]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.1.3-201507261202.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-3.1-4.1.3-201507261202.patch
CommitLineData
92147cde
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index 9de9813..1462492 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -3,9 +3,11 @@
6 *.bc
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -15,6 +17,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -51,14 +54,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38-.*
39+.[^g]*
40+.gen*
41 .*.d
42 .mm
43 53c700_d.h
44@@ -72,9 +78,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48+PERF*
49 SCCS
50 System.map*
51 TAGS
52+TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56@@ -83,6 +91,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60+ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64@@ -95,32 +104,40 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68+builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74+clut_vga16.c
75+common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82+config.c
83 config.mak
84 config.mak.autogen
85+config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89 crc32table.h*
90 cscope.*
91 defkeymap.c
92+devicetable-offsets.h
93 devlist.h*
94 dnotify_test
95 docproc
96 dslm
97+dtc-lexer.lex.c
98 elf2ecoff
99 elfconfig.h*
100 evergreen_reg_safe.h
101+exception_policy.conf
102 fixdep
103 flask.h
104 fore200e_mkfirm
105@@ -128,12 +145,15 @@ fore200e_pca_fw.c*
106 gconf
107 gconf.glade.h
108 gen-devlist
109+gen-kdb_cmds.c
110 gen_crc32table
111 gen_init_cpio
112 generated
113 genheaders
114 genksyms
115 *_gray256.c
116+hash
117+hid-example
118 hpet_example
119 hugepage-mmap
120 hugepage-shm
121@@ -148,14 +168,14 @@ int32.c
122 int4.c
123 int8.c
124 kallsyms
125-kconfig
126+kern_constants.h
127 keywords.c
128 ksym.c*
129 ksym.h*
130 kxgettext
131 lex.c
132 lex.*.c
133-linux
134+lib1funcs.S
135 logo_*.c
136 logo_*_clut224.c
137 logo_*_mono.c
138@@ -165,14 +185,15 @@ mach-types.h
139 machtypes.h
140 map
141 map_hugetlb
142-media
143 mconf
144+mdp
145 miboot*
146 mk_elfconfig
147 mkboot
148 mkbugboot
149 mkcpustr
150 mkdep
151+mkpiggy
152 mkprep
153 mkregtable
154 mktables
155@@ -188,6 +209,8 @@ oui.c*
156 page-types
157 parse.c
158 parse.h
159+parse-events*
160+pasyms.h
161 patches*
162 pca200e.bin
163 pca200e_ecd.bin2
164@@ -197,6 +220,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168+pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172@@ -206,7 +230,12 @@ r200_reg_safe.h
173 r300_reg_safe.h
174 r420_reg_safe.h
175 r600_reg_safe.h
176+randomize_layout_hash.h
177+randomize_layout_seed.h
178+realmode.lds
179+realmode.relocs
180 recordmcount
181+regdb.c
182 relocs
183 rlim_names.h
184 rn50_reg_safe.h
185@@ -216,8 +245,12 @@ series
186 setup
187 setup.bin
188 setup.elf
189+signing_key*
190+size_overflow_hash.h
191 sImage
192+slabinfo
193 sm_tbl*
194+sortextable
195 split-include
196 syscalltab.h
197 tables.c
198@@ -227,6 +260,7 @@ tftpboot.img
199 timeconst.h
200 times.h*
201 trix_boot.h
202+user_constants.h
203 utsrelease.h*
204 vdso-syms.lds
205 vdso.lds
206@@ -238,13 +272,17 @@ vdso32.lds
207 vdso32.so.dbg
208 vdso64.lds
209 vdso64.so.dbg
210+vdsox32.lds
211+vdsox32-syms.lds
212 version.h*
213 vmImage
214 vmlinux
215 vmlinux-*
216 vmlinux.aout
217 vmlinux.bin.all
218+vmlinux.bin.bz2
219 vmlinux.lds
220+vmlinux.relocs
221 vmlinuz
222 voffset.h
223 vsyscall.lds
224@@ -252,9 +290,12 @@ vsyscall_32.lds
225 wanxlfw.inc
226 uImage
227 unifdef
228+utsrelease.h
229 wakeup.bin
230 wakeup.elf
231 wakeup.lds
232+x509*
233 zImage*
234 zconf.hash.c
235+zconf.lex.c
236 zoffset.h
237diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
238index 74b6c6d..eac0e77 100644
239--- a/Documentation/kbuild/makefiles.txt
240+++ b/Documentation/kbuild/makefiles.txt
241@@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
242 === 4 Host Program support
243 --- 4.1 Simple Host Program
244 --- 4.2 Composite Host Programs
245- --- 4.3 Using C++ for host programs
246- --- 4.4 Controlling compiler options for host programs
247- --- 4.5 When host programs are actually built
248- --- 4.6 Using hostprogs-$(CONFIG_FOO)
249+ --- 4.3 Defining shared libraries
250+ --- 4.4 Using C++ for host programs
251+ --- 4.5 Controlling compiler options for host programs
252+ --- 4.6 When host programs are actually built
253+ --- 4.7 Using hostprogs-$(CONFIG_FOO)
254
255 === 5 Kbuild clean infrastructure
256
257@@ -643,7 +644,29 @@ Both possibilities are described in the following.
258 Finally, the two .o files are linked to the executable, lxdialog.
259 Note: The syntax <executable>-y is not permitted for host-programs.
260
261---- 4.3 Using C++ for host programs
262+--- 4.3 Defining shared libraries
263+
264+ Objects with extension .so are considered shared libraries, and
265+ will be compiled as position independent objects.
266+ Kbuild provides support for shared libraries, but the usage
267+ shall be restricted.
268+ In the following example the libkconfig.so shared library is used
269+ to link the executable conf.
270+
271+ Example:
272+ #scripts/kconfig/Makefile
273+ hostprogs-y := conf
274+ conf-objs := conf.o libkconfig.so
275+ libkconfig-objs := expr.o type.o
276+
277+ Shared libraries always require a corresponding -objs line, and
278+ in the example above the shared library libkconfig is composed by
279+ the two objects expr.o and type.o.
280+ expr.o and type.o will be built as position independent code and
281+ linked as a shared library libkconfig.so. C++ is not supported for
282+ shared libraries.
283+
284+--- 4.4 Using C++ for host programs
285
286 kbuild offers support for host programs written in C++. This was
287 introduced solely to support kconfig, and is not recommended
288@@ -666,7 +689,7 @@ Both possibilities are described in the following.
289 qconf-cxxobjs := qconf.o
290 qconf-objs := check.o
291
292---- 4.4 Controlling compiler options for host programs
293+--- 4.5 Controlling compiler options for host programs
294
295 When compiling host programs, it is possible to set specific flags.
296 The programs will always be compiled utilising $(HOSTCC) passed
297@@ -694,7 +717,7 @@ Both possibilities are described in the following.
298 When linking qconf, it will be passed the extra option
299 "-L$(QTDIR)/lib".
300
301---- 4.5 When host programs are actually built
302+--- 4.6 When host programs are actually built
303
304 Kbuild will only build host-programs when they are referenced
305 as a prerequisite.
306@@ -725,7 +748,7 @@ Both possibilities are described in the following.
307 This will tell kbuild to build lxdialog even if not referenced in
308 any rule.
309
310---- 4.6 Using hostprogs-$(CONFIG_FOO)
311+--- 4.7 Using hostprogs-$(CONFIG_FOO)
312
313 A typical pattern in a Kbuild file looks like this:
314
315diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
316index 6726139..c825c0a 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1223,6 +1223,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
320 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
321 Default: 1024
322
323+ grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
324+ ignore grsecurity's /proc restrictions
325+
326+ grsec_sysfs_restrict= Format: 0 | 1
327+ Default: 1
328+ Disables GRKERNSEC_SYSFS_RESTRICT if enabled in config
329+
330 hashdist= [KNL,NUMA] Large hashes allocated during boot
331 are distributed across NUMA nodes. Defaults on
332 for 64-bit NUMA, off otherwise.
333@@ -2333,6 +2340,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
334 noexec=on: enable non-executable mappings (default)
335 noexec=off: disable non-executable mappings
336
337+ nopcid [X86-64]
338+ Disable PCID (Process-Context IDentifier) even if it
339+ is supported by the processor.
340+
341 nosmap [X86]
342 Disable SMAP (Supervisor Mode Access Prevention)
343 even if it is supported by processor.
344@@ -2631,6 +2642,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
345 the specified number of seconds. This is to be used if
346 your oopses keep scrolling off the screen.
347
348+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
349+ virtualization environments that don't cope well with the
350+ expand down segment used by UDEREF on X86-32 or the frequent
351+ page table updates on X86-64.
352+
353+ pax_sanitize_slab=
354+ Format: { 0 | 1 | off | fast | full }
355+ Options '0' and '1' are only provided for backward
356+ compatibility, 'off' or 'fast' should be used instead.
357+ 0|off : disable slab object sanitization
358+ 1|fast: enable slab object sanitization excluding
359+ whitelisted slabs (default)
360+ full : sanitize all slabs, even the whitelisted ones
361+
362+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
363+
364+ pax_extra_latent_entropy
365+ Enable a very simple form of latent entropy extraction
366+ from the first 4GB of memory as the bootmem allocator
367+ passes the memory pages to the buddy allocator.
368+
369+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
370+ when the processor supports PCID.
371+
372 pcbit= [HW,ISDN]
373
374 pcd. [PARIDE]
375diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
376index c831001..1bfbbf6 100644
377--- a/Documentation/sysctl/kernel.txt
378+++ b/Documentation/sysctl/kernel.txt
379@@ -41,6 +41,7 @@ show up in /proc/sys/kernel:
380 - kptr_restrict
381 - kstack_depth_to_print [ X86 only ]
382 - l2cr [ PPC only ]
383+- modify_ldt [ X86 only ]
384 - modprobe ==> Documentation/debugging-modules.txt
385 - modules_disabled
386 - msg_next_id [ sysv ipc ]
387@@ -391,6 +392,20 @@ This flag controls the L2 cache of G3 processor boards. If
388
389 ==============================================================
390
391+modify_ldt: (X86 only)
392+
393+Enables (1) or disables (0) the modify_ldt syscall. Modifying the LDT
394+(Local Descriptor Table) may be needed to run a 16-bit or segmented code
395+such as Dosemu or Wine. This is done via a system call which is not needed
396+to run portable applications, and which can sometimes be abused to exploit
397+some weaknesses of the architecture, opening new vulnerabilities.
398+
399+This sysctl allows one to increase the system's security by disabling the
400+system call, or to restore compatibility with specific applications when it
401+was already disabled.
402+
403+==============================================================
404+
405 modules_disabled:
406
407 A toggle value indicating if modules are allowed to be loaded
408diff --git a/Makefile b/Makefile
409index e3cdec4..56ae73d 100644
410--- a/Makefile
411+++ b/Makefile
412@@ -299,7 +299,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
413 HOSTCC = gcc
414 HOSTCXX = g++
415 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
416-HOSTCXXFLAGS = -O2
417+HOSTCFLAGS = -W -Wno-unused-parameter -Wno-missing-field-initializers -fno-delete-null-pointer-checks
418+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
419+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
420
421 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
422 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
423@@ -444,8 +446,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
424 # Rules shared between *config targets and build targets
425
426 # Basic helpers built in scripts/
427-PHONY += scripts_basic
428-scripts_basic:
429+PHONY += scripts_basic gcc-plugins
430+scripts_basic: gcc-plugins
431 $(Q)$(MAKE) $(build)=scripts/basic
432 $(Q)rm -f .tmp_quiet_recordmcount
433
434@@ -620,6 +622,74 @@ endif
435 # Tell gcc to never replace conditional load with a non-conditional one
436 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
437
438+ifndef DISABLE_PAX_PLUGINS
439+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
440+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
441+else
442+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
443+endif
444+ifneq ($(PLUGINCC),)
445+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
446+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
447+endif
448+ifdef CONFIG_PAX_MEMORY_STACKLEAK
449+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
450+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
451+endif
452+ifdef CONFIG_KALLOCSTAT_PLUGIN
453+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
454+endif
455+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
456+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
457+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
458+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
459+endif
460+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
461+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
462+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
463+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
464+endif
465+endif
466+ifdef CONFIG_CHECKER_PLUGIN
467+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
468+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
469+endif
470+endif
471+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
472+ifdef CONFIG_PAX_SIZE_OVERFLOW
473+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
474+endif
475+ifdef CONFIG_PAX_LATENT_ENTROPY
476+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
477+endif
478+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
479+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
480+endif
481+INITIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/initify_plugin.so -DINITIFY_PLUGIN
482+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
483+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
484+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
485+GCC_PLUGINS_CFLAGS += $(INITIFY_PLUGIN_CFLAGS)
486+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
487+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
488+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
489+ifeq ($(KBUILD_EXTMOD),)
490+gcc-plugins:
491+ $(Q)$(MAKE) $(build)=tools/gcc
492+else
493+gcc-plugins: ;
494+endif
495+else
496+gcc-plugins:
497+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
498+ $(error Your gcc installation does not support plugins. If the necessary headers for plugin support are missing, they should be installed. On Debian, apt-get install gcc-<ver>-plugin-dev. If you choose to ignore this error and lessen the improvements provided by this patch, re-run make with the DISABLE_PAX_PLUGINS=y argument.))
499+else
500+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
501+endif
502+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
503+endif
504+endif
505+
506 ifdef CONFIG_READABLE_ASM
507 # Disable optimizations that make assembler listings hard to read.
508 # reorder blocks reorders the control in the function
509@@ -712,7 +782,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
510 else
511 KBUILD_CFLAGS += -g
512 endif
513-KBUILD_AFLAGS += -Wa,-gdwarf-2
514+KBUILD_AFLAGS += -Wa,--gdwarf-2
515 endif
516 ifdef CONFIG_DEBUG_INFO_DWARF4
517 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
518@@ -883,7 +953,7 @@ export mod_sign_cmd
519
520
521 ifeq ($(KBUILD_EXTMOD),)
522-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
523+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
524
525 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
526 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
527@@ -933,6 +1003,8 @@ endif
528
529 # The actual objects are generated when descending,
530 # make sure no implicit rule kicks in
531+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
532+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
533 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
534
535 # Handle descending into subdirectories listed in $(vmlinux-dirs)
536@@ -942,7 +1014,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
537 # Error messages still appears in the original language
538
539 PHONY += $(vmlinux-dirs)
540-$(vmlinux-dirs): prepare scripts
541+$(vmlinux-dirs): gcc-plugins prepare scripts
542 $(Q)$(MAKE) $(build)=$@
543
544 define filechk_kernel.release
545@@ -985,10 +1057,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
546
547 archprepare: archheaders archscripts prepare1 scripts_basic
548
549+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
550+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
551 prepare0: archprepare FORCE
552 $(Q)$(MAKE) $(build)=.
553
554 # All the preparing..
555+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
556 prepare: prepare0
557
558 # Generate some files
559@@ -1096,6 +1171,8 @@ all: modules
560 # using awk while concatenating to the final file.
561
562 PHONY += modules
563+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
564+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
565 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
566 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
567 @$(kecho) ' Building modules, stage 2.';
568@@ -1111,7 +1188,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
569
570 # Target to prepare building external modules
571 PHONY += modules_prepare
572-modules_prepare: prepare scripts
573+modules_prepare: gcc-plugins prepare scripts
574
575 # Target to install modules
576 PHONY += modules_install
577@@ -1177,7 +1254,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
578 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
579 signing_key.priv signing_key.x509 x509.genkey \
580 extra_certificates signing_key.x509.keyid \
581- signing_key.x509.signer vmlinux-gdb.py
582+ signing_key.x509.signer vmlinux-gdb.py \
583+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
584+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
585+ tools/gcc/randomize_layout_seed.h
586
587 # clean - Delete most, but leave enough to build external modules
588 #
589@@ -1216,7 +1296,7 @@ distclean: mrproper
590 @find $(srctree) $(RCS_FIND_IGNORE) \
591 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
592 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
593- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
594+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
595 -type f -print | xargs rm -f
596
597
598@@ -1382,6 +1462,8 @@ PHONY += $(module-dirs) modules
599 $(module-dirs): crmodverdir $(objtree)/Module.symvers
600 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
601
602+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
603+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
604 modules: $(module-dirs)
605 @$(kecho) ' Building modules, stage 2.';
606 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
607@@ -1522,17 +1604,21 @@ else
608 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
609 endif
610
611-%.s: %.c prepare scripts FORCE
612+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
613+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
614+%.s: %.c gcc-plugins prepare scripts FORCE
615 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
616 %.i: %.c prepare scripts FORCE
617 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
618-%.o: %.c prepare scripts FORCE
619+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
620+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
621+%.o: %.c gcc-plugins prepare scripts FORCE
622 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
623 %.lst: %.c prepare scripts FORCE
624 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
625-%.s: %.S prepare scripts FORCE
626+%.s: %.S gcc-plugins prepare scripts FORCE
627 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
628-%.o: %.S prepare scripts FORCE
629+%.o: %.S gcc-plugins prepare scripts FORCE
630 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
631 %.symtypes: %.c prepare scripts FORCE
632 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
633@@ -1544,11 +1630,15 @@ endif
634 $(build)=$(build-dir)
635 # Make sure the latest headers are built for Documentation
636 Documentation/: headers_install
637-%/: prepare scripts FORCE
638+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
639+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
640+%/: gcc-plugins prepare scripts FORCE
641 $(cmd_crmodverdir)
642 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
643 $(build)=$(build-dir)
644-%.ko: prepare scripts FORCE
645+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
646+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
647+%.ko: gcc-plugins prepare scripts FORCE
648 $(cmd_crmodverdir)
649 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
650 $(build)=$(build-dir) $(@:.ko=.o)
651diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
652index 8f8eafb..3405f46 100644
653--- a/arch/alpha/include/asm/atomic.h
654+++ b/arch/alpha/include/asm/atomic.h
655@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
656 #define atomic_dec(v) atomic_sub(1,(v))
657 #define atomic64_dec(v) atomic64_sub(1,(v))
658
659+#define atomic64_read_unchecked(v) atomic64_read(v)
660+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
661+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
662+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
663+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
664+#define atomic64_inc_unchecked(v) atomic64_inc(v)
665+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
666+#define atomic64_dec_unchecked(v) atomic64_dec(v)
667+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
668+
669 #endif /* _ALPHA_ATOMIC_H */
670diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
671index ad368a9..fbe0f25 100644
672--- a/arch/alpha/include/asm/cache.h
673+++ b/arch/alpha/include/asm/cache.h
674@@ -4,19 +4,19 @@
675 #ifndef __ARCH_ALPHA_CACHE_H
676 #define __ARCH_ALPHA_CACHE_H
677
678+#include <linux/const.h>
679
680 /* Bytes per L1 (data) cache line. */
681 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
682-# define L1_CACHE_BYTES 64
683 # define L1_CACHE_SHIFT 6
684 #else
685 /* Both EV4 and EV5 are write-through, read-allocate,
686 direct-mapped, physical.
687 */
688-# define L1_CACHE_BYTES 32
689 # define L1_CACHE_SHIFT 5
690 #endif
691
692+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
693 #define SMP_CACHE_BYTES L1_CACHE_BYTES
694
695 #endif
696diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
697index 968d999..d36b2df 100644
698--- a/arch/alpha/include/asm/elf.h
699+++ b/arch/alpha/include/asm/elf.h
700@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
701
702 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
703
704+#ifdef CONFIG_PAX_ASLR
705+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
706+
707+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
708+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
709+#endif
710+
711 /* $0 is set by ld.so to a pointer to a function which might be
712 registered using atexit. This provides a mean for the dynamic
713 linker to call DT_FINI functions for shared libraries that have
714diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
715index aab14a0..b4fa3e7 100644
716--- a/arch/alpha/include/asm/pgalloc.h
717+++ b/arch/alpha/include/asm/pgalloc.h
718@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
719 pgd_set(pgd, pmd);
720 }
721
722+static inline void
723+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
724+{
725+ pgd_populate(mm, pgd, pmd);
726+}
727+
728 extern pgd_t *pgd_alloc(struct mm_struct *mm);
729
730 static inline void
731diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
732index a9a1195..e9b8417 100644
733--- a/arch/alpha/include/asm/pgtable.h
734+++ b/arch/alpha/include/asm/pgtable.h
735@@ -101,6 +101,17 @@ struct vm_area_struct;
736 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
737 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
738 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
739+
740+#ifdef CONFIG_PAX_PAGEEXEC
741+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
742+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
743+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
744+#else
745+# define PAGE_SHARED_NOEXEC PAGE_SHARED
746+# define PAGE_COPY_NOEXEC PAGE_COPY
747+# define PAGE_READONLY_NOEXEC PAGE_READONLY
748+#endif
749+
750 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
751
752 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
753diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
754index 2fd00b7..cfd5069 100644
755--- a/arch/alpha/kernel/module.c
756+++ b/arch/alpha/kernel/module.c
757@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
758
759 /* The small sections were sorted to the end of the segment.
760 The following should definitely cover them. */
761- gp = (u64)me->module_core + me->core_size - 0x8000;
762+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
763 got = sechdrs[me->arch.gotsecindex].sh_addr;
764
765 for (i = 0; i < n; i++) {
766diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
767index 36dc91a..6769cb0 100644
768--- a/arch/alpha/kernel/osf_sys.c
769+++ b/arch/alpha/kernel/osf_sys.c
770@@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
771 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
772
773 static unsigned long
774-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
775- unsigned long limit)
776+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
777+ unsigned long limit, unsigned long flags)
778 {
779 struct vm_unmapped_area_info info;
780+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
781
782 info.flags = 0;
783 info.length = len;
784@@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
785 info.high_limit = limit;
786 info.align_mask = 0;
787 info.align_offset = 0;
788+ info.threadstack_offset = offset;
789 return vm_unmapped_area(&info);
790 }
791
792@@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
793 merely specific addresses, but regions of memory -- perhaps
794 this feature should be incorporated into all ports? */
795
796+#ifdef CONFIG_PAX_RANDMMAP
797+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
798+#endif
799+
800 if (addr) {
801- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
802+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
803 if (addr != (unsigned long) -ENOMEM)
804 return addr;
805 }
806
807 /* Next, try allocating at TASK_UNMAPPED_BASE. */
808- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
809- len, limit);
810+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
811+
812 if (addr != (unsigned long) -ENOMEM)
813 return addr;
814
815 /* Finally, try allocating in low memory. */
816- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
817+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
818
819 return addr;
820 }
821diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
822index 9d0ac09..479a962 100644
823--- a/arch/alpha/mm/fault.c
824+++ b/arch/alpha/mm/fault.c
825@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
826 __reload_thread(pcb);
827 }
828
829+#ifdef CONFIG_PAX_PAGEEXEC
830+/*
831+ * PaX: decide what to do with offenders (regs->pc = fault address)
832+ *
833+ * returns 1 when task should be killed
834+ * 2 when patched PLT trampoline was detected
835+ * 3 when unpatched PLT trampoline was detected
836+ */
837+static int pax_handle_fetch_fault(struct pt_regs *regs)
838+{
839+
840+#ifdef CONFIG_PAX_EMUPLT
841+ int err;
842+
843+ do { /* PaX: patched PLT emulation #1 */
844+ unsigned int ldah, ldq, jmp;
845+
846+ err = get_user(ldah, (unsigned int *)regs->pc);
847+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
848+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
849+
850+ if (err)
851+ break;
852+
853+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
854+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
855+ jmp == 0x6BFB0000U)
856+ {
857+ unsigned long r27, addr;
858+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
859+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
860+
861+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
862+ err = get_user(r27, (unsigned long *)addr);
863+ if (err)
864+ break;
865+
866+ regs->r27 = r27;
867+ regs->pc = r27;
868+ return 2;
869+ }
870+ } while (0);
871+
872+ do { /* PaX: patched PLT emulation #2 */
873+ unsigned int ldah, lda, br;
874+
875+ err = get_user(ldah, (unsigned int *)regs->pc);
876+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
877+ err |= get_user(br, (unsigned int *)(regs->pc+8));
878+
879+ if (err)
880+ break;
881+
882+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
883+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
884+ (br & 0xFFE00000U) == 0xC3E00000U)
885+ {
886+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
887+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
888+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
889+
890+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
891+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
892+ return 2;
893+ }
894+ } while (0);
895+
896+ do { /* PaX: unpatched PLT emulation */
897+ unsigned int br;
898+
899+ err = get_user(br, (unsigned int *)regs->pc);
900+
901+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
902+ unsigned int br2, ldq, nop, jmp;
903+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
904+
905+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
906+ err = get_user(br2, (unsigned int *)addr);
907+ err |= get_user(ldq, (unsigned int *)(addr+4));
908+ err |= get_user(nop, (unsigned int *)(addr+8));
909+ err |= get_user(jmp, (unsigned int *)(addr+12));
910+ err |= get_user(resolver, (unsigned long *)(addr+16));
911+
912+ if (err)
913+ break;
914+
915+ if (br2 == 0xC3600000U &&
916+ ldq == 0xA77B000CU &&
917+ nop == 0x47FF041FU &&
918+ jmp == 0x6B7B0000U)
919+ {
920+ regs->r28 = regs->pc+4;
921+ regs->r27 = addr+16;
922+ regs->pc = resolver;
923+ return 3;
924+ }
925+ }
926+ } while (0);
927+#endif
928+
929+ return 1;
930+}
931+
932+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
933+{
934+ unsigned long i;
935+
936+ printk(KERN_ERR "PAX: bytes at PC: ");
937+ for (i = 0; i < 5; i++) {
938+ unsigned int c;
939+ if (get_user(c, (unsigned int *)pc+i))
940+ printk(KERN_CONT "???????? ");
941+ else
942+ printk(KERN_CONT "%08x ", c);
943+ }
944+ printk("\n");
945+}
946+#endif
947
948 /*
949 * This routine handles page faults. It determines the address,
950@@ -133,8 +251,29 @@ retry:
951 good_area:
952 si_code = SEGV_ACCERR;
953 if (cause < 0) {
954- if (!(vma->vm_flags & VM_EXEC))
955+ if (!(vma->vm_flags & VM_EXEC)) {
956+
957+#ifdef CONFIG_PAX_PAGEEXEC
958+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
959+ goto bad_area;
960+
961+ up_read(&mm->mmap_sem);
962+ switch (pax_handle_fetch_fault(regs)) {
963+
964+#ifdef CONFIG_PAX_EMUPLT
965+ case 2:
966+ case 3:
967+ return;
968+#endif
969+
970+ }
971+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
972+ do_group_exit(SIGKILL);
973+#else
974 goto bad_area;
975+#endif
976+
977+ }
978 } else if (!cause) {
979 /* Allow reads even for write-only mappings */
980 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
981diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
982index 45df48b..952017a 100644
983--- a/arch/arm/Kconfig
984+++ b/arch/arm/Kconfig
985@@ -1716,7 +1716,7 @@ config ALIGNMENT_TRAP
986
987 config UACCESS_WITH_MEMCPY
988 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
989- depends on MMU
990+ depends on MMU && !PAX_MEMORY_UDEREF
991 default y if CPU_FEROCEON
992 help
993 Implement faster copy_to_user and clear_user methods for CPU
994@@ -1951,6 +1951,7 @@ config XIP_PHYS_ADDR
995 config KEXEC
996 bool "Kexec system call (EXPERIMENTAL)"
997 depends on (!SMP || PM_SLEEP_SMP)
998+ depends on !GRKERNSEC_KMEM
999 help
1000 kexec is a system call that implements the ability to shutdown your
1001 current kernel, and to start another kernel. It is like a reboot
1002diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
1003index e22c119..abe7041 100644
1004--- a/arch/arm/include/asm/atomic.h
1005+++ b/arch/arm/include/asm/atomic.h
1006@@ -18,17 +18,41 @@
1007 #include <asm/barrier.h>
1008 #include <asm/cmpxchg.h>
1009
1010+#ifdef CONFIG_GENERIC_ATOMIC64
1011+#include <asm-generic/atomic64.h>
1012+#endif
1013+
1014 #define ATOMIC_INIT(i) { (i) }
1015
1016 #ifdef __KERNEL__
1017
1018+#ifdef CONFIG_THUMB2_KERNEL
1019+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
1020+#else
1021+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
1022+#endif
1023+
1024+#define _ASM_EXTABLE(from, to) \
1025+" .pushsection __ex_table,\"a\"\n"\
1026+" .align 3\n" \
1027+" .long " #from ", " #to"\n" \
1028+" .popsection"
1029+
1030 /*
1031 * On ARM, ordinary assignment (str instruction) doesn't clear the local
1032 * strex/ldrex monitor on some implementations. The reason we can use it for
1033 * atomic_set() is the clrex or dummy strex done on every exception return.
1034 */
1035 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1036+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1037+{
1038+ return ACCESS_ONCE(v->counter);
1039+}
1040 #define atomic_set(v,i) (((v)->counter) = (i))
1041+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1042+{
1043+ v->counter = i;
1044+}
1045
1046 #if __LINUX_ARM_ARCH__ >= 6
1047
1048@@ -38,26 +62,50 @@
1049 * to ensure that the update happens.
1050 */
1051
1052-#define ATOMIC_OP(op, c_op, asm_op) \
1053-static inline void atomic_##op(int i, atomic_t *v) \
1054+#ifdef CONFIG_PAX_REFCOUNT
1055+#define __OVERFLOW_POST \
1056+ " bvc 3f\n" \
1057+ "2: " REFCOUNT_TRAP_INSN "\n"\
1058+ "3:\n"
1059+#define __OVERFLOW_POST_RETURN \
1060+ " bvc 3f\n" \
1061+" mov %0, %1\n" \
1062+ "2: " REFCOUNT_TRAP_INSN "\n"\
1063+ "3:\n"
1064+#define __OVERFLOW_EXTABLE \
1065+ "4:\n" \
1066+ _ASM_EXTABLE(2b, 4b)
1067+#else
1068+#define __OVERFLOW_POST
1069+#define __OVERFLOW_POST_RETURN
1070+#define __OVERFLOW_EXTABLE
1071+#endif
1072+
1073+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1074+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1075 { \
1076 unsigned long tmp; \
1077 int result; \
1078 \
1079 prefetchw(&v->counter); \
1080- __asm__ __volatile__("@ atomic_" #op "\n" \
1081+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1082 "1: ldrex %0, [%3]\n" \
1083 " " #asm_op " %0, %0, %4\n" \
1084+ post_op \
1085 " strex %1, %0, [%3]\n" \
1086 " teq %1, #0\n" \
1087-" bne 1b" \
1088+" bne 1b\n" \
1089+ extable \
1090 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1091 : "r" (&v->counter), "Ir" (i) \
1092 : "cc"); \
1093 } \
1094
1095-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1096-static inline int atomic_##op##_return(int i, atomic_t *v) \
1097+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1098+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1099+
1100+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1101+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1102 { \
1103 unsigned long tmp; \
1104 int result; \
1105@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1106 smp_mb(); \
1107 prefetchw(&v->counter); \
1108 \
1109- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1110+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1111 "1: ldrex %0, [%3]\n" \
1112 " " #asm_op " %0, %0, %4\n" \
1113+ post_op \
1114 " strex %1, %0, [%3]\n" \
1115 " teq %1, #0\n" \
1116-" bne 1b" \
1117+" bne 1b\n" \
1118+ extable \
1119 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1120 : "r" (&v->counter), "Ir" (i) \
1121 : "cc"); \
1122@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1123 return result; \
1124 }
1125
1126+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1127+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1128+
1129 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1130 {
1131 int oldval;
1132@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1133 __asm__ __volatile__ ("@ atomic_add_unless\n"
1134 "1: ldrex %0, [%4]\n"
1135 " teq %0, %5\n"
1136-" beq 2f\n"
1137-" add %1, %0, %6\n"
1138+" beq 4f\n"
1139+" adds %1, %0, %6\n"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+" bvc 3f\n"
1143+"2: " REFCOUNT_TRAP_INSN "\n"
1144+"3:\n"
1145+#endif
1146+
1147 " strex %2, %1, [%4]\n"
1148 " teq %2, #0\n"
1149 " bne 1b\n"
1150-"2:"
1151+"4:"
1152+
1153+#ifdef CONFIG_PAX_REFCOUNT
1154+ _ASM_EXTABLE(2b, 4b)
1155+#endif
1156+
1157 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1158 : "r" (&v->counter), "r" (u), "r" (a)
1159 : "cc");
1160@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1161 return oldval;
1162 }
1163
1164+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1165+{
1166+ unsigned long oldval, res;
1167+
1168+ smp_mb();
1169+
1170+ do {
1171+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1172+ "ldrex %1, [%3]\n"
1173+ "mov %0, #0\n"
1174+ "teq %1, %4\n"
1175+ "strexeq %0, %5, [%3]\n"
1176+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1177+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1178+ : "cc");
1179+ } while (res);
1180+
1181+ smp_mb();
1182+
1183+ return oldval;
1184+}
1185+
1186 #else /* ARM_ARCH_6 */
1187
1188 #ifdef CONFIG_SMP
1189 #error SMP not supported on pre-ARMv6 CPUs
1190 #endif
1191
1192-#define ATOMIC_OP(op, c_op, asm_op) \
1193-static inline void atomic_##op(int i, atomic_t *v) \
1194+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1195+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1196 { \
1197 unsigned long flags; \
1198 \
1199@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1200 raw_local_irq_restore(flags); \
1201 } \
1202
1203-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1204-static inline int atomic_##op##_return(int i, atomic_t *v) \
1205+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1206+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1207+
1208+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1209+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1210 { \
1211 unsigned long flags; \
1212 int val; \
1213@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1214 return val; \
1215 }
1216
1217+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1218+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1219+
1220 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1221 {
1222 int ret;
1223@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1224 return ret;
1225 }
1226
1227+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1228+{
1229+ return atomic_cmpxchg((atomic_t *)v, old, new);
1230+}
1231+
1232 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1233 {
1234 int c, old;
1235@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1236
1237 #undef ATOMIC_OPS
1238 #undef ATOMIC_OP_RETURN
1239+#undef __ATOMIC_OP_RETURN
1240 #undef ATOMIC_OP
1241+#undef __ATOMIC_OP
1242
1243 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1244+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1245+{
1246+ return xchg(&v->counter, new);
1247+}
1248
1249 #define atomic_inc(v) atomic_add(1, v)
1250+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1251+{
1252+ atomic_add_unchecked(1, v);
1253+}
1254 #define atomic_dec(v) atomic_sub(1, v)
1255+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1256+{
1257+ atomic_sub_unchecked(1, v);
1258+}
1259
1260 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1261+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1262+{
1263+ return atomic_add_return_unchecked(1, v) == 0;
1264+}
1265 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1266 #define atomic_inc_return(v) (atomic_add_return(1, v))
1267+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1268+{
1269+ return atomic_add_return_unchecked(1, v);
1270+}
1271 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1272 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1273
1274@@ -216,6 +336,14 @@ typedef struct {
1275 long long counter;
1276 } atomic64_t;
1277
1278+#ifdef CONFIG_PAX_REFCOUNT
1279+typedef struct {
1280+ long long counter;
1281+} atomic64_unchecked_t;
1282+#else
1283+typedef atomic64_t atomic64_unchecked_t;
1284+#endif
1285+
1286 #define ATOMIC64_INIT(i) { (i) }
1287
1288 #ifdef CONFIG_ARM_LPAE
1289@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1290 return result;
1291 }
1292
1293+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1294+{
1295+ long long result;
1296+
1297+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1298+" ldrd %0, %H0, [%1]"
1299+ : "=&r" (result)
1300+ : "r" (&v->counter), "Qo" (v->counter)
1301+ );
1302+
1303+ return result;
1304+}
1305+
1306 static inline void atomic64_set(atomic64_t *v, long long i)
1307 {
1308 __asm__ __volatile__("@ atomic64_set\n"
1309@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1310 : "r" (&v->counter), "r" (i)
1311 );
1312 }
1313+
1314+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1315+{
1316+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1317+" strd %2, %H2, [%1]"
1318+ : "=Qo" (v->counter)
1319+ : "r" (&v->counter), "r" (i)
1320+ );
1321+}
1322 #else
1323 static inline long long atomic64_read(const atomic64_t *v)
1324 {
1325@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1326 return result;
1327 }
1328
1329+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1330+{
1331+ long long result;
1332+
1333+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1334+" ldrexd %0, %H0, [%1]"
1335+ : "=&r" (result)
1336+ : "r" (&v->counter), "Qo" (v->counter)
1337+ );
1338+
1339+ return result;
1340+}
1341+
1342 static inline void atomic64_set(atomic64_t *v, long long i)
1343 {
1344 long long tmp;
1345@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1346 : "r" (&v->counter), "r" (i)
1347 : "cc");
1348 }
1349+
1350+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1351+{
1352+ long long tmp;
1353+
1354+ prefetchw(&v->counter);
1355+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1356+"1: ldrexd %0, %H0, [%2]\n"
1357+" strexd %0, %3, %H3, [%2]\n"
1358+" teq %0, #0\n"
1359+" bne 1b"
1360+ : "=&r" (tmp), "=Qo" (v->counter)
1361+ : "r" (&v->counter), "r" (i)
1362+ : "cc");
1363+}
1364 #endif
1365
1366-#define ATOMIC64_OP(op, op1, op2) \
1367-static inline void atomic64_##op(long long i, atomic64_t *v) \
1368+#undef __OVERFLOW_POST_RETURN
1369+#define __OVERFLOW_POST_RETURN \
1370+ " bvc 3f\n" \
1371+" mov %0, %1\n" \
1372+" mov %H0, %H1\n" \
1373+ "2: " REFCOUNT_TRAP_INSN "\n"\
1374+ "3:\n"
1375+
1376+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1377+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1378 { \
1379 long long result; \
1380 unsigned long tmp; \
1381 \
1382 prefetchw(&v->counter); \
1383- __asm__ __volatile__("@ atomic64_" #op "\n" \
1384+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1385 "1: ldrexd %0, %H0, [%3]\n" \
1386 " " #op1 " %Q0, %Q0, %Q4\n" \
1387 " " #op2 " %R0, %R0, %R4\n" \
1388+ post_op \
1389 " strexd %1, %0, %H0, [%3]\n" \
1390 " teq %1, #0\n" \
1391-" bne 1b" \
1392+" bne 1b\n" \
1393+ extable \
1394 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1395 : "r" (&v->counter), "r" (i) \
1396 : "cc"); \
1397 } \
1398
1399-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1400-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1401+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1402+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1403+
1404+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1405+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1406 { \
1407 long long result; \
1408 unsigned long tmp; \
1409@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1410 smp_mb(); \
1411 prefetchw(&v->counter); \
1412 \
1413- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1414+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1415 "1: ldrexd %0, %H0, [%3]\n" \
1416 " " #op1 " %Q0, %Q0, %Q4\n" \
1417 " " #op2 " %R0, %R0, %R4\n" \
1418+ post_op \
1419 " strexd %1, %0, %H0, [%3]\n" \
1420 " teq %1, #0\n" \
1421-" bne 1b" \
1422+" bne 1b\n" \
1423+ extable \
1424 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1425 : "r" (&v->counter), "r" (i) \
1426 : "cc"); \
1427@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1428 return result; \
1429 }
1430
1431+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1432+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1433+
1434 #define ATOMIC64_OPS(op, op1, op2) \
1435 ATOMIC64_OP(op, op1, op2) \
1436 ATOMIC64_OP_RETURN(op, op1, op2)
1437@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1438
1439 #undef ATOMIC64_OPS
1440 #undef ATOMIC64_OP_RETURN
1441+#undef __ATOMIC64_OP_RETURN
1442 #undef ATOMIC64_OP
1443+#undef __ATOMIC64_OP
1444+#undef __OVERFLOW_EXTABLE
1445+#undef __OVERFLOW_POST_RETURN
1446+#undef __OVERFLOW_POST
1447
1448 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1449 long long new)
1450@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1451 return oldval;
1452 }
1453
1454+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1455+ long long new)
1456+{
1457+ long long oldval;
1458+ unsigned long res;
1459+
1460+ smp_mb();
1461+
1462+ do {
1463+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1464+ "ldrexd %1, %H1, [%3]\n"
1465+ "mov %0, #0\n"
1466+ "teq %1, %4\n"
1467+ "teqeq %H1, %H4\n"
1468+ "strexdeq %0, %5, %H5, [%3]"
1469+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1470+ : "r" (&ptr->counter), "r" (old), "r" (new)
1471+ : "cc");
1472+ } while (res);
1473+
1474+ smp_mb();
1475+
1476+ return oldval;
1477+}
1478+
1479 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1480 {
1481 long long result;
1482@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1483 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1484 {
1485 long long result;
1486- unsigned long tmp;
1487+ u64 tmp;
1488
1489 smp_mb();
1490 prefetchw(&v->counter);
1491
1492 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1493-"1: ldrexd %0, %H0, [%3]\n"
1494-" subs %Q0, %Q0, #1\n"
1495-" sbc %R0, %R0, #0\n"
1496+"1: ldrexd %1, %H1, [%3]\n"
1497+" subs %Q0, %Q1, #1\n"
1498+" sbcs %R0, %R1, #0\n"
1499+
1500+#ifdef CONFIG_PAX_REFCOUNT
1501+" bvc 3f\n"
1502+" mov %Q0, %Q1\n"
1503+" mov %R0, %R1\n"
1504+"2: " REFCOUNT_TRAP_INSN "\n"
1505+"3:\n"
1506+#endif
1507+
1508 " teq %R0, #0\n"
1509-" bmi 2f\n"
1510+" bmi 4f\n"
1511 " strexd %1, %0, %H0, [%3]\n"
1512 " teq %1, #0\n"
1513 " bne 1b\n"
1514-"2:"
1515+"4:\n"
1516+
1517+#ifdef CONFIG_PAX_REFCOUNT
1518+ _ASM_EXTABLE(2b, 4b)
1519+#endif
1520+
1521 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1522 : "r" (&v->counter)
1523 : "cc");
1524@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1525 " teq %0, %5\n"
1526 " teqeq %H0, %H5\n"
1527 " moveq %1, #0\n"
1528-" beq 2f\n"
1529+" beq 4f\n"
1530 " adds %Q0, %Q0, %Q6\n"
1531-" adc %R0, %R0, %R6\n"
1532+" adcs %R0, %R0, %R6\n"
1533+
1534+#ifdef CONFIG_PAX_REFCOUNT
1535+" bvc 3f\n"
1536+"2: " REFCOUNT_TRAP_INSN "\n"
1537+"3:\n"
1538+#endif
1539+
1540 " strexd %2, %0, %H0, [%4]\n"
1541 " teq %2, #0\n"
1542 " bne 1b\n"
1543-"2:"
1544+"4:\n"
1545+
1546+#ifdef CONFIG_PAX_REFCOUNT
1547+ _ASM_EXTABLE(2b, 4b)
1548+#endif
1549+
1550 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1551 : "r" (&v->counter), "r" (u), "r" (a)
1552 : "cc");
1553@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1554
1555 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1556 #define atomic64_inc(v) atomic64_add(1LL, (v))
1557+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1558 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1559+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1560 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1561 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1562 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1563+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1564 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1565 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1566 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1567diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1568index d2f81e6..3c4dba5 100644
1569--- a/arch/arm/include/asm/barrier.h
1570+++ b/arch/arm/include/asm/barrier.h
1571@@ -67,7 +67,7 @@
1572 do { \
1573 compiletime_assert_atomic_type(*p); \
1574 smp_mb(); \
1575- ACCESS_ONCE(*p) = (v); \
1576+ ACCESS_ONCE_RW(*p) = (v); \
1577 } while (0)
1578
1579 #define smp_load_acquire(p) \
1580diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1581index 75fe66b..ba3dee4 100644
1582--- a/arch/arm/include/asm/cache.h
1583+++ b/arch/arm/include/asm/cache.h
1584@@ -4,8 +4,10 @@
1585 #ifndef __ASMARM_CACHE_H
1586 #define __ASMARM_CACHE_H
1587
1588+#include <linux/const.h>
1589+
1590 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1591-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1592+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1593
1594 /*
1595 * Memory returned by kmalloc() may be used for DMA, so we must make
1596@@ -24,5 +26,6 @@
1597 #endif
1598
1599 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1600+#define __read_only __attribute__ ((__section__(".data..read_only")))
1601
1602 #endif
1603diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1604index 2d46862..a35415b 100644
1605--- a/arch/arm/include/asm/cacheflush.h
1606+++ b/arch/arm/include/asm/cacheflush.h
1607@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1608 void (*dma_unmap_area)(const void *, size_t, int);
1609
1610 void (*dma_flush_range)(const void *, const void *);
1611-};
1612+} __no_const;
1613
1614 /*
1615 * Select the calling method
1616diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1617index 5233151..87a71fa 100644
1618--- a/arch/arm/include/asm/checksum.h
1619+++ b/arch/arm/include/asm/checksum.h
1620@@ -37,7 +37,19 @@ __wsum
1621 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1622
1623 __wsum
1624-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1625+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1626+
1627+static inline __wsum
1628+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1629+{
1630+ __wsum ret;
1631+ pax_open_userland();
1632+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1633+ pax_close_userland();
1634+ return ret;
1635+}
1636+
1637+
1638
1639 /*
1640 * Fold a partial checksum without adding pseudo headers
1641diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1642index abb2c37..96db950 100644
1643--- a/arch/arm/include/asm/cmpxchg.h
1644+++ b/arch/arm/include/asm/cmpxchg.h
1645@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1646
1647 #define xchg(ptr,x) \
1648 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1649+#define xchg_unchecked(ptr,x) \
1650+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1651
1652 #include <asm-generic/cmpxchg-local.h>
1653
1654diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1655index 6ddbe44..b5e38b1a 100644
1656--- a/arch/arm/include/asm/domain.h
1657+++ b/arch/arm/include/asm/domain.h
1658@@ -48,18 +48,37 @@
1659 * Domain types
1660 */
1661 #define DOMAIN_NOACCESS 0
1662-#define DOMAIN_CLIENT 1
1663 #ifdef CONFIG_CPU_USE_DOMAINS
1664+#define DOMAIN_USERCLIENT 1
1665+#define DOMAIN_KERNELCLIENT 1
1666 #define DOMAIN_MANAGER 3
1667+#define DOMAIN_VECTORS DOMAIN_USER
1668 #else
1669+
1670+#ifdef CONFIG_PAX_KERNEXEC
1671 #define DOMAIN_MANAGER 1
1672+#define DOMAIN_KERNEXEC 3
1673+#else
1674+#define DOMAIN_MANAGER 1
1675+#endif
1676+
1677+#ifdef CONFIG_PAX_MEMORY_UDEREF
1678+#define DOMAIN_USERCLIENT 0
1679+#define DOMAIN_UDEREF 1
1680+#define DOMAIN_VECTORS DOMAIN_KERNEL
1681+#else
1682+#define DOMAIN_USERCLIENT 1
1683+#define DOMAIN_VECTORS DOMAIN_USER
1684+#endif
1685+#define DOMAIN_KERNELCLIENT 1
1686+
1687 #endif
1688
1689 #define domain_val(dom,type) ((type) << (2*(dom)))
1690
1691 #ifndef __ASSEMBLY__
1692
1693-#ifdef CONFIG_CPU_USE_DOMAINS
1694+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1695 static inline void set_domain(unsigned val)
1696 {
1697 asm volatile(
1698@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1699 isb();
1700 }
1701
1702-#define modify_domain(dom,type) \
1703- do { \
1704- struct thread_info *thread = current_thread_info(); \
1705- unsigned int domain = thread->cpu_domain; \
1706- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1707- thread->cpu_domain = domain | domain_val(dom, type); \
1708- set_domain(thread->cpu_domain); \
1709- } while (0)
1710-
1711+extern void modify_domain(unsigned int dom, unsigned int type);
1712 #else
1713 static inline void set_domain(unsigned val) { }
1714 static inline void modify_domain(unsigned dom, unsigned type) { }
1715diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1716index d2315ff..f60b47b 100644
1717--- a/arch/arm/include/asm/elf.h
1718+++ b/arch/arm/include/asm/elf.h
1719@@ -117,7 +117,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1720 the loader. We need to make sure that it is out of the way of the program
1721 that it will "exec", and that there is sufficient room for the brk. */
1722
1723-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1724+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1725+
1726+#ifdef CONFIG_PAX_ASLR
1727+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1728+
1729+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1730+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1731+#endif
1732
1733 /* When the program starts, a1 contains a pointer to a function to be
1734 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1735diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1736index de53547..52b9a28 100644
1737--- a/arch/arm/include/asm/fncpy.h
1738+++ b/arch/arm/include/asm/fncpy.h
1739@@ -81,7 +81,9 @@
1740 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1741 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1742 \
1743+ pax_open_kernel(); \
1744 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1745+ pax_close_kernel(); \
1746 flush_icache_range((unsigned long)(dest_buf), \
1747 (unsigned long)(dest_buf) + (size)); \
1748 \
1749diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1750index 4e78065..f265b48 100644
1751--- a/arch/arm/include/asm/futex.h
1752+++ b/arch/arm/include/asm/futex.h
1753@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1755 return -EFAULT;
1756
1757+ pax_open_userland();
1758+
1759 smp_mb();
1760 /* Prefetching cannot fault */
1761 prefetchw(uaddr);
1762@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1763 : "cc", "memory");
1764 smp_mb();
1765
1766+ pax_close_userland();
1767+
1768 *uval = val;
1769 return ret;
1770 }
1771@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1772 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1773 return -EFAULT;
1774
1775+ pax_open_userland();
1776+
1777 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1778 "1: " TUSER(ldr) " %1, [%4]\n"
1779 " teq %1, %2\n"
1780@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1781 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1782 : "cc", "memory");
1783
1784+ pax_close_userland();
1785+
1786 *uval = val;
1787 return ret;
1788 }
1789@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1790 return -EFAULT;
1791
1792 pagefault_disable(); /* implies preempt_disable() */
1793+ pax_open_userland();
1794
1795 switch (op) {
1796 case FUTEX_OP_SET:
1797@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1798 ret = -ENOSYS;
1799 }
1800
1801+ pax_close_userland();
1802 pagefault_enable(); /* subsumes preempt_enable() */
1803
1804 if (!ret) {
1805diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1806index 83eb2f7..ed77159 100644
1807--- a/arch/arm/include/asm/kmap_types.h
1808+++ b/arch/arm/include/asm/kmap_types.h
1809@@ -4,6 +4,6 @@
1810 /*
1811 * This is the "bare minimum". AIO seems to require this.
1812 */
1813-#define KM_TYPE_NR 16
1814+#define KM_TYPE_NR 17
1815
1816 #endif
1817diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1818index 9e614a1..3302cca 100644
1819--- a/arch/arm/include/asm/mach/dma.h
1820+++ b/arch/arm/include/asm/mach/dma.h
1821@@ -22,7 +22,7 @@ struct dma_ops {
1822 int (*residue)(unsigned int, dma_t *); /* optional */
1823 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1824 const char *type;
1825-};
1826+} __do_const;
1827
1828 struct dma_struct {
1829 void *addr; /* single DMA address */
1830diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1831index f98c7f3..e5c626d 100644
1832--- a/arch/arm/include/asm/mach/map.h
1833+++ b/arch/arm/include/asm/mach/map.h
1834@@ -23,17 +23,19 @@ struct map_desc {
1835
1836 /* types 0-3 are defined in asm/io.h */
1837 enum {
1838- MT_UNCACHED = 4,
1839- MT_CACHECLEAN,
1840- MT_MINICLEAN,
1841+ MT_UNCACHED_RW = 4,
1842+ MT_CACHECLEAN_RO,
1843+ MT_MINICLEAN_RO,
1844 MT_LOW_VECTORS,
1845 MT_HIGH_VECTORS,
1846- MT_MEMORY_RWX,
1847+ __MT_MEMORY_RWX,
1848 MT_MEMORY_RW,
1849- MT_ROM,
1850- MT_MEMORY_RWX_NONCACHED,
1851+ MT_MEMORY_RX,
1852+ MT_ROM_RX,
1853+ MT_MEMORY_RW_NONCACHED,
1854+ MT_MEMORY_RX_NONCACHED,
1855 MT_MEMORY_RW_DTCM,
1856- MT_MEMORY_RWX_ITCM,
1857+ MT_MEMORY_RX_ITCM,
1858 MT_MEMORY_RW_SO,
1859 MT_MEMORY_DMA_READY,
1860 };
1861diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1862index 563b92f..689d58e 100644
1863--- a/arch/arm/include/asm/outercache.h
1864+++ b/arch/arm/include/asm/outercache.h
1865@@ -39,7 +39,7 @@ struct outer_cache_fns {
1866 /* This is an ARM L2C thing */
1867 void (*write_sec)(unsigned long, unsigned);
1868 void (*configure)(const struct l2x0_regs *);
1869-};
1870+} __no_const;
1871
1872 extern struct outer_cache_fns outer_cache;
1873
1874diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1875index 4355f0e..cd9168e 100644
1876--- a/arch/arm/include/asm/page.h
1877+++ b/arch/arm/include/asm/page.h
1878@@ -23,6 +23,7 @@
1879
1880 #else
1881
1882+#include <linux/compiler.h>
1883 #include <asm/glue.h>
1884
1885 /*
1886@@ -114,7 +115,7 @@ struct cpu_user_fns {
1887 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1888 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1889 unsigned long vaddr, struct vm_area_struct *vma);
1890-};
1891+} __no_const;
1892
1893 #ifdef MULTI_USER
1894 extern struct cpu_user_fns cpu_user;
1895diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1896index 19cfab5..3f5c7e9 100644
1897--- a/arch/arm/include/asm/pgalloc.h
1898+++ b/arch/arm/include/asm/pgalloc.h
1899@@ -17,6 +17,7 @@
1900 #include <asm/processor.h>
1901 #include <asm/cacheflush.h>
1902 #include <asm/tlbflush.h>
1903+#include <asm/system_info.h>
1904
1905 #define check_pgt_cache() do { } while (0)
1906
1907@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1908 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1909 }
1910
1911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1912+{
1913+ pud_populate(mm, pud, pmd);
1914+}
1915+
1916 #else /* !CONFIG_ARM_LPAE */
1917
1918 /*
1919@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1920 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1921 #define pmd_free(mm, pmd) do { } while (0)
1922 #define pud_populate(mm,pmd,pte) BUG()
1923+#define pud_populate_kernel(mm,pmd,pte) BUG()
1924
1925 #endif /* CONFIG_ARM_LPAE */
1926
1927@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1928 __free_page(pte);
1929 }
1930
1931+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1932+{
1933+#ifdef CONFIG_ARM_LPAE
1934+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1935+#else
1936+ if (addr & SECTION_SIZE)
1937+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1938+ else
1939+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1940+#endif
1941+ flush_pmd_entry(pmdp);
1942+}
1943+
1944 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1945 pmdval_t prot)
1946 {
1947diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1948index 5e68278..1869bae 100644
1949--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1950+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1951@@ -27,7 +27,7 @@
1952 /*
1953 * - section
1954 */
1955-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1956+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1957 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1958 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1959 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1960@@ -39,6 +39,7 @@
1961 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1962 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1963 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1964+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1965
1966 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1967 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1968@@ -68,6 +69,7 @@
1969 * - extended small page/tiny page
1970 */
1971 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1972+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1973 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1974 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1975 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1976diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1977index bfd662e..f6cbb02 100644
1978--- a/arch/arm/include/asm/pgtable-2level.h
1979+++ b/arch/arm/include/asm/pgtable-2level.h
1980@@ -127,6 +127,9 @@
1981 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1982 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1983
1984+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1985+#define L_PTE_PXN (_AT(pteval_t, 0))
1986+
1987 /*
1988 * These are the memory types, defined to be compatible with
1989 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1990diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1991index a745a2a..481350a 100644
1992--- a/arch/arm/include/asm/pgtable-3level.h
1993+++ b/arch/arm/include/asm/pgtable-3level.h
1994@@ -80,6 +80,7 @@
1995 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1996 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1997 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1998+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1999 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2000 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2001 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2002@@ -91,10 +92,12 @@
2003 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2004 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2005 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2006+#define PMD_SECT_RDONLY PMD_SECT_AP2
2007
2008 /*
2009 * To be used in assembly code with the upper page attributes.
2010 */
2011+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2012 #define L_PTE_XN_HIGH (1 << (54 - 32))
2013 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2014
2015diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2016index f403541..b10df68 100644
2017--- a/arch/arm/include/asm/pgtable.h
2018+++ b/arch/arm/include/asm/pgtable.h
2019@@ -33,6 +33,9 @@
2020 #include <asm/pgtable-2level.h>
2021 #endif
2022
2023+#define ktla_ktva(addr) (addr)
2024+#define ktva_ktla(addr) (addr)
2025+
2026 /*
2027 * Just any arbitrary offset to the start of the vmalloc VM area: the
2028 * current 8MB value just means that there will be a 8MB "hole" after the
2029@@ -48,6 +51,9 @@
2030 #define LIBRARY_TEXT_START 0x0c000000
2031
2032 #ifndef __ASSEMBLY__
2033+extern pteval_t __supported_pte_mask;
2034+extern pmdval_t __supported_pmd_mask;
2035+
2036 extern void __pte_error(const char *file, int line, pte_t);
2037 extern void __pmd_error(const char *file, int line, pmd_t);
2038 extern void __pgd_error(const char *file, int line, pgd_t);
2039@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2040 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2041 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2042
2043+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2044+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2045+
2046+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2047+#include <asm/domain.h>
2048+#include <linux/thread_info.h>
2049+#include <linux/preempt.h>
2050+
2051+static inline int test_domain(int domain, int domaintype)
2052+{
2053+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2054+}
2055+#endif
2056+
2057+#ifdef CONFIG_PAX_KERNEXEC
2058+static inline unsigned long pax_open_kernel(void) {
2059+#ifdef CONFIG_ARM_LPAE
2060+ /* TODO */
2061+#else
2062+ preempt_disable();
2063+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2064+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2065+#endif
2066+ return 0;
2067+}
2068+
2069+static inline unsigned long pax_close_kernel(void) {
2070+#ifdef CONFIG_ARM_LPAE
2071+ /* TODO */
2072+#else
2073+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2074+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2075+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2076+ preempt_enable_no_resched();
2077+#endif
2078+ return 0;
2079+}
2080+#else
2081+static inline unsigned long pax_open_kernel(void) { return 0; }
2082+static inline unsigned long pax_close_kernel(void) { return 0; }
2083+#endif
2084+
2085 /*
2086 * This is the lowest virtual address we can permit any user space
2087 * mapping to be mapped at. This is particularly important for
2088@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2089 /*
2090 * The pgprot_* and protection_map entries will be fixed up in runtime
2091 * to include the cachable and bufferable bits based on memory policy,
2092- * as well as any architecture dependent bits like global/ASID and SMP
2093- * shared mapping bits.
2094+ * as well as any architecture dependent bits like global/ASID, PXN,
2095+ * and SMP shared mapping bits.
2096 */
2097 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2098
2099@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2100 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2101 {
2102 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2103- L_PTE_NONE | L_PTE_VALID;
2104+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2105 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2106 return pte;
2107 }
2108diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2109index c25ef3e..735f14b 100644
2110--- a/arch/arm/include/asm/psci.h
2111+++ b/arch/arm/include/asm/psci.h
2112@@ -32,7 +32,7 @@ struct psci_operations {
2113 int (*affinity_info)(unsigned long target_affinity,
2114 unsigned long lowest_affinity_level);
2115 int (*migrate_info_type)(void);
2116-};
2117+} __no_const;
2118
2119 extern struct psci_operations psci_ops;
2120 extern struct smp_operations psci_smp_ops;
2121diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2122index 18f5a55..5072a40 100644
2123--- a/arch/arm/include/asm/smp.h
2124+++ b/arch/arm/include/asm/smp.h
2125@@ -107,7 +107,7 @@ struct smp_operations {
2126 int (*cpu_disable)(unsigned int cpu);
2127 #endif
2128 #endif
2129-};
2130+} __no_const;
2131
2132 struct of_cpu_method {
2133 const char *method;
2134diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2135index bd32ede..bd90a0b 100644
2136--- a/arch/arm/include/asm/thread_info.h
2137+++ b/arch/arm/include/asm/thread_info.h
2138@@ -74,9 +74,9 @@ struct thread_info {
2139 .flags = 0, \
2140 .preempt_count = INIT_PREEMPT_COUNT, \
2141 .addr_limit = KERNEL_DS, \
2142- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2143- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2144- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2145+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2146+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2147+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2148 }
2149
2150 #define init_thread_info (init_thread_union.thread_info)
2151@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2152 #define TIF_SYSCALL_AUDIT 9
2153 #define TIF_SYSCALL_TRACEPOINT 10
2154 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2155-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2156+/* within 8 bits of TIF_SYSCALL_TRACE
2157+ * to meet flexible second operand requirements
2158+ */
2159+#define TIF_GRSEC_SETXID 12
2160+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2161 #define TIF_USING_IWMMXT 17
2162 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2163 #define TIF_RESTORE_SIGMASK 20
2164@@ -166,10 +170,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2165 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2166 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2167 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2168+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2169
2170 /* Checks for any syscall work in entry-common.S */
2171 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2172- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2173+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2174
2175 /*
2176 * Change these and you break ASM code in entry-common.S
2177diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2178index 5f833f7..76e6644 100644
2179--- a/arch/arm/include/asm/tls.h
2180+++ b/arch/arm/include/asm/tls.h
2181@@ -3,6 +3,7 @@
2182
2183 #include <linux/compiler.h>
2184 #include <asm/thread_info.h>
2185+#include <asm/pgtable.h>
2186
2187 #ifdef __ASSEMBLY__
2188 #include <asm/asm-offsets.h>
2189@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2190 * at 0xffff0fe0 must be used instead. (see
2191 * entry-armv.S for details)
2192 */
2193+ pax_open_kernel();
2194 *((unsigned int *)0xffff0ff0) = val;
2195+ pax_close_kernel();
2196 #endif
2197 }
2198
2199diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2200index 74b17d0..57a4bf4 100644
2201--- a/arch/arm/include/asm/uaccess.h
2202+++ b/arch/arm/include/asm/uaccess.h
2203@@ -18,6 +18,7 @@
2204 #include <asm/domain.h>
2205 #include <asm/unified.h>
2206 #include <asm/compiler.h>
2207+#include <asm/pgtable.h>
2208
2209 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2210 #include <asm-generic/uaccess-unaligned.h>
2211@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2212 static inline void set_fs(mm_segment_t fs)
2213 {
2214 current_thread_info()->addr_limit = fs;
2215- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2216+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2217 }
2218
2219 #define segment_eq(a, b) ((a) == (b))
2220
2221+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2222+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2223+
2224+static inline void pax_open_userland(void)
2225+{
2226+
2227+#ifdef CONFIG_PAX_MEMORY_UDEREF
2228+ if (segment_eq(get_fs(), USER_DS)) {
2229+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2230+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2231+ }
2232+#endif
2233+
2234+}
2235+
2236+static inline void pax_close_userland(void)
2237+{
2238+
2239+#ifdef CONFIG_PAX_MEMORY_UDEREF
2240+ if (segment_eq(get_fs(), USER_DS)) {
2241+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2242+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2243+ }
2244+#endif
2245+
2246+}
2247+
2248 #define __addr_ok(addr) ({ \
2249 unsigned long flag; \
2250 __asm__("cmp %2, %0; movlo %0, #0" \
2251@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2252
2253 #define get_user(x, p) \
2254 ({ \
2255+ int __e; \
2256 might_fault(); \
2257- __get_user_check(x, p); \
2258+ pax_open_userland(); \
2259+ __e = __get_user_check((x), (p)); \
2260+ pax_close_userland(); \
2261+ __e; \
2262 })
2263
2264 extern int __put_user_1(void *, unsigned int);
2265@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2266
2267 #define put_user(x, p) \
2268 ({ \
2269+ int __e; \
2270 might_fault(); \
2271- __put_user_check(x, p); \
2272+ pax_open_userland(); \
2273+ __e = __put_user_check((x), (p)); \
2274+ pax_close_userland(); \
2275+ __e; \
2276 })
2277
2278 #else /* CONFIG_MMU */
2279@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2280
2281 #endif /* CONFIG_MMU */
2282
2283+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2284 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2285
2286 #define user_addr_max() \
2287@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2288 #define __get_user(x, ptr) \
2289 ({ \
2290 long __gu_err = 0; \
2291+ pax_open_userland(); \
2292 __get_user_err((x), (ptr), __gu_err); \
2293+ pax_close_userland(); \
2294 __gu_err; \
2295 })
2296
2297 #define __get_user_error(x, ptr, err) \
2298 ({ \
2299+ pax_open_userland(); \
2300 __get_user_err((x), (ptr), err); \
2301+ pax_close_userland(); \
2302 (void) 0; \
2303 })
2304
2305@@ -368,13 +409,17 @@ do { \
2306 #define __put_user(x, ptr) \
2307 ({ \
2308 long __pu_err = 0; \
2309+ pax_open_userland(); \
2310 __put_user_err((x), (ptr), __pu_err); \
2311+ pax_close_userland(); \
2312 __pu_err; \
2313 })
2314
2315 #define __put_user_error(x, ptr, err) \
2316 ({ \
2317+ pax_open_userland(); \
2318 __put_user_err((x), (ptr), err); \
2319+ pax_close_userland(); \
2320 (void) 0; \
2321 })
2322
2323@@ -474,11 +519,44 @@ do { \
2324
2325
2326 #ifdef CONFIG_MMU
2327-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2328-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2329+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2330+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2331+
2332+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2333+{
2334+ unsigned long ret;
2335+
2336+ check_object_size(to, n, false);
2337+ pax_open_userland();
2338+ ret = ___copy_from_user(to, from, n);
2339+ pax_close_userland();
2340+ return ret;
2341+}
2342+
2343+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2344+{
2345+ unsigned long ret;
2346+
2347+ check_object_size(from, n, true);
2348+ pax_open_userland();
2349+ ret = ___copy_to_user(to, from, n);
2350+ pax_close_userland();
2351+ return ret;
2352+}
2353+
2354 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2355-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2356+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2357 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2358+
2359+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2360+{
2361+ unsigned long ret;
2362+ pax_open_userland();
2363+ ret = ___clear_user(addr, n);
2364+ pax_close_userland();
2365+ return ret;
2366+}
2367+
2368 #else
2369 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2370 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2371@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2372
2373 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2374 {
2375+ if ((long)n < 0)
2376+ return n;
2377+
2378 if (access_ok(VERIFY_READ, from, n))
2379 n = __copy_from_user(to, from, n);
2380 else /* security hole - plug it */
2381@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2382
2383 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2384 {
2385+ if ((long)n < 0)
2386+ return n;
2387+
2388 if (access_ok(VERIFY_WRITE, to, n))
2389 n = __copy_to_user(to, from, n);
2390 return n;
2391diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2392index 5af0ed1..cea83883 100644
2393--- a/arch/arm/include/uapi/asm/ptrace.h
2394+++ b/arch/arm/include/uapi/asm/ptrace.h
2395@@ -92,7 +92,7 @@
2396 * ARMv7 groups of PSR bits
2397 */
2398 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2399-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2400+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2401 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2402 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2403
2404diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2405index a88671c..1cc895e 100644
2406--- a/arch/arm/kernel/armksyms.c
2407+++ b/arch/arm/kernel/armksyms.c
2408@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2409
2410 /* networking */
2411 EXPORT_SYMBOL(csum_partial);
2412-EXPORT_SYMBOL(csum_partial_copy_from_user);
2413+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2414 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2415 EXPORT_SYMBOL(__csum_ipv6_magic);
2416
2417@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2418 #ifdef CONFIG_MMU
2419 EXPORT_SYMBOL(copy_page);
2420
2421-EXPORT_SYMBOL(__copy_from_user);
2422-EXPORT_SYMBOL(__copy_to_user);
2423-EXPORT_SYMBOL(__clear_user);
2424+EXPORT_SYMBOL(___copy_from_user);
2425+EXPORT_SYMBOL(___copy_to_user);
2426+EXPORT_SYMBOL(___clear_user);
2427
2428 EXPORT_SYMBOL(__get_user_1);
2429 EXPORT_SYMBOL(__get_user_2);
2430diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2431index 570306c..c87f193 100644
2432--- a/arch/arm/kernel/entry-armv.S
2433+++ b/arch/arm/kernel/entry-armv.S
2434@@ -48,6 +48,87 @@
2435 9997:
2436 .endm
2437
2438+ .macro pax_enter_kernel
2439+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2440+ @ make aligned space for saved DACR
2441+ sub sp, sp, #8
2442+ @ save regs
2443+ stmdb sp!, {r1, r2}
2444+ @ read DACR from cpu_domain into r1
2445+ mov r2, sp
2446+ @ assume 8K pages, since we have to split the immediate in two
2447+ bic r2, r2, #(0x1fc0)
2448+ bic r2, r2, #(0x3f)
2449+ ldr r1, [r2, #TI_CPU_DOMAIN]
2450+ @ store old DACR on stack
2451+ str r1, [sp, #8]
2452+#ifdef CONFIG_PAX_KERNEXEC
2453+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2454+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2455+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2456+#endif
2457+#ifdef CONFIG_PAX_MEMORY_UDEREF
2458+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2459+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2460+#endif
2461+ @ write r1 to current_thread_info()->cpu_domain
2462+ str r1, [r2, #TI_CPU_DOMAIN]
2463+ @ write r1 to DACR
2464+ mcr p15, 0, r1, c3, c0, 0
2465+ @ instruction sync
2466+ instr_sync
2467+ @ restore regs
2468+ ldmia sp!, {r1, r2}
2469+#endif
2470+ .endm
2471+
2472+ .macro pax_open_userland
2473+#ifdef CONFIG_PAX_MEMORY_UDEREF
2474+ @ save regs
2475+ stmdb sp!, {r0, r1}
2476+ @ read DACR from cpu_domain into r1
2477+ mov r0, sp
2478+ @ assume 8K pages, since we have to split the immediate in two
2479+ bic r0, r0, #(0x1fc0)
2480+ bic r0, r0, #(0x3f)
2481+ ldr r1, [r0, #TI_CPU_DOMAIN]
2482+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2483+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2484+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2485+ @ write r1 to current_thread_info()->cpu_domain
2486+ str r1, [r0, #TI_CPU_DOMAIN]
2487+ @ write r1 to DACR
2488+ mcr p15, 0, r1, c3, c0, 0
2489+ @ instruction sync
2490+ instr_sync
2491+ @ restore regs
2492+ ldmia sp!, {r0, r1}
2493+#endif
2494+ .endm
2495+
2496+ .macro pax_close_userland
2497+#ifdef CONFIG_PAX_MEMORY_UDEREF
2498+ @ save regs
2499+ stmdb sp!, {r0, r1}
2500+ @ read DACR from cpu_domain into r1
2501+ mov r0, sp
2502+ @ assume 8K pages, since we have to split the immediate in two
2503+ bic r0, r0, #(0x1fc0)
2504+ bic r0, r0, #(0x3f)
2505+ ldr r1, [r0, #TI_CPU_DOMAIN]
2506+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2507+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2508+ @ write r1 to current_thread_info()->cpu_domain
2509+ str r1, [r0, #TI_CPU_DOMAIN]
2510+ @ write r1 to DACR
2511+ mcr p15, 0, r1, c3, c0, 0
2512+ @ instruction sync
2513+ instr_sync
2514+ @ restore regs
2515+ ldmia sp!, {r0, r1}
2516+#endif
2517+ .endm
2518+
2519 .macro pabt_helper
2520 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2521 #ifdef MULTI_PABORT
2522@@ -90,11 +171,15 @@
2523 * Invalid mode handlers
2524 */
2525 .macro inv_entry, reason
2526+
2527+ pax_enter_kernel
2528+
2529 sub sp, sp, #S_FRAME_SIZE
2530 ARM( stmib sp, {r1 - lr} )
2531 THUMB( stmia sp, {r0 - r12} )
2532 THUMB( str sp, [sp, #S_SP] )
2533 THUMB( str lr, [sp, #S_LR] )
2534+
2535 mov r1, #\reason
2536 .endm
2537
2538@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2539 .macro svc_entry, stack_hole=0, trace=1
2540 UNWIND(.fnstart )
2541 UNWIND(.save {r0 - pc} )
2542+
2543+ pax_enter_kernel
2544+
2545 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2546+
2547 #ifdef CONFIG_THUMB2_KERNEL
2548 SPFIX( str r0, [sp] ) @ temporarily saved
2549 SPFIX( mov r0, sp )
2550@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2551 ldmia r0, {r3 - r5}
2552 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2553 mov r6, #-1 @ "" "" "" ""
2554+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2555+ @ offset sp by 8 as done in pax_enter_kernel
2556+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2557+#else
2558 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2559+#endif
2560 SPFIX( addeq r2, r2, #4 )
2561 str r3, [sp, #-4]! @ save the "real" r0 copied
2562 @ from the exception stack
2563@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2564 .macro usr_entry, trace=1
2565 UNWIND(.fnstart )
2566 UNWIND(.cantunwind ) @ don't unwind the user space
2567+
2568+ pax_enter_kernel_user
2569+
2570 sub sp, sp, #S_FRAME_SIZE
2571 ARM( stmib sp, {r1 - r12} )
2572 THUMB( stmia sp, {r0 - r12} )
2573@@ -479,7 +576,9 @@ __und_usr:
2574 tst r3, #PSR_T_BIT @ Thumb mode?
2575 bne __und_usr_thumb
2576 sub r4, r2, #4 @ ARM instr at LR - 4
2577+ pax_open_userland
2578 1: ldrt r0, [r4]
2579+ pax_close_userland
2580 ARM_BE8(rev r0, r0) @ little endian instruction
2581
2582 @ r0 = 32-bit ARM instruction which caused the exception
2583@@ -513,11 +612,15 @@ __und_usr_thumb:
2584 */
2585 .arch armv6t2
2586 #endif
2587+ pax_open_userland
2588 2: ldrht r5, [r4]
2589+ pax_close_userland
2590 ARM_BE8(rev16 r5, r5) @ little endian instruction
2591 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2592 blo __und_usr_fault_16 @ 16bit undefined instruction
2593+ pax_open_userland
2594 3: ldrht r0, [r2]
2595+ pax_close_userland
2596 ARM_BE8(rev16 r0, r0) @ little endian instruction
2597 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2598 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2599@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2600 */
2601 .pushsection .text.fixup, "ax"
2602 .align 2
2603-4: str r4, [sp, #S_PC] @ retry current instruction
2604+4: pax_close_userland
2605+ str r4, [sp, #S_PC] @ retry current instruction
2606 ret r9
2607 .popsection
2608 .pushsection __ex_table,"a"
2609@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2610 THUMB( str lr, [ip], #4 )
2611 ldr r4, [r2, #TI_TP_VALUE]
2612 ldr r5, [r2, #TI_TP_VALUE + 4]
2613-#ifdef CONFIG_CPU_USE_DOMAINS
2614+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2615 ldr r6, [r2, #TI_CPU_DOMAIN]
2616 #endif
2617 switch_tls r1, r4, r5, r3, r7
2618@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2619 ldr r8, =__stack_chk_guard
2620 ldr r7, [r7, #TSK_STACK_CANARY]
2621 #endif
2622-#ifdef CONFIG_CPU_USE_DOMAINS
2623+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2624 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2625 #endif
2626 mov r5, r0
2627diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2628index 4e7f40c..0f9ee2c 100644
2629--- a/arch/arm/kernel/entry-common.S
2630+++ b/arch/arm/kernel/entry-common.S
2631@@ -11,18 +11,46 @@
2632 #include <asm/assembler.h>
2633 #include <asm/unistd.h>
2634 #include <asm/ftrace.h>
2635+#include <asm/domain.h>
2636 #include <asm/unwind.h>
2637
2638+#include "entry-header.S"
2639+
2640 #ifdef CONFIG_NEED_RET_TO_USER
2641 #include <mach/entry-macro.S>
2642 #else
2643 .macro arch_ret_to_user, tmp1, tmp2
2644+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2645+ @ save regs
2646+ stmdb sp!, {r1, r2}
2647+ @ read DACR from cpu_domain into r1
2648+ mov r2, sp
2649+ @ assume 8K pages, since we have to split the immediate in two
2650+ bic r2, r2, #(0x1fc0)
2651+ bic r2, r2, #(0x3f)
2652+ ldr r1, [r2, #TI_CPU_DOMAIN]
2653+#ifdef CONFIG_PAX_KERNEXEC
2654+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2655+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2656+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2657+#endif
2658+#ifdef CONFIG_PAX_MEMORY_UDEREF
2659+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2660+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2661+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2662+#endif
2663+ @ write r1 to current_thread_info()->cpu_domain
2664+ str r1, [r2, #TI_CPU_DOMAIN]
2665+ @ write r1 to DACR
2666+ mcr p15, 0, r1, c3, c0, 0
2667+ @ instruction sync
2668+ instr_sync
2669+ @ restore regs
2670+ ldmia sp!, {r1, r2}
2671+#endif
2672 .endm
2673 #endif
2674
2675-#include "entry-header.S"
2676-
2677-
2678 .align 5
2679 /*
2680 * This is the fast syscall return path. We do as little as
2681@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2682 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2683 #endif
2684
2685+ /*
2686+ * do this here to avoid a performance hit of wrapping the code above
2687+ * that directly dereferences userland to parse the SWI instruction
2688+ */
2689+ pax_enter_kernel_user
2690+
2691 adr tbl, sys_call_table @ load syscall table pointer
2692
2693 #if defined(CONFIG_OABI_COMPAT)
2694diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2695index 1a0045a..9b4f34d 100644
2696--- a/arch/arm/kernel/entry-header.S
2697+++ b/arch/arm/kernel/entry-header.S
2698@@ -196,6 +196,60 @@
2699 msr cpsr_c, \rtemp @ switch back to the SVC mode
2700 .endm
2701
2702+ .macro pax_enter_kernel_user
2703+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2704+ @ save regs
2705+ stmdb sp!, {r0, r1}
2706+ @ read DACR from cpu_domain into r1
2707+ mov r0, sp
2708+ @ assume 8K pages, since we have to split the immediate in two
2709+ bic r0, r0, #(0x1fc0)
2710+ bic r0, r0, #(0x3f)
2711+ ldr r1, [r0, #TI_CPU_DOMAIN]
2712+#ifdef CONFIG_PAX_MEMORY_UDEREF
2713+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2714+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2715+#endif
2716+#ifdef CONFIG_PAX_KERNEXEC
2717+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2718+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2719+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2720+#endif
2721+ @ write r1 to current_thread_info()->cpu_domain
2722+ str r1, [r0, #TI_CPU_DOMAIN]
2723+ @ write r1 to DACR
2724+ mcr p15, 0, r1, c3, c0, 0
2725+ @ instruction sync
2726+ instr_sync
2727+ @ restore regs
2728+ ldmia sp!, {r0, r1}
2729+#endif
2730+ .endm
2731+
2732+ .macro pax_exit_kernel
2733+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2734+ @ save regs
2735+ stmdb sp!, {r0, r1}
2736+ @ read old DACR from stack into r1
2737+ ldr r1, [sp, #(8 + S_SP)]
2738+ sub r1, r1, #8
2739+ ldr r1, [r1]
2740+
2741+ @ write r1 to current_thread_info()->cpu_domain
2742+ mov r0, sp
2743+ @ assume 8K pages, since we have to split the immediate in two
2744+ bic r0, r0, #(0x1fc0)
2745+ bic r0, r0, #(0x3f)
2746+ str r1, [r0, #TI_CPU_DOMAIN]
2747+ @ write r1 to DACR
2748+ mcr p15, 0, r1, c3, c0, 0
2749+ @ instruction sync
2750+ instr_sync
2751+ @ restore regs
2752+ ldmia sp!, {r0, r1}
2753+#endif
2754+ .endm
2755+
2756 #ifndef CONFIG_THUMB2_KERNEL
2757 .macro svc_exit, rpsr, irq = 0
2758 .if \irq != 0
2759@@ -215,6 +269,9 @@
2760 blne trace_hardirqs_off
2761 #endif
2762 .endif
2763+
2764+ pax_exit_kernel
2765+
2766 msr spsr_cxsf, \rpsr
2767 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2768 @ We must avoid clrex due to Cortex-A15 erratum #830321
2769@@ -291,6 +348,9 @@
2770 blne trace_hardirqs_off
2771 #endif
2772 .endif
2773+
2774+ pax_exit_kernel
2775+
2776 ldr lr, [sp, #S_SP] @ top of the stack
2777 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2778
2779diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2780index 059c3da..8e45cfc 100644
2781--- a/arch/arm/kernel/fiq.c
2782+++ b/arch/arm/kernel/fiq.c
2783@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2784 void *base = vectors_page;
2785 unsigned offset = FIQ_OFFSET;
2786
2787+ pax_open_kernel();
2788 memcpy(base + offset, start, length);
2789+ pax_close_kernel();
2790+
2791 if (!cache_is_vipt_nonaliasing())
2792 flush_icache_range((unsigned long)base + offset, offset +
2793 length);
2794diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2795index 3637973..cb29657 100644
2796--- a/arch/arm/kernel/head.S
2797+++ b/arch/arm/kernel/head.S
2798@@ -444,7 +444,7 @@ __enable_mmu:
2799 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2800 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2802- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2803+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2804 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2805 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2806 #endif
2807diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2808index af791f4..3ff9821 100644
2809--- a/arch/arm/kernel/module.c
2810+++ b/arch/arm/kernel/module.c
2811@@ -38,12 +38,39 @@
2812 #endif
2813
2814 #ifdef CONFIG_MMU
2815-void *module_alloc(unsigned long size)
2816+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2817 {
2818+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2819+ return NULL;
2820 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2821- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2822+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2823 __builtin_return_address(0));
2824 }
2825+
2826+void *module_alloc(unsigned long size)
2827+{
2828+
2829+#ifdef CONFIG_PAX_KERNEXEC
2830+ return __module_alloc(size, PAGE_KERNEL);
2831+#else
2832+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2833+#endif
2834+
2835+}
2836+
2837+#ifdef CONFIG_PAX_KERNEXEC
2838+void module_memfree_exec(void *module_region)
2839+{
2840+ module_memfree(module_region);
2841+}
2842+EXPORT_SYMBOL(module_memfree_exec);
2843+
2844+void *module_alloc_exec(unsigned long size)
2845+{
2846+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2847+}
2848+EXPORT_SYMBOL(module_alloc_exec);
2849+#endif
2850 #endif
2851
2852 int
2853diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2854index 69bda1a..755113a 100644
2855--- a/arch/arm/kernel/patch.c
2856+++ b/arch/arm/kernel/patch.c
2857@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2858 else
2859 __acquire(&patch_lock);
2860
2861+ pax_open_kernel();
2862 if (thumb2 && __opcode_is_thumb16(insn)) {
2863 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2864 size = sizeof(u16);
2865@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2866 *(u32 *)waddr = insn;
2867 size = sizeof(u32);
2868 }
2869+ pax_close_kernel();
2870
2871 if (waddr != addr) {
2872 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2873diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2874index f192a2a..1a40523 100644
2875--- a/arch/arm/kernel/process.c
2876+++ b/arch/arm/kernel/process.c
2877@@ -105,8 +105,8 @@ void __show_regs(struct pt_regs *regs)
2878
2879 show_regs_print_info(KERN_DEFAULT);
2880
2881- print_symbol("PC is at %s\n", instruction_pointer(regs));
2882- print_symbol("LR is at %s\n", regs->ARM_lr);
2883+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2884+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2885 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2886 "sp : %08lx ip : %08lx fp : %08lx\n",
2887 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2888@@ -283,12 +283,6 @@ unsigned long get_wchan(struct task_struct *p)
2889 return 0;
2890 }
2891
2892-unsigned long arch_randomize_brk(struct mm_struct *mm)
2893-{
2894- unsigned long range_end = mm->brk + 0x02000000;
2895- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2896-}
2897-
2898 #ifdef CONFIG_MMU
2899 #ifdef CONFIG_KUSER_HELPERS
2900 /*
2901@@ -304,7 +298,7 @@ static struct vm_area_struct gate_vma = {
2902
2903 static int __init gate_vma_init(void)
2904 {
2905- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2906+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2907 return 0;
2908 }
2909 arch_initcall(gate_vma_init);
2910@@ -333,91 +327,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2911 return is_gate_vma(vma) ? "[vectors]" : NULL;
2912 }
2913
2914-/* If possible, provide a placement hint at a random offset from the
2915- * stack for the sigpage and vdso pages.
2916- */
2917-static unsigned long sigpage_addr(const struct mm_struct *mm,
2918- unsigned int npages)
2919-{
2920- unsigned long offset;
2921- unsigned long first;
2922- unsigned long last;
2923- unsigned long addr;
2924- unsigned int slots;
2925-
2926- first = PAGE_ALIGN(mm->start_stack);
2927-
2928- last = TASK_SIZE - (npages << PAGE_SHIFT);
2929-
2930- /* No room after stack? */
2931- if (first > last)
2932- return 0;
2933-
2934- /* Just enough room? */
2935- if (first == last)
2936- return first;
2937-
2938- slots = ((last - first) >> PAGE_SHIFT) + 1;
2939-
2940- offset = get_random_int() % slots;
2941-
2942- addr = first + (offset << PAGE_SHIFT);
2943-
2944- return addr;
2945-}
2946-
2947-static struct page *signal_page;
2948-extern struct page *get_signal_page(void);
2949-
2950-static const struct vm_special_mapping sigpage_mapping = {
2951- .name = "[sigpage]",
2952- .pages = &signal_page,
2953-};
2954-
2955 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2956 {
2957 struct mm_struct *mm = current->mm;
2958- struct vm_area_struct *vma;
2959- unsigned long npages;
2960- unsigned long addr;
2961- unsigned long hint;
2962- int ret = 0;
2963-
2964- if (!signal_page)
2965- signal_page = get_signal_page();
2966- if (!signal_page)
2967- return -ENOMEM;
2968-
2969- npages = 1; /* for sigpage */
2970- npages += vdso_total_pages;
2971
2972 down_write(&mm->mmap_sem);
2973- hint = sigpage_addr(mm, npages);
2974- addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
2975- if (IS_ERR_VALUE(addr)) {
2976- ret = addr;
2977- goto up_fail;
2978- }
2979-
2980- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2981- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2982- &sigpage_mapping);
2983-
2984- if (IS_ERR(vma)) {
2985- ret = PTR_ERR(vma);
2986- goto up_fail;
2987- }
2988-
2989- mm->context.sigpage = addr;
2990-
2991- /* Unlike the sigpage, failure to install the vdso is unlikely
2992- * to be fatal to the process, so no error check needed
2993- * here.
2994- */
2995- arm_install_vdso(mm, addr + PAGE_SIZE);
2996-
2997- up_fail:
2998+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2999 up_write(&mm->mmap_sem);
3000- return ret;
3001+ return 0;
3002 }
3003 #endif
3004diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3005index f90fdf4..24e8c84 100644
3006--- a/arch/arm/kernel/psci.c
3007+++ b/arch/arm/kernel/psci.c
3008@@ -26,7 +26,7 @@
3009 #include <asm/psci.h>
3010 #include <asm/system_misc.h>
3011
3012-struct psci_operations psci_ops;
3013+struct psci_operations psci_ops __read_only;
3014
3015 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3016 typedef int (*psci_initcall_t)(const struct device_node *);
3017diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3018index ef9119f..31995a3 100644
3019--- a/arch/arm/kernel/ptrace.c
3020+++ b/arch/arm/kernel/ptrace.c
3021@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3022 regs->ARM_ip = ip;
3023 }
3024
3025+#ifdef CONFIG_GRKERNSEC_SETXID
3026+extern void gr_delayed_cred_worker(void);
3027+#endif
3028+
3029 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3030 {
3031 current_thread_info()->syscall = scno;
3032
3033+#ifdef CONFIG_GRKERNSEC_SETXID
3034+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3035+ gr_delayed_cred_worker();
3036+#endif
3037+
3038 /* Do the secure computing check first; failures should be fast. */
3039 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3040 if (secure_computing() == -1)
3041diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
3042index 1a4d232..2677169 100644
3043--- a/arch/arm/kernel/reboot.c
3044+++ b/arch/arm/kernel/reboot.c
3045@@ -122,6 +122,7 @@ void machine_power_off(void)
3046
3047 if (pm_power_off)
3048 pm_power_off();
3049+ while (1);
3050 }
3051
3052 /*
3053diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3054index 6c777e9..3d2d0ca 100644
3055--- a/arch/arm/kernel/setup.c
3056+++ b/arch/arm/kernel/setup.c
3057@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3058 unsigned int elf_hwcap2 __read_mostly;
3059 EXPORT_SYMBOL(elf_hwcap2);
3060
3061+pteval_t __supported_pte_mask __read_only;
3062+pmdval_t __supported_pmd_mask __read_only;
3063
3064 #ifdef MULTI_CPU
3065-struct processor processor __read_mostly;
3066+struct processor processor __read_only;
3067 #endif
3068 #ifdef MULTI_TLB
3069-struct cpu_tlb_fns cpu_tlb __read_mostly;
3070+struct cpu_tlb_fns cpu_tlb __read_only;
3071 #endif
3072 #ifdef MULTI_USER
3073-struct cpu_user_fns cpu_user __read_mostly;
3074+struct cpu_user_fns cpu_user __read_only;
3075 #endif
3076 #ifdef MULTI_CACHE
3077-struct cpu_cache_fns cpu_cache __read_mostly;
3078+struct cpu_cache_fns cpu_cache __read_only;
3079 #endif
3080 #ifdef CONFIG_OUTER_CACHE
3081-struct outer_cache_fns outer_cache __read_mostly;
3082+struct outer_cache_fns outer_cache __read_only;
3083 EXPORT_SYMBOL(outer_cache);
3084 #endif
3085
3086@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3087 * Register 0 and check for VMSAv7 or PMSAv7 */
3088 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3089 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3090- (mmfr0 & 0x000000f0) >= 0x00000030)
3091+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3092 cpu_arch = CPU_ARCH_ARMv7;
3093- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3094+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3095+ __supported_pte_mask |= L_PTE_PXN;
3096+ __supported_pmd_mask |= PMD_PXNTABLE;
3097+ }
3098+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3099 (mmfr0 & 0x000000f0) == 0x00000020)
3100 cpu_arch = CPU_ARCH_ARMv6;
3101 else
3102diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3103index 423663e..bfeb0ff 100644
3104--- a/arch/arm/kernel/signal.c
3105+++ b/arch/arm/kernel/signal.c
3106@@ -24,8 +24,6 @@
3107
3108 extern const unsigned long sigreturn_codes[7];
3109
3110-static unsigned long signal_return_offset;
3111-
3112 #ifdef CONFIG_CRUNCH
3113 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3114 {
3115@@ -385,8 +383,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3116 * except when the MPU has protected the vectors
3117 * page from PL0
3118 */
3119- retcode = mm->context.sigpage + signal_return_offset +
3120- (idx << 2) + thumb;
3121+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3122 } else
3123 #endif
3124 {
3125@@ -592,33 +589,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3126 } while (thread_flags & _TIF_WORK_MASK);
3127 return 0;
3128 }
3129-
3130-struct page *get_signal_page(void)
3131-{
3132- unsigned long ptr;
3133- unsigned offset;
3134- struct page *page;
3135- void *addr;
3136-
3137- page = alloc_pages(GFP_KERNEL, 0);
3138-
3139- if (!page)
3140- return NULL;
3141-
3142- addr = page_address(page);
3143-
3144- /* Give the signal return code some randomness */
3145- offset = 0x200 + (get_random_int() & 0x7fc);
3146- signal_return_offset = offset;
3147-
3148- /*
3149- * Copy signal return handlers into the vector page, and
3150- * set sigreturn to be a pointer to these.
3151- */
3152- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3153-
3154- ptr = (unsigned long)addr + offset;
3155- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3156-
3157- return page;
3158-}
3159diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3160index cca5b87..68f0f73 100644
3161--- a/arch/arm/kernel/smp.c
3162+++ b/arch/arm/kernel/smp.c
3163@@ -76,7 +76,7 @@ enum ipi_msg_type {
3164
3165 static DECLARE_COMPLETION(cpu_running);
3166
3167-static struct smp_operations smp_ops;
3168+static struct smp_operations smp_ops __read_only;
3169
3170 void __init smp_set_ops(struct smp_operations *ops)
3171 {
3172diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3173index 7a3be1d..b00c7de 100644
3174--- a/arch/arm/kernel/tcm.c
3175+++ b/arch/arm/kernel/tcm.c
3176@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3177 .virtual = ITCM_OFFSET,
3178 .pfn = __phys_to_pfn(ITCM_OFFSET),
3179 .length = 0,
3180- .type = MT_MEMORY_RWX_ITCM,
3181+ .type = MT_MEMORY_RX_ITCM,
3182 }
3183 };
3184
3185@@ -267,7 +267,9 @@ no_dtcm:
3186 start = &__sitcm_text;
3187 end = &__eitcm_text;
3188 ram = &__itcm_start;
3189+ pax_open_kernel();
3190 memcpy(start, ram, itcm_code_sz);
3191+ pax_close_kernel();
3192 pr_debug("CPU ITCM: copied code from %p - %p\n",
3193 start, end);
3194 itcm_present = true;
3195diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3196index 3dce1a3..60e857f 100644
3197--- a/arch/arm/kernel/traps.c
3198+++ b/arch/arm/kernel/traps.c
3199@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3200 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3201 {
3202 #ifdef CONFIG_KALLSYMS
3203- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3204+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3205 #else
3206 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3207 #endif
3208@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3209 static int die_owner = -1;
3210 static unsigned int die_nest_count;
3211
3212+extern void gr_handle_kernel_exploit(void);
3213+
3214 static unsigned long oops_begin(void)
3215 {
3216 int cpu;
3217@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3218 panic("Fatal exception in interrupt");
3219 if (panic_on_oops)
3220 panic("Fatal exception");
3221+
3222+ gr_handle_kernel_exploit();
3223+
3224 if (signr)
3225 do_exit(signr);
3226 }
3227@@ -878,7 +883,11 @@ void __init early_trap_init(void *vectors_base)
3228 kuser_init(vectors_base);
3229
3230 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3231- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3232+
3233+#ifndef CONFIG_PAX_MEMORY_UDEREF
3234+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3235+#endif
3236+
3237 #else /* ifndef CONFIG_CPU_V7M */
3238 /*
3239 * on V7-M there is no need to copy the vector table to a dedicated
3240diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3241index 8b60fde..8d986dd 100644
3242--- a/arch/arm/kernel/vmlinux.lds.S
3243+++ b/arch/arm/kernel/vmlinux.lds.S
3244@@ -37,7 +37,7 @@
3245 #endif
3246
3247 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3248- defined(CONFIG_GENERIC_BUG)
3249+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3250 #define ARM_EXIT_KEEP(x) x
3251 #define ARM_EXIT_DISCARD(x)
3252 #else
3253@@ -120,6 +120,8 @@ SECTIONS
3254 #ifdef CONFIG_DEBUG_RODATA
3255 . = ALIGN(1<<SECTION_SHIFT);
3256 #endif
3257+ _etext = .; /* End of text section */
3258+
3259 RO_DATA(PAGE_SIZE)
3260
3261 . = ALIGN(4);
3262@@ -150,8 +152,6 @@ SECTIONS
3263
3264 NOTES
3265
3266- _etext = .; /* End of text and rodata section */
3267-
3268 #ifndef CONFIG_XIP_KERNEL
3269 # ifdef CONFIG_ARM_KERNMEM_PERMS
3270 . = ALIGN(1<<SECTION_SHIFT);
3271diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3272index d9631ec..b0c966c 100644
3273--- a/arch/arm/kvm/arm.c
3274+++ b/arch/arm/kvm/arm.c
3275@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3276 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3277
3278 /* The VMID used in the VTTBR */
3279-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3280+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3281 static u8 kvm_next_vmid;
3282 static DEFINE_SPINLOCK(kvm_vmid_lock);
3283
3284@@ -373,7 +373,7 @@ void force_vm_exit(const cpumask_t *mask)
3285 */
3286 static bool need_new_vmid_gen(struct kvm *kvm)
3287 {
3288- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3289+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3290 }
3291
3292 /**
3293@@ -406,7 +406,7 @@ static void update_vttbr(struct kvm *kvm)
3294
3295 /* First user of a new VMID generation? */
3296 if (unlikely(kvm_next_vmid == 0)) {
3297- atomic64_inc(&kvm_vmid_gen);
3298+ atomic64_inc_unchecked(&kvm_vmid_gen);
3299 kvm_next_vmid = 1;
3300
3301 /*
3302@@ -423,7 +423,7 @@ static void update_vttbr(struct kvm *kvm)
3303 kvm_call_hyp(__kvm_flush_vm_context);
3304 }
3305
3306- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3307+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3308 kvm->arch.vmid = kvm_next_vmid;
3309 kvm_next_vmid++;
3310
3311@@ -1098,7 +1098,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3312 /**
3313 * Initialize Hyp-mode and memory mappings on all CPUs.
3314 */
3315-int kvm_arch_init(void *opaque)
3316+int kvm_arch_init(const void *opaque)
3317 {
3318 int err;
3319 int ret, cpu;
3320diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3321index 1710fd7..ec3e014 100644
3322--- a/arch/arm/lib/clear_user.S
3323+++ b/arch/arm/lib/clear_user.S
3324@@ -12,14 +12,14 @@
3325
3326 .text
3327
3328-/* Prototype: int __clear_user(void *addr, size_t sz)
3329+/* Prototype: int ___clear_user(void *addr, size_t sz)
3330 * Purpose : clear some user memory
3331 * Params : addr - user memory address to clear
3332 * : sz - number of bytes to clear
3333 * Returns : number of bytes NOT cleared
3334 */
3335 ENTRY(__clear_user_std)
3336-WEAK(__clear_user)
3337+WEAK(___clear_user)
3338 stmfd sp!, {r1, lr}
3339 mov r2, #0
3340 cmp r1, #4
3341@@ -44,7 +44,7 @@ WEAK(__clear_user)
3342 USER( strnebt r2, [r0])
3343 mov r0, #0
3344 ldmfd sp!, {r1, pc}
3345-ENDPROC(__clear_user)
3346+ENDPROC(___clear_user)
3347 ENDPROC(__clear_user_std)
3348
3349 .pushsection .text.fixup,"ax"
3350diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3351index 7a235b9..73a0556 100644
3352--- a/arch/arm/lib/copy_from_user.S
3353+++ b/arch/arm/lib/copy_from_user.S
3354@@ -17,7 +17,7 @@
3355 /*
3356 * Prototype:
3357 *
3358- * size_t __copy_from_user(void *to, const void *from, size_t n)
3359+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3360 *
3361 * Purpose:
3362 *
3363@@ -89,11 +89,11 @@
3364
3365 .text
3366
3367-ENTRY(__copy_from_user)
3368+ENTRY(___copy_from_user)
3369
3370 #include "copy_template.S"
3371
3372-ENDPROC(__copy_from_user)
3373+ENDPROC(___copy_from_user)
3374
3375 .pushsection .fixup,"ax"
3376 .align 0
3377diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3378index 6ee2f67..d1cce76 100644
3379--- a/arch/arm/lib/copy_page.S
3380+++ b/arch/arm/lib/copy_page.S
3381@@ -10,6 +10,7 @@
3382 * ASM optimised string functions
3383 */
3384 #include <linux/linkage.h>
3385+#include <linux/const.h>
3386 #include <asm/assembler.h>
3387 #include <asm/asm-offsets.h>
3388 #include <asm/cache.h>
3389diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3390index 9648b06..19c333c 100644
3391--- a/arch/arm/lib/copy_to_user.S
3392+++ b/arch/arm/lib/copy_to_user.S
3393@@ -17,7 +17,7 @@
3394 /*
3395 * Prototype:
3396 *
3397- * size_t __copy_to_user(void *to, const void *from, size_t n)
3398+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3399 *
3400 * Purpose:
3401 *
3402@@ -93,11 +93,11 @@
3403 .text
3404
3405 ENTRY(__copy_to_user_std)
3406-WEAK(__copy_to_user)
3407+WEAK(___copy_to_user)
3408
3409 #include "copy_template.S"
3410
3411-ENDPROC(__copy_to_user)
3412+ENDPROC(___copy_to_user)
3413 ENDPROC(__copy_to_user_std)
3414
3415 .pushsection .text.fixup,"ax"
3416diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3417index 1d0957e..f708846 100644
3418--- a/arch/arm/lib/csumpartialcopyuser.S
3419+++ b/arch/arm/lib/csumpartialcopyuser.S
3420@@ -57,8 +57,8 @@
3421 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3422 */
3423
3424-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3425-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3426+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3427+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3428
3429 #include "csumpartialcopygeneric.S"
3430
3431diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3432index 8044591..c9b2609 100644
3433--- a/arch/arm/lib/delay.c
3434+++ b/arch/arm/lib/delay.c
3435@@ -29,7 +29,7 @@
3436 /*
3437 * Default to the loop-based delay implementation.
3438 */
3439-struct arm_delay_ops arm_delay_ops = {
3440+struct arm_delay_ops arm_delay_ops __read_only = {
3441 .delay = __loop_delay,
3442 .const_udelay = __loop_const_udelay,
3443 .udelay = __loop_udelay,
3444diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3445index 3e58d71..029817c 100644
3446--- a/arch/arm/lib/uaccess_with_memcpy.c
3447+++ b/arch/arm/lib/uaccess_with_memcpy.c
3448@@ -136,7 +136,7 @@ out:
3449 }
3450
3451 unsigned long
3452-__copy_to_user(void __user *to, const void *from, unsigned long n)
3453+___copy_to_user(void __user *to, const void *from, unsigned long n)
3454 {
3455 /*
3456 * This test is stubbed out of the main function above to keep
3457@@ -190,7 +190,7 @@ out:
3458 return n;
3459 }
3460
3461-unsigned long __clear_user(void __user *addr, unsigned long n)
3462+unsigned long ___clear_user(void __user *addr, unsigned long n)
3463 {
3464 /* See rational for this in __copy_to_user() above. */
3465 if (n < 64)
3466diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3467index 7d23ce0..5ef383a 100644
3468--- a/arch/arm/mach-exynos/suspend.c
3469+++ b/arch/arm/mach-exynos/suspend.c
3470@@ -738,8 +738,10 @@ void __init exynos_pm_init(void)
3471 tmp |= pm_data->wake_disable_mask;
3472 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3473
3474- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3475- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3476+ pax_open_kernel();
3477+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3478+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3479+ pax_close_kernel();
3480
3481 register_syscore_ops(&exynos_pm_syscore_ops);
3482 suspend_set_ops(&exynos_suspend_ops);
3483diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3484index 0662087..004d163 100644
3485--- a/arch/arm/mach-keystone/keystone.c
3486+++ b/arch/arm/mach-keystone/keystone.c
3487@@ -27,7 +27,7 @@
3488
3489 #include "keystone.h"
3490
3491-static struct notifier_block platform_nb;
3492+static notifier_block_no_const platform_nb;
3493 static unsigned long keystone_dma_pfn_offset __read_mostly;
3494
3495 static int keystone_platform_notifier(struct notifier_block *nb,
3496diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3497index e46e9ea..9141c83 100644
3498--- a/arch/arm/mach-mvebu/coherency.c
3499+++ b/arch/arm/mach-mvebu/coherency.c
3500@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3501
3502 /*
3503 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3504- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3505+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3506 * is needed as a workaround for a deadlock issue between the PCIe
3507 * interface and the cache controller.
3508 */
3509@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3510 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3511
3512 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3513- mtype = MT_UNCACHED;
3514+ mtype = MT_UNCACHED_RW;
3515
3516 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3517 }
3518diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3519index b6443a4..20a0b74 100644
3520--- a/arch/arm/mach-omap2/board-n8x0.c
3521+++ b/arch/arm/mach-omap2/board-n8x0.c
3522@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3523 }
3524 #endif
3525
3526-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3527+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3528 .late_init = n8x0_menelaus_late_init,
3529 };
3530
3531diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3532index 79f49d9..70bf184 100644
3533--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3534+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3535@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3536 void (*resume)(void);
3537 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3538 void (*hotplug_restart)(void);
3539-};
3540+} __no_const;
3541
3542 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3543 static struct powerdomain *mpuss_pd;
3544@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3545 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3546 {}
3547
3548-struct cpu_pm_ops omap_pm_ops = {
3549+static struct cpu_pm_ops omap_pm_ops __read_only = {
3550 .finish_suspend = default_finish_suspend,
3551 .resume = dummy_cpu_resume,
3552 .scu_prepare = dummy_scu_prepare,
3553diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3554index 5305ec7..6d74045 100644
3555--- a/arch/arm/mach-omap2/omap-smp.c
3556+++ b/arch/arm/mach-omap2/omap-smp.c
3557@@ -19,6 +19,7 @@
3558 #include <linux/device.h>
3559 #include <linux/smp.h>
3560 #include <linux/io.h>
3561+#include <linux/irq.h>
3562 #include <linux/irqchip/arm-gic.h>
3563
3564 #include <asm/smp_scu.h>
3565diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3566index 3b56722..33ac281 100644
3567--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3568+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3569@@ -330,7 +330,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3570 return NOTIFY_OK;
3571 }
3572
3573-static struct notifier_block __refdata irq_hotplug_notifier = {
3574+static struct notifier_block irq_hotplug_notifier = {
3575 .notifier_call = irq_cpu_hotplug_notify,
3576 };
3577
3578diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3579index 166b18f..f985f04 100644
3580--- a/arch/arm/mach-omap2/omap_device.c
3581+++ b/arch/arm/mach-omap2/omap_device.c
3582@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3583 struct platform_device __init *omap_device_build(const char *pdev_name,
3584 int pdev_id,
3585 struct omap_hwmod *oh,
3586- void *pdata, int pdata_len)
3587+ const void *pdata, int pdata_len)
3588 {
3589 struct omap_hwmod *ohs[] = { oh };
3590
3591@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3592 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3593 int pdev_id,
3594 struct omap_hwmod **ohs,
3595- int oh_cnt, void *pdata,
3596+ int oh_cnt, const void *pdata,
3597 int pdata_len)
3598 {
3599 int ret = -ENOMEM;
3600diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3601index 78c02b3..c94109a 100644
3602--- a/arch/arm/mach-omap2/omap_device.h
3603+++ b/arch/arm/mach-omap2/omap_device.h
3604@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3605 /* Core code interface */
3606
3607 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3608- struct omap_hwmod *oh, void *pdata,
3609+ struct omap_hwmod *oh, const void *pdata,
3610 int pdata_len);
3611
3612 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3613 struct omap_hwmod **oh, int oh_cnt,
3614- void *pdata, int pdata_len);
3615+ const void *pdata, int pdata_len);
3616
3617 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3618 struct omap_hwmod **ohs, int oh_cnt);
3619diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3620index 752969f..a34b446 100644
3621--- a/arch/arm/mach-omap2/omap_hwmod.c
3622+++ b/arch/arm/mach-omap2/omap_hwmod.c
3623@@ -199,10 +199,10 @@ struct omap_hwmod_soc_ops {
3624 int (*init_clkdm)(struct omap_hwmod *oh);
3625 void (*update_context_lost)(struct omap_hwmod *oh);
3626 int (*get_context_lost)(struct omap_hwmod *oh);
3627-};
3628+} __no_const;
3629
3630 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3631-static struct omap_hwmod_soc_ops soc_ops;
3632+static struct omap_hwmod_soc_ops soc_ops __read_only;
3633
3634 /* omap_hwmod_list contains all registered struct omap_hwmods */
3635 static LIST_HEAD(omap_hwmod_list);
3636diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3637index 95fee54..cfa9cf1 100644
3638--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3639+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3640@@ -10,6 +10,7 @@
3641
3642 #include <linux/kernel.h>
3643 #include <linux/init.h>
3644+#include <asm/pgtable.h>
3645
3646 #include "powerdomain.h"
3647
3648@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3649
3650 void __init am43xx_powerdomains_init(void)
3651 {
3652- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3653+ pax_open_kernel();
3654+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3655+ pax_close_kernel();
3656 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3657 pwrdm_register_pwrdms(powerdomains_am43xx);
3658 pwrdm_complete_init();
3659diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3660index ff0a68c..b312aa0 100644
3661--- a/arch/arm/mach-omap2/wd_timer.c
3662+++ b/arch/arm/mach-omap2/wd_timer.c
3663@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3664 struct omap_hwmod *oh;
3665 char *oh_name = "wd_timer2";
3666 char *dev_name = "omap_wdt";
3667- struct omap_wd_timer_platform_data pdata;
3668+ static struct omap_wd_timer_platform_data pdata = {
3669+ .read_reset_sources = prm_read_reset_sources
3670+ };
3671
3672 if (!cpu_class_is_omap2() || of_have_populated_dt())
3673 return 0;
3674@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3675 return -EINVAL;
3676 }
3677
3678- pdata.read_reset_sources = prm_read_reset_sources;
3679-
3680 pdev = omap_device_build(dev_name, id, oh, &pdata,
3681 sizeof(struct omap_wd_timer_platform_data));
3682 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3683diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3684index 7469347..1ecc350 100644
3685--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3686+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3687@@ -177,7 +177,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3688 bool entered_lp2 = false;
3689
3690 if (tegra_pending_sgi())
3691- ACCESS_ONCE(abort_flag) = true;
3692+ ACCESS_ONCE_RW(abort_flag) = true;
3693
3694 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3695
3696diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3697index 3b9098d..15b390f 100644
3698--- a/arch/arm/mach-tegra/irq.c
3699+++ b/arch/arm/mach-tegra/irq.c
3700@@ -20,6 +20,7 @@
3701 #include <linux/cpu_pm.h>
3702 #include <linux/interrupt.h>
3703 #include <linux/io.h>
3704+#include <linux/irq.h>
3705 #include <linux/irqchip/arm-gic.h>
3706 #include <linux/irq.h>
3707 #include <linux/kernel.h>
3708diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3709index 2cb587b..6ddfebf 100644
3710--- a/arch/arm/mach-ux500/pm.c
3711+++ b/arch/arm/mach-ux500/pm.c
3712@@ -10,6 +10,7 @@
3713 */
3714
3715 #include <linux/kernel.h>
3716+#include <linux/irq.h>
3717 #include <linux/irqchip/arm-gic.h>
3718 #include <linux/delay.h>
3719 #include <linux/io.h>
3720diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3721index 2dea8b5..6499da2 100644
3722--- a/arch/arm/mach-ux500/setup.h
3723+++ b/arch/arm/mach-ux500/setup.h
3724@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3725 .type = MT_DEVICE, \
3726 }
3727
3728-#define __MEM_DEV_DESC(x, sz) { \
3729- .virtual = IO_ADDRESS(x), \
3730- .pfn = __phys_to_pfn(x), \
3731- .length = sz, \
3732- .type = MT_MEMORY_RWX, \
3733-}
3734-
3735 extern struct smp_operations ux500_smp_ops;
3736 extern void ux500_cpu_die(unsigned int cpu);
3737
3738diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3739index 52d768f..5f93180 100644
3740--- a/arch/arm/mach-zynq/platsmp.c
3741+++ b/arch/arm/mach-zynq/platsmp.c
3742@@ -24,6 +24,7 @@
3743 #include <linux/io.h>
3744 #include <asm/cacheflush.h>
3745 #include <asm/smp_scu.h>
3746+#include <linux/irq.h>
3747 #include <linux/irqchip/arm-gic.h>
3748 #include "common.h"
3749
3750diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3751index b4f92b9..ffefea9 100644
3752--- a/arch/arm/mm/Kconfig
3753+++ b/arch/arm/mm/Kconfig
3754@@ -446,6 +446,7 @@ config CPU_32v5
3755
3756 config CPU_32v6
3757 bool
3758+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3759 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3760
3761 config CPU_32v6K
3762@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3763
3764 config CPU_USE_DOMAINS
3765 bool
3766+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3767 help
3768 This option enables or disables the use of domain switching
3769 via the set_fs() function.
3770@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3771
3772 config KUSER_HELPERS
3773 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3774- depends on MMU
3775+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3776 default y
3777 help
3778 Warning: disabling this option may break user programs.
3779@@ -812,7 +814,7 @@ config KUSER_HELPERS
3780 See Documentation/arm/kernel_user_helpers.txt for details.
3781
3782 However, the fixed address nature of these helpers can be used
3783- by ROP (return orientated programming) authors when creating
3784+ by ROP (Return Oriented Programming) authors when creating
3785 exploits.
3786
3787 If all of the binaries and libraries which run on your platform
3788diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3789index 9769f1e..16aaa55 100644
3790--- a/arch/arm/mm/alignment.c
3791+++ b/arch/arm/mm/alignment.c
3792@@ -216,10 +216,12 @@ union offset_union {
3793 #define __get16_unaligned_check(ins,val,addr) \
3794 do { \
3795 unsigned int err = 0, v, a = addr; \
3796+ pax_open_userland(); \
3797 __get8_unaligned_check(ins,v,a,err); \
3798 val = v << ((BE) ? 8 : 0); \
3799 __get8_unaligned_check(ins,v,a,err); \
3800 val |= v << ((BE) ? 0 : 8); \
3801+ pax_close_userland(); \
3802 if (err) \
3803 goto fault; \
3804 } while (0)
3805@@ -233,6 +235,7 @@ union offset_union {
3806 #define __get32_unaligned_check(ins,val,addr) \
3807 do { \
3808 unsigned int err = 0, v, a = addr; \
3809+ pax_open_userland(); \
3810 __get8_unaligned_check(ins,v,a,err); \
3811 val = v << ((BE) ? 24 : 0); \
3812 __get8_unaligned_check(ins,v,a,err); \
3813@@ -241,6 +244,7 @@ union offset_union {
3814 val |= v << ((BE) ? 8 : 16); \
3815 __get8_unaligned_check(ins,v,a,err); \
3816 val |= v << ((BE) ? 0 : 24); \
3817+ pax_close_userland(); \
3818 if (err) \
3819 goto fault; \
3820 } while (0)
3821@@ -254,6 +258,7 @@ union offset_union {
3822 #define __put16_unaligned_check(ins,val,addr) \
3823 do { \
3824 unsigned int err = 0, v = val, a = addr; \
3825+ pax_open_userland(); \
3826 __asm__( FIRST_BYTE_16 \
3827 ARM( "1: "ins" %1, [%2], #1\n" ) \
3828 THUMB( "1: "ins" %1, [%2]\n" ) \
3829@@ -273,6 +278,7 @@ union offset_union {
3830 " .popsection\n" \
3831 : "=r" (err), "=&r" (v), "=&r" (a) \
3832 : "0" (err), "1" (v), "2" (a)); \
3833+ pax_close_userland(); \
3834 if (err) \
3835 goto fault; \
3836 } while (0)
3837@@ -286,6 +292,7 @@ union offset_union {
3838 #define __put32_unaligned_check(ins,val,addr) \
3839 do { \
3840 unsigned int err = 0, v = val, a = addr; \
3841+ pax_open_userland(); \
3842 __asm__( FIRST_BYTE_32 \
3843 ARM( "1: "ins" %1, [%2], #1\n" ) \
3844 THUMB( "1: "ins" %1, [%2]\n" ) \
3845@@ -315,6 +322,7 @@ union offset_union {
3846 " .popsection\n" \
3847 : "=r" (err), "=&r" (v), "=&r" (a) \
3848 : "0" (err), "1" (v), "2" (a)); \
3849+ pax_close_userland(); \
3850 if (err) \
3851 goto fault; \
3852 } while (0)
3853diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3854index e309c8f..f8965e8 100644
3855--- a/arch/arm/mm/cache-l2x0.c
3856+++ b/arch/arm/mm/cache-l2x0.c
3857@@ -43,7 +43,7 @@ struct l2c_init_data {
3858 void (*save)(void __iomem *);
3859 void (*configure)(void __iomem *);
3860 struct outer_cache_fns outer_cache;
3861-};
3862+} __do_const;
3863
3864 #define CACHE_LINE_SIZE 32
3865
3866diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3867index 845769e..4278fd7 100644
3868--- a/arch/arm/mm/context.c
3869+++ b/arch/arm/mm/context.c
3870@@ -43,7 +43,7 @@
3871 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3872
3873 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3874-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3875+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3876 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3877
3878 static DEFINE_PER_CPU(atomic64_t, active_asids);
3879@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3880 {
3881 static u32 cur_idx = 1;
3882 u64 asid = atomic64_read(&mm->context.id);
3883- u64 generation = atomic64_read(&asid_generation);
3884+ u64 generation = atomic64_read_unchecked(&asid_generation);
3885
3886 if (asid != 0) {
3887 /*
3888@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3889 */
3890 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3891 if (asid == NUM_USER_ASIDS) {
3892- generation = atomic64_add_return(ASID_FIRST_VERSION,
3893+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3894 &asid_generation);
3895 flush_context(cpu);
3896 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3897@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3898 cpu_set_reserved_ttbr0();
3899
3900 asid = atomic64_read(&mm->context.id);
3901- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3902+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3903 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3904 goto switch_mm_fastpath;
3905
3906 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3907 /* Check that our ASID belongs to the current generation. */
3908 asid = atomic64_read(&mm->context.id);
3909- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3910+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3911 asid = new_context(mm, cpu);
3912 atomic64_set(&mm->context.id, asid);
3913 }
3914diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3915index 6333d9c..3bb19f2 100644
3916--- a/arch/arm/mm/fault.c
3917+++ b/arch/arm/mm/fault.c
3918@@ -25,6 +25,7 @@
3919 #include <asm/system_misc.h>
3920 #include <asm/system_info.h>
3921 #include <asm/tlbflush.h>
3922+#include <asm/sections.h>
3923
3924 #include "fault.h"
3925
3926@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3927 if (fixup_exception(regs))
3928 return;
3929
3930+#ifdef CONFIG_PAX_MEMORY_UDEREF
3931+ if (addr < TASK_SIZE) {
3932+ if (current->signal->curr_ip)
3933+ 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),
3934+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3935+ else
3936+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3937+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3938+ }
3939+#endif
3940+
3941+#ifdef CONFIG_PAX_KERNEXEC
3942+ if ((fsr & FSR_WRITE) &&
3943+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3944+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3945+ {
3946+ if (current->signal->curr_ip)
3947+ 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),
3948+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3949+ else
3950+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3951+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3952+ }
3953+#endif
3954+
3955 /*
3956 * No handler, we'll have to terminate things with extreme prejudice.
3957 */
3958@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3959 }
3960 #endif
3961
3962+#ifdef CONFIG_PAX_PAGEEXEC
3963+ if (fsr & FSR_LNX_PF) {
3964+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3965+ do_group_exit(SIGKILL);
3966+ }
3967+#endif
3968+
3969 tsk->thread.address = addr;
3970 tsk->thread.error_code = fsr;
3971 tsk->thread.trap_no = 14;
3972@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3973 }
3974 #endif /* CONFIG_MMU */
3975
3976+#ifdef CONFIG_PAX_PAGEEXEC
3977+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3978+{
3979+ long i;
3980+
3981+ printk(KERN_ERR "PAX: bytes at PC: ");
3982+ for (i = 0; i < 20; i++) {
3983+ unsigned char c;
3984+ if (get_user(c, (__force unsigned char __user *)pc+i))
3985+ printk(KERN_CONT "?? ");
3986+ else
3987+ printk(KERN_CONT "%02x ", c);
3988+ }
3989+ printk("\n");
3990+
3991+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3992+ for (i = -1; i < 20; i++) {
3993+ unsigned long c;
3994+ if (get_user(c, (__force unsigned long __user *)sp+i))
3995+ printk(KERN_CONT "???????? ");
3996+ else
3997+ printk(KERN_CONT "%08lx ", c);
3998+ }
3999+ printk("\n");
4000+}
4001+#endif
4002+
4003 /*
4004 * First Level Translation Fault Handler
4005 *
4006@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4007 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4008 struct siginfo info;
4009
4010+#ifdef CONFIG_PAX_MEMORY_UDEREF
4011+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4012+ if (current->signal->curr_ip)
4013+ 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),
4014+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4015+ else
4016+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4017+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4018+ goto die;
4019+ }
4020+#endif
4021+
4022 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4023 return;
4024
4025+die:
4026 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4027 inf->name, fsr, addr);
4028 show_pte(current->mm, addr);
4029@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4030 ifsr_info[nr].name = name;
4031 }
4032
4033+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4034+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4035+
4036 asmlinkage void __exception
4037 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4038 {
4039 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4040 struct siginfo info;
4041+ unsigned long pc = instruction_pointer(regs);
4042+
4043+ if (user_mode(regs)) {
4044+ unsigned long sigpage = current->mm->context.sigpage;
4045+
4046+ if (sigpage <= pc && pc < sigpage + 7*4) {
4047+ if (pc < sigpage + 3*4)
4048+ sys_sigreturn(regs);
4049+ else
4050+ sys_rt_sigreturn(regs);
4051+ return;
4052+ }
4053+ if (pc == 0xffff0f60UL) {
4054+ /*
4055+ * PaX: __kuser_cmpxchg64 emulation
4056+ */
4057+ // TODO
4058+ //regs->ARM_pc = regs->ARM_lr;
4059+ //return;
4060+ }
4061+ if (pc == 0xffff0fa0UL) {
4062+ /*
4063+ * PaX: __kuser_memory_barrier emulation
4064+ */
4065+ // dmb(); implied by the exception
4066+ regs->ARM_pc = regs->ARM_lr;
4067+ return;
4068+ }
4069+ if (pc == 0xffff0fc0UL) {
4070+ /*
4071+ * PaX: __kuser_cmpxchg emulation
4072+ */
4073+ // TODO
4074+ //long new;
4075+ //int op;
4076+
4077+ //op = FUTEX_OP_SET << 28;
4078+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4079+ //regs->ARM_r0 = old != new;
4080+ //regs->ARM_pc = regs->ARM_lr;
4081+ //return;
4082+ }
4083+ if (pc == 0xffff0fe0UL) {
4084+ /*
4085+ * PaX: __kuser_get_tls emulation
4086+ */
4087+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4088+ regs->ARM_pc = regs->ARM_lr;
4089+ return;
4090+ }
4091+ }
4092+
4093+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4094+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4095+ if (current->signal->curr_ip)
4096+ 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),
4097+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4098+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4099+ else
4100+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4101+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4102+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4103+ goto die;
4104+ }
4105+#endif
4106+
4107+#ifdef CONFIG_PAX_REFCOUNT
4108+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4109+#ifdef CONFIG_THUMB2_KERNEL
4110+ unsigned short bkpt;
4111+
4112+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4113+#else
4114+ unsigned int bkpt;
4115+
4116+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4117+#endif
4118+ current->thread.error_code = ifsr;
4119+ current->thread.trap_no = 0;
4120+ pax_report_refcount_overflow(regs);
4121+ fixup_exception(regs);
4122+ return;
4123+ }
4124+ }
4125+#endif
4126
4127 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4128 return;
4129
4130+die:
4131 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4132 inf->name, ifsr, addr);
4133
4134diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4135index cf08bdf..772656c 100644
4136--- a/arch/arm/mm/fault.h
4137+++ b/arch/arm/mm/fault.h
4138@@ -3,6 +3,7 @@
4139
4140 /*
4141 * Fault status register encodings. We steal bit 31 for our own purposes.
4142+ * Set when the FSR value is from an instruction fault.
4143 */
4144 #define FSR_LNX_PF (1 << 31)
4145 #define FSR_WRITE (1 << 11)
4146@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4147 }
4148 #endif
4149
4150+/* valid for LPAE and !LPAE */
4151+static inline int is_xn_fault(unsigned int fsr)
4152+{
4153+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4154+}
4155+
4156+static inline int is_domain_fault(unsigned int fsr)
4157+{
4158+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4159+}
4160+
4161 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4162 unsigned long search_exception_table(unsigned long addr);
4163
4164diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4165index be92fa0..5252d7e 100644
4166--- a/arch/arm/mm/init.c
4167+++ b/arch/arm/mm/init.c
4168@@ -709,7 +709,46 @@ void free_tcmmem(void)
4169 {
4170 #ifdef CONFIG_HAVE_TCM
4171 extern char __tcm_start, __tcm_end;
4172+#endif
4173
4174+#ifdef CONFIG_PAX_KERNEXEC
4175+ unsigned long addr;
4176+ pgd_t *pgd;
4177+ pud_t *pud;
4178+ pmd_t *pmd;
4179+ int cpu_arch = cpu_architecture();
4180+ unsigned int cr = get_cr();
4181+
4182+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4183+ /* make pages tables, etc before .text NX */
4184+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4185+ pgd = pgd_offset_k(addr);
4186+ pud = pud_offset(pgd, addr);
4187+ pmd = pmd_offset(pud, addr);
4188+ __section_update(pmd, addr, PMD_SECT_XN);
4189+ }
4190+ /* make init NX */
4191+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4192+ pgd = pgd_offset_k(addr);
4193+ pud = pud_offset(pgd, addr);
4194+ pmd = pmd_offset(pud, addr);
4195+ __section_update(pmd, addr, PMD_SECT_XN);
4196+ }
4197+ /* make kernel code/rodata RX */
4198+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4199+ pgd = pgd_offset_k(addr);
4200+ pud = pud_offset(pgd, addr);
4201+ pmd = pmd_offset(pud, addr);
4202+#ifdef CONFIG_ARM_LPAE
4203+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4204+#else
4205+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4206+#endif
4207+ }
4208+ }
4209+#endif
4210+
4211+#ifdef CONFIG_HAVE_TCM
4212 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4213 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4214 #endif
4215diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4216index d1e5ad7..84dcbf2 100644
4217--- a/arch/arm/mm/ioremap.c
4218+++ b/arch/arm/mm/ioremap.c
4219@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4220 unsigned int mtype;
4221
4222 if (cached)
4223- mtype = MT_MEMORY_RWX;
4224+ mtype = MT_MEMORY_RX;
4225 else
4226- mtype = MT_MEMORY_RWX_NONCACHED;
4227+ mtype = MT_MEMORY_RX_NONCACHED;
4228
4229 return __arm_ioremap_caller(phys_addr, size, mtype,
4230 __builtin_return_address(0));
4231diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4232index 407dc78..047ce9d 100644
4233--- a/arch/arm/mm/mmap.c
4234+++ b/arch/arm/mm/mmap.c
4235@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4236 struct vm_area_struct *vma;
4237 int do_align = 0;
4238 int aliasing = cache_is_vipt_aliasing();
4239+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4240 struct vm_unmapped_area_info info;
4241
4242 /*
4243@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4244 if (len > TASK_SIZE)
4245 return -ENOMEM;
4246
4247+#ifdef CONFIG_PAX_RANDMMAP
4248+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4249+#endif
4250+
4251 if (addr) {
4252 if (do_align)
4253 addr = COLOUR_ALIGN(addr, pgoff);
4254@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4255 addr = PAGE_ALIGN(addr);
4256
4257 vma = find_vma(mm, addr);
4258- if (TASK_SIZE - len >= addr &&
4259- (!vma || addr + len <= vma->vm_start))
4260+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4261 return addr;
4262 }
4263
4264@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4265 info.high_limit = TASK_SIZE;
4266 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4267 info.align_offset = pgoff << PAGE_SHIFT;
4268+ info.threadstack_offset = offset;
4269 return vm_unmapped_area(&info);
4270 }
4271
4272@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4273 unsigned long addr = addr0;
4274 int do_align = 0;
4275 int aliasing = cache_is_vipt_aliasing();
4276+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4277 struct vm_unmapped_area_info info;
4278
4279 /*
4280@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4281 return addr;
4282 }
4283
4284+#ifdef CONFIG_PAX_RANDMMAP
4285+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4286+#endif
4287+
4288 /* requesting a specific address */
4289 if (addr) {
4290 if (do_align)
4291@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4292 else
4293 addr = PAGE_ALIGN(addr);
4294 vma = find_vma(mm, addr);
4295- if (TASK_SIZE - len >= addr &&
4296- (!vma || addr + len <= vma->vm_start))
4297+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4298 return addr;
4299 }
4300
4301@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4302 info.high_limit = mm->mmap_base;
4303 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4304 info.align_offset = pgoff << PAGE_SHIFT;
4305+ info.threadstack_offset = offset;
4306 addr = vm_unmapped_area(&info);
4307
4308 /*
4309@@ -183,14 +193,30 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4310 {
4311 unsigned long random_factor = 0UL;
4312
4313+#ifdef CONFIG_PAX_RANDMMAP
4314+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4315+#endif
4316+
4317 if (current->flags & PF_RANDOMIZE)
4318 random_factor = arch_mmap_rnd();
4319
4320 if (mmap_is_legacy()) {
4321 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4322+
4323+#ifdef CONFIG_PAX_RANDMMAP
4324+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4325+ mm->mmap_base += mm->delta_mmap;
4326+#endif
4327+
4328 mm->get_unmapped_area = arch_get_unmapped_area;
4329 } else {
4330 mm->mmap_base = mmap_base(random_factor);
4331+
4332+#ifdef CONFIG_PAX_RANDMMAP
4333+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4334+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4335+#endif
4336+
4337 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4338 }
4339 }
4340diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4341index 7186382..0c145cf 100644
4342--- a/arch/arm/mm/mmu.c
4343+++ b/arch/arm/mm/mmu.c
4344@@ -41,6 +41,22 @@
4345 #include "mm.h"
4346 #include "tcm.h"
4347
4348+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4349+void modify_domain(unsigned int dom, unsigned int type)
4350+{
4351+ struct thread_info *thread = current_thread_info();
4352+ unsigned int domain = thread->cpu_domain;
4353+ /*
4354+ * DOMAIN_MANAGER might be defined to some other value,
4355+ * use the arch-defined constant
4356+ */
4357+ domain &= ~domain_val(dom, 3);
4358+ thread->cpu_domain = domain | domain_val(dom, type);
4359+ set_domain(thread->cpu_domain);
4360+}
4361+EXPORT_SYMBOL(modify_domain);
4362+#endif
4363+
4364 /*
4365 * empty_zero_page is a special page that is used for
4366 * zero-initialized data and COW.
4367@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4368 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4369 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4370
4371-static struct mem_type mem_types[] = {
4372+#ifdef CONFIG_PAX_KERNEXEC
4373+#define L_PTE_KERNEXEC L_PTE_RDONLY
4374+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4375+#else
4376+#define L_PTE_KERNEXEC L_PTE_DIRTY
4377+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4378+#endif
4379+
4380+static struct mem_type mem_types[] __read_only = {
4381 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4382 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4383 L_PTE_SHARED,
4384@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4385 .prot_sect = PROT_SECT_DEVICE,
4386 .domain = DOMAIN_IO,
4387 },
4388- [MT_UNCACHED] = {
4389+ [MT_UNCACHED_RW] = {
4390 .prot_pte = PROT_PTE_DEVICE,
4391 .prot_l1 = PMD_TYPE_TABLE,
4392 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4393 .domain = DOMAIN_IO,
4394 },
4395- [MT_CACHECLEAN] = {
4396- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4397+ [MT_CACHECLEAN_RO] = {
4398+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4399 .domain = DOMAIN_KERNEL,
4400 },
4401 #ifndef CONFIG_ARM_LPAE
4402- [MT_MINICLEAN] = {
4403- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4404+ [MT_MINICLEAN_RO] = {
4405+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4406 .domain = DOMAIN_KERNEL,
4407 },
4408 #endif
4409@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4410 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4411 L_PTE_RDONLY,
4412 .prot_l1 = PMD_TYPE_TABLE,
4413- .domain = DOMAIN_USER,
4414+ .domain = DOMAIN_VECTORS,
4415 },
4416 [MT_HIGH_VECTORS] = {
4417 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4418 L_PTE_USER | L_PTE_RDONLY,
4419 .prot_l1 = PMD_TYPE_TABLE,
4420- .domain = DOMAIN_USER,
4421+ .domain = DOMAIN_VECTORS,
4422 },
4423- [MT_MEMORY_RWX] = {
4424+ [__MT_MEMORY_RWX] = {
4425 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4426 .prot_l1 = PMD_TYPE_TABLE,
4427 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4428@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4429 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4430 .domain = DOMAIN_KERNEL,
4431 },
4432- [MT_ROM] = {
4433- .prot_sect = PMD_TYPE_SECT,
4434+ [MT_MEMORY_RX] = {
4435+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4436+ .prot_l1 = PMD_TYPE_TABLE,
4437+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4438+ .domain = DOMAIN_KERNEL,
4439+ },
4440+ [MT_ROM_RX] = {
4441+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4442 .domain = DOMAIN_KERNEL,
4443 },
4444- [MT_MEMORY_RWX_NONCACHED] = {
4445+ [MT_MEMORY_RW_NONCACHED] = {
4446 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4447 L_PTE_MT_BUFFERABLE,
4448 .prot_l1 = PMD_TYPE_TABLE,
4449 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4450 .domain = DOMAIN_KERNEL,
4451 },
4452+ [MT_MEMORY_RX_NONCACHED] = {
4453+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4454+ L_PTE_MT_BUFFERABLE,
4455+ .prot_l1 = PMD_TYPE_TABLE,
4456+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4457+ .domain = DOMAIN_KERNEL,
4458+ },
4459 [MT_MEMORY_RW_DTCM] = {
4460 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4461 L_PTE_XN,
4462@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4463 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4464 .domain = DOMAIN_KERNEL,
4465 },
4466- [MT_MEMORY_RWX_ITCM] = {
4467- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4468+ [MT_MEMORY_RX_ITCM] = {
4469+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4470 .prot_l1 = PMD_TYPE_TABLE,
4471+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4472 .domain = DOMAIN_KERNEL,
4473 },
4474 [MT_MEMORY_RW_SO] = {
4475@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4476 * Mark cache clean areas and XIP ROM read only
4477 * from SVC mode and no access from userspace.
4478 */
4479- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4480- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4481- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4482+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4483+#ifdef CONFIG_PAX_KERNEXEC
4484+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4485+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4486+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4487+#endif
4488+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4489+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4490 #endif
4491
4492 /*
4493@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4494 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4495 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4496 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4497- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4498- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4499+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4500+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4501 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4502 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4503+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4504+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4505 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4506- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4507- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4508+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4509+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4510+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4511+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4512 }
4513 }
4514
4515@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4516 if (cpu_arch >= CPU_ARCH_ARMv6) {
4517 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4518 /* Non-cacheable Normal is XCB = 001 */
4519- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4520+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4521+ PMD_SECT_BUFFERED;
4522+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4523 PMD_SECT_BUFFERED;
4524 } else {
4525 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4526- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4527+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4528+ PMD_SECT_TEX(1);
4529+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4530 PMD_SECT_TEX(1);
4531 }
4532 } else {
4533- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4534+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4535+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4536 }
4537
4538 #ifdef CONFIG_ARM_LPAE
4539@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4540 user_pgprot |= PTE_EXT_PXN;
4541 #endif
4542
4543+ user_pgprot |= __supported_pte_mask;
4544+
4545 for (i = 0; i < 16; i++) {
4546 pteval_t v = pgprot_val(protection_map[i]);
4547 protection_map[i] = __pgprot(v | user_pgprot);
4548@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4549
4550 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4551 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4552- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4553- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4554+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4555+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4556 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4557 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4558+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4559+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4560 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4561- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4562- mem_types[MT_ROM].prot_sect |= cp->pmd;
4563+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4564+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4565+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4566
4567 switch (cp->pmd) {
4568 case PMD_SECT_WT:
4569- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4570+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4571 break;
4572 case PMD_SECT_WB:
4573 case PMD_SECT_WBWA:
4574- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4575+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4576 break;
4577 }
4578 pr_info("Memory policy: %sData cache %s\n",
4579@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4580 return;
4581 }
4582
4583- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4584+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4585 md->virtual >= PAGE_OFFSET &&
4586 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4587 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4588@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4589 * called function. This means you can't use any function or debugging
4590 * method which may touch any device, otherwise the kernel _will_ crash.
4591 */
4592+
4593+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4594+
4595 static void __init devicemaps_init(const struct machine_desc *mdesc)
4596 {
4597 struct map_desc map;
4598 unsigned long addr;
4599- void *vectors;
4600
4601- /*
4602- * Allocate the vector page early.
4603- */
4604- vectors = early_alloc(PAGE_SIZE * 2);
4605-
4606- early_trap_init(vectors);
4607+ early_trap_init(&vectors);
4608
4609 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4610 pmd_clear(pmd_off_k(addr));
4611@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4612 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4613 map.virtual = MODULES_VADDR;
4614 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4615- map.type = MT_ROM;
4616+ map.type = MT_ROM_RX;
4617 create_mapping(&map);
4618 #endif
4619
4620@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4621 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4622 map.virtual = FLUSH_BASE;
4623 map.length = SZ_1M;
4624- map.type = MT_CACHECLEAN;
4625+ map.type = MT_CACHECLEAN_RO;
4626 create_mapping(&map);
4627 #endif
4628 #ifdef FLUSH_BASE_MINICACHE
4629 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4630 map.virtual = FLUSH_BASE_MINICACHE;
4631 map.length = SZ_1M;
4632- map.type = MT_MINICLEAN;
4633+ map.type = MT_MINICLEAN_RO;
4634 create_mapping(&map);
4635 #endif
4636
4637@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4638 * location (0xffff0000). If we aren't using high-vectors, also
4639 * create a mapping at the low-vectors virtual address.
4640 */
4641- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4642+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4643 map.virtual = 0xffff0000;
4644 map.length = PAGE_SIZE;
4645 #ifdef CONFIG_KUSER_HELPERS
4646@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4647 static void __init map_lowmem(void)
4648 {
4649 struct memblock_region *reg;
4650+#ifndef CONFIG_PAX_KERNEXEC
4651 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4652 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4653+#endif
4654
4655 /* Map all the lowmem memory banks. */
4656 for_each_memblock(memory, reg) {
4657@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4658 if (start >= end)
4659 break;
4660
4661+#ifdef CONFIG_PAX_KERNEXEC
4662+ map.pfn = __phys_to_pfn(start);
4663+ map.virtual = __phys_to_virt(start);
4664+ map.length = end - start;
4665+
4666+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4667+ struct map_desc kernel;
4668+ struct map_desc initmap;
4669+
4670+ /* when freeing initmem we will make this RW */
4671+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4672+ initmap.virtual = (unsigned long)__init_begin;
4673+ initmap.length = _sdata - __init_begin;
4674+ initmap.type = __MT_MEMORY_RWX;
4675+ create_mapping(&initmap);
4676+
4677+ /* when freeing initmem we will make this RX */
4678+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4679+ kernel.virtual = (unsigned long)_stext;
4680+ kernel.length = __init_begin - _stext;
4681+ kernel.type = __MT_MEMORY_RWX;
4682+ create_mapping(&kernel);
4683+
4684+ if (map.virtual < (unsigned long)_stext) {
4685+ map.length = (unsigned long)_stext - map.virtual;
4686+ map.type = __MT_MEMORY_RWX;
4687+ create_mapping(&map);
4688+ }
4689+
4690+ map.pfn = __phys_to_pfn(__pa(_sdata));
4691+ map.virtual = (unsigned long)_sdata;
4692+ map.length = end - __pa(_sdata);
4693+ }
4694+
4695+ map.type = MT_MEMORY_RW;
4696+ create_mapping(&map);
4697+#else
4698 if (end < kernel_x_start) {
4699 map.pfn = __phys_to_pfn(start);
4700 map.virtual = __phys_to_virt(start);
4701 map.length = end - start;
4702- map.type = MT_MEMORY_RWX;
4703+ map.type = __MT_MEMORY_RWX;
4704
4705 create_mapping(&map);
4706 } else if (start >= kernel_x_end) {
4707@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4708 map.pfn = __phys_to_pfn(kernel_x_start);
4709 map.virtual = __phys_to_virt(kernel_x_start);
4710 map.length = kernel_x_end - kernel_x_start;
4711- map.type = MT_MEMORY_RWX;
4712+ map.type = __MT_MEMORY_RWX;
4713
4714 create_mapping(&map);
4715
4716@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4717 create_mapping(&map);
4718 }
4719 }
4720+#endif
4721 }
4722 }
4723
4724diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4725index e0e2358..a4ee460 100644
4726--- a/arch/arm/net/bpf_jit_32.c
4727+++ b/arch/arm/net/bpf_jit_32.c
4728@@ -20,6 +20,7 @@
4729 #include <asm/cacheflush.h>
4730 #include <asm/hwcap.h>
4731 #include <asm/opcodes.h>
4732+#include <asm/pgtable.h>
4733
4734 #include "bpf_jit_32.h"
4735
4736@@ -72,34 +73,58 @@ struct jit_ctx {
4737 #endif
4738 };
4739
4740+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4741+int bpf_jit_enable __read_only;
4742+#else
4743 int bpf_jit_enable __read_mostly;
4744+#endif
4745
4746-static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4747+static inline int call_neg_helper(struct sk_buff *skb, int offset, void *ret,
4748+ unsigned int size)
4749+{
4750+ void *ptr = bpf_internal_load_pointer_neg_helper(skb, offset, size);
4751+
4752+ if (!ptr)
4753+ return -EFAULT;
4754+ memcpy(ret, ptr, size);
4755+ return 0;
4756+}
4757+
4758+static u64 jit_get_skb_b(struct sk_buff *skb, int offset)
4759 {
4760 u8 ret;
4761 int err;
4762
4763- err = skb_copy_bits(skb, offset, &ret, 1);
4764+ if (offset < 0)
4765+ err = call_neg_helper(skb, offset, &ret, 1);
4766+ else
4767+ err = skb_copy_bits(skb, offset, &ret, 1);
4768
4769 return (u64)err << 32 | ret;
4770 }
4771
4772-static u64 jit_get_skb_h(struct sk_buff *skb, unsigned offset)
4773+static u64 jit_get_skb_h(struct sk_buff *skb, int offset)
4774 {
4775 u16 ret;
4776 int err;
4777
4778- err = skb_copy_bits(skb, offset, &ret, 2);
4779+ if (offset < 0)
4780+ err = call_neg_helper(skb, offset, &ret, 2);
4781+ else
4782+ err = skb_copy_bits(skb, offset, &ret, 2);
4783
4784 return (u64)err << 32 | ntohs(ret);
4785 }
4786
4787-static u64 jit_get_skb_w(struct sk_buff *skb, unsigned offset)
4788+static u64 jit_get_skb_w(struct sk_buff *skb, int offset)
4789 {
4790 u32 ret;
4791 int err;
4792
4793- err = skb_copy_bits(skb, offset, &ret, 4);
4794+ if (offset < 0)
4795+ err = call_neg_helper(skb, offset, &ret, 4);
4796+ else
4797+ err = skb_copy_bits(skb, offset, &ret, 4);
4798
4799 return (u64)err << 32 | ntohl(ret);
4800 }
4801@@ -179,8 +204,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4802 {
4803 u32 *ptr;
4804 /* We are guaranteed to have aligned memory. */
4805+ pax_open_kernel();
4806 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4807 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4808+ pax_close_kernel();
4809 }
4810
4811 static void build_prologue(struct jit_ctx *ctx)
4812@@ -536,9 +563,6 @@ static int build_body(struct jit_ctx *ctx)
4813 case BPF_LD | BPF_B | BPF_ABS:
4814 load_order = 0;
4815 load:
4816- /* the interpreter will deal with the negative K */
4817- if ((int)k < 0)
4818- return -ENOTSUPP;
4819 emit_mov_i(r_off, k, ctx);
4820 load_common:
4821 ctx->seen |= SEEN_DATA | SEEN_CALL;
4822@@ -547,12 +571,24 @@ load_common:
4823 emit(ARM_SUB_I(r_scratch, r_skb_hl,
4824 1 << load_order), ctx);
4825 emit(ARM_CMP_R(r_scratch, r_off), ctx);
4826- condt = ARM_COND_HS;
4827+ condt = ARM_COND_GE;
4828 } else {
4829 emit(ARM_CMP_R(r_skb_hl, r_off), ctx);
4830 condt = ARM_COND_HI;
4831 }
4832
4833+ /*
4834+ * test for negative offset, only if we are
4835+ * currently scheduled to take the fast
4836+ * path. this will update the flags so that
4837+ * the slowpath instruction are ignored if the
4838+ * offset is negative.
4839+ *
4840+ * for loard_order == 0 the HI condition will
4841+ * make loads at offset 0 take the slow path too.
4842+ */
4843+ _emit(condt, ARM_CMP_I(r_off, 0), ctx);
4844+
4845 _emit(condt, ARM_ADD_R(r_scratch, r_off, r_skb_data),
4846 ctx);
4847
4848@@ -860,9 +896,11 @@ b_epilogue:
4849 off = offsetof(struct sk_buff, vlan_tci);
4850 emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
4851 if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
4852- OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
4853- else
4854- OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
4855+ OP_IMM3(ARM_AND, r_A, r_A, ~VLAN_TAG_PRESENT, ctx);
4856+ else {
4857+ OP_IMM3(ARM_LSR, r_A, r_A, 12, ctx);
4858+ OP_IMM3(ARM_AND, r_A, r_A, 0x1, ctx);
4859+ }
4860 break;
4861 case BPF_ANC | SKF_AD_QUEUE:
4862 ctx->seen |= SEEN_SKB;
4863diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4864index 5b217f4..c23f40e 100644
4865--- a/arch/arm/plat-iop/setup.c
4866+++ b/arch/arm/plat-iop/setup.c
4867@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4868 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4869 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4870 .length = IOP3XX_PERIPHERAL_SIZE,
4871- .type = MT_UNCACHED,
4872+ .type = MT_UNCACHED_RW,
4873 },
4874 };
4875
4876diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4877index a5bc92d..0bb4730 100644
4878--- a/arch/arm/plat-omap/sram.c
4879+++ b/arch/arm/plat-omap/sram.c
4880@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4881 * Looks like we need to preserve some bootloader code at the
4882 * beginning of SRAM for jumping to flash for reboot to work...
4883 */
4884+ pax_open_kernel();
4885 memset_io(omap_sram_base + omap_sram_skip, 0,
4886 omap_sram_size - omap_sram_skip);
4887+ pax_close_kernel();
4888 }
4889diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4890index 7047051..44e8675 100644
4891--- a/arch/arm64/include/asm/atomic.h
4892+++ b/arch/arm64/include/asm/atomic.h
4893@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4894 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4895 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4896
4897+#define atomic64_read_unchecked(v) atomic64_read(v)
4898+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4899+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4900+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4901+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4902+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4903+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4904+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4905+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4906+
4907 #endif
4908 #endif
4909diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4910index 71f19c4..2b13cfe 100644
4911--- a/arch/arm64/include/asm/barrier.h
4912+++ b/arch/arm64/include/asm/barrier.h
4913@@ -44,7 +44,7 @@
4914 do { \
4915 compiletime_assert_atomic_type(*p); \
4916 barrier(); \
4917- ACCESS_ONCE(*p) = (v); \
4918+ ACCESS_ONCE_RW(*p) = (v); \
4919 } while (0)
4920
4921 #define smp_load_acquire(p) \
4922diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4923index 4fde8c1..441f84f 100644
4924--- a/arch/arm64/include/asm/percpu.h
4925+++ b/arch/arm64/include/asm/percpu.h
4926@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4927 {
4928 switch (size) {
4929 case 1:
4930- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4931+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4932 break;
4933 case 2:
4934- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4935+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4936 break;
4937 case 4:
4938- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4939+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4940 break;
4941 case 8:
4942- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4943+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4944 break;
4945 default:
4946 BUILD_BUG();
4947diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4948index 7642056..bffc904 100644
4949--- a/arch/arm64/include/asm/pgalloc.h
4950+++ b/arch/arm64/include/asm/pgalloc.h
4951@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4952 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4953 }
4954
4955+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4956+{
4957+ pud_populate(mm, pud, pmd);
4958+}
4959+
4960 #endif /* CONFIG_PGTABLE_LEVELS > 2 */
4961
4962 #if CONFIG_PGTABLE_LEVELS > 3
4963diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4964index 07e1ba44..ec8cbbb 100644
4965--- a/arch/arm64/include/asm/uaccess.h
4966+++ b/arch/arm64/include/asm/uaccess.h
4967@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4968 flag; \
4969 })
4970
4971+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4972 #define access_ok(type, addr, size) __range_ok(addr, size)
4973 #define user_addr_max get_fs
4974
4975diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4976index b0bd4e5..54e82f6 100644
4977--- a/arch/arm64/mm/dma-mapping.c
4978+++ b/arch/arm64/mm/dma-mapping.c
4979@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4980 phys_to_page(paddr),
4981 size >> PAGE_SHIFT);
4982 if (!freed)
4983- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4984+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4985 }
4986
4987 static void *__dma_alloc(struct device *dev, size_t size,
4988diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4989index c3a58a1..78fbf54 100644
4990--- a/arch/avr32/include/asm/cache.h
4991+++ b/arch/avr32/include/asm/cache.h
4992@@ -1,8 +1,10 @@
4993 #ifndef __ASM_AVR32_CACHE_H
4994 #define __ASM_AVR32_CACHE_H
4995
4996+#include <linux/const.h>
4997+
4998 #define L1_CACHE_SHIFT 5
4999-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5000+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5001
5002 /*
5003 * Memory returned by kmalloc() may be used for DMA, so we must make
5004diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
5005index 0388ece..87c8df1 100644
5006--- a/arch/avr32/include/asm/elf.h
5007+++ b/arch/avr32/include/asm/elf.h
5008@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
5009 the loader. We need to make sure that it is out of the way of the program
5010 that it will "exec", and that there is sufficient room for the brk. */
5011
5012-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
5013+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
5014
5015+#ifdef CONFIG_PAX_ASLR
5016+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
5017+
5018+#define PAX_DELTA_MMAP_LEN 15
5019+#define PAX_DELTA_STACK_LEN 15
5020+#endif
5021
5022 /* This yields a mask that user programs can use to figure out what
5023 instruction set this CPU supports. This could be done in user space,
5024diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
5025index 479330b..53717a8 100644
5026--- a/arch/avr32/include/asm/kmap_types.h
5027+++ b/arch/avr32/include/asm/kmap_types.h
5028@@ -2,9 +2,9 @@
5029 #define __ASM_AVR32_KMAP_TYPES_H
5030
5031 #ifdef CONFIG_DEBUG_HIGHMEM
5032-# define KM_TYPE_NR 29
5033+# define KM_TYPE_NR 30
5034 #else
5035-# define KM_TYPE_NR 14
5036+# define KM_TYPE_NR 15
5037 #endif
5038
5039 #endif /* __ASM_AVR32_KMAP_TYPES_H */
5040diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
5041index d223a8b..69c5210 100644
5042--- a/arch/avr32/mm/fault.c
5043+++ b/arch/avr32/mm/fault.c
5044@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
5045
5046 int exception_trace = 1;
5047
5048+#ifdef CONFIG_PAX_PAGEEXEC
5049+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5050+{
5051+ unsigned long i;
5052+
5053+ printk(KERN_ERR "PAX: bytes at PC: ");
5054+ for (i = 0; i < 20; i++) {
5055+ unsigned char c;
5056+ if (get_user(c, (unsigned char *)pc+i))
5057+ printk(KERN_CONT "???????? ");
5058+ else
5059+ printk(KERN_CONT "%02x ", c);
5060+ }
5061+ printk("\n");
5062+}
5063+#endif
5064+
5065 /*
5066 * This routine handles page faults. It determines the address and the
5067 * problem, and then passes it off to one of the appropriate routines.
5068@@ -178,6 +195,16 @@ bad_area:
5069 up_read(&mm->mmap_sem);
5070
5071 if (user_mode(regs)) {
5072+
5073+#ifdef CONFIG_PAX_PAGEEXEC
5074+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
5075+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
5076+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
5077+ do_group_exit(SIGKILL);
5078+ }
5079+ }
5080+#endif
5081+
5082 if (exception_trace && printk_ratelimit())
5083 printk("%s%s[%d]: segfault at %08lx pc %08lx "
5084 "sp %08lx ecr %lu\n",
5085diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
5086index 568885a..f8008df 100644
5087--- a/arch/blackfin/include/asm/cache.h
5088+++ b/arch/blackfin/include/asm/cache.h
5089@@ -7,6 +7,7 @@
5090 #ifndef __ARCH_BLACKFIN_CACHE_H
5091 #define __ARCH_BLACKFIN_CACHE_H
5092
5093+#include <linux/const.h>
5094 #include <linux/linkage.h> /* for asmlinkage */
5095
5096 /*
5097@@ -14,7 +15,7 @@
5098 * Blackfin loads 32 bytes for cache
5099 */
5100 #define L1_CACHE_SHIFT 5
5101-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5102+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5103 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5104
5105 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5106diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5107index aea2718..3639a60 100644
5108--- a/arch/cris/include/arch-v10/arch/cache.h
5109+++ b/arch/cris/include/arch-v10/arch/cache.h
5110@@ -1,8 +1,9 @@
5111 #ifndef _ASM_ARCH_CACHE_H
5112 #define _ASM_ARCH_CACHE_H
5113
5114+#include <linux/const.h>
5115 /* Etrax 100LX have 32-byte cache-lines. */
5116-#define L1_CACHE_BYTES 32
5117 #define L1_CACHE_SHIFT 5
5118+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5119
5120 #endif /* _ASM_ARCH_CACHE_H */
5121diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5122index 7caf25d..ee65ac5 100644
5123--- a/arch/cris/include/arch-v32/arch/cache.h
5124+++ b/arch/cris/include/arch-v32/arch/cache.h
5125@@ -1,11 +1,12 @@
5126 #ifndef _ASM_CRIS_ARCH_CACHE_H
5127 #define _ASM_CRIS_ARCH_CACHE_H
5128
5129+#include <linux/const.h>
5130 #include <arch/hwregs/dma.h>
5131
5132 /* A cache-line is 32 bytes. */
5133-#define L1_CACHE_BYTES 32
5134 #define L1_CACHE_SHIFT 5
5135+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5136
5137 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5138
5139diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5140index 102190a..5334cea 100644
5141--- a/arch/frv/include/asm/atomic.h
5142+++ b/arch/frv/include/asm/atomic.h
5143@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5144 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5145 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5146
5147+#define atomic64_read_unchecked(v) atomic64_read(v)
5148+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5149+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5150+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5151+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5152+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5153+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5154+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5155+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5156+
5157 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5158 {
5159 int c, old;
5160diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5161index 2797163..c2a401df9 100644
5162--- a/arch/frv/include/asm/cache.h
5163+++ b/arch/frv/include/asm/cache.h
5164@@ -12,10 +12,11 @@
5165 #ifndef __ASM_CACHE_H
5166 #define __ASM_CACHE_H
5167
5168+#include <linux/const.h>
5169
5170 /* bytes per L1 cache line */
5171 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5172-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5173+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5174
5175 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5176 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5177diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5178index 43901f2..0d8b865 100644
5179--- a/arch/frv/include/asm/kmap_types.h
5180+++ b/arch/frv/include/asm/kmap_types.h
5181@@ -2,6 +2,6 @@
5182 #ifndef _ASM_KMAP_TYPES_H
5183 #define _ASM_KMAP_TYPES_H
5184
5185-#define KM_TYPE_NR 17
5186+#define KM_TYPE_NR 18
5187
5188 #endif
5189diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5190index 836f147..4cf23f5 100644
5191--- a/arch/frv/mm/elf-fdpic.c
5192+++ b/arch/frv/mm/elf-fdpic.c
5193@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5194 {
5195 struct vm_area_struct *vma;
5196 struct vm_unmapped_area_info info;
5197+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5198
5199 if (len > TASK_SIZE)
5200 return -ENOMEM;
5201@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5202 if (addr) {
5203 addr = PAGE_ALIGN(addr);
5204 vma = find_vma(current->mm, addr);
5205- if (TASK_SIZE - len >= addr &&
5206- (!vma || addr + len <= vma->vm_start))
5207+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5208 goto success;
5209 }
5210
5211@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5212 info.high_limit = (current->mm->start_stack - 0x00200000);
5213 info.align_mask = 0;
5214 info.align_offset = 0;
5215+ info.threadstack_offset = offset;
5216 addr = vm_unmapped_area(&info);
5217 if (!(addr & ~PAGE_MASK))
5218 goto success;
5219diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5220index 69952c18..4fa2908 100644
5221--- a/arch/hexagon/include/asm/cache.h
5222+++ b/arch/hexagon/include/asm/cache.h
5223@@ -21,9 +21,11 @@
5224 #ifndef __ASM_CACHE_H
5225 #define __ASM_CACHE_H
5226
5227+#include <linux/const.h>
5228+
5229 /* Bytes per L1 cache line */
5230-#define L1_CACHE_SHIFT (5)
5231-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5232+#define L1_CACHE_SHIFT 5
5233+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5234
5235 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5236
5237diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5238index 76d25b2..d3793a0f 100644
5239--- a/arch/ia64/Kconfig
5240+++ b/arch/ia64/Kconfig
5241@@ -541,6 +541,7 @@ source "drivers/sn/Kconfig"
5242 config KEXEC
5243 bool "kexec system call"
5244 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5245+ depends on !GRKERNSEC_KMEM
5246 help
5247 kexec is a system call that implements the ability to shutdown your
5248 current kernel, and to start another kernel. It is like a reboot
5249diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5250index 970d0bd..e750b9b 100644
5251--- a/arch/ia64/Makefile
5252+++ b/arch/ia64/Makefile
5253@@ -98,5 +98,6 @@ endef
5254 archprepare: make_nr_irqs_h FORCE
5255 PHONY += make_nr_irqs_h FORCE
5256
5257+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5258 make_nr_irqs_h: FORCE
5259 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5260diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5261index 0bf0350..2ad1957 100644
5262--- a/arch/ia64/include/asm/atomic.h
5263+++ b/arch/ia64/include/asm/atomic.h
5264@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5265 #define atomic64_inc(v) atomic64_add(1, (v))
5266 #define atomic64_dec(v) atomic64_sub(1, (v))
5267
5268+#define atomic64_read_unchecked(v) atomic64_read(v)
5269+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5270+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5271+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5272+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5273+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5274+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5275+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5276+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5277+
5278 #endif /* _ASM_IA64_ATOMIC_H */
5279diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5280index f6769eb..1cdb590 100644
5281--- a/arch/ia64/include/asm/barrier.h
5282+++ b/arch/ia64/include/asm/barrier.h
5283@@ -66,7 +66,7 @@
5284 do { \
5285 compiletime_assert_atomic_type(*p); \
5286 barrier(); \
5287- ACCESS_ONCE(*p) = (v); \
5288+ ACCESS_ONCE_RW(*p) = (v); \
5289 } while (0)
5290
5291 #define smp_load_acquire(p) \
5292diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5293index 988254a..e1ee885 100644
5294--- a/arch/ia64/include/asm/cache.h
5295+++ b/arch/ia64/include/asm/cache.h
5296@@ -1,6 +1,7 @@
5297 #ifndef _ASM_IA64_CACHE_H
5298 #define _ASM_IA64_CACHE_H
5299
5300+#include <linux/const.h>
5301
5302 /*
5303 * Copyright (C) 1998-2000 Hewlett-Packard Co
5304@@ -9,7 +10,7 @@
5305
5306 /* Bytes per L1 (data) cache line. */
5307 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5308-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5309+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5310
5311 #ifdef CONFIG_SMP
5312 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5313diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5314index 5a83c5c..4d7f553 100644
5315--- a/arch/ia64/include/asm/elf.h
5316+++ b/arch/ia64/include/asm/elf.h
5317@@ -42,6 +42,13 @@
5318 */
5319 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5320
5321+#ifdef CONFIG_PAX_ASLR
5322+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5323+
5324+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5325+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5326+#endif
5327+
5328 #define PT_IA_64_UNWIND 0x70000001
5329
5330 /* IA-64 relocations: */
5331diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5332index f5e70e9..624fad5 100644
5333--- a/arch/ia64/include/asm/pgalloc.h
5334+++ b/arch/ia64/include/asm/pgalloc.h
5335@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5336 pgd_val(*pgd_entry) = __pa(pud);
5337 }
5338
5339+static inline void
5340+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5341+{
5342+ pgd_populate(mm, pgd_entry, pud);
5343+}
5344+
5345 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5346 {
5347 return quicklist_alloc(0, GFP_KERNEL, NULL);
5348@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5349 pud_val(*pud_entry) = __pa(pmd);
5350 }
5351
5352+static inline void
5353+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5354+{
5355+ pud_populate(mm, pud_entry, pmd);
5356+}
5357+
5358 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5359 {
5360 return quicklist_alloc(0, GFP_KERNEL, NULL);
5361diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5362index 9f3ed9e..c99b418 100644
5363--- a/arch/ia64/include/asm/pgtable.h
5364+++ b/arch/ia64/include/asm/pgtable.h
5365@@ -12,7 +12,7 @@
5366 * David Mosberger-Tang <davidm@hpl.hp.com>
5367 */
5368
5369-
5370+#include <linux/const.h>
5371 #include <asm/mman.h>
5372 #include <asm/page.h>
5373 #include <asm/processor.h>
5374@@ -139,6 +139,17 @@
5375 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5376 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5377 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5378+
5379+#ifdef CONFIG_PAX_PAGEEXEC
5380+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5381+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5382+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5383+#else
5384+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5385+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5386+# define PAGE_COPY_NOEXEC PAGE_COPY
5387+#endif
5388+
5389 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5390 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5391 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5392diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5393index 45698cd..e8e2dbc 100644
5394--- a/arch/ia64/include/asm/spinlock.h
5395+++ b/arch/ia64/include/asm/spinlock.h
5396@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5397 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5398
5399 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5400- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5401+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5402 }
5403
5404 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5405diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5406index 4f3fb6cc..254055e 100644
5407--- a/arch/ia64/include/asm/uaccess.h
5408+++ b/arch/ia64/include/asm/uaccess.h
5409@@ -70,6 +70,7 @@
5410 && ((segment).seg == KERNEL_DS.seg \
5411 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5412 })
5413+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5414 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5415
5416 /*
5417@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5418 static inline unsigned long
5419 __copy_to_user (void __user *to, const void *from, unsigned long count)
5420 {
5421+ if (count > INT_MAX)
5422+ return count;
5423+
5424+ if (!__builtin_constant_p(count))
5425+ check_object_size(from, count, true);
5426+
5427 return __copy_user(to, (__force void __user *) from, count);
5428 }
5429
5430 static inline unsigned long
5431 __copy_from_user (void *to, const void __user *from, unsigned long count)
5432 {
5433+ if (count > INT_MAX)
5434+ return count;
5435+
5436+ if (!__builtin_constant_p(count))
5437+ check_object_size(to, count, false);
5438+
5439 return __copy_user((__force void __user *) to, from, count);
5440 }
5441
5442@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5443 ({ \
5444 void __user *__cu_to = (to); \
5445 const void *__cu_from = (from); \
5446- long __cu_len = (n); \
5447+ unsigned long __cu_len = (n); \
5448 \
5449- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5450+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5451+ if (!__builtin_constant_p(n)) \
5452+ check_object_size(__cu_from, __cu_len, true); \
5453 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5454+ } \
5455 __cu_len; \
5456 })
5457
5458@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5459 ({ \
5460 void *__cu_to = (to); \
5461 const void __user *__cu_from = (from); \
5462- long __cu_len = (n); \
5463+ unsigned long __cu_len = (n); \
5464 \
5465 __chk_user_ptr(__cu_from); \
5466- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5467+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5468+ if (!__builtin_constant_p(n)) \
5469+ check_object_size(__cu_to, __cu_len, false); \
5470 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5471+ } \
5472 __cu_len; \
5473 })
5474
5475diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5476index 29754aa..06d2838 100644
5477--- a/arch/ia64/kernel/module.c
5478+++ b/arch/ia64/kernel/module.c
5479@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5480 }
5481
5482 static inline int
5483+in_init_rx (const struct module *mod, uint64_t addr)
5484+{
5485+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5486+}
5487+
5488+static inline int
5489+in_init_rw (const struct module *mod, uint64_t addr)
5490+{
5491+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5492+}
5493+
5494+static inline int
5495 in_init (const struct module *mod, uint64_t addr)
5496 {
5497- return addr - (uint64_t) mod->module_init < mod->init_size;
5498+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5499+}
5500+
5501+static inline int
5502+in_core_rx (const struct module *mod, uint64_t addr)
5503+{
5504+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5505+}
5506+
5507+static inline int
5508+in_core_rw (const struct module *mod, uint64_t addr)
5509+{
5510+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5511 }
5512
5513 static inline int
5514 in_core (const struct module *mod, uint64_t addr)
5515 {
5516- return addr - (uint64_t) mod->module_core < mod->core_size;
5517+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5518 }
5519
5520 static inline int
5521@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5522 break;
5523
5524 case RV_BDREL:
5525- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5526+ if (in_init_rx(mod, val))
5527+ val -= (uint64_t) mod->module_init_rx;
5528+ else if (in_init_rw(mod, val))
5529+ val -= (uint64_t) mod->module_init_rw;
5530+ else if (in_core_rx(mod, val))
5531+ val -= (uint64_t) mod->module_core_rx;
5532+ else if (in_core_rw(mod, val))
5533+ val -= (uint64_t) mod->module_core_rw;
5534 break;
5535
5536 case RV_LTV:
5537@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5538 * addresses have been selected...
5539 */
5540 uint64_t gp;
5541- if (mod->core_size > MAX_LTOFF)
5542+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5543 /*
5544 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5545 * at the end of the module.
5546 */
5547- gp = mod->core_size - MAX_LTOFF / 2;
5548+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5549 else
5550- gp = mod->core_size / 2;
5551- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5552+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5553+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5554 mod->arch.gp = gp;
5555 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5556 }
5557diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5558index c39c3cd..3c77738 100644
5559--- a/arch/ia64/kernel/palinfo.c
5560+++ b/arch/ia64/kernel/palinfo.c
5561@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5562 return NOTIFY_OK;
5563 }
5564
5565-static struct notifier_block __refdata palinfo_cpu_notifier =
5566+static struct notifier_block palinfo_cpu_notifier =
5567 {
5568 .notifier_call = palinfo_cpu_callback,
5569 .priority = 0,
5570diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5571index 41e33f8..65180b2a 100644
5572--- a/arch/ia64/kernel/sys_ia64.c
5573+++ b/arch/ia64/kernel/sys_ia64.c
5574@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5575 unsigned long align_mask = 0;
5576 struct mm_struct *mm = current->mm;
5577 struct vm_unmapped_area_info info;
5578+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5579
5580 if (len > RGN_MAP_LIMIT)
5581 return -ENOMEM;
5582@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5583 if (REGION_NUMBER(addr) == RGN_HPAGE)
5584 addr = 0;
5585 #endif
5586+
5587+#ifdef CONFIG_PAX_RANDMMAP
5588+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5589+ addr = mm->free_area_cache;
5590+ else
5591+#endif
5592+
5593 if (!addr)
5594 addr = TASK_UNMAPPED_BASE;
5595
5596@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5597 info.high_limit = TASK_SIZE;
5598 info.align_mask = align_mask;
5599 info.align_offset = 0;
5600+ info.threadstack_offset = offset;
5601 return vm_unmapped_area(&info);
5602 }
5603
5604diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5605index 84f8a52..7c76178 100644
5606--- a/arch/ia64/kernel/vmlinux.lds.S
5607+++ b/arch/ia64/kernel/vmlinux.lds.S
5608@@ -192,7 +192,7 @@ SECTIONS {
5609 /* Per-cpu data: */
5610 . = ALIGN(PERCPU_PAGE_SIZE);
5611 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5612- __phys_per_cpu_start = __per_cpu_load;
5613+ __phys_per_cpu_start = per_cpu_load;
5614 /*
5615 * ensure percpu data fits
5616 * into percpu page size
5617diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5618index ba5ba7a..36e9d3a 100644
5619--- a/arch/ia64/mm/fault.c
5620+++ b/arch/ia64/mm/fault.c
5621@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5622 return pte_present(pte);
5623 }
5624
5625+#ifdef CONFIG_PAX_PAGEEXEC
5626+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5627+{
5628+ unsigned long i;
5629+
5630+ printk(KERN_ERR "PAX: bytes at PC: ");
5631+ for (i = 0; i < 8; i++) {
5632+ unsigned int c;
5633+ if (get_user(c, (unsigned int *)pc+i))
5634+ printk(KERN_CONT "???????? ");
5635+ else
5636+ printk(KERN_CONT "%08x ", c);
5637+ }
5638+ printk("\n");
5639+}
5640+#endif
5641+
5642 # define VM_READ_BIT 0
5643 # define VM_WRITE_BIT 1
5644 # define VM_EXEC_BIT 2
5645@@ -151,8 +168,21 @@ retry:
5646 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5647 goto bad_area;
5648
5649- if ((vma->vm_flags & mask) != mask)
5650+ if ((vma->vm_flags & mask) != mask) {
5651+
5652+#ifdef CONFIG_PAX_PAGEEXEC
5653+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5654+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5655+ goto bad_area;
5656+
5657+ up_read(&mm->mmap_sem);
5658+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5659+ do_group_exit(SIGKILL);
5660+ }
5661+#endif
5662+
5663 goto bad_area;
5664+ }
5665
5666 /*
5667 * If for any reason at all we couldn't handle the fault, make
5668diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5669index 52b7604b..455cb85 100644
5670--- a/arch/ia64/mm/hugetlbpage.c
5671+++ b/arch/ia64/mm/hugetlbpage.c
5672@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5673 unsigned long pgoff, unsigned long flags)
5674 {
5675 struct vm_unmapped_area_info info;
5676+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5677
5678 if (len > RGN_MAP_LIMIT)
5679 return -ENOMEM;
5680@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5681 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5682 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5683 info.align_offset = 0;
5684+ info.threadstack_offset = offset;
5685 return vm_unmapped_area(&info);
5686 }
5687
5688diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5689index a9b65cf..49ae1cf 100644
5690--- a/arch/ia64/mm/init.c
5691+++ b/arch/ia64/mm/init.c
5692@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5693 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5694 vma->vm_end = vma->vm_start + PAGE_SIZE;
5695 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5696+
5697+#ifdef CONFIG_PAX_PAGEEXEC
5698+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5699+ vma->vm_flags &= ~VM_EXEC;
5700+
5701+#ifdef CONFIG_PAX_MPROTECT
5702+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5703+ vma->vm_flags &= ~VM_MAYEXEC;
5704+#endif
5705+
5706+ }
5707+#endif
5708+
5709 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5710 down_write(&current->mm->mmap_sem);
5711 if (insert_vm_struct(current->mm, vma)) {
5712@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5713 gate_vma.vm_start = FIXADDR_USER_START;
5714 gate_vma.vm_end = FIXADDR_USER_END;
5715 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5716- gate_vma.vm_page_prot = __P101;
5717+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5718
5719 return 0;
5720 }
5721diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5722index 40b3ee98..8c2c112 100644
5723--- a/arch/m32r/include/asm/cache.h
5724+++ b/arch/m32r/include/asm/cache.h
5725@@ -1,8 +1,10 @@
5726 #ifndef _ASM_M32R_CACHE_H
5727 #define _ASM_M32R_CACHE_H
5728
5729+#include <linux/const.h>
5730+
5731 /* L1 cache line size */
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 #endif /* _ASM_M32R_CACHE_H */
5737diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5738index 82abd15..d95ae5d 100644
5739--- a/arch/m32r/lib/usercopy.c
5740+++ b/arch/m32r/lib/usercopy.c
5741@@ -14,6 +14,9 @@
5742 unsigned long
5743 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5744 {
5745+ if ((long)n < 0)
5746+ return n;
5747+
5748 prefetch(from);
5749 if (access_ok(VERIFY_WRITE, to, n))
5750 __copy_user(to,from,n);
5751@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5752 unsigned long
5753 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5754 {
5755+ if ((long)n < 0)
5756+ return n;
5757+
5758 prefetchw(to);
5759 if (access_ok(VERIFY_READ, from, n))
5760 __copy_user_zeroing(to,from,n);
5761diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5762index 0395c51..5f26031 100644
5763--- a/arch/m68k/include/asm/cache.h
5764+++ b/arch/m68k/include/asm/cache.h
5765@@ -4,9 +4,11 @@
5766 #ifndef __ARCH_M68K_CACHE_H
5767 #define __ARCH_M68K_CACHE_H
5768
5769+#include <linux/const.h>
5770+
5771 /* bytes per L1 cache line */
5772 #define L1_CACHE_SHIFT 4
5773-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5774+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5775
5776 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5777
5778diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5779index d703d8e..a8e2d70 100644
5780--- a/arch/metag/include/asm/barrier.h
5781+++ b/arch/metag/include/asm/barrier.h
5782@@ -90,7 +90,7 @@ static inline void fence(void)
5783 do { \
5784 compiletime_assert_atomic_type(*p); \
5785 smp_mb(); \
5786- ACCESS_ONCE(*p) = (v); \
5787+ ACCESS_ONCE_RW(*p) = (v); \
5788 } while (0)
5789
5790 #define smp_load_acquire(p) \
5791diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5792index 7ca80ac..794ba72 100644
5793--- a/arch/metag/mm/hugetlbpage.c
5794+++ b/arch/metag/mm/hugetlbpage.c
5795@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5796 info.high_limit = TASK_SIZE;
5797 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5798 info.align_offset = 0;
5799+ info.threadstack_offset = 0;
5800 return vm_unmapped_area(&info);
5801 }
5802
5803diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5804index 4efe96a..60e8699 100644
5805--- a/arch/microblaze/include/asm/cache.h
5806+++ b/arch/microblaze/include/asm/cache.h
5807@@ -13,11 +13,12 @@
5808 #ifndef _ASM_MICROBLAZE_CACHE_H
5809 #define _ASM_MICROBLAZE_CACHE_H
5810
5811+#include <linux/const.h>
5812 #include <asm/registers.h>
5813
5814 #define L1_CACHE_SHIFT 5
5815 /* word-granular cache in microblaze */
5816-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5817+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5818
5819 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5820
5821diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5822index f501665..b107753 100644
5823--- a/arch/mips/Kconfig
5824+++ b/arch/mips/Kconfig
5825@@ -2585,6 +2585,7 @@ source "kernel/Kconfig.preempt"
5826
5827 config KEXEC
5828 bool "Kexec system call"
5829+ depends on !GRKERNSEC_KMEM
5830 help
5831 kexec is a system call that implements the ability to shutdown your
5832 current kernel, and to start another kernel. It is like a reboot
5833diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5834index d8960d4..77dbd31 100644
5835--- a/arch/mips/cavium-octeon/dma-octeon.c
5836+++ b/arch/mips/cavium-octeon/dma-octeon.c
5837@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5838 if (dma_release_from_coherent(dev, order, vaddr))
5839 return;
5840
5841- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5842+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5843 }
5844
5845 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5846diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5847index 26d4363..3c9a82e 100644
5848--- a/arch/mips/include/asm/atomic.h
5849+++ b/arch/mips/include/asm/atomic.h
5850@@ -22,15 +22,39 @@
5851 #include <asm/cmpxchg.h>
5852 #include <asm/war.h>
5853
5854+#ifdef CONFIG_GENERIC_ATOMIC64
5855+#include <asm-generic/atomic64.h>
5856+#endif
5857+
5858 #define ATOMIC_INIT(i) { (i) }
5859
5860+#ifdef CONFIG_64BIT
5861+#define _ASM_EXTABLE(from, to) \
5862+" .section __ex_table,\"a\"\n" \
5863+" .dword " #from ", " #to"\n" \
5864+" .previous\n"
5865+#else
5866+#define _ASM_EXTABLE(from, to) \
5867+" .section __ex_table,\"a\"\n" \
5868+" .word " #from ", " #to"\n" \
5869+" .previous\n"
5870+#endif
5871+
5872 /*
5873 * atomic_read - read atomic variable
5874 * @v: pointer of type atomic_t
5875 *
5876 * Atomically reads the value of @v.
5877 */
5878-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5879+static inline int atomic_read(const atomic_t *v)
5880+{
5881+ return ACCESS_ONCE(v->counter);
5882+}
5883+
5884+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5885+{
5886+ return ACCESS_ONCE(v->counter);
5887+}
5888
5889 /*
5890 * atomic_set - set atomic variable
5891@@ -39,47 +63,77 @@
5892 *
5893 * Atomically sets the value of @v to @i.
5894 */
5895-#define atomic_set(v, i) ((v)->counter = (i))
5896+static inline void atomic_set(atomic_t *v, int i)
5897+{
5898+ v->counter = i;
5899+}
5900
5901-#define ATOMIC_OP(op, c_op, asm_op) \
5902-static __inline__ void atomic_##op(int i, atomic_t * v) \
5903+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5904+{
5905+ v->counter = i;
5906+}
5907+
5908+#ifdef CONFIG_PAX_REFCOUNT
5909+#define __OVERFLOW_POST \
5910+ " b 4f \n" \
5911+ " .set noreorder \n" \
5912+ "3: b 5f \n" \
5913+ " move %0, %1 \n" \
5914+ " .set reorder \n"
5915+#define __OVERFLOW_EXTABLE \
5916+ "3:\n" \
5917+ _ASM_EXTABLE(2b, 3b)
5918+#else
5919+#define __OVERFLOW_POST
5920+#define __OVERFLOW_EXTABLE
5921+#endif
5922+
5923+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5924+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5925 { \
5926 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5927 int temp; \
5928 \
5929 __asm__ __volatile__( \
5930- " .set arch=r4000 \n" \
5931- "1: ll %0, %1 # atomic_" #op " \n" \
5932- " " #asm_op " %0, %2 \n" \
5933+ " .set mips3 \n" \
5934+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5935+ "2: " #asm_op " %0, %2 \n" \
5936 " sc %0, %1 \n" \
5937 " beqzl %0, 1b \n" \
5938+ extable \
5939 " .set mips0 \n" \
5940 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5941 : "Ir" (i)); \
5942 } else if (kernel_uses_llsc) { \
5943 int temp; \
5944 \
5945- do { \
5946- __asm__ __volatile__( \
5947- " .set "MIPS_ISA_LEVEL" \n" \
5948- " ll %0, %1 # atomic_" #op "\n" \
5949- " " #asm_op " %0, %2 \n" \
5950- " sc %0, %1 \n" \
5951- " .set mips0 \n" \
5952- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5953- : "Ir" (i)); \
5954- } while (unlikely(!temp)); \
5955+ __asm__ __volatile__( \
5956+ " .set "MIPS_ISA_LEVEL" \n" \
5957+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5958+ "2: " #asm_op " %0, %2 \n" \
5959+ " sc %0, %1 \n" \
5960+ " beqz %0, 1b \n" \
5961+ extable \
5962+ " .set mips0 \n" \
5963+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5964+ : "Ir" (i)); \
5965 } else { \
5966 unsigned long flags; \
5967 \
5968 raw_local_irq_save(flags); \
5969- v->counter c_op i; \
5970+ __asm__ __volatile__( \
5971+ "2: " #asm_op " %0, %1 \n" \
5972+ extable \
5973+ : "+r" (v->counter) : "Ir" (i)); \
5974 raw_local_irq_restore(flags); \
5975 } \
5976 }
5977
5978-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5979-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5980+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5981+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5982+
5983+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5984+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5985 { \
5986 int result; \
5987 \
5988@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5989 int temp; \
5990 \
5991 __asm__ __volatile__( \
5992- " .set arch=r4000 \n" \
5993- "1: ll %1, %2 # atomic_" #op "_return \n" \
5994- " " #asm_op " %0, %1, %3 \n" \
5995+ " .set mips3 \n" \
5996+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5997+ "2: " #asm_op " %0, %1, %3 \n" \
5998 " sc %0, %2 \n" \
5999 " beqzl %0, 1b \n" \
6000- " " #asm_op " %0, %1, %3 \n" \
6001+ post_op \
6002+ extable \
6003+ "4: " #asm_op " %0, %1, %3 \n" \
6004+ "5: \n" \
6005 " .set mips0 \n" \
6006 : "=&r" (result), "=&r" (temp), \
6007 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6008@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6009 } else if (kernel_uses_llsc) { \
6010 int temp; \
6011 \
6012- do { \
6013- __asm__ __volatile__( \
6014- " .set "MIPS_ISA_LEVEL" \n" \
6015- " ll %1, %2 # atomic_" #op "_return \n" \
6016- " " #asm_op " %0, %1, %3 \n" \
6017- " sc %0, %2 \n" \
6018- " .set mips0 \n" \
6019- : "=&r" (result), "=&r" (temp), \
6020- "+" GCC_OFF_SMALL_ASM() (v->counter) \
6021- : "Ir" (i)); \
6022- } while (unlikely(!result)); \
6023+ __asm__ __volatile__( \
6024+ " .set "MIPS_ISA_LEVEL" \n" \
6025+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
6026+ "2: " #asm_op " %0, %1, %3 \n" \
6027+ " sc %0, %2 \n" \
6028+ post_op \
6029+ extable \
6030+ "4: " #asm_op " %0, %1, %3 \n" \
6031+ "5: \n" \
6032+ " .set mips0 \n" \
6033+ : "=&r" (result), "=&r" (temp), \
6034+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
6035+ : "Ir" (i)); \
6036 \
6037 result = temp; result c_op i; \
6038 } else { \
6039 unsigned long flags; \
6040 \
6041 raw_local_irq_save(flags); \
6042- result = v->counter; \
6043- result c_op i; \
6044- v->counter = result; \
6045+ __asm__ __volatile__( \
6046+ " lw %0, %1 \n" \
6047+ "2: " #asm_op " %0, %1, %2 \n" \
6048+ " sw %0, %1 \n" \
6049+ "3: \n" \
6050+ extable \
6051+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6052+ : "Ir" (i)); \
6053 raw_local_irq_restore(flags); \
6054 } \
6055 \
6056@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6057 return result; \
6058 }
6059
6060-#define ATOMIC_OPS(op, c_op, asm_op) \
6061- ATOMIC_OP(op, c_op, asm_op) \
6062- ATOMIC_OP_RETURN(op, c_op, asm_op)
6063+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6064+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6065
6066-ATOMIC_OPS(add, +=, addu)
6067-ATOMIC_OPS(sub, -=, subu)
6068+#define ATOMIC_OPS(op, asm_op) \
6069+ ATOMIC_OP(op, asm_op) \
6070+ ATOMIC_OP_RETURN(op, asm_op)
6071+
6072+ATOMIC_OPS(add, add)
6073+ATOMIC_OPS(sub, sub)
6074
6075 #undef ATOMIC_OPS
6076 #undef ATOMIC_OP_RETURN
6077+#undef __ATOMIC_OP_RETURN
6078 #undef ATOMIC_OP
6079+#undef __ATOMIC_OP
6080
6081 /*
6082 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
6083@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
6084 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6085 * The function returns the old value of @v minus @i.
6086 */
6087-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6088+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6089 {
6090 int result;
6091
6092@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6093 int temp;
6094
6095 __asm__ __volatile__(
6096- " .set arch=r4000 \n"
6097+ " .set "MIPS_ISA_LEVEL" \n"
6098 "1: ll %1, %2 # atomic_sub_if_positive\n"
6099 " subu %0, %1, %3 \n"
6100 " bltz %0, 1f \n"
6101@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6102 return result;
6103 }
6104
6105-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6106-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6107+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6108+{
6109+ return cmpxchg(&v->counter, old, new);
6110+}
6111+
6112+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6113+ int new)
6114+{
6115+ return cmpxchg(&(v->counter), old, new);
6116+}
6117+
6118+static inline int atomic_xchg(atomic_t *v, int new)
6119+{
6120+ return xchg(&v->counter, new);
6121+}
6122+
6123+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6124+{
6125+ return xchg(&(v->counter), new);
6126+}
6127
6128 /**
6129 * __atomic_add_unless - add unless the number is a given value
6130@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6131
6132 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6133 #define atomic_inc_return(v) atomic_add_return(1, (v))
6134+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6135+{
6136+ return atomic_add_return_unchecked(1, v);
6137+}
6138
6139 /*
6140 * atomic_sub_and_test - subtract value from variable and test result
6141@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6142 * other cases.
6143 */
6144 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6145+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6146+{
6147+ return atomic_add_return_unchecked(1, v) == 0;
6148+}
6149
6150 /*
6151 * atomic_dec_and_test - decrement by 1 and test
6152@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6153 * Atomically increments @v by 1.
6154 */
6155 #define atomic_inc(v) atomic_add(1, (v))
6156+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6157+{
6158+ atomic_add_unchecked(1, v);
6159+}
6160
6161 /*
6162 * atomic_dec - decrement and test
6163@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6164 * Atomically decrements @v by 1.
6165 */
6166 #define atomic_dec(v) atomic_sub(1, (v))
6167+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6168+{
6169+ atomic_sub_unchecked(1, v);
6170+}
6171
6172 /*
6173 * atomic_add_negative - add and test if negative
6174@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6175 * @v: pointer of type atomic64_t
6176 *
6177 */
6178-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6179+static inline long atomic64_read(const atomic64_t *v)
6180+{
6181+ return ACCESS_ONCE(v->counter);
6182+}
6183+
6184+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6185+{
6186+ return ACCESS_ONCE(v->counter);
6187+}
6188
6189 /*
6190 * atomic64_set - set atomic variable
6191 * @v: pointer of type atomic64_t
6192 * @i: required value
6193 */
6194-#define atomic64_set(v, i) ((v)->counter = (i))
6195+static inline void atomic64_set(atomic64_t *v, long i)
6196+{
6197+ v->counter = i;
6198+}
6199
6200-#define ATOMIC64_OP(op, c_op, asm_op) \
6201-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6202+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6203+{
6204+ v->counter = i;
6205+}
6206+
6207+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6208+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6209 { \
6210 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6211 long temp; \
6212 \
6213 __asm__ __volatile__( \
6214- " .set arch=r4000 \n" \
6215- "1: lld %0, %1 # atomic64_" #op " \n" \
6216- " " #asm_op " %0, %2 \n" \
6217+ " .set "MIPS_ISA_LEVEL" \n" \
6218+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6219+ "2: " #asm_op " %0, %2 \n" \
6220 " scd %0, %1 \n" \
6221 " beqzl %0, 1b \n" \
6222+ extable \
6223 " .set mips0 \n" \
6224 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6225 : "Ir" (i)); \
6226 } else if (kernel_uses_llsc) { \
6227 long temp; \
6228 \
6229- do { \
6230- __asm__ __volatile__( \
6231- " .set "MIPS_ISA_LEVEL" \n" \
6232- " lld %0, %1 # atomic64_" #op "\n" \
6233- " " #asm_op " %0, %2 \n" \
6234- " scd %0, %1 \n" \
6235- " .set mips0 \n" \
6236- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6237- : "Ir" (i)); \
6238- } while (unlikely(!temp)); \
6239+ __asm__ __volatile__( \
6240+ " .set "MIPS_ISA_LEVEL" \n" \
6241+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6242+ "2: " #asm_op " %0, %2 \n" \
6243+ " scd %0, %1 \n" \
6244+ " beqz %0, 1b \n" \
6245+ extable \
6246+ " .set mips0 \n" \
6247+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6248+ : "Ir" (i)); \
6249 } else { \
6250 unsigned long flags; \
6251 \
6252 raw_local_irq_save(flags); \
6253- v->counter c_op i; \
6254+ __asm__ __volatile__( \
6255+ "2: " #asm_op " %0, %1 \n" \
6256+ extable \
6257+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6258 raw_local_irq_restore(flags); \
6259 } \
6260 }
6261
6262-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6263-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6264+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6265+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6266+
6267+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6268+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6269 { \
6270 long result; \
6271 \
6272@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6273 long temp; \
6274 \
6275 __asm__ __volatile__( \
6276- " .set arch=r4000 \n" \
6277+ " .set mips3 \n" \
6278 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6279- " " #asm_op " %0, %1, %3 \n" \
6280+ "2: " #asm_op " %0, %1, %3 \n" \
6281 " scd %0, %2 \n" \
6282 " beqzl %0, 1b \n" \
6283- " " #asm_op " %0, %1, %3 \n" \
6284+ post_op \
6285+ extable \
6286+ "4: " #asm_op " %0, %1, %3 \n" \
6287+ "5: \n" \
6288 " .set mips0 \n" \
6289 : "=&r" (result), "=&r" (temp), \
6290 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6291@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6292 } else if (kernel_uses_llsc) { \
6293 long temp; \
6294 \
6295- do { \
6296- __asm__ __volatile__( \
6297- " .set "MIPS_ISA_LEVEL" \n" \
6298- " lld %1, %2 # atomic64_" #op "_return\n" \
6299- " " #asm_op " %0, %1, %3 \n" \
6300- " scd %0, %2 \n" \
6301- " .set mips0 \n" \
6302- : "=&r" (result), "=&r" (temp), \
6303- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6304- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6305- : "memory"); \
6306- } while (unlikely(!result)); \
6307+ __asm__ __volatile__( \
6308+ " .set "MIPS_ISA_LEVEL" \n" \
6309+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6310+ "2: " #asm_op " %0, %1, %3 \n" \
6311+ " scd %0, %2 \n" \
6312+ " beqz %0, 1b \n" \
6313+ post_op \
6314+ extable \
6315+ "4: " #asm_op " %0, %1, %3 \n" \
6316+ "5: \n" \
6317+ " .set mips0 \n" \
6318+ : "=&r" (result), "=&r" (temp), \
6319+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6320+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6321+ : "memory"); \
6322 \
6323 result = temp; result c_op i; \
6324 } else { \
6325 unsigned long flags; \
6326 \
6327 raw_local_irq_save(flags); \
6328- result = v->counter; \
6329- result c_op i; \
6330- v->counter = result; \
6331+ __asm__ __volatile__( \
6332+ " ld %0, %1 \n" \
6333+ "2: " #asm_op " %0, %1, %2 \n" \
6334+ " sd %0, %1 \n" \
6335+ "3: \n" \
6336+ extable \
6337+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6338+ : "Ir" (i)); \
6339 raw_local_irq_restore(flags); \
6340 } \
6341 \
6342@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6343 return result; \
6344 }
6345
6346-#define ATOMIC64_OPS(op, c_op, asm_op) \
6347- ATOMIC64_OP(op, c_op, asm_op) \
6348- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6349+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6350+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6351
6352-ATOMIC64_OPS(add, +=, daddu)
6353-ATOMIC64_OPS(sub, -=, dsubu)
6354+#define ATOMIC64_OPS(op, asm_op) \
6355+ ATOMIC64_OP(op, asm_op) \
6356+ ATOMIC64_OP_RETURN(op, asm_op)
6357+
6358+ATOMIC64_OPS(add, dadd)
6359+ATOMIC64_OPS(sub, dsub)
6360
6361 #undef ATOMIC64_OPS
6362 #undef ATOMIC64_OP_RETURN
6363+#undef __ATOMIC64_OP_RETURN
6364 #undef ATOMIC64_OP
6365+#undef __ATOMIC64_OP
6366+#undef __OVERFLOW_EXTABLE
6367+#undef __OVERFLOW_POST
6368
6369 /*
6370 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6371@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6372 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6373 * The function returns the old value of @v minus @i.
6374 */
6375-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6376+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6377 {
6378 long result;
6379
6380@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6381 long temp;
6382
6383 __asm__ __volatile__(
6384- " .set arch=r4000 \n"
6385+ " .set "MIPS_ISA_LEVEL" \n"
6386 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6387 " dsubu %0, %1, %3 \n"
6388 " bltz %0, 1f \n"
6389@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6390 return result;
6391 }
6392
6393-#define atomic64_cmpxchg(v, o, n) \
6394- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6395-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6396+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6397+{
6398+ return cmpxchg(&v->counter, old, new);
6399+}
6400+
6401+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6402+ long new)
6403+{
6404+ return cmpxchg(&(v->counter), old, new);
6405+}
6406+
6407+static inline long atomic64_xchg(atomic64_t *v, long new)
6408+{
6409+ return xchg(&v->counter, new);
6410+}
6411+
6412+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6413+{
6414+ return xchg(&(v->counter), new);
6415+}
6416
6417 /**
6418 * atomic64_add_unless - add unless the number is a given value
6419@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6420
6421 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6422 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6423+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6424
6425 /*
6426 * atomic64_sub_and_test - subtract value from variable and test result
6427@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6428 * other cases.
6429 */
6430 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6431+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6432
6433 /*
6434 * atomic64_dec_and_test - decrement by 1 and test
6435@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6436 * Atomically increments @v by 1.
6437 */
6438 #define atomic64_inc(v) atomic64_add(1, (v))
6439+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6440
6441 /*
6442 * atomic64_dec - decrement and test
6443@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6444 * Atomically decrements @v by 1.
6445 */
6446 #define atomic64_dec(v) atomic64_sub(1, (v))
6447+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6448
6449 /*
6450 * atomic64_add_negative - add and test if negative
6451diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6452index 2b8bbbc..4556df6 100644
6453--- a/arch/mips/include/asm/barrier.h
6454+++ b/arch/mips/include/asm/barrier.h
6455@@ -133,7 +133,7 @@
6456 do { \
6457 compiletime_assert_atomic_type(*p); \
6458 smp_mb(); \
6459- ACCESS_ONCE(*p) = (v); \
6460+ ACCESS_ONCE_RW(*p) = (v); \
6461 } while (0)
6462
6463 #define smp_load_acquire(p) \
6464diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6465index b4db69f..8f3b093 100644
6466--- a/arch/mips/include/asm/cache.h
6467+++ b/arch/mips/include/asm/cache.h
6468@@ -9,10 +9,11 @@
6469 #ifndef _ASM_CACHE_H
6470 #define _ASM_CACHE_H
6471
6472+#include <linux/const.h>
6473 #include <kmalloc.h>
6474
6475 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6476-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6477+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6478
6479 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6480 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6481diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6482index f19e890..a4f8177 100644
6483--- a/arch/mips/include/asm/elf.h
6484+++ b/arch/mips/include/asm/elf.h
6485@@ -417,6 +417,13 @@ extern const char *__elf_platform;
6486 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6487 #endif
6488
6489+#ifdef CONFIG_PAX_ASLR
6490+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6491+
6492+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6493+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6494+#endif
6495+
6496 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6497 struct linux_binprm;
6498 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6499diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6500index c1f6afa..38cc6e9 100644
6501--- a/arch/mips/include/asm/exec.h
6502+++ b/arch/mips/include/asm/exec.h
6503@@ -12,6 +12,6 @@
6504 #ifndef _ASM_EXEC_H
6505 #define _ASM_EXEC_H
6506
6507-extern unsigned long arch_align_stack(unsigned long sp);
6508+#define arch_align_stack(x) ((x) & ~0xfUL)
6509
6510 #endif /* _ASM_EXEC_H */
6511diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6512index 9e8ef59..1139d6b 100644
6513--- a/arch/mips/include/asm/hw_irq.h
6514+++ b/arch/mips/include/asm/hw_irq.h
6515@@ -10,7 +10,7 @@
6516
6517 #include <linux/atomic.h>
6518
6519-extern atomic_t irq_err_count;
6520+extern atomic_unchecked_t irq_err_count;
6521
6522 /*
6523 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6524diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6525index 8feaed6..1bd8a64 100644
6526--- a/arch/mips/include/asm/local.h
6527+++ b/arch/mips/include/asm/local.h
6528@@ -13,15 +13,25 @@ typedef struct
6529 atomic_long_t a;
6530 } local_t;
6531
6532+typedef struct {
6533+ atomic_long_unchecked_t a;
6534+} local_unchecked_t;
6535+
6536 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6537
6538 #define local_read(l) atomic_long_read(&(l)->a)
6539+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6540 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6541+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6542
6543 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6544+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6545 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6546+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6547 #define local_inc(l) atomic_long_inc(&(l)->a)
6548+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6549 #define local_dec(l) atomic_long_dec(&(l)->a)
6550+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6551
6552 /*
6553 * Same as above, but return the result value
6554@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6555 return result;
6556 }
6557
6558+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6559+{
6560+ unsigned long result;
6561+
6562+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6563+ unsigned long temp;
6564+
6565+ __asm__ __volatile__(
6566+ " .set mips3 \n"
6567+ "1:" __LL "%1, %2 # local_add_return \n"
6568+ " addu %0, %1, %3 \n"
6569+ __SC "%0, %2 \n"
6570+ " beqzl %0, 1b \n"
6571+ " addu %0, %1, %3 \n"
6572+ " .set mips0 \n"
6573+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6574+ : "Ir" (i), "m" (l->a.counter)
6575+ : "memory");
6576+ } else if (kernel_uses_llsc) {
6577+ unsigned long temp;
6578+
6579+ __asm__ __volatile__(
6580+ " .set mips3 \n"
6581+ "1:" __LL "%1, %2 # local_add_return \n"
6582+ " addu %0, %1, %3 \n"
6583+ __SC "%0, %2 \n"
6584+ " beqz %0, 1b \n"
6585+ " addu %0, %1, %3 \n"
6586+ " .set mips0 \n"
6587+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6588+ : "Ir" (i), "m" (l->a.counter)
6589+ : "memory");
6590+ } else {
6591+ unsigned long flags;
6592+
6593+ local_irq_save(flags);
6594+ result = l->a.counter;
6595+ result += i;
6596+ l->a.counter = result;
6597+ local_irq_restore(flags);
6598+ }
6599+
6600+ return result;
6601+}
6602+
6603 static __inline__ long local_sub_return(long i, local_t * l)
6604 {
6605 unsigned long result;
6606@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6607
6608 #define local_cmpxchg(l, o, n) \
6609 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6610+#define local_cmpxchg_unchecked(l, o, n) \
6611+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6612 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6613
6614 /**
6615diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6616index 89dd7fe..a123c97 100644
6617--- a/arch/mips/include/asm/page.h
6618+++ b/arch/mips/include/asm/page.h
6619@@ -118,7 +118,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6620 #ifdef CONFIG_CPU_MIPS32
6621 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6622 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6623- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6624+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6625 #else
6626 typedef struct { unsigned long long pte; } pte_t;
6627 #define pte_val(x) ((x).pte)
6628diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6629index b336037..5b874cc 100644
6630--- a/arch/mips/include/asm/pgalloc.h
6631+++ b/arch/mips/include/asm/pgalloc.h
6632@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6633 {
6634 set_pud(pud, __pud((unsigned long)pmd));
6635 }
6636+
6637+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6638+{
6639+ pud_populate(mm, pud, pmd);
6640+}
6641 #endif
6642
6643 /*
6644diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6645index 819af9d..439839d 100644
6646--- a/arch/mips/include/asm/pgtable.h
6647+++ b/arch/mips/include/asm/pgtable.h
6648@@ -20,6 +20,9 @@
6649 #include <asm/io.h>
6650 #include <asm/pgtable-bits.h>
6651
6652+#define ktla_ktva(addr) (addr)
6653+#define ktva_ktla(addr) (addr)
6654+
6655 struct mm_struct;
6656 struct vm_area_struct;
6657
6658diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6659index 9c0014e..5101ef5 100644
6660--- a/arch/mips/include/asm/thread_info.h
6661+++ b/arch/mips/include/asm/thread_info.h
6662@@ -100,6 +100,9 @@ static inline struct thread_info *current_thread_info(void)
6663 #define TIF_SECCOMP 4 /* secure computing */
6664 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6665 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6666+/* li takes a 32bit immediate */
6667+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6668+
6669 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6670 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6671 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6672@@ -135,14 +138,16 @@ static inline struct thread_info *current_thread_info(void)
6673 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6674 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6675 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6676+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6677
6678 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6679 _TIF_SYSCALL_AUDIT | \
6680- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6681+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6682+ _TIF_GRSEC_SETXID)
6683
6684 /* work to do in syscall_trace_leave() */
6685 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6686- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6687+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6688
6689 /* work to do on interrupt/exception return */
6690 #define _TIF_WORK_MASK \
6691@@ -150,7 +155,7 @@ static inline struct thread_info *current_thread_info(void)
6692 /* work to do on any return to u-space */
6693 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6694 _TIF_WORK_SYSCALL_EXIT | \
6695- _TIF_SYSCALL_TRACEPOINT)
6696+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6697
6698 /*
6699 * We stash processor id into a COP0 register to retrieve it fast
6700diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6701index bf8b324..cec5705 100644
6702--- a/arch/mips/include/asm/uaccess.h
6703+++ b/arch/mips/include/asm/uaccess.h
6704@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6705 __ok == 0; \
6706 })
6707
6708+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6709 #define access_ok(type, addr, size) \
6710 likely(__access_ok((addr), (size), __access_mask))
6711
6712diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6713index 1188e00..41cf144 100644
6714--- a/arch/mips/kernel/binfmt_elfn32.c
6715+++ b/arch/mips/kernel/binfmt_elfn32.c
6716@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6717 #undef ELF_ET_DYN_BASE
6718 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6719
6720+#ifdef CONFIG_PAX_ASLR
6721+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6722+
6723+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6724+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6725+#endif
6726+
6727 #include <asm/processor.h>
6728 #include <linux/module.h>
6729 #include <linux/elfcore.h>
6730diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6731index 9287678..f870e47 100644
6732--- a/arch/mips/kernel/binfmt_elfo32.c
6733+++ b/arch/mips/kernel/binfmt_elfo32.c
6734@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6735 #undef ELF_ET_DYN_BASE
6736 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6737
6738+#ifdef CONFIG_PAX_ASLR
6739+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6740+
6741+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6742+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6743+#endif
6744+
6745 #include <asm/processor.h>
6746
6747 #include <linux/module.h>
6748diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6749index a74ec3a..4f06f18 100644
6750--- a/arch/mips/kernel/i8259.c
6751+++ b/arch/mips/kernel/i8259.c
6752@@ -202,7 +202,7 @@ spurious_8259A_irq:
6753 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6754 spurious_irq_mask |= irqmask;
6755 }
6756- atomic_inc(&irq_err_count);
6757+ atomic_inc_unchecked(&irq_err_count);
6758 /*
6759 * Theoretically we do not have to handle this IRQ,
6760 * but in Linux this does not cause problems and is
6761diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6762index 44a1f79..2bd6aa3 100644
6763--- a/arch/mips/kernel/irq-gt641xx.c
6764+++ b/arch/mips/kernel/irq-gt641xx.c
6765@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6766 }
6767 }
6768
6769- atomic_inc(&irq_err_count);
6770+ atomic_inc_unchecked(&irq_err_count);
6771 }
6772
6773 void __init gt641xx_irq_init(void)
6774diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6775index 3c8a18a..b4929b6 100644
6776--- a/arch/mips/kernel/irq.c
6777+++ b/arch/mips/kernel/irq.c
6778@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6779 printk("unexpected IRQ # %d\n", irq);
6780 }
6781
6782-atomic_t irq_err_count;
6783+atomic_unchecked_t irq_err_count;
6784
6785 int arch_show_interrupts(struct seq_file *p, int prec)
6786 {
6787- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6788+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6789 return 0;
6790 }
6791
6792 asmlinkage void spurious_interrupt(void)
6793 {
6794- atomic_inc(&irq_err_count);
6795+ atomic_inc_unchecked(&irq_err_count);
6796 }
6797
6798 void __init init_IRQ(void)
6799@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6800 }
6801
6802 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6803+
6804+extern void gr_handle_kernel_exploit(void);
6805 static inline void check_stack_overflow(void)
6806 {
6807 unsigned long sp;
6808@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6809 printk("do_IRQ: stack overflow: %ld\n",
6810 sp - sizeof(struct thread_info));
6811 dump_stack();
6812+ gr_handle_kernel_exploit();
6813 }
6814 }
6815 #else
6816diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6817index 0614717..002fa43 100644
6818--- a/arch/mips/kernel/pm-cps.c
6819+++ b/arch/mips/kernel/pm-cps.c
6820@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6821 nc_core_ready_count = nc_addr;
6822
6823 /* Ensure ready_count is zero-initialised before the assembly runs */
6824- ACCESS_ONCE(*nc_core_ready_count) = 0;
6825+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6826 coupled_barrier(&per_cpu(pm_barrier, core), online);
6827
6828 /* Run the generated entry code */
6829diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6830index f2975d4..f61d355 100644
6831--- a/arch/mips/kernel/process.c
6832+++ b/arch/mips/kernel/process.c
6833@@ -541,18 +541,6 @@ out:
6834 return pc;
6835 }
6836
6837-/*
6838- * Don't forget that the stack pointer must be aligned on a 8 bytes
6839- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6840- */
6841-unsigned long arch_align_stack(unsigned long sp)
6842-{
6843- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6844- sp -= get_random_int() & ~PAGE_MASK;
6845-
6846- return sp & ALMASK;
6847-}
6848-
6849 static void arch_dump_stack(void *info)
6850 {
6851 struct pt_regs *regs;
6852diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6853index e933a30..0d02625 100644
6854--- a/arch/mips/kernel/ptrace.c
6855+++ b/arch/mips/kernel/ptrace.c
6856@@ -785,6 +785,10 @@ long arch_ptrace(struct task_struct *child, long request,
6857 return ret;
6858 }
6859
6860+#ifdef CONFIG_GRKERNSEC_SETXID
6861+extern void gr_delayed_cred_worker(void);
6862+#endif
6863+
6864 /*
6865 * Notification of system call entry/exit
6866 * - triggered by current->work.syscall_trace
6867@@ -803,6 +807,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6868 tracehook_report_syscall_entry(regs))
6869 ret = -1;
6870
6871+#ifdef CONFIG_GRKERNSEC_SETXID
6872+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6873+ gr_delayed_cred_worker();
6874+#endif
6875+
6876 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6877 trace_sys_enter(regs, regs->regs[2]);
6878
6879diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6880index 2242bdd..b284048 100644
6881--- a/arch/mips/kernel/sync-r4k.c
6882+++ b/arch/mips/kernel/sync-r4k.c
6883@@ -18,8 +18,8 @@
6884 #include <asm/mipsregs.h>
6885
6886 static atomic_t count_start_flag = ATOMIC_INIT(0);
6887-static atomic_t count_count_start = ATOMIC_INIT(0);
6888-static atomic_t count_count_stop = ATOMIC_INIT(0);
6889+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6890+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6891 static atomic_t count_reference = ATOMIC_INIT(0);
6892
6893 #define COUNTON 100
6894@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6895
6896 for (i = 0; i < NR_LOOPS; i++) {
6897 /* slaves loop on '!= 2' */
6898- while (atomic_read(&count_count_start) != 1)
6899+ while (atomic_read_unchecked(&count_count_start) != 1)
6900 mb();
6901- atomic_set(&count_count_stop, 0);
6902+ atomic_set_unchecked(&count_count_stop, 0);
6903 smp_wmb();
6904
6905 /* this lets the slaves write their count register */
6906- atomic_inc(&count_count_start);
6907+ atomic_inc_unchecked(&count_count_start);
6908
6909 /*
6910 * Everyone initialises count in the last loop:
6911@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6912 /*
6913 * Wait for all slaves to leave the synchronization point:
6914 */
6915- while (atomic_read(&count_count_stop) != 1)
6916+ while (atomic_read_unchecked(&count_count_stop) != 1)
6917 mb();
6918- atomic_set(&count_count_start, 0);
6919+ atomic_set_unchecked(&count_count_start, 0);
6920 smp_wmb();
6921- atomic_inc(&count_count_stop);
6922+ atomic_inc_unchecked(&count_count_stop);
6923 }
6924 /* Arrange for an interrupt in a short while */
6925 write_c0_compare(read_c0_count() + COUNTON);
6926@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6927 initcount = atomic_read(&count_reference);
6928
6929 for (i = 0; i < NR_LOOPS; i++) {
6930- atomic_inc(&count_count_start);
6931- while (atomic_read(&count_count_start) != 2)
6932+ atomic_inc_unchecked(&count_count_start);
6933+ while (atomic_read_unchecked(&count_count_start) != 2)
6934 mb();
6935
6936 /*
6937@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6938 if (i == NR_LOOPS-1)
6939 write_c0_count(initcount);
6940
6941- atomic_inc(&count_count_stop);
6942- while (atomic_read(&count_count_stop) != 2)
6943+ atomic_inc_unchecked(&count_count_stop);
6944+ while (atomic_read_unchecked(&count_count_stop) != 2)
6945 mb();
6946 }
6947 /* Arrange for an interrupt in a short while */
6948diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6949index d2d1c19..3e21d8d 100644
6950--- a/arch/mips/kernel/traps.c
6951+++ b/arch/mips/kernel/traps.c
6952@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6953 siginfo_t info;
6954
6955 prev_state = exception_enter();
6956- die_if_kernel("Integer overflow", regs);
6957+ if (unlikely(!user_mode(regs))) {
6958+
6959+#ifdef CONFIG_PAX_REFCOUNT
6960+ if (fixup_exception(regs)) {
6961+ pax_report_refcount_overflow(regs);
6962+ exception_exit(prev_state);
6963+ return;
6964+ }
6965+#endif
6966+
6967+ die("Integer overflow", regs);
6968+ }
6969
6970 info.si_code = FPE_INTOVF;
6971 info.si_signo = SIGFPE;
6972diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6973index 52f205a..335927c 100644
6974--- a/arch/mips/kvm/mips.c
6975+++ b/arch/mips/kvm/mips.c
6976@@ -1013,7 +1013,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6977 return r;
6978 }
6979
6980-int kvm_arch_init(void *opaque)
6981+int kvm_arch_init(const void *opaque)
6982 {
6983 if (kvm_mips_callbacks) {
6984 kvm_err("kvm: module already exists\n");
6985diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6986index 7ff8637..6004edb 100644
6987--- a/arch/mips/mm/fault.c
6988+++ b/arch/mips/mm/fault.c
6989@@ -31,6 +31,23 @@
6990
6991 int show_unhandled_signals = 1;
6992
6993+#ifdef CONFIG_PAX_PAGEEXEC
6994+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6995+{
6996+ unsigned long i;
6997+
6998+ printk(KERN_ERR "PAX: bytes at PC: ");
6999+ for (i = 0; i < 5; i++) {
7000+ unsigned int c;
7001+ if (get_user(c, (unsigned int *)pc+i))
7002+ printk(KERN_CONT "???????? ");
7003+ else
7004+ printk(KERN_CONT "%08x ", c);
7005+ }
7006+ printk("\n");
7007+}
7008+#endif
7009+
7010 /*
7011 * This routine handles page faults. It determines the address,
7012 * and the problem, and then passes it off to one of the appropriate
7013@@ -206,6 +223,14 @@ bad_area:
7014 bad_area_nosemaphore:
7015 /* User mode accesses just cause a SIGSEGV */
7016 if (user_mode(regs)) {
7017+
7018+#ifdef CONFIG_PAX_PAGEEXEC
7019+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
7020+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
7021+ do_group_exit(SIGKILL);
7022+ }
7023+#endif
7024+
7025 tsk->thread.cp0_badvaddr = address;
7026 tsk->thread.error_code = write;
7027 if (show_unhandled_signals &&
7028diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
7029index 5c81fdd..db158d3 100644
7030--- a/arch/mips/mm/mmap.c
7031+++ b/arch/mips/mm/mmap.c
7032@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7033 struct vm_area_struct *vma;
7034 unsigned long addr = addr0;
7035 int do_color_align;
7036+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
7037 struct vm_unmapped_area_info info;
7038
7039 if (unlikely(len > TASK_SIZE))
7040@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7041 do_color_align = 1;
7042
7043 /* requesting a specific address */
7044+
7045+#ifdef CONFIG_PAX_RANDMMAP
7046+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7047+#endif
7048+
7049 if (addr) {
7050 if (do_color_align)
7051 addr = COLOUR_ALIGN(addr, pgoff);
7052@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7053 addr = PAGE_ALIGN(addr);
7054
7055 vma = find_vma(mm, addr);
7056- if (TASK_SIZE - len >= addr &&
7057- (!vma || addr + len <= vma->vm_start))
7058+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7059 return addr;
7060 }
7061
7062 info.length = len;
7063 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7064 info.align_offset = pgoff << PAGE_SHIFT;
7065+ info.threadstack_offset = offset;
7066
7067 if (dir == DOWN) {
7068 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7069@@ -160,45 +166,34 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7070 {
7071 unsigned long random_factor = 0UL;
7072
7073+#ifdef CONFIG_PAX_RANDMMAP
7074+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7075+#endif
7076+
7077 if (current->flags & PF_RANDOMIZE)
7078 random_factor = arch_mmap_rnd();
7079
7080 if (mmap_is_legacy()) {
7081 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7082+
7083+#ifdef CONFIG_PAX_RANDMMAP
7084+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7085+ mm->mmap_base += mm->delta_mmap;
7086+#endif
7087+
7088 mm->get_unmapped_area = arch_get_unmapped_area;
7089 } else {
7090 mm->mmap_base = mmap_base(random_factor);
7091+
7092+#ifdef CONFIG_PAX_RANDMMAP
7093+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7094+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7095+#endif
7096+
7097 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7098 }
7099 }
7100
7101-static inline unsigned long brk_rnd(void)
7102-{
7103- unsigned long rnd = get_random_int();
7104-
7105- rnd = rnd << PAGE_SHIFT;
7106- /* 8MB for 32bit, 256MB for 64bit */
7107- if (TASK_IS_32BIT_ADDR)
7108- rnd = rnd & 0x7ffffful;
7109- else
7110- rnd = rnd & 0xffffffful;
7111-
7112- return rnd;
7113-}
7114-
7115-unsigned long arch_randomize_brk(struct mm_struct *mm)
7116-{
7117- unsigned long base = mm->brk;
7118- unsigned long ret;
7119-
7120- ret = PAGE_ALIGN(base + brk_rnd());
7121-
7122- if (ret < mm->brk)
7123- return mm->brk;
7124-
7125- return ret;
7126-}
7127-
7128 int __virt_addr_valid(const volatile void *kaddr)
7129 {
7130 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7131diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7132index a2358b4..7cead4f 100644
7133--- a/arch/mips/sgi-ip27/ip27-nmi.c
7134+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7135@@ -187,9 +187,9 @@ void
7136 cont_nmi_dump(void)
7137 {
7138 #ifndef REAL_NMI_SIGNAL
7139- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7140+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7141
7142- atomic_inc(&nmied_cpus);
7143+ atomic_inc_unchecked(&nmied_cpus);
7144 #endif
7145 /*
7146 * Only allow 1 cpu to proceed
7147@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7148 udelay(10000);
7149 }
7150 #else
7151- while (atomic_read(&nmied_cpus) != num_online_cpus());
7152+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7153 #endif
7154
7155 /*
7156diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7157index a046b30..6799527 100644
7158--- a/arch/mips/sni/rm200.c
7159+++ b/arch/mips/sni/rm200.c
7160@@ -270,7 +270,7 @@ spurious_8259A_irq:
7161 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7162 spurious_irq_mask |= irqmask;
7163 }
7164- atomic_inc(&irq_err_count);
7165+ atomic_inc_unchecked(&irq_err_count);
7166 /*
7167 * Theoretically we do not have to handle this IRQ,
7168 * but in Linux this does not cause problems and is
7169diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7170index 41e873b..34d33a7 100644
7171--- a/arch/mips/vr41xx/common/icu.c
7172+++ b/arch/mips/vr41xx/common/icu.c
7173@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7174
7175 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7176
7177- atomic_inc(&irq_err_count);
7178+ atomic_inc_unchecked(&irq_err_count);
7179
7180 return -1;
7181 }
7182diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7183index ae0e4ee..e8f0692 100644
7184--- a/arch/mips/vr41xx/common/irq.c
7185+++ b/arch/mips/vr41xx/common/irq.c
7186@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7187 irq_cascade_t *cascade;
7188
7189 if (irq >= NR_IRQS) {
7190- atomic_inc(&irq_err_count);
7191+ atomic_inc_unchecked(&irq_err_count);
7192 return;
7193 }
7194
7195@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7196 ret = cascade->get_irq(irq);
7197 irq = ret;
7198 if (ret < 0)
7199- atomic_inc(&irq_err_count);
7200+ atomic_inc_unchecked(&irq_err_count);
7201 else
7202 irq_dispatch(irq);
7203 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7204diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7205index 967d144..db12197 100644
7206--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7207+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7208@@ -11,12 +11,14 @@
7209 #ifndef _ASM_PROC_CACHE_H
7210 #define _ASM_PROC_CACHE_H
7211
7212+#include <linux/const.h>
7213+
7214 /* L1 cache */
7215
7216 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7217 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7218-#define L1_CACHE_BYTES 16 /* bytes per entry */
7219 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7220+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7221 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7222
7223 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7224diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7225index bcb5df2..84fabd2 100644
7226--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7227+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7228@@ -16,13 +16,15 @@
7229 #ifndef _ASM_PROC_CACHE_H
7230 #define _ASM_PROC_CACHE_H
7231
7232+#include <linux/const.h>
7233+
7234 /*
7235 * L1 cache
7236 */
7237 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7238 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7239-#define L1_CACHE_BYTES 32 /* bytes per entry */
7240 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7241+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7242 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7243
7244 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7245diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7246index 4ce7a01..449202a 100644
7247--- a/arch/openrisc/include/asm/cache.h
7248+++ b/arch/openrisc/include/asm/cache.h
7249@@ -19,11 +19,13 @@
7250 #ifndef __ASM_OPENRISC_CACHE_H
7251 #define __ASM_OPENRISC_CACHE_H
7252
7253+#include <linux/const.h>
7254+
7255 /* FIXME: How can we replace these with values from the CPU...
7256 * they shouldn't be hard-coded!
7257 */
7258
7259-#define L1_CACHE_BYTES 16
7260 #define L1_CACHE_SHIFT 4
7261+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7262
7263 #endif /* __ASM_OPENRISC_CACHE_H */
7264diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7265index 226f8ca9..9d9b87d 100644
7266--- a/arch/parisc/include/asm/atomic.h
7267+++ b/arch/parisc/include/asm/atomic.h
7268@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7269 return dec;
7270 }
7271
7272+#define atomic64_read_unchecked(v) atomic64_read(v)
7273+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7274+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7275+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7276+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7277+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7278+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7279+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7280+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7281+
7282 #endif /* !CONFIG_64BIT */
7283
7284
7285diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7286index 47f11c7..3420df2 100644
7287--- a/arch/parisc/include/asm/cache.h
7288+++ b/arch/parisc/include/asm/cache.h
7289@@ -5,6 +5,7 @@
7290 #ifndef __ARCH_PARISC_CACHE_H
7291 #define __ARCH_PARISC_CACHE_H
7292
7293+#include <linux/const.h>
7294
7295 /*
7296 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7297@@ -15,13 +16,13 @@
7298 * just ruin performance.
7299 */
7300 #ifdef CONFIG_PA20
7301-#define L1_CACHE_BYTES 64
7302 #define L1_CACHE_SHIFT 6
7303 #else
7304-#define L1_CACHE_BYTES 32
7305 #define L1_CACHE_SHIFT 5
7306 #endif
7307
7308+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7309+
7310 #ifndef __ASSEMBLY__
7311
7312 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7313diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7314index 78c9fd3..42fa66a 100644
7315--- a/arch/parisc/include/asm/elf.h
7316+++ b/arch/parisc/include/asm/elf.h
7317@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7318
7319 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7320
7321+#ifdef CONFIG_PAX_ASLR
7322+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7323+
7324+#define PAX_DELTA_MMAP_LEN 16
7325+#define PAX_DELTA_STACK_LEN 16
7326+#endif
7327+
7328 /* This yields a mask that user programs can use to figure out what
7329 instruction set this CPU supports. This could be done in user space,
7330 but it's not easy, and we've already done it here. */
7331diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7332index 3a08eae..08fef28 100644
7333--- a/arch/parisc/include/asm/pgalloc.h
7334+++ b/arch/parisc/include/asm/pgalloc.h
7335@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7336 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7337 }
7338
7339+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7340+{
7341+ pgd_populate(mm, pgd, pmd);
7342+}
7343+
7344 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7345 {
7346 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7347@@ -72,7 +77,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7348
7349 static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7350 {
7351- if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)
7352+ if (pmd_flag(*pmd) & PxD_FLAG_ATTACHED) {
7353 /*
7354 * This is the permanent pmd attached to the pgd;
7355 * cannot free it.
7356@@ -81,6 +86,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7357 */
7358 mm_inc_nr_pmds(mm);
7359 return;
7360+ }
7361 free_pages((unsigned long)pmd, PMD_ORDER);
7362 }
7363
7364@@ -96,6 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7365 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7366 #define pmd_free(mm, x) do { } while (0)
7367 #define pgd_populate(mm, pmd, pte) BUG()
7368+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7369
7370 #endif
7371
7372diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7373index 0a18375..d613939 100644
7374--- a/arch/parisc/include/asm/pgtable.h
7375+++ b/arch/parisc/include/asm/pgtable.h
7376@@ -213,6 +213,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7377 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7378 #define PAGE_COPY PAGE_EXECREAD
7379 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7380+
7381+#ifdef CONFIG_PAX_PAGEEXEC
7382+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7383+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7384+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7385+#else
7386+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7387+# define PAGE_COPY_NOEXEC PAGE_COPY
7388+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7389+#endif
7390+
7391 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7392 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7393 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7394diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7395index 0abdd4c..1af92f0 100644
7396--- a/arch/parisc/include/asm/uaccess.h
7397+++ b/arch/parisc/include/asm/uaccess.h
7398@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7399 const void __user *from,
7400 unsigned long n)
7401 {
7402- int sz = __compiletime_object_size(to);
7403+ size_t sz = __compiletime_object_size(to);
7404 int ret = -EFAULT;
7405
7406- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7407+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7408 ret = __copy_from_user(to, from, n);
7409 else
7410 copy_from_user_overflow();
7411diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7412index 3c63a82..b1d6ee9 100644
7413--- a/arch/parisc/kernel/module.c
7414+++ b/arch/parisc/kernel/module.c
7415@@ -98,16 +98,38 @@
7416
7417 /* three functions to determine where in the module core
7418 * or init pieces the location is */
7419+static inline int in_init_rx(struct module *me, void *loc)
7420+{
7421+ return (loc >= me->module_init_rx &&
7422+ loc < (me->module_init_rx + me->init_size_rx));
7423+}
7424+
7425+static inline int in_init_rw(struct module *me, void *loc)
7426+{
7427+ return (loc >= me->module_init_rw &&
7428+ loc < (me->module_init_rw + me->init_size_rw));
7429+}
7430+
7431 static inline int in_init(struct module *me, void *loc)
7432 {
7433- return (loc >= me->module_init &&
7434- loc <= (me->module_init + me->init_size));
7435+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7436+}
7437+
7438+static inline int in_core_rx(struct module *me, void *loc)
7439+{
7440+ return (loc >= me->module_core_rx &&
7441+ loc < (me->module_core_rx + me->core_size_rx));
7442+}
7443+
7444+static inline int in_core_rw(struct module *me, void *loc)
7445+{
7446+ return (loc >= me->module_core_rw &&
7447+ loc < (me->module_core_rw + me->core_size_rw));
7448 }
7449
7450 static inline int in_core(struct module *me, void *loc)
7451 {
7452- return (loc >= me->module_core &&
7453- loc <= (me->module_core + me->core_size));
7454+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7455 }
7456
7457 static inline int in_local(struct module *me, void *loc)
7458@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7459 }
7460
7461 /* align things a bit */
7462- me->core_size = ALIGN(me->core_size, 16);
7463- me->arch.got_offset = me->core_size;
7464- me->core_size += gots * sizeof(struct got_entry);
7465+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7466+ me->arch.got_offset = me->core_size_rw;
7467+ me->core_size_rw += gots * sizeof(struct got_entry);
7468
7469- me->core_size = ALIGN(me->core_size, 16);
7470- me->arch.fdesc_offset = me->core_size;
7471- me->core_size += fdescs * sizeof(Elf_Fdesc);
7472+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7473+ me->arch.fdesc_offset = me->core_size_rw;
7474+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7475
7476 me->arch.got_max = gots;
7477 me->arch.fdesc_max = fdescs;
7478@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7479
7480 BUG_ON(value == 0);
7481
7482- got = me->module_core + me->arch.got_offset;
7483+ got = me->module_core_rw + me->arch.got_offset;
7484 for (i = 0; got[i].addr; i++)
7485 if (got[i].addr == value)
7486 goto out;
7487@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7488 #ifdef CONFIG_64BIT
7489 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7490 {
7491- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7492+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7493
7494 if (!value) {
7495 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7496@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7497
7498 /* Create new one */
7499 fdesc->addr = value;
7500- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7501+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7502 return (Elf_Addr)fdesc;
7503 }
7504 #endif /* CONFIG_64BIT */
7505@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7506
7507 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7508 end = table + sechdrs[me->arch.unwind_section].sh_size;
7509- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7510+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7511
7512 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7513 me->arch.unwind_section, table, end, gp);
7514diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7515index 5aba01a..47cdd5a 100644
7516--- a/arch/parisc/kernel/sys_parisc.c
7517+++ b/arch/parisc/kernel/sys_parisc.c
7518@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7519 unsigned long task_size = TASK_SIZE;
7520 int do_color_align, last_mmap;
7521 struct vm_unmapped_area_info info;
7522+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7523
7524 if (len > task_size)
7525 return -ENOMEM;
7526@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7527 goto found_addr;
7528 }
7529
7530+#ifdef CONFIG_PAX_RANDMMAP
7531+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7532+#endif
7533+
7534 if (addr) {
7535 if (do_color_align && last_mmap)
7536 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7537@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7538 info.high_limit = mmap_upper_limit();
7539 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7540 info.align_offset = shared_align_offset(last_mmap, pgoff);
7541+ info.threadstack_offset = offset;
7542 addr = vm_unmapped_area(&info);
7543
7544 found_addr:
7545@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7546 unsigned long addr = addr0;
7547 int do_color_align, last_mmap;
7548 struct vm_unmapped_area_info info;
7549+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7550
7551 #ifdef CONFIG_64BIT
7552 /* This should only ever run for 32-bit processes. */
7553@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7554 }
7555
7556 /* requesting a specific address */
7557+#ifdef CONFIG_PAX_RANDMMAP
7558+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7559+#endif
7560+
7561 if (addr) {
7562 if (do_color_align && last_mmap)
7563 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7564@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7565 info.high_limit = mm->mmap_base;
7566 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7567 info.align_offset = shared_align_offset(last_mmap, pgoff);
7568+ info.threadstack_offset = offset;
7569 addr = vm_unmapped_area(&info);
7570 if (!(addr & ~PAGE_MASK))
7571 goto found_addr;
7572@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7573 mm->mmap_legacy_base = mmap_legacy_base();
7574 mm->mmap_base = mmap_upper_limit();
7575
7576+#ifdef CONFIG_PAX_RANDMMAP
7577+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7578+ mm->mmap_legacy_base += mm->delta_mmap;
7579+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7580+ }
7581+#endif
7582+
7583 if (mmap_is_legacy()) {
7584 mm->mmap_base = mm->mmap_legacy_base;
7585 mm->get_unmapped_area = arch_get_unmapped_area;
7586diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7587index 47ee620..1107387 100644
7588--- a/arch/parisc/kernel/traps.c
7589+++ b/arch/parisc/kernel/traps.c
7590@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7591
7592 down_read(&current->mm->mmap_sem);
7593 vma = find_vma(current->mm,regs->iaoq[0]);
7594- if (vma && (regs->iaoq[0] >= vma->vm_start)
7595- && (vma->vm_flags & VM_EXEC)) {
7596-
7597+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7598 fault_address = regs->iaoq[0];
7599 fault_space = regs->iasq[0];
7600
7601diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7602index e5120e6..8ddb5cc 100644
7603--- a/arch/parisc/mm/fault.c
7604+++ b/arch/parisc/mm/fault.c
7605@@ -15,6 +15,7 @@
7606 #include <linux/sched.h>
7607 #include <linux/interrupt.h>
7608 #include <linux/module.h>
7609+#include <linux/unistd.h>
7610
7611 #include <asm/uaccess.h>
7612 #include <asm/traps.h>
7613@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7614 static unsigned long
7615 parisc_acctyp(unsigned long code, unsigned int inst)
7616 {
7617- if (code == 6 || code == 16)
7618+ if (code == 6 || code == 7 || code == 16)
7619 return VM_EXEC;
7620
7621 switch (inst & 0xf0000000) {
7622@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7623 }
7624 #endif
7625
7626+#ifdef CONFIG_PAX_PAGEEXEC
7627+/*
7628+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7629+ *
7630+ * returns 1 when task should be killed
7631+ * 2 when rt_sigreturn trampoline was detected
7632+ * 3 when unpatched PLT trampoline was detected
7633+ */
7634+static int pax_handle_fetch_fault(struct pt_regs *regs)
7635+{
7636+
7637+#ifdef CONFIG_PAX_EMUPLT
7638+ int err;
7639+
7640+ do { /* PaX: unpatched PLT emulation */
7641+ unsigned int bl, depwi;
7642+
7643+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7644+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7645+
7646+ if (err)
7647+ break;
7648+
7649+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7650+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7651+
7652+ err = get_user(ldw, (unsigned int *)addr);
7653+ err |= get_user(bv, (unsigned int *)(addr+4));
7654+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7655+
7656+ if (err)
7657+ break;
7658+
7659+ if (ldw == 0x0E801096U &&
7660+ bv == 0xEAC0C000U &&
7661+ ldw2 == 0x0E881095U)
7662+ {
7663+ unsigned int resolver, map;
7664+
7665+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7666+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7667+ if (err)
7668+ break;
7669+
7670+ regs->gr[20] = instruction_pointer(regs)+8;
7671+ regs->gr[21] = map;
7672+ regs->gr[22] = resolver;
7673+ regs->iaoq[0] = resolver | 3UL;
7674+ regs->iaoq[1] = regs->iaoq[0] + 4;
7675+ return 3;
7676+ }
7677+ }
7678+ } while (0);
7679+#endif
7680+
7681+#ifdef CONFIG_PAX_EMUTRAMP
7682+
7683+#ifndef CONFIG_PAX_EMUSIGRT
7684+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7685+ return 1;
7686+#endif
7687+
7688+ do { /* PaX: rt_sigreturn emulation */
7689+ unsigned int ldi1, ldi2, bel, nop;
7690+
7691+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7692+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7693+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7694+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7695+
7696+ if (err)
7697+ break;
7698+
7699+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7700+ ldi2 == 0x3414015AU &&
7701+ bel == 0xE4008200U &&
7702+ nop == 0x08000240U)
7703+ {
7704+ regs->gr[25] = (ldi1 & 2) >> 1;
7705+ regs->gr[20] = __NR_rt_sigreturn;
7706+ regs->gr[31] = regs->iaoq[1] + 16;
7707+ regs->sr[0] = regs->iasq[1];
7708+ regs->iaoq[0] = 0x100UL;
7709+ regs->iaoq[1] = regs->iaoq[0] + 4;
7710+ regs->iasq[0] = regs->sr[2];
7711+ regs->iasq[1] = regs->sr[2];
7712+ return 2;
7713+ }
7714+ } while (0);
7715+#endif
7716+
7717+ return 1;
7718+}
7719+
7720+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7721+{
7722+ unsigned long i;
7723+
7724+ printk(KERN_ERR "PAX: bytes at PC: ");
7725+ for (i = 0; i < 5; i++) {
7726+ unsigned int c;
7727+ if (get_user(c, (unsigned int *)pc+i))
7728+ printk(KERN_CONT "???????? ");
7729+ else
7730+ printk(KERN_CONT "%08x ", c);
7731+ }
7732+ printk("\n");
7733+}
7734+#endif
7735+
7736 int fixup_exception(struct pt_regs *regs)
7737 {
7738 const struct exception_table_entry *fix;
7739@@ -234,8 +345,33 @@ retry:
7740
7741 good_area:
7742
7743- if ((vma->vm_flags & acc_type) != acc_type)
7744+ if ((vma->vm_flags & acc_type) != acc_type) {
7745+
7746+#ifdef CONFIG_PAX_PAGEEXEC
7747+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7748+ (address & ~3UL) == instruction_pointer(regs))
7749+ {
7750+ up_read(&mm->mmap_sem);
7751+ switch (pax_handle_fetch_fault(regs)) {
7752+
7753+#ifdef CONFIG_PAX_EMUPLT
7754+ case 3:
7755+ return;
7756+#endif
7757+
7758+#ifdef CONFIG_PAX_EMUTRAMP
7759+ case 2:
7760+ return;
7761+#endif
7762+
7763+ }
7764+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7765+ do_group_exit(SIGKILL);
7766+ }
7767+#endif
7768+
7769 goto bad_area;
7770+ }
7771
7772 /*
7773 * If for any reason at all we couldn't handle the fault, make
7774diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7775index 190cc48..48439ce 100644
7776--- a/arch/powerpc/Kconfig
7777+++ b/arch/powerpc/Kconfig
7778@@ -413,6 +413,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7779 config KEXEC
7780 bool "kexec system call"
7781 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7782+ depends on !GRKERNSEC_KMEM
7783 help
7784 kexec is a system call that implements the ability to shutdown your
7785 current kernel, and to start another kernel. It is like a reboot
7786diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7787index 512d278..d31fadd 100644
7788--- a/arch/powerpc/include/asm/atomic.h
7789+++ b/arch/powerpc/include/asm/atomic.h
7790@@ -12,6 +12,11 @@
7791
7792 #define ATOMIC_INIT(i) { (i) }
7793
7794+#define _ASM_EXTABLE(from, to) \
7795+" .section __ex_table,\"a\"\n" \
7796+ PPC_LONG" " #from ", " #to"\n" \
7797+" .previous\n"
7798+
7799 static __inline__ int atomic_read(const atomic_t *v)
7800 {
7801 int t;
7802@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7803 return t;
7804 }
7805
7806+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7807+{
7808+ int t;
7809+
7810+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7811+
7812+ return t;
7813+}
7814+
7815 static __inline__ void atomic_set(atomic_t *v, int i)
7816 {
7817 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7818 }
7819
7820-#define ATOMIC_OP(op, asm_op) \
7821-static __inline__ void atomic_##op(int a, atomic_t *v) \
7822+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7823+{
7824+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7825+}
7826+
7827+#ifdef CONFIG_PAX_REFCOUNT
7828+#define __REFCOUNT_OP(op) op##o.
7829+#define __OVERFLOW_PRE \
7830+ " mcrxr cr0\n"
7831+#define __OVERFLOW_POST \
7832+ " bf 4*cr0+so, 3f\n" \
7833+ "2: .long 0x00c00b00\n" \
7834+ "3:\n"
7835+#define __OVERFLOW_EXTABLE \
7836+ "\n4:\n"
7837+ _ASM_EXTABLE(2b, 4b)
7838+#else
7839+#define __REFCOUNT_OP(op) op
7840+#define __OVERFLOW_PRE
7841+#define __OVERFLOW_POST
7842+#define __OVERFLOW_EXTABLE
7843+#endif
7844+
7845+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7846+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7847 { \
7848 int t; \
7849 \
7850 __asm__ __volatile__( \
7851-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7852+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7853+ pre_op \
7854 #asm_op " %0,%2,%0\n" \
7855+ post_op \
7856 PPC405_ERR77(0,%3) \
7857 " stwcx. %0,0,%3 \n" \
7858 " bne- 1b\n" \
7859+ extable \
7860 : "=&r" (t), "+m" (v->counter) \
7861 : "r" (a), "r" (&v->counter) \
7862 : "cc"); \
7863 } \
7864
7865-#define ATOMIC_OP_RETURN(op, asm_op) \
7866-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7867+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7868+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7869+
7870+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7871+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7872 { \
7873 int t; \
7874 \
7875 __asm__ __volatile__( \
7876 PPC_ATOMIC_ENTRY_BARRIER \
7877-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7878+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7879+ pre_op \
7880 #asm_op " %0,%1,%0\n" \
7881+ post_op \
7882 PPC405_ERR77(0,%2) \
7883 " stwcx. %0,0,%2 \n" \
7884 " bne- 1b\n" \
7885+ extable \
7886 PPC_ATOMIC_EXIT_BARRIER \
7887 : "=&r" (t) \
7888 : "r" (a), "r" (&v->counter) \
7889@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7890 return t; \
7891 }
7892
7893+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7894+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7895+
7896 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7897
7898 ATOMIC_OPS(add, add)
7899@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7900
7901 #undef ATOMIC_OPS
7902 #undef ATOMIC_OP_RETURN
7903+#undef __ATOMIC_OP_RETURN
7904 #undef ATOMIC_OP
7905+#undef __ATOMIC_OP
7906
7907 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7908
7909-static __inline__ void atomic_inc(atomic_t *v)
7910-{
7911- int t;
7912+/*
7913+ * atomic_inc - increment atomic variable
7914+ * @v: pointer of type atomic_t
7915+ *
7916+ * Automatically increments @v by 1
7917+ */
7918+#define atomic_inc(v) atomic_add(1, (v))
7919+#define atomic_inc_return(v) atomic_add_return(1, (v))
7920
7921- __asm__ __volatile__(
7922-"1: lwarx %0,0,%2 # atomic_inc\n\
7923- addic %0,%0,1\n"
7924- PPC405_ERR77(0,%2)
7925-" stwcx. %0,0,%2 \n\
7926- bne- 1b"
7927- : "=&r" (t), "+m" (v->counter)
7928- : "r" (&v->counter)
7929- : "cc", "xer");
7930+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7931+{
7932+ atomic_add_unchecked(1, v);
7933 }
7934
7935-static __inline__ int atomic_inc_return(atomic_t *v)
7936+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7937 {
7938- int t;
7939-
7940- __asm__ __volatile__(
7941- PPC_ATOMIC_ENTRY_BARRIER
7942-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7943- addic %0,%0,1\n"
7944- PPC405_ERR77(0,%1)
7945-" stwcx. %0,0,%1 \n\
7946- bne- 1b"
7947- PPC_ATOMIC_EXIT_BARRIER
7948- : "=&r" (t)
7949- : "r" (&v->counter)
7950- : "cc", "xer", "memory");
7951-
7952- return t;
7953+ return atomic_add_return_unchecked(1, v);
7954 }
7955
7956 /*
7957@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7958 */
7959 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7960
7961-static __inline__ void atomic_dec(atomic_t *v)
7962+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7963 {
7964- int t;
7965-
7966- __asm__ __volatile__(
7967-"1: lwarx %0,0,%2 # atomic_dec\n\
7968- addic %0,%0,-1\n"
7969- PPC405_ERR77(0,%2)\
7970-" stwcx. %0,0,%2\n\
7971- bne- 1b"
7972- : "=&r" (t), "+m" (v->counter)
7973- : "r" (&v->counter)
7974- : "cc", "xer");
7975+ return atomic_add_return_unchecked(1, v) == 0;
7976 }
7977
7978-static __inline__ int atomic_dec_return(atomic_t *v)
7979+/*
7980+ * atomic_dec - decrement atomic variable
7981+ * @v: pointer of type atomic_t
7982+ *
7983+ * Atomically decrements @v by 1
7984+ */
7985+#define atomic_dec(v) atomic_sub(1, (v))
7986+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7987+
7988+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7989 {
7990- int t;
7991-
7992- __asm__ __volatile__(
7993- PPC_ATOMIC_ENTRY_BARRIER
7994-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7995- addic %0,%0,-1\n"
7996- PPC405_ERR77(0,%1)
7997-" stwcx. %0,0,%1\n\
7998- bne- 1b"
7999- PPC_ATOMIC_EXIT_BARRIER
8000- : "=&r" (t)
8001- : "r" (&v->counter)
8002- : "cc", "xer", "memory");
8003-
8004- return t;
8005+ atomic_sub_unchecked(1, v);
8006 }
8007
8008 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8009 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
8010
8011+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8012+{
8013+ return cmpxchg(&(v->counter), old, new);
8014+}
8015+
8016+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8017+{
8018+ return xchg(&(v->counter), new);
8019+}
8020+
8021 /**
8022 * __atomic_add_unless - add unless the number is a given value
8023 * @v: pointer of type atomic_t
8024@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
8025 PPC_ATOMIC_ENTRY_BARRIER
8026 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
8027 cmpw 0,%0,%3 \n\
8028- beq- 2f \n\
8029- add %0,%2,%0 \n"
8030+ beq- 2f \n"
8031+
8032+#ifdef CONFIG_PAX_REFCOUNT
8033+" mcrxr cr0\n"
8034+" addo. %0,%2,%0\n"
8035+" bf 4*cr0+so, 4f\n"
8036+"3:.long " "0x00c00b00""\n"
8037+"4:\n"
8038+#else
8039+ "add %0,%2,%0 \n"
8040+#endif
8041+
8042 PPC405_ERR77(0,%2)
8043 " stwcx. %0,0,%1 \n\
8044 bne- 1b \n"
8045+"5:"
8046+
8047+#ifdef CONFIG_PAX_REFCOUNT
8048+ _ASM_EXTABLE(3b, 5b)
8049+#endif
8050+
8051 PPC_ATOMIC_EXIT_BARRIER
8052 " subf %0,%2,%0 \n\
8053 2:"
8054@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
8055 }
8056 #define atomic_dec_if_positive atomic_dec_if_positive
8057
8058+#define smp_mb__before_atomic_dec() smp_mb()
8059+#define smp_mb__after_atomic_dec() smp_mb()
8060+#define smp_mb__before_atomic_inc() smp_mb()
8061+#define smp_mb__after_atomic_inc() smp_mb()
8062+
8063 #ifdef __powerpc64__
8064
8065 #define ATOMIC64_INIT(i) { (i) }
8066@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8067 return t;
8068 }
8069
8070+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8071+{
8072+ long t;
8073+
8074+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8075+
8076+ return t;
8077+}
8078+
8079 static __inline__ void atomic64_set(atomic64_t *v, long i)
8080 {
8081 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8082 }
8083
8084-#define ATOMIC64_OP(op, asm_op) \
8085-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8086+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8087+{
8088+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8089+}
8090+
8091+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8092+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8093 { \
8094 long t; \
8095 \
8096 __asm__ __volatile__( \
8097 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8098+ pre_op \
8099 #asm_op " %0,%2,%0\n" \
8100+ post_op \
8101 " stdcx. %0,0,%3 \n" \
8102 " bne- 1b\n" \
8103+ extable \
8104 : "=&r" (t), "+m" (v->counter) \
8105 : "r" (a), "r" (&v->counter) \
8106 : "cc"); \
8107 }
8108
8109-#define ATOMIC64_OP_RETURN(op, asm_op) \
8110-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8111+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8112+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8113+
8114+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8115+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8116 { \
8117 long t; \
8118 \
8119 __asm__ __volatile__( \
8120 PPC_ATOMIC_ENTRY_BARRIER \
8121 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8122+ pre_op \
8123 #asm_op " %0,%1,%0\n" \
8124+ post_op \
8125 " stdcx. %0,0,%2 \n" \
8126 " bne- 1b\n" \
8127+ extable \
8128 PPC_ATOMIC_EXIT_BARRIER \
8129 : "=&r" (t) \
8130 : "r" (a), "r" (&v->counter) \
8131@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8132 return t; \
8133 }
8134
8135+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8136+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8137+
8138 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8139
8140 ATOMIC64_OPS(add, add)
8141@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8142
8143 #undef ATOMIC64_OPS
8144 #undef ATOMIC64_OP_RETURN
8145+#undef __ATOMIC64_OP_RETURN
8146 #undef ATOMIC64_OP
8147+#undef __ATOMIC64_OP
8148+#undef __OVERFLOW_EXTABLE
8149+#undef __OVERFLOW_POST
8150+#undef __OVERFLOW_PRE
8151+#undef __REFCOUNT_OP
8152
8153 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8154
8155-static __inline__ void atomic64_inc(atomic64_t *v)
8156-{
8157- long t;
8158+/*
8159+ * atomic64_inc - increment atomic variable
8160+ * @v: pointer of type atomic64_t
8161+ *
8162+ * Automatically increments @v by 1
8163+ */
8164+#define atomic64_inc(v) atomic64_add(1, (v))
8165+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8166
8167- __asm__ __volatile__(
8168-"1: ldarx %0,0,%2 # atomic64_inc\n\
8169- addic %0,%0,1\n\
8170- stdcx. %0,0,%2 \n\
8171- bne- 1b"
8172- : "=&r" (t), "+m" (v->counter)
8173- : "r" (&v->counter)
8174- : "cc", "xer");
8175+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8176+{
8177+ atomic64_add_unchecked(1, v);
8178 }
8179
8180-static __inline__ long atomic64_inc_return(atomic64_t *v)
8181+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8182 {
8183- long t;
8184-
8185- __asm__ __volatile__(
8186- PPC_ATOMIC_ENTRY_BARRIER
8187-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8188- addic %0,%0,1\n\
8189- stdcx. %0,0,%1 \n\
8190- bne- 1b"
8191- PPC_ATOMIC_EXIT_BARRIER
8192- : "=&r" (t)
8193- : "r" (&v->counter)
8194- : "cc", "xer", "memory");
8195-
8196- return t;
8197+ return atomic64_add_return_unchecked(1, v);
8198 }
8199
8200 /*
8201@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8202 */
8203 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8204
8205-static __inline__ void atomic64_dec(atomic64_t *v)
8206+/*
8207+ * atomic64_dec - decrement atomic variable
8208+ * @v: pointer of type atomic64_t
8209+ *
8210+ * Atomically decrements @v by 1
8211+ */
8212+#define atomic64_dec(v) atomic64_sub(1, (v))
8213+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8214+
8215+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8216 {
8217- long t;
8218-
8219- __asm__ __volatile__(
8220-"1: ldarx %0,0,%2 # atomic64_dec\n\
8221- addic %0,%0,-1\n\
8222- stdcx. %0,0,%2\n\
8223- bne- 1b"
8224- : "=&r" (t), "+m" (v->counter)
8225- : "r" (&v->counter)
8226- : "cc", "xer");
8227-}
8228-
8229-static __inline__ long atomic64_dec_return(atomic64_t *v)
8230-{
8231- long t;
8232-
8233- __asm__ __volatile__(
8234- PPC_ATOMIC_ENTRY_BARRIER
8235-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8236- addic %0,%0,-1\n\
8237- stdcx. %0,0,%1\n\
8238- bne- 1b"
8239- PPC_ATOMIC_EXIT_BARRIER
8240- : "=&r" (t)
8241- : "r" (&v->counter)
8242- : "cc", "xer", "memory");
8243-
8244- return t;
8245+ atomic64_sub_unchecked(1, v);
8246 }
8247
8248 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8249@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8250 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8251 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8252
8253+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8254+{
8255+ return cmpxchg(&(v->counter), old, new);
8256+}
8257+
8258+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8259+{
8260+ return xchg(&(v->counter), new);
8261+}
8262+
8263 /**
8264 * atomic64_add_unless - add unless the number is a given value
8265 * @v: pointer of type atomic64_t
8266@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8267
8268 __asm__ __volatile__ (
8269 PPC_ATOMIC_ENTRY_BARRIER
8270-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8271+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8272 cmpd 0,%0,%3 \n\
8273- beq- 2f \n\
8274- add %0,%2,%0 \n"
8275+ beq- 2f \n"
8276+
8277+#ifdef CONFIG_PAX_REFCOUNT
8278+" mcrxr cr0\n"
8279+" addo. %0,%2,%0\n"
8280+" bf 4*cr0+so, 4f\n"
8281+"3:.long " "0x00c00b00""\n"
8282+"4:\n"
8283+#else
8284+ "add %0,%2,%0 \n"
8285+#endif
8286+
8287 " stdcx. %0,0,%1 \n\
8288 bne- 1b \n"
8289 PPC_ATOMIC_EXIT_BARRIER
8290+"5:"
8291+
8292+#ifdef CONFIG_PAX_REFCOUNT
8293+ _ASM_EXTABLE(3b, 5b)
8294+#endif
8295+
8296 " subf %0,%2,%0 \n\
8297 2:"
8298 : "=&r" (t)
8299diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8300index a3bf5be..e03ba81 100644
8301--- a/arch/powerpc/include/asm/barrier.h
8302+++ b/arch/powerpc/include/asm/barrier.h
8303@@ -76,7 +76,7 @@
8304 do { \
8305 compiletime_assert_atomic_type(*p); \
8306 smp_lwsync(); \
8307- ACCESS_ONCE(*p) = (v); \
8308+ ACCESS_ONCE_RW(*p) = (v); \
8309 } while (0)
8310
8311 #define smp_load_acquire(p) \
8312diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8313index 0dc42c5..b80a3a1 100644
8314--- a/arch/powerpc/include/asm/cache.h
8315+++ b/arch/powerpc/include/asm/cache.h
8316@@ -4,6 +4,7 @@
8317 #ifdef __KERNEL__
8318
8319 #include <asm/reg.h>
8320+#include <linux/const.h>
8321
8322 /* bytes per L1 cache line */
8323 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8324@@ -23,7 +24,7 @@
8325 #define L1_CACHE_SHIFT 7
8326 #endif
8327
8328-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8329+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8330
8331 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8332
8333diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8334index ee46ffe..b36c98c 100644
8335--- a/arch/powerpc/include/asm/elf.h
8336+++ b/arch/powerpc/include/asm/elf.h
8337@@ -30,6 +30,18 @@
8338
8339 #define ELF_ET_DYN_BASE 0x20000000
8340
8341+#ifdef CONFIG_PAX_ASLR
8342+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8343+
8344+#ifdef __powerpc64__
8345+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8346+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8347+#else
8348+#define PAX_DELTA_MMAP_LEN 15
8349+#define PAX_DELTA_STACK_LEN 15
8350+#endif
8351+#endif
8352+
8353 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8354
8355 /*
8356diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8357index 8196e9c..d83a9f3 100644
8358--- a/arch/powerpc/include/asm/exec.h
8359+++ b/arch/powerpc/include/asm/exec.h
8360@@ -4,6 +4,6 @@
8361 #ifndef _ASM_POWERPC_EXEC_H
8362 #define _ASM_POWERPC_EXEC_H
8363
8364-extern unsigned long arch_align_stack(unsigned long sp);
8365+#define arch_align_stack(x) ((x) & ~0xfUL)
8366
8367 #endif /* _ASM_POWERPC_EXEC_H */
8368diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8369index 5acabbd..7ea14fa 100644
8370--- a/arch/powerpc/include/asm/kmap_types.h
8371+++ b/arch/powerpc/include/asm/kmap_types.h
8372@@ -10,7 +10,7 @@
8373 * 2 of the License, or (at your option) any later version.
8374 */
8375
8376-#define KM_TYPE_NR 16
8377+#define KM_TYPE_NR 17
8378
8379 #endif /* __KERNEL__ */
8380 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8381diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8382index b8da913..c02b593 100644
8383--- a/arch/powerpc/include/asm/local.h
8384+++ b/arch/powerpc/include/asm/local.h
8385@@ -9,21 +9,65 @@ typedef struct
8386 atomic_long_t a;
8387 } local_t;
8388
8389+typedef struct
8390+{
8391+ atomic_long_unchecked_t a;
8392+} local_unchecked_t;
8393+
8394 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8395
8396 #define local_read(l) atomic_long_read(&(l)->a)
8397+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8398 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8399+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8400
8401 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8402+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8403 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8404+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8405 #define local_inc(l) atomic_long_inc(&(l)->a)
8406+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8407 #define local_dec(l) atomic_long_dec(&(l)->a)
8408+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8409
8410 static __inline__ long local_add_return(long a, local_t *l)
8411 {
8412 long t;
8413
8414 __asm__ __volatile__(
8415+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8416+
8417+#ifdef CONFIG_PAX_REFCOUNT
8418+" mcrxr cr0\n"
8419+" addo. %0,%1,%0\n"
8420+" bf 4*cr0+so, 3f\n"
8421+"2:.long " "0x00c00b00""\n"
8422+#else
8423+" add %0,%1,%0\n"
8424+#endif
8425+
8426+"3:\n"
8427+ PPC405_ERR77(0,%2)
8428+ PPC_STLCX "%0,0,%2 \n\
8429+ bne- 1b"
8430+
8431+#ifdef CONFIG_PAX_REFCOUNT
8432+"\n4:\n"
8433+ _ASM_EXTABLE(2b, 4b)
8434+#endif
8435+
8436+ : "=&r" (t)
8437+ : "r" (a), "r" (&(l->a.counter))
8438+ : "cc", "memory");
8439+
8440+ return t;
8441+}
8442+
8443+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8444+{
8445+ long t;
8446+
8447+ __asm__ __volatile__(
8448 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8449 add %0,%1,%0\n"
8450 PPC405_ERR77(0,%2)
8451@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8452
8453 #define local_cmpxchg(l, o, n) \
8454 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8455+#define local_cmpxchg_unchecked(l, o, n) \
8456+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8457 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8458
8459 /**
8460diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8461index 8565c25..2865190 100644
8462--- a/arch/powerpc/include/asm/mman.h
8463+++ b/arch/powerpc/include/asm/mman.h
8464@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8465 }
8466 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8467
8468-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8469+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8470 {
8471 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8472 }
8473diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8474index 69c0598..2c56964 100644
8475--- a/arch/powerpc/include/asm/page.h
8476+++ b/arch/powerpc/include/asm/page.h
8477@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8478 * and needs to be executable. This means the whole heap ends
8479 * up being executable.
8480 */
8481-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8482- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8483+#define VM_DATA_DEFAULT_FLAGS32 \
8484+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8485+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8486
8487 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8488 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8489@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8490 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8491 #endif
8492
8493+#define ktla_ktva(addr) (addr)
8494+#define ktva_ktla(addr) (addr)
8495+
8496 #ifndef CONFIG_PPC_BOOK3S_64
8497 /*
8498 * Use the top bit of the higher-level page table entries to indicate whether
8499diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8500index d908a46..3753f71 100644
8501--- a/arch/powerpc/include/asm/page_64.h
8502+++ b/arch/powerpc/include/asm/page_64.h
8503@@ -172,15 +172,18 @@ do { \
8504 * stack by default, so in the absence of a PT_GNU_STACK program header
8505 * we turn execute permission off.
8506 */
8507-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8508- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8509+#define VM_STACK_DEFAULT_FLAGS32 \
8510+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8511+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8512
8513 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8514 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8515
8516+#ifndef CONFIG_PAX_PAGEEXEC
8517 #define VM_STACK_DEFAULT_FLAGS \
8518 (is_32bit_task() ? \
8519 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8520+#endif
8521
8522 #include <asm-generic/getorder.h>
8523
8524diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8525index 4b0be20..c15a27d 100644
8526--- a/arch/powerpc/include/asm/pgalloc-64.h
8527+++ b/arch/powerpc/include/asm/pgalloc-64.h
8528@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8529 #ifndef CONFIG_PPC_64K_PAGES
8530
8531 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8532+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8533
8534 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8535 {
8536@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8537 pud_set(pud, (unsigned long)pmd);
8538 }
8539
8540+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8541+{
8542+ pud_populate(mm, pud, pmd);
8543+}
8544+
8545 #define pmd_populate(mm, pmd, pte_page) \
8546 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8547 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8548@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8549 #endif
8550
8551 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8552+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8553
8554 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8555 pte_t *pte)
8556diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8557index 11a3863..108f194 100644
8558--- a/arch/powerpc/include/asm/pgtable.h
8559+++ b/arch/powerpc/include/asm/pgtable.h
8560@@ -2,6 +2,7 @@
8561 #define _ASM_POWERPC_PGTABLE_H
8562 #ifdef __KERNEL__
8563
8564+#include <linux/const.h>
8565 #ifndef __ASSEMBLY__
8566 #include <linux/mmdebug.h>
8567 #include <linux/mmzone.h>
8568diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8569index 62cfb0c..50c6402 100644
8570--- a/arch/powerpc/include/asm/pte-hash32.h
8571+++ b/arch/powerpc/include/asm/pte-hash32.h
8572@@ -20,6 +20,7 @@
8573 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8574 #define _PAGE_USER 0x004 /* usermode access allowed */
8575 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8576+#define _PAGE_EXEC _PAGE_GUARDED
8577 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8578 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8579 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8580diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8581index af56b5c..f86f3f6 100644
8582--- a/arch/powerpc/include/asm/reg.h
8583+++ b/arch/powerpc/include/asm/reg.h
8584@@ -253,6 +253,7 @@
8585 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8586 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8587 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8588+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8589 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8590 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8591 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8592diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8593index 825663c..f9e9134 100644
8594--- a/arch/powerpc/include/asm/smp.h
8595+++ b/arch/powerpc/include/asm/smp.h
8596@@ -51,7 +51,7 @@ struct smp_ops_t {
8597 int (*cpu_disable)(void);
8598 void (*cpu_die)(unsigned int nr);
8599 int (*cpu_bootable)(unsigned int nr);
8600-};
8601+} __no_const;
8602
8603 extern void smp_send_debugger_break(void);
8604 extern void start_secondary_resume(void);
8605diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8606index 4dbe072..b803275 100644
8607--- a/arch/powerpc/include/asm/spinlock.h
8608+++ b/arch/powerpc/include/asm/spinlock.h
8609@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8610 __asm__ __volatile__(
8611 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8612 __DO_SIGN_EXTEND
8613-" addic. %0,%0,1\n\
8614- ble- 2f\n"
8615+
8616+#ifdef CONFIG_PAX_REFCOUNT
8617+" mcrxr cr0\n"
8618+" addico. %0,%0,1\n"
8619+" bf 4*cr0+so, 3f\n"
8620+"2:.long " "0x00c00b00""\n"
8621+#else
8622+" addic. %0,%0,1\n"
8623+#endif
8624+
8625+"3:\n"
8626+ "ble- 4f\n"
8627 PPC405_ERR77(0,%1)
8628 " stwcx. %0,0,%1\n\
8629 bne- 1b\n"
8630 PPC_ACQUIRE_BARRIER
8631-"2:" : "=&r" (tmp)
8632+"4:"
8633+
8634+#ifdef CONFIG_PAX_REFCOUNT
8635+ _ASM_EXTABLE(2b,4b)
8636+#endif
8637+
8638+ : "=&r" (tmp)
8639 : "r" (&rw->lock)
8640 : "cr0", "xer", "memory");
8641
8642@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8643 __asm__ __volatile__(
8644 "# read_unlock\n\t"
8645 PPC_RELEASE_BARRIER
8646-"1: lwarx %0,0,%1\n\
8647- addic %0,%0,-1\n"
8648+"1: lwarx %0,0,%1\n"
8649+
8650+#ifdef CONFIG_PAX_REFCOUNT
8651+" mcrxr cr0\n"
8652+" addico. %0,%0,-1\n"
8653+" bf 4*cr0+so, 3f\n"
8654+"2:.long " "0x00c00b00""\n"
8655+#else
8656+" addic. %0,%0,-1\n"
8657+#endif
8658+
8659+"3:\n"
8660 PPC405_ERR77(0,%1)
8661 " stwcx. %0,0,%1\n\
8662 bne- 1b"
8663+
8664+#ifdef CONFIG_PAX_REFCOUNT
8665+"\n4:\n"
8666+ _ASM_EXTABLE(2b, 4b)
8667+#endif
8668+
8669 : "=&r"(tmp)
8670 : "r"(&rw->lock)
8671 : "cr0", "xer", "memory");
8672diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8673index 7efee4a..48d47cc 100644
8674--- a/arch/powerpc/include/asm/thread_info.h
8675+++ b/arch/powerpc/include/asm/thread_info.h
8676@@ -101,6 +101,8 @@ static inline struct thread_info *current_thread_info(void)
8677 #if defined(CONFIG_PPC64)
8678 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8679 #endif
8680+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8681+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8682
8683 /* as above, but as bit values */
8684 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8685@@ -119,9 +121,10 @@ static inline struct thread_info *current_thread_info(void)
8686 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8687 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8688 #define _TIF_NOHZ (1<<TIF_NOHZ)
8689+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8690 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8691 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8692- _TIF_NOHZ)
8693+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8694
8695 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8696 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8697diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8698index a0c071d..49cdc7f 100644
8699--- a/arch/powerpc/include/asm/uaccess.h
8700+++ b/arch/powerpc/include/asm/uaccess.h
8701@@ -58,6 +58,7 @@
8702
8703 #endif
8704
8705+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8706 #define access_ok(type, addr, size) \
8707 (__chk_user_ptr(addr), \
8708 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8709@@ -318,52 +319,6 @@ do { \
8710 extern unsigned long __copy_tofrom_user(void __user *to,
8711 const void __user *from, unsigned long size);
8712
8713-#ifndef __powerpc64__
8714-
8715-static inline unsigned long copy_from_user(void *to,
8716- const void __user *from, unsigned long n)
8717-{
8718- unsigned long over;
8719-
8720- if (access_ok(VERIFY_READ, from, n))
8721- return __copy_tofrom_user((__force void __user *)to, from, n);
8722- if ((unsigned long)from < TASK_SIZE) {
8723- over = (unsigned long)from + n - TASK_SIZE;
8724- return __copy_tofrom_user((__force void __user *)to, from,
8725- n - over) + over;
8726- }
8727- return n;
8728-}
8729-
8730-static inline unsigned long copy_to_user(void __user *to,
8731- const void *from, unsigned long n)
8732-{
8733- unsigned long over;
8734-
8735- if (access_ok(VERIFY_WRITE, to, n))
8736- return __copy_tofrom_user(to, (__force void __user *)from, n);
8737- if ((unsigned long)to < TASK_SIZE) {
8738- over = (unsigned long)to + n - TASK_SIZE;
8739- return __copy_tofrom_user(to, (__force void __user *)from,
8740- n - over) + over;
8741- }
8742- return n;
8743-}
8744-
8745-#else /* __powerpc64__ */
8746-
8747-#define __copy_in_user(to, from, size) \
8748- __copy_tofrom_user((to), (from), (size))
8749-
8750-extern unsigned long copy_from_user(void *to, const void __user *from,
8751- unsigned long n);
8752-extern unsigned long copy_to_user(void __user *to, const void *from,
8753- unsigned long n);
8754-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8755- unsigned long n);
8756-
8757-#endif /* __powerpc64__ */
8758-
8759 static inline unsigned long __copy_from_user_inatomic(void *to,
8760 const void __user *from, unsigned long n)
8761 {
8762@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8763 if (ret == 0)
8764 return 0;
8765 }
8766+
8767+ if (!__builtin_constant_p(n))
8768+ check_object_size(to, n, false);
8769+
8770 return __copy_tofrom_user((__force void __user *)to, from, n);
8771 }
8772
8773@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8774 if (ret == 0)
8775 return 0;
8776 }
8777+
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n, true);
8780+
8781 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8782 }
8783
8784@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8785 return __copy_to_user_inatomic(to, from, size);
8786 }
8787
8788+#ifndef __powerpc64__
8789+
8790+static inline unsigned long __must_check copy_from_user(void *to,
8791+ const void __user *from, unsigned long n)
8792+{
8793+ unsigned long over;
8794+
8795+ if ((long)n < 0)
8796+ return n;
8797+
8798+ if (access_ok(VERIFY_READ, from, n)) {
8799+ if (!__builtin_constant_p(n))
8800+ check_object_size(to, n, false);
8801+ return __copy_tofrom_user((__force void __user *)to, from, n);
8802+ }
8803+ if ((unsigned long)from < TASK_SIZE) {
8804+ over = (unsigned long)from + n - TASK_SIZE;
8805+ if (!__builtin_constant_p(n - over))
8806+ check_object_size(to, n - over, false);
8807+ return __copy_tofrom_user((__force void __user *)to, from,
8808+ n - over) + over;
8809+ }
8810+ return n;
8811+}
8812+
8813+static inline unsigned long __must_check copy_to_user(void __user *to,
8814+ const void *from, unsigned long n)
8815+{
8816+ unsigned long over;
8817+
8818+ if ((long)n < 0)
8819+ return n;
8820+
8821+ if (access_ok(VERIFY_WRITE, to, n)) {
8822+ if (!__builtin_constant_p(n))
8823+ check_object_size(from, n, true);
8824+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8825+ }
8826+ if ((unsigned long)to < TASK_SIZE) {
8827+ over = (unsigned long)to + n - TASK_SIZE;
8828+ if (!__builtin_constant_p(n))
8829+ check_object_size(from, n - over, true);
8830+ return __copy_tofrom_user(to, (__force void __user *)from,
8831+ n - over) + over;
8832+ }
8833+ return n;
8834+}
8835+
8836+#else /* __powerpc64__ */
8837+
8838+#define __copy_in_user(to, from, size) \
8839+ __copy_tofrom_user((to), (from), (size))
8840+
8841+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8842+{
8843+ if ((long)n < 0 || n > INT_MAX)
8844+ return n;
8845+
8846+ if (!__builtin_constant_p(n))
8847+ check_object_size(to, n, false);
8848+
8849+ if (likely(access_ok(VERIFY_READ, from, n)))
8850+ n = __copy_from_user(to, from, n);
8851+ else
8852+ memset(to, 0, n);
8853+ return n;
8854+}
8855+
8856+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8857+{
8858+ if ((long)n < 0 || n > INT_MAX)
8859+ return n;
8860+
8861+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8862+ if (!__builtin_constant_p(n))
8863+ check_object_size(from, n, true);
8864+ n = __copy_to_user(to, from, n);
8865+ }
8866+ return n;
8867+}
8868+
8869+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8870+ unsigned long n);
8871+
8872+#endif /* __powerpc64__ */
8873+
8874 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8875
8876 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8877diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8878index c1ebbda..fd8a98d 100644
8879--- a/arch/powerpc/kernel/Makefile
8880+++ b/arch/powerpc/kernel/Makefile
8881@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8882 CFLAGS_btext.o += -fPIC
8883 endif
8884
8885+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8886+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8887+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8888+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8889+
8890 ifdef CONFIG_FUNCTION_TRACER
8891 # Do not trace early boot code
8892 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8893@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8894 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8895 endif
8896
8897+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8898+
8899 obj-y := cputable.o ptrace.o syscalls.o \
8900 irq.o align.o signal_32.o pmc.o vdso.o \
8901 process.o systbl.o idle.o \
8902diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8903index 3e68d1c..72a5ee6 100644
8904--- a/arch/powerpc/kernel/exceptions-64e.S
8905+++ b/arch/powerpc/kernel/exceptions-64e.S
8906@@ -1010,6 +1010,7 @@ storage_fault_common:
8907 std r14,_DAR(r1)
8908 std r15,_DSISR(r1)
8909 addi r3,r1,STACK_FRAME_OVERHEAD
8910+ bl save_nvgprs
8911 mr r4,r14
8912 mr r5,r15
8913 ld r14,PACA_EXGEN+EX_R14(r13)
8914@@ -1018,8 +1019,7 @@ storage_fault_common:
8915 cmpdi r3,0
8916 bne- 1f
8917 b ret_from_except_lite
8918-1: bl save_nvgprs
8919- mr r5,r3
8920+1: mr r5,r3
8921 addi r3,r1,STACK_FRAME_OVERHEAD
8922 ld r4,_DAR(r1)
8923 bl bad_page_fault
8924diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8925index 9519e6b..13f6c38 100644
8926--- a/arch/powerpc/kernel/exceptions-64s.S
8927+++ b/arch/powerpc/kernel/exceptions-64s.S
8928@@ -1599,10 +1599,10 @@ handle_page_fault:
8929 11: ld r4,_DAR(r1)
8930 ld r5,_DSISR(r1)
8931 addi r3,r1,STACK_FRAME_OVERHEAD
8932+ bl save_nvgprs
8933 bl do_page_fault
8934 cmpdi r3,0
8935 beq+ 12f
8936- bl save_nvgprs
8937 mr r5,r3
8938 addi r3,r1,STACK_FRAME_OVERHEAD
8939 lwz r4,_DAR(r1)
8940diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8941index 4509603..cdb491f 100644
8942--- a/arch/powerpc/kernel/irq.c
8943+++ b/arch/powerpc/kernel/irq.c
8944@@ -460,6 +460,8 @@ void migrate_irqs(void)
8945 }
8946 #endif
8947
8948+extern void gr_handle_kernel_exploit(void);
8949+
8950 static inline void check_stack_overflow(void)
8951 {
8952 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8953@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8954 pr_err("do_IRQ: stack overflow: %ld\n",
8955 sp - sizeof(struct thread_info));
8956 dump_stack();
8957+ gr_handle_kernel_exploit();
8958 }
8959 #endif
8960 }
8961diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8962index c94d2e0..992a9ce 100644
8963--- a/arch/powerpc/kernel/module_32.c
8964+++ b/arch/powerpc/kernel/module_32.c
8965@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8966 me->arch.core_plt_section = i;
8967 }
8968 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8969- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8970+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8971 return -ENOEXEC;
8972 }
8973
8974@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8975
8976 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8977 /* Init, or core PLT? */
8978- if (location >= mod->module_core
8979- && location < mod->module_core + mod->core_size)
8980+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8981+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8982 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8983- else
8984+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8985+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8986 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8987+ else {
8988+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8989+ return ~0UL;
8990+ }
8991
8992 /* Find this entry, or if that fails, the next avail. entry */
8993 while (entry->jump[0]) {
8994@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8995 }
8996 #ifdef CONFIG_DYNAMIC_FTRACE
8997 module->arch.tramp =
8998- do_plt_call(module->module_core,
8999+ do_plt_call(module->module_core_rx,
9000 (unsigned long)ftrace_caller,
9001 sechdrs, module);
9002 #endif
9003diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
9004index febb50d..bb10020 100644
9005--- a/arch/powerpc/kernel/process.c
9006+++ b/arch/powerpc/kernel/process.c
9007@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
9008 * Lookup NIP late so we have the best change of getting the
9009 * above info out without failing
9010 */
9011- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
9012- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
9013+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
9014+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
9015 #endif
9016 show_stack(current, (unsigned long *) regs->gpr[1]);
9017 if (!user_mode(regs))
9018@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
9019 newsp = stack[0];
9020 ip = stack[STACK_FRAME_LR_SAVE];
9021 if (!firstframe || ip != lr) {
9022- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
9023+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
9024 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
9025 if ((ip == rth) && curr_frame >= 0) {
9026- printk(" (%pS)",
9027+ printk(" (%pA)",
9028 (void *)current->ret_stack[curr_frame].ret);
9029 curr_frame--;
9030 }
9031@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
9032 struct pt_regs *regs = (struct pt_regs *)
9033 (sp + STACK_FRAME_OVERHEAD);
9034 lr = regs->link;
9035- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
9036+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
9037 regs->trap, (void *)regs->nip, (void *)lr);
9038 firstframe = 1;
9039 }
9040@@ -1613,49 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
9041 mtspr(SPRN_CTRLT, ctrl);
9042 }
9043 #endif /* CONFIG_PPC64 */
9044-
9045-unsigned long arch_align_stack(unsigned long sp)
9046-{
9047- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9048- sp -= get_random_int() & ~PAGE_MASK;
9049- return sp & ~0xf;
9050-}
9051-
9052-static inline unsigned long brk_rnd(void)
9053-{
9054- unsigned long rnd = 0;
9055-
9056- /* 8MB for 32bit, 1GB for 64bit */
9057- if (is_32bit_task())
9058- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
9059- else
9060- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
9061-
9062- return rnd << PAGE_SHIFT;
9063-}
9064-
9065-unsigned long arch_randomize_brk(struct mm_struct *mm)
9066-{
9067- unsigned long base = mm->brk;
9068- unsigned long ret;
9069-
9070-#ifdef CONFIG_PPC_STD_MMU_64
9071- /*
9072- * If we are using 1TB segments and we are allowed to randomise
9073- * the heap, we can put it above 1TB so it is backed by a 1TB
9074- * segment. Otherwise the heap will be in the bottom 1TB
9075- * which always uses 256MB segments and this may result in a
9076- * performance penalty.
9077- */
9078- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9079- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9080-#endif
9081-
9082- ret = PAGE_ALIGN(base + brk_rnd());
9083-
9084- if (ret < mm->brk)
9085- return mm->brk;
9086-
9087- return ret;
9088-}
9089-
9090diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9091index f21897b..28c0428 100644
9092--- a/arch/powerpc/kernel/ptrace.c
9093+++ b/arch/powerpc/kernel/ptrace.c
9094@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9095 return ret;
9096 }
9097
9098+#ifdef CONFIG_GRKERNSEC_SETXID
9099+extern void gr_delayed_cred_worker(void);
9100+#endif
9101+
9102 /*
9103 * We must return the syscall number to actually look up in the table.
9104 * This can be -1L to skip running any syscall at all.
9105@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9106
9107 secure_computing_strict(regs->gpr[0]);
9108
9109+#ifdef CONFIG_GRKERNSEC_SETXID
9110+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9111+ gr_delayed_cred_worker();
9112+#endif
9113+
9114 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9115 tracehook_report_syscall_entry(regs))
9116 /*
9117@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9118 {
9119 int step;
9120
9121+#ifdef CONFIG_GRKERNSEC_SETXID
9122+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9123+ gr_delayed_cred_worker();
9124+#endif
9125+
9126 audit_syscall_exit(regs);
9127
9128 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9129diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9130index d3a831a..3a33123 100644
9131--- a/arch/powerpc/kernel/signal_32.c
9132+++ b/arch/powerpc/kernel/signal_32.c
9133@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9134 /* Save user registers on the stack */
9135 frame = &rt_sf->uc.uc_mcontext;
9136 addr = frame;
9137- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9138+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9139 sigret = 0;
9140 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9141 } else {
9142diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9143index c7c24d2..1bf7039 100644
9144--- a/arch/powerpc/kernel/signal_64.c
9145+++ b/arch/powerpc/kernel/signal_64.c
9146@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9147 current->thread.fp_state.fpscr = 0;
9148
9149 /* Set up to return from userspace. */
9150- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9151+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9152 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9153 } else {
9154 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9155diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9156index 19e4744..28a8d7b 100644
9157--- a/arch/powerpc/kernel/traps.c
9158+++ b/arch/powerpc/kernel/traps.c
9159@@ -36,6 +36,7 @@
9160 #include <linux/debugfs.h>
9161 #include <linux/ratelimit.h>
9162 #include <linux/context_tracking.h>
9163+#include <linux/uaccess.h>
9164
9165 #include <asm/emulated_ops.h>
9166 #include <asm/pgtable.h>
9167@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9168 return flags;
9169 }
9170
9171+extern void gr_handle_kernel_exploit(void);
9172+
9173 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9174 int signr)
9175 {
9176@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9177 panic("Fatal exception in interrupt");
9178 if (panic_on_oops)
9179 panic("Fatal exception");
9180+
9181+ gr_handle_kernel_exploit();
9182+
9183 do_exit(signr);
9184 }
9185
9186@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9187 enum ctx_state prev_state = exception_enter();
9188 unsigned int reason = get_reason(regs);
9189
9190+#ifdef CONFIG_PAX_REFCOUNT
9191+ unsigned int bkpt;
9192+ const struct exception_table_entry *entry;
9193+
9194+ if (reason & REASON_ILLEGAL) {
9195+ /* Check if PaX bad instruction */
9196+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9197+ current->thread.trap_nr = 0;
9198+ pax_report_refcount_overflow(regs);
9199+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9200+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9201+ regs->nip = entry->fixup;
9202+ return;
9203+ }
9204+ /* fixup_exception() could not handle */
9205+ goto bail;
9206+ }
9207+ }
9208+#endif
9209+
9210 /* We can now get here via a FP Unavailable exception if the core
9211 * has no FPU, in that case the reason flags will be 0 */
9212
9213diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9214index 305eb0d..accc5b40 100644
9215--- a/arch/powerpc/kernel/vdso.c
9216+++ b/arch/powerpc/kernel/vdso.c
9217@@ -34,6 +34,7 @@
9218 #include <asm/vdso.h>
9219 #include <asm/vdso_datapage.h>
9220 #include <asm/setup.h>
9221+#include <asm/mman.h>
9222
9223 #undef DEBUG
9224
9225@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9226 vdso_base = VDSO32_MBASE;
9227 #endif
9228
9229- current->mm->context.vdso_base = 0;
9230+ current->mm->context.vdso_base = ~0UL;
9231
9232 /* vDSO has a problem and was disabled, just don't "enable" it for the
9233 * process
9234@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9235 vdso_base = get_unmapped_area(NULL, vdso_base,
9236 (vdso_pages << PAGE_SHIFT) +
9237 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9238- 0, 0);
9239+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9240 if (IS_ERR_VALUE(vdso_base)) {
9241 rc = vdso_base;
9242 goto fail_mmapsem;
9243diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9244index ac3ddf1..9a54c76 100644
9245--- a/arch/powerpc/kvm/powerpc.c
9246+++ b/arch/powerpc/kvm/powerpc.c
9247@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9248 }
9249 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9250
9251-int kvm_arch_init(void *opaque)
9252+int kvm_arch_init(const void *opaque)
9253 {
9254 return 0;
9255 }
9256diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9257index 5eea6f3..5d10396 100644
9258--- a/arch/powerpc/lib/usercopy_64.c
9259+++ b/arch/powerpc/lib/usercopy_64.c
9260@@ -9,22 +9,6 @@
9261 #include <linux/module.h>
9262 #include <asm/uaccess.h>
9263
9264-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9265-{
9266- if (likely(access_ok(VERIFY_READ, from, n)))
9267- n = __copy_from_user(to, from, n);
9268- else
9269- memset(to, 0, n);
9270- return n;
9271-}
9272-
9273-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9274-{
9275- if (likely(access_ok(VERIFY_WRITE, to, n)))
9276- n = __copy_to_user(to, from, n);
9277- return n;
9278-}
9279-
9280 unsigned long copy_in_user(void __user *to, const void __user *from,
9281 unsigned long n)
9282 {
9283@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9284 return n;
9285 }
9286
9287-EXPORT_SYMBOL(copy_from_user);
9288-EXPORT_SYMBOL(copy_to_user);
9289 EXPORT_SYMBOL(copy_in_user);
9290
9291diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9292index b396868..3eb6b9f 100644
9293--- a/arch/powerpc/mm/fault.c
9294+++ b/arch/powerpc/mm/fault.c
9295@@ -33,6 +33,10 @@
9296 #include <linux/ratelimit.h>
9297 #include <linux/context_tracking.h>
9298 #include <linux/hugetlb.h>
9299+#include <linux/slab.h>
9300+#include <linux/pagemap.h>
9301+#include <linux/compiler.h>
9302+#include <linux/unistd.h>
9303
9304 #include <asm/firmware.h>
9305 #include <asm/page.h>
9306@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9307 }
9308 #endif
9309
9310+#ifdef CONFIG_PAX_PAGEEXEC
9311+/*
9312+ * PaX: decide what to do with offenders (regs->nip = fault address)
9313+ *
9314+ * returns 1 when task should be killed
9315+ */
9316+static int pax_handle_fetch_fault(struct pt_regs *regs)
9317+{
9318+ return 1;
9319+}
9320+
9321+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9322+{
9323+ unsigned long i;
9324+
9325+ printk(KERN_ERR "PAX: bytes at PC: ");
9326+ for (i = 0; i < 5; i++) {
9327+ unsigned int c;
9328+ if (get_user(c, (unsigned int __user *)pc+i))
9329+ printk(KERN_CONT "???????? ");
9330+ else
9331+ printk(KERN_CONT "%08x ", c);
9332+ }
9333+ printk("\n");
9334+}
9335+#endif
9336+
9337 /*
9338 * Check whether the instruction at regs->nip is a store using
9339 * an update addressing form which will update r1.
9340@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9341 * indicate errors in DSISR but can validly be set in SRR1.
9342 */
9343 if (trap == 0x400)
9344- error_code &= 0x48200000;
9345+ error_code &= 0x58200000;
9346 else
9347 is_write = error_code & DSISR_ISSTORE;
9348 #else
9349@@ -383,12 +414,16 @@ good_area:
9350 * "undefined". Of those that can be set, this is the only
9351 * one which seems bad.
9352 */
9353- if (error_code & 0x10000000)
9354+ if (error_code & DSISR_GUARDED)
9355 /* Guarded storage error. */
9356 goto bad_area;
9357 #endif /* CONFIG_8xx */
9358
9359 if (is_exec) {
9360+#ifdef CONFIG_PPC_STD_MMU
9361+ if (error_code & DSISR_GUARDED)
9362+ goto bad_area;
9363+#endif
9364 /*
9365 * Allow execution from readable areas if the MMU does not
9366 * provide separate controls over reading and executing.
9367@@ -483,6 +518,23 @@ bad_area:
9368 bad_area_nosemaphore:
9369 /* User mode accesses cause a SIGSEGV */
9370 if (user_mode(regs)) {
9371+
9372+#ifdef CONFIG_PAX_PAGEEXEC
9373+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9374+#ifdef CONFIG_PPC_STD_MMU
9375+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9376+#else
9377+ if (is_exec && regs->nip == address) {
9378+#endif
9379+ switch (pax_handle_fetch_fault(regs)) {
9380+ }
9381+
9382+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9383+ do_group_exit(SIGKILL);
9384+ }
9385+ }
9386+#endif
9387+
9388 _exception(SIGSEGV, regs, code, address);
9389 goto bail;
9390 }
9391diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9392index 0f0502e..bc3e7a3 100644
9393--- a/arch/powerpc/mm/mmap.c
9394+++ b/arch/powerpc/mm/mmap.c
9395@@ -86,6 +86,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9396 {
9397 unsigned long random_factor = 0UL;
9398
9399+#ifdef CONFIG_PAX_RANDMMAP
9400+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9401+#endif
9402+
9403 if (current->flags & PF_RANDOMIZE)
9404 random_factor = arch_mmap_rnd();
9405
9406@@ -95,9 +99,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9407 */
9408 if (mmap_is_legacy()) {
9409 mm->mmap_base = TASK_UNMAPPED_BASE;
9410+
9411+#ifdef CONFIG_PAX_RANDMMAP
9412+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9413+ mm->mmap_base += mm->delta_mmap;
9414+#endif
9415+
9416 mm->get_unmapped_area = arch_get_unmapped_area;
9417 } else {
9418 mm->mmap_base = mmap_base(random_factor);
9419+
9420+#ifdef CONFIG_PAX_RANDMMAP
9421+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9422+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9423+#endif
9424+
9425 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9426 }
9427 }
9428diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9429index 0f432a7..abfe841 100644
9430--- a/arch/powerpc/mm/slice.c
9431+++ b/arch/powerpc/mm/slice.c
9432@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9433 if ((mm->task_size - len) < addr)
9434 return 0;
9435 vma = find_vma(mm, addr);
9436- return (!vma || (addr + len) <= vma->vm_start);
9437+ return check_heap_stack_gap(vma, addr, len, 0);
9438 }
9439
9440 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9441@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9442 info.align_offset = 0;
9443
9444 addr = TASK_UNMAPPED_BASE;
9445+
9446+#ifdef CONFIG_PAX_RANDMMAP
9447+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9448+ addr += mm->delta_mmap;
9449+#endif
9450+
9451 while (addr < TASK_SIZE) {
9452 info.low_limit = addr;
9453 if (!slice_scan_available(addr, available, 1, &addr))
9454@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9455 if (fixed && addr > (mm->task_size - len))
9456 return -ENOMEM;
9457
9458+#ifdef CONFIG_PAX_RANDMMAP
9459+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9460+ addr = 0;
9461+#endif
9462+
9463 /* If hint, make sure it matches our alignment restrictions */
9464 if (!fixed && addr) {
9465 addr = _ALIGN_UP(addr, 1ul << pshift);
9466diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9467index d966bbe..372124a 100644
9468--- a/arch/powerpc/platforms/cell/spufs/file.c
9469+++ b/arch/powerpc/platforms/cell/spufs/file.c
9470@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9471 return VM_FAULT_NOPAGE;
9472 }
9473
9474-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9475+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9476 unsigned long address,
9477- void *buf, int len, int write)
9478+ void *buf, size_t len, int write)
9479 {
9480 struct spu_context *ctx = vma->vm_file->private_data;
9481 unsigned long offset = address - vma->vm_start;
9482diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9483index adbe380..adb7516 100644
9484--- a/arch/s390/include/asm/atomic.h
9485+++ b/arch/s390/include/asm/atomic.h
9486@@ -317,4 +317,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9487 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9488 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9489
9490+#define atomic64_read_unchecked(v) atomic64_read(v)
9491+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9492+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9493+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9494+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9495+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9496+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9497+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9498+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9499+
9500 #endif /* __ARCH_S390_ATOMIC__ */
9501diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9502index 8d72471..5322500 100644
9503--- a/arch/s390/include/asm/barrier.h
9504+++ b/arch/s390/include/asm/barrier.h
9505@@ -42,7 +42,7 @@
9506 do { \
9507 compiletime_assert_atomic_type(*p); \
9508 barrier(); \
9509- ACCESS_ONCE(*p) = (v); \
9510+ ACCESS_ONCE_RW(*p) = (v); \
9511 } while (0)
9512
9513 #define smp_load_acquire(p) \
9514diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9515index 4d7ccac..d03d0ad 100644
9516--- a/arch/s390/include/asm/cache.h
9517+++ b/arch/s390/include/asm/cache.h
9518@@ -9,8 +9,10 @@
9519 #ifndef __ARCH_S390_CACHE_H
9520 #define __ARCH_S390_CACHE_H
9521
9522-#define L1_CACHE_BYTES 256
9523+#include <linux/const.h>
9524+
9525 #define L1_CACHE_SHIFT 8
9526+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9527 #define NET_SKB_PAD 32
9528
9529 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9530diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9531index 3ad48f2..64cc6f3 100644
9532--- a/arch/s390/include/asm/elf.h
9533+++ b/arch/s390/include/asm/elf.h
9534@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
9535 (STACK_TOP / 3 * 2) : \
9536 (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
9537
9538+#ifdef CONFIG_PAX_ASLR
9539+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9540+
9541+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9542+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9543+#endif
9544+
9545 /* This yields a mask that user programs can use to figure out what
9546 instruction set this CPU supports. */
9547
9548diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9549index c4a93d6..4d2a9b4 100644
9550--- a/arch/s390/include/asm/exec.h
9551+++ b/arch/s390/include/asm/exec.h
9552@@ -7,6 +7,6 @@
9553 #ifndef __ASM_EXEC_H
9554 #define __ASM_EXEC_H
9555
9556-extern unsigned long arch_align_stack(unsigned long sp);
9557+#define arch_align_stack(x) ((x) & ~0xfUL)
9558
9559 #endif /* __ASM_EXEC_H */
9560diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9561index d64a7a6..0830329 100644
9562--- a/arch/s390/include/asm/uaccess.h
9563+++ b/arch/s390/include/asm/uaccess.h
9564@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9565 __range_ok((unsigned long)(addr), (size)); \
9566 })
9567
9568+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9569 #define access_ok(type, addr, size) __access_ok(addr, size)
9570
9571 /*
9572@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9573 copy_to_user(void __user *to, const void *from, unsigned long n)
9574 {
9575 might_fault();
9576+
9577+ if ((long)n < 0)
9578+ return n;
9579+
9580 return __copy_to_user(to, from, n);
9581 }
9582
9583@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9584 static inline unsigned long __must_check
9585 copy_from_user(void *to, const void __user *from, unsigned long n)
9586 {
9587- unsigned int sz = __compiletime_object_size(to);
9588+ size_t sz = __compiletime_object_size(to);
9589
9590 might_fault();
9591- if (unlikely(sz != -1 && sz < n)) {
9592+
9593+ if ((long)n < 0)
9594+ return n;
9595+
9596+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9597 copy_from_user_overflow();
9598 return n;
9599 }
9600diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9601index 0c1a679..e1df357 100644
9602--- a/arch/s390/kernel/module.c
9603+++ b/arch/s390/kernel/module.c
9604@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9605
9606 /* Increase core size by size of got & plt and set start
9607 offsets for got and plt. */
9608- me->core_size = ALIGN(me->core_size, 4);
9609- me->arch.got_offset = me->core_size;
9610- me->core_size += me->arch.got_size;
9611- me->arch.plt_offset = me->core_size;
9612- me->core_size += me->arch.plt_size;
9613+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9614+ me->arch.got_offset = me->core_size_rw;
9615+ me->core_size_rw += me->arch.got_size;
9616+ me->arch.plt_offset = me->core_size_rx;
9617+ me->core_size_rx += me->arch.plt_size;
9618 return 0;
9619 }
9620
9621@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9622 if (info->got_initialized == 0) {
9623 Elf_Addr *gotent;
9624
9625- gotent = me->module_core + me->arch.got_offset +
9626+ gotent = me->module_core_rw + me->arch.got_offset +
9627 info->got_offset;
9628 *gotent = val;
9629 info->got_initialized = 1;
9630@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9631 rc = apply_rela_bits(loc, val, 0, 64, 0);
9632 else if (r_type == R_390_GOTENT ||
9633 r_type == R_390_GOTPLTENT) {
9634- val += (Elf_Addr) me->module_core - loc;
9635+ val += (Elf_Addr) me->module_core_rw - loc;
9636 rc = apply_rela_bits(loc, val, 1, 32, 1);
9637 }
9638 break;
9639@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9640 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9641 if (info->plt_initialized == 0) {
9642 unsigned int *ip;
9643- ip = me->module_core + me->arch.plt_offset +
9644+ ip = me->module_core_rx + me->arch.plt_offset +
9645 info->plt_offset;
9646 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
9647 ip[1] = 0x100a0004;
9648@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9649 val - loc + 0xffffUL < 0x1ffffeUL) ||
9650 (r_type == R_390_PLT32DBL &&
9651 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9652- val = (Elf_Addr) me->module_core +
9653+ val = (Elf_Addr) me->module_core_rx +
9654 me->arch.plt_offset +
9655 info->plt_offset;
9656 val += rela->r_addend - loc;
9657@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9658 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9659 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9660 val = val + rela->r_addend -
9661- ((Elf_Addr) me->module_core + me->arch.got_offset);
9662+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9663 if (r_type == R_390_GOTOFF16)
9664 rc = apply_rela_bits(loc, val, 0, 16, 0);
9665 else if (r_type == R_390_GOTOFF32)
9666@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9667 break;
9668 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9669 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9670- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9671+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9672 rela->r_addend - loc;
9673 if (r_type == R_390_GOTPC)
9674 rc = apply_rela_bits(loc, val, 1, 32, 0);
9675diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9676index dc5edc2..7d34ae3 100644
9677--- a/arch/s390/kernel/process.c
9678+++ b/arch/s390/kernel/process.c
9679@@ -200,27 +200,3 @@ unsigned long get_wchan(struct task_struct *p)
9680 }
9681 return 0;
9682 }
9683-
9684-unsigned long arch_align_stack(unsigned long sp)
9685-{
9686- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9687- sp -= get_random_int() & ~PAGE_MASK;
9688- return sp & ~0xf;
9689-}
9690-
9691-static inline unsigned long brk_rnd(void)
9692-{
9693- /* 8MB for 32bit, 1GB for 64bit */
9694- if (is_32bit_task())
9695- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9696- else
9697- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9698-}
9699-
9700-unsigned long arch_randomize_brk(struct mm_struct *mm)
9701-{
9702- unsigned long ret;
9703-
9704- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9705- return (ret > mm->brk) ? ret : mm->brk;
9706-}
9707diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9708index 6e552af..3e608a1 100644
9709--- a/arch/s390/mm/mmap.c
9710+++ b/arch/s390/mm/mmap.c
9711@@ -239,6 +239,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9712 {
9713 unsigned long random_factor = 0UL;
9714
9715+#ifdef CONFIG_PAX_RANDMMAP
9716+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9717+#endif
9718+
9719 if (current->flags & PF_RANDOMIZE)
9720 random_factor = arch_mmap_rnd();
9721
9722@@ -248,9 +252,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9723 */
9724 if (mmap_is_legacy()) {
9725 mm->mmap_base = mmap_base_legacy(random_factor);
9726+
9727+#ifdef CONFIG_PAX_RANDMMAP
9728+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9729+ mm->mmap_base += mm->delta_mmap;
9730+#endif
9731+
9732 mm->get_unmapped_area = s390_get_unmapped_area;
9733 } else {
9734 mm->mmap_base = mmap_base(random_factor);
9735+
9736+#ifdef CONFIG_PAX_RANDMMAP
9737+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9738+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9739+#endif
9740+
9741 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9742 }
9743 }
9744diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9745index ae3d59f..f65f075 100644
9746--- a/arch/score/include/asm/cache.h
9747+++ b/arch/score/include/asm/cache.h
9748@@ -1,7 +1,9 @@
9749 #ifndef _ASM_SCORE_CACHE_H
9750 #define _ASM_SCORE_CACHE_H
9751
9752+#include <linux/const.h>
9753+
9754 #define L1_CACHE_SHIFT 4
9755-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9756+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9757
9758 #endif /* _ASM_SCORE_CACHE_H */
9759diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9760index f9f3cd5..58ff438 100644
9761--- a/arch/score/include/asm/exec.h
9762+++ b/arch/score/include/asm/exec.h
9763@@ -1,6 +1,6 @@
9764 #ifndef _ASM_SCORE_EXEC_H
9765 #define _ASM_SCORE_EXEC_H
9766
9767-extern unsigned long arch_align_stack(unsigned long sp);
9768+#define arch_align_stack(x) (x)
9769
9770 #endif /* _ASM_SCORE_EXEC_H */
9771diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9772index a1519ad3..e8ac1ff 100644
9773--- a/arch/score/kernel/process.c
9774+++ b/arch/score/kernel/process.c
9775@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9776
9777 return task_pt_regs(task)->cp0_epc;
9778 }
9779-
9780-unsigned long arch_align_stack(unsigned long sp)
9781-{
9782- return sp;
9783-}
9784diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9785index ef9e555..331bd29 100644
9786--- a/arch/sh/include/asm/cache.h
9787+++ b/arch/sh/include/asm/cache.h
9788@@ -9,10 +9,11 @@
9789 #define __ASM_SH_CACHE_H
9790 #ifdef __KERNEL__
9791
9792+#include <linux/const.h>
9793 #include <linux/init.h>
9794 #include <cpu/cache.h>
9795
9796-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9797+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9798
9799 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9800
9801diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9802index 6777177..cb5e44f 100644
9803--- a/arch/sh/mm/mmap.c
9804+++ b/arch/sh/mm/mmap.c
9805@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9806 struct mm_struct *mm = current->mm;
9807 struct vm_area_struct *vma;
9808 int do_colour_align;
9809+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9810 struct vm_unmapped_area_info info;
9811
9812 if (flags & MAP_FIXED) {
9813@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9814 if (filp || (flags & MAP_SHARED))
9815 do_colour_align = 1;
9816
9817+#ifdef CONFIG_PAX_RANDMMAP
9818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9819+#endif
9820+
9821 if (addr) {
9822 if (do_colour_align)
9823 addr = COLOUR_ALIGN(addr, pgoff);
9824@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9825 addr = PAGE_ALIGN(addr);
9826
9827 vma = find_vma(mm, addr);
9828- if (TASK_SIZE - len >= addr &&
9829- (!vma || addr + len <= vma->vm_start))
9830+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9831 return addr;
9832 }
9833
9834 info.flags = 0;
9835 info.length = len;
9836- info.low_limit = TASK_UNMAPPED_BASE;
9837+ info.low_limit = mm->mmap_base;
9838 info.high_limit = TASK_SIZE;
9839 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9840 info.align_offset = pgoff << PAGE_SHIFT;
9841@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9842 struct mm_struct *mm = current->mm;
9843 unsigned long addr = addr0;
9844 int do_colour_align;
9845+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9846 struct vm_unmapped_area_info info;
9847
9848 if (flags & MAP_FIXED) {
9849@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9850 if (filp || (flags & MAP_SHARED))
9851 do_colour_align = 1;
9852
9853+#ifdef CONFIG_PAX_RANDMMAP
9854+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9855+#endif
9856+
9857 /* requesting a specific address */
9858 if (addr) {
9859 if (do_colour_align)
9860@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9861 addr = PAGE_ALIGN(addr);
9862
9863 vma = find_vma(mm, addr);
9864- if (TASK_SIZE - len >= addr &&
9865- (!vma || addr + len <= vma->vm_start))
9866+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9867 return addr;
9868 }
9869
9870@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9871 VM_BUG_ON(addr != -ENOMEM);
9872 info.flags = 0;
9873 info.low_limit = TASK_UNMAPPED_BASE;
9874+
9875+#ifdef CONFIG_PAX_RANDMMAP
9876+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9877+ info.low_limit += mm->delta_mmap;
9878+#endif
9879+
9880 info.high_limit = TASK_SIZE;
9881 addr = vm_unmapped_area(&info);
9882 }
9883diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9884index 4082749..fd97781 100644
9885--- a/arch/sparc/include/asm/atomic_64.h
9886+++ b/arch/sparc/include/asm/atomic_64.h
9887@@ -15,18 +15,38 @@
9888 #define ATOMIC64_INIT(i) { (i) }
9889
9890 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9891+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9892+{
9893+ return ACCESS_ONCE(v->counter);
9894+}
9895 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9896+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9897+{
9898+ return ACCESS_ONCE(v->counter);
9899+}
9900
9901 #define atomic_set(v, i) (((v)->counter) = i)
9902+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9903+{
9904+ v->counter = i;
9905+}
9906 #define atomic64_set(v, i) (((v)->counter) = i)
9907+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9908+{
9909+ v->counter = i;
9910+}
9911
9912-#define ATOMIC_OP(op) \
9913-void atomic_##op(int, atomic_t *); \
9914-void atomic64_##op(long, atomic64_t *);
9915+#define __ATOMIC_OP(op, suffix) \
9916+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9917+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9918
9919-#define ATOMIC_OP_RETURN(op) \
9920-int atomic_##op##_return(int, atomic_t *); \
9921-long atomic64_##op##_return(long, atomic64_t *);
9922+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9923+
9924+#define __ATOMIC_OP_RETURN(op, suffix) \
9925+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9926+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9927+
9928+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9929
9930 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9931
9932@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9933
9934 #undef ATOMIC_OPS
9935 #undef ATOMIC_OP_RETURN
9936+#undef __ATOMIC_OP_RETURN
9937 #undef ATOMIC_OP
9938+#undef __ATOMIC_OP
9939
9940 #define atomic_dec_return(v) atomic_sub_return(1, v)
9941 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9942
9943 #define atomic_inc_return(v) atomic_add_return(1, v)
9944+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9945+{
9946+ return atomic_add_return_unchecked(1, v);
9947+}
9948 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9949+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9950+{
9951+ return atomic64_add_return_unchecked(1, v);
9952+}
9953
9954 /*
9955 * atomic_inc_and_test - increment and test
9956@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9957 * other cases.
9958 */
9959 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9960+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9961+{
9962+ return atomic_inc_return_unchecked(v) == 0;
9963+}
9964 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9965
9966 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9967@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9968 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9969
9970 #define atomic_inc(v) atomic_add(1, v)
9971+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9972+{
9973+ atomic_add_unchecked(1, v);
9974+}
9975 #define atomic64_inc(v) atomic64_add(1, v)
9976+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9977+{
9978+ atomic64_add_unchecked(1, v);
9979+}
9980
9981 #define atomic_dec(v) atomic_sub(1, v)
9982+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9983+{
9984+ atomic_sub_unchecked(1, v);
9985+}
9986 #define atomic64_dec(v) atomic64_sub(1, v)
9987+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9988+{
9989+ atomic64_sub_unchecked(1, v);
9990+}
9991
9992 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9993 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9994
9995 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9996+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9997+{
9998+ return cmpxchg(&v->counter, old, new);
9999+}
10000 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10001+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10002+{
10003+ return xchg(&v->counter, new);
10004+}
10005
10006 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10007 {
10008- int c, old;
10009+ int c, old, new;
10010 c = atomic_read(v);
10011 for (;;) {
10012- if (unlikely(c == (u)))
10013+ if (unlikely(c == u))
10014 break;
10015- old = atomic_cmpxchg((v), c, c + (a));
10016+
10017+ asm volatile("addcc %2, %0, %0\n"
10018+
10019+#ifdef CONFIG_PAX_REFCOUNT
10020+ "tvs %%icc, 6\n"
10021+#endif
10022+
10023+ : "=r" (new)
10024+ : "0" (c), "ir" (a)
10025+ : "cc");
10026+
10027+ old = atomic_cmpxchg(v, c, new);
10028 if (likely(old == c))
10029 break;
10030 c = old;
10031@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10032 #define atomic64_cmpxchg(v, o, n) \
10033 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10034 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10035+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10036+{
10037+ return xchg(&v->counter, new);
10038+}
10039
10040 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10041 {
10042- long c, old;
10043+ long c, old, new;
10044 c = atomic64_read(v);
10045 for (;;) {
10046- if (unlikely(c == (u)))
10047+ if (unlikely(c == u))
10048 break;
10049- old = atomic64_cmpxchg((v), c, c + (a));
10050+
10051+ asm volatile("addcc %2, %0, %0\n"
10052+
10053+#ifdef CONFIG_PAX_REFCOUNT
10054+ "tvs %%xcc, 6\n"
10055+#endif
10056+
10057+ : "=r" (new)
10058+ : "0" (c), "ir" (a)
10059+ : "cc");
10060+
10061+ old = atomic64_cmpxchg(v, c, new);
10062 if (likely(old == c))
10063 break;
10064 c = old;
10065 }
10066- return c != (u);
10067+ return c != u;
10068 }
10069
10070 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10071diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10072index 7664894..45a974b 100644
10073--- a/arch/sparc/include/asm/barrier_64.h
10074+++ b/arch/sparc/include/asm/barrier_64.h
10075@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10076 do { \
10077 compiletime_assert_atomic_type(*p); \
10078 barrier(); \
10079- ACCESS_ONCE(*p) = (v); \
10080+ ACCESS_ONCE_RW(*p) = (v); \
10081 } while (0)
10082
10083 #define smp_load_acquire(p) \
10084diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10085index 5bb6991..5c2132e 100644
10086--- a/arch/sparc/include/asm/cache.h
10087+++ b/arch/sparc/include/asm/cache.h
10088@@ -7,10 +7,12 @@
10089 #ifndef _SPARC_CACHE_H
10090 #define _SPARC_CACHE_H
10091
10092+#include <linux/const.h>
10093+
10094 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10095
10096 #define L1_CACHE_SHIFT 5
10097-#define L1_CACHE_BYTES 32
10098+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10099
10100 #ifdef CONFIG_SPARC32
10101 #define SMP_CACHE_BYTES_SHIFT 5
10102diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10103index a24e41f..47677ff 100644
10104--- a/arch/sparc/include/asm/elf_32.h
10105+++ b/arch/sparc/include/asm/elf_32.h
10106@@ -114,6 +114,13 @@ typedef struct {
10107
10108 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10109
10110+#ifdef CONFIG_PAX_ASLR
10111+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10112+
10113+#define PAX_DELTA_MMAP_LEN 16
10114+#define PAX_DELTA_STACK_LEN 16
10115+#endif
10116+
10117 /* This yields a mask that user programs can use to figure out what
10118 instruction set this cpu supports. This can NOT be done in userspace
10119 on Sparc. */
10120diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10121index 370ca1e..d4f4a98 100644
10122--- a/arch/sparc/include/asm/elf_64.h
10123+++ b/arch/sparc/include/asm/elf_64.h
10124@@ -189,6 +189,13 @@ typedef struct {
10125 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10126 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10127
10128+#ifdef CONFIG_PAX_ASLR
10129+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10130+
10131+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10132+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10133+#endif
10134+
10135 extern unsigned long sparc64_elf_hwcap;
10136 #define ELF_HWCAP sparc64_elf_hwcap
10137
10138diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10139index a3890da..f6a408e 100644
10140--- a/arch/sparc/include/asm/pgalloc_32.h
10141+++ b/arch/sparc/include/asm/pgalloc_32.h
10142@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10143 }
10144
10145 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10146+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10147
10148 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10149 unsigned long address)
10150diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10151index 5e31871..13469c6 100644
10152--- a/arch/sparc/include/asm/pgalloc_64.h
10153+++ b/arch/sparc/include/asm/pgalloc_64.h
10154@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10155 }
10156
10157 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10158+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10159
10160 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10161 {
10162@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10163 }
10164
10165 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10166+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10167
10168 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10169 {
10170diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10171index 59ba6f6..4518128 100644
10172--- a/arch/sparc/include/asm/pgtable.h
10173+++ b/arch/sparc/include/asm/pgtable.h
10174@@ -5,4 +5,8 @@
10175 #else
10176 #include <asm/pgtable_32.h>
10177 #endif
10178+
10179+#define ktla_ktva(addr) (addr)
10180+#define ktva_ktla(addr) (addr)
10181+
10182 #endif
10183diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10184index f06b36a..bca3189 100644
10185--- a/arch/sparc/include/asm/pgtable_32.h
10186+++ b/arch/sparc/include/asm/pgtable_32.h
10187@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10188 #define PAGE_SHARED SRMMU_PAGE_SHARED
10189 #define PAGE_COPY SRMMU_PAGE_COPY
10190 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10191+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10192+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10193+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10194 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10195
10196 /* Top-level page directory - dummy used by init-mm.
10197@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10198
10199 /* xwr */
10200 #define __P000 PAGE_NONE
10201-#define __P001 PAGE_READONLY
10202-#define __P010 PAGE_COPY
10203-#define __P011 PAGE_COPY
10204+#define __P001 PAGE_READONLY_NOEXEC
10205+#define __P010 PAGE_COPY_NOEXEC
10206+#define __P011 PAGE_COPY_NOEXEC
10207 #define __P100 PAGE_READONLY
10208 #define __P101 PAGE_READONLY
10209 #define __P110 PAGE_COPY
10210 #define __P111 PAGE_COPY
10211
10212 #define __S000 PAGE_NONE
10213-#define __S001 PAGE_READONLY
10214-#define __S010 PAGE_SHARED
10215-#define __S011 PAGE_SHARED
10216+#define __S001 PAGE_READONLY_NOEXEC
10217+#define __S010 PAGE_SHARED_NOEXEC
10218+#define __S011 PAGE_SHARED_NOEXEC
10219 #define __S100 PAGE_READONLY
10220 #define __S101 PAGE_READONLY
10221 #define __S110 PAGE_SHARED
10222diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10223index ae51a11..eadfd03 100644
10224--- a/arch/sparc/include/asm/pgtsrmmu.h
10225+++ b/arch/sparc/include/asm/pgtsrmmu.h
10226@@ -111,6 +111,11 @@
10227 SRMMU_EXEC | SRMMU_REF)
10228 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10229 SRMMU_EXEC | SRMMU_REF)
10230+
10231+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10232+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10233+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10234+
10235 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10236 SRMMU_DIRTY | SRMMU_REF)
10237
10238diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10239index 29d64b1..4272fe8 100644
10240--- a/arch/sparc/include/asm/setup.h
10241+++ b/arch/sparc/include/asm/setup.h
10242@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10243 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10244
10245 /* init_64.c */
10246-extern atomic_t dcpage_flushes;
10247-extern atomic_t dcpage_flushes_xcall;
10248+extern atomic_unchecked_t dcpage_flushes;
10249+extern atomic_unchecked_t dcpage_flushes_xcall;
10250
10251 extern int sysctl_tsb_ratio;
10252 #endif
10253diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10254index 9689176..63c18ea 100644
10255--- a/arch/sparc/include/asm/spinlock_64.h
10256+++ b/arch/sparc/include/asm/spinlock_64.h
10257@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10258
10259 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10260
10261-static void inline arch_read_lock(arch_rwlock_t *lock)
10262+static inline void arch_read_lock(arch_rwlock_t *lock)
10263 {
10264 unsigned long tmp1, tmp2;
10265
10266 __asm__ __volatile__ (
10267 "1: ldsw [%2], %0\n"
10268 " brlz,pn %0, 2f\n"
10269-"4: add %0, 1, %1\n"
10270+"4: addcc %0, 1, %1\n"
10271+
10272+#ifdef CONFIG_PAX_REFCOUNT
10273+" tvs %%icc, 6\n"
10274+#endif
10275+
10276 " cas [%2], %0, %1\n"
10277 " cmp %0, %1\n"
10278 " bne,pn %%icc, 1b\n"
10279@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10280 " .previous"
10281 : "=&r" (tmp1), "=&r" (tmp2)
10282 : "r" (lock)
10283- : "memory");
10284+ : "memory", "cc");
10285 }
10286
10287-static int inline arch_read_trylock(arch_rwlock_t *lock)
10288+static inline int arch_read_trylock(arch_rwlock_t *lock)
10289 {
10290 int tmp1, tmp2;
10291
10292@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10293 "1: ldsw [%2], %0\n"
10294 " brlz,a,pn %0, 2f\n"
10295 " mov 0, %0\n"
10296-" add %0, 1, %1\n"
10297+" addcc %0, 1, %1\n"
10298+
10299+#ifdef CONFIG_PAX_REFCOUNT
10300+" tvs %%icc, 6\n"
10301+#endif
10302+
10303 " cas [%2], %0, %1\n"
10304 " cmp %0, %1\n"
10305 " bne,pn %%icc, 1b\n"
10306@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10307 return tmp1;
10308 }
10309
10310-static void inline arch_read_unlock(arch_rwlock_t *lock)
10311+static inline void arch_read_unlock(arch_rwlock_t *lock)
10312 {
10313 unsigned long tmp1, tmp2;
10314
10315 __asm__ __volatile__(
10316 "1: lduw [%2], %0\n"
10317-" sub %0, 1, %1\n"
10318+" subcc %0, 1, %1\n"
10319+
10320+#ifdef CONFIG_PAX_REFCOUNT
10321+" tvs %%icc, 6\n"
10322+#endif
10323+
10324 " cas [%2], %0, %1\n"
10325 " cmp %0, %1\n"
10326 " bne,pn %%xcc, 1b\n"
10327@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10328 : "memory");
10329 }
10330
10331-static void inline arch_write_lock(arch_rwlock_t *lock)
10332+static inline void arch_write_lock(arch_rwlock_t *lock)
10333 {
10334 unsigned long mask, tmp1, tmp2;
10335
10336@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10337 : "memory");
10338 }
10339
10340-static void inline arch_write_unlock(arch_rwlock_t *lock)
10341+static inline void arch_write_unlock(arch_rwlock_t *lock)
10342 {
10343 __asm__ __volatile__(
10344 " stw %%g0, [%0]"
10345@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10346 : "memory");
10347 }
10348
10349-static int inline arch_write_trylock(arch_rwlock_t *lock)
10350+static inline int arch_write_trylock(arch_rwlock_t *lock)
10351 {
10352 unsigned long mask, tmp1, tmp2, result;
10353
10354diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10355index 229475f..2fca9163 100644
10356--- a/arch/sparc/include/asm/thread_info_32.h
10357+++ b/arch/sparc/include/asm/thread_info_32.h
10358@@ -48,6 +48,7 @@ struct thread_info {
10359 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10360 unsigned long rwbuf_stkptrs[NSWINS];
10361 unsigned long w_saved;
10362+ unsigned long lowest_stack;
10363 };
10364
10365 /*
10366diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10367index bde5982..9cbb56d 100644
10368--- a/arch/sparc/include/asm/thread_info_64.h
10369+++ b/arch/sparc/include/asm/thread_info_64.h
10370@@ -59,6 +59,8 @@ struct thread_info {
10371 struct pt_regs *kern_una_regs;
10372 unsigned int kern_una_insn;
10373
10374+ unsigned long lowest_stack;
10375+
10376 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10377 __attribute__ ((aligned(64)));
10378 };
10379@@ -180,12 +182,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10380 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10381 /* flag bit 4 is available */
10382 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10383-/* flag bit 6 is available */
10384+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10385 #define TIF_32BIT 7 /* 32-bit binary */
10386 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10387 #define TIF_SECCOMP 9 /* secure computing */
10388 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10389 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10390+
10391 /* NOTE: Thread flags >= 12 should be ones we have no interest
10392 * in using in assembly, else we can't use the mask as
10393 * an immediate value in instructions such as andcc.
10394@@ -205,12 +208,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10395 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10396 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10397 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10398+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10399
10400 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10401 _TIF_DO_NOTIFY_RESUME_MASK | \
10402 _TIF_NEED_RESCHED)
10403 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10404
10405+#define _TIF_WORK_SYSCALL \
10406+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10407+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10408+
10409 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10410
10411 /*
10412diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10413index bd56c28..4b63d83 100644
10414--- a/arch/sparc/include/asm/uaccess.h
10415+++ b/arch/sparc/include/asm/uaccess.h
10416@@ -1,5 +1,6 @@
10417 #ifndef ___ASM_SPARC_UACCESS_H
10418 #define ___ASM_SPARC_UACCESS_H
10419+
10420 #if defined(__sparc__) && defined(__arch64__)
10421 #include <asm/uaccess_64.h>
10422 #else
10423diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10424index 64ee103..388aef0 100644
10425--- a/arch/sparc/include/asm/uaccess_32.h
10426+++ b/arch/sparc/include/asm/uaccess_32.h
10427@@ -47,6 +47,7 @@
10428 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10429 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10430 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10431+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10432 #define access_ok(type, addr, size) \
10433 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10434
10435@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10436
10437 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10438 {
10439- if (n && __access_ok((unsigned long) to, n))
10440+ if ((long)n < 0)
10441+ return n;
10442+
10443+ if (n && __access_ok((unsigned long) to, n)) {
10444+ if (!__builtin_constant_p(n))
10445+ check_object_size(from, n, true);
10446 return __copy_user(to, (__force void __user *) from, n);
10447- else
10448+ } else
10449 return n;
10450 }
10451
10452 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10453 {
10454+ if ((long)n < 0)
10455+ return n;
10456+
10457+ if (!__builtin_constant_p(n))
10458+ check_object_size(from, n, true);
10459+
10460 return __copy_user(to, (__force void __user *) from, n);
10461 }
10462
10463 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10464 {
10465- if (n && __access_ok((unsigned long) from, n))
10466+ if ((long)n < 0)
10467+ return n;
10468+
10469+ if (n && __access_ok((unsigned long) from, n)) {
10470+ if (!__builtin_constant_p(n))
10471+ check_object_size(to, n, false);
10472 return __copy_user((__force void __user *) to, from, n);
10473- else
10474+ } else
10475 return n;
10476 }
10477
10478 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10479 {
10480+ if ((long)n < 0)
10481+ return n;
10482+
10483 return __copy_user((__force void __user *) to, from, n);
10484 }
10485
10486diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10487index a35194b..47dabc0d 100644
10488--- a/arch/sparc/include/asm/uaccess_64.h
10489+++ b/arch/sparc/include/asm/uaccess_64.h
10490@@ -10,6 +10,7 @@
10491 #include <linux/compiler.h>
10492 #include <linux/string.h>
10493 #include <linux/thread_info.h>
10494+#include <linux/kernel.h>
10495 #include <asm/asi.h>
10496 #include <asm/spitfire.h>
10497 #include <asm-generic/uaccess-unaligned.h>
10498@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10499 return 1;
10500 }
10501
10502+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10503+{
10504+ return 1;
10505+}
10506+
10507 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10508 {
10509 return 1;
10510@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10511 static inline unsigned long __must_check
10512 copy_from_user(void *to, const void __user *from, unsigned long size)
10513 {
10514- unsigned long ret = ___copy_from_user(to, from, size);
10515+ unsigned long ret;
10516
10517+ if ((long)size < 0 || size > INT_MAX)
10518+ return size;
10519+
10520+ if (!__builtin_constant_p(size))
10521+ check_object_size(to, size, false);
10522+
10523+ ret = ___copy_from_user(to, from, size);
10524 if (unlikely(ret))
10525 ret = copy_from_user_fixup(to, from, size);
10526
10527@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10528 static inline unsigned long __must_check
10529 copy_to_user(void __user *to, const void *from, unsigned long size)
10530 {
10531- unsigned long ret = ___copy_to_user(to, from, size);
10532+ unsigned long ret;
10533
10534+ if ((long)size < 0 || size > INT_MAX)
10535+ return size;
10536+
10537+ if (!__builtin_constant_p(size))
10538+ check_object_size(from, size, true);
10539+
10540+ ret = ___copy_to_user(to, from, size);
10541 if (unlikely(ret))
10542 ret = copy_to_user_fixup(to, from, size);
10543 return ret;
10544diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10545index 7cf9c6e..6206648 100644
10546--- a/arch/sparc/kernel/Makefile
10547+++ b/arch/sparc/kernel/Makefile
10548@@ -4,7 +4,7 @@
10549 #
10550
10551 asflags-y := -ansi
10552-ccflags-y := -Werror
10553+#ccflags-y := -Werror
10554
10555 extra-y := head_$(BITS).o
10556
10557diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10558index 50e7b62..79fae35 100644
10559--- a/arch/sparc/kernel/process_32.c
10560+++ b/arch/sparc/kernel/process_32.c
10561@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10562
10563 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10564 r->psr, r->pc, r->npc, r->y, print_tainted());
10565- printk("PC: <%pS>\n", (void *) r->pc);
10566+ printk("PC: <%pA>\n", (void *) r->pc);
10567 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10568 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10569 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10570 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10571 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10572 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10573- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10574+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10575
10576 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10577 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10578@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10579 rw = (struct reg_window32 *) fp;
10580 pc = rw->ins[7];
10581 printk("[%08lx : ", pc);
10582- printk("%pS ] ", (void *) pc);
10583+ printk("%pA ] ", (void *) pc);
10584 fp = rw->ins[6];
10585 } while (++count < 16);
10586 printk("\n");
10587diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10588index 46a5964..a35c62c 100644
10589--- a/arch/sparc/kernel/process_64.c
10590+++ b/arch/sparc/kernel/process_64.c
10591@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10592 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10593 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10594 if (regs->tstate & TSTATE_PRIV)
10595- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10596+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10597 }
10598
10599 void show_regs(struct pt_regs *regs)
10600@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10601
10602 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10603 regs->tpc, regs->tnpc, regs->y, print_tainted());
10604- printk("TPC: <%pS>\n", (void *) regs->tpc);
10605+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10606 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10607 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10608 regs->u_regs[3]);
10609@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10610 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10611 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10612 regs->u_regs[15]);
10613- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10614+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10615 show_regwindow(regs);
10616 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10617 }
10618@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10619 ((tp && tp->task) ? tp->task->pid : -1));
10620
10621 if (gp->tstate & TSTATE_PRIV) {
10622- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10623+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10624 (void *) gp->tpc,
10625 (void *) gp->o7,
10626 (void *) gp->i7,
10627diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10628index 79cc0d1..ec62734 100644
10629--- a/arch/sparc/kernel/prom_common.c
10630+++ b/arch/sparc/kernel/prom_common.c
10631@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10632
10633 unsigned int prom_early_allocated __initdata;
10634
10635-static struct of_pdt_ops prom_sparc_ops __initdata = {
10636+static struct of_pdt_ops prom_sparc_ops __initconst = {
10637 .nextprop = prom_common_nextprop,
10638 .getproplen = prom_getproplen,
10639 .getproperty = prom_getproperty,
10640diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10641index 9ddc492..27a5619 100644
10642--- a/arch/sparc/kernel/ptrace_64.c
10643+++ b/arch/sparc/kernel/ptrace_64.c
10644@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10645 return ret;
10646 }
10647
10648+#ifdef CONFIG_GRKERNSEC_SETXID
10649+extern void gr_delayed_cred_worker(void);
10650+#endif
10651+
10652 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10653 {
10654 int ret = 0;
10655@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10656 if (test_thread_flag(TIF_NOHZ))
10657 user_exit();
10658
10659+#ifdef CONFIG_GRKERNSEC_SETXID
10660+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10661+ gr_delayed_cred_worker();
10662+#endif
10663+
10664 if (test_thread_flag(TIF_SYSCALL_TRACE))
10665 ret = tracehook_report_syscall_entry(regs);
10666
10667@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10668 if (test_thread_flag(TIF_NOHZ))
10669 user_exit();
10670
10671+#ifdef CONFIG_GRKERNSEC_SETXID
10672+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10673+ gr_delayed_cred_worker();
10674+#endif
10675+
10676 audit_syscall_exit(regs);
10677
10678 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10679diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10680index 19cd08d..ff21e99 100644
10681--- a/arch/sparc/kernel/smp_64.c
10682+++ b/arch/sparc/kernel/smp_64.c
10683@@ -891,7 +891,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10684 return;
10685
10686 #ifdef CONFIG_DEBUG_DCFLUSH
10687- atomic_inc(&dcpage_flushes);
10688+ atomic_inc_unchecked(&dcpage_flushes);
10689 #endif
10690
10691 this_cpu = get_cpu();
10692@@ -915,7 +915,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10693 xcall_deliver(data0, __pa(pg_addr),
10694 (u64) pg_addr, cpumask_of(cpu));
10695 #ifdef CONFIG_DEBUG_DCFLUSH
10696- atomic_inc(&dcpage_flushes_xcall);
10697+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10698 #endif
10699 }
10700 }
10701@@ -934,7 +934,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10702 preempt_disable();
10703
10704 #ifdef CONFIG_DEBUG_DCFLUSH
10705- atomic_inc(&dcpage_flushes);
10706+ atomic_inc_unchecked(&dcpage_flushes);
10707 #endif
10708 data0 = 0;
10709 pg_addr = page_address(page);
10710@@ -951,7 +951,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10711 xcall_deliver(data0, __pa(pg_addr),
10712 (u64) pg_addr, cpu_online_mask);
10713 #ifdef CONFIG_DEBUG_DCFLUSH
10714- atomic_inc(&dcpage_flushes_xcall);
10715+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10716 #endif
10717 }
10718 __local_flush_dcache_page(page);
10719diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10720index 646988d..b88905f 100644
10721--- a/arch/sparc/kernel/sys_sparc_32.c
10722+++ b/arch/sparc/kernel/sys_sparc_32.c
10723@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10724 if (len > TASK_SIZE - PAGE_SIZE)
10725 return -ENOMEM;
10726 if (!addr)
10727- addr = TASK_UNMAPPED_BASE;
10728+ addr = current->mm->mmap_base;
10729
10730 info.flags = 0;
10731 info.length = len;
10732diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10733index 30e7ddb..266a3b0 100644
10734--- a/arch/sparc/kernel/sys_sparc_64.c
10735+++ b/arch/sparc/kernel/sys_sparc_64.c
10736@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10737 struct vm_area_struct * vma;
10738 unsigned long task_size = TASK_SIZE;
10739 int do_color_align;
10740+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10741 struct vm_unmapped_area_info info;
10742
10743 if (flags & MAP_FIXED) {
10744 /* We do not accept a shared mapping if it would violate
10745 * cache aliasing constraints.
10746 */
10747- if ((flags & MAP_SHARED) &&
10748+ if ((filp || (flags & MAP_SHARED)) &&
10749 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10750 return -EINVAL;
10751 return addr;
10752@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10753 if (filp || (flags & MAP_SHARED))
10754 do_color_align = 1;
10755
10756+#ifdef CONFIG_PAX_RANDMMAP
10757+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10758+#endif
10759+
10760 if (addr) {
10761 if (do_color_align)
10762 addr = COLOR_ALIGN(addr, pgoff);
10763@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10764 addr = PAGE_ALIGN(addr);
10765
10766 vma = find_vma(mm, addr);
10767- if (task_size - len >= addr &&
10768- (!vma || addr + len <= vma->vm_start))
10769+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10770 return addr;
10771 }
10772
10773 info.flags = 0;
10774 info.length = len;
10775- info.low_limit = TASK_UNMAPPED_BASE;
10776+ info.low_limit = mm->mmap_base;
10777 info.high_limit = min(task_size, VA_EXCLUDE_START);
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 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10784 VM_BUG_ON(addr != -ENOMEM);
10785 info.low_limit = VA_EXCLUDE_END;
10786+
10787+#ifdef CONFIG_PAX_RANDMMAP
10788+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10789+ info.low_limit += mm->delta_mmap;
10790+#endif
10791+
10792 info.high_limit = task_size;
10793 addr = vm_unmapped_area(&info);
10794 }
10795@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10796 unsigned long task_size = STACK_TOP32;
10797 unsigned long addr = addr0;
10798 int do_color_align;
10799+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10800 struct vm_unmapped_area_info info;
10801
10802 /* This should only ever run for 32-bit processes. */
10803@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10804 /* We do not accept a shared mapping if it would violate
10805 * cache aliasing constraints.
10806 */
10807- if ((flags & MAP_SHARED) &&
10808+ if ((filp || (flags & MAP_SHARED)) &&
10809 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10810 return -EINVAL;
10811 return addr;
10812@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10813 if (filp || (flags & MAP_SHARED))
10814 do_color_align = 1;
10815
10816+#ifdef CONFIG_PAX_RANDMMAP
10817+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10818+#endif
10819+
10820 /* requesting a specific address */
10821 if (addr) {
10822 if (do_color_align)
10823@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10824 addr = PAGE_ALIGN(addr);
10825
10826 vma = find_vma(mm, addr);
10827- if (task_size - len >= addr &&
10828- (!vma || addr + len <= vma->vm_start))
10829+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10830 return addr;
10831 }
10832
10833@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10834 info.high_limit = mm->mmap_base;
10835 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10836 info.align_offset = pgoff << PAGE_SHIFT;
10837+ info.threadstack_offset = offset;
10838 addr = vm_unmapped_area(&info);
10839
10840 /*
10841@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10842 VM_BUG_ON(addr != -ENOMEM);
10843 info.flags = 0;
10844 info.low_limit = TASK_UNMAPPED_BASE;
10845+
10846+#ifdef CONFIG_PAX_RANDMMAP
10847+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10848+ info.low_limit += mm->delta_mmap;
10849+#endif
10850+
10851 info.high_limit = STACK_TOP32;
10852 addr = vm_unmapped_area(&info);
10853 }
10854@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10855 EXPORT_SYMBOL(get_fb_unmapped_area);
10856
10857 /* Essentially the same as PowerPC. */
10858-static unsigned long mmap_rnd(void)
10859+static unsigned long mmap_rnd(struct mm_struct *mm)
10860 {
10861 unsigned long rnd = 0UL;
10862
10863+#ifdef CONFIG_PAX_RANDMMAP
10864+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10865+#endif
10866+
10867 if (current->flags & PF_RANDOMIZE) {
10868 unsigned long val = get_random_int();
10869 if (test_thread_flag(TIF_32BIT))
10870@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10871
10872 void arch_pick_mmap_layout(struct mm_struct *mm)
10873 {
10874- unsigned long random_factor = mmap_rnd();
10875+ unsigned long random_factor = mmap_rnd(mm);
10876 unsigned long gap;
10877
10878 /*
10879@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10880 gap == RLIM_INFINITY ||
10881 sysctl_legacy_va_layout) {
10882 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10883+
10884+#ifdef CONFIG_PAX_RANDMMAP
10885+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10886+ mm->mmap_base += mm->delta_mmap;
10887+#endif
10888+
10889 mm->get_unmapped_area = arch_get_unmapped_area;
10890 } else {
10891 /* We know it's 32-bit */
10892@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10893 gap = (task_size / 6 * 5);
10894
10895 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10896+
10897+#ifdef CONFIG_PAX_RANDMMAP
10898+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10899+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10900+#endif
10901+
10902 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10903 }
10904 }
10905diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10906index bb00089..e0ea580 100644
10907--- a/arch/sparc/kernel/syscalls.S
10908+++ b/arch/sparc/kernel/syscalls.S
10909@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10910 #endif
10911 .align 32
10912 1: ldx [%g6 + TI_FLAGS], %l5
10913- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10914+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10915 be,pt %icc, rtrap
10916 nop
10917 call syscall_trace_leave
10918@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10919
10920 srl %i3, 0, %o3 ! IEU0
10921 srl %i2, 0, %o2 ! IEU0 Group
10922- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10923+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10924 bne,pn %icc, linux_syscall_trace32 ! CTI
10925 mov %i0, %l5 ! IEU1
10926 5: call %l7 ! CTI Group brk forced
10927@@ -218,7 +218,7 @@ linux_sparc_syscall:
10928
10929 mov %i3, %o3 ! IEU1
10930 mov %i4, %o4 ! IEU0 Group
10931- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10932+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10933 bne,pn %icc, linux_syscall_trace ! CTI Group
10934 mov %i0, %l5 ! IEU0
10935 2: call %l7 ! CTI Group brk forced
10936@@ -233,7 +233,7 @@ ret_sys_call:
10937
10938 cmp %o0, -ERESTART_RESTARTBLOCK
10939 bgeu,pn %xcc, 1f
10940- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10941+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10942 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10943
10944 2:
10945diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10946index 4f21df7..0a374da 100644
10947--- a/arch/sparc/kernel/traps_32.c
10948+++ b/arch/sparc/kernel/traps_32.c
10949@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10950 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10951 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10952
10953+extern void gr_handle_kernel_exploit(void);
10954+
10955 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10956 {
10957 static int die_counter;
10958@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10959 count++ < 30 &&
10960 (((unsigned long) rw) >= PAGE_OFFSET) &&
10961 !(((unsigned long) rw) & 0x7)) {
10962- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10963+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10964 (void *) rw->ins[7]);
10965 rw = (struct reg_window32 *)rw->ins[6];
10966 }
10967 }
10968 printk("Instruction DUMP:");
10969 instruction_dump ((unsigned long *) regs->pc);
10970- if(regs->psr & PSR_PS)
10971+ if(regs->psr & PSR_PS) {
10972+ gr_handle_kernel_exploit();
10973 do_exit(SIGKILL);
10974+ }
10975 do_exit(SIGSEGV);
10976 }
10977
10978diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10979index d21cd62..00a4a17 100644
10980--- a/arch/sparc/kernel/traps_64.c
10981+++ b/arch/sparc/kernel/traps_64.c
10982@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10983 i + 1,
10984 p->trapstack[i].tstate, p->trapstack[i].tpc,
10985 p->trapstack[i].tnpc, p->trapstack[i].tt);
10986- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10987+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10988 }
10989 }
10990
10991@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10992
10993 lvl -= 0x100;
10994 if (regs->tstate & TSTATE_PRIV) {
10995+
10996+#ifdef CONFIG_PAX_REFCOUNT
10997+ if (lvl == 6)
10998+ pax_report_refcount_overflow(regs);
10999+#endif
11000+
11001 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11002 die_if_kernel(buffer, regs);
11003 }
11004@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11005 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11006 {
11007 char buffer[32];
11008-
11009+
11010 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11011 0, lvl, SIGTRAP) == NOTIFY_STOP)
11012 return;
11013
11014+#ifdef CONFIG_PAX_REFCOUNT
11015+ if (lvl == 6)
11016+ pax_report_refcount_overflow(regs);
11017+#endif
11018+
11019 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11020
11021 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11022@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11023 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11024 printk("%s" "ERROR(%d): ",
11025 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11026- printk("TPC<%pS>\n", (void *) regs->tpc);
11027+ printk("TPC<%pA>\n", (void *) regs->tpc);
11028 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11029 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11030 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11031@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11032 smp_processor_id(),
11033 (type & 0x1) ? 'I' : 'D',
11034 regs->tpc);
11035- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11036+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11037 panic("Irrecoverable Cheetah+ parity error.");
11038 }
11039
11040@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11041 smp_processor_id(),
11042 (type & 0x1) ? 'I' : 'D',
11043 regs->tpc);
11044- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11045+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11046 }
11047
11048 struct sun4v_error_entry {
11049@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11050 /*0x38*/u64 reserved_5;
11051 };
11052
11053-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11054-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11055+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11056+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11057
11058 static const char *sun4v_err_type_to_str(u8 type)
11059 {
11060@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11061 }
11062
11063 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11064- int cpu, const char *pfx, atomic_t *ocnt)
11065+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11066 {
11067 u64 *raw_ptr = (u64 *) ent;
11068 u32 attrs;
11069@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11070
11071 show_regs(regs);
11072
11073- if ((cnt = atomic_read(ocnt)) != 0) {
11074- atomic_set(ocnt, 0);
11075+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11076+ atomic_set_unchecked(ocnt, 0);
11077 wmb();
11078 printk("%s: Queue overflowed %d times.\n",
11079 pfx, cnt);
11080@@ -2048,7 +2059,7 @@ out:
11081 */
11082 void sun4v_resum_overflow(struct pt_regs *regs)
11083 {
11084- atomic_inc(&sun4v_resum_oflow_cnt);
11085+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11086 }
11087
11088 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11089@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11090 /* XXX Actually even this can make not that much sense. Perhaps
11091 * XXX we should just pull the plug and panic directly from here?
11092 */
11093- atomic_inc(&sun4v_nonresum_oflow_cnt);
11094+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11095 }
11096
11097 static void sun4v_tlb_error(struct pt_regs *regs)
11098@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11099
11100 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11101 regs->tpc, tl);
11102- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11103+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11104 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11105- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11106+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11107 (void *) regs->u_regs[UREG_I7]);
11108 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11109 "pte[%lx] error[%lx]\n",
11110@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11111
11112 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11113 regs->tpc, tl);
11114- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11115+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11116 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11117- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11118+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11119 (void *) regs->u_regs[UREG_I7]);
11120 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11121 "pte[%lx] error[%lx]\n",
11122@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11123 fp = (unsigned long)sf->fp + STACK_BIAS;
11124 }
11125
11126- printk(" [%016lx] %pS\n", pc, (void *) pc);
11127+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11128 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11129 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11130 int index = tsk->curr_ret_stack;
11131 if (tsk->ret_stack && index >= graph) {
11132 pc = tsk->ret_stack[index - graph].ret;
11133- printk(" [%016lx] %pS\n", pc, (void *) pc);
11134+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11135 graph++;
11136 }
11137 }
11138@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11139 return (struct reg_window *) (fp + STACK_BIAS);
11140 }
11141
11142+extern void gr_handle_kernel_exploit(void);
11143+
11144 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11145 {
11146 static int die_counter;
11147@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11148 while (rw &&
11149 count++ < 30 &&
11150 kstack_valid(tp, (unsigned long) rw)) {
11151- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11152+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11153 (void *) rw->ins[7]);
11154
11155 rw = kernel_stack_up(rw);
11156@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11157 }
11158 if (panic_on_oops)
11159 panic("Fatal exception");
11160- if (regs->tstate & TSTATE_PRIV)
11161+ if (regs->tstate & TSTATE_PRIV) {
11162+ gr_handle_kernel_exploit();
11163 do_exit(SIGKILL);
11164+ }
11165 do_exit(SIGSEGV);
11166 }
11167 EXPORT_SYMBOL(die_if_kernel);
11168diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11169index 62098a8..547ab2c 100644
11170--- a/arch/sparc/kernel/unaligned_64.c
11171+++ b/arch/sparc/kernel/unaligned_64.c
11172@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11173 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11174
11175 if (__ratelimit(&ratelimit)) {
11176- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11177+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11178 regs->tpc, (void *) regs->tpc);
11179 }
11180 }
11181diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11182index 3269b02..64f5231 100644
11183--- a/arch/sparc/lib/Makefile
11184+++ b/arch/sparc/lib/Makefile
11185@@ -2,7 +2,7 @@
11186 #
11187
11188 asflags-y := -ansi -DST_DIV0=0x02
11189-ccflags-y := -Werror
11190+#ccflags-y := -Werror
11191
11192 lib-$(CONFIG_SPARC32) += ashrdi3.o
11193 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11194diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11195index 05dac43..76f8ed4 100644
11196--- a/arch/sparc/lib/atomic_64.S
11197+++ b/arch/sparc/lib/atomic_64.S
11198@@ -15,11 +15,22 @@
11199 * a value and does the barriers.
11200 */
11201
11202-#define ATOMIC_OP(op) \
11203-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11204+#ifdef CONFIG_PAX_REFCOUNT
11205+#define __REFCOUNT_OP(op) op##cc
11206+#define __OVERFLOW_IOP tvs %icc, 6;
11207+#define __OVERFLOW_XOP tvs %xcc, 6;
11208+#else
11209+#define __REFCOUNT_OP(op) op
11210+#define __OVERFLOW_IOP
11211+#define __OVERFLOW_XOP
11212+#endif
11213+
11214+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11215+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11216 BACKOFF_SETUP(%o2); \
11217 1: lduw [%o1], %g1; \
11218- op %g1, %o0, %g7; \
11219+ asm_op %g1, %o0, %g7; \
11220+ post_op \
11221 cas [%o1], %g1, %g7; \
11222 cmp %g1, %g7; \
11223 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11224@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11225 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11226 ENDPROC(atomic_##op); \
11227
11228-#define ATOMIC_OP_RETURN(op) \
11229-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11230+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11231+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11232+
11233+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11234+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11235 BACKOFF_SETUP(%o2); \
11236 1: lduw [%o1], %g1; \
11237- op %g1, %o0, %g7; \
11238+ asm_op %g1, %o0, %g7; \
11239+ post_op \
11240 cas [%o1], %g1, %g7; \
11241 cmp %g1, %g7; \
11242 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11243@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11244 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11245 ENDPROC(atomic_##op##_return);
11246
11247+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11248+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11249+
11250 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11251
11252 ATOMIC_OPS(add)
11253@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11254
11255 #undef ATOMIC_OPS
11256 #undef ATOMIC_OP_RETURN
11257+#undef __ATOMIC_OP_RETURN
11258 #undef ATOMIC_OP
11259+#undef __ATOMIC_OP
11260
11261-#define ATOMIC64_OP(op) \
11262-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11263+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11264+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11265 BACKOFF_SETUP(%o2); \
11266 1: ldx [%o1], %g1; \
11267- op %g1, %o0, %g7; \
11268+ asm_op %g1, %o0, %g7; \
11269+ post_op \
11270 casx [%o1], %g1, %g7; \
11271 cmp %g1, %g7; \
11272 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11273@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11274 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11275 ENDPROC(atomic64_##op); \
11276
11277-#define ATOMIC64_OP_RETURN(op) \
11278-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11279+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11280+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11281+
11282+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11283+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11284 BACKOFF_SETUP(%o2); \
11285 1: ldx [%o1], %g1; \
11286- op %g1, %o0, %g7; \
11287+ asm_op %g1, %o0, %g7; \
11288+ post_op \
11289 casx [%o1], %g1, %g7; \
11290 cmp %g1, %g7; \
11291 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11292@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11293 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11294 ENDPROC(atomic64_##op##_return);
11295
11296+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11297+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11298+
11299 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11300
11301 ATOMIC64_OPS(add)
11302@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11303
11304 #undef ATOMIC64_OPS
11305 #undef ATOMIC64_OP_RETURN
11306+#undef __ATOMIC64_OP_RETURN
11307 #undef ATOMIC64_OP
11308+#undef __ATOMIC64_OP
11309+#undef __OVERFLOW_XOP
11310+#undef __OVERFLOW_IOP
11311+#undef __REFCOUNT_OP
11312
11313 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11314 BACKOFF_SETUP(%o2)
11315diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11316index 1d649a9..fbc5bfc 100644
11317--- a/arch/sparc/lib/ksyms.c
11318+++ b/arch/sparc/lib/ksyms.c
11319@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11320 /* Atomic counter implementation. */
11321 #define ATOMIC_OP(op) \
11322 EXPORT_SYMBOL(atomic_##op); \
11323-EXPORT_SYMBOL(atomic64_##op);
11324+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11325+EXPORT_SYMBOL(atomic64_##op); \
11326+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11327
11328 #define ATOMIC_OP_RETURN(op) \
11329 EXPORT_SYMBOL(atomic_##op##_return); \
11330@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11331 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11332
11333 ATOMIC_OPS(add)
11334+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11335+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11336 ATOMIC_OPS(sub)
11337
11338 #undef ATOMIC_OPS
11339diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11340index 30c3ecc..736f015 100644
11341--- a/arch/sparc/mm/Makefile
11342+++ b/arch/sparc/mm/Makefile
11343@@ -2,7 +2,7 @@
11344 #
11345
11346 asflags-y := -ansi
11347-ccflags-y := -Werror
11348+#ccflags-y := -Werror
11349
11350 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11351 obj-y += fault_$(BITS).o
11352diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11353index 70d8171..274c6c0 100644
11354--- a/arch/sparc/mm/fault_32.c
11355+++ b/arch/sparc/mm/fault_32.c
11356@@ -21,6 +21,9 @@
11357 #include <linux/perf_event.h>
11358 #include <linux/interrupt.h>
11359 #include <linux/kdebug.h>
11360+#include <linux/slab.h>
11361+#include <linux/pagemap.h>
11362+#include <linux/compiler.h>
11363
11364 #include <asm/page.h>
11365 #include <asm/pgtable.h>
11366@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11367 return safe_compute_effective_address(regs, insn);
11368 }
11369
11370+#ifdef CONFIG_PAX_PAGEEXEC
11371+#ifdef CONFIG_PAX_DLRESOLVE
11372+static void pax_emuplt_close(struct vm_area_struct *vma)
11373+{
11374+ vma->vm_mm->call_dl_resolve = 0UL;
11375+}
11376+
11377+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11378+{
11379+ unsigned int *kaddr;
11380+
11381+ vmf->page = alloc_page(GFP_HIGHUSER);
11382+ if (!vmf->page)
11383+ return VM_FAULT_OOM;
11384+
11385+ kaddr = kmap(vmf->page);
11386+ memset(kaddr, 0, PAGE_SIZE);
11387+ kaddr[0] = 0x9DE3BFA8U; /* save */
11388+ flush_dcache_page(vmf->page);
11389+ kunmap(vmf->page);
11390+ return VM_FAULT_MAJOR;
11391+}
11392+
11393+static const struct vm_operations_struct pax_vm_ops = {
11394+ .close = pax_emuplt_close,
11395+ .fault = pax_emuplt_fault
11396+};
11397+
11398+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11399+{
11400+ int ret;
11401+
11402+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11403+ vma->vm_mm = current->mm;
11404+ vma->vm_start = addr;
11405+ vma->vm_end = addr + PAGE_SIZE;
11406+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11407+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11408+ vma->vm_ops = &pax_vm_ops;
11409+
11410+ ret = insert_vm_struct(current->mm, vma);
11411+ if (ret)
11412+ return ret;
11413+
11414+ ++current->mm->total_vm;
11415+ return 0;
11416+}
11417+#endif
11418+
11419+/*
11420+ * PaX: decide what to do with offenders (regs->pc = fault address)
11421+ *
11422+ * returns 1 when task should be killed
11423+ * 2 when patched PLT trampoline was detected
11424+ * 3 when unpatched PLT trampoline was detected
11425+ */
11426+static int pax_handle_fetch_fault(struct pt_regs *regs)
11427+{
11428+
11429+#ifdef CONFIG_PAX_EMUPLT
11430+ int err;
11431+
11432+ do { /* PaX: patched PLT emulation #1 */
11433+ unsigned int sethi1, sethi2, jmpl;
11434+
11435+ err = get_user(sethi1, (unsigned int *)regs->pc);
11436+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11437+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11438+
11439+ if (err)
11440+ break;
11441+
11442+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11443+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11444+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11445+ {
11446+ unsigned int addr;
11447+
11448+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11449+ addr = regs->u_regs[UREG_G1];
11450+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11451+ regs->pc = addr;
11452+ regs->npc = addr+4;
11453+ return 2;
11454+ }
11455+ } while (0);
11456+
11457+ do { /* PaX: patched PLT emulation #2 */
11458+ unsigned int ba;
11459+
11460+ err = get_user(ba, (unsigned int *)regs->pc);
11461+
11462+ if (err)
11463+ break;
11464+
11465+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11466+ unsigned int addr;
11467+
11468+ if ((ba & 0xFFC00000U) == 0x30800000U)
11469+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11470+ else
11471+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11472+ regs->pc = addr;
11473+ regs->npc = addr+4;
11474+ return 2;
11475+ }
11476+ } while (0);
11477+
11478+ do { /* PaX: patched PLT emulation #3 */
11479+ unsigned int sethi, bajmpl, nop;
11480+
11481+ err = get_user(sethi, (unsigned int *)regs->pc);
11482+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11483+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11484+
11485+ if (err)
11486+ break;
11487+
11488+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11489+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11490+ nop == 0x01000000U)
11491+ {
11492+ unsigned int addr;
11493+
11494+ addr = (sethi & 0x003FFFFFU) << 10;
11495+ regs->u_regs[UREG_G1] = addr;
11496+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11497+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11498+ else
11499+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11500+ regs->pc = addr;
11501+ regs->npc = addr+4;
11502+ return 2;
11503+ }
11504+ } while (0);
11505+
11506+ do { /* PaX: unpatched PLT emulation step 1 */
11507+ unsigned int sethi, ba, nop;
11508+
11509+ err = get_user(sethi, (unsigned int *)regs->pc);
11510+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11511+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11512+
11513+ if (err)
11514+ break;
11515+
11516+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11517+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11518+ nop == 0x01000000U)
11519+ {
11520+ unsigned int addr, save, call;
11521+
11522+ if ((ba & 0xFFC00000U) == 0x30800000U)
11523+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11524+ else
11525+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11526+
11527+ err = get_user(save, (unsigned int *)addr);
11528+ err |= get_user(call, (unsigned int *)(addr+4));
11529+ err |= get_user(nop, (unsigned int *)(addr+8));
11530+ if (err)
11531+ break;
11532+
11533+#ifdef CONFIG_PAX_DLRESOLVE
11534+ if (save == 0x9DE3BFA8U &&
11535+ (call & 0xC0000000U) == 0x40000000U &&
11536+ nop == 0x01000000U)
11537+ {
11538+ struct vm_area_struct *vma;
11539+ unsigned long call_dl_resolve;
11540+
11541+ down_read(&current->mm->mmap_sem);
11542+ call_dl_resolve = current->mm->call_dl_resolve;
11543+ up_read(&current->mm->mmap_sem);
11544+ if (likely(call_dl_resolve))
11545+ goto emulate;
11546+
11547+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11548+
11549+ down_write(&current->mm->mmap_sem);
11550+ if (current->mm->call_dl_resolve) {
11551+ call_dl_resolve = current->mm->call_dl_resolve;
11552+ up_write(&current->mm->mmap_sem);
11553+ if (vma)
11554+ kmem_cache_free(vm_area_cachep, vma);
11555+ goto emulate;
11556+ }
11557+
11558+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11559+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11560+ up_write(&current->mm->mmap_sem);
11561+ if (vma)
11562+ kmem_cache_free(vm_area_cachep, vma);
11563+ return 1;
11564+ }
11565+
11566+ if (pax_insert_vma(vma, call_dl_resolve)) {
11567+ up_write(&current->mm->mmap_sem);
11568+ kmem_cache_free(vm_area_cachep, vma);
11569+ return 1;
11570+ }
11571+
11572+ current->mm->call_dl_resolve = call_dl_resolve;
11573+ up_write(&current->mm->mmap_sem);
11574+
11575+emulate:
11576+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11577+ regs->pc = call_dl_resolve;
11578+ regs->npc = addr+4;
11579+ return 3;
11580+ }
11581+#endif
11582+
11583+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11584+ if ((save & 0xFFC00000U) == 0x05000000U &&
11585+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11586+ nop == 0x01000000U)
11587+ {
11588+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11589+ regs->u_regs[UREG_G2] = addr + 4;
11590+ addr = (save & 0x003FFFFFU) << 10;
11591+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11592+ regs->pc = addr;
11593+ regs->npc = addr+4;
11594+ return 3;
11595+ }
11596+ }
11597+ } while (0);
11598+
11599+ do { /* PaX: unpatched PLT emulation step 2 */
11600+ unsigned int save, call, nop;
11601+
11602+ err = get_user(save, (unsigned int *)(regs->pc-4));
11603+ err |= get_user(call, (unsigned int *)regs->pc);
11604+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11605+ if (err)
11606+ break;
11607+
11608+ if (save == 0x9DE3BFA8U &&
11609+ (call & 0xC0000000U) == 0x40000000U &&
11610+ nop == 0x01000000U)
11611+ {
11612+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11613+
11614+ regs->u_regs[UREG_RETPC] = regs->pc;
11615+ regs->pc = dl_resolve;
11616+ regs->npc = dl_resolve+4;
11617+ return 3;
11618+ }
11619+ } while (0);
11620+#endif
11621+
11622+ return 1;
11623+}
11624+
11625+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11626+{
11627+ unsigned long i;
11628+
11629+ printk(KERN_ERR "PAX: bytes at PC: ");
11630+ for (i = 0; i < 8; i++) {
11631+ unsigned int c;
11632+ if (get_user(c, (unsigned int *)pc+i))
11633+ printk(KERN_CONT "???????? ");
11634+ else
11635+ printk(KERN_CONT "%08x ", c);
11636+ }
11637+ printk("\n");
11638+}
11639+#endif
11640+
11641 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11642 int text_fault)
11643 {
11644@@ -226,6 +500,24 @@ good_area:
11645 if (!(vma->vm_flags & VM_WRITE))
11646 goto bad_area;
11647 } else {
11648+
11649+#ifdef CONFIG_PAX_PAGEEXEC
11650+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11651+ up_read(&mm->mmap_sem);
11652+ switch (pax_handle_fetch_fault(regs)) {
11653+
11654+#ifdef CONFIG_PAX_EMUPLT
11655+ case 2:
11656+ case 3:
11657+ return;
11658+#endif
11659+
11660+ }
11661+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11662+ do_group_exit(SIGKILL);
11663+ }
11664+#endif
11665+
11666 /* Allow reads even for write-only mappings */
11667 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11668 goto bad_area;
11669diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11670index 4798232..f76e3aa 100644
11671--- a/arch/sparc/mm/fault_64.c
11672+++ b/arch/sparc/mm/fault_64.c
11673@@ -22,6 +22,9 @@
11674 #include <linux/kdebug.h>
11675 #include <linux/percpu.h>
11676 #include <linux/context_tracking.h>
11677+#include <linux/slab.h>
11678+#include <linux/pagemap.h>
11679+#include <linux/compiler.h>
11680
11681 #include <asm/page.h>
11682 #include <asm/pgtable.h>
11683@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11684 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11685 regs->tpc);
11686 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11687- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11688+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11689 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11690 dump_stack();
11691 unhandled_fault(regs->tpc, current, regs);
11692@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11693 show_regs(regs);
11694 }
11695
11696+#ifdef CONFIG_PAX_PAGEEXEC
11697+#ifdef CONFIG_PAX_DLRESOLVE
11698+static void pax_emuplt_close(struct vm_area_struct *vma)
11699+{
11700+ vma->vm_mm->call_dl_resolve = 0UL;
11701+}
11702+
11703+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11704+{
11705+ unsigned int *kaddr;
11706+
11707+ vmf->page = alloc_page(GFP_HIGHUSER);
11708+ if (!vmf->page)
11709+ return VM_FAULT_OOM;
11710+
11711+ kaddr = kmap(vmf->page);
11712+ memset(kaddr, 0, PAGE_SIZE);
11713+ kaddr[0] = 0x9DE3BFA8U; /* save */
11714+ flush_dcache_page(vmf->page);
11715+ kunmap(vmf->page);
11716+ return VM_FAULT_MAJOR;
11717+}
11718+
11719+static const struct vm_operations_struct pax_vm_ops = {
11720+ .close = pax_emuplt_close,
11721+ .fault = pax_emuplt_fault
11722+};
11723+
11724+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11725+{
11726+ int ret;
11727+
11728+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11729+ vma->vm_mm = current->mm;
11730+ vma->vm_start = addr;
11731+ vma->vm_end = addr + PAGE_SIZE;
11732+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11733+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11734+ vma->vm_ops = &pax_vm_ops;
11735+
11736+ ret = insert_vm_struct(current->mm, vma);
11737+ if (ret)
11738+ return ret;
11739+
11740+ ++current->mm->total_vm;
11741+ return 0;
11742+}
11743+#endif
11744+
11745+/*
11746+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11747+ *
11748+ * returns 1 when task should be killed
11749+ * 2 when patched PLT trampoline was detected
11750+ * 3 when unpatched PLT trampoline was detected
11751+ */
11752+static int pax_handle_fetch_fault(struct pt_regs *regs)
11753+{
11754+
11755+#ifdef CONFIG_PAX_EMUPLT
11756+ int err;
11757+
11758+ do { /* PaX: patched PLT emulation #1 */
11759+ unsigned int sethi1, sethi2, jmpl;
11760+
11761+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11762+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11763+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11764+
11765+ if (err)
11766+ break;
11767+
11768+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11769+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11770+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11771+ {
11772+ unsigned long addr;
11773+
11774+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11775+ addr = regs->u_regs[UREG_G1];
11776+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
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 #2 */
11788+ unsigned int ba;
11789+
11790+ err = get_user(ba, (unsigned int *)regs->tpc);
11791+
11792+ if (err)
11793+ break;
11794+
11795+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11796+ unsigned long addr;
11797+
11798+ if ((ba & 0xFFC00000U) == 0x30800000U)
11799+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11800+ else
11801+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11802+
11803+ if (test_thread_flag(TIF_32BIT))
11804+ addr &= 0xFFFFFFFFUL;
11805+
11806+ regs->tpc = addr;
11807+ regs->tnpc = addr+4;
11808+ return 2;
11809+ }
11810+ } while (0);
11811+
11812+ do { /* PaX: patched PLT emulation #3 */
11813+ unsigned int sethi, bajmpl, nop;
11814+
11815+ err = get_user(sethi, (unsigned int *)regs->tpc);
11816+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11817+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11818+
11819+ if (err)
11820+ break;
11821+
11822+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11823+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11824+ nop == 0x01000000U)
11825+ {
11826+ unsigned long addr;
11827+
11828+ addr = (sethi & 0x003FFFFFU) << 10;
11829+ regs->u_regs[UREG_G1] = addr;
11830+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11831+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11832+ else
11833+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11834+
11835+ if (test_thread_flag(TIF_32BIT))
11836+ addr &= 0xFFFFFFFFUL;
11837+
11838+ regs->tpc = addr;
11839+ regs->tnpc = addr+4;
11840+ return 2;
11841+ }
11842+ } while (0);
11843+
11844+ do { /* PaX: patched PLT emulation #4 */
11845+ unsigned int sethi, mov1, call, mov2;
11846+
11847+ err = get_user(sethi, (unsigned int *)regs->tpc);
11848+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11849+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11850+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11851+
11852+ if (err)
11853+ break;
11854+
11855+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11856+ mov1 == 0x8210000FU &&
11857+ (call & 0xC0000000U) == 0x40000000U &&
11858+ mov2 == 0x9E100001U)
11859+ {
11860+ unsigned long addr;
11861+
11862+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11863+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11864+
11865+ if (test_thread_flag(TIF_32BIT))
11866+ addr &= 0xFFFFFFFFUL;
11867+
11868+ regs->tpc = addr;
11869+ regs->tnpc = addr+4;
11870+ return 2;
11871+ }
11872+ } while (0);
11873+
11874+ do { /* PaX: patched PLT emulation #5 */
11875+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11876+
11877+ err = get_user(sethi, (unsigned int *)regs->tpc);
11878+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11879+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11880+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11881+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11882+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11883+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11884+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11885+
11886+ if (err)
11887+ break;
11888+
11889+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11890+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11891+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11892+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11893+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11894+ sllx == 0x83287020U &&
11895+ jmpl == 0x81C04005U &&
11896+ nop == 0x01000000U)
11897+ {
11898+ unsigned long addr;
11899+
11900+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11901+ regs->u_regs[UREG_G1] <<= 32;
11902+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11903+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11904+ regs->tpc = addr;
11905+ regs->tnpc = addr+4;
11906+ return 2;
11907+ }
11908+ } while (0);
11909+
11910+ do { /* PaX: patched PLT emulation #6 */
11911+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11912+
11913+ err = get_user(sethi, (unsigned int *)regs->tpc);
11914+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11915+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11916+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11917+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11918+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11919+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11920+
11921+ if (err)
11922+ break;
11923+
11924+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11925+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11926+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11927+ sllx == 0x83287020U &&
11928+ (or & 0xFFFFE000U) == 0x8A116000U &&
11929+ jmpl == 0x81C04005U &&
11930+ nop == 0x01000000U)
11931+ {
11932+ unsigned long addr;
11933+
11934+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11935+ regs->u_regs[UREG_G1] <<= 32;
11936+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11937+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11938+ regs->tpc = addr;
11939+ regs->tnpc = addr+4;
11940+ return 2;
11941+ }
11942+ } while (0);
11943+
11944+ do { /* PaX: unpatched PLT emulation step 1 */
11945+ unsigned int sethi, ba, nop;
11946+
11947+ err = get_user(sethi, (unsigned int *)regs->tpc);
11948+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11949+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11950+
11951+ if (err)
11952+ break;
11953+
11954+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11955+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11956+ nop == 0x01000000U)
11957+ {
11958+ unsigned long addr;
11959+ unsigned int save, call;
11960+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11961+
11962+ if ((ba & 0xFFC00000U) == 0x30800000U)
11963+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11964+ else
11965+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11966+
11967+ if (test_thread_flag(TIF_32BIT))
11968+ addr &= 0xFFFFFFFFUL;
11969+
11970+ err = get_user(save, (unsigned int *)addr);
11971+ err |= get_user(call, (unsigned int *)(addr+4));
11972+ err |= get_user(nop, (unsigned int *)(addr+8));
11973+ if (err)
11974+ break;
11975+
11976+#ifdef CONFIG_PAX_DLRESOLVE
11977+ if (save == 0x9DE3BFA8U &&
11978+ (call & 0xC0000000U) == 0x40000000U &&
11979+ nop == 0x01000000U)
11980+ {
11981+ struct vm_area_struct *vma;
11982+ unsigned long call_dl_resolve;
11983+
11984+ down_read(&current->mm->mmap_sem);
11985+ call_dl_resolve = current->mm->call_dl_resolve;
11986+ up_read(&current->mm->mmap_sem);
11987+ if (likely(call_dl_resolve))
11988+ goto emulate;
11989+
11990+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11991+
11992+ down_write(&current->mm->mmap_sem);
11993+ if (current->mm->call_dl_resolve) {
11994+ call_dl_resolve = current->mm->call_dl_resolve;
11995+ up_write(&current->mm->mmap_sem);
11996+ if (vma)
11997+ kmem_cache_free(vm_area_cachep, vma);
11998+ goto emulate;
11999+ }
12000+
12001+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12002+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12003+ up_write(&current->mm->mmap_sem);
12004+ if (vma)
12005+ kmem_cache_free(vm_area_cachep, vma);
12006+ return 1;
12007+ }
12008+
12009+ if (pax_insert_vma(vma, call_dl_resolve)) {
12010+ up_write(&current->mm->mmap_sem);
12011+ kmem_cache_free(vm_area_cachep, vma);
12012+ return 1;
12013+ }
12014+
12015+ current->mm->call_dl_resolve = call_dl_resolve;
12016+ up_write(&current->mm->mmap_sem);
12017+
12018+emulate:
12019+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12020+ regs->tpc = call_dl_resolve;
12021+ regs->tnpc = addr+4;
12022+ return 3;
12023+ }
12024+#endif
12025+
12026+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12027+ if ((save & 0xFFC00000U) == 0x05000000U &&
12028+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12029+ nop == 0x01000000U)
12030+ {
12031+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12032+ regs->u_regs[UREG_G2] = addr + 4;
12033+ addr = (save & 0x003FFFFFU) << 10;
12034+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12035+
12036+ if (test_thread_flag(TIF_32BIT))
12037+ addr &= 0xFFFFFFFFUL;
12038+
12039+ regs->tpc = addr;
12040+ regs->tnpc = addr+4;
12041+ return 3;
12042+ }
12043+
12044+ /* PaX: 64-bit PLT stub */
12045+ err = get_user(sethi1, (unsigned int *)addr);
12046+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12047+ err |= get_user(or1, (unsigned int *)(addr+8));
12048+ err |= get_user(or2, (unsigned int *)(addr+12));
12049+ err |= get_user(sllx, (unsigned int *)(addr+16));
12050+ err |= get_user(add, (unsigned int *)(addr+20));
12051+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12052+ err |= get_user(nop, (unsigned int *)(addr+28));
12053+ if (err)
12054+ break;
12055+
12056+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12057+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12058+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12059+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12060+ sllx == 0x89293020U &&
12061+ add == 0x8A010005U &&
12062+ jmpl == 0x89C14000U &&
12063+ nop == 0x01000000U)
12064+ {
12065+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12066+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12067+ regs->u_regs[UREG_G4] <<= 32;
12068+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12069+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12070+ regs->u_regs[UREG_G4] = addr + 24;
12071+ addr = regs->u_regs[UREG_G5];
12072+ regs->tpc = addr;
12073+ regs->tnpc = addr+4;
12074+ return 3;
12075+ }
12076+ }
12077+ } while (0);
12078+
12079+#ifdef CONFIG_PAX_DLRESOLVE
12080+ do { /* PaX: unpatched PLT emulation step 2 */
12081+ unsigned int save, call, nop;
12082+
12083+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12084+ err |= get_user(call, (unsigned int *)regs->tpc);
12085+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12086+ if (err)
12087+ break;
12088+
12089+ if (save == 0x9DE3BFA8U &&
12090+ (call & 0xC0000000U) == 0x40000000U &&
12091+ nop == 0x01000000U)
12092+ {
12093+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12094+
12095+ if (test_thread_flag(TIF_32BIT))
12096+ dl_resolve &= 0xFFFFFFFFUL;
12097+
12098+ regs->u_regs[UREG_RETPC] = regs->tpc;
12099+ regs->tpc = dl_resolve;
12100+ regs->tnpc = dl_resolve+4;
12101+ return 3;
12102+ }
12103+ } while (0);
12104+#endif
12105+
12106+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12107+ unsigned int sethi, ba, nop;
12108+
12109+ err = get_user(sethi, (unsigned int *)regs->tpc);
12110+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12111+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12112+
12113+ if (err)
12114+ break;
12115+
12116+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12117+ (ba & 0xFFF00000U) == 0x30600000U &&
12118+ nop == 0x01000000U)
12119+ {
12120+ unsigned long addr;
12121+
12122+ addr = (sethi & 0x003FFFFFU) << 10;
12123+ regs->u_regs[UREG_G1] = addr;
12124+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12125+
12126+ if (test_thread_flag(TIF_32BIT))
12127+ addr &= 0xFFFFFFFFUL;
12128+
12129+ regs->tpc = addr;
12130+ regs->tnpc = addr+4;
12131+ return 2;
12132+ }
12133+ } while (0);
12134+
12135+#endif
12136+
12137+ return 1;
12138+}
12139+
12140+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12141+{
12142+ unsigned long i;
12143+
12144+ printk(KERN_ERR "PAX: bytes at PC: ");
12145+ for (i = 0; i < 8; i++) {
12146+ unsigned int c;
12147+ if (get_user(c, (unsigned int *)pc+i))
12148+ printk(KERN_CONT "???????? ");
12149+ else
12150+ printk(KERN_CONT "%08x ", c);
12151+ }
12152+ printk("\n");
12153+}
12154+#endif
12155+
12156 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12157 {
12158 enum ctx_state prev_state = exception_enter();
12159@@ -353,6 +816,29 @@ retry:
12160 if (!vma)
12161 goto bad_area;
12162
12163+#ifdef CONFIG_PAX_PAGEEXEC
12164+ /* PaX: detect ITLB misses on non-exec pages */
12165+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12166+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12167+ {
12168+ if (address != regs->tpc)
12169+ goto good_area;
12170+
12171+ up_read(&mm->mmap_sem);
12172+ switch (pax_handle_fetch_fault(regs)) {
12173+
12174+#ifdef CONFIG_PAX_EMUPLT
12175+ case 2:
12176+ case 3:
12177+ return;
12178+#endif
12179+
12180+ }
12181+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12182+ do_group_exit(SIGKILL);
12183+ }
12184+#endif
12185+
12186 /* Pure DTLB misses do not tell us whether the fault causing
12187 * load/store/atomic was a write or not, it only says that there
12188 * was no match. So in such a case we (carefully) read the
12189diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12190index 4242eab..9ae6360 100644
12191--- a/arch/sparc/mm/hugetlbpage.c
12192+++ b/arch/sparc/mm/hugetlbpage.c
12193@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12194 unsigned long addr,
12195 unsigned long len,
12196 unsigned long pgoff,
12197- unsigned long flags)
12198+ unsigned long flags,
12199+ unsigned long offset)
12200 {
12201+ struct mm_struct *mm = current->mm;
12202 unsigned long task_size = TASK_SIZE;
12203 struct vm_unmapped_area_info info;
12204
12205@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12206
12207 info.flags = 0;
12208 info.length = len;
12209- info.low_limit = TASK_UNMAPPED_BASE;
12210+ info.low_limit = mm->mmap_base;
12211 info.high_limit = min(task_size, VA_EXCLUDE_START);
12212 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12213 info.align_offset = 0;
12214+ info.threadstack_offset = offset;
12215 addr = vm_unmapped_area(&info);
12216
12217 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12218 VM_BUG_ON(addr != -ENOMEM);
12219 info.low_limit = VA_EXCLUDE_END;
12220+
12221+#ifdef CONFIG_PAX_RANDMMAP
12222+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12223+ info.low_limit += mm->delta_mmap;
12224+#endif
12225+
12226 info.high_limit = task_size;
12227 addr = vm_unmapped_area(&info);
12228 }
12229@@ -55,7 +64,8 @@ static unsigned long
12230 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12231 const unsigned long len,
12232 const unsigned long pgoff,
12233- const unsigned long flags)
12234+ const unsigned long flags,
12235+ const unsigned long offset)
12236 {
12237 struct mm_struct *mm = current->mm;
12238 unsigned long addr = addr0;
12239@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12240 info.high_limit = mm->mmap_base;
12241 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12242 info.align_offset = 0;
12243+ info.threadstack_offset = offset;
12244 addr = vm_unmapped_area(&info);
12245
12246 /*
12247@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12248 VM_BUG_ON(addr != -ENOMEM);
12249 info.flags = 0;
12250 info.low_limit = TASK_UNMAPPED_BASE;
12251+
12252+#ifdef CONFIG_PAX_RANDMMAP
12253+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12254+ info.low_limit += mm->delta_mmap;
12255+#endif
12256+
12257 info.high_limit = STACK_TOP32;
12258 addr = vm_unmapped_area(&info);
12259 }
12260@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12261 struct mm_struct *mm = current->mm;
12262 struct vm_area_struct *vma;
12263 unsigned long task_size = TASK_SIZE;
12264+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12265
12266 if (test_thread_flag(TIF_32BIT))
12267 task_size = STACK_TOP32;
12268@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12269 return addr;
12270 }
12271
12272+#ifdef CONFIG_PAX_RANDMMAP
12273+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12274+#endif
12275+
12276 if (addr) {
12277 addr = ALIGN(addr, HPAGE_SIZE);
12278 vma = find_vma(mm, addr);
12279- if (task_size - len >= addr &&
12280- (!vma || addr + len <= vma->vm_start))
12281+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12282 return addr;
12283 }
12284 if (mm->get_unmapped_area == arch_get_unmapped_area)
12285 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12286- pgoff, flags);
12287+ pgoff, flags, offset);
12288 else
12289 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12290- pgoff, flags);
12291+ pgoff, flags, offset);
12292 }
12293
12294 pte_t *huge_pte_alloc(struct mm_struct *mm,
12295diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12296index 559cb74..9e5f097 100644
12297--- a/arch/sparc/mm/init_64.c
12298+++ b/arch/sparc/mm/init_64.c
12299@@ -187,9 +187,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12300 int num_kernel_image_mappings;
12301
12302 #ifdef CONFIG_DEBUG_DCFLUSH
12303-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12304+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12305 #ifdef CONFIG_SMP
12306-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12307+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12308 #endif
12309 #endif
12310
12311@@ -197,7 +197,7 @@ inline void flush_dcache_page_impl(struct page *page)
12312 {
12313 BUG_ON(tlb_type == hypervisor);
12314 #ifdef CONFIG_DEBUG_DCFLUSH
12315- atomic_inc(&dcpage_flushes);
12316+ atomic_inc_unchecked(&dcpage_flushes);
12317 #endif
12318
12319 #ifdef DCACHE_ALIASING_POSSIBLE
12320@@ -469,10 +469,10 @@ void mmu_info(struct seq_file *m)
12321
12322 #ifdef CONFIG_DEBUG_DCFLUSH
12323 seq_printf(m, "DCPageFlushes\t: %d\n",
12324- atomic_read(&dcpage_flushes));
12325+ atomic_read_unchecked(&dcpage_flushes));
12326 #ifdef CONFIG_SMP
12327 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12328- atomic_read(&dcpage_flushes_xcall));
12329+ atomic_read_unchecked(&dcpage_flushes_xcall));
12330 #endif /* CONFIG_SMP */
12331 #endif /* CONFIG_DEBUG_DCFLUSH */
12332 }
12333diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12334index a07e31b..85c9003 100644
12335--- a/arch/tile/Kconfig
12336+++ b/arch/tile/Kconfig
12337@@ -198,6 +198,7 @@ source "kernel/Kconfig.hz"
12338
12339 config KEXEC
12340 bool "kexec system call"
12341+ depends on !GRKERNSEC_KMEM
12342 ---help---
12343 kexec is a system call that implements the ability to shutdown your
12344 current kernel, and to start another kernel. It is like a reboot
12345diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12346index 7b11c5f..755a026 100644
12347--- a/arch/tile/include/asm/atomic_64.h
12348+++ b/arch/tile/include/asm/atomic_64.h
12349@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12350
12351 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12352
12353+#define atomic64_read_unchecked(v) atomic64_read(v)
12354+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12355+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12356+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12357+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12358+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12359+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12360+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12361+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12362+
12363 /* Define this to indicate that cmpxchg is an efficient operation. */
12364 #define __HAVE_ARCH_CMPXCHG
12365
12366diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12367index 6160761..00cac88 100644
12368--- a/arch/tile/include/asm/cache.h
12369+++ b/arch/tile/include/asm/cache.h
12370@@ -15,11 +15,12 @@
12371 #ifndef _ASM_TILE_CACHE_H
12372 #define _ASM_TILE_CACHE_H
12373
12374+#include <linux/const.h>
12375 #include <arch/chip.h>
12376
12377 /* bytes per L1 data cache line */
12378 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12379-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12380+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12381
12382 /* bytes per L2 cache line */
12383 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12384diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12385index f41cb53..31d3ab4 100644
12386--- a/arch/tile/include/asm/uaccess.h
12387+++ b/arch/tile/include/asm/uaccess.h
12388@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12389 const void __user *from,
12390 unsigned long n)
12391 {
12392- int sz = __compiletime_object_size(to);
12393+ size_t sz = __compiletime_object_size(to);
12394
12395- if (likely(sz == -1 || sz >= n))
12396+ if (likely(sz == (size_t)-1 || sz >= n))
12397 n = _copy_from_user(to, from, n);
12398 else
12399 copy_from_user_overflow();
12400diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12401index 8416240..a012fb7 100644
12402--- a/arch/tile/mm/hugetlbpage.c
12403+++ b/arch/tile/mm/hugetlbpage.c
12404@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12405 info.high_limit = TASK_SIZE;
12406 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12407 info.align_offset = 0;
12408+ info.threadstack_offset = 0;
12409 return vm_unmapped_area(&info);
12410 }
12411
12412@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12413 info.high_limit = current->mm->mmap_base;
12414 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12415 info.align_offset = 0;
12416+ info.threadstack_offset = 0;
12417 addr = vm_unmapped_area(&info);
12418
12419 /*
12420diff --git a/arch/um/Makefile b/arch/um/Makefile
12421index 17d4460..9d74338e3de4 100644
12422--- a/arch/um/Makefile
12423+++ b/arch/um/Makefile
12424@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12425 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12426 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12427
12428+ifdef CONSTIFY_PLUGIN
12429+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12430+endif
12431+
12432 #This will adjust *FLAGS accordingly to the platform.
12433 include $(ARCH_DIR)/Makefile-os-$(OS)
12434
12435diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12436index 19e1bdd..3665b77 100644
12437--- a/arch/um/include/asm/cache.h
12438+++ b/arch/um/include/asm/cache.h
12439@@ -1,6 +1,7 @@
12440 #ifndef __UM_CACHE_H
12441 #define __UM_CACHE_H
12442
12443+#include <linux/const.h>
12444
12445 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12446 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12447@@ -12,6 +13,6 @@
12448 # define L1_CACHE_SHIFT 5
12449 #endif
12450
12451-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12452+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12453
12454 #endif
12455diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12456index 2e0a6b1..a64d0f5 100644
12457--- a/arch/um/include/asm/kmap_types.h
12458+++ b/arch/um/include/asm/kmap_types.h
12459@@ -8,6 +8,6 @@
12460
12461 /* No more #include "asm/arch/kmap_types.h" ! */
12462
12463-#define KM_TYPE_NR 14
12464+#define KM_TYPE_NR 15
12465
12466 #endif
12467diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12468index 71c5d13..4c7b9f1 100644
12469--- a/arch/um/include/asm/page.h
12470+++ b/arch/um/include/asm/page.h
12471@@ -14,6 +14,9 @@
12472 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12473 #define PAGE_MASK (~(PAGE_SIZE-1))
12474
12475+#define ktla_ktva(addr) (addr)
12476+#define ktva_ktla(addr) (addr)
12477+
12478 #ifndef __ASSEMBLY__
12479
12480 struct page;
12481diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12482index 2b4274e..754fe06 100644
12483--- a/arch/um/include/asm/pgtable-3level.h
12484+++ b/arch/um/include/asm/pgtable-3level.h
12485@@ -58,6 +58,7 @@
12486 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12487 #define pud_populate(mm, pud, pmd) \
12488 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12489+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12490
12491 #ifdef CONFIG_64BIT
12492 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12493diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12494index 68b9119..f72353c 100644
12495--- a/arch/um/kernel/process.c
12496+++ b/arch/um/kernel/process.c
12497@@ -345,22 +345,6 @@ int singlestepping(void * t)
12498 return 2;
12499 }
12500
12501-/*
12502- * Only x86 and x86_64 have an arch_align_stack().
12503- * All other arches have "#define arch_align_stack(x) (x)"
12504- * in their asm/exec.h
12505- * As this is included in UML from asm-um/system-generic.h,
12506- * we can use it to behave as the subarch does.
12507- */
12508-#ifndef arch_align_stack
12509-unsigned long arch_align_stack(unsigned long sp)
12510-{
12511- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12512- sp -= get_random_int() % 8192;
12513- return sp & ~0xf;
12514-}
12515-#endif
12516-
12517 unsigned long get_wchan(struct task_struct *p)
12518 {
12519 unsigned long stack_page, sp, ip;
12520diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12521index ad8f795..2c7eec6 100644
12522--- a/arch/unicore32/include/asm/cache.h
12523+++ b/arch/unicore32/include/asm/cache.h
12524@@ -12,8 +12,10 @@
12525 #ifndef __UNICORE_CACHE_H__
12526 #define __UNICORE_CACHE_H__
12527
12528-#define L1_CACHE_SHIFT (5)
12529-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12530+#include <linux/const.h>
12531+
12532+#define L1_CACHE_SHIFT 5
12533+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12534
12535 /*
12536 * Memory returned by kmalloc() may be used for DMA, so we must make
12537diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12538index 226d569..d420edc 100644
12539--- a/arch/x86/Kconfig
12540+++ b/arch/x86/Kconfig
12541@@ -32,7 +32,7 @@ config X86
12542 select HAVE_AOUT if X86_32
12543 select HAVE_UNSTABLE_SCHED_CLOCK
12544 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
12545- select ARCH_SUPPORTS_INT128 if X86_64
12546+ select ARCH_SUPPORTS_INT128 if X86_64 && !PAX_SIZE_OVERFLOW
12547 select HAVE_IDE
12548 select HAVE_OPROFILE
12549 select HAVE_PCSPKR_PLATFORM
12550@@ -134,7 +134,7 @@ config X86
12551 select RTC_LIB
12552 select HAVE_DEBUG_STACKOVERFLOW
12553 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12554- select HAVE_CC_STACKPROTECTOR
12555+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12556 select GENERIC_CPU_AUTOPROBE
12557 select HAVE_ARCH_AUDITSYSCALL
12558 select ARCH_SUPPORTS_ATOMIC_RMW
12559@@ -266,7 +266,7 @@ config X86_HT
12560
12561 config X86_32_LAZY_GS
12562 def_bool y
12563- depends on X86_32 && !CC_STACKPROTECTOR
12564+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12565
12566 config ARCH_HWEIGHT_CFLAGS
12567 string
12568@@ -638,6 +638,7 @@ config SCHED_OMIT_FRAME_POINTER
12569
12570 menuconfig HYPERVISOR_GUEST
12571 bool "Linux guest support"
12572+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12573 ---help---
12574 Say Y here to enable options for running Linux under various hyper-
12575 visors. This option enables basic hypervisor detection and platform
12576@@ -1005,6 +1006,7 @@ config VM86
12577
12578 config X86_16BIT
12579 bool "Enable support for 16-bit segments" if EXPERT
12580+ depends on !GRKERNSEC
12581 default y
12582 ---help---
12583 This option is required by programs like Wine to run 16-bit
12584@@ -1178,6 +1180,7 @@ choice
12585
12586 config NOHIGHMEM
12587 bool "off"
12588+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12589 ---help---
12590 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12591 However, the address space of 32-bit x86 processors is only 4
12592@@ -1214,6 +1217,7 @@ config NOHIGHMEM
12593
12594 config HIGHMEM4G
12595 bool "4GB"
12596+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12597 ---help---
12598 Select this if you have a 32-bit processor and between 1 and 4
12599 gigabytes of physical RAM.
12600@@ -1266,7 +1270,7 @@ config PAGE_OFFSET
12601 hex
12602 default 0xB0000000 if VMSPLIT_3G_OPT
12603 default 0x80000000 if VMSPLIT_2G
12604- default 0x78000000 if VMSPLIT_2G_OPT
12605+ default 0x70000000 if VMSPLIT_2G_OPT
12606 default 0x40000000 if VMSPLIT_1G
12607 default 0xC0000000
12608 depends on X86_32
12609@@ -1717,6 +1721,7 @@ source kernel/Kconfig.hz
12610
12611 config KEXEC
12612 bool "kexec system call"
12613+ depends on !GRKERNSEC_KMEM
12614 ---help---
12615 kexec is a system call that implements the ability to shutdown your
12616 current kernel, and to start another kernel. It is like a reboot
12617@@ -1899,7 +1904,9 @@ config X86_NEED_RELOCS
12618
12619 config PHYSICAL_ALIGN
12620 hex "Alignment value to which kernel should be aligned"
12621- default "0x200000"
12622+ default "0x1000000"
12623+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12624+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12625 range 0x2000 0x1000000 if X86_32
12626 range 0x200000 0x1000000 if X86_64
12627 ---help---
12628@@ -1982,6 +1989,7 @@ config COMPAT_VDSO
12629 def_bool n
12630 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12631 depends on X86_32 || IA32_EMULATION
12632+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12633 ---help---
12634 Certain buggy versions of glibc will crash if they are
12635 presented with a 32-bit vDSO that is not mapped at the address
12636@@ -2046,6 +2054,22 @@ config CMDLINE_OVERRIDE
12637 This is used to work around broken boot loaders. This should
12638 be set to 'N' under normal conditions.
12639
12640+config DEFAULT_MODIFY_LDT_SYSCALL
12641+ bool "Allow userspace to modify the LDT by default"
12642+ default y
12643+
12644+ ---help---
12645+ Modifying the LDT (Local Descriptor Table) may be needed to run a
12646+ 16-bit or segmented code such as Dosemu or Wine. This is done via
12647+ a system call which is not needed to run portable applications,
12648+ and which can sometimes be abused to exploit some weaknesses of
12649+ the architecture, opening new vulnerabilities.
12650+
12651+ For this reason this option allows one to enable or disable the
12652+ feature at runtime. It is recommended to say 'N' here to leave
12653+ the system protected, and to enable it at runtime only if needed
12654+ by setting the sys.kernel.modify_ldt sysctl.
12655+
12656 source "kernel/livepatch/Kconfig"
12657
12658 endmenu
12659diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12660index 6983314..54ad7e8 100644
12661--- a/arch/x86/Kconfig.cpu
12662+++ b/arch/x86/Kconfig.cpu
12663@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12664
12665 config X86_F00F_BUG
12666 def_bool y
12667- depends on M586MMX || M586TSC || M586 || M486
12668+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12669
12670 config X86_INVD_BUG
12671 def_bool y
12672@@ -327,7 +327,7 @@ config X86_INVD_BUG
12673
12674 config X86_ALIGNMENT_16
12675 def_bool y
12676- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12677+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12678
12679 config X86_INTEL_USERCOPY
12680 def_bool y
12681@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12682 # generates cmov.
12683 config X86_CMOV
12684 def_bool y
12685- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12686+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12687
12688 config X86_MINIMUM_CPU_FAMILY
12689 int
12690diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12691index 72484a6..83a4411 100644
12692--- a/arch/x86/Kconfig.debug
12693+++ b/arch/x86/Kconfig.debug
12694@@ -89,7 +89,7 @@ config EFI_PGT_DUMP
12695 config DEBUG_RODATA
12696 bool "Write protect kernel read-only data structures"
12697 default y
12698- depends on DEBUG_KERNEL
12699+ depends on DEBUG_KERNEL && BROKEN
12700 ---help---
12701 Mark the kernel read-only data as write-protected in the pagetables,
12702 in order to catch accidental (and incorrect) writes to such const
12703@@ -107,7 +107,7 @@ config DEBUG_RODATA_TEST
12704
12705 config DEBUG_SET_MODULE_RONX
12706 bool "Set loadable kernel module data as NX and text as RO"
12707- depends on MODULES
12708+ depends on MODULES && BROKEN
12709 ---help---
12710 This option helps catch unintended modifications to loadable
12711 kernel module's text and read-only data. It also prevents execution
12712diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12713index 2fda005..2c72d40 100644
12714--- a/arch/x86/Makefile
12715+++ b/arch/x86/Makefile
12716@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12717 # CPU-specific tuning. Anything which can be shared with UML should go here.
12718 include arch/x86/Makefile_32.cpu
12719 KBUILD_CFLAGS += $(cflags-y)
12720-
12721- # temporary until string.h is fixed
12722- KBUILD_CFLAGS += -ffreestanding
12723 else
12724 BITS := 64
12725 UTS_MACHINE := x86_64
12726@@ -107,6 +104,9 @@ else
12727 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12728 endif
12729
12730+# temporary until string.h is fixed
12731+KBUILD_CFLAGS += -ffreestanding
12732+
12733 # Make sure compiler does not have buggy stack-protector support.
12734 ifdef CONFIG_CC_STACKPROTECTOR
12735 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12736@@ -181,6 +181,7 @@ archheaders:
12737 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12738
12739 archprepare:
12740+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12741 ifeq ($(CONFIG_KEXEC_FILE),y)
12742 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12743 endif
12744@@ -264,3 +265,9 @@ define archhelp
12745 echo ' FDARGS="..." arguments for the booted kernel'
12746 echo ' FDINITRD=file initrd for the booted kernel'
12747 endef
12748+
12749+define OLD_LD
12750+
12751+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12752+*** Please upgrade your binutils to 2.18 or newer
12753+endef
12754diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12755index 57bbf2f..b100fce 100644
12756--- a/arch/x86/boot/Makefile
12757+++ b/arch/x86/boot/Makefile
12758@@ -58,6 +58,9 @@ clean-files += cpustr.h
12759 # ---------------------------------------------------------------------------
12760
12761 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12762+ifdef CONSTIFY_PLUGIN
12763+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12764+endif
12765 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12766 GCOV_PROFILE := n
12767
12768diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12769index 878e4b9..20537ab 100644
12770--- a/arch/x86/boot/bitops.h
12771+++ b/arch/x86/boot/bitops.h
12772@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12773 u8 v;
12774 const u32 *p = (const u32 *)addr;
12775
12776- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12777+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12778 return v;
12779 }
12780
12781@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12782
12783 static inline void set_bit(int nr, void *addr)
12784 {
12785- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12786+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12787 }
12788
12789 #endif /* BOOT_BITOPS_H */
12790diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12791index bd49ec6..94c7f58 100644
12792--- a/arch/x86/boot/boot.h
12793+++ b/arch/x86/boot/boot.h
12794@@ -84,7 +84,7 @@ static inline void io_delay(void)
12795 static inline u16 ds(void)
12796 {
12797 u16 seg;
12798- asm("movw %%ds,%0" : "=rm" (seg));
12799+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12800 return seg;
12801 }
12802
12803diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12804index 0a291cd..9686efc 100644
12805--- a/arch/x86/boot/compressed/Makefile
12806+++ b/arch/x86/boot/compressed/Makefile
12807@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12808 KBUILD_CFLAGS += -mno-mmx -mno-sse
12809 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12810 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12811+ifdef CONSTIFY_PLUGIN
12812+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12813+endif
12814
12815 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12816 GCOV_PROFILE := n
12817diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12818index a53440e..c3dbf1e 100644
12819--- a/arch/x86/boot/compressed/efi_stub_32.S
12820+++ b/arch/x86/boot/compressed/efi_stub_32.S
12821@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12822 * parameter 2, ..., param n. To make things easy, we save the return
12823 * address of efi_call_phys in a global variable.
12824 */
12825- popl %ecx
12826- movl %ecx, saved_return_addr(%edx)
12827- /* get the function pointer into ECX*/
12828- popl %ecx
12829- movl %ecx, efi_rt_function_ptr(%edx)
12830+ popl saved_return_addr(%edx)
12831+ popl efi_rt_function_ptr(%edx)
12832
12833 /*
12834 * 3. Call the physical function.
12835 */
12836- call *%ecx
12837+ call *efi_rt_function_ptr(%edx)
12838
12839 /*
12840 * 4. Balance the stack. And because EAX contain the return value,
12841@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12842 1: popl %edx
12843 subl $1b, %edx
12844
12845- movl efi_rt_function_ptr(%edx), %ecx
12846- pushl %ecx
12847+ pushl efi_rt_function_ptr(%edx)
12848
12849 /*
12850 * 10. Push the saved return address onto the stack and return.
12851 */
12852- movl saved_return_addr(%edx), %ecx
12853- pushl %ecx
12854- ret
12855+ jmpl *saved_return_addr(%edx)
12856 ENDPROC(efi_call_phys)
12857 .previous
12858
12859diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12860index 630384a..278e788 100644
12861--- a/arch/x86/boot/compressed/efi_thunk_64.S
12862+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12863@@ -189,8 +189,8 @@ efi_gdt64:
12864 .long 0 /* Filled out by user */
12865 .word 0
12866 .quad 0x0000000000000000 /* NULL descriptor */
12867- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12868- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12869+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12870+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12871 .quad 0x0080890000000000 /* TS descriptor */
12872 .quad 0x0000000000000000 /* TS continued */
12873 efi_gdt64_end:
12874diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12875index 8ef964d..fcfb8aa 100644
12876--- a/arch/x86/boot/compressed/head_32.S
12877+++ b/arch/x86/boot/compressed/head_32.S
12878@@ -141,10 +141,10 @@ preferred_addr:
12879 addl %eax, %ebx
12880 notl %eax
12881 andl %eax, %ebx
12882- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12883+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12884 jge 1f
12885 #endif
12886- movl $LOAD_PHYSICAL_ADDR, %ebx
12887+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12888 1:
12889
12890 /* Target address to relocate to for decompression */
12891diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12892index b0c0d16..3b44ff8 100644
12893--- a/arch/x86/boot/compressed/head_64.S
12894+++ b/arch/x86/boot/compressed/head_64.S
12895@@ -95,10 +95,10 @@ ENTRY(startup_32)
12896 addl %eax, %ebx
12897 notl %eax
12898 andl %eax, %ebx
12899- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12900+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12901 jge 1f
12902 #endif
12903- movl $LOAD_PHYSICAL_ADDR, %ebx
12904+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12905 1:
12906
12907 /* Target address to relocate to for decompression */
12908@@ -323,10 +323,10 @@ preferred_addr:
12909 addq %rax, %rbp
12910 notq %rax
12911 andq %rax, %rbp
12912- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12913+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12914 jge 1f
12915 #endif
12916- movq $LOAD_PHYSICAL_ADDR, %rbp
12917+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12918 1:
12919
12920 /* Target address to relocate to for decompression */
12921@@ -435,8 +435,8 @@ gdt:
12922 .long gdt
12923 .word 0
12924 .quad 0x0000000000000000 /* NULL descriptor */
12925- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12926- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12927+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12928+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12929 .quad 0x0080890000000000 /* TS descriptor */
12930 .quad 0x0000000000000000 /* TS continued */
12931 gdt_end:
12932diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12933index a107b93..55602de 100644
12934--- a/arch/x86/boot/compressed/misc.c
12935+++ b/arch/x86/boot/compressed/misc.c
12936@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12937 * Calculate the delta between where vmlinux was linked to load
12938 * and where it was actually loaded.
12939 */
12940- delta = min_addr - LOAD_PHYSICAL_ADDR;
12941+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12942 if (!delta) {
12943 debug_putstr("No relocation needed... ");
12944 return;
12945@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12946 Elf32_Ehdr ehdr;
12947 Elf32_Phdr *phdrs, *phdr;
12948 #endif
12949- void *dest;
12950+ void *dest, *prev;
12951 int i;
12952
12953 memcpy(&ehdr, output, sizeof(ehdr));
12954@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12955 case PT_LOAD:
12956 #ifdef CONFIG_RELOCATABLE
12957 dest = output;
12958- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12959+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12960 #else
12961 dest = (void *)(phdr->p_paddr);
12962 #endif
12963 memcpy(dest,
12964 output + phdr->p_offset,
12965 phdr->p_filesz);
12966+ if (i)
12967+ memset(prev, 0xff, dest - prev);
12968+ prev = dest + phdr->p_filesz;
12969 break;
12970 default: /* Ignore other PT_* */ break;
12971 }
12972@@ -419,7 +422,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12973 error("Destination address too large");
12974 #endif
12975 #ifndef CONFIG_RELOCATABLE
12976- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12977+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12978 error("Wrong destination address");
12979 #endif
12980
12981diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12982index 1fd7d57..0f7d096 100644
12983--- a/arch/x86/boot/cpucheck.c
12984+++ b/arch/x86/boot/cpucheck.c
12985@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12986 u32 ecx = MSR_K7_HWCR;
12987 u32 eax, edx;
12988
12989- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12990+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12991 eax &= ~(1 << 15);
12992- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12993+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12994
12995 get_cpuflags(); /* Make sure it really did something */
12996 err = check_cpuflags();
12997@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12998 u32 ecx = MSR_VIA_FCR;
12999 u32 eax, edx;
13000
13001- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13002+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13003 eax |= (1<<1)|(1<<7);
13004- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13005+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13006
13007 set_bit(X86_FEATURE_CX8, cpu.flags);
13008 err = check_cpuflags();
13009@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
13010 u32 eax, edx;
13011 u32 level = 1;
13012
13013- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13014- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13015- asm("cpuid"
13016+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
13017+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
13018+ asm volatile("cpuid"
13019 : "+a" (level), "=d" (cpu.flags[0])
13020 : : "ecx", "ebx");
13021- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13022+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
13023
13024 err = check_cpuflags();
13025 } else if (err == 0x01 &&
13026diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
13027index 16ef025..91e033b 100644
13028--- a/arch/x86/boot/header.S
13029+++ b/arch/x86/boot/header.S
13030@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
13031 # single linked list of
13032 # struct setup_data
13033
13034-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
13035+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
13036
13037 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
13038+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13039+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
13040+#else
13041 #define VO_INIT_SIZE (VO__end - VO__text)
13042+#endif
13043 #if ZO_INIT_SIZE > VO_INIT_SIZE
13044 #define INIT_SIZE ZO_INIT_SIZE
13045 #else
13046diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13047index db75d07..8e6d0af 100644
13048--- a/arch/x86/boot/memory.c
13049+++ b/arch/x86/boot/memory.c
13050@@ -19,7 +19,7 @@
13051
13052 static int detect_memory_e820(void)
13053 {
13054- int count = 0;
13055+ unsigned int count = 0;
13056 struct biosregs ireg, oreg;
13057 struct e820entry *desc = boot_params.e820_map;
13058 static struct e820entry buf; /* static so it is zeroed */
13059diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13060index ba3e100..6501b8f 100644
13061--- a/arch/x86/boot/video-vesa.c
13062+++ b/arch/x86/boot/video-vesa.c
13063@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13064
13065 boot_params.screen_info.vesapm_seg = oreg.es;
13066 boot_params.screen_info.vesapm_off = oreg.di;
13067+ boot_params.screen_info.vesapm_size = oreg.cx;
13068 }
13069
13070 /*
13071diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13072index 05111bb..a1ae1f0 100644
13073--- a/arch/x86/boot/video.c
13074+++ b/arch/x86/boot/video.c
13075@@ -98,7 +98,7 @@ static void store_mode_params(void)
13076 static unsigned int get_entry(void)
13077 {
13078 char entry_buf[4];
13079- int i, len = 0;
13080+ unsigned int i, len = 0;
13081 int key;
13082 unsigned int v;
13083
13084diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13085index 9105655..41779c1 100644
13086--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13087+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13088@@ -8,6 +8,8 @@
13089 * including this sentence is retained in full.
13090 */
13091
13092+#include <asm/alternative-asm.h>
13093+
13094 .extern crypto_ft_tab
13095 .extern crypto_it_tab
13096 .extern crypto_fl_tab
13097@@ -70,6 +72,8 @@
13098 je B192; \
13099 leaq 32(r9),r9;
13100
13101+#define ret pax_force_retaddr; ret
13102+
13103 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13104 movq r1,r2; \
13105 movq r3,r4; \
13106diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13107index 6bd2c6c..368c93e 100644
13108--- a/arch/x86/crypto/aesni-intel_asm.S
13109+++ b/arch/x86/crypto/aesni-intel_asm.S
13110@@ -31,6 +31,7 @@
13111
13112 #include <linux/linkage.h>
13113 #include <asm/inst.h>
13114+#include <asm/alternative-asm.h>
13115
13116 /*
13117 * The following macros are used to move an (un)aligned 16 byte value to/from
13118@@ -217,7 +218,7 @@ enc: .octa 0x2
13119 * num_initial_blocks = b mod 4
13120 * encrypt the initial num_initial_blocks blocks and apply ghash on
13121 * the ciphertext
13122-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13123+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13124 * are clobbered
13125 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13126 */
13127@@ -227,8 +228,8 @@ enc: .octa 0x2
13128 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13129 MOVADQ SHUF_MASK(%rip), %xmm14
13130 mov arg7, %r10 # %r10 = AAD
13131- mov arg8, %r12 # %r12 = aadLen
13132- mov %r12, %r11
13133+ mov arg8, %r15 # %r15 = aadLen
13134+ mov %r15, %r11
13135 pxor %xmm\i, %xmm\i
13136
13137 _get_AAD_loop\num_initial_blocks\operation:
13138@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13139 psrldq $4, %xmm\i
13140 pxor \TMP1, %xmm\i
13141 add $4, %r10
13142- sub $4, %r12
13143+ sub $4, %r15
13144 jne _get_AAD_loop\num_initial_blocks\operation
13145
13146 cmp $16, %r11
13147 je _get_AAD_loop2_done\num_initial_blocks\operation
13148
13149- mov $16, %r12
13150+ mov $16, %r15
13151 _get_AAD_loop2\num_initial_blocks\operation:
13152 psrldq $4, %xmm\i
13153- sub $4, %r12
13154- cmp %r11, %r12
13155+ sub $4, %r15
13156+ cmp %r11, %r15
13157 jne _get_AAD_loop2\num_initial_blocks\operation
13158
13159 _get_AAD_loop2_done\num_initial_blocks\operation:
13160@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13161 * num_initial_blocks = b mod 4
13162 * encrypt the initial num_initial_blocks blocks and apply ghash on
13163 * the ciphertext
13164-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13165+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13166 * are clobbered
13167 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13168 */
13169@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13170 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13171 MOVADQ SHUF_MASK(%rip), %xmm14
13172 mov arg7, %r10 # %r10 = AAD
13173- mov arg8, %r12 # %r12 = aadLen
13174- mov %r12, %r11
13175+ mov arg8, %r15 # %r15 = aadLen
13176+ mov %r15, %r11
13177 pxor %xmm\i, %xmm\i
13178 _get_AAD_loop\num_initial_blocks\operation:
13179 movd (%r10), \TMP1
13180@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13181 psrldq $4, %xmm\i
13182 pxor \TMP1, %xmm\i
13183 add $4, %r10
13184- sub $4, %r12
13185+ sub $4, %r15
13186 jne _get_AAD_loop\num_initial_blocks\operation
13187 cmp $16, %r11
13188 je _get_AAD_loop2_done\num_initial_blocks\operation
13189- mov $16, %r12
13190+ mov $16, %r15
13191 _get_AAD_loop2\num_initial_blocks\operation:
13192 psrldq $4, %xmm\i
13193- sub $4, %r12
13194- cmp %r11, %r12
13195+ sub $4, %r15
13196+ cmp %r11, %r15
13197 jne _get_AAD_loop2\num_initial_blocks\operation
13198 _get_AAD_loop2_done\num_initial_blocks\operation:
13199 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13200@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13201 *
13202 *****************************************************************************/
13203 ENTRY(aesni_gcm_dec)
13204- push %r12
13205+ push %r15
13206 push %r13
13207 push %r14
13208 mov %rsp, %r14
13209@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13210 */
13211 sub $VARIABLE_OFFSET, %rsp
13212 and $~63, %rsp # align rsp to 64 bytes
13213- mov %arg6, %r12
13214- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13215+ mov %arg6, %r15
13216+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13217 movdqa SHUF_MASK(%rip), %xmm2
13218 PSHUFB_XMM %xmm2, %xmm13
13219
13220@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13221 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13222 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13223 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13224- mov %r13, %r12
13225- and $(3<<4), %r12
13226+ mov %r13, %r15
13227+ and $(3<<4), %r15
13228 jz _initial_num_blocks_is_0_decrypt
13229- cmp $(2<<4), %r12
13230+ cmp $(2<<4), %r15
13231 jb _initial_num_blocks_is_1_decrypt
13232 je _initial_num_blocks_is_2_decrypt
13233 _initial_num_blocks_is_3_decrypt:
13234@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13235 sub $16, %r11
13236 add %r13, %r11
13237 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13238- lea SHIFT_MASK+16(%rip), %r12
13239- sub %r13, %r12
13240+ lea SHIFT_MASK+16(%rip), %r15
13241+ sub %r13, %r15
13242 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13243 # (%r13 is the number of bytes in plaintext mod 16)
13244- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13245+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13246 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13247
13248 movdqa %xmm1, %xmm2
13249 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13250- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13251+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13252 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13253 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13254 pand %xmm1, %xmm2
13255@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13256 sub $1, %r13
13257 jne _less_than_8_bytes_left_decrypt
13258 _multiple_of_16_bytes_decrypt:
13259- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13260- shl $3, %r12 # convert into number of bits
13261- movd %r12d, %xmm15 # len(A) in %xmm15
13262+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13263+ shl $3, %r15 # convert into number of bits
13264+ movd %r15d, %xmm15 # len(A) in %xmm15
13265 shl $3, %arg4 # len(C) in bits (*128)
13266 MOVQ_R64_XMM %arg4, %xmm1
13267 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13268@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13269 mov %r14, %rsp
13270 pop %r14
13271 pop %r13
13272- pop %r12
13273+ pop %r15
13274+ pax_force_retaddr
13275 ret
13276 ENDPROC(aesni_gcm_dec)
13277
13278@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13279 * poly = x^128 + x^127 + x^126 + x^121 + 1
13280 ***************************************************************************/
13281 ENTRY(aesni_gcm_enc)
13282- push %r12
13283+ push %r15
13284 push %r13
13285 push %r14
13286 mov %rsp, %r14
13287@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13288 #
13289 sub $VARIABLE_OFFSET, %rsp
13290 and $~63, %rsp
13291- mov %arg6, %r12
13292- movdqu (%r12), %xmm13
13293+ mov %arg6, %r15
13294+ movdqu (%r15), %xmm13
13295 movdqa SHUF_MASK(%rip), %xmm2
13296 PSHUFB_XMM %xmm2, %xmm13
13297
13298@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13299 movdqa %xmm13, HashKey(%rsp)
13300 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13301 and $-16, %r13
13302- mov %r13, %r12
13303+ mov %r13, %r15
13304
13305 # Encrypt first few blocks
13306
13307- and $(3<<4), %r12
13308+ and $(3<<4), %r15
13309 jz _initial_num_blocks_is_0_encrypt
13310- cmp $(2<<4), %r12
13311+ cmp $(2<<4), %r15
13312 jb _initial_num_blocks_is_1_encrypt
13313 je _initial_num_blocks_is_2_encrypt
13314 _initial_num_blocks_is_3_encrypt:
13315@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13316 sub $16, %r11
13317 add %r13, %r11
13318 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13319- lea SHIFT_MASK+16(%rip), %r12
13320- sub %r13, %r12
13321+ lea SHIFT_MASK+16(%rip), %r15
13322+ sub %r13, %r15
13323 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13324 # (%r13 is the number of bytes in plaintext mod 16)
13325- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13326+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13327 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13328 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13329- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13330+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13331 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13332 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13333 movdqa SHUF_MASK(%rip), %xmm10
13334@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13335 sub $1, %r13
13336 jne _less_than_8_bytes_left_encrypt
13337 _multiple_of_16_bytes_encrypt:
13338- mov arg8, %r12 # %r12 = addLen (number of bytes)
13339- shl $3, %r12
13340- movd %r12d, %xmm15 # len(A) in %xmm15
13341+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13342+ shl $3, %r15
13343+ movd %r15d, %xmm15 # len(A) in %xmm15
13344 shl $3, %arg4 # len(C) in bits (*128)
13345 MOVQ_R64_XMM %arg4, %xmm1
13346 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13347@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13348 mov %r14, %rsp
13349 pop %r14
13350 pop %r13
13351- pop %r12
13352+ pop %r15
13353+ pax_force_retaddr
13354 ret
13355 ENDPROC(aesni_gcm_enc)
13356
13357@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13358 pxor %xmm1, %xmm0
13359 movaps %xmm0, (TKEYP)
13360 add $0x10, TKEYP
13361+ pax_force_retaddr
13362 ret
13363 ENDPROC(_key_expansion_128)
13364 ENDPROC(_key_expansion_256a)
13365@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13366 shufps $0b01001110, %xmm2, %xmm1
13367 movaps %xmm1, 0x10(TKEYP)
13368 add $0x20, TKEYP
13369+ pax_force_retaddr
13370 ret
13371 ENDPROC(_key_expansion_192a)
13372
13373@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13374
13375 movaps %xmm0, (TKEYP)
13376 add $0x10, TKEYP
13377+ pax_force_retaddr
13378 ret
13379 ENDPROC(_key_expansion_192b)
13380
13381@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13382 pxor %xmm1, %xmm2
13383 movaps %xmm2, (TKEYP)
13384 add $0x10, TKEYP
13385+ pax_force_retaddr
13386 ret
13387 ENDPROC(_key_expansion_256b)
13388
13389@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13390 #ifndef __x86_64__
13391 popl KEYP
13392 #endif
13393+ pax_force_retaddr
13394 ret
13395 ENDPROC(aesni_set_key)
13396
13397@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13398 popl KLEN
13399 popl KEYP
13400 #endif
13401+ pax_force_retaddr
13402 ret
13403 ENDPROC(aesni_enc)
13404
13405@@ -1985,6 +1994,7 @@ _aesni_enc1:
13406 AESENC KEY STATE
13407 movaps 0x70(TKEYP), KEY
13408 AESENCLAST KEY STATE
13409+ pax_force_retaddr
13410 ret
13411 ENDPROC(_aesni_enc1)
13412
13413@@ -2094,6 +2104,7 @@ _aesni_enc4:
13414 AESENCLAST KEY STATE2
13415 AESENCLAST KEY STATE3
13416 AESENCLAST KEY STATE4
13417+ pax_force_retaddr
13418 ret
13419 ENDPROC(_aesni_enc4)
13420
13421@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13422 popl KLEN
13423 popl KEYP
13424 #endif
13425+ pax_force_retaddr
13426 ret
13427 ENDPROC(aesni_dec)
13428
13429@@ -2175,6 +2187,7 @@ _aesni_dec1:
13430 AESDEC KEY STATE
13431 movaps 0x70(TKEYP), KEY
13432 AESDECLAST KEY STATE
13433+ pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_dec1)
13436
13437@@ -2284,6 +2297,7 @@ _aesni_dec4:
13438 AESDECLAST KEY STATE2
13439 AESDECLAST KEY STATE3
13440 AESDECLAST KEY STATE4
13441+ pax_force_retaddr
13442 ret
13443 ENDPROC(_aesni_dec4)
13444
13445@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13446 popl KEYP
13447 popl LEN
13448 #endif
13449+ pax_force_retaddr
13450 ret
13451 ENDPROC(aesni_ecb_enc)
13452
13453@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13454 popl KEYP
13455 popl LEN
13456 #endif
13457+ pax_force_retaddr
13458 ret
13459 ENDPROC(aesni_ecb_dec)
13460
13461@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13462 popl LEN
13463 popl IVP
13464 #endif
13465+ pax_force_retaddr
13466 ret
13467 ENDPROC(aesni_cbc_enc)
13468
13469@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13470 popl LEN
13471 popl IVP
13472 #endif
13473+ pax_force_retaddr
13474 ret
13475 ENDPROC(aesni_cbc_dec)
13476
13477@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13478 mov $1, TCTR_LOW
13479 MOVQ_R64_XMM TCTR_LOW INC
13480 MOVQ_R64_XMM CTR TCTR_LOW
13481+ pax_force_retaddr
13482 ret
13483 ENDPROC(_aesni_inc_init)
13484
13485@@ -2590,6 +2609,7 @@ _aesni_inc:
13486 .Linc_low:
13487 movaps CTR, IV
13488 PSHUFB_XMM BSWAP_MASK IV
13489+ pax_force_retaddr
13490 ret
13491 ENDPROC(_aesni_inc)
13492
13493@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13494 .Lctr_enc_ret:
13495 movups IV, (IVP)
13496 .Lctr_enc_just_ret:
13497+ pax_force_retaddr
13498 ret
13499 ENDPROC(aesni_ctr_enc)
13500
13501@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13502 pxor INC, STATE4
13503 movdqu STATE4, 0x70(OUTP)
13504
13505+ pax_force_retaddr
13506 ret
13507 ENDPROC(aesni_xts_crypt8)
13508
13509diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13510index 246c670..466e2d6 100644
13511--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13512+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13513@@ -21,6 +21,7 @@
13514 */
13515
13516 #include <linux/linkage.h>
13517+#include <asm/alternative-asm.h>
13518
13519 .file "blowfish-x86_64-asm.S"
13520 .text
13521@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13522 jnz .L__enc_xor;
13523
13524 write_block();
13525+ pax_force_retaddr
13526 ret;
13527 .L__enc_xor:
13528 xor_block();
13529+ pax_force_retaddr
13530 ret;
13531 ENDPROC(__blowfish_enc_blk)
13532
13533@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13534
13535 movq %r11, %rbp;
13536
13537+ pax_force_retaddr
13538 ret;
13539 ENDPROC(blowfish_dec_blk)
13540
13541@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13542
13543 popq %rbx;
13544 popq %rbp;
13545+ pax_force_retaddr
13546 ret;
13547
13548 .L__enc_xor4:
13549@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13550
13551 popq %rbx;
13552 popq %rbp;
13553+ pax_force_retaddr
13554 ret;
13555 ENDPROC(__blowfish_enc_blk_4way)
13556
13557@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13558 popq %rbx;
13559 popq %rbp;
13560
13561+ pax_force_retaddr
13562 ret;
13563 ENDPROC(blowfish_dec_blk_4way)
13564diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13565index ce71f92..1dce7ec 100644
13566--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13567+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13568@@ -16,6 +16,7 @@
13569 */
13570
13571 #include <linux/linkage.h>
13572+#include <asm/alternative-asm.h>
13573
13574 #define CAMELLIA_TABLE_BYTE_LEN 272
13575
13576@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13577 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13578 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13579 %rcx, (%r9));
13580+ pax_force_retaddr
13581 ret;
13582 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13583
13584@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13585 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13586 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13587 %rax, (%r9));
13588+ pax_force_retaddr
13589 ret;
13590 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13591
13592@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13593 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13594 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13595
13596+ pax_force_retaddr
13597 ret;
13598
13599 .align 8
13600@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13601 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13602 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13603
13604+ pax_force_retaddr
13605 ret;
13606
13607 .align 8
13608@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13609 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13610 %xmm8, %rsi);
13611
13612+ pax_force_retaddr
13613 ret;
13614 ENDPROC(camellia_ecb_enc_16way)
13615
13616@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13617 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13618 %xmm8, %rsi);
13619
13620+ pax_force_retaddr
13621 ret;
13622 ENDPROC(camellia_ecb_dec_16way)
13623
13624@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13625 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13626 %xmm8, %rsi);
13627
13628+ pax_force_retaddr
13629 ret;
13630 ENDPROC(camellia_cbc_dec_16way)
13631
13632@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13633 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13634 %xmm8, %rsi);
13635
13636+ pax_force_retaddr
13637 ret;
13638 ENDPROC(camellia_ctr_16way)
13639
13640@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13641 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13642 %xmm8, %rsi);
13643
13644+ pax_force_retaddr
13645 ret;
13646 ENDPROC(camellia_xts_crypt_16way)
13647
13648diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13649index 0e0b886..5a3123c 100644
13650--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13651+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13652@@ -11,6 +11,7 @@
13653 */
13654
13655 #include <linux/linkage.h>
13656+#include <asm/alternative-asm.h>
13657
13658 #define CAMELLIA_TABLE_BYTE_LEN 272
13659
13660@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13661 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13662 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13663 %rcx, (%r9));
13664+ pax_force_retaddr
13665 ret;
13666 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13667
13668@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13669 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13670 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13671 %rax, (%r9));
13672+ pax_force_retaddr
13673 ret;
13674 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13675
13676@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13677 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13678 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13679
13680+ pax_force_retaddr
13681 ret;
13682
13683 .align 8
13684@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13685 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13686 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13687
13688+ pax_force_retaddr
13689 ret;
13690
13691 .align 8
13692@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13693
13694 vzeroupper;
13695
13696+ pax_force_retaddr
13697 ret;
13698 ENDPROC(camellia_ecb_enc_32way)
13699
13700@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13701
13702 vzeroupper;
13703
13704+ pax_force_retaddr
13705 ret;
13706 ENDPROC(camellia_ecb_dec_32way)
13707
13708@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13709
13710 vzeroupper;
13711
13712+ pax_force_retaddr
13713 ret;
13714 ENDPROC(camellia_cbc_dec_32way)
13715
13716@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13717
13718 vzeroupper;
13719
13720+ pax_force_retaddr
13721 ret;
13722 ENDPROC(camellia_ctr_32way)
13723
13724@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13725
13726 vzeroupper;
13727
13728+ pax_force_retaddr
13729 ret;
13730 ENDPROC(camellia_xts_crypt_32way)
13731
13732diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13733index 310319c..db3d7b5 100644
13734--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13735+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13736@@ -21,6 +21,7 @@
13737 */
13738
13739 #include <linux/linkage.h>
13740+#include <asm/alternative-asm.h>
13741
13742 .file "camellia-x86_64-asm_64.S"
13743 .text
13744@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13745 enc_outunpack(mov, RT1);
13746
13747 movq RRBP, %rbp;
13748+ pax_force_retaddr
13749 ret;
13750
13751 .L__enc_xor:
13752 enc_outunpack(xor, RT1);
13753
13754 movq RRBP, %rbp;
13755+ pax_force_retaddr
13756 ret;
13757 ENDPROC(__camellia_enc_blk)
13758
13759@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13760 dec_outunpack();
13761
13762 movq RRBP, %rbp;
13763+ pax_force_retaddr
13764 ret;
13765 ENDPROC(camellia_dec_blk)
13766
13767@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13768
13769 movq RRBP, %rbp;
13770 popq %rbx;
13771+ pax_force_retaddr
13772 ret;
13773
13774 .L__enc2_xor:
13775@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13776
13777 movq RRBP, %rbp;
13778 popq %rbx;
13779+ pax_force_retaddr
13780 ret;
13781 ENDPROC(__camellia_enc_blk_2way)
13782
13783@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13784
13785 movq RRBP, %rbp;
13786 movq RXOR, %rbx;
13787+ pax_force_retaddr
13788 ret;
13789 ENDPROC(camellia_dec_blk_2way)
13790diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13791index c35fd5d..2d8c7db 100644
13792--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13793+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13794@@ -24,6 +24,7 @@
13795 */
13796
13797 #include <linux/linkage.h>
13798+#include <asm/alternative-asm.h>
13799
13800 .file "cast5-avx-x86_64-asm_64.S"
13801
13802@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13803 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13804 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13805
13806+ pax_force_retaddr
13807 ret;
13808 ENDPROC(__cast5_enc_blk16)
13809
13810@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13811 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13812 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13813
13814+ pax_force_retaddr
13815 ret;
13816
13817 .L__skip_dec:
13818@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13819 vmovdqu RR4, (6*4*4)(%r11);
13820 vmovdqu RL4, (7*4*4)(%r11);
13821
13822+ pax_force_retaddr
13823 ret;
13824 ENDPROC(cast5_ecb_enc_16way)
13825
13826@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13827 vmovdqu RR4, (6*4*4)(%r11);
13828 vmovdqu RL4, (7*4*4)(%r11);
13829
13830+ pax_force_retaddr
13831 ret;
13832 ENDPROC(cast5_ecb_dec_16way)
13833
13834@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13835 * %rdx: src
13836 */
13837
13838- pushq %r12;
13839+ pushq %r14;
13840
13841 movq %rsi, %r11;
13842- movq %rdx, %r12;
13843+ movq %rdx, %r14;
13844
13845 vmovdqu (0*16)(%rdx), RL1;
13846 vmovdqu (1*16)(%rdx), RR1;
13847@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13848 call __cast5_dec_blk16;
13849
13850 /* xor with src */
13851- vmovq (%r12), RX;
13852+ vmovq (%r14), RX;
13853 vpshufd $0x4f, RX, RX;
13854 vpxor RX, RR1, RR1;
13855- vpxor 0*16+8(%r12), RL1, RL1;
13856- vpxor 1*16+8(%r12), RR2, RR2;
13857- vpxor 2*16+8(%r12), RL2, RL2;
13858- vpxor 3*16+8(%r12), RR3, RR3;
13859- vpxor 4*16+8(%r12), RL3, RL3;
13860- vpxor 5*16+8(%r12), RR4, RR4;
13861- vpxor 6*16+8(%r12), RL4, RL4;
13862+ vpxor 0*16+8(%r14), RL1, RL1;
13863+ vpxor 1*16+8(%r14), RR2, RR2;
13864+ vpxor 2*16+8(%r14), RL2, RL2;
13865+ vpxor 3*16+8(%r14), RR3, RR3;
13866+ vpxor 4*16+8(%r14), RL3, RL3;
13867+ vpxor 5*16+8(%r14), RR4, RR4;
13868+ vpxor 6*16+8(%r14), RL4, RL4;
13869
13870 vmovdqu RR1, (0*16)(%r11);
13871 vmovdqu RL1, (1*16)(%r11);
13872@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13873 vmovdqu RR4, (6*16)(%r11);
13874 vmovdqu RL4, (7*16)(%r11);
13875
13876- popq %r12;
13877+ popq %r14;
13878
13879+ pax_force_retaddr
13880 ret;
13881 ENDPROC(cast5_cbc_dec_16way)
13882
13883@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13884 * %rcx: iv (big endian, 64bit)
13885 */
13886
13887- pushq %r12;
13888+ pushq %r14;
13889
13890 movq %rsi, %r11;
13891- movq %rdx, %r12;
13892+ movq %rdx, %r14;
13893
13894 vpcmpeqd RTMP, RTMP, RTMP;
13895 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13896@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13897 call __cast5_enc_blk16;
13898
13899 /* dst = src ^ iv */
13900- vpxor (0*16)(%r12), RR1, RR1;
13901- vpxor (1*16)(%r12), RL1, RL1;
13902- vpxor (2*16)(%r12), RR2, RR2;
13903- vpxor (3*16)(%r12), RL2, RL2;
13904- vpxor (4*16)(%r12), RR3, RR3;
13905- vpxor (5*16)(%r12), RL3, RL3;
13906- vpxor (6*16)(%r12), RR4, RR4;
13907- vpxor (7*16)(%r12), RL4, RL4;
13908+ vpxor (0*16)(%r14), RR1, RR1;
13909+ vpxor (1*16)(%r14), RL1, RL1;
13910+ vpxor (2*16)(%r14), RR2, RR2;
13911+ vpxor (3*16)(%r14), RL2, RL2;
13912+ vpxor (4*16)(%r14), RR3, RR3;
13913+ vpxor (5*16)(%r14), RL3, RL3;
13914+ vpxor (6*16)(%r14), RR4, RR4;
13915+ vpxor (7*16)(%r14), RL4, RL4;
13916 vmovdqu RR1, (0*16)(%r11);
13917 vmovdqu RL1, (1*16)(%r11);
13918 vmovdqu RR2, (2*16)(%r11);
13919@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13920 vmovdqu RR4, (6*16)(%r11);
13921 vmovdqu RL4, (7*16)(%r11);
13922
13923- popq %r12;
13924+ popq %r14;
13925
13926+ pax_force_retaddr
13927 ret;
13928 ENDPROC(cast5_ctr_16way)
13929diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13930index e3531f8..e123f35 100644
13931--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13932+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13933@@ -24,6 +24,7 @@
13934 */
13935
13936 #include <linux/linkage.h>
13937+#include <asm/alternative-asm.h>
13938 #include "glue_helper-asm-avx.S"
13939
13940 .file "cast6-avx-x86_64-asm_64.S"
13941@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13942 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13943 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13944
13945+ pax_force_retaddr
13946 ret;
13947 ENDPROC(__cast6_enc_blk8)
13948
13949@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13950 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13951 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13952
13953+ pax_force_retaddr
13954 ret;
13955 ENDPROC(__cast6_dec_blk8)
13956
13957@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13958
13959 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13960
13961+ pax_force_retaddr
13962 ret;
13963 ENDPROC(cast6_ecb_enc_8way)
13964
13965@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13966
13967 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13968
13969+ pax_force_retaddr
13970 ret;
13971 ENDPROC(cast6_ecb_dec_8way)
13972
13973@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13974 * %rdx: src
13975 */
13976
13977- pushq %r12;
13978+ pushq %r14;
13979
13980 movq %rsi, %r11;
13981- movq %rdx, %r12;
13982+ movq %rdx, %r14;
13983
13984 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13985
13986 call __cast6_dec_blk8;
13987
13988- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13989+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13990
13991- popq %r12;
13992+ popq %r14;
13993
13994+ pax_force_retaddr
13995 ret;
13996 ENDPROC(cast6_cbc_dec_8way)
13997
13998@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13999 * %rcx: iv (little endian, 128bit)
14000 */
14001
14002- pushq %r12;
14003+ pushq %r14;
14004
14005 movq %rsi, %r11;
14006- movq %rdx, %r12;
14007+ movq %rdx, %r14;
14008
14009 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14010 RD2, RX, RKR, RKM);
14011
14012 call __cast6_enc_blk8;
14013
14014- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14015+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14016
14017- popq %r12;
14018+ popq %r14;
14019
14020+ pax_force_retaddr
14021 ret;
14022 ENDPROC(cast6_ctr_8way)
14023
14024@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
14025 /* dst <= regs xor IVs(in dst) */
14026 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14027
14028+ pax_force_retaddr
14029 ret;
14030 ENDPROC(cast6_xts_enc_8way)
14031
14032@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
14033 /* dst <= regs xor IVs(in dst) */
14034 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14035
14036+ pax_force_retaddr
14037 ret;
14038 ENDPROC(cast6_xts_dec_8way)
14039diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14040index 225be06..2885e731 100644
14041--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14042+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
14043@@ -45,6 +45,7 @@
14044
14045 #include <asm/inst.h>
14046 #include <linux/linkage.h>
14047+#include <asm/alternative-asm.h>
14048
14049 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14050
14051@@ -309,6 +310,7 @@ do_return:
14052 popq %rsi
14053 popq %rdi
14054 popq %rbx
14055+ pax_force_retaddr
14056 ret
14057
14058 ################################################################
14059@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14060 ## PCLMULQDQ tables
14061 ## Table is 128 entries x 2 words (8 bytes) each
14062 ################################################################
14063-.section .rotata, "a", %progbits
14064+.section .rodata, "a", %progbits
14065 .align 8
14066 K_table:
14067 .long 0x493c7d27, 0x00000001
14068diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14069index 5d1e007..098cb4f 100644
14070--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14071+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14072@@ -18,6 +18,7 @@
14073
14074 #include <linux/linkage.h>
14075 #include <asm/inst.h>
14076+#include <asm/alternative-asm.h>
14077
14078 .data
14079
14080@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14081 psrlq $1, T2
14082 pxor T2, T1
14083 pxor T1, DATA
14084+ pax_force_retaddr
14085 ret
14086 ENDPROC(__clmul_gf128mul_ble)
14087
14088@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14089 call __clmul_gf128mul_ble
14090 PSHUFB_XMM BSWAP DATA
14091 movups DATA, (%rdi)
14092+ pax_force_retaddr
14093 ret
14094 ENDPROC(clmul_ghash_mul)
14095
14096@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14097 PSHUFB_XMM BSWAP DATA
14098 movups DATA, (%rdi)
14099 .Lupdate_just_ret:
14100+ pax_force_retaddr
14101 ret
14102 ENDPROC(clmul_ghash_update)
14103diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14104index 9279e0b..c4b3d2c 100644
14105--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14106+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14107@@ -1,4 +1,5 @@
14108 #include <linux/linkage.h>
14109+#include <asm/alternative-asm.h>
14110
14111 # enter salsa20_encrypt_bytes
14112 ENTRY(salsa20_encrypt_bytes)
14113@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14114 add %r11,%rsp
14115 mov %rdi,%rax
14116 mov %rsi,%rdx
14117+ pax_force_retaddr
14118 ret
14119 # bytesatleast65:
14120 ._bytesatleast65:
14121@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14122 add %r11,%rsp
14123 mov %rdi,%rax
14124 mov %rsi,%rdx
14125+ pax_force_retaddr
14126 ret
14127 ENDPROC(salsa20_keysetup)
14128
14129@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14130 add %r11,%rsp
14131 mov %rdi,%rax
14132 mov %rsi,%rdx
14133+ pax_force_retaddr
14134 ret
14135 ENDPROC(salsa20_ivsetup)
14136diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14137index 2f202f4..d9164d6 100644
14138--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14139+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14140@@ -24,6 +24,7 @@
14141 */
14142
14143 #include <linux/linkage.h>
14144+#include <asm/alternative-asm.h>
14145 #include "glue_helper-asm-avx.S"
14146
14147 .file "serpent-avx-x86_64-asm_64.S"
14148@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14149 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14150 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14151
14152+ pax_force_retaddr
14153 ret;
14154 ENDPROC(__serpent_enc_blk8_avx)
14155
14156@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14157 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14158 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14159
14160+ pax_force_retaddr
14161 ret;
14162 ENDPROC(__serpent_dec_blk8_avx)
14163
14164@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14165
14166 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14167
14168+ pax_force_retaddr
14169 ret;
14170 ENDPROC(serpent_ecb_enc_8way_avx)
14171
14172@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14173
14174 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14175
14176+ pax_force_retaddr
14177 ret;
14178 ENDPROC(serpent_ecb_dec_8way_avx)
14179
14180@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14181
14182 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14183
14184+ pax_force_retaddr
14185 ret;
14186 ENDPROC(serpent_cbc_dec_8way_avx)
14187
14188@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14189
14190 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14191
14192+ pax_force_retaddr
14193 ret;
14194 ENDPROC(serpent_ctr_8way_avx)
14195
14196@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14197 /* dst <= regs xor IVs(in dst) */
14198 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14199
14200+ pax_force_retaddr
14201 ret;
14202 ENDPROC(serpent_xts_enc_8way_avx)
14203
14204@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14205 /* dst <= regs xor IVs(in dst) */
14206 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14207
14208+ pax_force_retaddr
14209 ret;
14210 ENDPROC(serpent_xts_dec_8way_avx)
14211diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14212index b222085..abd483c 100644
14213--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14214+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14215@@ -15,6 +15,7 @@
14216 */
14217
14218 #include <linux/linkage.h>
14219+#include <asm/alternative-asm.h>
14220 #include "glue_helper-asm-avx2.S"
14221
14222 .file "serpent-avx2-asm_64.S"
14223@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14224 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14225 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14226
14227+ pax_force_retaddr
14228 ret;
14229 ENDPROC(__serpent_enc_blk16)
14230
14231@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14232 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14233 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14234
14235+ pax_force_retaddr
14236 ret;
14237 ENDPROC(__serpent_dec_blk16)
14238
14239@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14240
14241 vzeroupper;
14242
14243+ pax_force_retaddr
14244 ret;
14245 ENDPROC(serpent_ecb_enc_16way)
14246
14247@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14248
14249 vzeroupper;
14250
14251+ pax_force_retaddr
14252 ret;
14253 ENDPROC(serpent_ecb_dec_16way)
14254
14255@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14256
14257 vzeroupper;
14258
14259+ pax_force_retaddr
14260 ret;
14261 ENDPROC(serpent_cbc_dec_16way)
14262
14263@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14264
14265 vzeroupper;
14266
14267+ pax_force_retaddr
14268 ret;
14269 ENDPROC(serpent_ctr_16way)
14270
14271@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14272
14273 vzeroupper;
14274
14275+ pax_force_retaddr
14276 ret;
14277 ENDPROC(serpent_xts_enc_16way)
14278
14279@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14280
14281 vzeroupper;
14282
14283+ pax_force_retaddr
14284 ret;
14285 ENDPROC(serpent_xts_dec_16way)
14286diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14287index acc066c..1559cc4 100644
14288--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14289+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14290@@ -25,6 +25,7 @@
14291 */
14292
14293 #include <linux/linkage.h>
14294+#include <asm/alternative-asm.h>
14295
14296 .file "serpent-sse2-x86_64-asm_64.S"
14297 .text
14298@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14299 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14300 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14301
14302+ pax_force_retaddr
14303 ret;
14304
14305 .L__enc_xor8:
14306 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14307 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14308
14309+ pax_force_retaddr
14310 ret;
14311 ENDPROC(__serpent_enc_blk_8way)
14312
14313@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14314 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14315 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14316
14317+ pax_force_retaddr
14318 ret;
14319 ENDPROC(serpent_dec_blk_8way)
14320diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14321index a410950..9dfe7ad 100644
14322--- a/arch/x86/crypto/sha1_ssse3_asm.S
14323+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14324@@ -29,6 +29,7 @@
14325 */
14326
14327 #include <linux/linkage.h>
14328+#include <asm/alternative-asm.h>
14329
14330 #define CTX %rdi // arg1
14331 #define BUF %rsi // arg2
14332@@ -75,9 +76,9 @@
14333
14334 push %rbx
14335 push %rbp
14336- push %r12
14337+ push %r14
14338
14339- mov %rsp, %r12
14340+ mov %rsp, %r14
14341 sub $64, %rsp # allocate workspace
14342 and $~15, %rsp # align stack
14343
14344@@ -99,11 +100,12 @@
14345 xor %rax, %rax
14346 rep stosq
14347
14348- mov %r12, %rsp # deallocate workspace
14349+ mov %r14, %rsp # deallocate workspace
14350
14351- pop %r12
14352+ pop %r14
14353 pop %rbp
14354 pop %rbx
14355+ pax_force_retaddr
14356 ret
14357
14358 ENDPROC(\name)
14359diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14360index 92b3b5d..0dc1dcb 100644
14361--- a/arch/x86/crypto/sha256-avx-asm.S
14362+++ b/arch/x86/crypto/sha256-avx-asm.S
14363@@ -49,6 +49,7 @@
14364
14365 #ifdef CONFIG_AS_AVX
14366 #include <linux/linkage.h>
14367+#include <asm/alternative-asm.h>
14368
14369 ## assume buffers not aligned
14370 #define VMOVDQ vmovdqu
14371@@ -460,6 +461,7 @@ done_hash:
14372 popq %r13
14373 popq %rbp
14374 popq %rbx
14375+ pax_force_retaddr
14376 ret
14377 ENDPROC(sha256_transform_avx)
14378
14379diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14380index 570ec5e..cf2b625 100644
14381--- a/arch/x86/crypto/sha256-avx2-asm.S
14382+++ b/arch/x86/crypto/sha256-avx2-asm.S
14383@@ -50,6 +50,7 @@
14384
14385 #ifdef CONFIG_AS_AVX2
14386 #include <linux/linkage.h>
14387+#include <asm/alternative-asm.h>
14388
14389 ## assume buffers not aligned
14390 #define VMOVDQ vmovdqu
14391@@ -720,6 +721,7 @@ done_hash:
14392 popq %r12
14393 popq %rbp
14394 popq %rbx
14395+ pax_force_retaddr
14396 ret
14397 ENDPROC(sha256_transform_rorx)
14398
14399diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14400index 2cedc44..5144899 100644
14401--- a/arch/x86/crypto/sha256-ssse3-asm.S
14402+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14403@@ -47,6 +47,7 @@
14404 ########################################################################
14405
14406 #include <linux/linkage.h>
14407+#include <asm/alternative-asm.h>
14408
14409 ## assume buffers not aligned
14410 #define MOVDQ movdqu
14411@@ -471,6 +472,7 @@ done_hash:
14412 popq %rbp
14413 popq %rbx
14414
14415+ pax_force_retaddr
14416 ret
14417 ENDPROC(sha256_transform_ssse3)
14418
14419diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14420index 565274d..af6bc08 100644
14421--- a/arch/x86/crypto/sha512-avx-asm.S
14422+++ b/arch/x86/crypto/sha512-avx-asm.S
14423@@ -49,6 +49,7 @@
14424
14425 #ifdef CONFIG_AS_AVX
14426 #include <linux/linkage.h>
14427+#include <asm/alternative-asm.h>
14428
14429 .text
14430
14431@@ -364,6 +365,7 @@ updateblock:
14432 mov frame_RSPSAVE(%rsp), %rsp
14433
14434 nowork:
14435+ pax_force_retaddr
14436 ret
14437 ENDPROC(sha512_transform_avx)
14438
14439diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14440index 1f20b35..f25c8c1 100644
14441--- a/arch/x86/crypto/sha512-avx2-asm.S
14442+++ b/arch/x86/crypto/sha512-avx2-asm.S
14443@@ -51,6 +51,7 @@
14444
14445 #ifdef CONFIG_AS_AVX2
14446 #include <linux/linkage.h>
14447+#include <asm/alternative-asm.h>
14448
14449 .text
14450
14451@@ -678,6 +679,7 @@ done_hash:
14452
14453 # Restore Stack Pointer
14454 mov frame_RSPSAVE(%rsp), %rsp
14455+ pax_force_retaddr
14456 ret
14457 ENDPROC(sha512_transform_rorx)
14458
14459diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14460index e610e29..ffcb5ed 100644
14461--- a/arch/x86/crypto/sha512-ssse3-asm.S
14462+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14463@@ -48,6 +48,7 @@
14464 ########################################################################
14465
14466 #include <linux/linkage.h>
14467+#include <asm/alternative-asm.h>
14468
14469 .text
14470
14471@@ -363,6 +364,7 @@ updateblock:
14472 mov frame_RSPSAVE(%rsp), %rsp
14473
14474 nowork:
14475+ pax_force_retaddr
14476 ret
14477 ENDPROC(sha512_transform_ssse3)
14478
14479diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14480index 0505813..b067311 100644
14481--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14482+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14483@@ -24,6 +24,7 @@
14484 */
14485
14486 #include <linux/linkage.h>
14487+#include <asm/alternative-asm.h>
14488 #include "glue_helper-asm-avx.S"
14489
14490 .file "twofish-avx-x86_64-asm_64.S"
14491@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14492 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14493 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14494
14495+ pax_force_retaddr
14496 ret;
14497 ENDPROC(__twofish_enc_blk8)
14498
14499@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14500 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14501 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14502
14503+ pax_force_retaddr
14504 ret;
14505 ENDPROC(__twofish_dec_blk8)
14506
14507@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14508
14509 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14510
14511+ pax_force_retaddr
14512 ret;
14513 ENDPROC(twofish_ecb_enc_8way)
14514
14515@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14516
14517 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14518
14519+ pax_force_retaddr
14520 ret;
14521 ENDPROC(twofish_ecb_dec_8way)
14522
14523@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14524 * %rdx: src
14525 */
14526
14527- pushq %r12;
14528+ pushq %r14;
14529
14530 movq %rsi, %r11;
14531- movq %rdx, %r12;
14532+ movq %rdx, %r14;
14533
14534 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14535
14536 call __twofish_dec_blk8;
14537
14538- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14539+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14540
14541- popq %r12;
14542+ popq %r14;
14543
14544+ pax_force_retaddr
14545 ret;
14546 ENDPROC(twofish_cbc_dec_8way)
14547
14548@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14549 * %rcx: iv (little endian, 128bit)
14550 */
14551
14552- pushq %r12;
14553+ pushq %r14;
14554
14555 movq %rsi, %r11;
14556- movq %rdx, %r12;
14557+ movq %rdx, %r14;
14558
14559 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14560 RD2, RX0, RX1, RY0);
14561
14562 call __twofish_enc_blk8;
14563
14564- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14565+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14566
14567- popq %r12;
14568+ popq %r14;
14569
14570+ pax_force_retaddr
14571 ret;
14572 ENDPROC(twofish_ctr_8way)
14573
14574@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14575 /* dst <= regs xor IVs(in dst) */
14576 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14577
14578+ pax_force_retaddr
14579 ret;
14580 ENDPROC(twofish_xts_enc_8way)
14581
14582@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14583 /* dst <= regs xor IVs(in dst) */
14584 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14585
14586+ pax_force_retaddr
14587 ret;
14588 ENDPROC(twofish_xts_dec_8way)
14589diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14590index 1c3b7ce..02f578d 100644
14591--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14592+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14593@@ -21,6 +21,7 @@
14594 */
14595
14596 #include <linux/linkage.h>
14597+#include <asm/alternative-asm.h>
14598
14599 .file "twofish-x86_64-asm-3way.S"
14600 .text
14601@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14602 popq %r13;
14603 popq %r14;
14604 popq %r15;
14605+ pax_force_retaddr
14606 ret;
14607
14608 .L__enc_xor3:
14609@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14610 popq %r13;
14611 popq %r14;
14612 popq %r15;
14613+ pax_force_retaddr
14614 ret;
14615 ENDPROC(__twofish_enc_blk_3way)
14616
14617@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14618 popq %r13;
14619 popq %r14;
14620 popq %r15;
14621+ pax_force_retaddr
14622 ret;
14623 ENDPROC(twofish_dec_blk_3way)
14624diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14625index a350c99..c1bac24 100644
14626--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14627+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14628@@ -22,6 +22,7 @@
14629
14630 #include <linux/linkage.h>
14631 #include <asm/asm-offsets.h>
14632+#include <asm/alternative-asm.h>
14633
14634 #define a_offset 0
14635 #define b_offset 4
14636@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14637
14638 popq R1
14639 movl $1,%eax
14640+ pax_force_retaddr
14641 ret
14642 ENDPROC(twofish_enc_blk)
14643
14644@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14645
14646 popq R1
14647 movl $1,%eax
14648+ pax_force_retaddr
14649 ret
14650 ENDPROC(twofish_dec_blk)
14651diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14652index ae6aad1..719d6d9 100644
14653--- a/arch/x86/ia32/ia32_aout.c
14654+++ b/arch/x86/ia32/ia32_aout.c
14655@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14656 unsigned long dump_start, dump_size;
14657 struct user32 dump;
14658
14659+ memset(&dump, 0, sizeof(dump));
14660+
14661 fs = get_fs();
14662 set_fs(KERNEL_DS);
14663 has_dumped = 1;
14664diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14665index c81d35e6..3500144 100644
14666--- a/arch/x86/ia32/ia32_signal.c
14667+++ b/arch/x86/ia32/ia32_signal.c
14668@@ -216,7 +216,7 @@ asmlinkage long sys32_sigreturn(void)
14669 if (__get_user(set.sig[0], &frame->sc.oldmask)
14670 || (_COMPAT_NSIG_WORDS > 1
14671 && __copy_from_user((((char *) &set.sig) + 4),
14672- &frame->extramask,
14673+ frame->extramask,
14674 sizeof(frame->extramask))))
14675 goto badframe;
14676
14677@@ -335,7 +335,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14678 sp -= frame_size;
14679 /* Align the stack pointer according to the i386 ABI,
14680 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14681- sp = ((sp + 4) & -16ul) - 4;
14682+ sp = ((sp - 12) & -16ul) - 4;
14683 return (void __user *) sp;
14684 }
14685
14686@@ -380,10 +380,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14687 } else {
14688 /* Return stub is in 32bit vsyscall page */
14689 if (current->mm->context.vdso)
14690- restorer = current->mm->context.vdso +
14691- selected_vdso32->sym___kernel_sigreturn;
14692+ restorer = (void __force_user *)(current->mm->context.vdso +
14693+ selected_vdso32->sym___kernel_sigreturn);
14694 else
14695- restorer = &frame->retcode;
14696+ restorer = frame->retcode;
14697 }
14698
14699 put_user_try {
14700@@ -393,7 +393,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14701 * These are actually not used anymore, but left because some
14702 * gdb versions depend on them as a marker.
14703 */
14704- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14705+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14706 } put_user_catch(err);
14707
14708 if (err)
14709@@ -435,7 +435,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14710 0xb8,
14711 __NR_ia32_rt_sigreturn,
14712 0x80cd,
14713- 0,
14714+ 0
14715 };
14716
14717 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14718@@ -458,16 +458,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14719
14720 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14721 restorer = ksig->ka.sa.sa_restorer;
14722+ else if (current->mm->context.vdso)
14723+ /* Return stub is in 32bit vsyscall page */
14724+ restorer = (void __force_user *)(current->mm->context.vdso +
14725+ selected_vdso32->sym___kernel_rt_sigreturn);
14726 else
14727- restorer = current->mm->context.vdso +
14728- selected_vdso32->sym___kernel_rt_sigreturn;
14729+ restorer = frame->retcode;
14730 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14731
14732 /*
14733 * Not actually used anymore, but left because some gdb
14734 * versions need it.
14735 */
14736- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14737+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14738 } put_user_catch(err);
14739
14740 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14741diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14742index 72bf268..127572a 100644
14743--- a/arch/x86/ia32/ia32entry.S
14744+++ b/arch/x86/ia32/ia32entry.S
14745@@ -15,8 +15,10 @@
14746 #include <asm/irqflags.h>
14747 #include <asm/asm.h>
14748 #include <asm/smap.h>
14749+#include <asm/pgtable.h>
14750 #include <linux/linkage.h>
14751 #include <linux/err.h>
14752+#include <asm/alternative-asm.h>
14753
14754 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14755 #include <linux/elf-em.h>
14756@@ -85,6 +87,32 @@ ENTRY(native_irq_enable_sysexit)
14757 ENDPROC(native_irq_enable_sysexit)
14758 #endif
14759
14760+ .macro pax_enter_kernel_user
14761+ pax_set_fptr_mask
14762+#ifdef CONFIG_PAX_MEMORY_UDEREF
14763+ call pax_enter_kernel_user
14764+#endif
14765+ .endm
14766+
14767+ .macro pax_exit_kernel_user
14768+#ifdef CONFIG_PAX_MEMORY_UDEREF
14769+ call pax_exit_kernel_user
14770+#endif
14771+#ifdef CONFIG_PAX_RANDKSTACK
14772+ pushq %rax
14773+ pushq %r11
14774+ call pax_randomize_kstack
14775+ popq %r11
14776+ popq %rax
14777+#endif
14778+ .endm
14779+
14780+ .macro pax_erase_kstack
14781+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14782+ call pax_erase_kstack
14783+#endif
14784+ .endm
14785+
14786 /*
14787 * 32bit SYSENTER instruction entry.
14788 *
14789@@ -119,23 +147,24 @@ ENTRY(ia32_sysenter_target)
14790 * it is too small to ever cause noticeable irq latency.
14791 */
14792 SWAPGS_UNSAFE_STACK
14793- movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp
14794- ENABLE_INTERRUPTS(CLBR_NONE)
14795+ movq PER_CPU_VAR(kernel_stack), %rsp
14796
14797 /* Zero-extending 32-bit regs, do not remove */
14798 movl %ebp, %ebp
14799 movl %eax, %eax
14800
14801- movl ASM_THREAD_INFO(TI_sysenter_return, %rsp, 0), %r10d
14802- CFI_REGISTER rip,r10
14803+ GET_THREAD_INFO(%r11)
14804+ movl TI_sysenter_return(%r11), %r11d
14805+ CFI_REGISTER rip,r11
14806
14807 /* Construct struct pt_regs on stack */
14808 pushq_cfi $__USER32_DS /* pt_regs->ss */
14809 pushq_cfi %rbp /* pt_regs->sp */
14810 CFI_REL_OFFSET rsp,0
14811 pushfq_cfi /* pt_regs->flags */
14812+ orl $X86_EFLAGS_IF,(%rsp)
14813 pushq_cfi $__USER32_CS /* pt_regs->cs */
14814- pushq_cfi %r10 /* pt_regs->ip = thread_info->sysenter_return */
14815+ pushq_cfi %r11 /* pt_regs->ip = thread_info->sysenter_return */
14816 CFI_REL_OFFSET rip,0
14817 pushq_cfi_reg rax /* pt_regs->orig_ax */
14818 pushq_cfi_reg rdi /* pt_regs->di */
14819@@ -147,15 +176,37 @@ ENTRY(ia32_sysenter_target)
14820 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14821 CFI_ADJUST_CFA_OFFSET 10*8
14822
14823+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14824+ movq_cfi r12, R12
14825+#endif
14826+
14827+ pax_enter_kernel_user
14828+
14829+#ifdef CONFIG_PAX_RANDKSTACK
14830+ pax_erase_kstack
14831+#endif
14832+
14833+ ENABLE_INTERRUPTS(CLBR_NONE)
14834+
14835 /*
14836 * no need to do an access_ok check here because rbp has been
14837 * 32bit zero extended
14838 */
14839+
14840+#ifdef CONFIG_PAX_MEMORY_UDEREF
14841+ addq pax_user_shadow_base,%rbp
14842+ ASM_PAX_OPEN_USERLAND
14843+#endif
14844+
14845 ASM_STAC
14846 1: movl (%rbp),%ebp
14847 _ASM_EXTABLE(1b,ia32_badarg)
14848 ASM_CLAC
14849
14850+#ifdef CONFIG_PAX_MEMORY_UDEREF
14851+ ASM_PAX_CLOSE_USERLAND
14852+#endif
14853+
14854 /*
14855 * Sysenter doesn't filter flags, so we need to clear NT
14856 * ourselves. To save a few cycles, we can check whether
14857@@ -165,8 +216,9 @@ ENTRY(ia32_sysenter_target)
14858 jnz sysenter_fix_flags
14859 sysenter_flags_fixed:
14860
14861- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14862- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14863+ GET_THREAD_INFO(%r11)
14864+ orl $TS_COMPAT,TI_status(%r11)
14865+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14866 CFI_REMEMBER_STATE
14867 jnz sysenter_tracesys
14868 cmpq $(IA32_NR_syscalls-1),%rax
14869@@ -181,9 +233,10 @@ sysenter_do_call:
14870 sysenter_dispatch:
14871 call *ia32_sys_call_table(,%rax,8)
14872 movq %rax,RAX(%rsp)
14873+ GET_THREAD_INFO(%r11)
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14877+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14878 jnz sysexit_audit
14879 sysexit_from_sys_call:
14880 /*
14881@@ -196,7 +249,9 @@ sysexit_from_sys_call:
14882 * This code path is still called 'sysexit' because it pairs
14883 * with 'sysenter' and it uses the SYSENTER calling convention.
14884 */
14885- andl $~TS_COMPAT,ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14886+ pax_exit_kernel_user
14887+ pax_erase_kstack
14888+ andl $~TS_COMPAT,TI_status(%r11)
14889 movl RIP(%rsp),%ecx /* User %eip */
14890 CFI_REGISTER rip,rcx
14891 RESTORE_RSI_RDI
14892@@ -247,6 +302,9 @@ sysexit_from_sys_call:
14893 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14894 movl %eax,%edi /* 1st arg: syscall number */
14895 call __audit_syscall_entry
14896+
14897+ pax_erase_kstack
14898+
14899 movl RAX(%rsp),%eax /* reload syscall number */
14900 cmpq $(IA32_NR_syscalls-1),%rax
14901 ja ia32_badsys
14902@@ -258,7 +316,7 @@ sysexit_from_sys_call:
14903 .endm
14904
14905 .macro auditsys_exit exit
14906- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14907+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14908 jnz ia32_ret_from_sys_call
14909 TRACE_IRQS_ON
14910 ENABLE_INTERRUPTS(CLBR_NONE)
14911@@ -269,11 +327,12 @@ sysexit_from_sys_call:
14912 1: setbe %al /* 1 if error, 0 if not */
14913 movzbl %al,%edi /* zero-extend that into %edi */
14914 call __audit_syscall_exit
14915+ GET_THREAD_INFO(%r11)
14916 movq RAX(%rsp),%rax /* reload syscall return value */
14917 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14918 DISABLE_INTERRUPTS(CLBR_NONE)
14919 TRACE_IRQS_OFF
14920- testl %edi, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14921+ testl %edi,TI_flags(%r11)
14922 jz \exit
14923 CLEAR_RREGS
14924 jmp int_with_check
14925@@ -295,7 +354,7 @@ sysenter_fix_flags:
14926
14927 sysenter_tracesys:
14928 #ifdef CONFIG_AUDITSYSCALL
14929- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14930+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14931 jz sysenter_auditsys
14932 #endif
14933 SAVE_EXTRA_REGS
14934@@ -307,6 +366,9 @@ sysenter_tracesys:
14935 RESTORE_EXTRA_REGS
14936 cmpq $(IA32_NR_syscalls-1),%rax
14937 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14938+
14939+ pax_erase_kstack
14940+
14941 jmp sysenter_do_call
14942 CFI_ENDPROC
14943 ENDPROC(ia32_sysenter_target)
14944@@ -357,7 +419,6 @@ ENTRY(ia32_cstar_target)
14945 movl %esp,%r8d
14946 CFI_REGISTER rsp,r8
14947 movq PER_CPU_VAR(kernel_stack),%rsp
14948- ENABLE_INTERRUPTS(CLBR_NONE)
14949
14950 /* Zero-extending 32-bit regs, do not remove */
14951 movl %eax,%eax
14952@@ -380,16 +441,41 @@ ENTRY(ia32_cstar_target)
14953 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14954 CFI_ADJUST_CFA_OFFSET 10*8
14955
14956+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14957+ movq_cfi r12, R12
14958+#endif
14959+
14960+ pax_enter_kernel_user
14961+
14962+#ifdef CONFIG_PAX_RANDKSTACK
14963+ pax_erase_kstack
14964+#endif
14965+
14966+ ENABLE_INTERRUPTS(CLBR_NONE)
14967+
14968 /*
14969 * no need to do an access_ok check here because r8 has been
14970 * 32bit zero extended
14971 */
14972+
14973+#ifdef CONFIG_PAX_MEMORY_UDEREF
14974+ ASM_PAX_OPEN_USERLAND
14975+ movq pax_user_shadow_base,%r8
14976+ addq RSP(%rsp),%r8
14977+#endif
14978+
14979 ASM_STAC
14980 1: movl (%r8),%r9d
14981 _ASM_EXTABLE(1b,ia32_badarg)
14982 ASM_CLAC
14983- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14984- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14985+
14986+#ifdef CONFIG_PAX_MEMORY_UDEREF
14987+ ASM_PAX_CLOSE_USERLAND
14988+#endif
14989+
14990+ GET_THREAD_INFO(%r11)
14991+ orl $TS_COMPAT,TI_status(%r11)
14992+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14993 CFI_REMEMBER_STATE
14994 jnz cstar_tracesys
14995 cmpq $IA32_NR_syscalls-1,%rax
14996@@ -404,12 +490,15 @@ cstar_do_call:
14997 cstar_dispatch:
14998 call *ia32_sys_call_table(,%rax,8)
14999 movq %rax,RAX(%rsp)
15000+ GET_THREAD_INFO(%r11)
15001 DISABLE_INTERRUPTS(CLBR_NONE)
15002 TRACE_IRQS_OFF
15003- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15004+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
15005 jnz sysretl_audit
15006 sysretl_from_sys_call:
15007- andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15008+ pax_exit_kernel_user
15009+ pax_erase_kstack
15010+ andl $~TS_COMPAT,TI_status(%r11)
15011 RESTORE_RSI_RDI_RDX
15012 movl RIP(%rsp),%ecx
15013 CFI_REGISTER rip,rcx
15014@@ -451,7 +540,7 @@ sysretl_audit:
15015
15016 cstar_tracesys:
15017 #ifdef CONFIG_AUDITSYSCALL
15018- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15019+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
15020 jz cstar_auditsys
15021 #endif
15022 xchgl %r9d,%ebp
15023@@ -465,11 +554,19 @@ cstar_tracesys:
15024 xchgl %ebp,%r9d
15025 cmpq $(IA32_NR_syscalls-1),%rax
15026 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
15027+
15028+ pax_erase_kstack
15029+
15030 jmp cstar_do_call
15031 END(ia32_cstar_target)
15032
15033 ia32_badarg:
15034 ASM_CLAC
15035+
15036+#ifdef CONFIG_PAX_MEMORY_UDEREF
15037+ ASM_PAX_CLOSE_USERLAND
15038+#endif
15039+
15040 movq $-EFAULT,%rax
15041 jmp ia32_sysret
15042 CFI_ENDPROC
15043@@ -505,14 +602,8 @@ ENTRY(ia32_syscall)
15044 /*CFI_REL_OFFSET cs,1*8 */
15045 CFI_REL_OFFSET rip,0*8
15046
15047- /*
15048- * Interrupts are off on entry.
15049- * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15050- * it is too small to ever cause noticeable irq latency.
15051- */
15052 PARAVIRT_ADJUST_EXCEPTION_FRAME
15053 SWAPGS
15054- ENABLE_INTERRUPTS(CLBR_NONE)
15055
15056 /* Zero-extending 32-bit regs, do not remove */
15057 movl %eax,%eax
15058@@ -528,8 +619,26 @@ ENTRY(ia32_syscall)
15059 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
15060 CFI_ADJUST_CFA_OFFSET 10*8
15061
15062- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15063- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15064+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15065+ movq_cfi r12, R12
15066+#endif
15067+
15068+ pax_enter_kernel_user
15069+
15070+#ifdef CONFIG_PAX_RANDKSTACK
15071+ pax_erase_kstack
15072+#endif
15073+
15074+ /*
15075+ * Interrupts are off on entry.
15076+ * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15077+ * it is too small to ever cause noticeable irq latency.
15078+ */
15079+ ENABLE_INTERRUPTS(CLBR_NONE)
15080+
15081+ GET_THREAD_INFO(%r11)
15082+ orl $TS_COMPAT,TI_status(%r11)
15083+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15084 jnz ia32_tracesys
15085 cmpq $(IA32_NR_syscalls-1),%rax
15086 ja ia32_badsys
15087@@ -557,6 +666,9 @@ ia32_tracesys:
15088 RESTORE_EXTRA_REGS
15089 cmpq $(IA32_NR_syscalls-1),%rax
15090 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15091+
15092+ pax_erase_kstack
15093+
15094 jmp ia32_do_call
15095 END(ia32_syscall)
15096
15097diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15098index 719cd70..69d576b 100644
15099--- a/arch/x86/ia32/sys_ia32.c
15100+++ b/arch/x86/ia32/sys_ia32.c
15101@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15102 */
15103 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15104 {
15105- typeof(ubuf->st_uid) uid = 0;
15106- typeof(ubuf->st_gid) gid = 0;
15107+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15108+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15109 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15110 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15111 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15112diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15113index bdf02ee..51a4656 100644
15114--- a/arch/x86/include/asm/alternative-asm.h
15115+++ b/arch/x86/include/asm/alternative-asm.h
15116@@ -18,6 +18,45 @@
15117 .endm
15118 #endif
15119
15120+#ifdef KERNEXEC_PLUGIN
15121+ .macro pax_force_retaddr_bts rip=0
15122+ btsq $63,\rip(%rsp)
15123+ .endm
15124+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15125+ .macro pax_force_retaddr rip=0, reload=0
15126+ btsq $63,\rip(%rsp)
15127+ .endm
15128+ .macro pax_force_fptr ptr
15129+ btsq $63,\ptr
15130+ .endm
15131+ .macro pax_set_fptr_mask
15132+ .endm
15133+#endif
15134+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15135+ .macro pax_force_retaddr rip=0, reload=0
15136+ .if \reload
15137+ pax_set_fptr_mask
15138+ .endif
15139+ orq %r12,\rip(%rsp)
15140+ .endm
15141+ .macro pax_force_fptr ptr
15142+ orq %r12,\ptr
15143+ .endm
15144+ .macro pax_set_fptr_mask
15145+ movabs $0x8000000000000000,%r12
15146+ .endm
15147+#endif
15148+#else
15149+ .macro pax_force_retaddr rip=0, reload=0
15150+ .endm
15151+ .macro pax_force_fptr ptr
15152+ .endm
15153+ .macro pax_force_retaddr_bts rip=0
15154+ .endm
15155+ .macro pax_set_fptr_mask
15156+ .endm
15157+#endif
15158+
15159 .macro altinstruction_entry orig alt feature orig_len alt_len pad_len
15160 .long \orig - .
15161 .long \alt - .
15162@@ -38,7 +77,7 @@
15163 altinstruction_entry 140b,143f,\feature,142b-140b,144f-143f,142b-141b
15164 .popsection
15165
15166- .pushsection .altinstr_replacement,"ax"
15167+ .pushsection .altinstr_replacement,"a"
15168 143:
15169 \newinstr
15170 144:
15171@@ -68,7 +107,7 @@
15172 altinstruction_entry 140b,144f,\feature2,142b-140b,145f-144f,142b-141b
15173 .popsection
15174
15175- .pushsection .altinstr_replacement,"ax"
15176+ .pushsection .altinstr_replacement,"a"
15177 143:
15178 \newinstr1
15179 144:
15180diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15181index ba32af0..ff42fc0 100644
15182--- a/arch/x86/include/asm/alternative.h
15183+++ b/arch/x86/include/asm/alternative.h
15184@@ -130,7 +130,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15185 ".pushsection .altinstructions,\"a\"\n" \
15186 ALTINSTR_ENTRY(feature, 1) \
15187 ".popsection\n" \
15188- ".pushsection .altinstr_replacement, \"ax\"\n" \
15189+ ".pushsection .altinstr_replacement, \"a\"\n" \
15190 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15191 ".popsection"
15192
15193@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15194 ALTINSTR_ENTRY(feature1, 1) \
15195 ALTINSTR_ENTRY(feature2, 2) \
15196 ".popsection\n" \
15197- ".pushsection .altinstr_replacement, \"ax\"\n" \
15198+ ".pushsection .altinstr_replacement, \"a\"\n" \
15199 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15200 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15201 ".popsection"
15202diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15203index 976b86a..f3bc83a 100644
15204--- a/arch/x86/include/asm/apic.h
15205+++ b/arch/x86/include/asm/apic.h
15206@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15207
15208 #ifdef CONFIG_X86_LOCAL_APIC
15209
15210-extern unsigned int apic_verbosity;
15211+extern int apic_verbosity;
15212 extern int local_apic_timer_c2_ok;
15213
15214 extern int disable_apic;
15215diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15216index 20370c6..a2eb9b0 100644
15217--- a/arch/x86/include/asm/apm.h
15218+++ b/arch/x86/include/asm/apm.h
15219@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15220 __asm__ __volatile__(APM_DO_ZERO_SEGS
15221 "pushl %%edi\n\t"
15222 "pushl %%ebp\n\t"
15223- "lcall *%%cs:apm_bios_entry\n\t"
15224+ "lcall *%%ss:apm_bios_entry\n\t"
15225 "setc %%al\n\t"
15226 "popl %%ebp\n\t"
15227 "popl %%edi\n\t"
15228@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15229 __asm__ __volatile__(APM_DO_ZERO_SEGS
15230 "pushl %%edi\n\t"
15231 "pushl %%ebp\n\t"
15232- "lcall *%%cs:apm_bios_entry\n\t"
15233+ "lcall *%%ss:apm_bios_entry\n\t"
15234 "setc %%bl\n\t"
15235 "popl %%ebp\n\t"
15236 "popl %%edi\n\t"
15237diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15238index 5e5cd12..51cdc93 100644
15239--- a/arch/x86/include/asm/atomic.h
15240+++ b/arch/x86/include/asm/atomic.h
15241@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15242 }
15243
15244 /**
15245+ * atomic_read_unchecked - read atomic variable
15246+ * @v: pointer of type atomic_unchecked_t
15247+ *
15248+ * Atomically reads the value of @v.
15249+ */
15250+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15251+{
15252+ return ACCESS_ONCE((v)->counter);
15253+}
15254+
15255+/**
15256 * atomic_set - set atomic variable
15257 * @v: pointer of type atomic_t
15258 * @i: required value
15259@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15260 }
15261
15262 /**
15263+ * atomic_set_unchecked - set atomic variable
15264+ * @v: pointer of type atomic_unchecked_t
15265+ * @i: required value
15266+ *
15267+ * Atomically sets the value of @v to @i.
15268+ */
15269+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15270+{
15271+ v->counter = i;
15272+}
15273+
15274+/**
15275 * atomic_add - add integer to atomic variable
15276 * @i: integer value to add
15277 * @v: pointer of type atomic_t
15278@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15279 */
15280 static inline void atomic_add(int i, atomic_t *v)
15281 {
15282- asm volatile(LOCK_PREFIX "addl %1,%0"
15283+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15284+
15285+#ifdef CONFIG_PAX_REFCOUNT
15286+ "jno 0f\n"
15287+ LOCK_PREFIX "subl %1,%0\n"
15288+ "int $4\n0:\n"
15289+ _ASM_EXTABLE(0b, 0b)
15290+#endif
15291+
15292+ : "+m" (v->counter)
15293+ : "ir" (i));
15294+}
15295+
15296+/**
15297+ * atomic_add_unchecked - add integer to atomic variable
15298+ * @i: integer value to add
15299+ * @v: pointer of type atomic_unchecked_t
15300+ *
15301+ * Atomically adds @i to @v.
15302+ */
15303+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15304+{
15305+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15306 : "+m" (v->counter)
15307 : "ir" (i));
15308 }
15309@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15310 */
15311 static inline void atomic_sub(int i, atomic_t *v)
15312 {
15313- asm volatile(LOCK_PREFIX "subl %1,%0"
15314+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15315+
15316+#ifdef CONFIG_PAX_REFCOUNT
15317+ "jno 0f\n"
15318+ LOCK_PREFIX "addl %1,%0\n"
15319+ "int $4\n0:\n"
15320+ _ASM_EXTABLE(0b, 0b)
15321+#endif
15322+
15323+ : "+m" (v->counter)
15324+ : "ir" (i));
15325+}
15326+
15327+/**
15328+ * atomic_sub_unchecked - subtract integer from atomic variable
15329+ * @i: integer value to subtract
15330+ * @v: pointer of type atomic_unchecked_t
15331+ *
15332+ * Atomically subtracts @i from @v.
15333+ */
15334+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15335+{
15336+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15337 : "+m" (v->counter)
15338 : "ir" (i));
15339 }
15340@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15341 */
15342 static inline int atomic_sub_and_test(int i, atomic_t *v)
15343 {
15344- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15345+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15346 }
15347
15348 /**
15349@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15350 */
15351 static inline void atomic_inc(atomic_t *v)
15352 {
15353- asm volatile(LOCK_PREFIX "incl %0"
15354+ asm volatile(LOCK_PREFIX "incl %0\n"
15355+
15356+#ifdef CONFIG_PAX_REFCOUNT
15357+ "jno 0f\n"
15358+ LOCK_PREFIX "decl %0\n"
15359+ "int $4\n0:\n"
15360+ _ASM_EXTABLE(0b, 0b)
15361+#endif
15362+
15363+ : "+m" (v->counter));
15364+}
15365+
15366+/**
15367+ * atomic_inc_unchecked - increment atomic variable
15368+ * @v: pointer of type atomic_unchecked_t
15369+ *
15370+ * Atomically increments @v by 1.
15371+ */
15372+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15373+{
15374+ asm volatile(LOCK_PREFIX "incl %0\n"
15375 : "+m" (v->counter));
15376 }
15377
15378@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15379 */
15380 static inline void atomic_dec(atomic_t *v)
15381 {
15382- asm volatile(LOCK_PREFIX "decl %0"
15383+ asm volatile(LOCK_PREFIX "decl %0\n"
15384+
15385+#ifdef CONFIG_PAX_REFCOUNT
15386+ "jno 0f\n"
15387+ LOCK_PREFIX "incl %0\n"
15388+ "int $4\n0:\n"
15389+ _ASM_EXTABLE(0b, 0b)
15390+#endif
15391+
15392+ : "+m" (v->counter));
15393+}
15394+
15395+/**
15396+ * atomic_dec_unchecked - decrement atomic variable
15397+ * @v: pointer of type atomic_unchecked_t
15398+ *
15399+ * Atomically decrements @v by 1.
15400+ */
15401+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15402+{
15403+ asm volatile(LOCK_PREFIX "decl %0\n"
15404 : "+m" (v->counter));
15405 }
15406
15407@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15408 */
15409 static inline int atomic_dec_and_test(atomic_t *v)
15410 {
15411- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15412+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15413 }
15414
15415 /**
15416@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15417 */
15418 static inline int atomic_inc_and_test(atomic_t *v)
15419 {
15420- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15421+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15422+}
15423+
15424+/**
15425+ * atomic_inc_and_test_unchecked - increment and test
15426+ * @v: pointer of type atomic_unchecked_t
15427+ *
15428+ * Atomically increments @v by 1
15429+ * and returns true if the result is zero, or false for all
15430+ * other cases.
15431+ */
15432+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15433+{
15434+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15435 }
15436
15437 /**
15438@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15439 */
15440 static inline int atomic_add_negative(int i, atomic_t *v)
15441 {
15442- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15443+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15444 }
15445
15446 /**
15447@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15448 *
15449 * Atomically adds @i to @v and returns @i + @v
15450 */
15451-static inline int atomic_add_return(int i, atomic_t *v)
15452+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15453+{
15454+ return i + xadd_check_overflow(&v->counter, i);
15455+}
15456+
15457+/**
15458+ * atomic_add_return_unchecked - add integer and return
15459+ * @i: integer value to add
15460+ * @v: pointer of type atomic_unchecked_t
15461+ *
15462+ * Atomically adds @i to @v and returns @i + @v
15463+ */
15464+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15465 {
15466 return i + xadd(&v->counter, i);
15467 }
15468@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15469 *
15470 * Atomically subtracts @i from @v and returns @v - @i
15471 */
15472-static inline int atomic_sub_return(int i, atomic_t *v)
15473+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15474 {
15475 return atomic_add_return(-i, v);
15476 }
15477
15478 #define atomic_inc_return(v) (atomic_add_return(1, v))
15479+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15480+{
15481+ return atomic_add_return_unchecked(1, v);
15482+}
15483 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15484
15485-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15486+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15487+{
15488+ return cmpxchg(&v->counter, old, new);
15489+}
15490+
15491+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15492 {
15493 return cmpxchg(&v->counter, old, new);
15494 }
15495@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15496 return xchg(&v->counter, new);
15497 }
15498
15499+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15500+{
15501+ return xchg(&v->counter, new);
15502+}
15503+
15504 /**
15505 * __atomic_add_unless - add unless the number is already a given value
15506 * @v: pointer of type atomic_t
15507@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15508 */
15509 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15510 {
15511- int c, old;
15512+ int c, old, new;
15513 c = atomic_read(v);
15514 for (;;) {
15515- if (unlikely(c == (u)))
15516+ if (unlikely(c == u))
15517 break;
15518- old = atomic_cmpxchg((v), c, c + (a));
15519+
15520+ asm volatile("addl %2,%0\n"
15521+
15522+#ifdef CONFIG_PAX_REFCOUNT
15523+ "jno 0f\n"
15524+ "subl %2,%0\n"
15525+ "int $4\n0:\n"
15526+ _ASM_EXTABLE(0b, 0b)
15527+#endif
15528+
15529+ : "=r" (new)
15530+ : "0" (c), "ir" (a));
15531+
15532+ old = atomic_cmpxchg(v, c, new);
15533 if (likely(old == c))
15534 break;
15535 c = old;
15536@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15537 }
15538
15539 /**
15540+ * atomic_inc_not_zero_hint - increment if not null
15541+ * @v: pointer of type atomic_t
15542+ * @hint: probable value of the atomic before the increment
15543+ *
15544+ * This version of atomic_inc_not_zero() gives a hint of probable
15545+ * value of the atomic. This helps processor to not read the memory
15546+ * before doing the atomic read/modify/write cycle, lowering
15547+ * number of bus transactions on some arches.
15548+ *
15549+ * Returns: 0 if increment was not done, 1 otherwise.
15550+ */
15551+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15552+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15553+{
15554+ int val, c = hint, new;
15555+
15556+ /* sanity test, should be removed by compiler if hint is a constant */
15557+ if (!hint)
15558+ return __atomic_add_unless(v, 1, 0);
15559+
15560+ do {
15561+ asm volatile("incl %0\n"
15562+
15563+#ifdef CONFIG_PAX_REFCOUNT
15564+ "jno 0f\n"
15565+ "decl %0\n"
15566+ "int $4\n0:\n"
15567+ _ASM_EXTABLE(0b, 0b)
15568+#endif
15569+
15570+ : "=r" (new)
15571+ : "0" (c));
15572+
15573+ val = atomic_cmpxchg(v, c, new);
15574+ if (val == c)
15575+ return 1;
15576+ c = val;
15577+ } while (c);
15578+
15579+ return 0;
15580+}
15581+
15582+/**
15583 * atomic_inc_short - increment of a short integer
15584 * @v: pointer to type int
15585 *
15586@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15587 }
15588
15589 /* These are x86-specific, used by some header files */
15590-#define atomic_clear_mask(mask, addr) \
15591- asm volatile(LOCK_PREFIX "andl %0,%1" \
15592- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15593+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15594+{
15595+ asm volatile(LOCK_PREFIX "andl %1,%0"
15596+ : "+m" (v->counter)
15597+ : "r" (~(mask))
15598+ : "memory");
15599+}
15600
15601-#define atomic_set_mask(mask, addr) \
15602- asm volatile(LOCK_PREFIX "orl %0,%1" \
15603- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15604- : "memory")
15605+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15606+{
15607+ asm volatile(LOCK_PREFIX "andl %1,%0"
15608+ : "+m" (v->counter)
15609+ : "r" (~(mask))
15610+ : "memory");
15611+}
15612+
15613+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15614+{
15615+ asm volatile(LOCK_PREFIX "orl %1,%0"
15616+ : "+m" (v->counter)
15617+ : "r" (mask)
15618+ : "memory");
15619+}
15620+
15621+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15622+{
15623+ asm volatile(LOCK_PREFIX "orl %1,%0"
15624+ : "+m" (v->counter)
15625+ : "r" (mask)
15626+ : "memory");
15627+}
15628
15629 #ifdef CONFIG_X86_32
15630 # include <asm/atomic64_32.h>
15631diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15632index b154de7..bf18a5a 100644
15633--- a/arch/x86/include/asm/atomic64_32.h
15634+++ b/arch/x86/include/asm/atomic64_32.h
15635@@ -12,6 +12,14 @@ typedef struct {
15636 u64 __aligned(8) counter;
15637 } atomic64_t;
15638
15639+#ifdef CONFIG_PAX_REFCOUNT
15640+typedef struct {
15641+ u64 __aligned(8) counter;
15642+} atomic64_unchecked_t;
15643+#else
15644+typedef atomic64_t atomic64_unchecked_t;
15645+#endif
15646+
15647 #define ATOMIC64_INIT(val) { (val) }
15648
15649 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15650@@ -37,21 +45,31 @@ typedef struct {
15651 ATOMIC64_DECL_ONE(sym##_386)
15652
15653 ATOMIC64_DECL_ONE(add_386);
15654+ATOMIC64_DECL_ONE(add_unchecked_386);
15655 ATOMIC64_DECL_ONE(sub_386);
15656+ATOMIC64_DECL_ONE(sub_unchecked_386);
15657 ATOMIC64_DECL_ONE(inc_386);
15658+ATOMIC64_DECL_ONE(inc_unchecked_386);
15659 ATOMIC64_DECL_ONE(dec_386);
15660+ATOMIC64_DECL_ONE(dec_unchecked_386);
15661 #endif
15662
15663 #define alternative_atomic64(f, out, in...) \
15664 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15665
15666 ATOMIC64_DECL(read);
15667+ATOMIC64_DECL(read_unchecked);
15668 ATOMIC64_DECL(set);
15669+ATOMIC64_DECL(set_unchecked);
15670 ATOMIC64_DECL(xchg);
15671 ATOMIC64_DECL(add_return);
15672+ATOMIC64_DECL(add_return_unchecked);
15673 ATOMIC64_DECL(sub_return);
15674+ATOMIC64_DECL(sub_return_unchecked);
15675 ATOMIC64_DECL(inc_return);
15676+ATOMIC64_DECL(inc_return_unchecked);
15677 ATOMIC64_DECL(dec_return);
15678+ATOMIC64_DECL(dec_return_unchecked);
15679 ATOMIC64_DECL(dec_if_positive);
15680 ATOMIC64_DECL(inc_not_zero);
15681 ATOMIC64_DECL(add_unless);
15682@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15683 }
15684
15685 /**
15686+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15687+ * @p: pointer to type atomic64_unchecked_t
15688+ * @o: expected value
15689+ * @n: new value
15690+ *
15691+ * Atomically sets @v to @n if it was equal to @o and returns
15692+ * the old value.
15693+ */
15694+
15695+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15696+{
15697+ return cmpxchg64(&v->counter, o, n);
15698+}
15699+
15700+/**
15701 * atomic64_xchg - xchg atomic64 variable
15702 * @v: pointer to type atomic64_t
15703 * @n: value to assign
15704@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15705 }
15706
15707 /**
15708+ * atomic64_set_unchecked - set atomic64 variable
15709+ * @v: pointer to type atomic64_unchecked_t
15710+ * @n: value to assign
15711+ *
15712+ * Atomically sets the value of @v to @n.
15713+ */
15714+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15715+{
15716+ unsigned high = (unsigned)(i >> 32);
15717+ unsigned low = (unsigned)i;
15718+ alternative_atomic64(set, /* no output */,
15719+ "S" (v), "b" (low), "c" (high)
15720+ : "eax", "edx", "memory");
15721+}
15722+
15723+/**
15724 * atomic64_read - read atomic64 variable
15725 * @v: pointer to type atomic64_t
15726 *
15727@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15728 }
15729
15730 /**
15731+ * atomic64_read_unchecked - read atomic64 variable
15732+ * @v: pointer to type atomic64_unchecked_t
15733+ *
15734+ * Atomically reads the value of @v and returns it.
15735+ */
15736+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15737+{
15738+ long long r;
15739+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15740+ return r;
15741+ }
15742+
15743+/**
15744 * atomic64_add_return - add and return
15745 * @i: integer value to add
15746 * @v: pointer to type atomic64_t
15747@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15748 return i;
15749 }
15750
15751+/**
15752+ * atomic64_add_return_unchecked - add and return
15753+ * @i: integer value to add
15754+ * @v: pointer to type atomic64_unchecked_t
15755+ *
15756+ * Atomically adds @i to @v and returns @i + *@v
15757+ */
15758+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15759+{
15760+ alternative_atomic64(add_return_unchecked,
15761+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15762+ ASM_NO_INPUT_CLOBBER("memory"));
15763+ return i;
15764+}
15765+
15766 /*
15767 * Other variants with different arithmetic operators:
15768 */
15769@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15770 return a;
15771 }
15772
15773+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15774+{
15775+ long long a;
15776+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15777+ "S" (v) : "memory", "ecx");
15778+ return a;
15779+}
15780+
15781 static inline long long atomic64_dec_return(atomic64_t *v)
15782 {
15783 long long a;
15784@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15785 }
15786
15787 /**
15788+ * atomic64_add_unchecked - add integer to atomic64 variable
15789+ * @i: integer value to add
15790+ * @v: pointer to type atomic64_unchecked_t
15791+ *
15792+ * Atomically adds @i to @v.
15793+ */
15794+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15795+{
15796+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15797+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15798+ ASM_NO_INPUT_CLOBBER("memory"));
15799+ return i;
15800+}
15801+
15802+/**
15803 * atomic64_sub - subtract the atomic64 variable
15804 * @i: integer value to subtract
15805 * @v: pointer to type atomic64_t
15806diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15807index f8d273e..02f39f3 100644
15808--- a/arch/x86/include/asm/atomic64_64.h
15809+++ b/arch/x86/include/asm/atomic64_64.h
15810@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15811 }
15812
15813 /**
15814+ * atomic64_read_unchecked - read atomic64 variable
15815+ * @v: pointer of type atomic64_unchecked_t
15816+ *
15817+ * Atomically reads the value of @v.
15818+ * Doesn't imply a read memory barrier.
15819+ */
15820+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15821+{
15822+ return ACCESS_ONCE((v)->counter);
15823+}
15824+
15825+/**
15826 * atomic64_set - set atomic64 variable
15827 * @v: pointer to type atomic64_t
15828 * @i: required value
15829@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15830 }
15831
15832 /**
15833+ * atomic64_set_unchecked - set atomic64 variable
15834+ * @v: pointer to type atomic64_unchecked_t
15835+ * @i: required value
15836+ *
15837+ * Atomically sets the value of @v to @i.
15838+ */
15839+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15840+{
15841+ v->counter = i;
15842+}
15843+
15844+/**
15845 * atomic64_add - add integer to atomic64 variable
15846 * @i: integer value to add
15847 * @v: pointer to type atomic64_t
15848@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15849 */
15850 static inline void atomic64_add(long i, atomic64_t *v)
15851 {
15852+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15853+
15854+#ifdef CONFIG_PAX_REFCOUNT
15855+ "jno 0f\n"
15856+ LOCK_PREFIX "subq %1,%0\n"
15857+ "int $4\n0:\n"
15858+ _ASM_EXTABLE(0b, 0b)
15859+#endif
15860+
15861+ : "=m" (v->counter)
15862+ : "er" (i), "m" (v->counter));
15863+}
15864+
15865+/**
15866+ * atomic64_add_unchecked - add integer to atomic64 variable
15867+ * @i: integer value to add
15868+ * @v: pointer to type atomic64_unchecked_t
15869+ *
15870+ * Atomically adds @i to @v.
15871+ */
15872+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15873+{
15874 asm volatile(LOCK_PREFIX "addq %1,%0"
15875 : "=m" (v->counter)
15876 : "er" (i), "m" (v->counter));
15877@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15878 */
15879 static inline void atomic64_sub(long i, atomic64_t *v)
15880 {
15881- asm volatile(LOCK_PREFIX "subq %1,%0"
15882+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15883+
15884+#ifdef CONFIG_PAX_REFCOUNT
15885+ "jno 0f\n"
15886+ LOCK_PREFIX "addq %1,%0\n"
15887+ "int $4\n0:\n"
15888+ _ASM_EXTABLE(0b, 0b)
15889+#endif
15890+
15891+ : "=m" (v->counter)
15892+ : "er" (i), "m" (v->counter));
15893+}
15894+
15895+/**
15896+ * atomic64_sub_unchecked - subtract the atomic64 variable
15897+ * @i: integer value to subtract
15898+ * @v: pointer to type atomic64_unchecked_t
15899+ *
15900+ * Atomically subtracts @i from @v.
15901+ */
15902+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15903+{
15904+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15905 : "=m" (v->counter)
15906 : "er" (i), "m" (v->counter));
15907 }
15908@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15909 */
15910 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15911 {
15912- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15913+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15914 }
15915
15916 /**
15917@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15918 */
15919 static inline void atomic64_inc(atomic64_t *v)
15920 {
15921+ asm volatile(LOCK_PREFIX "incq %0\n"
15922+
15923+#ifdef CONFIG_PAX_REFCOUNT
15924+ "jno 0f\n"
15925+ LOCK_PREFIX "decq %0\n"
15926+ "int $4\n0:\n"
15927+ _ASM_EXTABLE(0b, 0b)
15928+#endif
15929+
15930+ : "=m" (v->counter)
15931+ : "m" (v->counter));
15932+}
15933+
15934+/**
15935+ * atomic64_inc_unchecked - increment atomic64 variable
15936+ * @v: pointer to type atomic64_unchecked_t
15937+ *
15938+ * Atomically increments @v by 1.
15939+ */
15940+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15941+{
15942 asm volatile(LOCK_PREFIX "incq %0"
15943 : "=m" (v->counter)
15944 : "m" (v->counter));
15945@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15946 */
15947 static inline void atomic64_dec(atomic64_t *v)
15948 {
15949- asm volatile(LOCK_PREFIX "decq %0"
15950+ asm volatile(LOCK_PREFIX "decq %0\n"
15951+
15952+#ifdef CONFIG_PAX_REFCOUNT
15953+ "jno 0f\n"
15954+ LOCK_PREFIX "incq %0\n"
15955+ "int $4\n0:\n"
15956+ _ASM_EXTABLE(0b, 0b)
15957+#endif
15958+
15959+ : "=m" (v->counter)
15960+ : "m" (v->counter));
15961+}
15962+
15963+/**
15964+ * atomic64_dec_unchecked - decrement atomic64 variable
15965+ * @v: pointer to type atomic64_t
15966+ *
15967+ * Atomically decrements @v by 1.
15968+ */
15969+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15970+{
15971+ asm volatile(LOCK_PREFIX "decq %0\n"
15972 : "=m" (v->counter)
15973 : "m" (v->counter));
15974 }
15975@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15976 */
15977 static inline int atomic64_dec_and_test(atomic64_t *v)
15978 {
15979- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15980+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15981 }
15982
15983 /**
15984@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15985 */
15986 static inline int atomic64_inc_and_test(atomic64_t *v)
15987 {
15988- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15989+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15990 }
15991
15992 /**
15993@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15994 */
15995 static inline int atomic64_add_negative(long i, atomic64_t *v)
15996 {
15997- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15998+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15999 }
16000
16001 /**
16002@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
16003 */
16004 static inline long atomic64_add_return(long i, atomic64_t *v)
16005 {
16006+ return i + xadd_check_overflow(&v->counter, i);
16007+}
16008+
16009+/**
16010+ * atomic64_add_return_unchecked - add and return
16011+ * @i: integer value to add
16012+ * @v: pointer to type atomic64_unchecked_t
16013+ *
16014+ * Atomically adds @i to @v and returns @i + @v
16015+ */
16016+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
16017+{
16018 return i + xadd(&v->counter, i);
16019 }
16020
16021@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
16022 }
16023
16024 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
16025+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
16026+{
16027+ return atomic64_add_return_unchecked(1, v);
16028+}
16029 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
16030
16031 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16032@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
16033 return cmpxchg(&v->counter, old, new);
16034 }
16035
16036+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
16037+{
16038+ return cmpxchg(&v->counter, old, new);
16039+}
16040+
16041 static inline long atomic64_xchg(atomic64_t *v, long new)
16042 {
16043 return xchg(&v->counter, new);
16044@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
16045 */
16046 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
16047 {
16048- long c, old;
16049+ long c, old, new;
16050 c = atomic64_read(v);
16051 for (;;) {
16052- if (unlikely(c == (u)))
16053+ if (unlikely(c == u))
16054 break;
16055- old = atomic64_cmpxchg((v), c, c + (a));
16056+
16057+ asm volatile("add %2,%0\n"
16058+
16059+#ifdef CONFIG_PAX_REFCOUNT
16060+ "jno 0f\n"
16061+ "sub %2,%0\n"
16062+ "int $4\n0:\n"
16063+ _ASM_EXTABLE(0b, 0b)
16064+#endif
16065+
16066+ : "=r" (new)
16067+ : "0" (c), "ir" (a));
16068+
16069+ old = atomic64_cmpxchg(v, c, new);
16070 if (likely(old == c))
16071 break;
16072 c = old;
16073 }
16074- return c != (u);
16075+ return c != u;
16076 }
16077
16078 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16079diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16080index 959e45b..6ea9bf6 100644
16081--- a/arch/x86/include/asm/barrier.h
16082+++ b/arch/x86/include/asm/barrier.h
16083@@ -57,7 +57,7 @@
16084 do { \
16085 compiletime_assert_atomic_type(*p); \
16086 smp_mb(); \
16087- ACCESS_ONCE(*p) = (v); \
16088+ ACCESS_ONCE_RW(*p) = (v); \
16089 } while (0)
16090
16091 #define smp_load_acquire(p) \
16092@@ -74,7 +74,7 @@ do { \
16093 do { \
16094 compiletime_assert_atomic_type(*p); \
16095 barrier(); \
16096- ACCESS_ONCE(*p) = (v); \
16097+ ACCESS_ONCE_RW(*p) = (v); \
16098 } while (0)
16099
16100 #define smp_load_acquire(p) \
16101diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16102index cfe3b95..d01b118 100644
16103--- a/arch/x86/include/asm/bitops.h
16104+++ b/arch/x86/include/asm/bitops.h
16105@@ -50,7 +50,7 @@
16106 * a mask operation on a byte.
16107 */
16108 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16109-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16110+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16111 #define CONST_MASK(nr) (1 << ((nr) & 7))
16112
16113 /**
16114@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16115 */
16116 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16117 {
16118- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16119+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16120 }
16121
16122 /**
16123@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16124 */
16125 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16126 {
16127- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16128+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16129 }
16130
16131 /**
16132@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16133 */
16134 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16135 {
16136- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16137+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16138 }
16139
16140 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16141@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16142 *
16143 * Undefined if no bit exists, so code should check against 0 first.
16144 */
16145-static inline unsigned long __ffs(unsigned long word)
16146+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16147 {
16148 asm("rep; bsf %1,%0"
16149 : "=r" (word)
16150@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16151 *
16152 * Undefined if no zero exists, so code should check against ~0UL first.
16153 */
16154-static inline unsigned long ffz(unsigned long word)
16155+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16156 {
16157 asm("rep; bsf %1,%0"
16158 : "=r" (word)
16159@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16160 *
16161 * Undefined if no set bit exists, so code should check against 0 first.
16162 */
16163-static inline unsigned long __fls(unsigned long word)
16164+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16165 {
16166 asm("bsr %1,%0"
16167 : "=r" (word)
16168@@ -434,7 +434,7 @@ static inline int ffs(int x)
16169 * set bit if value is nonzero. The last (most significant) bit is
16170 * at position 32.
16171 */
16172-static inline int fls(int x)
16173+static inline int __intentional_overflow(-1) fls(int x)
16174 {
16175 int r;
16176
16177@@ -476,7 +476,7 @@ static inline int fls(int x)
16178 * at position 64.
16179 */
16180 #ifdef CONFIG_X86_64
16181-static __always_inline int fls64(__u64 x)
16182+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16183 {
16184 int bitpos = -1;
16185 /*
16186diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16187index 4fa687a..60f2d39 100644
16188--- a/arch/x86/include/asm/boot.h
16189+++ b/arch/x86/include/asm/boot.h
16190@@ -6,10 +6,15 @@
16191 #include <uapi/asm/boot.h>
16192
16193 /* Physical address where kernel should be loaded. */
16194-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16195+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16196 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16197 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16198
16199+#ifndef __ASSEMBLY__
16200+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16201+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16202+#endif
16203+
16204 /* Minimum kernel alignment, as a power of two */
16205 #ifdef CONFIG_X86_64
16206 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16207diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16208index 48f99f1..d78ebf9 100644
16209--- a/arch/x86/include/asm/cache.h
16210+++ b/arch/x86/include/asm/cache.h
16211@@ -5,12 +5,13 @@
16212
16213 /* L1 cache line size */
16214 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16215-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16216+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16217
16218 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16219+#define __read_only __attribute__((__section__(".data..read_only")))
16220
16221 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16222-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16223+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16224
16225 #ifdef CONFIG_X86_VSMP
16226 #ifdef CONFIG_SMP
16227diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16228index 1c8b50e..166bcaa 100644
16229--- a/arch/x86/include/asm/calling.h
16230+++ b/arch/x86/include/asm/calling.h
16231@@ -96,23 +96,26 @@ For 32-bit we have the following conventions - kernel is built with
16232 .endm
16233
16234 .macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1
16235+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16236+ movq_cfi r12, R12+\offset
16237+#endif
16238 .if \r11
16239- movq_cfi r11, 6*8+\offset
16240+ movq_cfi r11, R11+\offset
16241 .endif
16242 .if \r8910
16243- movq_cfi r10, 7*8+\offset
16244- movq_cfi r9, 8*8+\offset
16245- movq_cfi r8, 9*8+\offset
16246+ movq_cfi r10, R10+\offset
16247+ movq_cfi r9, R9+\offset
16248+ movq_cfi r8, R8+\offset
16249 .endif
16250 .if \rax
16251- movq_cfi rax, 10*8+\offset
16252+ movq_cfi rax, RAX+\offset
16253 .endif
16254 .if \rcx
16255- movq_cfi rcx, 11*8+\offset
16256+ movq_cfi rcx, RCX+\offset
16257 .endif
16258- movq_cfi rdx, 12*8+\offset
16259- movq_cfi rsi, 13*8+\offset
16260- movq_cfi rdi, 14*8+\offset
16261+ movq_cfi rdx, RDX+\offset
16262+ movq_cfi rsi, RSI+\offset
16263+ movq_cfi rdi, RDI+\offset
16264 .endm
16265 .macro SAVE_C_REGS offset=0
16266 SAVE_C_REGS_HELPER \offset, 1, 1, 1, 1
16267@@ -131,76 +134,87 @@ For 32-bit we have the following conventions - kernel is built with
16268 .endm
16269
16270 .macro SAVE_EXTRA_REGS offset=0
16271- movq_cfi r15, 0*8+\offset
16272- movq_cfi r14, 1*8+\offset
16273- movq_cfi r13, 2*8+\offset
16274- movq_cfi r12, 3*8+\offset
16275- movq_cfi rbp, 4*8+\offset
16276- movq_cfi rbx, 5*8+\offset
16277+ movq_cfi r15, R15+\offset
16278+ movq_cfi r14, R14+\offset
16279+ movq_cfi r13, R13+\offset
16280+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16281+ movq_cfi r12, R12+\offset
16282+#endif
16283+ movq_cfi rbp, RBP+\offset
16284+ movq_cfi rbx, RBX+\offset
16285 .endm
16286 .macro SAVE_EXTRA_REGS_RBP offset=0
16287- movq_cfi rbp, 4*8+\offset
16288+ movq_cfi rbp, RBP+\offset
16289 .endm
16290
16291 .macro RESTORE_EXTRA_REGS offset=0
16292- movq_cfi_restore 0*8+\offset, r15
16293- movq_cfi_restore 1*8+\offset, r14
16294- movq_cfi_restore 2*8+\offset, r13
16295- movq_cfi_restore 3*8+\offset, r12
16296- movq_cfi_restore 4*8+\offset, rbp
16297- movq_cfi_restore 5*8+\offset, rbx
16298+ movq_cfi_restore R15+\offset, r15
16299+ movq_cfi_restore R14+\offset, r14
16300+ movq_cfi_restore R13+\offset, r13
16301+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16302+ movq_cfi_restore R12+\offset, r12
16303+#endif
16304+ movq_cfi_restore RBP+\offset, rbp
16305+ movq_cfi_restore RBX+\offset, rbx
16306 .endm
16307
16308 .macro ZERO_EXTRA_REGS
16309 xorl %r15d, %r15d
16310 xorl %r14d, %r14d
16311 xorl %r13d, %r13d
16312+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16313 xorl %r12d, %r12d
16314+#endif
16315 xorl %ebp, %ebp
16316 xorl %ebx, %ebx
16317 .endm
16318
16319- .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1
16320+ .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1, rstor_r12=1
16321+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16322+ .if \rstor_r12
16323+ movq_cfi_restore R12, r12
16324+ .endif
16325+#endif
16326 .if \rstor_r11
16327- movq_cfi_restore 6*8, r11
16328+ movq_cfi_restore R11, r11
16329 .endif
16330 .if \rstor_r8910
16331- movq_cfi_restore 7*8, r10
16332- movq_cfi_restore 8*8, r9
16333- movq_cfi_restore 9*8, r8
16334+ movq_cfi_restore R10, r10
16335+ movq_cfi_restore R9, r9
16336+ movq_cfi_restore R8, r8
16337 .endif
16338 .if \rstor_rax
16339- movq_cfi_restore 10*8, rax
16340+ movq_cfi_restore RAX, rax
16341 .endif
16342 .if \rstor_rcx
16343- movq_cfi_restore 11*8, rcx
16344+ movq_cfi_restore RCX, rcx
16345 .endif
16346 .if \rstor_rdx
16347- movq_cfi_restore 12*8, rdx
16348+ movq_cfi_restore RDX, rdx
16349 .endif
16350- movq_cfi_restore 13*8, rsi
16351- movq_cfi_restore 14*8, rdi
16352+ movq_cfi_restore RSI, rsi
16353+ movq_cfi_restore RDI, rdi
16354 .endm
16355 .macro RESTORE_C_REGS
16356- RESTORE_C_REGS_HELPER 1,1,1,1,1
16357+ RESTORE_C_REGS_HELPER 1,1,1,1,1,1
16358 .endm
16359 .macro RESTORE_C_REGS_EXCEPT_RAX
16360- RESTORE_C_REGS_HELPER 0,1,1,1,1
16361+ RESTORE_C_REGS_HELPER 0,1,1,1,1,0
16362 .endm
16363 .macro RESTORE_C_REGS_EXCEPT_RCX
16364- RESTORE_C_REGS_HELPER 1,0,1,1,1
16365+ RESTORE_C_REGS_HELPER 1,0,1,1,1,0
16366 .endm
16367 .macro RESTORE_C_REGS_EXCEPT_R11
16368- RESTORE_C_REGS_HELPER 1,1,0,1,1
16369+ RESTORE_C_REGS_HELPER 1,1,0,1,1,1
16370 .endm
16371 .macro RESTORE_C_REGS_EXCEPT_RCX_R11
16372- RESTORE_C_REGS_HELPER 1,0,0,1,1
16373+ RESTORE_C_REGS_HELPER 1,0,0,1,1,1
16374 .endm
16375 .macro RESTORE_RSI_RDI
16376- RESTORE_C_REGS_HELPER 0,0,0,0,0
16377+ RESTORE_C_REGS_HELPER 0,0,0,0,0,1
16378 .endm
16379 .macro RESTORE_RSI_RDI_RDX
16380- RESTORE_C_REGS_HELPER 0,0,0,0,1
16381+ RESTORE_C_REGS_HELPER 0,0,0,0,1,1
16382 .endm
16383
16384 .macro REMOVE_PT_GPREGS_FROM_STACK addskip=0
16385diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16386index f50de69..2b0a458 100644
16387--- a/arch/x86/include/asm/checksum_32.h
16388+++ b/arch/x86/include/asm/checksum_32.h
16389@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16390 int len, __wsum sum,
16391 int *src_err_ptr, int *dst_err_ptr);
16392
16393+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16394+ int len, __wsum sum,
16395+ int *src_err_ptr, int *dst_err_ptr);
16396+
16397+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16398+ int len, __wsum sum,
16399+ int *src_err_ptr, int *dst_err_ptr);
16400+
16401 /*
16402 * Note: when you get a NULL pointer exception here this means someone
16403 * passed in an incorrect kernel address to one of these functions.
16404@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16405
16406 might_sleep();
16407 stac();
16408- ret = csum_partial_copy_generic((__force void *)src, dst,
16409+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16410 len, sum, err_ptr, NULL);
16411 clac();
16412
16413@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16414 might_sleep();
16415 if (access_ok(VERIFY_WRITE, dst, len)) {
16416 stac();
16417- ret = csum_partial_copy_generic(src, (__force void *)dst,
16418+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16419 len, sum, NULL, err_ptr);
16420 clac();
16421 return ret;
16422diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16423index 99c105d7..2f667ac 100644
16424--- a/arch/x86/include/asm/cmpxchg.h
16425+++ b/arch/x86/include/asm/cmpxchg.h
16426@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16427 __compiletime_error("Bad argument size for cmpxchg");
16428 extern void __xadd_wrong_size(void)
16429 __compiletime_error("Bad argument size for xadd");
16430+extern void __xadd_check_overflow_wrong_size(void)
16431+ __compiletime_error("Bad argument size for xadd_check_overflow");
16432 extern void __add_wrong_size(void)
16433 __compiletime_error("Bad argument size for add");
16434+extern void __add_check_overflow_wrong_size(void)
16435+ __compiletime_error("Bad argument size for add_check_overflow");
16436
16437 /*
16438 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16439@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16440 __ret; \
16441 })
16442
16443+#ifdef CONFIG_PAX_REFCOUNT
16444+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16445+ ({ \
16446+ __typeof__ (*(ptr)) __ret = (arg); \
16447+ switch (sizeof(*(ptr))) { \
16448+ case __X86_CASE_L: \
16449+ asm volatile (lock #op "l %0, %1\n" \
16450+ "jno 0f\n" \
16451+ "mov %0,%1\n" \
16452+ "int $4\n0:\n" \
16453+ _ASM_EXTABLE(0b, 0b) \
16454+ : "+r" (__ret), "+m" (*(ptr)) \
16455+ : : "memory", "cc"); \
16456+ break; \
16457+ case __X86_CASE_Q: \
16458+ asm volatile (lock #op "q %q0, %1\n" \
16459+ "jno 0f\n" \
16460+ "mov %0,%1\n" \
16461+ "int $4\n0:\n" \
16462+ _ASM_EXTABLE(0b, 0b) \
16463+ : "+r" (__ret), "+m" (*(ptr)) \
16464+ : : "memory", "cc"); \
16465+ break; \
16466+ default: \
16467+ __ ## op ## _check_overflow_wrong_size(); \
16468+ } \
16469+ __ret; \
16470+ })
16471+#else
16472+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16473+#endif
16474+
16475 /*
16476 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16477 * Since this is generally used to protect other memory information, we
16478@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16479 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16480 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16481
16482+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16483+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16484+
16485 #define __add(ptr, inc, lock) \
16486 ({ \
16487 __typeof__ (*(ptr)) __ret = (inc); \
16488diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16489index acdee09..a553db3 100644
16490--- a/arch/x86/include/asm/compat.h
16491+++ b/arch/x86/include/asm/compat.h
16492@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16493 typedef u32 compat_uint_t;
16494 typedef u32 compat_ulong_t;
16495 typedef u64 __attribute__((aligned(4))) compat_u64;
16496-typedef u32 compat_uptr_t;
16497+typedef u32 __user compat_uptr_t;
16498
16499 struct compat_timespec {
16500 compat_time_t tv_sec;
16501diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16502index 3d6606f..91703f1 100644
16503--- a/arch/x86/include/asm/cpufeature.h
16504+++ b/arch/x86/include/asm/cpufeature.h
16505@@ -214,7 +214,7 @@
16506 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16507 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16508 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16509-
16510+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16511
16512 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16513 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16514@@ -222,7 +222,7 @@
16515 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16516 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16517 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16518-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16519+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16520 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16521 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16522 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16523@@ -401,6 +401,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16524 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16525 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16526 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16527+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16528
16529 #if __GNUC__ >= 4
16530 extern void warn_pre_alternatives(void);
16531@@ -454,7 +455,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16532
16533 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16534 t_warn:
16535- warn_pre_alternatives();
16536+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16537+ warn_pre_alternatives();
16538 return false;
16539 #endif
16540
16541@@ -475,7 +477,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16542 ".section .discard,\"aw\",@progbits\n"
16543 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16544 ".previous\n"
16545- ".section .altinstr_replacement,\"ax\"\n"
16546+ ".section .altinstr_replacement,\"a\"\n"
16547 "3: movb $1,%0\n"
16548 "4:\n"
16549 ".previous\n"
16550@@ -510,7 +512,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16551 " .byte 5f - 4f\n" /* repl len */
16552 " .byte 3b - 2b\n" /* pad len */
16553 ".previous\n"
16554- ".section .altinstr_replacement,\"ax\"\n"
16555+ ".section .altinstr_replacement,\"a\"\n"
16556 "4: jmp %l[t_no]\n"
16557 "5:\n"
16558 ".previous\n"
16559@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16560 ".section .discard,\"aw\",@progbits\n"
16561 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16562 ".previous\n"
16563- ".section .altinstr_replacement,\"ax\"\n"
16564+ ".section .altinstr_replacement,\"a\"\n"
16565 "3: movb $0,%0\n"
16566 "4:\n"
16567 ".previous\n"
16568@@ -560,7 +562,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16569 ".section .discard,\"aw\",@progbits\n"
16570 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16571 ".previous\n"
16572- ".section .altinstr_replacement,\"ax\"\n"
16573+ ".section .altinstr_replacement,\"a\"\n"
16574 "5: movb $1,%0\n"
16575 "6:\n"
16576 ".previous\n"
16577diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16578index a0bf89f..56f0b2a 100644
16579--- a/arch/x86/include/asm/desc.h
16580+++ b/arch/x86/include/asm/desc.h
16581@@ -4,6 +4,7 @@
16582 #include <asm/desc_defs.h>
16583 #include <asm/ldt.h>
16584 #include <asm/mmu.h>
16585+#include <asm/pgtable.h>
16586
16587 #include <linux/smp.h>
16588 #include <linux/percpu.h>
16589@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16590
16591 desc->type = (info->read_exec_only ^ 1) << 1;
16592 desc->type |= info->contents << 2;
16593+ desc->type |= info->seg_not_present ^ 1;
16594
16595 desc->s = 1;
16596 desc->dpl = 0x3;
16597@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16598 }
16599
16600 extern struct desc_ptr idt_descr;
16601-extern gate_desc idt_table[];
16602-extern struct desc_ptr debug_idt_descr;
16603-extern gate_desc debug_idt_table[];
16604-
16605-struct gdt_page {
16606- struct desc_struct gdt[GDT_ENTRIES];
16607-} __attribute__((aligned(PAGE_SIZE)));
16608-
16609-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16610+extern gate_desc idt_table[IDT_ENTRIES];
16611+extern const struct desc_ptr debug_idt_descr;
16612+extern gate_desc debug_idt_table[IDT_ENTRIES];
16613
16614+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16615 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16616 {
16617- return per_cpu(gdt_page, cpu).gdt;
16618+ return cpu_gdt_table[cpu];
16619 }
16620
16621 #ifdef CONFIG_X86_64
16622@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16623 unsigned long base, unsigned dpl, unsigned flags,
16624 unsigned short seg)
16625 {
16626- gate->a = (seg << 16) | (base & 0xffff);
16627- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16628+ gate->gate.offset_low = base;
16629+ gate->gate.seg = seg;
16630+ gate->gate.reserved = 0;
16631+ gate->gate.type = type;
16632+ gate->gate.s = 0;
16633+ gate->gate.dpl = dpl;
16634+ gate->gate.p = 1;
16635+ gate->gate.offset_high = base >> 16;
16636 }
16637
16638 #endif
16639@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16640
16641 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16642 {
16643+ pax_open_kernel();
16644 memcpy(&idt[entry], gate, sizeof(*gate));
16645+ pax_close_kernel();
16646 }
16647
16648 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16649 {
16650+ pax_open_kernel();
16651 memcpy(&ldt[entry], desc, 8);
16652+ pax_close_kernel();
16653 }
16654
16655 static inline void
16656@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16657 default: size = sizeof(*gdt); break;
16658 }
16659
16660+ pax_open_kernel();
16661 memcpy(&gdt[entry], desc, size);
16662+ pax_close_kernel();
16663 }
16664
16665 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16666@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16667
16668 static inline void native_load_tr_desc(void)
16669 {
16670+ pax_open_kernel();
16671 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16672+ pax_close_kernel();
16673 }
16674
16675 static inline void native_load_gdt(const struct desc_ptr *dtr)
16676@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16677 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16678 unsigned int i;
16679
16680+ pax_open_kernel();
16681 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16682 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16683+ pax_close_kernel();
16684 }
16685
16686 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16687@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16688 preempt_enable();
16689 }
16690
16691-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16692+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16693 {
16694 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16695 }
16696@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16697 }
16698
16699 #ifdef CONFIG_X86_64
16700-static inline void set_nmi_gate(int gate, void *addr)
16701+static inline void set_nmi_gate(int gate, const void *addr)
16702 {
16703 gate_desc s;
16704
16705@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16706 #endif
16707
16708 #ifdef CONFIG_TRACING
16709-extern struct desc_ptr trace_idt_descr;
16710-extern gate_desc trace_idt_table[];
16711+extern const struct desc_ptr trace_idt_descr;
16712+extern gate_desc trace_idt_table[IDT_ENTRIES];
16713 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16714 {
16715 write_idt_entry(trace_idt_table, entry, gate);
16716 }
16717
16718-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16719+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16720 unsigned dpl, unsigned ist, unsigned seg)
16721 {
16722 gate_desc s;
16723@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16724 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16725 #endif
16726
16727-static inline void _set_gate(int gate, unsigned type, void *addr,
16728+static inline void _set_gate(int gate, unsigned type, const void *addr,
16729 unsigned dpl, unsigned ist, unsigned seg)
16730 {
16731 gate_desc s;
16732@@ -379,14 +392,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16733 #define set_intr_gate_notrace(n, addr) \
16734 do { \
16735 BUG_ON((unsigned)n > 0xFF); \
16736- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16737+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16738 __KERNEL_CS); \
16739 } while (0)
16740
16741 #define set_intr_gate(n, addr) \
16742 do { \
16743 set_intr_gate_notrace(n, addr); \
16744- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16745+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16746 0, 0, __KERNEL_CS); \
16747 } while (0)
16748
16749@@ -414,19 +427,19 @@ static inline void alloc_system_vector(int vector)
16750 /*
16751 * This routine sets up an interrupt gate at directory privilege level 3.
16752 */
16753-static inline void set_system_intr_gate(unsigned int n, void *addr)
16754+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16755 {
16756 BUG_ON((unsigned)n > 0xFF);
16757 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16758 }
16759
16760-static inline void set_system_trap_gate(unsigned int n, void *addr)
16761+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16762 {
16763 BUG_ON((unsigned)n > 0xFF);
16764 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16765 }
16766
16767-static inline void set_trap_gate(unsigned int n, void *addr)
16768+static inline void set_trap_gate(unsigned int n, const void *addr)
16769 {
16770 BUG_ON((unsigned)n > 0xFF);
16771 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16772@@ -435,16 +448,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16773 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16774 {
16775 BUG_ON((unsigned)n > 0xFF);
16776- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16777+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16778 }
16779
16780-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16781+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16782 {
16783 BUG_ON((unsigned)n > 0xFF);
16784 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16785 }
16786
16787-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16788+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16789 {
16790 BUG_ON((unsigned)n > 0xFF);
16791 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16792@@ -516,4 +529,17 @@ static inline void load_current_idt(void)
16793 else
16794 load_idt((const struct desc_ptr *)&idt_descr);
16795 }
16796+
16797+#ifdef CONFIG_X86_32
16798+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16799+{
16800+ struct desc_struct d;
16801+
16802+ if (likely(limit))
16803+ limit = (limit - 1UL) >> PAGE_SHIFT;
16804+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16805+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16806+}
16807+#endif
16808+
16809 #endif /* _ASM_X86_DESC_H */
16810diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16811index 278441f..b95a174 100644
16812--- a/arch/x86/include/asm/desc_defs.h
16813+++ b/arch/x86/include/asm/desc_defs.h
16814@@ -31,6 +31,12 @@ struct desc_struct {
16815 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16816 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16817 };
16818+ struct {
16819+ u16 offset_low;
16820+ u16 seg;
16821+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16822+ unsigned offset_high: 16;
16823+ } gate;
16824 };
16825 } __attribute__((packed));
16826
16827diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16828index ced283a..ffe04cc 100644
16829--- a/arch/x86/include/asm/div64.h
16830+++ b/arch/x86/include/asm/div64.h
16831@@ -39,7 +39,7 @@
16832 __mod; \
16833 })
16834
16835-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16836+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16837 {
16838 union {
16839 u64 v64;
16840diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16841index f161c18..97d43e8 100644
16842--- a/arch/x86/include/asm/elf.h
16843+++ b/arch/x86/include/asm/elf.h
16844@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16845
16846 #include <asm/vdso.h>
16847
16848-#ifdef CONFIG_X86_64
16849-extern unsigned int vdso64_enabled;
16850-#endif
16851 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16852 extern unsigned int vdso32_enabled;
16853 #endif
16854@@ -250,7 +247,25 @@ extern int force_personality32;
16855 the loader. We need to make sure that it is out of the way of the program
16856 that it will "exec", and that there is sufficient room for the brk. */
16857
16858+#ifdef CONFIG_PAX_SEGMEXEC
16859+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16860+#else
16861 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16862+#endif
16863+
16864+#ifdef CONFIG_PAX_ASLR
16865+#ifdef CONFIG_X86_32
16866+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16867+
16868+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16869+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16870+#else
16871+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16872+
16873+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16874+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16875+#endif
16876+#endif
16877
16878 /* This yields a mask that user programs can use to figure out what
16879 instruction set this CPU supports. This could be done in user space,
16880@@ -299,17 +314,13 @@ do { \
16881
16882 #define ARCH_DLINFO \
16883 do { \
16884- if (vdso64_enabled) \
16885- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16886- (unsigned long __force)current->mm->context.vdso); \
16887+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16888 } while (0)
16889
16890 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16891 #define ARCH_DLINFO_X32 \
16892 do { \
16893- if (vdso64_enabled) \
16894- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16895- (unsigned long __force)current->mm->context.vdso); \
16896+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16897 } while (0)
16898
16899 #define AT_SYSINFO 32
16900@@ -324,10 +335,10 @@ else \
16901
16902 #endif /* !CONFIG_X86_32 */
16903
16904-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16905+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16906
16907 #define VDSO_ENTRY \
16908- ((unsigned long)current->mm->context.vdso + \
16909+ (current->mm->context.vdso + \
16910 selected_vdso32->sym___kernel_vsyscall)
16911
16912 struct linux_binprm;
16913diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16914index 77a99ac..39ff7f5 100644
16915--- a/arch/x86/include/asm/emergency-restart.h
16916+++ b/arch/x86/include/asm/emergency-restart.h
16917@@ -1,6 +1,6 @@
16918 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16919 #define _ASM_X86_EMERGENCY_RESTART_H
16920
16921-extern void machine_emergency_restart(void);
16922+extern void machine_emergency_restart(void) __noreturn;
16923
16924 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16925diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16926index 1c7eefe..d0e4702 100644
16927--- a/arch/x86/include/asm/floppy.h
16928+++ b/arch/x86/include/asm/floppy.h
16929@@ -229,18 +229,18 @@ static struct fd_routine_l {
16930 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16931 } fd_routine[] = {
16932 {
16933- request_dma,
16934- free_dma,
16935- get_dma_residue,
16936- dma_mem_alloc,
16937- hard_dma_setup
16938+ ._request_dma = request_dma,
16939+ ._free_dma = free_dma,
16940+ ._get_dma_residue = get_dma_residue,
16941+ ._dma_mem_alloc = dma_mem_alloc,
16942+ ._dma_setup = hard_dma_setup
16943 },
16944 {
16945- vdma_request_dma,
16946- vdma_nop,
16947- vdma_get_dma_residue,
16948- vdma_mem_alloc,
16949- vdma_dma_setup
16950+ ._request_dma = vdma_request_dma,
16951+ ._free_dma = vdma_nop,
16952+ ._get_dma_residue = vdma_get_dma_residue,
16953+ ._dma_mem_alloc = vdma_mem_alloc,
16954+ ._dma_setup = vdma_dma_setup
16955 }
16956 };
16957
16958diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16959index da5e967..ab07eec 100644
16960--- a/arch/x86/include/asm/fpu-internal.h
16961+++ b/arch/x86/include/asm/fpu-internal.h
16962@@ -151,8 +151,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16963 #define user_insn(insn, output, input...) \
16964 ({ \
16965 int err; \
16966+ pax_open_userland(); \
16967 asm volatile(ASM_STAC "\n" \
16968- "1:" #insn "\n\t" \
16969+ "1:" \
16970+ __copyuser_seg \
16971+ #insn "\n\t" \
16972 "2: " ASM_CLAC "\n" \
16973 ".section .fixup,\"ax\"\n" \
16974 "3: movl $-1,%[err]\n" \
16975@@ -161,6 +164,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16976 _ASM_EXTABLE(1b, 3b) \
16977 : [err] "=r" (err), output \
16978 : "0"(0), input); \
16979+ pax_close_userland(); \
16980 err; \
16981 })
16982
16983@@ -327,7 +331,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16984 "fnclex\n\t"
16985 "emms\n\t"
16986 "fildl %P[addr]" /* set F?P to defined value */
16987- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16988+ : : [addr] "m" (cpu_tss[raw_smp_processor_id()].x86_tss.sp0));
16989 }
16990
16991 return fpu_restore_checking(&tsk->thread.fpu);
16992diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16993index b4c1f54..e290c08 100644
16994--- a/arch/x86/include/asm/futex.h
16995+++ b/arch/x86/include/asm/futex.h
16996@@ -12,6 +12,7 @@
16997 #include <asm/smap.h>
16998
16999 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
17000+ typecheck(u32 __user *, uaddr); \
17001 asm volatile("\t" ASM_STAC "\n" \
17002 "1:\t" insn "\n" \
17003 "2:\t" ASM_CLAC "\n" \
17004@@ -20,15 +21,16 @@
17005 "\tjmp\t2b\n" \
17006 "\t.previous\n" \
17007 _ASM_EXTABLE(1b, 3b) \
17008- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
17009+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
17010 : "i" (-EFAULT), "0" (oparg), "1" (0))
17011
17012 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
17013+ typecheck(u32 __user *, uaddr); \
17014 asm volatile("\t" ASM_STAC "\n" \
17015 "1:\tmovl %2, %0\n" \
17016 "\tmovl\t%0, %3\n" \
17017 "\t" insn "\n" \
17018- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
17019+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
17020 "\tjnz\t1b\n" \
17021 "3:\t" ASM_CLAC "\n" \
17022 "\t.section .fixup,\"ax\"\n" \
17023@@ -38,7 +40,7 @@
17024 _ASM_EXTABLE(1b, 4b) \
17025 _ASM_EXTABLE(2b, 4b) \
17026 : "=&a" (oldval), "=&r" (ret), \
17027- "+m" (*uaddr), "=&r" (tem) \
17028+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17029 : "r" (oparg), "i" (-EFAULT), "1" (0))
17030
17031 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17032@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17033
17034 pagefault_disable();
17035
17036+ pax_open_userland();
17037 switch (op) {
17038 case FUTEX_OP_SET:
17039- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17040+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17041 break;
17042 case FUTEX_OP_ADD:
17043- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17044+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17045 uaddr, oparg);
17046 break;
17047 case FUTEX_OP_OR:
17048@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17049 default:
17050 ret = -ENOSYS;
17051 }
17052+ pax_close_userland();
17053
17054 pagefault_enable();
17055
17056diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17057index e9571dd..df5f542 100644
17058--- a/arch/x86/include/asm/hw_irq.h
17059+++ b/arch/x86/include/asm/hw_irq.h
17060@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17061 #endif /* CONFIG_X86_LOCAL_APIC */
17062
17063 /* Statistics */
17064-extern atomic_t irq_err_count;
17065-extern atomic_t irq_mis_count;
17066+extern atomic_unchecked_t irq_err_count;
17067+extern atomic_unchecked_t irq_mis_count;
17068
17069 /* EISA */
17070 extern void eisa_set_level_irq(unsigned int irq);
17071diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17072index ccffa53..3c90c87 100644
17073--- a/arch/x86/include/asm/i8259.h
17074+++ b/arch/x86/include/asm/i8259.h
17075@@ -62,7 +62,7 @@ struct legacy_pic {
17076 void (*init)(int auto_eoi);
17077 int (*irq_pending)(unsigned int irq);
17078 void (*make_irq)(unsigned int irq);
17079-};
17080+} __do_const;
17081
17082 extern struct legacy_pic *legacy_pic;
17083 extern struct legacy_pic null_legacy_pic;
17084diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17085index 34a5b93..27e40a6 100644
17086--- a/arch/x86/include/asm/io.h
17087+++ b/arch/x86/include/asm/io.h
17088@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17089 "m" (*(volatile type __force *)addr) barrier); }
17090
17091 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17092-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17093-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17094+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17095+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17096
17097 build_mmio_read(__readb, "b", unsigned char, "=q", )
17098-build_mmio_read(__readw, "w", unsigned short, "=r", )
17099-build_mmio_read(__readl, "l", unsigned int, "=r", )
17100+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17101+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17102
17103 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17104 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17105@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17106 * this function
17107 */
17108
17109-static inline phys_addr_t virt_to_phys(volatile void *address)
17110+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17111 {
17112 return __pa(address);
17113 }
17114@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17115 return ioremap_nocache(offset, size);
17116 }
17117
17118-extern void iounmap(volatile void __iomem *addr);
17119+extern void iounmap(const volatile void __iomem *addr);
17120
17121 extern void set_iounmap_nonlazy(void);
17122
17123@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17124
17125 #include <linux/vmalloc.h>
17126
17127+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17128+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17129+{
17130+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17131+}
17132+
17133+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17134+{
17135+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17136+}
17137+
17138 /*
17139 * Convert a virtual cached pointer to an uncached pointer
17140 */
17141diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17142index b77f5ed..a2f791e 100644
17143--- a/arch/x86/include/asm/irqflags.h
17144+++ b/arch/x86/include/asm/irqflags.h
17145@@ -137,6 +137,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17146 swapgs; \
17147 sysretl
17148
17149+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17150+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17151+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17152+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17153+
17154 #else
17155 #define INTERRUPT_RETURN iret
17156 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17157diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17158index 4421b5d..8543006 100644
17159--- a/arch/x86/include/asm/kprobes.h
17160+++ b/arch/x86/include/asm/kprobes.h
17161@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17162 #define RELATIVEJUMP_SIZE 5
17163 #define RELATIVECALL_OPCODE 0xe8
17164 #define RELATIVE_ADDR_SIZE 4
17165-#define MAX_STACK_SIZE 64
17166-#define MIN_STACK_SIZE(ADDR) \
17167- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17168- THREAD_SIZE - (unsigned long)(ADDR))) \
17169- ? (MAX_STACK_SIZE) \
17170- : (((unsigned long)current_thread_info()) + \
17171- THREAD_SIZE - (unsigned long)(ADDR)))
17172+#define MAX_STACK_SIZE 64UL
17173+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17174
17175 #define flush_insn_slot(p) do { } while (0)
17176
17177diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17178index 4ad6560..75c7bdd 100644
17179--- a/arch/x86/include/asm/local.h
17180+++ b/arch/x86/include/asm/local.h
17181@@ -10,33 +10,97 @@ typedef struct {
17182 atomic_long_t a;
17183 } local_t;
17184
17185+typedef struct {
17186+ atomic_long_unchecked_t a;
17187+} local_unchecked_t;
17188+
17189 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17190
17191 #define local_read(l) atomic_long_read(&(l)->a)
17192+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17193 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17194+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17195
17196 static inline void local_inc(local_t *l)
17197 {
17198- asm volatile(_ASM_INC "%0"
17199+ asm volatile(_ASM_INC "%0\n"
17200+
17201+#ifdef CONFIG_PAX_REFCOUNT
17202+ "jno 0f\n"
17203+ _ASM_DEC "%0\n"
17204+ "int $4\n0:\n"
17205+ _ASM_EXTABLE(0b, 0b)
17206+#endif
17207+
17208+ : "+m" (l->a.counter));
17209+}
17210+
17211+static inline void local_inc_unchecked(local_unchecked_t *l)
17212+{
17213+ asm volatile(_ASM_INC "%0\n"
17214 : "+m" (l->a.counter));
17215 }
17216
17217 static inline void local_dec(local_t *l)
17218 {
17219- asm volatile(_ASM_DEC "%0"
17220+ asm volatile(_ASM_DEC "%0\n"
17221+
17222+#ifdef CONFIG_PAX_REFCOUNT
17223+ "jno 0f\n"
17224+ _ASM_INC "%0\n"
17225+ "int $4\n0:\n"
17226+ _ASM_EXTABLE(0b, 0b)
17227+#endif
17228+
17229+ : "+m" (l->a.counter));
17230+}
17231+
17232+static inline void local_dec_unchecked(local_unchecked_t *l)
17233+{
17234+ asm volatile(_ASM_DEC "%0\n"
17235 : "+m" (l->a.counter));
17236 }
17237
17238 static inline void local_add(long i, local_t *l)
17239 {
17240- asm volatile(_ASM_ADD "%1,%0"
17241+ asm volatile(_ASM_ADD "%1,%0\n"
17242+
17243+#ifdef CONFIG_PAX_REFCOUNT
17244+ "jno 0f\n"
17245+ _ASM_SUB "%1,%0\n"
17246+ "int $4\n0:\n"
17247+ _ASM_EXTABLE(0b, 0b)
17248+#endif
17249+
17250+ : "+m" (l->a.counter)
17251+ : "ir" (i));
17252+}
17253+
17254+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17255+{
17256+ asm volatile(_ASM_ADD "%1,%0\n"
17257 : "+m" (l->a.counter)
17258 : "ir" (i));
17259 }
17260
17261 static inline void local_sub(long i, local_t *l)
17262 {
17263- asm volatile(_ASM_SUB "%1,%0"
17264+ asm volatile(_ASM_SUB "%1,%0\n"
17265+
17266+#ifdef CONFIG_PAX_REFCOUNT
17267+ "jno 0f\n"
17268+ _ASM_ADD "%1,%0\n"
17269+ "int $4\n0:\n"
17270+ _ASM_EXTABLE(0b, 0b)
17271+#endif
17272+
17273+ : "+m" (l->a.counter)
17274+ : "ir" (i));
17275+}
17276+
17277+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17278+{
17279+ asm volatile(_ASM_SUB "%1,%0\n"
17280 : "+m" (l->a.counter)
17281 : "ir" (i));
17282 }
17283@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17284 */
17285 static inline int local_sub_and_test(long i, local_t *l)
17286 {
17287- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17288+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17289 }
17290
17291 /**
17292@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17293 */
17294 static inline int local_dec_and_test(local_t *l)
17295 {
17296- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17297+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17298 }
17299
17300 /**
17301@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17302 */
17303 static inline int local_inc_and_test(local_t *l)
17304 {
17305- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17306+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17307 }
17308
17309 /**
17310@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17311 */
17312 static inline int local_add_negative(long i, local_t *l)
17313 {
17314- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17315+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17316 }
17317
17318 /**
17319@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17320 static inline long local_add_return(long i, local_t *l)
17321 {
17322 long __i = i;
17323+ asm volatile(_ASM_XADD "%0, %1\n"
17324+
17325+#ifdef CONFIG_PAX_REFCOUNT
17326+ "jno 0f\n"
17327+ _ASM_MOV "%0,%1\n"
17328+ "int $4\n0:\n"
17329+ _ASM_EXTABLE(0b, 0b)
17330+#endif
17331+
17332+ : "+r" (i), "+m" (l->a.counter)
17333+ : : "memory");
17334+ return i + __i;
17335+}
17336+
17337+/**
17338+ * local_add_return_unchecked - add and return
17339+ * @i: integer value to add
17340+ * @l: pointer to type local_unchecked_t
17341+ *
17342+ * Atomically adds @i to @l and returns @i + @l
17343+ */
17344+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17345+{
17346+ long __i = i;
17347 asm volatile(_ASM_XADD "%0, %1;"
17348 : "+r" (i), "+m" (l->a.counter)
17349 : : "memory");
17350@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17351
17352 #define local_cmpxchg(l, o, n) \
17353 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17354+#define local_cmpxchg_unchecked(l, o, n) \
17355+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17356 /* Always has a lock prefix */
17357 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17358
17359diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17360new file mode 100644
17361index 0000000..2bfd3ba
17362--- /dev/null
17363+++ b/arch/x86/include/asm/mman.h
17364@@ -0,0 +1,15 @@
17365+#ifndef _X86_MMAN_H
17366+#define _X86_MMAN_H
17367+
17368+#include <uapi/asm/mman.h>
17369+
17370+#ifdef __KERNEL__
17371+#ifndef __ASSEMBLY__
17372+#ifdef CONFIG_X86_32
17373+#define arch_mmap_check i386_mmap_check
17374+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17375+#endif
17376+#endif
17377+#endif
17378+
17379+#endif /* X86_MMAN_H */
17380diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17381index 09b9620..923aecd 100644
17382--- a/arch/x86/include/asm/mmu.h
17383+++ b/arch/x86/include/asm/mmu.h
17384@@ -9,7 +9,7 @@
17385 * we put the segment information here.
17386 */
17387 typedef struct {
17388- void *ldt;
17389+ struct desc_struct *ldt;
17390 int size;
17391
17392 #ifdef CONFIG_X86_64
17393@@ -18,7 +18,19 @@ typedef struct {
17394 #endif
17395
17396 struct mutex lock;
17397- void __user *vdso;
17398+ unsigned long vdso;
17399+
17400+#ifdef CONFIG_X86_32
17401+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17402+ unsigned long user_cs_base;
17403+ unsigned long user_cs_limit;
17404+
17405+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17406+ cpumask_t cpu_user_cs_mask;
17407+#endif
17408+
17409+#endif
17410+#endif
17411
17412 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17413 } mm_context_t;
17414diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17415index 883f6b93..bb405b5 100644
17416--- a/arch/x86/include/asm/mmu_context.h
17417+++ b/arch/x86/include/asm/mmu_context.h
17418@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17419
17420 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17421 {
17422+
17423+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17424+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17425+ unsigned int i;
17426+ pgd_t *pgd;
17427+
17428+ pax_open_kernel();
17429+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17430+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17431+ set_pgd_batched(pgd+i, native_make_pgd(0));
17432+ pax_close_kernel();
17433+ }
17434+#endif
17435+
17436 #ifdef CONFIG_SMP
17437 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17438 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17439@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17440 struct task_struct *tsk)
17441 {
17442 unsigned cpu = smp_processor_id();
17443+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17444+ int tlbstate = TLBSTATE_OK;
17445+#endif
17446
17447 if (likely(prev != next)) {
17448 #ifdef CONFIG_SMP
17449+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17450+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17451+#endif
17452 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17453 this_cpu_write(cpu_tlbstate.active_mm, next);
17454 #endif
17455 cpumask_set_cpu(cpu, mm_cpumask(next));
17456
17457 /* Re-load page tables */
17458+#ifdef CONFIG_PAX_PER_CPU_PGD
17459+ pax_open_kernel();
17460+
17461+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17462+ if (static_cpu_has(X86_FEATURE_PCID))
17463+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17464+ else
17465+#endif
17466+
17467+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17468+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17469+ pax_close_kernel();
17470+ 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));
17471+
17472+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17473+ if (static_cpu_has(X86_FEATURE_PCID)) {
17474+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17475+ u64 descriptor[2];
17476+ descriptor[0] = PCID_USER;
17477+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17478+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17479+ descriptor[0] = PCID_KERNEL;
17480+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17481+ }
17482+ } else {
17483+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17484+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17485+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17486+ else
17487+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17488+ }
17489+ } else
17490+#endif
17491+
17492+ load_cr3(get_cpu_pgd(cpu, kernel));
17493+#else
17494 load_cr3(next->pgd);
17495+#endif
17496 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17497
17498 /* Stop flush ipis for the previous mm */
17499@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17500 */
17501 if (unlikely(prev->context.ldt != next->context.ldt))
17502 load_LDT_nolock(&next->context);
17503+
17504+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17505+ if (!(__supported_pte_mask & _PAGE_NX)) {
17506+ smp_mb__before_atomic();
17507+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17508+ smp_mb__after_atomic();
17509+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17510+ }
17511+#endif
17512+
17513+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17514+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17515+ prev->context.user_cs_limit != next->context.user_cs_limit))
17516+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17517+#ifdef CONFIG_SMP
17518+ else if (unlikely(tlbstate != TLBSTATE_OK))
17519+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17520+#endif
17521+#endif
17522+
17523 }
17524+ else {
17525+
17526+#ifdef CONFIG_PAX_PER_CPU_PGD
17527+ pax_open_kernel();
17528+
17529+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17530+ if (static_cpu_has(X86_FEATURE_PCID))
17531+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17532+ else
17533+#endif
17534+
17535+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17536+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17537+ pax_close_kernel();
17538+ 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));
17539+
17540+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17541+ if (static_cpu_has(X86_FEATURE_PCID)) {
17542+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17543+ u64 descriptor[2];
17544+ descriptor[0] = PCID_USER;
17545+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17546+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17547+ descriptor[0] = PCID_KERNEL;
17548+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17549+ }
17550+ } else {
17551+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17552+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17553+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17554+ else
17555+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17556+ }
17557+ } else
17558+#endif
17559+
17560+ load_cr3(get_cpu_pgd(cpu, kernel));
17561+#endif
17562+
17563 #ifdef CONFIG_SMP
17564- else {
17565 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17566 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17567
17568@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17569 * tlb flush IPI delivery. We must reload CR3
17570 * to make sure to use no freed page tables.
17571 */
17572+
17573+#ifndef CONFIG_PAX_PER_CPU_PGD
17574 load_cr3(next->pgd);
17575 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17576+#endif
17577+
17578 load_mm_cr4(next);
17579 load_LDT_nolock(&next->context);
17580+
17581+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17582+ if (!(__supported_pte_mask & _PAGE_NX))
17583+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17584+#endif
17585+
17586+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17587+#ifdef CONFIG_PAX_PAGEEXEC
17588+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17589+#endif
17590+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17591+#endif
17592+
17593 }
17594+#endif
17595 }
17596-#endif
17597 }
17598
17599 #define activate_mm(prev, next) \
17600diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17601index e3b7819..b257c64 100644
17602--- a/arch/x86/include/asm/module.h
17603+++ b/arch/x86/include/asm/module.h
17604@@ -5,6 +5,7 @@
17605
17606 #ifdef CONFIG_X86_64
17607 /* X86_64 does not define MODULE_PROC_FAMILY */
17608+#define MODULE_PROC_FAMILY ""
17609 #elif defined CONFIG_M486
17610 #define MODULE_PROC_FAMILY "486 "
17611 #elif defined CONFIG_M586
17612@@ -57,8 +58,20 @@
17613 #error unknown processor family
17614 #endif
17615
17616-#ifdef CONFIG_X86_32
17617-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17618+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17619+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17620+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17621+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17622+#else
17623+#define MODULE_PAX_KERNEXEC ""
17624 #endif
17625
17626+#ifdef CONFIG_PAX_MEMORY_UDEREF
17627+#define MODULE_PAX_UDEREF "UDEREF "
17628+#else
17629+#define MODULE_PAX_UDEREF ""
17630+#endif
17631+
17632+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17633+
17634 #endif /* _ASM_X86_MODULE_H */
17635diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17636index 5f2fc44..106caa6 100644
17637--- a/arch/x86/include/asm/nmi.h
17638+++ b/arch/x86/include/asm/nmi.h
17639@@ -36,26 +36,35 @@ enum {
17640
17641 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17642
17643+struct nmiaction;
17644+
17645+struct nmiwork {
17646+ const struct nmiaction *action;
17647+ u64 max_duration;
17648+ struct irq_work irq_work;
17649+};
17650+
17651 struct nmiaction {
17652 struct list_head list;
17653 nmi_handler_t handler;
17654- u64 max_duration;
17655- struct irq_work irq_work;
17656 unsigned long flags;
17657 const char *name;
17658-};
17659+ struct nmiwork *work;
17660+} __do_const;
17661
17662 #define register_nmi_handler(t, fn, fg, n, init...) \
17663 ({ \
17664- static struct nmiaction init fn##_na = { \
17665+ static struct nmiwork fn##_nw; \
17666+ static const struct nmiaction init fn##_na = { \
17667 .handler = (fn), \
17668 .name = (n), \
17669 .flags = (fg), \
17670+ .work = &fn##_nw, \
17671 }; \
17672 __register_nmi_handler((t), &fn##_na); \
17673 })
17674
17675-int __register_nmi_handler(unsigned int, struct nmiaction *);
17676+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17677
17678 void unregister_nmi_handler(unsigned int, const char *);
17679
17680diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17681index 802dde3..9183e68 100644
17682--- a/arch/x86/include/asm/page.h
17683+++ b/arch/x86/include/asm/page.h
17684@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17685 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17686
17687 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17688+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17689
17690 #define __boot_va(x) __va(x)
17691 #define __boot_pa(x) __pa(x)
17692@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17693 * virt_to_page(kaddr) returns a valid pointer if and only if
17694 * virt_addr_valid(kaddr) returns true.
17695 */
17696-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17697 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17698 extern bool __virt_addr_valid(unsigned long kaddr);
17699 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17700
17701+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17702+#define virt_to_page(kaddr) \
17703+ ({ \
17704+ const void *__kaddr = (const void *)(kaddr); \
17705+ BUG_ON(!virt_addr_valid(__kaddr)); \
17706+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17707+ })
17708+#else
17709+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17710+#endif
17711+
17712 #endif /* __ASSEMBLY__ */
17713
17714 #include <asm-generic/memory_model.h>
17715diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17716index b3bebf9..13ac22e 100644
17717--- a/arch/x86/include/asm/page_64.h
17718+++ b/arch/x86/include/asm/page_64.h
17719@@ -7,9 +7,9 @@
17720
17721 /* duplicated to the one in bootmem.h */
17722 extern unsigned long max_pfn;
17723-extern unsigned long phys_base;
17724+extern const unsigned long phys_base;
17725
17726-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17727+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17728 {
17729 unsigned long y = x - __START_KERNEL_map;
17730
17731@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17732 }
17733
17734 #ifdef CONFIG_DEBUG_VIRTUAL
17735-extern unsigned long __phys_addr(unsigned long);
17736-extern unsigned long __phys_addr_symbol(unsigned long);
17737+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17738+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17739 #else
17740 #define __phys_addr(x) __phys_addr_nodebug(x)
17741 #define __phys_addr_symbol(x) \
17742diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17743index 8957810..f34efb4 100644
17744--- a/arch/x86/include/asm/paravirt.h
17745+++ b/arch/x86/include/asm/paravirt.h
17746@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17747 return (pmd_t) { ret };
17748 }
17749
17750-static inline pmdval_t pmd_val(pmd_t pmd)
17751+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17752 {
17753 pmdval_t ret;
17754
17755@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17756 val);
17757 }
17758
17759+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17760+{
17761+ pgdval_t val = native_pgd_val(pgd);
17762+
17763+ if (sizeof(pgdval_t) > sizeof(long))
17764+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17765+ val, (u64)val >> 32);
17766+ else
17767+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17768+ val);
17769+}
17770+
17771 static inline void pgd_clear(pgd_t *pgdp)
17772 {
17773 set_pgd(pgdp, __pgd(0));
17774@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17775 pv_mmu_ops.set_fixmap(idx, phys, flags);
17776 }
17777
17778+#ifdef CONFIG_PAX_KERNEXEC
17779+static inline unsigned long pax_open_kernel(void)
17780+{
17781+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17782+}
17783+
17784+static inline unsigned long pax_close_kernel(void)
17785+{
17786+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17787+}
17788+#else
17789+static inline unsigned long pax_open_kernel(void) { return 0; }
17790+static inline unsigned long pax_close_kernel(void) { return 0; }
17791+#endif
17792+
17793 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17794
17795 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17796@@ -906,7 +933,7 @@ extern void default_banner(void);
17797
17798 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17799 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17800-#define PARA_INDIRECT(addr) *%cs:addr
17801+#define PARA_INDIRECT(addr) *%ss:addr
17802 #endif
17803
17804 #define INTERRUPT_RETURN \
17805@@ -976,6 +1003,21 @@ extern void default_banner(void);
17806 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64), \
17807 CLBR_NONE, \
17808 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
17809+
17810+#define GET_CR0_INTO_RDI \
17811+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17812+ mov %rax,%rdi
17813+
17814+#define SET_RDI_INTO_CR0 \
17815+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17816+
17817+#define GET_CR3_INTO_RDI \
17818+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17819+ mov %rax,%rdi
17820+
17821+#define SET_RDI_INTO_CR3 \
17822+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17823+
17824 #endif /* CONFIG_X86_32 */
17825
17826 #endif /* __ASSEMBLY__ */
17827diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17828index f7b0b5c..cdd33f9 100644
17829--- a/arch/x86/include/asm/paravirt_types.h
17830+++ b/arch/x86/include/asm/paravirt_types.h
17831@@ -84,7 +84,7 @@ struct pv_init_ops {
17832 */
17833 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17834 unsigned long addr, unsigned len);
17835-};
17836+} __no_const __no_randomize_layout;
17837
17838
17839 struct pv_lazy_ops {
17840@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17841 void (*enter)(void);
17842 void (*leave)(void);
17843 void (*flush)(void);
17844-};
17845+} __no_randomize_layout;
17846
17847 struct pv_time_ops {
17848 unsigned long long (*sched_clock)(void);
17849 unsigned long long (*steal_clock)(int cpu);
17850 unsigned long (*get_tsc_khz)(void);
17851-};
17852+} __no_const __no_randomize_layout;
17853
17854 struct pv_cpu_ops {
17855 /* hooks for various privileged instructions */
17856@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17857
17858 void (*start_context_switch)(struct task_struct *prev);
17859 void (*end_context_switch)(struct task_struct *next);
17860-};
17861+} __no_const __no_randomize_layout;
17862
17863 struct pv_irq_ops {
17864 /*
17865@@ -215,7 +215,7 @@ struct pv_irq_ops {
17866 #ifdef CONFIG_X86_64
17867 void (*adjust_exception_frame)(void);
17868 #endif
17869-};
17870+} __no_randomize_layout;
17871
17872 struct pv_apic_ops {
17873 #ifdef CONFIG_X86_LOCAL_APIC
17874@@ -223,7 +223,7 @@ struct pv_apic_ops {
17875 unsigned long start_eip,
17876 unsigned long start_esp);
17877 #endif
17878-};
17879+} __no_const __no_randomize_layout;
17880
17881 struct pv_mmu_ops {
17882 unsigned long (*read_cr2)(void);
17883@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17884 struct paravirt_callee_save make_pud;
17885
17886 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17887+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17888 #endif /* CONFIG_PGTABLE_LEVELS == 4 */
17889 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
17890
17891@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17892 an mfn. We can tell which is which from the index. */
17893 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17894 phys_addr_t phys, pgprot_t flags);
17895-};
17896+
17897+#ifdef CONFIG_PAX_KERNEXEC
17898+ unsigned long (*pax_open_kernel)(void);
17899+ unsigned long (*pax_close_kernel)(void);
17900+#endif
17901+
17902+} __no_randomize_layout;
17903
17904 struct arch_spinlock;
17905 #ifdef CONFIG_SMP
17906@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17907 struct pv_lock_ops {
17908 struct paravirt_callee_save lock_spinning;
17909 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17910-};
17911+} __no_randomize_layout;
17912
17913 /* This contains all the paravirt structures: we get a convenient
17914 * number for each function using the offset which we use to indicate
17915- * what to patch. */
17916+ * what to patch.
17917+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17918+ */
17919+
17920 struct paravirt_patch_template {
17921 struct pv_init_ops pv_init_ops;
17922 struct pv_time_ops pv_time_ops;
17923@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17924 struct pv_apic_ops pv_apic_ops;
17925 struct pv_mmu_ops pv_mmu_ops;
17926 struct pv_lock_ops pv_lock_ops;
17927-};
17928+} __no_randomize_layout;
17929
17930 extern struct pv_info pv_info;
17931 extern struct pv_init_ops pv_init_ops;
17932diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17933index bf7f8b5..ca5799d 100644
17934--- a/arch/x86/include/asm/pgalloc.h
17935+++ b/arch/x86/include/asm/pgalloc.h
17936@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17937 pmd_t *pmd, pte_t *pte)
17938 {
17939 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17940+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17941+}
17942+
17943+static inline void pmd_populate_user(struct mm_struct *mm,
17944+ pmd_t *pmd, pte_t *pte)
17945+{
17946+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17947 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17948 }
17949
17950@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17951
17952 #ifdef CONFIG_X86_PAE
17953 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17954+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17955+{
17956+ pud_populate(mm, pudp, pmd);
17957+}
17958 #else /* !CONFIG_X86_PAE */
17959 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17960 {
17961 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17962 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17963 }
17964+
17965+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17966+{
17967+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17968+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17969+}
17970 #endif /* CONFIG_X86_PAE */
17971
17972 #if CONFIG_PGTABLE_LEVELS > 3
17973@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17974 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17975 }
17976
17977+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17978+{
17979+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17980+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17981+}
17982+
17983 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17984 {
17985 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17986diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17987index fd74a11..35fd5af 100644
17988--- a/arch/x86/include/asm/pgtable-2level.h
17989+++ b/arch/x86/include/asm/pgtable-2level.h
17990@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17991
17992 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17993 {
17994+ pax_open_kernel();
17995 *pmdp = pmd;
17996+ pax_close_kernel();
17997 }
17998
17999 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18000diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
18001index cdaa58c..e61122b 100644
18002--- a/arch/x86/include/asm/pgtable-3level.h
18003+++ b/arch/x86/include/asm/pgtable-3level.h
18004@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18005
18006 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18007 {
18008+ pax_open_kernel();
18009 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
18010+ pax_close_kernel();
18011 }
18012
18013 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18014 {
18015+ pax_open_kernel();
18016 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
18017+ pax_close_kernel();
18018 }
18019
18020 /*
18021diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
18022index fe57e7a..0573d42 100644
18023--- a/arch/x86/include/asm/pgtable.h
18024+++ b/arch/x86/include/asm/pgtable.h
18025@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18026
18027 #ifndef __PAGETABLE_PUD_FOLDED
18028 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18029+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18030 #define pgd_clear(pgd) native_pgd_clear(pgd)
18031 #endif
18032
18033@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18034
18035 #define arch_end_context_switch(prev) do {} while(0)
18036
18037+#define pax_open_kernel() native_pax_open_kernel()
18038+#define pax_close_kernel() native_pax_close_kernel()
18039 #endif /* CONFIG_PARAVIRT */
18040
18041+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18042+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18043+
18044+#ifdef CONFIG_PAX_KERNEXEC
18045+static inline unsigned long native_pax_open_kernel(void)
18046+{
18047+ unsigned long cr0;
18048+
18049+ preempt_disable();
18050+ barrier();
18051+ cr0 = read_cr0() ^ X86_CR0_WP;
18052+ BUG_ON(cr0 & X86_CR0_WP);
18053+ write_cr0(cr0);
18054+ barrier();
18055+ return cr0 ^ X86_CR0_WP;
18056+}
18057+
18058+static inline unsigned long native_pax_close_kernel(void)
18059+{
18060+ unsigned long cr0;
18061+
18062+ barrier();
18063+ cr0 = read_cr0() ^ X86_CR0_WP;
18064+ BUG_ON(!(cr0 & X86_CR0_WP));
18065+ write_cr0(cr0);
18066+ barrier();
18067+ preempt_enable_no_resched();
18068+ return cr0 ^ X86_CR0_WP;
18069+}
18070+#else
18071+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18072+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18073+#endif
18074+
18075 /*
18076 * The following only work if pte_present() is true.
18077 * Undefined behaviour if not..
18078 */
18079+static inline int pte_user(pte_t pte)
18080+{
18081+ return pte_val(pte) & _PAGE_USER;
18082+}
18083+
18084 static inline int pte_dirty(pte_t pte)
18085 {
18086 return pte_flags(pte) & _PAGE_DIRTY;
18087@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18088 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18089 }
18090
18091+static inline unsigned long pgd_pfn(pgd_t pgd)
18092+{
18093+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18094+}
18095+
18096 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18097
18098 static inline int pmd_large(pmd_t pte)
18099@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18100 return pte_clear_flags(pte, _PAGE_RW);
18101 }
18102
18103+static inline pte_t pte_mkread(pte_t pte)
18104+{
18105+ return __pte(pte_val(pte) | _PAGE_USER);
18106+}
18107+
18108 static inline pte_t pte_mkexec(pte_t pte)
18109 {
18110- return pte_clear_flags(pte, _PAGE_NX);
18111+#ifdef CONFIG_X86_PAE
18112+ if (__supported_pte_mask & _PAGE_NX)
18113+ return pte_clear_flags(pte, _PAGE_NX);
18114+ else
18115+#endif
18116+ return pte_set_flags(pte, _PAGE_USER);
18117+}
18118+
18119+static inline pte_t pte_exprotect(pte_t pte)
18120+{
18121+#ifdef CONFIG_X86_PAE
18122+ if (__supported_pte_mask & _PAGE_NX)
18123+ return pte_set_flags(pte, _PAGE_NX);
18124+ else
18125+#endif
18126+ return pte_clear_flags(pte, _PAGE_USER);
18127 }
18128
18129 static inline pte_t pte_mkdirty(pte_t pte)
18130@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18131 #endif
18132
18133 #ifndef __ASSEMBLY__
18134+
18135+#ifdef CONFIG_PAX_PER_CPU_PGD
18136+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18137+enum cpu_pgd_type {kernel = 0, user = 1};
18138+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18139+{
18140+ return cpu_pgd[cpu][type];
18141+}
18142+#endif
18143+
18144 #include <linux/mm_types.h>
18145 #include <linux/mmdebug.h>
18146 #include <linux/log2.h>
18147@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18148 * Currently stuck as a macro due to indirect forward reference to
18149 * linux/mmzone.h's __section_mem_map_addr() definition:
18150 */
18151-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18152+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18153
18154 /* Find an entry in the second-level page table.. */
18155 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18156@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18157 * Currently stuck as a macro due to indirect forward reference to
18158 * linux/mmzone.h's __section_mem_map_addr() definition:
18159 */
18160-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18161+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18162
18163 /* to find an entry in a page-table-directory. */
18164 static inline unsigned long pud_index(unsigned long address)
18165@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18166
18167 static inline int pgd_bad(pgd_t pgd)
18168 {
18169- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18170+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18171 }
18172
18173 static inline int pgd_none(pgd_t pgd)
18174@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18175 * pgd_offset() returns a (pgd_t *)
18176 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18177 */
18178-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18179+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18180+
18181+#ifdef CONFIG_PAX_PER_CPU_PGD
18182+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18183+#endif
18184+
18185 /*
18186 * a shortcut which implies the use of the kernel's pgd, instead
18187 * of a process's
18188@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18189 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18190 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18191
18192+#ifdef CONFIG_X86_32
18193+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18194+#else
18195+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18196+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18197+
18198+#ifdef CONFIG_PAX_MEMORY_UDEREF
18199+#ifdef __ASSEMBLY__
18200+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18201+#else
18202+extern unsigned long pax_user_shadow_base;
18203+extern pgdval_t clone_pgd_mask;
18204+#endif
18205+#else
18206+#define pax_user_shadow_base (0UL)
18207+#endif
18208+
18209+#endif
18210+
18211 #ifndef __ASSEMBLY__
18212
18213 extern int direct_gbpages;
18214@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18215 * dst and src can be on the same page, but the range must not overlap,
18216 * and must not cross a page boundary.
18217 */
18218-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18219+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18220 {
18221- memcpy(dst, src, count * sizeof(pgd_t));
18222+ pax_open_kernel();
18223+ while (count--)
18224+ *dst++ = *src++;
18225+ pax_close_kernel();
18226 }
18227
18228+#ifdef CONFIG_PAX_PER_CPU_PGD
18229+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18230+#endif
18231+
18232+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18233+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18234+#else
18235+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18236+#endif
18237+
18238 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18239 static inline int page_level_shift(enum pg_level level)
18240 {
18241diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18242index b6c0b40..3535d47 100644
18243--- a/arch/x86/include/asm/pgtable_32.h
18244+++ b/arch/x86/include/asm/pgtable_32.h
18245@@ -25,9 +25,6 @@
18246 struct mm_struct;
18247 struct vm_area_struct;
18248
18249-extern pgd_t swapper_pg_dir[1024];
18250-extern pgd_t initial_page_table[1024];
18251-
18252 static inline void pgtable_cache_init(void) { }
18253 static inline void check_pgt_cache(void) { }
18254 void paging_init(void);
18255@@ -45,6 +42,12 @@ void paging_init(void);
18256 # include <asm/pgtable-2level.h>
18257 #endif
18258
18259+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18260+extern pgd_t initial_page_table[PTRS_PER_PGD];
18261+#ifdef CONFIG_X86_PAE
18262+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18263+#endif
18264+
18265 #if defined(CONFIG_HIGHPTE)
18266 #define pte_offset_map(dir, address) \
18267 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18268@@ -59,12 +62,17 @@ void paging_init(void);
18269 /* Clear a kernel PTE and flush it from the TLB */
18270 #define kpte_clear_flush(ptep, vaddr) \
18271 do { \
18272+ pax_open_kernel(); \
18273 pte_clear(&init_mm, (vaddr), (ptep)); \
18274+ pax_close_kernel(); \
18275 __flush_tlb_one((vaddr)); \
18276 } while (0)
18277
18278 #endif /* !__ASSEMBLY__ */
18279
18280+#define HAVE_ARCH_UNMAPPED_AREA
18281+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18282+
18283 /*
18284 * kern_addr_valid() is (1) for FLATMEM and (0) for
18285 * SPARSEMEM and DISCONTIGMEM
18286diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18287index 9fb2f2b..b04b4bf 100644
18288--- a/arch/x86/include/asm/pgtable_32_types.h
18289+++ b/arch/x86/include/asm/pgtable_32_types.h
18290@@ -8,7 +8,7 @@
18291 */
18292 #ifdef CONFIG_X86_PAE
18293 # include <asm/pgtable-3level_types.h>
18294-# define PMD_SIZE (1UL << PMD_SHIFT)
18295+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18296 # define PMD_MASK (~(PMD_SIZE - 1))
18297 #else
18298 # include <asm/pgtable-2level_types.h>
18299@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18300 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18301 #endif
18302
18303+#ifdef CONFIG_PAX_KERNEXEC
18304+#ifndef __ASSEMBLY__
18305+extern unsigned char MODULES_EXEC_VADDR[];
18306+extern unsigned char MODULES_EXEC_END[];
18307+#endif
18308+#include <asm/boot.h>
18309+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18310+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18311+#else
18312+#define ktla_ktva(addr) (addr)
18313+#define ktva_ktla(addr) (addr)
18314+#endif
18315+
18316 #define MODULES_VADDR VMALLOC_START
18317 #define MODULES_END VMALLOC_END
18318 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18319diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18320index 2ee7811..55aca24 100644
18321--- a/arch/x86/include/asm/pgtable_64.h
18322+++ b/arch/x86/include/asm/pgtable_64.h
18323@@ -16,11 +16,16 @@
18324
18325 extern pud_t level3_kernel_pgt[512];
18326 extern pud_t level3_ident_pgt[512];
18327+extern pud_t level3_vmalloc_start_pgt[512];
18328+extern pud_t level3_vmalloc_end_pgt[512];
18329+extern pud_t level3_vmemmap_pgt[512];
18330+extern pud_t level2_vmemmap_pgt[512];
18331 extern pmd_t level2_kernel_pgt[512];
18332 extern pmd_t level2_fixmap_pgt[512];
18333-extern pmd_t level2_ident_pgt[512];
18334-extern pte_t level1_fixmap_pgt[512];
18335-extern pgd_t init_level4_pgt[];
18336+extern pmd_t level2_ident_pgt[2][512];
18337+extern pte_t level1_fixmap_pgt[3][512];
18338+extern pte_t level1_vsyscall_pgt[512];
18339+extern pgd_t init_level4_pgt[512];
18340
18341 #define swapper_pg_dir init_level4_pgt
18342
18343@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18344
18345 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18346 {
18347+ pax_open_kernel();
18348 *pmdp = pmd;
18349+ pax_close_kernel();
18350 }
18351
18352 static inline void native_pmd_clear(pmd_t *pmd)
18353@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18354
18355 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18356 {
18357+ pax_open_kernel();
18358 *pudp = pud;
18359+ pax_close_kernel();
18360 }
18361
18362 static inline void native_pud_clear(pud_t *pud)
18363@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18364
18365 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18366 {
18367+ pax_open_kernel();
18368+ *pgdp = pgd;
18369+ pax_close_kernel();
18370+}
18371+
18372+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18373+{
18374 *pgdp = pgd;
18375 }
18376
18377diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18378index e6844df..432b56e 100644
18379--- a/arch/x86/include/asm/pgtable_64_types.h
18380+++ b/arch/x86/include/asm/pgtable_64_types.h
18381@@ -60,11 +60,16 @@ typedef struct { pteval_t pte; } pte_t;
18382 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18383 #define MODULES_END _AC(0xffffffffff000000, UL)
18384 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18385+#define MODULES_EXEC_VADDR MODULES_VADDR
18386+#define MODULES_EXEC_END MODULES_END
18387 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18388 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18389 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18390 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18391
18392+#define ktla_ktva(addr) (addr)
18393+#define ktva_ktla(addr) (addr)
18394+
18395 #define EARLY_DYNAMIC_PAGE_TABLES 64
18396
18397 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18398diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18399index 78f0c8c..4424bb0 100644
18400--- a/arch/x86/include/asm/pgtable_types.h
18401+++ b/arch/x86/include/asm/pgtable_types.h
18402@@ -85,8 +85,10 @@
18403
18404 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18405 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18406-#else
18407+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18408 #define _PAGE_NX (_AT(pteval_t, 0))
18409+#else
18410+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18411 #endif
18412
18413 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18414@@ -141,6 +143,9 @@ enum page_cache_mode {
18415 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18416 _PAGE_ACCESSED)
18417
18418+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18419+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18420+
18421 #define __PAGE_KERNEL_EXEC \
18422 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18423 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18424@@ -148,7 +153,7 @@ enum page_cache_mode {
18425 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18426 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18427 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18428-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18429+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18430 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18431 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18432 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18433@@ -194,7 +199,7 @@ enum page_cache_mode {
18434 #ifdef CONFIG_X86_64
18435 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18436 #else
18437-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18438+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18439 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18440 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18441 #endif
18442@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18443 {
18444 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18445 }
18446+#endif
18447
18448+#if CONFIG_PGTABLE_LEVELS == 3
18449+#include <asm-generic/pgtable-nopud.h>
18450+#endif
18451+
18452+#if CONFIG_PGTABLE_LEVELS == 2
18453+#include <asm-generic/pgtable-nopmd.h>
18454+#endif
18455+
18456+#ifndef __ASSEMBLY__
18457 #if CONFIG_PGTABLE_LEVELS > 3
18458 typedef struct { pudval_t pud; } pud_t;
18459
18460@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18461 return pud.pud;
18462 }
18463 #else
18464-#include <asm-generic/pgtable-nopud.h>
18465-
18466 static inline pudval_t native_pud_val(pud_t pud)
18467 {
18468 return native_pgd_val(pud.pgd);
18469@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18470 return pmd.pmd;
18471 }
18472 #else
18473-#include <asm-generic/pgtable-nopmd.h>
18474-
18475 static inline pmdval_t native_pmd_val(pmd_t pmd)
18476 {
18477 return native_pgd_val(pmd.pud.pgd);
18478@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18479
18480 extern pteval_t __supported_pte_mask;
18481 extern void set_nx(void);
18482-extern int nx_enabled;
18483
18484 #define pgprot_writecombine pgprot_writecombine
18485 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18486diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18487index 8f327184..368fb29 100644
18488--- a/arch/x86/include/asm/preempt.h
18489+++ b/arch/x86/include/asm/preempt.h
18490@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18491 */
18492 static __always_inline bool __preempt_count_dec_and_test(void)
18493 {
18494- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18495+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18496 }
18497
18498 /*
18499diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18500index 23ba676..6584489 100644
18501--- a/arch/x86/include/asm/processor.h
18502+++ b/arch/x86/include/asm/processor.h
18503@@ -130,7 +130,7 @@ struct cpuinfo_x86 {
18504 /* Index into per_cpu list: */
18505 u16 cpu_index;
18506 u32 microcode;
18507-};
18508+} __randomize_layout;
18509
18510 #define X86_VENDOR_INTEL 0
18511 #define X86_VENDOR_CYRIX 1
18512@@ -201,9 +201,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18513 : "memory");
18514 }
18515
18516+/* invpcid (%rdx),%rax */
18517+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18518+
18519+#define INVPCID_SINGLE_ADDRESS 0UL
18520+#define INVPCID_SINGLE_CONTEXT 1UL
18521+#define INVPCID_ALL_GLOBAL 2UL
18522+#define INVPCID_ALL_NONGLOBAL 3UL
18523+
18524+#define PCID_KERNEL 0UL
18525+#define PCID_USER 1UL
18526+#define PCID_NOFLUSH (1UL << 63)
18527+
18528 static inline void load_cr3(pgd_t *pgdir)
18529 {
18530- write_cr3(__pa(pgdir));
18531+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18532 }
18533
18534 #ifdef CONFIG_X86_32
18535@@ -300,7 +312,7 @@ struct tss_struct {
18536
18537 } ____cacheline_aligned;
18538
18539-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);
18540+extern struct tss_struct cpu_tss[NR_CPUS];
18541
18542 #ifdef CONFIG_X86_32
18543 DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);
18544@@ -500,6 +512,7 @@ struct thread_struct {
18545 unsigned short ds;
18546 unsigned short fsindex;
18547 unsigned short gsindex;
18548+ unsigned short ss;
18549 #endif
18550 #ifdef CONFIG_X86_32
18551 unsigned long ip;
18552@@ -585,10 +598,10 @@ static inline void native_swapgs(void)
18553 #endif
18554 }
18555
18556-static inline unsigned long current_top_of_stack(void)
18557+static inline unsigned long current_top_of_stack(unsigned int cpu)
18558 {
18559 #ifdef CONFIG_X86_64
18560- return this_cpu_read_stable(cpu_tss.x86_tss.sp0);
18561+ return cpu_tss[cpu].x86_tss.sp0;
18562 #else
18563 /* sp0 on x86_32 is special in and around vm86 mode. */
18564 return this_cpu_read_stable(cpu_current_top_of_stack);
18565@@ -837,8 +850,15 @@ static inline void spin_lock_prefetch(const void *x)
18566 */
18567 #define TASK_SIZE PAGE_OFFSET
18568 #define TASK_SIZE_MAX TASK_SIZE
18569+
18570+#ifdef CONFIG_PAX_SEGMEXEC
18571+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18572+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18573+#else
18574 #define STACK_TOP TASK_SIZE
18575-#define STACK_TOP_MAX STACK_TOP
18576+#endif
18577+
18578+#define STACK_TOP_MAX TASK_SIZE
18579
18580 #define INIT_THREAD { \
18581 .sp0 = TOP_OF_INIT_STACK, \
18582@@ -859,12 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18583 * "struct pt_regs" is possible, but they may contain the
18584 * completely wrong values.
18585 */
18586-#define task_pt_regs(task) \
18587-({ \
18588- unsigned long __ptr = (unsigned long)task_stack_page(task); \
18589- __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \
18590- ((struct pt_regs *)__ptr) - 1; \
18591-})
18592+#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
18593
18594 #define KSTK_ESP(task) (task_pt_regs(task)->sp)
18595
18596@@ -878,13 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18597 * particular problem by preventing anything from being mapped
18598 * at the maximum canonical address.
18599 */
18600-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18601+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18602
18603 /* This decides where the kernel will search for a free chunk of vm
18604 * space during mmap's.
18605 */
18606 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18607- 0xc0000000 : 0xFFFFe000)
18608+ 0xc0000000 : 0xFFFFf000)
18609
18610 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18611 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18612@@ -918,6 +933,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18613 */
18614 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18615
18616+#ifdef CONFIG_PAX_SEGMEXEC
18617+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18618+#endif
18619+
18620 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18621
18622 /* Get/set a process' ability to use the timestamp counter instruction */
18623@@ -962,7 +981,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18624 return 0;
18625 }
18626
18627-extern unsigned long arch_align_stack(unsigned long sp);
18628+#define arch_align_stack(x) ((x) & ~0xfUL)
18629 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18630
18631 void default_idle(void);
18632@@ -972,6 +991,6 @@ bool xen_set_default_idle(void);
18633 #define xen_set_default_idle 0
18634 #endif
18635
18636-void stop_this_cpu(void *dummy);
18637+void stop_this_cpu(void *dummy) __noreturn;
18638 void df_debug(struct pt_regs *regs, long error_code);
18639 #endif /* _ASM_X86_PROCESSOR_H */
18640diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18641index 5fabf13..7388158 100644
18642--- a/arch/x86/include/asm/ptrace.h
18643+++ b/arch/x86/include/asm/ptrace.h
18644@@ -125,15 +125,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18645 #ifdef CONFIG_X86_64
18646 static inline bool user_64bit_mode(struct pt_regs *regs)
18647 {
18648+ unsigned long cs = regs->cs & 0xffff;
18649 #ifndef CONFIG_PARAVIRT
18650 /*
18651 * On non-paravirt systems, this is the only long mode CPL 3
18652 * selector. We do not allow long mode selectors in the LDT.
18653 */
18654- return regs->cs == __USER_CS;
18655+ return cs == __USER_CS;
18656 #else
18657 /* Headers are too twisted for this to go in paravirt.h. */
18658- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18659+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18660 #endif
18661 }
18662
18663@@ -180,9 +181,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18664 * Traps from the kernel do not save sp and ss.
18665 * Use the helper function to retrieve sp.
18666 */
18667- if (offset == offsetof(struct pt_regs, sp) &&
18668- regs->cs == __KERNEL_CS)
18669- return kernel_stack_pointer(regs);
18670+ if (offset == offsetof(struct pt_regs, sp)) {
18671+ unsigned long cs = regs->cs & 0xffff;
18672+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18673+ return kernel_stack_pointer(regs);
18674+ }
18675 #endif
18676 return *(unsigned long *)((unsigned long)regs + offset);
18677 }
18678diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18679index ae0e241..e80b10b 100644
18680--- a/arch/x86/include/asm/qrwlock.h
18681+++ b/arch/x86/include/asm/qrwlock.h
18682@@ -7,8 +7,8 @@
18683 #define queue_write_unlock queue_write_unlock
18684 static inline void queue_write_unlock(struct qrwlock *lock)
18685 {
18686- barrier();
18687- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18688+ barrier();
18689+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18690 }
18691 #endif
18692
18693diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18694index 9c6b890..5305f53 100644
18695--- a/arch/x86/include/asm/realmode.h
18696+++ b/arch/x86/include/asm/realmode.h
18697@@ -22,16 +22,14 @@ struct real_mode_header {
18698 #endif
18699 /* APM/BIOS reboot */
18700 u32 machine_real_restart_asm;
18701-#ifdef CONFIG_X86_64
18702 u32 machine_real_restart_seg;
18703-#endif
18704 };
18705
18706 /* This must match data at trampoline_32/64.S */
18707 struct trampoline_header {
18708 #ifdef CONFIG_X86_32
18709 u32 start;
18710- u16 gdt_pad;
18711+ u16 boot_cs;
18712 u16 gdt_limit;
18713 u32 gdt_base;
18714 #else
18715diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18716index a82c4f1..ac45053 100644
18717--- a/arch/x86/include/asm/reboot.h
18718+++ b/arch/x86/include/asm/reboot.h
18719@@ -6,13 +6,13 @@
18720 struct pt_regs;
18721
18722 struct machine_ops {
18723- void (*restart)(char *cmd);
18724- void (*halt)(void);
18725- void (*power_off)(void);
18726+ void (* __noreturn restart)(char *cmd);
18727+ void (* __noreturn halt)(void);
18728+ void (* __noreturn power_off)(void);
18729 void (*shutdown)(void);
18730 void (*crash_shutdown)(struct pt_regs *);
18731- void (*emergency_restart)(void);
18732-};
18733+ void (* __noreturn emergency_restart)(void);
18734+} __no_const;
18735
18736 extern struct machine_ops machine_ops;
18737
18738diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18739index 8f7866a..e442f20 100644
18740--- a/arch/x86/include/asm/rmwcc.h
18741+++ b/arch/x86/include/asm/rmwcc.h
18742@@ -3,7 +3,34 @@
18743
18744 #ifdef CC_HAVE_ASM_GOTO
18745
18746-#define __GEN_RMWcc(fullop, var, cc, ...) \
18747+#ifdef CONFIG_PAX_REFCOUNT
18748+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18749+do { \
18750+ asm_volatile_goto (fullop \
18751+ ";jno 0f\n" \
18752+ fullantiop \
18753+ ";int $4\n0:\n" \
18754+ _ASM_EXTABLE(0b, 0b) \
18755+ ";j" cc " %l[cc_label]" \
18756+ : : "m" (var), ## __VA_ARGS__ \
18757+ : "memory" : cc_label); \
18758+ return 0; \
18759+cc_label: \
18760+ return 1; \
18761+} while (0)
18762+#else
18763+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18764+do { \
18765+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18766+ : : "m" (var), ## __VA_ARGS__ \
18767+ : "memory" : cc_label); \
18768+ return 0; \
18769+cc_label: \
18770+ return 1; \
18771+} while (0)
18772+#endif
18773+
18774+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18775 do { \
18776 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18777 : : "m" (var), ## __VA_ARGS__ \
18778@@ -13,15 +40,46 @@ cc_label: \
18779 return 1; \
18780 } while (0)
18781
18782-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18783- __GEN_RMWcc(op " " arg0, var, cc)
18784+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18785+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18786
18787-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18788- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18789+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18790+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18791+
18792+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18793+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18794+
18795+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18796+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18797
18798 #else /* !CC_HAVE_ASM_GOTO */
18799
18800-#define __GEN_RMWcc(fullop, var, cc, ...) \
18801+#ifdef CONFIG_PAX_REFCOUNT
18802+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18803+do { \
18804+ char c; \
18805+ asm volatile (fullop \
18806+ ";jno 0f\n" \
18807+ fullantiop \
18808+ ";int $4\n0:\n" \
18809+ _ASM_EXTABLE(0b, 0b) \
18810+ "; set" cc " %1" \
18811+ : "+m" (var), "=qm" (c) \
18812+ : __VA_ARGS__ : "memory"); \
18813+ return c != 0; \
18814+} while (0)
18815+#else
18816+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18817+do { \
18818+ char c; \
18819+ asm volatile (fullop "; set" cc " %1" \
18820+ : "+m" (var), "=qm" (c) \
18821+ : __VA_ARGS__ : "memory"); \
18822+ return c != 0; \
18823+} while (0)
18824+#endif
18825+
18826+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18827 do { \
18828 char c; \
18829 asm volatile (fullop "; set" cc " %1" \
18830@@ -30,11 +88,17 @@ do { \
18831 return c != 0; \
18832 } while (0)
18833
18834-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18835- __GEN_RMWcc(op " " arg0, var, cc)
18836+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18837+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18838+
18839+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18840+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18841+
18842+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18843+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18844
18845-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18846- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18847+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18848+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18849
18850 #endif /* CC_HAVE_ASM_GOTO */
18851
18852diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18853index cad82c9..2e5c5c1 100644
18854--- a/arch/x86/include/asm/rwsem.h
18855+++ b/arch/x86/include/asm/rwsem.h
18856@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18857 {
18858 asm volatile("# beginning down_read\n\t"
18859 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18860+
18861+#ifdef CONFIG_PAX_REFCOUNT
18862+ "jno 0f\n"
18863+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18864+ "int $4\n0:\n"
18865+ _ASM_EXTABLE(0b, 0b)
18866+#endif
18867+
18868 /* adds 0x00000001 */
18869 " jns 1f\n"
18870 " call call_rwsem_down_read_failed\n"
18871@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18872 "1:\n\t"
18873 " mov %1,%2\n\t"
18874 " add %3,%2\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ "sub %3,%2\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 " jle 2f\n\t"
18884 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18885 " jnz 1b\n\t"
18886@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18887 long tmp;
18888 asm volatile("# beginning down_write\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 /* adds 0xffff0001, returns the old value */
18899 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18900 /* was the active mask 0 before? */
18901@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18902 long tmp;
18903 asm volatile("# beginning __up_read\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 1, returns the old value */
18914 " jns 1f\n\t"
18915 " call call_rwsem_wake\n" /* expects old value in %edx */
18916@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18917 long tmp;
18918 asm volatile("# beginning __up_write\n\t"
18919 LOCK_PREFIX " xadd %1,(%2)\n\t"
18920+
18921+#ifdef CONFIG_PAX_REFCOUNT
18922+ "jno 0f\n"
18923+ "mov %1,(%2)\n"
18924+ "int $4\n0:\n"
18925+ _ASM_EXTABLE(0b, 0b)
18926+#endif
18927+
18928 /* subtracts 0xffff0001, returns the old value */
18929 " jns 1f\n\t"
18930 " call call_rwsem_wake\n" /* expects old value in %edx */
18931@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18932 {
18933 asm volatile("# beginning __downgrade_write\n\t"
18934 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18935+
18936+#ifdef CONFIG_PAX_REFCOUNT
18937+ "jno 0f\n"
18938+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18939+ "int $4\n0:\n"
18940+ _ASM_EXTABLE(0b, 0b)
18941+#endif
18942+
18943 /*
18944 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18945 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18946@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18947 */
18948 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18949 {
18950- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18951+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18952+
18953+#ifdef CONFIG_PAX_REFCOUNT
18954+ "jno 0f\n"
18955+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18956+ "int $4\n0:\n"
18957+ _ASM_EXTABLE(0b, 0b)
18958+#endif
18959+
18960 : "+m" (sem->count)
18961 : "er" (delta));
18962 }
18963@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18964 */
18965 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18966 {
18967- return delta + xadd(&sem->count, delta);
18968+ return delta + xadd_check_overflow(&sem->count, delta);
18969 }
18970
18971 #endif /* __KERNEL__ */
18972diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18973index 7d5a192..23ef1aa 100644
18974--- a/arch/x86/include/asm/segment.h
18975+++ b/arch/x86/include/asm/segment.h
18976@@ -82,14 +82,20 @@
18977 * 26 - ESPFIX small SS
18978 * 27 - per-cpu [ offset to per-cpu data area ]
18979 * 28 - stack_canary-20 [ for stack protector ] <=== cacheline #8
18980- * 29 - unused
18981- * 30 - unused
18982+ * 29 - PCI BIOS CS
18983+ * 30 - PCI BIOS DS
18984 * 31 - TSS for double fault handler
18985 */
18986+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18987+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18988+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18989+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18990+
18991 #define GDT_ENTRY_TLS_MIN 6
18992 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18993
18994 #define GDT_ENTRY_KERNEL_CS 12
18995+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 4
18996 #define GDT_ENTRY_KERNEL_DS 13
18997 #define GDT_ENTRY_DEFAULT_USER_CS 14
18998 #define GDT_ENTRY_DEFAULT_USER_DS 15
18999@@ -106,6 +112,12 @@
19000 #define GDT_ENTRY_PERCPU 27
19001 #define GDT_ENTRY_STACK_CANARY 28
19002
19003+#define GDT_ENTRY_PCIBIOS_CS 29
19004+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19005+
19006+#define GDT_ENTRY_PCIBIOS_DS 30
19007+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19008+
19009 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19010
19011 /*
19012@@ -118,6 +130,7 @@
19013 */
19014
19015 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19016+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19017 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19018 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19019 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)
19020@@ -129,7 +142,7 @@
19021 #define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16*8)
19022
19023 /* "Is this PNP code selector (PNP_CS32 or PNP_CS16)?" */
19024-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == PNP_CS32)
19025+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19026
19027 /* data segment for BIOS: */
19028 #define PNP_DS (GDT_ENTRY_PNPBIOS_DS*8)
19029@@ -176,6 +189,8 @@
19030 #define GDT_ENTRY_DEFAULT_USER_DS 5
19031 #define GDT_ENTRY_DEFAULT_USER_CS 6
19032
19033+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19034+
19035 /* Needs two entries */
19036 #define GDT_ENTRY_TSS 8
19037 /* Needs two entries */
19038@@ -187,10 +202,12 @@
19039 /* Abused to load per CPU data from limit */
19040 #define GDT_ENTRY_PER_CPU 15
19041
19042+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19043+
19044 /*
19045 * Number of entries in the GDT table:
19046 */
19047-#define GDT_ENTRIES 16
19048+#define GDT_ENTRIES 17
19049
19050 /*
19051 * Segment selector values corresponding to the above entries:
19052@@ -200,7 +217,9 @@
19053 */
19054 #define __KERNEL32_CS (GDT_ENTRY_KERNEL32_CS*8)
19055 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19056+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19057 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19058+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19059 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)
19060 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19061 #define __USER32_DS __USER_DS
19062diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19063index ba665eb..0f72938 100644
19064--- a/arch/x86/include/asm/smap.h
19065+++ b/arch/x86/include/asm/smap.h
19066@@ -25,6 +25,18 @@
19067
19068 #include <asm/alternative-asm.h>
19069
19070+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19071+#define ASM_PAX_OPEN_USERLAND \
19072+ ALTERNATIVE "", "call __pax_open_userland", X86_FEATURE_STRONGUDEREF
19073+
19074+#define ASM_PAX_CLOSE_USERLAND \
19075+ ALTERNATIVE "", "call __pax_close_userland", X86_FEATURE_STRONGUDEREF
19076+
19077+#else
19078+#define ASM_PAX_OPEN_USERLAND
19079+#define ASM_PAX_CLOSE_USERLAND
19080+#endif
19081+
19082 #ifdef CONFIG_X86_SMAP
19083
19084 #define ASM_CLAC \
19085@@ -44,6 +56,37 @@
19086
19087 #include <asm/alternative.h>
19088
19089+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19090+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19091+
19092+extern void __pax_open_userland(void);
19093+static __always_inline unsigned long pax_open_userland(void)
19094+{
19095+
19096+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19097+ asm volatile(ALTERNATIVE("", "call %P[open]", X86_FEATURE_STRONGUDEREF)
19098+ :
19099+ : [open] "i" (__pax_open_userland)
19100+ : "memory", "rax");
19101+#endif
19102+
19103+ return 0;
19104+}
19105+
19106+extern void __pax_close_userland(void);
19107+static __always_inline unsigned long pax_close_userland(void)
19108+{
19109+
19110+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19111+ asm volatile(ALTERNATIVE("", "call %P[close]", X86_FEATURE_STRONGUDEREF)
19112+ :
19113+ : [close] "i" (__pax_close_userland)
19114+ : "memory", "rax");
19115+#endif
19116+
19117+ return 0;
19118+}
19119+
19120 #ifdef CONFIG_X86_SMAP
19121
19122 static __always_inline void clac(void)
19123diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19124index 17a8dce..79f7280 100644
19125--- a/arch/x86/include/asm/smp.h
19126+++ b/arch/x86/include/asm/smp.h
19127@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19128 /* cpus sharing the last level cache: */
19129 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19130 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19131-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19132+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19133
19134 static inline struct cpumask *cpu_sibling_mask(int cpu)
19135 {
19136@@ -78,7 +78,7 @@ struct smp_ops {
19137
19138 void (*send_call_func_ipi)(const struct cpumask *mask);
19139 void (*send_call_func_single_ipi)(int cpu);
19140-};
19141+} __no_const;
19142
19143 /* Globals due to paravirt */
19144 extern void set_cpu_sibling_map(int cpu);
19145@@ -192,14 +192,8 @@ extern unsigned disabled_cpus;
19146 extern int safe_smp_processor_id(void);
19147
19148 #elif defined(CONFIG_X86_64_SMP)
19149-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19150-
19151-#define stack_smp_processor_id() \
19152-({ \
19153- struct thread_info *ti; \
19154- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19155- ti->cpu; \
19156-})
19157+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19158+#define stack_smp_processor_id() raw_smp_processor_id()
19159 #define safe_smp_processor_id() smp_processor_id()
19160
19161 #endif
19162diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19163index 6a99859..03cb807 100644
19164--- a/arch/x86/include/asm/stackprotector.h
19165+++ b/arch/x86/include/asm/stackprotector.h
19166@@ -47,7 +47,7 @@
19167 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19168 */
19169 #define GDT_STACK_CANARY_INIT \
19170- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19171+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19172
19173 /*
19174 * Initialize the stackprotector canary value.
19175@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19176
19177 static inline void load_stack_canary_segment(void)
19178 {
19179-#ifdef CONFIG_X86_32
19180+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19181 asm volatile ("mov %0, %%gs" : : "r" (0));
19182 #endif
19183 }
19184diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19185index 70bbe39..4ae2bd4 100644
19186--- a/arch/x86/include/asm/stacktrace.h
19187+++ b/arch/x86/include/asm/stacktrace.h
19188@@ -11,28 +11,20 @@
19189
19190 extern int kstack_depth_to_print;
19191
19192-struct thread_info;
19193+struct task_struct;
19194 struct stacktrace_ops;
19195
19196-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19197- unsigned long *stack,
19198- unsigned long bp,
19199- const struct stacktrace_ops *ops,
19200- void *data,
19201- unsigned long *end,
19202- int *graph);
19203+typedef unsigned long walk_stack_t(struct task_struct *task,
19204+ void *stack_start,
19205+ unsigned long *stack,
19206+ unsigned long bp,
19207+ const struct stacktrace_ops *ops,
19208+ void *data,
19209+ unsigned long *end,
19210+ int *graph);
19211
19212-extern unsigned long
19213-print_context_stack(struct thread_info *tinfo,
19214- unsigned long *stack, unsigned long bp,
19215- const struct stacktrace_ops *ops, void *data,
19216- unsigned long *end, int *graph);
19217-
19218-extern unsigned long
19219-print_context_stack_bp(struct thread_info *tinfo,
19220- unsigned long *stack, unsigned long bp,
19221- const struct stacktrace_ops *ops, void *data,
19222- unsigned long *end, int *graph);
19223+extern walk_stack_t print_context_stack;
19224+extern walk_stack_t print_context_stack_bp;
19225
19226 /* Generic stack tracer with callbacks */
19227
19228@@ -40,7 +32,7 @@ struct stacktrace_ops {
19229 void (*address)(void *data, unsigned long address, int reliable);
19230 /* On negative return stop dumping */
19231 int (*stack)(void *data, char *name);
19232- walk_stack_t walk_stack;
19233+ walk_stack_t *walk_stack;
19234 };
19235
19236 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19237diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19238index 751bf4b..a1278b5 100644
19239--- a/arch/x86/include/asm/switch_to.h
19240+++ b/arch/x86/include/asm/switch_to.h
19241@@ -112,7 +112,7 @@ do { \
19242 "call __switch_to\n\t" \
19243 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19244 __switch_canary \
19245- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19246+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19247 "movq %%rax,%%rdi\n\t" \
19248 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19249 "jnz ret_from_fork\n\t" \
19250@@ -123,7 +123,7 @@ do { \
19251 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19252 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19253 [_tif_fork] "i" (_TIF_FORK), \
19254- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19255+ [thread_info] "m" (current_tinfo), \
19256 [current_task] "m" (current_task) \
19257 __switch_canary_iparam \
19258 : "memory", "cc" __EXTRA_CLOBBER)
19259diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19260index b4bdec3..e8af9bc 100644
19261--- a/arch/x86/include/asm/thread_info.h
19262+++ b/arch/x86/include/asm/thread_info.h
19263@@ -36,7 +36,7 @@
19264 #ifdef CONFIG_X86_32
19265 # define TOP_OF_KERNEL_STACK_PADDING 8
19266 #else
19267-# define TOP_OF_KERNEL_STACK_PADDING 0
19268+# define TOP_OF_KERNEL_STACK_PADDING 16
19269 #endif
19270
19271 /*
19272@@ -50,27 +50,26 @@ struct task_struct;
19273 #include <linux/atomic.h>
19274
19275 struct thread_info {
19276- struct task_struct *task; /* main task structure */
19277 __u32 flags; /* low level flags */
19278 __u32 status; /* thread synchronous flags */
19279 __u32 cpu; /* current CPU */
19280 int saved_preempt_count;
19281 mm_segment_t addr_limit;
19282 void __user *sysenter_return;
19283+ unsigned long lowest_stack;
19284 unsigned int sig_on_uaccess_error:1;
19285 unsigned int uaccess_err:1; /* uaccess failed */
19286 };
19287
19288-#define INIT_THREAD_INFO(tsk) \
19289+#define INIT_THREAD_INFO \
19290 { \
19291- .task = &tsk, \
19292 .flags = 0, \
19293 .cpu = 0, \
19294 .saved_preempt_count = INIT_PREEMPT_COUNT, \
19295 .addr_limit = KERNEL_DS, \
19296 }
19297
19298-#define init_thread_info (init_thread_union.thread_info)
19299+#define init_thread_info (init_thread_union.stack)
19300 #define init_stack (init_thread_union.stack)
19301
19302 #else /* !__ASSEMBLY__ */
19303@@ -110,6 +109,7 @@ struct thread_info {
19304 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19305 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19306 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19307+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19308
19309 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19310 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19311@@ -133,17 +133,18 @@ struct thread_info {
19312 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19313 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19314 #define _TIF_X32 (1 << TIF_X32)
19315+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19316
19317 /* work to do in syscall_trace_enter() */
19318 #define _TIF_WORK_SYSCALL_ENTRY \
19319 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19320 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19321- _TIF_NOHZ)
19322+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19323
19324 /* work to do in syscall_trace_leave() */
19325 #define _TIF_WORK_SYSCALL_EXIT \
19326 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19327- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19328+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19329
19330 /* work to do on interrupt/exception return */
19331 #define _TIF_WORK_MASK \
19332@@ -154,7 +155,7 @@ struct thread_info {
19333 /* work to do on any return to user space */
19334 #define _TIF_ALLWORK_MASK \
19335 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19336- _TIF_NOHZ)
19337+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19338
19339 /* Only used for 64 bit */
19340 #define _TIF_DO_NOTIFY_MASK \
19341@@ -179,9 +180,11 @@ struct thread_info {
19342
19343 DECLARE_PER_CPU(unsigned long, kernel_stack);
19344
19345+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19346+
19347 static inline struct thread_info *current_thread_info(void)
19348 {
19349- return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
19350+ return this_cpu_read_stable(current_tinfo);
19351 }
19352
19353 static inline unsigned long current_stack_pointer(void)
19354@@ -199,8 +202,7 @@ static inline unsigned long current_stack_pointer(void)
19355
19356 /* Load thread_info address into "reg" */
19357 #define GET_THREAD_INFO(reg) \
19358- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19359- _ASM_SUB $(THREAD_SIZE),reg ;
19360+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19361
19362 /*
19363 * ASM operand which evaluates to a 'thread_info' address of
19364@@ -293,5 +295,12 @@ static inline bool is_ia32_task(void)
19365 extern void arch_task_cache_init(void);
19366 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19367 extern void arch_release_task_struct(struct task_struct *tsk);
19368+
19369+#define __HAVE_THREAD_FUNCTIONS
19370+#define task_thread_info(task) (&(task)->tinfo)
19371+#define task_stack_page(task) ((task)->stack)
19372+#define setup_thread_stack(p, org) do {} while (0)
19373+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19374+
19375 #endif
19376 #endif /* _ASM_X86_THREAD_INFO_H */
19377diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19378index cd79194..e7a9491 100644
19379--- a/arch/x86/include/asm/tlbflush.h
19380+++ b/arch/x86/include/asm/tlbflush.h
19381@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19382
19383 static inline void __native_flush_tlb(void)
19384 {
19385+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19386+ u64 descriptor[2];
19387+
19388+ descriptor[0] = PCID_KERNEL;
19389+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19390+ return;
19391+ }
19392+
19393+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19394+ if (static_cpu_has(X86_FEATURE_PCID)) {
19395+ unsigned int cpu = raw_get_cpu();
19396+
19397+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19398+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19399+ raw_put_cpu_no_resched();
19400+ return;
19401+ }
19402+#endif
19403+
19404 native_write_cr3(native_read_cr3());
19405 }
19406
19407 static inline void __native_flush_tlb_global_irq_disabled(void)
19408 {
19409- unsigned long cr4;
19410+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19411+ u64 descriptor[2];
19412
19413- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19414- /* clear PGE */
19415- native_write_cr4(cr4 & ~X86_CR4_PGE);
19416- /* write old PGE again and flush TLBs */
19417- native_write_cr4(cr4);
19418+ descriptor[0] = PCID_KERNEL;
19419+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19420+ } else {
19421+ unsigned long cr4;
19422+
19423+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19424+ /* clear PGE */
19425+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19426+ /* write old PGE again and flush TLBs */
19427+ native_write_cr4(cr4);
19428+ }
19429 }
19430
19431 static inline void __native_flush_tlb_global(void)
19432@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19433
19434 static inline void __native_flush_tlb_single(unsigned long addr)
19435 {
19436+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19437+ u64 descriptor[2];
19438+
19439+ descriptor[0] = PCID_KERNEL;
19440+ descriptor[1] = addr;
19441+
19442+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19443+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19444+ if (addr < TASK_SIZE_MAX)
19445+ descriptor[1] += pax_user_shadow_base;
19446+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19447+ }
19448+
19449+ descriptor[0] = PCID_USER;
19450+ descriptor[1] = addr;
19451+#endif
19452+
19453+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19454+ return;
19455+ }
19456+
19457+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19458+ if (static_cpu_has(X86_FEATURE_PCID)) {
19459+ unsigned int cpu = raw_get_cpu();
19460+
19461+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19462+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19463+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19464+ raw_put_cpu_no_resched();
19465+
19466+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19467+ addr += pax_user_shadow_base;
19468+ }
19469+#endif
19470+
19471 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19472 }
19473
19474diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19475index ace9dec..3f9e253 100644
19476--- a/arch/x86/include/asm/uaccess.h
19477+++ b/arch/x86/include/asm/uaccess.h
19478@@ -7,6 +7,7 @@
19479 #include <linux/compiler.h>
19480 #include <linux/thread_info.h>
19481 #include <linux/string.h>
19482+#include <linux/spinlock.h>
19483 #include <asm/asm.h>
19484 #include <asm/page.h>
19485 #include <asm/smap.h>
19486@@ -29,7 +30,12 @@
19487
19488 #define get_ds() (KERNEL_DS)
19489 #define get_fs() (current_thread_info()->addr_limit)
19490+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19491+void __set_fs(mm_segment_t x);
19492+void set_fs(mm_segment_t x);
19493+#else
19494 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19495+#endif
19496
19497 #define segment_eq(a, b) ((a).seg == (b).seg)
19498
19499@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19500 * checks that the pointer is in the user space range - after calling
19501 * this function, memory access functions may still return -EFAULT.
19502 */
19503-#define access_ok(type, addr, size) \
19504- likely(!__range_not_ok(addr, size, user_addr_max()))
19505+extern int _cond_resched(void);
19506+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19507+#define access_ok(type, addr, size) \
19508+({ \
19509+ unsigned long __size = size; \
19510+ unsigned long __addr = (unsigned long)addr; \
19511+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19512+ if (__ret_ao && __size) { \
19513+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19514+ unsigned long __end_ao = __addr + __size - 1; \
19515+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19516+ while (__addr_ao <= __end_ao) { \
19517+ char __c_ao; \
19518+ __addr_ao += PAGE_SIZE; \
19519+ if (__size > PAGE_SIZE) \
19520+ _cond_resched(); \
19521+ if (__get_user(__c_ao, (char __user *)__addr)) \
19522+ break; \
19523+ if (type != VERIFY_WRITE) { \
19524+ __addr = __addr_ao; \
19525+ continue; \
19526+ } \
19527+ if (__put_user(__c_ao, (char __user *)__addr)) \
19528+ break; \
19529+ __addr = __addr_ao; \
19530+ } \
19531+ } \
19532+ } \
19533+ __ret_ao; \
19534+})
19535
19536 /*
19537 * The exception table consists of pairs of addresses relative to the
19538@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19539 extern int __get_user_bad(void);
19540
19541 /*
19542- * This is a type: either unsigned long, if the argument fits into
19543- * that type, or otherwise unsigned long long.
19544+ * This is a type: either (un)signed int, if the argument fits into
19545+ * that type, or otherwise (un)signed long long.
19546 */
19547 #define __inttype(x) \
19548-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19549+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19550+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19551+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19552
19553 /**
19554 * get_user: - Get a simple variable from user space.
19555@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19556 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19557 __chk_user_ptr(ptr); \
19558 might_fault(); \
19559+ pax_open_userland(); \
19560 asm volatile("call __get_user_%P3" \
19561 : "=a" (__ret_gu), "=r" (__val_gu) \
19562 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19563 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19564+ pax_close_userland(); \
19565 __ret_gu; \
19566 })
19567
19568@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19569 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19570 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19571
19572-
19573+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19574+#define __copyuser_seg "gs;"
19575+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19576+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19577+#else
19578+#define __copyuser_seg
19579+#define __COPYUSER_SET_ES
19580+#define __COPYUSER_RESTORE_ES
19581+#endif
19582
19583 #ifdef CONFIG_X86_32
19584 #define __put_user_asm_u64(x, addr, err, errret) \
19585 asm volatile(ASM_STAC "\n" \
19586- "1: movl %%eax,0(%2)\n" \
19587- "2: movl %%edx,4(%2)\n" \
19588+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19589+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19590 "3: " ASM_CLAC "\n" \
19591 ".section .fixup,\"ax\"\n" \
19592 "4: movl %3,%0\n" \
19593@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19594
19595 #define __put_user_asm_ex_u64(x, addr) \
19596 asm volatile(ASM_STAC "\n" \
19597- "1: movl %%eax,0(%1)\n" \
19598- "2: movl %%edx,4(%1)\n" \
19599+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19600+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19601 "3: " ASM_CLAC "\n" \
19602 _ASM_EXTABLE_EX(1b, 2b) \
19603 _ASM_EXTABLE_EX(2b, 3b) \
19604@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19605 __typeof__(*(ptr)) __pu_val; \
19606 __chk_user_ptr(ptr); \
19607 might_fault(); \
19608- __pu_val = x; \
19609+ __pu_val = (x); \
19610+ pax_open_userland(); \
19611 switch (sizeof(*(ptr))) { \
19612 case 1: \
19613 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19614@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19615 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19616 break; \
19617 } \
19618+ pax_close_userland(); \
19619 __ret_pu; \
19620 })
19621
19622@@ -355,8 +403,10 @@ do { \
19623 } while (0)
19624
19625 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19626+do { \
19627+ pax_open_userland(); \
19628 asm volatile(ASM_STAC "\n" \
19629- "1: mov"itype" %2,%"rtype"1\n" \
19630+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19631 "2: " ASM_CLAC "\n" \
19632 ".section .fixup,\"ax\"\n" \
19633 "3: mov %3,%0\n" \
19634@@ -364,8 +414,10 @@ do { \
19635 " jmp 2b\n" \
19636 ".previous\n" \
19637 _ASM_EXTABLE(1b, 3b) \
19638- : "=r" (err), ltype(x) \
19639- : "m" (__m(addr)), "i" (errret), "0" (err))
19640+ : "=r" (err), ltype (x) \
19641+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19642+ pax_close_userland(); \
19643+} while (0)
19644
19645 #define __get_user_size_ex(x, ptr, size) \
19646 do { \
19647@@ -389,7 +441,7 @@ do { \
19648 } while (0)
19649
19650 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19651- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19652+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19653 "2:\n" \
19654 _ASM_EXTABLE_EX(1b, 2b) \
19655 : ltype(x) : "m" (__m(addr)))
19656@@ -406,13 +458,24 @@ do { \
19657 int __gu_err; \
19658 unsigned long __gu_val; \
19659 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19660- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19661+ (x) = (__typeof__(*(ptr)))__gu_val; \
19662 __gu_err; \
19663 })
19664
19665 /* FIXME: this hack is definitely wrong -AK */
19666 struct __large_struct { unsigned long buf[100]; };
19667-#define __m(x) (*(struct __large_struct __user *)(x))
19668+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19669+#define ____m(x) \
19670+({ \
19671+ unsigned long ____x = (unsigned long)(x); \
19672+ if (____x < pax_user_shadow_base) \
19673+ ____x += pax_user_shadow_base; \
19674+ (typeof(x))____x; \
19675+})
19676+#else
19677+#define ____m(x) (x)
19678+#endif
19679+#define __m(x) (*(struct __large_struct __user *)____m(x))
19680
19681 /*
19682 * Tell gcc we read from memory instead of writing: this is because
19683@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19684 * aliasing issues.
19685 */
19686 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19687+do { \
19688+ pax_open_userland(); \
19689 asm volatile(ASM_STAC "\n" \
19690- "1: mov"itype" %"rtype"1,%2\n" \
19691+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19692 "2: " ASM_CLAC "\n" \
19693 ".section .fixup,\"ax\"\n" \
19694 "3: mov %3,%0\n" \
19695@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19696 ".previous\n" \
19697 _ASM_EXTABLE(1b, 3b) \
19698 : "=r"(err) \
19699- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19700+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19701+ pax_close_userland(); \
19702+} while (0)
19703
19704 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19705- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19706+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19707 "2:\n" \
19708 _ASM_EXTABLE_EX(1b, 2b) \
19709 : : ltype(x), "m" (__m(addr)))
19710@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19711 */
19712 #define uaccess_try do { \
19713 current_thread_info()->uaccess_err = 0; \
19714+ pax_open_userland(); \
19715 stac(); \
19716 barrier();
19717
19718 #define uaccess_catch(err) \
19719 clac(); \
19720+ pax_close_userland(); \
19721 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19722 } while (0)
19723
19724@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19725 * On error, the variable @x is set to zero.
19726 */
19727
19728+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19729+#define __get_user(x, ptr) get_user((x), (ptr))
19730+#else
19731 #define __get_user(x, ptr) \
19732 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19733+#endif
19734
19735 /**
19736 * __put_user: - Write a simple value into user space, with less checking.
19737@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19738 * Returns zero on success, or -EFAULT on error.
19739 */
19740
19741+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19742+#define __put_user(x, ptr) put_user((x), (ptr))
19743+#else
19744 #define __put_user(x, ptr) \
19745 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19746+#endif
19747
19748 #define __get_user_unaligned __get_user
19749 #define __put_user_unaligned __put_user
19750@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19751 #define get_user_ex(x, ptr) do { \
19752 unsigned long __gue_val; \
19753 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19754- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19755+ (x) = (__typeof__(*(ptr)))__gue_val; \
19756 } while (0)
19757
19758 #define put_user_try uaccess_try
19759@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19760 extern __must_check long strnlen_user(const char __user *str, long n);
19761
19762 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19763-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19764+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19765
19766 extern void __cmpxchg_wrong_size(void)
19767 __compiletime_error("Bad argument size for cmpxchg");
19768@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19769 __typeof__(ptr) __uval = (uval); \
19770 __typeof__(*(ptr)) __old = (old); \
19771 __typeof__(*(ptr)) __new = (new); \
19772+ pax_open_userland(); \
19773 switch (size) { \
19774 case 1: \
19775 { \
19776 asm volatile("\t" ASM_STAC "\n" \
19777- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19778+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19779 "2:\t" ASM_CLAC "\n" \
19780 "\t.section .fixup, \"ax\"\n" \
19781 "3:\tmov %3, %0\n" \
19782 "\tjmp 2b\n" \
19783 "\t.previous\n" \
19784 _ASM_EXTABLE(1b, 3b) \
19785- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19786+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19787 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19788 : "memory" \
19789 ); \
19790@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19791 case 2: \
19792 { \
19793 asm volatile("\t" ASM_STAC "\n" \
19794- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19795+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19796 "2:\t" ASM_CLAC "\n" \
19797 "\t.section .fixup, \"ax\"\n" \
19798 "3:\tmov %3, %0\n" \
19799 "\tjmp 2b\n" \
19800 "\t.previous\n" \
19801 _ASM_EXTABLE(1b, 3b) \
19802- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19803+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19804 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19805 : "memory" \
19806 ); \
19807@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19808 case 4: \
19809 { \
19810 asm volatile("\t" ASM_STAC "\n" \
19811- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19812+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19813 "2:\t" ASM_CLAC "\n" \
19814 "\t.section .fixup, \"ax\"\n" \
19815 "3:\tmov %3, %0\n" \
19816 "\tjmp 2b\n" \
19817 "\t.previous\n" \
19818 _ASM_EXTABLE(1b, 3b) \
19819- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19820+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19821 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19822 : "memory" \
19823 ); \
19824@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19825 __cmpxchg_wrong_size(); \
19826 \
19827 asm volatile("\t" ASM_STAC "\n" \
19828- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19829+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19830 "2:\t" ASM_CLAC "\n" \
19831 "\t.section .fixup, \"ax\"\n" \
19832 "3:\tmov %3, %0\n" \
19833 "\tjmp 2b\n" \
19834 "\t.previous\n" \
19835 _ASM_EXTABLE(1b, 3b) \
19836- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19837+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19838 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19839 : "memory" \
19840 ); \
19841@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19842 default: \
19843 __cmpxchg_wrong_size(); \
19844 } \
19845+ pax_close_userland(); \
19846 *__uval = __old; \
19847 __ret; \
19848 })
19849@@ -636,17 +715,6 @@ extern struct movsl_mask {
19850
19851 #define ARCH_HAS_NOCACHE_UACCESS 1
19852
19853-#ifdef CONFIG_X86_32
19854-# include <asm/uaccess_32.h>
19855-#else
19856-# include <asm/uaccess_64.h>
19857-#endif
19858-
19859-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19860- unsigned n);
19861-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19862- unsigned n);
19863-
19864 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19865 # define copy_user_diag __compiletime_error
19866 #else
19867@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19868 extern void copy_user_diag("copy_from_user() buffer size is too small")
19869 copy_from_user_overflow(void);
19870 extern void copy_user_diag("copy_to_user() buffer size is too small")
19871-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19872+copy_to_user_overflow(void);
19873
19874 #undef copy_user_diag
19875
19876@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19877
19878 extern void
19879 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19880-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19881+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19882 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19883
19884 #else
19885@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19886
19887 #endif
19888
19889+#ifdef CONFIG_X86_32
19890+# include <asm/uaccess_32.h>
19891+#else
19892+# include <asm/uaccess_64.h>
19893+#endif
19894+
19895 static inline unsigned long __must_check
19896 copy_from_user(void *to, const void __user *from, unsigned long n)
19897 {
19898- int sz = __compiletime_object_size(to);
19899+ size_t sz = __compiletime_object_size(to);
19900
19901 might_fault();
19902
19903@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19904 * case, and do only runtime checking for non-constant sizes.
19905 */
19906
19907- if (likely(sz < 0 || sz >= n))
19908- n = _copy_from_user(to, from, n);
19909- else if(__builtin_constant_p(n))
19910- copy_from_user_overflow();
19911- else
19912- __copy_from_user_overflow(sz, n);
19913+ if (likely(sz != (size_t)-1 && sz < n)) {
19914+ if(__builtin_constant_p(n))
19915+ copy_from_user_overflow();
19916+ else
19917+ __copy_from_user_overflow(sz, n);
19918+ } else if (access_ok(VERIFY_READ, from, n))
19919+ n = __copy_from_user(to, from, n);
19920+ else if ((long)n > 0)
19921+ memset(to, 0, n);
19922
19923 return n;
19924 }
19925@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19926 static inline unsigned long __must_check
19927 copy_to_user(void __user *to, const void *from, unsigned long n)
19928 {
19929- int sz = __compiletime_object_size(from);
19930+ size_t sz = __compiletime_object_size(from);
19931
19932 might_fault();
19933
19934 /* See the comment in copy_from_user() above. */
19935- if (likely(sz < 0 || sz >= n))
19936- n = _copy_to_user(to, from, n);
19937- else if(__builtin_constant_p(n))
19938- copy_to_user_overflow();
19939- else
19940- __copy_to_user_overflow(sz, n);
19941+ if (likely(sz != (size_t)-1 && sz < n)) {
19942+ if(__builtin_constant_p(n))
19943+ copy_to_user_overflow();
19944+ else
19945+ __copy_to_user_overflow(sz, n);
19946+ } else if (access_ok(VERIFY_WRITE, to, n))
19947+ n = __copy_to_user(to, from, n);
19948
19949 return n;
19950 }
19951diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19952index 3c03a5d..edb68ae 100644
19953--- a/arch/x86/include/asm/uaccess_32.h
19954+++ b/arch/x86/include/asm/uaccess_32.h
19955@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19956 * anything, so this is accurate.
19957 */
19958
19959-static __always_inline unsigned long __must_check
19960+static __always_inline __size_overflow(3) unsigned long __must_check
19961 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19962 {
19963+ if ((long)n < 0)
19964+ return n;
19965+
19966+ check_object_size(from, n, true);
19967+
19968 if (__builtin_constant_p(n)) {
19969 unsigned long ret;
19970
19971@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
19972 __copy_to_user(void __user *to, const void *from, unsigned long n)
19973 {
19974 might_fault();
19975+
19976 return __copy_to_user_inatomic(to, from, n);
19977 }
19978
19979-static __always_inline unsigned long
19980+static __always_inline __size_overflow(3) unsigned long
19981 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
19982 {
19983+ if ((long)n < 0)
19984+ return n;
19985+
19986 /* Avoid zeroing the tail if the copy fails..
19987 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
19988 * but as the zeroing behaviour is only significant when n is not
19989@@ -137,6 +146,12 @@ static __always_inline unsigned long
19990 __copy_from_user(void *to, const void __user *from, unsigned long n)
19991 {
19992 might_fault();
19993+
19994+ if ((long)n < 0)
19995+ return n;
19996+
19997+ check_object_size(to, n, false);
19998+
19999 if (__builtin_constant_p(n)) {
20000 unsigned long ret;
20001
20002@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20003 const void __user *from, unsigned long n)
20004 {
20005 might_fault();
20006+
20007+ if ((long)n < 0)
20008+ return n;
20009+
20010 if (__builtin_constant_p(n)) {
20011 unsigned long ret;
20012
20013@@ -181,7 +200,10 @@ static __always_inline unsigned long
20014 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20015 unsigned long n)
20016 {
20017- return __copy_from_user_ll_nocache_nozero(to, from, n);
20018+ if ((long)n < 0)
20019+ return n;
20020+
20021+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20022 }
20023
20024 #endif /* _ASM_X86_UACCESS_32_H */
20025diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20026index f2f9b39..2ae1bf8 100644
20027--- a/arch/x86/include/asm/uaccess_64.h
20028+++ b/arch/x86/include/asm/uaccess_64.h
20029@@ -10,6 +10,9 @@
20030 #include <asm/alternative.h>
20031 #include <asm/cpufeature.h>
20032 #include <asm/page.h>
20033+#include <asm/pgtable.h>
20034+
20035+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20036
20037 /*
20038 * Copy To/From Userspace
20039@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20040 __must_check unsigned long
20041 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20042
20043-static __always_inline __must_check unsigned long
20044-copy_user_generic(void *to, const void *from, unsigned len)
20045+static __always_inline __must_check __size_overflow(3) unsigned long
20046+copy_user_generic(void *to, const void *from, unsigned long len)
20047 {
20048 unsigned ret;
20049
20050@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20051 }
20052
20053 __must_check unsigned long
20054-copy_in_user(void __user *to, const void __user *from, unsigned len);
20055+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20056
20057 static __always_inline __must_check
20058-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20059+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20060 {
20061- int ret = 0;
20062+ size_t sz = __compiletime_object_size(dst);
20063+ unsigned ret = 0;
20064+
20065+ if (size > INT_MAX)
20066+ return size;
20067+
20068+ check_object_size(dst, size, false);
20069+
20070+#ifdef CONFIG_PAX_MEMORY_UDEREF
20071+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20072+ return size;
20073+#endif
20074+
20075+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20076+ if(__builtin_constant_p(size))
20077+ copy_from_user_overflow();
20078+ else
20079+ __copy_from_user_overflow(sz, size);
20080+ return size;
20081+ }
20082
20083 if (!__builtin_constant_p(size))
20084- return copy_user_generic(dst, (__force void *)src, size);
20085+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20086 switch (size) {
20087- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20088+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20089 ret, "b", "b", "=q", 1);
20090 return ret;
20091- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20092+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20093 ret, "w", "w", "=r", 2);
20094 return ret;
20095- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20096+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20097 ret, "l", "k", "=r", 4);
20098 return ret;
20099- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20100+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20101 ret, "q", "", "=r", 8);
20102 return ret;
20103 case 10:
20104- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20105+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20106 ret, "q", "", "=r", 10);
20107 if (unlikely(ret))
20108 return ret;
20109 __get_user_asm(*(u16 *)(8 + (char *)dst),
20110- (u16 __user *)(8 + (char __user *)src),
20111+ (const u16 __user *)(8 + (const char __user *)src),
20112 ret, "w", "w", "=r", 2);
20113 return ret;
20114 case 16:
20115- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20116+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20117 ret, "q", "", "=r", 16);
20118 if (unlikely(ret))
20119 return ret;
20120 __get_user_asm(*(u64 *)(8 + (char *)dst),
20121- (u64 __user *)(8 + (char __user *)src),
20122+ (const u64 __user *)(8 + (const char __user *)src),
20123 ret, "q", "", "=r", 8);
20124 return ret;
20125 default:
20126- return copy_user_generic(dst, (__force void *)src, size);
20127+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20128 }
20129 }
20130
20131 static __always_inline __must_check
20132-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20133+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20134 {
20135 might_fault();
20136 return __copy_from_user_nocheck(dst, src, size);
20137 }
20138
20139 static __always_inline __must_check
20140-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20141+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20142 {
20143- int ret = 0;
20144+ size_t sz = __compiletime_object_size(src);
20145+ unsigned ret = 0;
20146+
20147+ if (size > INT_MAX)
20148+ return size;
20149+
20150+ check_object_size(src, size, true);
20151+
20152+#ifdef CONFIG_PAX_MEMORY_UDEREF
20153+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20154+ return size;
20155+#endif
20156+
20157+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20158+ if(__builtin_constant_p(size))
20159+ copy_to_user_overflow();
20160+ else
20161+ __copy_to_user_overflow(sz, size);
20162+ return size;
20163+ }
20164
20165 if (!__builtin_constant_p(size))
20166- return copy_user_generic((__force void *)dst, src, size);
20167+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20168 switch (size) {
20169- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20170+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20171 ret, "b", "b", "iq", 1);
20172 return ret;
20173- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20174+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20175 ret, "w", "w", "ir", 2);
20176 return ret;
20177- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20178+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20179 ret, "l", "k", "ir", 4);
20180 return ret;
20181- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20182+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20183 ret, "q", "", "er", 8);
20184 return ret;
20185 case 10:
20186- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20187+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20188 ret, "q", "", "er", 10);
20189 if (unlikely(ret))
20190 return ret;
20191 asm("":::"memory");
20192- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20193+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20194 ret, "w", "w", "ir", 2);
20195 return ret;
20196 case 16:
20197- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20198+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20199 ret, "q", "", "er", 16);
20200 if (unlikely(ret))
20201 return ret;
20202 asm("":::"memory");
20203- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20204+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20205 ret, "q", "", "er", 8);
20206 return ret;
20207 default:
20208- return copy_user_generic((__force void *)dst, src, size);
20209+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20210 }
20211 }
20212
20213 static __always_inline __must_check
20214-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20215+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20216 {
20217 might_fault();
20218 return __copy_to_user_nocheck(dst, src, size);
20219 }
20220
20221 static __always_inline __must_check
20222-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20223+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20224 {
20225- int ret = 0;
20226+ unsigned ret = 0;
20227
20228 might_fault();
20229+
20230+ if (size > INT_MAX)
20231+ return size;
20232+
20233+#ifdef CONFIG_PAX_MEMORY_UDEREF
20234+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20235+ return size;
20236+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20237+ return size;
20238+#endif
20239+
20240 if (!__builtin_constant_p(size))
20241- return copy_user_generic((__force void *)dst,
20242- (__force void *)src, size);
20243+ return copy_user_generic((__force_kernel void *)____m(dst),
20244+ (__force_kernel const void *)____m(src), size);
20245 switch (size) {
20246 case 1: {
20247 u8 tmp;
20248- __get_user_asm(tmp, (u8 __user *)src,
20249+ __get_user_asm(tmp, (const u8 __user *)src,
20250 ret, "b", "b", "=q", 1);
20251 if (likely(!ret))
20252 __put_user_asm(tmp, (u8 __user *)dst,
20253@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20254 }
20255 case 2: {
20256 u16 tmp;
20257- __get_user_asm(tmp, (u16 __user *)src,
20258+ __get_user_asm(tmp, (const u16 __user *)src,
20259 ret, "w", "w", "=r", 2);
20260 if (likely(!ret))
20261 __put_user_asm(tmp, (u16 __user *)dst,
20262@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20263
20264 case 4: {
20265 u32 tmp;
20266- __get_user_asm(tmp, (u32 __user *)src,
20267+ __get_user_asm(tmp, (const u32 __user *)src,
20268 ret, "l", "k", "=r", 4);
20269 if (likely(!ret))
20270 __put_user_asm(tmp, (u32 __user *)dst,
20271@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20272 }
20273 case 8: {
20274 u64 tmp;
20275- __get_user_asm(tmp, (u64 __user *)src,
20276+ __get_user_asm(tmp, (const u64 __user *)src,
20277 ret, "q", "", "=r", 8);
20278 if (likely(!ret))
20279 __put_user_asm(tmp, (u64 __user *)dst,
20280@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20281 return ret;
20282 }
20283 default:
20284- return copy_user_generic((__force void *)dst,
20285- (__force void *)src, size);
20286+ return copy_user_generic((__force_kernel void *)____m(dst),
20287+ (__force_kernel const void *)____m(src), size);
20288 }
20289 }
20290
20291-static __must_check __always_inline int
20292-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20293+static __must_check __always_inline unsigned long
20294+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20295 {
20296 return __copy_from_user_nocheck(dst, src, size);
20297 }
20298
20299-static __must_check __always_inline int
20300-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20301+static __must_check __always_inline unsigned long
20302+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20303 {
20304 return __copy_to_user_nocheck(dst, src, size);
20305 }
20306
20307-extern long __copy_user_nocache(void *dst, const void __user *src,
20308- unsigned size, int zerorest);
20309+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20310+ unsigned long size, int zerorest);
20311
20312-static inline int
20313-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20314+static inline unsigned long
20315+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20316 {
20317 might_fault();
20318+
20319+ if (size > INT_MAX)
20320+ return size;
20321+
20322+#ifdef CONFIG_PAX_MEMORY_UDEREF
20323+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20324+ return size;
20325+#endif
20326+
20327 return __copy_user_nocache(dst, src, size, 1);
20328 }
20329
20330-static inline int
20331+static inline unsigned long
20332 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20333- unsigned size)
20334+ unsigned long size)
20335 {
20336+ if (size > INT_MAX)
20337+ return size;
20338+
20339+#ifdef CONFIG_PAX_MEMORY_UDEREF
20340+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20341+ return size;
20342+#endif
20343+
20344 return __copy_user_nocache(dst, src, size, 0);
20345 }
20346
20347 unsigned long
20348-copy_user_handle_tail(char *to, char *from, unsigned len);
20349+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20350
20351 #endif /* _ASM_X86_UACCESS_64_H */
20352diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20353index 5b238981..77fdd78 100644
20354--- a/arch/x86/include/asm/word-at-a-time.h
20355+++ b/arch/x86/include/asm/word-at-a-time.h
20356@@ -11,7 +11,7 @@
20357 * and shift, for example.
20358 */
20359 struct word_at_a_time {
20360- const unsigned long one_bits, high_bits;
20361+ unsigned long one_bits, high_bits;
20362 };
20363
20364 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20365diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20366index f58a9c7..dc378042a 100644
20367--- a/arch/x86/include/asm/x86_init.h
20368+++ b/arch/x86/include/asm/x86_init.h
20369@@ -129,7 +129,7 @@ struct x86_init_ops {
20370 struct x86_init_timers timers;
20371 struct x86_init_iommu iommu;
20372 struct x86_init_pci pci;
20373-};
20374+} __no_const;
20375
20376 /**
20377 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20378@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20379 void (*setup_percpu_clockev)(void);
20380 void (*early_percpu_clock_init)(void);
20381 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20382-};
20383+} __no_const;
20384
20385 struct timespec;
20386
20387@@ -168,7 +168,7 @@ struct x86_platform_ops {
20388 void (*save_sched_clock_state)(void);
20389 void (*restore_sched_clock_state)(void);
20390 void (*apic_post_init)(void);
20391-};
20392+} __no_const;
20393
20394 struct pci_dev;
20395 struct msi_msg;
20396@@ -182,7 +182,7 @@ struct x86_msi_ops {
20397 void (*teardown_msi_irqs)(struct pci_dev *dev);
20398 void (*restore_msi_irqs)(struct pci_dev *dev);
20399 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20400-};
20401+} __no_const;
20402
20403 struct IO_APIC_route_entry;
20404 struct io_apic_irq_attr;
20405@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20406 unsigned int destination, int vector,
20407 struct io_apic_irq_attr *attr);
20408 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20409-};
20410+} __no_const;
20411
20412 extern struct x86_init_ops x86_init;
20413 extern struct x86_cpuinit_ops x86_cpuinit;
20414diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20415index c44a5d5..7f83cfc 100644
20416--- a/arch/x86/include/asm/xen/page.h
20417+++ b/arch/x86/include/asm/xen/page.h
20418@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20419 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20420 * cases needing an extended handling.
20421 */
20422-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20423+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20424 {
20425 unsigned long mfn;
20426
20427diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20428index c9a6d68..cb57f42 100644
20429--- a/arch/x86/include/asm/xsave.h
20430+++ b/arch/x86/include/asm/xsave.h
20431@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20432 if (unlikely(err))
20433 return -EFAULT;
20434
20435+ pax_open_userland();
20436 __asm__ __volatile__(ASM_STAC "\n"
20437- "1:"XSAVE"\n"
20438+ "1:"
20439+ __copyuser_seg
20440+ XSAVE"\n"
20441 "2: " ASM_CLAC "\n"
20442 xstate_fault
20443 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20444 : "memory");
20445+ pax_close_userland();
20446 return err;
20447 }
20448
20449@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20450 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20451 {
20452 int err = 0;
20453- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20454+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20455 u32 lmask = mask;
20456 u32 hmask = mask >> 32;
20457
20458+ pax_open_userland();
20459 __asm__ __volatile__(ASM_STAC "\n"
20460- "1:"XRSTOR"\n"
20461+ "1:"
20462+ __copyuser_seg
20463+ XRSTOR"\n"
20464 "2: " ASM_CLAC "\n"
20465 xstate_fault
20466 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20467 : "memory"); /* memory required? */
20468+ pax_close_userland();
20469 return err;
20470 }
20471
20472diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20473index 960a8a9..404daf7 100644
20474--- a/arch/x86/include/uapi/asm/e820.h
20475+++ b/arch/x86/include/uapi/asm/e820.h
20476@@ -68,7 +68,7 @@ struct e820map {
20477 #define ISA_START_ADDRESS 0xa0000
20478 #define ISA_END_ADDRESS 0x100000
20479
20480-#define BIOS_BEGIN 0x000a0000
20481+#define BIOS_BEGIN 0x000c0000
20482 #define BIOS_END 0x00100000
20483
20484 #define BIOS_ROM_BASE 0xffe00000
20485diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20486index 9bcd0b5..750f1b7 100644
20487--- a/arch/x86/kernel/Makefile
20488+++ b/arch/x86/kernel/Makefile
20489@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20490 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20491 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20492 obj-y += probe_roms.o
20493-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20494+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20495 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20496 obj-$(CONFIG_X86_64) += mcount_64.o
20497 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20498diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20499index dbe76a1..e2ec334 100644
20500--- a/arch/x86/kernel/acpi/boot.c
20501+++ b/arch/x86/kernel/acpi/boot.c
20502@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20503 * If your system is blacklisted here, but you find that acpi=force
20504 * works for you, please contact linux-acpi@vger.kernel.org
20505 */
20506-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20507+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20508 /*
20509 * Boxes that need ACPI disabled
20510 */
20511@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20512 };
20513
20514 /* second table for DMI checks that should run after early-quirks */
20515-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20516+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20517 /*
20518 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20519 * which includes some code which overrides all temperature
20520diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20521index d1daead..acd77e2 100644
20522--- a/arch/x86/kernel/acpi/sleep.c
20523+++ b/arch/x86/kernel/acpi/sleep.c
20524@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20525 #else /* CONFIG_64BIT */
20526 #ifdef CONFIG_SMP
20527 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20528+
20529+ pax_open_kernel();
20530 early_gdt_descr.address =
20531 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20532+ pax_close_kernel();
20533+
20534 initial_gs = per_cpu_offset(smp_processor_id());
20535 #endif
20536 initial_code = (unsigned long)wakeup_long64;
20537diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20538index 665c6b7..eae4d56 100644
20539--- a/arch/x86/kernel/acpi/wakeup_32.S
20540+++ b/arch/x86/kernel/acpi/wakeup_32.S
20541@@ -29,13 +29,11 @@ wakeup_pmode_return:
20542 # and restore the stack ... but you need gdt for this to work
20543 movl saved_context_esp, %esp
20544
20545- movl %cs:saved_magic, %eax
20546- cmpl $0x12345678, %eax
20547+ cmpl $0x12345678, saved_magic
20548 jne bogus_magic
20549
20550 # jump to place where we left off
20551- movl saved_eip, %eax
20552- jmp *%eax
20553+ jmp *(saved_eip)
20554
20555 bogus_magic:
20556 jmp bogus_magic
20557diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20558index aef6531..2044b66 100644
20559--- a/arch/x86/kernel/alternative.c
20560+++ b/arch/x86/kernel/alternative.c
20561@@ -248,7 +248,9 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
20562 unsigned int noplen = len;
20563 if (noplen > ASM_NOP_MAX)
20564 noplen = ASM_NOP_MAX;
20565+ pax_open_kernel();
20566 memcpy(insns, ideal_nops[noplen], noplen);
20567+ pax_close_kernel();
20568 insns += noplen;
20569 len -= noplen;
20570 }
20571@@ -276,6 +278,11 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf)
20572 if (a->replacementlen != 5)
20573 return;
20574
20575+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20576+ if (orig_insn < (u8 *)_text || (u8 *)_einittext <= orig_insn)
20577+ orig_insn = ktva_ktla(orig_insn);
20578+#endif
20579+
20580 o_dspl = *(s32 *)(insnbuf + 1);
20581
20582 /* next_rip of the replacement JMP */
20583@@ -362,7 +369,23 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20584 int insnbuf_sz = 0;
20585
20586 instr = (u8 *)&a->instr_offset + a->instr_offset;
20587+
20588+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20589+ if ((u8 *)_text <= instr && instr < (u8 *)_einittext) {
20590+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20591+ instr = ktla_ktva(instr);
20592+ }
20593+#endif
20594+
20595 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20596+
20597+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20598+ if ((u8 *)_text <= replacement && replacement < (u8 *)_einittext) {
20599+ replacement += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20600+ replacement = ktla_ktva(replacement);
20601+ }
20602+#endif
20603+
20604 BUG_ON(a->instrlen > sizeof(insnbuf));
20605 BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
20606 if (!boot_cpu_has(a->cpuid)) {
20607@@ -402,6 +425,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20608 }
20609 DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
20610
20611+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20612+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20613+ instr = ktva_ktla(instr);
20614+#endif
20615+
20616 text_poke_early(instr, insnbuf, insnbuf_sz);
20617 }
20618 }
20619@@ -416,10 +444,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20620 for (poff = start; poff < end; poff++) {
20621 u8 *ptr = (u8 *)poff + *poff;
20622
20623+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20624+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20625+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20626+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20627+#endif
20628+
20629 if (!*poff || ptr < text || ptr >= text_end)
20630 continue;
20631 /* turn DS segment override prefix into lock prefix */
20632- if (*ptr == 0x3e)
20633+ if (*ktla_ktva(ptr) == 0x3e)
20634 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20635 }
20636 mutex_unlock(&text_mutex);
20637@@ -434,10 +468,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20638 for (poff = start; poff < end; poff++) {
20639 u8 *ptr = (u8 *)poff + *poff;
20640
20641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20642+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20643+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20644+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 if (!*poff || ptr < text || ptr >= text_end)
20648 continue;
20649 /* turn lock prefix into DS segment override prefix */
20650- if (*ptr == 0xf0)
20651+ if (*ktla_ktva(ptr) == 0xf0)
20652 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20653 }
20654 mutex_unlock(&text_mutex);
20655@@ -574,7 +614,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20656
20657 BUG_ON(p->len > MAX_PATCH_LEN);
20658 /* prep the buffer with the original instructions */
20659- memcpy(insnbuf, p->instr, p->len);
20660+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20661 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20662 (unsigned long)p->instr, p->len);
20663
20664@@ -621,7 +661,7 @@ void __init alternative_instructions(void)
20665 if (!uniproc_patched || num_possible_cpus() == 1)
20666 free_init_pages("SMP alternatives",
20667 (unsigned long)__smp_locks,
20668- (unsigned long)__smp_locks_end);
20669+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20670 #endif
20671
20672 apply_paravirt(__parainstructions, __parainstructions_end);
20673@@ -641,13 +681,17 @@ void __init alternative_instructions(void)
20674 * instructions. And on the local CPU you need to be protected again NMI or MCE
20675 * handlers seeing an inconsistent instruction while you patch.
20676 */
20677-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20678+void *__kprobes text_poke_early(void *addr, const void *opcode,
20679 size_t len)
20680 {
20681 unsigned long flags;
20682 local_irq_save(flags);
20683- memcpy(addr, opcode, len);
20684+
20685+ pax_open_kernel();
20686+ memcpy(ktla_ktva(addr), opcode, len);
20687 sync_core();
20688+ pax_close_kernel();
20689+
20690 local_irq_restore(flags);
20691 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20692 that causes hangs on some VIA CPUs. */
20693@@ -669,36 +713,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20694 */
20695 void *text_poke(void *addr, const void *opcode, size_t len)
20696 {
20697- unsigned long flags;
20698- char *vaddr;
20699+ unsigned char *vaddr = ktla_ktva(addr);
20700 struct page *pages[2];
20701- int i;
20702+ size_t i;
20703
20704 if (!core_kernel_text((unsigned long)addr)) {
20705- pages[0] = vmalloc_to_page(addr);
20706- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20707+ pages[0] = vmalloc_to_page(vaddr);
20708+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20709 } else {
20710- pages[0] = virt_to_page(addr);
20711+ pages[0] = virt_to_page(vaddr);
20712 WARN_ON(!PageReserved(pages[0]));
20713- pages[1] = virt_to_page(addr + PAGE_SIZE);
20714+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20715 }
20716 BUG_ON(!pages[0]);
20717- local_irq_save(flags);
20718- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20719- if (pages[1])
20720- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20721- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20722- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20723- clear_fixmap(FIX_TEXT_POKE0);
20724- if (pages[1])
20725- clear_fixmap(FIX_TEXT_POKE1);
20726- local_flush_tlb();
20727- sync_core();
20728- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20729- that causes hangs on some VIA CPUs. */
20730+ text_poke_early(addr, opcode, len);
20731 for (i = 0; i < len; i++)
20732- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20733- local_irq_restore(flags);
20734+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20735 return addr;
20736 }
20737
20738@@ -752,7 +782,7 @@ int poke_int3_handler(struct pt_regs *regs)
20739 */
20740 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20741 {
20742- unsigned char int3 = 0xcc;
20743+ const unsigned char int3 = 0xcc;
20744
20745 bp_int3_handler = handler;
20746 bp_int3_addr = (u8 *)addr + sizeof(int3);
20747diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20748index dcb5285..cc79e9d 100644
20749--- a/arch/x86/kernel/apic/apic.c
20750+++ b/arch/x86/kernel/apic/apic.c
20751@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20752 /*
20753 * Debug level, exported for io_apic.c
20754 */
20755-unsigned int apic_verbosity;
20756+int apic_verbosity;
20757
20758 int pic_mode;
20759
20760@@ -1857,7 +1857,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20761 apic_write(APIC_ESR, 0);
20762 v = apic_read(APIC_ESR);
20763 ack_APIC_irq();
20764- atomic_inc(&irq_err_count);
20765+ atomic_inc_unchecked(&irq_err_count);
20766
20767 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20768 smp_processor_id(), v);
20769diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20770index de918c4..32eed23 100644
20771--- a/arch/x86/kernel/apic/apic_flat_64.c
20772+++ b/arch/x86/kernel/apic/apic_flat_64.c
20773@@ -154,7 +154,7 @@ static int flat_probe(void)
20774 return 1;
20775 }
20776
20777-static struct apic apic_flat = {
20778+static struct apic apic_flat __read_only = {
20779 .name = "flat",
20780 .probe = flat_probe,
20781 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20782@@ -260,7 +260,7 @@ static int physflat_probe(void)
20783 return 0;
20784 }
20785
20786-static struct apic apic_physflat = {
20787+static struct apic apic_physflat __read_only = {
20788
20789 .name = "physical flat",
20790 .probe = physflat_probe,
20791diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20792index b205cdb..d8503ff 100644
20793--- a/arch/x86/kernel/apic/apic_noop.c
20794+++ b/arch/x86/kernel/apic/apic_noop.c
20795@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20796 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20797 }
20798
20799-struct apic apic_noop = {
20800+struct apic apic_noop __read_only = {
20801 .name = "noop",
20802 .probe = noop_probe,
20803 .acpi_madt_oem_check = NULL,
20804diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20805index c4a8d63..fe893ac 100644
20806--- a/arch/x86/kernel/apic/bigsmp_32.c
20807+++ b/arch/x86/kernel/apic/bigsmp_32.c
20808@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20809 return dmi_bigsmp;
20810 }
20811
20812-static struct apic apic_bigsmp = {
20813+static struct apic apic_bigsmp __read_only = {
20814
20815 .name = "bigsmp",
20816 .probe = probe_bigsmp,
20817diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20818index f4dc246..fbab133 100644
20819--- a/arch/x86/kernel/apic/io_apic.c
20820+++ b/arch/x86/kernel/apic/io_apic.c
20821@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20822 return ret;
20823 }
20824
20825-atomic_t irq_mis_count;
20826+atomic_unchecked_t irq_mis_count;
20827
20828 #ifdef CONFIG_GENERIC_PENDING_IRQ
20829 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20830@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20831 * at the cpu.
20832 */
20833 if (!(v & (1 << (i & 0x1f)))) {
20834- atomic_inc(&irq_mis_count);
20835+ atomic_inc_unchecked(&irq_mis_count);
20836
20837 eoi_ioapic_irq(irq, cfg);
20838 }
20839@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20840 ioapic_irqd_unmask(data, cfg, masked);
20841 }
20842
20843-static struct irq_chip ioapic_chip __read_mostly = {
20844+static struct irq_chip ioapic_chip = {
20845 .name = "IO-APIC",
20846 .irq_startup = startup_ioapic_irq,
20847 .irq_mask = mask_ioapic_irq,
20848@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20849 ack_APIC_irq();
20850 }
20851
20852-static struct irq_chip lapic_chip __read_mostly = {
20853+static struct irq_chip lapic_chip = {
20854 .name = "local-APIC",
20855 .irq_mask = mask_lapic_irq,
20856 .irq_unmask = unmask_lapic_irq,
20857diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20858index bda4886..f9c7195 100644
20859--- a/arch/x86/kernel/apic/probe_32.c
20860+++ b/arch/x86/kernel/apic/probe_32.c
20861@@ -72,7 +72,7 @@ static int probe_default(void)
20862 return 1;
20863 }
20864
20865-static struct apic apic_default = {
20866+static struct apic apic_default __read_only = {
20867
20868 .name = "default",
20869 .probe = probe_default,
20870diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20871index 6cedd79..023ff8e 100644
20872--- a/arch/x86/kernel/apic/vector.c
20873+++ b/arch/x86/kernel/apic/vector.c
20874@@ -21,7 +21,7 @@
20875
20876 static DEFINE_RAW_SPINLOCK(vector_lock);
20877
20878-void lock_vector_lock(void)
20879+void lock_vector_lock(void) __acquires(vector_lock)
20880 {
20881 /* Used to the online set of cpus does not change
20882 * during assign_irq_vector.
20883@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20884 raw_spin_lock(&vector_lock);
20885 }
20886
20887-void unlock_vector_lock(void)
20888+void unlock_vector_lock(void) __releases(vector_lock)
20889 {
20890 raw_spin_unlock(&vector_lock);
20891 }
20892diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20893index ab3219b..e8033eb 100644
20894--- a/arch/x86/kernel/apic/x2apic_cluster.c
20895+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20896@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20897 return notifier_from_errno(err);
20898 }
20899
20900-static struct notifier_block __refdata x2apic_cpu_notifier = {
20901+static struct notifier_block x2apic_cpu_notifier = {
20902 .notifier_call = update_clusterinfo,
20903 };
20904
20905@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20906 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20907 }
20908
20909-static struct apic apic_x2apic_cluster = {
20910+static struct apic apic_x2apic_cluster __read_only = {
20911
20912 .name = "cluster x2apic",
20913 .probe = x2apic_cluster_probe,
20914diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20915index 6fae733..5ca17af 100644
20916--- a/arch/x86/kernel/apic/x2apic_phys.c
20917+++ b/arch/x86/kernel/apic/x2apic_phys.c
20918@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20919 return apic == &apic_x2apic_phys;
20920 }
20921
20922-static struct apic apic_x2apic_phys = {
20923+static struct apic apic_x2apic_phys __read_only = {
20924
20925 .name = "physical x2apic",
20926 .probe = x2apic_phys_probe,
20927diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20928index c8d9295..9af2d03 100644
20929--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20930+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20931@@ -375,7 +375,7 @@ static int uv_probe(void)
20932 return apic == &apic_x2apic_uv_x;
20933 }
20934
20935-static struct apic __refdata apic_x2apic_uv_x = {
20936+static struct apic apic_x2apic_uv_x __read_only = {
20937
20938 .name = "UV large system",
20939 .probe = uv_probe,
20940diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20941index 927ec92..de68f32 100644
20942--- a/arch/x86/kernel/apm_32.c
20943+++ b/arch/x86/kernel/apm_32.c
20944@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20945 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20946 * even though they are called in protected mode.
20947 */
20948-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20949+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20950 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20951
20952 static const char driver_version[] = "1.16ac"; /* no spaces */
20953@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
20954 BUG_ON(cpu != 0);
20955 gdt = get_cpu_gdt_table(cpu);
20956 save_desc_40 = gdt[0x40 / 8];
20957+
20958+ pax_open_kernel();
20959 gdt[0x40 / 8] = bad_bios_desc;
20960+ pax_close_kernel();
20961
20962 apm_irq_save(flags);
20963 APM_DO_SAVE_SEGS;
20964@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
20965 &call->esi);
20966 APM_DO_RESTORE_SEGS;
20967 apm_irq_restore(flags);
20968+
20969+ pax_open_kernel();
20970 gdt[0x40 / 8] = save_desc_40;
20971+ pax_close_kernel();
20972+
20973 put_cpu();
20974
20975 return call->eax & 0xff;
20976@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
20977 BUG_ON(cpu != 0);
20978 gdt = get_cpu_gdt_table(cpu);
20979 save_desc_40 = gdt[0x40 / 8];
20980+
20981+ pax_open_kernel();
20982 gdt[0x40 / 8] = bad_bios_desc;
20983+ pax_close_kernel();
20984
20985 apm_irq_save(flags);
20986 APM_DO_SAVE_SEGS;
20987@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
20988 &call->eax);
20989 APM_DO_RESTORE_SEGS;
20990 apm_irq_restore(flags);
20991+
20992+ pax_open_kernel();
20993 gdt[0x40 / 8] = save_desc_40;
20994+ pax_close_kernel();
20995+
20996 put_cpu();
20997 return error;
20998 }
20999@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21000 return 0;
21001 }
21002
21003-static struct dmi_system_id __initdata apm_dmi_table[] = {
21004+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21005 {
21006 print_if_true,
21007 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21008@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21009 * code to that CPU.
21010 */
21011 gdt = get_cpu_gdt_table(0);
21012+
21013+ pax_open_kernel();
21014 set_desc_base(&gdt[APM_CS >> 3],
21015 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21016 set_desc_base(&gdt[APM_CS_16 >> 3],
21017 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21018 set_desc_base(&gdt[APM_DS >> 3],
21019 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21020+ pax_close_kernel();
21021
21022 proc_create("apm", 0, NULL, &apm_file_ops);
21023
21024diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21025index 9f6b934..cf5ffb3 100644
21026--- a/arch/x86/kernel/asm-offsets.c
21027+++ b/arch/x86/kernel/asm-offsets.c
21028@@ -32,6 +32,8 @@ void common(void) {
21029 OFFSET(TI_flags, thread_info, flags);
21030 OFFSET(TI_status, thread_info, status);
21031 OFFSET(TI_addr_limit, thread_info, addr_limit);
21032+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21033+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21034
21035 BLANK();
21036 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21037@@ -52,8 +54,26 @@ void common(void) {
21038 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21039 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21040 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21041+
21042+#ifdef CONFIG_PAX_KERNEXEC
21043+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21044 #endif
21045
21046+#ifdef CONFIG_PAX_MEMORY_UDEREF
21047+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21048+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21049+#ifdef CONFIG_X86_64
21050+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21051+#endif
21052+#endif
21053+
21054+#endif
21055+
21056+ BLANK();
21057+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21058+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21059+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21060+
21061 #ifdef CONFIG_XEN
21062 BLANK();
21063 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21064diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21065index 5ce6f2d..9e738f3 100644
21066--- a/arch/x86/kernel/asm-offsets_64.c
21067+++ b/arch/x86/kernel/asm-offsets_64.c
21068@@ -80,6 +80,7 @@ int main(void)
21069 BLANK();
21070 #undef ENTRY
21071
21072+ DEFINE(TSS_size, sizeof(struct tss_struct));
21073 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21074 OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
21075 BLANK();
21076diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21077index 9bff687..5b899fb 100644
21078--- a/arch/x86/kernel/cpu/Makefile
21079+++ b/arch/x86/kernel/cpu/Makefile
21080@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21081 CFLAGS_REMOVE_perf_event.o = -pg
21082 endif
21083
21084-# Make sure load_percpu_segment has no stackprotector
21085-nostackp := $(call cc-option, -fno-stack-protector)
21086-CFLAGS_common.o := $(nostackp)
21087-
21088 obj-y := intel_cacheinfo.o scattered.o topology.o
21089 obj-y += common.o
21090 obj-y += rdrand.o
21091diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21092index e4cf633..941f450 100644
21093--- a/arch/x86/kernel/cpu/amd.c
21094+++ b/arch/x86/kernel/cpu/amd.c
21095@@ -729,7 +729,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21096 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21097 {
21098 /* AMD errata T13 (order #21922) */
21099- if ((c->x86 == 6)) {
21100+ if (c->x86 == 6) {
21101 /* Duron Rev A0 */
21102 if (c->x86_model == 3 && c->x86_mask == 0)
21103 size = 64;
21104diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21105index a62cf04..69a13ee 100644
21106--- a/arch/x86/kernel/cpu/common.c
21107+++ b/arch/x86/kernel/cpu/common.c
21108@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21109
21110 static const struct cpu_dev *this_cpu = &default_cpu;
21111
21112-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21113-#ifdef CONFIG_X86_64
21114- /*
21115- * We need valid kernel segments for data and code in long mode too
21116- * IRET will check the segment types kkeil 2000/10/28
21117- * Also sysret mandates a special GDT layout
21118- *
21119- * TLS descriptors are currently at a different place compared to i386.
21120- * Hopefully nobody expects them at a fixed place (Wine?)
21121- */
21122- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21123- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21124- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21125- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21126- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21127- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21128-#else
21129- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21130- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21131- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21132- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21133- /*
21134- * Segments used for calling PnP BIOS have byte granularity.
21135- * They code segments and data segments have fixed 64k limits,
21136- * the transfer segment sizes are set at run time.
21137- */
21138- /* 32-bit code */
21139- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21140- /* 16-bit code */
21141- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21142- /* 16-bit data */
21143- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21144- /* 16-bit data */
21145- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21146- /* 16-bit data */
21147- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21148- /*
21149- * The APM segments have byte granularity and their bases
21150- * are set at run time. All have 64k limits.
21151- */
21152- /* 32-bit code */
21153- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21154- /* 16-bit code */
21155- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21156- /* data */
21157- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21158-
21159- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21160- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21161- GDT_STACK_CANARY_INIT
21162-#endif
21163-} };
21164-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21165-
21166 static int __init x86_xsave_setup(char *s)
21167 {
21168 if (strlen(s))
21169@@ -306,6 +252,60 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21170 }
21171 }
21172
21173+#ifdef CONFIG_X86_64
21174+static __init int setup_disable_pcid(char *arg)
21175+{
21176+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21177+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21178+
21179+#ifdef CONFIG_PAX_MEMORY_UDEREF
21180+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21181+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21182+#endif
21183+
21184+ return 1;
21185+}
21186+__setup("nopcid", setup_disable_pcid);
21187+
21188+static void setup_pcid(struct cpuinfo_x86 *c)
21189+{
21190+ if (cpu_has(c, X86_FEATURE_PCID)) {
21191+ printk("PAX: PCID detected\n");
21192+ cr4_set_bits(X86_CR4_PCIDE);
21193+ } else
21194+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21195+
21196+ if (cpu_has(c, X86_FEATURE_INVPCID))
21197+ printk("PAX: INVPCID detected\n");
21198+
21199+#ifdef CONFIG_PAX_MEMORY_UDEREF
21200+ if (clone_pgd_mask == ~(pgdval_t)0UL) {
21201+ printk("PAX: UDEREF disabled\n");
21202+ return;
21203+ }
21204+
21205+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21206+ pax_open_kernel();
21207+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21208+ pax_close_kernel();
21209+ printk("PAX: slow and weak UDEREF enabled\n");
21210+ return;
21211+ }
21212+
21213+ pax_open_kernel();
21214+ clone_pgd_mask = ~(pgdval_t)0UL;
21215+ pax_close_kernel();
21216+ if (pax_user_shadow_base)
21217+ printk("PAX: weak UDEREF enabled\n");
21218+ else {
21219+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21220+ printk("PAX: strong UDEREF enabled\n");
21221+ }
21222+#endif
21223+
21224+}
21225+#endif
21226+
21227 /*
21228 * Some CPU features depend on higher CPUID levels, which may not always
21229 * be available due to CPUID level capping or broken virtualization
21230@@ -406,7 +406,7 @@ void switch_to_new_gdt(int cpu)
21231 {
21232 struct desc_ptr gdt_descr;
21233
21234- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21235+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21236 gdt_descr.size = GDT_SIZE - 1;
21237 load_gdt(&gdt_descr);
21238 /* Reload the per-cpu base */
21239@@ -935,6 +935,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21240 setup_smep(c);
21241 setup_smap(c);
21242
21243+#ifdef CONFIG_X86_32
21244+#ifdef CONFIG_PAX_PAGEEXEC
21245+ if (!(__supported_pte_mask & _PAGE_NX))
21246+ clear_cpu_cap(c, X86_FEATURE_PSE);
21247+#endif
21248+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21249+ clear_cpu_cap(c, X86_FEATURE_SEP);
21250+#endif
21251+#endif
21252+
21253+#ifdef CONFIG_X86_64
21254+ setup_pcid(c);
21255+#endif
21256+
21257 /*
21258 * The vendor-specific functions might have changed features.
21259 * Now we do "generic changes."
21260@@ -1009,7 +1023,7 @@ void enable_sep_cpu(void)
21261 int cpu;
21262
21263 cpu = get_cpu();
21264- tss = &per_cpu(cpu_tss, cpu);
21265+ tss = cpu_tss + cpu;
21266
21267 if (!boot_cpu_has(X86_FEATURE_SEP))
21268 goto out;
21269@@ -1155,14 +1169,16 @@ static __init int setup_disablecpuid(char *arg)
21270 }
21271 __setup("clearcpuid=", setup_disablecpuid);
21272
21273+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21274+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21275+
21276 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21277- (unsigned long)&init_thread_union + THREAD_SIZE;
21278+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21279 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21280
21281 #ifdef CONFIG_X86_64
21282-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21283-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21284- (unsigned long) debug_idt_table };
21285+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21286+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21287
21288 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21289 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21290@@ -1367,7 +1383,7 @@ void cpu_init(void)
21291 */
21292 load_ucode_ap();
21293
21294- t = &per_cpu(cpu_tss, cpu);
21295+ t = cpu_tss + cpu;
21296 oist = &per_cpu(orig_ist, cpu);
21297
21298 #ifdef CONFIG_NUMA
21299@@ -1399,7 +1415,6 @@ void cpu_init(void)
21300 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21301 barrier();
21302
21303- x86_configure_nx();
21304 x2apic_setup();
21305
21306 /*
21307@@ -1451,7 +1466,7 @@ void cpu_init(void)
21308 {
21309 int cpu = smp_processor_id();
21310 struct task_struct *curr = current;
21311- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
21312+ struct tss_struct *t = cpu_tss + cpu;
21313 struct thread_struct *thread = &curr->thread;
21314
21315 wait_for_master_cpu(cpu);
21316diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21317index edcb0e2..a138233 100644
21318--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21319+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21320@@ -519,25 +519,23 @@ cache_private_attrs_is_visible(struct kobject *kobj,
21321 return 0;
21322 }
21323
21324+static struct attribute *amd_l3_attrs[4];
21325+
21326 static struct attribute_group cache_private_group = {
21327 .is_visible = cache_private_attrs_is_visible,
21328+ .attrs = amd_l3_attrs,
21329 };
21330
21331 static void init_amd_l3_attrs(void)
21332 {
21333 int n = 1;
21334- static struct attribute **amd_l3_attrs;
21335-
21336- if (amd_l3_attrs) /* already initialized */
21337- return;
21338
21339 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21340 n += 2;
21341 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21342 n += 1;
21343
21344- amd_l3_attrs = kcalloc(n, sizeof(*amd_l3_attrs), GFP_KERNEL);
21345- if (!amd_l3_attrs)
21346+ if (n > 1 && amd_l3_attrs[0]) /* already initialized */
21347 return;
21348
21349 n = 0;
21350@@ -547,8 +545,6 @@ static void init_amd_l3_attrs(void)
21351 }
21352 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21353 amd_l3_attrs[n++] = &dev_attr_subcaches.attr;
21354-
21355- cache_private_group.attrs = amd_l3_attrs;
21356 }
21357
21358 const struct attribute_group *
21359@@ -559,7 +555,7 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
21360 if (this_leaf->level < 3 || !nb)
21361 return NULL;
21362
21363- if (nb && nb->l3_cache.indices)
21364+ if (nb->l3_cache.indices)
21365 init_amd_l3_attrs();
21366
21367 return &cache_private_group;
21368diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21369index 20190bd..cadb2ab 100644
21370--- a/arch/x86/kernel/cpu/mcheck/mce.c
21371+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21372@@ -47,6 +47,7 @@
21373 #include <asm/tlbflush.h>
21374 #include <asm/mce.h>
21375 #include <asm/msr.h>
21376+#include <asm/local.h>
21377
21378 #include "mce-internal.h"
21379
21380@@ -256,7 +257,7 @@ static void print_mce(struct mce *m)
21381 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21382 m->cs, m->ip);
21383
21384- if (m->cs == __KERNEL_CS)
21385+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21386 print_symbol("{%s}", m->ip);
21387 pr_cont("\n");
21388 }
21389@@ -289,10 +290,10 @@ static void print_mce(struct mce *m)
21390
21391 #define PANIC_TIMEOUT 5 /* 5 seconds */
21392
21393-static atomic_t mce_panicked;
21394+static atomic_unchecked_t mce_panicked;
21395
21396 static int fake_panic;
21397-static atomic_t mce_fake_panicked;
21398+static atomic_unchecked_t mce_fake_panicked;
21399
21400 /* Panic in progress. Enable interrupts and wait for final IPI */
21401 static void wait_for_panic(void)
21402@@ -316,7 +317,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21403 /*
21404 * Make sure only one CPU runs in machine check panic
21405 */
21406- if (atomic_inc_return(&mce_panicked) > 1)
21407+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21408 wait_for_panic();
21409 barrier();
21410
21411@@ -324,7 +325,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21412 console_verbose();
21413 } else {
21414 /* Don't log too much for fake panic */
21415- if (atomic_inc_return(&mce_fake_panicked) > 1)
21416+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21417 return;
21418 }
21419 /* First print corrected ones that are still unlogged */
21420@@ -363,7 +364,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21421 if (!fake_panic) {
21422 if (panic_timeout == 0)
21423 panic_timeout = mca_cfg.panic_timeout;
21424- panic(msg);
21425+ panic("%s", msg);
21426 } else
21427 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21428 }
21429@@ -749,7 +750,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21430 * might have been modified by someone else.
21431 */
21432 rmb();
21433- if (atomic_read(&mce_panicked))
21434+ if (atomic_read_unchecked(&mce_panicked))
21435 wait_for_panic();
21436 if (!mca_cfg.monarch_timeout)
21437 goto out;
21438@@ -1679,7 +1680,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21439 }
21440
21441 /* Call the installed machine check handler for this CPU setup. */
21442-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21443+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21444 unexpected_machine_check;
21445
21446 /*
21447@@ -1702,7 +1703,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21448 return;
21449 }
21450
21451+ pax_open_kernel();
21452 machine_check_vector = do_machine_check;
21453+ pax_close_kernel();
21454
21455 __mcheck_cpu_init_generic();
21456 __mcheck_cpu_init_vendor(c);
21457@@ -1716,7 +1719,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21458 */
21459
21460 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21461-static int mce_chrdev_open_count; /* #times opened */
21462+static local_t mce_chrdev_open_count; /* #times opened */
21463 static int mce_chrdev_open_exclu; /* already open exclusive? */
21464
21465 static int mce_chrdev_open(struct inode *inode, struct file *file)
21466@@ -1724,7 +1727,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21467 spin_lock(&mce_chrdev_state_lock);
21468
21469 if (mce_chrdev_open_exclu ||
21470- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21471+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21472 spin_unlock(&mce_chrdev_state_lock);
21473
21474 return -EBUSY;
21475@@ -1732,7 +1735,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21476
21477 if (file->f_flags & O_EXCL)
21478 mce_chrdev_open_exclu = 1;
21479- mce_chrdev_open_count++;
21480+ local_inc(&mce_chrdev_open_count);
21481
21482 spin_unlock(&mce_chrdev_state_lock);
21483
21484@@ -1743,7 +1746,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21485 {
21486 spin_lock(&mce_chrdev_state_lock);
21487
21488- mce_chrdev_open_count--;
21489+ local_dec(&mce_chrdev_open_count);
21490 mce_chrdev_open_exclu = 0;
21491
21492 spin_unlock(&mce_chrdev_state_lock);
21493@@ -2419,7 +2422,7 @@ static __init void mce_init_banks(void)
21494
21495 for (i = 0; i < mca_cfg.banks; i++) {
21496 struct mce_bank *b = &mce_banks[i];
21497- struct device_attribute *a = &b->attr;
21498+ device_attribute_no_const *a = &b->attr;
21499
21500 sysfs_attr_init(&a->attr);
21501 a->attr.name = b->attrname;
21502@@ -2526,7 +2529,7 @@ struct dentry *mce_get_debugfs_dir(void)
21503 static void mce_reset(void)
21504 {
21505 cpu_missing = 0;
21506- atomic_set(&mce_fake_panicked, 0);
21507+ atomic_set_unchecked(&mce_fake_panicked, 0);
21508 atomic_set(&mce_executing, 0);
21509 atomic_set(&mce_callin, 0);
21510 atomic_set(&global_nwo, 0);
21511diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21512index 737b0ad..09ec66e 100644
21513--- a/arch/x86/kernel/cpu/mcheck/p5.c
21514+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21515@@ -12,6 +12,7 @@
21516 #include <asm/tlbflush.h>
21517 #include <asm/mce.h>
21518 #include <asm/msr.h>
21519+#include <asm/pgtable.h>
21520
21521 /* By default disabled */
21522 int mce_p5_enabled __read_mostly;
21523@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21524 if (!cpu_has(c, X86_FEATURE_MCE))
21525 return;
21526
21527+ pax_open_kernel();
21528 machine_check_vector = pentium_machine_check;
21529+ pax_close_kernel();
21530 /* Make sure the vector pointer is visible before we enable MCEs: */
21531 wmb();
21532
21533diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21534index 44f1382..315b292 100644
21535--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21536+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21537@@ -11,6 +11,7 @@
21538 #include <asm/tlbflush.h>
21539 #include <asm/mce.h>
21540 #include <asm/msr.h>
21541+#include <asm/pgtable.h>
21542
21543 /* Machine check handler for WinChip C6: */
21544 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21545@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21546 {
21547 u32 lo, hi;
21548
21549+ pax_open_kernel();
21550 machine_check_vector = winchip_machine_check;
21551+ pax_close_kernel();
21552 /* Make sure the vector pointer is visible before we enable MCEs: */
21553 wmb();
21554
21555diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21556index 36a8361..e7058c2 100644
21557--- a/arch/x86/kernel/cpu/microcode/core.c
21558+++ b/arch/x86/kernel/cpu/microcode/core.c
21559@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21560 return NOTIFY_OK;
21561 }
21562
21563-static struct notifier_block __refdata mc_cpu_notifier = {
21564+static struct notifier_block mc_cpu_notifier = {
21565 .notifier_call = mc_cpu_callback,
21566 };
21567
21568diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21569index a41bead..4e3685b 100644
21570--- a/arch/x86/kernel/cpu/microcode/intel.c
21571+++ b/arch/x86/kernel/cpu/microcode/intel.c
21572@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21573
21574 static int get_ucode_user(void *to, const void *from, size_t n)
21575 {
21576- return copy_from_user(to, from, n);
21577+ return copy_from_user(to, (const void __force_user *)from, n);
21578 }
21579
21580 static enum ucode_state
21581 request_microcode_user(int cpu, const void __user *buf, size_t size)
21582 {
21583- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21584+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21585 }
21586
21587 static void microcode_fini_cpu(int cpu)
21588diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21589index ea5f363..cb0e905 100644
21590--- a/arch/x86/kernel/cpu/mtrr/main.c
21591+++ b/arch/x86/kernel/cpu/mtrr/main.c
21592@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21593 u64 size_or_mask, size_and_mask;
21594 static bool mtrr_aps_delayed_init;
21595
21596-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21597+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21598
21599 const struct mtrr_ops *mtrr_if;
21600
21601diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21602index df5e41f..816c719 100644
21603--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21604+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21605@@ -25,7 +25,7 @@ struct mtrr_ops {
21606 int (*validate_add_page)(unsigned long base, unsigned long size,
21607 unsigned int type);
21608 int (*have_wrcomb)(void);
21609-};
21610+} __do_const;
21611
21612 extern int generic_get_free_region(unsigned long base, unsigned long size,
21613 int replace_reg);
21614diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21615index aa4e3a7..469370f 100644
21616--- a/arch/x86/kernel/cpu/perf_event.c
21617+++ b/arch/x86/kernel/cpu/perf_event.c
21618@@ -1509,7 +1509,7 @@ static void __init pmu_check_apic(void)
21619
21620 }
21621
21622-static struct attribute_group x86_pmu_format_group = {
21623+static attribute_group_no_const x86_pmu_format_group = {
21624 .name = "format",
21625 .attrs = NULL,
21626 };
21627@@ -1608,7 +1608,7 @@ static struct attribute *events_attr[] = {
21628 NULL,
21629 };
21630
21631-static struct attribute_group x86_pmu_events_group = {
21632+static attribute_group_no_const x86_pmu_events_group = {
21633 .name = "events",
21634 .attrs = events_attr,
21635 };
21636@@ -2181,7 +2181,7 @@ static unsigned long get_segment_base(unsigned int segment)
21637 if (idx > GDT_ENTRIES)
21638 return 0;
21639
21640- desc = raw_cpu_ptr(gdt_page.gdt);
21641+ desc = get_cpu_gdt_table(smp_processor_id());
21642 }
21643
21644 return get_desc_base(desc + idx);
21645@@ -2271,7 +2271,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21646 break;
21647
21648 perf_callchain_store(entry, frame.return_address);
21649- fp = frame.next_frame;
21650+ fp = (const void __force_user *)frame.next_frame;
21651 }
21652 }
21653
21654diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21655index 97242a9..cf9c30e 100644
21656--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21657+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21658@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21659 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21660 {
21661 struct attribute **attrs;
21662- struct attribute_group *attr_group;
21663+ attribute_group_no_const *attr_group;
21664 int i = 0, j;
21665
21666 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21667diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21668index 2813ea0..3ef5969c8 100644
21669--- a/arch/x86/kernel/cpu/perf_event_intel.c
21670+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21671@@ -3033,10 +3033,10 @@ __init int intel_pmu_init(void)
21672 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21673
21674 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21675- u64 capabilities;
21676+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21677
21678- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21679- x86_pmu.intel_cap.capabilities = capabilities;
21680+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21681+ x86_pmu.intel_cap.capabilities = capabilities;
21682 }
21683
21684 intel_ds_init();
21685diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21686index 7795f3f..3535b76 100644
21687--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
21688+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21689@@ -252,7 +252,7 @@ static void bts_event_start(struct perf_event *event, int flags)
21690 __bts_event_start(event);
21691
21692 /* PMI handler: this counter is running and likely generating PMIs */
21693- ACCESS_ONCE(bts->started) = 1;
21694+ ACCESS_ONCE_RW(bts->started) = 1;
21695 }
21696
21697 static void __bts_event_stop(struct perf_event *event)
21698@@ -266,7 +266,7 @@ static void __bts_event_stop(struct perf_event *event)
21699 if (event->hw.state & PERF_HES_STOPPED)
21700 return;
21701
21702- ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED;
21703+ ACCESS_ONCE_RW(event->hw.state) |= PERF_HES_STOPPED;
21704 }
21705
21706 static void bts_event_stop(struct perf_event *event, int flags)
21707@@ -274,7 +274,7 @@ static void bts_event_stop(struct perf_event *event, int flags)
21708 struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
21709
21710 /* PMI handler: don't restart this counter */
21711- ACCESS_ONCE(bts->started) = 0;
21712+ ACCESS_ONCE_RW(bts->started) = 0;
21713
21714 __bts_event_stop(event);
21715
21716diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21717index e4d1b8b..2c6ffa0 100644
21718--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21719+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21720@@ -1352,7 +1352,9 @@ static int __init intel_cqm_init(void)
21721 goto out;
21722 }
21723
21724- event_attr_intel_cqm_llc_scale.event_str = str;
21725+ pax_open_kernel();
21726+ *(const char **)&event_attr_intel_cqm_llc_scale.event_str = str;
21727+ pax_close_kernel();
21728
21729 ret = intel_cqm_setup_rmid_cache();
21730 if (ret)
21731diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21732index 123ff1b..d53e500 100644
21733--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
21734+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21735@@ -116,16 +116,12 @@ static const struct attribute_group *pt_attr_groups[] = {
21736
21737 static int __init pt_pmu_hw_init(void)
21738 {
21739- struct dev_ext_attribute *de_attrs;
21740- struct attribute **attrs;
21741- size_t size;
21742- int ret;
21743+ static struct dev_ext_attribute de_attrs[ARRAY_SIZE(pt_caps)];
21744+ static struct attribute *attrs[ARRAY_SIZE(pt_caps)];
21745 long i;
21746
21747- attrs = NULL;
21748- ret = -ENODEV;
21749 if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))
21750- goto fail;
21751+ return -ENODEV;
21752
21753 for (i = 0; i < PT_CPUID_LEAVES; i++) {
21754 cpuid_count(20, i,
21755@@ -135,39 +131,25 @@ static int __init pt_pmu_hw_init(void)
21756 &pt_pmu.caps[CR_EDX + i*4]);
21757 }
21758
21759- ret = -ENOMEM;
21760- size = sizeof(struct attribute *) * (ARRAY_SIZE(pt_caps)+1);
21761- attrs = kzalloc(size, GFP_KERNEL);
21762- if (!attrs)
21763- goto fail;
21764-
21765- size = sizeof(struct dev_ext_attribute) * (ARRAY_SIZE(pt_caps)+1);
21766- de_attrs = kzalloc(size, GFP_KERNEL);
21767- if (!de_attrs)
21768- goto fail;
21769-
21770+ pax_open_kernel();
21771 for (i = 0; i < ARRAY_SIZE(pt_caps); i++) {
21772- struct dev_ext_attribute *de_attr = de_attrs + i;
21773+ struct dev_ext_attribute *de_attr = &de_attrs[i];
21774
21775- de_attr->attr.attr.name = pt_caps[i].name;
21776+ *(const char **)&de_attr->attr.attr.name = pt_caps[i].name;
21777
21778 sysfs_attr_init(&de_attr->attr.attr);
21779
21780- de_attr->attr.attr.mode = S_IRUGO;
21781- de_attr->attr.show = pt_cap_show;
21782- de_attr->var = (void *)i;
21783+ *(umode_t *)&de_attr->attr.attr.mode = S_IRUGO;
21784+ *(void **)&de_attr->attr.show = pt_cap_show;
21785+ *(void **)&de_attr->var = (void *)i;
21786
21787 attrs[i] = &de_attr->attr.attr;
21788 }
21789
21790- pt_cap_group.attrs = attrs;
21791+ *(struct attribute ***)&pt_cap_group.attrs = attrs;
21792+ pax_close_kernel();
21793
21794 return 0;
21795-
21796-fail:
21797- kfree(attrs);
21798-
21799- return ret;
21800 }
21801
21802 #define PT_CONFIG_MASK (RTIT_CTL_TSC_EN | RTIT_CTL_DISRETC)
21803@@ -928,7 +910,7 @@ static void pt_event_start(struct perf_event *event, int mode)
21804 return;
21805 }
21806
21807- ACCESS_ONCE(pt->handle_nmi) = 1;
21808+ ACCESS_ONCE_RW(pt->handle_nmi) = 1;
21809 event->hw.state = 0;
21810
21811 pt_config_buffer(buf->cur->table, buf->cur_idx,
21812@@ -945,7 +927,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
21813 * Protect against the PMI racing with disabling wrmsr,
21814 * see comment in intel_pt_interrupt().
21815 */
21816- ACCESS_ONCE(pt->handle_nmi) = 0;
21817+ ACCESS_ONCE_RW(pt->handle_nmi) = 0;
21818 pt_config_start(false);
21819
21820 if (event->hw.state == PERF_HES_STOPPED)
21821diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21822index 358c54a..f068235 100644
21823--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21824+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21825@@ -487,7 +487,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21826 NULL,
21827 };
21828
21829-static struct attribute_group rapl_pmu_events_group = {
21830+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21831 .name = "events",
21832 .attrs = NULL, /* patched at runtime */
21833 };
21834diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21835index 90b7c50..7863ae3 100644
21836--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21837+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21838@@ -732,7 +732,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21839 static int __init uncore_type_init(struct intel_uncore_type *type)
21840 {
21841 struct intel_uncore_pmu *pmus;
21842- struct attribute_group *attr_group;
21843+ attribute_group_no_const *attr_group;
21844 struct attribute **attrs;
21845 int i, j;
21846
21847diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21848index ceac8f5..a562de7 100644
21849--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21850+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21851@@ -115,7 +115,7 @@ struct intel_uncore_box {
21852 struct uncore_event_desc {
21853 struct kobj_attribute attr;
21854 const char *config;
21855-};
21856+} __do_const;
21857
21858 ssize_t uncore_event_show(struct kobject *kobj,
21859 struct kobj_attribute *attr, char *buf);
21860diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21861index 83741a7..bd3507d 100644
21862--- a/arch/x86/kernel/cpuid.c
21863+++ b/arch/x86/kernel/cpuid.c
21864@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21865 return notifier_from_errno(err);
21866 }
21867
21868-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21869+static struct notifier_block cpuid_class_cpu_notifier =
21870 {
21871 .notifier_call = cpuid_class_cpu_callback,
21872 };
21873diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21874index afa64ad..dce67dd 100644
21875--- a/arch/x86/kernel/crash_dump_64.c
21876+++ b/arch/x86/kernel/crash_dump_64.c
21877@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21878 return -ENOMEM;
21879
21880 if (userbuf) {
21881- if (copy_to_user(buf, vaddr + offset, csize)) {
21882+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21883 iounmap(vaddr);
21884 return -EFAULT;
21885 }
21886diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21887index f6dfd93..892ade4 100644
21888--- a/arch/x86/kernel/doublefault.c
21889+++ b/arch/x86/kernel/doublefault.c
21890@@ -12,7 +12,7 @@
21891
21892 #define DOUBLEFAULT_STACKSIZE (1024)
21893 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21894-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21895+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21896
21897 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21898
21899@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21900 unsigned long gdt, tss;
21901
21902 native_store_gdt(&gdt_desc);
21903- gdt = gdt_desc.address;
21904+ gdt = (unsigned long)gdt_desc.address;
21905
21906 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21907
21908@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21909 /* 0x2 bit is always set */
21910 .flags = X86_EFLAGS_SF | 0x2,
21911 .sp = STACK_START,
21912- .es = __USER_DS,
21913+ .es = __KERNEL_DS,
21914 .cs = __KERNEL_CS,
21915 .ss = __KERNEL_DS,
21916- .ds = __USER_DS,
21917+ .ds = __KERNEL_DS,
21918 .fs = __KERNEL_PERCPU,
21919
21920 .__cr3 = __pa_nodebug(swapper_pg_dir),
21921diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21922index 9c30acf..8cf2411 100644
21923--- a/arch/x86/kernel/dumpstack.c
21924+++ b/arch/x86/kernel/dumpstack.c
21925@@ -2,6 +2,9 @@
21926 * Copyright (C) 1991, 1992 Linus Torvalds
21927 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21928 */
21929+#ifdef CONFIG_GRKERNSEC_HIDESYM
21930+#define __INCLUDED_BY_HIDESYM 1
21931+#endif
21932 #include <linux/kallsyms.h>
21933 #include <linux/kprobes.h>
21934 #include <linux/uaccess.h>
21935@@ -35,23 +38,21 @@ static void printk_stack_address(unsigned long address, int reliable,
21936
21937 void printk_address(unsigned long address)
21938 {
21939- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21940+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21941 }
21942
21943 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21944 static void
21945 print_ftrace_graph_addr(unsigned long addr, void *data,
21946 const struct stacktrace_ops *ops,
21947- struct thread_info *tinfo, int *graph)
21948+ struct task_struct *task, int *graph)
21949 {
21950- struct task_struct *task;
21951 unsigned long ret_addr;
21952 int index;
21953
21954 if (addr != (unsigned long)return_to_handler)
21955 return;
21956
21957- task = tinfo->task;
21958 index = task->curr_ret_stack;
21959
21960 if (!task->ret_stack || index < *graph)
21961@@ -68,7 +69,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21962 static inline void
21963 print_ftrace_graph_addr(unsigned long addr, void *data,
21964 const struct stacktrace_ops *ops,
21965- struct thread_info *tinfo, int *graph)
21966+ struct task_struct *task, int *graph)
21967 { }
21968 #endif
21969
21970@@ -79,10 +80,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21971 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21972 */
21973
21974-static inline int valid_stack_ptr(struct thread_info *tinfo,
21975- void *p, unsigned int size, void *end)
21976+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21977 {
21978- void *t = tinfo;
21979 if (end) {
21980 if (p < end && p >= (end-THREAD_SIZE))
21981 return 1;
21982@@ -93,14 +92,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21983 }
21984
21985 unsigned long
21986-print_context_stack(struct thread_info *tinfo,
21987+print_context_stack(struct task_struct *task, void *stack_start,
21988 unsigned long *stack, unsigned long bp,
21989 const struct stacktrace_ops *ops, void *data,
21990 unsigned long *end, int *graph)
21991 {
21992 struct stack_frame *frame = (struct stack_frame *)bp;
21993
21994- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21995+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21996 unsigned long addr;
21997
21998 addr = *stack;
21999@@ -112,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
22000 } else {
22001 ops->address(data, addr, 0);
22002 }
22003- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22004+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22005 }
22006 stack++;
22007 }
22008@@ -121,7 +120,7 @@ print_context_stack(struct thread_info *tinfo,
22009 EXPORT_SYMBOL_GPL(print_context_stack);
22010
22011 unsigned long
22012-print_context_stack_bp(struct thread_info *tinfo,
22013+print_context_stack_bp(struct task_struct *task, void *stack_start,
22014 unsigned long *stack, unsigned long bp,
22015 const struct stacktrace_ops *ops, void *data,
22016 unsigned long *end, int *graph)
22017@@ -129,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22018 struct stack_frame *frame = (struct stack_frame *)bp;
22019 unsigned long *ret_addr = &frame->return_address;
22020
22021- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22022+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22023 unsigned long addr = *ret_addr;
22024
22025 if (!__kernel_text_address(addr))
22026@@ -138,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22027 ops->address(data, addr, 1);
22028 frame = frame->next_frame;
22029 ret_addr = &frame->return_address;
22030- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22031+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22032 }
22033
22034 return (unsigned long)frame;
22035@@ -226,6 +225,8 @@ unsigned long oops_begin(void)
22036 EXPORT_SYMBOL_GPL(oops_begin);
22037 NOKPROBE_SYMBOL(oops_begin);
22038
22039+extern void gr_handle_kernel_exploit(void);
22040+
22041 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22042 {
22043 if (regs && kexec_should_crash(current))
22044@@ -247,7 +248,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22045 panic("Fatal exception in interrupt");
22046 if (panic_on_oops)
22047 panic("Fatal exception");
22048- do_exit(signr);
22049+
22050+ gr_handle_kernel_exploit();
22051+
22052+ do_group_exit(signr);
22053 }
22054 NOKPROBE_SYMBOL(oops_end);
22055
22056diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22057index 464ffd6..01f2cda 100644
22058--- a/arch/x86/kernel/dumpstack_32.c
22059+++ b/arch/x86/kernel/dumpstack_32.c
22060@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22061 bp = stack_frame(task, regs);
22062
22063 for (;;) {
22064- struct thread_info *context;
22065+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22066 void *end_stack;
22067
22068 end_stack = is_hardirq_stack(stack, cpu);
22069 if (!end_stack)
22070 end_stack = is_softirq_stack(stack, cpu);
22071
22072- context = task_thread_info(task);
22073- bp = ops->walk_stack(context, stack, bp, ops, data,
22074+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22075 end_stack, &graph);
22076
22077 /* Stop if not on irq stack */
22078@@ -137,16 +136,17 @@ void show_regs(struct pt_regs *regs)
22079 unsigned int code_len = code_bytes;
22080 unsigned char c;
22081 u8 *ip;
22082+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22083
22084 pr_emerg("Stack:\n");
22085 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22086
22087 pr_emerg("Code:");
22088
22089- ip = (u8 *)regs->ip - code_prologue;
22090+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22091 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22092 /* try starting at IP */
22093- ip = (u8 *)regs->ip;
22094+ ip = (u8 *)regs->ip + cs_base;
22095 code_len = code_len - code_prologue + 1;
22096 }
22097 for (i = 0; i < code_len; i++, ip++) {
22098@@ -155,7 +155,7 @@ void show_regs(struct pt_regs *regs)
22099 pr_cont(" Bad EIP value.");
22100 break;
22101 }
22102- if (ip == (u8 *)regs->ip)
22103+ if (ip == (u8 *)regs->ip + cs_base)
22104 pr_cont(" <%02x>", c);
22105 else
22106 pr_cont(" %02x", c);
22107@@ -168,6 +168,7 @@ int is_valid_bugaddr(unsigned long ip)
22108 {
22109 unsigned short ud2;
22110
22111+ ip = ktla_ktva(ip);
22112 if (ip < PAGE_OFFSET)
22113 return 0;
22114 if (probe_kernel_address((unsigned short *)ip, ud2))
22115@@ -175,3 +176,15 @@ int is_valid_bugaddr(unsigned long ip)
22116
22117 return ud2 == 0x0b0f;
22118 }
22119+
22120+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22121+void __used pax_check_alloca(unsigned long size)
22122+{
22123+ unsigned long sp = (unsigned long)&sp, stack_left;
22124+
22125+ /* all kernel stacks are of the same size */
22126+ stack_left = sp & (THREAD_SIZE - 1);
22127+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22128+}
22129+EXPORT_SYMBOL(pax_check_alloca);
22130+#endif
22131diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22132index 5f1c626..1cba97e 100644
22133--- a/arch/x86/kernel/dumpstack_64.c
22134+++ b/arch/x86/kernel/dumpstack_64.c
22135@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22136 const struct stacktrace_ops *ops, void *data)
22137 {
22138 const unsigned cpu = get_cpu();
22139- struct thread_info *tinfo;
22140 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22141 unsigned long dummy;
22142 unsigned used = 0;
22143 int graph = 0;
22144 int done = 0;
22145+ void *stack_start;
22146
22147 if (!task)
22148 task = current;
22149@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22150 * current stack address. If the stacks consist of nested
22151 * exceptions
22152 */
22153- tinfo = task_thread_info(task);
22154 while (!done) {
22155 unsigned long *stack_end;
22156 enum stack_type stype;
22157@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22158 if (ops->stack(data, id) < 0)
22159 break;
22160
22161- bp = ops->walk_stack(tinfo, stack, bp, ops,
22162+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22163 data, stack_end, &graph);
22164 ops->stack(data, "<EOE>");
22165 /*
22166@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22167 * second-to-last pointer (index -2 to end) in the
22168 * exception stack:
22169 */
22170+ if ((u16)stack_end[-1] != __KERNEL_DS)
22171+ goto out;
22172 stack = (unsigned long *) stack_end[-2];
22173 done = 0;
22174 break;
22175@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22176
22177 if (ops->stack(data, "IRQ") < 0)
22178 break;
22179- bp = ops->walk_stack(tinfo, stack, bp,
22180+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22181 ops, data, stack_end, &graph);
22182 /*
22183 * We link to the next stack (which would be
22184@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22185 /*
22186 * This handles the process stack:
22187 */
22188- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22189+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22190+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22191+out:
22192 put_cpu();
22193 }
22194 EXPORT_SYMBOL(dump_trace);
22195@@ -347,8 +350,55 @@ int is_valid_bugaddr(unsigned long ip)
22196 {
22197 unsigned short ud2;
22198
22199- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22200+ if (probe_kernel_address((unsigned short *)ip, ud2))
22201 return 0;
22202
22203 return ud2 == 0x0b0f;
22204 }
22205+
22206+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22207+void __used pax_check_alloca(unsigned long size)
22208+{
22209+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22210+ unsigned cpu, used;
22211+ char *id;
22212+
22213+ /* check the process stack first */
22214+ stack_start = (unsigned long)task_stack_page(current);
22215+ stack_end = stack_start + THREAD_SIZE;
22216+ if (likely(stack_start <= sp && sp < stack_end)) {
22217+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22218+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22219+ return;
22220+ }
22221+
22222+ cpu = get_cpu();
22223+
22224+ /* check the irq stacks */
22225+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22226+ stack_start = stack_end - IRQ_STACK_SIZE;
22227+ if (stack_start <= sp && sp < stack_end) {
22228+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22229+ put_cpu();
22230+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22231+ return;
22232+ }
22233+
22234+ /* check the exception stacks */
22235+ used = 0;
22236+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22237+ stack_start = stack_end - EXCEPTION_STKSZ;
22238+ if (stack_end && stack_start <= sp && sp < stack_end) {
22239+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22240+ put_cpu();
22241+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22242+ return;
22243+ }
22244+
22245+ put_cpu();
22246+
22247+ /* unknown stack */
22248+ BUG();
22249+}
22250+EXPORT_SYMBOL(pax_check_alloca);
22251+#endif
22252diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22253index e2ce85d..00ccad0 100644
22254--- a/arch/x86/kernel/e820.c
22255+++ b/arch/x86/kernel/e820.c
22256@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22257
22258 static void early_panic(char *msg)
22259 {
22260- early_printk(msg);
22261- panic(msg);
22262+ early_printk("%s", msg);
22263+ panic("%s", msg);
22264 }
22265
22266 static int userdef __initdata;
22267diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22268index 89427d8..00c0d52 100644
22269--- a/arch/x86/kernel/early_printk.c
22270+++ b/arch/x86/kernel/early_printk.c
22271@@ -7,6 +7,7 @@
22272 #include <linux/pci_regs.h>
22273 #include <linux/pci_ids.h>
22274 #include <linux/errno.h>
22275+#include <linux/sched.h>
22276 #include <asm/io.h>
22277 #include <asm/processor.h>
22278 #include <asm/fcntl.h>
22279diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22280index 1c30976..71b41b9 100644
22281--- a/arch/x86/kernel/entry_32.S
22282+++ b/arch/x86/kernel/entry_32.S
22283@@ -177,13 +177,154 @@
22284 /*CFI_REL_OFFSET gs, PT_GS*/
22285 .endm
22286 .macro SET_KERNEL_GS reg
22287+
22288+#ifdef CONFIG_CC_STACKPROTECTOR
22289 movl $(__KERNEL_STACK_CANARY), \reg
22290+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22291+ movl $(__USER_DS), \reg
22292+#else
22293+ xorl \reg, \reg
22294+#endif
22295+
22296 movl \reg, %gs
22297 .endm
22298
22299 #endif /* CONFIG_X86_32_LAZY_GS */
22300
22301-.macro SAVE_ALL
22302+.macro pax_enter_kernel
22303+#ifdef CONFIG_PAX_KERNEXEC
22304+ call pax_enter_kernel
22305+#endif
22306+.endm
22307+
22308+.macro pax_exit_kernel
22309+#ifdef CONFIG_PAX_KERNEXEC
22310+ call pax_exit_kernel
22311+#endif
22312+.endm
22313+
22314+#ifdef CONFIG_PAX_KERNEXEC
22315+ENTRY(pax_enter_kernel)
22316+#ifdef CONFIG_PARAVIRT
22317+ pushl %eax
22318+ pushl %ecx
22319+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22320+ mov %eax, %esi
22321+#else
22322+ mov %cr0, %esi
22323+#endif
22324+ bts $X86_CR0_WP_BIT, %esi
22325+ jnc 1f
22326+ mov %cs, %esi
22327+ cmp $__KERNEL_CS, %esi
22328+ jz 3f
22329+ ljmp $__KERNEL_CS, $3f
22330+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22331+2:
22332+#ifdef CONFIG_PARAVIRT
22333+ mov %esi, %eax
22334+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22335+#else
22336+ mov %esi, %cr0
22337+#endif
22338+3:
22339+#ifdef CONFIG_PARAVIRT
22340+ popl %ecx
22341+ popl %eax
22342+#endif
22343+ ret
22344+ENDPROC(pax_enter_kernel)
22345+
22346+ENTRY(pax_exit_kernel)
22347+#ifdef CONFIG_PARAVIRT
22348+ pushl %eax
22349+ pushl %ecx
22350+#endif
22351+ mov %cs, %esi
22352+ cmp $__KERNEXEC_KERNEL_CS, %esi
22353+ jnz 2f
22354+#ifdef CONFIG_PARAVIRT
22355+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22356+ mov %eax, %esi
22357+#else
22358+ mov %cr0, %esi
22359+#endif
22360+ btr $X86_CR0_WP_BIT, %esi
22361+ ljmp $__KERNEL_CS, $1f
22362+1:
22363+#ifdef CONFIG_PARAVIRT
22364+ mov %esi, %eax
22365+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22366+#else
22367+ mov %esi, %cr0
22368+#endif
22369+2:
22370+#ifdef CONFIG_PARAVIRT
22371+ popl %ecx
22372+ popl %eax
22373+#endif
22374+ ret
22375+ENDPROC(pax_exit_kernel)
22376+#endif
22377+
22378+ .macro pax_erase_kstack
22379+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22380+ call pax_erase_kstack
22381+#endif
22382+ .endm
22383+
22384+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22385+/*
22386+ * ebp: thread_info
22387+ */
22388+ENTRY(pax_erase_kstack)
22389+ pushl %edi
22390+ pushl %ecx
22391+ pushl %eax
22392+
22393+ mov TI_lowest_stack(%ebp), %edi
22394+ mov $-0xBEEF, %eax
22395+ std
22396+
22397+1: mov %edi, %ecx
22398+ and $THREAD_SIZE_asm - 1, %ecx
22399+ shr $2, %ecx
22400+ repne scasl
22401+ jecxz 2f
22402+
22403+ cmp $2*16, %ecx
22404+ jc 2f
22405+
22406+ mov $2*16, %ecx
22407+ repe scasl
22408+ jecxz 2f
22409+ jne 1b
22410+
22411+2: cld
22412+ or $2*4, %edi
22413+ mov %esp, %ecx
22414+ sub %edi, %ecx
22415+
22416+ cmp $THREAD_SIZE_asm, %ecx
22417+ jb 3f
22418+ ud2
22419+3:
22420+
22421+ shr $2, %ecx
22422+ rep stosl
22423+
22424+ mov TI_task_thread_sp0(%ebp), %edi
22425+ sub $128, %edi
22426+ mov %edi, TI_lowest_stack(%ebp)
22427+
22428+ popl %eax
22429+ popl %ecx
22430+ popl %edi
22431+ ret
22432+ENDPROC(pax_erase_kstack)
22433+#endif
22434+
22435+.macro __SAVE_ALL _DS
22436 cld
22437 PUSH_GS
22438 pushl_cfi %fs
22439@@ -206,7 +347,7 @@
22440 CFI_REL_OFFSET ecx, 0
22441 pushl_cfi %ebx
22442 CFI_REL_OFFSET ebx, 0
22443- movl $(__USER_DS), %edx
22444+ movl $\_DS, %edx
22445 movl %edx, %ds
22446 movl %edx, %es
22447 movl $(__KERNEL_PERCPU), %edx
22448@@ -214,6 +355,15 @@
22449 SET_KERNEL_GS %edx
22450 .endm
22451
22452+.macro SAVE_ALL
22453+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22454+ __SAVE_ALL __KERNEL_DS
22455+ pax_enter_kernel
22456+#else
22457+ __SAVE_ALL __USER_DS
22458+#endif
22459+.endm
22460+
22461 .macro RESTORE_INT_REGS
22462 popl_cfi %ebx
22463 CFI_RESTORE ebx
22464@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22465 popfl_cfi
22466 jmp syscall_exit
22467 CFI_ENDPROC
22468-END(ret_from_fork)
22469+ENDPROC(ret_from_fork)
22470
22471 ENTRY(ret_from_kernel_thread)
22472 CFI_STARTPROC
22473@@ -340,7 +490,15 @@ ret_from_intr:
22474 andl $SEGMENT_RPL_MASK, %eax
22475 #endif
22476 cmpl $USER_RPL, %eax
22477+
22478+#ifdef CONFIG_PAX_KERNEXEC
22479+ jae resume_userspace
22480+
22481+ pax_exit_kernel
22482+ jmp resume_kernel
22483+#else
22484 jb resume_kernel # not returning to v8086 or userspace
22485+#endif
22486
22487 ENTRY(resume_userspace)
22488 LOCKDEP_SYS_EXIT
22489@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22490 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22491 # int/exception return?
22492 jne work_pending
22493- jmp restore_all
22494-END(ret_from_exception)
22495+ jmp restore_all_pax
22496+ENDPROC(ret_from_exception)
22497
22498 #ifdef CONFIG_PREEMPT
22499 ENTRY(resume_kernel)
22500@@ -365,7 +523,7 @@ need_resched:
22501 jz restore_all
22502 call preempt_schedule_irq
22503 jmp need_resched
22504-END(resume_kernel)
22505+ENDPROC(resume_kernel)
22506 #endif
22507 CFI_ENDPROC
22508
22509@@ -395,33 +553,45 @@ sysenter_past_esp:
22510 /*CFI_REL_OFFSET cs, 0*/
22511 /*
22512 * Push current_thread_info()->sysenter_return to the stack.
22513- * A tiny bit of offset fixup is necessary: TI_sysenter_return
22514- * is relative to thread_info, which is at the bottom of the
22515- * kernel stack page. 4*4 means the 4 words pushed above;
22516- * TOP_OF_KERNEL_STACK_PADDING takes us to the top of the stack;
22517- * and THREAD_SIZE takes us to the bottom.
22518 */
22519- pushl_cfi ((TI_sysenter_return) - THREAD_SIZE + TOP_OF_KERNEL_STACK_PADDING + 4*4)(%esp)
22520+ pushl_cfi $0
22521 CFI_REL_OFFSET eip, 0
22522
22523 pushl_cfi %eax
22524 SAVE_ALL
22525+ GET_THREAD_INFO(%ebp)
22526+ movl TI_sysenter_return(%ebp),%ebp
22527+ movl %ebp,PT_EIP(%esp)
22528 ENABLE_INTERRUPTS(CLBR_NONE)
22529
22530 /*
22531 * Load the potential sixth argument from user stack.
22532 * Careful about security.
22533 */
22534+ movl PT_OLDESP(%esp),%ebp
22535+
22536+#ifdef CONFIG_PAX_MEMORY_UDEREF
22537+ mov PT_OLDSS(%esp),%ds
22538+1: movl %ds:(%ebp),%ebp
22539+ push %ss
22540+ pop %ds
22541+#else
22542 cmpl $__PAGE_OFFSET-3,%ebp
22543 jae syscall_fault
22544 ASM_STAC
22545 1: movl (%ebp),%ebp
22546 ASM_CLAC
22547+#endif
22548+
22549 movl %ebp,PT_EBP(%esp)
22550 _ASM_EXTABLE(1b,syscall_fault)
22551
22552 GET_THREAD_INFO(%ebp)
22553
22554+#ifdef CONFIG_PAX_RANDKSTACK
22555+ pax_erase_kstack
22556+#endif
22557+
22558 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22559 jnz sysenter_audit
22560 sysenter_do_call:
22561@@ -437,12 +607,24 @@ sysenter_after_call:
22562 testl $_TIF_ALLWORK_MASK, %ecx
22563 jnz sysexit_audit
22564 sysenter_exit:
22565+
22566+#ifdef CONFIG_PAX_RANDKSTACK
22567+ pushl_cfi %eax
22568+ movl %esp, %eax
22569+ call pax_randomize_kstack
22570+ popl_cfi %eax
22571+#endif
22572+
22573+ pax_erase_kstack
22574+
22575 /* if something modifies registers it must also disable sysexit */
22576 movl PT_EIP(%esp), %edx
22577 movl PT_OLDESP(%esp), %ecx
22578 xorl %ebp,%ebp
22579 TRACE_IRQS_ON
22580 1: mov PT_FS(%esp), %fs
22581+2: mov PT_DS(%esp), %ds
22582+3: mov PT_ES(%esp), %es
22583 PTGS_TO_GS
22584 ENABLE_INTERRUPTS_SYSEXIT
22585
22586@@ -456,6 +638,9 @@ sysenter_audit:
22587 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22588 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22589 call __audit_syscall_entry
22590+
22591+ pax_erase_kstack
22592+
22593 popl_cfi %ecx /* get that remapped edx off the stack */
22594 popl_cfi %ecx /* get that remapped esi off the stack */
22595 movl PT_EAX(%esp),%eax /* reload syscall number */
22596@@ -482,10 +667,16 @@ sysexit_audit:
22597
22598 CFI_ENDPROC
22599 .pushsection .fixup,"ax"
22600-2: movl $0,PT_FS(%esp)
22601+4: movl $0,PT_FS(%esp)
22602+ jmp 1b
22603+5: movl $0,PT_DS(%esp)
22604+ jmp 1b
22605+6: movl $0,PT_ES(%esp)
22606 jmp 1b
22607 .popsection
22608- _ASM_EXTABLE(1b,2b)
22609+ _ASM_EXTABLE(1b,4b)
22610+ _ASM_EXTABLE(2b,5b)
22611+ _ASM_EXTABLE(3b,6b)
22612 PTGS_TO_GS_EX
22613 ENDPROC(ia32_sysenter_target)
22614
22615@@ -496,6 +687,11 @@ ENTRY(system_call)
22616 pushl_cfi %eax # save orig_eax
22617 SAVE_ALL
22618 GET_THREAD_INFO(%ebp)
22619+
22620+#ifdef CONFIG_PAX_RANDKSTACK
22621+ pax_erase_kstack
22622+#endif
22623+
22624 # system call tracing in operation / emulation
22625 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22626 jnz syscall_trace_entry
22627@@ -515,6 +711,15 @@ syscall_exit:
22628 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22629 jnz syscall_exit_work
22630
22631+restore_all_pax:
22632+
22633+#ifdef CONFIG_PAX_RANDKSTACK
22634+ movl %esp, %eax
22635+ call pax_randomize_kstack
22636+#endif
22637+
22638+ pax_erase_kstack
22639+
22640 restore_all:
22641 TRACE_IRQS_IRET
22642 restore_all_notrace:
22643@@ -569,14 +774,34 @@ ldt_ss:
22644 * compensating for the offset by changing to the ESPFIX segment with
22645 * a base address that matches for the difference.
22646 */
22647-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22648+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22649 mov %esp, %edx /* load kernel esp */
22650 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22651 mov %dx, %ax /* eax: new kernel esp */
22652 sub %eax, %edx /* offset (low word is 0) */
22653+#ifdef CONFIG_SMP
22654+ movl PER_CPU_VAR(cpu_number), %ebx
22655+ shll $PAGE_SHIFT_asm, %ebx
22656+ addl $cpu_gdt_table, %ebx
22657+#else
22658+ movl $cpu_gdt_table, %ebx
22659+#endif
22660 shr $16, %edx
22661- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22662- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22663+
22664+#ifdef CONFIG_PAX_KERNEXEC
22665+ mov %cr0, %esi
22666+ btr $X86_CR0_WP_BIT, %esi
22667+ mov %esi, %cr0
22668+#endif
22669+
22670+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22671+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22672+
22673+#ifdef CONFIG_PAX_KERNEXEC
22674+ bts $X86_CR0_WP_BIT, %esi
22675+ mov %esi, %cr0
22676+#endif
22677+
22678 pushl_cfi $__ESPFIX_SS
22679 pushl_cfi %eax /* new kernel esp */
22680 /* Disable interrupts, but do not irqtrace this section: we
22681@@ -606,20 +831,18 @@ work_resched:
22682 movl TI_flags(%ebp), %ecx
22683 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22684 # than syscall tracing?
22685- jz restore_all
22686+ jz restore_all_pax
22687 testb $_TIF_NEED_RESCHED, %cl
22688 jnz work_resched
22689
22690 work_notifysig: # deal with pending signals and
22691 # notify-resume requests
22692+ movl %esp, %eax
22693 #ifdef CONFIG_VM86
22694 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22695- movl %esp, %eax
22696 jnz work_notifysig_v86 # returning to kernel-space or
22697 # vm86-space
22698 1:
22699-#else
22700- movl %esp, %eax
22701 #endif
22702 TRACE_IRQS_ON
22703 ENABLE_INTERRUPTS(CLBR_NONE)
22704@@ -640,7 +863,7 @@ work_notifysig_v86:
22705 movl %eax, %esp
22706 jmp 1b
22707 #endif
22708-END(work_pending)
22709+ENDPROC(work_pending)
22710
22711 # perform syscall exit tracing
22712 ALIGN
22713@@ -648,11 +871,14 @@ syscall_trace_entry:
22714 movl $-ENOSYS,PT_EAX(%esp)
22715 movl %esp, %eax
22716 call syscall_trace_enter
22717+
22718+ pax_erase_kstack
22719+
22720 /* What it returned is what we'll actually use. */
22721 cmpl $(NR_syscalls), %eax
22722 jnae syscall_call
22723 jmp syscall_exit
22724-END(syscall_trace_entry)
22725+ENDPROC(syscall_trace_entry)
22726
22727 # perform syscall exit tracing
22728 ALIGN
22729@@ -665,26 +891,30 @@ syscall_exit_work:
22730 movl %esp, %eax
22731 call syscall_trace_leave
22732 jmp resume_userspace
22733-END(syscall_exit_work)
22734+ENDPROC(syscall_exit_work)
22735 CFI_ENDPROC
22736
22737 RING0_INT_FRAME # can't unwind into user space anyway
22738 syscall_fault:
22739+#ifdef CONFIG_PAX_MEMORY_UDEREF
22740+ push %ss
22741+ pop %ds
22742+#endif
22743 ASM_CLAC
22744 GET_THREAD_INFO(%ebp)
22745 movl $-EFAULT,PT_EAX(%esp)
22746 jmp resume_userspace
22747-END(syscall_fault)
22748+ENDPROC(syscall_fault)
22749
22750 syscall_badsys:
22751 movl $-ENOSYS,%eax
22752 jmp syscall_after_call
22753-END(syscall_badsys)
22754+ENDPROC(syscall_badsys)
22755
22756 sysenter_badsys:
22757 movl $-ENOSYS,%eax
22758 jmp sysenter_after_call
22759-END(sysenter_badsys)
22760+ENDPROC(sysenter_badsys)
22761 CFI_ENDPROC
22762
22763 .macro FIXUP_ESPFIX_STACK
22764@@ -697,8 +927,15 @@ END(sysenter_badsys)
22765 */
22766 #ifdef CONFIG_X86_ESPFIX32
22767 /* fixup the stack */
22768- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22769- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22770+#ifdef CONFIG_SMP
22771+ movl PER_CPU_VAR(cpu_number), %ebx
22772+ shll $PAGE_SHIFT_asm, %ebx
22773+ addl $cpu_gdt_table, %ebx
22774+#else
22775+ movl $cpu_gdt_table, %ebx
22776+#endif
22777+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22778+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22779 shl $16, %eax
22780 addl %esp, %eax /* the adjusted stack pointer */
22781 pushl_cfi $__KERNEL_DS
22782@@ -737,7 +974,7 @@ ENTRY(irq_entries_start)
22783 CFI_ADJUST_CFA_OFFSET -4
22784 .align 8
22785 .endr
22786-END(irq_entries_start)
22787+ENDPROC(irq_entries_start)
22788
22789 /*
22790 * the CPU automatically disables interrupts when executing an IRQ vector,
22791@@ -790,7 +1027,7 @@ ENTRY(coprocessor_error)
22792 pushl_cfi $do_coprocessor_error
22793 jmp error_code
22794 CFI_ENDPROC
22795-END(coprocessor_error)
22796+ENDPROC(coprocessor_error)
22797
22798 ENTRY(simd_coprocessor_error)
22799 RING0_INT_FRAME
22800@@ -806,7 +1043,7 @@ ENTRY(simd_coprocessor_error)
22801 #endif
22802 jmp error_code
22803 CFI_ENDPROC
22804-END(simd_coprocessor_error)
22805+ENDPROC(simd_coprocessor_error)
22806
22807 ENTRY(device_not_available)
22808 RING0_INT_FRAME
22809@@ -815,18 +1052,18 @@ ENTRY(device_not_available)
22810 pushl_cfi $do_device_not_available
22811 jmp error_code
22812 CFI_ENDPROC
22813-END(device_not_available)
22814+ENDPROC(device_not_available)
22815
22816 #ifdef CONFIG_PARAVIRT
22817 ENTRY(native_iret)
22818 iret
22819 _ASM_EXTABLE(native_iret, iret_exc)
22820-END(native_iret)
22821+ENDPROC(native_iret)
22822
22823 ENTRY(native_irq_enable_sysexit)
22824 sti
22825 sysexit
22826-END(native_irq_enable_sysexit)
22827+ENDPROC(native_irq_enable_sysexit)
22828 #endif
22829
22830 ENTRY(overflow)
22831@@ -836,7 +1073,7 @@ ENTRY(overflow)
22832 pushl_cfi $do_overflow
22833 jmp error_code
22834 CFI_ENDPROC
22835-END(overflow)
22836+ENDPROC(overflow)
22837
22838 ENTRY(bounds)
22839 RING0_INT_FRAME
22840@@ -845,7 +1082,7 @@ ENTRY(bounds)
22841 pushl_cfi $do_bounds
22842 jmp error_code
22843 CFI_ENDPROC
22844-END(bounds)
22845+ENDPROC(bounds)
22846
22847 ENTRY(invalid_op)
22848 RING0_INT_FRAME
22849@@ -854,7 +1091,7 @@ ENTRY(invalid_op)
22850 pushl_cfi $do_invalid_op
22851 jmp error_code
22852 CFI_ENDPROC
22853-END(invalid_op)
22854+ENDPROC(invalid_op)
22855
22856 ENTRY(coprocessor_segment_overrun)
22857 RING0_INT_FRAME
22858@@ -863,7 +1100,7 @@ ENTRY(coprocessor_segment_overrun)
22859 pushl_cfi $do_coprocessor_segment_overrun
22860 jmp error_code
22861 CFI_ENDPROC
22862-END(coprocessor_segment_overrun)
22863+ENDPROC(coprocessor_segment_overrun)
22864
22865 ENTRY(invalid_TSS)
22866 RING0_EC_FRAME
22867@@ -871,7 +1108,7 @@ ENTRY(invalid_TSS)
22868 pushl_cfi $do_invalid_TSS
22869 jmp error_code
22870 CFI_ENDPROC
22871-END(invalid_TSS)
22872+ENDPROC(invalid_TSS)
22873
22874 ENTRY(segment_not_present)
22875 RING0_EC_FRAME
22876@@ -879,7 +1116,7 @@ ENTRY(segment_not_present)
22877 pushl_cfi $do_segment_not_present
22878 jmp error_code
22879 CFI_ENDPROC
22880-END(segment_not_present)
22881+ENDPROC(segment_not_present)
22882
22883 ENTRY(stack_segment)
22884 RING0_EC_FRAME
22885@@ -887,7 +1124,7 @@ ENTRY(stack_segment)
22886 pushl_cfi $do_stack_segment
22887 jmp error_code
22888 CFI_ENDPROC
22889-END(stack_segment)
22890+ENDPROC(stack_segment)
22891
22892 ENTRY(alignment_check)
22893 RING0_EC_FRAME
22894@@ -895,7 +1132,7 @@ ENTRY(alignment_check)
22895 pushl_cfi $do_alignment_check
22896 jmp error_code
22897 CFI_ENDPROC
22898-END(alignment_check)
22899+ENDPROC(alignment_check)
22900
22901 ENTRY(divide_error)
22902 RING0_INT_FRAME
22903@@ -904,7 +1141,7 @@ ENTRY(divide_error)
22904 pushl_cfi $do_divide_error
22905 jmp error_code
22906 CFI_ENDPROC
22907-END(divide_error)
22908+ENDPROC(divide_error)
22909
22910 #ifdef CONFIG_X86_MCE
22911 ENTRY(machine_check)
22912@@ -914,7 +1151,7 @@ ENTRY(machine_check)
22913 pushl_cfi machine_check_vector
22914 jmp error_code
22915 CFI_ENDPROC
22916-END(machine_check)
22917+ENDPROC(machine_check)
22918 #endif
22919
22920 ENTRY(spurious_interrupt_bug)
22921@@ -924,7 +1161,7 @@ ENTRY(spurious_interrupt_bug)
22922 pushl_cfi $do_spurious_interrupt_bug
22923 jmp error_code
22924 CFI_ENDPROC
22925-END(spurious_interrupt_bug)
22926+ENDPROC(spurious_interrupt_bug)
22927
22928 #ifdef CONFIG_XEN
22929 /* Xen doesn't set %esp to be precisely what the normal sysenter
22930@@ -1033,7 +1270,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22931
22932 ENTRY(mcount)
22933 ret
22934-END(mcount)
22935+ENDPROC(mcount)
22936
22937 ENTRY(ftrace_caller)
22938 pushl %eax
22939@@ -1063,7 +1300,7 @@ ftrace_graph_call:
22940 .globl ftrace_stub
22941 ftrace_stub:
22942 ret
22943-END(ftrace_caller)
22944+ENDPROC(ftrace_caller)
22945
22946 ENTRY(ftrace_regs_caller)
22947 pushf /* push flags before compare (in cs location) */
22948@@ -1161,7 +1398,7 @@ trace:
22949 popl %ecx
22950 popl %eax
22951 jmp ftrace_stub
22952-END(mcount)
22953+ENDPROC(mcount)
22954 #endif /* CONFIG_DYNAMIC_FTRACE */
22955 #endif /* CONFIG_FUNCTION_TRACER */
22956
22957@@ -1179,7 +1416,7 @@ ENTRY(ftrace_graph_caller)
22958 popl %ecx
22959 popl %eax
22960 ret
22961-END(ftrace_graph_caller)
22962+ENDPROC(ftrace_graph_caller)
22963
22964 .globl return_to_handler
22965 return_to_handler:
22966@@ -1233,15 +1470,18 @@ error_code:
22967 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22968 REG_TO_PTGS %ecx
22969 SET_KERNEL_GS %ecx
22970- movl $(__USER_DS), %ecx
22971+ movl $(__KERNEL_DS), %ecx
22972 movl %ecx, %ds
22973 movl %ecx, %es
22974+
22975+ pax_enter_kernel
22976+
22977 TRACE_IRQS_OFF
22978 movl %esp,%eax # pt_regs pointer
22979 call *%edi
22980 jmp ret_from_exception
22981 CFI_ENDPROC
22982-END(page_fault)
22983+ENDPROC(page_fault)
22984
22985 /*
22986 * Debug traps and NMI can happen at the one SYSENTER instruction
22987@@ -1284,7 +1524,7 @@ debug_stack_correct:
22988 call do_debug
22989 jmp ret_from_exception
22990 CFI_ENDPROC
22991-END(debug)
22992+ENDPROC(debug)
22993
22994 /*
22995 * NMI is doubly nasty. It can happen _while_ we're handling
22996@@ -1324,6 +1564,9 @@ nmi_stack_correct:
22997 xorl %edx,%edx # zero error code
22998 movl %esp,%eax # pt_regs pointer
22999 call do_nmi
23000+
23001+ pax_exit_kernel
23002+
23003 jmp restore_all_notrace
23004 CFI_ENDPROC
23005
23006@@ -1361,13 +1604,16 @@ nmi_espfix_stack:
23007 FIXUP_ESPFIX_STACK # %eax == %esp
23008 xorl %edx,%edx # zero error code
23009 call do_nmi
23010+
23011+ pax_exit_kernel
23012+
23013 RESTORE_REGS
23014 lss 12+4(%esp), %esp # back to espfix stack
23015 CFI_ADJUST_CFA_OFFSET -24
23016 jmp irq_return
23017 #endif
23018 CFI_ENDPROC
23019-END(nmi)
23020+ENDPROC(nmi)
23021
23022 ENTRY(int3)
23023 RING0_INT_FRAME
23024@@ -1380,14 +1626,14 @@ ENTRY(int3)
23025 call do_int3
23026 jmp ret_from_exception
23027 CFI_ENDPROC
23028-END(int3)
23029+ENDPROC(int3)
23030
23031 ENTRY(general_protection)
23032 RING0_EC_FRAME
23033 pushl_cfi $do_general_protection
23034 jmp error_code
23035 CFI_ENDPROC
23036-END(general_protection)
23037+ENDPROC(general_protection)
23038
23039 #ifdef CONFIG_KVM_GUEST
23040 ENTRY(async_page_fault)
23041@@ -1396,6 +1642,6 @@ ENTRY(async_page_fault)
23042 pushl_cfi $do_async_page_fault
23043 jmp error_code
23044 CFI_ENDPROC
23045-END(async_page_fault)
23046+ENDPROC(async_page_fault)
23047 #endif
23048
23049diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23050index 02c2eff..a13739f 100644
23051--- a/arch/x86/kernel/entry_64.S
23052+++ b/arch/x86/kernel/entry_64.S
23053@@ -46,6 +46,8 @@
23054 #include <asm/smap.h>
23055 #include <asm/pgtable_types.h>
23056 #include <linux/err.h>
23057+#include <asm/pgtable.h>
23058+#include <asm/alternative-asm.h>
23059
23060 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23061 #include <linux/elf-em.h>
23062@@ -64,6 +66,401 @@ ENTRY(native_usergs_sysret64)
23063 ENDPROC(native_usergs_sysret64)
23064 #endif /* CONFIG_PARAVIRT */
23065
23066+ .macro ljmpq sel, off
23067+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23068+ .byte 0x48; ljmp *1234f(%rip)
23069+ .pushsection .rodata
23070+ .align 16
23071+ 1234: .quad \off; .word \sel
23072+ .popsection
23073+#else
23074+ pushq $\sel
23075+ pushq $\off
23076+ lretq
23077+#endif
23078+ .endm
23079+
23080+ .macro pax_enter_kernel
23081+ pax_set_fptr_mask
23082+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23083+ call pax_enter_kernel
23084+#endif
23085+ .endm
23086+
23087+ .macro pax_exit_kernel
23088+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23089+ call pax_exit_kernel
23090+#endif
23091+
23092+ .endm
23093+
23094+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23095+ENTRY(pax_enter_kernel)
23096+ pushq %rdi
23097+
23098+#ifdef CONFIG_PARAVIRT
23099+ PV_SAVE_REGS(CLBR_RDI)
23100+#endif
23101+
23102+#ifdef CONFIG_PAX_KERNEXEC
23103+ GET_CR0_INTO_RDI
23104+ bts $X86_CR0_WP_BIT,%rdi
23105+ jnc 3f
23106+ mov %cs,%edi
23107+ cmp $__KERNEL_CS,%edi
23108+ jnz 2f
23109+1:
23110+#endif
23111+
23112+#ifdef CONFIG_PAX_MEMORY_UDEREF
23113+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23114+ GET_CR3_INTO_RDI
23115+ cmp $0,%dil
23116+ jnz 112f
23117+ mov $__KERNEL_DS,%edi
23118+ mov %edi,%ss
23119+ jmp 111f
23120+112: cmp $1,%dil
23121+ jz 113f
23122+ ud2
23123+113: sub $4097,%rdi
23124+ bts $63,%rdi
23125+ SET_RDI_INTO_CR3
23126+ mov $__UDEREF_KERNEL_DS,%edi
23127+ mov %edi,%ss
23128+111:
23129+#endif
23130+
23131+#ifdef CONFIG_PARAVIRT
23132+ PV_RESTORE_REGS(CLBR_RDI)
23133+#endif
23134+
23135+ popq %rdi
23136+ pax_force_retaddr
23137+ retq
23138+
23139+#ifdef CONFIG_PAX_KERNEXEC
23140+2: ljmpq __KERNEL_CS,1b
23141+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23142+4: SET_RDI_INTO_CR0
23143+ jmp 1b
23144+#endif
23145+ENDPROC(pax_enter_kernel)
23146+
23147+ENTRY(pax_exit_kernel)
23148+ pushq %rdi
23149+
23150+#ifdef CONFIG_PARAVIRT
23151+ PV_SAVE_REGS(CLBR_RDI)
23152+#endif
23153+
23154+#ifdef CONFIG_PAX_KERNEXEC
23155+ mov %cs,%rdi
23156+ cmp $__KERNEXEC_KERNEL_CS,%edi
23157+ jz 2f
23158+ GET_CR0_INTO_RDI
23159+ bts $X86_CR0_WP_BIT,%rdi
23160+ jnc 4f
23161+1:
23162+#endif
23163+
23164+#ifdef CONFIG_PAX_MEMORY_UDEREF
23165+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23166+ mov %ss,%edi
23167+ cmp $__UDEREF_KERNEL_DS,%edi
23168+ jnz 111f
23169+ GET_CR3_INTO_RDI
23170+ cmp $0,%dil
23171+ jz 112f
23172+ ud2
23173+112: add $4097,%rdi
23174+ bts $63,%rdi
23175+ SET_RDI_INTO_CR3
23176+ mov $__KERNEL_DS,%edi
23177+ mov %edi,%ss
23178+111:
23179+#endif
23180+
23181+#ifdef CONFIG_PARAVIRT
23182+ PV_RESTORE_REGS(CLBR_RDI);
23183+#endif
23184+
23185+ popq %rdi
23186+ pax_force_retaddr
23187+ retq
23188+
23189+#ifdef CONFIG_PAX_KERNEXEC
23190+2: GET_CR0_INTO_RDI
23191+ btr $X86_CR0_WP_BIT,%rdi
23192+ jnc 4f
23193+ ljmpq __KERNEL_CS,3f
23194+3: SET_RDI_INTO_CR0
23195+ jmp 1b
23196+4: ud2
23197+ jmp 4b
23198+#endif
23199+ENDPROC(pax_exit_kernel)
23200+#endif
23201+
23202+ .macro pax_enter_kernel_user
23203+ pax_set_fptr_mask
23204+#ifdef CONFIG_PAX_MEMORY_UDEREF
23205+ call pax_enter_kernel_user
23206+#endif
23207+ .endm
23208+
23209+ .macro pax_exit_kernel_user
23210+#ifdef CONFIG_PAX_MEMORY_UDEREF
23211+ call pax_exit_kernel_user
23212+#endif
23213+#ifdef CONFIG_PAX_RANDKSTACK
23214+ pushq %rax
23215+ pushq %r11
23216+ call pax_randomize_kstack
23217+ popq %r11
23218+ popq %rax
23219+#endif
23220+ .endm
23221+
23222+#ifdef CONFIG_PAX_MEMORY_UDEREF
23223+ENTRY(pax_enter_kernel_user)
23224+ pushq %rdi
23225+ pushq %rbx
23226+
23227+#ifdef CONFIG_PARAVIRT
23228+ PV_SAVE_REGS(CLBR_RDI)
23229+#endif
23230+
23231+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23232+ GET_CR3_INTO_RDI
23233+ cmp $1,%dil
23234+ jnz 4f
23235+ sub $4097,%rdi
23236+ bts $63,%rdi
23237+ SET_RDI_INTO_CR3
23238+ jmp 3f
23239+111:
23240+
23241+ GET_CR3_INTO_RDI
23242+ mov %rdi,%rbx
23243+ add $__START_KERNEL_map,%rbx
23244+ sub phys_base(%rip),%rbx
23245+
23246+#ifdef CONFIG_PARAVIRT
23247+ cmpl $0, pv_info+PARAVIRT_enabled
23248+ jz 1f
23249+ pushq %rdi
23250+ i = 0
23251+ .rept USER_PGD_PTRS
23252+ mov i*8(%rbx),%rsi
23253+ mov $0,%sil
23254+ lea i*8(%rbx),%rdi
23255+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23256+ i = i + 1
23257+ .endr
23258+ popq %rdi
23259+ jmp 2f
23260+1:
23261+#endif
23262+
23263+ i = 0
23264+ .rept USER_PGD_PTRS
23265+ movb $0,i*8(%rbx)
23266+ i = i + 1
23267+ .endr
23268+
23269+2: SET_RDI_INTO_CR3
23270+
23271+#ifdef CONFIG_PAX_KERNEXEC
23272+ GET_CR0_INTO_RDI
23273+ bts $X86_CR0_WP_BIT,%rdi
23274+ SET_RDI_INTO_CR0
23275+#endif
23276+
23277+3:
23278+
23279+#ifdef CONFIG_PARAVIRT
23280+ PV_RESTORE_REGS(CLBR_RDI)
23281+#endif
23282+
23283+ popq %rbx
23284+ popq %rdi
23285+ pax_force_retaddr
23286+ retq
23287+4: ud2
23288+ENDPROC(pax_enter_kernel_user)
23289+
23290+ENTRY(pax_exit_kernel_user)
23291+ pushq %rdi
23292+ pushq %rbx
23293+
23294+#ifdef CONFIG_PARAVIRT
23295+ PV_SAVE_REGS(CLBR_RDI)
23296+#endif
23297+
23298+ GET_CR3_INTO_RDI
23299+ ALTERNATIVE "jmp 1f", "", X86_FEATURE_PCID
23300+ cmp $0,%dil
23301+ jnz 3f
23302+ add $4097,%rdi
23303+ bts $63,%rdi
23304+ SET_RDI_INTO_CR3
23305+ jmp 2f
23306+1:
23307+
23308+ mov %rdi,%rbx
23309+
23310+#ifdef CONFIG_PAX_KERNEXEC
23311+ GET_CR0_INTO_RDI
23312+ btr $X86_CR0_WP_BIT,%rdi
23313+ jnc 3f
23314+ SET_RDI_INTO_CR0
23315+#endif
23316+
23317+ add $__START_KERNEL_map,%rbx
23318+ sub phys_base(%rip),%rbx
23319+
23320+#ifdef CONFIG_PARAVIRT
23321+ cmpl $0, pv_info+PARAVIRT_enabled
23322+ jz 1f
23323+ i = 0
23324+ .rept USER_PGD_PTRS
23325+ mov i*8(%rbx),%rsi
23326+ mov $0x67,%sil
23327+ lea i*8(%rbx),%rdi
23328+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23329+ i = i + 1
23330+ .endr
23331+ jmp 2f
23332+1:
23333+#endif
23334+
23335+ i = 0
23336+ .rept USER_PGD_PTRS
23337+ movb $0x67,i*8(%rbx)
23338+ i = i + 1
23339+ .endr
23340+2:
23341+
23342+#ifdef CONFIG_PARAVIRT
23343+ PV_RESTORE_REGS(CLBR_RDI)
23344+#endif
23345+
23346+ popq %rbx
23347+ popq %rdi
23348+ pax_force_retaddr
23349+ retq
23350+3: ud2
23351+ENDPROC(pax_exit_kernel_user)
23352+#endif
23353+
23354+ .macro pax_enter_kernel_nmi
23355+ pax_set_fptr_mask
23356+
23357+#ifdef CONFIG_PAX_KERNEXEC
23358+ GET_CR0_INTO_RDI
23359+ bts $X86_CR0_WP_BIT,%rdi
23360+ jc 110f
23361+ SET_RDI_INTO_CR0
23362+ or $2,%ebx
23363+110:
23364+#endif
23365+
23366+#ifdef CONFIG_PAX_MEMORY_UDEREF
23367+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23368+ GET_CR3_INTO_RDI
23369+ cmp $0,%dil
23370+ jz 111f
23371+ sub $4097,%rdi
23372+ or $4,%ebx
23373+ bts $63,%rdi
23374+ SET_RDI_INTO_CR3
23375+ mov $__UDEREF_KERNEL_DS,%edi
23376+ mov %edi,%ss
23377+111:
23378+#endif
23379+ .endm
23380+
23381+ .macro pax_exit_kernel_nmi
23382+#ifdef CONFIG_PAX_KERNEXEC
23383+ btr $1,%ebx
23384+ jnc 110f
23385+ GET_CR0_INTO_RDI
23386+ btr $X86_CR0_WP_BIT,%rdi
23387+ SET_RDI_INTO_CR0
23388+110:
23389+#endif
23390+
23391+#ifdef CONFIG_PAX_MEMORY_UDEREF
23392+ btr $2,%ebx
23393+ jnc 111f
23394+ GET_CR3_INTO_RDI
23395+ add $4097,%rdi
23396+ bts $63,%rdi
23397+ SET_RDI_INTO_CR3
23398+ mov $__KERNEL_DS,%edi
23399+ mov %edi,%ss
23400+111:
23401+#endif
23402+ .endm
23403+
23404+ .macro pax_erase_kstack
23405+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23406+ call pax_erase_kstack
23407+#endif
23408+ .endm
23409+
23410+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23411+ENTRY(pax_erase_kstack)
23412+ pushq %rdi
23413+ pushq %rcx
23414+ pushq %rax
23415+ pushq %r11
23416+
23417+ GET_THREAD_INFO(%r11)
23418+ mov TI_lowest_stack(%r11), %rdi
23419+ mov $-0xBEEF, %rax
23420+ std
23421+
23422+1: mov %edi, %ecx
23423+ and $THREAD_SIZE_asm - 1, %ecx
23424+ shr $3, %ecx
23425+ repne scasq
23426+ jecxz 2f
23427+
23428+ cmp $2*8, %ecx
23429+ jc 2f
23430+
23431+ mov $2*8, %ecx
23432+ repe scasq
23433+ jecxz 2f
23434+ jne 1b
23435+
23436+2: cld
23437+ or $2*8, %rdi
23438+ mov %esp, %ecx
23439+ sub %edi, %ecx
23440+
23441+ cmp $THREAD_SIZE_asm, %rcx
23442+ jb 3f
23443+ ud2
23444+3:
23445+
23446+ shr $3, %ecx
23447+ rep stosq
23448+
23449+ mov TI_task_thread_sp0(%r11), %rdi
23450+ sub $256, %rdi
23451+ mov %rdi, TI_lowest_stack(%r11)
23452+
23453+ popq %r11
23454+ popq %rax
23455+ popq %rcx
23456+ popq %rdi
23457+ pax_force_retaddr
23458+ ret
23459+ENDPROC(pax_erase_kstack)
23460+#endif
23461
23462 .macro TRACE_IRQS_IRETQ
23463 #ifdef CONFIG_TRACE_IRQFLAGS
23464@@ -100,7 +497,7 @@ ENDPROC(native_usergs_sysret64)
23465 .endm
23466
23467 .macro TRACE_IRQS_IRETQ_DEBUG
23468- bt $9,EFLAGS(%rsp) /* interrupts off? */
23469+ bt $X86_EFLAGS_IF_BIT,EFLAGS(%rsp) /* interrupts off? */
23470 jnc 1f
23471 TRACE_IRQS_ON_DEBUG
23472 1:
23473@@ -221,14 +618,6 @@ GLOBAL(system_call_after_swapgs)
23474 /* Construct struct pt_regs on stack */
23475 pushq_cfi $__USER_DS /* pt_regs->ss */
23476 pushq_cfi PER_CPU_VAR(rsp_scratch) /* pt_regs->sp */
23477- /*
23478- * Re-enable interrupts.
23479- * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23480- * must execute atomically in the face of possible interrupt-driven
23481- * task preemption. We must enable interrupts only after we're done
23482- * with using rsp_scratch:
23483- */
23484- ENABLE_INTERRUPTS(CLBR_NONE)
23485 pushq_cfi %r11 /* pt_regs->flags */
23486 pushq_cfi $__USER_CS /* pt_regs->cs */
23487 pushq_cfi %rcx /* pt_regs->ip */
23488@@ -246,7 +635,27 @@ GLOBAL(system_call_after_swapgs)
23489 sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */
23490 CFI_ADJUST_CFA_OFFSET 6*8
23491
23492- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23493+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
23494+ movq_cfi r12, R12
23495+#endif
23496+
23497+ pax_enter_kernel_user
23498+
23499+#ifdef CONFIG_PAX_RANDKSTACK
23500+ pax_erase_kstack
23501+#endif
23502+
23503+ /*
23504+ * Re-enable interrupts.
23505+ * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23506+ * must execute atomically in the face of possible interrupt-driven
23507+ * task preemption. We must enable interrupts only after we're done
23508+ * with using rsp_scratch:
23509+ */
23510+ ENABLE_INTERRUPTS(CLBR_NONE)
23511+
23512+ GET_THREAD_INFO(%rcx)
23513+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23514 jnz tracesys
23515 system_call_fastpath:
23516 #if __SYSCALL_MASK == ~0
23517@@ -279,10 +688,13 @@ system_call_fastpath:
23518 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23519 * very bad.
23520 */
23521- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23522+ GET_THREAD_INFO(%rcx)
23523+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23524 jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */
23525
23526 CFI_REMEMBER_STATE
23527+ pax_exit_kernel_user
23528+ pax_erase_kstack
23529
23530 RESTORE_C_REGS_EXCEPT_RCX_R11
23531 movq RIP(%rsp),%rcx
23532@@ -316,6 +728,9 @@ tracesys:
23533 call syscall_trace_enter_phase1
23534 test %rax, %rax
23535 jnz tracesys_phase2 /* if needed, run the slow path */
23536+
23537+ pax_erase_kstack
23538+
23539 RESTORE_C_REGS_EXCEPT_RAX /* else restore clobbered regs */
23540 movq ORIG_RAX(%rsp), %rax
23541 jmp system_call_fastpath /* and return to the fast path */
23542@@ -327,6 +742,8 @@ tracesys_phase2:
23543 movq %rax,%rdx
23544 call syscall_trace_enter_phase2
23545
23546+ pax_erase_kstack
23547+
23548 /*
23549 * Reload registers from stack in case ptrace changed them.
23550 * We don't reload %rax because syscall_trace_entry_phase2() returned
23551@@ -364,6 +781,8 @@ GLOBAL(int_with_check)
23552 andl %edi,%edx
23553 jnz int_careful
23554 andl $~TS_COMPAT,TI_status(%rcx)
23555+ pax_exit_kernel_user
23556+ pax_erase_kstack
23557 jmp syscall_return
23558
23559 /* Either reschedule or signal or syscall exit tracking needed. */
23560@@ -485,7 +904,7 @@ opportunistic_sysret_failed:
23561 SWAPGS
23562 jmp restore_c_regs_and_iret
23563 CFI_ENDPROC
23564-END(system_call)
23565+ENDPROC(system_call)
23566
23567
23568 .macro FORK_LIKE func
23569@@ -495,7 +914,7 @@ ENTRY(stub_\func)
23570 SAVE_EXTRA_REGS 8
23571 jmp sys_\func
23572 CFI_ENDPROC
23573-END(stub_\func)
23574+ENDPROC(stub_\func)
23575 .endm
23576
23577 FORK_LIKE clone
23578@@ -519,7 +938,7 @@ return_from_execve:
23579 movq %rax,RAX(%rsp)
23580 jmp int_ret_from_sys_call
23581 CFI_ENDPROC
23582-END(stub_execve)
23583+ENDPROC(stub_execve)
23584 /*
23585 * Remaining execve stubs are only 7 bytes long.
23586 * ENTRY() often aligns to 16 bytes, which in this case has no benefits.
23587@@ -531,7 +950,7 @@ GLOBAL(stub_execveat)
23588 call sys_execveat
23589 jmp return_from_execve
23590 CFI_ENDPROC
23591-END(stub_execveat)
23592+ENDPROC(stub_execveat)
23593
23594 #ifdef CONFIG_X86_X32_ABI
23595 .align 8
23596@@ -541,7 +960,7 @@ GLOBAL(stub_x32_execve)
23597 call compat_sys_execve
23598 jmp return_from_execve
23599 CFI_ENDPROC
23600-END(stub_x32_execve)
23601+ENDPROC(stub_x32_execve)
23602 .align 8
23603 GLOBAL(stub_x32_execveat)
23604 CFI_STARTPROC
23605@@ -549,7 +968,7 @@ GLOBAL(stub_x32_execveat)
23606 call compat_sys_execveat
23607 jmp return_from_execve
23608 CFI_ENDPROC
23609-END(stub_x32_execveat)
23610+ENDPROC(stub_x32_execveat)
23611 #endif
23612
23613 #ifdef CONFIG_IA32_EMULATION
23614@@ -592,7 +1011,7 @@ return_from_stub:
23615 movq %rax,RAX(%rsp)
23616 jmp int_ret_from_sys_call
23617 CFI_ENDPROC
23618-END(stub_rt_sigreturn)
23619+ENDPROC(stub_rt_sigreturn)
23620
23621 #ifdef CONFIG_X86_X32_ABI
23622 ENTRY(stub_x32_rt_sigreturn)
23623@@ -602,7 +1021,7 @@ ENTRY(stub_x32_rt_sigreturn)
23624 call sys32_x32_rt_sigreturn
23625 jmp return_from_stub
23626 CFI_ENDPROC
23627-END(stub_x32_rt_sigreturn)
23628+ENDPROC(stub_x32_rt_sigreturn)
23629 #endif
23630
23631 /*
23632@@ -622,7 +1041,7 @@ ENTRY(ret_from_fork)
23633
23634 RESTORE_EXTRA_REGS
23635
23636- testl $3,CS(%rsp) # from kernel_thread?
23637+ testb $3,CS(%rsp) # from kernel_thread?
23638
23639 /*
23640 * By the time we get here, we have no idea whether our pt_regs,
23641@@ -641,7 +1060,7 @@ ENTRY(ret_from_fork)
23642 RESTORE_EXTRA_REGS
23643 jmp int_ret_from_sys_call
23644 CFI_ENDPROC
23645-END(ret_from_fork)
23646+ENDPROC(ret_from_fork)
23647
23648 /*
23649 * Build the entry stubs with some assembler magic.
23650@@ -659,7 +1078,7 @@ ENTRY(irq_entries_start)
23651 .align 8
23652 .endr
23653 CFI_ENDPROC
23654-END(irq_entries_start)
23655+ENDPROC(irq_entries_start)
23656
23657 /*
23658 * Interrupt entry/exit.
23659@@ -672,21 +1091,13 @@ END(irq_entries_start)
23660 /* 0(%rsp): ~(interrupt number) */
23661 .macro interrupt func
23662 cld
23663- /*
23664- * Since nothing in interrupt handling code touches r12...r15 members
23665- * of "struct pt_regs", and since interrupts can nest, we can save
23666- * four stack slots and simultaneously provide
23667- * an unwind-friendly stack layout by saving "truncated" pt_regs
23668- * exactly up to rbp slot, without these members.
23669- */
23670- ALLOC_PT_GPREGS_ON_STACK -RBP
23671- SAVE_C_REGS -RBP
23672- /* this goes to 0(%rsp) for unwinder, not for saving the value: */
23673- SAVE_EXTRA_REGS_RBP -RBP
23674+ ALLOC_PT_GPREGS_ON_STACK
23675+ SAVE_C_REGS
23676+ SAVE_EXTRA_REGS
23677
23678- leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
23679+ movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */
23680
23681- testl $3, CS-RBP(%rsp)
23682+ testb $3, CS(%rsp)
23683 je 1f
23684 SWAPGS
23685 1:
23686@@ -709,8 +1120,20 @@ END(irq_entries_start)
23687 CFI_ESCAPE 0x0f /* DW_CFA_def_cfa_expression */, 6, \
23688 0x77 /* DW_OP_breg7 (rsp) */, 0, \
23689 0x06 /* DW_OP_deref */, \
23690- 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS-RBP, \
23691+ 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS, \
23692 0x22 /* DW_OP_plus */
23693+
23694+#ifdef CONFIG_PAX_MEMORY_UDEREF
23695+ testb $3, CS(%rdi)
23696+ jnz 1f
23697+ pax_enter_kernel
23698+ jmp 2f
23699+1: pax_enter_kernel_user
23700+2:
23701+#else
23702+ pax_enter_kernel
23703+#endif
23704+
23705 /* We entered an interrupt context - irqs are off: */
23706 TRACE_IRQS_OFF
23707
23708@@ -735,13 +1158,12 @@ ret_from_intr:
23709
23710 /* Restore saved previous stack */
23711 popq %rsi
23712- CFI_DEF_CFA rsi,SIZEOF_PTREGS-RBP /* reg/off reset after def_cfa_expr */
23713- /* return code expects complete pt_regs - adjust rsp accordingly: */
23714- leaq -RBP(%rsi),%rsp
23715+ CFI_DEF_CFA rsi,SIZEOF_PTREGS /* reg/off reset after def_cfa_expr */
23716+ movq %rsi, %rsp
23717 CFI_DEF_CFA_REGISTER rsp
23718- CFI_ADJUST_CFA_OFFSET RBP
23719+ CFI_ADJUST_CFA_OFFSET 0
23720
23721- testl $3,CS(%rsp)
23722+ testb $3,CS(%rsp)
23723 je retint_kernel
23724 /* Interrupt came from user space */
23725
23726@@ -763,6 +1185,8 @@ retint_swapgs: /* return to user-space */
23727 * The iretq could re-enable interrupts:
23728 */
23729 DISABLE_INTERRUPTS(CLBR_ANY)
23730+ pax_exit_kernel_user
23731+# pax_erase_kstack
23732 TRACE_IRQS_IRETQ
23733
23734 SWAPGS
23735@@ -781,6 +1205,21 @@ retint_kernel:
23736 jmp 0b
23737 1:
23738 #endif
23739+
23740+ pax_exit_kernel
23741+
23742+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23743+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23744+ * namely calling EFI runtime services with a phys mapping. We're
23745+ * starting off with NOPs and patch in the real instrumentation
23746+ * (BTS/OR) before starting any userland process; even before starting
23747+ * up the APs.
23748+ */
23749+ ALTERNATIVE "", "pax_force_retaddr 16*8", X86_FEATURE_ALWAYS
23750+#else
23751+ pax_force_retaddr RIP
23752+#endif
23753+
23754 /*
23755 * The iretq could re-enable interrupts:
23756 */
23757@@ -793,8 +1232,6 @@ retint_kernel:
23758 restore_c_regs_and_iret:
23759 RESTORE_C_REGS
23760 REMOVE_PT_GPREGS_FROM_STACK 8
23761-
23762-irq_return:
23763 INTERRUPT_RETURN
23764
23765 ENTRY(native_iret)
23766@@ -824,15 +1261,15 @@ native_irq_return_ldt:
23767 SWAPGS
23768 movq PER_CPU_VAR(espfix_waddr),%rdi
23769 movq %rax,(0*8)(%rdi) /* RAX */
23770- movq (2*8)(%rsp),%rax /* RIP */
23771+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23772 movq %rax,(1*8)(%rdi)
23773- movq (3*8)(%rsp),%rax /* CS */
23774+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23775 movq %rax,(2*8)(%rdi)
23776- movq (4*8)(%rsp),%rax /* RFLAGS */
23777+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23778 movq %rax,(3*8)(%rdi)
23779- movq (6*8)(%rsp),%rax /* SS */
23780+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23781 movq %rax,(5*8)(%rdi)
23782- movq (5*8)(%rsp),%rax /* RSP */
23783+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23784 movq %rax,(4*8)(%rdi)
23785 andl $0xffff0000,%eax
23786 popq_cfi %rdi
23787@@ -875,7 +1312,7 @@ retint_signal:
23788 jmp retint_with_reschedule
23789
23790 CFI_ENDPROC
23791-END(common_interrupt)
23792+ENDPROC(common_interrupt)
23793
23794 /*
23795 * APIC interrupts.
23796@@ -889,7 +1326,7 @@ ENTRY(\sym)
23797 interrupt \do_sym
23798 jmp ret_from_intr
23799 CFI_ENDPROC
23800-END(\sym)
23801+ENDPROC(\sym)
23802 .endm
23803
23804 #ifdef CONFIG_TRACING
23805@@ -962,7 +1399,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23806 /*
23807 * Exception entry points.
23808 */
23809-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)
23810+#define CPU_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23811
23812 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23813 ENTRY(\sym)
23814@@ -1018,6 +1455,12 @@ ENTRY(\sym)
23815 .endif
23816
23817 .if \shift_ist != -1
23818+#ifdef CONFIG_SMP
23819+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23820+ lea cpu_tss(%r13), %r13
23821+#else
23822+ lea cpu_tss(%rip), %r13
23823+#endif
23824 subq $EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)
23825 .endif
23826
23827@@ -1065,7 +1508,7 @@ ENTRY(\sym)
23828 .endif
23829
23830 CFI_ENDPROC
23831-END(\sym)
23832+ENDPROC(\sym)
23833 .endm
23834
23835 #ifdef CONFIG_TRACING
23836@@ -1106,9 +1549,10 @@ gs_change:
23837 2: mfence /* workaround */
23838 SWAPGS
23839 popfq_cfi
23840+ pax_force_retaddr
23841 ret
23842 CFI_ENDPROC
23843-END(native_load_gs_index)
23844+ENDPROC(native_load_gs_index)
23845
23846 _ASM_EXTABLE(gs_change,bad_gs)
23847 .section .fixup,"ax"
23848@@ -1136,9 +1580,10 @@ ENTRY(do_softirq_own_stack)
23849 CFI_DEF_CFA_REGISTER rsp
23850 CFI_ADJUST_CFA_OFFSET -8
23851 decl PER_CPU_VAR(irq_count)
23852+ pax_force_retaddr
23853 ret
23854 CFI_ENDPROC
23855-END(do_softirq_own_stack)
23856+ENDPROC(do_softirq_own_stack)
23857
23858 #ifdef CONFIG_XEN
23859 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23860@@ -1179,7 +1624,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23861 #endif
23862 jmp error_exit
23863 CFI_ENDPROC
23864-END(xen_do_hypervisor_callback)
23865+ENDPROC(xen_do_hypervisor_callback)
23866
23867 /*
23868 * Hypervisor uses this for application faults while it executes.
23869@@ -1240,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
23870 SAVE_EXTRA_REGS
23871 jmp error_exit
23872 CFI_ENDPROC
23873-END(xen_failsafe_callback)
23874+ENDPROC(xen_failsafe_callback)
23875
23876 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23877 xen_hvm_callback_vector xen_evtchn_do_upcall
23878@@ -1286,9 +1731,39 @@ ENTRY(paranoid_entry)
23879 js 1f /* negative -> in kernel */
23880 SWAPGS
23881 xorl %ebx,%ebx
23882-1: ret
23883+1:
23884+#ifdef CONFIG_PAX_MEMORY_UDEREF
23885+ testb $3, CS+8(%rsp)
23886+ jnz 1f
23887+ pax_enter_kernel
23888+ jmp 2f
23889+1: pax_enter_kernel_user
23890+2:
23891+#else
23892+ pax_enter_kernel
23893+#endif
23894+ pax_force_retaddr
23895+ ret
23896 CFI_ENDPROC
23897-END(paranoid_entry)
23898+ENDPROC(paranoid_entry)
23899+
23900+ENTRY(paranoid_entry_nmi)
23901+ XCPT_FRAME 1 15*8
23902+ cld
23903+ SAVE_C_REGS 8
23904+ SAVE_EXTRA_REGS 8
23905+ movl $1,%ebx
23906+ movl $MSR_GS_BASE,%ecx
23907+ rdmsr
23908+ testl %edx,%edx
23909+ js 1f /* negative -> in kernel */
23910+ SWAPGS
23911+ xorl %ebx,%ebx
23912+1: pax_enter_kernel_nmi
23913+ pax_force_retaddr
23914+ ret
23915+ CFI_ENDPROC
23916+ENDPROC(paranoid_entry_nmi)
23917
23918 /*
23919 * "Paranoid" exit path from exception stack. This is invoked
23920@@ -1305,20 +1780,27 @@ ENTRY(paranoid_exit)
23921 DEFAULT_FRAME
23922 DISABLE_INTERRUPTS(CLBR_NONE)
23923 TRACE_IRQS_OFF_DEBUG
23924- testl %ebx,%ebx /* swapgs needed? */
23925+ testl $1,%ebx /* swapgs needed? */
23926 jnz paranoid_exit_no_swapgs
23927+#ifdef CONFIG_PAX_MEMORY_UDEREF
23928+ pax_exit_kernel_user
23929+#else
23930+ pax_exit_kernel
23931+#endif
23932 TRACE_IRQS_IRETQ
23933 SWAPGS_UNSAFE_STACK
23934 jmp paranoid_exit_restore
23935 paranoid_exit_no_swapgs:
23936+ pax_exit_kernel
23937 TRACE_IRQS_IRETQ_DEBUG
23938 paranoid_exit_restore:
23939 RESTORE_EXTRA_REGS
23940 RESTORE_C_REGS
23941 REMOVE_PT_GPREGS_FROM_STACK 8
23942+ pax_force_retaddr_bts
23943 INTERRUPT_RETURN
23944 CFI_ENDPROC
23945-END(paranoid_exit)
23946+ENDPROC(paranoid_exit)
23947
23948 /*
23949 * Save all registers in pt_regs, and switch gs if needed.
23950@@ -1330,12 +1812,23 @@ ENTRY(error_entry)
23951 SAVE_C_REGS 8
23952 SAVE_EXTRA_REGS 8
23953 xorl %ebx,%ebx
23954- testl $3,CS+8(%rsp)
23955+ testb $3,CS+8(%rsp)
23956 je error_kernelspace
23957 error_swapgs:
23958 SWAPGS
23959 error_sti:
23960+#ifdef CONFIG_PAX_MEMORY_UDEREF
23961+ testb $3, CS+8(%rsp)
23962+ jnz 1f
23963+ pax_enter_kernel
23964+ jmp 2f
23965+1: pax_enter_kernel_user
23966+2:
23967+#else
23968+ pax_enter_kernel
23969+#endif
23970 TRACE_IRQS_OFF
23971+ pax_force_retaddr
23972 ret
23973
23974 /*
23975@@ -1370,7 +1863,7 @@ error_bad_iret:
23976 decl %ebx /* Return to usergs */
23977 jmp error_sti
23978 CFI_ENDPROC
23979-END(error_entry)
23980+ENDPROC(error_entry)
23981
23982
23983 /* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
23984@@ -1381,7 +1874,7 @@ ENTRY(error_exit)
23985 DISABLE_INTERRUPTS(CLBR_NONE)
23986 TRACE_IRQS_OFF
23987 GET_THREAD_INFO(%rcx)
23988- testl %eax,%eax
23989+ testl $1,%eax
23990 jne retint_kernel
23991 LOCKDEP_SYS_EXIT_IRQ
23992 movl TI_flags(%rcx),%edx
23993@@ -1390,7 +1883,7 @@ ENTRY(error_exit)
23994 jnz retint_careful
23995 jmp retint_swapgs
23996 CFI_ENDPROC
23997-END(error_exit)
23998+ENDPROC(error_exit)
23999
24000 /* Runs on exception stack */
24001 ENTRY(nmi)
24002@@ -1413,11 +1906,12 @@ ENTRY(nmi)
24003 * If the variable is not set and the stack is not the NMI
24004 * stack then:
24005 * o Set the special variable on the stack
24006- * o Copy the interrupt frame into a "saved" location on the stack
24007- * o Copy the interrupt frame into a "copy" location on the stack
24008+ * o Copy the interrupt frame into an "outermost" location on the
24009+ * stack
24010+ * o Copy the interrupt frame into an "iret" location on the stack
24011 * o Continue processing the NMI
24012 * If the variable is set or the previous stack is the NMI stack:
24013- * o Modify the "copy" location to jump to the repeate_nmi
24014+ * o Modify the "iret" location to jump to the repeat_nmi
24015 * o return back to the first NMI
24016 *
24017 * Now on exit of the first NMI, we first clear the stack variable
24018@@ -1426,32 +1920,185 @@ ENTRY(nmi)
24019 * a nested NMI that updated the copy interrupt stack frame, a
24020 * jump will be made to the repeat_nmi code that will handle the second
24021 * NMI.
24022+ *
24023+ * However, espfix prevents us from directly returning to userspace
24024+ * with a single IRET instruction. Similarly, IRET to user mode
24025+ * can fault. We therefore handle NMIs from user space like
24026+ * other IST entries.
24027 */
24028
24029 /* Use %rdx as our temp variable throughout */
24030 pushq_cfi %rdx
24031 CFI_REL_OFFSET rdx, 0
24032
24033+ testb $3, CS-RIP+8(%rsp)
24034+ jz .Lnmi_from_kernel
24035+
24036+ /*
24037+ * NMI from user mode. We need to run on the thread stack, but we
24038+ * can't go through the normal entry paths: NMIs are masked, and
24039+ * we don't want to enable interrupts, because then we'll end
24040+ * up in an awkward situation in which IRQs are on but NMIs
24041+ * are off.
24042+ */
24043+
24044+ SWAPGS
24045+ cld
24046+ movq %rsp, %rdx
24047+ movq PER_CPU_VAR(kernel_stack), %rsp
24048+ pushq 5*8(%rdx) /* pt_regs->ss */
24049+ pushq 4*8(%rdx) /* pt_regs->rsp */
24050+ pushq 3*8(%rdx) /* pt_regs->flags */
24051+ pushq 2*8(%rdx) /* pt_regs->cs */
24052+ pushq 1*8(%rdx) /* pt_regs->rip */
24053+ pushq $-1 /* pt_regs->orig_ax */
24054+ pushq %rdi /* pt_regs->di */
24055+ pushq %rsi /* pt_regs->si */
24056+ pushq (%rdx) /* pt_regs->dx */
24057+ pushq %rcx /* pt_regs->cx */
24058+ pushq %rax /* pt_regs->ax */
24059+ pushq %r8 /* pt_regs->r8 */
24060+ pushq %r9 /* pt_regs->r9 */
24061+ pushq %r10 /* pt_regs->r10 */
24062+ pushq %r11 /* pt_regs->r11 */
24063+ pushq %rbx /* pt_regs->rbx */
24064+ pushq %rbp /* pt_regs->rbp */
24065+ pushq %r12 /* pt_regs->r12 */
24066+ pushq %r13 /* pt_regs->r13 */
24067+ pushq %r14 /* pt_regs->r14 */
24068+ pushq %r15 /* pt_regs->r15 */
24069+
24070+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24071+ xorl %ebx,%ebx
24072+#endif
24073+
24074+ pax_enter_kernel_nmi
24075+
24076 /*
24077- * If %cs was not the kernel segment, then the NMI triggered in user
24078- * space, which means it is definitely not nested.
24079+ * At this point we no longer need to worry about stack damage
24080+ * due to nesting -- we're on the normal thread stack and we're
24081+ * done with the NMI stack.
24082 */
24083- cmpl $__KERNEL_CS, 16(%rsp)
24084- jne first_nmi
24085+
24086+ movq %rsp, %rdi
24087+ movq $-1, %rsi
24088+ call do_nmi
24089+
24090+ pax_exit_kernel_nmi
24091+
24092+ /*
24093+ * Return back to user mode. We must *not* do the normal exit
24094+ * work, because we don't want to enable interrupts. Fortunately,
24095+ * do_nmi doesn't modify pt_regs.
24096+ */
24097+ SWAPGS
24098+
24099+ /*
24100+ * Open-code the entire return process for compatibility with varying
24101+ * register layouts across different kernel versions.
24102+ */
24103+
24104+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24105+ movq RBX(%rsp), %rbx /* pt_regs->rbx*/
24106+#endif
24107+
24108+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
24109+ movq R12(%rsp), %r12 /* pt_regs->r12*/
24110+#endif
24111+
24112+ addq $6*8, %rsp /* skip bx, bp, and r12-r15 */
24113+ popq %r11 /* pt_regs->r11 */
24114+ popq %r10 /* pt_regs->r10 */
24115+ popq %r9 /* pt_regs->r9 */
24116+ popq %r8 /* pt_regs->r8 */
24117+ popq %rax /* pt_regs->ax */
24118+ popq %rcx /* pt_regs->cx */
24119+ popq %rdx /* pt_regs->dx */
24120+ popq %rsi /* pt_regs->si */
24121+ popq %rdi /* pt_regs->di */
24122+ addq $8, %rsp /* skip orig_ax */
24123+ INTERRUPT_RETURN
24124+
24125+.Lnmi_from_kernel:
24126+ /*
24127+ * Here's what our stack frame will look like:
24128+ * +---------------------------------------------------------+
24129+ * | original SS |
24130+ * | original Return RSP |
24131+ * | original RFLAGS |
24132+ * | original CS |
24133+ * | original RIP |
24134+ * +---------------------------------------------------------+
24135+ * | temp storage for rdx |
24136+ * +---------------------------------------------------------+
24137+ * | "NMI executing" variable |
24138+ * +---------------------------------------------------------+
24139+ * | iret SS } Copied from "outermost" frame |
24140+ * | iret Return RSP } on each loop iteration; overwritten |
24141+ * | iret RFLAGS } by a nested NMI to force another |
24142+ * | iret CS } iteration if needed. |
24143+ * | iret RIP } |
24144+ * +---------------------------------------------------------+
24145+ * | outermost SS } initialized in first_nmi; |
24146+ * | outermost Return RSP } will not be changed before |
24147+ * | outermost RFLAGS } NMI processing is done. |
24148+ * | outermost CS } Copied to "iret" frame on each |
24149+ * | outermost RIP } iteration. |
24150+ * +---------------------------------------------------------+
24151+ * | pt_regs |
24152+ * +---------------------------------------------------------+
24153+ *
24154+ * The "original" frame is used by hardware. Before re-enabling
24155+ * NMIs, we need to be done with it, and we need to leave enough
24156+ * space for the asm code here.
24157+ *
24158+ * We return by executing IRET while RSP points to the "iret" frame.
24159+ * That will either return for real or it will loop back into NMI
24160+ * processing.
24161+ *
24162+ * The "outermost" frame is copied to the "iret" frame on each
24163+ * iteration of the loop, so each iteration starts with the "iret"
24164+ * frame pointing to the final return target.
24165+ */
24166+
24167+ /*
24168+ * If we interrupted kernel code between repeat_nmi and
24169+ * end_repeat_nmi, then we are a nested NMI. We must not
24170+ * modify the "iret" frame because it's being written by
24171+ * the outer NMI. That's okay: the outer NMI handler is
24172+ * about to about to call do_nmi anyway, so we can just
24173+ * resume the outer NMI.
24174+ */
24175+
24176+ movq $repeat_nmi, %rdx
24177+ cmpq 8(%rsp), %rdx
24178+ ja 1f
24179+ movq $end_repeat_nmi, %rdx
24180+ cmpq 8(%rsp), %rdx
24181+ ja nested_nmi_out
24182+1:
24183
24184 /*
24185- * Check the special variable on the stack to see if NMIs are
24186- * executing.
24187+ * Now check "NMI executing". If it's set, then we're nested.
24188+ *
24189+ * First check "NMI executing". If it's set, then we're nested.
24190+ * This will not detect if we interrupted an outer NMI just
24191+ * before IRET.
24192 */
24193 cmpl $1, -8(%rsp)
24194 je nested_nmi
24195
24196 /*
24197- * Now test if the previous stack was an NMI stack.
24198- * We need the double check. We check the NMI stack to satisfy the
24199- * race when the first NMI clears the variable before returning.
24200- * We check the variable because the first NMI could be in a
24201- * breakpoint routine using a breakpoint stack.
24202+ * Now test if the previous stack was an NMI stack. This covers
24203+ * the case where we interrupt an outer NMI after it clears
24204+ * "NMI executing" but before IRET. We need to be careful, though:
24205+ * there is one case in which RSP could point to the NMI stack
24206+ * despite there being no NMI active: naughty userspace controls
24207+ * RSP at the very beginning of the SYSCALL targets. We can
24208+ * pull a fast one on naughty userspace, though: we program
24209+ * SYSCALL to mask DF, so userspace cannot cause DF to be set
24210+ * if it controls the kernel's RSP. We set DF before we clear
24211+ * "NMI executing".
24212 */
24213 lea 6*8(%rsp), %rdx
24214 /* Compare the NMI stack (rdx) with the stack we came from (4*8(%rsp)) */
24215@@ -1462,27 +2109,22 @@ ENTRY(nmi)
24216 cmpq %rdx, 4*8(%rsp)
24217 /* If it is below the NMI stack, it is a normal NMI */
24218 jb first_nmi
24219- /* Ah, it is within the NMI stack, treat it as nested */
24220+
24221+ /* Ah, it is within the NMI stack. */
24222+
24223+ testb $(X86_EFLAGS_DF >> 8), (3*8 + 1)(%rsp)
24224+ jz first_nmi /* RSP was user controlled. */
24225
24226 CFI_REMEMBER_STATE
24227
24228+ /* This is a nested NMI. */
24229+
24230 nested_nmi:
24231 /*
24232- * Do nothing if we interrupted the fixup in repeat_nmi.
24233- * It's about to repeat the NMI handler, so we are fine
24234- * with ignoring this one.
24235+ * Modify the "iret" frame to point to repeat_nmi, forcing another
24236+ * iteration of NMI handling.
24237 */
24238- movq $repeat_nmi, %rdx
24239- cmpq 8(%rsp), %rdx
24240- ja 1f
24241- movq $end_repeat_nmi, %rdx
24242- cmpq 8(%rsp), %rdx
24243- ja nested_nmi_out
24244-
24245-1:
24246- /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24247- leaq -1*8(%rsp), %rdx
24248- movq %rdx, %rsp
24249+ subq $8, %rsp
24250 CFI_ADJUST_CFA_OFFSET 1*8
24251 leaq -10*8(%rsp), %rdx
24252 pushq_cfi $__KERNEL_DS
24253@@ -1499,60 +2141,24 @@ nested_nmi_out:
24254 popq_cfi %rdx
24255 CFI_RESTORE rdx
24256
24257- /* No need to check faults here */
24258+ /* We are returning to kernel mode, so this cannot result in a fault. */
24259+# pax_force_retaddr_bts
24260 INTERRUPT_RETURN
24261
24262 CFI_RESTORE_STATE
24263 first_nmi:
24264- /*
24265- * Because nested NMIs will use the pushed location that we
24266- * stored in rdx, we must keep that space available.
24267- * Here's what our stack frame will look like:
24268- * +-------------------------+
24269- * | original SS |
24270- * | original Return RSP |
24271- * | original RFLAGS |
24272- * | original CS |
24273- * | original RIP |
24274- * +-------------------------+
24275- * | temp storage for rdx |
24276- * +-------------------------+
24277- * | NMI executing variable |
24278- * +-------------------------+
24279- * | copied SS |
24280- * | copied Return RSP |
24281- * | copied RFLAGS |
24282- * | copied CS |
24283- * | copied RIP |
24284- * +-------------------------+
24285- * | Saved SS |
24286- * | Saved Return RSP |
24287- * | Saved RFLAGS |
24288- * | Saved CS |
24289- * | Saved RIP |
24290- * +-------------------------+
24291- * | pt_regs |
24292- * +-------------------------+
24293- *
24294- * The saved stack frame is used to fix up the copied stack frame
24295- * that a nested NMI may change to make the interrupted NMI iret jump
24296- * to the repeat_nmi. The original stack frame and the temp storage
24297- * is also used by nested NMIs and can not be trusted on exit.
24298- */
24299- /* Do not pop rdx, nested NMIs will corrupt that part of the stack */
24300+ /* Restore rdx. */
24301 movq (%rsp), %rdx
24302 CFI_RESTORE rdx
24303
24304 /* Set the NMI executing variable on the stack. */
24305 pushq_cfi $1
24306
24307- /*
24308- * Leave room for the "copied" frame
24309- */
24310+ /* Leave room for the "iret" frame */
24311 subq $(5*8), %rsp
24312 CFI_ADJUST_CFA_OFFSET 5*8
24313
24314- /* Copy the stack frame to the Saved frame */
24315+ /* Copy the "original" frame to the "outermost" frame */
24316 .rept 5
24317 pushq_cfi 11*8(%rsp)
24318 .endr
24319@@ -1560,6 +2166,7 @@ first_nmi:
24320
24321 /* Everything up to here is safe from nested NMIs */
24322
24323+repeat_nmi:
24324 /*
24325 * If there was a nested NMI, the first NMI's iret will return
24326 * here. But NMIs are still enabled and we can take another
24327@@ -1568,16 +2175,21 @@ first_nmi:
24328 * it will just return, as we are about to repeat an NMI anyway.
24329 * This makes it safe to copy to the stack frame that a nested
24330 * NMI will update.
24331- */
24332-repeat_nmi:
24333- /*
24334- * Update the stack variable to say we are still in NMI (the update
24335- * is benign for the non-repeat case, where 1 was pushed just above
24336- * to this very stack slot).
24337+ *
24338+ * RSP is pointing to "outermost RIP". gsbase is unknown, but, if
24339+ * we're repeating an NMI, gsbase has the same value that it had on
24340+ * the first iteration. paranoid_entry will load the kernel
24341+ * gsbase if needed before we call do_nmi.
24342+ *
24343+ * Set "NMI executing" in case we came back here via IRET.
24344 */
24345 movq $1, 10*8(%rsp)
24346
24347- /* Make another copy, this one may be modified by nested NMIs */
24348+ /*
24349+ * Copy the "outermost" frame to the "iret" frame. NMIs that nest
24350+ * here must not modify the "iret" frame while we're writing to
24351+ * it or it will end up containing garbage.
24352+ */
24353 addq $(10*8), %rsp
24354 CFI_ADJUST_CFA_OFFSET -10*8
24355 .rept 5
24356@@ -1588,66 +2200,65 @@ repeat_nmi:
24357 end_repeat_nmi:
24358
24359 /*
24360- * Everything below this point can be preempted by a nested
24361- * NMI if the first NMI took an exception and reset our iret stack
24362- * so that we repeat another NMI.
24363+ * Everything below this point can be preempted by a nested NMI.
24364+ * If this happens, then the inner NMI will change the "iret"
24365+ * frame to point back to repeat_nmi.
24366 */
24367 pushq_cfi $-1 /* ORIG_RAX: no syscall to restart */
24368 ALLOC_PT_GPREGS_ON_STACK
24369
24370 /*
24371- * Use paranoid_entry to handle SWAPGS, but no need to use paranoid_exit
24372+ * Use paranoid_entry_nmi to handle SWAPGS, but no need to use paranoid_exit
24373 * as we should not be calling schedule in NMI context.
24374 * Even with normal interrupts enabled. An NMI should not be
24375 * setting NEED_RESCHED or anything that normal interrupts and
24376 * exceptions might do.
24377 */
24378- call paranoid_entry
24379+ call paranoid_entry_nmi
24380 DEFAULT_FRAME 0
24381
24382- /*
24383- * Save off the CR2 register. If we take a page fault in the NMI then
24384- * it could corrupt the CR2 value. If the NMI preempts a page fault
24385- * handler before it was able to read the CR2 register, and then the
24386- * NMI itself takes a page fault, the page fault that was preempted
24387- * will read the information from the NMI page fault and not the
24388- * origin fault. Save it off and restore it if it changes.
24389- * Use the r12 callee-saved register.
24390- */
24391- movq %cr2, %r12
24392-
24393 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24394 movq %rsp,%rdi
24395 movq $-1,%rsi
24396 call do_nmi
24397
24398- /* Did the NMI take a page fault? Restore cr2 if it did */
24399- movq %cr2, %rcx
24400- cmpq %rcx, %r12
24401- je 1f
24402- movq %r12, %cr2
24403-1:
24404-
24405- testl %ebx,%ebx /* swapgs needed? */
24406+ testl $1,%ebx /* swapgs needed? */
24407 jnz nmi_restore
24408 nmi_swapgs:
24409 SWAPGS_UNSAFE_STACK
24410 nmi_restore:
24411+ pax_exit_kernel_nmi
24412 RESTORE_EXTRA_REGS
24413 RESTORE_C_REGS
24414- /* Pop the extra iret frame at once */
24415+
24416 REMOVE_PT_GPREGS_FROM_STACK 6*8
24417
24418- /* Clear the NMI executing stack variable */
24419- movq $0, 5*8(%rsp)
24420- jmp irq_return
24421+ pax_force_retaddr_bts
24422+
24423+ /*
24424+ * Clear "NMI executing". Set DF first so that we can easily
24425+ * distinguish the remaining code between here and IRET from
24426+ * the SYSCALL entry and exit paths. On a native kernel, we
24427+ * could just inspect RIP, but, on paravirt kernels,
24428+ * INTERRUPT_RETURN can translate into a jump into a
24429+ * hypercall page.
24430+ */
24431+ std
24432+ movq $0, 5*8(%rsp) /* clear "NMI executing" */
24433+
24434+ /*
24435+ * INTERRUPT_RETURN reads the "iret" frame and exits the NMI
24436+ * stack in a single instruction. We are returning to kernel
24437+ * mode, so this cannot result in a fault.
24438+ */
24439+ INTERRUPT_RETURN
24440 CFI_ENDPROC
24441-END(nmi)
24442+ENDPROC(nmi)
24443
24444 ENTRY(ignore_sysret)
24445 CFI_STARTPROC
24446 mov $-ENOSYS,%eax
24447 sysret
24448 CFI_ENDPROC
24449-END(ignore_sysret)
24450+ENDPROC(ignore_sysret)
24451
24452diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24453index f5d0730..5bce89c 100644
24454--- a/arch/x86/kernel/espfix_64.c
24455+++ b/arch/x86/kernel/espfix_64.c
24456@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24457 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24458 static void *espfix_pages[ESPFIX_MAX_PAGES];
24459
24460-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24461- __aligned(PAGE_SIZE);
24462+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24463
24464 static unsigned int page_random, slot_random;
24465
24466@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24467 void __init init_espfix_bsp(void)
24468 {
24469 pgd_t *pgd_p;
24470+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24471
24472 /* Install the espfix pud into the kernel page directory */
24473- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24474+ pgd_p = &init_level4_pgt[index];
24475 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24476
24477+#ifdef CONFIG_PAX_PER_CPU_PGD
24478+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24479+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24480+#endif
24481+
24482 /* Randomize the locations */
24483 init_espfix_random();
24484
24485@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24486 set_pte(&pte_p[n*PTE_STRIDE], pte);
24487
24488 /* Job is done for this CPU and any CPU which shares this page */
24489- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24490+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24491
24492 unlock_done:
24493 mutex_unlock(&espfix_init_mutex);
24494diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24495index 8b7b0a5..02219db 100644
24496--- a/arch/x86/kernel/ftrace.c
24497+++ b/arch/x86/kernel/ftrace.c
24498@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24499 * kernel identity mapping to modify code.
24500 */
24501 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24502- ip = (unsigned long)__va(__pa_symbol(ip));
24503+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24504
24505 return ip;
24506 }
24507@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24508 {
24509 unsigned char replaced[MCOUNT_INSN_SIZE];
24510
24511+ ip = ktla_ktva(ip);
24512+
24513 /*
24514 * Note: Due to modules and __init, code can
24515 * disappear and change, we need to protect against faulting
24516@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24517 unsigned char old[MCOUNT_INSN_SIZE];
24518 int ret;
24519
24520- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24521+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24522
24523 ftrace_update_func = ip;
24524 /* Make sure the breakpoints see the ftrace_update_func update */
24525@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24526 unsigned char replaced[MCOUNT_INSN_SIZE];
24527 unsigned char brk = BREAKPOINT_INSTRUCTION;
24528
24529- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24530+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24531 return -EFAULT;
24532
24533 /* Make sure it is what we expect it to be */
24534@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24535 /* Module allocation simplifies allocating memory for code */
24536 static inline void *alloc_tramp(unsigned long size)
24537 {
24538- return module_alloc(size);
24539+ return module_alloc_exec(size);
24540 }
24541 static inline void tramp_free(void *tramp)
24542 {
24543- module_memfree(tramp);
24544+ module_memfree_exec(tramp);
24545 }
24546 #else
24547 /* Trampolines can only be created if modules are supported */
24548@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24549 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24550
24551 /* Copy ftrace_caller onto the trampoline memory */
24552+ pax_open_kernel();
24553 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24554+ pax_close_kernel();
24555 if (WARN_ON(ret < 0)) {
24556 tramp_free(trampoline);
24557 return 0;
24558@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24559
24560 /* The trampoline ends with a jmp to ftrace_return */
24561 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24562+ pax_open_kernel();
24563 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24564
24565 /*
24566@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24567
24568 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24569 *ptr = (unsigned long)ops;
24570+ pax_close_kernel();
24571
24572 op_offset -= start_offset;
24573 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24574@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24575 op_ptr.offset = offset;
24576
24577 /* put in the new offset to the ftrace_ops */
24578+ pax_open_kernel();
24579 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24580+ pax_close_kernel();
24581
24582 /* ALLOC_TRAMP flags lets us know we created it */
24583 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24584diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24585index 5a46681..1ef7ffa 100644
24586--- a/arch/x86/kernel/head64.c
24587+++ b/arch/x86/kernel/head64.c
24588@@ -68,12 +68,12 @@ again:
24589 pgd = *pgd_p;
24590
24591 /*
24592- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24593- * critical -- __PAGE_OFFSET would point us back into the dynamic
24594+ * The use of __early_va rather than __va here is critical:
24595+ * __va would point us back into the dynamic
24596 * range and we might end up looping forever...
24597 */
24598 if (pgd)
24599- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24600+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24601 else {
24602 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24603 reset_early_page_tables();
24604@@ -83,13 +83,13 @@ again:
24605 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24606 for (i = 0; i < PTRS_PER_PUD; i++)
24607 pud_p[i] = 0;
24608- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24609+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24610 }
24611 pud_p += pud_index(address);
24612 pud = *pud_p;
24613
24614 if (pud)
24615- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24616+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24617 else {
24618 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24619 reset_early_page_tables();
24620@@ -99,7 +99,7 @@ again:
24621 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24622 for (i = 0; i < PTRS_PER_PMD; i++)
24623 pmd_p[i] = 0;
24624- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24625+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24626 }
24627 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24628 pmd_p[pmd_index(address)] = pmd;
24629@@ -177,7 +177,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24630 */
24631 load_ucode_bsp();
24632
24633- clear_page(init_level4_pgt);
24634 /* set init_level4_pgt kernel high mapping*/
24635 init_level4_pgt[511] = early_level4_pgt[511];
24636
24637diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24638index 7e429c9..7244a52 100644
24639--- a/arch/x86/kernel/head_32.S
24640+++ b/arch/x86/kernel/head_32.S
24641@@ -27,6 +27,12 @@
24642 /* Physical address */
24643 #define pa(X) ((X) - __PAGE_OFFSET)
24644
24645+#ifdef CONFIG_PAX_KERNEXEC
24646+#define ta(X) (X)
24647+#else
24648+#define ta(X) ((X) - __PAGE_OFFSET)
24649+#endif
24650+
24651 /*
24652 * References to members of the new_cpu_data structure.
24653 */
24654@@ -56,11 +62,7 @@
24655 * and small than max_low_pfn, otherwise will waste some page table entries
24656 */
24657
24658-#if PTRS_PER_PMD > 1
24659-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24660-#else
24661-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24662-#endif
24663+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24664
24665 /*
24666 * Number of possible pages in the lowmem region.
24667@@ -86,6 +88,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24668 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24669
24670 /*
24671+ * Real beginning of normal "text" segment
24672+ */
24673+ENTRY(stext)
24674+ENTRY(_stext)
24675+
24676+/*
24677 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24678 * %esi points to the real-mode code as a 32-bit pointer.
24679 * CS and DS must be 4 GB flat segments, but we don't depend on
24680@@ -93,6 +101,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24681 * can.
24682 */
24683 __HEAD
24684+
24685+#ifdef CONFIG_PAX_KERNEXEC
24686+ jmp startup_32
24687+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24688+.fill PAGE_SIZE-5,1,0xcc
24689+#endif
24690+
24691 ENTRY(startup_32)
24692 movl pa(stack_start),%ecx
24693
24694@@ -114,6 +129,59 @@ ENTRY(startup_32)
24695 2:
24696 leal -__PAGE_OFFSET(%ecx),%esp
24697
24698+#ifdef CONFIG_SMP
24699+ movl $pa(cpu_gdt_table),%edi
24700+ movl $__per_cpu_load,%eax
24701+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24702+ rorl $16,%eax
24703+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24704+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24705+ movl $__per_cpu_end - 1,%eax
24706+ subl $__per_cpu_start,%eax
24707+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24708+#endif
24709+
24710+#ifdef CONFIG_PAX_MEMORY_UDEREF
24711+ movl $NR_CPUS,%ecx
24712+ movl $pa(cpu_gdt_table),%edi
24713+1:
24714+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24715+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24716+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24717+ addl $PAGE_SIZE_asm,%edi
24718+ loop 1b
24719+#endif
24720+
24721+#ifdef CONFIG_PAX_KERNEXEC
24722+ movl $pa(boot_gdt),%edi
24723+ movl $__LOAD_PHYSICAL_ADDR,%eax
24724+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24725+ rorl $16,%eax
24726+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24727+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24728+ rorl $16,%eax
24729+
24730+ ljmp $(__BOOT_CS),$1f
24731+1:
24732+
24733+ movl $NR_CPUS,%ecx
24734+ movl $pa(cpu_gdt_table),%edi
24735+ addl $__PAGE_OFFSET,%eax
24736+1:
24737+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24738+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24739+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24740+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24741+ rorl $16,%eax
24742+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24743+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24744+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24745+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24746+ rorl $16,%eax
24747+ addl $PAGE_SIZE_asm,%edi
24748+ loop 1b
24749+#endif
24750+
24751 /*
24752 * Clear BSS first so that there are no surprises...
24753 */
24754@@ -209,8 +277,11 @@ ENTRY(startup_32)
24755 movl %eax, pa(max_pfn_mapped)
24756
24757 /* Do early initialization of the fixmap area */
24758- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24759- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24760+#ifdef CONFIG_COMPAT_VDSO
24761+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24762+#else
24763+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24764+#endif
24765 #else /* Not PAE */
24766
24767 page_pde_offset = (__PAGE_OFFSET >> 20);
24768@@ -240,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24769 movl %eax, pa(max_pfn_mapped)
24770
24771 /* Do early initialization of the fixmap area */
24772- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24773- movl %eax,pa(initial_page_table+0xffc)
24774+#ifdef CONFIG_COMPAT_VDSO
24775+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24776+#else
24777+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24778+#endif
24779 #endif
24780
24781 #ifdef CONFIG_PARAVIRT
24782@@ -255,9 +329,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24783 cmpl $num_subarch_entries, %eax
24784 jae bad_subarch
24785
24786- movl pa(subarch_entries)(,%eax,4), %eax
24787- subl $__PAGE_OFFSET, %eax
24788- jmp *%eax
24789+ jmp *pa(subarch_entries)(,%eax,4)
24790
24791 bad_subarch:
24792 WEAK(lguest_entry)
24793@@ -269,10 +341,10 @@ WEAK(xen_entry)
24794 __INITDATA
24795
24796 subarch_entries:
24797- .long default_entry /* normal x86/PC */
24798- .long lguest_entry /* lguest hypervisor */
24799- .long xen_entry /* Xen hypervisor */
24800- .long default_entry /* Moorestown MID */
24801+ .long ta(default_entry) /* normal x86/PC */
24802+ .long ta(lguest_entry) /* lguest hypervisor */
24803+ .long ta(xen_entry) /* Xen hypervisor */
24804+ .long ta(default_entry) /* Moorestown MID */
24805 num_subarch_entries = (. - subarch_entries) / 4
24806 .previous
24807 #else
24808@@ -362,6 +434,7 @@ default_entry:
24809 movl pa(mmu_cr4_features),%eax
24810 movl %eax,%cr4
24811
24812+#ifdef CONFIG_X86_PAE
24813 testb $X86_CR4_PAE, %al # check if PAE is enabled
24814 jz enable_paging
24815
24816@@ -390,6 +463,9 @@ default_entry:
24817 /* Make changes effective */
24818 wrmsr
24819
24820+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24821+#endif
24822+
24823 enable_paging:
24824
24825 /*
24826@@ -457,14 +533,20 @@ is486:
24827 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24828 movl %eax,%ss # after changing gdt.
24829
24830- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24831+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24832 movl %eax,%ds
24833 movl %eax,%es
24834
24835 movl $(__KERNEL_PERCPU), %eax
24836 movl %eax,%fs # set this cpu's percpu
24837
24838+#ifdef CONFIG_CC_STACKPROTECTOR
24839 movl $(__KERNEL_STACK_CANARY),%eax
24840+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24841+ movl $(__USER_DS),%eax
24842+#else
24843+ xorl %eax,%eax
24844+#endif
24845 movl %eax,%gs
24846
24847 xorl %eax,%eax # Clear LDT
24848@@ -521,8 +603,11 @@ setup_once:
24849 * relocation. Manually set base address in stack canary
24850 * segment descriptor.
24851 */
24852- movl $gdt_page,%eax
24853+ movl $cpu_gdt_table,%eax
24854 movl $stack_canary,%ecx
24855+#ifdef CONFIG_SMP
24856+ addl $__per_cpu_load,%ecx
24857+#endif
24858 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24859 shrl $16, %ecx
24860 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24861@@ -559,7 +644,7 @@ early_idt_handler_common:
24862 cmpl $2,(%esp) # X86_TRAP_NMI
24863 je is_nmi # Ignore NMI
24864
24865- cmpl $2,%ss:early_recursion_flag
24866+ cmpl $1,%ss:early_recursion_flag
24867 je hlt_loop
24868 incl %ss:early_recursion_flag
24869
24870@@ -597,8 +682,8 @@ early_idt_handler_common:
24871 pushl (20+6*4)(%esp) /* trapno */
24872 pushl $fault_msg
24873 call printk
24874-#endif
24875 call dump_stack
24876+#endif
24877 hlt_loop:
24878 hlt
24879 jmp hlt_loop
24880@@ -618,8 +703,11 @@ ENDPROC(early_idt_handler_common)
24881 /* This is the default interrupt "handler" :-) */
24882 ALIGN
24883 ignore_int:
24884- cld
24885 #ifdef CONFIG_PRINTK
24886+ cmpl $2,%ss:early_recursion_flag
24887+ je hlt_loop
24888+ incl %ss:early_recursion_flag
24889+ cld
24890 pushl %eax
24891 pushl %ecx
24892 pushl %edx
24893@@ -628,9 +716,6 @@ ignore_int:
24894 movl $(__KERNEL_DS),%eax
24895 movl %eax,%ds
24896 movl %eax,%es
24897- cmpl $2,early_recursion_flag
24898- je hlt_loop
24899- incl early_recursion_flag
24900 pushl 16(%esp)
24901 pushl 24(%esp)
24902 pushl 32(%esp)
24903@@ -664,29 +749,34 @@ ENTRY(setup_once_ref)
24904 /*
24905 * BSS section
24906 */
24907-__PAGE_ALIGNED_BSS
24908- .align PAGE_SIZE
24909 #ifdef CONFIG_X86_PAE
24910+.section .initial_pg_pmd,"a",@progbits
24911 initial_pg_pmd:
24912 .fill 1024*KPMDS,4,0
24913 #else
24914+.section .initial_page_table,"a",@progbits
24915 ENTRY(initial_page_table)
24916 .fill 1024,4,0
24917 #endif
24918+.section .initial_pg_fixmap,"a",@progbits
24919 initial_pg_fixmap:
24920 .fill 1024,4,0
24921+.section .empty_zero_page,"a",@progbits
24922 ENTRY(empty_zero_page)
24923 .fill 4096,1,0
24924+.section .swapper_pg_dir,"a",@progbits
24925 ENTRY(swapper_pg_dir)
24926+#ifdef CONFIG_X86_PAE
24927+ .fill 4,8,0
24928+#else
24929 .fill 1024,4,0
24930+#endif
24931
24932 /*
24933 * This starts the data section.
24934 */
24935 #ifdef CONFIG_X86_PAE
24936-__PAGE_ALIGNED_DATA
24937- /* Page-aligned for the benefit of paravirt? */
24938- .align PAGE_SIZE
24939+.section .initial_page_table,"a",@progbits
24940 ENTRY(initial_page_table)
24941 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24942 # if KPMDS == 3
24943@@ -705,12 +795,20 @@ ENTRY(initial_page_table)
24944 # error "Kernel PMDs should be 1, 2 or 3"
24945 # endif
24946 .align PAGE_SIZE /* needs to be page-sized too */
24947+
24948+#ifdef CONFIG_PAX_PER_CPU_PGD
24949+ENTRY(cpu_pgd)
24950+ .rept 2*NR_CPUS
24951+ .fill 4,8,0
24952+ .endr
24953+#endif
24954+
24955 #endif
24956
24957 .data
24958 .balign 4
24959 ENTRY(stack_start)
24960- .long init_thread_union+THREAD_SIZE
24961+ .long init_thread_union+THREAD_SIZE-8
24962
24963 __INITRODATA
24964 int_msg:
24965@@ -738,7 +836,7 @@ fault_msg:
24966 * segment size, and 32-bit linear address value:
24967 */
24968
24969- .data
24970+.section .rodata,"a",@progbits
24971 .globl boot_gdt_descr
24972 .globl idt_descr
24973
24974@@ -747,7 +845,7 @@ fault_msg:
24975 .word 0 # 32 bit align gdt_desc.address
24976 boot_gdt_descr:
24977 .word __BOOT_DS+7
24978- .long boot_gdt - __PAGE_OFFSET
24979+ .long pa(boot_gdt)
24980
24981 .word 0 # 32-bit align idt_desc.address
24982 idt_descr:
24983@@ -758,7 +856,7 @@ idt_descr:
24984 .word 0 # 32 bit align gdt_desc.address
24985 ENTRY(early_gdt_descr)
24986 .word GDT_ENTRIES*8-1
24987- .long gdt_page /* Overwritten for secondary CPUs */
24988+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24989
24990 /*
24991 * The boot_gdt must mirror the equivalent in setup.S and is
24992@@ -767,5 +865,65 @@ ENTRY(early_gdt_descr)
24993 .align L1_CACHE_BYTES
24994 ENTRY(boot_gdt)
24995 .fill GDT_ENTRY_BOOT_CS,8,0
24996- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24997- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24998+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24999+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
25000+
25001+ .align PAGE_SIZE_asm
25002+ENTRY(cpu_gdt_table)
25003+ .rept NR_CPUS
25004+ .quad 0x0000000000000000 /* NULL descriptor */
25005+ .quad 0x0000000000000000 /* 0x0b reserved */
25006+ .quad 0x0000000000000000 /* 0x13 reserved */
25007+ .quad 0x0000000000000000 /* 0x1b reserved */
25008+
25009+#ifdef CONFIG_PAX_KERNEXEC
25010+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
25011+#else
25012+ .quad 0x0000000000000000 /* 0x20 unused */
25013+#endif
25014+
25015+ .quad 0x0000000000000000 /* 0x28 unused */
25016+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
25017+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
25018+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
25019+ .quad 0x0000000000000000 /* 0x4b reserved */
25020+ .quad 0x0000000000000000 /* 0x53 reserved */
25021+ .quad 0x0000000000000000 /* 0x5b reserved */
25022+
25023+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
25024+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
25025+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
25026+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
25027+
25028+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
25029+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
25030+
25031+ /*
25032+ * Segments used for calling PnP BIOS have byte granularity.
25033+ * The code segments and data segments have fixed 64k limits,
25034+ * the transfer segment sizes are set at run time.
25035+ */
25036+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
25037+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
25038+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
25039+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
25040+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
25041+
25042+ /*
25043+ * The APM segments have byte granularity and their bases
25044+ * are set at run time. All have 64k limits.
25045+ */
25046+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
25047+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
25048+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
25049+
25050+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
25051+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
25052+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
25053+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
25054+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
25055+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
25056+
25057+ /* Be sure this is zeroed to avoid false validations in Xen */
25058+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
25059+ .endr
25060diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
25061index df7e780..e97a497 100644
25062--- a/arch/x86/kernel/head_64.S
25063+++ b/arch/x86/kernel/head_64.S
25064@@ -20,6 +20,8 @@
25065 #include <asm/processor-flags.h>
25066 #include <asm/percpu.h>
25067 #include <asm/nops.h>
25068+#include <asm/cpufeature.h>
25069+#include <asm/alternative-asm.h>
25070
25071 #ifdef CONFIG_PARAVIRT
25072 #include <asm/asm-offsets.h>
25073@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
25074 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
25075 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
25076 L3_START_KERNEL = pud_index(__START_KERNEL_map)
25077+L4_VMALLOC_START = pgd_index(VMALLOC_START)
25078+L3_VMALLOC_START = pud_index(VMALLOC_START)
25079+L4_VMALLOC_END = pgd_index(VMALLOC_END)
25080+L3_VMALLOC_END = pud_index(VMALLOC_END)
25081+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
25082+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
25083
25084 .text
25085 __HEAD
25086@@ -89,11 +97,26 @@ startup_64:
25087 * Fixup the physical addresses in the page table
25088 */
25089 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
25090+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
25091+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
25092+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
25093+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
25094+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
25095
25096- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
25097- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
25098+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
25099+#ifndef CONFIG_XEN
25100+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
25101+#endif
25102
25103+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
25104+
25105+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
25106+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
25107+
25108+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
25109+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
25110 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
25111+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
25112
25113 /*
25114 * Set up the identity mapping for the switchover. These
25115@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
25116 * after the boot processor executes this code.
25117 */
25118
25119+ orq $-1, %rbp
25120 movq $(init_level4_pgt - __START_KERNEL_map), %rax
25121 1:
25122
25123- /* Enable PAE mode and PGE */
25124- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
25125+ /* Enable PAE mode and PSE/PGE */
25126+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
25127 movq %rcx, %cr4
25128
25129 /* Setup early boot stage 4 level pagetables. */
25130@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
25131 movl $MSR_EFER, %ecx
25132 rdmsr
25133 btsl $_EFER_SCE, %eax /* Enable System Call */
25134- btl $20,%edi /* No Execute supported? */
25135+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
25136 jnc 1f
25137 btsl $_EFER_NX, %eax
25138+ cmpq $-1, %rbp
25139+ je 1f
25140 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
25141+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
25142+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
25143+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
25144+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
25145+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
25146+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
25147+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
25148+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
25149+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
25150 1: wrmsr /* Make changes effective */
25151
25152 /* Setup cr0 */
25153@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
25154 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
25155 * address given in m16:64.
25156 */
25157+ pax_set_fptr_mask
25158 movq initial_code(%rip),%rax
25159 pushq $0 # fake return address to stop unwinder
25160 pushq $__KERNEL_CS # set correct cs
25161@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
25162 .quad INIT_PER_CPU_VAR(irq_stack_union)
25163
25164 GLOBAL(stack_start)
25165- .quad init_thread_union+THREAD_SIZE-8
25166+ .quad init_thread_union+THREAD_SIZE-16
25167 .word 0
25168 __FINITDATA
25169
25170@@ -393,7 +429,7 @@ early_idt_handler_common:
25171 call dump_stack
25172 #ifdef CONFIG_KALLSYMS
25173 leaq early_idt_ripmsg(%rip),%rdi
25174- movq 40(%rsp),%rsi # %rip again
25175+ movq 88(%rsp),%rsi # %rip again
25176 call __print_symbol
25177 #endif
25178 #endif /* EARLY_PRINTK */
25179@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
25180 early_recursion_flag:
25181 .long 0
25182
25183+ .section .rodata,"a",@progbits
25184 #ifdef CONFIG_EARLY_PRINTK
25185 early_idt_msg:
25186 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
25187@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
25188 NEXT_PAGE(early_dynamic_pgts)
25189 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
25190
25191- .data
25192+ .section .rodata,"a",@progbits
25193
25194-#ifndef CONFIG_XEN
25195 NEXT_PAGE(init_level4_pgt)
25196- .fill 512,8,0
25197-#else
25198-NEXT_PAGE(init_level4_pgt)
25199- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25200 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
25201 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25202+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
25203+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
25204+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
25205+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
25206+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
25207+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25208 .org init_level4_pgt + L4_START_KERNEL*8, 0
25209 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
25210 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
25211
25212+#ifdef CONFIG_PAX_PER_CPU_PGD
25213+NEXT_PAGE(cpu_pgd)
25214+ .rept 2*NR_CPUS
25215+ .fill 512,8,0
25216+ .endr
25217+#endif
25218+
25219 NEXT_PAGE(level3_ident_pgt)
25220 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25221+#ifdef CONFIG_XEN
25222 .fill 511, 8, 0
25223+#else
25224+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
25225+ .fill 510,8,0
25226+#endif
25227+
25228+NEXT_PAGE(level3_vmalloc_start_pgt)
25229+ .fill 512,8,0
25230+
25231+NEXT_PAGE(level3_vmalloc_end_pgt)
25232+ .fill 512,8,0
25233+
25234+NEXT_PAGE(level3_vmemmap_pgt)
25235+ .fill L3_VMEMMAP_START,8,0
25236+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25237+
25238 NEXT_PAGE(level2_ident_pgt)
25239- /* Since I easily can, map the first 1G.
25240+ /* Since I easily can, map the first 2G.
25241 * Don't set NX because code runs from these pages.
25242 */
25243- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25244-#endif
25245+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25246
25247 NEXT_PAGE(level3_kernel_pgt)
25248 .fill L3_START_KERNEL,8,0
25249@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25250 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25251 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25252
25253+NEXT_PAGE(level2_vmemmap_pgt)
25254+ .fill 512,8,0
25255+
25256 NEXT_PAGE(level2_kernel_pgt)
25257 /*
25258 * 512 MB kernel mapping. We spend a full page on this pagetable
25259@@ -494,23 +557,61 @@ NEXT_PAGE(level2_kernel_pgt)
25260 KERNEL_IMAGE_SIZE/PMD_SIZE)
25261
25262 NEXT_PAGE(level2_fixmap_pgt)
25263- .fill 506,8,0
25264- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25265- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25266- .fill 5,8,0
25267+ .fill 504,8,0
25268+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25269+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25270+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25271+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25272+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25273+ .fill 4,8,0
25274
25275 NEXT_PAGE(level1_fixmap_pgt)
25276+ .fill 3*512,8,0
25277+
25278+NEXT_PAGE(level1_vsyscall_pgt)
25279 .fill 512,8,0
25280
25281 #undef PMDS
25282
25283- .data
25284+ .align PAGE_SIZE
25285+ENTRY(cpu_gdt_table)
25286+ .rept NR_CPUS
25287+ .quad 0x0000000000000000 /* NULL descriptor */
25288+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25289+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25290+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25291+ .quad 0x00cffb000000ffff /* __USER32_CS */
25292+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25293+ .quad 0x00affb000000ffff /* __USER_CS */
25294+
25295+#ifdef CONFIG_PAX_KERNEXEC
25296+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25297+#else
25298+ .quad 0x0 /* unused */
25299+#endif
25300+
25301+ .quad 0,0 /* TSS */
25302+ .quad 0,0 /* LDT */
25303+ .quad 0,0,0 /* three TLS descriptors */
25304+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25305+ /* asm/segment.h:GDT_ENTRIES must match this */
25306+
25307+#ifdef CONFIG_PAX_MEMORY_UDEREF
25308+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25309+#else
25310+ .quad 0x0 /* unused */
25311+#endif
25312+
25313+ /* zero the remaining page */
25314+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25315+ .endr
25316+
25317 .align 16
25318 .globl early_gdt_descr
25319 early_gdt_descr:
25320 .word GDT_ENTRIES*8-1
25321 early_gdt_descr_base:
25322- .quad INIT_PER_CPU_VAR(gdt_page)
25323+ .quad cpu_gdt_table
25324
25325 ENTRY(phys_base)
25326 /* This must match the first entry in level2_kernel_pgt */
25327@@ -534,8 +635,8 @@ NEXT_PAGE(kasan_zero_pud)
25328
25329
25330 #include "../../x86/xen/xen-head.S"
25331-
25332- __PAGE_ALIGNED_BSS
25333+
25334+ .section .rodata,"a",@progbits
25335 NEXT_PAGE(empty_zero_page)
25336 .skip PAGE_SIZE
25337
25338diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25339index 05fd74f..c3548b1 100644
25340--- a/arch/x86/kernel/i386_ksyms_32.c
25341+++ b/arch/x86/kernel/i386_ksyms_32.c
25342@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25343 EXPORT_SYMBOL(cmpxchg8b_emu);
25344 #endif
25345
25346+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25347+
25348 /* Networking helper routines. */
25349 EXPORT_SYMBOL(csum_partial_copy_generic);
25350+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25351+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25352
25353 EXPORT_SYMBOL(__get_user_1);
25354 EXPORT_SYMBOL(__get_user_2);
25355@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25356 EXPORT_SYMBOL(___preempt_schedule_context);
25357 #endif
25358 #endif
25359+
25360+#ifdef CONFIG_PAX_KERNEXEC
25361+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25362+#endif
25363+
25364+#ifdef CONFIG_PAX_PER_CPU_PGD
25365+EXPORT_SYMBOL(cpu_pgd);
25366+#endif
25367diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25368index e7cc537..67d7372 100644
25369--- a/arch/x86/kernel/i8259.c
25370+++ b/arch/x86/kernel/i8259.c
25371@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25372 static void make_8259A_irq(unsigned int irq)
25373 {
25374 disable_irq_nosync(irq);
25375- io_apic_irqs &= ~(1<<irq);
25376+ io_apic_irqs &= ~(1UL<<irq);
25377 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25378 enable_irq(irq);
25379 }
25380@@ -208,7 +208,7 @@ spurious_8259A_irq:
25381 "spurious 8259A interrupt: IRQ%d.\n", irq);
25382 spurious_irq_mask |= irqmask;
25383 }
25384- atomic_inc(&irq_err_count);
25385+ atomic_inc_unchecked(&irq_err_count);
25386 /*
25387 * Theoretically we do not have to handle this IRQ,
25388 * but in Linux this does not cause problems and is
25389@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25390 /* (slave's support for AEOI in flat mode is to be investigated) */
25391 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25392
25393+ pax_open_kernel();
25394 if (auto_eoi)
25395 /*
25396 * In AEOI mode we just have to mask the interrupt
25397 * when acking.
25398 */
25399- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25400+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25401 else
25402- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25403+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25404+ pax_close_kernel();
25405
25406 udelay(100); /* wait for 8259A to initialize */
25407
25408diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25409index a979b5b..1d6db75 100644
25410--- a/arch/x86/kernel/io_delay.c
25411+++ b/arch/x86/kernel/io_delay.c
25412@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25413 * Quirk table for systems that misbehave (lock up, etc.) if port
25414 * 0x80 is used:
25415 */
25416-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25417+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25418 {
25419 .callback = dmi_io_delay_0xed_port,
25420 .ident = "Compaq Presario V6000",
25421diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25422index 37dae79..620dd84 100644
25423--- a/arch/x86/kernel/ioport.c
25424+++ b/arch/x86/kernel/ioport.c
25425@@ -6,6 +6,7 @@
25426 #include <linux/sched.h>
25427 #include <linux/kernel.h>
25428 #include <linux/capability.h>
25429+#include <linux/security.h>
25430 #include <linux/errno.h>
25431 #include <linux/types.h>
25432 #include <linux/ioport.h>
25433@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25434 return -EINVAL;
25435 if (turn_on && !capable(CAP_SYS_RAWIO))
25436 return -EPERM;
25437+#ifdef CONFIG_GRKERNSEC_IO
25438+ if (turn_on && grsec_disable_privio) {
25439+ gr_handle_ioperm();
25440+ return -ENODEV;
25441+ }
25442+#endif
25443
25444 /*
25445 * If it's the first ioperm() call in this thread's lifetime, set the
25446@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25447 * because the ->io_bitmap_max value must match the bitmap
25448 * contents:
25449 */
25450- tss = &per_cpu(cpu_tss, get_cpu());
25451+ tss = cpu_tss + get_cpu();
25452
25453 if (turn_on)
25454 bitmap_clear(t->io_bitmap_ptr, from, num);
25455@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25456 if (level > old) {
25457 if (!capable(CAP_SYS_RAWIO))
25458 return -EPERM;
25459+#ifdef CONFIG_GRKERNSEC_IO
25460+ if (grsec_disable_privio) {
25461+ gr_handle_iopl();
25462+ return -ENODEV;
25463+ }
25464+#endif
25465 }
25466 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25467 t->iopl = level << 12;
25468diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25469index e5952c2..11c3a54 100644
25470--- a/arch/x86/kernel/irq.c
25471+++ b/arch/x86/kernel/irq.c
25472@@ -22,7 +22,7 @@
25473 #define CREATE_TRACE_POINTS
25474 #include <asm/trace/irq_vectors.h>
25475
25476-atomic_t irq_err_count;
25477+atomic_unchecked_t irq_err_count;
25478
25479 /* Function pointer for generic interrupt vector handling */
25480 void (*x86_platform_ipi_callback)(void) = NULL;
25481@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25482 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25483 seq_puts(p, " Hypervisor callback interrupts\n");
25484 #endif
25485- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25486+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25487 #if defined(CONFIG_X86_IO_APIC)
25488- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25489+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25490 #endif
25491 return 0;
25492 }
25493@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25494
25495 u64 arch_irq_stat(void)
25496 {
25497- u64 sum = atomic_read(&irq_err_count);
25498+ u64 sum = atomic_read_unchecked(&irq_err_count);
25499 return sum;
25500 }
25501
25502diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25503index f9fd86a..e6cc9ae 100644
25504--- a/arch/x86/kernel/irq_32.c
25505+++ b/arch/x86/kernel/irq_32.c
25506@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25507
25508 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25509
25510+extern void gr_handle_kernel_exploit(void);
25511+
25512 int sysctl_panic_on_stackoverflow __read_mostly;
25513
25514 /* Debugging check for stack overflow: is there less than 1KB free? */
25515@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25516 __asm__ __volatile__("andl %%esp,%0" :
25517 "=r" (sp) : "0" (THREAD_SIZE - 1));
25518
25519- return sp < (sizeof(struct thread_info) + STACK_WARN);
25520+ return sp < STACK_WARN;
25521 }
25522
25523 static void print_stack_overflow(void)
25524 {
25525 printk(KERN_WARNING "low stack detected by irq handler\n");
25526 dump_stack();
25527+ gr_handle_kernel_exploit();
25528 if (sysctl_panic_on_stackoverflow)
25529 panic("low stack detected by irq handler - check messages\n");
25530 }
25531@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25532 static inline int
25533 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25534 {
25535- struct irq_stack *curstk, *irqstk;
25536+ struct irq_stack *irqstk;
25537 u32 *isp, *prev_esp, arg1, arg2;
25538
25539- curstk = (struct irq_stack *) current_stack();
25540 irqstk = __this_cpu_read(hardirq_stack);
25541
25542 /*
25543@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25544 * handler) we can't do that and just have to keep using the
25545 * current stack (which is the irq stack already after all)
25546 */
25547- if (unlikely(curstk == irqstk))
25548+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25549 return 0;
25550
25551- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25552+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25553
25554 /* Save the next esp at the bottom of the stack */
25555 prev_esp = (u32 *)irqstk;
25556 *prev_esp = current_stack_pointer();
25557
25558+#ifdef CONFIG_PAX_MEMORY_UDEREF
25559+ __set_fs(MAKE_MM_SEG(0));
25560+#endif
25561+
25562 if (unlikely(overflow))
25563 call_on_stack(print_stack_overflow, isp);
25564
25565@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25566 : "0" (irq), "1" (desc), "2" (isp),
25567 "D" (desc->handle_irq)
25568 : "memory", "cc", "ecx");
25569+
25570+#ifdef CONFIG_PAX_MEMORY_UDEREF
25571+ __set_fs(current_thread_info()->addr_limit);
25572+#endif
25573+
25574 return 1;
25575 }
25576
25577@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25578 */
25579 void irq_ctx_init(int cpu)
25580 {
25581- struct irq_stack *irqstk;
25582-
25583 if (per_cpu(hardirq_stack, cpu))
25584 return;
25585
25586- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25587- THREADINFO_GFP,
25588- THREAD_SIZE_ORDER));
25589- per_cpu(hardirq_stack, cpu) = irqstk;
25590-
25591- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25592- THREADINFO_GFP,
25593- THREAD_SIZE_ORDER));
25594- per_cpu(softirq_stack, cpu) = irqstk;
25595-
25596- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25597- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25598+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25599+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25600 }
25601
25602 void do_softirq_own_stack(void)
25603 {
25604- struct thread_info *curstk;
25605 struct irq_stack *irqstk;
25606 u32 *isp, *prev_esp;
25607
25608- curstk = current_stack();
25609 irqstk = __this_cpu_read(softirq_stack);
25610
25611 /* build the stack frame on the softirq stack */
25612@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25613 prev_esp = (u32 *)irqstk;
25614 *prev_esp = current_stack_pointer();
25615
25616+#ifdef CONFIG_PAX_MEMORY_UDEREF
25617+ __set_fs(MAKE_MM_SEG(0));
25618+#endif
25619+
25620 call_on_stack(__do_softirq, isp);
25621+
25622+#ifdef CONFIG_PAX_MEMORY_UDEREF
25623+ __set_fs(current_thread_info()->addr_limit);
25624+#endif
25625+
25626 }
25627
25628 bool handle_irq(unsigned irq, struct pt_regs *regs)
25629diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25630index 394e643..824fce8 100644
25631--- a/arch/x86/kernel/irq_64.c
25632+++ b/arch/x86/kernel/irq_64.c
25633@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25634 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25635 EXPORT_PER_CPU_SYMBOL(irq_regs);
25636
25637+extern void gr_handle_kernel_exploit(void);
25638+
25639 int sysctl_panic_on_stackoverflow;
25640
25641 /*
25642@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25643 irq_stack_top, irq_stack_bottom,
25644 estack_top, estack_bottom);
25645
25646+ gr_handle_kernel_exploit();
25647+
25648 if (sysctl_panic_on_stackoverflow)
25649 panic("low stack detected by irq handler - check messages\n");
25650 #endif
25651diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25652index 26d5a55..a01160a 100644
25653--- a/arch/x86/kernel/jump_label.c
25654+++ b/arch/x86/kernel/jump_label.c
25655@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25656 * Jump label is enabled for the first time.
25657 * So we expect a default_nop...
25658 */
25659- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25660+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25661 != 0))
25662 bug_at((void *)entry->code, __LINE__);
25663 } else {
25664@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25665 * ...otherwise expect an ideal_nop. Otherwise
25666 * something went horribly wrong.
25667 */
25668- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25669+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25670 != 0))
25671 bug_at((void *)entry->code, __LINE__);
25672 }
25673@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25674 * are converting the default nop to the ideal nop.
25675 */
25676 if (init) {
25677- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25678+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25679 bug_at((void *)entry->code, __LINE__);
25680 } else {
25681 code.jump = 0xe9;
25682 code.offset = entry->target -
25683 (entry->code + JUMP_LABEL_NOP_SIZE);
25684- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25685+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25686 bug_at((void *)entry->code, __LINE__);
25687 }
25688 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25689diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25690index d6178d9..e12482f 100644
25691--- a/arch/x86/kernel/kgdb.c
25692+++ b/arch/x86/kernel/kgdb.c
25693@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25694 bp->attr.bp_addr = breakinfo[breakno].addr;
25695 bp->attr.bp_len = breakinfo[breakno].len;
25696 bp->attr.bp_type = breakinfo[breakno].type;
25697- info->address = breakinfo[breakno].addr;
25698+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25699+ info->address = ktla_ktva(breakinfo[breakno].addr);
25700+ else
25701+ info->address = breakinfo[breakno].addr;
25702 info->len = breakinfo[breakno].len;
25703 info->type = breakinfo[breakno].type;
25704 val = arch_install_hw_breakpoint(bp);
25705@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25706 case 'k':
25707 /* clear the trace bit */
25708 linux_regs->flags &= ~X86_EFLAGS_TF;
25709- atomic_set(&kgdb_cpu_doing_single_step, -1);
25710+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25711
25712 /* set the trace bit if we're stepping */
25713 if (remcomInBuffer[0] == 's') {
25714 linux_regs->flags |= X86_EFLAGS_TF;
25715- atomic_set(&kgdb_cpu_doing_single_step,
25716+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25717 raw_smp_processor_id());
25718 }
25719
25720@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25721
25722 switch (cmd) {
25723 case DIE_DEBUG:
25724- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25725+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25726 if (user_mode(regs))
25727 return single_step_cont(regs, args);
25728 break;
25729@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25730 #endif /* CONFIG_DEBUG_RODATA */
25731
25732 bpt->type = BP_BREAKPOINT;
25733- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25734+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25735 BREAK_INSTR_SIZE);
25736 if (err)
25737 return err;
25738- err = probe_kernel_write((char *)bpt->bpt_addr,
25739+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25740 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25741 #ifdef CONFIG_DEBUG_RODATA
25742 if (!err)
25743@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25744 return -EBUSY;
25745 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25746 BREAK_INSTR_SIZE);
25747- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25748+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25749 if (err)
25750 return err;
25751 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25752@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25753 if (mutex_is_locked(&text_mutex))
25754 goto knl_write;
25755 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25756- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25757+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25758 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25759 goto knl_write;
25760 return err;
25761 knl_write:
25762 #endif /* CONFIG_DEBUG_RODATA */
25763- return probe_kernel_write((char *)bpt->bpt_addr,
25764+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25765 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25766 }
25767
25768diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25769index 1deffe6..4705700 100644
25770--- a/arch/x86/kernel/kprobes/core.c
25771+++ b/arch/x86/kernel/kprobes/core.c
25772@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25773 s32 raddr;
25774 } __packed *insn;
25775
25776- insn = (struct __arch_relative_insn *)from;
25777+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25778+
25779+ pax_open_kernel();
25780 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25781 insn->op = op;
25782+ pax_close_kernel();
25783 }
25784
25785 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25786@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25787 kprobe_opcode_t opcode;
25788 kprobe_opcode_t *orig_opcodes = opcodes;
25789
25790- if (search_exception_tables((unsigned long)opcodes))
25791+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25792 return 0; /* Page fault may occur on this address. */
25793
25794 retry:
25795@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25796 * Fortunately, we know that the original code is the ideal 5-byte
25797 * long NOP.
25798 */
25799- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25800+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25801 if (faddr)
25802 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25803 else
25804 buf[0] = kp->opcode;
25805- return (unsigned long)buf;
25806+ return ktva_ktla((unsigned long)buf);
25807 }
25808
25809 /*
25810@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25811 /* Another subsystem puts a breakpoint, failed to recover */
25812 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25813 return 0;
25814+ pax_open_kernel();
25815 memcpy(dest, insn.kaddr, length);
25816+ pax_close_kernel();
25817
25818 #ifdef CONFIG_X86_64
25819 if (insn_rip_relative(&insn)) {
25820@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25821 return 0;
25822 }
25823 disp = (u8 *) dest + insn_offset_displacement(&insn);
25824+ pax_open_kernel();
25825 *(s32 *) disp = (s32) newdisp;
25826+ pax_close_kernel();
25827 }
25828 #endif
25829 return length;
25830@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25831 * nor set current_kprobe, because it doesn't use single
25832 * stepping.
25833 */
25834- regs->ip = (unsigned long)p->ainsn.insn;
25835+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25836 preempt_enable_no_resched();
25837 return;
25838 }
25839@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25840 regs->flags &= ~X86_EFLAGS_IF;
25841 /* single step inline if the instruction is an int3 */
25842 if (p->opcode == BREAKPOINT_INSTRUCTION)
25843- regs->ip = (unsigned long)p->addr;
25844+ regs->ip = ktla_ktva((unsigned long)p->addr);
25845 else
25846- regs->ip = (unsigned long)p->ainsn.insn;
25847+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25848 }
25849 NOKPROBE_SYMBOL(setup_singlestep);
25850
25851@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25852 setup_singlestep(p, regs, kcb, 0);
25853 return 1;
25854 }
25855- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25856+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25857 /*
25858 * The breakpoint instruction was removed right
25859 * after we hit it. Another cpu has removed
25860@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25861 " movq %rax, 152(%rsp)\n"
25862 RESTORE_REGS_STRING
25863 " popfq\n"
25864+#ifdef KERNEXEC_PLUGIN
25865+ " btsq $63,(%rsp)\n"
25866+#endif
25867 #else
25868 " pushf\n"
25869 SAVE_REGS_STRING
25870@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25871 struct kprobe_ctlblk *kcb)
25872 {
25873 unsigned long *tos = stack_addr(regs);
25874- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25875+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25876 unsigned long orig_ip = (unsigned long)p->addr;
25877 kprobe_opcode_t *insn = p->ainsn.insn;
25878
25879diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25880index 7b3b9d1..e2478b91 100644
25881--- a/arch/x86/kernel/kprobes/opt.c
25882+++ b/arch/x86/kernel/kprobes/opt.c
25883@@ -79,6 +79,7 @@ found:
25884 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25885 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25886 {
25887+ pax_open_kernel();
25888 #ifdef CONFIG_X86_64
25889 *addr++ = 0x48;
25890 *addr++ = 0xbf;
25891@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25892 *addr++ = 0xb8;
25893 #endif
25894 *(unsigned long *)addr = val;
25895+ pax_close_kernel();
25896 }
25897
25898 asm (
25899@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25900 * Verify if the address gap is in 2GB range, because this uses
25901 * a relative jump.
25902 */
25903- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25904+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25905 if (abs(rel) > 0x7fffffff) {
25906 __arch_remove_optimized_kprobe(op, 0);
25907 return -ERANGE;
25908@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25909 op->optinsn.size = ret;
25910
25911 /* Copy arch-dep-instance from template */
25912- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25913+ pax_open_kernel();
25914+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25915+ pax_close_kernel();
25916
25917 /* Set probe information */
25918 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25919
25920 /* Set probe function call */
25921- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25922+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25923
25924 /* Set returning jmp instruction at the tail of out-of-line buffer */
25925- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25926+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25927 (u8 *)op->kp.addr + op->optinsn.size);
25928
25929 flush_icache_range((unsigned long) buf,
25930@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25931 WARN_ON(kprobe_disabled(&op->kp));
25932
25933 /* Backup instructions which will be replaced by jump address */
25934- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25935+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25936 RELATIVE_ADDR_SIZE);
25937
25938 insn_buf[0] = RELATIVEJUMP_OPCODE;
25939@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25940 /* This kprobe is really able to run optimized path. */
25941 op = container_of(p, struct optimized_kprobe, kp);
25942 /* Detour through copied instructions */
25943- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25944+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25945 if (!reenter)
25946 reset_current_kprobe();
25947 preempt_enable_no_resched();
25948diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25949index c2bedae..25e7ab60 100644
25950--- a/arch/x86/kernel/ksysfs.c
25951+++ b/arch/x86/kernel/ksysfs.c
25952@@ -184,7 +184,7 @@ out:
25953
25954 static struct kobj_attribute type_attr = __ATTR_RO(type);
25955
25956-static struct bin_attribute data_attr = {
25957+static bin_attribute_no_const data_attr __read_only = {
25958 .attr = {
25959 .name = "data",
25960 .mode = S_IRUGO,
25961diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25962index c37886d..f43b63d 100644
25963--- a/arch/x86/kernel/ldt.c
25964+++ b/arch/x86/kernel/ldt.c
25965@@ -11,6 +11,7 @@
25966 #include <linux/sched.h>
25967 #include <linux/string.h>
25968 #include <linux/mm.h>
25969+#include <linux/ratelimit.h>
25970 #include <linux/smp.h>
25971 #include <linux/vmalloc.h>
25972 #include <linux/uaccess.h>
25973@@ -20,6 +21,14 @@
25974 #include <asm/mmu_context.h>
25975 #include <asm/syscalls.h>
25976
25977+#ifdef CONFIG_GRKERNSEC
25978+int sysctl_modify_ldt __read_only = 0;
25979+#elif defined(CONFIG_DEFAULT_MODIFY_LDT_SYSCALL)
25980+int sysctl_modify_ldt __read_only = 1;
25981+#else
25982+int sysctl_modify_ldt __read_only = 0;
25983+#endif
25984+
25985 #ifdef CONFIG_SMP
25986 static void flush_ldt(void *current_mm)
25987 {
25988@@ -66,13 +75,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25989 if (reload) {
25990 #ifdef CONFIG_SMP
25991 preempt_disable();
25992- load_LDT(pc);
25993+ load_LDT_nolock(pc);
25994 if (!cpumask_equal(mm_cpumask(current->mm),
25995 cpumask_of(smp_processor_id())))
25996 smp_call_function(flush_ldt, current->mm, 1);
25997 preempt_enable();
25998 #else
25999- load_LDT(pc);
26000+ load_LDT_nolock(pc);
26001 #endif
26002 }
26003 if (oldsize) {
26004@@ -94,7 +103,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
26005 return err;
26006
26007 for (i = 0; i < old->size; i++)
26008- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
26009+ write_ldt_entry(new->ldt, i, old->ldt + i);
26010 return 0;
26011 }
26012
26013@@ -115,6 +124,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
26014 retval = copy_ldt(&mm->context, &old_mm->context);
26015 mutex_unlock(&old_mm->context.lock);
26016 }
26017+
26018+ if (tsk == current) {
26019+ mm->context.vdso = 0;
26020+
26021+#ifdef CONFIG_X86_32
26022+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
26023+ mm->context.user_cs_base = 0UL;
26024+ mm->context.user_cs_limit = ~0UL;
26025+
26026+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
26027+ cpumask_clear(&mm->context.cpu_user_cs_mask);
26028+#endif
26029+
26030+#endif
26031+#endif
26032+
26033+ }
26034+
26035 return retval;
26036 }
26037
26038@@ -229,6 +256,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
26039 }
26040 }
26041
26042+#ifdef CONFIG_PAX_SEGMEXEC
26043+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
26044+ error = -EINVAL;
26045+ goto out_unlock;
26046+ }
26047+#endif
26048+
26049 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
26050 error = -EINVAL;
26051 goto out_unlock;
26052@@ -254,6 +288,15 @@ asmlinkage int sys_modify_ldt(int func, void __user *ptr,
26053 {
26054 int ret = -ENOSYS;
26055
26056+ if (!sysctl_modify_ldt) {
26057+ printk_ratelimited(KERN_INFO
26058+ "Denied a call to modify_ldt() from %s[%d] (uid: %d)."
26059+ " Adjust sysctl if this was not an exploit attempt.\n",
26060+ current->comm, task_pid_nr(current),
26061+ from_kuid_munged(current_user_ns(), current_uid()));
26062+ return ret;
26063+ }
26064+
26065 switch (func) {
26066 case 0:
26067 ret = read_ldt(ptr, bytecount);
26068diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
26069index ff3c3101d..d7c0cd8 100644
26070--- a/arch/x86/kernel/livepatch.c
26071+++ b/arch/x86/kernel/livepatch.c
26072@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
26073 int ret, numpages, size = 4;
26074 bool readonly;
26075 unsigned long val;
26076- unsigned long core = (unsigned long)mod->module_core;
26077- unsigned long core_ro_size = mod->core_ro_size;
26078- unsigned long core_size = mod->core_size;
26079+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
26080+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
26081+ unsigned long core_size_rx = mod->core_size_rx;
26082+ unsigned long core_size_rw = mod->core_size_rw;
26083
26084 switch (type) {
26085 case R_X86_64_NONE:
26086@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
26087 return -EINVAL;
26088 }
26089
26090- if (loc < core || loc >= core + core_size)
26091+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
26092+ (loc < core_rw || loc >= core_rw + core_size_rw))
26093 /* loc does not point to any symbol inside the module */
26094 return -EINVAL;
26095
26096- if (loc < core + core_ro_size)
26097+ if (loc < core_rx + core_size_rx)
26098 readonly = true;
26099 else
26100 readonly = false;
26101diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
26102index 469b23d..5449cfe 100644
26103--- a/arch/x86/kernel/machine_kexec_32.c
26104+++ b/arch/x86/kernel/machine_kexec_32.c
26105@@ -26,7 +26,7 @@
26106 #include <asm/cacheflush.h>
26107 #include <asm/debugreg.h>
26108
26109-static void set_idt(void *newidt, __u16 limit)
26110+static void set_idt(struct desc_struct *newidt, __u16 limit)
26111 {
26112 struct desc_ptr curidt;
26113
26114@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
26115 }
26116
26117
26118-static void set_gdt(void *newgdt, __u16 limit)
26119+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
26120 {
26121 struct desc_ptr curgdt;
26122
26123@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
26124 }
26125
26126 control_page = page_address(image->control_code_page);
26127- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
26128+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
26129
26130 relocate_kernel_ptr = control_page;
26131 page_list[PA_CONTROL_PAGE] = __pa(control_page);
26132diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
26133index 94ea120..4154cea 100644
26134--- a/arch/x86/kernel/mcount_64.S
26135+++ b/arch/x86/kernel/mcount_64.S
26136@@ -7,7 +7,7 @@
26137 #include <linux/linkage.h>
26138 #include <asm/ptrace.h>
26139 #include <asm/ftrace.h>
26140-
26141+#include <asm/alternative-asm.h>
26142
26143 .code64
26144 .section .entry.text, "ax"
26145@@ -148,8 +148,9 @@
26146 #ifdef CONFIG_DYNAMIC_FTRACE
26147
26148 ENTRY(function_hook)
26149+ pax_force_retaddr
26150 retq
26151-END(function_hook)
26152+ENDPROC(function_hook)
26153
26154 ENTRY(ftrace_caller)
26155 /* save_mcount_regs fills in first two parameters */
26156@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
26157 #endif
26158
26159 GLOBAL(ftrace_stub)
26160+ pax_force_retaddr
26161 retq
26162-END(ftrace_caller)
26163+ENDPROC(ftrace_caller)
26164
26165 ENTRY(ftrace_regs_caller)
26166 /* Save the current flags before any operations that can change them */
26167@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
26168
26169 jmp ftrace_return
26170
26171-END(ftrace_regs_caller)
26172+ENDPROC(ftrace_regs_caller)
26173
26174
26175 #else /* ! CONFIG_DYNAMIC_FTRACE */
26176@@ -272,18 +274,20 @@ fgraph_trace:
26177 #endif
26178
26179 GLOBAL(ftrace_stub)
26180+ pax_force_retaddr
26181 retq
26182
26183 trace:
26184 /* save_mcount_regs fills in first two parameters */
26185 save_mcount_regs
26186
26187+ pax_force_fptr ftrace_trace_function
26188 call *ftrace_trace_function
26189
26190 restore_mcount_regs
26191
26192 jmp fgraph_trace
26193-END(function_hook)
26194+ENDPROC(function_hook)
26195 #endif /* CONFIG_DYNAMIC_FTRACE */
26196 #endif /* CONFIG_FUNCTION_TRACER */
26197
26198@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
26199
26200 restore_mcount_regs
26201
26202+ pax_force_retaddr
26203 retq
26204-END(ftrace_graph_caller)
26205+ENDPROC(ftrace_graph_caller)
26206
26207 GLOBAL(return_to_handler)
26208 subq $24, %rsp
26209@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26210 movq 8(%rsp), %rdx
26211 movq (%rsp), %rax
26212 addq $24, %rsp
26213+ pax_force_fptr %rdi
26214 jmp *%rdi
26215+ENDPROC(return_to_handler)
26216 #endif
26217diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26218index 005c03e..2f440cd 100644
26219--- a/arch/x86/kernel/module.c
26220+++ b/arch/x86/kernel/module.c
26221@@ -75,17 +75,17 @@ static unsigned long int get_module_load_offset(void)
26222 }
26223 #endif
26224
26225-void *module_alloc(unsigned long size)
26226+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26227 {
26228 void *p;
26229
26230- if (PAGE_ALIGN(size) > MODULES_LEN)
26231+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26232 return NULL;
26233
26234 p = __vmalloc_node_range(size, MODULE_ALIGN,
26235 MODULES_VADDR + get_module_load_offset(),
26236- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26237- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26238+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26239+ prot, 0, NUMA_NO_NODE,
26240 __builtin_return_address(0));
26241 if (p && (kasan_module_alloc(p, size) < 0)) {
26242 vfree(p);
26243@@ -95,6 +95,51 @@ void *module_alloc(unsigned long size)
26244 return p;
26245 }
26246
26247+void *module_alloc(unsigned long size)
26248+{
26249+
26250+#ifdef CONFIG_PAX_KERNEXEC
26251+ return __module_alloc(size, PAGE_KERNEL);
26252+#else
26253+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26254+#endif
26255+
26256+}
26257+
26258+#ifdef CONFIG_PAX_KERNEXEC
26259+#ifdef CONFIG_X86_32
26260+void *module_alloc_exec(unsigned long size)
26261+{
26262+ struct vm_struct *area;
26263+
26264+ if (size == 0)
26265+ return NULL;
26266+
26267+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26268+return area ? area->addr : NULL;
26269+}
26270+EXPORT_SYMBOL(module_alloc_exec);
26271+
26272+void module_memfree_exec(void *module_region)
26273+{
26274+ vunmap(module_region);
26275+}
26276+EXPORT_SYMBOL(module_memfree_exec);
26277+#else
26278+void module_memfree_exec(void *module_region)
26279+{
26280+ module_memfree(module_region);
26281+}
26282+EXPORT_SYMBOL(module_memfree_exec);
26283+
26284+void *module_alloc_exec(unsigned long size)
26285+{
26286+ return __module_alloc(size, PAGE_KERNEL_RX);
26287+}
26288+EXPORT_SYMBOL(module_alloc_exec);
26289+#endif
26290+#endif
26291+
26292 #ifdef CONFIG_X86_32
26293 int apply_relocate(Elf32_Shdr *sechdrs,
26294 const char *strtab,
26295@@ -105,14 +150,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26296 unsigned int i;
26297 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26298 Elf32_Sym *sym;
26299- uint32_t *location;
26300+ uint32_t *plocation, location;
26301
26302 DEBUGP("Applying relocate section %u to %u\n",
26303 relsec, sechdrs[relsec].sh_info);
26304 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26305 /* This is where to make the change */
26306- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26307- + rel[i].r_offset;
26308+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26309+ location = (uint32_t)plocation;
26310+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26311+ plocation = ktla_ktva((void *)plocation);
26312 /* This is the symbol it is referring to. Note that all
26313 undefined symbols have been resolved. */
26314 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26315@@ -121,11 +168,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26316 switch (ELF32_R_TYPE(rel[i].r_info)) {
26317 case R_386_32:
26318 /* We add the value into the location given */
26319- *location += sym->st_value;
26320+ pax_open_kernel();
26321+ *plocation += sym->st_value;
26322+ pax_close_kernel();
26323 break;
26324 case R_386_PC32:
26325 /* Add the value, subtract its position */
26326- *location += sym->st_value - (uint32_t)location;
26327+ pax_open_kernel();
26328+ *plocation += sym->st_value - location;
26329+ pax_close_kernel();
26330 break;
26331 default:
26332 pr_err("%s: Unknown relocation: %u\n",
26333@@ -170,21 +221,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26334 case R_X86_64_NONE:
26335 break;
26336 case R_X86_64_64:
26337+ pax_open_kernel();
26338 *(u64 *)loc = val;
26339+ pax_close_kernel();
26340 break;
26341 case R_X86_64_32:
26342+ pax_open_kernel();
26343 *(u32 *)loc = val;
26344+ pax_close_kernel();
26345 if (val != *(u32 *)loc)
26346 goto overflow;
26347 break;
26348 case R_X86_64_32S:
26349+ pax_open_kernel();
26350 *(s32 *)loc = val;
26351+ pax_close_kernel();
26352 if ((s64)val != *(s32 *)loc)
26353 goto overflow;
26354 break;
26355 case R_X86_64_PC32:
26356 val -= (u64)loc;
26357+ pax_open_kernel();
26358 *(u32 *)loc = val;
26359+ pax_close_kernel();
26360+
26361 #if 0
26362 if ((s64)val != *(s32 *)loc)
26363 goto overflow;
26364diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26365index 113e707..0a690e1 100644
26366--- a/arch/x86/kernel/msr.c
26367+++ b/arch/x86/kernel/msr.c
26368@@ -39,6 +39,7 @@
26369 #include <linux/notifier.h>
26370 #include <linux/uaccess.h>
26371 #include <linux/gfp.h>
26372+#include <linux/grsecurity.h>
26373
26374 #include <asm/processor.h>
26375 #include <asm/msr.h>
26376@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26377 int err = 0;
26378 ssize_t bytes = 0;
26379
26380+#ifdef CONFIG_GRKERNSEC_KMEM
26381+ gr_handle_msr_write();
26382+ return -EPERM;
26383+#endif
26384+
26385 if (count % 8)
26386 return -EINVAL; /* Invalid chunk size */
26387
26388@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26389 err = -EBADF;
26390 break;
26391 }
26392+#ifdef CONFIG_GRKERNSEC_KMEM
26393+ gr_handle_msr_write();
26394+ return -EPERM;
26395+#endif
26396 if (copy_from_user(&regs, uregs, sizeof regs)) {
26397 err = -EFAULT;
26398 break;
26399@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26400 return notifier_from_errno(err);
26401 }
26402
26403-static struct notifier_block __refdata msr_class_cpu_notifier = {
26404+static struct notifier_block msr_class_cpu_notifier = {
26405 .notifier_call = msr_class_cpu_callback,
26406 };
26407
26408diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26409index c3e985d..f690edd 100644
26410--- a/arch/x86/kernel/nmi.c
26411+++ b/arch/x86/kernel/nmi.c
26412@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26413
26414 static void nmi_max_handler(struct irq_work *w)
26415 {
26416- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26417+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26418 int remainder_ns, decimal_msecs;
26419- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26420+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26421
26422 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26423 decimal_msecs = remainder_ns / 1000;
26424
26425 printk_ratelimited(KERN_INFO
26426 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26427- a->handler, whole_msecs, decimal_msecs);
26428+ n->action->handler, whole_msecs, decimal_msecs);
26429 }
26430
26431 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26432@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26433 delta = sched_clock() - delta;
26434 trace_nmi_handler(a->handler, (int)delta, thishandled);
26435
26436- if (delta < nmi_longest_ns || delta < a->max_duration)
26437+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26438 continue;
26439
26440- a->max_duration = delta;
26441- irq_work_queue(&a->irq_work);
26442+ a->work->max_duration = delta;
26443+ irq_work_queue(&a->work->irq_work);
26444 }
26445
26446 rcu_read_unlock();
26447@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26448 }
26449 NOKPROBE_SYMBOL(nmi_handle);
26450
26451-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26452+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26453 {
26454 struct nmi_desc *desc = nmi_to_desc(type);
26455 unsigned long flags;
26456@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26457 if (!action->handler)
26458 return -EINVAL;
26459
26460- init_irq_work(&action->irq_work, nmi_max_handler);
26461+ action->work->action = action;
26462+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26463
26464 spin_lock_irqsave(&desc->lock, flags);
26465
26466@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26467 * event confuses some handlers (kdump uses this flag)
26468 */
26469 if (action->flags & NMI_FLAG_FIRST)
26470- list_add_rcu(&action->list, &desc->head);
26471+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26472 else
26473- list_add_tail_rcu(&action->list, &desc->head);
26474+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26475
26476 spin_unlock_irqrestore(&desc->lock, flags);
26477 return 0;
26478@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26479 if (!strcmp(n->name, name)) {
26480 WARN(in_nmi(),
26481 "Trying to free NMI (%s) from NMI context!\n", n->name);
26482- list_del_rcu(&n->list);
26483+ pax_list_del_rcu((struct list_head *)&n->list);
26484 break;
26485 }
26486 }
26487@@ -408,15 +409,15 @@ static void default_do_nmi(struct pt_regs *regs)
26488 NOKPROBE_SYMBOL(default_do_nmi);
26489
26490 /*
26491- * NMIs can hit breakpoints which will cause it to lose its
26492- * NMI context with the CPU when the breakpoint does an iret.
26493- */
26494-#ifdef CONFIG_X86_32
26495-/*
26496- * For i386, NMIs use the same stack as the kernel, and we can
26497- * add a workaround to the iret problem in C (preventing nested
26498- * NMIs if an NMI takes a trap). Simply have 3 states the NMI
26499- * can be in:
26500+ * NMIs can page fault or hit breakpoints which will cause it to lose
26501+ * its NMI context with the CPU when the breakpoint or page fault does an IRET.
26502+ *
26503+ * As a result, NMIs can nest if NMIs get unmasked due an IRET during
26504+ * NMI processing. On x86_64, the asm glue protects us from nested NMIs
26505+ * if the outer NMI came from kernel mode, but we can still nest if the
26506+ * outer NMI came from user mode.
26507+ *
26508+ * To handle these nested NMIs, we have three states:
26509 *
26510 * 1) not running
26511 * 2) executing
26512@@ -430,15 +431,14 @@ NOKPROBE_SYMBOL(default_do_nmi);
26513 * (Note, the latch is binary, thus multiple NMIs triggering,
26514 * when one is running, are ignored. Only one NMI is restarted.)
26515 *
26516- * If an NMI hits a breakpoint that executes an iret, another
26517- * NMI can preempt it. We do not want to allow this new NMI
26518- * to run, but we want to execute it when the first one finishes.
26519- * We set the state to "latched", and the exit of the first NMI will
26520- * perform a dec_return, if the result is zero (NOT_RUNNING), then
26521- * it will simply exit the NMI handler. If not, the dec_return
26522- * would have set the state to NMI_EXECUTING (what we want it to
26523- * be when we are running). In this case, we simply jump back
26524- * to rerun the NMI handler again, and restart the 'latched' NMI.
26525+ * If an NMI executes an iret, another NMI can preempt it. We do not
26526+ * want to allow this new NMI to run, but we want to execute it when the
26527+ * first one finishes. We set the state to "latched", and the exit of
26528+ * the first NMI will perform a dec_return, if the result is zero
26529+ * (NOT_RUNNING), then it will simply exit the NMI handler. If not, the
26530+ * dec_return would have set the state to NMI_EXECUTING (what we want it
26531+ * to be when we are running). In this case, we simply jump back to
26532+ * rerun the NMI handler again, and restart the 'latched' NMI.
26533 *
26534 * No trap (breakpoint or page fault) should be hit before nmi_restart,
26535 * thus there is no race between the first check of state for NOT_RUNNING
26536@@ -461,49 +461,47 @@ enum nmi_states {
26537 static DEFINE_PER_CPU(enum nmi_states, nmi_state);
26538 static DEFINE_PER_CPU(unsigned long, nmi_cr2);
26539
26540-#define nmi_nesting_preprocess(regs) \
26541- do { \
26542- if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) { \
26543- this_cpu_write(nmi_state, NMI_LATCHED); \
26544- return; \
26545- } \
26546- this_cpu_write(nmi_state, NMI_EXECUTING); \
26547- this_cpu_write(nmi_cr2, read_cr2()); \
26548- } while (0); \
26549- nmi_restart:
26550-
26551-#define nmi_nesting_postprocess() \
26552- do { \
26553- if (unlikely(this_cpu_read(nmi_cr2) != read_cr2())) \
26554- write_cr2(this_cpu_read(nmi_cr2)); \
26555- if (this_cpu_dec_return(nmi_state)) \
26556- goto nmi_restart; \
26557- } while (0)
26558-#else /* x86_64 */
26559+#ifdef CONFIG_X86_64
26560 /*
26561- * In x86_64 things are a bit more difficult. This has the same problem
26562- * where an NMI hitting a breakpoint that calls iret will remove the
26563- * NMI context, allowing a nested NMI to enter. What makes this more
26564- * difficult is that both NMIs and breakpoints have their own stack.
26565- * When a new NMI or breakpoint is executed, the stack is set to a fixed
26566- * point. If an NMI is nested, it will have its stack set at that same
26567- * fixed address that the first NMI had, and will start corrupting the
26568- * stack. This is handled in entry_64.S, but the same problem exists with
26569- * the breakpoint stack.
26570+ * In x86_64, we need to handle breakpoint -> NMI -> breakpoint. Without
26571+ * some care, the inner breakpoint will clobber the outer breakpoint's
26572+ * stack.
26573 *
26574- * If a breakpoint is being processed, and the debug stack is being used,
26575- * if an NMI comes in and also hits a breakpoint, the stack pointer
26576- * will be set to the same fixed address as the breakpoint that was
26577- * interrupted, causing that stack to be corrupted. To handle this case,
26578- * check if the stack that was interrupted is the debug stack, and if
26579- * so, change the IDT so that new breakpoints will use the current stack
26580- * and not switch to the fixed address. On return of the NMI, switch back
26581- * to the original IDT.
26582+ * If a breakpoint is being processed, and the debug stack is being
26583+ * used, if an NMI comes in and also hits a breakpoint, the stack
26584+ * pointer will be set to the same fixed address as the breakpoint that
26585+ * was interrupted, causing that stack to be corrupted. To handle this
26586+ * case, check if the stack that was interrupted is the debug stack, and
26587+ * if so, change the IDT so that new breakpoints will use the current
26588+ * stack and not switch to the fixed address. On return of the NMI,
26589+ * switch back to the original IDT.
26590 */
26591 static DEFINE_PER_CPU(int, update_debug_stack);
26592+#endif
26593
26594-static inline void nmi_nesting_preprocess(struct pt_regs *regs)
26595+dotraplinkage notrace void
26596+do_nmi(struct pt_regs *regs, long error_code)
26597 {
26598+
26599+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26600+ if (!user_mode(regs)) {
26601+ unsigned long cs = regs->cs & 0xFFFF;
26602+ unsigned long ip = ktva_ktla(regs->ip);
26603+
26604+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26605+ regs->ip = ip;
26606+ }
26607+#endif
26608+
26609+ if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) {
26610+ this_cpu_write(nmi_state, NMI_LATCHED);
26611+ return;
26612+ }
26613+ this_cpu_write(nmi_state, NMI_EXECUTING);
26614+ this_cpu_write(nmi_cr2, read_cr2());
26615+nmi_restart:
26616+
26617+#ifdef CONFIG_X86_64
26618 /*
26619 * If we interrupted a breakpoint, it is possible that
26620 * the nmi handler will have breakpoints too. We need to
26621@@ -514,22 +512,8 @@ static inline void nmi_nesting_preprocess(struct pt_regs *regs)
26622 debug_stack_set_zero();
26623 this_cpu_write(update_debug_stack, 1);
26624 }
26625-}
26626-
26627-static inline void nmi_nesting_postprocess(void)
26628-{
26629- if (unlikely(this_cpu_read(update_debug_stack))) {
26630- debug_stack_reset();
26631- this_cpu_write(update_debug_stack, 0);
26632- }
26633-}
26634 #endif
26635
26636-dotraplinkage notrace void
26637-do_nmi(struct pt_regs *regs, long error_code)
26638-{
26639- nmi_nesting_preprocess(regs);
26640-
26641 nmi_enter();
26642
26643 inc_irq_stat(__nmi_count);
26644@@ -539,8 +523,17 @@ do_nmi(struct pt_regs *regs, long error_code)
26645
26646 nmi_exit();
26647
26648- /* On i386, may loop back to preprocess */
26649- nmi_nesting_postprocess();
26650+#ifdef CONFIG_X86_64
26651+ if (unlikely(this_cpu_read(update_debug_stack))) {
26652+ debug_stack_reset();
26653+ this_cpu_write(update_debug_stack, 0);
26654+ }
26655+#endif
26656+
26657+ if (unlikely(this_cpu_read(nmi_cr2) != read_cr2()))
26658+ write_cr2(this_cpu_read(nmi_cr2));
26659+ if (this_cpu_dec_return(nmi_state))
26660+ goto nmi_restart;
26661 }
26662 NOKPROBE_SYMBOL(do_nmi);
26663
26664diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26665index 6d9582e..f746287 100644
26666--- a/arch/x86/kernel/nmi_selftest.c
26667+++ b/arch/x86/kernel/nmi_selftest.c
26668@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26669 {
26670 /* trap all the unknown NMIs we may generate */
26671 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26672- __initdata);
26673+ __initconst);
26674 }
26675
26676 static void __init cleanup_nmi_testsuite(void)
26677@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26678 unsigned long timeout;
26679
26680 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26681- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26682+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26683 nmi_fail = FAILURE;
26684 return;
26685 }
26686diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26687index bbb6c73..24a58ef 100644
26688--- a/arch/x86/kernel/paravirt-spinlocks.c
26689+++ b/arch/x86/kernel/paravirt-spinlocks.c
26690@@ -8,7 +8,7 @@
26691
26692 #include <asm/paravirt.h>
26693
26694-struct pv_lock_ops pv_lock_ops = {
26695+struct pv_lock_ops pv_lock_ops __read_only = {
26696 #ifdef CONFIG_SMP
26697 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26698 .unlock_kick = paravirt_nop,
26699diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26700index c614dd4..9ad659e 100644
26701--- a/arch/x86/kernel/paravirt.c
26702+++ b/arch/x86/kernel/paravirt.c
26703@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26704 {
26705 return x;
26706 }
26707+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26708+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26709+#endif
26710
26711 void __init default_banner(void)
26712 {
26713@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26714
26715 if (opfunc == NULL)
26716 /* If there's no function, patch it with a ud2a (BUG) */
26717- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26718- else if (opfunc == _paravirt_nop)
26719+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26720+ else if (opfunc == (void *)_paravirt_nop)
26721 /* If the operation is a nop, then nop the callsite */
26722 ret = paravirt_patch_nop();
26723
26724 /* identity functions just return their single argument */
26725- else if (opfunc == _paravirt_ident_32)
26726+ else if (opfunc == (void *)_paravirt_ident_32)
26727 ret = paravirt_patch_ident_32(insnbuf, len);
26728- else if (opfunc == _paravirt_ident_64)
26729+ else if (opfunc == (void *)_paravirt_ident_64)
26730 ret = paravirt_patch_ident_64(insnbuf, len);
26731+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26732+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26733+ ret = paravirt_patch_ident_64(insnbuf, len);
26734+#endif
26735
26736 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26737 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26738@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26739 if (insn_len > len || start == NULL)
26740 insn_len = len;
26741 else
26742- memcpy(insnbuf, start, insn_len);
26743+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26744
26745 return insn_len;
26746 }
26747@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26748 return this_cpu_read(paravirt_lazy_mode);
26749 }
26750
26751-struct pv_info pv_info = {
26752+struct pv_info pv_info __read_only = {
26753 .name = "bare hardware",
26754 .paravirt_enabled = 0,
26755 .kernel_rpl = 0,
26756@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26757 #endif
26758 };
26759
26760-struct pv_init_ops pv_init_ops = {
26761+struct pv_init_ops pv_init_ops __read_only = {
26762 .patch = native_patch,
26763 };
26764
26765-struct pv_time_ops pv_time_ops = {
26766+struct pv_time_ops pv_time_ops __read_only = {
26767 .sched_clock = native_sched_clock,
26768 .steal_clock = native_steal_clock,
26769 };
26770
26771-__visible struct pv_irq_ops pv_irq_ops = {
26772+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26773 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26774 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26775 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26776@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26777 #endif
26778 };
26779
26780-__visible struct pv_cpu_ops pv_cpu_ops = {
26781+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26782 .cpuid = native_cpuid,
26783 .get_debugreg = native_get_debugreg,
26784 .set_debugreg = native_set_debugreg,
26785@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26786 NOKPROBE_SYMBOL(native_set_debugreg);
26787 NOKPROBE_SYMBOL(native_load_idt);
26788
26789-struct pv_apic_ops pv_apic_ops = {
26790+struct pv_apic_ops pv_apic_ops __read_only= {
26791 #ifdef CONFIG_X86_LOCAL_APIC
26792 .startup_ipi_hook = paravirt_nop,
26793 #endif
26794 };
26795
26796-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26797+#ifdef CONFIG_X86_32
26798+#ifdef CONFIG_X86_PAE
26799+/* 64-bit pagetable entries */
26800+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26801+#else
26802 /* 32-bit pagetable entries */
26803 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26804+#endif
26805 #else
26806 /* 64-bit pagetable entries */
26807 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26808 #endif
26809
26810-struct pv_mmu_ops pv_mmu_ops = {
26811+struct pv_mmu_ops pv_mmu_ops __read_only = {
26812
26813 .read_cr2 = native_read_cr2,
26814 .write_cr2 = native_write_cr2,
26815@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26816 .make_pud = PTE_IDENT,
26817
26818 .set_pgd = native_set_pgd,
26819+ .set_pgd_batched = native_set_pgd_batched,
26820 #endif
26821 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
26822
26823@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26824 },
26825
26826 .set_fixmap = native_set_fixmap,
26827+
26828+#ifdef CONFIG_PAX_KERNEXEC
26829+ .pax_open_kernel = native_pax_open_kernel,
26830+ .pax_close_kernel = native_pax_close_kernel,
26831+#endif
26832+
26833 };
26834
26835 EXPORT_SYMBOL_GPL(pv_time_ops);
26836diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26837index a1da673..b6f5831 100644
26838--- a/arch/x86/kernel/paravirt_patch_64.c
26839+++ b/arch/x86/kernel/paravirt_patch_64.c
26840@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26841 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26842 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26843 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26844+
26845+#ifndef CONFIG_PAX_MEMORY_UDEREF
26846 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26847+#endif
26848+
26849 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26850 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26851
26852@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26853 PATCH_SITE(pv_mmu_ops, read_cr3);
26854 PATCH_SITE(pv_mmu_ops, write_cr3);
26855 PATCH_SITE(pv_cpu_ops, clts);
26856+
26857+#ifndef CONFIG_PAX_MEMORY_UDEREF
26858 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26859+#endif
26860+
26861 PATCH_SITE(pv_cpu_ops, wbinvd);
26862
26863 patch_site:
26864diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26865index 0497f71..7186c0d 100644
26866--- a/arch/x86/kernel/pci-calgary_64.c
26867+++ b/arch/x86/kernel/pci-calgary_64.c
26868@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26869 tce_space = be64_to_cpu(readq(target));
26870 tce_space = tce_space & TAR_SW_BITS;
26871
26872- tce_space = tce_space & (~specified_table_size);
26873+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26874 info->tce_space = (u64 *)__va(tce_space);
26875 }
26876 }
26877diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26878index 35ccf75..7a15747 100644
26879--- a/arch/x86/kernel/pci-iommu_table.c
26880+++ b/arch/x86/kernel/pci-iommu_table.c
26881@@ -2,7 +2,7 @@
26882 #include <asm/iommu_table.h>
26883 #include <linux/string.h>
26884 #include <linux/kallsyms.h>
26885-
26886+#include <linux/sched.h>
26887
26888 #define DEBUG 1
26889
26890diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26891index 77dd0ad..9ec4723 100644
26892--- a/arch/x86/kernel/pci-swiotlb.c
26893+++ b/arch/x86/kernel/pci-swiotlb.c
26894@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26895 struct dma_attrs *attrs)
26896 {
26897 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26898- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26899+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26900 else
26901 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26902 }
26903diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26904index 6e338e3..82f946e 100644
26905--- a/arch/x86/kernel/process.c
26906+++ b/arch/x86/kernel/process.c
26907@@ -38,7 +38,8 @@
26908 * section. Since TSS's are completely CPU-local, we want them
26909 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26910 */
26911-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26912+struct tss_struct cpu_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = {
26913+ [0 ... NR_CPUS-1] = {
26914 .x86_tss = {
26915 .sp0 = TOP_OF_INIT_STACK,
26916 #ifdef CONFIG_X86_32
26917@@ -56,6 +57,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26918 */
26919 .io_bitmap = { [0 ... IO_BITMAP_LONGS] = ~0 },
26920 #endif
26921+}
26922 };
26923 EXPORT_PER_CPU_SYMBOL(cpu_tss);
26924
26925@@ -115,7 +117,7 @@ void arch_task_cache_init(void)
26926 task_xstate_cachep =
26927 kmem_cache_create("task_xstate", xstate_size,
26928 __alignof__(union thread_xstate),
26929- SLAB_PANIC | SLAB_NOTRACK, NULL);
26930+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26931 setup_xstate_comp();
26932 }
26933
26934@@ -129,7 +131,7 @@ void exit_thread(void)
26935 unsigned long *bp = t->io_bitmap_ptr;
26936
26937 if (bp) {
26938- struct tss_struct *tss = &per_cpu(cpu_tss, get_cpu());
26939+ struct tss_struct *tss = cpu_tss + get_cpu();
26940
26941 t->io_bitmap_ptr = NULL;
26942 clear_thread_flag(TIF_IO_BITMAP);
26943@@ -149,6 +151,9 @@ void flush_thread(void)
26944 {
26945 struct task_struct *tsk = current;
26946
26947+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26948+ loadsegment(gs, 0);
26949+#endif
26950 flush_ptrace_hw_breakpoint(tsk);
26951 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26952
26953@@ -302,7 +307,7 @@ static void __exit_idle(void)
26954 void exit_idle(void)
26955 {
26956 /* idle loop has pid 0 */
26957- if (current->pid)
26958+ if (task_pid_nr(current))
26959 return;
26960 __exit_idle();
26961 }
26962@@ -355,7 +360,7 @@ bool xen_set_default_idle(void)
26963 return ret;
26964 }
26965 #endif
26966-void stop_this_cpu(void *dummy)
26967+__noreturn void stop_this_cpu(void *dummy)
26968 {
26969 local_irq_disable();
26970 /*
26971@@ -531,16 +536,43 @@ static int __init idle_setup(char *str)
26972 }
26973 early_param("idle", idle_setup);
26974
26975-unsigned long arch_align_stack(unsigned long sp)
26976-{
26977- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26978- sp -= get_random_int() % 8192;
26979- return sp & ~0xf;
26980-}
26981-
26982 unsigned long arch_randomize_brk(struct mm_struct *mm)
26983 {
26984 unsigned long range_end = mm->brk + 0x02000000;
26985 return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26986 }
26987
26988+#ifdef CONFIG_PAX_RANDKSTACK
26989+void pax_randomize_kstack(struct pt_regs *regs)
26990+{
26991+ struct thread_struct *thread = &current->thread;
26992+ unsigned long time;
26993+
26994+ if (!randomize_va_space)
26995+ return;
26996+
26997+ if (v8086_mode(regs))
26998+ return;
26999+
27000+ rdtscl(time);
27001+
27002+ /* P4 seems to return a 0 LSB, ignore it */
27003+#ifdef CONFIG_MPENTIUM4
27004+ time &= 0x3EUL;
27005+ time <<= 2;
27006+#elif defined(CONFIG_X86_64)
27007+ time &= 0xFUL;
27008+ time <<= 4;
27009+#else
27010+ time &= 0x1FUL;
27011+ time <<= 3;
27012+#endif
27013+
27014+ thread->sp0 ^= time;
27015+ load_sp0(cpu_tss + smp_processor_id(), thread);
27016+
27017+#ifdef CONFIG_X86_64
27018+ this_cpu_write(kernel_stack, thread->sp0);
27019+#endif
27020+}
27021+#endif
27022diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
27023index 8ed2106..1345704 100644
27024--- a/arch/x86/kernel/process_32.c
27025+++ b/arch/x86/kernel/process_32.c
27026@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
27027 unsigned long thread_saved_pc(struct task_struct *tsk)
27028 {
27029 return ((unsigned long *)tsk->thread.sp)[3];
27030+//XXX return tsk->thread.eip;
27031 }
27032
27033 void __show_regs(struct pt_regs *regs, int all)
27034@@ -76,16 +77,15 @@ void __show_regs(struct pt_regs *regs, int all)
27035 if (user_mode(regs)) {
27036 sp = regs->sp;
27037 ss = regs->ss & 0xffff;
27038- gs = get_user_gs(regs);
27039 } else {
27040 sp = kernel_stack_pointer(regs);
27041 savesegment(ss, ss);
27042- savesegment(gs, gs);
27043 }
27044+ gs = get_user_gs(regs);
27045
27046 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
27047 (u16)regs->cs, regs->ip, regs->flags,
27048- smp_processor_id());
27049+ raw_smp_processor_id());
27050 print_symbol("EIP is at %s\n", regs->ip);
27051
27052 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
27053@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
27054 int copy_thread(unsigned long clone_flags, unsigned long sp,
27055 unsigned long arg, struct task_struct *p)
27056 {
27057- struct pt_regs *childregs = task_pt_regs(p);
27058+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
27059 struct task_struct *tsk;
27060 int err;
27061
27062 p->thread.sp = (unsigned long) childregs;
27063 p->thread.sp0 = (unsigned long) (childregs+1);
27064+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
27065 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
27066
27067 if (unlikely(p->flags & PF_KTHREAD)) {
27068 /* kernel thread */
27069 memset(childregs, 0, sizeof(struct pt_regs));
27070 p->thread.ip = (unsigned long) ret_from_kernel_thread;
27071- task_user_gs(p) = __KERNEL_STACK_CANARY;
27072- childregs->ds = __USER_DS;
27073- childregs->es = __USER_DS;
27074+ savesegment(gs, childregs->gs);
27075+ childregs->ds = __KERNEL_DS;
27076+ childregs->es = __KERNEL_DS;
27077 childregs->fs = __KERNEL_PERCPU;
27078 childregs->bx = sp; /* function */
27079 childregs->bp = arg;
27080@@ -244,7 +245,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27081 struct thread_struct *prev = &prev_p->thread,
27082 *next = &next_p->thread;
27083 int cpu = smp_processor_id();
27084- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
27085+ struct tss_struct *tss = cpu_tss + cpu;
27086 fpu_switch_t fpu;
27087
27088 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
27089@@ -263,6 +264,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27090 */
27091 lazy_save_gs(prev->gs);
27092
27093+#ifdef CONFIG_PAX_MEMORY_UDEREF
27094+ __set_fs(task_thread_info(next_p)->addr_limit);
27095+#endif
27096+
27097 /*
27098 * Load the per-thread Thread-Local Storage descriptor.
27099 */
27100@@ -306,12 +311,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27101 * current_thread_info().
27102 */
27103 load_sp0(tss, next);
27104- this_cpu_write(kernel_stack,
27105- (unsigned long)task_stack_page(next_p) +
27106- THREAD_SIZE);
27107- this_cpu_write(cpu_current_top_of_stack,
27108- (unsigned long)task_stack_page(next_p) +
27109- THREAD_SIZE);
27110+ this_cpu_write(current_task, next_p);
27111+ this_cpu_write(current_tinfo, &next_p->tinfo);
27112+ this_cpu_write(kernel_stack, next->sp0);
27113+ this_cpu_write(cpu_current_top_of_stack, next->sp0);
27114
27115 /*
27116 * Restore %gs if needed (which is common)
27117@@ -321,8 +324,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27118
27119 switch_fpu_finish(next_p, fpu);
27120
27121- this_cpu_write(current_task, next_p);
27122-
27123 return prev_p;
27124 }
27125
27126@@ -352,4 +353,3 @@ unsigned long get_wchan(struct task_struct *p)
27127 } while (count++ < 16);
27128 return 0;
27129 }
27130-
27131diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
27132index ddfdbf7..625417c 100644
27133--- a/arch/x86/kernel/process_64.c
27134+++ b/arch/x86/kernel/process_64.c
27135@@ -158,9 +158,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
27136 struct pt_regs *childregs;
27137 struct task_struct *me = current;
27138
27139- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
27140+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
27141 childregs = task_pt_regs(p);
27142 p->thread.sp = (unsigned long) childregs;
27143+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
27144 set_tsk_thread_flag(p, TIF_FORK);
27145 p->thread.io_bitmap_ptr = NULL;
27146
27147@@ -170,6 +171,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
27148 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
27149 savesegment(es, p->thread.es);
27150 savesegment(ds, p->thread.ds);
27151+ savesegment(ss, p->thread.ss);
27152+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
27153 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
27154
27155 if (unlikely(p->flags & PF_KTHREAD)) {
27156@@ -275,7 +278,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27157 struct thread_struct *prev = &prev_p->thread;
27158 struct thread_struct *next = &next_p->thread;
27159 int cpu = smp_processor_id();
27160- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
27161+ struct tss_struct *tss = cpu_tss + cpu;
27162 unsigned fsindex, gsindex;
27163 fpu_switch_t fpu;
27164
27165@@ -326,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27166 if (unlikely(next->ds | prev->ds))
27167 loadsegment(ds, next->ds);
27168
27169+ savesegment(ss, prev->ss);
27170+ if (unlikely(next->ss != prev->ss))
27171+ loadsegment(ss, next->ss);
27172+
27173 /*
27174 * Switch FS and GS.
27175 *
27176@@ -397,6 +404,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27177 * Switch the PDA and FPU contexts.
27178 */
27179 this_cpu_write(current_task, next_p);
27180+ this_cpu_write(current_tinfo, &next_p->tinfo);
27181
27182 /*
27183 * If it were not for PREEMPT_ACTIVE we could guarantee that the
27184@@ -409,8 +417,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
27185 /* Reload esp0 and ss1. This changes current_thread_info(). */
27186 load_sp0(tss, next);
27187
27188- this_cpu_write(kernel_stack,
27189- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
27190+ this_cpu_write(kernel_stack, next->sp0);
27191
27192 /*
27193 * Now maybe reload the debug registers and handle I/O bitmaps
27194@@ -508,12 +515,11 @@ unsigned long get_wchan(struct task_struct *p)
27195 if (!p || p == current || p->state == TASK_RUNNING)
27196 return 0;
27197 stack = (unsigned long)task_stack_page(p);
27198- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
27199+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
27200 return 0;
27201 fp = *(u64 *)(p->thread.sp);
27202 do {
27203- if (fp < (unsigned long)stack ||
27204- fp >= (unsigned long)stack+THREAD_SIZE)
27205+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
27206 return 0;
27207 ip = *(u64 *)(fp+8);
27208 if (!in_sched_functions(ip))
27209diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
27210index a7bc794..094ee8e 100644
27211--- a/arch/x86/kernel/ptrace.c
27212+++ b/arch/x86/kernel/ptrace.c
27213@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
27214 unsigned long sp = (unsigned long)&regs->sp;
27215 u32 *prev_esp;
27216
27217- if (context == (sp & ~(THREAD_SIZE - 1)))
27218+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
27219 return sp;
27220
27221- prev_esp = (u32 *)(context);
27222+ prev_esp = *(u32 **)(context);
27223 if (prev_esp)
27224 return (unsigned long)prev_esp;
27225
27226@@ -446,6 +446,20 @@ static int putreg(struct task_struct *child,
27227 if (child->thread.gs != value)
27228 return do_arch_prctl(child, ARCH_SET_GS, value);
27229 return 0;
27230+
27231+ case offsetof(struct user_regs_struct,ip):
27232+ /*
27233+ * Protect against any attempt to set ip to an
27234+ * impossible address. There are dragons lurking if the
27235+ * address is noncanonical. (This explicitly allows
27236+ * setting ip to TASK_SIZE_MAX, because user code can do
27237+ * that all by itself by running off the end of its
27238+ * address space.
27239+ */
27240+ if (value > TASK_SIZE_MAX)
27241+ return -EIO;
27242+ break;
27243+
27244 #endif
27245 }
27246
27247@@ -582,7 +596,7 @@ static void ptrace_triggered(struct perf_event *bp,
27248 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
27249 {
27250 int i;
27251- int dr7 = 0;
27252+ unsigned long dr7 = 0;
27253 struct arch_hw_breakpoint *info;
27254
27255 for (i = 0; i < HBP_NUM; i++) {
27256@@ -816,7 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,
27257 unsigned long addr, unsigned long data)
27258 {
27259 int ret;
27260- unsigned long __user *datap = (unsigned long __user *)data;
27261+ unsigned long __user *datap = (__force unsigned long __user *)data;
27262
27263 switch (request) {
27264 /* read the word at location addr in the USER area. */
27265@@ -901,14 +915,14 @@ long arch_ptrace(struct task_struct *child, long request,
27266 if ((int) addr < 0)
27267 return -EIO;
27268 ret = do_get_thread_area(child, addr,
27269- (struct user_desc __user *)data);
27270+ (__force struct user_desc __user *) data);
27271 break;
27272
27273 case PTRACE_SET_THREAD_AREA:
27274 if ((int) addr < 0)
27275 return -EIO;
27276 ret = do_set_thread_area(child, addr,
27277- (struct user_desc __user *)data, 0);
27278+ (__force struct user_desc __user *) data, 0);
27279 break;
27280 #endif
27281
27282@@ -1286,7 +1300,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
27283
27284 #ifdef CONFIG_X86_64
27285
27286-static struct user_regset x86_64_regsets[] __read_mostly = {
27287+static user_regset_no_const x86_64_regsets[] __read_only = {
27288 [REGSET_GENERAL] = {
27289 .core_note_type = NT_PRSTATUS,
27290 .n = sizeof(struct user_regs_struct) / sizeof(long),
27291@@ -1327,7 +1341,7 @@ static const struct user_regset_view user_x86_64_view = {
27292 #endif /* CONFIG_X86_64 */
27293
27294 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
27295-static struct user_regset x86_32_regsets[] __read_mostly = {
27296+static user_regset_no_const x86_32_regsets[] __read_only = {
27297 [REGSET_GENERAL] = {
27298 .core_note_type = NT_PRSTATUS,
27299 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
27300@@ -1380,7 +1394,7 @@ static const struct user_regset_view user_x86_32_view = {
27301 */
27302 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
27303
27304-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
27305+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
27306 {
27307 #ifdef CONFIG_X86_64
27308 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
27309@@ -1415,7 +1429,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
27310 memset(info, 0, sizeof(*info));
27311 info->si_signo = SIGTRAP;
27312 info->si_code = si_code;
27313- info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
27314+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
27315 }
27316
27317 void user_single_step_siginfo(struct task_struct *tsk,
27318@@ -1449,6 +1463,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
27319 }
27320 }
27321
27322+#ifdef CONFIG_GRKERNSEC_SETXID
27323+extern void gr_delayed_cred_worker(void);
27324+#endif
27325+
27326 /*
27327 * We can return 0 to resume the syscall or anything else to go to phase
27328 * 2. If we resume the syscall, we need to put something appropriate in
27329@@ -1556,6 +1574,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
27330
27331 BUG_ON(regs != task_pt_regs(current));
27332
27333+#ifdef CONFIG_GRKERNSEC_SETXID
27334+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27335+ gr_delayed_cred_worker();
27336+#endif
27337+
27338 /*
27339 * If we stepped into a sysenter/syscall insn, it trapped in
27340 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
27341@@ -1614,6 +1637,11 @@ void syscall_trace_leave(struct pt_regs *regs)
27342 */
27343 user_exit();
27344
27345+#ifdef CONFIG_GRKERNSEC_SETXID
27346+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27347+ gr_delayed_cred_worker();
27348+#endif
27349+
27350 audit_syscall_exit(regs);
27351
27352 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
27353diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
27354index 2f355d2..e75ed0a 100644
27355--- a/arch/x86/kernel/pvclock.c
27356+++ b/arch/x86/kernel/pvclock.c
27357@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
27358 reset_hung_task_detector();
27359 }
27360
27361-static atomic64_t last_value = ATOMIC64_INIT(0);
27362+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
27363
27364 void pvclock_resume(void)
27365 {
27366- atomic64_set(&last_value, 0);
27367+ atomic64_set_unchecked(&last_value, 0);
27368 }
27369
27370 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
27371@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
27372 * updating at the same time, and one of them could be slightly behind,
27373 * making the assumption that last_value always go forward fail to hold.
27374 */
27375- last = atomic64_read(&last_value);
27376+ last = atomic64_read_unchecked(&last_value);
27377 do {
27378 if (ret < last)
27379 return last;
27380- last = atomic64_cmpxchg(&last_value, last, ret);
27381+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27382 } while (unlikely(last != ret));
27383
27384 return ret;
27385diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27386index 86db4bc..a50a54a 100644
27387--- a/arch/x86/kernel/reboot.c
27388+++ b/arch/x86/kernel/reboot.c
27389@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27390
27391 void __noreturn machine_real_restart(unsigned int type)
27392 {
27393+
27394+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27395+ struct desc_struct *gdt;
27396+#endif
27397+
27398 local_irq_disable();
27399
27400 /*
27401@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27402
27403 /* Jump to the identity-mapped low memory code */
27404 #ifdef CONFIG_X86_32
27405- asm volatile("jmpl *%0" : :
27406+
27407+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27408+ gdt = get_cpu_gdt_table(smp_processor_id());
27409+ pax_open_kernel();
27410+#ifdef CONFIG_PAX_MEMORY_UDEREF
27411+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27412+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27413+ loadsegment(ds, __KERNEL_DS);
27414+ loadsegment(es, __KERNEL_DS);
27415+ loadsegment(ss, __KERNEL_DS);
27416+#endif
27417+#ifdef CONFIG_PAX_KERNEXEC
27418+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27419+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27420+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27421+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27422+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27423+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27424+#endif
27425+ pax_close_kernel();
27426+#endif
27427+
27428+ asm volatile("ljmpl *%0" : :
27429 "rm" (real_mode_header->machine_real_restart_asm),
27430 "a" (type));
27431 #else
27432@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27433 /*
27434 * This is a single dmi_table handling all reboot quirks.
27435 */
27436-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27437+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27438
27439 /* Acer */
27440 { /* Handle reboot issue on Acer Aspire one */
27441@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27442 * This means that this function can never return, it can misbehave
27443 * by not rebooting properly and hanging.
27444 */
27445-static void native_machine_emergency_restart(void)
27446+static void __noreturn native_machine_emergency_restart(void)
27447 {
27448 int i;
27449 int attempt = 0;
27450@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27451 #endif
27452 }
27453
27454-static void __machine_emergency_restart(int emergency)
27455+static void __noreturn __machine_emergency_restart(int emergency)
27456 {
27457 reboot_emergency = emergency;
27458 machine_ops.emergency_restart();
27459 }
27460
27461-static void native_machine_restart(char *__unused)
27462+static void __noreturn native_machine_restart(char *__unused)
27463 {
27464 pr_notice("machine restart\n");
27465
27466@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27467 __machine_emergency_restart(0);
27468 }
27469
27470-static void native_machine_halt(void)
27471+static void __noreturn native_machine_halt(void)
27472 {
27473 /* Stop other cpus and apics */
27474 machine_shutdown();
27475@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27476 stop_this_cpu(NULL);
27477 }
27478
27479-static void native_machine_power_off(void)
27480+static void __noreturn native_machine_power_off(void)
27481 {
27482 if (pm_power_off) {
27483 if (!reboot_force)
27484@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27485 }
27486 /* A fallback in case there is no PM info available */
27487 tboot_shutdown(TB_SHUTDOWN_HALT);
27488+ unreachable();
27489 }
27490
27491-struct machine_ops machine_ops = {
27492+struct machine_ops machine_ops __read_only = {
27493 .power_off = native_machine_power_off,
27494 .shutdown = native_machine_shutdown,
27495 .emergency_restart = native_machine_emergency_restart,
27496diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27497index c8e41e9..64049ef 100644
27498--- a/arch/x86/kernel/reboot_fixups_32.c
27499+++ b/arch/x86/kernel/reboot_fixups_32.c
27500@@ -57,7 +57,7 @@ struct device_fixup {
27501 unsigned int vendor;
27502 unsigned int device;
27503 void (*reboot_fixup)(struct pci_dev *);
27504-};
27505+} __do_const;
27506
27507 /*
27508 * PCI ids solely used for fixups_table go here
27509diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27510index 98111b3..73ca125 100644
27511--- a/arch/x86/kernel/relocate_kernel_64.S
27512+++ b/arch/x86/kernel/relocate_kernel_64.S
27513@@ -96,8 +96,7 @@ relocate_kernel:
27514
27515 /* jump to identity mapped page */
27516 addq $(identity_mapped - relocate_kernel), %r8
27517- pushq %r8
27518- ret
27519+ jmp *%r8
27520
27521 identity_mapped:
27522 /* set return address to 0 if not preserving context */
27523diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27524index d74ac33..d9efe04 100644
27525--- a/arch/x86/kernel/setup.c
27526+++ b/arch/x86/kernel/setup.c
27527@@ -111,6 +111,7 @@
27528 #include <asm/mce.h>
27529 #include <asm/alternative.h>
27530 #include <asm/prom.h>
27531+#include <asm/boot.h>
27532
27533 /*
27534 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27535@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27536 #endif
27537
27538
27539-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27540-__visible unsigned long mmu_cr4_features;
27541+#ifdef CONFIG_X86_64
27542+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27543+#elif defined(CONFIG_X86_PAE)
27544+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27545 #else
27546-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27547+__visible unsigned long mmu_cr4_features __read_only;
27548 #endif
27549
27550 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27551@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27552 * area (640->1Mb) as ram even though it is not.
27553 * take them out.
27554 */
27555- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27556+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27557
27558 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27559 }
27560@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27561 /* called before trim_bios_range() to spare extra sanitize */
27562 static void __init e820_add_kernel_range(void)
27563 {
27564- u64 start = __pa_symbol(_text);
27565+ u64 start = __pa_symbol(ktla_ktva(_text));
27566 u64 size = __pa_symbol(_end) - start;
27567
27568 /*
27569@@ -860,8 +863,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27570
27571 void __init setup_arch(char **cmdline_p)
27572 {
27573+#ifdef CONFIG_X86_32
27574+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27575+#else
27576 memblock_reserve(__pa_symbol(_text),
27577 (unsigned long)__bss_stop - (unsigned long)_text);
27578+#endif
27579
27580 early_reserve_initrd();
27581
27582@@ -959,16 +966,16 @@ void __init setup_arch(char **cmdline_p)
27583
27584 if (!boot_params.hdr.root_flags)
27585 root_mountflags &= ~MS_RDONLY;
27586- init_mm.start_code = (unsigned long) _text;
27587- init_mm.end_code = (unsigned long) _etext;
27588+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27589+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27590 init_mm.end_data = (unsigned long) _edata;
27591 init_mm.brk = _brk_end;
27592
27593 mpx_mm_init(&init_mm);
27594
27595- code_resource.start = __pa_symbol(_text);
27596- code_resource.end = __pa_symbol(_etext)-1;
27597- data_resource.start = __pa_symbol(_etext);
27598+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27599+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27600+ data_resource.start = __pa_symbol(_sdata);
27601 data_resource.end = __pa_symbol(_edata)-1;
27602 bss_resource.start = __pa_symbol(__bss_start);
27603 bss_resource.end = __pa_symbol(__bss_stop)-1;
27604diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27605index e4fcb87..9c06c55 100644
27606--- a/arch/x86/kernel/setup_percpu.c
27607+++ b/arch/x86/kernel/setup_percpu.c
27608@@ -21,19 +21,17 @@
27609 #include <asm/cpu.h>
27610 #include <asm/stackprotector.h>
27611
27612-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27613+#ifdef CONFIG_SMP
27614+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27615 EXPORT_PER_CPU_SYMBOL(cpu_number);
27616+#endif
27617
27618-#ifdef CONFIG_X86_64
27619 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27620-#else
27621-#define BOOT_PERCPU_OFFSET 0
27622-#endif
27623
27624 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27625 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27626
27627-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27628+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27629 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27630 };
27631 EXPORT_SYMBOL(__per_cpu_offset);
27632@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27633 {
27634 #ifdef CONFIG_NEED_MULTIPLE_NODES
27635 pg_data_t *last = NULL;
27636- unsigned int cpu;
27637+ int cpu;
27638
27639 for_each_possible_cpu(cpu) {
27640 int node = early_cpu_to_node(cpu);
27641@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27642 {
27643 #ifdef CONFIG_X86_32
27644 struct desc_struct gdt;
27645+ unsigned long base = per_cpu_offset(cpu);
27646
27647- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27648- 0x2 | DESCTYPE_S, 0x8);
27649- gdt.s = 1;
27650+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27651+ 0x83 | DESCTYPE_S, 0xC);
27652 write_gdt_entry(get_cpu_gdt_table(cpu),
27653 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27654 #endif
27655@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27656 /* alrighty, percpu areas up and running */
27657 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27658 for_each_possible_cpu(cpu) {
27659+#ifdef CONFIG_CC_STACKPROTECTOR
27660+#ifdef CONFIG_X86_32
27661+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27662+#endif
27663+#endif
27664 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27665 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27666 per_cpu(cpu_number, cpu) = cpu;
27667@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27668 */
27669 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27670 #endif
27671+#ifdef CONFIG_CC_STACKPROTECTOR
27672+#ifdef CONFIG_X86_32
27673+ if (!cpu)
27674+ per_cpu(stack_canary.canary, cpu) = canary;
27675+#endif
27676+#endif
27677 /*
27678 * Up to this point, the boot CPU has been using .init.data
27679 * area. Reload any changed state for the boot CPU.
27680diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27681index 1ea14fd..b16147f 100644
27682--- a/arch/x86/kernel/signal.c
27683+++ b/arch/x86/kernel/signal.c
27684@@ -183,7 +183,7 @@ static unsigned long align_sigframe(unsigned long sp)
27685 * Align the stack pointer according to the i386 ABI,
27686 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27687 */
27688- sp = ((sp + 4) & -16ul) - 4;
27689+ sp = ((sp - 12) & -16ul) - 4;
27690 #else /* !CONFIG_X86_32 */
27691 sp = round_down(sp, 16) - 8;
27692 #endif
27693@@ -291,10 +291,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27694 }
27695
27696 if (current->mm->context.vdso)
27697- restorer = current->mm->context.vdso +
27698- selected_vdso32->sym___kernel_sigreturn;
27699+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27700 else
27701- restorer = &frame->retcode;
27702+ restorer = (void __user *)&frame->retcode;
27703 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27704 restorer = ksig->ka.sa.sa_restorer;
27705
27706@@ -308,7 +307,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27707 * reasons and because gdb uses it as a signature to notice
27708 * signal handler stack frames.
27709 */
27710- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27711+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27712
27713 if (err)
27714 return -EFAULT;
27715@@ -355,8 +354,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27716 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27717
27718 /* Set up to return from userspace. */
27719- restorer = current->mm->context.vdso +
27720- selected_vdso32->sym___kernel_rt_sigreturn;
27721+ if (current->mm->context.vdso)
27722+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27723+ else
27724+ restorer = (void __user *)&frame->retcode;
27725 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27726 restorer = ksig->ka.sa.sa_restorer;
27727 put_user_ex(restorer, &frame->pretcode);
27728@@ -368,7 +369,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27729 * reasons and because gdb uses it as a signature to notice
27730 * signal handler stack frames.
27731 */
27732- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27733+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27734 } put_user_catch(err);
27735
27736 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27737@@ -598,7 +599,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27738 {
27739 int usig = ksig->sig;
27740 sigset_t *set = sigmask_to_save();
27741- compat_sigset_t *cset = (compat_sigset_t *) set;
27742+ sigset_t sigcopy;
27743+ compat_sigset_t *cset;
27744+
27745+ sigcopy = *set;
27746+
27747+ cset = (compat_sigset_t *) &sigcopy;
27748
27749 /* Set up the stack frame */
27750 if (is_ia32_frame()) {
27751@@ -609,7 +615,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27752 } else if (is_x32_frame()) {
27753 return x32_setup_rt_frame(ksig, cset, regs);
27754 } else {
27755- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27756+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27757 }
27758 }
27759
27760diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27761index be8e1bd..a3d93fa 100644
27762--- a/arch/x86/kernel/smp.c
27763+++ b/arch/x86/kernel/smp.c
27764@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27765
27766 __setup("nonmi_ipi", nonmi_ipi_setup);
27767
27768-struct smp_ops smp_ops = {
27769+struct smp_ops smp_ops __read_only = {
27770 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27771 .smp_prepare_cpus = native_smp_prepare_cpus,
27772 .smp_cpus_done = native_smp_cpus_done,
27773diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27774index 50e547e..d59d06a 100644
27775--- a/arch/x86/kernel/smpboot.c
27776+++ b/arch/x86/kernel/smpboot.c
27777@@ -226,14 +226,17 @@ static void notrace start_secondary(void *unused)
27778
27779 enable_start_cpu0 = 0;
27780
27781-#ifdef CONFIG_X86_32
27782+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27783+ barrier();
27784+
27785 /* switch away from the initial page table */
27786+#ifdef CONFIG_PAX_PER_CPU_PGD
27787+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27788+#else
27789 load_cr3(swapper_pg_dir);
27790+#endif
27791 __flush_tlb_all();
27792-#endif
27793
27794- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27795- barrier();
27796 /*
27797 * Check TSC synchronization with the BP:
27798 */
27799@@ -782,18 +785,17 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
27800 alternatives_enable_smp();
27801
27802 per_cpu(current_task, cpu) = idle;
27803+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27804
27805 #ifdef CONFIG_X86_32
27806 /* Stack for startup_32 can be just as for start_secondary onwards */
27807 irq_ctx_init(cpu);
27808- per_cpu(cpu_current_top_of_stack, cpu) =
27809- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27810+ per_cpu(cpu_current_top_of_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27811 #else
27812 clear_tsk_thread_flag(idle, TIF_FORK);
27813 initial_gs = per_cpu_offset(cpu);
27814 #endif
27815- per_cpu(kernel_stack, cpu) =
27816- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27817+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27818 }
27819
27820 /*
27821@@ -814,9 +816,11 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27822 unsigned long timeout;
27823
27824 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27825- (THREAD_SIZE + task_stack_page(idle))) - 1);
27826+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27827
27828+ pax_open_kernel();
27829 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27830+ pax_close_kernel();
27831 initial_code = (unsigned long)start_secondary;
27832 stack_start = idle->thread.sp;
27833
27834@@ -961,6 +965,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27835
27836 common_cpu_up(cpu, tidle);
27837
27838+#ifdef CONFIG_PAX_PER_CPU_PGD
27839+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27840+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27841+ KERNEL_PGD_PTRS);
27842+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27843+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27844+ KERNEL_PGD_PTRS);
27845+#endif
27846+
27847 err = do_boot_cpu(apicid, cpu, tidle);
27848 if (err) {
27849 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27850diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27851index 9b4d51d..5d28b58 100644
27852--- a/arch/x86/kernel/step.c
27853+++ b/arch/x86/kernel/step.c
27854@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27855 struct desc_struct *desc;
27856 unsigned long base;
27857
27858- seg &= ~7UL;
27859+ seg >>= 3;
27860
27861 mutex_lock(&child->mm->context.lock);
27862- if (unlikely((seg >> 3) >= child->mm->context.size))
27863+ if (unlikely(seg >= child->mm->context.size))
27864 addr = -1L; /* bogus selector, access would fault */
27865 else {
27866 desc = child->mm->context.ldt + seg;
27867@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27868 addr += base;
27869 }
27870 mutex_unlock(&child->mm->context.lock);
27871- }
27872+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27873+ addr = ktla_ktva(addr);
27874
27875 return addr;
27876 }
27877@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27878 unsigned char opcode[15];
27879 unsigned long addr = convert_ip_to_linear(child, regs);
27880
27881+ if (addr == -EINVAL)
27882+ return 0;
27883+
27884 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27885 for (i = 0; i < copied; i++) {
27886 switch (opcode[i]) {
27887diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27888new file mode 100644
27889index 0000000..5877189
27890--- /dev/null
27891+++ b/arch/x86/kernel/sys_i386_32.c
27892@@ -0,0 +1,189 @@
27893+/*
27894+ * This file contains various random system calls that
27895+ * have a non-standard calling sequence on the Linux/i386
27896+ * platform.
27897+ */
27898+
27899+#include <linux/errno.h>
27900+#include <linux/sched.h>
27901+#include <linux/mm.h>
27902+#include <linux/fs.h>
27903+#include <linux/smp.h>
27904+#include <linux/sem.h>
27905+#include <linux/msg.h>
27906+#include <linux/shm.h>
27907+#include <linux/stat.h>
27908+#include <linux/syscalls.h>
27909+#include <linux/mman.h>
27910+#include <linux/file.h>
27911+#include <linux/utsname.h>
27912+#include <linux/ipc.h>
27913+#include <linux/elf.h>
27914+
27915+#include <linux/uaccess.h>
27916+#include <linux/unistd.h>
27917+
27918+#include <asm/syscalls.h>
27919+
27920+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27921+{
27922+ unsigned long pax_task_size = TASK_SIZE;
27923+
27924+#ifdef CONFIG_PAX_SEGMEXEC
27925+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27926+ pax_task_size = SEGMEXEC_TASK_SIZE;
27927+#endif
27928+
27929+ if (flags & MAP_FIXED)
27930+ if (len > pax_task_size || addr > pax_task_size - len)
27931+ return -EINVAL;
27932+
27933+ return 0;
27934+}
27935+
27936+/*
27937+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27938+ */
27939+static unsigned long get_align_mask(void)
27940+{
27941+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27942+ return 0;
27943+
27944+ if (!(current->flags & PF_RANDOMIZE))
27945+ return 0;
27946+
27947+ return va_align.mask;
27948+}
27949+
27950+unsigned long
27951+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27952+ unsigned long len, unsigned long pgoff, unsigned long flags)
27953+{
27954+ struct mm_struct *mm = current->mm;
27955+ struct vm_area_struct *vma;
27956+ unsigned long pax_task_size = TASK_SIZE;
27957+ struct vm_unmapped_area_info info;
27958+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27959+
27960+#ifdef CONFIG_PAX_SEGMEXEC
27961+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27962+ pax_task_size = SEGMEXEC_TASK_SIZE;
27963+#endif
27964+
27965+ pax_task_size -= PAGE_SIZE;
27966+
27967+ if (len > pax_task_size)
27968+ return -ENOMEM;
27969+
27970+ if (flags & MAP_FIXED)
27971+ return addr;
27972+
27973+#ifdef CONFIG_PAX_RANDMMAP
27974+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27975+#endif
27976+
27977+ if (addr) {
27978+ addr = PAGE_ALIGN(addr);
27979+ if (pax_task_size - len >= addr) {
27980+ vma = find_vma(mm, addr);
27981+ if (check_heap_stack_gap(vma, addr, len, offset))
27982+ return addr;
27983+ }
27984+ }
27985+
27986+ info.flags = 0;
27987+ info.length = len;
27988+ info.align_mask = filp ? get_align_mask() : 0;
27989+ info.align_offset = pgoff << PAGE_SHIFT;
27990+ info.threadstack_offset = offset;
27991+
27992+#ifdef CONFIG_PAX_PAGEEXEC
27993+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27994+ info.low_limit = 0x00110000UL;
27995+ info.high_limit = mm->start_code;
27996+
27997+#ifdef CONFIG_PAX_RANDMMAP
27998+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27999+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
28000+#endif
28001+
28002+ if (info.low_limit < info.high_limit) {
28003+ addr = vm_unmapped_area(&info);
28004+ if (!IS_ERR_VALUE(addr))
28005+ return addr;
28006+ }
28007+ } else
28008+#endif
28009+
28010+ info.low_limit = mm->mmap_base;
28011+ info.high_limit = pax_task_size;
28012+
28013+ return vm_unmapped_area(&info);
28014+}
28015+
28016+unsigned long
28017+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28018+ const unsigned long len, const unsigned long pgoff,
28019+ const unsigned long flags)
28020+{
28021+ struct vm_area_struct *vma;
28022+ struct mm_struct *mm = current->mm;
28023+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
28024+ struct vm_unmapped_area_info info;
28025+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28026+
28027+#ifdef CONFIG_PAX_SEGMEXEC
28028+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
28029+ pax_task_size = SEGMEXEC_TASK_SIZE;
28030+#endif
28031+
28032+ pax_task_size -= PAGE_SIZE;
28033+
28034+ /* requested length too big for entire address space */
28035+ if (len > pax_task_size)
28036+ return -ENOMEM;
28037+
28038+ if (flags & MAP_FIXED)
28039+ return addr;
28040+
28041+#ifdef CONFIG_PAX_PAGEEXEC
28042+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
28043+ goto bottomup;
28044+#endif
28045+
28046+#ifdef CONFIG_PAX_RANDMMAP
28047+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28048+#endif
28049+
28050+ /* requesting a specific address */
28051+ if (addr) {
28052+ addr = PAGE_ALIGN(addr);
28053+ if (pax_task_size - len >= addr) {
28054+ vma = find_vma(mm, addr);
28055+ if (check_heap_stack_gap(vma, addr, len, offset))
28056+ return addr;
28057+ }
28058+ }
28059+
28060+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
28061+ info.length = len;
28062+ info.low_limit = PAGE_SIZE;
28063+ info.high_limit = mm->mmap_base;
28064+ info.align_mask = filp ? get_align_mask() : 0;
28065+ info.align_offset = pgoff << PAGE_SHIFT;
28066+ info.threadstack_offset = offset;
28067+
28068+ addr = vm_unmapped_area(&info);
28069+ if (!(addr & ~PAGE_MASK))
28070+ return addr;
28071+ VM_BUG_ON(addr != -ENOMEM);
28072+
28073+bottomup:
28074+ /*
28075+ * A failed mmap() very likely causes application failure,
28076+ * so fall back to the bottom-up function here. This scenario
28077+ * can happen with large stack limits and large mmap()
28078+ * allocations.
28079+ */
28080+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
28081+}
28082diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
28083index 10e0272..b4bb9a7 100644
28084--- a/arch/x86/kernel/sys_x86_64.c
28085+++ b/arch/x86/kernel/sys_x86_64.c
28086@@ -97,8 +97,8 @@ out:
28087 return error;
28088 }
28089
28090-static void find_start_end(unsigned long flags, unsigned long *begin,
28091- unsigned long *end)
28092+static void find_start_end(struct mm_struct *mm, unsigned long flags,
28093+ unsigned long *begin, unsigned long *end)
28094 {
28095 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
28096 unsigned long new_begin;
28097@@ -117,7 +117,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
28098 *begin = new_begin;
28099 }
28100 } else {
28101- *begin = current->mm->mmap_legacy_base;
28102+ *begin = mm->mmap_legacy_base;
28103 *end = TASK_SIZE;
28104 }
28105 }
28106@@ -130,20 +130,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
28107 struct vm_area_struct *vma;
28108 struct vm_unmapped_area_info info;
28109 unsigned long begin, end;
28110+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28111
28112 if (flags & MAP_FIXED)
28113 return addr;
28114
28115- find_start_end(flags, &begin, &end);
28116+ find_start_end(mm, flags, &begin, &end);
28117
28118 if (len > end)
28119 return -ENOMEM;
28120
28121+#ifdef CONFIG_PAX_RANDMMAP
28122+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28123+#endif
28124+
28125 if (addr) {
28126 addr = PAGE_ALIGN(addr);
28127 vma = find_vma(mm, addr);
28128- if (end - len >= addr &&
28129- (!vma || addr + len <= vma->vm_start))
28130+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
28131 return addr;
28132 }
28133
28134@@ -157,6 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
28135 info.align_mask = get_align_mask();
28136 info.align_offset += get_align_bits();
28137 }
28138+ info.threadstack_offset = offset;
28139 return vm_unmapped_area(&info);
28140 }
28141
28142@@ -169,6 +174,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28143 struct mm_struct *mm = current->mm;
28144 unsigned long addr = addr0;
28145 struct vm_unmapped_area_info info;
28146+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
28147
28148 /* requested length too big for entire address space */
28149 if (len > TASK_SIZE)
28150@@ -181,12 +187,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28151 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
28152 goto bottomup;
28153
28154+#ifdef CONFIG_PAX_RANDMMAP
28155+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
28156+#endif
28157+
28158 /* requesting a specific address */
28159 if (addr) {
28160 addr = PAGE_ALIGN(addr);
28161 vma = find_vma(mm, addr);
28162- if (TASK_SIZE - len >= addr &&
28163- (!vma || addr + len <= vma->vm_start))
28164+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
28165 return addr;
28166 }
28167
28168@@ -200,6 +209,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
28169 info.align_mask = get_align_mask();
28170 info.align_offset += get_align_bits();
28171 }
28172+ info.threadstack_offset = offset;
28173 addr = vm_unmapped_area(&info);
28174 if (!(addr & ~PAGE_MASK))
28175 return addr;
28176diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
28177index 91a4496..42fc304 100644
28178--- a/arch/x86/kernel/tboot.c
28179+++ b/arch/x86/kernel/tboot.c
28180@@ -44,6 +44,7 @@
28181 #include <asm/setup.h>
28182 #include <asm/e820.h>
28183 #include <asm/io.h>
28184+#include <asm/tlbflush.h>
28185
28186 #include "../realmode/rm/wakeup.h"
28187
28188@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
28189
28190 void tboot_shutdown(u32 shutdown_type)
28191 {
28192- void (*shutdown)(void);
28193+ void (* __noreturn shutdown)(void);
28194
28195 if (!tboot_enabled())
28196 return;
28197@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
28198 tboot->shutdown_type = shutdown_type;
28199
28200 switch_to_tboot_pt();
28201+ cr4_clear_bits(X86_CR4_PCIDE);
28202
28203- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
28204+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
28205 shutdown();
28206
28207 /* should not reach here */
28208@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
28209 return -ENODEV;
28210 }
28211
28212-static atomic_t ap_wfs_count;
28213+static atomic_unchecked_t ap_wfs_count;
28214
28215 static int tboot_wait_for_aps(int num_aps)
28216 {
28217@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
28218 {
28219 switch (action) {
28220 case CPU_DYING:
28221- atomic_inc(&ap_wfs_count);
28222+ atomic_inc_unchecked(&ap_wfs_count);
28223 if (num_online_cpus() == 1)
28224- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
28225+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
28226 return NOTIFY_BAD;
28227 break;
28228 }
28229@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
28230
28231 tboot_create_trampoline();
28232
28233- atomic_set(&ap_wfs_count, 0);
28234+ atomic_set_unchecked(&ap_wfs_count, 0);
28235 register_hotcpu_notifier(&tboot_cpu_notifier);
28236
28237 #ifdef CONFIG_DEBUG_FS
28238diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
28239index d39c091..1df4349 100644
28240--- a/arch/x86/kernel/time.c
28241+++ b/arch/x86/kernel/time.c
28242@@ -32,7 +32,7 @@ unsigned long profile_pc(struct pt_regs *regs)
28243
28244 if (!user_mode(regs) && in_lock_functions(pc)) {
28245 #ifdef CONFIG_FRAME_POINTER
28246- return *(unsigned long *)(regs->bp + sizeof(long));
28247+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
28248 #else
28249 unsigned long *sp =
28250 (unsigned long *)kernel_stack_pointer(regs);
28251@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
28252 * or above a saved flags. Eflags has bits 22-31 zero,
28253 * kernel addresses don't.
28254 */
28255+
28256+#ifdef CONFIG_PAX_KERNEXEC
28257+ return ktla_ktva(sp[0]);
28258+#else
28259 if (sp[0] >> 22)
28260 return sp[0];
28261 if (sp[1] >> 22)
28262 return sp[1];
28263 #endif
28264+
28265+#endif
28266 }
28267 return pc;
28268 }
28269diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
28270index 7fc5e84..c6e445a 100644
28271--- a/arch/x86/kernel/tls.c
28272+++ b/arch/x86/kernel/tls.c
28273@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
28274 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
28275 return -EINVAL;
28276
28277+#ifdef CONFIG_PAX_SEGMEXEC
28278+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
28279+ return -EINVAL;
28280+#endif
28281+
28282 set_tls_desc(p, idx, &info, 1);
28283
28284 return 0;
28285@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
28286
28287 if (kbuf)
28288 info = kbuf;
28289- else if (__copy_from_user(infobuf, ubuf, count))
28290+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
28291 return -EFAULT;
28292 else
28293 info = infobuf;
28294diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
28295index 1c113db..287b42e 100644
28296--- a/arch/x86/kernel/tracepoint.c
28297+++ b/arch/x86/kernel/tracepoint.c
28298@@ -9,11 +9,11 @@
28299 #include <linux/atomic.h>
28300
28301 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
28302-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28303+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28304 (unsigned long) trace_idt_table };
28305
28306 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28307-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
28308+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
28309
28310 static int trace_irq_vector_refcount;
28311 static DEFINE_MUTEX(irq_vector_mutex);
28312diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
28313index 324ab52..0cfd2d05 100644
28314--- a/arch/x86/kernel/traps.c
28315+++ b/arch/x86/kernel/traps.c
28316@@ -68,7 +68,7 @@
28317 #include <asm/proto.h>
28318
28319 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28320-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
28321+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
28322 #else
28323 #include <asm/processor-flags.h>
28324 #include <asm/setup.h>
28325@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
28326 #endif
28327
28328 /* Must be page-aligned because the real IDT is used in a fixmap. */
28329-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
28330+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
28331
28332 DECLARE_BITMAP(used_vectors, NR_VECTORS);
28333 EXPORT_SYMBOL_GPL(used_vectors);
28334@@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
28335 * will catch asm bugs and any attempt to use ist_preempt_enable
28336 * from double_fault.
28337 */
28338- BUG_ON((unsigned long)(current_top_of_stack() -
28339+ BUG_ON((unsigned long)(current_top_of_stack(smp_processor_id()) -
28340 current_stack_pointer()) >= THREAD_SIZE);
28341
28342 preempt_count_sub(HARDIRQ_OFFSET);
28343@@ -191,7 +191,7 @@ void ist_end_non_atomic(void)
28344 }
28345
28346 static nokprobe_inline int
28347-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28348+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
28349 struct pt_regs *regs, long error_code)
28350 {
28351 if (v8086_mode(regs)) {
28352@@ -211,8 +211,20 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28353 if (!fixup_exception(regs)) {
28354 tsk->thread.error_code = error_code;
28355 tsk->thread.trap_nr = trapnr;
28356+
28357+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28358+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28359+ str = "PAX: suspicious stack segment fault";
28360+#endif
28361+
28362 die(str, regs, error_code);
28363 }
28364+
28365+#ifdef CONFIG_PAX_REFCOUNT
28366+ if (trapnr == X86_TRAP_OF)
28367+ pax_report_refcount_overflow(regs);
28368+#endif
28369+
28370 return 0;
28371 }
28372
28373@@ -251,7 +263,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28374 }
28375
28376 static void
28377-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28378+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28379 long error_code, siginfo_t *info)
28380 {
28381 struct task_struct *tsk = current;
28382@@ -275,7 +287,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28383 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28384 printk_ratelimit()) {
28385 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28386- tsk->comm, tsk->pid, str,
28387+ tsk->comm, task_pid_nr(tsk), str,
28388 regs->ip, regs->sp, error_code);
28389 print_vma_addr(" in ", regs->ip);
28390 pr_cont("\n");
28391@@ -357,6 +369,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28392 tsk->thread.error_code = error_code;
28393 tsk->thread.trap_nr = X86_TRAP_DF;
28394
28395+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28396+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28397+ die("grsec: kernel stack overflow detected", regs, error_code);
28398+#endif
28399+
28400 #ifdef CONFIG_DOUBLEFAULT
28401 df_debug(regs, error_code);
28402 #endif
28403@@ -475,11 +492,35 @@ do_general_protection(struct pt_regs *regs, long error_code)
28404 tsk->thread.error_code = error_code;
28405 tsk->thread.trap_nr = X86_TRAP_GP;
28406 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28407- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28408+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28409+
28410+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28411+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28412+ die("PAX: suspicious general protection fault", regs, error_code);
28413+ else
28414+#endif
28415+
28416 die("general protection fault", regs, error_code);
28417+ }
28418 goto exit;
28419 }
28420
28421+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28422+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28423+ struct mm_struct *mm = tsk->mm;
28424+ unsigned long limit;
28425+
28426+ down_write(&mm->mmap_sem);
28427+ limit = mm->context.user_cs_limit;
28428+ if (limit < TASK_SIZE) {
28429+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28430+ up_write(&mm->mmap_sem);
28431+ return;
28432+ }
28433+ up_write(&mm->mmap_sem);
28434+ }
28435+#endif
28436+
28437 tsk->thread.error_code = error_code;
28438 tsk->thread.trap_nr = X86_TRAP_GP;
28439
28440@@ -578,6 +619,9 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28441 container_of(task_pt_regs(current),
28442 struct bad_iret_stack, regs);
28443
28444+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28445+ new_stack = s;
28446+
28447 /* Copy the IRET target to the new stack. */
28448 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28449
28450diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28451index 5054497..139f8f8 100644
28452--- a/arch/x86/kernel/tsc.c
28453+++ b/arch/x86/kernel/tsc.c
28454@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28455 */
28456 smp_wmb();
28457
28458- ACCESS_ONCE(c2n->head) = data;
28459+ ACCESS_ONCE_RW(c2n->head) = data;
28460 }
28461
28462 /*
28463diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28464index 0b81ad6..fff670e 100644
28465--- a/arch/x86/kernel/uprobes.c
28466+++ b/arch/x86/kernel/uprobes.c
28467@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28468
28469 if (nleft != rasize) {
28470 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28471- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28472+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28473
28474 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28475 }
28476diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28477index b9242ba..50c5edd 100644
28478--- a/arch/x86/kernel/verify_cpu.S
28479+++ b/arch/x86/kernel/verify_cpu.S
28480@@ -20,6 +20,7 @@
28481 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28482 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28483 * arch/x86/kernel/head_32.S: processor startup
28484+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28485 *
28486 * verify_cpu, returns the status of longmode and SSE in register %eax.
28487 * 0: Success 1: Failure
28488diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28489index fc9db6e..2c5865d 100644
28490--- a/arch/x86/kernel/vm86_32.c
28491+++ b/arch/x86/kernel/vm86_32.c
28492@@ -44,6 +44,7 @@
28493 #include <linux/ptrace.h>
28494 #include <linux/audit.h>
28495 #include <linux/stddef.h>
28496+#include <linux/grsecurity.h>
28497
28498 #include <asm/uaccess.h>
28499 #include <asm/io.h>
28500@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28501 do_exit(SIGSEGV);
28502 }
28503
28504- tss = &per_cpu(cpu_tss, get_cpu());
28505+ tss = cpu_tss + get_cpu();
28506 current->thread.sp0 = current->thread.saved_sp0;
28507 current->thread.sysenter_cs = __KERNEL_CS;
28508 load_sp0(tss, &current->thread);
28509@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28510
28511 if (tsk->thread.saved_sp0)
28512 return -EPERM;
28513+
28514+#ifdef CONFIG_GRKERNSEC_VM86
28515+ if (!capable(CAP_SYS_RAWIO)) {
28516+ gr_handle_vm86();
28517+ return -EPERM;
28518+ }
28519+#endif
28520+
28521 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28522 offsetof(struct kernel_vm86_struct, vm86plus) -
28523 sizeof(info.regs));
28524@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28525 int tmp;
28526 struct vm86plus_struct __user *v86;
28527
28528+#ifdef CONFIG_GRKERNSEC_VM86
28529+ if (!capable(CAP_SYS_RAWIO)) {
28530+ gr_handle_vm86();
28531+ return -EPERM;
28532+ }
28533+#endif
28534+
28535 tsk = current;
28536 switch (cmd) {
28537 case VM86_REQUEST_IRQ:
28538@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28539 tsk->thread.saved_fs = info->regs32->fs;
28540 tsk->thread.saved_gs = get_user_gs(info->regs32);
28541
28542- tss = &per_cpu(cpu_tss, get_cpu());
28543+ tss = cpu_tss + get_cpu();
28544 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28545 if (cpu_has_sep)
28546 tsk->thread.sysenter_cs = 0;
28547@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28548 goto cannot_handle;
28549 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28550 goto cannot_handle;
28551- intr_ptr = (unsigned long __user *) (i << 2);
28552+ intr_ptr = (__force unsigned long __user *) (i << 2);
28553 if (get_user(segoffs, intr_ptr))
28554 goto cannot_handle;
28555 if ((segoffs >> 16) == BIOSSEG)
28556diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28557index 00bf300..129df8e 100644
28558--- a/arch/x86/kernel/vmlinux.lds.S
28559+++ b/arch/x86/kernel/vmlinux.lds.S
28560@@ -26,6 +26,13 @@
28561 #include <asm/page_types.h>
28562 #include <asm/cache.h>
28563 #include <asm/boot.h>
28564+#include <asm/segment.h>
28565+
28566+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28567+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28568+#else
28569+#define __KERNEL_TEXT_OFFSET 0
28570+#endif
28571
28572 #undef i386 /* in case the preprocessor is a 32bit one */
28573
28574@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28575
28576 PHDRS {
28577 text PT_LOAD FLAGS(5); /* R_E */
28578+#ifdef CONFIG_X86_32
28579+ module PT_LOAD FLAGS(5); /* R_E */
28580+#endif
28581+#ifdef CONFIG_XEN
28582+ rodata PT_LOAD FLAGS(5); /* R_E */
28583+#else
28584+ rodata PT_LOAD FLAGS(4); /* R__ */
28585+#endif
28586 data PT_LOAD FLAGS(6); /* RW_ */
28587-#ifdef CONFIG_X86_64
28588+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28589 #ifdef CONFIG_SMP
28590 percpu PT_LOAD FLAGS(6); /* RW_ */
28591 #endif
28592+ text.init PT_LOAD FLAGS(5); /* R_E */
28593+ text.exit PT_LOAD FLAGS(5); /* R_E */
28594 init PT_LOAD FLAGS(7); /* RWE */
28595-#endif
28596 note PT_NOTE FLAGS(0); /* ___ */
28597 }
28598
28599 SECTIONS
28600 {
28601 #ifdef CONFIG_X86_32
28602- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28603- phys_startup_32 = startup_32 - LOAD_OFFSET;
28604+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28605 #else
28606- . = __START_KERNEL;
28607- phys_startup_64 = startup_64 - LOAD_OFFSET;
28608+ . = __START_KERNEL;
28609 #endif
28610
28611 /* Text and read-only data */
28612- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28613- _text = .;
28614+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28615 /* bootstrapping code */
28616+#ifdef CONFIG_X86_32
28617+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28618+#else
28619+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28620+#endif
28621+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28622+ _text = .;
28623 HEAD_TEXT
28624 . = ALIGN(8);
28625 _stext = .;
28626@@ -104,13 +124,47 @@ SECTIONS
28627 IRQENTRY_TEXT
28628 *(.fixup)
28629 *(.gnu.warning)
28630- /* End of text section */
28631- _etext = .;
28632 } :text = 0x9090
28633
28634- NOTES :text :note
28635+ . += __KERNEL_TEXT_OFFSET;
28636
28637- EXCEPTION_TABLE(16) :text = 0x9090
28638+#ifdef CONFIG_X86_32
28639+ . = ALIGN(PAGE_SIZE);
28640+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28641+
28642+#ifdef CONFIG_PAX_KERNEXEC
28643+ MODULES_EXEC_VADDR = .;
28644+ BYTE(0)
28645+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28646+ . = ALIGN(HPAGE_SIZE) - 1;
28647+ MODULES_EXEC_END = .;
28648+#endif
28649+
28650+ } :module
28651+#endif
28652+
28653+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28654+ /* End of text section */
28655+ BYTE(0)
28656+ _etext = . - __KERNEL_TEXT_OFFSET;
28657+ }
28658+
28659+#ifdef CONFIG_X86_32
28660+ . = ALIGN(PAGE_SIZE);
28661+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28662+ . = ALIGN(PAGE_SIZE);
28663+ *(.empty_zero_page)
28664+ *(.initial_pg_fixmap)
28665+ *(.initial_pg_pmd)
28666+ *(.initial_page_table)
28667+ *(.swapper_pg_dir)
28668+ } :rodata
28669+#endif
28670+
28671+ . = ALIGN(PAGE_SIZE);
28672+ NOTES :rodata :note
28673+
28674+ EXCEPTION_TABLE(16) :rodata
28675
28676 #if defined(CONFIG_DEBUG_RODATA)
28677 /* .text should occupy whole number of pages */
28678@@ -122,16 +176,20 @@ SECTIONS
28679
28680 /* Data */
28681 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28682+
28683+#ifdef CONFIG_PAX_KERNEXEC
28684+ . = ALIGN(HPAGE_SIZE);
28685+#else
28686+ . = ALIGN(PAGE_SIZE);
28687+#endif
28688+
28689 /* Start of data section */
28690 _sdata = .;
28691
28692 /* init_task */
28693 INIT_TASK_DATA(THREAD_SIZE)
28694
28695-#ifdef CONFIG_X86_32
28696- /* 32 bit has nosave before _edata */
28697 NOSAVE_DATA
28698-#endif
28699
28700 PAGE_ALIGNED_DATA(PAGE_SIZE)
28701
28702@@ -174,12 +232,19 @@ SECTIONS
28703 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28704
28705 /* Init code and data - will be freed after init */
28706- . = ALIGN(PAGE_SIZE);
28707 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28708+ BYTE(0)
28709+
28710+#ifdef CONFIG_PAX_KERNEXEC
28711+ . = ALIGN(HPAGE_SIZE);
28712+#else
28713+ . = ALIGN(PAGE_SIZE);
28714+#endif
28715+
28716 __init_begin = .; /* paired with __init_end */
28717- }
28718+ } :init.begin
28719
28720-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28721+#ifdef CONFIG_SMP
28722 /*
28723 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28724 * output PHDR, so the next output section - .init.text - should
28725@@ -190,12 +255,27 @@ SECTIONS
28726 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28727 #endif
28728
28729- INIT_TEXT_SECTION(PAGE_SIZE)
28730-#ifdef CONFIG_X86_64
28731- :init
28732-#endif
28733+ . = ALIGN(PAGE_SIZE);
28734+ init_begin = .;
28735+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28736+ VMLINUX_SYMBOL(_sinittext) = .;
28737+ INIT_TEXT
28738+ . = ALIGN(PAGE_SIZE);
28739+ } :text.init
28740
28741- INIT_DATA_SECTION(16)
28742+ /*
28743+ * .exit.text is discard at runtime, not link time, to deal with
28744+ * references from .altinstructions and .eh_frame
28745+ */
28746+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28747+ EXIT_TEXT
28748+ VMLINUX_SYMBOL(_einittext) = .;
28749+ . = ALIGN(16);
28750+ } :text.exit
28751+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28752+
28753+ . = ALIGN(PAGE_SIZE);
28754+ INIT_DATA_SECTION(16) :init
28755
28756 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28757 __x86_cpu_dev_start = .;
28758@@ -266,19 +346,12 @@ SECTIONS
28759 }
28760
28761 . = ALIGN(8);
28762- /*
28763- * .exit.text is discard at runtime, not link time, to deal with
28764- * references from .altinstructions and .eh_frame
28765- */
28766- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28767- EXIT_TEXT
28768- }
28769
28770 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28771 EXIT_DATA
28772 }
28773
28774-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28775+#ifndef CONFIG_SMP
28776 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28777 #endif
28778
28779@@ -297,16 +370,10 @@ SECTIONS
28780 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28781 __smp_locks = .;
28782 *(.smp_locks)
28783- . = ALIGN(PAGE_SIZE);
28784 __smp_locks_end = .;
28785+ . = ALIGN(PAGE_SIZE);
28786 }
28787
28788-#ifdef CONFIG_X86_64
28789- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28790- NOSAVE_DATA
28791- }
28792-#endif
28793-
28794 /* BSS */
28795 . = ALIGN(PAGE_SIZE);
28796 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28797@@ -322,6 +389,7 @@ SECTIONS
28798 __brk_base = .;
28799 . += 64 * 1024; /* 64k alignment slop space */
28800 *(.brk_reservation) /* areas brk users have reserved */
28801+ . = ALIGN(HPAGE_SIZE);
28802 __brk_limit = .;
28803 }
28804
28805@@ -348,13 +416,12 @@ SECTIONS
28806 * for the boot processor.
28807 */
28808 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28809-INIT_PER_CPU(gdt_page);
28810 INIT_PER_CPU(irq_stack_union);
28811
28812 /*
28813 * Build-time check on the image size:
28814 */
28815-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28816+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28817 "kernel image bigger than KERNEL_IMAGE_SIZE");
28818
28819 #ifdef CONFIG_SMP
28820diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28821index 2dcc6ff..082dc7a 100644
28822--- a/arch/x86/kernel/vsyscall_64.c
28823+++ b/arch/x86/kernel/vsyscall_64.c
28824@@ -38,15 +38,13 @@
28825 #define CREATE_TRACE_POINTS
28826 #include "vsyscall_trace.h"
28827
28828-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28829+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28830
28831 static int __init vsyscall_setup(char *str)
28832 {
28833 if (str) {
28834 if (!strcmp("emulate", str))
28835 vsyscall_mode = EMULATE;
28836- else if (!strcmp("native", str))
28837- vsyscall_mode = NATIVE;
28838 else if (!strcmp("none", str))
28839 vsyscall_mode = NONE;
28840 else
28841@@ -264,8 +262,7 @@ do_ret:
28842 return true;
28843
28844 sigsegv:
28845- force_sig(SIGSEGV, current);
28846- return true;
28847+ do_group_exit(SIGKILL);
28848 }
28849
28850 /*
28851@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28852 static struct vm_area_struct gate_vma = {
28853 .vm_start = VSYSCALL_ADDR,
28854 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28855- .vm_page_prot = PAGE_READONLY_EXEC,
28856- .vm_flags = VM_READ | VM_EXEC,
28857+ .vm_page_prot = PAGE_READONLY,
28858+ .vm_flags = VM_READ,
28859 .vm_ops = &gate_vma_ops,
28860 };
28861
28862@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28863 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28864
28865 if (vsyscall_mode != NONE)
28866- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28867- vsyscall_mode == NATIVE
28868- ? PAGE_KERNEL_VSYSCALL
28869- : PAGE_KERNEL_VVAR);
28870+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28871
28872 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28873 (unsigned long)VSYSCALL_ADDR);
28874diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28875index 37d8fa4..66e319a 100644
28876--- a/arch/x86/kernel/x8664_ksyms_64.c
28877+++ b/arch/x86/kernel/x8664_ksyms_64.c
28878@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28879 EXPORT_SYMBOL(copy_user_generic_unrolled);
28880 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28881 EXPORT_SYMBOL(__copy_user_nocache);
28882-EXPORT_SYMBOL(_copy_from_user);
28883-EXPORT_SYMBOL(_copy_to_user);
28884
28885 EXPORT_SYMBOL(copy_page);
28886 EXPORT_SYMBOL(clear_page);
28887@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28888 EXPORT_SYMBOL(___preempt_schedule_context);
28889 #endif
28890 #endif
28891+
28892+#ifdef CONFIG_PAX_PER_CPU_PGD
28893+EXPORT_SYMBOL(cpu_pgd);
28894+#endif
28895diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28896index 234b072..b7ab191 100644
28897--- a/arch/x86/kernel/x86_init.c
28898+++ b/arch/x86/kernel/x86_init.c
28899@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28900 static void default_nmi_init(void) { };
28901 static int default_i8042_detect(void) { return 1; };
28902
28903-struct x86_platform_ops x86_platform = {
28904+struct x86_platform_ops x86_platform __read_only = {
28905 .calibrate_tsc = native_calibrate_tsc,
28906 .get_wallclock = mach_get_cmos_time,
28907 .set_wallclock = mach_set_rtc_mmss,
28908@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28909 EXPORT_SYMBOL_GPL(x86_platform);
28910
28911 #if defined(CONFIG_PCI_MSI)
28912-struct x86_msi_ops x86_msi = {
28913+struct x86_msi_ops x86_msi __read_only = {
28914 .setup_msi_irqs = native_setup_msi_irqs,
28915 .compose_msi_msg = native_compose_msi_msg,
28916 .teardown_msi_irq = native_teardown_msi_irq,
28917@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28918 }
28919 #endif
28920
28921-struct x86_io_apic_ops x86_io_apic_ops = {
28922+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28923 .init = native_io_apic_init_mappings,
28924 .read = native_io_apic_read,
28925 .write = native_io_apic_write,
28926diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28927index 87a815b..727dbe6 100644
28928--- a/arch/x86/kernel/xsave.c
28929+++ b/arch/x86/kernel/xsave.c
28930@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28931
28932 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28933 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28934- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28935+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28936
28937 if (!use_xsave())
28938 return err;
28939
28940- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28941+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28942
28943 /*
28944 * Read the xstate_bv which we copied (directly from the cpu or
28945 * from the state in task struct) to the user buffers.
28946 */
28947- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28948+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28949
28950 /*
28951 * For legacy compatible, we always set FP/SSE bits in the bit
28952@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28953 */
28954 xstate_bv |= XSTATE_FPSSE;
28955
28956- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28957+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28958
28959 return err;
28960 }
28961@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28962 {
28963 int err;
28964
28965+ buf = (struct xsave_struct __user *)____m(buf);
28966 if (use_xsave())
28967 err = xsave_user(buf);
28968 else if (use_fxsr())
28969@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28970 */
28971 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28972 {
28973+ buf = (void __user *)____m(buf);
28974 if (use_xsave()) {
28975 if ((unsigned long)buf % 64 || fx_only) {
28976 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28977diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28978index 1d08ad3..c6a4faf 100644
28979--- a/arch/x86/kvm/cpuid.c
28980+++ b/arch/x86/kvm/cpuid.c
28981@@ -204,15 +204,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28982 struct kvm_cpuid2 *cpuid,
28983 struct kvm_cpuid_entry2 __user *entries)
28984 {
28985- int r;
28986+ int r, i;
28987
28988 r = -E2BIG;
28989 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28990 goto out;
28991 r = -EFAULT;
28992- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28993- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28994+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28995 goto out;
28996+ for (i = 0; i < cpuid->nent; ++i) {
28997+ struct kvm_cpuid_entry2 cpuid_entry;
28998+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28999+ goto out;
29000+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
29001+ }
29002 vcpu->arch.cpuid_nent = cpuid->nent;
29003 kvm_apic_set_version(vcpu);
29004 kvm_x86_ops->cpuid_update(vcpu);
29005@@ -225,15 +230,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
29006 struct kvm_cpuid2 *cpuid,
29007 struct kvm_cpuid_entry2 __user *entries)
29008 {
29009- int r;
29010+ int r, i;
29011
29012 r = -E2BIG;
29013 if (cpuid->nent < vcpu->arch.cpuid_nent)
29014 goto out;
29015 r = -EFAULT;
29016- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
29017- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
29018+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
29019 goto out;
29020+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
29021+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
29022+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
29023+ goto out;
29024+ }
29025 return 0;
29026
29027 out:
29028diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
29029index 630bcb0..a7f6d9e 100644
29030--- a/arch/x86/kvm/emulate.c
29031+++ b/arch/x86/kvm/emulate.c
29032@@ -3569,7 +3569,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
29033 int cr = ctxt->modrm_reg;
29034 u64 efer = 0;
29035
29036- static u64 cr_reserved_bits[] = {
29037+ static const u64 cr_reserved_bits[] = {
29038 0xffffffff00000000ULL,
29039 0, 0, 0, /* CR3 checked later */
29040 CR4_RESERVED_BITS,
29041diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
29042index 67d07e0..10769d5 100644
29043--- a/arch/x86/kvm/lapic.c
29044+++ b/arch/x86/kvm/lapic.c
29045@@ -56,7 +56,7 @@
29046 #define APIC_BUS_CYCLE_NS 1
29047
29048 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
29049-#define apic_debug(fmt, arg...)
29050+#define apic_debug(fmt, arg...) do {} while (0)
29051
29052 #define APIC_LVT_NUM 6
29053 /* 14 is the version for Xeon and Pentium 8.4.8*/
29054diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
29055index 9d28383..c4ea87e 100644
29056--- a/arch/x86/kvm/lapic.h
29057+++ b/arch/x86/kvm/lapic.h
29058@@ -150,7 +150,7 @@ static inline bool kvm_apic_vid_enabled(struct kvm *kvm)
29059
29060 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
29061 {
29062- return vcpu->arch.apic->pending_events;
29063+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
29064 }
29065
29066 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
29067diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
29068index 6e6d115..43fecbf 100644
29069--- a/arch/x86/kvm/paging_tmpl.h
29070+++ b/arch/x86/kvm/paging_tmpl.h
29071@@ -343,7 +343,7 @@ retry_walk:
29072 if (unlikely(kvm_is_error_hva(host_addr)))
29073 goto error;
29074
29075- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
29076+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
29077 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
29078 goto error;
29079 walker->ptep_user[walker->level - 1] = ptep_user;
29080diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
29081index 4911bf1..e7d3ed2 100644
29082--- a/arch/x86/kvm/svm.c
29083+++ b/arch/x86/kvm/svm.c
29084@@ -3577,7 +3577,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
29085 int cpu = raw_smp_processor_id();
29086
29087 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
29088+
29089+ pax_open_kernel();
29090 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
29091+ pax_close_kernel();
29092+
29093 load_TR_desc();
29094 }
29095
29096@@ -3973,6 +3977,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
29097 #endif
29098 #endif
29099
29100+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
29101+ __set_fs(current_thread_info()->addr_limit);
29102+#endif
29103+
29104 reload_tss(vcpu);
29105
29106 local_irq_disable();
29107diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
29108index 2d73807..84a0e59 100644
29109--- a/arch/x86/kvm/vmx.c
29110+++ b/arch/x86/kvm/vmx.c
29111@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
29112 #endif
29113 }
29114
29115-static void vmcs_clear_bits(unsigned long field, u32 mask)
29116+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
29117 {
29118 vmcs_writel(field, vmcs_readl(field) & ~mask);
29119 }
29120
29121-static void vmcs_set_bits(unsigned long field, u32 mask)
29122+static void vmcs_set_bits(unsigned long field, unsigned long mask)
29123 {
29124 vmcs_writel(field, vmcs_readl(field) | mask);
29125 }
29126@@ -1705,7 +1705,11 @@ static void reload_tss(void)
29127 struct desc_struct *descs;
29128
29129 descs = (void *)gdt->address;
29130+
29131+ pax_open_kernel();
29132 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
29133+ pax_close_kernel();
29134+
29135 load_TR_desc();
29136 }
29137
29138@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
29139 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
29140 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
29141
29142+#ifdef CONFIG_PAX_PER_CPU_PGD
29143+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
29144+#endif
29145+
29146 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
29147 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
29148 vmx->loaded_vmcs->cpu = cpu;
29149@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
29150 * reads and returns guest's timestamp counter "register"
29151 * guest_tsc = host_tsc + tsc_offset -- 21.3
29152 */
29153-static u64 guest_read_tsc(void)
29154+static u64 __intentional_overflow(-1) guest_read_tsc(void)
29155 {
29156 u64 host_tsc, tsc_offset;
29157
29158@@ -4467,7 +4475,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
29159 unsigned long cr4;
29160
29161 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
29162+
29163+#ifndef CONFIG_PAX_PER_CPU_PGD
29164 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
29165+#endif
29166
29167 /* Save the most likely value for this task's CR4 in the VMCS. */
29168 cr4 = cr4_read_shadow();
29169@@ -4494,7 +4505,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
29170 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
29171 vmx->host_idt_base = dt.address;
29172
29173- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
29174+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
29175
29176 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
29177 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
29178@@ -6107,11 +6118,17 @@ static __init int hardware_setup(void)
29179 * page upon invalidation. No need to do anything if not
29180 * using the APIC_ACCESS_ADDR VMCS field.
29181 */
29182- if (!flexpriority_enabled)
29183- kvm_x86_ops->set_apic_access_page_addr = NULL;
29184+ if (!flexpriority_enabled) {
29185+ pax_open_kernel();
29186+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
29187+ pax_close_kernel();
29188+ }
29189
29190- if (!cpu_has_vmx_tpr_shadow())
29191- kvm_x86_ops->update_cr8_intercept = NULL;
29192+ if (!cpu_has_vmx_tpr_shadow()) {
29193+ pax_open_kernel();
29194+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
29195+ pax_close_kernel();
29196+ }
29197
29198 if (enable_ept && !cpu_has_vmx_ept_2m_page())
29199 kvm_disable_largepages();
29200@@ -6122,14 +6139,16 @@ static __init int hardware_setup(void)
29201 if (!cpu_has_vmx_apicv())
29202 enable_apicv = 0;
29203
29204+ pax_open_kernel();
29205 if (enable_apicv)
29206- kvm_x86_ops->update_cr8_intercept = NULL;
29207+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
29208 else {
29209- kvm_x86_ops->hwapic_irr_update = NULL;
29210- kvm_x86_ops->hwapic_isr_update = NULL;
29211- kvm_x86_ops->deliver_posted_interrupt = NULL;
29212- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29213+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
29214+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
29215+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
29216+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
29217 }
29218+ pax_close_kernel();
29219
29220 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
29221 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
29222@@ -6182,10 +6201,12 @@ static __init int hardware_setup(void)
29223 enable_pml = 0;
29224
29225 if (!enable_pml) {
29226- kvm_x86_ops->slot_enable_log_dirty = NULL;
29227- kvm_x86_ops->slot_disable_log_dirty = NULL;
29228- kvm_x86_ops->flush_log_dirty = NULL;
29229- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29230+ pax_open_kernel();
29231+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
29232+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
29233+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
29234+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
29235+ pax_close_kernel();
29236 }
29237
29238 return alloc_kvm_area();
29239@@ -8230,6 +8251,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29240 "jmp 2f \n\t"
29241 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
29242 "2: "
29243+
29244+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29245+ "ljmp %[cs],$3f\n\t"
29246+ "3: "
29247+#endif
29248+
29249 /* Save guest registers, load host registers, keep flags */
29250 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
29251 "pop %0 \n\t"
29252@@ -8282,6 +8309,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29253 #endif
29254 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
29255 [wordsize]"i"(sizeof(ulong))
29256+
29257+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29258+ ,[cs]"i"(__KERNEL_CS)
29259+#endif
29260+
29261 : "cc", "memory"
29262 #ifdef CONFIG_X86_64
29263 , "rax", "rbx", "rdi", "rsi"
29264@@ -8295,7 +8327,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29265 if (debugctlmsr)
29266 update_debugctlmsr(debugctlmsr);
29267
29268-#ifndef CONFIG_X86_64
29269+#ifdef CONFIG_X86_32
29270 /*
29271 * The sysexit path does not restore ds/es, so we must set them to
29272 * a reasonable value ourselves.
29273@@ -8304,8 +8336,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29274 * may be executed in interrupt context, which saves and restore segments
29275 * around it, nullifying its effect.
29276 */
29277- loadsegment(ds, __USER_DS);
29278- loadsegment(es, __USER_DS);
29279+ loadsegment(ds, __KERNEL_DS);
29280+ loadsegment(es, __KERNEL_DS);
29281+ loadsegment(ss, __KERNEL_DS);
29282+
29283+#ifdef CONFIG_PAX_KERNEXEC
29284+ loadsegment(fs, __KERNEL_PERCPU);
29285+#endif
29286+
29287+#ifdef CONFIG_PAX_MEMORY_UDEREF
29288+ __set_fs(current_thread_info()->addr_limit);
29289+#endif
29290+
29291 #endif
29292
29293 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29294diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29295index ea306ad..669f42d 100644
29296--- a/arch/x86/kvm/x86.c
29297+++ b/arch/x86/kvm/x86.c
29298@@ -1929,8 +1929,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29299 {
29300 struct kvm *kvm = vcpu->kvm;
29301 int lm = is_long_mode(vcpu);
29302- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29303- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29304+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29305+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29306 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29307 : kvm->arch.xen_hvm_config.blob_size_32;
29308 u32 page_num = data & ~PAGE_MASK;
29309@@ -2867,6 +2867,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29310 if (n < msr_list.nmsrs)
29311 goto out;
29312 r = -EFAULT;
29313+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29314+ goto out;
29315 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29316 num_msrs_to_save * sizeof(u32)))
29317 goto out;
29318@@ -5784,7 +5786,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29319 };
29320 #endif
29321
29322-int kvm_arch_init(void *opaque)
29323+int kvm_arch_init(const void *opaque)
29324 {
29325 int r;
29326 struct kvm_x86_ops *ops = opaque;
29327diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29328index 8f9a133..3c7694b 100644
29329--- a/arch/x86/lguest/boot.c
29330+++ b/arch/x86/lguest/boot.c
29331@@ -1341,9 +1341,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29332 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29333 * Launcher to reboot us.
29334 */
29335-static void lguest_restart(char *reason)
29336+static __noreturn void lguest_restart(char *reason)
29337 {
29338 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29339+ BUG();
29340 }
29341
29342 /*G:050
29343diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29344index 00933d5..3a64af9 100644
29345--- a/arch/x86/lib/atomic64_386_32.S
29346+++ b/arch/x86/lib/atomic64_386_32.S
29347@@ -48,6 +48,10 @@ BEGIN(read)
29348 movl (v), %eax
29349 movl 4(v), %edx
29350 RET_ENDP
29351+BEGIN(read_unchecked)
29352+ movl (v), %eax
29353+ movl 4(v), %edx
29354+RET_ENDP
29355 #undef v
29356
29357 #define v %esi
29358@@ -55,6 +59,10 @@ BEGIN(set)
29359 movl %ebx, (v)
29360 movl %ecx, 4(v)
29361 RET_ENDP
29362+BEGIN(set_unchecked)
29363+ movl %ebx, (v)
29364+ movl %ecx, 4(v)
29365+RET_ENDP
29366 #undef v
29367
29368 #define v %esi
29369@@ -70,6 +78,20 @@ RET_ENDP
29370 BEGIN(add)
29371 addl %eax, (v)
29372 adcl %edx, 4(v)
29373+
29374+#ifdef CONFIG_PAX_REFCOUNT
29375+ jno 0f
29376+ subl %eax, (v)
29377+ sbbl %edx, 4(v)
29378+ int $4
29379+0:
29380+ _ASM_EXTABLE(0b, 0b)
29381+#endif
29382+
29383+RET_ENDP
29384+BEGIN(add_unchecked)
29385+ addl %eax, (v)
29386+ adcl %edx, 4(v)
29387 RET_ENDP
29388 #undef v
29389
29390@@ -77,6 +99,24 @@ RET_ENDP
29391 BEGIN(add_return)
29392 addl (v), %eax
29393 adcl 4(v), %edx
29394+
29395+#ifdef CONFIG_PAX_REFCOUNT
29396+ into
29397+1234:
29398+ _ASM_EXTABLE(1234b, 2f)
29399+#endif
29400+
29401+ movl %eax, (v)
29402+ movl %edx, 4(v)
29403+
29404+#ifdef CONFIG_PAX_REFCOUNT
29405+2:
29406+#endif
29407+
29408+RET_ENDP
29409+BEGIN(add_return_unchecked)
29410+ addl (v), %eax
29411+ adcl 4(v), %edx
29412 movl %eax, (v)
29413 movl %edx, 4(v)
29414 RET_ENDP
29415@@ -86,6 +126,20 @@ RET_ENDP
29416 BEGIN(sub)
29417 subl %eax, (v)
29418 sbbl %edx, 4(v)
29419+
29420+#ifdef CONFIG_PAX_REFCOUNT
29421+ jno 0f
29422+ addl %eax, (v)
29423+ adcl %edx, 4(v)
29424+ int $4
29425+0:
29426+ _ASM_EXTABLE(0b, 0b)
29427+#endif
29428+
29429+RET_ENDP
29430+BEGIN(sub_unchecked)
29431+ subl %eax, (v)
29432+ sbbl %edx, 4(v)
29433 RET_ENDP
29434 #undef v
29435
29436@@ -96,6 +150,27 @@ BEGIN(sub_return)
29437 sbbl $0, %edx
29438 addl (v), %eax
29439 adcl 4(v), %edx
29440+
29441+#ifdef CONFIG_PAX_REFCOUNT
29442+ into
29443+1234:
29444+ _ASM_EXTABLE(1234b, 2f)
29445+#endif
29446+
29447+ movl %eax, (v)
29448+ movl %edx, 4(v)
29449+
29450+#ifdef CONFIG_PAX_REFCOUNT
29451+2:
29452+#endif
29453+
29454+RET_ENDP
29455+BEGIN(sub_return_unchecked)
29456+ negl %edx
29457+ negl %eax
29458+ sbbl $0, %edx
29459+ addl (v), %eax
29460+ adcl 4(v), %edx
29461 movl %eax, (v)
29462 movl %edx, 4(v)
29463 RET_ENDP
29464@@ -105,6 +180,20 @@ RET_ENDP
29465 BEGIN(inc)
29466 addl $1, (v)
29467 adcl $0, 4(v)
29468+
29469+#ifdef CONFIG_PAX_REFCOUNT
29470+ jno 0f
29471+ subl $1, (v)
29472+ sbbl $0, 4(v)
29473+ int $4
29474+0:
29475+ _ASM_EXTABLE(0b, 0b)
29476+#endif
29477+
29478+RET_ENDP
29479+BEGIN(inc_unchecked)
29480+ addl $1, (v)
29481+ adcl $0, 4(v)
29482 RET_ENDP
29483 #undef v
29484
29485@@ -114,6 +203,26 @@ BEGIN(inc_return)
29486 movl 4(v), %edx
29487 addl $1, %eax
29488 adcl $0, %edx
29489+
29490+#ifdef CONFIG_PAX_REFCOUNT
29491+ into
29492+1234:
29493+ _ASM_EXTABLE(1234b, 2f)
29494+#endif
29495+
29496+ movl %eax, (v)
29497+ movl %edx, 4(v)
29498+
29499+#ifdef CONFIG_PAX_REFCOUNT
29500+2:
29501+#endif
29502+
29503+RET_ENDP
29504+BEGIN(inc_return_unchecked)
29505+ movl (v), %eax
29506+ movl 4(v), %edx
29507+ addl $1, %eax
29508+ adcl $0, %edx
29509 movl %eax, (v)
29510 movl %edx, 4(v)
29511 RET_ENDP
29512@@ -123,6 +232,20 @@ RET_ENDP
29513 BEGIN(dec)
29514 subl $1, (v)
29515 sbbl $0, 4(v)
29516+
29517+#ifdef CONFIG_PAX_REFCOUNT
29518+ jno 0f
29519+ addl $1, (v)
29520+ adcl $0, 4(v)
29521+ int $4
29522+0:
29523+ _ASM_EXTABLE(0b, 0b)
29524+#endif
29525+
29526+RET_ENDP
29527+BEGIN(dec_unchecked)
29528+ subl $1, (v)
29529+ sbbl $0, 4(v)
29530 RET_ENDP
29531 #undef v
29532
29533@@ -132,6 +255,26 @@ BEGIN(dec_return)
29534 movl 4(v), %edx
29535 subl $1, %eax
29536 sbbl $0, %edx
29537+
29538+#ifdef CONFIG_PAX_REFCOUNT
29539+ into
29540+1234:
29541+ _ASM_EXTABLE(1234b, 2f)
29542+#endif
29543+
29544+ movl %eax, (v)
29545+ movl %edx, 4(v)
29546+
29547+#ifdef CONFIG_PAX_REFCOUNT
29548+2:
29549+#endif
29550+
29551+RET_ENDP
29552+BEGIN(dec_return_unchecked)
29553+ movl (v), %eax
29554+ movl 4(v), %edx
29555+ subl $1, %eax
29556+ sbbl $0, %edx
29557 movl %eax, (v)
29558 movl %edx, 4(v)
29559 RET_ENDP
29560@@ -143,6 +286,13 @@ BEGIN(add_unless)
29561 adcl %edx, %edi
29562 addl (v), %eax
29563 adcl 4(v), %edx
29564+
29565+#ifdef CONFIG_PAX_REFCOUNT
29566+ into
29567+1234:
29568+ _ASM_EXTABLE(1234b, 2f)
29569+#endif
29570+
29571 cmpl %eax, %ecx
29572 je 3f
29573 1:
29574@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29575 1:
29576 addl $1, %eax
29577 adcl $0, %edx
29578+
29579+#ifdef CONFIG_PAX_REFCOUNT
29580+ into
29581+1234:
29582+ _ASM_EXTABLE(1234b, 2f)
29583+#endif
29584+
29585 movl %eax, (v)
29586 movl %edx, 4(v)
29587 movl $1, %eax
29588@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29589 movl 4(v), %edx
29590 subl $1, %eax
29591 sbbl $0, %edx
29592+
29593+#ifdef CONFIG_PAX_REFCOUNT
29594+ into
29595+1234:
29596+ _ASM_EXTABLE(1234b, 1f)
29597+#endif
29598+
29599 js 1f
29600 movl %eax, (v)
29601 movl %edx, 4(v)
29602diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29603index 082a851..6a963bc 100644
29604--- a/arch/x86/lib/atomic64_cx8_32.S
29605+++ b/arch/x86/lib/atomic64_cx8_32.S
29606@@ -25,10 +25,20 @@ ENTRY(atomic64_read_cx8)
29607 CFI_STARTPROC
29608
29609 read64 %ecx
29610+ pax_force_retaddr
29611 ret
29612 CFI_ENDPROC
29613 ENDPROC(atomic64_read_cx8)
29614
29615+ENTRY(atomic64_read_unchecked_cx8)
29616+ CFI_STARTPROC
29617+
29618+ read64 %ecx
29619+ pax_force_retaddr
29620+ ret
29621+ CFI_ENDPROC
29622+ENDPROC(atomic64_read_unchecked_cx8)
29623+
29624 ENTRY(atomic64_set_cx8)
29625 CFI_STARTPROC
29626
29627@@ -38,10 +48,25 @@ ENTRY(atomic64_set_cx8)
29628 cmpxchg8b (%esi)
29629 jne 1b
29630
29631+ pax_force_retaddr
29632 ret
29633 CFI_ENDPROC
29634 ENDPROC(atomic64_set_cx8)
29635
29636+ENTRY(atomic64_set_unchecked_cx8)
29637+ CFI_STARTPROC
29638+
29639+1:
29640+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29641+ * are atomic on 586 and newer */
29642+ cmpxchg8b (%esi)
29643+ jne 1b
29644+
29645+ pax_force_retaddr
29646+ ret
29647+ CFI_ENDPROC
29648+ENDPROC(atomic64_set_unchecked_cx8)
29649+
29650 ENTRY(atomic64_xchg_cx8)
29651 CFI_STARTPROC
29652
29653@@ -50,12 +75,13 @@ ENTRY(atomic64_xchg_cx8)
29654 cmpxchg8b (%esi)
29655 jne 1b
29656
29657+ pax_force_retaddr
29658 ret
29659 CFI_ENDPROC
29660 ENDPROC(atomic64_xchg_cx8)
29661
29662-.macro addsub_return func ins insc
29663-ENTRY(atomic64_\func\()_return_cx8)
29664+.macro addsub_return func ins insc unchecked=""
29665+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29666 CFI_STARTPROC
29667 pushl_cfi_reg ebp
29668 pushl_cfi_reg ebx
29669@@ -72,27 +98,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29670 movl %edx, %ecx
29671 \ins\()l %esi, %ebx
29672 \insc\()l %edi, %ecx
29673+
29674+.ifb \unchecked
29675+#ifdef CONFIG_PAX_REFCOUNT
29676+ into
29677+2:
29678+ _ASM_EXTABLE(2b, 3f)
29679+#endif
29680+.endif
29681+
29682 LOCK_PREFIX
29683 cmpxchg8b (%ebp)
29684 jne 1b
29685-
29686-10:
29687 movl %ebx, %eax
29688 movl %ecx, %edx
29689+
29690+.ifb \unchecked
29691+#ifdef CONFIG_PAX_REFCOUNT
29692+3:
29693+#endif
29694+.endif
29695+
29696 popl_cfi_reg edi
29697 popl_cfi_reg esi
29698 popl_cfi_reg ebx
29699 popl_cfi_reg ebp
29700+ pax_force_retaddr
29701 ret
29702 CFI_ENDPROC
29703-ENDPROC(atomic64_\func\()_return_cx8)
29704+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29705 .endm
29706
29707 addsub_return add add adc
29708 addsub_return sub sub sbb
29709+addsub_return add add adc _unchecked
29710+addsub_return sub sub sbb _unchecked
29711
29712-.macro incdec_return func ins insc
29713-ENTRY(atomic64_\func\()_return_cx8)
29714+.macro incdec_return func ins insc unchecked=""
29715+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29716 CFI_STARTPROC
29717 pushl_cfi_reg ebx
29718
29719@@ -102,21 +145,38 @@ ENTRY(atomic64_\func\()_return_cx8)
29720 movl %edx, %ecx
29721 \ins\()l $1, %ebx
29722 \insc\()l $0, %ecx
29723+
29724+.ifb \unchecked
29725+#ifdef CONFIG_PAX_REFCOUNT
29726+ into
29727+2:
29728+ _ASM_EXTABLE(2b, 3f)
29729+#endif
29730+.endif
29731+
29732 LOCK_PREFIX
29733 cmpxchg8b (%esi)
29734 jne 1b
29735-
29736-10:
29737 movl %ebx, %eax
29738 movl %ecx, %edx
29739+
29740+.ifb \unchecked
29741+#ifdef CONFIG_PAX_REFCOUNT
29742+3:
29743+#endif
29744+.endif
29745+
29746 popl_cfi_reg ebx
29747+ pax_force_retaddr
29748 ret
29749 CFI_ENDPROC
29750-ENDPROC(atomic64_\func\()_return_cx8)
29751+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29752 .endm
29753
29754 incdec_return inc add adc
29755 incdec_return dec sub sbb
29756+incdec_return inc add adc _unchecked
29757+incdec_return dec sub sbb _unchecked
29758
29759 ENTRY(atomic64_dec_if_positive_cx8)
29760 CFI_STARTPROC
29761@@ -128,6 +188,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29762 movl %edx, %ecx
29763 subl $1, %ebx
29764 sbb $0, %ecx
29765+
29766+#ifdef CONFIG_PAX_REFCOUNT
29767+ into
29768+1234:
29769+ _ASM_EXTABLE(1234b, 2f)
29770+#endif
29771+
29772 js 2f
29773 LOCK_PREFIX
29774 cmpxchg8b (%esi)
29775@@ -137,6 +204,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29776 movl %ebx, %eax
29777 movl %ecx, %edx
29778 popl_cfi_reg ebx
29779+ pax_force_retaddr
29780 ret
29781 CFI_ENDPROC
29782 ENDPROC(atomic64_dec_if_positive_cx8)
29783@@ -161,6 +229,13 @@ ENTRY(atomic64_add_unless_cx8)
29784 movl %edx, %ecx
29785 addl %ebp, %ebx
29786 adcl %edi, %ecx
29787+
29788+#ifdef CONFIG_PAX_REFCOUNT
29789+ into
29790+1234:
29791+ _ASM_EXTABLE(1234b, 3f)
29792+#endif
29793+
29794 LOCK_PREFIX
29795 cmpxchg8b (%esi)
29796 jne 1b
29797@@ -171,6 +246,7 @@ ENTRY(atomic64_add_unless_cx8)
29798 CFI_ADJUST_CFA_OFFSET -8
29799 popl_cfi_reg ebx
29800 popl_cfi_reg ebp
29801+ pax_force_retaddr
29802 ret
29803 4:
29804 cmpl %edx, 4(%esp)
29805@@ -193,6 +269,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29806 xorl %ecx, %ecx
29807 addl $1, %ebx
29808 adcl %edx, %ecx
29809+
29810+#ifdef CONFIG_PAX_REFCOUNT
29811+ into
29812+1234:
29813+ _ASM_EXTABLE(1234b, 3f)
29814+#endif
29815+
29816 LOCK_PREFIX
29817 cmpxchg8b (%esi)
29818 jne 1b
29819@@ -200,6 +283,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29820 movl $1, %eax
29821 3:
29822 popl_cfi_reg ebx
29823+ pax_force_retaddr
29824 ret
29825 CFI_ENDPROC
29826 ENDPROC(atomic64_inc_not_zero_cx8)
29827diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29828index 9bc944a..e52be6c 100644
29829--- a/arch/x86/lib/checksum_32.S
29830+++ b/arch/x86/lib/checksum_32.S
29831@@ -29,7 +29,8 @@
29832 #include <asm/dwarf2.h>
29833 #include <asm/errno.h>
29834 #include <asm/asm.h>
29835-
29836+#include <asm/segment.h>
29837+
29838 /*
29839 * computes a partial checksum, e.g. for TCP/UDP fragments
29840 */
29841@@ -285,9 +286,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29842
29843 #define ARGBASE 16
29844 #define FP 12
29845-
29846-ENTRY(csum_partial_copy_generic)
29847+
29848+ENTRY(csum_partial_copy_generic_to_user)
29849 CFI_STARTPROC
29850+
29851+#ifdef CONFIG_PAX_MEMORY_UDEREF
29852+ pushl_cfi %gs
29853+ popl_cfi %es
29854+ jmp csum_partial_copy_generic
29855+#endif
29856+
29857+ENTRY(csum_partial_copy_generic_from_user)
29858+
29859+#ifdef CONFIG_PAX_MEMORY_UDEREF
29860+ pushl_cfi %gs
29861+ popl_cfi %ds
29862+#endif
29863+
29864+ENTRY(csum_partial_copy_generic)
29865 subl $4,%esp
29866 CFI_ADJUST_CFA_OFFSET 4
29867 pushl_cfi_reg edi
29868@@ -306,7 +322,7 @@ ENTRY(csum_partial_copy_generic)
29869 jmp 4f
29870 SRC(1: movw (%esi), %bx )
29871 addl $2, %esi
29872-DST( movw %bx, (%edi) )
29873+DST( movw %bx, %es:(%edi) )
29874 addl $2, %edi
29875 addw %bx, %ax
29876 adcl $0, %eax
29877@@ -318,30 +334,30 @@ DST( movw %bx, (%edi) )
29878 SRC(1: movl (%esi), %ebx )
29879 SRC( movl 4(%esi), %edx )
29880 adcl %ebx, %eax
29881-DST( movl %ebx, (%edi) )
29882+DST( movl %ebx, %es:(%edi) )
29883 adcl %edx, %eax
29884-DST( movl %edx, 4(%edi) )
29885+DST( movl %edx, %es:4(%edi) )
29886
29887 SRC( movl 8(%esi), %ebx )
29888 SRC( movl 12(%esi), %edx )
29889 adcl %ebx, %eax
29890-DST( movl %ebx, 8(%edi) )
29891+DST( movl %ebx, %es:8(%edi) )
29892 adcl %edx, %eax
29893-DST( movl %edx, 12(%edi) )
29894+DST( movl %edx, %es:12(%edi) )
29895
29896 SRC( movl 16(%esi), %ebx )
29897 SRC( movl 20(%esi), %edx )
29898 adcl %ebx, %eax
29899-DST( movl %ebx, 16(%edi) )
29900+DST( movl %ebx, %es:16(%edi) )
29901 adcl %edx, %eax
29902-DST( movl %edx, 20(%edi) )
29903+DST( movl %edx, %es:20(%edi) )
29904
29905 SRC( movl 24(%esi), %ebx )
29906 SRC( movl 28(%esi), %edx )
29907 adcl %ebx, %eax
29908-DST( movl %ebx, 24(%edi) )
29909+DST( movl %ebx, %es:24(%edi) )
29910 adcl %edx, %eax
29911-DST( movl %edx, 28(%edi) )
29912+DST( movl %edx, %es:28(%edi) )
29913
29914 lea 32(%esi), %esi
29915 lea 32(%edi), %edi
29916@@ -355,7 +371,7 @@ DST( movl %edx, 28(%edi) )
29917 shrl $2, %edx # This clears CF
29918 SRC(3: movl (%esi), %ebx )
29919 adcl %ebx, %eax
29920-DST( movl %ebx, (%edi) )
29921+DST( movl %ebx, %es:(%edi) )
29922 lea 4(%esi), %esi
29923 lea 4(%edi), %edi
29924 dec %edx
29925@@ -367,12 +383,12 @@ DST( movl %ebx, (%edi) )
29926 jb 5f
29927 SRC( movw (%esi), %cx )
29928 leal 2(%esi), %esi
29929-DST( movw %cx, (%edi) )
29930+DST( movw %cx, %es:(%edi) )
29931 leal 2(%edi), %edi
29932 je 6f
29933 shll $16,%ecx
29934 SRC(5: movb (%esi), %cl )
29935-DST( movb %cl, (%edi) )
29936+DST( movb %cl, %es:(%edi) )
29937 6: addl %ecx, %eax
29938 adcl $0, %eax
29939 7:
29940@@ -383,7 +399,7 @@ DST( movb %cl, (%edi) )
29941
29942 6001:
29943 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29944- movl $-EFAULT, (%ebx)
29945+ movl $-EFAULT, %ss:(%ebx)
29946
29947 # zero the complete destination - computing the rest
29948 # is too much work
29949@@ -396,37 +412,58 @@ DST( movb %cl, (%edi) )
29950
29951 6002:
29952 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29953- movl $-EFAULT,(%ebx)
29954+ movl $-EFAULT,%ss:(%ebx)
29955 jmp 5000b
29956
29957 .previous
29958
29959+ pushl_cfi %ss
29960+ popl_cfi %ds
29961+ pushl_cfi %ss
29962+ popl_cfi %es
29963 popl_cfi_reg ebx
29964 popl_cfi_reg esi
29965 popl_cfi_reg edi
29966 popl_cfi %ecx # equivalent to addl $4,%esp
29967 ret
29968 CFI_ENDPROC
29969-ENDPROC(csum_partial_copy_generic)
29970+ENDPROC(csum_partial_copy_generic_to_user)
29971
29972 #else
29973
29974 /* Version for PentiumII/PPro */
29975
29976 #define ROUND1(x) \
29977+ nop; nop; nop; \
29978 SRC(movl x(%esi), %ebx ) ; \
29979 addl %ebx, %eax ; \
29980- DST(movl %ebx, x(%edi) ) ;
29981+ DST(movl %ebx, %es:x(%edi)) ;
29982
29983 #define ROUND(x) \
29984+ nop; nop; nop; \
29985 SRC(movl x(%esi), %ebx ) ; \
29986 adcl %ebx, %eax ; \
29987- DST(movl %ebx, x(%edi) ) ;
29988+ DST(movl %ebx, %es:x(%edi)) ;
29989
29990 #define ARGBASE 12
29991-
29992-ENTRY(csum_partial_copy_generic)
29993+
29994+ENTRY(csum_partial_copy_generic_to_user)
29995 CFI_STARTPROC
29996+
29997+#ifdef CONFIG_PAX_MEMORY_UDEREF
29998+ pushl_cfi %gs
29999+ popl_cfi %es
30000+ jmp csum_partial_copy_generic
30001+#endif
30002+
30003+ENTRY(csum_partial_copy_generic_from_user)
30004+
30005+#ifdef CONFIG_PAX_MEMORY_UDEREF
30006+ pushl_cfi %gs
30007+ popl_cfi %ds
30008+#endif
30009+
30010+ENTRY(csum_partial_copy_generic)
30011 pushl_cfi_reg ebx
30012 pushl_cfi_reg edi
30013 pushl_cfi_reg esi
30014@@ -444,7 +481,7 @@ ENTRY(csum_partial_copy_generic)
30015 subl %ebx, %edi
30016 lea -1(%esi),%edx
30017 andl $-32,%edx
30018- lea 3f(%ebx,%ebx), %ebx
30019+ lea 3f(%ebx,%ebx,2), %ebx
30020 testl %esi, %esi
30021 jmp *%ebx
30022 1: addl $64,%esi
30023@@ -465,19 +502,19 @@ ENTRY(csum_partial_copy_generic)
30024 jb 5f
30025 SRC( movw (%esi), %dx )
30026 leal 2(%esi), %esi
30027-DST( movw %dx, (%edi) )
30028+DST( movw %dx, %es:(%edi) )
30029 leal 2(%edi), %edi
30030 je 6f
30031 shll $16,%edx
30032 5:
30033 SRC( movb (%esi), %dl )
30034-DST( movb %dl, (%edi) )
30035+DST( movb %dl, %es:(%edi) )
30036 6: addl %edx, %eax
30037 adcl $0, %eax
30038 7:
30039 .section .fixup, "ax"
30040 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
30041- movl $-EFAULT, (%ebx)
30042+ movl $-EFAULT, %ss:(%ebx)
30043 # zero the complete destination (computing the rest is too much work)
30044 movl ARGBASE+8(%esp),%edi # dst
30045 movl ARGBASE+12(%esp),%ecx # len
30046@@ -485,16 +522,23 @@ DST( movb %dl, (%edi) )
30047 rep; stosb
30048 jmp 7b
30049 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
30050- movl $-EFAULT, (%ebx)
30051+ movl $-EFAULT, %ss:(%ebx)
30052 jmp 7b
30053 .previous
30054
30055+#ifdef CONFIG_PAX_MEMORY_UDEREF
30056+ pushl_cfi %ss
30057+ popl_cfi %ds
30058+ pushl_cfi %ss
30059+ popl_cfi %es
30060+#endif
30061+
30062 popl_cfi_reg esi
30063 popl_cfi_reg edi
30064 popl_cfi_reg ebx
30065 ret
30066 CFI_ENDPROC
30067-ENDPROC(csum_partial_copy_generic)
30068+ENDPROC(csum_partial_copy_generic_to_user)
30069
30070 #undef ROUND
30071 #undef ROUND1
30072diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
30073index e67e579..4782449 100644
30074--- a/arch/x86/lib/clear_page_64.S
30075+++ b/arch/x86/lib/clear_page_64.S
30076@@ -23,6 +23,7 @@ ENTRY(clear_page)
30077 movl $4096/8,%ecx
30078 xorl %eax,%eax
30079 rep stosq
30080+ pax_force_retaddr
30081 ret
30082 CFI_ENDPROC
30083 ENDPROC(clear_page)
30084@@ -47,6 +48,7 @@ ENTRY(clear_page_orig)
30085 leaq 64(%rdi),%rdi
30086 jnz .Lloop
30087 nop
30088+ pax_force_retaddr
30089 ret
30090 CFI_ENDPROC
30091 ENDPROC(clear_page_orig)
30092@@ -56,6 +58,7 @@ ENTRY(clear_page_c_e)
30093 movl $4096,%ecx
30094 xorl %eax,%eax
30095 rep stosb
30096+ pax_force_retaddr
30097 ret
30098 CFI_ENDPROC
30099 ENDPROC(clear_page_c_e)
30100diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
30101index 40a1725..5d12ac4 100644
30102--- a/arch/x86/lib/cmpxchg16b_emu.S
30103+++ b/arch/x86/lib/cmpxchg16b_emu.S
30104@@ -8,6 +8,7 @@
30105 #include <linux/linkage.h>
30106 #include <asm/dwarf2.h>
30107 #include <asm/percpu.h>
30108+#include <asm/alternative-asm.h>
30109
30110 .text
30111
30112@@ -46,12 +47,14 @@ CFI_STARTPROC
30113 CFI_REMEMBER_STATE
30114 popfq_cfi
30115 mov $1, %al
30116+ pax_force_retaddr
30117 ret
30118
30119 CFI_RESTORE_STATE
30120 .Lnot_same:
30121 popfq_cfi
30122 xor %al,%al
30123+ pax_force_retaddr
30124 ret
30125
30126 CFI_ENDPROC
30127diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
30128index 8239dbc..e714d2a 100644
30129--- a/arch/x86/lib/copy_page_64.S
30130+++ b/arch/x86/lib/copy_page_64.S
30131@@ -17,6 +17,7 @@ ENTRY(copy_page)
30132 ALTERNATIVE "jmp copy_page_regs", "", X86_FEATURE_REP_GOOD
30133 movl $4096/8, %ecx
30134 rep movsq
30135+ pax_force_retaddr
30136 ret
30137 CFI_ENDPROC
30138 ENDPROC(copy_page)
30139@@ -27,8 +28,8 @@ ENTRY(copy_page_regs)
30140 CFI_ADJUST_CFA_OFFSET 2*8
30141 movq %rbx, (%rsp)
30142 CFI_REL_OFFSET rbx, 0
30143- movq %r12, 1*8(%rsp)
30144- CFI_REL_OFFSET r12, 1*8
30145+ movq %r13, 1*8(%rsp)
30146+ CFI_REL_OFFSET r13, 1*8
30147
30148 movl $(4096/64)-5, %ecx
30149 .p2align 4
30150@@ -41,7 +42,7 @@ ENTRY(copy_page_regs)
30151 movq 0x8*4(%rsi), %r9
30152 movq 0x8*5(%rsi), %r10
30153 movq 0x8*6(%rsi), %r11
30154- movq 0x8*7(%rsi), %r12
30155+ movq 0x8*7(%rsi), %r13
30156
30157 prefetcht0 5*64(%rsi)
30158
30159@@ -52,7 +53,7 @@ ENTRY(copy_page_regs)
30160 movq %r9, 0x8*4(%rdi)
30161 movq %r10, 0x8*5(%rdi)
30162 movq %r11, 0x8*6(%rdi)
30163- movq %r12, 0x8*7(%rdi)
30164+ movq %r13, 0x8*7(%rdi)
30165
30166 leaq 64 (%rsi), %rsi
30167 leaq 64 (%rdi), %rdi
30168@@ -71,7 +72,7 @@ ENTRY(copy_page_regs)
30169 movq 0x8*4(%rsi), %r9
30170 movq 0x8*5(%rsi), %r10
30171 movq 0x8*6(%rsi), %r11
30172- movq 0x8*7(%rsi), %r12
30173+ movq 0x8*7(%rsi), %r13
30174
30175 movq %rax, 0x8*0(%rdi)
30176 movq %rbx, 0x8*1(%rdi)
30177@@ -80,7 +81,7 @@ ENTRY(copy_page_regs)
30178 movq %r9, 0x8*4(%rdi)
30179 movq %r10, 0x8*5(%rdi)
30180 movq %r11, 0x8*6(%rdi)
30181- movq %r12, 0x8*7(%rdi)
30182+ movq %r13, 0x8*7(%rdi)
30183
30184 leaq 64(%rdi), %rdi
30185 leaq 64(%rsi), %rsi
30186@@ -88,10 +89,11 @@ ENTRY(copy_page_regs)
30187
30188 movq (%rsp), %rbx
30189 CFI_RESTORE rbx
30190- movq 1*8(%rsp), %r12
30191- CFI_RESTORE r12
30192+ movq 1*8(%rsp), %r13
30193+ CFI_RESTORE r13
30194 addq $2*8, %rsp
30195 CFI_ADJUST_CFA_OFFSET -2*8
30196+ pax_force_retaddr
30197 ret
30198 CFI_ENDPROC
30199 ENDPROC(copy_page_regs)
30200diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
30201index fa997df..060ab18 100644
30202--- a/arch/x86/lib/copy_user_64.S
30203+++ b/arch/x86/lib/copy_user_64.S
30204@@ -15,6 +15,7 @@
30205 #include <asm/alternative-asm.h>
30206 #include <asm/asm.h>
30207 #include <asm/smap.h>
30208+#include <asm/pgtable.h>
30209
30210 .macro ALIGN_DESTINATION
30211 /* check for bad alignment of destination */
30212@@ -40,56 +41,6 @@
30213 _ASM_EXTABLE(101b,103b)
30214 .endm
30215
30216-/* Standard copy_to_user with segment limit checking */
30217-ENTRY(_copy_to_user)
30218- CFI_STARTPROC
30219- GET_THREAD_INFO(%rax)
30220- movq %rdi,%rcx
30221- addq %rdx,%rcx
30222- jc bad_to_user
30223- cmpq TI_addr_limit(%rax),%rcx
30224- ja bad_to_user
30225- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
30226- "jmp copy_user_generic_string", \
30227- X86_FEATURE_REP_GOOD, \
30228- "jmp copy_user_enhanced_fast_string", \
30229- X86_FEATURE_ERMS
30230- CFI_ENDPROC
30231-ENDPROC(_copy_to_user)
30232-
30233-/* Standard copy_from_user with segment limit checking */
30234-ENTRY(_copy_from_user)
30235- CFI_STARTPROC
30236- GET_THREAD_INFO(%rax)
30237- movq %rsi,%rcx
30238- addq %rdx,%rcx
30239- jc bad_from_user
30240- cmpq TI_addr_limit(%rax),%rcx
30241- ja bad_from_user
30242- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
30243- "jmp copy_user_generic_string", \
30244- X86_FEATURE_REP_GOOD, \
30245- "jmp copy_user_enhanced_fast_string", \
30246- X86_FEATURE_ERMS
30247- CFI_ENDPROC
30248-ENDPROC(_copy_from_user)
30249-
30250- .section .fixup,"ax"
30251- /* must zero dest */
30252-ENTRY(bad_from_user)
30253-bad_from_user:
30254- CFI_STARTPROC
30255- movl %edx,%ecx
30256- xorl %eax,%eax
30257- rep
30258- stosb
30259-bad_to_user:
30260- movl %edx,%eax
30261- ret
30262- CFI_ENDPROC
30263-ENDPROC(bad_from_user)
30264- .previous
30265-
30266 /*
30267 * copy_user_generic_unrolled - memory copy with exception handling.
30268 * This version is for CPUs like P4 that don't have efficient micro
30269@@ -105,6 +56,7 @@ ENDPROC(bad_from_user)
30270 */
30271 ENTRY(copy_user_generic_unrolled)
30272 CFI_STARTPROC
30273+ ASM_PAX_OPEN_USERLAND
30274 ASM_STAC
30275 cmpl $8,%edx
30276 jb 20f /* less then 8 bytes, go to byte copy loop */
30277@@ -154,6 +106,8 @@ ENTRY(copy_user_generic_unrolled)
30278 jnz 21b
30279 23: xor %eax,%eax
30280 ASM_CLAC
30281+ ASM_PAX_CLOSE_USERLAND
30282+ pax_force_retaddr
30283 ret
30284
30285 .section .fixup,"ax"
30286@@ -209,6 +163,7 @@ ENDPROC(copy_user_generic_unrolled)
30287 */
30288 ENTRY(copy_user_generic_string)
30289 CFI_STARTPROC
30290+ ASM_PAX_OPEN_USERLAND
30291 ASM_STAC
30292 cmpl $8,%edx
30293 jb 2f /* less than 8 bytes, go to byte copy loop */
30294@@ -223,6 +178,8 @@ ENTRY(copy_user_generic_string)
30295 movsb
30296 xorl %eax,%eax
30297 ASM_CLAC
30298+ ASM_PAX_CLOSE_USERLAND
30299+ pax_force_retaddr
30300 ret
30301
30302 .section .fixup,"ax"
30303@@ -250,12 +207,15 @@ ENDPROC(copy_user_generic_string)
30304 */
30305 ENTRY(copy_user_enhanced_fast_string)
30306 CFI_STARTPROC
30307+ ASM_PAX_OPEN_USERLAND
30308 ASM_STAC
30309 movl %edx,%ecx
30310 1: rep
30311 movsb
30312 xorl %eax,%eax
30313 ASM_CLAC
30314+ ASM_PAX_CLOSE_USERLAND
30315+ pax_force_retaddr
30316 ret
30317
30318 .section .fixup,"ax"
30319diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30320index 6a4f43c..c70fb52 100644
30321--- a/arch/x86/lib/copy_user_nocache_64.S
30322+++ b/arch/x86/lib/copy_user_nocache_64.S
30323@@ -8,6 +8,7 @@
30324
30325 #include <linux/linkage.h>
30326 #include <asm/dwarf2.h>
30327+#include <asm/alternative-asm.h>
30328
30329 #define FIX_ALIGNMENT 1
30330
30331@@ -16,6 +17,7 @@
30332 #include <asm/thread_info.h>
30333 #include <asm/asm.h>
30334 #include <asm/smap.h>
30335+#include <asm/pgtable.h>
30336
30337 .macro ALIGN_DESTINATION
30338 #ifdef FIX_ALIGNMENT
30339@@ -49,6 +51,16 @@
30340 */
30341 ENTRY(__copy_user_nocache)
30342 CFI_STARTPROC
30343+
30344+#ifdef CONFIG_PAX_MEMORY_UDEREF
30345+ mov pax_user_shadow_base,%rcx
30346+ cmp %rcx,%rsi
30347+ jae 1f
30348+ add %rcx,%rsi
30349+1:
30350+#endif
30351+
30352+ ASM_PAX_OPEN_USERLAND
30353 ASM_STAC
30354 cmpl $8,%edx
30355 jb 20f /* less then 8 bytes, go to byte copy loop */
30356@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30357 jnz 21b
30358 23: xorl %eax,%eax
30359 ASM_CLAC
30360+ ASM_PAX_CLOSE_USERLAND
30361 sfence
30362+ pax_force_retaddr
30363 ret
30364
30365 .section .fixup,"ax"
30366diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30367index 9734182..dbee61c 100644
30368--- a/arch/x86/lib/csum-copy_64.S
30369+++ b/arch/x86/lib/csum-copy_64.S
30370@@ -9,6 +9,7 @@
30371 #include <asm/dwarf2.h>
30372 #include <asm/errno.h>
30373 #include <asm/asm.h>
30374+#include <asm/alternative-asm.h>
30375
30376 /*
30377 * Checksum copy with exception handling.
30378@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30379 CFI_ADJUST_CFA_OFFSET 7*8
30380 movq %rbx, 2*8(%rsp)
30381 CFI_REL_OFFSET rbx, 2*8
30382- movq %r12, 3*8(%rsp)
30383- CFI_REL_OFFSET r12, 3*8
30384+ movq %r15, 3*8(%rsp)
30385+ CFI_REL_OFFSET r15, 3*8
30386 movq %r14, 4*8(%rsp)
30387 CFI_REL_OFFSET r14, 4*8
30388 movq %r13, 5*8(%rsp)
30389@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30390 movl %edx, %ecx
30391
30392 xorl %r9d, %r9d
30393- movq %rcx, %r12
30394+ movq %rcx, %r15
30395
30396- shrq $6, %r12
30397+ shrq $6, %r15
30398 jz .Lhandle_tail /* < 64 */
30399
30400 clc
30401
30402 /* main loop. clear in 64 byte blocks */
30403 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30404- /* r11: temp3, rdx: temp4, r12 loopcnt */
30405+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30406 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30407 .p2align 4
30408 .Lloop:
30409@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30410 adcq %r14, %rax
30411 adcq %r13, %rax
30412
30413- decl %r12d
30414+ decl %r15d
30415
30416 dest
30417 movq %rbx, (%rsi)
30418@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30419 .Lende:
30420 movq 2*8(%rsp), %rbx
30421 CFI_RESTORE rbx
30422- movq 3*8(%rsp), %r12
30423- CFI_RESTORE r12
30424+ movq 3*8(%rsp), %r15
30425+ CFI_RESTORE r15
30426 movq 4*8(%rsp), %r14
30427 CFI_RESTORE r14
30428 movq 5*8(%rsp), %r13
30429@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30430 CFI_RESTORE rbp
30431 addq $7*8, %rsp
30432 CFI_ADJUST_CFA_OFFSET -7*8
30433+ pax_force_retaddr
30434 ret
30435 CFI_RESTORE_STATE
30436
30437diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30438index 1318f75..44c30fd 100644
30439--- a/arch/x86/lib/csum-wrappers_64.c
30440+++ b/arch/x86/lib/csum-wrappers_64.c
30441@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30442 len -= 2;
30443 }
30444 }
30445+ pax_open_userland();
30446 stac();
30447- isum = csum_partial_copy_generic((__force const void *)src,
30448+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30449 dst, len, isum, errp, NULL);
30450 clac();
30451+ pax_close_userland();
30452 if (unlikely(*errp))
30453 goto out_err;
30454
30455@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30456 }
30457
30458 *errp = 0;
30459+ pax_open_userland();
30460 stac();
30461- ret = csum_partial_copy_generic(src, (void __force *)dst,
30462+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30463 len, isum, NULL, errp);
30464 clac();
30465+ pax_close_userland();
30466 return ret;
30467 }
30468 EXPORT_SYMBOL(csum_partial_copy_to_user);
30469diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30470index a451235..a74bfa3 100644
30471--- a/arch/x86/lib/getuser.S
30472+++ b/arch/x86/lib/getuser.S
30473@@ -33,17 +33,40 @@
30474 #include <asm/thread_info.h>
30475 #include <asm/asm.h>
30476 #include <asm/smap.h>
30477+#include <asm/segment.h>
30478+#include <asm/pgtable.h>
30479+#include <asm/alternative-asm.h>
30480+
30481+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30482+#define __copyuser_seg gs;
30483+#else
30484+#define __copyuser_seg
30485+#endif
30486
30487 .text
30488 ENTRY(__get_user_1)
30489 CFI_STARTPROC
30490+
30491+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30492 GET_THREAD_INFO(%_ASM_DX)
30493 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30494 jae bad_get_user
30495+
30496+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30497+ mov pax_user_shadow_base,%_ASM_DX
30498+ cmp %_ASM_DX,%_ASM_AX
30499+ jae 1234f
30500+ add %_ASM_DX,%_ASM_AX
30501+1234:
30502+#endif
30503+
30504+#endif
30505+
30506 ASM_STAC
30507-1: movzbl (%_ASM_AX),%edx
30508+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30509 xor %eax,%eax
30510 ASM_CLAC
30511+ pax_force_retaddr
30512 ret
30513 CFI_ENDPROC
30514 ENDPROC(__get_user_1)
30515@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30516 ENTRY(__get_user_2)
30517 CFI_STARTPROC
30518 add $1,%_ASM_AX
30519+
30520+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30521 jc bad_get_user
30522 GET_THREAD_INFO(%_ASM_DX)
30523 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30524 jae bad_get_user
30525+
30526+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30527+ mov pax_user_shadow_base,%_ASM_DX
30528+ cmp %_ASM_DX,%_ASM_AX
30529+ jae 1234f
30530+ add %_ASM_DX,%_ASM_AX
30531+1234:
30532+#endif
30533+
30534+#endif
30535+
30536 ASM_STAC
30537-2: movzwl -1(%_ASM_AX),%edx
30538+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30539 xor %eax,%eax
30540 ASM_CLAC
30541+ pax_force_retaddr
30542 ret
30543 CFI_ENDPROC
30544 ENDPROC(__get_user_2)
30545@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30546 ENTRY(__get_user_4)
30547 CFI_STARTPROC
30548 add $3,%_ASM_AX
30549+
30550+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30551 jc bad_get_user
30552 GET_THREAD_INFO(%_ASM_DX)
30553 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30554 jae bad_get_user
30555+
30556+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30557+ mov pax_user_shadow_base,%_ASM_DX
30558+ cmp %_ASM_DX,%_ASM_AX
30559+ jae 1234f
30560+ add %_ASM_DX,%_ASM_AX
30561+1234:
30562+#endif
30563+
30564+#endif
30565+
30566 ASM_STAC
30567-3: movl -3(%_ASM_AX),%edx
30568+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30569 xor %eax,%eax
30570 ASM_CLAC
30571+ pax_force_retaddr
30572 ret
30573 CFI_ENDPROC
30574 ENDPROC(__get_user_4)
30575@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30576 GET_THREAD_INFO(%_ASM_DX)
30577 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30578 jae bad_get_user
30579+
30580+#ifdef CONFIG_PAX_MEMORY_UDEREF
30581+ mov pax_user_shadow_base,%_ASM_DX
30582+ cmp %_ASM_DX,%_ASM_AX
30583+ jae 1234f
30584+ add %_ASM_DX,%_ASM_AX
30585+1234:
30586+#endif
30587+
30588 ASM_STAC
30589 4: movq -7(%_ASM_AX),%rdx
30590 xor %eax,%eax
30591 ASM_CLAC
30592+ pax_force_retaddr
30593 ret
30594 #else
30595 add $7,%_ASM_AX
30596@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30597 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30598 jae bad_get_user_8
30599 ASM_STAC
30600-4: movl -7(%_ASM_AX),%edx
30601-5: movl -3(%_ASM_AX),%ecx
30602+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30603+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30604 xor %eax,%eax
30605 ASM_CLAC
30606+ pax_force_retaddr
30607 ret
30608 #endif
30609 CFI_ENDPROC
30610@@ -113,6 +175,7 @@ bad_get_user:
30611 xor %edx,%edx
30612 mov $(-EFAULT),%_ASM_AX
30613 ASM_CLAC
30614+ pax_force_retaddr
30615 ret
30616 CFI_ENDPROC
30617 END(bad_get_user)
30618@@ -124,6 +187,7 @@ bad_get_user_8:
30619 xor %ecx,%ecx
30620 mov $(-EFAULT),%_ASM_AX
30621 ASM_CLAC
30622+ pax_force_retaddr
30623 ret
30624 CFI_ENDPROC
30625 END(bad_get_user_8)
30626diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30627index 8f72b33..a43d9969 100644
30628--- a/arch/x86/lib/insn.c
30629+++ b/arch/x86/lib/insn.c
30630@@ -20,8 +20,10 @@
30631
30632 #ifdef __KERNEL__
30633 #include <linux/string.h>
30634+#include <asm/pgtable_types.h>
30635 #else
30636 #include <string.h>
30637+#define ktla_ktva(addr) addr
30638 #endif
30639 #include <asm/inat.h>
30640 #include <asm/insn.h>
30641@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30642 buf_len = MAX_INSN_SIZE;
30643
30644 memset(insn, 0, sizeof(*insn));
30645- insn->kaddr = kaddr;
30646- insn->end_kaddr = kaddr + buf_len;
30647- insn->next_byte = kaddr;
30648+ insn->kaddr = ktla_ktva(kaddr);
30649+ insn->end_kaddr = insn->kaddr + buf_len;
30650+ insn->next_byte = insn->kaddr;
30651 insn->x86_64 = x86_64 ? 1 : 0;
30652 insn->opnd_bytes = 4;
30653 if (x86_64)
30654diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30655index 05a95e7..326f2fa 100644
30656--- a/arch/x86/lib/iomap_copy_64.S
30657+++ b/arch/x86/lib/iomap_copy_64.S
30658@@ -17,6 +17,7 @@
30659
30660 #include <linux/linkage.h>
30661 #include <asm/dwarf2.h>
30662+#include <asm/alternative-asm.h>
30663
30664 /*
30665 * override generic version in lib/iomap_copy.c
30666@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30667 CFI_STARTPROC
30668 movl %edx,%ecx
30669 rep movsd
30670+ pax_force_retaddr
30671 ret
30672 CFI_ENDPROC
30673 ENDPROC(__iowrite32_copy)
30674diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30675index b046664..dec9465 100644
30676--- a/arch/x86/lib/memcpy_64.S
30677+++ b/arch/x86/lib/memcpy_64.S
30678@@ -37,6 +37,7 @@ ENTRY(memcpy)
30679 rep movsq
30680 movl %edx, %ecx
30681 rep movsb
30682+ pax_force_retaddr
30683 ret
30684 ENDPROC(memcpy)
30685 ENDPROC(__memcpy)
30686@@ -49,6 +50,7 @@ ENTRY(memcpy_erms)
30687 movq %rdi, %rax
30688 movq %rdx, %rcx
30689 rep movsb
30690+ pax_force_retaddr
30691 ret
30692 ENDPROC(memcpy_erms)
30693
30694@@ -134,6 +136,7 @@ ENTRY(memcpy_orig)
30695 movq %r9, 1*8(%rdi)
30696 movq %r10, -2*8(%rdi, %rdx)
30697 movq %r11, -1*8(%rdi, %rdx)
30698+ pax_force_retaddr
30699 retq
30700 .p2align 4
30701 .Lless_16bytes:
30702@@ -146,6 +149,7 @@ ENTRY(memcpy_orig)
30703 movq -1*8(%rsi, %rdx), %r9
30704 movq %r8, 0*8(%rdi)
30705 movq %r9, -1*8(%rdi, %rdx)
30706+ pax_force_retaddr
30707 retq
30708 .p2align 4
30709 .Lless_8bytes:
30710@@ -159,6 +163,7 @@ ENTRY(memcpy_orig)
30711 movl -4(%rsi, %rdx), %r8d
30712 movl %ecx, (%rdi)
30713 movl %r8d, -4(%rdi, %rdx)
30714+ pax_force_retaddr
30715 retq
30716 .p2align 4
30717 .Lless_3bytes:
30718@@ -177,6 +182,7 @@ ENTRY(memcpy_orig)
30719 movb %cl, (%rdi)
30720
30721 .Lend:
30722+ pax_force_retaddr
30723 retq
30724 CFI_ENDPROC
30725 ENDPROC(memcpy_orig)
30726diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30727index 0f8a0d0..f6e0ea4 100644
30728--- a/arch/x86/lib/memmove_64.S
30729+++ b/arch/x86/lib/memmove_64.S
30730@@ -43,7 +43,7 @@ ENTRY(__memmove)
30731 jg 2f
30732
30733 .Lmemmove_begin_forward:
30734- ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; retq", X86_FEATURE_ERMS
30735+ ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; pax_force_retaddr; retq", X86_FEATURE_ERMS
30736
30737 /*
30738 * movsq instruction have many startup latency
30739@@ -206,6 +206,7 @@ ENTRY(__memmove)
30740 movb (%rsi), %r11b
30741 movb %r11b, (%rdi)
30742 13:
30743+ pax_force_retaddr
30744 retq
30745 CFI_ENDPROC
30746 ENDPROC(__memmove)
30747diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30748index 93118fb..386ed2a 100644
30749--- a/arch/x86/lib/memset_64.S
30750+++ b/arch/x86/lib/memset_64.S
30751@@ -41,6 +41,7 @@ ENTRY(__memset)
30752 movl %edx,%ecx
30753 rep stosb
30754 movq %r9,%rax
30755+ pax_force_retaddr
30756 ret
30757 ENDPROC(memset)
30758 ENDPROC(__memset)
30759@@ -62,6 +63,7 @@ ENTRY(memset_erms)
30760 movq %rdx,%rcx
30761 rep stosb
30762 movq %r9,%rax
30763+ pax_force_retaddr
30764 ret
30765 ENDPROC(memset_erms)
30766
30767@@ -126,6 +128,7 @@ ENTRY(memset_orig)
30768
30769 .Lende:
30770 movq %r10,%rax
30771+ pax_force_retaddr
30772 ret
30773
30774 CFI_RESTORE_STATE
30775diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30776index c9f2d9b..e7fd2c0 100644
30777--- a/arch/x86/lib/mmx_32.c
30778+++ b/arch/x86/lib/mmx_32.c
30779@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30780 {
30781 void *p;
30782 int i;
30783+ unsigned long cr0;
30784
30785 if (unlikely(in_interrupt()))
30786 return __memcpy(to, from, len);
30787@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30788 kernel_fpu_begin();
30789
30790 __asm__ __volatile__ (
30791- "1: prefetch (%0)\n" /* This set is 28 bytes */
30792- " prefetch 64(%0)\n"
30793- " prefetch 128(%0)\n"
30794- " prefetch 192(%0)\n"
30795- " prefetch 256(%0)\n"
30796+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30797+ " prefetch 64(%1)\n"
30798+ " prefetch 128(%1)\n"
30799+ " prefetch 192(%1)\n"
30800+ " prefetch 256(%1)\n"
30801 "2: \n"
30802 ".section .fixup, \"ax\"\n"
30803- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30804+ "3: \n"
30805+
30806+#ifdef CONFIG_PAX_KERNEXEC
30807+ " movl %%cr0, %0\n"
30808+ " movl %0, %%eax\n"
30809+ " andl $0xFFFEFFFF, %%eax\n"
30810+ " movl %%eax, %%cr0\n"
30811+#endif
30812+
30813+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30814+
30815+#ifdef CONFIG_PAX_KERNEXEC
30816+ " movl %0, %%cr0\n"
30817+#endif
30818+
30819 " jmp 2b\n"
30820 ".previous\n"
30821 _ASM_EXTABLE(1b, 3b)
30822- : : "r" (from));
30823+ : "=&r" (cr0) : "r" (from) : "ax");
30824
30825 for ( ; i > 5; i--) {
30826 __asm__ __volatile__ (
30827- "1: prefetch 320(%0)\n"
30828- "2: movq (%0), %%mm0\n"
30829- " movq 8(%0), %%mm1\n"
30830- " movq 16(%0), %%mm2\n"
30831- " movq 24(%0), %%mm3\n"
30832- " movq %%mm0, (%1)\n"
30833- " movq %%mm1, 8(%1)\n"
30834- " movq %%mm2, 16(%1)\n"
30835- " movq %%mm3, 24(%1)\n"
30836- " movq 32(%0), %%mm0\n"
30837- " movq 40(%0), %%mm1\n"
30838- " movq 48(%0), %%mm2\n"
30839- " movq 56(%0), %%mm3\n"
30840- " movq %%mm0, 32(%1)\n"
30841- " movq %%mm1, 40(%1)\n"
30842- " movq %%mm2, 48(%1)\n"
30843- " movq %%mm3, 56(%1)\n"
30844+ "1: prefetch 320(%1)\n"
30845+ "2: movq (%1), %%mm0\n"
30846+ " movq 8(%1), %%mm1\n"
30847+ " movq 16(%1), %%mm2\n"
30848+ " movq 24(%1), %%mm3\n"
30849+ " movq %%mm0, (%2)\n"
30850+ " movq %%mm1, 8(%2)\n"
30851+ " movq %%mm2, 16(%2)\n"
30852+ " movq %%mm3, 24(%2)\n"
30853+ " movq 32(%1), %%mm0\n"
30854+ " movq 40(%1), %%mm1\n"
30855+ " movq 48(%1), %%mm2\n"
30856+ " movq 56(%1), %%mm3\n"
30857+ " movq %%mm0, 32(%2)\n"
30858+ " movq %%mm1, 40(%2)\n"
30859+ " movq %%mm2, 48(%2)\n"
30860+ " movq %%mm3, 56(%2)\n"
30861 ".section .fixup, \"ax\"\n"
30862- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30863+ "3:\n"
30864+
30865+#ifdef CONFIG_PAX_KERNEXEC
30866+ " movl %%cr0, %0\n"
30867+ " movl %0, %%eax\n"
30868+ " andl $0xFFFEFFFF, %%eax\n"
30869+ " movl %%eax, %%cr0\n"
30870+#endif
30871+
30872+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30873+
30874+#ifdef CONFIG_PAX_KERNEXEC
30875+ " movl %0, %%cr0\n"
30876+#endif
30877+
30878 " jmp 2b\n"
30879 ".previous\n"
30880 _ASM_EXTABLE(1b, 3b)
30881- : : "r" (from), "r" (to) : "memory");
30882+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30883
30884 from += 64;
30885 to += 64;
30886@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30887 static void fast_copy_page(void *to, void *from)
30888 {
30889 int i;
30890+ unsigned long cr0;
30891
30892 kernel_fpu_begin();
30893
30894@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30895 * but that is for later. -AV
30896 */
30897 __asm__ __volatile__(
30898- "1: prefetch (%0)\n"
30899- " prefetch 64(%0)\n"
30900- " prefetch 128(%0)\n"
30901- " prefetch 192(%0)\n"
30902- " prefetch 256(%0)\n"
30903+ "1: prefetch (%1)\n"
30904+ " prefetch 64(%1)\n"
30905+ " prefetch 128(%1)\n"
30906+ " prefetch 192(%1)\n"
30907+ " prefetch 256(%1)\n"
30908 "2: \n"
30909 ".section .fixup, \"ax\"\n"
30910- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30911+ "3: \n"
30912+
30913+#ifdef CONFIG_PAX_KERNEXEC
30914+ " movl %%cr0, %0\n"
30915+ " movl %0, %%eax\n"
30916+ " andl $0xFFFEFFFF, %%eax\n"
30917+ " movl %%eax, %%cr0\n"
30918+#endif
30919+
30920+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30921+
30922+#ifdef CONFIG_PAX_KERNEXEC
30923+ " movl %0, %%cr0\n"
30924+#endif
30925+
30926 " jmp 2b\n"
30927 ".previous\n"
30928- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30929+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30930
30931 for (i = 0; i < (4096-320)/64; i++) {
30932 __asm__ __volatile__ (
30933- "1: prefetch 320(%0)\n"
30934- "2: movq (%0), %%mm0\n"
30935- " movntq %%mm0, (%1)\n"
30936- " movq 8(%0), %%mm1\n"
30937- " movntq %%mm1, 8(%1)\n"
30938- " movq 16(%0), %%mm2\n"
30939- " movntq %%mm2, 16(%1)\n"
30940- " movq 24(%0), %%mm3\n"
30941- " movntq %%mm3, 24(%1)\n"
30942- " movq 32(%0), %%mm4\n"
30943- " movntq %%mm4, 32(%1)\n"
30944- " movq 40(%0), %%mm5\n"
30945- " movntq %%mm5, 40(%1)\n"
30946- " movq 48(%0), %%mm6\n"
30947- " movntq %%mm6, 48(%1)\n"
30948- " movq 56(%0), %%mm7\n"
30949- " movntq %%mm7, 56(%1)\n"
30950+ "1: prefetch 320(%1)\n"
30951+ "2: movq (%1), %%mm0\n"
30952+ " movntq %%mm0, (%2)\n"
30953+ " movq 8(%1), %%mm1\n"
30954+ " movntq %%mm1, 8(%2)\n"
30955+ " movq 16(%1), %%mm2\n"
30956+ " movntq %%mm2, 16(%2)\n"
30957+ " movq 24(%1), %%mm3\n"
30958+ " movntq %%mm3, 24(%2)\n"
30959+ " movq 32(%1), %%mm4\n"
30960+ " movntq %%mm4, 32(%2)\n"
30961+ " movq 40(%1), %%mm5\n"
30962+ " movntq %%mm5, 40(%2)\n"
30963+ " movq 48(%1), %%mm6\n"
30964+ " movntq %%mm6, 48(%2)\n"
30965+ " movq 56(%1), %%mm7\n"
30966+ " movntq %%mm7, 56(%2)\n"
30967 ".section .fixup, \"ax\"\n"
30968- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30969+ "3:\n"
30970+
30971+#ifdef CONFIG_PAX_KERNEXEC
30972+ " movl %%cr0, %0\n"
30973+ " movl %0, %%eax\n"
30974+ " andl $0xFFFEFFFF, %%eax\n"
30975+ " movl %%eax, %%cr0\n"
30976+#endif
30977+
30978+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30979+
30980+#ifdef CONFIG_PAX_KERNEXEC
30981+ " movl %0, %%cr0\n"
30982+#endif
30983+
30984 " jmp 2b\n"
30985 ".previous\n"
30986- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30987+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30988
30989 from += 64;
30990 to += 64;
30991@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30992 static void fast_copy_page(void *to, void *from)
30993 {
30994 int i;
30995+ unsigned long cr0;
30996
30997 kernel_fpu_begin();
30998
30999 __asm__ __volatile__ (
31000- "1: prefetch (%0)\n"
31001- " prefetch 64(%0)\n"
31002- " prefetch 128(%0)\n"
31003- " prefetch 192(%0)\n"
31004- " prefetch 256(%0)\n"
31005+ "1: prefetch (%1)\n"
31006+ " prefetch 64(%1)\n"
31007+ " prefetch 128(%1)\n"
31008+ " prefetch 192(%1)\n"
31009+ " prefetch 256(%1)\n"
31010 "2: \n"
31011 ".section .fixup, \"ax\"\n"
31012- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
31013+ "3: \n"
31014+
31015+#ifdef CONFIG_PAX_KERNEXEC
31016+ " movl %%cr0, %0\n"
31017+ " movl %0, %%eax\n"
31018+ " andl $0xFFFEFFFF, %%eax\n"
31019+ " movl %%eax, %%cr0\n"
31020+#endif
31021+
31022+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
31023+
31024+#ifdef CONFIG_PAX_KERNEXEC
31025+ " movl %0, %%cr0\n"
31026+#endif
31027+
31028 " jmp 2b\n"
31029 ".previous\n"
31030- _ASM_EXTABLE(1b, 3b) : : "r" (from));
31031+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
31032
31033 for (i = 0; i < 4096/64; i++) {
31034 __asm__ __volatile__ (
31035- "1: prefetch 320(%0)\n"
31036- "2: movq (%0), %%mm0\n"
31037- " movq 8(%0), %%mm1\n"
31038- " movq 16(%0), %%mm2\n"
31039- " movq 24(%0), %%mm3\n"
31040- " movq %%mm0, (%1)\n"
31041- " movq %%mm1, 8(%1)\n"
31042- " movq %%mm2, 16(%1)\n"
31043- " movq %%mm3, 24(%1)\n"
31044- " movq 32(%0), %%mm0\n"
31045- " movq 40(%0), %%mm1\n"
31046- " movq 48(%0), %%mm2\n"
31047- " movq 56(%0), %%mm3\n"
31048- " movq %%mm0, 32(%1)\n"
31049- " movq %%mm1, 40(%1)\n"
31050- " movq %%mm2, 48(%1)\n"
31051- " movq %%mm3, 56(%1)\n"
31052+ "1: prefetch 320(%1)\n"
31053+ "2: movq (%1), %%mm0\n"
31054+ " movq 8(%1), %%mm1\n"
31055+ " movq 16(%1), %%mm2\n"
31056+ " movq 24(%1), %%mm3\n"
31057+ " movq %%mm0, (%2)\n"
31058+ " movq %%mm1, 8(%2)\n"
31059+ " movq %%mm2, 16(%2)\n"
31060+ " movq %%mm3, 24(%2)\n"
31061+ " movq 32(%1), %%mm0\n"
31062+ " movq 40(%1), %%mm1\n"
31063+ " movq 48(%1), %%mm2\n"
31064+ " movq 56(%1), %%mm3\n"
31065+ " movq %%mm0, 32(%2)\n"
31066+ " movq %%mm1, 40(%2)\n"
31067+ " movq %%mm2, 48(%2)\n"
31068+ " movq %%mm3, 56(%2)\n"
31069 ".section .fixup, \"ax\"\n"
31070- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31071+ "3:\n"
31072+
31073+#ifdef CONFIG_PAX_KERNEXEC
31074+ " movl %%cr0, %0\n"
31075+ " movl %0, %%eax\n"
31076+ " andl $0xFFFEFFFF, %%eax\n"
31077+ " movl %%eax, %%cr0\n"
31078+#endif
31079+
31080+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
31081+
31082+#ifdef CONFIG_PAX_KERNEXEC
31083+ " movl %0, %%cr0\n"
31084+#endif
31085+
31086 " jmp 2b\n"
31087 ".previous\n"
31088 _ASM_EXTABLE(1b, 3b)
31089- : : "r" (from), "r" (to) : "memory");
31090+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
31091
31092 from += 64;
31093 to += 64;
31094diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
31095index 3ca5218..c2ae6bc 100644
31096--- a/arch/x86/lib/msr-reg.S
31097+++ b/arch/x86/lib/msr-reg.S
31098@@ -3,6 +3,7 @@
31099 #include <asm/dwarf2.h>
31100 #include <asm/asm.h>
31101 #include <asm/msr.h>
31102+#include <asm/alternative-asm.h>
31103
31104 #ifdef CONFIG_X86_64
31105 /*
31106@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
31107 movl %edi, 28(%r10)
31108 popq_cfi_reg rbp
31109 popq_cfi_reg rbx
31110+ pax_force_retaddr
31111 ret
31112 3:
31113 CFI_RESTORE_STATE
31114diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
31115index fc6ba17..14ad9a5 100644
31116--- a/arch/x86/lib/putuser.S
31117+++ b/arch/x86/lib/putuser.S
31118@@ -16,7 +16,9 @@
31119 #include <asm/errno.h>
31120 #include <asm/asm.h>
31121 #include <asm/smap.h>
31122-
31123+#include <asm/segment.h>
31124+#include <asm/pgtable.h>
31125+#include <asm/alternative-asm.h>
31126
31127 /*
31128 * __put_user_X
31129@@ -30,57 +32,125 @@
31130 * as they get called from within inline assembly.
31131 */
31132
31133-#define ENTER CFI_STARTPROC ; \
31134- GET_THREAD_INFO(%_ASM_BX)
31135-#define EXIT ASM_CLAC ; \
31136- ret ; \
31137+#define ENTER CFI_STARTPROC
31138+#define EXIT ASM_CLAC ; \
31139+ pax_force_retaddr ; \
31140+ ret ; \
31141 CFI_ENDPROC
31142
31143+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31144+#define _DEST %_ASM_CX,%_ASM_BX
31145+#else
31146+#define _DEST %_ASM_CX
31147+#endif
31148+
31149+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
31150+#define __copyuser_seg gs;
31151+#else
31152+#define __copyuser_seg
31153+#endif
31154+
31155 .text
31156 ENTRY(__put_user_1)
31157 ENTER
31158+
31159+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31160+ GET_THREAD_INFO(%_ASM_BX)
31161 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
31162 jae bad_put_user
31163+
31164+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31165+ mov pax_user_shadow_base,%_ASM_BX
31166+ cmp %_ASM_BX,%_ASM_CX
31167+ jb 1234f
31168+ xor %ebx,%ebx
31169+1234:
31170+#endif
31171+
31172+#endif
31173+
31174 ASM_STAC
31175-1: movb %al,(%_ASM_CX)
31176+1: __copyuser_seg movb %al,(_DEST)
31177 xor %eax,%eax
31178 EXIT
31179 ENDPROC(__put_user_1)
31180
31181 ENTRY(__put_user_2)
31182 ENTER
31183+
31184+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31185+ GET_THREAD_INFO(%_ASM_BX)
31186 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31187 sub $1,%_ASM_BX
31188 cmp %_ASM_BX,%_ASM_CX
31189 jae bad_put_user
31190+
31191+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31192+ mov pax_user_shadow_base,%_ASM_BX
31193+ cmp %_ASM_BX,%_ASM_CX
31194+ jb 1234f
31195+ xor %ebx,%ebx
31196+1234:
31197+#endif
31198+
31199+#endif
31200+
31201 ASM_STAC
31202-2: movw %ax,(%_ASM_CX)
31203+2: __copyuser_seg movw %ax,(_DEST)
31204 xor %eax,%eax
31205 EXIT
31206 ENDPROC(__put_user_2)
31207
31208 ENTRY(__put_user_4)
31209 ENTER
31210+
31211+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31212+ GET_THREAD_INFO(%_ASM_BX)
31213 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31214 sub $3,%_ASM_BX
31215 cmp %_ASM_BX,%_ASM_CX
31216 jae bad_put_user
31217+
31218+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31219+ mov pax_user_shadow_base,%_ASM_BX
31220+ cmp %_ASM_BX,%_ASM_CX
31221+ jb 1234f
31222+ xor %ebx,%ebx
31223+1234:
31224+#endif
31225+
31226+#endif
31227+
31228 ASM_STAC
31229-3: movl %eax,(%_ASM_CX)
31230+3: __copyuser_seg movl %eax,(_DEST)
31231 xor %eax,%eax
31232 EXIT
31233 ENDPROC(__put_user_4)
31234
31235 ENTRY(__put_user_8)
31236 ENTER
31237+
31238+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31239+ GET_THREAD_INFO(%_ASM_BX)
31240 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31241 sub $7,%_ASM_BX
31242 cmp %_ASM_BX,%_ASM_CX
31243 jae bad_put_user
31244+
31245+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31246+ mov pax_user_shadow_base,%_ASM_BX
31247+ cmp %_ASM_BX,%_ASM_CX
31248+ jb 1234f
31249+ xor %ebx,%ebx
31250+1234:
31251+#endif
31252+
31253+#endif
31254+
31255 ASM_STAC
31256-4: mov %_ASM_AX,(%_ASM_CX)
31257+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31258 #ifdef CONFIG_X86_32
31259-5: movl %edx,4(%_ASM_CX)
31260+5: __copyuser_seg movl %edx,4(_DEST)
31261 #endif
31262 xor %eax,%eax
31263 EXIT
31264diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31265index 2322abe..1e78a75 100644
31266--- a/arch/x86/lib/rwsem.S
31267+++ b/arch/x86/lib/rwsem.S
31268@@ -92,6 +92,7 @@ ENTRY(call_rwsem_down_read_failed)
31269 call rwsem_down_read_failed
31270 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
31271 restore_common_regs
31272+ pax_force_retaddr
31273 ret
31274 CFI_ENDPROC
31275 ENDPROC(call_rwsem_down_read_failed)
31276@@ -102,6 +103,7 @@ ENTRY(call_rwsem_down_write_failed)
31277 movq %rax,%rdi
31278 call rwsem_down_write_failed
31279 restore_common_regs
31280+ pax_force_retaddr
31281 ret
31282 CFI_ENDPROC
31283 ENDPROC(call_rwsem_down_write_failed)
31284@@ -115,7 +117,8 @@ ENTRY(call_rwsem_wake)
31285 movq %rax,%rdi
31286 call rwsem_wake
31287 restore_common_regs
31288-1: ret
31289+1: pax_force_retaddr
31290+ ret
31291 CFI_ENDPROC
31292 ENDPROC(call_rwsem_wake)
31293
31294@@ -127,6 +130,7 @@ ENTRY(call_rwsem_downgrade_wake)
31295 call rwsem_downgrade_wake
31296 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
31297 restore_common_regs
31298+ pax_force_retaddr
31299 ret
31300 CFI_ENDPROC
31301 ENDPROC(call_rwsem_downgrade_wake)
31302diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31303index f89ba4e9..512b2de 100644
31304--- a/arch/x86/lib/thunk_64.S
31305+++ b/arch/x86/lib/thunk_64.S
31306@@ -9,6 +9,7 @@
31307 #include <asm/dwarf2.h>
31308 #include <asm/calling.h>
31309 #include <asm/asm.h>
31310+#include <asm/alternative-asm.h>
31311
31312 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31313 .macro THUNK name, func, put_ret_addr_in_rdi=0
31314@@ -69,6 +70,7 @@ restore:
31315 popq_cfi_reg rdx
31316 popq_cfi_reg rsi
31317 popq_cfi_reg rdi
31318+ pax_force_retaddr
31319 ret
31320 CFI_ENDPROC
31321 _ASM_NOKPROBE(restore)
31322diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
31323index ddf9ecb..e342586 100644
31324--- a/arch/x86/lib/usercopy.c
31325+++ b/arch/x86/lib/usercopy.c
31326@@ -20,7 +20,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
31327 unsigned long ret;
31328
31329 if (__range_not_ok(from, n, TASK_SIZE))
31330- return 0;
31331+ return n;
31332
31333 /*
31334 * Even though this function is typically called from NMI/IRQ context
31335diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31336index e2f5e21..4b22130 100644
31337--- a/arch/x86/lib/usercopy_32.c
31338+++ b/arch/x86/lib/usercopy_32.c
31339@@ -42,11 +42,13 @@ do { \
31340 int __d0; \
31341 might_fault(); \
31342 __asm__ __volatile__( \
31343+ __COPYUSER_SET_ES \
31344 ASM_STAC "\n" \
31345 "0: rep; stosl\n" \
31346 " movl %2,%0\n" \
31347 "1: rep; stosb\n" \
31348 "2: " ASM_CLAC "\n" \
31349+ __COPYUSER_RESTORE_ES \
31350 ".section .fixup,\"ax\"\n" \
31351 "3: lea 0(%2,%0,4),%0\n" \
31352 " jmp 2b\n" \
31353@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31354
31355 #ifdef CONFIG_X86_INTEL_USERCOPY
31356 static unsigned long
31357-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31358+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31359 {
31360 int d0, d1;
31361 __asm__ __volatile__(
31362@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31363 " .align 2,0x90\n"
31364 "3: movl 0(%4), %%eax\n"
31365 "4: movl 4(%4), %%edx\n"
31366- "5: movl %%eax, 0(%3)\n"
31367- "6: movl %%edx, 4(%3)\n"
31368+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31369+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31370 "7: movl 8(%4), %%eax\n"
31371 "8: movl 12(%4),%%edx\n"
31372- "9: movl %%eax, 8(%3)\n"
31373- "10: movl %%edx, 12(%3)\n"
31374+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31375+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31376 "11: movl 16(%4), %%eax\n"
31377 "12: movl 20(%4), %%edx\n"
31378- "13: movl %%eax, 16(%3)\n"
31379- "14: movl %%edx, 20(%3)\n"
31380+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31381+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31382 "15: movl 24(%4), %%eax\n"
31383 "16: movl 28(%4), %%edx\n"
31384- "17: movl %%eax, 24(%3)\n"
31385- "18: movl %%edx, 28(%3)\n"
31386+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31387+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31388 "19: movl 32(%4), %%eax\n"
31389 "20: movl 36(%4), %%edx\n"
31390- "21: movl %%eax, 32(%3)\n"
31391- "22: movl %%edx, 36(%3)\n"
31392+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31393+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31394 "23: movl 40(%4), %%eax\n"
31395 "24: movl 44(%4), %%edx\n"
31396- "25: movl %%eax, 40(%3)\n"
31397- "26: movl %%edx, 44(%3)\n"
31398+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31399+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31400 "27: movl 48(%4), %%eax\n"
31401 "28: movl 52(%4), %%edx\n"
31402- "29: movl %%eax, 48(%3)\n"
31403- "30: movl %%edx, 52(%3)\n"
31404+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31405+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31406 "31: movl 56(%4), %%eax\n"
31407 "32: movl 60(%4), %%edx\n"
31408- "33: movl %%eax, 56(%3)\n"
31409- "34: movl %%edx, 60(%3)\n"
31410+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31411+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31412 " addl $-64, %0\n"
31413 " addl $64, %4\n"
31414 " addl $64, %3\n"
31415@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31416 " shrl $2, %0\n"
31417 " andl $3, %%eax\n"
31418 " cld\n"
31419+ __COPYUSER_SET_ES
31420 "99: rep; movsl\n"
31421 "36: movl %%eax, %0\n"
31422 "37: rep; movsb\n"
31423 "100:\n"
31424+ __COPYUSER_RESTORE_ES
31425+ ".section .fixup,\"ax\"\n"
31426+ "101: lea 0(%%eax,%0,4),%0\n"
31427+ " jmp 100b\n"
31428+ ".previous\n"
31429+ _ASM_EXTABLE(1b,100b)
31430+ _ASM_EXTABLE(2b,100b)
31431+ _ASM_EXTABLE(3b,100b)
31432+ _ASM_EXTABLE(4b,100b)
31433+ _ASM_EXTABLE(5b,100b)
31434+ _ASM_EXTABLE(6b,100b)
31435+ _ASM_EXTABLE(7b,100b)
31436+ _ASM_EXTABLE(8b,100b)
31437+ _ASM_EXTABLE(9b,100b)
31438+ _ASM_EXTABLE(10b,100b)
31439+ _ASM_EXTABLE(11b,100b)
31440+ _ASM_EXTABLE(12b,100b)
31441+ _ASM_EXTABLE(13b,100b)
31442+ _ASM_EXTABLE(14b,100b)
31443+ _ASM_EXTABLE(15b,100b)
31444+ _ASM_EXTABLE(16b,100b)
31445+ _ASM_EXTABLE(17b,100b)
31446+ _ASM_EXTABLE(18b,100b)
31447+ _ASM_EXTABLE(19b,100b)
31448+ _ASM_EXTABLE(20b,100b)
31449+ _ASM_EXTABLE(21b,100b)
31450+ _ASM_EXTABLE(22b,100b)
31451+ _ASM_EXTABLE(23b,100b)
31452+ _ASM_EXTABLE(24b,100b)
31453+ _ASM_EXTABLE(25b,100b)
31454+ _ASM_EXTABLE(26b,100b)
31455+ _ASM_EXTABLE(27b,100b)
31456+ _ASM_EXTABLE(28b,100b)
31457+ _ASM_EXTABLE(29b,100b)
31458+ _ASM_EXTABLE(30b,100b)
31459+ _ASM_EXTABLE(31b,100b)
31460+ _ASM_EXTABLE(32b,100b)
31461+ _ASM_EXTABLE(33b,100b)
31462+ _ASM_EXTABLE(34b,100b)
31463+ _ASM_EXTABLE(35b,100b)
31464+ _ASM_EXTABLE(36b,100b)
31465+ _ASM_EXTABLE(37b,100b)
31466+ _ASM_EXTABLE(99b,101b)
31467+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31468+ : "1"(to), "2"(from), "0"(size)
31469+ : "eax", "edx", "memory");
31470+ return size;
31471+}
31472+
31473+static unsigned long
31474+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31475+{
31476+ int d0, d1;
31477+ __asm__ __volatile__(
31478+ " .align 2,0x90\n"
31479+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31480+ " cmpl $67, %0\n"
31481+ " jbe 3f\n"
31482+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31483+ " .align 2,0x90\n"
31484+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31485+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31486+ "5: movl %%eax, 0(%3)\n"
31487+ "6: movl %%edx, 4(%3)\n"
31488+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31489+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31490+ "9: movl %%eax, 8(%3)\n"
31491+ "10: movl %%edx, 12(%3)\n"
31492+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31493+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31494+ "13: movl %%eax, 16(%3)\n"
31495+ "14: movl %%edx, 20(%3)\n"
31496+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31497+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31498+ "17: movl %%eax, 24(%3)\n"
31499+ "18: movl %%edx, 28(%3)\n"
31500+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31501+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31502+ "21: movl %%eax, 32(%3)\n"
31503+ "22: movl %%edx, 36(%3)\n"
31504+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31505+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31506+ "25: movl %%eax, 40(%3)\n"
31507+ "26: movl %%edx, 44(%3)\n"
31508+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31509+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31510+ "29: movl %%eax, 48(%3)\n"
31511+ "30: movl %%edx, 52(%3)\n"
31512+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31513+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31514+ "33: movl %%eax, 56(%3)\n"
31515+ "34: movl %%edx, 60(%3)\n"
31516+ " addl $-64, %0\n"
31517+ " addl $64, %4\n"
31518+ " addl $64, %3\n"
31519+ " cmpl $63, %0\n"
31520+ " ja 1b\n"
31521+ "35: movl %0, %%eax\n"
31522+ " shrl $2, %0\n"
31523+ " andl $3, %%eax\n"
31524+ " cld\n"
31525+ "99: rep; "__copyuser_seg" movsl\n"
31526+ "36: movl %%eax, %0\n"
31527+ "37: rep; "__copyuser_seg" movsb\n"
31528+ "100:\n"
31529 ".section .fixup,\"ax\"\n"
31530 "101: lea 0(%%eax,%0,4),%0\n"
31531 " jmp 100b\n"
31532@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31533 int d0, d1;
31534 __asm__ __volatile__(
31535 " .align 2,0x90\n"
31536- "0: movl 32(%4), %%eax\n"
31537+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31538 " cmpl $67, %0\n"
31539 " jbe 2f\n"
31540- "1: movl 64(%4), %%eax\n"
31541+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31542 " .align 2,0x90\n"
31543- "2: movl 0(%4), %%eax\n"
31544- "21: movl 4(%4), %%edx\n"
31545+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31546+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31547 " movl %%eax, 0(%3)\n"
31548 " movl %%edx, 4(%3)\n"
31549- "3: movl 8(%4), %%eax\n"
31550- "31: movl 12(%4),%%edx\n"
31551+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31552+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31553 " movl %%eax, 8(%3)\n"
31554 " movl %%edx, 12(%3)\n"
31555- "4: movl 16(%4), %%eax\n"
31556- "41: movl 20(%4), %%edx\n"
31557+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31558+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31559 " movl %%eax, 16(%3)\n"
31560 " movl %%edx, 20(%3)\n"
31561- "10: movl 24(%4), %%eax\n"
31562- "51: movl 28(%4), %%edx\n"
31563+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31564+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31565 " movl %%eax, 24(%3)\n"
31566 " movl %%edx, 28(%3)\n"
31567- "11: movl 32(%4), %%eax\n"
31568- "61: movl 36(%4), %%edx\n"
31569+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31570+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31571 " movl %%eax, 32(%3)\n"
31572 " movl %%edx, 36(%3)\n"
31573- "12: movl 40(%4), %%eax\n"
31574- "71: movl 44(%4), %%edx\n"
31575+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31576+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31577 " movl %%eax, 40(%3)\n"
31578 " movl %%edx, 44(%3)\n"
31579- "13: movl 48(%4), %%eax\n"
31580- "81: movl 52(%4), %%edx\n"
31581+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31582+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31583 " movl %%eax, 48(%3)\n"
31584 " movl %%edx, 52(%3)\n"
31585- "14: movl 56(%4), %%eax\n"
31586- "91: movl 60(%4), %%edx\n"
31587+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31588+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31589 " movl %%eax, 56(%3)\n"
31590 " movl %%edx, 60(%3)\n"
31591 " addl $-64, %0\n"
31592@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31593 " shrl $2, %0\n"
31594 " andl $3, %%eax\n"
31595 " cld\n"
31596- "6: rep; movsl\n"
31597+ "6: rep; "__copyuser_seg" movsl\n"
31598 " movl %%eax,%0\n"
31599- "7: rep; movsb\n"
31600+ "7: rep; "__copyuser_seg" movsb\n"
31601 "8:\n"
31602 ".section .fixup,\"ax\"\n"
31603 "9: lea 0(%%eax,%0,4),%0\n"
31604@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31605
31606 __asm__ __volatile__(
31607 " .align 2,0x90\n"
31608- "0: movl 32(%4), %%eax\n"
31609+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31610 " cmpl $67, %0\n"
31611 " jbe 2f\n"
31612- "1: movl 64(%4), %%eax\n"
31613+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31614 " .align 2,0x90\n"
31615- "2: movl 0(%4), %%eax\n"
31616- "21: movl 4(%4), %%edx\n"
31617+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31618+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31619 " movnti %%eax, 0(%3)\n"
31620 " movnti %%edx, 4(%3)\n"
31621- "3: movl 8(%4), %%eax\n"
31622- "31: movl 12(%4),%%edx\n"
31623+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31624+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31625 " movnti %%eax, 8(%3)\n"
31626 " movnti %%edx, 12(%3)\n"
31627- "4: movl 16(%4), %%eax\n"
31628- "41: movl 20(%4), %%edx\n"
31629+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31630+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31631 " movnti %%eax, 16(%3)\n"
31632 " movnti %%edx, 20(%3)\n"
31633- "10: movl 24(%4), %%eax\n"
31634- "51: movl 28(%4), %%edx\n"
31635+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31636+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31637 " movnti %%eax, 24(%3)\n"
31638 " movnti %%edx, 28(%3)\n"
31639- "11: movl 32(%4), %%eax\n"
31640- "61: movl 36(%4), %%edx\n"
31641+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31642+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31643 " movnti %%eax, 32(%3)\n"
31644 " movnti %%edx, 36(%3)\n"
31645- "12: movl 40(%4), %%eax\n"
31646- "71: movl 44(%4), %%edx\n"
31647+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31648+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31649 " movnti %%eax, 40(%3)\n"
31650 " movnti %%edx, 44(%3)\n"
31651- "13: movl 48(%4), %%eax\n"
31652- "81: movl 52(%4), %%edx\n"
31653+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31654+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31655 " movnti %%eax, 48(%3)\n"
31656 " movnti %%edx, 52(%3)\n"
31657- "14: movl 56(%4), %%eax\n"
31658- "91: movl 60(%4), %%edx\n"
31659+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31660+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31661 " movnti %%eax, 56(%3)\n"
31662 " movnti %%edx, 60(%3)\n"
31663 " addl $-64, %0\n"
31664@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31665 " shrl $2, %0\n"
31666 " andl $3, %%eax\n"
31667 " cld\n"
31668- "6: rep; movsl\n"
31669+ "6: rep; "__copyuser_seg" movsl\n"
31670 " movl %%eax,%0\n"
31671- "7: rep; movsb\n"
31672+ "7: rep; "__copyuser_seg" movsb\n"
31673 "8:\n"
31674 ".section .fixup,\"ax\"\n"
31675 "9: lea 0(%%eax,%0,4),%0\n"
31676@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31677
31678 __asm__ __volatile__(
31679 " .align 2,0x90\n"
31680- "0: movl 32(%4), %%eax\n"
31681+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31682 " cmpl $67, %0\n"
31683 " jbe 2f\n"
31684- "1: movl 64(%4), %%eax\n"
31685+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31686 " .align 2,0x90\n"
31687- "2: movl 0(%4), %%eax\n"
31688- "21: movl 4(%4), %%edx\n"
31689+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31690+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31691 " movnti %%eax, 0(%3)\n"
31692 " movnti %%edx, 4(%3)\n"
31693- "3: movl 8(%4), %%eax\n"
31694- "31: movl 12(%4),%%edx\n"
31695+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31696+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31697 " movnti %%eax, 8(%3)\n"
31698 " movnti %%edx, 12(%3)\n"
31699- "4: movl 16(%4), %%eax\n"
31700- "41: movl 20(%4), %%edx\n"
31701+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31702+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31703 " movnti %%eax, 16(%3)\n"
31704 " movnti %%edx, 20(%3)\n"
31705- "10: movl 24(%4), %%eax\n"
31706- "51: movl 28(%4), %%edx\n"
31707+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31708+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31709 " movnti %%eax, 24(%3)\n"
31710 " movnti %%edx, 28(%3)\n"
31711- "11: movl 32(%4), %%eax\n"
31712- "61: movl 36(%4), %%edx\n"
31713+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31714+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31715 " movnti %%eax, 32(%3)\n"
31716 " movnti %%edx, 36(%3)\n"
31717- "12: movl 40(%4), %%eax\n"
31718- "71: movl 44(%4), %%edx\n"
31719+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31720+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31721 " movnti %%eax, 40(%3)\n"
31722 " movnti %%edx, 44(%3)\n"
31723- "13: movl 48(%4), %%eax\n"
31724- "81: movl 52(%4), %%edx\n"
31725+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31726+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31727 " movnti %%eax, 48(%3)\n"
31728 " movnti %%edx, 52(%3)\n"
31729- "14: movl 56(%4), %%eax\n"
31730- "91: movl 60(%4), %%edx\n"
31731+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31732+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31733 " movnti %%eax, 56(%3)\n"
31734 " movnti %%edx, 60(%3)\n"
31735 " addl $-64, %0\n"
31736@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31737 " shrl $2, %0\n"
31738 " andl $3, %%eax\n"
31739 " cld\n"
31740- "6: rep; movsl\n"
31741+ "6: rep; "__copyuser_seg" movsl\n"
31742 " movl %%eax,%0\n"
31743- "7: rep; movsb\n"
31744+ "7: rep; "__copyuser_seg" movsb\n"
31745 "8:\n"
31746 ".section .fixup,\"ax\"\n"
31747 "9: lea 0(%%eax,%0,4),%0\n"
31748@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31749 */
31750 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31751 unsigned long size);
31752-unsigned long __copy_user_intel(void __user *to, const void *from,
31753+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31754+ unsigned long size);
31755+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31756 unsigned long size);
31757 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31758 const void __user *from, unsigned long size);
31759 #endif /* CONFIG_X86_INTEL_USERCOPY */
31760
31761 /* Generic arbitrary sized copy. */
31762-#define __copy_user(to, from, size) \
31763+#define __copy_user(to, from, size, prefix, set, restore) \
31764 do { \
31765 int __d0, __d1, __d2; \
31766 __asm__ __volatile__( \
31767+ set \
31768 " cmp $7,%0\n" \
31769 " jbe 1f\n" \
31770 " movl %1,%0\n" \
31771 " negl %0\n" \
31772 " andl $7,%0\n" \
31773 " subl %0,%3\n" \
31774- "4: rep; movsb\n" \
31775+ "4: rep; "prefix"movsb\n" \
31776 " movl %3,%0\n" \
31777 " shrl $2,%0\n" \
31778 " andl $3,%3\n" \
31779 " .align 2,0x90\n" \
31780- "0: rep; movsl\n" \
31781+ "0: rep; "prefix"movsl\n" \
31782 " movl %3,%0\n" \
31783- "1: rep; movsb\n" \
31784+ "1: rep; "prefix"movsb\n" \
31785 "2:\n" \
31786+ restore \
31787 ".section .fixup,\"ax\"\n" \
31788 "5: addl %3,%0\n" \
31789 " jmp 2b\n" \
31790@@ -538,14 +650,14 @@ do { \
31791 " negl %0\n" \
31792 " andl $7,%0\n" \
31793 " subl %0,%3\n" \
31794- "4: rep; movsb\n" \
31795+ "4: rep; "__copyuser_seg"movsb\n" \
31796 " movl %3,%0\n" \
31797 " shrl $2,%0\n" \
31798 " andl $3,%3\n" \
31799 " .align 2,0x90\n" \
31800- "0: rep; movsl\n" \
31801+ "0: rep; "__copyuser_seg"movsl\n" \
31802 " movl %3,%0\n" \
31803- "1: rep; movsb\n" \
31804+ "1: rep; "__copyuser_seg"movsb\n" \
31805 "2:\n" \
31806 ".section .fixup,\"ax\"\n" \
31807 "5: addl %3,%0\n" \
31808@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31809 {
31810 stac();
31811 if (movsl_is_ok(to, from, n))
31812- __copy_user(to, from, n);
31813+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31814 else
31815- n = __copy_user_intel(to, from, n);
31816+ n = __generic_copy_to_user_intel(to, from, n);
31817 clac();
31818 return n;
31819 }
31820@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31821 {
31822 stac();
31823 if (movsl_is_ok(to, from, n))
31824- __copy_user(to, from, n);
31825+ __copy_user(to, from, n, __copyuser_seg, "", "");
31826 else
31827- n = __copy_user_intel((void __user *)to,
31828- (const void *)from, n);
31829+ n = __generic_copy_from_user_intel(to, from, n);
31830 clac();
31831 return n;
31832 }
31833@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31834 if (n > 64 && cpu_has_xmm2)
31835 n = __copy_user_intel_nocache(to, from, n);
31836 else
31837- __copy_user(to, from, n);
31838+ __copy_user(to, from, n, __copyuser_seg, "", "");
31839 #else
31840- __copy_user(to, from, n);
31841+ __copy_user(to, from, n, __copyuser_seg, "", "");
31842 #endif
31843 clac();
31844 return n;
31845 }
31846 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31847
31848-/**
31849- * copy_to_user: - Copy a block of data into user space.
31850- * @to: Destination address, in user space.
31851- * @from: Source address, in kernel space.
31852- * @n: Number of bytes to copy.
31853- *
31854- * Context: User context only. This function may sleep.
31855- *
31856- * Copy data from kernel space to user space.
31857- *
31858- * Returns number of bytes that could not be copied.
31859- * On success, this will be zero.
31860- */
31861-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31862+#ifdef CONFIG_PAX_MEMORY_UDEREF
31863+void __set_fs(mm_segment_t x)
31864 {
31865- if (access_ok(VERIFY_WRITE, to, n))
31866- n = __copy_to_user(to, from, n);
31867- return n;
31868+ switch (x.seg) {
31869+ case 0:
31870+ loadsegment(gs, 0);
31871+ break;
31872+ case TASK_SIZE_MAX:
31873+ loadsegment(gs, __USER_DS);
31874+ break;
31875+ case -1UL:
31876+ loadsegment(gs, __KERNEL_DS);
31877+ break;
31878+ default:
31879+ BUG();
31880+ }
31881 }
31882-EXPORT_SYMBOL(_copy_to_user);
31883+EXPORT_SYMBOL(__set_fs);
31884
31885-/**
31886- * copy_from_user: - Copy a block of data from user space.
31887- * @to: Destination address, in kernel space.
31888- * @from: Source address, in user space.
31889- * @n: Number of bytes to copy.
31890- *
31891- * Context: User context only. This function may sleep.
31892- *
31893- * Copy data from user space to kernel space.
31894- *
31895- * Returns number of bytes that could not be copied.
31896- * On success, this will be zero.
31897- *
31898- * If some data could not be copied, this function will pad the copied
31899- * data to the requested size using zero bytes.
31900- */
31901-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31902+void set_fs(mm_segment_t x)
31903 {
31904- if (access_ok(VERIFY_READ, from, n))
31905- n = __copy_from_user(to, from, n);
31906- else
31907- memset(to, 0, n);
31908- return n;
31909+ current_thread_info()->addr_limit = x;
31910+ __set_fs(x);
31911 }
31912-EXPORT_SYMBOL(_copy_from_user);
31913+EXPORT_SYMBOL(set_fs);
31914+#endif
31915diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31916index 0a42327..7a82465 100644
31917--- a/arch/x86/lib/usercopy_64.c
31918+++ b/arch/x86/lib/usercopy_64.c
31919@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31920 might_fault();
31921 /* no memory constraint because it doesn't change any memory gcc knows
31922 about */
31923+ pax_open_userland();
31924 stac();
31925 asm volatile(
31926 " testq %[size8],%[size8]\n"
31927@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31928 _ASM_EXTABLE(0b,3b)
31929 _ASM_EXTABLE(1b,2b)
31930 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31931- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31932+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31933 [zero] "r" (0UL), [eight] "r" (8UL));
31934 clac();
31935+ pax_close_userland();
31936 return size;
31937 }
31938 EXPORT_SYMBOL(__clear_user);
31939@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31940 }
31941 EXPORT_SYMBOL(clear_user);
31942
31943-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31944+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31945 {
31946- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31947- return copy_user_generic((__force void *)to, (__force void *)from, len);
31948- }
31949- return len;
31950+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31951+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31952+ return len;
31953 }
31954 EXPORT_SYMBOL(copy_in_user);
31955
31956@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31957 * it is not necessary to optimize tail handling.
31958 */
31959 __visible unsigned long
31960-copy_user_handle_tail(char *to, char *from, unsigned len)
31961+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31962 {
31963+ clac();
31964+ pax_close_userland();
31965 for (; len; --len, to++) {
31966 char c;
31967
31968@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31969 if (__put_user_nocheck(c, to, sizeof(char)))
31970 break;
31971 }
31972- clac();
31973
31974 /* If the destination is a kernel buffer, we always clear the end */
31975- if (!__addr_ok(to))
31976+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31977 memset(to, 0, len);
31978 return len;
31979 }
31980diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31981index a482d10..1a6edb5 100644
31982--- a/arch/x86/mm/Makefile
31983+++ b/arch/x86/mm/Makefile
31984@@ -33,3 +33,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31985 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31986
31987 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31988+
31989+quote:="
31990+obj-$(CONFIG_X86_64) += uderef_64.o
31991+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) -fcall-saved-rax
31992diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31993index 903ec1e..c4166b2 100644
31994--- a/arch/x86/mm/extable.c
31995+++ b/arch/x86/mm/extable.c
31996@@ -6,12 +6,24 @@
31997 static inline unsigned long
31998 ex_insn_addr(const struct exception_table_entry *x)
31999 {
32000- return (unsigned long)&x->insn + x->insn;
32001+ unsigned long reloc = 0;
32002+
32003+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32004+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32005+#endif
32006+
32007+ return (unsigned long)&x->insn + x->insn + reloc;
32008 }
32009 static inline unsigned long
32010 ex_fixup_addr(const struct exception_table_entry *x)
32011 {
32012- return (unsigned long)&x->fixup + x->fixup;
32013+ unsigned long reloc = 0;
32014+
32015+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32016+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32017+#endif
32018+
32019+ return (unsigned long)&x->fixup + x->fixup + reloc;
32020 }
32021
32022 int fixup_exception(struct pt_regs *regs)
32023@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
32024 unsigned long new_ip;
32025
32026 #ifdef CONFIG_PNPBIOS
32027- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
32028+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
32029 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
32030 extern u32 pnp_bios_is_utter_crap;
32031 pnp_bios_is_utter_crap = 1;
32032@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
32033 i += 4;
32034 p->fixup -= i;
32035 i += 4;
32036+
32037+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32038+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
32039+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32040+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
32041+#endif
32042+
32043 }
32044 }
32045
32046diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
32047index 181c53b..d336596 100644
32048--- a/arch/x86/mm/fault.c
32049+++ b/arch/x86/mm/fault.c
32050@@ -13,12 +13,19 @@
32051 #include <linux/hugetlb.h> /* hstate_index_to_shift */
32052 #include <linux/prefetch.h> /* prefetchw */
32053 #include <linux/context_tracking.h> /* exception_enter(), ... */
32054+#include <linux/unistd.h>
32055+#include <linux/compiler.h>
32056
32057 #include <asm/traps.h> /* dotraplinkage, ... */
32058 #include <asm/pgalloc.h> /* pgd_*(), ... */
32059 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
32060 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
32061 #include <asm/vsyscall.h> /* emulate_vsyscall */
32062+#include <asm/tlbflush.h>
32063+
32064+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32065+#include <asm/stacktrace.h>
32066+#endif
32067
32068 #define CREATE_TRACE_POINTS
32069 #include <asm/trace/exceptions.h>
32070@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
32071 return !instr_lo || (instr_lo>>1) == 1;
32072 case 0x00:
32073 /* Prefetch instruction is 0x0F0D or 0x0F18 */
32074- if (probe_kernel_address(instr, opcode))
32075+ if (user_mode(regs)) {
32076+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
32077+ return 0;
32078+ } else if (probe_kernel_address(instr, opcode))
32079 return 0;
32080
32081 *prefetch = (instr_lo == 0xF) &&
32082@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
32083 while (instr < max_instr) {
32084 unsigned char opcode;
32085
32086- if (probe_kernel_address(instr, opcode))
32087+ if (user_mode(regs)) {
32088+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
32089+ break;
32090+ } else if (probe_kernel_address(instr, opcode))
32091 break;
32092
32093 instr++;
32094@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
32095 force_sig_info(si_signo, &info, tsk);
32096 }
32097
32098+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32099+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
32100+#endif
32101+
32102+#ifdef CONFIG_PAX_EMUTRAMP
32103+static int pax_handle_fetch_fault(struct pt_regs *regs);
32104+#endif
32105+
32106+#ifdef CONFIG_PAX_PAGEEXEC
32107+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
32108+{
32109+ pgd_t *pgd;
32110+ pud_t *pud;
32111+ pmd_t *pmd;
32112+
32113+ pgd = pgd_offset(mm, address);
32114+ if (!pgd_present(*pgd))
32115+ return NULL;
32116+ pud = pud_offset(pgd, address);
32117+ if (!pud_present(*pud))
32118+ return NULL;
32119+ pmd = pmd_offset(pud, address);
32120+ if (!pmd_present(*pmd))
32121+ return NULL;
32122+ return pmd;
32123+}
32124+#endif
32125+
32126 DEFINE_SPINLOCK(pgd_lock);
32127 LIST_HEAD(pgd_list);
32128
32129@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
32130 for (address = VMALLOC_START & PMD_MASK;
32131 address >= TASK_SIZE && address < FIXADDR_TOP;
32132 address += PMD_SIZE) {
32133+
32134+#ifdef CONFIG_PAX_PER_CPU_PGD
32135+ unsigned long cpu;
32136+#else
32137 struct page *page;
32138+#endif
32139
32140 spin_lock(&pgd_lock);
32141+
32142+#ifdef CONFIG_PAX_PER_CPU_PGD
32143+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
32144+ pgd_t *pgd = get_cpu_pgd(cpu, user);
32145+ pmd_t *ret;
32146+
32147+ ret = vmalloc_sync_one(pgd, address);
32148+ if (!ret)
32149+ break;
32150+ pgd = get_cpu_pgd(cpu, kernel);
32151+#else
32152 list_for_each_entry(page, &pgd_list, lru) {
32153+ pgd_t *pgd;
32154 spinlock_t *pgt_lock;
32155 pmd_t *ret;
32156
32157@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
32158 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
32159
32160 spin_lock(pgt_lock);
32161- ret = vmalloc_sync_one(page_address(page), address);
32162+ pgd = page_address(page);
32163+#endif
32164+
32165+ ret = vmalloc_sync_one(pgd, address);
32166+
32167+#ifndef CONFIG_PAX_PER_CPU_PGD
32168 spin_unlock(pgt_lock);
32169+#endif
32170
32171 if (!ret)
32172 break;
32173@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
32174 * an interrupt in the middle of a task switch..
32175 */
32176 pgd_paddr = read_cr3();
32177+
32178+#ifdef CONFIG_PAX_PER_CPU_PGD
32179+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32180+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32181+#endif
32182+
32183 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32184 if (!pmd_k)
32185 return -1;
32186@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32187 * happen within a race in page table update. In the later
32188 * case just flush:
32189 */
32190- pgd = pgd_offset(current->active_mm, address);
32191+
32192 pgd_ref = pgd_offset_k(address);
32193 if (pgd_none(*pgd_ref))
32194 return -1;
32195
32196+#ifdef CONFIG_PAX_PER_CPU_PGD
32197+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32198+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32199+ if (pgd_none(*pgd)) {
32200+ set_pgd(pgd, *pgd_ref);
32201+ arch_flush_lazy_mmu_mode();
32202+ } else {
32203+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32204+ }
32205+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32206+#else
32207+ pgd = pgd_offset(current->active_mm, address);
32208+#endif
32209+
32210 if (pgd_none(*pgd)) {
32211 set_pgd(pgd, *pgd_ref);
32212 arch_flush_lazy_mmu_mode();
32213@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32214 static int is_errata100(struct pt_regs *regs, unsigned long address)
32215 {
32216 #ifdef CONFIG_X86_64
32217- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32218+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32219 return 1;
32220 #endif
32221 return 0;
32222@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32223 }
32224
32225 static const char nx_warning[] = KERN_CRIT
32226-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32227+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32228 static const char smep_warning[] = KERN_CRIT
32229-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32230+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32231
32232 static void
32233 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32234@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32235 if (!oops_may_print())
32236 return;
32237
32238- if (error_code & PF_INSTR) {
32239+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32240 unsigned int level;
32241 pgd_t *pgd;
32242 pte_t *pte;
32243@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32244 pte = lookup_address_in_pgd(pgd, address, &level);
32245
32246 if (pte && pte_present(*pte) && !pte_exec(*pte))
32247- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32248+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32249 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32250 (pgd_flags(*pgd) & _PAGE_USER) &&
32251 (__read_cr4() & X86_CR4_SMEP))
32252- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32253+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32254 }
32255
32256+#ifdef CONFIG_PAX_KERNEXEC
32257+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32258+ if (current->signal->curr_ip)
32259+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32260+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32261+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32262+ else
32263+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32264+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32265+ }
32266+#endif
32267+
32268 printk(KERN_ALERT "BUG: unable to handle kernel ");
32269 if (address < PAGE_SIZE)
32270 printk(KERN_CONT "NULL pointer dereference");
32271@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32272 return;
32273 }
32274 #endif
32275+
32276+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32277+ if (pax_is_fetch_fault(regs, error_code, address)) {
32278+
32279+#ifdef CONFIG_PAX_EMUTRAMP
32280+ switch (pax_handle_fetch_fault(regs)) {
32281+ case 2:
32282+ return;
32283+ }
32284+#endif
32285+
32286+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32287+ do_group_exit(SIGKILL);
32288+ }
32289+#endif
32290+
32291 /* Kernel addresses are always protection faults: */
32292 if (address >= TASK_SIZE)
32293 error_code |= PF_PROT;
32294@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32295 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32296 printk(KERN_ERR
32297 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32298- tsk->comm, tsk->pid, address);
32299+ tsk->comm, task_pid_nr(tsk), address);
32300 code = BUS_MCEERR_AR;
32301 }
32302 #endif
32303@@ -916,6 +1028,107 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32304 return 1;
32305 }
32306
32307+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32308+static inline unsigned long get_limit(unsigned long segment)
32309+{
32310+ unsigned long __limit;
32311+
32312+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
32313+ return __limit + 1;
32314+}
32315+
32316+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32317+{
32318+ pte_t *pte;
32319+ pmd_t *pmd;
32320+ spinlock_t *ptl;
32321+ unsigned char pte_mask;
32322+
32323+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32324+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32325+ return 0;
32326+
32327+ /* PaX: it's our fault, let's handle it if we can */
32328+
32329+ /* PaX: take a look at read faults before acquiring any locks */
32330+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32331+ /* instruction fetch attempt from a protected page in user mode */
32332+ up_read(&mm->mmap_sem);
32333+
32334+#ifdef CONFIG_PAX_EMUTRAMP
32335+ switch (pax_handle_fetch_fault(regs)) {
32336+ case 2:
32337+ return 1;
32338+ }
32339+#endif
32340+
32341+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32342+ do_group_exit(SIGKILL);
32343+ }
32344+
32345+ pmd = pax_get_pmd(mm, address);
32346+ if (unlikely(!pmd))
32347+ return 0;
32348+
32349+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32350+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32351+ pte_unmap_unlock(pte, ptl);
32352+ return 0;
32353+ }
32354+
32355+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32356+ /* write attempt to a protected page in user mode */
32357+ pte_unmap_unlock(pte, ptl);
32358+ return 0;
32359+ }
32360+
32361+#ifdef CONFIG_SMP
32362+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
32363+#else
32364+ if (likely(address > get_limit(regs->cs)))
32365+#endif
32366+ {
32367+ set_pte(pte, pte_mkread(*pte));
32368+ __flush_tlb_one(address);
32369+ pte_unmap_unlock(pte, ptl);
32370+ up_read(&mm->mmap_sem);
32371+ return 1;
32372+ }
32373+
32374+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32375+
32376+ /*
32377+ * PaX: fill DTLB with user rights and retry
32378+ */
32379+ __asm__ __volatile__ (
32380+ "orb %2,(%1)\n"
32381+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32382+/*
32383+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32384+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32385+ * page fault when examined during a TLB load attempt. this is true not only
32386+ * for PTEs holding a non-present entry but also present entries that will
32387+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32388+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32389+ * for our target pages since their PTEs are simply not in the TLBs at all.
32390+
32391+ * the best thing in omitting it is that we gain around 15-20% speed in the
32392+ * fast path of the page fault handler and can get rid of tracing since we
32393+ * can no longer flush unintended entries.
32394+ */
32395+ "invlpg (%0)\n"
32396+#endif
32397+ __copyuser_seg"testb $0,(%0)\n"
32398+ "xorb %3,(%1)\n"
32399+ :
32400+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32401+ : "memory", "cc");
32402+ pte_unmap_unlock(pte, ptl);
32403+ up_read(&mm->mmap_sem);
32404+ return 1;
32405+}
32406+#endif
32407+
32408 /*
32409 * Handle a spurious fault caused by a stale TLB entry.
32410 *
32411@@ -1001,6 +1214,9 @@ int show_unhandled_signals = 1;
32412 static inline int
32413 access_error(unsigned long error_code, struct vm_area_struct *vma)
32414 {
32415+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32416+ return 1;
32417+
32418 if (error_code & PF_WRITE) {
32419 /* write, present and write, not present: */
32420 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32421@@ -1063,6 +1279,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32422 tsk = current;
32423 mm = tsk->mm;
32424
32425+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32426+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32427+ if (!search_exception_tables(regs->ip)) {
32428+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32429+ bad_area_nosemaphore(regs, error_code, address);
32430+ return;
32431+ }
32432+ if (address < pax_user_shadow_base) {
32433+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32434+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32435+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32436+ } else
32437+ address -= pax_user_shadow_base;
32438+ }
32439+#endif
32440+
32441 /*
32442 * Detect and handle instructions that would cause a page fault for
32443 * both a tracked kernel page and a userspace page.
32444@@ -1187,6 +1419,11 @@ retry:
32445 might_sleep();
32446 }
32447
32448+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32449+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32450+ return;
32451+#endif
32452+
32453 vma = find_vma(mm, address);
32454 if (unlikely(!vma)) {
32455 bad_area(regs, error_code, address);
32456@@ -1198,18 +1435,24 @@ retry:
32457 bad_area(regs, error_code, address);
32458 return;
32459 }
32460- if (error_code & PF_USER) {
32461- /*
32462- * Accessing the stack below %sp is always a bug.
32463- * The large cushion allows instructions like enter
32464- * and pusha to work. ("enter $65535, $31" pushes
32465- * 32 pointers and then decrements %sp by 65535.)
32466- */
32467- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32468- bad_area(regs, error_code, address);
32469- return;
32470- }
32471+ /*
32472+ * Accessing the stack below %sp is always a bug.
32473+ * The large cushion allows instructions like enter
32474+ * and pusha to work. ("enter $65535, $31" pushes
32475+ * 32 pointers and then decrements %sp by 65535.)
32476+ */
32477+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32478+ bad_area(regs, error_code, address);
32479+ return;
32480 }
32481+
32482+#ifdef CONFIG_PAX_SEGMEXEC
32483+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32484+ bad_area(regs, error_code, address);
32485+ return;
32486+ }
32487+#endif
32488+
32489 if (unlikely(expand_stack(vma, address))) {
32490 bad_area(regs, error_code, address);
32491 return;
32492@@ -1329,3 +1572,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32493 }
32494 NOKPROBE_SYMBOL(trace_do_page_fault);
32495 #endif /* CONFIG_TRACING */
32496+
32497+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32498+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32499+{
32500+ struct mm_struct *mm = current->mm;
32501+ unsigned long ip = regs->ip;
32502+
32503+ if (v8086_mode(regs))
32504+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32505+
32506+#ifdef CONFIG_PAX_PAGEEXEC
32507+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32508+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32509+ return true;
32510+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32511+ return true;
32512+ return false;
32513+ }
32514+#endif
32515+
32516+#ifdef CONFIG_PAX_SEGMEXEC
32517+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32518+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32519+ return true;
32520+ return false;
32521+ }
32522+#endif
32523+
32524+ return false;
32525+}
32526+#endif
32527+
32528+#ifdef CONFIG_PAX_EMUTRAMP
32529+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32530+{
32531+ int err;
32532+
32533+ do { /* PaX: libffi trampoline emulation */
32534+ unsigned char mov, jmp;
32535+ unsigned int addr1, addr2;
32536+
32537+#ifdef CONFIG_X86_64
32538+ if ((regs->ip + 9) >> 32)
32539+ break;
32540+#endif
32541+
32542+ err = get_user(mov, (unsigned char __user *)regs->ip);
32543+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32544+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32545+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32546+
32547+ if (err)
32548+ break;
32549+
32550+ if (mov == 0xB8 && jmp == 0xE9) {
32551+ regs->ax = addr1;
32552+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32553+ return 2;
32554+ }
32555+ } while (0);
32556+
32557+ do { /* PaX: gcc trampoline emulation #1 */
32558+ unsigned char mov1, mov2;
32559+ unsigned short jmp;
32560+ unsigned int addr1, addr2;
32561+
32562+#ifdef CONFIG_X86_64
32563+ if ((regs->ip + 11) >> 32)
32564+ break;
32565+#endif
32566+
32567+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32568+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32569+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32570+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32571+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32572+
32573+ if (err)
32574+ break;
32575+
32576+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32577+ regs->cx = addr1;
32578+ regs->ax = addr2;
32579+ regs->ip = addr2;
32580+ return 2;
32581+ }
32582+ } while (0);
32583+
32584+ do { /* PaX: gcc trampoline emulation #2 */
32585+ unsigned char mov, jmp;
32586+ unsigned int addr1, addr2;
32587+
32588+#ifdef CONFIG_X86_64
32589+ if ((regs->ip + 9) >> 32)
32590+ break;
32591+#endif
32592+
32593+ err = get_user(mov, (unsigned char __user *)regs->ip);
32594+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32595+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32596+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32597+
32598+ if (err)
32599+ break;
32600+
32601+ if (mov == 0xB9 && jmp == 0xE9) {
32602+ regs->cx = addr1;
32603+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32604+ return 2;
32605+ }
32606+ } while (0);
32607+
32608+ return 1; /* PaX in action */
32609+}
32610+
32611+#ifdef CONFIG_X86_64
32612+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32613+{
32614+ int err;
32615+
32616+ do { /* PaX: libffi trampoline emulation */
32617+ unsigned short mov1, mov2, jmp1;
32618+ unsigned char stcclc, jmp2;
32619+ unsigned long addr1, addr2;
32620+
32621+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32622+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32623+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32624+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32625+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32626+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32627+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32628+
32629+ if (err)
32630+ break;
32631+
32632+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32633+ regs->r11 = addr1;
32634+ regs->r10 = addr2;
32635+ if (stcclc == 0xF8)
32636+ regs->flags &= ~X86_EFLAGS_CF;
32637+ else
32638+ regs->flags |= X86_EFLAGS_CF;
32639+ regs->ip = addr1;
32640+ return 2;
32641+ }
32642+ } while (0);
32643+
32644+ do { /* PaX: gcc trampoline emulation #1 */
32645+ unsigned short mov1, mov2, jmp1;
32646+ unsigned char jmp2;
32647+ unsigned int addr1;
32648+ unsigned long addr2;
32649+
32650+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32651+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32652+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32653+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32654+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32655+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32656+
32657+ if (err)
32658+ break;
32659+
32660+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32661+ regs->r11 = addr1;
32662+ regs->r10 = addr2;
32663+ regs->ip = addr1;
32664+ return 2;
32665+ }
32666+ } while (0);
32667+
32668+ do { /* PaX: gcc trampoline emulation #2 */
32669+ unsigned short mov1, mov2, jmp1;
32670+ unsigned char jmp2;
32671+ unsigned long addr1, addr2;
32672+
32673+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32674+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32675+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32676+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32677+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32678+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32679+
32680+ if (err)
32681+ break;
32682+
32683+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32684+ regs->r11 = addr1;
32685+ regs->r10 = addr2;
32686+ regs->ip = addr1;
32687+ return 2;
32688+ }
32689+ } while (0);
32690+
32691+ return 1; /* PaX in action */
32692+}
32693+#endif
32694+
32695+/*
32696+ * PaX: decide what to do with offenders (regs->ip = fault address)
32697+ *
32698+ * returns 1 when task should be killed
32699+ * 2 when gcc trampoline was detected
32700+ */
32701+static int pax_handle_fetch_fault(struct pt_regs *regs)
32702+{
32703+ if (v8086_mode(regs))
32704+ return 1;
32705+
32706+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32707+ return 1;
32708+
32709+#ifdef CONFIG_X86_32
32710+ return pax_handle_fetch_fault_32(regs);
32711+#else
32712+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32713+ return pax_handle_fetch_fault_32(regs);
32714+ else
32715+ return pax_handle_fetch_fault_64(regs);
32716+#endif
32717+}
32718+#endif
32719+
32720+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32721+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32722+{
32723+ long i;
32724+
32725+ printk(KERN_ERR "PAX: bytes at PC: ");
32726+ for (i = 0; i < 20; i++) {
32727+ unsigned char c;
32728+ if (get_user(c, (unsigned char __force_user *)pc+i))
32729+ printk(KERN_CONT "?? ");
32730+ else
32731+ printk(KERN_CONT "%02x ", c);
32732+ }
32733+ printk("\n");
32734+
32735+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32736+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32737+ unsigned long c;
32738+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32739+#ifdef CONFIG_X86_32
32740+ printk(KERN_CONT "???????? ");
32741+#else
32742+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32743+ printk(KERN_CONT "???????? ???????? ");
32744+ else
32745+ printk(KERN_CONT "???????????????? ");
32746+#endif
32747+ } else {
32748+#ifdef CONFIG_X86_64
32749+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32750+ printk(KERN_CONT "%08x ", (unsigned int)c);
32751+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32752+ } else
32753+#endif
32754+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32755+ }
32756+ }
32757+ printk("\n");
32758+}
32759+#endif
32760+
32761+/**
32762+ * probe_kernel_write(): safely attempt to write to a location
32763+ * @dst: address to write to
32764+ * @src: pointer to the data that shall be written
32765+ * @size: size of the data chunk
32766+ *
32767+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32768+ * happens, handle that and return -EFAULT.
32769+ */
32770+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32771+{
32772+ long ret;
32773+ mm_segment_t old_fs = get_fs();
32774+
32775+ set_fs(KERNEL_DS);
32776+ pagefault_disable();
32777+ pax_open_kernel();
32778+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32779+ pax_close_kernel();
32780+ pagefault_enable();
32781+ set_fs(old_fs);
32782+
32783+ return ret ? -EFAULT : 0;
32784+}
32785diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32786index 81bf3d2..7ef25c2 100644
32787--- a/arch/x86/mm/gup.c
32788+++ b/arch/x86/mm/gup.c
32789@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32790 addr = start;
32791 len = (unsigned long) nr_pages << PAGE_SHIFT;
32792 end = start + len;
32793- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32794+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32795 (void __user *)start, len)))
32796 return 0;
32797
32798@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32799 goto slow_irqon;
32800 #endif
32801
32802+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32803+ (void __user *)start, len)))
32804+ return 0;
32805+
32806 /*
32807 * XXX: batch / limit 'nr', to avoid large irq off latency
32808 * needs some instrumenting to determine the common sizes used by
32809diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32810index 4500142..53a363c 100644
32811--- a/arch/x86/mm/highmem_32.c
32812+++ b/arch/x86/mm/highmem_32.c
32813@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32814 idx = type + KM_TYPE_NR*smp_processor_id();
32815 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32816 BUG_ON(!pte_none(*(kmap_pte-idx)));
32817+
32818+ pax_open_kernel();
32819 set_pte(kmap_pte-idx, mk_pte(page, prot));
32820+ pax_close_kernel();
32821+
32822 arch_flush_lazy_mmu_mode();
32823
32824 return (void *)vaddr;
32825diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32826index 42982b2..7168fc3 100644
32827--- a/arch/x86/mm/hugetlbpage.c
32828+++ b/arch/x86/mm/hugetlbpage.c
32829@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32830 #ifdef CONFIG_HUGETLB_PAGE
32831 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32832 unsigned long addr, unsigned long len,
32833- unsigned long pgoff, unsigned long flags)
32834+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32835 {
32836 struct hstate *h = hstate_file(file);
32837 struct vm_unmapped_area_info info;
32838-
32839+
32840 info.flags = 0;
32841 info.length = len;
32842 info.low_limit = current->mm->mmap_legacy_base;
32843 info.high_limit = TASK_SIZE;
32844 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32845 info.align_offset = 0;
32846+ info.threadstack_offset = offset;
32847 return vm_unmapped_area(&info);
32848 }
32849
32850 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32851 unsigned long addr0, unsigned long len,
32852- unsigned long pgoff, unsigned long flags)
32853+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32854 {
32855 struct hstate *h = hstate_file(file);
32856 struct vm_unmapped_area_info info;
32857@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32858 info.high_limit = current->mm->mmap_base;
32859 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32860 info.align_offset = 0;
32861+ info.threadstack_offset = offset;
32862 addr = vm_unmapped_area(&info);
32863
32864 /*
32865@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32866 VM_BUG_ON(addr != -ENOMEM);
32867 info.flags = 0;
32868 info.low_limit = TASK_UNMAPPED_BASE;
32869+
32870+#ifdef CONFIG_PAX_RANDMMAP
32871+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32872+ info.low_limit += current->mm->delta_mmap;
32873+#endif
32874+
32875 info.high_limit = TASK_SIZE;
32876 addr = vm_unmapped_area(&info);
32877 }
32878@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32879 struct hstate *h = hstate_file(file);
32880 struct mm_struct *mm = current->mm;
32881 struct vm_area_struct *vma;
32882+ unsigned long pax_task_size = TASK_SIZE;
32883+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32884
32885 if (len & ~huge_page_mask(h))
32886 return -EINVAL;
32887- if (len > TASK_SIZE)
32888+
32889+#ifdef CONFIG_PAX_SEGMEXEC
32890+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32891+ pax_task_size = SEGMEXEC_TASK_SIZE;
32892+#endif
32893+
32894+ pax_task_size -= PAGE_SIZE;
32895+
32896+ if (len > pax_task_size)
32897 return -ENOMEM;
32898
32899 if (flags & MAP_FIXED) {
32900@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32901 return addr;
32902 }
32903
32904+#ifdef CONFIG_PAX_RANDMMAP
32905+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32906+#endif
32907+
32908 if (addr) {
32909 addr = ALIGN(addr, huge_page_size(h));
32910 vma = find_vma(mm, addr);
32911- if (TASK_SIZE - len >= addr &&
32912- (!vma || addr + len <= vma->vm_start))
32913+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32914 return addr;
32915 }
32916 if (mm->get_unmapped_area == arch_get_unmapped_area)
32917 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32918- pgoff, flags);
32919+ pgoff, flags, offset);
32920 else
32921 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32922- pgoff, flags);
32923+ pgoff, flags, offset);
32924 }
32925 #endif /* CONFIG_HUGETLB_PAGE */
32926
32927diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32928index 1d55318..d58fd6a 100644
32929--- a/arch/x86/mm/init.c
32930+++ b/arch/x86/mm/init.c
32931@@ -4,6 +4,7 @@
32932 #include <linux/swap.h>
32933 #include <linux/memblock.h>
32934 #include <linux/bootmem.h> /* for max_low_pfn */
32935+#include <linux/tboot.h>
32936
32937 #include <asm/cacheflush.h>
32938 #include <asm/e820.h>
32939@@ -17,6 +18,8 @@
32940 #include <asm/proto.h>
32941 #include <asm/dma.h> /* for MAX_DMA_PFN */
32942 #include <asm/microcode.h>
32943+#include <asm/desc.h>
32944+#include <asm/bios_ebda.h>
32945
32946 /*
32947 * We need to define the tracepoints somewhere, and tlb.c
32948@@ -615,7 +618,18 @@ void __init init_mem_mapping(void)
32949 early_ioremap_page_table_range_init();
32950 #endif
32951
32952+#ifdef CONFIG_PAX_PER_CPU_PGD
32953+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32954+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32955+ KERNEL_PGD_PTRS);
32956+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32957+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32958+ KERNEL_PGD_PTRS);
32959+ load_cr3(get_cpu_pgd(0, kernel));
32960+#else
32961 load_cr3(swapper_pg_dir);
32962+#endif
32963+
32964 __flush_tlb_all();
32965
32966 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32967@@ -631,10 +645,40 @@ void __init init_mem_mapping(void)
32968 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32969 * mmio resources as well as potential bios/acpi data regions.
32970 */
32971+
32972+#ifdef CONFIG_GRKERNSEC_KMEM
32973+static unsigned int ebda_start __read_only;
32974+static unsigned int ebda_end __read_only;
32975+#endif
32976+
32977 int devmem_is_allowed(unsigned long pagenr)
32978 {
32979- if (pagenr < 256)
32980+#ifdef CONFIG_GRKERNSEC_KMEM
32981+ /* allow BDA */
32982+ if (!pagenr)
32983 return 1;
32984+ /* allow EBDA */
32985+ if (pagenr >= ebda_start && pagenr < ebda_end)
32986+ return 1;
32987+ /* if tboot is in use, allow access to its hardcoded serial log range */
32988+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32989+ return 1;
32990+#else
32991+ if (!pagenr)
32992+ return 1;
32993+#ifdef CONFIG_VM86
32994+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32995+ return 1;
32996+#endif
32997+#endif
32998+
32999+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
33000+ return 1;
33001+#ifdef CONFIG_GRKERNSEC_KMEM
33002+ /* throw out everything else below 1MB */
33003+ if (pagenr <= 256)
33004+ return 0;
33005+#endif
33006 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
33007 return 0;
33008 if (!page_is_ram(pagenr))
33009@@ -680,8 +724,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
33010 #endif
33011 }
33012
33013+#ifdef CONFIG_GRKERNSEC_KMEM
33014+static inline void gr_init_ebda(void)
33015+{
33016+ unsigned int ebda_addr;
33017+ unsigned int ebda_size = 0;
33018+
33019+ ebda_addr = get_bios_ebda();
33020+ if (ebda_addr) {
33021+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
33022+ ebda_size <<= 10;
33023+ }
33024+ if (ebda_addr && ebda_size) {
33025+ ebda_start = ebda_addr >> PAGE_SHIFT;
33026+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
33027+ } else {
33028+ ebda_start = 0x9f000 >> PAGE_SHIFT;
33029+ ebda_end = 0xa0000 >> PAGE_SHIFT;
33030+ }
33031+}
33032+#else
33033+static inline void gr_init_ebda(void) { }
33034+#endif
33035+
33036 void free_initmem(void)
33037 {
33038+#ifdef CONFIG_PAX_KERNEXEC
33039+#ifdef CONFIG_X86_32
33040+ /* PaX: limit KERNEL_CS to actual size */
33041+ unsigned long addr, limit;
33042+ struct desc_struct d;
33043+ int cpu;
33044+#else
33045+ pgd_t *pgd;
33046+ pud_t *pud;
33047+ pmd_t *pmd;
33048+ unsigned long addr, end;
33049+#endif
33050+#endif
33051+
33052+ gr_init_ebda();
33053+
33054+#ifdef CONFIG_PAX_KERNEXEC
33055+#ifdef CONFIG_X86_32
33056+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
33057+ limit = (limit - 1UL) >> PAGE_SHIFT;
33058+
33059+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
33060+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
33061+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
33062+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
33063+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
33064+ }
33065+
33066+ /* PaX: make KERNEL_CS read-only */
33067+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
33068+ if (!paravirt_enabled())
33069+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
33070+/*
33071+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
33072+ pgd = pgd_offset_k(addr);
33073+ pud = pud_offset(pgd, addr);
33074+ pmd = pmd_offset(pud, addr);
33075+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33076+ }
33077+*/
33078+#ifdef CONFIG_X86_PAE
33079+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
33080+/*
33081+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
33082+ pgd = pgd_offset_k(addr);
33083+ pud = pud_offset(pgd, addr);
33084+ pmd = pmd_offset(pud, addr);
33085+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
33086+ }
33087+*/
33088+#endif
33089+
33090+#ifdef CONFIG_MODULES
33091+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
33092+#endif
33093+
33094+#else
33095+ /* PaX: make kernel code/rodata read-only, rest non-executable */
33096+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
33097+ pgd = pgd_offset_k(addr);
33098+ pud = pud_offset(pgd, addr);
33099+ pmd = pmd_offset(pud, addr);
33100+ if (!pmd_present(*pmd))
33101+ continue;
33102+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
33103+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33104+ else
33105+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
33106+ }
33107+
33108+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
33109+ end = addr + KERNEL_IMAGE_SIZE;
33110+ for (; addr < end; addr += PMD_SIZE) {
33111+ pgd = pgd_offset_k(addr);
33112+ pud = pud_offset(pgd, addr);
33113+ pmd = pmd_offset(pud, addr);
33114+ if (!pmd_present(*pmd))
33115+ continue;
33116+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
33117+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
33118+ }
33119+#endif
33120+
33121+ flush_tlb_all();
33122+#endif
33123+
33124 free_init_pages("unused kernel",
33125 (unsigned long)(&__init_begin),
33126 (unsigned long)(&__init_end));
33127diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
33128index c8140e1..59257fc 100644
33129--- a/arch/x86/mm/init_32.c
33130+++ b/arch/x86/mm/init_32.c
33131@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
33132 bool __read_mostly __vmalloc_start_set = false;
33133
33134 /*
33135- * Creates a middle page table and puts a pointer to it in the
33136- * given global directory entry. This only returns the gd entry
33137- * in non-PAE compilation mode, since the middle layer is folded.
33138- */
33139-static pmd_t * __init one_md_table_init(pgd_t *pgd)
33140-{
33141- pud_t *pud;
33142- pmd_t *pmd_table;
33143-
33144-#ifdef CONFIG_X86_PAE
33145- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
33146- pmd_table = (pmd_t *)alloc_low_page();
33147- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
33148- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
33149- pud = pud_offset(pgd, 0);
33150- BUG_ON(pmd_table != pmd_offset(pud, 0));
33151-
33152- return pmd_table;
33153- }
33154-#endif
33155- pud = pud_offset(pgd, 0);
33156- pmd_table = pmd_offset(pud, 0);
33157-
33158- return pmd_table;
33159-}
33160-
33161-/*
33162 * Create a page table and place a pointer to it in a middle page
33163 * directory entry:
33164 */
33165@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
33166 pte_t *page_table = (pte_t *)alloc_low_page();
33167
33168 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33169+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33170+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33171+#else
33172 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33173+#endif
33174 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33175 }
33176
33177 return pte_offset_kernel(pmd, 0);
33178 }
33179
33180+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33181+{
33182+ pud_t *pud;
33183+ pmd_t *pmd_table;
33184+
33185+ pud = pud_offset(pgd, 0);
33186+ pmd_table = pmd_offset(pud, 0);
33187+
33188+ return pmd_table;
33189+}
33190+
33191 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33192 {
33193 int pgd_idx = pgd_index(vaddr);
33194@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33195 int pgd_idx, pmd_idx;
33196 unsigned long vaddr;
33197 pgd_t *pgd;
33198+ pud_t *pud;
33199 pmd_t *pmd;
33200 pte_t *pte = NULL;
33201 unsigned long count = page_table_range_init_count(start, end);
33202@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33203 pgd = pgd_base + pgd_idx;
33204
33205 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33206- pmd = one_md_table_init(pgd);
33207- pmd = pmd + pmd_index(vaddr);
33208+ pud = pud_offset(pgd, vaddr);
33209+ pmd = pmd_offset(pud, vaddr);
33210+
33211+#ifdef CONFIG_X86_PAE
33212+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33213+#endif
33214+
33215 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33216 pmd++, pmd_idx++) {
33217 pte = page_table_kmap_check(one_page_table_init(pmd),
33218@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33219 }
33220 }
33221
33222-static inline int is_kernel_text(unsigned long addr)
33223+static inline int is_kernel_text(unsigned long start, unsigned long end)
33224 {
33225- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33226- return 1;
33227- return 0;
33228+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33229+ end <= ktla_ktva((unsigned long)_stext)) &&
33230+ (start >= ktla_ktva((unsigned long)_einittext) ||
33231+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33232+
33233+#ifdef CONFIG_ACPI_SLEEP
33234+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33235+#endif
33236+
33237+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33238+ return 0;
33239+ return 1;
33240 }
33241
33242 /*
33243@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33244 unsigned long last_map_addr = end;
33245 unsigned long start_pfn, end_pfn;
33246 pgd_t *pgd_base = swapper_pg_dir;
33247- int pgd_idx, pmd_idx, pte_ofs;
33248+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33249 unsigned long pfn;
33250 pgd_t *pgd;
33251+ pud_t *pud;
33252 pmd_t *pmd;
33253 pte_t *pte;
33254 unsigned pages_2m, pages_4k;
33255@@ -291,8 +295,13 @@ repeat:
33256 pfn = start_pfn;
33257 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33258 pgd = pgd_base + pgd_idx;
33259- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33260- pmd = one_md_table_init(pgd);
33261+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33262+ pud = pud_offset(pgd, 0);
33263+ pmd = pmd_offset(pud, 0);
33264+
33265+#ifdef CONFIG_X86_PAE
33266+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33267+#endif
33268
33269 if (pfn >= end_pfn)
33270 continue;
33271@@ -304,14 +313,13 @@ repeat:
33272 #endif
33273 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33274 pmd++, pmd_idx++) {
33275- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33276+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33277
33278 /*
33279 * Map with big pages if possible, otherwise
33280 * create normal page tables:
33281 */
33282 if (use_pse) {
33283- unsigned int addr2;
33284 pgprot_t prot = PAGE_KERNEL_LARGE;
33285 /*
33286 * first pass will use the same initial
33287@@ -322,11 +330,7 @@ repeat:
33288 _PAGE_PSE);
33289
33290 pfn &= PMD_MASK >> PAGE_SHIFT;
33291- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33292- PAGE_OFFSET + PAGE_SIZE-1;
33293-
33294- if (is_kernel_text(addr) ||
33295- is_kernel_text(addr2))
33296+ if (is_kernel_text(address, address + PMD_SIZE))
33297 prot = PAGE_KERNEL_LARGE_EXEC;
33298
33299 pages_2m++;
33300@@ -343,7 +347,7 @@ repeat:
33301 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33302 pte += pte_ofs;
33303 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33304- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33305+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33306 pgprot_t prot = PAGE_KERNEL;
33307 /*
33308 * first pass will use the same initial
33309@@ -351,7 +355,7 @@ repeat:
33310 */
33311 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33312
33313- if (is_kernel_text(addr))
33314+ if (is_kernel_text(address, address + PAGE_SIZE))
33315 prot = PAGE_KERNEL_EXEC;
33316
33317 pages_4k++;
33318@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33319
33320 pud = pud_offset(pgd, va);
33321 pmd = pmd_offset(pud, va);
33322- if (!pmd_present(*pmd))
33323+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33324 break;
33325
33326 /* should not be large page here */
33327@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33328
33329 static void __init pagetable_init(void)
33330 {
33331- pgd_t *pgd_base = swapper_pg_dir;
33332-
33333- permanent_kmaps_init(pgd_base);
33334+ permanent_kmaps_init(swapper_pg_dir);
33335 }
33336
33337-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33338+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33339 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33340
33341 /* user-defined highmem size */
33342@@ -787,10 +789,10 @@ void __init mem_init(void)
33343 ((unsigned long)&__init_end -
33344 (unsigned long)&__init_begin) >> 10,
33345
33346- (unsigned long)&_etext, (unsigned long)&_edata,
33347- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33348+ (unsigned long)&_sdata, (unsigned long)&_edata,
33349+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33350
33351- (unsigned long)&_text, (unsigned long)&_etext,
33352+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33353 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33354
33355 /*
33356@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33357 if (!kernel_set_to_readonly)
33358 return;
33359
33360+ start = ktla_ktva(start);
33361 pr_debug("Set kernel text: %lx - %lx for read write\n",
33362 start, start+size);
33363
33364@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33365 if (!kernel_set_to_readonly)
33366 return;
33367
33368+ start = ktla_ktva(start);
33369 pr_debug("Set kernel text: %lx - %lx for read only\n",
33370 start, start+size);
33371
33372@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33373 unsigned long start = PFN_ALIGN(_text);
33374 unsigned long size = PFN_ALIGN(_etext) - start;
33375
33376+ start = ktla_ktva(start);
33377 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33378 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33379 size >> 10);
33380diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33381index 3fba623..5ee9802 100644
33382--- a/arch/x86/mm/init_64.c
33383+++ b/arch/x86/mm/init_64.c
33384@@ -136,7 +136,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
33385 * around without checking the pgd every time.
33386 */
33387
33388-pteval_t __supported_pte_mask __read_mostly = ~0;
33389+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33390 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33391
33392 int force_personality32;
33393@@ -169,7 +169,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33394
33395 for (address = start; address <= end; address += PGDIR_SIZE) {
33396 const pgd_t *pgd_ref = pgd_offset_k(address);
33397+
33398+#ifdef CONFIG_PAX_PER_CPU_PGD
33399+ unsigned long cpu;
33400+#else
33401 struct page *page;
33402+#endif
33403
33404 /*
33405 * When it is called after memory hot remove, pgd_none()
33406@@ -180,6 +185,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33407 continue;
33408
33409 spin_lock(&pgd_lock);
33410+
33411+#ifdef CONFIG_PAX_PER_CPU_PGD
33412+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33413+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33414+
33415+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33416+ BUG_ON(pgd_page_vaddr(*pgd)
33417+ != pgd_page_vaddr(*pgd_ref));
33418+
33419+ if (removed) {
33420+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33421+ pgd_clear(pgd);
33422+ } else {
33423+ if (pgd_none(*pgd))
33424+ set_pgd(pgd, *pgd_ref);
33425+ }
33426+
33427+ pgd = pgd_offset_cpu(cpu, kernel, address);
33428+#else
33429 list_for_each_entry(page, &pgd_list, lru) {
33430 pgd_t *pgd;
33431 spinlock_t *pgt_lock;
33432@@ -188,6 +212,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33433 /* the pgt_lock only for Xen */
33434 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33435 spin_lock(pgt_lock);
33436+#endif
33437
33438 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33439 BUG_ON(pgd_page_vaddr(*pgd)
33440@@ -201,7 +226,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33441 set_pgd(pgd, *pgd_ref);
33442 }
33443
33444+#ifndef CONFIG_PAX_PER_CPU_PGD
33445 spin_unlock(pgt_lock);
33446+#endif
33447+
33448 }
33449 spin_unlock(&pgd_lock);
33450 }
33451@@ -234,7 +262,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33452 {
33453 if (pgd_none(*pgd)) {
33454 pud_t *pud = (pud_t *)spp_getpage();
33455- pgd_populate(&init_mm, pgd, pud);
33456+ pgd_populate_kernel(&init_mm, pgd, pud);
33457 if (pud != pud_offset(pgd, 0))
33458 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33459 pud, pud_offset(pgd, 0));
33460@@ -246,7 +274,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33461 {
33462 if (pud_none(*pud)) {
33463 pmd_t *pmd = (pmd_t *) spp_getpage();
33464- pud_populate(&init_mm, pud, pmd);
33465+ pud_populate_kernel(&init_mm, pud, pmd);
33466 if (pmd != pmd_offset(pud, 0))
33467 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33468 pmd, pmd_offset(pud, 0));
33469@@ -275,7 +303,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33470 pmd = fill_pmd(pud, vaddr);
33471 pte = fill_pte(pmd, vaddr);
33472
33473+ pax_open_kernel();
33474 set_pte(pte, new_pte);
33475+ pax_close_kernel();
33476
33477 /*
33478 * It's enough to flush this one mapping.
33479@@ -337,14 +367,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33480 pgd = pgd_offset_k((unsigned long)__va(phys));
33481 if (pgd_none(*pgd)) {
33482 pud = (pud_t *) spp_getpage();
33483- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33484- _PAGE_USER));
33485+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33486 }
33487 pud = pud_offset(pgd, (unsigned long)__va(phys));
33488 if (pud_none(*pud)) {
33489 pmd = (pmd_t *) spp_getpage();
33490- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33491- _PAGE_USER));
33492+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33493 }
33494 pmd = pmd_offset(pud, phys);
33495 BUG_ON(!pmd_none(*pmd));
33496@@ -585,7 +613,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33497 prot);
33498
33499 spin_lock(&init_mm.page_table_lock);
33500- pud_populate(&init_mm, pud, pmd);
33501+ pud_populate_kernel(&init_mm, pud, pmd);
33502 spin_unlock(&init_mm.page_table_lock);
33503 }
33504 __flush_tlb_all();
33505@@ -626,7 +654,7 @@ kernel_physical_mapping_init(unsigned long start,
33506 page_size_mask);
33507
33508 spin_lock(&init_mm.page_table_lock);
33509- pgd_populate(&init_mm, pgd, pud);
33510+ pgd_populate_kernel(&init_mm, pgd, pud);
33511 spin_unlock(&init_mm.page_table_lock);
33512 pgd_changed = true;
33513 }
33514diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33515index 9ca35fc..4b2b7b7 100644
33516--- a/arch/x86/mm/iomap_32.c
33517+++ b/arch/x86/mm/iomap_32.c
33518@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33519 type = kmap_atomic_idx_push();
33520 idx = type + KM_TYPE_NR * smp_processor_id();
33521 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33522+
33523+ pax_open_kernel();
33524 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33525+ pax_close_kernel();
33526+
33527 arch_flush_lazy_mmu_mode();
33528
33529 return (void *)vaddr;
33530diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33531index 70e7444..75b9a13 100644
33532--- a/arch/x86/mm/ioremap.c
33533+++ b/arch/x86/mm/ioremap.c
33534@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33535 unsigned long i;
33536
33537 for (i = 0; i < nr_pages; ++i)
33538- if (pfn_valid(start_pfn + i) &&
33539- !PageReserved(pfn_to_page(start_pfn + i)))
33540+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33541+ !PageReserved(pfn_to_page(start_pfn + i))))
33542 return 1;
33543
33544 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33545@@ -288,7 +288,7 @@ EXPORT_SYMBOL(ioremap_prot);
33546 *
33547 * Caller must ensure there is only one unmapping for the same pointer.
33548 */
33549-void iounmap(volatile void __iomem *addr)
33550+void iounmap(const volatile void __iomem *addr)
33551 {
33552 struct vm_struct *p, *o;
33553
33554@@ -351,32 +351,36 @@ int arch_ioremap_pmd_supported(void)
33555 */
33556 void *xlate_dev_mem_ptr(phys_addr_t phys)
33557 {
33558- unsigned long start = phys & PAGE_MASK;
33559- unsigned long offset = phys & ~PAGE_MASK;
33560- unsigned long vaddr;
33561+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33562
33563- /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33564- if (page_is_ram(start >> PAGE_SHIFT))
33565- return __va(phys);
33566+ if (page_is_ram(pfn)) {
33567+#ifdef CONFIG_HIGHMEM
33568+ if (pfn >= max_low_pfn)
33569+ return kmap_high(pfn_to_page(pfn));
33570+ else
33571+#endif
33572+ return __va(phys);
33573+ }
33574
33575- vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
33576- /* Only add the offset on success and return NULL if the ioremap() failed: */
33577- if (vaddr)
33578- vaddr += offset;
33579-
33580- return (void *)vaddr;
33581+ return (void __force *)ioremap_cache(phys, 1);
33582 }
33583
33584 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33585 {
33586- if (page_is_ram(phys >> PAGE_SHIFT))
33587+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33588+
33589+ if (page_is_ram(pfn)) {
33590+#ifdef CONFIG_HIGHMEM
33591+ if (pfn >= max_low_pfn)
33592+ kunmap_high(pfn_to_page(pfn));
33593+#endif
33594 return;
33595+ }
33596
33597- iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33598- return;
33599+ iounmap((void __iomem __force *)addr);
33600 }
33601
33602-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33603+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33604
33605 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33606 {
33607@@ -412,8 +416,7 @@ void __init early_ioremap_init(void)
33608 early_ioremap_setup();
33609
33610 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33611- memset(bm_pte, 0, sizeof(bm_pte));
33612- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33613+ pmd_populate_user(&init_mm, pmd, bm_pte);
33614
33615 /*
33616 * The boot-ioremap range spans multiple pmds, for which
33617diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33618index b4f2e7e..96c9c3e 100644
33619--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33620+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33621@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33622 * memory (e.g. tracked pages)? For now, we need this to avoid
33623 * invoking kmemcheck for PnP BIOS calls.
33624 */
33625- if (regs->flags & X86_VM_MASK)
33626+ if (v8086_mode(regs))
33627 return false;
33628- if (regs->cs != __KERNEL_CS)
33629+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33630 return false;
33631
33632 pte = kmemcheck_pte_lookup(address);
33633diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33634index 9d518d6..8a091f5 100644
33635--- a/arch/x86/mm/mmap.c
33636+++ b/arch/x86/mm/mmap.c
33637@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33638 * Leave an at least ~128 MB hole with possible stack randomization.
33639 */
33640 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33641-#define MAX_GAP (TASK_SIZE/6*5)
33642+#define MAX_GAP (pax_task_size/6*5)
33643
33644 static int mmap_is_legacy(void)
33645 {
33646@@ -81,27 +81,40 @@ unsigned long arch_mmap_rnd(void)
33647 return rnd << PAGE_SHIFT;
33648 }
33649
33650-static unsigned long mmap_base(unsigned long rnd)
33651+static unsigned long mmap_base(struct mm_struct *mm, unsigned long rnd)
33652 {
33653 unsigned long gap = rlimit(RLIMIT_STACK);
33654+ unsigned long pax_task_size = TASK_SIZE;
33655+
33656+#ifdef CONFIG_PAX_SEGMEXEC
33657+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33658+ pax_task_size = SEGMEXEC_TASK_SIZE;
33659+#endif
33660
33661 if (gap < MIN_GAP)
33662 gap = MIN_GAP;
33663 else if (gap > MAX_GAP)
33664 gap = MAX_GAP;
33665
33666- return PAGE_ALIGN(TASK_SIZE - gap - rnd);
33667+ return PAGE_ALIGN(pax_task_size - gap - rnd);
33668 }
33669
33670 /*
33671 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33672 * does, but not when emulating X86_32
33673 */
33674-static unsigned long mmap_legacy_base(unsigned long rnd)
33675+static unsigned long mmap_legacy_base(struct mm_struct *mm, unsigned long rnd)
33676 {
33677- if (mmap_is_ia32())
33678+ if (mmap_is_ia32()) {
33679+
33680+#ifdef CONFIG_PAX_SEGMEXEC
33681+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33682+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33683+ else
33684+#endif
33685+
33686 return TASK_UNMAPPED_BASE;
33687- else
33688+ } else
33689 return TASK_UNMAPPED_BASE + rnd;
33690 }
33691
33692@@ -113,16 +126,27 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
33693 {
33694 unsigned long random_factor = 0UL;
33695
33696+#ifdef CONFIG_PAX_RANDMMAP
33697+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33698+#endif
33699 if (current->flags & PF_RANDOMIZE)
33700 random_factor = arch_mmap_rnd();
33701
33702- mm->mmap_legacy_base = mmap_legacy_base(random_factor);
33703+ mm->mmap_legacy_base = mmap_legacy_base(mm, random_factor);
33704
33705 if (mmap_is_legacy()) {
33706 mm->mmap_base = mm->mmap_legacy_base;
33707 mm->get_unmapped_area = arch_get_unmapped_area;
33708 } else {
33709- mm->mmap_base = mmap_base(random_factor);
33710+ mm->mmap_base = mmap_base(mm, random_factor);
33711 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
33712 }
33713+
33714+#ifdef CONFIG_PAX_RANDMMAP
33715+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33716+ mm->mmap_legacy_base += mm->delta_mmap;
33717+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33718+ }
33719+#endif
33720+
33721 }
33722diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33723index 0057a7a..95c7edd 100644
33724--- a/arch/x86/mm/mmio-mod.c
33725+++ b/arch/x86/mm/mmio-mod.c
33726@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33727 break;
33728 default:
33729 {
33730- unsigned char *ip = (unsigned char *)instptr;
33731+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33732 my_trace->opcode = MMIO_UNKNOWN_OP;
33733 my_trace->width = 0;
33734 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33735@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33736 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33737 void __iomem *addr)
33738 {
33739- static atomic_t next_id;
33740+ static atomic_unchecked_t next_id;
33741 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33742 /* These are page-unaligned. */
33743 struct mmiotrace_map map = {
33744@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33745 .private = trace
33746 },
33747 .phys = offset,
33748- .id = atomic_inc_return(&next_id)
33749+ .id = atomic_inc_return_unchecked(&next_id)
33750 };
33751 map.map_id = trace->id;
33752
33753@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33754 ioremap_trace_core(offset, size, addr);
33755 }
33756
33757-static void iounmap_trace_core(volatile void __iomem *addr)
33758+static void iounmap_trace_core(const volatile void __iomem *addr)
33759 {
33760 struct mmiotrace_map map = {
33761 .phys = 0,
33762@@ -328,7 +328,7 @@ not_enabled:
33763 }
33764 }
33765
33766-void mmiotrace_iounmap(volatile void __iomem *addr)
33767+void mmiotrace_iounmap(const volatile void __iomem *addr)
33768 {
33769 might_sleep();
33770 if (is_enabled()) /* recheck and proper locking in *_core() */
33771diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33772index 4053bb5..b1ad3dc 100644
33773--- a/arch/x86/mm/numa.c
33774+++ b/arch/x86/mm/numa.c
33775@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33776 }
33777 }
33778
33779-static int __init numa_register_memblks(struct numa_meminfo *mi)
33780+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33781 {
33782 unsigned long uninitialized_var(pfn_align);
33783 int i, nid;
33784diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33785index 89af288..05381957 100644
33786--- a/arch/x86/mm/pageattr.c
33787+++ b/arch/x86/mm/pageattr.c
33788@@ -260,7 +260,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33789 */
33790 #ifdef CONFIG_PCI_BIOS
33791 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33792- pgprot_val(forbidden) |= _PAGE_NX;
33793+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33794 #endif
33795
33796 /*
33797@@ -268,9 +268,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33798 * Does not cover __inittext since that is gone later on. On
33799 * 64bit we do not enforce !NX on the low mapping
33800 */
33801- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33802- pgprot_val(forbidden) |= _PAGE_NX;
33803+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33804+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33805
33806+#ifdef CONFIG_DEBUG_RODATA
33807 /*
33808 * The .rodata section needs to be read-only. Using the pfn
33809 * catches all aliases.
33810@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33811 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33812 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33813 pgprot_val(forbidden) |= _PAGE_RW;
33814+#endif
33815
33816 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33817 /*
33818@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33819 }
33820 #endif
33821
33822+#ifdef CONFIG_PAX_KERNEXEC
33823+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33824+ pgprot_val(forbidden) |= _PAGE_RW;
33825+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33826+ }
33827+#endif
33828+
33829 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33830
33831 return prot;
33832@@ -438,23 +447,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33833 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33834 {
33835 /* change init_mm */
33836+ pax_open_kernel();
33837 set_pte_atomic(kpte, pte);
33838+
33839 #ifdef CONFIG_X86_32
33840 if (!SHARED_KERNEL_PMD) {
33841+
33842+#ifdef CONFIG_PAX_PER_CPU_PGD
33843+ unsigned long cpu;
33844+#else
33845 struct page *page;
33846+#endif
33847
33848+#ifdef CONFIG_PAX_PER_CPU_PGD
33849+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33850+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33851+#else
33852 list_for_each_entry(page, &pgd_list, lru) {
33853- pgd_t *pgd;
33854+ pgd_t *pgd = (pgd_t *)page_address(page);
33855+#endif
33856+
33857 pud_t *pud;
33858 pmd_t *pmd;
33859
33860- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33861+ pgd += pgd_index(address);
33862 pud = pud_offset(pgd, address);
33863 pmd = pmd_offset(pud, address);
33864 set_pte_atomic((pte_t *)pmd, pte);
33865 }
33866 }
33867 #endif
33868+ pax_close_kernel();
33869 }
33870
33871 static int
33872diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33873index 35af677..e7bf11f 100644
33874--- a/arch/x86/mm/pat.c
33875+++ b/arch/x86/mm/pat.c
33876@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33877 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33878
33879 if (pg_flags == _PGMT_DEFAULT)
33880- return -1;
33881+ return _PAGE_CACHE_MODE_NUM;
33882 else if (pg_flags == _PGMT_WC)
33883 return _PAGE_CACHE_MODE_WC;
33884 else if (pg_flags == _PGMT_UC_MINUS)
33885@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33886
33887 page = pfn_to_page(pfn);
33888 type = get_page_memtype(page);
33889- if (type != -1) {
33890+ if (type != _PAGE_CACHE_MODE_NUM) {
33891 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33892 start, end - 1, type, req_type);
33893 if (new_type)
33894@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33895
33896 if (!entry) {
33897 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33898- current->comm, current->pid, start, end - 1);
33899+ current->comm, task_pid_nr(current), start, end - 1);
33900 return -EINVAL;
33901 }
33902
33903@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33904 page = pfn_to_page(paddr >> PAGE_SHIFT);
33905 rettype = get_page_memtype(page);
33906 /*
33907- * -1 from get_page_memtype() implies RAM page is in its
33908+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33909 * default state and not reserved, and hence of type WB
33910 */
33911- if (rettype == -1)
33912+ if (rettype == _PAGE_CACHE_MODE_NUM)
33913 rettype = _PAGE_CACHE_MODE_WB;
33914
33915 return rettype;
33916@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33917
33918 while (cursor < to) {
33919 if (!devmem_is_allowed(pfn)) {
33920- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
33921- current->comm, from, to - 1);
33922+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx), PAT prevents it\n",
33923+ current->comm, from, to - 1, cursor);
33924 return 0;
33925 }
33926 cursor += PAGE_SIZE;
33927@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33928 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33929 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33930 "for [mem %#010Lx-%#010Lx]\n",
33931- current->comm, current->pid,
33932+ current->comm, task_pid_nr(current),
33933 cattr_name(pcm),
33934 base, (unsigned long long)(base + size-1));
33935 return -EINVAL;
33936@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33937 pcm = lookup_memtype(paddr);
33938 if (want_pcm != pcm) {
33939 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33940- current->comm, current->pid,
33941+ current->comm, task_pid_nr(current),
33942 cattr_name(want_pcm),
33943 (unsigned long long)paddr,
33944 (unsigned long long)(paddr + size - 1),
33945@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33946 free_memtype(paddr, paddr + size);
33947 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33948 " for [mem %#010Lx-%#010Lx], got %s\n",
33949- current->comm, current->pid,
33950+ current->comm, task_pid_nr(current),
33951 cattr_name(want_pcm),
33952 (unsigned long long)paddr,
33953 (unsigned long long)(paddr + size - 1),
33954diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33955index 6582adc..fcc5d0b 100644
33956--- a/arch/x86/mm/pat_rbtree.c
33957+++ b/arch/x86/mm/pat_rbtree.c
33958@@ -161,7 +161,7 @@ success:
33959
33960 failure:
33961 printk(KERN_INFO "%s:%d conflicting memory types "
33962- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33963+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33964 end, cattr_name(found_type), cattr_name(match->type));
33965 return -EBUSY;
33966 }
33967diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33968index 9f0614d..92ae64a 100644
33969--- a/arch/x86/mm/pf_in.c
33970+++ b/arch/x86/mm/pf_in.c
33971@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33972 int i;
33973 enum reason_type rv = OTHERS;
33974
33975- p = (unsigned char *)ins_addr;
33976+ p = (unsigned char *)ktla_ktva(ins_addr);
33977 p += skip_prefix(p, &prf);
33978 p += get_opcode(p, &opcode);
33979
33980@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33981 struct prefix_bits prf;
33982 int i;
33983
33984- p = (unsigned char *)ins_addr;
33985+ p = (unsigned char *)ktla_ktva(ins_addr);
33986 p += skip_prefix(p, &prf);
33987 p += get_opcode(p, &opcode);
33988
33989@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33990 struct prefix_bits prf;
33991 int i;
33992
33993- p = (unsigned char *)ins_addr;
33994+ p = (unsigned char *)ktla_ktva(ins_addr);
33995 p += skip_prefix(p, &prf);
33996 p += get_opcode(p, &opcode);
33997
33998@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33999 struct prefix_bits prf;
34000 int i;
34001
34002- p = (unsigned char *)ins_addr;
34003+ p = (unsigned char *)ktla_ktva(ins_addr);
34004 p += skip_prefix(p, &prf);
34005 p += get_opcode(p, &opcode);
34006 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
34007@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
34008 struct prefix_bits prf;
34009 int i;
34010
34011- p = (unsigned char *)ins_addr;
34012+ p = (unsigned char *)ktla_ktva(ins_addr);
34013 p += skip_prefix(p, &prf);
34014 p += get_opcode(p, &opcode);
34015 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
34016diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
34017index 0b97d2c..597bb38 100644
34018--- a/arch/x86/mm/pgtable.c
34019+++ b/arch/x86/mm/pgtable.c
34020@@ -98,10 +98,75 @@ static inline void pgd_list_del(pgd_t *pgd)
34021 list_del(&page->lru);
34022 }
34023
34024-#define UNSHARED_PTRS_PER_PGD \
34025- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
34026+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
34027+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
34028
34029+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
34030+{
34031+ unsigned int count = USER_PGD_PTRS;
34032
34033+ if (!pax_user_shadow_base)
34034+ return;
34035+
34036+ while (count--)
34037+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
34038+}
34039+#endif
34040+
34041+#ifdef CONFIG_PAX_PER_CPU_PGD
34042+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
34043+{
34044+ unsigned int count = USER_PGD_PTRS;
34045+
34046+ while (count--) {
34047+ pgd_t pgd;
34048+
34049+#ifdef CONFIG_X86_64
34050+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
34051+#else
34052+ pgd = *src++;
34053+#endif
34054+
34055+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
34056+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
34057+#endif
34058+
34059+ *dst++ = pgd;
34060+ }
34061+
34062+}
34063+#endif
34064+
34065+#ifdef CONFIG_X86_64
34066+#define pxd_t pud_t
34067+#define pyd_t pgd_t
34068+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
34069+#define pgtable_pxd_page_ctor(page) true
34070+#define pgtable_pxd_page_dtor(page) do {} while (0)
34071+#define pxd_free(mm, pud) pud_free((mm), (pud))
34072+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
34073+#define pyd_offset(mm, address) pgd_offset((mm), (address))
34074+#define PYD_SIZE PGDIR_SIZE
34075+#define mm_inc_nr_pxds(mm) do {} while (0)
34076+#define mm_dec_nr_pxds(mm) do {} while (0)
34077+#else
34078+#define pxd_t pmd_t
34079+#define pyd_t pud_t
34080+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
34081+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
34082+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
34083+#define pxd_free(mm, pud) pmd_free((mm), (pud))
34084+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
34085+#define pyd_offset(mm, address) pud_offset((mm), (address))
34086+#define PYD_SIZE PUD_SIZE
34087+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
34088+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
34089+#endif
34090+
34091+#ifdef CONFIG_PAX_PER_CPU_PGD
34092+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
34093+static inline void pgd_dtor(pgd_t *pgd) {}
34094+#else
34095 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
34096 {
34097 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
34098@@ -142,6 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
34099 pgd_list_del(pgd);
34100 spin_unlock(&pgd_lock);
34101 }
34102+#endif
34103
34104 /*
34105 * List of all pgd's needed for non-PAE so it can invalidate entries
34106@@ -154,7 +220,7 @@ static void pgd_dtor(pgd_t *pgd)
34107 * -- nyc
34108 */
34109
34110-#ifdef CONFIG_X86_PAE
34111+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
34112 /*
34113 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
34114 * updating the top-level pagetable entries to guarantee the
34115@@ -166,7 +232,7 @@ static void pgd_dtor(pgd_t *pgd)
34116 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
34117 * and initialize the kernel pmds here.
34118 */
34119-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
34120+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
34121
34122 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
34123 {
34124@@ -184,46 +250,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
34125 */
34126 flush_tlb_mm(mm);
34127 }
34128+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
34129+#define PREALLOCATED_PXDS USER_PGD_PTRS
34130 #else /* !CONFIG_X86_PAE */
34131
34132 /* No need to prepopulate any pagetable entries in non-PAE modes. */
34133-#define PREALLOCATED_PMDS 0
34134+#define PREALLOCATED_PXDS 0
34135
34136 #endif /* CONFIG_X86_PAE */
34137
34138-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
34139+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
34140 {
34141 int i;
34142
34143- for(i = 0; i < PREALLOCATED_PMDS; i++)
34144- if (pmds[i]) {
34145- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
34146- free_page((unsigned long)pmds[i]);
34147- mm_dec_nr_pmds(mm);
34148+ for(i = 0; i < PREALLOCATED_PXDS; i++)
34149+ if (pxds[i]) {
34150+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
34151+ free_page((unsigned long)pxds[i]);
34152+ mm_dec_nr_pxds(mm);
34153 }
34154 }
34155
34156-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34157+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
34158 {
34159 int i;
34160 bool failed = false;
34161
34162- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34163- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
34164- if (!pmd)
34165+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34166+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
34167+ if (!pxd)
34168 failed = true;
34169- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
34170- free_page((unsigned long)pmd);
34171- pmd = NULL;
34172+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
34173+ free_page((unsigned long)pxd);
34174+ pxd = NULL;
34175 failed = true;
34176 }
34177- if (pmd)
34178- mm_inc_nr_pmds(mm);
34179- pmds[i] = pmd;
34180+ if (pxd)
34181+ mm_inc_nr_pxds(mm);
34182+ pxds[i] = pxd;
34183 }
34184
34185 if (failed) {
34186- free_pmds(mm, pmds);
34187+ free_pxds(mm, pxds);
34188 return -ENOMEM;
34189 }
34190
34191@@ -236,43 +304,47 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34192 * preallocate which never got a corresponding vma will need to be
34193 * freed manually.
34194 */
34195-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34196+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34197 {
34198 int i;
34199
34200- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34201+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34202 pgd_t pgd = pgdp[i];
34203
34204 if (pgd_val(pgd) != 0) {
34205- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34206+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34207
34208- pgdp[i] = native_make_pgd(0);
34209+ set_pgd(pgdp + i, native_make_pgd(0));
34210
34211- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34212- pmd_free(mm, pmd);
34213- mm_dec_nr_pmds(mm);
34214+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34215+ pxd_free(mm, pxd);
34216+ mm_dec_nr_pxds(mm);
34217 }
34218 }
34219 }
34220
34221-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34222+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34223 {
34224- pud_t *pud;
34225+ pyd_t *pyd;
34226 int i;
34227
34228- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34229+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34230 return;
34231
34232- pud = pud_offset(pgd, 0);
34233+#ifdef CONFIG_X86_64
34234+ pyd = pyd_offset(mm, 0L);
34235+#else
34236+ pyd = pyd_offset(pgd, 0L);
34237+#endif
34238
34239- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34240- pmd_t *pmd = pmds[i];
34241+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34242+ pxd_t *pxd = pxds[i];
34243
34244 if (i >= KERNEL_PGD_BOUNDARY)
34245- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34246- sizeof(pmd_t) * PTRS_PER_PMD);
34247+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34248+ sizeof(pxd_t) * PTRS_PER_PMD);
34249
34250- pud_populate(mm, pud, pmd);
34251+ pyd_populate(mm, pyd, pxd);
34252 }
34253 }
34254
34255@@ -354,7 +426,7 @@ static inline void _pgd_free(pgd_t *pgd)
34256 pgd_t *pgd_alloc(struct mm_struct *mm)
34257 {
34258 pgd_t *pgd;
34259- pmd_t *pmds[PREALLOCATED_PMDS];
34260+ pxd_t *pxds[PREALLOCATED_PXDS];
34261
34262 pgd = _pgd_alloc();
34263
34264@@ -363,11 +435,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34265
34266 mm->pgd = pgd;
34267
34268- if (preallocate_pmds(mm, pmds) != 0)
34269+ if (preallocate_pxds(mm, pxds) != 0)
34270 goto out_free_pgd;
34271
34272 if (paravirt_pgd_alloc(mm) != 0)
34273- goto out_free_pmds;
34274+ goto out_free_pxds;
34275
34276 /*
34277 * Make sure that pre-populating the pmds is atomic with
34278@@ -377,14 +449,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34279 spin_lock(&pgd_lock);
34280
34281 pgd_ctor(mm, pgd);
34282- pgd_prepopulate_pmd(mm, pgd, pmds);
34283+ pgd_prepopulate_pxd(mm, pgd, pxds);
34284
34285 spin_unlock(&pgd_lock);
34286
34287 return pgd;
34288
34289-out_free_pmds:
34290- free_pmds(mm, pmds);
34291+out_free_pxds:
34292+ free_pxds(mm, pxds);
34293 out_free_pgd:
34294 _pgd_free(pgd);
34295 out:
34296@@ -393,7 +465,7 @@ out:
34297
34298 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34299 {
34300- pgd_mop_up_pmds(mm, pgd);
34301+ pgd_mop_up_pxds(mm, pgd);
34302 pgd_dtor(pgd);
34303 paravirt_pgd_free(mm, pgd);
34304 _pgd_free(pgd);
34305diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34306index 75cc097..79a097f 100644
34307--- a/arch/x86/mm/pgtable_32.c
34308+++ b/arch/x86/mm/pgtable_32.c
34309@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34310 return;
34311 }
34312 pte = pte_offset_kernel(pmd, vaddr);
34313+
34314+ pax_open_kernel();
34315 if (pte_val(pteval))
34316 set_pte_at(&init_mm, vaddr, pte, pteval);
34317 else
34318 pte_clear(&init_mm, vaddr, pte);
34319+ pax_close_kernel();
34320
34321 /*
34322 * It's enough to flush this one mapping.
34323diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34324index e666cbb..61788c45 100644
34325--- a/arch/x86/mm/physaddr.c
34326+++ b/arch/x86/mm/physaddr.c
34327@@ -10,7 +10,7 @@
34328 #ifdef CONFIG_X86_64
34329
34330 #ifdef CONFIG_DEBUG_VIRTUAL
34331-unsigned long __phys_addr(unsigned long x)
34332+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34333 {
34334 unsigned long y = x - __START_KERNEL_map;
34335
34336@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34337 #else
34338
34339 #ifdef CONFIG_DEBUG_VIRTUAL
34340-unsigned long __phys_addr(unsigned long x)
34341+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34342 {
34343 unsigned long phys_addr = x - PAGE_OFFSET;
34344 /* VMALLOC_* aren't constants */
34345diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34346index 90555bf..f5f1828 100644
34347--- a/arch/x86/mm/setup_nx.c
34348+++ b/arch/x86/mm/setup_nx.c
34349@@ -5,8 +5,10 @@
34350 #include <asm/pgtable.h>
34351 #include <asm/proto.h>
34352
34353+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34354 static int disable_nx;
34355
34356+#ifndef CONFIG_PAX_PAGEEXEC
34357 /*
34358 * noexec = on|off
34359 *
34360@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34361 return 0;
34362 }
34363 early_param("noexec", noexec_setup);
34364+#endif
34365+
34366+#endif
34367
34368 void x86_configure_nx(void)
34369 {
34370+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34371 if (cpu_has_nx && !disable_nx)
34372 __supported_pte_mask |= _PAGE_NX;
34373 else
34374+#endif
34375 __supported_pte_mask &= ~_PAGE_NX;
34376 }
34377
34378diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34379index 3250f23..7a97ba2 100644
34380--- a/arch/x86/mm/tlb.c
34381+++ b/arch/x86/mm/tlb.c
34382@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34383 BUG();
34384 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34385 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34386+
34387+#ifndef CONFIG_PAX_PER_CPU_PGD
34388 load_cr3(swapper_pg_dir);
34389+#endif
34390+
34391 /*
34392 * This gets called in the idle path where RCU
34393 * functions differently. Tracing normally
34394diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34395new file mode 100644
34396index 0000000..3fda3f3
34397--- /dev/null
34398+++ b/arch/x86/mm/uderef_64.c
34399@@ -0,0 +1,37 @@
34400+#include <linux/mm.h>
34401+#include <asm/pgtable.h>
34402+#include <asm/uaccess.h>
34403+
34404+#ifdef CONFIG_PAX_MEMORY_UDEREF
34405+/* PaX: due to the special call convention these functions must
34406+ * - remain leaf functions under all configurations,
34407+ * - never be called directly, only dereferenced from the wrappers.
34408+ */
34409+void __used __pax_open_userland(void)
34410+{
34411+ unsigned int cpu;
34412+
34413+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34414+ return;
34415+
34416+ cpu = raw_get_cpu();
34417+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34418+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34419+ raw_put_cpu_no_resched();
34420+}
34421+EXPORT_SYMBOL(__pax_open_userland);
34422+
34423+void __used __pax_close_userland(void)
34424+{
34425+ unsigned int cpu;
34426+
34427+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34428+ return;
34429+
34430+ cpu = raw_get_cpu();
34431+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34432+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34433+ raw_put_cpu_no_resched();
34434+}
34435+EXPORT_SYMBOL(__pax_close_userland);
34436+#endif
34437diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34438index 6440221..f84b5c7 100644
34439--- a/arch/x86/net/bpf_jit.S
34440+++ b/arch/x86/net/bpf_jit.S
34441@@ -9,6 +9,7 @@
34442 */
34443 #include <linux/linkage.h>
34444 #include <asm/dwarf2.h>
34445+#include <asm/alternative-asm.h>
34446
34447 /*
34448 * Calling convention :
34449@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34450 jle bpf_slow_path_word
34451 mov (SKBDATA,%rsi),%eax
34452 bswap %eax /* ntohl() */
34453+ pax_force_retaddr
34454 ret
34455
34456 sk_load_half:
34457@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34458 jle bpf_slow_path_half
34459 movzwl (SKBDATA,%rsi),%eax
34460 rol $8,%ax # ntohs()
34461+ pax_force_retaddr
34462 ret
34463
34464 sk_load_byte:
34465@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34466 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34467 jle bpf_slow_path_byte
34468 movzbl (SKBDATA,%rsi),%eax
34469+ pax_force_retaddr
34470 ret
34471
34472 /* rsi contains offset and can be scratched */
34473@@ -90,6 +94,7 @@ bpf_slow_path_word:
34474 js bpf_error
34475 mov - MAX_BPF_STACK + 32(%rbp),%eax
34476 bswap %eax
34477+ pax_force_retaddr
34478 ret
34479
34480 bpf_slow_path_half:
34481@@ -98,12 +103,14 @@ bpf_slow_path_half:
34482 mov - MAX_BPF_STACK + 32(%rbp),%ax
34483 rol $8,%ax
34484 movzwl %ax,%eax
34485+ pax_force_retaddr
34486 ret
34487
34488 bpf_slow_path_byte:
34489 bpf_slow_path_common(1)
34490 js bpf_error
34491 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34492+ pax_force_retaddr
34493 ret
34494
34495 #define sk_negative_common(SIZE) \
34496@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34497 sk_negative_common(4)
34498 mov (%rax), %eax
34499 bswap %eax
34500+ pax_force_retaddr
34501 ret
34502
34503 bpf_slow_path_half_neg:
34504@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34505 mov (%rax),%ax
34506 rol $8,%ax
34507 movzwl %ax,%eax
34508+ pax_force_retaddr
34509 ret
34510
34511 bpf_slow_path_byte_neg:
34512@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34513 .globl sk_load_byte_negative_offset
34514 sk_negative_common(1)
34515 movzbl (%rax), %eax
34516+ pax_force_retaddr
34517 ret
34518
34519 bpf_error:
34520@@ -156,4 +166,5 @@ bpf_error:
34521 mov - MAX_BPF_STACK + 16(%rbp),%r14
34522 mov - MAX_BPF_STACK + 24(%rbp),%r15
34523 leaveq
34524+ pax_force_retaddr
34525 ret
34526diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34527index ddeff48..877ead6 100644
34528--- a/arch/x86/net/bpf_jit_comp.c
34529+++ b/arch/x86/net/bpf_jit_comp.c
34530@@ -13,7 +13,11 @@
34531 #include <linux/if_vlan.h>
34532 #include <asm/cacheflush.h>
34533
34534+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34535+int bpf_jit_enable __read_only;
34536+#else
34537 int bpf_jit_enable __read_mostly;
34538+#endif
34539
34540 /*
34541 * assembly code in arch/x86/net/bpf_jit.S
34542@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34543 static void jit_fill_hole(void *area, unsigned int size)
34544 {
34545 /* fill whole space with int3 instructions */
34546+ pax_open_kernel();
34547 memset(area, 0xcc, size);
34548+ pax_close_kernel();
34549 }
34550
34551 struct jit_context {
34552@@ -924,7 +930,9 @@ common_load:
34553 pr_err("bpf_jit_compile fatal error\n");
34554 return -EFAULT;
34555 }
34556+ pax_open_kernel();
34557 memcpy(image + proglen, temp, ilen);
34558+ pax_close_kernel();
34559 }
34560 proglen += ilen;
34561 addrs[i] = proglen;
34562@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34563
34564 if (image) {
34565 bpf_flush_icache(header, image + proglen);
34566- set_memory_ro((unsigned long)header, header->pages);
34567 prog->bpf_func = (void *)image;
34568 prog->jited = true;
34569 }
34570@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34571 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34572 struct bpf_binary_header *header = (void *)addr;
34573
34574- if (!fp->jited)
34575- goto free_filter;
34576+ if (fp->jited)
34577+ bpf_jit_binary_free(header);
34578
34579- set_memory_rw(addr, header->pages);
34580- bpf_jit_binary_free(header);
34581-
34582-free_filter:
34583 bpf_prog_unlock_free(fp);
34584 }
34585diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34586index 4e664bd..2beeaa2 100644
34587--- a/arch/x86/oprofile/backtrace.c
34588+++ b/arch/x86/oprofile/backtrace.c
34589@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34590 struct stack_frame_ia32 *fp;
34591 unsigned long bytes;
34592
34593- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34594+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34595 if (bytes != 0)
34596 return NULL;
34597
34598- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34599+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34600
34601 oprofile_add_trace(bufhead[0].return_address);
34602
34603@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34604 struct stack_frame bufhead[2];
34605 unsigned long bytes;
34606
34607- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34608+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34609 if (bytes != 0)
34610 return NULL;
34611
34612diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34613index 1d2e639..f6ef82a 100644
34614--- a/arch/x86/oprofile/nmi_int.c
34615+++ b/arch/x86/oprofile/nmi_int.c
34616@@ -23,6 +23,7 @@
34617 #include <asm/nmi.h>
34618 #include <asm/msr.h>
34619 #include <asm/apic.h>
34620+#include <asm/pgtable.h>
34621
34622 #include "op_counter.h"
34623 #include "op_x86_model.h"
34624@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34625 if (ret)
34626 return ret;
34627
34628- if (!model->num_virt_counters)
34629- model->num_virt_counters = model->num_counters;
34630+ if (!model->num_virt_counters) {
34631+ pax_open_kernel();
34632+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34633+ pax_close_kernel();
34634+ }
34635
34636 mux_init(ops);
34637
34638diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34639index 50d86c0..7985318 100644
34640--- a/arch/x86/oprofile/op_model_amd.c
34641+++ b/arch/x86/oprofile/op_model_amd.c
34642@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34643 num_counters = AMD64_NUM_COUNTERS;
34644 }
34645
34646- op_amd_spec.num_counters = num_counters;
34647- op_amd_spec.num_controls = num_counters;
34648- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34649+ pax_open_kernel();
34650+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34651+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34652+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34653+ pax_close_kernel();
34654
34655 return 0;
34656 }
34657diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34658index d90528e..0127e2b 100644
34659--- a/arch/x86/oprofile/op_model_ppro.c
34660+++ b/arch/x86/oprofile/op_model_ppro.c
34661@@ -19,6 +19,7 @@
34662 #include <asm/msr.h>
34663 #include <asm/apic.h>
34664 #include <asm/nmi.h>
34665+#include <asm/pgtable.h>
34666
34667 #include "op_x86_model.h"
34668 #include "op_counter.h"
34669@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34670
34671 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34672
34673- op_arch_perfmon_spec.num_counters = num_counters;
34674- op_arch_perfmon_spec.num_controls = num_counters;
34675+ pax_open_kernel();
34676+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34677+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34678+ pax_close_kernel();
34679 }
34680
34681 static int arch_perfmon_init(struct oprofile_operations *ignore)
34682diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34683index 71e8a67..6a313bb 100644
34684--- a/arch/x86/oprofile/op_x86_model.h
34685+++ b/arch/x86/oprofile/op_x86_model.h
34686@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34687 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34688 struct op_msrs const * const msrs);
34689 #endif
34690-};
34691+} __do_const;
34692
34693 struct op_counter_config;
34694
34695diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34696index 852aa4c..71613f2 100644
34697--- a/arch/x86/pci/intel_mid_pci.c
34698+++ b/arch/x86/pci/intel_mid_pci.c
34699@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34700 pci_mmcfg_late_init();
34701 pcibios_enable_irq = intel_mid_pci_irq_enable;
34702 pcibios_disable_irq = intel_mid_pci_irq_disable;
34703- pci_root_ops = intel_mid_pci_ops;
34704+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34705 pci_soc_mode = 1;
34706 /* Continue with standard init */
34707 return 1;
34708diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34709index 5dc6ca5..25c03f5 100644
34710--- a/arch/x86/pci/irq.c
34711+++ b/arch/x86/pci/irq.c
34712@@ -51,7 +51,7 @@ struct irq_router {
34713 struct irq_router_handler {
34714 u16 vendor;
34715 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34716-};
34717+} __do_const;
34718
34719 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34720 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34721@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34722 return 0;
34723 }
34724
34725-static __initdata struct irq_router_handler pirq_routers[] = {
34726+static __initconst const struct irq_router_handler pirq_routers[] = {
34727 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34728 { PCI_VENDOR_ID_AL, ali_router_probe },
34729 { PCI_VENDOR_ID_ITE, ite_router_probe },
34730@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34731 static void __init pirq_find_router(struct irq_router *r)
34732 {
34733 struct irq_routing_table *rt = pirq_table;
34734- struct irq_router_handler *h;
34735+ const struct irq_router_handler *h;
34736
34737 #ifdef CONFIG_PCI_BIOS
34738 if (!rt->signature) {
34739@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34740 return 0;
34741 }
34742
34743-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34744+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34745 {
34746 .callback = fix_broken_hp_bios_irq9,
34747 .ident = "HP Pavilion N5400 Series Laptop",
34748diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34749index 9b83b90..4112152 100644
34750--- a/arch/x86/pci/pcbios.c
34751+++ b/arch/x86/pci/pcbios.c
34752@@ -79,7 +79,7 @@ union bios32 {
34753 static struct {
34754 unsigned long address;
34755 unsigned short segment;
34756-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34757+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34758
34759 /*
34760 * Returns the entry point for the given service, NULL on error
34761@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34762 unsigned long length; /* %ecx */
34763 unsigned long entry; /* %edx */
34764 unsigned long flags;
34765+ struct desc_struct d, *gdt;
34766
34767 local_irq_save(flags);
34768- __asm__("lcall *(%%edi); cld"
34769+
34770+ gdt = get_cpu_gdt_table(smp_processor_id());
34771+
34772+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34773+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34774+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34775+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34776+
34777+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34778 : "=a" (return_code),
34779 "=b" (address),
34780 "=c" (length),
34781 "=d" (entry)
34782 : "0" (service),
34783 "1" (0),
34784- "D" (&bios32_indirect));
34785+ "D" (&bios32_indirect),
34786+ "r"(__PCIBIOS_DS)
34787+ : "memory");
34788+
34789+ pax_open_kernel();
34790+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34791+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34792+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34793+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34794+ pax_close_kernel();
34795+
34796 local_irq_restore(flags);
34797
34798 switch (return_code) {
34799- case 0:
34800- return address + entry;
34801- case 0x80: /* Not present */
34802- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34803- return 0;
34804- default: /* Shouldn't happen */
34805- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34806- service, return_code);
34807+ case 0: {
34808+ int cpu;
34809+ unsigned char flags;
34810+
34811+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34812+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34813+ printk(KERN_WARNING "bios32_service: not valid\n");
34814 return 0;
34815+ }
34816+ address = address + PAGE_OFFSET;
34817+ length += 16UL; /* some BIOSs underreport this... */
34818+ flags = 4;
34819+ if (length >= 64*1024*1024) {
34820+ length >>= PAGE_SHIFT;
34821+ flags |= 8;
34822+ }
34823+
34824+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34825+ gdt = get_cpu_gdt_table(cpu);
34826+ pack_descriptor(&d, address, length, 0x9b, flags);
34827+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34828+ pack_descriptor(&d, address, length, 0x93, flags);
34829+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34830+ }
34831+ return entry;
34832+ }
34833+ case 0x80: /* Not present */
34834+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34835+ return 0;
34836+ default: /* Shouldn't happen */
34837+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34838+ service, return_code);
34839+ return 0;
34840 }
34841 }
34842
34843 static struct {
34844 unsigned long address;
34845 unsigned short segment;
34846-} pci_indirect = { 0, __KERNEL_CS };
34847+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34848
34849-static int pci_bios_present;
34850+static int pci_bios_present __read_only;
34851
34852 static int __init check_pcibios(void)
34853 {
34854@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34855 unsigned long flags, pcibios_entry;
34856
34857 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34858- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34859+ pci_indirect.address = pcibios_entry;
34860
34861 local_irq_save(flags);
34862- __asm__(
34863- "lcall *(%%edi); cld\n\t"
34864+ __asm__("movw %w6, %%ds\n\t"
34865+ "lcall *%%ss:(%%edi); cld\n\t"
34866+ "push %%ss\n\t"
34867+ "pop %%ds\n\t"
34868 "jc 1f\n\t"
34869 "xor %%ah, %%ah\n"
34870 "1:"
34871@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34872 "=b" (ebx),
34873 "=c" (ecx)
34874 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34875- "D" (&pci_indirect)
34876+ "D" (&pci_indirect),
34877+ "r" (__PCIBIOS_DS)
34878 : "memory");
34879 local_irq_restore(flags);
34880
34881@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34882
34883 switch (len) {
34884 case 1:
34885- __asm__("lcall *(%%esi); cld\n\t"
34886+ __asm__("movw %w6, %%ds\n\t"
34887+ "lcall *%%ss:(%%esi); cld\n\t"
34888+ "push %%ss\n\t"
34889+ "pop %%ds\n\t"
34890 "jc 1f\n\t"
34891 "xor %%ah, %%ah\n"
34892 "1:"
34893@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34894 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34895 "b" (bx),
34896 "D" ((long)reg),
34897- "S" (&pci_indirect));
34898+ "S" (&pci_indirect),
34899+ "r" (__PCIBIOS_DS));
34900 /*
34901 * Zero-extend the result beyond 8 bits, do not trust the
34902 * BIOS having done it:
34903@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34904 *value &= 0xff;
34905 break;
34906 case 2:
34907- __asm__("lcall *(%%esi); cld\n\t"
34908+ __asm__("movw %w6, %%ds\n\t"
34909+ "lcall *%%ss:(%%esi); cld\n\t"
34910+ "push %%ss\n\t"
34911+ "pop %%ds\n\t"
34912 "jc 1f\n\t"
34913 "xor %%ah, %%ah\n"
34914 "1:"
34915@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34916 : "1" (PCIBIOS_READ_CONFIG_WORD),
34917 "b" (bx),
34918 "D" ((long)reg),
34919- "S" (&pci_indirect));
34920+ "S" (&pci_indirect),
34921+ "r" (__PCIBIOS_DS));
34922 /*
34923 * Zero-extend the result beyond 16 bits, do not trust the
34924 * BIOS having done it:
34925@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34926 *value &= 0xffff;
34927 break;
34928 case 4:
34929- __asm__("lcall *(%%esi); cld\n\t"
34930+ __asm__("movw %w6, %%ds\n\t"
34931+ "lcall *%%ss:(%%esi); cld\n\t"
34932+ "push %%ss\n\t"
34933+ "pop %%ds\n\t"
34934 "jc 1f\n\t"
34935 "xor %%ah, %%ah\n"
34936 "1:"
34937@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34938 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34939 "b" (bx),
34940 "D" ((long)reg),
34941- "S" (&pci_indirect));
34942+ "S" (&pci_indirect),
34943+ "r" (__PCIBIOS_DS));
34944 break;
34945 }
34946
34947@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34948
34949 switch (len) {
34950 case 1:
34951- __asm__("lcall *(%%esi); cld\n\t"
34952+ __asm__("movw %w6, %%ds\n\t"
34953+ "lcall *%%ss:(%%esi); cld\n\t"
34954+ "push %%ss\n\t"
34955+ "pop %%ds\n\t"
34956 "jc 1f\n\t"
34957 "xor %%ah, %%ah\n"
34958 "1:"
34959@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34960 "c" (value),
34961 "b" (bx),
34962 "D" ((long)reg),
34963- "S" (&pci_indirect));
34964+ "S" (&pci_indirect),
34965+ "r" (__PCIBIOS_DS));
34966 break;
34967 case 2:
34968- __asm__("lcall *(%%esi); cld\n\t"
34969+ __asm__("movw %w6, %%ds\n\t"
34970+ "lcall *%%ss:(%%esi); cld\n\t"
34971+ "push %%ss\n\t"
34972+ "pop %%ds\n\t"
34973 "jc 1f\n\t"
34974 "xor %%ah, %%ah\n"
34975 "1:"
34976@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34977 "c" (value),
34978 "b" (bx),
34979 "D" ((long)reg),
34980- "S" (&pci_indirect));
34981+ "S" (&pci_indirect),
34982+ "r" (__PCIBIOS_DS));
34983 break;
34984 case 4:
34985- __asm__("lcall *(%%esi); cld\n\t"
34986+ __asm__("movw %w6, %%ds\n\t"
34987+ "lcall *%%ss:(%%esi); cld\n\t"
34988+ "push %%ss\n\t"
34989+ "pop %%ds\n\t"
34990 "jc 1f\n\t"
34991 "xor %%ah, %%ah\n"
34992 "1:"
34993@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34994 "c" (value),
34995 "b" (bx),
34996 "D" ((long)reg),
34997- "S" (&pci_indirect));
34998+ "S" (&pci_indirect),
34999+ "r" (__PCIBIOS_DS));
35000 break;
35001 }
35002
35003@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
35004
35005 DBG("PCI: Fetching IRQ routing table... ");
35006 __asm__("push %%es\n\t"
35007+ "movw %w8, %%ds\n\t"
35008 "push %%ds\n\t"
35009 "pop %%es\n\t"
35010- "lcall *(%%esi); cld\n\t"
35011+ "lcall *%%ss:(%%esi); cld\n\t"
35012 "pop %%es\n\t"
35013+ "push %%ss\n\t"
35014+ "pop %%ds\n"
35015 "jc 1f\n\t"
35016 "xor %%ah, %%ah\n"
35017 "1:"
35018@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
35019 "1" (0),
35020 "D" ((long) &opt),
35021 "S" (&pci_indirect),
35022- "m" (opt)
35023+ "m" (opt),
35024+ "r" (__PCIBIOS_DS)
35025 : "memory");
35026 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
35027 if (ret & 0xff00)
35028@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
35029 {
35030 int ret;
35031
35032- __asm__("lcall *(%%esi); cld\n\t"
35033+ __asm__("movw %w5, %%ds\n\t"
35034+ "lcall *%%ss:(%%esi); cld\n\t"
35035+ "push %%ss\n\t"
35036+ "pop %%ds\n"
35037 "jc 1f\n\t"
35038 "xor %%ah, %%ah\n"
35039 "1:"
35040@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
35041 : "0" (PCIBIOS_SET_PCI_HW_INT),
35042 "b" ((dev->bus->number << 8) | dev->devfn),
35043 "c" ((irq << 8) | (pin + 10)),
35044- "S" (&pci_indirect));
35045+ "S" (&pci_indirect),
35046+ "r" (__PCIBIOS_DS));
35047 return !(ret & 0xff00);
35048 }
35049 EXPORT_SYMBOL(pcibios_set_irq_routing);
35050diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
35051index ed5b673..24d2d53 100644
35052--- a/arch/x86/platform/efi/efi_32.c
35053+++ b/arch/x86/platform/efi/efi_32.c
35054@@ -61,11 +61,27 @@ pgd_t * __init efi_call_phys_prolog(void)
35055 struct desc_ptr gdt_descr;
35056 pgd_t *save_pgd;
35057
35058+#ifdef CONFIG_PAX_KERNEXEC
35059+ struct desc_struct d;
35060+#endif
35061+
35062 /* Current pgd is swapper_pg_dir, we'll restore it later: */
35063+#ifdef CONFIG_PAX_PER_CPU_PGD
35064+ save_pgd = get_cpu_pgd(smp_processor_id(), kernel);
35065+#else
35066 save_pgd = swapper_pg_dir;
35067+#endif
35068+
35069 load_cr3(initial_page_table);
35070 __flush_tlb_all();
35071
35072+#ifdef CONFIG_PAX_KERNEXEC
35073+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
35074+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
35075+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
35076+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
35077+#endif
35078+
35079 gdt_descr.address = __pa(get_cpu_gdt_table(0));
35080 gdt_descr.size = GDT_SIZE - 1;
35081 load_gdt(&gdt_descr);
35082@@ -77,6 +93,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
35083 {
35084 struct desc_ptr gdt_descr;
35085
35086+#ifdef CONFIG_PAX_KERNEXEC
35087+ struct desc_struct d;
35088+
35089+ memset(&d, 0, sizeof d);
35090+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
35091+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
35092+#endif
35093+
35094 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
35095 gdt_descr.size = GDT_SIZE - 1;
35096 load_gdt(&gdt_descr);
35097diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
35098index a0ac0f9..f41d324 100644
35099--- a/arch/x86/platform/efi/efi_64.c
35100+++ b/arch/x86/platform/efi/efi_64.c
35101@@ -96,6 +96,11 @@ pgd_t * __init efi_call_phys_prolog(void)
35102 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
35103 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
35104 }
35105+
35106+#ifdef CONFIG_PAX_PER_CPU_PGD
35107+ load_cr3(swapper_pg_dir);
35108+#endif
35109+
35110 __flush_tlb_all();
35111
35112 return save_pgd;
35113@@ -119,6 +124,10 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
35114
35115 kfree(save_pgd);
35116
35117+#ifdef CONFIG_PAX_PER_CPU_PGD
35118+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
35119+#endif
35120+
35121 __flush_tlb_all();
35122 early_code_mapping_set_exec(0);
35123 }
35124@@ -148,8 +157,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
35125 unsigned npages;
35126 pgd_t *pgd;
35127
35128- if (efi_enabled(EFI_OLD_MEMMAP))
35129+ if (efi_enabled(EFI_OLD_MEMMAP)) {
35130+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
35131+ * able to execute the EFI services.
35132+ */
35133+ if (__supported_pte_mask & _PAGE_NX) {
35134+ unsigned long addr = (unsigned long) __va(0);
35135+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
35136+
35137+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
35138+#ifdef CONFIG_PAX_PER_CPU_PGD
35139+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
35140+#endif
35141+ set_pgd(pgd_offset_k(addr), pe);
35142+ }
35143+
35144 return 0;
35145+ }
35146
35147 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
35148 pgd = __va(efi_scratch.efi_pgt);
35149diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
35150index 040192b..7d3300f 100644
35151--- a/arch/x86/platform/efi/efi_stub_32.S
35152+++ b/arch/x86/platform/efi/efi_stub_32.S
35153@@ -6,7 +6,9 @@
35154 */
35155
35156 #include <linux/linkage.h>
35157+#include <linux/init.h>
35158 #include <asm/page_types.h>
35159+#include <asm/segment.h>
35160
35161 /*
35162 * efi_call_phys(void *, ...) is a function with variable parameters.
35163@@ -20,7 +22,7 @@
35164 * service functions will comply with gcc calling convention, too.
35165 */
35166
35167-.text
35168+__INIT
35169 ENTRY(efi_call_phys)
35170 /*
35171 * 0. The function can only be called in Linux kernel. So CS has been
35172@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
35173 * The mapping of lower virtual memory has been created in prolog and
35174 * epilog.
35175 */
35176- movl $1f, %edx
35177- subl $__PAGE_OFFSET, %edx
35178- jmp *%edx
35179+#ifdef CONFIG_PAX_KERNEXEC
35180+ movl $(__KERNEXEC_EFI_DS), %edx
35181+ mov %edx, %ds
35182+ mov %edx, %es
35183+ mov %edx, %ss
35184+ addl $2f,(1f)
35185+ ljmp *(1f)
35186+
35187+__INITDATA
35188+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35189+.previous
35190+
35191+2:
35192+ subl $2b,(1b)
35193+#else
35194+ jmp 1f-__PAGE_OFFSET
35195 1:
35196+#endif
35197
35198 /*
35199 * 2. Now on the top of stack is the return
35200@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35201 * parameter 2, ..., param n. To make things easy, we save the return
35202 * address of efi_call_phys in a global variable.
35203 */
35204- popl %edx
35205- movl %edx, saved_return_addr
35206- /* get the function pointer into ECX*/
35207- popl %ecx
35208- movl %ecx, efi_rt_function_ptr
35209- movl $2f, %edx
35210- subl $__PAGE_OFFSET, %edx
35211- pushl %edx
35212+ popl (saved_return_addr)
35213+ popl (efi_rt_function_ptr)
35214
35215 /*
35216 * 3. Clear PG bit in %CR0.
35217@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35218 /*
35219 * 5. Call the physical function.
35220 */
35221- jmp *%ecx
35222+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35223
35224-2:
35225 /*
35226 * 6. After EFI runtime service returns, control will return to
35227 * following instruction. We'd better readjust stack pointer first.
35228@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35229 movl %cr0, %edx
35230 orl $0x80000000, %edx
35231 movl %edx, %cr0
35232- jmp 1f
35233-1:
35234+
35235 /*
35236 * 8. Now restore the virtual mode from flat mode by
35237 * adding EIP with PAGE_OFFSET.
35238 */
35239- movl $1f, %edx
35240- jmp *%edx
35241+#ifdef CONFIG_PAX_KERNEXEC
35242+ movl $(__KERNEL_DS), %edx
35243+ mov %edx, %ds
35244+ mov %edx, %es
35245+ mov %edx, %ss
35246+ ljmp $(__KERNEL_CS),$1f
35247+#else
35248+ jmp 1f+__PAGE_OFFSET
35249+#endif
35250 1:
35251
35252 /*
35253 * 9. Balance the stack. And because EAX contain the return value,
35254 * we'd better not clobber it.
35255 */
35256- leal efi_rt_function_ptr, %edx
35257- movl (%edx), %ecx
35258- pushl %ecx
35259+ pushl (efi_rt_function_ptr)
35260
35261 /*
35262- * 10. Push the saved return address onto the stack and return.
35263+ * 10. Return to the saved return address.
35264 */
35265- leal saved_return_addr, %edx
35266- movl (%edx), %ecx
35267- pushl %ecx
35268- ret
35269+ jmpl *(saved_return_addr)
35270 ENDPROC(efi_call_phys)
35271 .previous
35272
35273-.data
35274+__INITDATA
35275 saved_return_addr:
35276 .long 0
35277 efi_rt_function_ptr:
35278diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35279index 86d0f9e..6d499f4 100644
35280--- a/arch/x86/platform/efi/efi_stub_64.S
35281+++ b/arch/x86/platform/efi/efi_stub_64.S
35282@@ -11,6 +11,7 @@
35283 #include <asm/msr.h>
35284 #include <asm/processor-flags.h>
35285 #include <asm/page_types.h>
35286+#include <asm/alternative-asm.h>
35287
35288 #define SAVE_XMM \
35289 mov %rsp, %rax; \
35290@@ -88,6 +89,7 @@ ENTRY(efi_call)
35291 RESTORE_PGT
35292 addq $48, %rsp
35293 RESTORE_XMM
35294+ pax_force_retaddr 0, 1
35295 ret
35296 ENDPROC(efi_call)
35297
35298diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35299index 3005f0c..d06aeb0 100644
35300--- a/arch/x86/platform/intel-mid/intel-mid.c
35301+++ b/arch/x86/platform/intel-mid/intel-mid.c
35302@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35303 /* intel_mid_ops to store sub arch ops */
35304 struct intel_mid_ops *intel_mid_ops;
35305 /* getter function for sub arch ops*/
35306-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35307+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35308 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35309 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35310
35311@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35312 {
35313 };
35314
35315-static void intel_mid_reboot(void)
35316+static void __noreturn intel_mid_reboot(void)
35317 {
35318 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35319+ BUG();
35320 }
35321
35322 static unsigned long __init intel_mid_calibrate_tsc(void)
35323diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35324index 3c1c386..59a68ed 100644
35325--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35326+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35327@@ -13,6 +13,6 @@
35328 /* For every CPU addition a new get_<cpuname>_ops interface needs
35329 * to be added.
35330 */
35331-extern void *get_penwell_ops(void);
35332-extern void *get_cloverview_ops(void);
35333-extern void *get_tangier_ops(void);
35334+extern const void *get_penwell_ops(void);
35335+extern const void *get_cloverview_ops(void);
35336+extern const void *get_tangier_ops(void);
35337diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35338index 23381d2..8ddc10e 100644
35339--- a/arch/x86/platform/intel-mid/mfld.c
35340+++ b/arch/x86/platform/intel-mid/mfld.c
35341@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35342 pm_power_off = mfld_power_off;
35343 }
35344
35345-void *get_penwell_ops(void)
35346+const void *get_penwell_ops(void)
35347 {
35348 return &penwell_ops;
35349 }
35350
35351-void *get_cloverview_ops(void)
35352+const void *get_cloverview_ops(void)
35353 {
35354 return &penwell_ops;
35355 }
35356diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35357index aaca917..66eadbc 100644
35358--- a/arch/x86/platform/intel-mid/mrfl.c
35359+++ b/arch/x86/platform/intel-mid/mrfl.c
35360@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35361 .arch_setup = tangier_arch_setup,
35362 };
35363
35364-void *get_tangier_ops(void)
35365+const void *get_tangier_ops(void)
35366 {
35367 return &tangier_ops;
35368 }
35369diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35370index 278e4da..55e8d8a 100644
35371--- a/arch/x86/platform/intel-quark/imr_selftest.c
35372+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35373@@ -55,7 +55,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35374 */
35375 static void __init imr_self_test(void)
35376 {
35377- phys_addr_t base = virt_to_phys(&_text);
35378+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35379 size_t size = virt_to_phys(&__end_rodata) - base;
35380 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35381 int ret;
35382diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35383index d6ee929..3637cb5 100644
35384--- a/arch/x86/platform/olpc/olpc_dt.c
35385+++ b/arch/x86/platform/olpc/olpc_dt.c
35386@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35387 return res;
35388 }
35389
35390-static struct of_pdt_ops prom_olpc_ops __initdata = {
35391+static struct of_pdt_ops prom_olpc_ops __initconst = {
35392 .nextprop = olpc_dt_nextprop,
35393 .getproplen = olpc_dt_getproplen,
35394 .getproperty = olpc_dt_getproperty,
35395diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35396index 757678f..9895d9b 100644
35397--- a/arch/x86/power/cpu.c
35398+++ b/arch/x86/power/cpu.c
35399@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35400 static void fix_processor_context(void)
35401 {
35402 int cpu = smp_processor_id();
35403- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
35404-#ifdef CONFIG_X86_64
35405- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35406- tss_desc tss;
35407-#endif
35408+ struct tss_struct *t = cpu_tss + cpu;
35409+
35410 set_tss_desc(cpu, t); /*
35411 * This just modifies memory; should not be
35412 * necessary. But... This is necessary, because
35413@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35414 */
35415
35416 #ifdef CONFIG_X86_64
35417- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35418- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35419- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35420-
35421 syscall_init(); /* This sets MSR_*STAR and related */
35422 #endif
35423 load_TR_desc(); /* This does ltr */
35424diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35425index 0b7a63d..0d0f2c2 100644
35426--- a/arch/x86/realmode/init.c
35427+++ b/arch/x86/realmode/init.c
35428@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35429 __va(real_mode_header->trampoline_header);
35430
35431 #ifdef CONFIG_X86_32
35432- trampoline_header->start = __pa_symbol(startup_32_smp);
35433+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35434+
35435+#ifdef CONFIG_PAX_KERNEXEC
35436+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35437+#endif
35438+
35439+ trampoline_header->boot_cs = __BOOT_CS;
35440 trampoline_header->gdt_limit = __BOOT_DS + 7;
35441 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35442 #else
35443@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35444 *trampoline_cr4_features = __read_cr4();
35445
35446 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35447- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35448+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35449 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35450 #endif
35451 }
35452diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35453index 2730d77..2e4cd19 100644
35454--- a/arch/x86/realmode/rm/Makefile
35455+++ b/arch/x86/realmode/rm/Makefile
35456@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35457
35458 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35459 -I$(srctree)/arch/x86/boot
35460+ifdef CONSTIFY_PLUGIN
35461+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35462+endif
35463 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35464 GCOV_PROFILE := n
35465diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35466index a28221d..93c40f1 100644
35467--- a/arch/x86/realmode/rm/header.S
35468+++ b/arch/x86/realmode/rm/header.S
35469@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35470 #endif
35471 /* APM/BIOS reboot */
35472 .long pa_machine_real_restart_asm
35473-#ifdef CONFIG_X86_64
35474+#ifdef CONFIG_X86_32
35475+ .long __KERNEL_CS
35476+#else
35477 .long __KERNEL32_CS
35478 #endif
35479 END(real_mode_header)
35480diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35481index d66c607..3def845 100644
35482--- a/arch/x86/realmode/rm/reboot.S
35483+++ b/arch/x86/realmode/rm/reboot.S
35484@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35485 lgdtl pa_tr_gdt
35486
35487 /* Disable paging to drop us out of long mode */
35488+ movl %cr4, %eax
35489+ andl $~X86_CR4_PCIDE, %eax
35490+ movl %eax, %cr4
35491+
35492 movl %cr0, %eax
35493 andl $~X86_CR0_PG, %eax
35494 movl %eax, %cr0
35495diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35496index 48ddd76..c26749f 100644
35497--- a/arch/x86/realmode/rm/trampoline_32.S
35498+++ b/arch/x86/realmode/rm/trampoline_32.S
35499@@ -24,6 +24,12 @@
35500 #include <asm/page_types.h>
35501 #include "realmode.h"
35502
35503+#ifdef CONFIG_PAX_KERNEXEC
35504+#define ta(X) (X)
35505+#else
35506+#define ta(X) (pa_ ## X)
35507+#endif
35508+
35509 .text
35510 .code16
35511
35512@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35513
35514 cli # We should be safe anyway
35515
35516- movl tr_start, %eax # where we need to go
35517-
35518 movl $0xA5A5A5A5, trampoline_status
35519 # write marker for master knows we're running
35520
35521@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35522 movw $1, %dx # protected mode (PE) bit
35523 lmsw %dx # into protected mode
35524
35525- ljmpl $__BOOT_CS, $pa_startup_32
35526+ ljmpl *(trampoline_header)
35527
35528 .section ".text32","ax"
35529 .code32
35530@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35531 .balign 8
35532 GLOBAL(trampoline_header)
35533 tr_start: .space 4
35534- tr_gdt_pad: .space 2
35535+ tr_boot_cs: .space 2
35536 tr_gdt: .space 6
35537 END(trampoline_header)
35538
35539diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35540index dac7b20..72dbaca 100644
35541--- a/arch/x86/realmode/rm/trampoline_64.S
35542+++ b/arch/x86/realmode/rm/trampoline_64.S
35543@@ -93,6 +93,7 @@ ENTRY(startup_32)
35544 movl %edx, %gs
35545
35546 movl pa_tr_cr4, %eax
35547+ andl $~X86_CR4_PCIDE, %eax
35548 movl %eax, %cr4 # Enable PAE mode
35549
35550 # Setup trampoline 4 level pagetables
35551@@ -106,7 +107,7 @@ ENTRY(startup_32)
35552 wrmsr
35553
35554 # Enable paging and in turn activate Long Mode
35555- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35556+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35557 movl %eax, %cr0
35558
35559 /*
35560diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35561index 9e7e147..25a4158 100644
35562--- a/arch/x86/realmode/rm/wakeup_asm.S
35563+++ b/arch/x86/realmode/rm/wakeup_asm.S
35564@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35565 lgdtl pmode_gdt
35566
35567 /* This really couldn't... */
35568- movl pmode_entry, %eax
35569 movl pmode_cr0, %ecx
35570 movl %ecx, %cr0
35571- ljmpl $__KERNEL_CS, $pa_startup_32
35572- /* -> jmp *%eax in trampoline_32.S */
35573+
35574+ ljmpl *pmode_entry
35575 #else
35576 jmp trampoline_start
35577 #endif
35578diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35579index 604a37e..e49702a 100644
35580--- a/arch/x86/tools/Makefile
35581+++ b/arch/x86/tools/Makefile
35582@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35583
35584 $(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
35585
35586-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35587+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35588 hostprogs-y += relocs
35589 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35590 PHONY += relocs
35591diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35592index 0c2fae8..88036b7 100644
35593--- a/arch/x86/tools/relocs.c
35594+++ b/arch/x86/tools/relocs.c
35595@@ -1,5 +1,7 @@
35596 /* This is included from relocs_32/64.c */
35597
35598+#include "../../../include/generated/autoconf.h"
35599+
35600 #define ElfW(type) _ElfW(ELF_BITS, type)
35601 #define _ElfW(bits, type) __ElfW(bits, type)
35602 #define __ElfW(bits, type) Elf##bits##_##type
35603@@ -11,6 +13,7 @@
35604 #define Elf_Sym ElfW(Sym)
35605
35606 static Elf_Ehdr ehdr;
35607+static Elf_Phdr *phdr;
35608
35609 struct relocs {
35610 uint32_t *offset;
35611@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35612 }
35613 }
35614
35615+static void read_phdrs(FILE *fp)
35616+{
35617+ unsigned int i;
35618+
35619+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35620+ if (!phdr) {
35621+ die("Unable to allocate %d program headers\n",
35622+ ehdr.e_phnum);
35623+ }
35624+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35625+ die("Seek to %d failed: %s\n",
35626+ ehdr.e_phoff, strerror(errno));
35627+ }
35628+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35629+ die("Cannot read ELF program headers: %s\n",
35630+ strerror(errno));
35631+ }
35632+ for(i = 0; i < ehdr.e_phnum; i++) {
35633+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35634+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35635+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35636+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35637+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35638+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35639+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35640+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35641+ }
35642+
35643+}
35644+
35645 static void read_shdrs(FILE *fp)
35646 {
35647- int i;
35648+ unsigned int i;
35649 Elf_Shdr shdr;
35650
35651 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35652@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35653
35654 static void read_strtabs(FILE *fp)
35655 {
35656- int i;
35657+ unsigned int i;
35658 for (i = 0; i < ehdr.e_shnum; i++) {
35659 struct section *sec = &secs[i];
35660 if (sec->shdr.sh_type != SHT_STRTAB) {
35661@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35662
35663 static void read_symtabs(FILE *fp)
35664 {
35665- int i,j;
35666+ unsigned int i,j;
35667 for (i = 0; i < ehdr.e_shnum; i++) {
35668 struct section *sec = &secs[i];
35669 if (sec->shdr.sh_type != SHT_SYMTAB) {
35670@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35671 }
35672
35673
35674-static void read_relocs(FILE *fp)
35675+static void read_relocs(FILE *fp, int use_real_mode)
35676 {
35677- int i,j;
35678+ unsigned int i,j;
35679+ uint32_t base;
35680+
35681 for (i = 0; i < ehdr.e_shnum; i++) {
35682 struct section *sec = &secs[i];
35683 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35684@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35685 die("Cannot read symbol table: %s\n",
35686 strerror(errno));
35687 }
35688+ base = 0;
35689+
35690+#ifdef CONFIG_X86_32
35691+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35692+ if (phdr[j].p_type != PT_LOAD )
35693+ continue;
35694+ 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)
35695+ continue;
35696+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35697+ break;
35698+ }
35699+#endif
35700+
35701 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35702 Elf_Rel *rel = &sec->reltab[j];
35703- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35704+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35705 rel->r_info = elf_xword_to_cpu(rel->r_info);
35706 #if (SHT_REL_TYPE == SHT_RELA)
35707 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35708@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35709
35710 static void print_absolute_symbols(void)
35711 {
35712- int i;
35713+ unsigned int i;
35714 const char *format;
35715
35716 if (ELF_BITS == 64)
35717@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35718 for (i = 0; i < ehdr.e_shnum; i++) {
35719 struct section *sec = &secs[i];
35720 char *sym_strtab;
35721- int j;
35722+ unsigned int j;
35723
35724 if (sec->shdr.sh_type != SHT_SYMTAB) {
35725 continue;
35726@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35727
35728 static void print_absolute_relocs(void)
35729 {
35730- int i, printed = 0;
35731+ unsigned int i, printed = 0;
35732 const char *format;
35733
35734 if (ELF_BITS == 64)
35735@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35736 struct section *sec_applies, *sec_symtab;
35737 char *sym_strtab;
35738 Elf_Sym *sh_symtab;
35739- int j;
35740+ unsigned int j;
35741 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35742 continue;
35743 }
35744@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35745 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35746 Elf_Sym *sym, const char *symname))
35747 {
35748- int i;
35749+ unsigned int i;
35750 /* Walk through the relocations */
35751 for (i = 0; i < ehdr.e_shnum; i++) {
35752 char *sym_strtab;
35753 Elf_Sym *sh_symtab;
35754 struct section *sec_applies, *sec_symtab;
35755- int j;
35756+ unsigned int j;
35757 struct section *sec = &secs[i];
35758
35759 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35760@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35761 {
35762 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35763 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35764+ char *sym_strtab = sec->link->link->strtab;
35765+
35766+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35767+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35768+ return 0;
35769+
35770+#ifdef CONFIG_PAX_KERNEXEC
35771+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35772+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35773+ return 0;
35774+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35775+ return 0;
35776+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35777+ return 0;
35778+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35779+ return 0;
35780+#endif
35781
35782 switch (r_type) {
35783 case R_386_NONE:
35784@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35785
35786 static void emit_relocs(int as_text, int use_real_mode)
35787 {
35788- int i;
35789+ unsigned int i;
35790 int (*write_reloc)(uint32_t, FILE *) = write32;
35791 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35792 const char *symname);
35793@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35794 {
35795 regex_init(use_real_mode);
35796 read_ehdr(fp);
35797+ read_phdrs(fp);
35798 read_shdrs(fp);
35799 read_strtabs(fp);
35800 read_symtabs(fp);
35801- read_relocs(fp);
35802+ read_relocs(fp, use_real_mode);
35803 if (ELF_BITS == 64)
35804 percpu_init();
35805 if (show_absolute_syms) {
35806diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35807index f40281e..92728c9 100644
35808--- a/arch/x86/um/mem_32.c
35809+++ b/arch/x86/um/mem_32.c
35810@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35811 gate_vma.vm_start = FIXADDR_USER_START;
35812 gate_vma.vm_end = FIXADDR_USER_END;
35813 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35814- gate_vma.vm_page_prot = __P101;
35815+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35816
35817 return 0;
35818 }
35819diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35820index 80ffa5b..a33bd15 100644
35821--- a/arch/x86/um/tls_32.c
35822+++ b/arch/x86/um/tls_32.c
35823@@ -260,7 +260,7 @@ out:
35824 if (unlikely(task == current &&
35825 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35826 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35827- "without flushed TLS.", current->pid);
35828+ "without flushed TLS.", task_pid_nr(current));
35829 }
35830
35831 return 0;
35832diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35833index e970320..c006fea 100644
35834--- a/arch/x86/vdso/Makefile
35835+++ b/arch/x86/vdso/Makefile
35836@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35837 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35838 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35839
35840-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35841+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35842 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35843 GCOV_PROFILE := n
35844
35845diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35846index 0224987..c7d65a5 100644
35847--- a/arch/x86/vdso/vdso2c.h
35848+++ b/arch/x86/vdso/vdso2c.h
35849@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35850 unsigned long load_size = -1; /* Work around bogus warning */
35851 unsigned long mapping_size;
35852 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35853- int i;
35854+ unsigned int i;
35855 unsigned long j;
35856 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35857 *alt_sec = NULL;
35858diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35859index e904c27..b9eaa03 100644
35860--- a/arch/x86/vdso/vdso32-setup.c
35861+++ b/arch/x86/vdso/vdso32-setup.c
35862@@ -14,6 +14,7 @@
35863 #include <asm/cpufeature.h>
35864 #include <asm/processor.h>
35865 #include <asm/vdso.h>
35866+#include <asm/mman.h>
35867
35868 #ifdef CONFIG_COMPAT_VDSO
35869 #define VDSO_DEFAULT 0
35870diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35871index 1c9f750..cfddb1a 100644
35872--- a/arch/x86/vdso/vma.c
35873+++ b/arch/x86/vdso/vma.c
35874@@ -19,10 +19,7 @@
35875 #include <asm/page.h>
35876 #include <asm/hpet.h>
35877 #include <asm/desc.h>
35878-
35879-#if defined(CONFIG_X86_64)
35880-unsigned int __read_mostly vdso64_enabled = 1;
35881-#endif
35882+#include <asm/mman.h>
35883
35884 void __init init_vdso_image(const struct vdso_image *image)
35885 {
35886@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35887 .pages = no_pages,
35888 };
35889
35890+#ifdef CONFIG_PAX_RANDMMAP
35891+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35892+ calculate_addr = false;
35893+#endif
35894+
35895 if (calculate_addr) {
35896 addr = vdso_addr(current->mm->start_stack,
35897 image->size - image->sym_vvar_start);
35898@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35899 down_write(&mm->mmap_sem);
35900
35901 addr = get_unmapped_area(NULL, addr,
35902- image->size - image->sym_vvar_start, 0, 0);
35903+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35904 if (IS_ERR_VALUE(addr)) {
35905 ret = addr;
35906 goto up_fail;
35907 }
35908
35909 text_start = addr - image->sym_vvar_start;
35910- current->mm->context.vdso = (void __user *)text_start;
35911+ mm->context.vdso = text_start;
35912
35913 /*
35914 * MAYWRITE to allow gdb to COW and set breakpoints
35915@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35916 hpet_address >> PAGE_SHIFT,
35917 PAGE_SIZE,
35918 pgprot_noncached(PAGE_READONLY));
35919-
35920- if (ret)
35921- goto up_fail;
35922 }
35923 #endif
35924
35925 up_fail:
35926 if (ret)
35927- current->mm->context.vdso = NULL;
35928+ current->mm->context.vdso = 0;
35929
35930 up_write(&mm->mmap_sem);
35931 return ret;
35932@@ -191,8 +190,8 @@ static int load_vdso32(void)
35933
35934 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35935 current_thread_info()->sysenter_return =
35936- current->mm->context.vdso +
35937- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35938+ (void __force_user *)(current->mm->context.vdso +
35939+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35940
35941 return 0;
35942 }
35943@@ -201,9 +200,6 @@ static int load_vdso32(void)
35944 #ifdef CONFIG_X86_64
35945 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35946 {
35947- if (!vdso64_enabled)
35948- return 0;
35949-
35950 return map_vdso(&vdso_image_64, true);
35951 }
35952
35953@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35954 int uses_interp)
35955 {
35956 #ifdef CONFIG_X86_X32_ABI
35957- if (test_thread_flag(TIF_X32)) {
35958- if (!vdso64_enabled)
35959- return 0;
35960-
35961+ if (test_thread_flag(TIF_X32))
35962 return map_vdso(&vdso_image_x32, true);
35963- }
35964 #endif
35965
35966 return load_vdso32();
35967@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35968 #endif
35969
35970 #ifdef CONFIG_X86_64
35971-static __init int vdso_setup(char *s)
35972-{
35973- vdso64_enabled = simple_strtoul(s, NULL, 0);
35974- return 0;
35975-}
35976-__setup("vdso=", vdso_setup);
35977-#endif
35978-
35979-#ifdef CONFIG_X86_64
35980 static void vgetcpu_cpu_init(void *arg)
35981 {
35982 int cpu = smp_processor_id();
35983diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35984index e88fda8..76ce7ce 100644
35985--- a/arch/x86/xen/Kconfig
35986+++ b/arch/x86/xen/Kconfig
35987@@ -9,6 +9,7 @@ config XEN
35988 select XEN_HAVE_PVMMU
35989 depends on X86_64 || (X86_32 && X86_PAE)
35990 depends on X86_TSC
35991+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35992 help
35993 This is the Linux Xen port. Enabling this will allow the
35994 kernel to boot in a paravirtualized environment under the
35995diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35996index 46957ea..ef7b714 100644
35997--- a/arch/x86/xen/enlighten.c
35998+++ b/arch/x86/xen/enlighten.c
35999@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
36000
36001 struct shared_info xen_dummy_shared_info;
36002
36003-void *xen_initial_gdt;
36004-
36005 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
36006 __read_mostly int xen_have_vector_callback;
36007 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
36008@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
36009 {
36010 unsigned long va = dtr->address;
36011 unsigned int size = dtr->size + 1;
36012- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
36013- unsigned long frames[pages];
36014+ unsigned long frames[65536 / PAGE_SIZE];
36015 int f;
36016
36017 /*
36018@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
36019 {
36020 unsigned long va = dtr->address;
36021 unsigned int size = dtr->size + 1;
36022- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
36023- unsigned long frames[pages];
36024+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
36025 int f;
36026
36027 /*
36028@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
36029 * 8-byte entries, or 16 4k pages..
36030 */
36031
36032- BUG_ON(size > 65536);
36033+ BUG_ON(size > GDT_SIZE);
36034 BUG_ON(va & ~PAGE_MASK);
36035
36036 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
36037@@ -1223,30 +1219,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
36038 #endif
36039 };
36040
36041-static void xen_reboot(int reason)
36042+static __noreturn void xen_reboot(int reason)
36043 {
36044 struct sched_shutdown r = { .reason = reason };
36045
36046- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
36047- BUG();
36048+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
36049+ BUG();
36050 }
36051
36052-static void xen_restart(char *msg)
36053+static __noreturn void xen_restart(char *msg)
36054 {
36055 xen_reboot(SHUTDOWN_reboot);
36056 }
36057
36058-static void xen_emergency_restart(void)
36059+static __noreturn void xen_emergency_restart(void)
36060 {
36061 xen_reboot(SHUTDOWN_reboot);
36062 }
36063
36064-static void xen_machine_halt(void)
36065+static __noreturn void xen_machine_halt(void)
36066 {
36067 xen_reboot(SHUTDOWN_poweroff);
36068 }
36069
36070-static void xen_machine_power_off(void)
36071+static __noreturn void xen_machine_power_off(void)
36072 {
36073 if (pm_power_off)
36074 pm_power_off();
36075@@ -1399,8 +1395,11 @@ static void __ref xen_setup_gdt(int cpu)
36076 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
36077 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
36078
36079- setup_stack_canary_segment(0);
36080- switch_to_new_gdt(0);
36081+ setup_stack_canary_segment(cpu);
36082+#ifdef CONFIG_X86_64
36083+ load_percpu_segment(cpu);
36084+#endif
36085+ switch_to_new_gdt(cpu);
36086
36087 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
36088 pv_cpu_ops.load_gdt = xen_load_gdt;
36089@@ -1515,7 +1514,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
36090 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
36091
36092 /* Work out if we support NX */
36093- x86_configure_nx();
36094+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
36095+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
36096+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
36097+ unsigned l, h;
36098+
36099+ __supported_pte_mask |= _PAGE_NX;
36100+ rdmsr(MSR_EFER, l, h);
36101+ l |= EFER_NX;
36102+ wrmsr(MSR_EFER, l, h);
36103+ }
36104+#endif
36105
36106 /* Get mfn list */
36107 xen_build_dynamic_phys_to_machine();
36108@@ -1543,13 +1552,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
36109
36110 machine_ops = xen_machine_ops;
36111
36112- /*
36113- * The only reliable way to retain the initial address of the
36114- * percpu gdt_page is to remember it here, so we can go and
36115- * mark it RW later, when the initial percpu area is freed.
36116- */
36117- xen_initial_gdt = &per_cpu(gdt_page, 0);
36118-
36119 xen_smp_init();
36120
36121 #ifdef CONFIG_ACPI_NUMA
36122diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
36123index dd151b2..d5ab952 100644
36124--- a/arch/x86/xen/mmu.c
36125+++ b/arch/x86/xen/mmu.c
36126@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
36127 return val;
36128 }
36129
36130-static pteval_t pte_pfn_to_mfn(pteval_t val)
36131+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
36132 {
36133 if (val & _PAGE_PRESENT) {
36134 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
36135@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36136 * L3_k[511] -> level2_fixmap_pgt */
36137 convert_pfn_mfn(level3_kernel_pgt);
36138
36139+ convert_pfn_mfn(level3_vmalloc_start_pgt);
36140+ convert_pfn_mfn(level3_vmalloc_end_pgt);
36141+ convert_pfn_mfn(level3_vmemmap_pgt);
36142 /* L3_k[511][506] -> level1_fixmap_pgt */
36143+ /* L3_k[511][507] -> level1_vsyscall_pgt */
36144 convert_pfn_mfn(level2_fixmap_pgt);
36145 }
36146 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
36147@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
36148 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
36149 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
36150 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
36151+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
36152+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
36153+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
36154 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
36155 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
36156+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
36157 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
36158 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
36159- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
36160+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
36161+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
36162+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
36163+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
36164
36165 /* Pin down new L4 */
36166 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
36167@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
36168 pv_mmu_ops.set_pud = xen_set_pud;
36169 #if CONFIG_PGTABLE_LEVELS == 4
36170 pv_mmu_ops.set_pgd = xen_set_pgd;
36171+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
36172 #endif
36173
36174 /* This will work as long as patching hasn't happened yet
36175@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
36176 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
36177 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
36178 .set_pgd = xen_set_pgd_hyper,
36179+ .set_pgd_batched = xen_set_pgd_hyper,
36180
36181 .alloc_pud = xen_alloc_pmd_init,
36182 .release_pud = xen_release_pmd_init,
36183diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
36184index 8648438..18bac20 100644
36185--- a/arch/x86/xen/smp.c
36186+++ b/arch/x86/xen/smp.c
36187@@ -284,17 +284,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36188
36189 if (xen_pv_domain()) {
36190 if (!xen_feature(XENFEAT_writable_page_tables))
36191- /* We've switched to the "real" per-cpu gdt, so make
36192- * sure the old memory can be recycled. */
36193- make_lowmem_page_readwrite(xen_initial_gdt);
36194-
36195 #ifdef CONFIG_X86_32
36196 /*
36197 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36198 * expects __USER_DS
36199 */
36200- loadsegment(ds, __USER_DS);
36201- loadsegment(es, __USER_DS);
36202+ loadsegment(ds, __KERNEL_DS);
36203+ loadsegment(es, __KERNEL_DS);
36204 #endif
36205
36206 xen_filter_cpu_maps();
36207@@ -375,7 +371,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36208 #ifdef CONFIG_X86_32
36209 /* Note: PVH is not yet supported on x86_32. */
36210 ctxt->user_regs.fs = __KERNEL_PERCPU;
36211- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36212+ savesegment(gs, ctxt->user_regs.gs);
36213 #endif
36214 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36215
36216@@ -383,8 +379,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36217 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36218 ctxt->flags = VGCF_IN_KERNEL;
36219 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36220- ctxt->user_regs.ds = __USER_DS;
36221- ctxt->user_regs.es = __USER_DS;
36222+ ctxt->user_regs.ds = __KERNEL_DS;
36223+ ctxt->user_regs.es = __KERNEL_DS;
36224 ctxt->user_regs.ss = __KERNEL_DS;
36225
36226 xen_copy_trap_info(ctxt->trap_ctxt);
36227@@ -720,7 +716,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36228
36229 void __init xen_smp_init(void)
36230 {
36231- smp_ops = xen_smp_ops;
36232+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36233 xen_fill_possible_map();
36234 }
36235
36236diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36237index fd92a64..1f72641 100644
36238--- a/arch/x86/xen/xen-asm_32.S
36239+++ b/arch/x86/xen/xen-asm_32.S
36240@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36241 pushw %fs
36242 movl $(__KERNEL_PERCPU), %eax
36243 movl %eax, %fs
36244- movl %fs:xen_vcpu, %eax
36245+ mov PER_CPU_VAR(xen_vcpu), %eax
36246 POP_FS
36247 #else
36248 movl %ss:xen_vcpu, %eax
36249diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36250index 8afdfcc..79239db 100644
36251--- a/arch/x86/xen/xen-head.S
36252+++ b/arch/x86/xen/xen-head.S
36253@@ -41,6 +41,17 @@ ENTRY(startup_xen)
36254 #ifdef CONFIG_X86_32
36255 mov %esi,xen_start_info
36256 mov $init_thread_union+THREAD_SIZE,%esp
36257+#ifdef CONFIG_SMP
36258+ movl $cpu_gdt_table,%edi
36259+ movl $__per_cpu_load,%eax
36260+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36261+ rorl $16,%eax
36262+ movb %al,__KERNEL_PERCPU + 4(%edi)
36263+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36264+ movl $__per_cpu_end - 1,%eax
36265+ subl $__per_cpu_start,%eax
36266+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36267+#endif
36268 #else
36269 mov %rsi,xen_start_info
36270 mov $init_thread_union+THREAD_SIZE,%rsp
36271diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36272index 9e195c6..523ed36 100644
36273--- a/arch/x86/xen/xen-ops.h
36274+++ b/arch/x86/xen/xen-ops.h
36275@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36276 void xen_syscall32_target(void);
36277 #endif
36278
36279-extern void *xen_initial_gdt;
36280-
36281 struct trap_info;
36282 void xen_copy_trap_info(struct trap_info *traps);
36283
36284diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36285index 525bd3d..ef888b1 100644
36286--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36287+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36288@@ -119,9 +119,9 @@
36289 ----------------------------------------------------------------------*/
36290
36291 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36292-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36293 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36294 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36295+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36296
36297 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36298 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36299diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36300index 2f33760..835e50a 100644
36301--- a/arch/xtensa/variants/fsf/include/variant/core.h
36302+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36303@@ -11,6 +11,7 @@
36304 #ifndef _XTENSA_CORE_H
36305 #define _XTENSA_CORE_H
36306
36307+#include <linux/const.h>
36308
36309 /****************************************************************************
36310 Parameters Useful for Any Code, USER or PRIVILEGED
36311@@ -112,9 +113,9 @@
36312 ----------------------------------------------------------------------*/
36313
36314 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36315-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36316 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36317 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36318+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36319
36320 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36321 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36322diff --git a/block/bio.c b/block/bio.c
36323index f66a4ea..73ddf55 100644
36324--- a/block/bio.c
36325+++ b/block/bio.c
36326@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36327 /*
36328 * Overflow, abort
36329 */
36330- if (end < start)
36331+ if (end < start || end - start > INT_MAX - nr_pages)
36332 return ERR_PTR(-EINVAL);
36333
36334 nr_pages += end - start;
36335@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36336 /*
36337 * Overflow, abort
36338 */
36339- if (end < start)
36340+ if (end < start || end - start > INT_MAX - nr_pages)
36341 return ERR_PTR(-EINVAL);
36342
36343 nr_pages += end - start;
36344diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36345index 0736729..2ec3b48 100644
36346--- a/block/blk-iopoll.c
36347+++ b/block/blk-iopoll.c
36348@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36349 }
36350 EXPORT_SYMBOL(blk_iopoll_complete);
36351
36352-static void blk_iopoll_softirq(struct softirq_action *h)
36353+static __latent_entropy void blk_iopoll_softirq(void)
36354 {
36355 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36356 int rearm = 0, budget = blk_iopoll_budget;
36357diff --git a/block/blk-map.c b/block/blk-map.c
36358index da310a1..213b5c9 100644
36359--- a/block/blk-map.c
36360+++ b/block/blk-map.c
36361@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36362 if (!len || !kbuf)
36363 return -EINVAL;
36364
36365- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36366+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36367 if (do_copy)
36368 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36369 else
36370diff --git a/block/blk-mq.c b/block/blk-mq.c
36371index 594eea0..2dc1fd6 100644
36372--- a/block/blk-mq.c
36373+++ b/block/blk-mq.c
36374@@ -1968,7 +1968,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
36375 goto err_hctxs;
36376
36377 setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q);
36378- blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000);
36379+ blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ);
36380
36381 q->nr_queues = nr_cpu_ids;
36382 q->nr_hw_queues = set->nr_hw_queues;
36383diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36384index 53b1737..08177d2e 100644
36385--- a/block/blk-softirq.c
36386+++ b/block/blk-softirq.c
36387@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36388 * Softirq action handler - move entries to local list and loop over them
36389 * while passing them to the queue registered handler.
36390 */
36391-static void blk_done_softirq(struct softirq_action *h)
36392+static __latent_entropy void blk_done_softirq(void)
36393 {
36394 struct list_head *cpu_list, local_list;
36395
36396diff --git a/block/bsg.c b/block/bsg.c
36397index d214e92..9649863 100644
36398--- a/block/bsg.c
36399+++ b/block/bsg.c
36400@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36401 struct sg_io_v4 *hdr, struct bsg_device *bd,
36402 fmode_t has_write_perm)
36403 {
36404+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36405+ unsigned char *cmdptr;
36406+
36407 if (hdr->request_len > BLK_MAX_CDB) {
36408 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36409 if (!rq->cmd)
36410 return -ENOMEM;
36411- }
36412+ cmdptr = rq->cmd;
36413+ } else
36414+ cmdptr = tmpcmd;
36415
36416- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36417+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36418 hdr->request_len))
36419 return -EFAULT;
36420
36421+ if (cmdptr != rq->cmd)
36422+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36423+
36424 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36425 if (blk_verify_command(rq->cmd, has_write_perm))
36426 return -EPERM;
36427diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36428index f678c73..f35aa18 100644
36429--- a/block/compat_ioctl.c
36430+++ b/block/compat_ioctl.c
36431@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36432 cgc = compat_alloc_user_space(sizeof(*cgc));
36433 cgc32 = compat_ptr(arg);
36434
36435- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36436+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36437 get_user(data, &cgc32->buffer) ||
36438 put_user(compat_ptr(data), &cgc->buffer) ||
36439 copy_in_user(&cgc->buflen, &cgc32->buflen,
36440@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36441 err |= __get_user(f->spec1, &uf->spec1);
36442 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36443 err |= __get_user(name, &uf->name);
36444- f->name = compat_ptr(name);
36445+ f->name = (void __force_kernel *)compat_ptr(name);
36446 if (err) {
36447 err = -EFAULT;
36448 goto out;
36449diff --git a/block/genhd.c b/block/genhd.c
36450index ea982ea..86e0f9e 100644
36451--- a/block/genhd.c
36452+++ b/block/genhd.c
36453@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36454
36455 /*
36456 * Register device numbers dev..(dev+range-1)
36457- * range must be nonzero
36458+ * Noop if @range is zero.
36459 * The hash chain is sorted on range, so that subranges can override.
36460 */
36461 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36462 struct kobject *(*probe)(dev_t, int *, void *),
36463 int (*lock)(dev_t, void *), void *data)
36464 {
36465- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36466+ if (range)
36467+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36468 }
36469
36470 EXPORT_SYMBOL(blk_register_region);
36471
36472+/* undo blk_register_region(), noop if @range is zero */
36473 void blk_unregister_region(dev_t devt, unsigned long range)
36474 {
36475- kobj_unmap(bdev_map, devt, range);
36476+ if (range)
36477+ kobj_unmap(bdev_map, devt, range);
36478 }
36479
36480 EXPORT_SYMBOL(blk_unregister_region);
36481diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36482index 26cb624..a49c3a5 100644
36483--- a/block/partitions/efi.c
36484+++ b/block/partitions/efi.c
36485@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36486 if (!gpt)
36487 return NULL;
36488
36489+ if (!le32_to_cpu(gpt->num_partition_entries))
36490+ return NULL;
36491+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36492+ if (!pte)
36493+ return NULL;
36494+
36495 count = le32_to_cpu(gpt->num_partition_entries) *
36496 le32_to_cpu(gpt->sizeof_partition_entry);
36497- if (!count)
36498- return NULL;
36499- pte = kmalloc(count, GFP_KERNEL);
36500- if (!pte)
36501- return NULL;
36502-
36503 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36504 (u8 *) pte, count) < count) {
36505 kfree(pte);
36506diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36507index 55b6f15..b602c9a 100644
36508--- a/block/scsi_ioctl.c
36509+++ b/block/scsi_ioctl.c
36510@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36511 return put_user(0, p);
36512 }
36513
36514-static int sg_get_timeout(struct request_queue *q)
36515+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36516 {
36517 return jiffies_to_clock_t(q->sg_timeout);
36518 }
36519@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36520 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36521 struct sg_io_hdr *hdr, fmode_t mode)
36522 {
36523- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36524+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36525+ unsigned char *cmdptr;
36526+
36527+ if (rq->cmd != rq->__cmd)
36528+ cmdptr = rq->cmd;
36529+ else
36530+ cmdptr = tmpcmd;
36531+
36532+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36533 return -EFAULT;
36534+
36535+ if (cmdptr != rq->cmd)
36536+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36537+
36538 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36539 return -EPERM;
36540
36541@@ -420,6 +432,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36542 int err;
36543 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36544 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36545+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36546+ unsigned char *cmdptr;
36547
36548 if (!sic)
36549 return -EINVAL;
36550@@ -458,9 +472,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36551 */
36552 err = -EFAULT;
36553 rq->cmd_len = cmdlen;
36554- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36555+
36556+ if (rq->cmd != rq->__cmd)
36557+ cmdptr = rq->cmd;
36558+ else
36559+ cmdptr = tmpcmd;
36560+
36561+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36562 goto error;
36563
36564+ if (rq->cmd != cmdptr)
36565+ memcpy(rq->cmd, cmdptr, cmdlen);
36566+
36567 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36568 goto error;
36569
36570diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36571index b0602ba..fb71850 100644
36572--- a/crypto/cryptd.c
36573+++ b/crypto/cryptd.c
36574@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36575
36576 struct cryptd_blkcipher_request_ctx {
36577 crypto_completion_t complete;
36578-};
36579+} __no_const;
36580
36581 struct cryptd_hash_ctx {
36582 struct crypto_shash *child;
36583@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36584
36585 struct cryptd_aead_request_ctx {
36586 crypto_completion_t complete;
36587-};
36588+} __no_const;
36589
36590 static void cryptd_queue_worker(struct work_struct *work);
36591
36592diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36593index c305d41..a96de79 100644
36594--- a/crypto/pcrypt.c
36595+++ b/crypto/pcrypt.c
36596@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36597 int ret;
36598
36599 pinst->kobj.kset = pcrypt_kset;
36600- ret = kobject_add(&pinst->kobj, NULL, name);
36601+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36602 if (!ret)
36603 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36604
36605diff --git a/crypto/zlib.c b/crypto/zlib.c
36606index 0eefa9d..0fa3d29 100644
36607--- a/crypto/zlib.c
36608+++ b/crypto/zlib.c
36609@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36610 zlib_comp_exit(ctx);
36611
36612 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36613- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36614+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36615 : MAX_WBITS;
36616 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36617- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36618+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36619 : DEF_MEM_LEVEL;
36620
36621 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36622diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36623index 3b37676..898edfa 100644
36624--- a/drivers/acpi/acpica/hwxfsleep.c
36625+++ b/drivers/acpi/acpica/hwxfsleep.c
36626@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36627 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36628
36629 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36630- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36631- acpi_hw_extended_sleep},
36632- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36633- acpi_hw_extended_wake_prep},
36634- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36635+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36636+ .extended_function = acpi_hw_extended_sleep},
36637+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36638+ .extended_function = acpi_hw_extended_wake_prep},
36639+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36640+ .extended_function = acpi_hw_extended_wake}
36641 };
36642
36643 /*
36644diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36645index 16129c7..8b675cd 100644
36646--- a/drivers/acpi/apei/apei-internal.h
36647+++ b/drivers/acpi/apei/apei-internal.h
36648@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36649 struct apei_exec_ins_type {
36650 u32 flags;
36651 apei_exec_ins_func_t run;
36652-};
36653+} __do_const;
36654
36655 struct apei_exec_context {
36656 u32 ip;
36657diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36658index e82d097..0c855c1 100644
36659--- a/drivers/acpi/apei/ghes.c
36660+++ b/drivers/acpi/apei/ghes.c
36661@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36662 const struct acpi_hest_generic *generic,
36663 const struct acpi_hest_generic_status *estatus)
36664 {
36665- static atomic_t seqno;
36666+ static atomic_unchecked_t seqno;
36667 unsigned int curr_seqno;
36668 char pfx_seq[64];
36669
36670@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36671 else
36672 pfx = KERN_ERR;
36673 }
36674- curr_seqno = atomic_inc_return(&seqno);
36675+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36676 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36677 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36678 pfx_seq, generic->header.source_id);
36679diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36680index a83e3c6..c3d617f 100644
36681--- a/drivers/acpi/bgrt.c
36682+++ b/drivers/acpi/bgrt.c
36683@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36684 if (!bgrt_image)
36685 return -ENODEV;
36686
36687- bin_attr_image.private = bgrt_image;
36688- bin_attr_image.size = bgrt_image_size;
36689+ pax_open_kernel();
36690+ *(void **)&bin_attr_image.private = bgrt_image;
36691+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36692+ pax_close_kernel();
36693
36694 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36695 if (!bgrt_kobj)
36696diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36697index 1d17919..315e955 100644
36698--- a/drivers/acpi/blacklist.c
36699+++ b/drivers/acpi/blacklist.c
36700@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36701 u32 is_critical_error;
36702 };
36703
36704-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36705+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36706
36707 /*
36708 * POLICY: If *anything* doesn't work, put it on the blacklist.
36709@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36710 return 0;
36711 }
36712
36713-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36714+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36715 {
36716 .callback = dmi_disable_osi_vista,
36717 .ident = "Fujitsu Siemens",
36718diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36719index 513e7230e..802015a 100644
36720--- a/drivers/acpi/bus.c
36721+++ b/drivers/acpi/bus.c
36722@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36723 }
36724 #endif
36725
36726-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36727+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36728 /*
36729 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36730 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36731@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36732 {}
36733 };
36734 #else
36735-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36736+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36737 {}
36738 };
36739 #endif
36740diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36741index c68e724..e863008 100644
36742--- a/drivers/acpi/custom_method.c
36743+++ b/drivers/acpi/custom_method.c
36744@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36745 struct acpi_table_header table;
36746 acpi_status status;
36747
36748+#ifdef CONFIG_GRKERNSEC_KMEM
36749+ return -EPERM;
36750+#endif
36751+
36752 if (!(*ppos)) {
36753 /* parse the table header to get the table length */
36754 if (count <= sizeof(struct acpi_table_header))
36755diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36756index 8217e0b..3294cb6 100644
36757--- a/drivers/acpi/device_pm.c
36758+++ b/drivers/acpi/device_pm.c
36759@@ -1026,6 +1026,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36760
36761 #endif /* CONFIG_PM_SLEEP */
36762
36763+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36764+
36765 static struct dev_pm_domain acpi_general_pm_domain = {
36766 .ops = {
36767 .runtime_suspend = acpi_subsys_runtime_suspend,
36768@@ -1042,6 +1044,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36769 .restore_early = acpi_subsys_resume_early,
36770 #endif
36771 },
36772+ .detach = acpi_dev_pm_detach
36773 };
36774
36775 /**
36776@@ -1111,7 +1114,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36777 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36778 }
36779
36780- dev->pm_domain->detach = acpi_dev_pm_detach;
36781 return 0;
36782 }
36783 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36784diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36785index 5e8fed4..d9bb545 100644
36786--- a/drivers/acpi/ec.c
36787+++ b/drivers/acpi/ec.c
36788@@ -1293,7 +1293,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36789 return 0;
36790 }
36791
36792-static struct dmi_system_id ec_dmi_table[] __initdata = {
36793+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36794 {
36795 ec_skip_dsdt_scan, "Compal JFL92", {
36796 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36797diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36798index 139d9e4..9a9d799 100644
36799--- a/drivers/acpi/pci_slot.c
36800+++ b/drivers/acpi/pci_slot.c
36801@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36802 return 0;
36803 }
36804
36805-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36806+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36807 /*
36808 * Fujitsu Primequest machines will return 1023 to indicate an
36809 * error if the _SUN method is evaluated on SxFy objects that
36810diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36811index d9f7158..168e742 100644
36812--- a/drivers/acpi/processor_driver.c
36813+++ b/drivers/acpi/processor_driver.c
36814@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36815 return NOTIFY_OK;
36816 }
36817
36818-static struct notifier_block __refdata acpi_cpu_notifier = {
36819+static struct notifier_block __refconst acpi_cpu_notifier = {
36820 .notifier_call = acpi_cpu_soft_notify,
36821 };
36822
36823diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36824index 39e0c8e..b5ae20c 100644
36825--- a/drivers/acpi/processor_idle.c
36826+++ b/drivers/acpi/processor_idle.c
36827@@ -910,7 +910,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36828 {
36829 int i, count = CPUIDLE_DRIVER_STATE_START;
36830 struct acpi_processor_cx *cx;
36831- struct cpuidle_state *state;
36832+ cpuidle_state_no_const *state;
36833 struct cpuidle_driver *drv = &acpi_idle_driver;
36834
36835 if (!pr->flags.power_setup_done)
36836diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36837index e5dd808..1eceed1 100644
36838--- a/drivers/acpi/processor_pdc.c
36839+++ b/drivers/acpi/processor_pdc.c
36840@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36841 return 0;
36842 }
36843
36844-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36845+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36846 {
36847 set_no_mwait, "Extensa 5220", {
36848 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36849diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36850index 2f0d4db..b9e9b15 100644
36851--- a/drivers/acpi/sleep.c
36852+++ b/drivers/acpi/sleep.c
36853@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36854 return 0;
36855 }
36856
36857-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36858+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36859 {
36860 .callback = init_old_suspend_ordering,
36861 .ident = "Abit KN9 (nForce4 variant)",
36862diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36863index 0876d77b..3ba0127 100644
36864--- a/drivers/acpi/sysfs.c
36865+++ b/drivers/acpi/sysfs.c
36866@@ -423,11 +423,11 @@ static u32 num_counters;
36867 static struct attribute **all_attrs;
36868 static u32 acpi_gpe_count;
36869
36870-static struct attribute_group interrupt_stats_attr_group = {
36871+static attribute_group_no_const interrupt_stats_attr_group = {
36872 .name = "interrupts",
36873 };
36874
36875-static struct kobj_attribute *counter_attrs;
36876+static kobj_attribute_no_const *counter_attrs;
36877
36878 static void delete_gpe_attr_array(void)
36879 {
36880diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36881index d24fa19..782f1e6 100644
36882--- a/drivers/acpi/thermal.c
36883+++ b/drivers/acpi/thermal.c
36884@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36885 return 0;
36886 }
36887
36888-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36889+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36890 /*
36891 * Award BIOS on this AOpen makes thermal control almost worthless.
36892 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36893diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36894index cc79d3f..28adb33 100644
36895--- a/drivers/acpi/video.c
36896+++ b/drivers/acpi/video.c
36897@@ -431,7 +431,7 @@ static int __init video_enable_native_backlight(const struct dmi_system_id *d)
36898 return 0;
36899 }
36900
36901-static struct dmi_system_id video_dmi_table[] __initdata = {
36902+static const struct dmi_system_id video_dmi_table[] __initconst = {
36903 /*
36904 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36905 */
36906diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36907index 287c4ba..6a600bc 100644
36908--- a/drivers/ata/libahci.c
36909+++ b/drivers/ata/libahci.c
36910@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36911 }
36912 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36913
36914-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36915+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36916 struct ata_taskfile *tf, int is_cmd, u16 flags,
36917 unsigned long timeout_msec)
36918 {
36919diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36920index 577849c..920847c 100644
36921--- a/drivers/ata/libata-core.c
36922+++ b/drivers/ata/libata-core.c
36923@@ -102,7 +102,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36924 static void ata_dev_xfermask(struct ata_device *dev);
36925 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36926
36927-atomic_t ata_print_id = ATOMIC_INIT(0);
36928+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36929
36930 struct ata_force_param {
36931 const char *name;
36932@@ -4801,7 +4801,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36933 struct ata_port *ap;
36934 unsigned int tag;
36935
36936- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36937+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36938 ap = qc->ap;
36939
36940 qc->flags = 0;
36941@@ -4818,7 +4818,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36942 struct ata_port *ap;
36943 struct ata_link *link;
36944
36945- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36946+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36947 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36948 ap = qc->ap;
36949 link = qc->dev->link;
36950@@ -5925,6 +5925,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36951 return;
36952
36953 spin_lock(&lock);
36954+ pax_open_kernel();
36955
36956 for (cur = ops->inherits; cur; cur = cur->inherits) {
36957 void **inherit = (void **)cur;
36958@@ -5938,8 +5939,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36959 if (IS_ERR(*pp))
36960 *pp = NULL;
36961
36962- ops->inherits = NULL;
36963+ *(struct ata_port_operations **)&ops->inherits = NULL;
36964
36965+ pax_close_kernel();
36966 spin_unlock(&lock);
36967 }
36968
36969@@ -6135,7 +6137,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36970
36971 /* give ports names and add SCSI hosts */
36972 for (i = 0; i < host->n_ports; i++) {
36973- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36974+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36975 host->ports[i]->local_port_no = i + 1;
36976 }
36977
36978diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36979index 3131adc..93e7aa0 100644
36980--- a/drivers/ata/libata-scsi.c
36981+++ b/drivers/ata/libata-scsi.c
36982@@ -4209,7 +4209,7 @@ int ata_sas_port_init(struct ata_port *ap)
36983
36984 if (rc)
36985 return rc;
36986- ap->print_id = atomic_inc_return(&ata_print_id);
36987+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36988 return 0;
36989 }
36990 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36991diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36992index a998a17..8de4bf4 100644
36993--- a/drivers/ata/libata.h
36994+++ b/drivers/ata/libata.h
36995@@ -53,7 +53,7 @@ enum {
36996 ATA_DNXFER_QUIET = (1 << 31),
36997 };
36998
36999-extern atomic_t ata_print_id;
37000+extern atomic_unchecked_t ata_print_id;
37001 extern int atapi_passthru16;
37002 extern int libata_fua;
37003 extern int libata_noacpi;
37004diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
37005index a9b0c82..207d97d 100644
37006--- a/drivers/ata/pata_arasan_cf.c
37007+++ b/drivers/ata/pata_arasan_cf.c
37008@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
37009 /* Handle platform specific quirks */
37010 if (quirk) {
37011 if (quirk & CF_BROKEN_PIO) {
37012- ap->ops->set_piomode = NULL;
37013+ pax_open_kernel();
37014+ *(void **)&ap->ops->set_piomode = NULL;
37015+ pax_close_kernel();
37016 ap->pio_mask = 0;
37017 }
37018 if (quirk & CF_BROKEN_MWDMA)
37019diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
37020index f9b983a..887b9d8 100644
37021--- a/drivers/atm/adummy.c
37022+++ b/drivers/atm/adummy.c
37023@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
37024 vcc->pop(vcc, skb);
37025 else
37026 dev_kfree_skb_any(skb);
37027- atomic_inc(&vcc->stats->tx);
37028+ atomic_inc_unchecked(&vcc->stats->tx);
37029
37030 return 0;
37031 }
37032diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
37033index f1a9198..f466a4a 100644
37034--- a/drivers/atm/ambassador.c
37035+++ b/drivers/atm/ambassador.c
37036@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
37037 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
37038
37039 // VC layer stats
37040- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37041+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37042
37043 // free the descriptor
37044 kfree (tx_descr);
37045@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
37046 dump_skb ("<<<", vc, skb);
37047
37048 // VC layer stats
37049- atomic_inc(&atm_vcc->stats->rx);
37050+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37051 __net_timestamp(skb);
37052 // end of our responsibility
37053 atm_vcc->push (atm_vcc, skb);
37054@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
37055 } else {
37056 PRINTK (KERN_INFO, "dropped over-size frame");
37057 // should we count this?
37058- atomic_inc(&atm_vcc->stats->rx_drop);
37059+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37060 }
37061
37062 } else {
37063@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
37064 }
37065
37066 if (check_area (skb->data, skb->len)) {
37067- atomic_inc(&atm_vcc->stats->tx_err);
37068+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
37069 return -ENOMEM; // ?
37070 }
37071
37072diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
37073index 480fa6f..947067c 100644
37074--- a/drivers/atm/atmtcp.c
37075+++ b/drivers/atm/atmtcp.c
37076@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37077 if (vcc->pop) vcc->pop(vcc,skb);
37078 else dev_kfree_skb(skb);
37079 if (dev_data) return 0;
37080- atomic_inc(&vcc->stats->tx_err);
37081+ atomic_inc_unchecked(&vcc->stats->tx_err);
37082 return -ENOLINK;
37083 }
37084 size = skb->len+sizeof(struct atmtcp_hdr);
37085@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37086 if (!new_skb) {
37087 if (vcc->pop) vcc->pop(vcc,skb);
37088 else dev_kfree_skb(skb);
37089- atomic_inc(&vcc->stats->tx_err);
37090+ atomic_inc_unchecked(&vcc->stats->tx_err);
37091 return -ENOBUFS;
37092 }
37093 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
37094@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
37095 if (vcc->pop) vcc->pop(vcc,skb);
37096 else dev_kfree_skb(skb);
37097 out_vcc->push(out_vcc,new_skb);
37098- atomic_inc(&vcc->stats->tx);
37099- atomic_inc(&out_vcc->stats->rx);
37100+ atomic_inc_unchecked(&vcc->stats->tx);
37101+ atomic_inc_unchecked(&out_vcc->stats->rx);
37102 return 0;
37103 }
37104
37105@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37106 read_unlock(&vcc_sklist_lock);
37107 if (!out_vcc) {
37108 result = -EUNATCH;
37109- atomic_inc(&vcc->stats->tx_err);
37110+ atomic_inc_unchecked(&vcc->stats->tx_err);
37111 goto done;
37112 }
37113 skb_pull(skb,sizeof(struct atmtcp_hdr));
37114@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
37115 __net_timestamp(new_skb);
37116 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
37117 out_vcc->push(out_vcc,new_skb);
37118- atomic_inc(&vcc->stats->tx);
37119- atomic_inc(&out_vcc->stats->rx);
37120+ atomic_inc_unchecked(&vcc->stats->tx);
37121+ atomic_inc_unchecked(&out_vcc->stats->rx);
37122 done:
37123 if (vcc->pop) vcc->pop(vcc,skb);
37124 else dev_kfree_skb(skb);
37125diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
37126index 6339efd..2b441d5 100644
37127--- a/drivers/atm/eni.c
37128+++ b/drivers/atm/eni.c
37129@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
37130 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
37131 vcc->dev->number);
37132 length = 0;
37133- atomic_inc(&vcc->stats->rx_err);
37134+ atomic_inc_unchecked(&vcc->stats->rx_err);
37135 }
37136 else {
37137 length = ATM_CELL_SIZE-1; /* no HEC */
37138@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37139 size);
37140 }
37141 eff = length = 0;
37142- atomic_inc(&vcc->stats->rx_err);
37143+ atomic_inc_unchecked(&vcc->stats->rx_err);
37144 }
37145 else {
37146 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
37147@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
37148 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
37149 vcc->dev->number,vcc->vci,length,size << 2,descr);
37150 length = eff = 0;
37151- atomic_inc(&vcc->stats->rx_err);
37152+ atomic_inc_unchecked(&vcc->stats->rx_err);
37153 }
37154 }
37155 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
37156@@ -770,7 +770,7 @@ rx_dequeued++;
37157 vcc->push(vcc,skb);
37158 pushed++;
37159 }
37160- atomic_inc(&vcc->stats->rx);
37161+ atomic_inc_unchecked(&vcc->stats->rx);
37162 }
37163 wake_up(&eni_dev->rx_wait);
37164 }
37165@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
37166 DMA_TO_DEVICE);
37167 if (vcc->pop) vcc->pop(vcc,skb);
37168 else dev_kfree_skb_irq(skb);
37169- atomic_inc(&vcc->stats->tx);
37170+ atomic_inc_unchecked(&vcc->stats->tx);
37171 wake_up(&eni_dev->tx_wait);
37172 dma_complete++;
37173 }
37174diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37175index 82f2ae0..f205c02 100644
37176--- a/drivers/atm/firestream.c
37177+++ b/drivers/atm/firestream.c
37178@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37179 }
37180 }
37181
37182- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37183+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37184
37185 fs_dprintk (FS_DEBUG_TXMEM, "i");
37186 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37187@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37188 #endif
37189 skb_put (skb, qe->p1 & 0xffff);
37190 ATM_SKB(skb)->vcc = atm_vcc;
37191- atomic_inc(&atm_vcc->stats->rx);
37192+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37193 __net_timestamp(skb);
37194 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37195 atm_vcc->push (atm_vcc, skb);
37196@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37197 kfree (pe);
37198 }
37199 if (atm_vcc)
37200- atomic_inc(&atm_vcc->stats->rx_drop);
37201+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37202 break;
37203 case 0x1f: /* Reassembly abort: no buffers. */
37204 /* Silently increment error counter. */
37205 if (atm_vcc)
37206- atomic_inc(&atm_vcc->stats->rx_drop);
37207+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37208 break;
37209 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37210 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37211diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37212index 75dde90..4309ead 100644
37213--- a/drivers/atm/fore200e.c
37214+++ b/drivers/atm/fore200e.c
37215@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37216 #endif
37217 /* check error condition */
37218 if (*entry->status & STATUS_ERROR)
37219- atomic_inc(&vcc->stats->tx_err);
37220+ atomic_inc_unchecked(&vcc->stats->tx_err);
37221 else
37222- atomic_inc(&vcc->stats->tx);
37223+ atomic_inc_unchecked(&vcc->stats->tx);
37224 }
37225 }
37226
37227@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37228 if (skb == NULL) {
37229 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37230
37231- atomic_inc(&vcc->stats->rx_drop);
37232+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37233 return -ENOMEM;
37234 }
37235
37236@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37237
37238 dev_kfree_skb_any(skb);
37239
37240- atomic_inc(&vcc->stats->rx_drop);
37241+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37242 return -ENOMEM;
37243 }
37244
37245 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37246
37247 vcc->push(vcc, skb);
37248- atomic_inc(&vcc->stats->rx);
37249+ atomic_inc_unchecked(&vcc->stats->rx);
37250
37251 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37252
37253@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37254 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37255 fore200e->atm_dev->number,
37256 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37257- atomic_inc(&vcc->stats->rx_err);
37258+ atomic_inc_unchecked(&vcc->stats->rx_err);
37259 }
37260 }
37261
37262@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37263 goto retry_here;
37264 }
37265
37266- atomic_inc(&vcc->stats->tx_err);
37267+ atomic_inc_unchecked(&vcc->stats->tx_err);
37268
37269 fore200e->tx_sat++;
37270 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37271diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37272index 93dca2e..c5daa69 100644
37273--- a/drivers/atm/he.c
37274+++ b/drivers/atm/he.c
37275@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37276
37277 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37278 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37279- atomic_inc(&vcc->stats->rx_drop);
37280+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37281 goto return_host_buffers;
37282 }
37283
37284@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37285 RBRQ_LEN_ERR(he_dev->rbrq_head)
37286 ? "LEN_ERR" : "",
37287 vcc->vpi, vcc->vci);
37288- atomic_inc(&vcc->stats->rx_err);
37289+ atomic_inc_unchecked(&vcc->stats->rx_err);
37290 goto return_host_buffers;
37291 }
37292
37293@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37294 vcc->push(vcc, skb);
37295 spin_lock(&he_dev->global_lock);
37296
37297- atomic_inc(&vcc->stats->rx);
37298+ atomic_inc_unchecked(&vcc->stats->rx);
37299
37300 return_host_buffers:
37301 ++pdus_assembled;
37302@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37303 tpd->vcc->pop(tpd->vcc, tpd->skb);
37304 else
37305 dev_kfree_skb_any(tpd->skb);
37306- atomic_inc(&tpd->vcc->stats->tx_err);
37307+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37308 }
37309 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37310 return;
37311@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37312 vcc->pop(vcc, skb);
37313 else
37314 dev_kfree_skb_any(skb);
37315- atomic_inc(&vcc->stats->tx_err);
37316+ atomic_inc_unchecked(&vcc->stats->tx_err);
37317 return -EINVAL;
37318 }
37319
37320@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37321 vcc->pop(vcc, skb);
37322 else
37323 dev_kfree_skb_any(skb);
37324- atomic_inc(&vcc->stats->tx_err);
37325+ atomic_inc_unchecked(&vcc->stats->tx_err);
37326 return -EINVAL;
37327 }
37328 #endif
37329@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37330 vcc->pop(vcc, skb);
37331 else
37332 dev_kfree_skb_any(skb);
37333- atomic_inc(&vcc->stats->tx_err);
37334+ atomic_inc_unchecked(&vcc->stats->tx_err);
37335 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37336 return -ENOMEM;
37337 }
37338@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37339 vcc->pop(vcc, skb);
37340 else
37341 dev_kfree_skb_any(skb);
37342- atomic_inc(&vcc->stats->tx_err);
37343+ atomic_inc_unchecked(&vcc->stats->tx_err);
37344 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37345 return -ENOMEM;
37346 }
37347@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37348 __enqueue_tpd(he_dev, tpd, cid);
37349 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37350
37351- atomic_inc(&vcc->stats->tx);
37352+ atomic_inc_unchecked(&vcc->stats->tx);
37353
37354 return 0;
37355 }
37356diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37357index 527bbd5..96570c8 100644
37358--- a/drivers/atm/horizon.c
37359+++ b/drivers/atm/horizon.c
37360@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37361 {
37362 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37363 // VC layer stats
37364- atomic_inc(&vcc->stats->rx);
37365+ atomic_inc_unchecked(&vcc->stats->rx);
37366 __net_timestamp(skb);
37367 // end of our responsibility
37368 vcc->push (vcc, skb);
37369@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37370 dev->tx_iovec = NULL;
37371
37372 // VC layer stats
37373- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37374+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37375
37376 // free the skb
37377 hrz_kfree_skb (skb);
37378diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37379index 074616b..d6b3d5f 100644
37380--- a/drivers/atm/idt77252.c
37381+++ b/drivers/atm/idt77252.c
37382@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37383 else
37384 dev_kfree_skb(skb);
37385
37386- atomic_inc(&vcc->stats->tx);
37387+ atomic_inc_unchecked(&vcc->stats->tx);
37388 }
37389
37390 atomic_dec(&scq->used);
37391@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37392 if ((sb = dev_alloc_skb(64)) == NULL) {
37393 printk("%s: Can't allocate buffers for aal0.\n",
37394 card->name);
37395- atomic_add(i, &vcc->stats->rx_drop);
37396+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37397 break;
37398 }
37399 if (!atm_charge(vcc, sb->truesize)) {
37400 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37401 card->name);
37402- atomic_add(i - 1, &vcc->stats->rx_drop);
37403+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37404 dev_kfree_skb(sb);
37405 break;
37406 }
37407@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37408 ATM_SKB(sb)->vcc = vcc;
37409 __net_timestamp(sb);
37410 vcc->push(vcc, sb);
37411- atomic_inc(&vcc->stats->rx);
37412+ atomic_inc_unchecked(&vcc->stats->rx);
37413
37414 cell += ATM_CELL_PAYLOAD;
37415 }
37416@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37417 "(CDC: %08x)\n",
37418 card->name, len, rpp->len, readl(SAR_REG_CDC));
37419 recycle_rx_pool_skb(card, rpp);
37420- atomic_inc(&vcc->stats->rx_err);
37421+ atomic_inc_unchecked(&vcc->stats->rx_err);
37422 return;
37423 }
37424 if (stat & SAR_RSQE_CRC) {
37425 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37426 recycle_rx_pool_skb(card, rpp);
37427- atomic_inc(&vcc->stats->rx_err);
37428+ atomic_inc_unchecked(&vcc->stats->rx_err);
37429 return;
37430 }
37431 if (skb_queue_len(&rpp->queue) > 1) {
37432@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37433 RXPRINTK("%s: Can't alloc RX skb.\n",
37434 card->name);
37435 recycle_rx_pool_skb(card, rpp);
37436- atomic_inc(&vcc->stats->rx_err);
37437+ atomic_inc_unchecked(&vcc->stats->rx_err);
37438 return;
37439 }
37440 if (!atm_charge(vcc, skb->truesize)) {
37441@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37442 __net_timestamp(skb);
37443
37444 vcc->push(vcc, skb);
37445- atomic_inc(&vcc->stats->rx);
37446+ atomic_inc_unchecked(&vcc->stats->rx);
37447
37448 return;
37449 }
37450@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37451 __net_timestamp(skb);
37452
37453 vcc->push(vcc, skb);
37454- atomic_inc(&vcc->stats->rx);
37455+ atomic_inc_unchecked(&vcc->stats->rx);
37456
37457 if (skb->truesize > SAR_FB_SIZE_3)
37458 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37459@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37460 if (vcc->qos.aal != ATM_AAL0) {
37461 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37462 card->name, vpi, vci);
37463- atomic_inc(&vcc->stats->rx_drop);
37464+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37465 goto drop;
37466 }
37467
37468 if ((sb = dev_alloc_skb(64)) == NULL) {
37469 printk("%s: Can't allocate buffers for AAL0.\n",
37470 card->name);
37471- atomic_inc(&vcc->stats->rx_err);
37472+ atomic_inc_unchecked(&vcc->stats->rx_err);
37473 goto drop;
37474 }
37475
37476@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37477 ATM_SKB(sb)->vcc = vcc;
37478 __net_timestamp(sb);
37479 vcc->push(vcc, sb);
37480- atomic_inc(&vcc->stats->rx);
37481+ atomic_inc_unchecked(&vcc->stats->rx);
37482
37483 drop:
37484 skb_pull(queue, 64);
37485@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37486
37487 if (vc == NULL) {
37488 printk("%s: NULL connection in send().\n", card->name);
37489- atomic_inc(&vcc->stats->tx_err);
37490+ atomic_inc_unchecked(&vcc->stats->tx_err);
37491 dev_kfree_skb(skb);
37492 return -EINVAL;
37493 }
37494 if (!test_bit(VCF_TX, &vc->flags)) {
37495 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37496- atomic_inc(&vcc->stats->tx_err);
37497+ atomic_inc_unchecked(&vcc->stats->tx_err);
37498 dev_kfree_skb(skb);
37499 return -EINVAL;
37500 }
37501@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37502 break;
37503 default:
37504 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37505- atomic_inc(&vcc->stats->tx_err);
37506+ atomic_inc_unchecked(&vcc->stats->tx_err);
37507 dev_kfree_skb(skb);
37508 return -EINVAL;
37509 }
37510
37511 if (skb_shinfo(skb)->nr_frags != 0) {
37512 printk("%s: No scatter-gather yet.\n", card->name);
37513- atomic_inc(&vcc->stats->tx_err);
37514+ atomic_inc_unchecked(&vcc->stats->tx_err);
37515 dev_kfree_skb(skb);
37516 return -EINVAL;
37517 }
37518@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37519
37520 err = queue_skb(card, vc, skb, oam);
37521 if (err) {
37522- atomic_inc(&vcc->stats->tx_err);
37523+ atomic_inc_unchecked(&vcc->stats->tx_err);
37524 dev_kfree_skb(skb);
37525 return err;
37526 }
37527@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37528 skb = dev_alloc_skb(64);
37529 if (!skb) {
37530 printk("%s: Out of memory in send_oam().\n", card->name);
37531- atomic_inc(&vcc->stats->tx_err);
37532+ atomic_inc_unchecked(&vcc->stats->tx_err);
37533 return -ENOMEM;
37534 }
37535 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37536diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37537index 924f8e2..3375a3e 100644
37538--- a/drivers/atm/iphase.c
37539+++ b/drivers/atm/iphase.c
37540@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37541 status = (u_short) (buf_desc_ptr->desc_mode);
37542 if (status & (RX_CER | RX_PTE | RX_OFL))
37543 {
37544- atomic_inc(&vcc->stats->rx_err);
37545+ atomic_inc_unchecked(&vcc->stats->rx_err);
37546 IF_ERR(printk("IA: bad packet, dropping it");)
37547 if (status & RX_CER) {
37548 IF_ERR(printk(" cause: packet CRC error\n");)
37549@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37550 len = dma_addr - buf_addr;
37551 if (len > iadev->rx_buf_sz) {
37552 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37553- atomic_inc(&vcc->stats->rx_err);
37554+ atomic_inc_unchecked(&vcc->stats->rx_err);
37555 goto out_free_desc;
37556 }
37557
37558@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37559 ia_vcc = INPH_IA_VCC(vcc);
37560 if (ia_vcc == NULL)
37561 {
37562- atomic_inc(&vcc->stats->rx_err);
37563+ atomic_inc_unchecked(&vcc->stats->rx_err);
37564 atm_return(vcc, skb->truesize);
37565 dev_kfree_skb_any(skb);
37566 goto INCR_DLE;
37567@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37568 if ((length > iadev->rx_buf_sz) || (length >
37569 (skb->len - sizeof(struct cpcs_trailer))))
37570 {
37571- atomic_inc(&vcc->stats->rx_err);
37572+ atomic_inc_unchecked(&vcc->stats->rx_err);
37573 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37574 length, skb->len);)
37575 atm_return(vcc, skb->truesize);
37576@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37577
37578 IF_RX(printk("rx_dle_intr: skb push");)
37579 vcc->push(vcc,skb);
37580- atomic_inc(&vcc->stats->rx);
37581+ atomic_inc_unchecked(&vcc->stats->rx);
37582 iadev->rx_pkt_cnt++;
37583 }
37584 INCR_DLE:
37585@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37586 {
37587 struct k_sonet_stats *stats;
37588 stats = &PRIV(_ia_dev[board])->sonet_stats;
37589- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37590- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37591- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37592- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37593- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37594- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37595- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37596- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37597- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37598+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37599+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37600+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37601+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37602+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37603+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37604+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37605+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37606+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37607 }
37608 ia_cmds.status = 0;
37609 break;
37610@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37611 if ((desc == 0) || (desc > iadev->num_tx_desc))
37612 {
37613 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37614- atomic_inc(&vcc->stats->tx);
37615+ atomic_inc_unchecked(&vcc->stats->tx);
37616 if (vcc->pop)
37617 vcc->pop(vcc, skb);
37618 else
37619@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37620 ATM_DESC(skb) = vcc->vci;
37621 skb_queue_tail(&iadev->tx_dma_q, skb);
37622
37623- atomic_inc(&vcc->stats->tx);
37624+ atomic_inc_unchecked(&vcc->stats->tx);
37625 iadev->tx_pkt_cnt++;
37626 /* Increment transaction counter */
37627 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37628
37629 #if 0
37630 /* add flow control logic */
37631- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37632+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37633 if (iavcc->vc_desc_cnt > 10) {
37634 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37635 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37636diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37637index ce43ae3..969de38 100644
37638--- a/drivers/atm/lanai.c
37639+++ b/drivers/atm/lanai.c
37640@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37641 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37642 lanai_endtx(lanai, lvcc);
37643 lanai_free_skb(lvcc->tx.atmvcc, skb);
37644- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37645+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37646 }
37647
37648 /* Try to fill the buffer - don't call unless there is backlog */
37649@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37650 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37651 __net_timestamp(skb);
37652 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37653- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37654+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37655 out:
37656 lvcc->rx.buf.ptr = end;
37657 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37658@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37659 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37660 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37661 lanai->stats.service_rxnotaal5++;
37662- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37663+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37664 return 0;
37665 }
37666 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37667@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37668 int bytes;
37669 read_unlock(&vcc_sklist_lock);
37670 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37671- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37672+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37673 lvcc->stats.x.aal5.service_trash++;
37674 bytes = (SERVICE_GET_END(s) * 16) -
37675 (((unsigned long) lvcc->rx.buf.ptr) -
37676@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37677 }
37678 if (s & SERVICE_STREAM) {
37679 read_unlock(&vcc_sklist_lock);
37680- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37681+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37682 lvcc->stats.x.aal5.service_stream++;
37683 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37684 "PDU on VCI %d!\n", lanai->number, vci);
37685@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37686 return 0;
37687 }
37688 DPRINTK("got rx crc error on vci %d\n", vci);
37689- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37690+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37691 lvcc->stats.x.aal5.service_rxcrc++;
37692 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37693 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37694diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37695index ddc4ceb..36e29aa 100644
37696--- a/drivers/atm/nicstar.c
37697+++ b/drivers/atm/nicstar.c
37698@@ -1632,7 +1632,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37699 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37700 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37701 card->index);
37702- atomic_inc(&vcc->stats->tx_err);
37703+ atomic_inc_unchecked(&vcc->stats->tx_err);
37704 dev_kfree_skb_any(skb);
37705 return -EINVAL;
37706 }
37707@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37708 if (!vc->tx) {
37709 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37710 card->index);
37711- atomic_inc(&vcc->stats->tx_err);
37712+ atomic_inc_unchecked(&vcc->stats->tx_err);
37713 dev_kfree_skb_any(skb);
37714 return -EINVAL;
37715 }
37716@@ -1648,14 +1648,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37717 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37718 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37719 card->index);
37720- atomic_inc(&vcc->stats->tx_err);
37721+ atomic_inc_unchecked(&vcc->stats->tx_err);
37722 dev_kfree_skb_any(skb);
37723 return -EINVAL;
37724 }
37725
37726 if (skb_shinfo(skb)->nr_frags != 0) {
37727 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37728- atomic_inc(&vcc->stats->tx_err);
37729+ atomic_inc_unchecked(&vcc->stats->tx_err);
37730 dev_kfree_skb_any(skb);
37731 return -EINVAL;
37732 }
37733@@ -1703,11 +1703,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37734 }
37735
37736 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37737- atomic_inc(&vcc->stats->tx_err);
37738+ atomic_inc_unchecked(&vcc->stats->tx_err);
37739 dev_kfree_skb_any(skb);
37740 return -EIO;
37741 }
37742- atomic_inc(&vcc->stats->tx);
37743+ atomic_inc_unchecked(&vcc->stats->tx);
37744
37745 return 0;
37746 }
37747@@ -2024,14 +2024,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37748 printk
37749 ("nicstar%d: Can't allocate buffers for aal0.\n",
37750 card->index);
37751- atomic_add(i, &vcc->stats->rx_drop);
37752+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37753 break;
37754 }
37755 if (!atm_charge(vcc, sb->truesize)) {
37756 RXPRINTK
37757 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37758 card->index);
37759- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37760+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37761 dev_kfree_skb_any(sb);
37762 break;
37763 }
37764@@ -2046,7 +2046,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37765 ATM_SKB(sb)->vcc = vcc;
37766 __net_timestamp(sb);
37767 vcc->push(vcc, sb);
37768- atomic_inc(&vcc->stats->rx);
37769+ atomic_inc_unchecked(&vcc->stats->rx);
37770 cell += ATM_CELL_PAYLOAD;
37771 }
37772
37773@@ -2063,7 +2063,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37774 if (iovb == NULL) {
37775 printk("nicstar%d: Out of iovec buffers.\n",
37776 card->index);
37777- atomic_inc(&vcc->stats->rx_drop);
37778+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37779 recycle_rx_buf(card, skb);
37780 return;
37781 }
37782@@ -2087,7 +2087,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37783 small or large buffer itself. */
37784 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37785 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37786- atomic_inc(&vcc->stats->rx_err);
37787+ atomic_inc_unchecked(&vcc->stats->rx_err);
37788 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37789 NS_MAX_IOVECS);
37790 NS_PRV_IOVCNT(iovb) = 0;
37791@@ -2107,7 +2107,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37792 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37793 card->index);
37794 which_list(card, skb);
37795- atomic_inc(&vcc->stats->rx_err);
37796+ atomic_inc_unchecked(&vcc->stats->rx_err);
37797 recycle_rx_buf(card, skb);
37798 vc->rx_iov = NULL;
37799 recycle_iov_buf(card, iovb);
37800@@ -2120,7 +2120,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37801 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37802 card->index);
37803 which_list(card, skb);
37804- atomic_inc(&vcc->stats->rx_err);
37805+ atomic_inc_unchecked(&vcc->stats->rx_err);
37806 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37807 NS_PRV_IOVCNT(iovb));
37808 vc->rx_iov = NULL;
37809@@ -2143,7 +2143,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37810 printk(" - PDU size mismatch.\n");
37811 else
37812 printk(".\n");
37813- atomic_inc(&vcc->stats->rx_err);
37814+ atomic_inc_unchecked(&vcc->stats->rx_err);
37815 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37816 NS_PRV_IOVCNT(iovb));
37817 vc->rx_iov = NULL;
37818@@ -2157,14 +2157,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37819 /* skb points to a small buffer */
37820 if (!atm_charge(vcc, skb->truesize)) {
37821 push_rxbufs(card, skb);
37822- atomic_inc(&vcc->stats->rx_drop);
37823+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37824 } else {
37825 skb_put(skb, len);
37826 dequeue_sm_buf(card, skb);
37827 ATM_SKB(skb)->vcc = vcc;
37828 __net_timestamp(skb);
37829 vcc->push(vcc, skb);
37830- atomic_inc(&vcc->stats->rx);
37831+ atomic_inc_unchecked(&vcc->stats->rx);
37832 }
37833 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37834 struct sk_buff *sb;
37835@@ -2175,14 +2175,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37836 if (len <= NS_SMBUFSIZE) {
37837 if (!atm_charge(vcc, sb->truesize)) {
37838 push_rxbufs(card, sb);
37839- atomic_inc(&vcc->stats->rx_drop);
37840+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37841 } else {
37842 skb_put(sb, len);
37843 dequeue_sm_buf(card, sb);
37844 ATM_SKB(sb)->vcc = vcc;
37845 __net_timestamp(sb);
37846 vcc->push(vcc, sb);
37847- atomic_inc(&vcc->stats->rx);
37848+ atomic_inc_unchecked(&vcc->stats->rx);
37849 }
37850
37851 push_rxbufs(card, skb);
37852@@ -2191,7 +2191,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37853
37854 if (!atm_charge(vcc, skb->truesize)) {
37855 push_rxbufs(card, skb);
37856- atomic_inc(&vcc->stats->rx_drop);
37857+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37858 } else {
37859 dequeue_lg_buf(card, skb);
37860 skb_push(skb, NS_SMBUFSIZE);
37861@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37862 ATM_SKB(skb)->vcc = vcc;
37863 __net_timestamp(skb);
37864 vcc->push(vcc, skb);
37865- atomic_inc(&vcc->stats->rx);
37866+ atomic_inc_unchecked(&vcc->stats->rx);
37867 }
37868
37869 push_rxbufs(card, sb);
37870@@ -2222,7 +2222,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37871 printk
37872 ("nicstar%d: Out of huge buffers.\n",
37873 card->index);
37874- atomic_inc(&vcc->stats->rx_drop);
37875+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37876 recycle_iovec_rx_bufs(card,
37877 (struct iovec *)
37878 iovb->data,
37879@@ -2273,7 +2273,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37880 card->hbpool.count++;
37881 } else
37882 dev_kfree_skb_any(hb);
37883- atomic_inc(&vcc->stats->rx_drop);
37884+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37885 } else {
37886 /* Copy the small buffer to the huge buffer */
37887 sb = (struct sk_buff *)iov->iov_base;
37888@@ -2307,7 +2307,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37889 ATM_SKB(hb)->vcc = vcc;
37890 __net_timestamp(hb);
37891 vcc->push(vcc, hb);
37892- atomic_inc(&vcc->stats->rx);
37893+ atomic_inc_unchecked(&vcc->stats->rx);
37894 }
37895 }
37896
37897diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37898index 74e18b0..f16afa0 100644
37899--- a/drivers/atm/solos-pci.c
37900+++ b/drivers/atm/solos-pci.c
37901@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37902 }
37903 atm_charge(vcc, skb->truesize);
37904 vcc->push(vcc, skb);
37905- atomic_inc(&vcc->stats->rx);
37906+ atomic_inc_unchecked(&vcc->stats->rx);
37907 break;
37908
37909 case PKT_STATUS:
37910@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37911 vcc = SKB_CB(oldskb)->vcc;
37912
37913 if (vcc) {
37914- atomic_inc(&vcc->stats->tx);
37915+ atomic_inc_unchecked(&vcc->stats->tx);
37916 solos_pop(vcc, oldskb);
37917 } else {
37918 dev_kfree_skb_irq(oldskb);
37919diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37920index 0215934..ce9f5b1 100644
37921--- a/drivers/atm/suni.c
37922+++ b/drivers/atm/suni.c
37923@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37924
37925
37926 #define ADD_LIMITED(s,v) \
37927- atomic_add((v),&stats->s); \
37928- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37929+ atomic_add_unchecked((v),&stats->s); \
37930+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37931
37932
37933 static void suni_hz(unsigned long from_timer)
37934diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37935index 5120a96..e2572bd 100644
37936--- a/drivers/atm/uPD98402.c
37937+++ b/drivers/atm/uPD98402.c
37938@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37939 struct sonet_stats tmp;
37940 int error = 0;
37941
37942- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37943+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37944 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37945 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37946 if (zero && !error) {
37947@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37948
37949
37950 #define ADD_LIMITED(s,v) \
37951- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37952- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37953- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37954+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37955+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37956+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37957
37958
37959 static void stat_event(struct atm_dev *dev)
37960@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37961 if (reason & uPD98402_INT_PFM) stat_event(dev);
37962 if (reason & uPD98402_INT_PCO) {
37963 (void) GET(PCOCR); /* clear interrupt cause */
37964- atomic_add(GET(HECCT),
37965+ atomic_add_unchecked(GET(HECCT),
37966 &PRIV(dev)->sonet_stats.uncorr_hcs);
37967 }
37968 if ((reason & uPD98402_INT_RFO) &&
37969@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37970 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37971 uPD98402_INT_LOS),PIMR); /* enable them */
37972 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37973- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37974- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37975- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37976+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37977+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37978+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37979 return 0;
37980 }
37981
37982diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37983index cecfb94..87009ec 100644
37984--- a/drivers/atm/zatm.c
37985+++ b/drivers/atm/zatm.c
37986@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37987 }
37988 if (!size) {
37989 dev_kfree_skb_irq(skb);
37990- if (vcc) atomic_inc(&vcc->stats->rx_err);
37991+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37992 continue;
37993 }
37994 if (!atm_charge(vcc,skb->truesize)) {
37995@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37996 skb->len = size;
37997 ATM_SKB(skb)->vcc = vcc;
37998 vcc->push(vcc,skb);
37999- atomic_inc(&vcc->stats->rx);
38000+ atomic_inc_unchecked(&vcc->stats->rx);
38001 }
38002 zout(pos & 0xffff,MTA(mbx));
38003 #if 0 /* probably a stupid idea */
38004@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
38005 skb_queue_head(&zatm_vcc->backlog,skb);
38006 break;
38007 }
38008- atomic_inc(&vcc->stats->tx);
38009+ atomic_inc_unchecked(&vcc->stats->tx);
38010 wake_up(&zatm_vcc->tx_wait);
38011 }
38012
38013diff --git a/drivers/base/bus.c b/drivers/base/bus.c
38014index 79bc203..fa3945b 100644
38015--- a/drivers/base/bus.c
38016+++ b/drivers/base/bus.c
38017@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
38018 return -EINVAL;
38019
38020 mutex_lock(&subsys->p->mutex);
38021- list_add_tail(&sif->node, &subsys->p->interfaces);
38022+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
38023 if (sif->add_dev) {
38024 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
38025 while ((dev = subsys_dev_iter_next(&iter)))
38026@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
38027 subsys = sif->subsys;
38028
38029 mutex_lock(&subsys->p->mutex);
38030- list_del_init(&sif->node);
38031+ pax_list_del_init((struct list_head *)&sif->node);
38032 if (sif->remove_dev) {
38033 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
38034 while ((dev = subsys_dev_iter_next(&iter)))
38035diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
38036index 68f0314..ca2a609 100644
38037--- a/drivers/base/devtmpfs.c
38038+++ b/drivers/base/devtmpfs.c
38039@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
38040 if (!thread)
38041 return 0;
38042
38043- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
38044+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
38045 if (err)
38046 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
38047 else
38048@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
38049 *err = sys_unshare(CLONE_NEWNS);
38050 if (*err)
38051 goto out;
38052- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
38053+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
38054 if (*err)
38055 goto out;
38056- sys_chdir("/.."); /* will traverse into overmounted root */
38057- sys_chroot(".");
38058+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
38059+ sys_chroot((char __force_user *)".");
38060 complete(&setup_done);
38061 while (1) {
38062 spin_lock(&req_lock);
38063diff --git a/drivers/base/node.c b/drivers/base/node.c
38064index a2aa65b..8831326 100644
38065--- a/drivers/base/node.c
38066+++ b/drivers/base/node.c
38067@@ -613,7 +613,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
38068 struct node_attr {
38069 struct device_attribute attr;
38070 enum node_states state;
38071-};
38072+} __do_const;
38073
38074 static ssize_t show_node_state(struct device *dev,
38075 struct device_attribute *attr, char *buf)
38076diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
38077index 2327613..211d7f5 100644
38078--- a/drivers/base/power/domain.c
38079+++ b/drivers/base/power/domain.c
38080@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
38081 {
38082 struct cpuidle_driver *cpuidle_drv;
38083 struct gpd_cpuidle_data *cpuidle_data;
38084- struct cpuidle_state *idle_state;
38085+ cpuidle_state_no_const *idle_state;
38086 int ret = 0;
38087
38088 if (IS_ERR_OR_NULL(genpd) || state < 0)
38089@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
38090 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
38091 {
38092 struct gpd_cpuidle_data *cpuidle_data;
38093- struct cpuidle_state *idle_state;
38094+ cpuidle_state_no_const *idle_state;
38095 int ret = 0;
38096
38097 if (IS_ERR_OR_NULL(genpd))
38098@@ -2222,8 +2222,11 @@ int genpd_dev_pm_attach(struct device *dev)
38099 return ret;
38100 }
38101
38102- dev->pm_domain->detach = genpd_dev_pm_detach;
38103- dev->pm_domain->sync = genpd_dev_pm_sync;
38104+ pax_open_kernel();
38105+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
38106+ *(void **)&dev->pm_domain->sync = genpd_dev_pm_sync;
38107+ pax_close_kernel();
38108+
38109 pm_genpd_poweron(pd);
38110
38111 return 0;
38112diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
38113index d2be3f9..0a3167a 100644
38114--- a/drivers/base/power/sysfs.c
38115+++ b/drivers/base/power/sysfs.c
38116@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
38117 return -EIO;
38118 }
38119 }
38120- return sprintf(buf, p);
38121+ return sprintf(buf, "%s", p);
38122 }
38123
38124 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
38125diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
38126index 7726200..a417da7 100644
38127--- a/drivers/base/power/wakeup.c
38128+++ b/drivers/base/power/wakeup.c
38129@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
38130 * They need to be modified together atomically, so it's better to use one
38131 * atomic variable to hold them both.
38132 */
38133-static atomic_t combined_event_count = ATOMIC_INIT(0);
38134+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
38135
38136 #define IN_PROGRESS_BITS (sizeof(int) * 4)
38137 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
38138
38139 static void split_counters(unsigned int *cnt, unsigned int *inpr)
38140 {
38141- unsigned int comb = atomic_read(&combined_event_count);
38142+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
38143
38144 *cnt = (comb >> IN_PROGRESS_BITS);
38145 *inpr = comb & MAX_IN_PROGRESS;
38146@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
38147 ws->start_prevent_time = ws->last_time;
38148
38149 /* Increment the counter of events in progress. */
38150- cec = atomic_inc_return(&combined_event_count);
38151+ cec = atomic_inc_return_unchecked(&combined_event_count);
38152
38153 trace_wakeup_source_activate(ws->name, cec);
38154 }
38155@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
38156 * Increment the counter of registered wakeup events and decrement the
38157 * couter of wakeup events in progress simultaneously.
38158 */
38159- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
38160+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
38161 trace_wakeup_source_deactivate(ws->name, cec);
38162
38163 split_counters(&cnt, &inpr);
38164diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
38165index 8d98a32..61d3165 100644
38166--- a/drivers/base/syscore.c
38167+++ b/drivers/base/syscore.c
38168@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38169 void register_syscore_ops(struct syscore_ops *ops)
38170 {
38171 mutex_lock(&syscore_ops_lock);
38172- list_add_tail(&ops->node, &syscore_ops_list);
38173+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38174 mutex_unlock(&syscore_ops_lock);
38175 }
38176 EXPORT_SYMBOL_GPL(register_syscore_ops);
38177@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38178 void unregister_syscore_ops(struct syscore_ops *ops)
38179 {
38180 mutex_lock(&syscore_ops_lock);
38181- list_del(&ops->node);
38182+ pax_list_del((struct list_head *)&ops->node);
38183 mutex_unlock(&syscore_ops_lock);
38184 }
38185 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38186diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38187index ff20f19..018f1da 100644
38188--- a/drivers/block/cciss.c
38189+++ b/drivers/block/cciss.c
38190@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38191 while (!list_empty(&h->reqQ)) {
38192 c = list_entry(h->reqQ.next, CommandList_struct, list);
38193 /* can't do anything if fifo is full */
38194- if ((h->access.fifo_full(h))) {
38195+ if ((h->access->fifo_full(h))) {
38196 dev_warn(&h->pdev->dev, "fifo full\n");
38197 break;
38198 }
38199@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38200 h->Qdepth--;
38201
38202 /* Tell the controller execute command */
38203- h->access.submit_command(h, c);
38204+ h->access->submit_command(h, c);
38205
38206 /* Put job onto the completed Q */
38207 addQ(&h->cmpQ, c);
38208@@ -3444,17 +3444,17 @@ startio:
38209
38210 static inline unsigned long get_next_completion(ctlr_info_t *h)
38211 {
38212- return h->access.command_completed(h);
38213+ return h->access->command_completed(h);
38214 }
38215
38216 static inline int interrupt_pending(ctlr_info_t *h)
38217 {
38218- return h->access.intr_pending(h);
38219+ return h->access->intr_pending(h);
38220 }
38221
38222 static inline long interrupt_not_for_us(ctlr_info_t *h)
38223 {
38224- return ((h->access.intr_pending(h) == 0) ||
38225+ return ((h->access->intr_pending(h) == 0) ||
38226 (h->interrupts_enabled == 0));
38227 }
38228
38229@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38230 u32 a;
38231
38232 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38233- return h->access.command_completed(h);
38234+ return h->access->command_completed(h);
38235
38236 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38237 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38238@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38239 trans_support & CFGTBL_Trans_use_short_tags);
38240
38241 /* Change the access methods to the performant access methods */
38242- h->access = SA5_performant_access;
38243+ h->access = &SA5_performant_access;
38244 h->transMethod = CFGTBL_Trans_Performant;
38245
38246 return;
38247@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38248 if (prod_index < 0)
38249 return -ENODEV;
38250 h->product_name = products[prod_index].product_name;
38251- h->access = *(products[prod_index].access);
38252+ h->access = products[prod_index].access;
38253
38254 if (cciss_board_disabled(h)) {
38255 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38256@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38257 }
38258
38259 /* make sure the board interrupts are off */
38260- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38261+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38262 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38263 if (rc)
38264 goto clean2;
38265@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38266 * fake ones to scoop up any residual completions.
38267 */
38268 spin_lock_irqsave(&h->lock, flags);
38269- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38270+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38271 spin_unlock_irqrestore(&h->lock, flags);
38272 free_irq(h->intr[h->intr_mode], h);
38273 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38274@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38275 dev_info(&h->pdev->dev, "Board READY.\n");
38276 dev_info(&h->pdev->dev,
38277 "Waiting for stale completions to drain.\n");
38278- h->access.set_intr_mask(h, CCISS_INTR_ON);
38279+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38280 msleep(10000);
38281- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38282+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38283
38284 rc = controller_reset_failed(h->cfgtable);
38285 if (rc)
38286@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38287 cciss_scsi_setup(h);
38288
38289 /* Turn the interrupts on so we can service requests */
38290- h->access.set_intr_mask(h, CCISS_INTR_ON);
38291+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38292
38293 /* Get the firmware version */
38294 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38295@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38296 kfree(flush_buf);
38297 if (return_code != IO_OK)
38298 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38299- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38300+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38301 free_irq(h->intr[h->intr_mode], h);
38302 }
38303
38304diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38305index 7fda30e..2f27946 100644
38306--- a/drivers/block/cciss.h
38307+++ b/drivers/block/cciss.h
38308@@ -101,7 +101,7 @@ struct ctlr_info
38309 /* information about each logical volume */
38310 drive_info_struct *drv[CISS_MAX_LUN];
38311
38312- struct access_method access;
38313+ struct access_method *access;
38314
38315 /* queue and queue Info */
38316 struct list_head reqQ;
38317@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38318 }
38319
38320 static struct access_method SA5_access = {
38321- SA5_submit_command,
38322- SA5_intr_mask,
38323- SA5_fifo_full,
38324- SA5_intr_pending,
38325- SA5_completed,
38326+ .submit_command = SA5_submit_command,
38327+ .set_intr_mask = SA5_intr_mask,
38328+ .fifo_full = SA5_fifo_full,
38329+ .intr_pending = SA5_intr_pending,
38330+ .command_completed = SA5_completed,
38331 };
38332
38333 static struct access_method SA5B_access = {
38334- SA5_submit_command,
38335- SA5B_intr_mask,
38336- SA5_fifo_full,
38337- SA5B_intr_pending,
38338- SA5_completed,
38339+ .submit_command = SA5_submit_command,
38340+ .set_intr_mask = SA5B_intr_mask,
38341+ .fifo_full = SA5_fifo_full,
38342+ .intr_pending = SA5B_intr_pending,
38343+ .command_completed = SA5_completed,
38344 };
38345
38346 static struct access_method SA5_performant_access = {
38347- SA5_submit_command,
38348- SA5_performant_intr_mask,
38349- SA5_fifo_full,
38350- SA5_performant_intr_pending,
38351- SA5_performant_completed,
38352+ .submit_command = SA5_submit_command,
38353+ .set_intr_mask = SA5_performant_intr_mask,
38354+ .fifo_full = SA5_fifo_full,
38355+ .intr_pending = SA5_performant_intr_pending,
38356+ .command_completed = SA5_performant_completed,
38357 };
38358
38359 struct board_type {
38360diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38361index f749df9..5f8b9c4 100644
38362--- a/drivers/block/cpqarray.c
38363+++ b/drivers/block/cpqarray.c
38364@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38365 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38366 goto Enomem4;
38367 }
38368- hba[i]->access.set_intr_mask(hba[i], 0);
38369+ hba[i]->access->set_intr_mask(hba[i], 0);
38370 if (request_irq(hba[i]->intr, do_ida_intr, IRQF_SHARED,
38371 hba[i]->devname, hba[i]))
38372 {
38373@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38374 add_timer(&hba[i]->timer);
38375
38376 /* Enable IRQ now that spinlock and rate limit timer are set up */
38377- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38378+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38379
38380 for(j=0; j<NWD; j++) {
38381 struct gendisk *disk = ida_gendisk[i][j];
38382@@ -694,7 +694,7 @@ DBGINFO(
38383 for(i=0; i<NR_PRODUCTS; i++) {
38384 if (board_id == products[i].board_id) {
38385 c->product_name = products[i].product_name;
38386- c->access = *(products[i].access);
38387+ c->access = products[i].access;
38388 break;
38389 }
38390 }
38391@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38392 hba[ctlr]->intr = intr;
38393 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38394 hba[ctlr]->product_name = products[j].product_name;
38395- hba[ctlr]->access = *(products[j].access);
38396+ hba[ctlr]->access = products[j].access;
38397 hba[ctlr]->ctlr = ctlr;
38398 hba[ctlr]->board_id = board_id;
38399 hba[ctlr]->pci_dev = NULL; /* not PCI */
38400@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38401
38402 while((c = h->reqQ) != NULL) {
38403 /* Can't do anything if we're busy */
38404- if (h->access.fifo_full(h) == 0)
38405+ if (h->access->fifo_full(h) == 0)
38406 return;
38407
38408 /* Get the first entry from the request Q */
38409@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38410 h->Qdepth--;
38411
38412 /* Tell the controller to do our bidding */
38413- h->access.submit_command(h, c);
38414+ h->access->submit_command(h, c);
38415
38416 /* Get onto the completion Q */
38417 addQ(&h->cmpQ, c);
38418@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38419 unsigned long flags;
38420 __u32 a,a1;
38421
38422- istat = h->access.intr_pending(h);
38423+ istat = h->access->intr_pending(h);
38424 /* Is this interrupt for us? */
38425 if (istat == 0)
38426 return IRQ_NONE;
38427@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38428 */
38429 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38430 if (istat & FIFO_NOT_EMPTY) {
38431- while((a = h->access.command_completed(h))) {
38432+ while((a = h->access->command_completed(h))) {
38433 a1 = a; a &= ~3;
38434 if ((c = h->cmpQ) == NULL)
38435 {
38436@@ -1448,11 +1448,11 @@ static int sendcmd(
38437 /*
38438 * Disable interrupt
38439 */
38440- info_p->access.set_intr_mask(info_p, 0);
38441+ info_p->access->set_intr_mask(info_p, 0);
38442 /* Make sure there is room in the command FIFO */
38443 /* Actually it should be completely empty at this time. */
38444 for (i = 200000; i > 0; i--) {
38445- temp = info_p->access.fifo_full(info_p);
38446+ temp = info_p->access->fifo_full(info_p);
38447 if (temp != 0) {
38448 break;
38449 }
38450@@ -1465,7 +1465,7 @@ DBG(
38451 /*
38452 * Send the cmd
38453 */
38454- info_p->access.submit_command(info_p, c);
38455+ info_p->access->submit_command(info_p, c);
38456 complete = pollcomplete(ctlr);
38457
38458 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38459@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38460 * we check the new geometry. Then turn interrupts back on when
38461 * we're done.
38462 */
38463- host->access.set_intr_mask(host, 0);
38464+ host->access->set_intr_mask(host, 0);
38465 getgeometry(ctlr);
38466- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38467+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38468
38469 for(i=0; i<NWD; i++) {
38470 struct gendisk *disk = ida_gendisk[ctlr][i];
38471@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38472 /* Wait (up to 2 seconds) for a command to complete */
38473
38474 for (i = 200000; i > 0; i--) {
38475- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38476+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38477 if (done == 0) {
38478 udelay(10); /* a short fixed delay */
38479 } else
38480diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38481index be73e9d..7fbf140 100644
38482--- a/drivers/block/cpqarray.h
38483+++ b/drivers/block/cpqarray.h
38484@@ -99,7 +99,7 @@ struct ctlr_info {
38485 drv_info_t drv[NWD];
38486 struct proc_dir_entry *proc;
38487
38488- struct access_method access;
38489+ struct access_method *access;
38490
38491 cmdlist_t *reqQ;
38492 cmdlist_t *cmpQ;
38493diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38494index 434c77d..6d3219a 100644
38495--- a/drivers/block/drbd/drbd_bitmap.c
38496+++ b/drivers/block/drbd/drbd_bitmap.c
38497@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38498 submit_bio(rw, bio);
38499 /* this should not count as user activity and cause the
38500 * resync to throttle -- see drbd_rs_should_slow_down(). */
38501- atomic_add(len >> 9, &device->rs_sect_ev);
38502+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38503 }
38504 }
38505
38506diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38507index b905e98..0812ed8 100644
38508--- a/drivers/block/drbd/drbd_int.h
38509+++ b/drivers/block/drbd/drbd_int.h
38510@@ -385,7 +385,7 @@ struct drbd_epoch {
38511 struct drbd_connection *connection;
38512 struct list_head list;
38513 unsigned int barrier_nr;
38514- atomic_t epoch_size; /* increased on every request added. */
38515+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38516 atomic_t active; /* increased on every req. added, and dec on every finished. */
38517 unsigned long flags;
38518 };
38519@@ -946,7 +946,7 @@ struct drbd_device {
38520 unsigned int al_tr_number;
38521 int al_tr_cycle;
38522 wait_queue_head_t seq_wait;
38523- atomic_t packet_seq;
38524+ atomic_unchecked_t packet_seq;
38525 unsigned int peer_seq;
38526 spinlock_t peer_seq_lock;
38527 unsigned long comm_bm_set; /* communicated number of set bits. */
38528@@ -955,8 +955,8 @@ struct drbd_device {
38529 struct mutex own_state_mutex;
38530 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38531 char congestion_reason; /* Why we where congested... */
38532- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38533- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38534+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38535+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38536 int rs_last_sect_ev; /* counter to compare with */
38537 int rs_last_events; /* counter of read or write "events" (unit sectors)
38538 * on the lower level device when we last looked. */
38539diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38540index 81fde9e..9948c05 100644
38541--- a/drivers/block/drbd/drbd_main.c
38542+++ b/drivers/block/drbd/drbd_main.c
38543@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38544 p->sector = sector;
38545 p->block_id = block_id;
38546 p->blksize = blksize;
38547- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38548+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38549 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38550 }
38551
38552@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38553 return -EIO;
38554 p->sector = cpu_to_be64(req->i.sector);
38555 p->block_id = (unsigned long)req;
38556- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38557+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38558 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38559 if (device->state.conn >= C_SYNC_SOURCE &&
38560 device->state.conn <= C_PAUSED_SYNC_T)
38561@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38562 atomic_set(&device->unacked_cnt, 0);
38563 atomic_set(&device->local_cnt, 0);
38564 atomic_set(&device->pp_in_use_by_net, 0);
38565- atomic_set(&device->rs_sect_in, 0);
38566- atomic_set(&device->rs_sect_ev, 0);
38567+ atomic_set_unchecked(&device->rs_sect_in, 0);
38568+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38569 atomic_set(&device->ap_in_flight, 0);
38570 atomic_set(&device->md_io.in_use, 0);
38571
38572@@ -2683,8 +2683,8 @@ void drbd_destroy_connection(struct kref *kref)
38573 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38574 struct drbd_resource *resource = connection->resource;
38575
38576- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38577- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38578+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38579+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38580 kfree(connection->current_epoch);
38581
38582 idr_destroy(&connection->peer_devices);
38583diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38584index 74df8cf..e41fc24 100644
38585--- a/drivers/block/drbd/drbd_nl.c
38586+++ b/drivers/block/drbd/drbd_nl.c
38587@@ -3637,13 +3637,13 @@ finish:
38588
38589 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38590 {
38591- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38592+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38593 struct sk_buff *msg;
38594 struct drbd_genlmsghdr *d_out;
38595 unsigned seq;
38596 int err = -ENOMEM;
38597
38598- seq = atomic_inc_return(&drbd_genl_seq);
38599+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38600 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38601 if (!msg)
38602 goto failed;
38603diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38604index cee2035..22f66bd 100644
38605--- a/drivers/block/drbd/drbd_receiver.c
38606+++ b/drivers/block/drbd/drbd_receiver.c
38607@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38608 struct drbd_device *device = peer_device->device;
38609 int err;
38610
38611- atomic_set(&device->packet_seq, 0);
38612+ atomic_set_unchecked(&device->packet_seq, 0);
38613 device->peer_seq = 0;
38614
38615 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38616@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38617 do {
38618 next_epoch = NULL;
38619
38620- epoch_size = atomic_read(&epoch->epoch_size);
38621+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38622
38623 switch (ev & ~EV_CLEANUP) {
38624 case EV_PUT:
38625@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38626 rv = FE_DESTROYED;
38627 } else {
38628 epoch->flags = 0;
38629- atomic_set(&epoch->epoch_size, 0);
38630+ atomic_set_unchecked(&epoch->epoch_size, 0);
38631 /* atomic_set(&epoch->active, 0); is already zero */
38632 if (rv == FE_STILL_LIVE)
38633 rv = FE_RECYCLED;
38634@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38635 conn_wait_active_ee_empty(connection);
38636 drbd_flush(connection);
38637
38638- if (atomic_read(&connection->current_epoch->epoch_size)) {
38639+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38640 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38641 if (epoch)
38642 break;
38643@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38644 }
38645
38646 epoch->flags = 0;
38647- atomic_set(&epoch->epoch_size, 0);
38648+ atomic_set_unchecked(&epoch->epoch_size, 0);
38649 atomic_set(&epoch->active, 0);
38650
38651 spin_lock(&connection->epoch_lock);
38652- if (atomic_read(&connection->current_epoch->epoch_size)) {
38653+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38654 list_add(&epoch->list, &connection->current_epoch->list);
38655 connection->current_epoch = epoch;
38656 connection->epochs++;
38657@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38658 list_add_tail(&peer_req->w.list, &device->sync_ee);
38659 spin_unlock_irq(&device->resource->req_lock);
38660
38661- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38662+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38663 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38664 return 0;
38665
38666@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38667 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38668 }
38669
38670- atomic_add(pi->size >> 9, &device->rs_sect_in);
38671+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38672
38673 return err;
38674 }
38675@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38676
38677 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38678 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38679- atomic_inc(&connection->current_epoch->epoch_size);
38680+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38681 err2 = drbd_drain_block(peer_device, pi->size);
38682 if (!err)
38683 err = err2;
38684@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38685
38686 spin_lock(&connection->epoch_lock);
38687 peer_req->epoch = connection->current_epoch;
38688- atomic_inc(&peer_req->epoch->epoch_size);
38689+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38690 atomic_inc(&peer_req->epoch->active);
38691 spin_unlock(&connection->epoch_lock);
38692
38693@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38694
38695 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38696 (int)part_stat_read(&disk->part0, sectors[1]) -
38697- atomic_read(&device->rs_sect_ev);
38698+ atomic_read_unchecked(&device->rs_sect_ev);
38699
38700 if (atomic_read(&device->ap_actlog_cnt)
38701 || curr_events - device->rs_last_events > 64) {
38702@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38703 device->use_csums = true;
38704 } else if (pi->cmd == P_OV_REPLY) {
38705 /* track progress, we may need to throttle */
38706- atomic_add(size >> 9, &device->rs_sect_in);
38707+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38708 peer_req->w.cb = w_e_end_ov_reply;
38709 dec_rs_pending(device);
38710 /* drbd_rs_begin_io done when we sent this request,
38711@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38712 goto out_free_e;
38713
38714 submit_for_resync:
38715- atomic_add(size >> 9, &device->rs_sect_ev);
38716+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38717
38718 submit:
38719 update_receiver_timing_details(connection, drbd_submit_peer_request);
38720@@ -4564,7 +4564,7 @@ struct data_cmd {
38721 int expect_payload;
38722 size_t pkt_size;
38723 int (*fn)(struct drbd_connection *, struct packet_info *);
38724-};
38725+} __do_const;
38726
38727 static struct data_cmd drbd_cmd_handler[] = {
38728 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38729@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38730 if (!list_empty(&connection->current_epoch->list))
38731 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38732 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38733- atomic_set(&connection->current_epoch->epoch_size, 0);
38734+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38735 connection->send.seen_any_write_yet = false;
38736
38737 drbd_info(connection, "Connection closed\n");
38738@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38739 put_ldev(device);
38740 }
38741 dec_rs_pending(device);
38742- atomic_add(blksize >> 9, &device->rs_sect_in);
38743+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38744
38745 return 0;
38746 }
38747@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38748 struct asender_cmd {
38749 size_t pkt_size;
38750 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38751-};
38752+} __do_const;
38753
38754 static struct asender_cmd asender_tbl[] = {
38755 [P_PING] = { 0, got_Ping },
38756diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38757index d0fae55..4469096 100644
38758--- a/drivers/block/drbd/drbd_worker.c
38759+++ b/drivers/block/drbd/drbd_worker.c
38760@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38761 list_add_tail(&peer_req->w.list, &device->read_ee);
38762 spin_unlock_irq(&device->resource->req_lock);
38763
38764- atomic_add(size >> 9, &device->rs_sect_ev);
38765+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38766 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38767 return 0;
38768
38769@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38770 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38771 int number, mxb;
38772
38773- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38774+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38775 device->rs_in_flight -= sect_in;
38776
38777 rcu_read_lock();
38778@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38779 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38780 struct fifo_buffer *plan;
38781
38782- atomic_set(&device->rs_sect_in, 0);
38783- atomic_set(&device->rs_sect_ev, 0);
38784+ atomic_set_unchecked(&device->rs_sect_in, 0);
38785+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38786 device->rs_in_flight = 0;
38787 device->rs_last_events =
38788 (int)part_stat_read(&disk->part0, sectors[0]) +
38789diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38790index 09e628da..7607aaa 100644
38791--- a/drivers/block/pktcdvd.c
38792+++ b/drivers/block/pktcdvd.c
38793@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38794
38795 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38796 {
38797- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38798+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38799 }
38800
38801 /*
38802@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38803 return -EROFS;
38804 }
38805 pd->settings.fp = ti.fp;
38806- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38807+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38808
38809 if (ti.nwa_v) {
38810 pd->nwa = be32_to_cpu(ti.next_writable);
38811diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38812index ec6c5c6..820ee2abc 100644
38813--- a/drivers/block/rbd.c
38814+++ b/drivers/block/rbd.c
38815@@ -64,7 +64,7 @@
38816 * If the counter is already at its maximum value returns
38817 * -EINVAL without updating it.
38818 */
38819-static int atomic_inc_return_safe(atomic_t *v)
38820+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38821 {
38822 unsigned int counter;
38823
38824diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38825index e5565fb..71be10b4 100644
38826--- a/drivers/block/smart1,2.h
38827+++ b/drivers/block/smart1,2.h
38828@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38829 }
38830
38831 static struct access_method smart4_access = {
38832- smart4_submit_command,
38833- smart4_intr_mask,
38834- smart4_fifo_full,
38835- smart4_intr_pending,
38836- smart4_completed,
38837+ .submit_command = smart4_submit_command,
38838+ .set_intr_mask = smart4_intr_mask,
38839+ .fifo_full = smart4_fifo_full,
38840+ .intr_pending = smart4_intr_pending,
38841+ .command_completed = smart4_completed,
38842 };
38843
38844 /*
38845@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38846 }
38847
38848 static struct access_method smart2_access = {
38849- smart2_submit_command,
38850- smart2_intr_mask,
38851- smart2_fifo_full,
38852- smart2_intr_pending,
38853- smart2_completed,
38854+ .submit_command = smart2_submit_command,
38855+ .set_intr_mask = smart2_intr_mask,
38856+ .fifo_full = smart2_fifo_full,
38857+ .intr_pending = smart2_intr_pending,
38858+ .command_completed = smart2_completed,
38859 };
38860
38861 /*
38862@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38863 }
38864
38865 static struct access_method smart2e_access = {
38866- smart2e_submit_command,
38867- smart2e_intr_mask,
38868- smart2e_fifo_full,
38869- smart2e_intr_pending,
38870- smart2e_completed,
38871+ .submit_command = smart2e_submit_command,
38872+ .set_intr_mask = smart2e_intr_mask,
38873+ .fifo_full = smart2e_fifo_full,
38874+ .intr_pending = smart2e_intr_pending,
38875+ .command_completed = smart2e_completed,
38876 };
38877
38878 /*
38879@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38880 }
38881
38882 static struct access_method smart1_access = {
38883- smart1_submit_command,
38884- smart1_intr_mask,
38885- smart1_fifo_full,
38886- smart1_intr_pending,
38887- smart1_completed,
38888+ .submit_command = smart1_submit_command,
38889+ .set_intr_mask = smart1_intr_mask,
38890+ .fifo_full = smart1_fifo_full,
38891+ .intr_pending = smart1_intr_pending,
38892+ .command_completed = smart1_completed,
38893 };
38894diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38895index 55c135b..9f8d60c 100644
38896--- a/drivers/bluetooth/btwilink.c
38897+++ b/drivers/bluetooth/btwilink.c
38898@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38899
38900 static int bt_ti_probe(struct platform_device *pdev)
38901 {
38902- static struct ti_st *hst;
38903+ struct ti_st *hst;
38904 struct hci_dev *hdev;
38905 int err;
38906
38907diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38908index 5d28a45..a538f90 100644
38909--- a/drivers/cdrom/cdrom.c
38910+++ b/drivers/cdrom/cdrom.c
38911@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38912 ENSURE(reset, CDC_RESET);
38913 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38914 cdi->mc_flags = 0;
38915- cdo->n_minors = 0;
38916 cdi->options = CDO_USE_FFLAGS;
38917
38918 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38919@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38920 else
38921 cdi->cdda_method = CDDA_OLD;
38922
38923- if (!cdo->generic_packet)
38924- cdo->generic_packet = cdrom_dummy_generic_packet;
38925+ if (!cdo->generic_packet) {
38926+ pax_open_kernel();
38927+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38928+ pax_close_kernel();
38929+ }
38930
38931 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38932 mutex_lock(&cdrom_mutex);
38933@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38934 if (cdi->exit)
38935 cdi->exit(cdi);
38936
38937- cdi->ops->n_minors--;
38938 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38939 }
38940
38941@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38942 */
38943 nr = nframes;
38944 do {
38945- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38946+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38947 if (cgc.buffer)
38948 break;
38949
38950@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38951 struct cdrom_device_info *cdi;
38952 int ret;
38953
38954- ret = scnprintf(info + *pos, max_size - *pos, header);
38955+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38956 if (!ret)
38957 return 1;
38958
38959diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38960index 584bc31..e64a12c 100644
38961--- a/drivers/cdrom/gdrom.c
38962+++ b/drivers/cdrom/gdrom.c
38963@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38964 .audio_ioctl = gdrom_audio_ioctl,
38965 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38966 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38967- .n_minors = 1,
38968 };
38969
38970 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38971diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38972index a4af822..ed58cd1 100644
38973--- a/drivers/char/Kconfig
38974+++ b/drivers/char/Kconfig
38975@@ -17,7 +17,8 @@ config DEVMEM
38976
38977 config DEVKMEM
38978 bool "/dev/kmem virtual device support"
38979- default y
38980+ default n
38981+ depends on !GRKERNSEC_KMEM
38982 help
38983 Say Y here if you want to support the /dev/kmem device. The
38984 /dev/kmem device is rarely used, but can be used for certain
38985@@ -586,6 +587,7 @@ config DEVPORT
38986 bool
38987 depends on !M68K
38988 depends on ISA || PCI
38989+ depends on !GRKERNSEC_KMEM
38990 default y
38991
38992 source "drivers/s390/char/Kconfig"
38993diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38994index a48e05b..6bac831 100644
38995--- a/drivers/char/agp/compat_ioctl.c
38996+++ b/drivers/char/agp/compat_ioctl.c
38997@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38998 return -ENOMEM;
38999 }
39000
39001- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
39002+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
39003 sizeof(*usegment) * ureserve.seg_count)) {
39004 kfree(usegment);
39005 kfree(ksegment);
39006diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
39007index 09f17eb..8531d2f 100644
39008--- a/drivers/char/agp/frontend.c
39009+++ b/drivers/char/agp/frontend.c
39010@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
39011 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
39012 return -EFAULT;
39013
39014- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
39015+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
39016 return -EFAULT;
39017
39018 client = agp_find_client_by_pid(reserve.pid);
39019@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
39020 if (segment == NULL)
39021 return -ENOMEM;
39022
39023- if (copy_from_user(segment, (void __user *) reserve.seg_list,
39024+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
39025 sizeof(struct agp_segment) * reserve.seg_count)) {
39026 kfree(segment);
39027 return -EFAULT;
39028diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
39029index 4f94375..413694e 100644
39030--- a/drivers/char/genrtc.c
39031+++ b/drivers/char/genrtc.c
39032@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
39033 switch (cmd) {
39034
39035 case RTC_PLL_GET:
39036+ memset(&pll, 0, sizeof(pll));
39037 if (get_rtc_pll(&pll))
39038 return -EINVAL;
39039 else
39040diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
39041index 5c0baa9..44011b1 100644
39042--- a/drivers/char/hpet.c
39043+++ b/drivers/char/hpet.c
39044@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
39045 }
39046
39047 static int
39048-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
39049+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
39050 struct hpet_info *info)
39051 {
39052 struct hpet_timer __iomem *timer;
39053diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
39054index a43048b..14724d5 100644
39055--- a/drivers/char/i8k.c
39056+++ b/drivers/char/i8k.c
39057@@ -790,7 +790,7 @@ static const struct i8k_config_data i8k_config_data[] = {
39058 },
39059 };
39060
39061-static struct dmi_system_id i8k_dmi_table[] __initdata = {
39062+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
39063 {
39064 .ident = "Dell Inspiron",
39065 .matches = {
39066diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
39067index bf75f63..359fa10 100644
39068--- a/drivers/char/ipmi/ipmi_msghandler.c
39069+++ b/drivers/char/ipmi/ipmi_msghandler.c
39070@@ -436,7 +436,7 @@ struct ipmi_smi {
39071 struct proc_dir_entry *proc_dir;
39072 char proc_dir_name[10];
39073
39074- atomic_t stats[IPMI_NUM_STATS];
39075+ atomic_unchecked_t stats[IPMI_NUM_STATS];
39076
39077 /*
39078 * run_to_completion duplicate of smb_info, smi_info
39079@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
39080 static DEFINE_MUTEX(smi_watchers_mutex);
39081
39082 #define ipmi_inc_stat(intf, stat) \
39083- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
39084+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
39085 #define ipmi_get_stat(intf, stat) \
39086- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
39087+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
39088
39089 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
39090 "ACPI", "SMBIOS", "PCI",
39091@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
39092 INIT_LIST_HEAD(&intf->cmd_rcvrs);
39093 init_waitqueue_head(&intf->waitq);
39094 for (i = 0; i < IPMI_NUM_STATS; i++)
39095- atomic_set(&intf->stats[i], 0);
39096+ atomic_set_unchecked(&intf->stats[i], 0);
39097
39098 intf->proc_dir = NULL;
39099
39100diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
39101index 8a45e92..e41b1c7 100644
39102--- a/drivers/char/ipmi/ipmi_si_intf.c
39103+++ b/drivers/char/ipmi/ipmi_si_intf.c
39104@@ -289,7 +289,7 @@ struct smi_info {
39105 unsigned char slave_addr;
39106
39107 /* Counters and things for the proc filesystem. */
39108- atomic_t stats[SI_NUM_STATS];
39109+ atomic_unchecked_t stats[SI_NUM_STATS];
39110
39111 struct task_struct *thread;
39112
39113@@ -298,9 +298,9 @@ struct smi_info {
39114 };
39115
39116 #define smi_inc_stat(smi, stat) \
39117- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
39118+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
39119 #define smi_get_stat(smi, stat) \
39120- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
39121+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
39122
39123 #define SI_MAX_PARMS 4
39124
39125@@ -3500,7 +3500,7 @@ static int try_smi_init(struct smi_info *new_smi)
39126 atomic_set(&new_smi->req_events, 0);
39127 new_smi->run_to_completion = false;
39128 for (i = 0; i < SI_NUM_STATS; i++)
39129- atomic_set(&new_smi->stats[i], 0);
39130+ atomic_set_unchecked(&new_smi->stats[i], 0);
39131
39132 new_smi->interrupt_disabled = true;
39133 atomic_set(&new_smi->need_watch, 0);
39134diff --git a/drivers/char/mem.c b/drivers/char/mem.c
39135index 6b1721f..fda9398 100644
39136--- a/drivers/char/mem.c
39137+++ b/drivers/char/mem.c
39138@@ -18,6 +18,7 @@
39139 #include <linux/raw.h>
39140 #include <linux/tty.h>
39141 #include <linux/capability.h>
39142+#include <linux/security.h>
39143 #include <linux/ptrace.h>
39144 #include <linux/device.h>
39145 #include <linux/highmem.h>
39146@@ -36,6 +37,10 @@
39147
39148 #define DEVPORT_MINOR 4
39149
39150+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39151+extern const struct file_operations grsec_fops;
39152+#endif
39153+
39154 static inline unsigned long size_inside_page(unsigned long start,
39155 unsigned long size)
39156 {
39157@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39158
39159 while (cursor < to) {
39160 if (!devmem_is_allowed(pfn)) {
39161+#ifdef CONFIG_GRKERNSEC_KMEM
39162+ gr_handle_mem_readwrite(from, to);
39163+#else
39164 printk(KERN_INFO
39165 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39166 current->comm, from, to);
39167+#endif
39168 return 0;
39169 }
39170 cursor += PAGE_SIZE;
39171@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39172 }
39173 return 1;
39174 }
39175+#elif defined(CONFIG_GRKERNSEC_KMEM)
39176+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39177+{
39178+ return 0;
39179+}
39180 #else
39181 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39182 {
39183@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39184 #endif
39185
39186 while (count > 0) {
39187- unsigned long remaining;
39188+ unsigned long remaining = 0;
39189+ char *temp;
39190
39191 sz = size_inside_page(p, count);
39192
39193@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39194 if (!ptr)
39195 return -EFAULT;
39196
39197- remaining = copy_to_user(buf, ptr, sz);
39198+#ifdef CONFIG_PAX_USERCOPY
39199+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39200+ if (!temp) {
39201+ unxlate_dev_mem_ptr(p, ptr);
39202+ return -ENOMEM;
39203+ }
39204+ remaining = probe_kernel_read(temp, ptr, sz);
39205+#else
39206+ temp = ptr;
39207+#endif
39208+
39209+ if (!remaining)
39210+ remaining = copy_to_user(buf, temp, sz);
39211+
39212+#ifdef CONFIG_PAX_USERCOPY
39213+ kfree(temp);
39214+#endif
39215+
39216 unxlate_dev_mem_ptr(p, ptr);
39217 if (remaining)
39218 return -EFAULT;
39219@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39220 size_t count, loff_t *ppos)
39221 {
39222 unsigned long p = *ppos;
39223- ssize_t low_count, read, sz;
39224+ ssize_t low_count, read, sz, err = 0;
39225 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39226- int err = 0;
39227
39228 read = 0;
39229 if (p < (unsigned long) high_memory) {
39230@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39231 }
39232 #endif
39233 while (low_count > 0) {
39234+ char *temp;
39235+
39236 sz = size_inside_page(p, low_count);
39237
39238 /*
39239@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39240 */
39241 kbuf = xlate_dev_kmem_ptr((void *)p);
39242
39243- if (copy_to_user(buf, kbuf, sz))
39244+#ifdef CONFIG_PAX_USERCOPY
39245+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39246+ if (!temp)
39247+ return -ENOMEM;
39248+ err = probe_kernel_read(temp, kbuf, sz);
39249+#else
39250+ temp = kbuf;
39251+#endif
39252+
39253+ if (!err)
39254+ err = copy_to_user(buf, temp, sz);
39255+
39256+#ifdef CONFIG_PAX_USERCOPY
39257+ kfree(temp);
39258+#endif
39259+
39260+ if (err)
39261 return -EFAULT;
39262 buf += sz;
39263 p += sz;
39264@@ -802,6 +851,9 @@ static const struct memdev {
39265 #ifdef CONFIG_PRINTK
39266 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39267 #endif
39268+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39269+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39270+#endif
39271 };
39272
39273 static int memory_open(struct inode *inode, struct file *filp)
39274@@ -863,7 +915,7 @@ static int __init chr_dev_init(void)
39275 continue;
39276
39277 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39278- NULL, devlist[minor].name);
39279+ NULL, "%s", devlist[minor].name);
39280 }
39281
39282 return tty_init();
39283diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39284index 9df78e2..01ba9ae 100644
39285--- a/drivers/char/nvram.c
39286+++ b/drivers/char/nvram.c
39287@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39288
39289 spin_unlock_irq(&rtc_lock);
39290
39291- if (copy_to_user(buf, contents, tmp - contents))
39292+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39293 return -EFAULT;
39294
39295 *ppos = i;
39296diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39297index 0ea9986..e7b07e4 100644
39298--- a/drivers/char/pcmcia/synclink_cs.c
39299+++ b/drivers/char/pcmcia/synclink_cs.c
39300@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39301
39302 if (debug_level >= DEBUG_LEVEL_INFO)
39303 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39304- __FILE__, __LINE__, info->device_name, port->count);
39305+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39306
39307 if (tty_port_close_start(port, tty, filp) == 0)
39308 goto cleanup;
39309@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39310 cleanup:
39311 if (debug_level >= DEBUG_LEVEL_INFO)
39312 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39313- tty->driver->name, port->count);
39314+ tty->driver->name, atomic_read(&port->count));
39315 }
39316
39317 /* Wait until the transmitter is empty.
39318@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39319
39320 if (debug_level >= DEBUG_LEVEL_INFO)
39321 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39322- __FILE__, __LINE__, tty->driver->name, port->count);
39323+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39324
39325 /* If port is closing, signal caller to try again */
39326 if (port->flags & ASYNC_CLOSING){
39327@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39328 goto cleanup;
39329 }
39330 spin_lock(&port->lock);
39331- port->count++;
39332+ atomic_inc(&port->count);
39333 spin_unlock(&port->lock);
39334 spin_unlock_irqrestore(&info->netlock, flags);
39335
39336- if (port->count == 1) {
39337+ if (atomic_read(&port->count) == 1) {
39338 /* 1st open on this device, init hardware */
39339 retval = startup(info, tty);
39340 if (retval < 0)
39341@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39342 unsigned short new_crctype;
39343
39344 /* return error if TTY interface open */
39345- if (info->port.count)
39346+ if (atomic_read(&info->port.count))
39347 return -EBUSY;
39348
39349 switch (encoding)
39350@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39351
39352 /* arbitrate between network and tty opens */
39353 spin_lock_irqsave(&info->netlock, flags);
39354- if (info->port.count != 0 || info->netcount != 0) {
39355+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39356 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39357 spin_unlock_irqrestore(&info->netlock, flags);
39358 return -EBUSY;
39359@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39360 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39361
39362 /* return error if TTY interface open */
39363- if (info->port.count)
39364+ if (atomic_read(&info->port.count))
39365 return -EBUSY;
39366
39367 if (cmd != SIOCWANDEV)
39368diff --git a/drivers/char/random.c b/drivers/char/random.c
39369index 9cd6968..6416f00 100644
39370--- a/drivers/char/random.c
39371+++ b/drivers/char/random.c
39372@@ -289,9 +289,6 @@
39373 /*
39374 * To allow fractional bits to be tracked, the entropy_count field is
39375 * denominated in units of 1/8th bits.
39376- *
39377- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39378- * credit_entropy_bits() needs to be 64 bits wide.
39379 */
39380 #define ENTROPY_SHIFT 3
39381 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39382@@ -439,9 +436,9 @@ struct entropy_store {
39383 };
39384
39385 static void push_to_pool(struct work_struct *work);
39386-static __u32 input_pool_data[INPUT_POOL_WORDS];
39387-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39388-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39389+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39390+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39391+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39392
39393 static struct entropy_store input_pool = {
39394 .poolinfo = &poolinfo_table[0],
39395@@ -635,7 +632,7 @@ retry:
39396 /* The +2 corresponds to the /4 in the denominator */
39397
39398 do {
39399- unsigned int anfrac = min(pnfrac, pool_size/2);
39400+ u64 anfrac = min(pnfrac, pool_size/2);
39401 unsigned int add =
39402 ((pool_size - entropy_count)*anfrac*3) >> s;
39403
39404@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39405
39406 extract_buf(r, tmp);
39407 i = min_t(int, nbytes, EXTRACT_SIZE);
39408- if (copy_to_user(buf, tmp, i)) {
39409+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39410 ret = -EFAULT;
39411 break;
39412 }
39413@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39414 static int proc_do_uuid(struct ctl_table *table, int write,
39415 void __user *buffer, size_t *lenp, loff_t *ppos)
39416 {
39417- struct ctl_table fake_table;
39418+ ctl_table_no_const fake_table;
39419 unsigned char buf[64], tmp_uuid[16], *uuid;
39420
39421 uuid = table->data;
39422@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39423 static int proc_do_entropy(struct ctl_table *table, int write,
39424 void __user *buffer, size_t *lenp, loff_t *ppos)
39425 {
39426- struct ctl_table fake_table;
39427+ ctl_table_no_const fake_table;
39428 int entropy_count;
39429
39430 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39431diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39432index e496dae..3db53b6 100644
39433--- a/drivers/char/sonypi.c
39434+++ b/drivers/char/sonypi.c
39435@@ -54,6 +54,7 @@
39436
39437 #include <asm/uaccess.h>
39438 #include <asm/io.h>
39439+#include <asm/local.h>
39440
39441 #include <linux/sonypi.h>
39442
39443@@ -490,7 +491,7 @@ static struct sonypi_device {
39444 spinlock_t fifo_lock;
39445 wait_queue_head_t fifo_proc_list;
39446 struct fasync_struct *fifo_async;
39447- int open_count;
39448+ local_t open_count;
39449 int model;
39450 struct input_dev *input_jog_dev;
39451 struct input_dev *input_key_dev;
39452@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39453 static int sonypi_misc_release(struct inode *inode, struct file *file)
39454 {
39455 mutex_lock(&sonypi_device.lock);
39456- sonypi_device.open_count--;
39457+ local_dec(&sonypi_device.open_count);
39458 mutex_unlock(&sonypi_device.lock);
39459 return 0;
39460 }
39461@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39462 {
39463 mutex_lock(&sonypi_device.lock);
39464 /* Flush input queue on first open */
39465- if (!sonypi_device.open_count)
39466+ if (!local_read(&sonypi_device.open_count))
39467 kfifo_reset(&sonypi_device.fifo);
39468- sonypi_device.open_count++;
39469+ local_inc(&sonypi_device.open_count);
39470 mutex_unlock(&sonypi_device.lock);
39471
39472 return 0;
39473@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39474
39475 static struct platform_device *sonypi_platform_device;
39476
39477-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39478+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39479 {
39480 .ident = "Sony Vaio",
39481 .matches = {
39482diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39483index 565a947..dcdc06e 100644
39484--- a/drivers/char/tpm/tpm_acpi.c
39485+++ b/drivers/char/tpm/tpm_acpi.c
39486@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39487 virt = acpi_os_map_iomem(start, len);
39488 if (!virt) {
39489 kfree(log->bios_event_log);
39490+ log->bios_event_log = NULL;
39491 printk("%s: ERROR - Unable to map memory\n", __func__);
39492 return -EIO;
39493 }
39494
39495- memcpy_fromio(log->bios_event_log, virt, len);
39496+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39497
39498 acpi_os_unmap_iomem(virt, len);
39499 return 0;
39500diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39501index 3a56a13..f8cbd25 100644
39502--- a/drivers/char/tpm/tpm_eventlog.c
39503+++ b/drivers/char/tpm/tpm_eventlog.c
39504@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39505 event = addr;
39506
39507 if ((event->event_type == 0 && event->event_size == 0) ||
39508- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39509+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39510 return NULL;
39511
39512 return addr;
39513@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39514 return NULL;
39515
39516 if ((event->event_type == 0 && event->event_size == 0) ||
39517- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39518+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39519 return NULL;
39520
39521 (*pos)++;
39522@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39523 int i;
39524
39525 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39526- seq_putc(m, data[i]);
39527+ if (!seq_putc(m, data[i]))
39528+ return -EFAULT;
39529
39530 return 0;
39531 }
39532diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39533index 50754d20..9561cdc 100644
39534--- a/drivers/char/virtio_console.c
39535+++ b/drivers/char/virtio_console.c
39536@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39537 if (to_user) {
39538 ssize_t ret;
39539
39540- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39541+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39542 if (ret)
39543 return -EFAULT;
39544 } else {
39545@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39546 if (!port_has_data(port) && !port->host_connected)
39547 return 0;
39548
39549- return fill_readbuf(port, ubuf, count, true);
39550+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39551 }
39552
39553 static int wait_port_writable(struct port *port, bool nonblock)
39554diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39555index 956b7e5..b655045 100644
39556--- a/drivers/clk/clk-composite.c
39557+++ b/drivers/clk/clk-composite.c
39558@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39559 struct clk *clk;
39560 struct clk_init_data init;
39561 struct clk_composite *composite;
39562- struct clk_ops *clk_composite_ops;
39563+ clk_ops_no_const *clk_composite_ops;
39564
39565 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39566 if (!composite) {
39567diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39568index e4c7538..99c50cd 100644
39569--- a/drivers/clk/samsung/clk.h
39570+++ b/drivers/clk/samsung/clk.h
39571@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39572 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39573 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39574
39575-#define PNAME(x) static const char *x[] __initdata
39576+#define PNAME(x) static const char * const x[] __initconst
39577
39578 /**
39579 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39580diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39581index dd3a78c..386d49c 100644
39582--- a/drivers/clk/socfpga/clk-gate.c
39583+++ b/drivers/clk/socfpga/clk-gate.c
39584@@ -22,6 +22,7 @@
39585 #include <linux/mfd/syscon.h>
39586 #include <linux/of.h>
39587 #include <linux/regmap.h>
39588+#include <asm/pgtable.h>
39589
39590 #include "clk.h"
39591
39592@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39593 return 0;
39594 }
39595
39596-static struct clk_ops gateclk_ops = {
39597+static clk_ops_no_const gateclk_ops __read_only = {
39598 .prepare = socfpga_clk_prepare,
39599 .recalc_rate = socfpga_clk_recalc_rate,
39600 .get_parent = socfpga_clk_get_parent,
39601@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39602 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39603 socfpga_clk->hw.bit_idx = clk_gate[1];
39604
39605- gateclk_ops.enable = clk_gate_ops.enable;
39606- gateclk_ops.disable = clk_gate_ops.disable;
39607+ pax_open_kernel();
39608+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39609+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39610+ pax_close_kernel();
39611 }
39612
39613 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39614diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39615index de6da95..c98278b 100644
39616--- a/drivers/clk/socfpga/clk-pll.c
39617+++ b/drivers/clk/socfpga/clk-pll.c
39618@@ -21,6 +21,7 @@
39619 #include <linux/io.h>
39620 #include <linux/of.h>
39621 #include <linux/of_address.h>
39622+#include <asm/pgtable.h>
39623
39624 #include "clk.h"
39625
39626@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39627 CLK_MGR_PLL_CLK_SRC_MASK;
39628 }
39629
39630-static struct clk_ops clk_pll_ops = {
39631+static clk_ops_no_const clk_pll_ops __read_only = {
39632 .recalc_rate = clk_pll_recalc_rate,
39633 .get_parent = clk_pll_get_parent,
39634 };
39635@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39636 pll_clk->hw.hw.init = &init;
39637
39638 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39639- clk_pll_ops.enable = clk_gate_ops.enable;
39640- clk_pll_ops.disable = clk_gate_ops.disable;
39641+ pax_open_kernel();
39642+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39643+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39644+ pax_close_kernel();
39645
39646 clk = clk_register(NULL, &pll_clk->hw.hw);
39647 if (WARN_ON(IS_ERR(clk))) {
39648diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39649index b0c18ed..1713a80 100644
39650--- a/drivers/cpufreq/acpi-cpufreq.c
39651+++ b/drivers/cpufreq/acpi-cpufreq.c
39652@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39653 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39654 per_cpu(acfreq_data, cpu) = data;
39655
39656- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39657- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39658+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39659+ pax_open_kernel();
39660+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39661+ pax_close_kernel();
39662+ }
39663
39664 result = acpi_processor_register_performance(data->acpi_data, cpu);
39665 if (result)
39666@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39667 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39668 break;
39669 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39670- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39671+ pax_open_kernel();
39672+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39673+ pax_close_kernel();
39674 break;
39675 default:
39676 break;
39677@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39678 if (!msrs)
39679 return;
39680
39681- acpi_cpufreq_driver.boost_supported = true;
39682- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39683+ pax_open_kernel();
39684+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39685+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39686+ pax_close_kernel();
39687
39688 cpu_notifier_register_begin();
39689
39690diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39691index bab67db..91af7e3 100644
39692--- a/drivers/cpufreq/cpufreq-dt.c
39693+++ b/drivers/cpufreq/cpufreq-dt.c
39694@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39695 if (!IS_ERR(cpu_reg))
39696 regulator_put(cpu_reg);
39697
39698- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39699+ pax_open_kernel();
39700+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39701+ pax_close_kernel();
39702
39703 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39704 if (ret)
39705diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39706index 8ae655c..3141442 100644
39707--- a/drivers/cpufreq/cpufreq.c
39708+++ b/drivers/cpufreq/cpufreq.c
39709@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39710 }
39711
39712 mutex_lock(&cpufreq_governor_mutex);
39713- list_del(&governor->governor_list);
39714+ pax_list_del(&governor->governor_list);
39715 mutex_unlock(&cpufreq_governor_mutex);
39716 return;
39717 }
39718@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39719 return NOTIFY_OK;
39720 }
39721
39722-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39723+static struct notifier_block cpufreq_cpu_notifier = {
39724 .notifier_call = cpufreq_cpu_callback,
39725 };
39726
39727@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39728 return 0;
39729
39730 write_lock_irqsave(&cpufreq_driver_lock, flags);
39731- cpufreq_driver->boost_enabled = state;
39732+ pax_open_kernel();
39733+ *(bool *)&cpufreq_driver->boost_enabled = state;
39734+ pax_close_kernel();
39735 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39736
39737 ret = cpufreq_driver->set_boost(state);
39738 if (ret) {
39739 write_lock_irqsave(&cpufreq_driver_lock, flags);
39740- cpufreq_driver->boost_enabled = !state;
39741+ pax_open_kernel();
39742+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39743+ pax_close_kernel();
39744 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39745
39746 pr_err("%s: Cannot %s BOOST\n",
39747@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39748 cpufreq_driver = driver_data;
39749 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39750
39751- if (driver_data->setpolicy)
39752- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39753+ if (driver_data->setpolicy) {
39754+ pax_open_kernel();
39755+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39756+ pax_close_kernel();
39757+ }
39758
39759 if (cpufreq_boost_supported()) {
39760 /*
39761 * Check if driver provides function to enable boost -
39762 * if not, use cpufreq_boost_set_sw as default
39763 */
39764- if (!cpufreq_driver->set_boost)
39765- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39766+ if (!cpufreq_driver->set_boost) {
39767+ pax_open_kernel();
39768+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39769+ pax_close_kernel();
39770+ }
39771
39772 ret = cpufreq_sysfs_create_file(&boost.attr);
39773 if (ret) {
39774diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39775index 1b44496..b80ff5e 100644
39776--- a/drivers/cpufreq/cpufreq_governor.c
39777+++ b/drivers/cpufreq/cpufreq_governor.c
39778@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39779 struct dbs_data *dbs_data;
39780 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39781 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39782- struct od_ops *od_ops = NULL;
39783+ const struct od_ops *od_ops = NULL;
39784 struct od_dbs_tuners *od_tuners = NULL;
39785 struct cs_dbs_tuners *cs_tuners = NULL;
39786 struct cpu_dbs_common_info *cpu_cdbs;
39787@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39788
39789 if ((cdata->governor == GOV_CONSERVATIVE) &&
39790 (!policy->governor->initialized)) {
39791- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39792+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39793
39794 cpufreq_register_notifier(cs_ops->notifier_block,
39795 CPUFREQ_TRANSITION_NOTIFIER);
39796@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39797
39798 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39799 (policy->governor->initialized == 1)) {
39800- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39801+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39802
39803 cpufreq_unregister_notifier(cs_ops->notifier_block,
39804 CPUFREQ_TRANSITION_NOTIFIER);
39805diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39806index cc401d1..8197340 100644
39807--- a/drivers/cpufreq/cpufreq_governor.h
39808+++ b/drivers/cpufreq/cpufreq_governor.h
39809@@ -212,7 +212,7 @@ struct common_dbs_data {
39810 void (*exit)(struct dbs_data *dbs_data);
39811
39812 /* Governor specific ops, see below */
39813- void *gov_ops;
39814+ const void *gov_ops;
39815 };
39816
39817 /* Governor Per policy data */
39818@@ -232,7 +232,7 @@ struct od_ops {
39819 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39820 unsigned int freq_next, unsigned int relation);
39821 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39822-};
39823+} __no_const;
39824
39825 struct cs_ops {
39826 struct notifier_block *notifier_block;
39827diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39828index ad3f38f..8f086cd 100644
39829--- a/drivers/cpufreq/cpufreq_ondemand.c
39830+++ b/drivers/cpufreq/cpufreq_ondemand.c
39831@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39832
39833 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39834
39835-static struct od_ops od_ops = {
39836+static struct od_ops od_ops __read_only = {
39837 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39838 .powersave_bias_target = generic_powersave_bias_target,
39839 .freq_increase = dbs_freq_increase,
39840@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39841 (struct cpufreq_policy *, unsigned int, unsigned int),
39842 unsigned int powersave_bias)
39843 {
39844- od_ops.powersave_bias_target = f;
39845+ pax_open_kernel();
39846+ *(void **)&od_ops.powersave_bias_target = f;
39847+ pax_close_kernel();
39848 od_set_powersave_bias(powersave_bias);
39849 }
39850 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39851
39852 void od_unregister_powersave_bias_handler(void)
39853 {
39854- od_ops.powersave_bias_target = generic_powersave_bias_target;
39855+ pax_open_kernel();
39856+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39857+ pax_close_kernel();
39858 od_set_powersave_bias(0);
39859 }
39860 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39861diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39862index c45d274..0f469f7 100644
39863--- a/drivers/cpufreq/intel_pstate.c
39864+++ b/drivers/cpufreq/intel_pstate.c
39865@@ -134,10 +134,10 @@ struct pstate_funcs {
39866 struct cpu_defaults {
39867 struct pstate_adjust_policy pid_policy;
39868 struct pstate_funcs funcs;
39869-};
39870+} __do_const;
39871
39872 static struct pstate_adjust_policy pid_params;
39873-static struct pstate_funcs pstate_funcs;
39874+static struct pstate_funcs *pstate_funcs;
39875 static int hwp_active;
39876
39877 struct perf_limits {
39878@@ -721,18 +721,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39879
39880 cpu->pstate.current_pstate = pstate;
39881
39882- pstate_funcs.set(cpu, pstate);
39883+ pstate_funcs->set(cpu, pstate);
39884 }
39885
39886 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39887 {
39888- cpu->pstate.min_pstate = pstate_funcs.get_min();
39889- cpu->pstate.max_pstate = pstate_funcs.get_max();
39890- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39891- cpu->pstate.scaling = pstate_funcs.get_scaling();
39892+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39893+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39894+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39895+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39896
39897- if (pstate_funcs.get_vid)
39898- pstate_funcs.get_vid(cpu);
39899+ if (pstate_funcs->get_vid)
39900+ pstate_funcs->get_vid(cpu);
39901 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39902 }
39903
39904@@ -1056,15 +1056,15 @@ static unsigned int force_load;
39905
39906 static int intel_pstate_msrs_not_valid(void)
39907 {
39908- if (!pstate_funcs.get_max() ||
39909- !pstate_funcs.get_min() ||
39910- !pstate_funcs.get_turbo())
39911+ if (!pstate_funcs->get_max() ||
39912+ !pstate_funcs->get_min() ||
39913+ !pstate_funcs->get_turbo())
39914 return -ENODEV;
39915
39916 return 0;
39917 }
39918
39919-static void copy_pid_params(struct pstate_adjust_policy *policy)
39920+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39921 {
39922 pid_params.sample_rate_ms = policy->sample_rate_ms;
39923 pid_params.p_gain_pct = policy->p_gain_pct;
39924@@ -1076,12 +1076,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39925
39926 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39927 {
39928- pstate_funcs.get_max = funcs->get_max;
39929- pstate_funcs.get_min = funcs->get_min;
39930- pstate_funcs.get_turbo = funcs->get_turbo;
39931- pstate_funcs.get_scaling = funcs->get_scaling;
39932- pstate_funcs.set = funcs->set;
39933- pstate_funcs.get_vid = funcs->get_vid;
39934+ pstate_funcs = funcs;
39935 }
39936
39937 #if IS_ENABLED(CONFIG_ACPI)
39938diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39939index 529cfd9..0e28fff 100644
39940--- a/drivers/cpufreq/p4-clockmod.c
39941+++ b/drivers/cpufreq/p4-clockmod.c
39942@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39943 case 0x0F: /* Core Duo */
39944 case 0x16: /* Celeron Core */
39945 case 0x1C: /* Atom */
39946- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39947+ pax_open_kernel();
39948+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39949+ pax_close_kernel();
39950 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39951 case 0x0D: /* Pentium M (Dothan) */
39952- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39953+ pax_open_kernel();
39954+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39955+ pax_close_kernel();
39956 /* fall through */
39957 case 0x09: /* Pentium M (Banias) */
39958 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39959@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39960
39961 /* on P-4s, the TSC runs with constant frequency independent whether
39962 * throttling is active or not. */
39963- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39964+ pax_open_kernel();
39965+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39966+ pax_close_kernel();
39967
39968 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39969 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39970diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39971index 9bb42ba..b01b4a2 100644
39972--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39973+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39974@@ -18,14 +18,12 @@
39975 #include <asm/head.h>
39976 #include <asm/timer.h>
39977
39978-static struct cpufreq_driver *cpufreq_us3_driver;
39979-
39980 struct us3_freq_percpu_info {
39981 struct cpufreq_frequency_table table[4];
39982 };
39983
39984 /* Indexed by cpu number. */
39985-static struct us3_freq_percpu_info *us3_freq_table;
39986+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39987
39988 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39989 * in the Safari config register.
39990@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39991
39992 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39993 {
39994- if (cpufreq_us3_driver)
39995- us3_freq_target(policy, 0);
39996+ us3_freq_target(policy, 0);
39997
39998 return 0;
39999 }
40000
40001+static int __init us3_freq_init(void);
40002+static void __exit us3_freq_exit(void);
40003+
40004+static struct cpufreq_driver cpufreq_us3_driver = {
40005+ .init = us3_freq_cpu_init,
40006+ .verify = cpufreq_generic_frequency_table_verify,
40007+ .target_index = us3_freq_target,
40008+ .get = us3_freq_get,
40009+ .exit = us3_freq_cpu_exit,
40010+ .name = "UltraSPARC-III",
40011+
40012+};
40013+
40014 static int __init us3_freq_init(void)
40015 {
40016 unsigned long manuf, impl, ver;
40017- int ret;
40018
40019 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40020 return -ENODEV;
40021@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40022 (impl == CHEETAH_IMPL ||
40023 impl == CHEETAH_PLUS_IMPL ||
40024 impl == JAGUAR_IMPL ||
40025- impl == PANTHER_IMPL)) {
40026- struct cpufreq_driver *driver;
40027-
40028- ret = -ENOMEM;
40029- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40030- if (!driver)
40031- goto err_out;
40032-
40033- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40034- GFP_KERNEL);
40035- if (!us3_freq_table)
40036- goto err_out;
40037-
40038- driver->init = us3_freq_cpu_init;
40039- driver->verify = cpufreq_generic_frequency_table_verify;
40040- driver->target_index = us3_freq_target;
40041- driver->get = us3_freq_get;
40042- driver->exit = us3_freq_cpu_exit;
40043- strcpy(driver->name, "UltraSPARC-III");
40044-
40045- cpufreq_us3_driver = driver;
40046- ret = cpufreq_register_driver(driver);
40047- if (ret)
40048- goto err_out;
40049-
40050- return 0;
40051-
40052-err_out:
40053- if (driver) {
40054- kfree(driver);
40055- cpufreq_us3_driver = NULL;
40056- }
40057- kfree(us3_freq_table);
40058- us3_freq_table = NULL;
40059- return ret;
40060- }
40061+ impl == PANTHER_IMPL))
40062+ return cpufreq_register_driver(&cpufreq_us3_driver);
40063
40064 return -ENODEV;
40065 }
40066
40067 static void __exit us3_freq_exit(void)
40068 {
40069- if (cpufreq_us3_driver) {
40070- cpufreq_unregister_driver(cpufreq_us3_driver);
40071- kfree(cpufreq_us3_driver);
40072- cpufreq_us3_driver = NULL;
40073- kfree(us3_freq_table);
40074- us3_freq_table = NULL;
40075- }
40076+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40077 }
40078
40079 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40080diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40081index 7d4a315..21bb886 100644
40082--- a/drivers/cpufreq/speedstep-centrino.c
40083+++ b/drivers/cpufreq/speedstep-centrino.c
40084@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40085 !cpu_has(cpu, X86_FEATURE_EST))
40086 return -ENODEV;
40087
40088- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40089- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40090+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40091+ pax_open_kernel();
40092+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40093+ pax_close_kernel();
40094+ }
40095
40096 if (policy->cpu != 0)
40097 return -ENODEV;
40098diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40099index 5db1478..e90e25e 100644
40100--- a/drivers/cpuidle/driver.c
40101+++ b/drivers/cpuidle/driver.c
40102@@ -193,7 +193,7 @@ static int poll_idle(struct cpuidle_device *dev,
40103
40104 static void poll_idle_init(struct cpuidle_driver *drv)
40105 {
40106- struct cpuidle_state *state = &drv->states[0];
40107+ cpuidle_state_no_const *state = &drv->states[0];
40108
40109 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40110 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40111diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40112index fb9f511..213e6cc 100644
40113--- a/drivers/cpuidle/governor.c
40114+++ b/drivers/cpuidle/governor.c
40115@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40116 mutex_lock(&cpuidle_lock);
40117 if (__cpuidle_find_governor(gov->name) == NULL) {
40118 ret = 0;
40119- list_add_tail(&gov->governor_list, &cpuidle_governors);
40120+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40121 if (!cpuidle_curr_governor ||
40122 cpuidle_curr_governor->rating < gov->rating)
40123 cpuidle_switch_governor(gov);
40124diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40125index 832a2c3..1794080 100644
40126--- a/drivers/cpuidle/sysfs.c
40127+++ b/drivers/cpuidle/sysfs.c
40128@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40129 NULL
40130 };
40131
40132-static struct attribute_group cpuidle_attr_group = {
40133+static attribute_group_no_const cpuidle_attr_group = {
40134 .attrs = cpuidle_default_attrs,
40135 .name = "cpuidle",
40136 };
40137diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40138index 8d2a772..33826c9 100644
40139--- a/drivers/crypto/hifn_795x.c
40140+++ b/drivers/crypto/hifn_795x.c
40141@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40142 MODULE_PARM_DESC(hifn_pll_ref,
40143 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40144
40145-static atomic_t hifn_dev_number;
40146+static atomic_unchecked_t hifn_dev_number;
40147
40148 #define ACRYPTO_OP_DECRYPT 0
40149 #define ACRYPTO_OP_ENCRYPT 1
40150@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40151 goto err_out_disable_pci_device;
40152
40153 snprintf(name, sizeof(name), "hifn%d",
40154- atomic_inc_return(&hifn_dev_number)-1);
40155+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40156
40157 err = pci_request_regions(pdev, name);
40158 if (err)
40159diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
40160index 4630709..0a70e46 100644
40161--- a/drivers/crypto/omap-des.c
40162+++ b/drivers/crypto/omap-des.c
40163@@ -536,9 +536,6 @@ static int omap_des_crypt_dma_stop(struct omap_des_dev *dd)
40164 dmaengine_terminate_all(dd->dma_lch_in);
40165 dmaengine_terminate_all(dd->dma_lch_out);
40166
40167- dma_unmap_sg(dd->dev, dd->in_sg, dd->in_sg_len, DMA_TO_DEVICE);
40168- dma_unmap_sg(dd->dev, dd->out_sg, dd->out_sg_len, DMA_FROM_DEVICE);
40169-
40170 return err;
40171 }
40172
40173diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40174index ca1b362..01cae6a 100644
40175--- a/drivers/devfreq/devfreq.c
40176+++ b/drivers/devfreq/devfreq.c
40177@@ -672,7 +672,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40178 goto err_out;
40179 }
40180
40181- list_add(&governor->node, &devfreq_governor_list);
40182+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40183
40184 list_for_each_entry(devfreq, &devfreq_list, node) {
40185 int ret = 0;
40186@@ -760,7 +760,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40187 }
40188 }
40189
40190- list_del(&governor->node);
40191+ pax_list_del((struct list_head *)&governor->node);
40192 err_out:
40193 mutex_unlock(&devfreq_list_lock);
40194
40195diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40196index 10fcaba..326f709 100644
40197--- a/drivers/dma/sh/shdma-base.c
40198+++ b/drivers/dma/sh/shdma-base.c
40199@@ -227,8 +227,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40200 schan->slave_id = -EINVAL;
40201 }
40202
40203- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40204- sdev->desc_size, GFP_KERNEL);
40205+ schan->desc = kcalloc(sdev->desc_size,
40206+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40207 if (!schan->desc) {
40208 ret = -ENOMEM;
40209 goto edescalloc;
40210diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40211index 11707df..2ea96f7 100644
40212--- a/drivers/dma/sh/shdmac.c
40213+++ b/drivers/dma/sh/shdmac.c
40214@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40215 return ret;
40216 }
40217
40218-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40219+static struct notifier_block sh_dmae_nmi_notifier = {
40220 .notifier_call = sh_dmae_nmi_handler,
40221
40222 /* Run before NMI debug handler and KGDB */
40223diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40224index 592af5f..bb1d583 100644
40225--- a/drivers/edac/edac_device.c
40226+++ b/drivers/edac/edac_device.c
40227@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40228 */
40229 int edac_device_alloc_index(void)
40230 {
40231- static atomic_t device_indexes = ATOMIC_INIT(0);
40232+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40233
40234- return atomic_inc_return(&device_indexes) - 1;
40235+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40236 }
40237 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40238
40239diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40240index 112d63a..5443a61 100644
40241--- a/drivers/edac/edac_mc_sysfs.c
40242+++ b/drivers/edac/edac_mc_sysfs.c
40243@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40244 struct dev_ch_attribute {
40245 struct device_attribute attr;
40246 int channel;
40247-};
40248+} __do_const;
40249
40250 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40251 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40252diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40253index 2cf44b4d..6dd2dc7 100644
40254--- a/drivers/edac/edac_pci.c
40255+++ b/drivers/edac/edac_pci.c
40256@@ -29,7 +29,7 @@
40257
40258 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40259 static LIST_HEAD(edac_pci_list);
40260-static atomic_t pci_indexes = ATOMIC_INIT(0);
40261+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40262
40263 /*
40264 * edac_pci_alloc_ctl_info
40265@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40266 */
40267 int edac_pci_alloc_index(void)
40268 {
40269- return atomic_inc_return(&pci_indexes) - 1;
40270+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40271 }
40272 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40273
40274diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40275index 24d877f..4e30133 100644
40276--- a/drivers/edac/edac_pci_sysfs.c
40277+++ b/drivers/edac/edac_pci_sysfs.c
40278@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40279 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40280 static int edac_pci_poll_msec = 1000; /* one second workq period */
40281
40282-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40283-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40284+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40285+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40286
40287 static struct kobject *edac_pci_top_main_kobj;
40288 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40289@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40290 void *value;
40291 ssize_t(*show) (void *, char *);
40292 ssize_t(*store) (void *, const char *, size_t);
40293-};
40294+} __do_const;
40295
40296 /* Set of show/store abstract level functions for PCI Parity object */
40297 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40298@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40299 edac_printk(KERN_CRIT, EDAC_PCI,
40300 "Signaled System Error on %s\n",
40301 pci_name(dev));
40302- atomic_inc(&pci_nonparity_count);
40303+ atomic_inc_unchecked(&pci_nonparity_count);
40304 }
40305
40306 if (status & (PCI_STATUS_PARITY)) {
40307@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40308 "Master Data Parity Error on %s\n",
40309 pci_name(dev));
40310
40311- atomic_inc(&pci_parity_count);
40312+ atomic_inc_unchecked(&pci_parity_count);
40313 }
40314
40315 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40316@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40317 "Detected Parity Error on %s\n",
40318 pci_name(dev));
40319
40320- atomic_inc(&pci_parity_count);
40321+ atomic_inc_unchecked(&pci_parity_count);
40322 }
40323 }
40324
40325@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40326 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40327 "Signaled System Error on %s\n",
40328 pci_name(dev));
40329- atomic_inc(&pci_nonparity_count);
40330+ atomic_inc_unchecked(&pci_nonparity_count);
40331 }
40332
40333 if (status & (PCI_STATUS_PARITY)) {
40334@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40335 "Master Data Parity Error on "
40336 "%s\n", pci_name(dev));
40337
40338- atomic_inc(&pci_parity_count);
40339+ atomic_inc_unchecked(&pci_parity_count);
40340 }
40341
40342 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40343@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40344 "Detected Parity Error on %s\n",
40345 pci_name(dev));
40346
40347- atomic_inc(&pci_parity_count);
40348+ atomic_inc_unchecked(&pci_parity_count);
40349 }
40350 }
40351 }
40352@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40353 if (!check_pci_errors)
40354 return;
40355
40356- before_count = atomic_read(&pci_parity_count);
40357+ before_count = atomic_read_unchecked(&pci_parity_count);
40358
40359 /* scan all PCI devices looking for a Parity Error on devices and
40360 * bridges.
40361@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40362 /* Only if operator has selected panic on PCI Error */
40363 if (edac_pci_get_panic_on_pe()) {
40364 /* If the count is different 'after' from 'before' */
40365- if (before_count != atomic_read(&pci_parity_count))
40366+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40367 panic("EDAC: PCI Parity Error");
40368 }
40369 }
40370diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40371index c2359a1..8bd119d 100644
40372--- a/drivers/edac/mce_amd.h
40373+++ b/drivers/edac/mce_amd.h
40374@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40375 bool (*mc0_mce)(u16, u8);
40376 bool (*mc1_mce)(u16, u8);
40377 bool (*mc2_mce)(u16, u8);
40378-};
40379+} __no_const;
40380
40381 void amd_report_gart_errors(bool);
40382 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40383diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40384index 57ea7f4..af06b76 100644
40385--- a/drivers/firewire/core-card.c
40386+++ b/drivers/firewire/core-card.c
40387@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40388 const struct fw_card_driver *driver,
40389 struct device *device)
40390 {
40391- static atomic_t index = ATOMIC_INIT(-1);
40392+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40393
40394- card->index = atomic_inc_return(&index);
40395+ card->index = atomic_inc_return_unchecked(&index);
40396 card->driver = driver;
40397 card->device = device;
40398 card->current_tlabel = 0;
40399@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40400
40401 void fw_core_remove_card(struct fw_card *card)
40402 {
40403- struct fw_card_driver dummy_driver = dummy_driver_template;
40404+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40405
40406 card->driver->update_phy_reg(card, 4,
40407 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40408diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40409index f9e3aee..269dbdb 100644
40410--- a/drivers/firewire/core-device.c
40411+++ b/drivers/firewire/core-device.c
40412@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40413 struct config_rom_attribute {
40414 struct device_attribute attr;
40415 u32 key;
40416-};
40417+} __do_const;
40418
40419 static ssize_t show_immediate(struct device *dev,
40420 struct device_attribute *dattr, char *buf)
40421diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40422index d6a09b9..18e90dd 100644
40423--- a/drivers/firewire/core-transaction.c
40424+++ b/drivers/firewire/core-transaction.c
40425@@ -38,6 +38,7 @@
40426 #include <linux/timer.h>
40427 #include <linux/types.h>
40428 #include <linux/workqueue.h>
40429+#include <linux/sched.h>
40430
40431 #include <asm/byteorder.h>
40432
40433diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40434index e1480ff6..1a429bd 100644
40435--- a/drivers/firewire/core.h
40436+++ b/drivers/firewire/core.h
40437@@ -111,6 +111,7 @@ struct fw_card_driver {
40438
40439 int (*stop_iso)(struct fw_iso_context *ctx);
40440 };
40441+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40442
40443 void fw_card_initialize(struct fw_card *card,
40444 const struct fw_card_driver *driver, struct device *device);
40445diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40446index f51d376..b118e40 100644
40447--- a/drivers/firewire/ohci.c
40448+++ b/drivers/firewire/ohci.c
40449@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40450 be32_to_cpu(ohci->next_header));
40451 }
40452
40453+#ifndef CONFIG_GRKERNSEC
40454 if (param_remote_dma) {
40455 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40456 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40457 }
40458+#endif
40459
40460 spin_unlock_irq(&ohci->lock);
40461
40462@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40463 unsigned long flags;
40464 int n, ret = 0;
40465
40466+#ifndef CONFIG_GRKERNSEC
40467 if (param_remote_dma)
40468 return 0;
40469+#endif
40470
40471 /*
40472 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40473diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40474index 94a58a0..f5eba42 100644
40475--- a/drivers/firmware/dmi-id.c
40476+++ b/drivers/firmware/dmi-id.c
40477@@ -16,7 +16,7 @@
40478 struct dmi_device_attribute{
40479 struct device_attribute dev_attr;
40480 int field;
40481-};
40482+} __do_const;
40483 #define to_dmi_dev_attr(_dev_attr) \
40484 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40485
40486diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40487index 4fd9961..52d60ce 100644
40488--- a/drivers/firmware/efi/cper.c
40489+++ b/drivers/firmware/efi/cper.c
40490@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40491 */
40492 u64 cper_next_record_id(void)
40493 {
40494- static atomic64_t seq;
40495+ static atomic64_unchecked_t seq;
40496
40497- if (!atomic64_read(&seq))
40498- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40499+ if (!atomic64_read_unchecked(&seq))
40500+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40501
40502- return atomic64_inc_return(&seq);
40503+ return atomic64_inc_return_unchecked(&seq);
40504 }
40505 EXPORT_SYMBOL_GPL(cper_next_record_id);
40506
40507diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40508index e14363d..c3d5d84 100644
40509--- a/drivers/firmware/efi/efi.c
40510+++ b/drivers/firmware/efi/efi.c
40511@@ -159,14 +159,16 @@ static struct attribute_group efi_subsys_attr_group = {
40512 };
40513
40514 static struct efivars generic_efivars;
40515-static struct efivar_operations generic_ops;
40516+static efivar_operations_no_const generic_ops __read_only;
40517
40518 static int generic_ops_register(void)
40519 {
40520- generic_ops.get_variable = efi.get_variable;
40521- generic_ops.set_variable = efi.set_variable;
40522- generic_ops.get_next_variable = efi.get_next_variable;
40523- generic_ops.query_variable_store = efi_query_variable_store;
40524+ pax_open_kernel();
40525+ *(void **)&generic_ops.get_variable = efi.get_variable;
40526+ *(void **)&generic_ops.set_variable = efi.set_variable;
40527+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40528+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40529+ pax_close_kernel();
40530
40531 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40532 }
40533diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40534index 7b2e049..a253334 100644
40535--- a/drivers/firmware/efi/efivars.c
40536+++ b/drivers/firmware/efi/efivars.c
40537@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40538 static int
40539 create_efivars_bin_attributes(void)
40540 {
40541- struct bin_attribute *attr;
40542+ bin_attribute_no_const *attr;
40543 int error;
40544
40545 /* new_var */
40546diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40547index 5c55227..97f4978 100644
40548--- a/drivers/firmware/efi/runtime-map.c
40549+++ b/drivers/firmware/efi/runtime-map.c
40550@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40551 kfree(entry);
40552 }
40553
40554-static struct kobj_type __refdata map_ktype = {
40555+static const struct kobj_type __refconst map_ktype = {
40556 .sysfs_ops = &map_attr_ops,
40557 .default_attrs = def_attrs,
40558 .release = map_release,
40559diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40560index f1ab05e..ab51228 100644
40561--- a/drivers/firmware/google/gsmi.c
40562+++ b/drivers/firmware/google/gsmi.c
40563@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40564 return local_hash_64(input, 32);
40565 }
40566
40567-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40568+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40569 {
40570 .ident = "Google Board",
40571 .matches = {
40572diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40573index 2f569aa..26e4f39 100644
40574--- a/drivers/firmware/google/memconsole.c
40575+++ b/drivers/firmware/google/memconsole.c
40576@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40577 return false;
40578 }
40579
40580-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40581+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40582 {
40583 .ident = "Google Board",
40584 .matches = {
40585@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40586 if (!found_memconsole())
40587 return -ENODEV;
40588
40589- memconsole_bin_attr.size = memconsole_length;
40590+ pax_open_kernel();
40591+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40592+ pax_close_kernel();
40593+
40594 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40595 }
40596
40597diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40598index cc016c61..d35279e 100644
40599--- a/drivers/firmware/memmap.c
40600+++ b/drivers/firmware/memmap.c
40601@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40602 kfree(entry);
40603 }
40604
40605-static struct kobj_type __refdata memmap_ktype = {
40606+static const struct kobj_type __refconst memmap_ktype = {
40607 .release = release_firmware_map_entry,
40608 .sysfs_ops = &memmap_attr_ops,
40609 .default_attrs = def_attrs,
40610diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40611index 3cfcfc6..09d6f117 100644
40612--- a/drivers/gpio/gpio-em.c
40613+++ b/drivers/gpio/gpio-em.c
40614@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40615 struct em_gio_priv *p;
40616 struct resource *io[2], *irq[2];
40617 struct gpio_chip *gpio_chip;
40618- struct irq_chip *irq_chip;
40619+ irq_chip_no_const *irq_chip;
40620 const char *name = dev_name(&pdev->dev);
40621 int ret;
40622
40623diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40624index 4ba7ed5..1536b5d 100644
40625--- a/drivers/gpio/gpio-ich.c
40626+++ b/drivers/gpio/gpio-ich.c
40627@@ -94,7 +94,7 @@ struct ichx_desc {
40628 * this option allows driver caching written output values
40629 */
40630 bool use_outlvl_cache;
40631-};
40632+} __do_const;
40633
40634 static struct {
40635 spinlock_t lock;
40636diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40637index b232397..a3ccece 100644
40638--- a/drivers/gpio/gpio-omap.c
40639+++ b/drivers/gpio/gpio-omap.c
40640@@ -1137,7 +1137,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40641 const struct omap_gpio_platform_data *pdata;
40642 struct resource *res;
40643 struct gpio_bank *bank;
40644- struct irq_chip *irqc;
40645+ irq_chip_no_const *irqc;
40646 int ret;
40647
40648 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40649diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40650index 1e14a6c..0442450 100644
40651--- a/drivers/gpio/gpio-rcar.c
40652+++ b/drivers/gpio/gpio-rcar.c
40653@@ -379,7 +379,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40654 struct gpio_rcar_priv *p;
40655 struct resource *io, *irq;
40656 struct gpio_chip *gpio_chip;
40657- struct irq_chip *irq_chip;
40658+ irq_chip_no_const *irq_chip;
40659 struct device *dev = &pdev->dev;
40660 const char *name = dev_name(dev);
40661 int ret;
40662diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40663index c1caa45..f0f97d2 100644
40664--- a/drivers/gpio/gpio-vr41xx.c
40665+++ b/drivers/gpio/gpio-vr41xx.c
40666@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40667 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40668 maskl, pendl, maskh, pendh);
40669
40670- atomic_inc(&irq_err_count);
40671+ atomic_inc_unchecked(&irq_err_count);
40672
40673 return -EINVAL;
40674 }
40675diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40676index 6bc612b..3932464 100644
40677--- a/drivers/gpio/gpiolib.c
40678+++ b/drivers/gpio/gpiolib.c
40679@@ -558,8 +558,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40680 }
40681
40682 if (gpiochip->irqchip) {
40683- gpiochip->irqchip->irq_request_resources = NULL;
40684- gpiochip->irqchip->irq_release_resources = NULL;
40685+ pax_open_kernel();
40686+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40687+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40688+ pax_close_kernel();
40689 gpiochip->irqchip = NULL;
40690 }
40691 }
40692@@ -625,8 +627,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40693 gpiochip->irqchip = NULL;
40694 return -EINVAL;
40695 }
40696- irqchip->irq_request_resources = gpiochip_irq_reqres;
40697- irqchip->irq_release_resources = gpiochip_irq_relres;
40698+
40699+ pax_open_kernel();
40700+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40701+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40702+ pax_close_kernel();
40703
40704 /*
40705 * Prepare the mapping since the irqchip shall be orthogonal to
40706diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40707index 488f51d..301d462 100644
40708--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40709+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40710@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40711 enum cache_policy alternate_policy,
40712 void __user *alternate_aperture_base,
40713 uint64_t alternate_aperture_size);
40714-};
40715+} __no_const;
40716
40717 /**
40718 * struct device_queue_manager
40719diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40720index 5940531..a75b0e5 100644
40721--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40722+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40723@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40724
40725 void (*submit_packet)(struct kernel_queue *kq);
40726 void (*rollback_packet)(struct kernel_queue *kq);
40727-};
40728+} __no_const;
40729
40730 struct kernel_queue {
40731 struct kernel_queue_ops ops;
40732diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40733index 9b23525..65f4110 100644
40734--- a/drivers/gpu/drm/drm_context.c
40735+++ b/drivers/gpu/drm/drm_context.c
40736@@ -53,6 +53,9 @@ struct drm_ctx_list {
40737 */
40738 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40739 {
40740+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40741+ return;
40742+
40743 mutex_lock(&dev->struct_mutex);
40744 idr_remove(&dev->ctx_idr, ctx_handle);
40745 mutex_unlock(&dev->struct_mutex);
40746@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40747 */
40748 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40749 {
40750+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40751+ return -EINVAL;
40752+
40753 idr_init(&dev->ctx_idr);
40754 return 0;
40755 }
40756@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40757 */
40758 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40759 {
40760+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40761+ return;
40762+
40763 mutex_lock(&dev->struct_mutex);
40764 idr_destroy(&dev->ctx_idr);
40765 mutex_unlock(&dev->struct_mutex);
40766@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40767 {
40768 struct drm_ctx_list *pos, *tmp;
40769
40770+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40771+ return;
40772+
40773 mutex_lock(&dev->ctxlist_mutex);
40774
40775 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40776 if (pos->tag == file &&
40777- pos->handle != DRM_KERNEL_CONTEXT) {
40778+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40779 if (dev->driver->context_dtor)
40780 dev->driver->context_dtor(dev, pos->handle);
40781
40782@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40783 struct drm_local_map *map;
40784 struct drm_map_list *_entry;
40785
40786+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40787+ return -EINVAL;
40788+
40789 mutex_lock(&dev->struct_mutex);
40790
40791 map = idr_find(&dev->ctx_idr, request->ctx_id);
40792@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40793 struct drm_local_map *map = NULL;
40794 struct drm_map_list *r_list = NULL;
40795
40796+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40797+ return -EINVAL;
40798+
40799 mutex_lock(&dev->struct_mutex);
40800 list_for_each_entry(r_list, &dev->maplist, head) {
40801 if (r_list->map
40802@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40803 {
40804 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40805
40806- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40807+ if (file_priv->master->lock.hw_lock == NULL) {
40808+ DRM_ERROR(
40809+ "Device has been unregistered. Hard exit. Process %d\n",
40810+ task_pid_nr(current));
40811+ send_sig(SIGTERM, current, 0);
40812+ return -EPERM;
40813+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40814 DRM_ERROR("Lock isn't held after context switch\n");
40815 }
40816
40817@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40818 struct drm_ctx ctx;
40819 int i;
40820
40821+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40822+ return -EINVAL;
40823+
40824 if (res->count >= DRM_RESERVED_CONTEXTS) {
40825 memset(&ctx, 0, sizeof(ctx));
40826 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40827@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40828 struct drm_ctx_list *ctx_entry;
40829 struct drm_ctx *ctx = data;
40830
40831+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40832+ return -EINVAL;
40833+
40834 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40835- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40836+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40837 /* Skip kernel's context and get a new one. */
40838 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40839 }
40840@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40841 {
40842 struct drm_ctx *ctx = data;
40843
40844+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40845+ return -EINVAL;
40846+
40847 /* This is 0, because we don't handle any context flags */
40848 ctx->flags = 0;
40849
40850@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40851 {
40852 struct drm_ctx *ctx = data;
40853
40854+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40855+ return -EINVAL;
40856+
40857 DRM_DEBUG("%d\n", ctx->handle);
40858 return drm_context_switch(dev, dev->last_context, ctx->handle);
40859 }
40860@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40861 {
40862 struct drm_ctx *ctx = data;
40863
40864+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40865+ return -EINVAL;
40866+
40867 DRM_DEBUG("%d\n", ctx->handle);
40868 drm_context_switch_complete(dev, file_priv, ctx->handle);
40869
40870@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40871 {
40872 struct drm_ctx *ctx = data;
40873
40874+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40875+ return -EINVAL;
40876+
40877 DRM_DEBUG("%d\n", ctx->handle);
40878- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40879+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40880 if (dev->driver->context_dtor)
40881 dev->driver->context_dtor(dev, ctx->handle);
40882 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40883diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40884index 3007b44..420b4a3 100644
40885--- a/drivers/gpu/drm/drm_crtc.c
40886+++ b/drivers/gpu/drm/drm_crtc.c
40887@@ -4176,7 +4176,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40888 goto done;
40889 }
40890
40891- if (copy_to_user(&enum_ptr[copied].name,
40892+ if (copy_to_user(enum_ptr[copied].name,
40893 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40894 ret = -EFAULT;
40895 goto done;
40896diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40897index 48f7359..8c3b594 100644
40898--- a/drivers/gpu/drm/drm_drv.c
40899+++ b/drivers/gpu/drm/drm_drv.c
40900@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40901
40902 drm_device_set_unplugged(dev);
40903
40904- if (dev->open_count == 0) {
40905+ if (local_read(&dev->open_count) == 0) {
40906 drm_put_dev(dev);
40907 }
40908 mutex_unlock(&drm_global_mutex);
40909@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40910 if (drm_ht_create(&dev->map_hash, 12))
40911 goto err_minors;
40912
40913- ret = drm_legacy_ctxbitmap_init(dev);
40914- if (ret) {
40915- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40916- goto err_ht;
40917+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40918+ ret = drm_legacy_ctxbitmap_init(dev);
40919+ if (ret) {
40920+ DRM_ERROR(
40921+ "Cannot allocate memory for context bitmap.\n");
40922+ goto err_ht;
40923+ }
40924 }
40925
40926 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40927diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40928index 076dd60..e4a4ba7 100644
40929--- a/drivers/gpu/drm/drm_fops.c
40930+++ b/drivers/gpu/drm/drm_fops.c
40931@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40932 return PTR_ERR(minor);
40933
40934 dev = minor->dev;
40935- if (!dev->open_count++)
40936+ if (local_inc_return(&dev->open_count) == 1)
40937 need_setup = 1;
40938
40939 /* share address_space across all char-devs of a single device */
40940@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40941 return 0;
40942
40943 err_undo:
40944- dev->open_count--;
40945+ local_dec(&dev->open_count);
40946 drm_minor_release(minor);
40947 return retcode;
40948 }
40949@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40950
40951 mutex_lock(&drm_global_mutex);
40952
40953- DRM_DEBUG("open_count = %d\n", dev->open_count);
40954+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40955
40956 mutex_lock(&dev->struct_mutex);
40957 list_del(&file_priv->lhead);
40958@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40959 * Begin inline drm_release
40960 */
40961
40962- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40963+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40964 task_pid_nr(current),
40965 (long)old_encode_dev(file_priv->minor->kdev->devt),
40966- dev->open_count);
40967+ local_read(&dev->open_count));
40968
40969 /* Release any auth tokens that might point to this file_priv,
40970 (do that under the drm_global_mutex) */
40971@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40972 * End inline drm_release
40973 */
40974
40975- if (!--dev->open_count) {
40976+ if (local_dec_and_test(&dev->open_count)) {
40977 retcode = drm_lastclose(dev);
40978 if (drm_device_is_unplugged(dev))
40979 drm_put_dev(dev);
40980diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40981index 3d2e91c..d31c4c9 100644
40982--- a/drivers/gpu/drm/drm_global.c
40983+++ b/drivers/gpu/drm/drm_global.c
40984@@ -36,7 +36,7 @@
40985 struct drm_global_item {
40986 struct mutex mutex;
40987 void *object;
40988- int refcount;
40989+ atomic_t refcount;
40990 };
40991
40992 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40993@@ -49,7 +49,7 @@ void drm_global_init(void)
40994 struct drm_global_item *item = &glob[i];
40995 mutex_init(&item->mutex);
40996 item->object = NULL;
40997- item->refcount = 0;
40998+ atomic_set(&item->refcount, 0);
40999 }
41000 }
41001
41002@@ -59,7 +59,7 @@ void drm_global_release(void)
41003 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41004 struct drm_global_item *item = &glob[i];
41005 BUG_ON(item->object != NULL);
41006- BUG_ON(item->refcount != 0);
41007+ BUG_ON(atomic_read(&item->refcount) != 0);
41008 }
41009 }
41010
41011@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41012 struct drm_global_item *item = &glob[ref->global_type];
41013
41014 mutex_lock(&item->mutex);
41015- if (item->refcount == 0) {
41016+ if (atomic_read(&item->refcount) == 0) {
41017 item->object = kzalloc(ref->size, GFP_KERNEL);
41018 if (unlikely(item->object == NULL)) {
41019 ret = -ENOMEM;
41020@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41021 goto out_err;
41022
41023 }
41024- ++item->refcount;
41025+ atomic_inc(&item->refcount);
41026 ref->object = item->object;
41027 mutex_unlock(&item->mutex);
41028 return 0;
41029@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41030 struct drm_global_item *item = &glob[ref->global_type];
41031
41032 mutex_lock(&item->mutex);
41033- BUG_ON(item->refcount == 0);
41034+ BUG_ON(atomic_read(&item->refcount) == 0);
41035 BUG_ON(ref->object != item->object);
41036- if (--item->refcount == 0) {
41037+ if (atomic_dec_and_test(&item->refcount)) {
41038 ref->release(ref);
41039 item->object = NULL;
41040 }
41041diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41042index cbb4fc0..5c756cb9 100644
41043--- a/drivers/gpu/drm/drm_info.c
41044+++ b/drivers/gpu/drm/drm_info.c
41045@@ -77,10 +77,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41046 struct drm_local_map *map;
41047 struct drm_map_list *r_list;
41048
41049- /* Hardcoded from _DRM_FRAME_BUFFER,
41050- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41051- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41052- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41053+ static const char * const types[] = {
41054+ [_DRM_FRAME_BUFFER] = "FB",
41055+ [_DRM_REGISTERS] = "REG",
41056+ [_DRM_SHM] = "SHM",
41057+ [_DRM_AGP] = "AGP",
41058+ [_DRM_SCATTER_GATHER] = "SG",
41059+ [_DRM_CONSISTENT] = "PCI"};
41060 const char *type;
41061 int i;
41062
41063@@ -91,7 +94,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41064 map = r_list->map;
41065 if (!map)
41066 continue;
41067- if (map->type < 0 || map->type > 5)
41068+ if (map->type >= ARRAY_SIZE(types))
41069 type = "??";
41070 else
41071 type = types[map->type];
41072diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41073index aa8bbb4..0f62630 100644
41074--- a/drivers/gpu/drm/drm_ioc32.c
41075+++ b/drivers/gpu/drm/drm_ioc32.c
41076@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41077 request = compat_alloc_user_space(nbytes);
41078 if (!access_ok(VERIFY_WRITE, request, nbytes))
41079 return -EFAULT;
41080- list = (struct drm_buf_desc *) (request + 1);
41081+ list = (struct drm_buf_desc __user *) (request + 1);
41082
41083 if (__put_user(count, &request->count)
41084 || __put_user(list, &request->list))
41085@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41086 request = compat_alloc_user_space(nbytes);
41087 if (!access_ok(VERIFY_WRITE, request, nbytes))
41088 return -EFAULT;
41089- list = (struct drm_buf_pub *) (request + 1);
41090+ list = (struct drm_buf_pub __user *) (request + 1);
41091
41092 if (__put_user(count, &request->count)
41093 || __put_user(list, &request->list))
41094@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41095 return 0;
41096 }
41097
41098-static drm_ioctl_compat_t *drm_compat_ioctls[] = {
41099+static drm_ioctl_compat_t drm_compat_ioctls[] = {
41100 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41101 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41102 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41103@@ -1062,7 +1062,6 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
41104 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41105 {
41106 unsigned int nr = DRM_IOCTL_NR(cmd);
41107- drm_ioctl_compat_t *fn;
41108 int ret;
41109
41110 /* Assume that ioctls without an explicit compat routine will just
41111@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41112 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41113 return drm_ioctl(filp, cmd, arg);
41114
41115- fn = drm_compat_ioctls[nr];
41116-
41117- if (fn != NULL)
41118- ret = (*fn) (filp, cmd, arg);
41119+ if (drm_compat_ioctls[nr] != NULL)
41120+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41121 else
41122 ret = drm_ioctl(filp, cmd, arg);
41123
41124diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41125index 266dcd6..d0194d9 100644
41126--- a/drivers/gpu/drm/drm_ioctl.c
41127+++ b/drivers/gpu/drm/drm_ioctl.c
41128@@ -663,7 +663,7 @@ long drm_ioctl(struct file *filp,
41129 struct drm_file *file_priv = filp->private_data;
41130 struct drm_device *dev;
41131 const struct drm_ioctl_desc *ioctl = NULL;
41132- drm_ioctl_t *func;
41133+ drm_ioctl_no_const_t func;
41134 unsigned int nr = DRM_IOCTL_NR(cmd);
41135 int retcode = -EINVAL;
41136 char stack_kdata[128];
41137diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41138index f861361..b61d4c7 100644
41139--- a/drivers/gpu/drm/drm_lock.c
41140+++ b/drivers/gpu/drm/drm_lock.c
41141@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41142 struct drm_master *master = file_priv->master;
41143 int ret = 0;
41144
41145+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41146+ return -EINVAL;
41147+
41148 ++file_priv->lock_count;
41149
41150- if (lock->context == DRM_KERNEL_CONTEXT) {
41151+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41152 DRM_ERROR("Process %d using kernel context %d\n",
41153 task_pid_nr(current), lock->context);
41154 return -EINVAL;
41155@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41156 struct drm_lock *lock = data;
41157 struct drm_master *master = file_priv->master;
41158
41159- if (lock->context == DRM_KERNEL_CONTEXT) {
41160+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41161+ return -EINVAL;
41162+
41163+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41164 DRM_ERROR("Process %d using kernel context %d\n",
41165 task_pid_nr(current), lock->context);
41166 return -EINVAL;
41167 }
41168
41169+ if (!master->lock.hw_lock) {
41170+ DRM_ERROR(
41171+ "Device has been unregistered. Hard exit. Process %d\n",
41172+ task_pid_nr(current));
41173+ send_sig(SIGTERM, current, 0);
41174+ return -EPERM;
41175+ }
41176+
41177 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41178 /* FIXME: Should really bail out here. */
41179 }
41180diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41181index d4813e0..6c1ab4d 100644
41182--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41183+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41184@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41185 u32 pipeconf_reg = PIPEACONF;
41186 u32 dspcntr_reg = DSPACNTR;
41187
41188- u32 pipeconf = dev_priv->pipeconf[pipe];
41189- u32 dspcntr = dev_priv->dspcntr[pipe];
41190+ u32 pipeconf;
41191+ u32 dspcntr;
41192 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41193
41194+ if (pipe == -1)
41195+ return;
41196+
41197+ pipeconf = dev_priv->pipeconf[pipe];
41198+ dspcntr = dev_priv->dspcntr[pipe];
41199+
41200 if (pipe) {
41201 pipeconf_reg = PIPECCONF;
41202 dspcntr_reg = DSPCCNTR;
41203diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41204index 93ec5dc..82acbaf 100644
41205--- a/drivers/gpu/drm/i810/i810_drv.h
41206+++ b/drivers/gpu/drm/i810/i810_drv.h
41207@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41208 int page_flipping;
41209
41210 wait_queue_head_t irq_queue;
41211- atomic_t irq_received;
41212- atomic_t irq_emitted;
41213+ atomic_unchecked_t irq_received;
41214+ atomic_unchecked_t irq_emitted;
41215
41216 int front_offset;
41217 } drm_i810_private_t;
41218diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41219index 68e0c85..3303192 100644
41220--- a/drivers/gpu/drm/i915/i915_dma.c
41221+++ b/drivers/gpu/drm/i915/i915_dma.c
41222@@ -162,6 +162,8 @@ static int i915_getparam(struct drm_device *dev, void *data,
41223 value = INTEL_INFO(dev)->eu_total;
41224 if (!value)
41225 return -ENODEV;
41226+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41227+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41228 break;
41229 default:
41230 DRM_DEBUG("Unknown parameter %d\n", param->param);
41231@@ -376,7 +378,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41232 * locking inversion with the driver load path. And the access here is
41233 * completely racy anyway. So don't bother with locking for now.
41234 */
41235- return dev->open_count == 0;
41236+ return local_read(&dev->open_count) == 0;
41237 }
41238
41239 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41240diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41241index a3190e79..86b06cb 100644
41242--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41243+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41244@@ -936,12 +936,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41245 static int
41246 validate_exec_list(struct drm_device *dev,
41247 struct drm_i915_gem_exec_object2 *exec,
41248- int count)
41249+ unsigned int count)
41250 {
41251 unsigned relocs_total = 0;
41252 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41253 unsigned invalid_flags;
41254- int i;
41255+ unsigned int i;
41256
41257 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41258 if (USES_FULL_PPGTT(dev))
41259diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41260index 176de63..b50b66a 100644
41261--- a/drivers/gpu/drm/i915/i915_ioc32.c
41262+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41263@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41264 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41265 || __put_user(batchbuffer32.num_cliprects,
41266 &batchbuffer->num_cliprects)
41267- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41268+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41269 &batchbuffer->cliprects))
41270 return -EFAULT;
41271
41272@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41273
41274 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41275 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41276- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41277+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41278 &cmdbuffer->buf)
41279 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41280 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41281 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41282 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41283- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41284+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41285 &cmdbuffer->cliprects))
41286 return -EFAULT;
41287
41288@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41289 (unsigned long)request);
41290 }
41291
41292-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41293+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41294 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41295 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41296 [DRM_I915_GETPARAM] = compat_i915_getparam,
41297@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41298 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41299 {
41300 unsigned int nr = DRM_IOCTL_NR(cmd);
41301- drm_ioctl_compat_t *fn = NULL;
41302 int ret;
41303
41304 if (nr < DRM_COMMAND_BASE)
41305 return drm_compat_ioctl(filp, cmd, arg);
41306
41307- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41308- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41309-
41310- if (fn != NULL)
41311- ret = (*fn) (filp, cmd, arg);
41312+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41313+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41314 else
41315 ret = drm_ioctl(filp, cmd, arg);
41316
41317diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41318index d0f3cbc..f3ab4cc 100644
41319--- a/drivers/gpu/drm/i915/intel_display.c
41320+++ b/drivers/gpu/drm/i915/intel_display.c
41321@@ -13604,13 +13604,13 @@ struct intel_quirk {
41322 int subsystem_vendor;
41323 int subsystem_device;
41324 void (*hook)(struct drm_device *dev);
41325-};
41326+} __do_const;
41327
41328 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41329 struct intel_dmi_quirk {
41330 void (*hook)(struct drm_device *dev);
41331 const struct dmi_system_id (*dmi_id_list)[];
41332-};
41333+} __do_const;
41334
41335 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41336 {
41337@@ -13618,18 +13618,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41338 return 1;
41339 }
41340
41341-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41342+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41343 {
41344- .dmi_id_list = &(const struct dmi_system_id[]) {
41345- {
41346- .callback = intel_dmi_reverse_brightness,
41347- .ident = "NCR Corporation",
41348- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41349- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41350- },
41351- },
41352- { } /* terminating entry */
41353+ .callback = intel_dmi_reverse_brightness,
41354+ .ident = "NCR Corporation",
41355+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41356+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41357 },
41358+ },
41359+ { } /* terminating entry */
41360+};
41361+
41362+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41363+ {
41364+ .dmi_id_list = &intel_dmi_quirks_table,
41365 .hook = quirk_invert_brightness,
41366 },
41367 };
41368diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41369index 74f505b..21f6914 100644
41370--- a/drivers/gpu/drm/imx/imx-drm-core.c
41371+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41372@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41373 if (imxdrm->pipes >= MAX_CRTC)
41374 return -EINVAL;
41375
41376- if (imxdrm->drm->open_count)
41377+ if (local_read(&imxdrm->drm->open_count))
41378 return -EBUSY;
41379
41380 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41381diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41382index b4a20149..219ab78 100644
41383--- a/drivers/gpu/drm/mga/mga_drv.h
41384+++ b/drivers/gpu/drm/mga/mga_drv.h
41385@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41386 u32 clear_cmd;
41387 u32 maccess;
41388
41389- atomic_t vbl_received; /**< Number of vblanks received. */
41390+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41391 wait_queue_head_t fence_queue;
41392- atomic_t last_fence_retired;
41393+ atomic_unchecked_t last_fence_retired;
41394 u32 next_fence_to_post;
41395
41396 unsigned int fb_cpp;
41397diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41398index 729bfd5..14bae78 100644
41399--- a/drivers/gpu/drm/mga/mga_ioc32.c
41400+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41401@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41402 return 0;
41403 }
41404
41405-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41406+drm_ioctl_compat_t mga_compat_ioctls[] = {
41407 [DRM_MGA_INIT] = compat_mga_init,
41408 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41409 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41410@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41411 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41412 {
41413 unsigned int nr = DRM_IOCTL_NR(cmd);
41414- drm_ioctl_compat_t *fn = NULL;
41415 int ret;
41416
41417 if (nr < DRM_COMMAND_BASE)
41418 return drm_compat_ioctl(filp, cmd, arg);
41419
41420- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41421- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41422-
41423- if (fn != NULL)
41424- ret = (*fn) (filp, cmd, arg);
41425+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41426+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41427 else
41428 ret = drm_ioctl(filp, cmd, arg);
41429
41430diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41431index 1b071b8..de8601a 100644
41432--- a/drivers/gpu/drm/mga/mga_irq.c
41433+++ b/drivers/gpu/drm/mga/mga_irq.c
41434@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41435 if (crtc != 0)
41436 return 0;
41437
41438- return atomic_read(&dev_priv->vbl_received);
41439+ return atomic_read_unchecked(&dev_priv->vbl_received);
41440 }
41441
41442
41443@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41444 /* VBLANK interrupt */
41445 if (status & MGA_VLINEPEN) {
41446 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41447- atomic_inc(&dev_priv->vbl_received);
41448+ atomic_inc_unchecked(&dev_priv->vbl_received);
41449 drm_handle_vblank(dev, 0);
41450 handled = 1;
41451 }
41452@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41453 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41454 MGA_WRITE(MGA_PRIMEND, prim_end);
41455
41456- atomic_inc(&dev_priv->last_fence_retired);
41457+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41458 wake_up(&dev_priv->fence_queue);
41459 handled = 1;
41460 }
41461@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41462 * using fences.
41463 */
41464 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41465- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41466+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41467 - *sequence) <= (1 << 23)));
41468
41469 *sequence = cur_fence;
41470diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41471index 0190b69..60c3eaf 100644
41472--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41473+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41474@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41475 struct bit_table {
41476 const char id;
41477 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41478-};
41479+} __no_const;
41480
41481 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41482
41483diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41484index 8904933..9624b38 100644
41485--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41486+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41487@@ -941,7 +941,8 @@ static struct drm_driver
41488 driver_stub = {
41489 .driver_features =
41490 DRIVER_USE_AGP |
41491- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41492+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41493+ DRIVER_KMS_LEGACY_CONTEXT,
41494
41495 .load = nouveau_drm_load,
41496 .unload = nouveau_drm_unload,
41497diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41498index dd72652..1fd2368 100644
41499--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41500+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41501@@ -123,7 +123,6 @@ struct nouveau_drm {
41502 struct drm_global_reference mem_global_ref;
41503 struct ttm_bo_global_ref bo_global_ref;
41504 struct ttm_bo_device bdev;
41505- atomic_t validate_sequence;
41506 int (*move)(struct nouveau_channel *,
41507 struct ttm_buffer_object *,
41508 struct ttm_mem_reg *, struct ttm_mem_reg *);
41509diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41510index 462679a..88e32a7 100644
41511--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41512+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41513@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41514 unsigned long arg)
41515 {
41516 unsigned int nr = DRM_IOCTL_NR(cmd);
41517- drm_ioctl_compat_t *fn = NULL;
41518+ drm_ioctl_compat_t fn = NULL;
41519 int ret;
41520
41521 if (nr < DRM_COMMAND_BASE)
41522diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41523index 18f4497..10f6025 100644
41524--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41525+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41526@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41527 }
41528
41529 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41530- nouveau_vram_manager_init,
41531- nouveau_vram_manager_fini,
41532- nouveau_vram_manager_new,
41533- nouveau_vram_manager_del,
41534- nouveau_vram_manager_debug
41535+ .init = nouveau_vram_manager_init,
41536+ .takedown = nouveau_vram_manager_fini,
41537+ .get_node = nouveau_vram_manager_new,
41538+ .put_node = nouveau_vram_manager_del,
41539+ .debug = nouveau_vram_manager_debug
41540 };
41541
41542 static int
41543@@ -198,11 +198,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41544 }
41545
41546 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41547- nouveau_gart_manager_init,
41548- nouveau_gart_manager_fini,
41549- nouveau_gart_manager_new,
41550- nouveau_gart_manager_del,
41551- nouveau_gart_manager_debug
41552+ .init = nouveau_gart_manager_init,
41553+ .takedown = nouveau_gart_manager_fini,
41554+ .get_node = nouveau_gart_manager_new,
41555+ .put_node = nouveau_gart_manager_del,
41556+ .debug = nouveau_gart_manager_debug
41557 };
41558
41559 /*XXX*/
41560@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41561 }
41562
41563 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41564- nv04_gart_manager_init,
41565- nv04_gart_manager_fini,
41566- nv04_gart_manager_new,
41567- nv04_gart_manager_del,
41568- nv04_gart_manager_debug
41569+ .init = nv04_gart_manager_init,
41570+ .takedown = nv04_gart_manager_fini,
41571+ .get_node = nv04_gart_manager_new,
41572+ .put_node = nv04_gart_manager_del,
41573+ .debug = nv04_gart_manager_debug
41574 };
41575
41576 int
41577diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41578index c7592ec..dd45ebc 100644
41579--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41580+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41581@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41582 * locking inversion with the driver load path. And the access here is
41583 * completely racy anyway. So don't bother with locking for now.
41584 */
41585- return dev->open_count == 0;
41586+ return local_read(&dev->open_count) == 0;
41587 }
41588
41589 static const struct vga_switcheroo_client_ops
41590diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41591index 9782364..89bd954 100644
41592--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41593+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41594@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41595 int ret;
41596
41597 mutex_lock(&qdev->async_io_mutex);
41598- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41599+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41600 if (qdev->last_sent_io_cmd > irq_num) {
41601 if (intr)
41602 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41603- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41604+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41605 else
41606 ret = wait_event_timeout(qdev->io_cmd_event,
41607- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41608+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41609 /* 0 is timeout, just bail the "hw" has gone away */
41610 if (ret <= 0)
41611 goto out;
41612- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41613+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41614 }
41615 outb(val, addr);
41616 qdev->last_sent_io_cmd = irq_num + 1;
41617 if (intr)
41618 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41619- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41620+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41621 else
41622 ret = wait_event_timeout(qdev->io_cmd_event,
41623- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41624+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41625 out:
41626 if (ret > 0)
41627 ret = 0;
41628diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41629index 6911b8c..89d6867 100644
41630--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41631+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41632@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41633 struct drm_info_node *node = (struct drm_info_node *) m->private;
41634 struct qxl_device *qdev = node->minor->dev->dev_private;
41635
41636- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41637- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41638- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41639- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41640+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41641+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41642+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41643+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41644 seq_printf(m, "%d\n", qdev->irq_received_error);
41645 return 0;
41646 }
41647diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41648index 7c6cafe..460f542 100644
41649--- a/drivers/gpu/drm/qxl/qxl_drv.h
41650+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41651@@ -290,10 +290,10 @@ struct qxl_device {
41652 unsigned int last_sent_io_cmd;
41653
41654 /* interrupt handling */
41655- atomic_t irq_received;
41656- atomic_t irq_received_display;
41657- atomic_t irq_received_cursor;
41658- atomic_t irq_received_io_cmd;
41659+ atomic_unchecked_t irq_received;
41660+ atomic_unchecked_t irq_received_display;
41661+ atomic_unchecked_t irq_received_cursor;
41662+ atomic_unchecked_t irq_received_io_cmd;
41663 unsigned irq_received_error;
41664 wait_queue_head_t display_event;
41665 wait_queue_head_t cursor_event;
41666diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41667index b110883..dd06418 100644
41668--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41669+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41670@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41671
41672 /* TODO copy slow path code from i915 */
41673 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41674- 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);
41675+ 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);
41676
41677 {
41678 struct qxl_drawable *draw = fb_cmd;
41679@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41680 struct drm_qxl_reloc reloc;
41681
41682 if (copy_from_user(&reloc,
41683- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41684+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41685 sizeof(reloc))) {
41686 ret = -EFAULT;
41687 goto out_free_bos;
41688@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41689
41690 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41691
41692- struct drm_qxl_command *commands =
41693- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41694+ struct drm_qxl_command __user *commands =
41695+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41696
41697- if (copy_from_user(&user_cmd, &commands[cmd_num],
41698+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41699 sizeof(user_cmd)))
41700 return -EFAULT;
41701
41702diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41703index 0bf1e20..42a7310 100644
41704--- a/drivers/gpu/drm/qxl/qxl_irq.c
41705+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41706@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41707 if (!pending)
41708 return IRQ_NONE;
41709
41710- atomic_inc(&qdev->irq_received);
41711+ atomic_inc_unchecked(&qdev->irq_received);
41712
41713 if (pending & QXL_INTERRUPT_DISPLAY) {
41714- atomic_inc(&qdev->irq_received_display);
41715+ atomic_inc_unchecked(&qdev->irq_received_display);
41716 wake_up_all(&qdev->display_event);
41717 qxl_queue_garbage_collect(qdev, false);
41718 }
41719 if (pending & QXL_INTERRUPT_CURSOR) {
41720- atomic_inc(&qdev->irq_received_cursor);
41721+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41722 wake_up_all(&qdev->cursor_event);
41723 }
41724 if (pending & QXL_INTERRUPT_IO_CMD) {
41725- atomic_inc(&qdev->irq_received_io_cmd);
41726+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41727 wake_up_all(&qdev->io_cmd_event);
41728 }
41729 if (pending & QXL_INTERRUPT_ERROR) {
41730@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41731 init_waitqueue_head(&qdev->io_cmd_event);
41732 INIT_WORK(&qdev->client_monitors_config_work,
41733 qxl_client_monitors_config_work_func);
41734- atomic_set(&qdev->irq_received, 0);
41735- atomic_set(&qdev->irq_received_display, 0);
41736- atomic_set(&qdev->irq_received_cursor, 0);
41737- atomic_set(&qdev->irq_received_io_cmd, 0);
41738+ atomic_set_unchecked(&qdev->irq_received, 0);
41739+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41740+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41741+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41742 qdev->irq_received_error = 0;
41743 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41744 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41745diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41746index 0cbc4c9..0e46686 100644
41747--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41748+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41749@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41750 }
41751 }
41752
41753-static struct vm_operations_struct qxl_ttm_vm_ops;
41754+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41755 static const struct vm_operations_struct *ttm_vm_ops;
41756
41757 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41758@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41759 return r;
41760 if (unlikely(ttm_vm_ops == NULL)) {
41761 ttm_vm_ops = vma->vm_ops;
41762+ pax_open_kernel();
41763 qxl_ttm_vm_ops = *ttm_vm_ops;
41764 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41765+ pax_close_kernel();
41766 }
41767 vma->vm_ops = &qxl_ttm_vm_ops;
41768 return 0;
41769@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41770 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41771 {
41772 #if defined(CONFIG_DEBUG_FS)
41773- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41774- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41775- unsigned i;
41776+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41777+ {
41778+ .name = "qxl_mem_mm",
41779+ .show = &qxl_mm_dump_table,
41780+ },
41781+ {
41782+ .name = "qxl_surf_mm",
41783+ .show = &qxl_mm_dump_table,
41784+ }
41785+ };
41786
41787- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41788- if (i == 0)
41789- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41790- else
41791- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41792- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41793- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41794- qxl_mem_types_list[i].driver_features = 0;
41795- if (i == 0)
41796- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41797- else
41798- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41799+ pax_open_kernel();
41800+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41801+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41802+ pax_close_kernel();
41803
41804- }
41805- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41806+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41807 #else
41808 return 0;
41809 #endif
41810diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41811index 2c45ac9..5d740f8 100644
41812--- a/drivers/gpu/drm/r128/r128_cce.c
41813+++ b/drivers/gpu/drm/r128/r128_cce.c
41814@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41815
41816 /* GH: Simple idle check.
41817 */
41818- atomic_set(&dev_priv->idle_count, 0);
41819+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41820
41821 /* We don't support anything other than bus-mastering ring mode,
41822 * but the ring can be in either AGP or PCI space for the ring
41823diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41824index 723e5d6..102dbaf 100644
41825--- a/drivers/gpu/drm/r128/r128_drv.h
41826+++ b/drivers/gpu/drm/r128/r128_drv.h
41827@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41828 int is_pci;
41829 unsigned long cce_buffers_offset;
41830
41831- atomic_t idle_count;
41832+ atomic_unchecked_t idle_count;
41833
41834 int page_flipping;
41835 int current_page;
41836 u32 crtc_offset;
41837 u32 crtc_offset_cntl;
41838
41839- atomic_t vbl_received;
41840+ atomic_unchecked_t vbl_received;
41841
41842 u32 color_fmt;
41843 unsigned int front_offset;
41844diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41845index 663f38c..ec159a1 100644
41846--- a/drivers/gpu/drm/r128/r128_ioc32.c
41847+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41848@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41849 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41850 }
41851
41852-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41853+drm_ioctl_compat_t r128_compat_ioctls[] = {
41854 [DRM_R128_INIT] = compat_r128_init,
41855 [DRM_R128_DEPTH] = compat_r128_depth,
41856 [DRM_R128_STIPPLE] = compat_r128_stipple,
41857@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41858 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41859 {
41860 unsigned int nr = DRM_IOCTL_NR(cmd);
41861- drm_ioctl_compat_t *fn = NULL;
41862 int ret;
41863
41864 if (nr < DRM_COMMAND_BASE)
41865 return drm_compat_ioctl(filp, cmd, arg);
41866
41867- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41868- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41869-
41870- if (fn != NULL)
41871- ret = (*fn) (filp, cmd, arg);
41872+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41873+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41874 else
41875 ret = drm_ioctl(filp, cmd, arg);
41876
41877diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41878index c2ae496..30b5993 100644
41879--- a/drivers/gpu/drm/r128/r128_irq.c
41880+++ b/drivers/gpu/drm/r128/r128_irq.c
41881@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41882 if (crtc != 0)
41883 return 0;
41884
41885- return atomic_read(&dev_priv->vbl_received);
41886+ return atomic_read_unchecked(&dev_priv->vbl_received);
41887 }
41888
41889 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41890@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41891 /* VBLANK interrupt */
41892 if (status & R128_CRTC_VBLANK_INT) {
41893 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41894- atomic_inc(&dev_priv->vbl_received);
41895+ atomic_inc_unchecked(&dev_priv->vbl_received);
41896 drm_handle_vblank(dev, 0);
41897 return IRQ_HANDLED;
41898 }
41899diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41900index 8fd2d9f..18c9660 100644
41901--- a/drivers/gpu/drm/r128/r128_state.c
41902+++ b/drivers/gpu/drm/r128/r128_state.c
41903@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41904
41905 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41906 {
41907- if (atomic_read(&dev_priv->idle_count) == 0)
41908+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41909 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41910 else
41911- atomic_set(&dev_priv->idle_count, 0);
41912+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41913 }
41914
41915 #endif
41916diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41917index b928c17..e5d9400 100644
41918--- a/drivers/gpu/drm/radeon/mkregtable.c
41919+++ b/drivers/gpu/drm/radeon/mkregtable.c
41920@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41921 regex_t mask_rex;
41922 regmatch_t match[4];
41923 char buf[1024];
41924- size_t end;
41925+ long end;
41926 int len;
41927 int done = 0;
41928 int r;
41929 unsigned o;
41930 struct offset *offset;
41931 char last_reg_s[10];
41932- int last_reg;
41933+ unsigned long last_reg;
41934
41935 if (regcomp
41936 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41937diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41938index a7fdfa4..04a3964 100644
41939--- a/drivers/gpu/drm/radeon/radeon_device.c
41940+++ b/drivers/gpu/drm/radeon/radeon_device.c
41941@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41942 * locking inversion with the driver load path. And the access here is
41943 * completely racy anyway. So don't bother with locking for now.
41944 */
41945- return dev->open_count == 0;
41946+ return local_read(&dev->open_count) == 0;
41947 }
41948
41949 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41950diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41951index 46bd393..6ae4719 100644
41952--- a/drivers/gpu/drm/radeon/radeon_drv.h
41953+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41954@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41955
41956 /* SW interrupt */
41957 wait_queue_head_t swi_queue;
41958- atomic_t swi_emitted;
41959+ atomic_unchecked_t swi_emitted;
41960 int vblank_crtc;
41961 uint32_t irq_enable_reg;
41962 uint32_t r500_disp_irq_reg;
41963diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41964index 0b98ea1..a3c770f 100644
41965--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41966+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41967@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41968 request = compat_alloc_user_space(sizeof(*request));
41969 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41970 || __put_user(req32.param, &request->param)
41971- || __put_user((void __user *)(unsigned long)req32.value,
41972+ || __put_user((unsigned long)req32.value,
41973 &request->value))
41974 return -EFAULT;
41975
41976@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41977 #define compat_radeon_cp_setparam NULL
41978 #endif /* X86_64 || IA64 */
41979
41980-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41981+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41982 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41983 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41984 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41985@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41986 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41987 {
41988 unsigned int nr = DRM_IOCTL_NR(cmd);
41989- drm_ioctl_compat_t *fn = NULL;
41990 int ret;
41991
41992 if (nr < DRM_COMMAND_BASE)
41993 return drm_compat_ioctl(filp, cmd, arg);
41994
41995- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41996- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41997-
41998- if (fn != NULL)
41999- ret = (*fn) (filp, cmd, arg);
42000+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42001+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42002 else
42003 ret = drm_ioctl(filp, cmd, arg);
42004
42005diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42006index 244b19b..c19226d 100644
42007--- a/drivers/gpu/drm/radeon/radeon_irq.c
42008+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42009@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42010 unsigned int ret;
42011 RING_LOCALS;
42012
42013- atomic_inc(&dev_priv->swi_emitted);
42014- ret = atomic_read(&dev_priv->swi_emitted);
42015+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42016+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42017
42018 BEGIN_RING(4);
42019 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42020@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42021 drm_radeon_private_t *dev_priv =
42022 (drm_radeon_private_t *) dev->dev_private;
42023
42024- atomic_set(&dev_priv->swi_emitted, 0);
42025+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42026 init_waitqueue_head(&dev_priv->swi_queue);
42027
42028 dev->max_vblank_count = 0x001fffff;
42029diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42030index 15aee72..cda326e 100644
42031--- a/drivers/gpu/drm/radeon/radeon_state.c
42032+++ b/drivers/gpu/drm/radeon/radeon_state.c
42033@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42034 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42035 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42036
42037- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42038+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42039 sarea_priv->nbox * sizeof(depth_boxes[0])))
42040 return -EFAULT;
42041
42042@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42043 {
42044 drm_radeon_private_t *dev_priv = dev->dev_private;
42045 drm_radeon_getparam_t *param = data;
42046- int value;
42047+ int value = 0;
42048
42049 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42050
42051diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42052index edafd3c..3af7c9c 100644
42053--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42054+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42055@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42056 man->size = size >> PAGE_SHIFT;
42057 }
42058
42059-static struct vm_operations_struct radeon_ttm_vm_ops;
42060+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42061 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42062
42063 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42064@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42065 }
42066 if (unlikely(ttm_vm_ops == NULL)) {
42067 ttm_vm_ops = vma->vm_ops;
42068+ pax_open_kernel();
42069 radeon_ttm_vm_ops = *ttm_vm_ops;
42070 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42071+ pax_close_kernel();
42072 }
42073 vma->vm_ops = &radeon_ttm_vm_ops;
42074 return 0;
42075diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42076index a287e4f..df1d5dd 100644
42077--- a/drivers/gpu/drm/tegra/dc.c
42078+++ b/drivers/gpu/drm/tegra/dc.c
42079@@ -1594,7 +1594,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42080 }
42081
42082 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42083- dc->debugfs_files[i].data = dc;
42084+ *(void **)&dc->debugfs_files[i].data = dc;
42085
42086 err = drm_debugfs_create_files(dc->debugfs_files,
42087 ARRAY_SIZE(debugfs_files),
42088diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42089index ed970f6..4eeea42 100644
42090--- a/drivers/gpu/drm/tegra/dsi.c
42091+++ b/drivers/gpu/drm/tegra/dsi.c
42092@@ -62,7 +62,7 @@ struct tegra_dsi {
42093 struct clk *clk_lp;
42094 struct clk *clk;
42095
42096- struct drm_info_list *debugfs_files;
42097+ drm_info_list_no_const *debugfs_files;
42098 struct drm_minor *minor;
42099 struct dentry *debugfs;
42100
42101diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42102index 06ab178..b5324e4 100644
42103--- a/drivers/gpu/drm/tegra/hdmi.c
42104+++ b/drivers/gpu/drm/tegra/hdmi.c
42105@@ -64,7 +64,7 @@ struct tegra_hdmi {
42106 bool stereo;
42107 bool dvi;
42108
42109- struct drm_info_list *debugfs_files;
42110+ drm_info_list_no_const *debugfs_files;
42111 struct drm_minor *minor;
42112 struct dentry *debugfs;
42113 };
42114diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42115index aa0bd054..aea6a01 100644
42116--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42117+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42118@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42119 }
42120
42121 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42122- ttm_bo_man_init,
42123- ttm_bo_man_takedown,
42124- ttm_bo_man_get_node,
42125- ttm_bo_man_put_node,
42126- ttm_bo_man_debug
42127+ .init = ttm_bo_man_init,
42128+ .takedown = ttm_bo_man_takedown,
42129+ .get_node = ttm_bo_man_get_node,
42130+ .put_node = ttm_bo_man_put_node,
42131+ .debug = ttm_bo_man_debug
42132 };
42133 EXPORT_SYMBOL(ttm_bo_manager_func);
42134diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42135index a1803fb..c53f6b0 100644
42136--- a/drivers/gpu/drm/ttm/ttm_memory.c
42137+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42138@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42139 zone->glob = glob;
42140 glob->zone_kernel = zone;
42141 ret = kobject_init_and_add(
42142- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42143+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42144 if (unlikely(ret != 0)) {
42145 kobject_put(&zone->kobj);
42146 return ret;
42147@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42148 zone->glob = glob;
42149 glob->zone_dma32 = zone;
42150 ret = kobject_init_and_add(
42151- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42152+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42153 if (unlikely(ret != 0)) {
42154 kobject_put(&zone->kobj);
42155 return ret;
42156diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42157index 025c429..314062f 100644
42158--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42159+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42160@@ -54,7 +54,7 @@
42161
42162 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42163 #define SMALL_ALLOCATION 16
42164-#define FREE_ALL_PAGES (~0U)
42165+#define FREE_ALL_PAGES (~0UL)
42166 /* times are in msecs */
42167 #define PAGE_FREE_INTERVAL 1000
42168
42169@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42170 * @free_all: If set to true will free all pages in pool
42171 * @use_static: Safe to use static buffer
42172 **/
42173-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42174+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42175 bool use_static)
42176 {
42177 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42178 unsigned long irq_flags;
42179 struct page *p;
42180 struct page **pages_to_free;
42181- unsigned freed_pages = 0,
42182- npages_to_free = nr_free;
42183+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42184
42185 if (NUM_PAGES_TO_ALLOC < nr_free)
42186 npages_to_free = NUM_PAGES_TO_ALLOC;
42187@@ -371,7 +370,8 @@ restart:
42188 __list_del(&p->lru, &pool->list);
42189
42190 ttm_pool_update_free_locked(pool, freed_pages);
42191- nr_free -= freed_pages;
42192+ if (likely(nr_free != FREE_ALL_PAGES))
42193+ nr_free -= freed_pages;
42194 }
42195
42196 spin_unlock_irqrestore(&pool->lock, irq_flags);
42197@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42198 unsigned i;
42199 unsigned pool_offset;
42200 struct ttm_page_pool *pool;
42201- int shrink_pages = sc->nr_to_scan;
42202+ unsigned long shrink_pages = sc->nr_to_scan;
42203 unsigned long freed = 0;
42204
42205 if (!mutex_trylock(&lock))
42206@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42207 pool_offset = ++start_pool % NUM_POOLS;
42208 /* select start pool in round robin fashion */
42209 for (i = 0; i < NUM_POOLS; ++i) {
42210- unsigned nr_free = shrink_pages;
42211+ unsigned long nr_free = shrink_pages;
42212 if (shrink_pages == 0)
42213 break;
42214 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42215@@ -673,7 +673,7 @@ out:
42216 }
42217
42218 /* Put all pages in pages list to correct pool to wait for reuse */
42219-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42220+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42221 enum ttm_caching_state cstate)
42222 {
42223 unsigned long irq_flags;
42224@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42225 struct list_head plist;
42226 struct page *p = NULL;
42227 gfp_t gfp_flags = GFP_USER;
42228- unsigned count;
42229+ unsigned long count;
42230 int r;
42231
42232 /* set zero flag for page allocation if required */
42233diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42234index 01e1d27..aaa018a 100644
42235--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42236+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42237@@ -56,7 +56,7 @@
42238
42239 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42240 #define SMALL_ALLOCATION 4
42241-#define FREE_ALL_PAGES (~0U)
42242+#define FREE_ALL_PAGES (~0UL)
42243 /* times are in msecs */
42244 #define IS_UNDEFINED (0)
42245 #define IS_WC (1<<1)
42246@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42247 * @nr_free: If set to true will free all pages in pool
42248 * @use_static: Safe to use static buffer
42249 **/
42250-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42251+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42252 bool use_static)
42253 {
42254 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42255@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42256 struct dma_page *dma_p, *tmp;
42257 struct page **pages_to_free;
42258 struct list_head d_pages;
42259- unsigned freed_pages = 0,
42260- npages_to_free = nr_free;
42261+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42262
42263 if (NUM_PAGES_TO_ALLOC < nr_free)
42264 npages_to_free = NUM_PAGES_TO_ALLOC;
42265@@ -499,7 +498,8 @@ restart:
42266 /* remove range of pages from the pool */
42267 if (freed_pages) {
42268 ttm_pool_update_free_locked(pool, freed_pages);
42269- nr_free -= freed_pages;
42270+ if (likely(nr_free != FREE_ALL_PAGES))
42271+ nr_free -= freed_pages;
42272 }
42273
42274 spin_unlock_irqrestore(&pool->lock, irq_flags);
42275@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42276 struct dma_page *d_page, *next;
42277 enum pool_type type;
42278 bool is_cached = false;
42279- unsigned count = 0, i, npages = 0;
42280+ unsigned long count = 0, i, npages = 0;
42281 unsigned long irq_flags;
42282
42283 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42284@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42285 static unsigned start_pool;
42286 unsigned idx = 0;
42287 unsigned pool_offset;
42288- unsigned shrink_pages = sc->nr_to_scan;
42289+ unsigned long shrink_pages = sc->nr_to_scan;
42290 struct device_pools *p;
42291 unsigned long freed = 0;
42292
42293@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42294 goto out;
42295 pool_offset = ++start_pool % _manager->npools;
42296 list_for_each_entry(p, &_manager->pools, pools) {
42297- unsigned nr_free;
42298+ unsigned long nr_free;
42299
42300 if (!p->dev)
42301 continue;
42302@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42303 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42304 freed += nr_free - shrink_pages;
42305
42306- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42307+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42308 p->pool->dev_name, p->pool->name, current->pid,
42309 nr_free, shrink_pages);
42310 }
42311diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42312index 5fc16ce..1bd84ec 100644
42313--- a/drivers/gpu/drm/udl/udl_fb.c
42314+++ b/drivers/gpu/drm/udl/udl_fb.c
42315@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42316 fb_deferred_io_cleanup(info);
42317 kfree(info->fbdefio);
42318 info->fbdefio = NULL;
42319- info->fbops->fb_mmap = udl_fb_mmap;
42320 }
42321
42322 pr_warn("released /dev/fb%d user=%d count=%d\n",
42323diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42324index ef8c500..01030c8 100644
42325--- a/drivers/gpu/drm/via/via_drv.h
42326+++ b/drivers/gpu/drm/via/via_drv.h
42327@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42328 typedef uint32_t maskarray_t[5];
42329
42330 typedef struct drm_via_irq {
42331- atomic_t irq_received;
42332+ atomic_unchecked_t irq_received;
42333 uint32_t pending_mask;
42334 uint32_t enable_mask;
42335 wait_queue_head_t irq_queue;
42336@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42337 struct timeval last_vblank;
42338 int last_vblank_valid;
42339 unsigned usec_per_vblank;
42340- atomic_t vbl_received;
42341+ atomic_unchecked_t vbl_received;
42342 drm_via_state_t hc_state;
42343 char pci_buf[VIA_PCI_BUF_SIZE];
42344 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42345diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42346index 1319433..a993b0c 100644
42347--- a/drivers/gpu/drm/via/via_irq.c
42348+++ b/drivers/gpu/drm/via/via_irq.c
42349@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42350 if (crtc != 0)
42351 return 0;
42352
42353- return atomic_read(&dev_priv->vbl_received);
42354+ return atomic_read_unchecked(&dev_priv->vbl_received);
42355 }
42356
42357 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42358@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42359
42360 status = VIA_READ(VIA_REG_INTERRUPT);
42361 if (status & VIA_IRQ_VBLANK_PENDING) {
42362- atomic_inc(&dev_priv->vbl_received);
42363- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42364+ atomic_inc_unchecked(&dev_priv->vbl_received);
42365+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42366 do_gettimeofday(&cur_vblank);
42367 if (dev_priv->last_vblank_valid) {
42368 dev_priv->usec_per_vblank =
42369@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42370 dev_priv->last_vblank = cur_vblank;
42371 dev_priv->last_vblank_valid = 1;
42372 }
42373- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42374+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42375 DRM_DEBUG("US per vblank is: %u\n",
42376 dev_priv->usec_per_vblank);
42377 }
42378@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42379
42380 for (i = 0; i < dev_priv->num_irqs; ++i) {
42381 if (status & cur_irq->pending_mask) {
42382- atomic_inc(&cur_irq->irq_received);
42383+ atomic_inc_unchecked(&cur_irq->irq_received);
42384 wake_up(&cur_irq->irq_queue);
42385 handled = 1;
42386 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42387@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42388 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42389 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42390 masks[irq][4]));
42391- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42392+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42393 } else {
42394 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42395 (((cur_irq_sequence =
42396- atomic_read(&cur_irq->irq_received)) -
42397+ atomic_read_unchecked(&cur_irq->irq_received)) -
42398 *sequence) <= (1 << 23)));
42399 }
42400 *sequence = cur_irq_sequence;
42401@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42402 }
42403
42404 for (i = 0; i < dev_priv->num_irqs; ++i) {
42405- atomic_set(&cur_irq->irq_received, 0);
42406+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42407 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42408 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42409 init_waitqueue_head(&cur_irq->irq_queue);
42410@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42411 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42412 case VIA_IRQ_RELATIVE:
42413 irqwait->request.sequence +=
42414- atomic_read(&cur_irq->irq_received);
42415+ atomic_read_unchecked(&cur_irq->irq_received);
42416 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42417 case VIA_IRQ_ABSOLUTE:
42418 break;
42419diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42420index d26a6da..5fa41ed 100644
42421--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42422+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42423@@ -447,7 +447,7 @@ struct vmw_private {
42424 * Fencing and IRQs.
42425 */
42426
42427- atomic_t marker_seq;
42428+ atomic_unchecked_t marker_seq;
42429 wait_queue_head_t fence_queue;
42430 wait_queue_head_t fifo_queue;
42431 spinlock_t waiter_lock;
42432diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42433index 39f2b03..d1b0a64 100644
42434--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42435+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42436@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42437 (unsigned int) min,
42438 (unsigned int) fifo->capabilities);
42439
42440- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42441+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42442 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42443 vmw_marker_queue_init(&fifo->marker_queue);
42444 return vmw_fifo_send_fence(dev_priv, &dummy);
42445@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42446 if (reserveable)
42447 iowrite32(bytes, fifo_mem +
42448 SVGA_FIFO_RESERVED);
42449- return fifo_mem + (next_cmd >> 2);
42450+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42451 } else {
42452 need_bounce = true;
42453 }
42454@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42455
42456 fm = vmw_fifo_reserve(dev_priv, bytes);
42457 if (unlikely(fm == NULL)) {
42458- *seqno = atomic_read(&dev_priv->marker_seq);
42459+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42460 ret = -ENOMEM;
42461 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42462 false, 3*HZ);
42463@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42464 }
42465
42466 do {
42467- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42468+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42469 } while (*seqno == 0);
42470
42471 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42472diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42473index 170b61b..fec7348 100644
42474--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42475+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42476@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42477 }
42478
42479 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42480- vmw_gmrid_man_init,
42481- vmw_gmrid_man_takedown,
42482- vmw_gmrid_man_get_node,
42483- vmw_gmrid_man_put_node,
42484- vmw_gmrid_man_debug
42485+ .init = vmw_gmrid_man_init,
42486+ .takedown = vmw_gmrid_man_takedown,
42487+ .get_node = vmw_gmrid_man_get_node,
42488+ .put_node = vmw_gmrid_man_put_node,
42489+ .debug = vmw_gmrid_man_debug
42490 };
42491diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42492index 69c8ce2..cacb0ab 100644
42493--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42494+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42495@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42496 int ret;
42497
42498 num_clips = arg->num_clips;
42499- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42500+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42501
42502 if (unlikely(num_clips == 0))
42503 return 0;
42504@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42505 int ret;
42506
42507 num_clips = arg->num_clips;
42508- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42509+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42510
42511 if (unlikely(num_clips == 0))
42512 return 0;
42513diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42514index 9fe9827..0aa2fc0 100644
42515--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42516+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42517@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42518 * emitted. Then the fence is stale and signaled.
42519 */
42520
42521- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42522+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42523 > VMW_FENCE_WRAP);
42524
42525 return ret;
42526@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42527
42528 if (fifo_idle)
42529 down_read(&fifo_state->rwsem);
42530- signal_seq = atomic_read(&dev_priv->marker_seq);
42531+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42532 ret = 0;
42533
42534 for (;;) {
42535diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42536index efd1ffd..0ae13ca 100644
42537--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42538+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42539@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42540 while (!vmw_lag_lt(queue, us)) {
42541 spin_lock(&queue->lock);
42542 if (list_empty(&queue->head))
42543- seqno = atomic_read(&dev_priv->marker_seq);
42544+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42545 else {
42546 marker = list_first_entry(&queue->head,
42547 struct vmw_marker, head);
42548diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42549index 37ac7b5..d52a5c9 100644
42550--- a/drivers/gpu/vga/vga_switcheroo.c
42551+++ b/drivers/gpu/vga/vga_switcheroo.c
42552@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42553
42554 /* this version is for the case where the power switch is separate
42555 to the device being powered down. */
42556-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42557+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42558 {
42559 /* copy over all the bus versions */
42560 if (dev->bus && dev->bus->pm) {
42561@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42562 return ret;
42563 }
42564
42565-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42566+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42567 {
42568 /* copy over all the bus versions */
42569 if (dev->bus && dev->bus->pm) {
42570diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42571index 722a925..594c312 100644
42572--- a/drivers/hid/hid-core.c
42573+++ b/drivers/hid/hid-core.c
42574@@ -2552,7 +2552,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42575
42576 int hid_add_device(struct hid_device *hdev)
42577 {
42578- static atomic_t id = ATOMIC_INIT(0);
42579+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42580 int ret;
42581
42582 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42583@@ -2595,7 +2595,7 @@ int hid_add_device(struct hid_device *hdev)
42584 /* XXX hack, any other cleaner solution after the driver core
42585 * is converted to allow more than 20 bytes as the device name? */
42586 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42587- hdev->vendor, hdev->product, atomic_inc_return(&id));
42588+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42589
42590 hid_debug_register(hdev, dev_name(&hdev->dev));
42591 ret = device_add(&hdev->dev);
42592diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
42593index 5614fee..8301fbf 100644
42594--- a/drivers/hid/hid-sensor-custom.c
42595+++ b/drivers/hid/hid-sensor-custom.c
42596@@ -34,7 +34,7 @@ struct hid_sensor_custom_field {
42597 int report_id;
42598 char group_name[HID_CUSTOM_NAME_LENGTH];
42599 struct hid_sensor_hub_attribute_info attribute;
42600- struct device_attribute sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42601+ device_attribute_no_const sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42602 char attr_name[HID_CUSTOM_TOTAL_ATTRS][HID_CUSTOM_NAME_LENGTH];
42603 struct attribute *attrs[HID_CUSTOM_TOTAL_ATTRS];
42604 struct attribute_group hid_custom_attribute_group;
42605@@ -590,7 +590,7 @@ static int hid_sensor_custom_add_attributes(struct hid_sensor_custom
42606 j = 0;
42607 while (j < HID_CUSTOM_TOTAL_ATTRS &&
42608 hid_custom_attrs[j].name) {
42609- struct device_attribute *device_attr;
42610+ device_attribute_no_const *device_attr;
42611
42612 device_attr = &sensor_inst->fields[i].sd_attrs[j];
42613
42614diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42615index c13fb5b..55a3802 100644
42616--- a/drivers/hid/hid-wiimote-debug.c
42617+++ b/drivers/hid/hid-wiimote-debug.c
42618@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42619 else if (size == 0)
42620 return -EIO;
42621
42622- if (copy_to_user(u, buf, size))
42623+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42624 return -EFAULT;
42625
42626 *off += size;
42627diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42628index 54da66d..aa3a3d7 100644
42629--- a/drivers/hv/channel.c
42630+++ b/drivers/hv/channel.c
42631@@ -373,7 +373,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42632 int ret = 0;
42633
42634 next_gpadl_handle =
42635- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42636+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42637
42638 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42639 if (ret)
42640diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42641index d3943bc..3de28a9 100644
42642--- a/drivers/hv/hv.c
42643+++ b/drivers/hv/hv.c
42644@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42645 u64 output_address = (output) ? virt_to_phys(output) : 0;
42646 u32 output_address_hi = output_address >> 32;
42647 u32 output_address_lo = output_address & 0xFFFFFFFF;
42648- void *hypercall_page = hv_context.hypercall_page;
42649+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42650
42651 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42652 "=a"(hv_status_lo) : "d" (control_hi),
42653@@ -164,7 +164,7 @@ int hv_init(void)
42654 /* See if the hypercall page is already set */
42655 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42656
42657- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42658+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42659
42660 if (!virtaddr)
42661 goto cleanup;
42662diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42663index cb5b7dc..6052f22 100644
42664--- a/drivers/hv/hv_balloon.c
42665+++ b/drivers/hv/hv_balloon.c
42666@@ -469,7 +469,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42667
42668 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42669 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42670-static atomic_t trans_id = ATOMIC_INIT(0);
42671+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42672
42673 static int dm_ring_size = (5 * PAGE_SIZE);
42674
42675@@ -941,7 +941,7 @@ static void hot_add_req(struct work_struct *dummy)
42676 pr_info("Memory hot add failed\n");
42677
42678 dm->state = DM_INITIALIZED;
42679- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42680+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42681 vmbus_sendpacket(dm->dev->channel, &resp,
42682 sizeof(struct dm_hot_add_response),
42683 (unsigned long)NULL,
42684@@ -1022,7 +1022,7 @@ static void post_status(struct hv_dynmem_device *dm)
42685 memset(&status, 0, sizeof(struct dm_status));
42686 status.hdr.type = DM_STATUS_REPORT;
42687 status.hdr.size = sizeof(struct dm_status);
42688- status.hdr.trans_id = atomic_inc_return(&trans_id);
42689+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42690
42691 /*
42692 * The host expects the guest to report free and committed memory.
42693@@ -1046,7 +1046,7 @@ static void post_status(struct hv_dynmem_device *dm)
42694 * send the status. This can happen if we were interrupted
42695 * after we picked our transaction ID.
42696 */
42697- if (status.hdr.trans_id != atomic_read(&trans_id))
42698+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42699 return;
42700
42701 /*
42702@@ -1191,7 +1191,7 @@ static void balloon_up(struct work_struct *dummy)
42703 */
42704
42705 do {
42706- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42707+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42708 ret = vmbus_sendpacket(dm_device.dev->channel,
42709 bl_resp,
42710 bl_resp->hdr.size,
42711@@ -1237,7 +1237,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42712
42713 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42714 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42715- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42716+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42717 resp.hdr.size = sizeof(struct dm_unballoon_response);
42718
42719 vmbus_sendpacket(dm_device.dev->channel, &resp,
42720@@ -1298,7 +1298,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42721 memset(&version_req, 0, sizeof(struct dm_version_request));
42722 version_req.hdr.type = DM_VERSION_REQUEST;
42723 version_req.hdr.size = sizeof(struct dm_version_request);
42724- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42725+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42726 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42727 version_req.is_last_attempt = 1;
42728
42729@@ -1471,7 +1471,7 @@ static int balloon_probe(struct hv_device *dev,
42730 memset(&version_req, 0, sizeof(struct dm_version_request));
42731 version_req.hdr.type = DM_VERSION_REQUEST;
42732 version_req.hdr.size = sizeof(struct dm_version_request);
42733- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42734+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42735 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42736 version_req.is_last_attempt = 0;
42737
42738@@ -1502,7 +1502,7 @@ static int balloon_probe(struct hv_device *dev,
42739 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42740 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42741 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42742- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42743+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42744
42745 cap_msg.caps.cap_bits.balloon = 1;
42746 cap_msg.caps.cap_bits.hot_add = 1;
42747diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42748index 887287a..238a626 100644
42749--- a/drivers/hv/hyperv_vmbus.h
42750+++ b/drivers/hv/hyperv_vmbus.h
42751@@ -645,7 +645,7 @@ enum vmbus_connect_state {
42752 struct vmbus_connection {
42753 enum vmbus_connect_state conn_state;
42754
42755- atomic_t next_gpadl_handle;
42756+ atomic_unchecked_t next_gpadl_handle;
42757
42758 /*
42759 * Represents channel interrupts. Each bit position represents a
42760diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42761index 579bdf9..0dac21d5 100644
42762--- a/drivers/hwmon/acpi_power_meter.c
42763+++ b/drivers/hwmon/acpi_power_meter.c
42764@@ -116,7 +116,7 @@ struct sensor_template {
42765 struct device_attribute *devattr,
42766 const char *buf, size_t count);
42767 int index;
42768-};
42769+} __do_const;
42770
42771 /* Averaging interval */
42772 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42773@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42774 struct sensor_template *attrs)
42775 {
42776 struct device *dev = &resource->acpi_dev->dev;
42777- struct sensor_device_attribute *sensors =
42778+ sensor_device_attribute_no_const *sensors =
42779 &resource->sensors[resource->num_sensors];
42780 int res = 0;
42781
42782@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42783 return 0;
42784 }
42785
42786-static struct dmi_system_id __initdata pm_dmi_table[] = {
42787+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42788 {
42789 enable_cap_knobs, "IBM Active Energy Manager",
42790 {
42791diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42792index 0af63da..05a183a 100644
42793--- a/drivers/hwmon/applesmc.c
42794+++ b/drivers/hwmon/applesmc.c
42795@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42796 {
42797 struct applesmc_node_group *grp;
42798 struct applesmc_dev_attr *node;
42799- struct attribute *attr;
42800+ attribute_no_const *attr;
42801 int ret, i;
42802
42803 for (grp = groups; grp->format; grp++) {
42804diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42805index cccef87..06ce8ec 100644
42806--- a/drivers/hwmon/asus_atk0110.c
42807+++ b/drivers/hwmon/asus_atk0110.c
42808@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42809 struct atk_sensor_data {
42810 struct list_head list;
42811 struct atk_data *data;
42812- struct device_attribute label_attr;
42813- struct device_attribute input_attr;
42814- struct device_attribute limit1_attr;
42815- struct device_attribute limit2_attr;
42816+ device_attribute_no_const label_attr;
42817+ device_attribute_no_const input_attr;
42818+ device_attribute_no_const limit1_attr;
42819+ device_attribute_no_const limit2_attr;
42820 char label_attr_name[ATTR_NAME_SIZE];
42821 char input_attr_name[ATTR_NAME_SIZE];
42822 char limit1_attr_name[ATTR_NAME_SIZE];
42823@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42824 static struct device_attribute atk_name_attr =
42825 __ATTR(name, 0444, atk_name_show, NULL);
42826
42827-static void atk_init_attribute(struct device_attribute *attr, char *name,
42828+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42829 sysfs_show_func show)
42830 {
42831 sysfs_attr_init(&attr->attr);
42832diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42833index ed303ba..e24bd26f 100644
42834--- a/drivers/hwmon/coretemp.c
42835+++ b/drivers/hwmon/coretemp.c
42836@@ -782,7 +782,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42837 return NOTIFY_OK;
42838 }
42839
42840-static struct notifier_block coretemp_cpu_notifier __refdata = {
42841+static struct notifier_block coretemp_cpu_notifier = {
42842 .notifier_call = coretemp_cpu_callback,
42843 };
42844
42845diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42846index 7a8a6fb..015c1fd 100644
42847--- a/drivers/hwmon/ibmaem.c
42848+++ b/drivers/hwmon/ibmaem.c
42849@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42850 struct aem_rw_sensor_template *rw)
42851 {
42852 struct device *dev = &data->pdev->dev;
42853- struct sensor_device_attribute *sensors = data->sensors;
42854+ sensor_device_attribute_no_const *sensors = data->sensors;
42855 int err;
42856
42857 /* Set up read-only sensors */
42858diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42859index 17ae2eb..21b71dd 100644
42860--- a/drivers/hwmon/iio_hwmon.c
42861+++ b/drivers/hwmon/iio_hwmon.c
42862@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42863 {
42864 struct device *dev = &pdev->dev;
42865 struct iio_hwmon_state *st;
42866- struct sensor_device_attribute *a;
42867+ sensor_device_attribute_no_const *a;
42868 int ret, i;
42869 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42870 enum iio_chan_type type;
42871diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42872index 37f0170..414ec2c 100644
42873--- a/drivers/hwmon/nct6683.c
42874+++ b/drivers/hwmon/nct6683.c
42875@@ -397,11 +397,11 @@ static struct attribute_group *
42876 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42877 int repeat)
42878 {
42879- struct sensor_device_attribute_2 *a2;
42880- struct sensor_device_attribute *a;
42881+ sensor_device_attribute_2_no_const *a2;
42882+ sensor_device_attribute_no_const *a;
42883 struct sensor_device_template **t;
42884 struct sensor_device_attr_u *su;
42885- struct attribute_group *group;
42886+ attribute_group_no_const *group;
42887 struct attribute **attrs;
42888 int i, j, count;
42889
42890diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42891index bd1c99d..2fa55ad 100644
42892--- a/drivers/hwmon/nct6775.c
42893+++ b/drivers/hwmon/nct6775.c
42894@@ -953,10 +953,10 @@ static struct attribute_group *
42895 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42896 int repeat)
42897 {
42898- struct attribute_group *group;
42899+ attribute_group_no_const *group;
42900 struct sensor_device_attr_u *su;
42901- struct sensor_device_attribute *a;
42902- struct sensor_device_attribute_2 *a2;
42903+ sensor_device_attribute_no_const *a;
42904+ sensor_device_attribute_2_no_const *a2;
42905 struct attribute **attrs;
42906 struct sensor_device_template **t;
42907 int i, count;
42908diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42909index f2e47c7..45d7941 100644
42910--- a/drivers/hwmon/pmbus/pmbus_core.c
42911+++ b/drivers/hwmon/pmbus/pmbus_core.c
42912@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42913 return 0;
42914 }
42915
42916-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42917+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42918 const char *name,
42919 umode_t mode,
42920 ssize_t (*show)(struct device *dev,
42921@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42922 dev_attr->store = store;
42923 }
42924
42925-static void pmbus_attr_init(struct sensor_device_attribute *a,
42926+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42927 const char *name,
42928 umode_t mode,
42929 ssize_t (*show)(struct device *dev,
42930@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42931 u16 reg, u8 mask)
42932 {
42933 struct pmbus_boolean *boolean;
42934- struct sensor_device_attribute *a;
42935+ sensor_device_attribute_no_const *a;
42936
42937 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42938 if (!boolean)
42939@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42940 bool update, bool readonly)
42941 {
42942 struct pmbus_sensor *sensor;
42943- struct device_attribute *a;
42944+ device_attribute_no_const *a;
42945
42946 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42947 if (!sensor)
42948@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42949 const char *lstring, int index)
42950 {
42951 struct pmbus_label *label;
42952- struct device_attribute *a;
42953+ device_attribute_no_const *a;
42954
42955 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42956 if (!label)
42957diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42958index d4f0935..7420593 100644
42959--- a/drivers/hwmon/sht15.c
42960+++ b/drivers/hwmon/sht15.c
42961@@ -169,7 +169,7 @@ struct sht15_data {
42962 int supply_uv;
42963 bool supply_uv_valid;
42964 struct work_struct update_supply_work;
42965- atomic_t interrupt_handled;
42966+ atomic_unchecked_t interrupt_handled;
42967 };
42968
42969 /**
42970@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42971 ret = gpio_direction_input(data->pdata->gpio_data);
42972 if (ret)
42973 return ret;
42974- atomic_set(&data->interrupt_handled, 0);
42975+ atomic_set_unchecked(&data->interrupt_handled, 0);
42976
42977 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42978 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42979 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42980 /* Only relevant if the interrupt hasn't occurred. */
42981- if (!atomic_read(&data->interrupt_handled))
42982+ if (!atomic_read_unchecked(&data->interrupt_handled))
42983 schedule_work(&data->read_work);
42984 }
42985 ret = wait_event_timeout(data->wait_queue,
42986@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42987
42988 /* First disable the interrupt */
42989 disable_irq_nosync(irq);
42990- atomic_inc(&data->interrupt_handled);
42991+ atomic_inc_unchecked(&data->interrupt_handled);
42992 /* Then schedule a reading work struct */
42993 if (data->state != SHT15_READING_NOTHING)
42994 schedule_work(&data->read_work);
42995@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42996 * If not, then start the interrupt again - care here as could
42997 * have gone low in meantime so verify it hasn't!
42998 */
42999- atomic_set(&data->interrupt_handled, 0);
43000+ atomic_set_unchecked(&data->interrupt_handled, 0);
43001 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43002 /* If still not occurred or another handler was scheduled */
43003 if (gpio_get_value(data->pdata->gpio_data)
43004- || atomic_read(&data->interrupt_handled))
43005+ || atomic_read_unchecked(&data->interrupt_handled))
43006 return;
43007 }
43008
43009diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43010index ac91c07..8e69663 100644
43011--- a/drivers/hwmon/via-cputemp.c
43012+++ b/drivers/hwmon/via-cputemp.c
43013@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43014 return NOTIFY_OK;
43015 }
43016
43017-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43018+static struct notifier_block via_cputemp_cpu_notifier = {
43019 .notifier_call = via_cputemp_cpu_callback,
43020 };
43021
43022diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43023index 65e3240..e6c511d 100644
43024--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43025+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43026@@ -39,7 +39,7 @@
43027 extern struct i2c_adapter amd756_smbus;
43028
43029 static struct i2c_adapter *s4882_adapter;
43030-static struct i2c_algorithm *s4882_algo;
43031+static i2c_algorithm_no_const *s4882_algo;
43032
43033 /* Wrapper access functions for multiplexed SMBus */
43034 static DEFINE_MUTEX(amd756_lock);
43035diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43036index b19a310..d6eece0 100644
43037--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43038+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43039@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43040 /* usb layer */
43041
43042 /* Send command to device, and get response. */
43043-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43044+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43045 {
43046 int ret = 0;
43047 int actual;
43048diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43049index 88eda09..cf40434 100644
43050--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43051+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43052@@ -37,7 +37,7 @@
43053 extern struct i2c_adapter *nforce2_smbus;
43054
43055 static struct i2c_adapter *s4985_adapter;
43056-static struct i2c_algorithm *s4985_algo;
43057+static i2c_algorithm_no_const *s4985_algo;
43058
43059 /* Wrapper access functions for multiplexed SMBus */
43060 static DEFINE_MUTEX(nforce2_lock);
43061diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43062index 71c7a39..71dd3e0 100644
43063--- a/drivers/i2c/i2c-dev.c
43064+++ b/drivers/i2c/i2c-dev.c
43065@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43066 break;
43067 }
43068
43069- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43070+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43071 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43072 if (IS_ERR(rdwr_pa[i].buf)) {
43073 res = PTR_ERR(rdwr_pa[i].buf);
43074diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43075index 0b510ba..4fbb5085 100644
43076--- a/drivers/ide/ide-cd.c
43077+++ b/drivers/ide/ide-cd.c
43078@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43079 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43080 if ((unsigned long)buf & alignment
43081 || blk_rq_bytes(rq) & q->dma_pad_mask
43082- || object_is_on_stack(buf))
43083+ || object_starts_on_stack(buf))
43084 drive->dma = 0;
43085 }
43086 }
43087diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43088index 4df97f6..c751151 100644
43089--- a/drivers/iio/industrialio-core.c
43090+++ b/drivers/iio/industrialio-core.c
43091@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43092 }
43093
43094 static
43095-int __iio_device_attr_init(struct device_attribute *dev_attr,
43096+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43097 const char *postfix,
43098 struct iio_chan_spec const *chan,
43099 ssize_t (*readfunc)(struct device *dev,
43100diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43101index 0271608..81998c5 100644
43102--- a/drivers/infiniband/core/cm.c
43103+++ b/drivers/infiniband/core/cm.c
43104@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43105
43106 struct cm_counter_group {
43107 struct kobject obj;
43108- atomic_long_t counter[CM_ATTR_COUNT];
43109+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43110 };
43111
43112 struct cm_counter_attribute {
43113@@ -1397,7 +1397,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43114 struct ib_mad_send_buf *msg = NULL;
43115 int ret;
43116
43117- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43118+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43119 counter[CM_REQ_COUNTER]);
43120
43121 /* Quick state check to discard duplicate REQs. */
43122@@ -1784,7 +1784,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43123 if (!cm_id_priv)
43124 return;
43125
43126- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43127+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43128 counter[CM_REP_COUNTER]);
43129 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43130 if (ret)
43131@@ -1951,7 +1951,7 @@ static int cm_rtu_handler(struct cm_work *work)
43132 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43133 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43134 spin_unlock_irq(&cm_id_priv->lock);
43135- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43136+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43137 counter[CM_RTU_COUNTER]);
43138 goto out;
43139 }
43140@@ -2134,7 +2134,7 @@ static int cm_dreq_handler(struct cm_work *work)
43141 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43142 dreq_msg->local_comm_id);
43143 if (!cm_id_priv) {
43144- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43145+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43146 counter[CM_DREQ_COUNTER]);
43147 cm_issue_drep(work->port, work->mad_recv_wc);
43148 return -EINVAL;
43149@@ -2159,7 +2159,7 @@ static int cm_dreq_handler(struct cm_work *work)
43150 case IB_CM_MRA_REP_RCVD:
43151 break;
43152 case IB_CM_TIMEWAIT:
43153- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43154+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43155 counter[CM_DREQ_COUNTER]);
43156 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43157 goto unlock;
43158@@ -2173,7 +2173,7 @@ static int cm_dreq_handler(struct cm_work *work)
43159 cm_free_msg(msg);
43160 goto deref;
43161 case IB_CM_DREQ_RCVD:
43162- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43163+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43164 counter[CM_DREQ_COUNTER]);
43165 goto unlock;
43166 default:
43167@@ -2540,7 +2540,7 @@ static int cm_mra_handler(struct cm_work *work)
43168 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43169 cm_id_priv->msg, timeout)) {
43170 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43171- atomic_long_inc(&work->port->
43172+ atomic_long_inc_unchecked(&work->port->
43173 counter_group[CM_RECV_DUPLICATES].
43174 counter[CM_MRA_COUNTER]);
43175 goto out;
43176@@ -2549,7 +2549,7 @@ static int cm_mra_handler(struct cm_work *work)
43177 break;
43178 case IB_CM_MRA_REQ_RCVD:
43179 case IB_CM_MRA_REP_RCVD:
43180- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43181+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43182 counter[CM_MRA_COUNTER]);
43183 /* fall through */
43184 default:
43185@@ -2711,7 +2711,7 @@ static int cm_lap_handler(struct cm_work *work)
43186 case IB_CM_LAP_IDLE:
43187 break;
43188 case IB_CM_MRA_LAP_SENT:
43189- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43190+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43191 counter[CM_LAP_COUNTER]);
43192 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43193 goto unlock;
43194@@ -2727,7 +2727,7 @@ static int cm_lap_handler(struct cm_work *work)
43195 cm_free_msg(msg);
43196 goto deref;
43197 case IB_CM_LAP_RCVD:
43198- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43199+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43200 counter[CM_LAP_COUNTER]);
43201 goto unlock;
43202 default:
43203@@ -3011,7 +3011,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43204 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43205 if (cur_cm_id_priv) {
43206 spin_unlock_irq(&cm.lock);
43207- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43208+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43209 counter[CM_SIDR_REQ_COUNTER]);
43210 goto out; /* Duplicate message. */
43211 }
43212@@ -3223,10 +3223,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43213 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43214 msg->retries = 1;
43215
43216- atomic_long_add(1 + msg->retries,
43217+ atomic_long_add_unchecked(1 + msg->retries,
43218 &port->counter_group[CM_XMIT].counter[attr_index]);
43219 if (msg->retries)
43220- atomic_long_add(msg->retries,
43221+ atomic_long_add_unchecked(msg->retries,
43222 &port->counter_group[CM_XMIT_RETRIES].
43223 counter[attr_index]);
43224
43225@@ -3436,7 +3436,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43226 }
43227
43228 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43229- atomic_long_inc(&port->counter_group[CM_RECV].
43230+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43231 counter[attr_id - CM_ATTR_ID_OFFSET]);
43232
43233 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43234@@ -3667,7 +3667,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43235 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43236
43237 return sprintf(buf, "%ld\n",
43238- atomic_long_read(&group->counter[cm_attr->index]));
43239+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43240 }
43241
43242 static const struct sysfs_ops cm_counter_ops = {
43243diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43244index 9f5ad7c..588cd84 100644
43245--- a/drivers/infiniband/core/fmr_pool.c
43246+++ b/drivers/infiniband/core/fmr_pool.c
43247@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43248
43249 struct task_struct *thread;
43250
43251- atomic_t req_ser;
43252- atomic_t flush_ser;
43253+ atomic_unchecked_t req_ser;
43254+ atomic_unchecked_t flush_ser;
43255
43256 wait_queue_head_t force_wait;
43257 };
43258@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43259 struct ib_fmr_pool *pool = pool_ptr;
43260
43261 do {
43262- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43263+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43264 ib_fmr_batch_release(pool);
43265
43266- atomic_inc(&pool->flush_ser);
43267+ atomic_inc_unchecked(&pool->flush_ser);
43268 wake_up_interruptible(&pool->force_wait);
43269
43270 if (pool->flush_function)
43271@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43272 }
43273
43274 set_current_state(TASK_INTERRUPTIBLE);
43275- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43276+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43277 !kthread_should_stop())
43278 schedule();
43279 __set_current_state(TASK_RUNNING);
43280@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43281 pool->dirty_watermark = params->dirty_watermark;
43282 pool->dirty_len = 0;
43283 spin_lock_init(&pool->pool_lock);
43284- atomic_set(&pool->req_ser, 0);
43285- atomic_set(&pool->flush_ser, 0);
43286+ atomic_set_unchecked(&pool->req_ser, 0);
43287+ atomic_set_unchecked(&pool->flush_ser, 0);
43288 init_waitqueue_head(&pool->force_wait);
43289
43290 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43291@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43292 }
43293 spin_unlock_irq(&pool->pool_lock);
43294
43295- serial = atomic_inc_return(&pool->req_ser);
43296+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43297 wake_up_process(pool->thread);
43298
43299 if (wait_event_interruptible(pool->force_wait,
43300- atomic_read(&pool->flush_ser) - serial >= 0))
43301+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43302 return -EINTR;
43303
43304 return 0;
43305@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43306 } else {
43307 list_add_tail(&fmr->list, &pool->dirty_list);
43308 if (++pool->dirty_len >= pool->dirty_watermark) {
43309- atomic_inc(&pool->req_ser);
43310+ atomic_inc_unchecked(&pool->req_ser);
43311 wake_up_process(pool->thread);
43312 }
43313 }
43314diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43315index a9f0489..27a161b 100644
43316--- a/drivers/infiniband/core/uverbs_cmd.c
43317+++ b/drivers/infiniband/core/uverbs_cmd.c
43318@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43319 if (copy_from_user(&cmd, buf, sizeof cmd))
43320 return -EFAULT;
43321
43322+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43323+ return -EFAULT;
43324+
43325 INIT_UDATA(&udata, buf + sizeof cmd,
43326 (unsigned long) cmd.response + sizeof resp,
43327 in_len - sizeof cmd, out_len - sizeof resp);
43328diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43329index cff815b..75576dd 100644
43330--- a/drivers/infiniband/hw/cxgb4/mem.c
43331+++ b/drivers/infiniband/hw/cxgb4/mem.c
43332@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43333 int err;
43334 struct fw_ri_tpte tpt;
43335 u32 stag_idx;
43336- static atomic_t key;
43337+ static atomic_unchecked_t key;
43338
43339 if (c4iw_fatal_error(rdev))
43340 return -EIO;
43341@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43342 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43343 rdev->stats.stag.max = rdev->stats.stag.cur;
43344 mutex_unlock(&rdev->stats.lock);
43345- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43346+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43347 }
43348 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43349 __func__, stag_state, type, pdid, stag_idx);
43350diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43351index 79b3dbc..96e5fcc 100644
43352--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43353+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43354@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43355 struct ib_atomic_eth *ateth;
43356 struct ipath_ack_entry *e;
43357 u64 vaddr;
43358- atomic64_t *maddr;
43359+ atomic64_unchecked_t *maddr;
43360 u64 sdata;
43361 u32 rkey;
43362 u8 next;
43363@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43364 IB_ACCESS_REMOTE_ATOMIC)))
43365 goto nack_acc_unlck;
43366 /* Perform atomic OP and save result. */
43367- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43368+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43369 sdata = be64_to_cpu(ateth->swap_data);
43370 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43371 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43372- (u64) atomic64_add_return(sdata, maddr) - sdata :
43373+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43374 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43375 be64_to_cpu(ateth->compare_data),
43376 sdata);
43377diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43378index 1f95bba..9530f87 100644
43379--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43380+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43381@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43382 unsigned long flags;
43383 struct ib_wc wc;
43384 u64 sdata;
43385- atomic64_t *maddr;
43386+ atomic64_unchecked_t *maddr;
43387 enum ib_wc_status send_status;
43388
43389 /*
43390@@ -382,11 +382,11 @@ again:
43391 IB_ACCESS_REMOTE_ATOMIC)))
43392 goto acc_err;
43393 /* Perform atomic OP and save result. */
43394- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43395+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43396 sdata = wqe->wr.wr.atomic.compare_add;
43397 *(u64 *) sqp->s_sge.sge.vaddr =
43398 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43399- (u64) atomic64_add_return(sdata, maddr) - sdata :
43400+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43401 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43402 sdata, wqe->wr.wr.atomic.swap);
43403 goto send_comp;
43404diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43405index 9cd2b00..7486df4 100644
43406--- a/drivers/infiniband/hw/mlx4/mad.c
43407+++ b/drivers/infiniband/hw/mlx4/mad.c
43408@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43409
43410 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43411 {
43412- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43413+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43414 cpu_to_be64(0xff00000000000000LL);
43415 }
43416
43417diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43418index ed327e6..ca1739e0 100644
43419--- a/drivers/infiniband/hw/mlx4/mcg.c
43420+++ b/drivers/infiniband/hw/mlx4/mcg.c
43421@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43422 {
43423 char name[20];
43424
43425- atomic_set(&ctx->tid, 0);
43426+ atomic_set_unchecked(&ctx->tid, 0);
43427 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43428 ctx->mcg_wq = create_singlethread_workqueue(name);
43429 if (!ctx->mcg_wq)
43430diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43431index fce39343..9d8fdff 100644
43432--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43433+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43434@@ -435,7 +435,7 @@ struct mlx4_ib_demux_ctx {
43435 struct list_head mcg_mgid0_list;
43436 struct workqueue_struct *mcg_wq;
43437 struct mlx4_ib_demux_pv_ctx **tun;
43438- atomic_t tid;
43439+ atomic_unchecked_t tid;
43440 int flushing; /* flushing the work queue */
43441 };
43442
43443diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43444index 9d3e5c1..6f166df 100644
43445--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43446+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43447@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43448 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43449 }
43450
43451-int mthca_QUERY_FW(struct mthca_dev *dev)
43452+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43453 {
43454 struct mthca_mailbox *mailbox;
43455 u32 *outbox;
43456@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43457 CMD_TIME_CLASS_B);
43458 }
43459
43460-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43461+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43462 int num_mtt)
43463 {
43464 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43465@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43466 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43467 }
43468
43469-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43470+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43471 int eq_num)
43472 {
43473 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43474@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43475 CMD_TIME_CLASS_B);
43476 }
43477
43478-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43479+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43480 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43481 void *in_mad, void *response_mad)
43482 {
43483diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43484index ded76c1..0cf0a08 100644
43485--- a/drivers/infiniband/hw/mthca/mthca_main.c
43486+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43487@@ -692,7 +692,7 @@ err_close:
43488 return err;
43489 }
43490
43491-static int mthca_setup_hca(struct mthca_dev *dev)
43492+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43493 {
43494 int err;
43495
43496diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43497index ed9a989..6aa5dc2 100644
43498--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43499+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43500@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43501 * through the bitmaps)
43502 */
43503
43504-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43505+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43506 {
43507 int o;
43508 int m;
43509@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43510 return key;
43511 }
43512
43513-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43514+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43515 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43516 {
43517 struct mthca_mailbox *mailbox;
43518@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43519 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43520 }
43521
43522-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43523+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43524 u64 *buffer_list, int buffer_size_shift,
43525 int list_len, u64 iova, u64 total_size,
43526 u32 access, struct mthca_mr *mr)
43527diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43528index 415f8e1..e34214e 100644
43529--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43530+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43531@@ -764,7 +764,7 @@ unlock:
43532 return 0;
43533 }
43534
43535-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43536+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43537 {
43538 struct mthca_dev *dev = to_mdev(ibcq->device);
43539 struct mthca_cq *cq = to_mcq(ibcq);
43540diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43541index 9f9d5c5..3c19aac 100644
43542--- a/drivers/infiniband/hw/nes/nes.c
43543+++ b/drivers/infiniband/hw/nes/nes.c
43544@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43545 LIST_HEAD(nes_adapter_list);
43546 static LIST_HEAD(nes_dev_list);
43547
43548-atomic_t qps_destroyed;
43549+atomic_unchecked_t qps_destroyed;
43550
43551 static unsigned int ee_flsh_adapter;
43552 static unsigned int sysfs_nonidx_addr;
43553@@ -279,7 +279,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43554 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43555 struct nes_adapter *nesadapter = nesdev->nesadapter;
43556
43557- atomic_inc(&qps_destroyed);
43558+ atomic_inc_unchecked(&qps_destroyed);
43559
43560 /* Free the control structures */
43561
43562diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43563index bd9d132..70d84f4 100644
43564--- a/drivers/infiniband/hw/nes/nes.h
43565+++ b/drivers/infiniband/hw/nes/nes.h
43566@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43567 extern unsigned int wqm_quanta;
43568 extern struct list_head nes_adapter_list;
43569
43570-extern atomic_t cm_connects;
43571-extern atomic_t cm_accepts;
43572-extern atomic_t cm_disconnects;
43573-extern atomic_t cm_closes;
43574-extern atomic_t cm_connecteds;
43575-extern atomic_t cm_connect_reqs;
43576-extern atomic_t cm_rejects;
43577-extern atomic_t mod_qp_timouts;
43578-extern atomic_t qps_created;
43579-extern atomic_t qps_destroyed;
43580-extern atomic_t sw_qps_destroyed;
43581+extern atomic_unchecked_t cm_connects;
43582+extern atomic_unchecked_t cm_accepts;
43583+extern atomic_unchecked_t cm_disconnects;
43584+extern atomic_unchecked_t cm_closes;
43585+extern atomic_unchecked_t cm_connecteds;
43586+extern atomic_unchecked_t cm_connect_reqs;
43587+extern atomic_unchecked_t cm_rejects;
43588+extern atomic_unchecked_t mod_qp_timouts;
43589+extern atomic_unchecked_t qps_created;
43590+extern atomic_unchecked_t qps_destroyed;
43591+extern atomic_unchecked_t sw_qps_destroyed;
43592 extern u32 mh_detected;
43593 extern u32 mh_pauses_sent;
43594 extern u32 cm_packets_sent;
43595@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43596 extern u32 cm_packets_received;
43597 extern u32 cm_packets_dropped;
43598 extern u32 cm_packets_retrans;
43599-extern atomic_t cm_listens_created;
43600-extern atomic_t cm_listens_destroyed;
43601+extern atomic_unchecked_t cm_listens_created;
43602+extern atomic_unchecked_t cm_listens_destroyed;
43603 extern u32 cm_backlog_drops;
43604-extern atomic_t cm_loopbacks;
43605-extern atomic_t cm_nodes_created;
43606-extern atomic_t cm_nodes_destroyed;
43607-extern atomic_t cm_accel_dropped_pkts;
43608-extern atomic_t cm_resets_recvd;
43609-extern atomic_t pau_qps_created;
43610-extern atomic_t pau_qps_destroyed;
43611+extern atomic_unchecked_t cm_loopbacks;
43612+extern atomic_unchecked_t cm_nodes_created;
43613+extern atomic_unchecked_t cm_nodes_destroyed;
43614+extern atomic_unchecked_t cm_accel_dropped_pkts;
43615+extern atomic_unchecked_t cm_resets_recvd;
43616+extern atomic_unchecked_t pau_qps_created;
43617+extern atomic_unchecked_t pau_qps_destroyed;
43618
43619 extern u32 int_mod_timer_init;
43620 extern u32 int_mod_cq_depth_256;
43621diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43622index 72b4341..2600332 100644
43623--- a/drivers/infiniband/hw/nes/nes_cm.c
43624+++ b/drivers/infiniband/hw/nes/nes_cm.c
43625@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43626 u32 cm_packets_retrans;
43627 u32 cm_packets_created;
43628 u32 cm_packets_received;
43629-atomic_t cm_listens_created;
43630-atomic_t cm_listens_destroyed;
43631+atomic_unchecked_t cm_listens_created;
43632+atomic_unchecked_t cm_listens_destroyed;
43633 u32 cm_backlog_drops;
43634-atomic_t cm_loopbacks;
43635-atomic_t cm_nodes_created;
43636-atomic_t cm_nodes_destroyed;
43637-atomic_t cm_accel_dropped_pkts;
43638-atomic_t cm_resets_recvd;
43639+atomic_unchecked_t cm_loopbacks;
43640+atomic_unchecked_t cm_nodes_created;
43641+atomic_unchecked_t cm_nodes_destroyed;
43642+atomic_unchecked_t cm_accel_dropped_pkts;
43643+atomic_unchecked_t cm_resets_recvd;
43644
43645 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43646 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43647@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43648 /* instance of function pointers for client API */
43649 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43650 static struct nes_cm_ops nes_cm_api = {
43651- mini_cm_accelerated,
43652- mini_cm_listen,
43653- mini_cm_del_listen,
43654- mini_cm_connect,
43655- mini_cm_close,
43656- mini_cm_accept,
43657- mini_cm_reject,
43658- mini_cm_recv_pkt,
43659- mini_cm_dealloc_core,
43660- mini_cm_get,
43661- mini_cm_set
43662+ .accelerated = mini_cm_accelerated,
43663+ .listen = mini_cm_listen,
43664+ .stop_listener = mini_cm_del_listen,
43665+ .connect = mini_cm_connect,
43666+ .close = mini_cm_close,
43667+ .accept = mini_cm_accept,
43668+ .reject = mini_cm_reject,
43669+ .recv_pkt = mini_cm_recv_pkt,
43670+ .destroy_cm_core = mini_cm_dealloc_core,
43671+ .get = mini_cm_get,
43672+ .set = mini_cm_set
43673 };
43674
43675 static struct nes_cm_core *g_cm_core;
43676
43677-atomic_t cm_connects;
43678-atomic_t cm_accepts;
43679-atomic_t cm_disconnects;
43680-atomic_t cm_closes;
43681-atomic_t cm_connecteds;
43682-atomic_t cm_connect_reqs;
43683-atomic_t cm_rejects;
43684+atomic_unchecked_t cm_connects;
43685+atomic_unchecked_t cm_accepts;
43686+atomic_unchecked_t cm_disconnects;
43687+atomic_unchecked_t cm_closes;
43688+atomic_unchecked_t cm_connecteds;
43689+atomic_unchecked_t cm_connect_reqs;
43690+atomic_unchecked_t cm_rejects;
43691
43692 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43693 {
43694@@ -1461,7 +1461,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43695 kfree(listener);
43696 listener = NULL;
43697 ret = 0;
43698- atomic_inc(&cm_listens_destroyed);
43699+ atomic_inc_unchecked(&cm_listens_destroyed);
43700 } else {
43701 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43702 }
43703@@ -1667,7 +1667,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43704 cm_node->rem_mac);
43705
43706 add_hte_node(cm_core, cm_node);
43707- atomic_inc(&cm_nodes_created);
43708+ atomic_inc_unchecked(&cm_nodes_created);
43709
43710 return cm_node;
43711 }
43712@@ -1728,7 +1728,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43713 }
43714
43715 atomic_dec(&cm_core->node_cnt);
43716- atomic_inc(&cm_nodes_destroyed);
43717+ atomic_inc_unchecked(&cm_nodes_destroyed);
43718 nesqp = cm_node->nesqp;
43719 if (nesqp) {
43720 nesqp->cm_node = NULL;
43721@@ -1792,7 +1792,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43722
43723 static void drop_packet(struct sk_buff *skb)
43724 {
43725- atomic_inc(&cm_accel_dropped_pkts);
43726+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43727 dev_kfree_skb_any(skb);
43728 }
43729
43730@@ -1855,7 +1855,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43731 {
43732
43733 int reset = 0; /* whether to send reset in case of err.. */
43734- atomic_inc(&cm_resets_recvd);
43735+ atomic_inc_unchecked(&cm_resets_recvd);
43736 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43737 " refcnt=%d\n", cm_node, cm_node->state,
43738 atomic_read(&cm_node->ref_count));
43739@@ -2523,7 +2523,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43740 rem_ref_cm_node(cm_node->cm_core, cm_node);
43741 return NULL;
43742 }
43743- atomic_inc(&cm_loopbacks);
43744+ atomic_inc_unchecked(&cm_loopbacks);
43745 loopbackremotenode->loopbackpartner = cm_node;
43746 loopbackremotenode->tcp_cntxt.rcv_wscale =
43747 NES_CM_DEFAULT_RCV_WND_SCALE;
43748@@ -2804,7 +2804,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43749 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43750 else {
43751 rem_ref_cm_node(cm_core, cm_node);
43752- atomic_inc(&cm_accel_dropped_pkts);
43753+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43754 dev_kfree_skb_any(skb);
43755 }
43756 break;
43757@@ -3112,7 +3112,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43758
43759 if ((cm_id) && (cm_id->event_handler)) {
43760 if (issue_disconn) {
43761- atomic_inc(&cm_disconnects);
43762+ atomic_inc_unchecked(&cm_disconnects);
43763 cm_event.event = IW_CM_EVENT_DISCONNECT;
43764 cm_event.status = disconn_status;
43765 cm_event.local_addr = cm_id->local_addr;
43766@@ -3134,7 +3134,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43767 }
43768
43769 if (issue_close) {
43770- atomic_inc(&cm_closes);
43771+ atomic_inc_unchecked(&cm_closes);
43772 nes_disconnect(nesqp, 1);
43773
43774 cm_id->provider_data = nesqp;
43775@@ -3272,7 +3272,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43776
43777 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43778 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43779- atomic_inc(&cm_accepts);
43780+ atomic_inc_unchecked(&cm_accepts);
43781
43782 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43783 netdev_refcnt_read(nesvnic->netdev));
43784@@ -3470,7 +3470,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43785 struct nes_cm_core *cm_core;
43786 u8 *start_buff;
43787
43788- atomic_inc(&cm_rejects);
43789+ atomic_inc_unchecked(&cm_rejects);
43790 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43791 loopback = cm_node->loopbackpartner;
43792 cm_core = cm_node->cm_core;
43793@@ -3535,7 +3535,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43794 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43795 ntohs(laddr->sin_port));
43796
43797- atomic_inc(&cm_connects);
43798+ atomic_inc_unchecked(&cm_connects);
43799 nesqp->active_conn = 1;
43800
43801 /* cache the cm_id in the qp */
43802@@ -3680,7 +3680,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43803 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43804 return err;
43805 }
43806- atomic_inc(&cm_listens_created);
43807+ atomic_inc_unchecked(&cm_listens_created);
43808 }
43809
43810 cm_id->add_ref(cm_id);
43811@@ -3787,7 +3787,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43812
43813 if (nesqp->destroyed)
43814 return;
43815- atomic_inc(&cm_connecteds);
43816+ atomic_inc_unchecked(&cm_connecteds);
43817 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43818 " local port 0x%04X. jiffies = %lu.\n",
43819 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43820@@ -3972,7 +3972,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43821
43822 cm_id->add_ref(cm_id);
43823 ret = cm_id->event_handler(cm_id, &cm_event);
43824- atomic_inc(&cm_closes);
43825+ atomic_inc_unchecked(&cm_closes);
43826 cm_event.event = IW_CM_EVENT_CLOSE;
43827 cm_event.status = 0;
43828 cm_event.provider_data = cm_id->provider_data;
43829@@ -4012,7 +4012,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43830 return;
43831 cm_id = cm_node->cm_id;
43832
43833- atomic_inc(&cm_connect_reqs);
43834+ atomic_inc_unchecked(&cm_connect_reqs);
43835 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43836 cm_node, cm_id, jiffies);
43837
43838@@ -4061,7 +4061,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43839 return;
43840 cm_id = cm_node->cm_id;
43841
43842- atomic_inc(&cm_connect_reqs);
43843+ atomic_inc_unchecked(&cm_connect_reqs);
43844 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43845 cm_node, cm_id, jiffies);
43846
43847diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43848index 4166452..fc952c3 100644
43849--- a/drivers/infiniband/hw/nes/nes_mgt.c
43850+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43851@@ -40,8 +40,8 @@
43852 #include "nes.h"
43853 #include "nes_mgt.h"
43854
43855-atomic_t pau_qps_created;
43856-atomic_t pau_qps_destroyed;
43857+atomic_unchecked_t pau_qps_created;
43858+atomic_unchecked_t pau_qps_destroyed;
43859
43860 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43861 {
43862@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43863 {
43864 struct sk_buff *skb;
43865 unsigned long flags;
43866- atomic_inc(&pau_qps_destroyed);
43867+ atomic_inc_unchecked(&pau_qps_destroyed);
43868
43869 /* Free packets that have not yet been forwarded */
43870 /* Lock is acquired by skb_dequeue when removing the skb */
43871@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43872 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43873 skb_queue_head_init(&nesqp->pau_list);
43874 spin_lock_init(&nesqp->pau_lock);
43875- atomic_inc(&pau_qps_created);
43876+ atomic_inc_unchecked(&pau_qps_created);
43877 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43878 }
43879
43880diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43881index 70acda9..a96de9d 100644
43882--- a/drivers/infiniband/hw/nes/nes_nic.c
43883+++ b/drivers/infiniband/hw/nes/nes_nic.c
43884@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43885 target_stat_values[++index] = mh_detected;
43886 target_stat_values[++index] = mh_pauses_sent;
43887 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43888- target_stat_values[++index] = atomic_read(&cm_connects);
43889- target_stat_values[++index] = atomic_read(&cm_accepts);
43890- target_stat_values[++index] = atomic_read(&cm_disconnects);
43891- target_stat_values[++index] = atomic_read(&cm_connecteds);
43892- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43893- target_stat_values[++index] = atomic_read(&cm_rejects);
43894- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43895- target_stat_values[++index] = atomic_read(&qps_created);
43896- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43897- target_stat_values[++index] = atomic_read(&qps_destroyed);
43898- target_stat_values[++index] = atomic_read(&cm_closes);
43899+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43900+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43901+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43902+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43903+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43904+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43905+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43906+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43907+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43908+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43909+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43910 target_stat_values[++index] = cm_packets_sent;
43911 target_stat_values[++index] = cm_packets_bounced;
43912 target_stat_values[++index] = cm_packets_created;
43913 target_stat_values[++index] = cm_packets_received;
43914 target_stat_values[++index] = cm_packets_dropped;
43915 target_stat_values[++index] = cm_packets_retrans;
43916- target_stat_values[++index] = atomic_read(&cm_listens_created);
43917- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43918+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43919+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43920 target_stat_values[++index] = cm_backlog_drops;
43921- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43922- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43923- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43924- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43925- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43926+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43927+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43928+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43929+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43930+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43931 target_stat_values[++index] = nesadapter->free_4kpbl;
43932 target_stat_values[++index] = nesadapter->free_256pbl;
43933 target_stat_values[++index] = int_mod_timer_init;
43934 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43935 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43936 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43937- target_stat_values[++index] = atomic_read(&pau_qps_created);
43938- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43939+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43940+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43941 }
43942
43943 /**
43944diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43945index c0d0296..3185f57 100644
43946--- a/drivers/infiniband/hw/nes/nes_verbs.c
43947+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43948@@ -46,9 +46,9 @@
43949
43950 #include <rdma/ib_umem.h>
43951
43952-atomic_t mod_qp_timouts;
43953-atomic_t qps_created;
43954-atomic_t sw_qps_destroyed;
43955+atomic_unchecked_t mod_qp_timouts;
43956+atomic_unchecked_t qps_created;
43957+atomic_unchecked_t sw_qps_destroyed;
43958
43959 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43960
43961@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43962 if (init_attr->create_flags)
43963 return ERR_PTR(-EINVAL);
43964
43965- atomic_inc(&qps_created);
43966+ atomic_inc_unchecked(&qps_created);
43967 switch (init_attr->qp_type) {
43968 case IB_QPT_RC:
43969 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43970@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43971 struct iw_cm_event cm_event;
43972 int ret = 0;
43973
43974- atomic_inc(&sw_qps_destroyed);
43975+ atomic_inc_unchecked(&sw_qps_destroyed);
43976 nesqp->destroyed = 1;
43977
43978 /* Blow away the connection if it exists. */
43979diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43980index 7df16f7..7e1b21e 100644
43981--- a/drivers/infiniband/hw/qib/qib.h
43982+++ b/drivers/infiniband/hw/qib/qib.h
43983@@ -52,6 +52,7 @@
43984 #include <linux/kref.h>
43985 #include <linux/sched.h>
43986 #include <linux/kthread.h>
43987+#include <linux/slab.h>
43988
43989 #include "qib_common.h"
43990 #include "qib_verbs.h"
43991diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43992index cdc7df4..a2fdfdb 100644
43993--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43994+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43995@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43996 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43997 }
43998
43999-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44000+static struct rtnl_link_ops ipoib_link_ops = {
44001 .kind = "ipoib",
44002 .maxtype = IFLA_IPOIB_MAX,
44003 .policy = ipoib_policy,
44004diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44005index e853a21..56fc5a8 100644
44006--- a/drivers/input/gameport/gameport.c
44007+++ b/drivers/input/gameport/gameport.c
44008@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44009 */
44010 static void gameport_init_port(struct gameport *gameport)
44011 {
44012- static atomic_t gameport_no = ATOMIC_INIT(-1);
44013+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44014
44015 __module_get(THIS_MODULE);
44016
44017 mutex_init(&gameport->drv_mutex);
44018 device_initialize(&gameport->dev);
44019 dev_set_name(&gameport->dev, "gameport%lu",
44020- (unsigned long)atomic_inc_return(&gameport_no));
44021+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44022 gameport->dev.bus = &gameport_bus;
44023 gameport->dev.release = gameport_release_port;
44024 if (gameport->parent)
44025diff --git a/drivers/input/input.c b/drivers/input/input.c
44026index cc357f1..ee42fbc 100644
44027--- a/drivers/input/input.c
44028+++ b/drivers/input/input.c
44029@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44030 */
44031 struct input_dev *input_allocate_device(void)
44032 {
44033- static atomic_t input_no = ATOMIC_INIT(-1);
44034+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44035 struct input_dev *dev;
44036
44037 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44038@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44039 INIT_LIST_HEAD(&dev->node);
44040
44041 dev_set_name(&dev->dev, "input%lu",
44042- (unsigned long)atomic_inc_return(&input_no));
44043+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44044
44045 __module_get(THIS_MODULE);
44046 }
44047diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44048index 4a95b22..874c182 100644
44049--- a/drivers/input/joystick/sidewinder.c
44050+++ b/drivers/input/joystick/sidewinder.c
44051@@ -30,6 +30,7 @@
44052 #include <linux/kernel.h>
44053 #include <linux/module.h>
44054 #include <linux/slab.h>
44055+#include <linux/sched.h>
44056 #include <linux/input.h>
44057 #include <linux/gameport.h>
44058 #include <linux/jiffies.h>
44059diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44060index 61c7611..e1bfa38 100644
44061--- a/drivers/input/joystick/xpad.c
44062+++ b/drivers/input/joystick/xpad.c
44063@@ -905,7 +905,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44064
44065 static int xpad_led_probe(struct usb_xpad *xpad)
44066 {
44067- static atomic_t led_seq = ATOMIC_INIT(-1);
44068+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44069 unsigned long led_no;
44070 struct xpad_led *led;
44071 struct led_classdev *led_cdev;
44072@@ -918,7 +918,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44073 if (!led)
44074 return -ENOMEM;
44075
44076- led_no = atomic_inc_return(&led_seq);
44077+ led_no = atomic_inc_return_unchecked(&led_seq);
44078
44079 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44080 led->xpad = xpad;
44081diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44082index ac1fa5f..5f7502c 100644
44083--- a/drivers/input/misc/ims-pcu.c
44084+++ b/drivers/input/misc/ims-pcu.c
44085@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44086
44087 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44088 {
44089- static atomic_t device_no = ATOMIC_INIT(-1);
44090+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44091
44092 const struct ims_pcu_device_info *info;
44093 int error;
44094@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44095 }
44096
44097 /* Device appears to be operable, complete initialization */
44098- pcu->device_no = atomic_inc_return(&device_no);
44099+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44100
44101 /*
44102 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44103diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44104index ad5a5a1..5eac214 100644
44105--- a/drivers/input/mouse/psmouse.h
44106+++ b/drivers/input/mouse/psmouse.h
44107@@ -125,7 +125,7 @@ struct psmouse_attribute {
44108 ssize_t (*set)(struct psmouse *psmouse, void *data,
44109 const char *buf, size_t count);
44110 bool protect;
44111-};
44112+} __do_const;
44113 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44114
44115 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44116diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44117index b604564..3f14ae4 100644
44118--- a/drivers/input/mousedev.c
44119+++ b/drivers/input/mousedev.c
44120@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44121
44122 spin_unlock_irq(&client->packet_lock);
44123
44124- if (copy_to_user(buffer, data, count))
44125+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44126 return -EFAULT;
44127
44128 return count;
44129diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44130index a05a517..323a2fd 100644
44131--- a/drivers/input/serio/serio.c
44132+++ b/drivers/input/serio/serio.c
44133@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44134 */
44135 static void serio_init_port(struct serio *serio)
44136 {
44137- static atomic_t serio_no = ATOMIC_INIT(-1);
44138+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44139
44140 __module_get(THIS_MODULE);
44141
44142@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44143 mutex_init(&serio->drv_mutex);
44144 device_initialize(&serio->dev);
44145 dev_set_name(&serio->dev, "serio%lu",
44146- (unsigned long)atomic_inc_return(&serio_no));
44147+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44148 serio->dev.bus = &serio_bus;
44149 serio->dev.release = serio_release_port;
44150 serio->dev.groups = serio_device_attr_groups;
44151diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44152index 71ef5d6..93380a9 100644
44153--- a/drivers/input/serio/serio_raw.c
44154+++ b/drivers/input/serio/serio_raw.c
44155@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44156
44157 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44158 {
44159- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44160+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44161 struct serio_raw *serio_raw;
44162 int err;
44163
44164@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44165 }
44166
44167 snprintf(serio_raw->name, sizeof(serio_raw->name),
44168- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44169+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44170 kref_init(&serio_raw->kref);
44171 INIT_LIST_HEAD(&serio_raw->client_list);
44172 init_waitqueue_head(&serio_raw->wait);
44173diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44174index 92e2243..8fd9092 100644
44175--- a/drivers/input/touchscreen/htcpen.c
44176+++ b/drivers/input/touchscreen/htcpen.c
44177@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44178 }
44179 };
44180
44181-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44182+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44183 {
44184 .ident = "Shift",
44185 .matches = {
44186diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44187index ca9f4ed..b860ff1 100644
44188--- a/drivers/iommu/amd_iommu.c
44189+++ b/drivers/iommu/amd_iommu.c
44190@@ -829,11 +829,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44191
44192 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44193 {
44194+ phys_addr_t physaddr;
44195 WARN_ON(address & 0x7ULL);
44196
44197 memset(cmd, 0, sizeof(*cmd));
44198- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44199- cmd->data[1] = upper_32_bits(__pa(address));
44200+
44201+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44202+ if (object_starts_on_stack((void *)address)) {
44203+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44204+ physaddr = __pa((u64)adjbuf);
44205+ } else
44206+#endif
44207+ physaddr = __pa(address);
44208+
44209+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44210+ cmd->data[1] = upper_32_bits(physaddr);
44211 cmd->data[2] = 1;
44212 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44213 }
44214diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44215index 65075ef..53823f9 100644
44216--- a/drivers/iommu/arm-smmu.c
44217+++ b/drivers/iommu/arm-smmu.c
44218@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44219
44220 struct arm_smmu_domain {
44221 struct arm_smmu_device *smmu;
44222- struct io_pgtable_ops *pgtbl_ops;
44223+ struct io_pgtable *pgtbl;
44224 spinlock_t pgtbl_lock;
44225 struct arm_smmu_cfg cfg;
44226 enum arm_smmu_domain_stage stage;
44227@@ -817,7 +817,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44228 {
44229 int irq, start, ret = 0;
44230 unsigned long ias, oas;
44231- struct io_pgtable_ops *pgtbl_ops;
44232+ struct io_pgtable *pgtbl;
44233 struct io_pgtable_cfg pgtbl_cfg;
44234 enum io_pgtable_fmt fmt;
44235 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44236@@ -902,14 +902,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44237 };
44238
44239 smmu_domain->smmu = smmu;
44240- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44241- if (!pgtbl_ops) {
44242+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44243+ if (!pgtbl) {
44244 ret = -ENOMEM;
44245 goto out_clear_smmu;
44246 }
44247
44248 /* Update our support page sizes to reflect the page table format */
44249- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44250+ pax_open_kernel();
44251+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44252+ pax_close_kernel();
44253
44254 /* Initialise the context bank with our page table cfg */
44255 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44256@@ -930,7 +932,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44257 mutex_unlock(&smmu_domain->init_mutex);
44258
44259 /* Publish page table ops for map/unmap */
44260- smmu_domain->pgtbl_ops = pgtbl_ops;
44261+ smmu_domain->pgtbl = pgtbl;
44262 return 0;
44263
44264 out_clear_smmu:
44265@@ -963,8 +965,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44266 free_irq(irq, domain);
44267 }
44268
44269- if (smmu_domain->pgtbl_ops)
44270- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44271+ free_io_pgtable(smmu_domain->pgtbl);
44272
44273 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44274 }
44275@@ -1190,13 +1191,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44276 int ret;
44277 unsigned long flags;
44278 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44279- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44280+ struct io_pgtable *iop = smmu_domain->pgtbl;
44281
44282- if (!ops)
44283+ if (!iop)
44284 return -ENODEV;
44285
44286 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44287- ret = ops->map(ops, iova, paddr, size, prot);
44288+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44289 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44290 return ret;
44291 }
44292@@ -1207,13 +1208,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44293 size_t ret;
44294 unsigned long flags;
44295 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44296- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44297+ struct io_pgtable *iop = smmu_domain->pgtbl;
44298
44299- if (!ops)
44300+ if (!iop)
44301 return 0;
44302
44303 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44304- ret = ops->unmap(ops, iova, size);
44305+ ret = iop->ops->unmap(iop, iova, size);
44306 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44307 return ret;
44308 }
44309@@ -1224,7 +1225,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44310 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44311 struct arm_smmu_device *smmu = smmu_domain->smmu;
44312 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44313- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44314+ struct io_pgtable *iop = smmu_domain->pgtbl;
44315 struct device *dev = smmu->dev;
44316 void __iomem *cb_base;
44317 u32 tmp;
44318@@ -1247,7 +1248,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44319 dev_err(dev,
44320 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44321 &iova);
44322- return ops->iova_to_phys(ops, iova);
44323+ return iop->ops->iova_to_phys(iop, iova);
44324 }
44325
44326 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44327@@ -1268,9 +1269,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44328 phys_addr_t ret;
44329 unsigned long flags;
44330 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44331- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44332+ struct io_pgtable *iop = smmu_domain->pgtbl;
44333
44334- if (!ops)
44335+ if (!iop)
44336 return 0;
44337
44338 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44339@@ -1278,7 +1279,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44340 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44341 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44342 } else {
44343- ret = ops->iova_to_phys(ops, iova);
44344+ ret = iop->ops->iova_to_phys(iop, iova);
44345 }
44346
44347 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44348@@ -1668,7 +1669,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44349 size |= SZ_64K | SZ_512M;
44350 }
44351
44352- arm_smmu_ops.pgsize_bitmap &= size;
44353+ pax_open_kernel();
44354+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44355+ pax_close_kernel();
44356 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44357
44358 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44359diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
44360index 5ecfaf2..c87c4b1 100644
44361--- a/drivers/iommu/intel-iommu.c
44362+++ b/drivers/iommu/intel-iommu.c
44363@@ -1756,8 +1756,9 @@ static int domain_init(struct dmar_domain *domain, int guest_width)
44364
44365 static void domain_exit(struct dmar_domain *domain)
44366 {
44367+ struct dmar_drhd_unit *drhd;
44368+ struct intel_iommu *iommu;
44369 struct page *freelist = NULL;
44370- int i;
44371
44372 /* Domain 0 is reserved, so dont process it */
44373 if (!domain)
44374@@ -1777,8 +1778,10 @@ static void domain_exit(struct dmar_domain *domain)
44375
44376 /* clear attached or cached domains */
44377 rcu_read_lock();
44378- for_each_set_bit(i, domain->iommu_bmp, g_num_of_iommus)
44379- iommu_detach_domain(domain, g_iommus[i]);
44380+ for_each_active_iommu(iommu, drhd)
44381+ if (domain_type_is_vm(domain) ||
44382+ test_bit(iommu->seq_id, domain->iommu_bmp))
44383+ iommu_detach_domain(domain, iommu);
44384 rcu_read_unlock();
44385
44386 dma_free_pagelist(freelist);
44387diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44388index 4e46021..f0a24fef 100644
44389--- a/drivers/iommu/io-pgtable-arm.c
44390+++ b/drivers/iommu/io-pgtable-arm.c
44391@@ -36,12 +36,6 @@
44392 #define io_pgtable_to_data(x) \
44393 container_of((x), struct arm_lpae_io_pgtable, iop)
44394
44395-#define io_pgtable_ops_to_pgtable(x) \
44396- container_of((x), struct io_pgtable, ops)
44397-
44398-#define io_pgtable_ops_to_data(x) \
44399- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44400-
44401 /*
44402 * For consistency with the architecture, we always consider
44403 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44404@@ -304,10 +298,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44405 return pte;
44406 }
44407
44408-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44409+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44410 phys_addr_t paddr, size_t size, int iommu_prot)
44411 {
44412- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44413+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44414 arm_lpae_iopte *ptep = data->pgd;
44415 int lvl = ARM_LPAE_START_LVL(data);
44416 arm_lpae_iopte prot;
44417@@ -447,12 +441,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44418 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44419 }
44420
44421-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44422+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44423 size_t size)
44424 {
44425 size_t unmapped;
44426- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44427- struct io_pgtable *iop = &data->iop;
44428+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44429 arm_lpae_iopte *ptep = data->pgd;
44430 int lvl = ARM_LPAE_START_LVL(data);
44431
44432@@ -463,10 +456,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44433 return unmapped;
44434 }
44435
44436-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44437+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44438 unsigned long iova)
44439 {
44440- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44441+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44442 arm_lpae_iopte pte, *ptep = data->pgd;
44443 int lvl = ARM_LPAE_START_LVL(data);
44444
44445@@ -533,6 +526,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44446 }
44447 }
44448
44449+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44450+ .map = arm_lpae_map,
44451+ .unmap = arm_lpae_unmap,
44452+ .iova_to_phys = arm_lpae_iova_to_phys,
44453+};
44454+
44455 static struct arm_lpae_io_pgtable *
44456 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44457 {
44458@@ -564,11 +563,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44459 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44460 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44461
44462- data->iop.ops = (struct io_pgtable_ops) {
44463- .map = arm_lpae_map,
44464- .unmap = arm_lpae_unmap,
44465- .iova_to_phys = arm_lpae_iova_to_phys,
44466- };
44467+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44468
44469 return data;
44470 }
44471@@ -830,9 +825,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44472 .flush_pgtable = dummy_flush_pgtable,
44473 };
44474
44475-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44476+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44477 {
44478- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44479+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44480 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44481
44482 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44483@@ -842,9 +837,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44484 data->bits_per_level, data->pgd);
44485 }
44486
44487-#define __FAIL(ops, i) ({ \
44488+#define __FAIL(iop, i) ({ \
44489 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44490- arm_lpae_dump_ops(ops); \
44491+ arm_lpae_dump_ops(iop); \
44492 selftest_running = false; \
44493 -EFAULT; \
44494 })
44495@@ -859,30 +854,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44496 int i, j;
44497 unsigned long iova;
44498 size_t size;
44499- struct io_pgtable_ops *ops;
44500+ struct io_pgtable *iop;
44501+ const struct io_pgtable_ops *ops;
44502
44503 selftest_running = true;
44504
44505 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44506 cfg_cookie = cfg;
44507- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44508- if (!ops) {
44509+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44510+ if (!iop) {
44511 pr_err("selftest: failed to allocate io pgtable ops\n");
44512 return -ENOMEM;
44513 }
44514+ ops = iop->ops;
44515
44516 /*
44517 * Initial sanity checks.
44518 * Empty page tables shouldn't provide any translations.
44519 */
44520- if (ops->iova_to_phys(ops, 42))
44521- return __FAIL(ops, i);
44522+ if (ops->iova_to_phys(iop, 42))
44523+ return __FAIL(iop, i);
44524
44525- if (ops->iova_to_phys(ops, SZ_1G + 42))
44526- return __FAIL(ops, i);
44527+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44528+ return __FAIL(iop, i);
44529
44530- if (ops->iova_to_phys(ops, SZ_2G + 42))
44531- return __FAIL(ops, i);
44532+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44533+ return __FAIL(iop, i);
44534
44535 /*
44536 * Distinct mappings of different granule sizes.
44537@@ -892,19 +889,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44538 while (j != BITS_PER_LONG) {
44539 size = 1UL << j;
44540
44541- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44542+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44543 IOMMU_WRITE |
44544 IOMMU_NOEXEC |
44545 IOMMU_CACHE))
44546- return __FAIL(ops, i);
44547+ return __FAIL(iop, i);
44548
44549 /* Overlapping mappings */
44550- if (!ops->map(ops, iova, iova + size, size,
44551+ if (!ops->map(iop, iova, iova + size, size,
44552 IOMMU_READ | IOMMU_NOEXEC))
44553- return __FAIL(ops, i);
44554+ return __FAIL(iop, i);
44555
44556- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44557- return __FAIL(ops, i);
44558+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44559+ return __FAIL(iop, i);
44560
44561 iova += SZ_1G;
44562 j++;
44563@@ -913,15 +910,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44564
44565 /* Partial unmap */
44566 size = 1UL << __ffs(cfg->pgsize_bitmap);
44567- if (ops->unmap(ops, SZ_1G + size, size) != size)
44568- return __FAIL(ops, i);
44569+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44570+ return __FAIL(iop, i);
44571
44572 /* Remap of partial unmap */
44573- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44574- return __FAIL(ops, i);
44575+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44576+ return __FAIL(iop, i);
44577
44578- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44579- return __FAIL(ops, i);
44580+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44581+ return __FAIL(iop, i);
44582
44583 /* Full unmap */
44584 iova = 0;
44585@@ -929,25 +926,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44586 while (j != BITS_PER_LONG) {
44587 size = 1UL << j;
44588
44589- if (ops->unmap(ops, iova, size) != size)
44590- return __FAIL(ops, i);
44591+ if (ops->unmap(iop, iova, size) != size)
44592+ return __FAIL(iop, i);
44593
44594- if (ops->iova_to_phys(ops, iova + 42))
44595- return __FAIL(ops, i);
44596+ if (ops->iova_to_phys(iop, iova + 42))
44597+ return __FAIL(iop, i);
44598
44599 /* Remap full block */
44600- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44601- return __FAIL(ops, i);
44602+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44603+ return __FAIL(iop, i);
44604
44605- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44606- return __FAIL(ops, i);
44607+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44608+ return __FAIL(iop, i);
44609
44610 iova += SZ_1G;
44611 j++;
44612 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44613 }
44614
44615- free_io_pgtable_ops(ops);
44616+ free_io_pgtable(iop);
44617 }
44618
44619 selftest_running = false;
44620diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44621index 6436fe2..088c965 100644
44622--- a/drivers/iommu/io-pgtable.c
44623+++ b/drivers/iommu/io-pgtable.c
44624@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44625 #endif
44626 };
44627
44628-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44629+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44630 struct io_pgtable_cfg *cfg,
44631 void *cookie)
44632 {
44633@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44634 iop->cookie = cookie;
44635 iop->cfg = *cfg;
44636
44637- return &iop->ops;
44638+ return iop;
44639 }
44640
44641 /*
44642 * It is the IOMMU driver's responsibility to ensure that the page table
44643 * is no longer accessible to the walker by this point.
44644 */
44645-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44646+void free_io_pgtable(struct io_pgtable *iop)
44647 {
44648- struct io_pgtable *iop;
44649-
44650- if (!ops)
44651+ if (!iop)
44652 return;
44653
44654- iop = container_of(ops, struct io_pgtable, ops);
44655 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44656 io_pgtable_init_table[iop->fmt]->free(iop);
44657 }
44658diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44659index 10e32f6..0b276c8 100644
44660--- a/drivers/iommu/io-pgtable.h
44661+++ b/drivers/iommu/io-pgtable.h
44662@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44663 * These functions map directly onto the iommu_ops member functions with
44664 * the same names.
44665 */
44666+struct io_pgtable;
44667 struct io_pgtable_ops {
44668- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44669+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44670 phys_addr_t paddr, size_t size, int prot);
44671- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44672+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44673 size_t size);
44674- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44675+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44676 unsigned long iova);
44677 };
44678
44679 /**
44680- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44681+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44682 *
44683 * @fmt: The page table format.
44684 * @cfg: The page table configuration. This will be modified to represent
44685@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44686 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44687 * the callback routines in cfg->tlb.
44688 */
44689-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44690- struct io_pgtable_cfg *cfg,
44691- void *cookie);
44692+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44693+ struct io_pgtable_cfg *cfg,
44694+ void *cookie);
44695
44696 /**
44697 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44698@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44699 *
44700 * @ops: The ops returned from alloc_io_pgtable_ops.
44701 */
44702-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44703+void free_io_pgtable(struct io_pgtable *iop);
44704
44705
44706 /*
44707@@ -125,7 +126,7 @@ struct io_pgtable {
44708 enum io_pgtable_fmt fmt;
44709 void *cookie;
44710 struct io_pgtable_cfg cfg;
44711- struct io_pgtable_ops ops;
44712+ const struct io_pgtable_ops *ops;
44713 };
44714
44715 /**
44716diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44717index d4f527e..8e4a4fd 100644
44718--- a/drivers/iommu/iommu.c
44719+++ b/drivers/iommu/iommu.c
44720@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44721 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44722 {
44723 int err;
44724- struct notifier_block *nb;
44725+ notifier_block_no_const *nb;
44726 struct iommu_callback_data cb = {
44727 .ops = ops,
44728 };
44729diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44730index 1a67c53..23181d8 100644
44731--- a/drivers/iommu/ipmmu-vmsa.c
44732+++ b/drivers/iommu/ipmmu-vmsa.c
44733@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44734 struct iommu_domain io_domain;
44735
44736 struct io_pgtable_cfg cfg;
44737- struct io_pgtable_ops *iop;
44738+ struct io_pgtable *iop;
44739
44740 unsigned int context_id;
44741 spinlock_t lock; /* Protects mappings */
44742@@ -328,8 +328,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44743 domain->cfg.oas = 40;
44744 domain->cfg.tlb = &ipmmu_gather_ops;
44745
44746- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44747- domain);
44748+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44749 if (!domain->iop)
44750 return -EINVAL;
44751
44752@@ -487,7 +486,7 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
44753 * been detached.
44754 */
44755 ipmmu_domain_destroy_context(domain);
44756- free_io_pgtable_ops(domain->iop);
44757+ free_io_pgtable(domain->iop);
44758 kfree(domain);
44759 }
44760
44761@@ -556,7 +555,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44762 if (!domain)
44763 return -ENODEV;
44764
44765- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44766+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44767 }
44768
44769 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44770@@ -564,7 +563,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44771 {
44772 struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
44773
44774- return domain->iop->unmap(domain->iop, iova, size);
44775+ return domain->iop->ops->unmap(domain->iop, iova, size);
44776 }
44777
44778 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44779@@ -574,7 +573,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44780
44781 /* TODO: Is locking needed ? */
44782
44783- return domain->iop->iova_to_phys(domain->iop, iova);
44784+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44785 }
44786
44787 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44788diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44789index 390079e..1da9d6c 100644
44790--- a/drivers/iommu/irq_remapping.c
44791+++ b/drivers/iommu/irq_remapping.c
44792@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44793 void panic_if_irq_remap(const char *msg)
44794 {
44795 if (irq_remapping_enabled)
44796- panic(msg);
44797+ panic("%s", msg);
44798 }
44799
44800 static void ir_ack_apic_edge(struct irq_data *data)
44801@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44802
44803 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44804 {
44805- chip->irq_print_chip = ir_print_prefix;
44806- chip->irq_ack = ir_ack_apic_edge;
44807- chip->irq_eoi = ir_ack_apic_level;
44808- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44809+ pax_open_kernel();
44810+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44811+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44812+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44813+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44814+ pax_close_kernel();
44815 }
44816
44817 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44818diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44819index 01999d7..4f14bb7 100644
44820--- a/drivers/irqchip/irq-gic.c
44821+++ b/drivers/irqchip/irq-gic.c
44822@@ -313,7 +313,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44823 chained_irq_exit(chip, desc);
44824 }
44825
44826-static struct irq_chip gic_chip = {
44827+static irq_chip_no_const gic_chip __read_only = {
44828 .name = "GIC",
44829 .irq_mask = gic_mask_irq,
44830 .irq_unmask = gic_unmask_irq,
44831diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44832index 9a0767b..5e5f86f 100644
44833--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44834+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44835@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44836 struct intc_irqpin_iomem *i;
44837 struct resource *io[INTC_IRQPIN_REG_NR];
44838 struct resource *irq;
44839- struct irq_chip *irq_chip;
44840+ irq_chip_no_const *irq_chip;
44841 void (*enable_fn)(struct irq_data *d);
44842 void (*disable_fn)(struct irq_data *d);
44843 const char *name = dev_name(dev);
44844diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44845index cdf80b7..e5c3ade 100644
44846--- a/drivers/irqchip/irq-renesas-irqc.c
44847+++ b/drivers/irqchip/irq-renesas-irqc.c
44848@@ -179,7 +179,7 @@ static int irqc_probe(struct platform_device *pdev)
44849 struct irqc_priv *p;
44850 struct resource *io;
44851 struct resource *irq;
44852- struct irq_chip *irq_chip;
44853+ irq_chip_no_const *irq_chip;
44854 const char *name = dev_name(&pdev->dev);
44855 int ret;
44856 int k;
44857diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44858index 6a2df32..dc962f1 100644
44859--- a/drivers/isdn/capi/capi.c
44860+++ b/drivers/isdn/capi/capi.c
44861@@ -81,8 +81,8 @@ struct capiminor {
44862
44863 struct capi20_appl *ap;
44864 u32 ncci;
44865- atomic_t datahandle;
44866- atomic_t msgid;
44867+ atomic_unchecked_t datahandle;
44868+ atomic_unchecked_t msgid;
44869
44870 struct tty_port port;
44871 int ttyinstop;
44872@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44873 capimsg_setu16(s, 2, mp->ap->applid);
44874 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44875 capimsg_setu8 (s, 5, CAPI_RESP);
44876- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44877+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44878 capimsg_setu32(s, 8, mp->ncci);
44879 capimsg_setu16(s, 12, datahandle);
44880 }
44881@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44882 mp->outbytes -= len;
44883 spin_unlock_bh(&mp->outlock);
44884
44885- datahandle = atomic_inc_return(&mp->datahandle);
44886+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44887 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44888 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44889 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44890 capimsg_setu16(skb->data, 2, mp->ap->applid);
44891 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44892 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44893- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44894+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44895 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44896 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44897 capimsg_setu16(skb->data, 16, len); /* Data length */
44898diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44899index aecec6d..11e13c5 100644
44900--- a/drivers/isdn/gigaset/bas-gigaset.c
44901+++ b/drivers/isdn/gigaset/bas-gigaset.c
44902@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44903
44904
44905 static const struct gigaset_ops gigops = {
44906- gigaset_write_cmd,
44907- gigaset_write_room,
44908- gigaset_chars_in_buffer,
44909- gigaset_brkchars,
44910- gigaset_init_bchannel,
44911- gigaset_close_bchannel,
44912- gigaset_initbcshw,
44913- gigaset_freebcshw,
44914- gigaset_reinitbcshw,
44915- gigaset_initcshw,
44916- gigaset_freecshw,
44917- gigaset_set_modem_ctrl,
44918- gigaset_baud_rate,
44919- gigaset_set_line_ctrl,
44920- gigaset_isoc_send_skb,
44921- gigaset_isoc_input,
44922+ .write_cmd = gigaset_write_cmd,
44923+ .write_room = gigaset_write_room,
44924+ .chars_in_buffer = gigaset_chars_in_buffer,
44925+ .brkchars = gigaset_brkchars,
44926+ .init_bchannel = gigaset_init_bchannel,
44927+ .close_bchannel = gigaset_close_bchannel,
44928+ .initbcshw = gigaset_initbcshw,
44929+ .freebcshw = gigaset_freebcshw,
44930+ .reinitbcshw = gigaset_reinitbcshw,
44931+ .initcshw = gigaset_initcshw,
44932+ .freecshw = gigaset_freecshw,
44933+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44934+ .baud_rate = gigaset_baud_rate,
44935+ .set_line_ctrl = gigaset_set_line_ctrl,
44936+ .send_skb = gigaset_isoc_send_skb,
44937+ .handle_input = gigaset_isoc_input,
44938 };
44939
44940 /* bas_gigaset_init
44941diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44942index 600c79b..3752bab 100644
44943--- a/drivers/isdn/gigaset/interface.c
44944+++ b/drivers/isdn/gigaset/interface.c
44945@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44946 }
44947 tty->driver_data = cs;
44948
44949- ++cs->port.count;
44950+ atomic_inc(&cs->port.count);
44951
44952- if (cs->port.count == 1) {
44953+ if (atomic_read(&cs->port.count) == 1) {
44954 tty_port_tty_set(&cs->port, tty);
44955 cs->port.low_latency = 1;
44956 }
44957@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44958
44959 if (!cs->connected)
44960 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44961- else if (!cs->port.count)
44962+ else if (!atomic_read(&cs->port.count))
44963 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44964- else if (!--cs->port.count)
44965+ else if (!atomic_dec_return(&cs->port.count))
44966 tty_port_tty_set(&cs->port, NULL);
44967
44968 mutex_unlock(&cs->mutex);
44969diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44970index 8c91fd5..14f13ce 100644
44971--- a/drivers/isdn/gigaset/ser-gigaset.c
44972+++ b/drivers/isdn/gigaset/ser-gigaset.c
44973@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44974 }
44975
44976 static const struct gigaset_ops ops = {
44977- gigaset_write_cmd,
44978- gigaset_write_room,
44979- gigaset_chars_in_buffer,
44980- gigaset_brkchars,
44981- gigaset_init_bchannel,
44982- gigaset_close_bchannel,
44983- gigaset_initbcshw,
44984- gigaset_freebcshw,
44985- gigaset_reinitbcshw,
44986- gigaset_initcshw,
44987- gigaset_freecshw,
44988- gigaset_set_modem_ctrl,
44989- gigaset_baud_rate,
44990- gigaset_set_line_ctrl,
44991- gigaset_m10x_send_skb, /* asyncdata.c */
44992- gigaset_m10x_input, /* asyncdata.c */
44993+ .write_cmd = gigaset_write_cmd,
44994+ .write_room = gigaset_write_room,
44995+ .chars_in_buffer = gigaset_chars_in_buffer,
44996+ .brkchars = gigaset_brkchars,
44997+ .init_bchannel = gigaset_init_bchannel,
44998+ .close_bchannel = gigaset_close_bchannel,
44999+ .initbcshw = gigaset_initbcshw,
45000+ .freebcshw = gigaset_freebcshw,
45001+ .reinitbcshw = gigaset_reinitbcshw,
45002+ .initcshw = gigaset_initcshw,
45003+ .freecshw = gigaset_freecshw,
45004+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45005+ .baud_rate = gigaset_baud_rate,
45006+ .set_line_ctrl = gigaset_set_line_ctrl,
45007+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45008+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45009 };
45010
45011
45012diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45013index 5f306e2..5342f88 100644
45014--- a/drivers/isdn/gigaset/usb-gigaset.c
45015+++ b/drivers/isdn/gigaset/usb-gigaset.c
45016@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45017 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45018 memcpy(cs->hw.usb->bchars, buf, 6);
45019 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45020- 0, 0, &buf, 6, 2000);
45021+ 0, 0, buf, 6, 2000);
45022 }
45023
45024 static void gigaset_freebcshw(struct bc_state *bcs)
45025@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45026 }
45027
45028 static const struct gigaset_ops ops = {
45029- gigaset_write_cmd,
45030- gigaset_write_room,
45031- gigaset_chars_in_buffer,
45032- gigaset_brkchars,
45033- gigaset_init_bchannel,
45034- gigaset_close_bchannel,
45035- gigaset_initbcshw,
45036- gigaset_freebcshw,
45037- gigaset_reinitbcshw,
45038- gigaset_initcshw,
45039- gigaset_freecshw,
45040- gigaset_set_modem_ctrl,
45041- gigaset_baud_rate,
45042- gigaset_set_line_ctrl,
45043- gigaset_m10x_send_skb,
45044- gigaset_m10x_input,
45045+ .write_cmd = gigaset_write_cmd,
45046+ .write_room = gigaset_write_room,
45047+ .chars_in_buffer = gigaset_chars_in_buffer,
45048+ .brkchars = gigaset_brkchars,
45049+ .init_bchannel = gigaset_init_bchannel,
45050+ .close_bchannel = gigaset_close_bchannel,
45051+ .initbcshw = gigaset_initbcshw,
45052+ .freebcshw = gigaset_freebcshw,
45053+ .reinitbcshw = gigaset_reinitbcshw,
45054+ .initcshw = gigaset_initcshw,
45055+ .freecshw = gigaset_freecshw,
45056+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45057+ .baud_rate = gigaset_baud_rate,
45058+ .set_line_ctrl = gigaset_set_line_ctrl,
45059+ .send_skb = gigaset_m10x_send_skb,
45060+ .handle_input = gigaset_m10x_input,
45061 };
45062
45063 /*
45064diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45065index 4d9b195..455075c 100644
45066--- a/drivers/isdn/hardware/avm/b1.c
45067+++ b/drivers/isdn/hardware/avm/b1.c
45068@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45069 }
45070 if (left) {
45071 if (t4file->user) {
45072- if (copy_from_user(buf, dp, left))
45073+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45074 return -EFAULT;
45075 } else {
45076 memcpy(buf, dp, left);
45077@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45078 }
45079 if (left) {
45080 if (config->user) {
45081- if (copy_from_user(buf, dp, left))
45082+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45083 return -EFAULT;
45084 } else {
45085 memcpy(buf, dp, left);
45086diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45087index 9b856e1..fa03c92 100644
45088--- a/drivers/isdn/i4l/isdn_common.c
45089+++ b/drivers/isdn/i4l/isdn_common.c
45090@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45091 } else
45092 return -EINVAL;
45093 case IIOCDBGVAR:
45094+ if (!capable(CAP_SYS_RAWIO))
45095+ return -EPERM;
45096 if (arg) {
45097 if (copy_to_user(argp, &dev, sizeof(ulong)))
45098 return -EFAULT;
45099diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45100index 91d5730..336523e 100644
45101--- a/drivers/isdn/i4l/isdn_concap.c
45102+++ b/drivers/isdn/i4l/isdn_concap.c
45103@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45104 }
45105
45106 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45107- &isdn_concap_dl_data_req,
45108- &isdn_concap_dl_connect_req,
45109- &isdn_concap_dl_disconn_req
45110+ .data_req = &isdn_concap_dl_data_req,
45111+ .connect_req = &isdn_concap_dl_connect_req,
45112+ .disconn_req = &isdn_concap_dl_disconn_req
45113 };
45114
45115 /* The following should better go into a dedicated source file such that
45116diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45117index bc91261..2ef7e36 100644
45118--- a/drivers/isdn/i4l/isdn_tty.c
45119+++ b/drivers/isdn/i4l/isdn_tty.c
45120@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45121
45122 #ifdef ISDN_DEBUG_MODEM_OPEN
45123 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45124- port->count);
45125+ atomic_read(&port->count));
45126 #endif
45127- port->count++;
45128+ atomic_inc(&port->count);
45129 port->tty = tty;
45130 /*
45131 * Start up serial port
45132@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45133 #endif
45134 return;
45135 }
45136- if ((tty->count == 1) && (port->count != 1)) {
45137+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45138 /*
45139 * Uh, oh. tty->count is 1, which means that the tty
45140 * structure will be freed. Info->count should always
45141@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45142 * serial port won't be shutdown.
45143 */
45144 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45145- "info->count is %d\n", port->count);
45146- port->count = 1;
45147+ "info->count is %d\n", atomic_read(&port->count));
45148+ atomic_set(&port->count, 1);
45149 }
45150- if (--port->count < 0) {
45151+ if (atomic_dec_return(&port->count) < 0) {
45152 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45153- info->line, port->count);
45154- port->count = 0;
45155+ info->line, atomic_read(&port->count));
45156+ atomic_set(&port->count, 0);
45157 }
45158- if (port->count) {
45159+ if (atomic_read(&port->count)) {
45160 #ifdef ISDN_DEBUG_MODEM_OPEN
45161 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45162 #endif
45163@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45164 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45165 return;
45166 isdn_tty_shutdown(info);
45167- port->count = 0;
45168+ atomic_set(&port->count, 0);
45169 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45170 port->tty = NULL;
45171 wake_up_interruptible(&port->open_wait);
45172@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45173 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45174 modem_info *info = &dev->mdm.info[i];
45175
45176- if (info->port.count == 0)
45177+ if (atomic_read(&info->port.count) == 0)
45178 continue;
45179 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45180 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45181diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45182index e2d4e58..40cd045 100644
45183--- a/drivers/isdn/i4l/isdn_x25iface.c
45184+++ b/drivers/isdn/i4l/isdn_x25iface.c
45185@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45186
45187
45188 static struct concap_proto_ops ix25_pops = {
45189- &isdn_x25iface_proto_new,
45190- &isdn_x25iface_proto_del,
45191- &isdn_x25iface_proto_restart,
45192- &isdn_x25iface_proto_close,
45193- &isdn_x25iface_xmit,
45194- &isdn_x25iface_receive,
45195- &isdn_x25iface_connect_ind,
45196- &isdn_x25iface_disconn_ind
45197+ .proto_new = &isdn_x25iface_proto_new,
45198+ .proto_del = &isdn_x25iface_proto_del,
45199+ .restart = &isdn_x25iface_proto_restart,
45200+ .close = &isdn_x25iface_proto_close,
45201+ .encap_and_xmit = &isdn_x25iface_xmit,
45202+ .data_ind = &isdn_x25iface_receive,
45203+ .connect_ind = &isdn_x25iface_connect_ind,
45204+ .disconn_ind = &isdn_x25iface_disconn_ind
45205 };
45206
45207 /* error message helper function */
45208diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45209index 358a574..b4987ea 100644
45210--- a/drivers/isdn/icn/icn.c
45211+++ b/drivers/isdn/icn/icn.c
45212@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45213 if (count > len)
45214 count = len;
45215 if (user) {
45216- if (copy_from_user(msg, buf, count))
45217+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45218 return -EFAULT;
45219 } else
45220 memcpy(msg, buf, count);
45221diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45222index 52c4382..09e0c7c 100644
45223--- a/drivers/isdn/mISDN/dsp_cmx.c
45224+++ b/drivers/isdn/mISDN/dsp_cmx.c
45225@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45226 static u16 dsp_count; /* last sample count */
45227 static int dsp_count_valid; /* if we have last sample count */
45228
45229-void
45230+void __intentional_overflow(-1)
45231 dsp_cmx_send(void *arg)
45232 {
45233 struct dsp_conf *conf;
45234diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45235index 312ffd3..9263d05 100644
45236--- a/drivers/lguest/core.c
45237+++ b/drivers/lguest/core.c
45238@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45239 * The end address needs +1 because __get_vm_area allocates an
45240 * extra guard page, so we need space for that.
45241 */
45242+
45243+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45244+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45245+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45246+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45247+#else
45248 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45249 VM_ALLOC, switcher_addr, switcher_addr
45250 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45251+#endif
45252+
45253 if (!switcher_vma) {
45254 err = -ENOMEM;
45255 printk("lguest: could not map switcher pages high\n");
45256@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45257 * Now the Switcher is mapped at the right address, we can't fail!
45258 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45259 */
45260- memcpy(switcher_vma->addr, start_switcher_text,
45261+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45262 end_switcher_text - start_switcher_text);
45263
45264 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45265diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45266index e3abebc9..6a35328 100644
45267--- a/drivers/lguest/page_tables.c
45268+++ b/drivers/lguest/page_tables.c
45269@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45270 /*:*/
45271
45272 #ifdef CONFIG_X86_PAE
45273-static void release_pmd(pmd_t *spmd)
45274+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45275 {
45276 /* If the entry's not present, there's nothing to release. */
45277 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45278diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45279index 30f2aef..391c748 100644
45280--- a/drivers/lguest/x86/core.c
45281+++ b/drivers/lguest/x86/core.c
45282@@ -60,7 +60,7 @@ static struct {
45283 /* Offset from where switcher.S was compiled to where we've copied it */
45284 static unsigned long switcher_offset(void)
45285 {
45286- return switcher_addr - (unsigned long)start_switcher_text;
45287+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45288 }
45289
45290 /* This cpu's struct lguest_pages (after the Switcher text page) */
45291@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45292 * These copies are pretty cheap, so we do them unconditionally: */
45293 /* Save the current Host top-level page directory.
45294 */
45295+
45296+#ifdef CONFIG_PAX_PER_CPU_PGD
45297+ pages->state.host_cr3 = read_cr3();
45298+#else
45299 pages->state.host_cr3 = __pa(current->mm->pgd);
45300+#endif
45301+
45302 /*
45303 * Set up the Guest's page tables to see this CPU's pages (and no
45304 * other CPU's pages).
45305@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45306 * compiled-in switcher code and the high-mapped copy we just made.
45307 */
45308 for (i = 0; i < IDT_ENTRIES; i++)
45309- default_idt_entries[i] += switcher_offset();
45310+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45311
45312 /*
45313 * Set up the Switcher's per-cpu areas.
45314@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45315 * it will be undisturbed when we switch. To change %cs and jump we
45316 * need this structure to feed to Intel's "lcall" instruction.
45317 */
45318- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45319+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45320 lguest_entry.segment = LGUEST_CS;
45321
45322 /*
45323diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45324index 40634b0..4f5855e 100644
45325--- a/drivers/lguest/x86/switcher_32.S
45326+++ b/drivers/lguest/x86/switcher_32.S
45327@@ -87,6 +87,7 @@
45328 #include <asm/page.h>
45329 #include <asm/segment.h>
45330 #include <asm/lguest.h>
45331+#include <asm/processor-flags.h>
45332
45333 // We mark the start of the code to copy
45334 // It's placed in .text tho it's never run here
45335@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45336 // Changes type when we load it: damn Intel!
45337 // For after we switch over our page tables
45338 // That entry will be read-only: we'd crash.
45339+
45340+#ifdef CONFIG_PAX_KERNEXEC
45341+ mov %cr0, %edx
45342+ xor $X86_CR0_WP, %edx
45343+ mov %edx, %cr0
45344+#endif
45345+
45346 movl $(GDT_ENTRY_TSS*8), %edx
45347 ltr %dx
45348
45349@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45350 // Let's clear it again for our return.
45351 // The GDT descriptor of the Host
45352 // Points to the table after two "size" bytes
45353- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45354+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45355 // Clear "used" from type field (byte 5, bit 2)
45356- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45357+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45358+
45359+#ifdef CONFIG_PAX_KERNEXEC
45360+ mov %cr0, %eax
45361+ xor $X86_CR0_WP, %eax
45362+ mov %eax, %cr0
45363+#endif
45364
45365 // Once our page table's switched, the Guest is live!
45366 // The Host fades as we run this final step.
45367@@ -295,13 +309,12 @@ deliver_to_host:
45368 // I consulted gcc, and it gave
45369 // These instructions, which I gladly credit:
45370 leal (%edx,%ebx,8), %eax
45371- movzwl (%eax),%edx
45372- movl 4(%eax), %eax
45373- xorw %ax, %ax
45374- orl %eax, %edx
45375+ movl 4(%eax), %edx
45376+ movw (%eax), %dx
45377 // Now the address of the handler's in %edx
45378 // We call it now: its "iret" drops us home.
45379- jmp *%edx
45380+ ljmp $__KERNEL_CS, $1f
45381+1: jmp *%edx
45382
45383 // Every interrupt can come to us here
45384 // But we must truly tell each apart.
45385diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45386index a08e3ee..df8ade2 100644
45387--- a/drivers/md/bcache/closure.h
45388+++ b/drivers/md/bcache/closure.h
45389@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45390 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45391 struct workqueue_struct *wq)
45392 {
45393- BUG_ON(object_is_on_stack(cl));
45394+ BUG_ON(object_starts_on_stack(cl));
45395 closure_set_ip(cl);
45396 cl->fn = fn;
45397 cl->wq = wq;
45398diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45399index 135a090..f7872f6 100644
45400--- a/drivers/md/bitmap.c
45401+++ b/drivers/md/bitmap.c
45402@@ -1927,7 +1927,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45403 chunk_kb ? "KB" : "B");
45404 if (bitmap->storage.file) {
45405 seq_printf(seq, ", file: ");
45406- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45407+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45408 }
45409
45410 seq_printf(seq, "\n");
45411diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45412index 720ceeb..030f1d4 100644
45413--- a/drivers/md/dm-ioctl.c
45414+++ b/drivers/md/dm-ioctl.c
45415@@ -1773,7 +1773,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45416 cmd == DM_LIST_VERSIONS_CMD)
45417 return 0;
45418
45419- if ((cmd == DM_DEV_CREATE_CMD)) {
45420+ if (cmd == DM_DEV_CREATE_CMD) {
45421 if (!*param->name) {
45422 DMWARN("name not supplied when creating device");
45423 return -EINVAL;
45424diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45425index 089d627..ef7352e 100644
45426--- a/drivers/md/dm-raid1.c
45427+++ b/drivers/md/dm-raid1.c
45428@@ -40,7 +40,7 @@ enum dm_raid1_error {
45429
45430 struct mirror {
45431 struct mirror_set *ms;
45432- atomic_t error_count;
45433+ atomic_unchecked_t error_count;
45434 unsigned long error_type;
45435 struct dm_dev *dev;
45436 sector_t offset;
45437@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45438 struct mirror *m;
45439
45440 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45441- if (!atomic_read(&m->error_count))
45442+ if (!atomic_read_unchecked(&m->error_count))
45443 return m;
45444
45445 return NULL;
45446@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45447 * simple way to tell if a device has encountered
45448 * errors.
45449 */
45450- atomic_inc(&m->error_count);
45451+ atomic_inc_unchecked(&m->error_count);
45452
45453 if (test_and_set_bit(error_type, &m->error_type))
45454 return;
45455@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45456 struct mirror *m = get_default_mirror(ms);
45457
45458 do {
45459- if (likely(!atomic_read(&m->error_count)))
45460+ if (likely(!atomic_read_unchecked(&m->error_count)))
45461 return m;
45462
45463 if (m-- == ms->mirror)
45464@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45465 {
45466 struct mirror *default_mirror = get_default_mirror(m->ms);
45467
45468- return !atomic_read(&default_mirror->error_count);
45469+ return !atomic_read_unchecked(&default_mirror->error_count);
45470 }
45471
45472 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45473@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45474 */
45475 if (likely(region_in_sync(ms, region, 1)))
45476 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45477- else if (m && atomic_read(&m->error_count))
45478+ else if (m && atomic_read_unchecked(&m->error_count))
45479 m = NULL;
45480
45481 if (likely(m))
45482@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45483 }
45484
45485 ms->mirror[mirror].ms = ms;
45486- atomic_set(&(ms->mirror[mirror].error_count), 0);
45487+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45488 ms->mirror[mirror].error_type = 0;
45489 ms->mirror[mirror].offset = offset;
45490
45491@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45492 */
45493 static char device_status_char(struct mirror *m)
45494 {
45495- if (!atomic_read(&(m->error_count)))
45496+ if (!atomic_read_unchecked(&(m->error_count)))
45497 return 'A';
45498
45499 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45500diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45501index f478a4c..4b8e5ef 100644
45502--- a/drivers/md/dm-stats.c
45503+++ b/drivers/md/dm-stats.c
45504@@ -382,7 +382,7 @@ do_sync_free:
45505 synchronize_rcu_expedited();
45506 dm_stat_free(&s->rcu_head);
45507 } else {
45508- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45509+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45510 call_rcu(&s->rcu_head, dm_stat_free);
45511 }
45512 return 0;
45513@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45514 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45515 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45516 ));
45517- ACCESS_ONCE(last->last_sector) = end_sector;
45518- ACCESS_ONCE(last->last_rw) = bi_rw;
45519+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45520+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45521 }
45522
45523 rcu_read_lock();
45524diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45525index f8b37d4..5c5cafd 100644
45526--- a/drivers/md/dm-stripe.c
45527+++ b/drivers/md/dm-stripe.c
45528@@ -21,7 +21,7 @@ struct stripe {
45529 struct dm_dev *dev;
45530 sector_t physical_start;
45531
45532- atomic_t error_count;
45533+ atomic_unchecked_t error_count;
45534 };
45535
45536 struct stripe_c {
45537@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45538 kfree(sc);
45539 return r;
45540 }
45541- atomic_set(&(sc->stripe[i].error_count), 0);
45542+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45543 }
45544
45545 ti->private = sc;
45546@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45547 DMEMIT("%d ", sc->stripes);
45548 for (i = 0; i < sc->stripes; i++) {
45549 DMEMIT("%s ", sc->stripe[i].dev->name);
45550- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45551+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45552 'D' : 'A';
45553 }
45554 buffer[i] = '\0';
45555@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45556 */
45557 for (i = 0; i < sc->stripes; i++)
45558 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45559- atomic_inc(&(sc->stripe[i].error_count));
45560- if (atomic_read(&(sc->stripe[i].error_count)) <
45561+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45562+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45563 DM_IO_ERROR_THRESHOLD)
45564 schedule_work(&sc->trigger_event);
45565 }
45566diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45567index 16ba55a..31af906 100644
45568--- a/drivers/md/dm-table.c
45569+++ b/drivers/md/dm-table.c
45570@@ -305,7 +305,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45571 if (!dev_size)
45572 return 0;
45573
45574- if ((start >= dev_size) || (start + len > dev_size)) {
45575+ if ((start >= dev_size) || (len > dev_size - start)) {
45576 DMWARN("%s: %s too small for target: "
45577 "start=%llu, len=%llu, dev_size=%llu",
45578 dm_device_name(ti->table->md), bdevname(bdev, b),
45579diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45580index 79f6941..b33b4e0 100644
45581--- a/drivers/md/dm-thin-metadata.c
45582+++ b/drivers/md/dm-thin-metadata.c
45583@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45584 {
45585 pmd->info.tm = pmd->tm;
45586 pmd->info.levels = 2;
45587- pmd->info.value_type.context = pmd->data_sm;
45588+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45589 pmd->info.value_type.size = sizeof(__le64);
45590 pmd->info.value_type.inc = data_block_inc;
45591 pmd->info.value_type.dec = data_block_dec;
45592@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45593
45594 pmd->bl_info.tm = pmd->tm;
45595 pmd->bl_info.levels = 1;
45596- pmd->bl_info.value_type.context = pmd->data_sm;
45597+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45598 pmd->bl_info.value_type.size = sizeof(__le64);
45599 pmd->bl_info.value_type.inc = data_block_inc;
45600 pmd->bl_info.value_type.dec = data_block_dec;
45601diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45602index 2caf492..0c0dcac 100644
45603--- a/drivers/md/dm.c
45604+++ b/drivers/md/dm.c
45605@@ -191,9 +191,9 @@ struct mapped_device {
45606 /*
45607 * Event handling.
45608 */
45609- atomic_t event_nr;
45610+ atomic_unchecked_t event_nr;
45611 wait_queue_head_t eventq;
45612- atomic_t uevent_seq;
45613+ atomic_unchecked_t uevent_seq;
45614 struct list_head uevent_list;
45615 spinlock_t uevent_lock; /* Protect access to uevent_list */
45616
45617@@ -2298,8 +2298,8 @@ static struct mapped_device *alloc_dev(int minor)
45618 spin_lock_init(&md->deferred_lock);
45619 atomic_set(&md->holders, 1);
45620 atomic_set(&md->open_count, 0);
45621- atomic_set(&md->event_nr, 0);
45622- atomic_set(&md->uevent_seq, 0);
45623+ atomic_set_unchecked(&md->event_nr, 0);
45624+ atomic_set_unchecked(&md->uevent_seq, 0);
45625 INIT_LIST_HEAD(&md->uevent_list);
45626 INIT_LIST_HEAD(&md->table_devices);
45627 spin_lock_init(&md->uevent_lock);
45628@@ -2466,7 +2466,7 @@ static void event_callback(void *context)
45629
45630 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45631
45632- atomic_inc(&md->event_nr);
45633+ atomic_inc_unchecked(&md->event_nr);
45634 wake_up(&md->eventq);
45635 }
45636
45637@@ -3465,18 +3465,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45638
45639 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45640 {
45641- return atomic_add_return(1, &md->uevent_seq);
45642+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45643 }
45644
45645 uint32_t dm_get_event_nr(struct mapped_device *md)
45646 {
45647- return atomic_read(&md->event_nr);
45648+ return atomic_read_unchecked(&md->event_nr);
45649 }
45650
45651 int dm_wait_event(struct mapped_device *md, int event_nr)
45652 {
45653 return wait_event_interruptible(md->eventq,
45654- (event_nr != atomic_read(&md->event_nr)));
45655+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45656 }
45657
45658 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45659diff --git a/drivers/md/md.c b/drivers/md/md.c
45660index 4dbed4a..bed2a6a 100644
45661--- a/drivers/md/md.c
45662+++ b/drivers/md/md.c
45663@@ -197,10 +197,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45664 * start build, activate spare
45665 */
45666 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45667-static atomic_t md_event_count;
45668+static atomic_unchecked_t md_event_count;
45669 void md_new_event(struct mddev *mddev)
45670 {
45671- atomic_inc(&md_event_count);
45672+ atomic_inc_unchecked(&md_event_count);
45673 wake_up(&md_event_waiters);
45674 }
45675 EXPORT_SYMBOL_GPL(md_new_event);
45676@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45677 */
45678 static void md_new_event_inintr(struct mddev *mddev)
45679 {
45680- atomic_inc(&md_event_count);
45681+ atomic_inc_unchecked(&md_event_count);
45682 wake_up(&md_event_waiters);
45683 }
45684
45685@@ -1449,7 +1449,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45686 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45687 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45688 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45689- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45690+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45691
45692 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45693 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45694@@ -1700,7 +1700,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45695 else
45696 sb->resync_offset = cpu_to_le64(0);
45697
45698- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45699+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45700
45701 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45702 sb->size = cpu_to_le64(mddev->dev_sectors);
45703@@ -2624,7 +2624,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45704 static ssize_t
45705 errors_show(struct md_rdev *rdev, char *page)
45706 {
45707- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45708+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45709 }
45710
45711 static ssize_t
45712@@ -2633,7 +2633,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45713 char *e;
45714 unsigned long n = simple_strtoul(buf, &e, 10);
45715 if (*buf && (*e == 0 || *e == '\n')) {
45716- atomic_set(&rdev->corrected_errors, n);
45717+ atomic_set_unchecked(&rdev->corrected_errors, n);
45718 return len;
45719 }
45720 return -EINVAL;
45721@@ -3069,8 +3069,8 @@ int md_rdev_init(struct md_rdev *rdev)
45722 rdev->sb_loaded = 0;
45723 rdev->bb_page = NULL;
45724 atomic_set(&rdev->nr_pending, 0);
45725- atomic_set(&rdev->read_errors, 0);
45726- atomic_set(&rdev->corrected_errors, 0);
45727+ atomic_set_unchecked(&rdev->read_errors, 0);
45728+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45729
45730 INIT_LIST_HEAD(&rdev->same_set);
45731 init_waitqueue_head(&rdev->blocked_wait);
45732@@ -7232,7 +7232,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45733
45734 spin_unlock(&pers_lock);
45735 seq_printf(seq, "\n");
45736- seq->poll_event = atomic_read(&md_event_count);
45737+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45738 return 0;
45739 }
45740 if (v == (void*)2) {
45741@@ -7335,7 +7335,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45742 return error;
45743
45744 seq = file->private_data;
45745- seq->poll_event = atomic_read(&md_event_count);
45746+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45747 return error;
45748 }
45749
45750@@ -7352,7 +7352,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45751 /* always allow read */
45752 mask = POLLIN | POLLRDNORM;
45753
45754- if (seq->poll_event != atomic_read(&md_event_count))
45755+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45756 mask |= POLLERR | POLLPRI;
45757 return mask;
45758 }
45759@@ -7448,7 +7448,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45760 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45761 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45762 (int)part_stat_read(&disk->part0, sectors[1]) -
45763- atomic_read(&disk->sync_io);
45764+ atomic_read_unchecked(&disk->sync_io);
45765 /* sync IO will cause sync_io to increase before the disk_stats
45766 * as sync_io is counted when a request starts, and
45767 * disk_stats is counted when it completes.
45768diff --git a/drivers/md/md.h b/drivers/md/md.h
45769index 4046a6c..e2f2997 100644
45770--- a/drivers/md/md.h
45771+++ b/drivers/md/md.h
45772@@ -95,13 +95,13 @@ struct md_rdev {
45773 * only maintained for arrays that
45774 * support hot removal
45775 */
45776- atomic_t read_errors; /* number of consecutive read errors that
45777+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45778 * we have tried to ignore.
45779 */
45780 struct timespec last_read_error; /* monotonic time since our
45781 * last read error
45782 */
45783- atomic_t corrected_errors; /* number of corrected read errors,
45784+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45785 * for reporting to userspace and storing
45786 * in superblock.
45787 */
45788@@ -486,7 +486,7 @@ extern void mddev_unlock(struct mddev *mddev);
45789
45790 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45791 {
45792- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45793+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45794 }
45795
45796 struct md_personality
45797diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45798index e8a9042..35bd145 100644
45799--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45800+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45801@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45802 * Flick into a mode where all blocks get allocated in the new area.
45803 */
45804 smm->begin = old_len;
45805- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45806+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45807
45808 /*
45809 * Extend.
45810@@ -714,7 +714,7 @@ out:
45811 /*
45812 * Switch back to normal behaviour.
45813 */
45814- memcpy(sm, &ops, sizeof(*sm));
45815+ memcpy((void *)sm, &ops, sizeof(*sm));
45816 return r;
45817 }
45818
45819diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45820index 3e6d115..ffecdeb 100644
45821--- a/drivers/md/persistent-data/dm-space-map.h
45822+++ b/drivers/md/persistent-data/dm-space-map.h
45823@@ -71,6 +71,7 @@ struct dm_space_map {
45824 dm_sm_threshold_fn fn,
45825 void *context);
45826 };
45827+typedef struct dm_space_map __no_const dm_space_map_no_const;
45828
45829 /*----------------------------------------------------------------*/
45830
45831diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45832index 9157a29..0d462f0 100644
45833--- a/drivers/md/raid1.c
45834+++ b/drivers/md/raid1.c
45835@@ -1934,7 +1934,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45836 if (r1_sync_page_io(rdev, sect, s,
45837 bio->bi_io_vec[idx].bv_page,
45838 READ) != 0)
45839- atomic_add(s, &rdev->corrected_errors);
45840+ atomic_add_unchecked(s, &rdev->corrected_errors);
45841 }
45842 sectors -= s;
45843 sect += s;
45844@@ -2167,7 +2167,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45845 !test_bit(Faulty, &rdev->flags)) {
45846 if (r1_sync_page_io(rdev, sect, s,
45847 conf->tmppage, READ)) {
45848- atomic_add(s, &rdev->corrected_errors);
45849+ atomic_add_unchecked(s, &rdev->corrected_errors);
45850 printk(KERN_INFO
45851 "md/raid1:%s: read error corrected "
45852 "(%d sectors at %llu on %s)\n",
45853diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45854index f55c3f3..4cca8c8 100644
45855--- a/drivers/md/raid10.c
45856+++ b/drivers/md/raid10.c
45857@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45858 /* The write handler will notice the lack of
45859 * R10BIO_Uptodate and record any errors etc
45860 */
45861- atomic_add(r10_bio->sectors,
45862+ atomic_add_unchecked(r10_bio->sectors,
45863 &conf->mirrors[d].rdev->corrected_errors);
45864
45865 /* for reconstruct, we always reschedule after a read.
45866@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45867 {
45868 struct timespec cur_time_mon;
45869 unsigned long hours_since_last;
45870- unsigned int read_errors = atomic_read(&rdev->read_errors);
45871+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45872
45873 ktime_get_ts(&cur_time_mon);
45874
45875@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45876 * overflowing the shift of read_errors by hours_since_last.
45877 */
45878 if (hours_since_last >= 8 * sizeof(read_errors))
45879- atomic_set(&rdev->read_errors, 0);
45880+ atomic_set_unchecked(&rdev->read_errors, 0);
45881 else
45882- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45883+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45884 }
45885
45886 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45887@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45888 return;
45889
45890 check_decay_read_errors(mddev, rdev);
45891- atomic_inc(&rdev->read_errors);
45892- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45893+ atomic_inc_unchecked(&rdev->read_errors);
45894+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45895 char b[BDEVNAME_SIZE];
45896 bdevname(rdev->bdev, b);
45897
45898@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45899 "md/raid10:%s: %s: Raid device exceeded "
45900 "read_error threshold [cur %d:max %d]\n",
45901 mdname(mddev), b,
45902- atomic_read(&rdev->read_errors), max_read_errors);
45903+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45904 printk(KERN_NOTICE
45905 "md/raid10:%s: %s: Failing raid device\n",
45906 mdname(mddev), b);
45907@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45908 sect +
45909 choose_data_offset(r10_bio, rdev)),
45910 bdevname(rdev->bdev, b));
45911- atomic_add(s, &rdev->corrected_errors);
45912+ atomic_add_unchecked(s, &rdev->corrected_errors);
45913 }
45914
45915 rdev_dec_pending(rdev, mddev);
45916diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45917index b6793d2..92be2bc 100644
45918--- a/drivers/md/raid5.c
45919+++ b/drivers/md/raid5.c
45920@@ -1108,23 +1108,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45921 struct bio_vec bvl;
45922 struct bvec_iter iter;
45923 struct page *bio_page;
45924- int page_offset;
45925+ s64 page_offset;
45926 struct async_submit_ctl submit;
45927 enum async_tx_flags flags = 0;
45928
45929 if (bio->bi_iter.bi_sector >= sector)
45930- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45931+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45932 else
45933- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45934+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45935
45936 if (frombio)
45937 flags |= ASYNC_TX_FENCE;
45938 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45939
45940 bio_for_each_segment(bvl, bio, iter) {
45941- int len = bvl.bv_len;
45942- int clen;
45943- int b_offset = 0;
45944+ s64 len = bvl.bv_len;
45945+ s64 clen;
45946+ s64 b_offset = 0;
45947
45948 if (page_offset < 0) {
45949 b_offset = -page_offset;
45950@@ -2017,6 +2017,10 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
45951 return 1;
45952 }
45953
45954+#ifdef CONFIG_GRKERNSEC_HIDESYM
45955+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45956+#endif
45957+
45958 static int grow_stripes(struct r5conf *conf, int num)
45959 {
45960 struct kmem_cache *sc;
45961@@ -2027,7 +2031,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45962 "raid%d-%s", conf->level, mdname(conf->mddev));
45963 else
45964 sprintf(conf->cache_name[0],
45965+#ifdef CONFIG_GRKERNSEC_HIDESYM
45966+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45967+#else
45968 "raid%d-%p", conf->level, conf->mddev);
45969+#endif
45970 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45971
45972 conf->active_name = 0;
45973@@ -2315,21 +2323,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45974 mdname(conf->mddev), STRIPE_SECTORS,
45975 (unsigned long long)s,
45976 bdevname(rdev->bdev, b));
45977- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45978+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45979 clear_bit(R5_ReadError, &sh->dev[i].flags);
45980 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45981 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45982 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45983
45984- if (atomic_read(&rdev->read_errors))
45985- atomic_set(&rdev->read_errors, 0);
45986+ if (atomic_read_unchecked(&rdev->read_errors))
45987+ atomic_set_unchecked(&rdev->read_errors, 0);
45988 } else {
45989 const char *bdn = bdevname(rdev->bdev, b);
45990 int retry = 0;
45991 int set_bad = 0;
45992
45993 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45994- atomic_inc(&rdev->read_errors);
45995+ atomic_inc_unchecked(&rdev->read_errors);
45996 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45997 printk_ratelimited(
45998 KERN_WARNING
45999@@ -2357,7 +2365,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46000 mdname(conf->mddev),
46001 (unsigned long long)s,
46002 bdn);
46003- } else if (atomic_read(&rdev->read_errors)
46004+ } else if (atomic_read_unchecked(&rdev->read_errors)
46005 > conf->max_nr_stripes)
46006 printk(KERN_WARNING
46007 "md/raid:%s: Too many read errors, failing device %s.\n",
46008diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46009index 13bb57f..0ca21b2 100644
46010--- a/drivers/media/dvb-core/dvbdev.c
46011+++ b/drivers/media/dvb-core/dvbdev.c
46012@@ -272,7 +272,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46013 const struct dvb_device *template, void *priv, int type)
46014 {
46015 struct dvb_device *dvbdev;
46016- struct file_operations *dvbdevfops;
46017+ file_operations_no_const *dvbdevfops;
46018 struct device *clsdev;
46019 int minor;
46020 int id;
46021diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46022index 6ad22b6..6e90e2a 100644
46023--- a/drivers/media/dvb-frontends/af9033.h
46024+++ b/drivers/media/dvb-frontends/af9033.h
46025@@ -96,6 +96,6 @@ struct af9033_ops {
46026 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46027 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46028 int onoff);
46029-};
46030+} __no_const;
46031
46032 #endif /* AF9033_H */
46033diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46034index 6ae9899..07d8543 100644
46035--- a/drivers/media/dvb-frontends/dib3000.h
46036+++ b/drivers/media/dvb-frontends/dib3000.h
46037@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46038 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46039 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46040 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46041-};
46042+} __no_const;
46043
46044 #if IS_REACHABLE(CONFIG_DVB_DIB3000MB)
46045 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46046diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46047index baa2789..c8de7fe 100644
46048--- a/drivers/media/dvb-frontends/dib7000p.h
46049+++ b/drivers/media/dvb-frontends/dib7000p.h
46050@@ -64,7 +64,7 @@ struct dib7000p_ops {
46051 int (*get_adc_power)(struct dvb_frontend *fe);
46052 int (*slave_reset)(struct dvb_frontend *fe);
46053 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46054-};
46055+} __no_const;
46056
46057 #if IS_REACHABLE(CONFIG_DVB_DIB7000P)
46058 void *dib7000p_attach(struct dib7000p_ops *ops);
46059diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46060index 780c37b..50e2620 100644
46061--- a/drivers/media/dvb-frontends/dib8000.h
46062+++ b/drivers/media/dvb-frontends/dib8000.h
46063@@ -61,7 +61,7 @@ struct dib8000_ops {
46064 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46065 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46066 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46067-};
46068+} __no_const;
46069
46070 #if IS_REACHABLE(CONFIG_DVB_DIB8000)
46071 void *dib8000_attach(struct dib8000_ops *ops);
46072diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46073index c9decd8..7849cec 100644
46074--- a/drivers/media/pci/cx88/cx88-video.c
46075+++ b/drivers/media/pci/cx88/cx88-video.c
46076@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46077
46078 /* ------------------------------------------------------------------ */
46079
46080-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46081-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46082-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46083+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46084+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46085+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46086
46087 module_param_array(video_nr, int, NULL, 0444);
46088 module_param_array(vbi_nr, int, NULL, 0444);
46089diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46090index c2e60b4..5eeccc0 100644
46091--- a/drivers/media/pci/ivtv/ivtv-driver.c
46092+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46093@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46094 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46095
46096 /* ivtv instance counter */
46097-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46098+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46099
46100 /* Parameter declarations */
46101 static int cardtype[IVTV_MAX_CARDS];
46102diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46103index 570d119..ed25830 100644
46104--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46105+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46106@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46107
46108 static int solo_sysfs_init(struct solo_dev *solo_dev)
46109 {
46110- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46111+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46112 struct device *dev = &solo_dev->dev;
46113 const char *driver;
46114 int i;
46115diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46116index 7ddc767..1c24361 100644
46117--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46118+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46119@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46120
46121 int solo_g723_init(struct solo_dev *solo_dev)
46122 {
46123- static struct snd_device_ops ops = { NULL };
46124+ static struct snd_device_ops ops = { };
46125 struct snd_card *card;
46126 struct snd_kcontrol_new kctl;
46127 char name[32];
46128diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46129index 8c84846..27b4f83 100644
46130--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46131+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46132@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46133
46134 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46135 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46136- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46137+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46138 if (p2m_id < 0)
46139 p2m_id = -p2m_id;
46140 }
46141diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46142index 1ca54b0..7d7cb9a 100644
46143--- a/drivers/media/pci/solo6x10/solo6x10.h
46144+++ b/drivers/media/pci/solo6x10/solo6x10.h
46145@@ -218,7 +218,7 @@ struct solo_dev {
46146
46147 /* P2M DMA Engine */
46148 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46149- atomic_t p2m_count;
46150+ atomic_unchecked_t p2m_count;
46151 int p2m_jiffies;
46152 unsigned int p2m_timeouts;
46153
46154diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46155index c135165..dc69499 100644
46156--- a/drivers/media/pci/tw68/tw68-core.c
46157+++ b/drivers/media/pci/tw68/tw68-core.c
46158@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46159 module_param_array(card, int, NULL, 0444);
46160 MODULE_PARM_DESC(card, "card type");
46161
46162-static atomic_t tw68_instance = ATOMIC_INIT(0);
46163+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46164
46165 /* ------------------------------------------------------------------ */
46166
46167diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46168index 17b189a..b78aa6b 100644
46169--- a/drivers/media/platform/omap/omap_vout.c
46170+++ b/drivers/media/platform/omap/omap_vout.c
46171@@ -63,7 +63,6 @@ enum omap_vout_channels {
46172 OMAP_VIDEO2,
46173 };
46174
46175-static struct videobuf_queue_ops video_vbq_ops;
46176 /* Variables configurable through module params*/
46177 static u32 video1_numbuffers = 3;
46178 static u32 video2_numbuffers = 3;
46179@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46180 {
46181 struct videobuf_queue *q;
46182 struct omap_vout_device *vout = NULL;
46183+ static struct videobuf_queue_ops video_vbq_ops = {
46184+ .buf_setup = omap_vout_buffer_setup,
46185+ .buf_prepare = omap_vout_buffer_prepare,
46186+ .buf_release = omap_vout_buffer_release,
46187+ .buf_queue = omap_vout_buffer_queue,
46188+ };
46189
46190 vout = video_drvdata(file);
46191 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46192@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46193 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46194
46195 q = &vout->vbq;
46196- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46197- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46198- video_vbq_ops.buf_release = omap_vout_buffer_release;
46199- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46200 spin_lock_init(&vout->vbq_lock);
46201
46202 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46203diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46204index fb2acc5..a2fcbdc4 100644
46205--- a/drivers/media/platform/s5p-tv/mixer.h
46206+++ b/drivers/media/platform/s5p-tv/mixer.h
46207@@ -156,7 +156,7 @@ struct mxr_layer {
46208 /** layer index (unique identifier) */
46209 int idx;
46210 /** callbacks for layer methods */
46211- struct mxr_layer_ops ops;
46212+ struct mxr_layer_ops *ops;
46213 /** format array */
46214 const struct mxr_format **fmt_array;
46215 /** size of format array */
46216diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46217index 74344c7..a39e70e 100644
46218--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46219+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46220@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46221 {
46222 struct mxr_layer *layer;
46223 int ret;
46224- struct mxr_layer_ops ops = {
46225+ static struct mxr_layer_ops ops = {
46226 .release = mxr_graph_layer_release,
46227 .buffer_set = mxr_graph_buffer_set,
46228 .stream_set = mxr_graph_stream_set,
46229diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46230index b713403..53cb5ad 100644
46231--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46232+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46233@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46234 layer->update_buf = next;
46235 }
46236
46237- layer->ops.buffer_set(layer, layer->update_buf);
46238+ layer->ops->buffer_set(layer, layer->update_buf);
46239
46240 if (done && done != layer->shadow_buf)
46241 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46242diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46243index 751f3b6..d829203 100644
46244--- a/drivers/media/platform/s5p-tv/mixer_video.c
46245+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46246@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46247 layer->geo.src.height = layer->geo.src.full_height;
46248
46249 mxr_geometry_dump(mdev, &layer->geo);
46250- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46251+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46252 mxr_geometry_dump(mdev, &layer->geo);
46253 }
46254
46255@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46256 layer->geo.dst.full_width = mbus_fmt.width;
46257 layer->geo.dst.full_height = mbus_fmt.height;
46258 layer->geo.dst.field = mbus_fmt.field;
46259- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46260+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46261
46262 mxr_geometry_dump(mdev, &layer->geo);
46263 }
46264@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46265 /* set source size to highest accepted value */
46266 geo->src.full_width = max(geo->dst.full_width, pix->width);
46267 geo->src.full_height = max(geo->dst.full_height, pix->height);
46268- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46269+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46270 mxr_geometry_dump(mdev, &layer->geo);
46271 /* set cropping to total visible screen */
46272 geo->src.width = pix->width;
46273@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46274 geo->src.x_offset = 0;
46275 geo->src.y_offset = 0;
46276 /* assure consistency of geometry */
46277- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46278+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46279 mxr_geometry_dump(mdev, &layer->geo);
46280 /* set full size to lowest possible value */
46281 geo->src.full_width = 0;
46282 geo->src.full_height = 0;
46283- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46284+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46285 mxr_geometry_dump(mdev, &layer->geo);
46286
46287 /* returning results */
46288@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46289 target->width = s->r.width;
46290 target->height = s->r.height;
46291
46292- layer->ops.fix_geometry(layer, stage, s->flags);
46293+ layer->ops->fix_geometry(layer, stage, s->flags);
46294
46295 /* retrieve update selection rectangle */
46296 res.left = target->x_offset;
46297@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46298 mxr_output_get(mdev);
46299
46300 mxr_layer_update_output(layer);
46301- layer->ops.format_set(layer);
46302+ layer->ops->format_set(layer);
46303 /* enabling layer in hardware */
46304 spin_lock_irqsave(&layer->enq_slock, flags);
46305 layer->state = MXR_LAYER_STREAMING;
46306 spin_unlock_irqrestore(&layer->enq_slock, flags);
46307
46308- layer->ops.stream_set(layer, MXR_ENABLE);
46309+ layer->ops->stream_set(layer, MXR_ENABLE);
46310 mxr_streamer_get(mdev);
46311
46312 return 0;
46313@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46314 spin_unlock_irqrestore(&layer->enq_slock, flags);
46315
46316 /* disabling layer in hardware */
46317- layer->ops.stream_set(layer, MXR_DISABLE);
46318+ layer->ops->stream_set(layer, MXR_DISABLE);
46319 /* remove one streamer */
46320 mxr_streamer_put(mdev);
46321 /* allow changes in output configuration */
46322@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46323
46324 void mxr_layer_release(struct mxr_layer *layer)
46325 {
46326- if (layer->ops.release)
46327- layer->ops.release(layer);
46328+ if (layer->ops->release)
46329+ layer->ops->release(layer);
46330 }
46331
46332 void mxr_base_layer_release(struct mxr_layer *layer)
46333@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46334
46335 layer->mdev = mdev;
46336 layer->idx = idx;
46337- layer->ops = *ops;
46338+ layer->ops = ops;
46339
46340 spin_lock_init(&layer->enq_slock);
46341 INIT_LIST_HEAD(&layer->enq_list);
46342diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46343index c9388c4..ce71ece 100644
46344--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46345+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46346@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46347 {
46348 struct mxr_layer *layer;
46349 int ret;
46350- struct mxr_layer_ops ops = {
46351+ static struct mxr_layer_ops ops = {
46352 .release = mxr_vp_layer_release,
46353 .buffer_set = mxr_vp_buffer_set,
46354 .stream_set = mxr_vp_stream_set,
46355diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46356index 82affae..42833ec 100644
46357--- a/drivers/media/radio/radio-cadet.c
46358+++ b/drivers/media/radio/radio-cadet.c
46359@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46360 unsigned char readbuf[RDS_BUFFER];
46361 int i = 0;
46362
46363+ if (count > RDS_BUFFER)
46364+ return -EFAULT;
46365 mutex_lock(&dev->lock);
46366 if (dev->rdsstat == 0)
46367 cadet_start_rds(dev);
46368@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46369 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46370 mutex_unlock(&dev->lock);
46371
46372- if (i && copy_to_user(data, readbuf, i))
46373- return -EFAULT;
46374+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46375+ i = -EFAULT;
46376+
46377 return i;
46378 }
46379
46380diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46381index 5236035..c622c74 100644
46382--- a/drivers/media/radio/radio-maxiradio.c
46383+++ b/drivers/media/radio/radio-maxiradio.c
46384@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46385 /* TEA5757 pin mappings */
46386 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46387
46388-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46389+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46390
46391 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46392 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46393diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46394index 050b3bb..79f62b9 100644
46395--- a/drivers/media/radio/radio-shark.c
46396+++ b/drivers/media/radio/radio-shark.c
46397@@ -79,7 +79,7 @@ struct shark_device {
46398 u32 last_val;
46399 };
46400
46401-static atomic_t shark_instance = ATOMIC_INIT(0);
46402+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46403
46404 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46405 {
46406diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46407index 8654e0d..0608a64 100644
46408--- a/drivers/media/radio/radio-shark2.c
46409+++ b/drivers/media/radio/radio-shark2.c
46410@@ -74,7 +74,7 @@ struct shark_device {
46411 u8 *transfer_buffer;
46412 };
46413
46414-static atomic_t shark_instance = ATOMIC_INIT(0);
46415+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46416
46417 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46418 {
46419diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46420index dccf586..d5db411 100644
46421--- a/drivers/media/radio/radio-si476x.c
46422+++ b/drivers/media/radio/radio-si476x.c
46423@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46424 struct si476x_radio *radio;
46425 struct v4l2_ctrl *ctrl;
46426
46427- static atomic_t instance = ATOMIC_INIT(0);
46428+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46429
46430 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46431 if (!radio)
46432diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46433index 704397f..4d05977 100644
46434--- a/drivers/media/radio/wl128x/fmdrv_common.c
46435+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46436@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46437 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46438
46439 /* Radio Nr */
46440-static u32 radio_nr = -1;
46441+static int radio_nr = -1;
46442 module_param(radio_nr, int, 0444);
46443 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46444
46445diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46446index 9fd1527..8927230 100644
46447--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46448+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46449@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46450
46451 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46452 {
46453- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46454- char result[64];
46455- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46456- sizeof(result), 0);
46457+ char *buf;
46458+ char *result;
46459+ int retval;
46460+
46461+ buf = kmalloc(2, GFP_KERNEL);
46462+ if (buf == NULL)
46463+ return -ENOMEM;
46464+ result = kmalloc(64, GFP_KERNEL);
46465+ if (result == NULL) {
46466+ kfree(buf);
46467+ return -ENOMEM;
46468+ }
46469+
46470+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46471+ buf[1] = enable ? 1 : 0;
46472+
46473+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46474+
46475+ kfree(buf);
46476+ kfree(result);
46477+ return retval;
46478 }
46479
46480 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46481 {
46482- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46483- char state[3];
46484- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46485+ char *buf;
46486+ char *state;
46487+ int retval;
46488+
46489+ buf = kmalloc(2, GFP_KERNEL);
46490+ if (buf == NULL)
46491+ return -ENOMEM;
46492+ state = kmalloc(3, GFP_KERNEL);
46493+ if (state == NULL) {
46494+ kfree(buf);
46495+ return -ENOMEM;
46496+ }
46497+
46498+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46499+ buf[1] = enable ? 1 : 0;
46500+
46501+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46502+
46503+ kfree(buf);
46504+ kfree(state);
46505+ return retval;
46506 }
46507
46508 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46509 {
46510- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46511- char state[3];
46512+ char *query;
46513+ char *state;
46514 int ret;
46515+ query = kmalloc(1, GFP_KERNEL);
46516+ if (query == NULL)
46517+ return -ENOMEM;
46518+ state = kmalloc(3, GFP_KERNEL);
46519+ if (state == NULL) {
46520+ kfree(query);
46521+ return -ENOMEM;
46522+ }
46523+
46524+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46525
46526 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46527
46528- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46529- sizeof(state), 0);
46530+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46531 if (ret < 0) {
46532 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46533 "state info\n");
46534@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46535
46536 /* Copy this pointer as we are gonna need it in the release phase */
46537 cinergyt2_usb_device = adap->dev;
46538-
46539+ kfree(query);
46540+ kfree(state);
46541 return 0;
46542 }
46543
46544@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46545 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46546 {
46547 struct cinergyt2_state *st = d->priv;
46548- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46549+ u8 *key, *cmd;
46550 int i;
46551
46552+ cmd = kmalloc(1, GFP_KERNEL);
46553+ if (cmd == NULL)
46554+ return -EINVAL;
46555+ key = kzalloc(5, GFP_KERNEL);
46556+ if (key == NULL) {
46557+ kfree(cmd);
46558+ return -EINVAL;
46559+ }
46560+
46561+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46562+
46563 *state = REMOTE_NO_KEY_PRESSED;
46564
46565- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46566+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46567 if (key[4] == 0xff) {
46568 /* key repeat */
46569 st->rc_counter++;
46570@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46571 *event = d->last_event;
46572 deb_rc("repeat key, event %x\n",
46573 *event);
46574- return 0;
46575+ goto out;
46576 }
46577 }
46578 deb_rc("repeated key (non repeatable)\n");
46579 }
46580- return 0;
46581+ goto out;
46582 }
46583
46584 /* hack to pass checksum on the custom field */
46585@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46586
46587 deb_rc("key: %*ph\n", 5, key);
46588 }
46589+out:
46590+ kfree(cmd);
46591+ kfree(key);
46592 return 0;
46593 }
46594
46595diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46596index c890fe4..f9b2ae6 100644
46597--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46598+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46599@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46600 fe_status_t *status)
46601 {
46602 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46603- struct dvbt_get_status_msg result;
46604- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46605+ struct dvbt_get_status_msg *result;
46606+ u8 *cmd;
46607 int ret;
46608
46609- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46610- sizeof(result), 0);
46611+ cmd = kmalloc(1, GFP_KERNEL);
46612+ if (cmd == NULL)
46613+ return -ENOMEM;
46614+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46615+ if (result == NULL) {
46616+ kfree(cmd);
46617+ return -ENOMEM;
46618+ }
46619+
46620+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46621+
46622+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46623+ sizeof(*result), 0);
46624 if (ret < 0)
46625- return ret;
46626+ goto out;
46627
46628 *status = 0;
46629
46630- if (0xffff - le16_to_cpu(result.gain) > 30)
46631+ if (0xffff - le16_to_cpu(result->gain) > 30)
46632 *status |= FE_HAS_SIGNAL;
46633- if (result.lock_bits & (1 << 6))
46634+ if (result->lock_bits & (1 << 6))
46635 *status |= FE_HAS_LOCK;
46636- if (result.lock_bits & (1 << 5))
46637+ if (result->lock_bits & (1 << 5))
46638 *status |= FE_HAS_SYNC;
46639- if (result.lock_bits & (1 << 4))
46640+ if (result->lock_bits & (1 << 4))
46641 *status |= FE_HAS_CARRIER;
46642- if (result.lock_bits & (1 << 1))
46643+ if (result->lock_bits & (1 << 1))
46644 *status |= FE_HAS_VITERBI;
46645
46646 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46647 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46648 *status &= ~FE_HAS_LOCK;
46649
46650- return 0;
46651+out:
46652+ kfree(cmd);
46653+ kfree(result);
46654+ return ret;
46655 }
46656
46657 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46658 {
46659 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46660- struct dvbt_get_status_msg status;
46661- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46662+ struct dvbt_get_status_msg *status;
46663+ char *cmd;
46664 int ret;
46665
46666- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46667- sizeof(status), 0);
46668+ cmd = kmalloc(1, GFP_KERNEL);
46669+ if (cmd == NULL)
46670+ return -ENOMEM;
46671+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46672+ if (status == NULL) {
46673+ kfree(cmd);
46674+ return -ENOMEM;
46675+ }
46676+
46677+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46678+
46679+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46680+ sizeof(*status), 0);
46681 if (ret < 0)
46682- return ret;
46683+ goto out;
46684
46685- *ber = le32_to_cpu(status.viterbi_error_rate);
46686+ *ber = le32_to_cpu(status->viterbi_error_rate);
46687+out:
46688+ kfree(cmd);
46689+ kfree(status);
46690 return 0;
46691 }
46692
46693 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46694 {
46695 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46696- struct dvbt_get_status_msg status;
46697- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46698+ struct dvbt_get_status_msg *status;
46699+ u8 *cmd;
46700 int ret;
46701
46702- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46703- sizeof(status), 0);
46704+ cmd = kmalloc(1, GFP_KERNEL);
46705+ if (cmd == NULL)
46706+ return -ENOMEM;
46707+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46708+ if (status == NULL) {
46709+ kfree(cmd);
46710+ return -ENOMEM;
46711+ }
46712+
46713+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46714+
46715+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46716+ sizeof(*status), 0);
46717 if (ret < 0) {
46718 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46719 ret);
46720- return ret;
46721+ goto out;
46722 }
46723- *unc = le32_to_cpu(status.uncorrected_block_count);
46724- return 0;
46725+ *unc = le32_to_cpu(status->uncorrected_block_count);
46726+
46727+out:
46728+ kfree(cmd);
46729+ kfree(status);
46730+ return ret;
46731 }
46732
46733 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46734 u16 *strength)
46735 {
46736 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46737- struct dvbt_get_status_msg status;
46738- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46739+ struct dvbt_get_status_msg *status;
46740+ char *cmd;
46741 int ret;
46742
46743- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46744- sizeof(status), 0);
46745+ cmd = kmalloc(1, GFP_KERNEL);
46746+ if (cmd == NULL)
46747+ return -ENOMEM;
46748+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46749+ if (status == NULL) {
46750+ kfree(cmd);
46751+ return -ENOMEM;
46752+ }
46753+
46754+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46755+
46756+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46757+ sizeof(*status), 0);
46758 if (ret < 0) {
46759 err("cinergyt2_fe_read_signal_strength() Failed!"
46760 " (Error=%d)\n", ret);
46761- return ret;
46762+ goto out;
46763 }
46764- *strength = (0xffff - le16_to_cpu(status.gain));
46765+ *strength = (0xffff - le16_to_cpu(status->gain));
46766+
46767+out:
46768+ kfree(cmd);
46769+ kfree(status);
46770 return 0;
46771 }
46772
46773 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46774 {
46775 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46776- struct dvbt_get_status_msg status;
46777- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46778+ struct dvbt_get_status_msg *status;
46779+ char *cmd;
46780 int ret;
46781
46782- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46783- sizeof(status), 0);
46784+ cmd = kmalloc(1, GFP_KERNEL);
46785+ if (cmd == NULL)
46786+ return -ENOMEM;
46787+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46788+ if (status == NULL) {
46789+ kfree(cmd);
46790+ return -ENOMEM;
46791+ }
46792+
46793+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46794+
46795+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46796+ sizeof(*status), 0);
46797 if (ret < 0) {
46798 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46799- return ret;
46800+ goto out;
46801 }
46802- *snr = (status.snr << 8) | status.snr;
46803- return 0;
46804+ *snr = (status->snr << 8) | status->snr;
46805+
46806+out:
46807+ kfree(cmd);
46808+ kfree(status);
46809+ return ret;
46810 }
46811
46812 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46813@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46814 {
46815 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46816 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46817- struct dvbt_set_parameters_msg param;
46818- char result[2];
46819+ struct dvbt_set_parameters_msg *param;
46820+ char *result;
46821 int err;
46822
46823- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46824- param.tps = cpu_to_le16(compute_tps(fep));
46825- param.freq = cpu_to_le32(fep->frequency / 1000);
46826- param.flags = 0;
46827+ result = kmalloc(2, GFP_KERNEL);
46828+ if (result == NULL)
46829+ return -ENOMEM;
46830+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46831+ if (param == NULL) {
46832+ kfree(result);
46833+ return -ENOMEM;
46834+ }
46835+
46836+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46837+ param->tps = cpu_to_le16(compute_tps(fep));
46838+ param->freq = cpu_to_le32(fep->frequency / 1000);
46839+ param->flags = 0;
46840
46841 switch (fep->bandwidth_hz) {
46842 default:
46843 case 8000000:
46844- param.bandwidth = 8;
46845+ param->bandwidth = 8;
46846 break;
46847 case 7000000:
46848- param.bandwidth = 7;
46849+ param->bandwidth = 7;
46850 break;
46851 case 6000000:
46852- param.bandwidth = 6;
46853+ param->bandwidth = 6;
46854 break;
46855 }
46856
46857 err = dvb_usb_generic_rw(state->d,
46858- (char *)&param, sizeof(param),
46859- result, sizeof(result), 0);
46860+ (char *)param, sizeof(*param),
46861+ result, 2, 0);
46862 if (err < 0)
46863 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46864
46865- return (err < 0) ? err : 0;
46866+ kfree(result);
46867+ kfree(param);
46868+ return err;
46869 }
46870
46871 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46872diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46873index 733a7ff..f8b52e3 100644
46874--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46875+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46876@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46877
46878 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46879 {
46880- struct hexline hx;
46881- u8 reset;
46882+ struct hexline *hx;
46883+ u8 *reset;
46884 int ret,pos=0;
46885
46886+ reset = kmalloc(1, GFP_KERNEL);
46887+ if (reset == NULL)
46888+ return -ENOMEM;
46889+
46890+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46891+ if (hx == NULL) {
46892+ kfree(reset);
46893+ return -ENOMEM;
46894+ }
46895+
46896 /* stop the CPU */
46897- reset = 1;
46898- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46899+ reset[0] = 1;
46900+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46901 err("could not stop the USB controller CPU.");
46902
46903- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46904- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46905- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46906+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46907+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46908+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46909
46910- if (ret != hx.len) {
46911+ if (ret != hx->len) {
46912 err("error while transferring firmware "
46913 "(transferred size: %d, block size: %d)",
46914- ret,hx.len);
46915+ ret,hx->len);
46916 ret = -EINVAL;
46917 break;
46918 }
46919 }
46920 if (ret < 0) {
46921 err("firmware download failed at %d with %d",pos,ret);
46922+ kfree(reset);
46923+ kfree(hx);
46924 return ret;
46925 }
46926
46927 if (ret == 0) {
46928 /* restart the CPU */
46929- reset = 0;
46930- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46931+ reset[0] = 0;
46932+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46933 err("could not restart the USB controller CPU.");
46934 ret = -EINVAL;
46935 }
46936 } else
46937 ret = -EIO;
46938
46939+ kfree(reset);
46940+ kfree(hx);
46941+
46942 return ret;
46943 }
46944 EXPORT_SYMBOL(usb_cypress_load_firmware);
46945diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46946index 5801ae7..83f71fa 100644
46947--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46948+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46949@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46950 static int technisat_usb2_i2c_access(struct usb_device *udev,
46951 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46952 {
46953- u8 b[64];
46954- int ret, actual_length;
46955+ u8 *b = kmalloc(64, GFP_KERNEL);
46956+ int ret, actual_length, error = 0;
46957+
46958+ if (b == NULL)
46959+ return -ENOMEM;
46960
46961 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46962 debug_dump(tx, txlen, deb_i2c);
46963@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46964
46965 if (ret < 0) {
46966 err("i2c-error: out failed %02x = %d", device_addr, ret);
46967- return -ENODEV;
46968+ error = -ENODEV;
46969+ goto out;
46970 }
46971
46972 ret = usb_bulk_msg(udev,
46973@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46974 b, 64, &actual_length, 1000);
46975 if (ret < 0) {
46976 err("i2c-error: in failed %02x = %d", device_addr, ret);
46977- return -ENODEV;
46978+ error = -ENODEV;
46979+ goto out;
46980 }
46981
46982 if (b[0] != I2C_STATUS_OK) {
46983@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46984 /* handle tuner-i2c-nak */
46985 if (!(b[0] == I2C_STATUS_NAK &&
46986 device_addr == 0x60
46987- /* && device_is_technisat_usb2 */))
46988- return -ENODEV;
46989+ /* && device_is_technisat_usb2 */)) {
46990+ error = -ENODEV;
46991+ goto out;
46992+ }
46993 }
46994
46995 deb_i2c("status: %d, ", b[0]);
46996@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46997
46998 deb_i2c("\n");
46999
47000- return 0;
47001+out:
47002+ kfree(b);
47003+ return error;
47004 }
47005
47006 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47007@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47008 {
47009 int ret;
47010
47011- u8 led[8] = {
47012- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47013- 0
47014- };
47015+ u8 *led = kzalloc(8, GFP_KERNEL);
47016+
47017+ if (led == NULL)
47018+ return -ENOMEM;
47019
47020 if (disable_led_control && state != TECH_LED_OFF)
47021 return 0;
47022
47023+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47024+
47025 switch (state) {
47026 case TECH_LED_ON:
47027 led[1] = 0x82;
47028@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47029 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47030 USB_TYPE_VENDOR | USB_DIR_OUT,
47031 0, 0,
47032- led, sizeof(led), 500);
47033+ led, 8, 500);
47034
47035 mutex_unlock(&d->i2c_mutex);
47036+
47037+ kfree(led);
47038+
47039 return ret;
47040 }
47041
47042 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47043 {
47044 int ret;
47045- u8 b = 0;
47046+ u8 *b = kzalloc(1, GFP_KERNEL);
47047+
47048+ if (b == NULL)
47049+ return -ENOMEM;
47050
47051 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47052 return -EAGAIN;
47053@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47054 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47055 USB_TYPE_VENDOR | USB_DIR_OUT,
47056 (red << 8) | green, 0,
47057- &b, 1, 500);
47058+ b, 1, 500);
47059
47060 mutex_unlock(&d->i2c_mutex);
47061
47062+ kfree(b);
47063+
47064 return ret;
47065 }
47066
47067@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47068 struct dvb_usb_device_description **desc, int *cold)
47069 {
47070 int ret;
47071- u8 version[3];
47072+ u8 *version = kmalloc(3, GFP_KERNEL);
47073
47074 /* first select the interface */
47075 if (usb_set_interface(udev, 0, 1) != 0)
47076@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47077
47078 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47079
47080+ if (version == NULL)
47081+ return 0;
47082+
47083 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47084 GET_VERSION_INFO_VENDOR_REQUEST,
47085 USB_TYPE_VENDOR | USB_DIR_IN,
47086 0, 0,
47087- version, sizeof(version), 500);
47088+ version, 3, 500);
47089
47090 if (ret < 0)
47091 *cold = 1;
47092@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47093 *cold = 0;
47094 }
47095
47096+ kfree(version);
47097+
47098 return 0;
47099 }
47100
47101@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47102
47103 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47104 {
47105- u8 buf[62], *b;
47106+ u8 *buf, *b;
47107 int ret;
47108 struct ir_raw_event ev;
47109
47110+ buf = kmalloc(62, GFP_KERNEL);
47111+
47112+ if (buf == NULL)
47113+ return -ENOMEM;
47114+
47115 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47116 buf[1] = 0x08;
47117 buf[2] = 0x8f;
47118@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47119 GET_IR_DATA_VENDOR_REQUEST,
47120 USB_TYPE_VENDOR | USB_DIR_IN,
47121 0x8080, 0,
47122- buf, sizeof(buf), 500);
47123+ buf, 62, 500);
47124
47125 unlock:
47126 mutex_unlock(&d->i2c_mutex);
47127
47128- if (ret < 0)
47129+ if (ret < 0) {
47130+ kfree(buf);
47131 return ret;
47132+ }
47133
47134- if (ret == 1)
47135+ if (ret == 1) {
47136+ kfree(buf);
47137 return 0; /* no key pressed */
47138+ }
47139
47140 /* decoding */
47141 b = buf+1;
47142@@ -656,6 +689,8 @@ unlock:
47143
47144 ir_raw_event_handle(d->rc_dev);
47145
47146+ kfree(buf);
47147+
47148 return 1;
47149 }
47150
47151diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47152index af63543..0436f20 100644
47153--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47154+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47155@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47156 * by passing a very big num_planes value */
47157 uplane = compat_alloc_user_space(num_planes *
47158 sizeof(struct v4l2_plane));
47159- kp->m.planes = (__force struct v4l2_plane *)uplane;
47160+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47161
47162 while (--num_planes >= 0) {
47163 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47164@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47165 if (num_planes == 0)
47166 return 0;
47167
47168- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47169+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47170 if (get_user(p, &up->m.planes))
47171 return -EFAULT;
47172 uplane32 = compat_ptr(p);
47173@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47174 get_user(kp->flags, &up->flags) ||
47175 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47176 return -EFAULT;
47177- kp->base = (__force void *)compat_ptr(tmp);
47178+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47179 return 0;
47180 }
47181
47182@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47183 n * sizeof(struct v4l2_ext_control32)))
47184 return -EFAULT;
47185 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47186- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47187+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47188 while (--n >= 0) {
47189 u32 id;
47190
47191@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47192 {
47193 struct v4l2_ext_control32 __user *ucontrols;
47194 struct v4l2_ext_control __user *kcontrols =
47195- (__force struct v4l2_ext_control __user *)kp->controls;
47196+ (struct v4l2_ext_control __force_user *)kp->controls;
47197 int n = kp->count;
47198 compat_caddr_t p;
47199
47200@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47201 get_user(tmp, &up->edid) ||
47202 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47203 return -EFAULT;
47204- kp->edid = (__force u8 *)compat_ptr(tmp);
47205+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47206 return 0;
47207 }
47208
47209diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47210index 5b0a30b..1974b38 100644
47211--- a/drivers/media/v4l2-core/v4l2-device.c
47212+++ b/drivers/media/v4l2-core/v4l2-device.c
47213@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47214 EXPORT_SYMBOL_GPL(v4l2_device_put);
47215
47216 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47217- atomic_t *instance)
47218+ atomic_unchecked_t *instance)
47219 {
47220- int num = atomic_inc_return(instance) - 1;
47221+ int num = atomic_inc_return_unchecked(instance) - 1;
47222 int len = strlen(basename);
47223
47224 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47225diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47226index aa407cb..ee847d4 100644
47227--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47228+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47229@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47230 struct file *file, void *fh, void *p);
47231 } u;
47232 void (*debug)(const void *arg, bool write_only);
47233-};
47234+} __do_const;
47235+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47236
47237 /* This control needs a priority check */
47238 #define INFO_FL_PRIO (1 << 0)
47239@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47240 struct video_device *vfd = video_devdata(file);
47241 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47242 bool write_only = false;
47243- struct v4l2_ioctl_info default_info;
47244+ v4l2_ioctl_info_no_const default_info;
47245 const struct v4l2_ioctl_info *info;
47246 void *fh = file->private_data;
47247 struct v4l2_fh *vfh = NULL;
47248@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47249 ret = -EINVAL;
47250 break;
47251 }
47252- *user_ptr = (void __user *)buf->m.planes;
47253+ *user_ptr = (void __force_user *)buf->m.planes;
47254 *kernel_ptr = (void **)&buf->m.planes;
47255 *array_size = sizeof(struct v4l2_plane) * buf->length;
47256 ret = 1;
47257@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47258 ret = -EINVAL;
47259 break;
47260 }
47261- *user_ptr = (void __user *)edid->edid;
47262+ *user_ptr = (void __force_user *)edid->edid;
47263 *kernel_ptr = (void **)&edid->edid;
47264 *array_size = edid->blocks * 128;
47265 ret = 1;
47266@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47267 ret = -EINVAL;
47268 break;
47269 }
47270- *user_ptr = (void __user *)ctrls->controls;
47271+ *user_ptr = (void __force_user *)ctrls->controls;
47272 *kernel_ptr = (void **)&ctrls->controls;
47273 *array_size = sizeof(struct v4l2_ext_control)
47274 * ctrls->count;
47275@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47276 }
47277
47278 if (has_array_args) {
47279- *kernel_ptr = (void __force *)user_ptr;
47280+ *kernel_ptr = (void __force_kernel *)user_ptr;
47281 if (copy_to_user(user_ptr, mbuf, array_size))
47282 err = -EFAULT;
47283 goto out_array_args;
47284diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47285index c94ea0d..b8a9f88 100644
47286--- a/drivers/memory/omap-gpmc.c
47287+++ b/drivers/memory/omap-gpmc.c
47288@@ -232,7 +232,6 @@ struct omap3_gpmc_regs {
47289 };
47290
47291 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47292-static struct irq_chip gpmc_irq_chip;
47293 static int gpmc_irq_start;
47294
47295 static struct resource gpmc_mem_root;
47296@@ -1146,6 +1145,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47297
47298 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47299
47300+static struct irq_chip gpmc_irq_chip = {
47301+ .name = "gpmc",
47302+ .irq_startup = gpmc_irq_noop_ret,
47303+ .irq_enable = gpmc_irq_enable,
47304+ .irq_disable = gpmc_irq_disable,
47305+ .irq_shutdown = gpmc_irq_noop,
47306+ .irq_ack = gpmc_irq_noop,
47307+ .irq_mask = gpmc_irq_noop,
47308+ .irq_unmask = gpmc_irq_noop,
47309+};
47310+
47311 static int gpmc_setup_irq(void)
47312 {
47313 int i;
47314@@ -1160,15 +1170,6 @@ static int gpmc_setup_irq(void)
47315 return gpmc_irq_start;
47316 }
47317
47318- gpmc_irq_chip.name = "gpmc";
47319- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47320- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47321- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47322- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47323- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47324- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47325- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47326-
47327 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47328 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47329
47330diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47331index 187f836..679544b 100644
47332--- a/drivers/message/fusion/mptbase.c
47333+++ b/drivers/message/fusion/mptbase.c
47334@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47335 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47336 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47337
47338+#ifdef CONFIG_GRKERNSEC_HIDESYM
47339+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47340+#else
47341 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47342 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47343+#endif
47344+
47345 /*
47346 * Rounding UP to nearest 4-kB boundary here...
47347 */
47348@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47349 ioc->facts.GlobalCredits);
47350
47351 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47352+#ifdef CONFIG_GRKERNSEC_HIDESYM
47353+ NULL, NULL);
47354+#else
47355 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47356+#endif
47357 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47358 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47359 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47360diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47361index 5bdaae1..eced16f 100644
47362--- a/drivers/message/fusion/mptsas.c
47363+++ b/drivers/message/fusion/mptsas.c
47364@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47365 return 0;
47366 }
47367
47368+static inline void
47369+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47370+{
47371+ if (phy_info->port_details) {
47372+ phy_info->port_details->rphy = rphy;
47373+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47374+ ioc->name, rphy));
47375+ }
47376+
47377+ if (rphy) {
47378+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47379+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47380+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47381+ ioc->name, rphy, rphy->dev.release));
47382+ }
47383+}
47384+
47385 /* no mutex */
47386 static void
47387 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47388@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47389 return NULL;
47390 }
47391
47392-static inline void
47393-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47394-{
47395- if (phy_info->port_details) {
47396- phy_info->port_details->rphy = rphy;
47397- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47398- ioc->name, rphy));
47399- }
47400-
47401- if (rphy) {
47402- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47403- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47404- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47405- ioc->name, rphy, rphy->dev.release));
47406- }
47407-}
47408-
47409 static inline struct sas_port *
47410 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47411 {
47412diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47413index cdd6f3d..1907a98 100644
47414--- a/drivers/mfd/ab8500-debugfs.c
47415+++ b/drivers/mfd/ab8500-debugfs.c
47416@@ -100,7 +100,7 @@ static int irq_last;
47417 static u32 *irq_count;
47418 static int num_irqs;
47419
47420-static struct device_attribute **dev_attr;
47421+static device_attribute_no_const **dev_attr;
47422 static char **event_name;
47423
47424 static u8 avg_sample = SAMPLE_16;
47425diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47426index 8057849..0550fdf 100644
47427--- a/drivers/mfd/kempld-core.c
47428+++ b/drivers/mfd/kempld-core.c
47429@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47430 .remove = kempld_remove,
47431 };
47432
47433-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47434+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47435 {
47436 .ident = "BHL6",
47437 .matches = {
47438diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47439index c880c89..45a7c68 100644
47440--- a/drivers/mfd/max8925-i2c.c
47441+++ b/drivers/mfd/max8925-i2c.c
47442@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47443 const struct i2c_device_id *id)
47444 {
47445 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47446- static struct max8925_chip *chip;
47447+ struct max8925_chip *chip;
47448 struct device_node *node = client->dev.of_node;
47449
47450 if (node && !pdata) {
47451diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47452index 7612d89..70549c2 100644
47453--- a/drivers/mfd/tps65910.c
47454+++ b/drivers/mfd/tps65910.c
47455@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47456 struct tps65910_platform_data *pdata)
47457 {
47458 int ret = 0;
47459- static struct regmap_irq_chip *tps6591x_irqs_chip;
47460+ struct regmap_irq_chip *tps6591x_irqs_chip;
47461
47462 if (!irq) {
47463 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47464diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47465index 1b772ef..01e77d33 100644
47466--- a/drivers/mfd/twl4030-irq.c
47467+++ b/drivers/mfd/twl4030-irq.c
47468@@ -34,6 +34,7 @@
47469 #include <linux/of.h>
47470 #include <linux/irqdomain.h>
47471 #include <linux/i2c/twl.h>
47472+#include <asm/pgtable.h>
47473
47474 #include "twl-core.h"
47475
47476@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47477 * Install an irq handler for each of the SIH modules;
47478 * clone dummy irq_chip since PIH can't *do* anything
47479 */
47480- twl4030_irq_chip = dummy_irq_chip;
47481- twl4030_irq_chip.name = "twl4030";
47482+ pax_open_kernel();
47483+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47484+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47485
47486- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47487+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47488+ pax_close_kernel();
47489
47490 for (i = irq_base; i < irq_end; i++) {
47491 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47492diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47493index 464419b..64bae8d 100644
47494--- a/drivers/misc/c2port/core.c
47495+++ b/drivers/misc/c2port/core.c
47496@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47497 goto error_idr_alloc;
47498 c2dev->id = ret;
47499
47500- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47501+ pax_open_kernel();
47502+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47503+ pax_close_kernel();
47504
47505 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47506 "c2port%d", c2dev->id);
47507diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47508index 8385177..2f54635 100644
47509--- a/drivers/misc/eeprom/sunxi_sid.c
47510+++ b/drivers/misc/eeprom/sunxi_sid.c
47511@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47512
47513 platform_set_drvdata(pdev, sid_data);
47514
47515- sid_bin_attr.size = sid_data->keysize;
47516+ pax_open_kernel();
47517+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47518+ pax_close_kernel();
47519 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47520 return -ENODEV;
47521
47522diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47523index 36f5d52..32311c3 100644
47524--- a/drivers/misc/kgdbts.c
47525+++ b/drivers/misc/kgdbts.c
47526@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47527 char before[BREAK_INSTR_SIZE];
47528 char after[BREAK_INSTR_SIZE];
47529
47530- probe_kernel_read(before, (char *)kgdbts_break_test,
47531+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47532 BREAK_INSTR_SIZE);
47533 init_simple_test();
47534 ts.tst = plant_and_detach_test;
47535@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47536 /* Activate test with initial breakpoint */
47537 if (!is_early)
47538 kgdb_breakpoint();
47539- probe_kernel_read(after, (char *)kgdbts_break_test,
47540+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47541 BREAK_INSTR_SIZE);
47542 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47543 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47544diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47545index 4739689..8a52950 100644
47546--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47547+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47548@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47549 * the lid is closed. This leads to interrupts as soon as a little move
47550 * is done.
47551 */
47552- atomic_inc(&lis3->count);
47553+ atomic_inc_unchecked(&lis3->count);
47554
47555 wake_up_interruptible(&lis3->misc_wait);
47556 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47557@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47558 if (lis3->pm_dev)
47559 pm_runtime_get_sync(lis3->pm_dev);
47560
47561- atomic_set(&lis3->count, 0);
47562+ atomic_set_unchecked(&lis3->count, 0);
47563 return 0;
47564 }
47565
47566@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47567 add_wait_queue(&lis3->misc_wait, &wait);
47568 while (true) {
47569 set_current_state(TASK_INTERRUPTIBLE);
47570- data = atomic_xchg(&lis3->count, 0);
47571+ data = atomic_xchg_unchecked(&lis3->count, 0);
47572 if (data)
47573 break;
47574
47575@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47576 struct lis3lv02d, miscdev);
47577
47578 poll_wait(file, &lis3->misc_wait, wait);
47579- if (atomic_read(&lis3->count))
47580+ if (atomic_read_unchecked(&lis3->count))
47581 return POLLIN | POLLRDNORM;
47582 return 0;
47583 }
47584diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47585index c439c82..1f20f57 100644
47586--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47587+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47588@@ -297,7 +297,7 @@ struct lis3lv02d {
47589 struct input_polled_dev *idev; /* input device */
47590 struct platform_device *pdev; /* platform device */
47591 struct regulator_bulk_data regulators[2];
47592- atomic_t count; /* interrupt count after last read */
47593+ atomic_unchecked_t count; /* interrupt count after last read */
47594 union axis_conversion ac; /* hw -> logical axis */
47595 int mapped_btns[3];
47596
47597diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47598index 2f30bad..c4c13d0 100644
47599--- a/drivers/misc/sgi-gru/gruhandles.c
47600+++ b/drivers/misc/sgi-gru/gruhandles.c
47601@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47602 unsigned long nsec;
47603
47604 nsec = CLKS2NSEC(clks);
47605- atomic_long_inc(&mcs_op_statistics[op].count);
47606- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47607+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47608+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47609 if (mcs_op_statistics[op].max < nsec)
47610 mcs_op_statistics[op].max = nsec;
47611 }
47612diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47613index 4f76359..cdfcb2e 100644
47614--- a/drivers/misc/sgi-gru/gruprocfs.c
47615+++ b/drivers/misc/sgi-gru/gruprocfs.c
47616@@ -32,9 +32,9 @@
47617
47618 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47619
47620-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47621+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47622 {
47623- unsigned long val = atomic_long_read(v);
47624+ unsigned long val = atomic_long_read_unchecked(v);
47625
47626 seq_printf(s, "%16lu %s\n", val, id);
47627 }
47628@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47629
47630 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47631 for (op = 0; op < mcsop_last; op++) {
47632- count = atomic_long_read(&mcs_op_statistics[op].count);
47633- total = atomic_long_read(&mcs_op_statistics[op].total);
47634+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47635+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47636 max = mcs_op_statistics[op].max;
47637 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47638 count ? total / count : 0, max);
47639diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47640index 5c3ce24..4915ccb 100644
47641--- a/drivers/misc/sgi-gru/grutables.h
47642+++ b/drivers/misc/sgi-gru/grutables.h
47643@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47644 * GRU statistics.
47645 */
47646 struct gru_stats_s {
47647- atomic_long_t vdata_alloc;
47648- atomic_long_t vdata_free;
47649- atomic_long_t gts_alloc;
47650- atomic_long_t gts_free;
47651- atomic_long_t gms_alloc;
47652- atomic_long_t gms_free;
47653- atomic_long_t gts_double_allocate;
47654- atomic_long_t assign_context;
47655- atomic_long_t assign_context_failed;
47656- atomic_long_t free_context;
47657- atomic_long_t load_user_context;
47658- atomic_long_t load_kernel_context;
47659- atomic_long_t lock_kernel_context;
47660- atomic_long_t unlock_kernel_context;
47661- atomic_long_t steal_user_context;
47662- atomic_long_t steal_kernel_context;
47663- atomic_long_t steal_context_failed;
47664- atomic_long_t nopfn;
47665- atomic_long_t asid_new;
47666- atomic_long_t asid_next;
47667- atomic_long_t asid_wrap;
47668- atomic_long_t asid_reuse;
47669- atomic_long_t intr;
47670- atomic_long_t intr_cbr;
47671- atomic_long_t intr_tfh;
47672- atomic_long_t intr_spurious;
47673- atomic_long_t intr_mm_lock_failed;
47674- atomic_long_t call_os;
47675- atomic_long_t call_os_wait_queue;
47676- atomic_long_t user_flush_tlb;
47677- atomic_long_t user_unload_context;
47678- atomic_long_t user_exception;
47679- atomic_long_t set_context_option;
47680- atomic_long_t check_context_retarget_intr;
47681- atomic_long_t check_context_unload;
47682- atomic_long_t tlb_dropin;
47683- atomic_long_t tlb_preload_page;
47684- atomic_long_t tlb_dropin_fail_no_asid;
47685- atomic_long_t tlb_dropin_fail_upm;
47686- atomic_long_t tlb_dropin_fail_invalid;
47687- atomic_long_t tlb_dropin_fail_range_active;
47688- atomic_long_t tlb_dropin_fail_idle;
47689- atomic_long_t tlb_dropin_fail_fmm;
47690- atomic_long_t tlb_dropin_fail_no_exception;
47691- atomic_long_t tfh_stale_on_fault;
47692- atomic_long_t mmu_invalidate_range;
47693- atomic_long_t mmu_invalidate_page;
47694- atomic_long_t flush_tlb;
47695- atomic_long_t flush_tlb_gru;
47696- atomic_long_t flush_tlb_gru_tgh;
47697- atomic_long_t flush_tlb_gru_zero_asid;
47698+ atomic_long_unchecked_t vdata_alloc;
47699+ atomic_long_unchecked_t vdata_free;
47700+ atomic_long_unchecked_t gts_alloc;
47701+ atomic_long_unchecked_t gts_free;
47702+ atomic_long_unchecked_t gms_alloc;
47703+ atomic_long_unchecked_t gms_free;
47704+ atomic_long_unchecked_t gts_double_allocate;
47705+ atomic_long_unchecked_t assign_context;
47706+ atomic_long_unchecked_t assign_context_failed;
47707+ atomic_long_unchecked_t free_context;
47708+ atomic_long_unchecked_t load_user_context;
47709+ atomic_long_unchecked_t load_kernel_context;
47710+ atomic_long_unchecked_t lock_kernel_context;
47711+ atomic_long_unchecked_t unlock_kernel_context;
47712+ atomic_long_unchecked_t steal_user_context;
47713+ atomic_long_unchecked_t steal_kernel_context;
47714+ atomic_long_unchecked_t steal_context_failed;
47715+ atomic_long_unchecked_t nopfn;
47716+ atomic_long_unchecked_t asid_new;
47717+ atomic_long_unchecked_t asid_next;
47718+ atomic_long_unchecked_t asid_wrap;
47719+ atomic_long_unchecked_t asid_reuse;
47720+ atomic_long_unchecked_t intr;
47721+ atomic_long_unchecked_t intr_cbr;
47722+ atomic_long_unchecked_t intr_tfh;
47723+ atomic_long_unchecked_t intr_spurious;
47724+ atomic_long_unchecked_t intr_mm_lock_failed;
47725+ atomic_long_unchecked_t call_os;
47726+ atomic_long_unchecked_t call_os_wait_queue;
47727+ atomic_long_unchecked_t user_flush_tlb;
47728+ atomic_long_unchecked_t user_unload_context;
47729+ atomic_long_unchecked_t user_exception;
47730+ atomic_long_unchecked_t set_context_option;
47731+ atomic_long_unchecked_t check_context_retarget_intr;
47732+ atomic_long_unchecked_t check_context_unload;
47733+ atomic_long_unchecked_t tlb_dropin;
47734+ atomic_long_unchecked_t tlb_preload_page;
47735+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47736+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47737+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47738+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47739+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47740+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47741+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47742+ atomic_long_unchecked_t tfh_stale_on_fault;
47743+ atomic_long_unchecked_t mmu_invalidate_range;
47744+ atomic_long_unchecked_t mmu_invalidate_page;
47745+ atomic_long_unchecked_t flush_tlb;
47746+ atomic_long_unchecked_t flush_tlb_gru;
47747+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47748+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47749
47750- atomic_long_t copy_gpa;
47751- atomic_long_t read_gpa;
47752+ atomic_long_unchecked_t copy_gpa;
47753+ atomic_long_unchecked_t read_gpa;
47754
47755- atomic_long_t mesq_receive;
47756- atomic_long_t mesq_receive_none;
47757- atomic_long_t mesq_send;
47758- atomic_long_t mesq_send_failed;
47759- atomic_long_t mesq_noop;
47760- atomic_long_t mesq_send_unexpected_error;
47761- atomic_long_t mesq_send_lb_overflow;
47762- atomic_long_t mesq_send_qlimit_reached;
47763- atomic_long_t mesq_send_amo_nacked;
47764- atomic_long_t mesq_send_put_nacked;
47765- atomic_long_t mesq_page_overflow;
47766- atomic_long_t mesq_qf_locked;
47767- atomic_long_t mesq_qf_noop_not_full;
47768- atomic_long_t mesq_qf_switch_head_failed;
47769- atomic_long_t mesq_qf_unexpected_error;
47770- atomic_long_t mesq_noop_unexpected_error;
47771- atomic_long_t mesq_noop_lb_overflow;
47772- atomic_long_t mesq_noop_qlimit_reached;
47773- atomic_long_t mesq_noop_amo_nacked;
47774- atomic_long_t mesq_noop_put_nacked;
47775- atomic_long_t mesq_noop_page_overflow;
47776+ atomic_long_unchecked_t mesq_receive;
47777+ atomic_long_unchecked_t mesq_receive_none;
47778+ atomic_long_unchecked_t mesq_send;
47779+ atomic_long_unchecked_t mesq_send_failed;
47780+ atomic_long_unchecked_t mesq_noop;
47781+ atomic_long_unchecked_t mesq_send_unexpected_error;
47782+ atomic_long_unchecked_t mesq_send_lb_overflow;
47783+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47784+ atomic_long_unchecked_t mesq_send_amo_nacked;
47785+ atomic_long_unchecked_t mesq_send_put_nacked;
47786+ atomic_long_unchecked_t mesq_page_overflow;
47787+ atomic_long_unchecked_t mesq_qf_locked;
47788+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47789+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47790+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47791+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47792+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47793+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47794+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47795+ atomic_long_unchecked_t mesq_noop_put_nacked;
47796+ atomic_long_unchecked_t mesq_noop_page_overflow;
47797
47798 };
47799
47800@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47801 tghop_invalidate, mcsop_last};
47802
47803 struct mcs_op_statistic {
47804- atomic_long_t count;
47805- atomic_long_t total;
47806+ atomic_long_unchecked_t count;
47807+ atomic_long_unchecked_t total;
47808 unsigned long max;
47809 };
47810
47811@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47812
47813 #define STAT(id) do { \
47814 if (gru_options & OPT_STATS) \
47815- atomic_long_inc(&gru_stats.id); \
47816+ atomic_long_inc_unchecked(&gru_stats.id); \
47817 } while (0)
47818
47819 #ifdef CONFIG_SGI_GRU_DEBUG
47820diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47821index c862cd4..0d176fe 100644
47822--- a/drivers/misc/sgi-xp/xp.h
47823+++ b/drivers/misc/sgi-xp/xp.h
47824@@ -288,7 +288,7 @@ struct xpc_interface {
47825 xpc_notify_func, void *);
47826 void (*received) (short, int, void *);
47827 enum xp_retval (*partid_to_nasids) (short, void *);
47828-};
47829+} __no_const;
47830
47831 extern struct xpc_interface xpc_interface;
47832
47833diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47834index 01be66d..e3a0c7e 100644
47835--- a/drivers/misc/sgi-xp/xp_main.c
47836+++ b/drivers/misc/sgi-xp/xp_main.c
47837@@ -78,13 +78,13 @@ xpc_notloaded(void)
47838 }
47839
47840 struct xpc_interface xpc_interface = {
47841- (void (*)(int))xpc_notloaded,
47842- (void (*)(int))xpc_notloaded,
47843- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47844- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47845+ .connect = (void (*)(int))xpc_notloaded,
47846+ .disconnect = (void (*)(int))xpc_notloaded,
47847+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47848+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47849 void *))xpc_notloaded,
47850- (void (*)(short, int, void *))xpc_notloaded,
47851- (enum xp_retval(*)(short, void *))xpc_notloaded
47852+ .received = (void (*)(short, int, void *))xpc_notloaded,
47853+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47854 };
47855 EXPORT_SYMBOL_GPL(xpc_interface);
47856
47857diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47858index b94d5f7..7f494c5 100644
47859--- a/drivers/misc/sgi-xp/xpc.h
47860+++ b/drivers/misc/sgi-xp/xpc.h
47861@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47862 void (*received_payload) (struct xpc_channel *, void *);
47863 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47864 };
47865+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47866
47867 /* struct xpc_partition act_state values (for XPC HB) */
47868
47869@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47870 /* found in xpc_main.c */
47871 extern struct device *xpc_part;
47872 extern struct device *xpc_chan;
47873-extern struct xpc_arch_operations xpc_arch_ops;
47874+extern xpc_arch_operations_no_const xpc_arch_ops;
47875 extern int xpc_disengage_timelimit;
47876 extern int xpc_disengage_timedout;
47877 extern int xpc_activate_IRQ_rcvd;
47878diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47879index 7f32712..8539ab2 100644
47880--- a/drivers/misc/sgi-xp/xpc_main.c
47881+++ b/drivers/misc/sgi-xp/xpc_main.c
47882@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47883 .notifier_call = xpc_system_die,
47884 };
47885
47886-struct xpc_arch_operations xpc_arch_ops;
47887+xpc_arch_operations_no_const xpc_arch_ops;
47888
47889 /*
47890 * Timer function to enforce the timelimit on the partition disengage.
47891diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47892index 60f7141..ba97c1a 100644
47893--- a/drivers/mmc/card/block.c
47894+++ b/drivers/mmc/card/block.c
47895@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47896 if (idata->ic.postsleep_min_us)
47897 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47898
47899- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47900+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47901 err = -EFAULT;
47902 goto cmd_rel_host;
47903 }
47904diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47905index f45ab91..9f50d8f 100644
47906--- a/drivers/mmc/host/dw_mmc.h
47907+++ b/drivers/mmc/host/dw_mmc.h
47908@@ -287,5 +287,5 @@ struct dw_mci_drv_data {
47909 int (*execute_tuning)(struct dw_mci_slot *slot);
47910 int (*prepare_hs400_tuning)(struct dw_mci *host,
47911 struct mmc_ios *ios);
47912-};
47913+} __do_const;
47914 #endif /* _DW_MMC_H_ */
47915diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47916index fb26674..3172c2b 100644
47917--- a/drivers/mmc/host/mmci.c
47918+++ b/drivers/mmc/host/mmci.c
47919@@ -1633,7 +1633,9 @@ static int mmci_probe(struct amba_device *dev,
47920 mmc->caps |= MMC_CAP_CMD23;
47921
47922 if (variant->busy_detect) {
47923- mmci_ops.card_busy = mmci_card_busy;
47924+ pax_open_kernel();
47925+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47926+ pax_close_kernel();
47927 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47928 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47929 mmc->max_busy_timeout = 0;
47930diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47931index 9df2b68..6d5ed1a 100644
47932--- a/drivers/mmc/host/omap_hsmmc.c
47933+++ b/drivers/mmc/host/omap_hsmmc.c
47934@@ -2004,7 +2004,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47935
47936 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47937 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47938- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47939+ pax_open_kernel();
47940+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47941+ pax_close_kernel();
47942 }
47943
47944 pm_runtime_enable(host->dev);
47945diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47946index 82f512d..5a228bb 100644
47947--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47948+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47949@@ -993,9 +993,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47950 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47951 }
47952
47953- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47954- sdhci_esdhc_ops.platform_execute_tuning =
47955+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47956+ pax_open_kernel();
47957+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47958 esdhc_executing_tuning;
47959+ pax_close_kernel();
47960+ }
47961
47962 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47963 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47964diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47965index c6d2dd7..81b1ca3 100644
47966--- a/drivers/mmc/host/sdhci-s3c.c
47967+++ b/drivers/mmc/host/sdhci-s3c.c
47968@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47969 * we can use overriding functions instead of default.
47970 */
47971 if (sc->no_divider) {
47972- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47973- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47974- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47975+ pax_open_kernel();
47976+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47977+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47978+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47979+ pax_close_kernel();
47980 }
47981
47982 /* It supports additional host capabilities if needed */
47983diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47984index 9a1a6ff..b8f1a57 100644
47985--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47986+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47987@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47988 size_t totlen = 0, thislen;
47989 int ret = 0;
47990 size_t buflen = 0;
47991- static char *buffer;
47992+ char *buffer;
47993
47994 if (!ECCBUF_SIZE) {
47995 /* We should fall back to a general writev implementation.
47996diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47997index 870c7fc..c7d6440 100644
47998--- a/drivers/mtd/nand/denali.c
47999+++ b/drivers/mtd/nand/denali.c
48000@@ -24,6 +24,7 @@
48001 #include <linux/slab.h>
48002 #include <linux/mtd/mtd.h>
48003 #include <linux/module.h>
48004+#include <linux/slab.h>
48005
48006 #include "denali.h"
48007
48008diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48009index 1b8f350..990f2e9 100644
48010--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48011+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48012@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48013
48014 /* first try to map the upper buffer directly */
48015 if (virt_addr_valid(this->upper_buf) &&
48016- !object_is_on_stack(this->upper_buf)) {
48017+ !object_starts_on_stack(this->upper_buf)) {
48018 sg_init_one(sgl, this->upper_buf, this->upper_len);
48019 ret = dma_map_sg(this->dev, sgl, 1, dr);
48020 if (ret == 0)
48021diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48022index a5dfbfb..8042ab4 100644
48023--- a/drivers/mtd/nftlmount.c
48024+++ b/drivers/mtd/nftlmount.c
48025@@ -24,6 +24,7 @@
48026 #include <asm/errno.h>
48027 #include <linux/delay.h>
48028 #include <linux/slab.h>
48029+#include <linux/sched.h>
48030 #include <linux/mtd/mtd.h>
48031 #include <linux/mtd/nand.h>
48032 #include <linux/mtd/nftl.h>
48033diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48034index c23184a..4115c41 100644
48035--- a/drivers/mtd/sm_ftl.c
48036+++ b/drivers/mtd/sm_ftl.c
48037@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48038 #define SM_CIS_VENDOR_OFFSET 0x59
48039 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48040 {
48041- struct attribute_group *attr_group;
48042+ attribute_group_no_const *attr_group;
48043 struct attribute **attributes;
48044 struct sm_sysfs_attribute *vendor_attribute;
48045 char *vendor;
48046diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48047index 7b11243..b3278a3 100644
48048--- a/drivers/net/bonding/bond_netlink.c
48049+++ b/drivers/net/bonding/bond_netlink.c
48050@@ -585,7 +585,7 @@ nla_put_failure:
48051 return -EMSGSIZE;
48052 }
48053
48054-struct rtnl_link_ops bond_link_ops __read_mostly = {
48055+struct rtnl_link_ops bond_link_ops = {
48056 .kind = "bond",
48057 .priv_size = sizeof(struct bonding),
48058 .setup = bond_setup,
48059diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48060index b3b922a..80bba38 100644
48061--- a/drivers/net/caif/caif_hsi.c
48062+++ b/drivers/net/caif/caif_hsi.c
48063@@ -1444,7 +1444,7 @@ err:
48064 return -ENODEV;
48065 }
48066
48067-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48068+static struct rtnl_link_ops caif_hsi_link_ops = {
48069 .kind = "cfhsi",
48070 .priv_size = sizeof(struct cfhsi),
48071 .setup = cfhsi_setup,
48072diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48073index e8c96b8..516a96c 100644
48074--- a/drivers/net/can/Kconfig
48075+++ b/drivers/net/can/Kconfig
48076@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48077
48078 config CAN_FLEXCAN
48079 tristate "Support for Freescale FLEXCAN based chips"
48080- depends on ARM || PPC
48081+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48082 ---help---
48083 Say Y here if you want to support for Freescale FlexCAN.
48084
48085diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48086index e9b1810..5c2f3f9 100644
48087--- a/drivers/net/can/dev.c
48088+++ b/drivers/net/can/dev.c
48089@@ -964,7 +964,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48090 return -EOPNOTSUPP;
48091 }
48092
48093-static struct rtnl_link_ops can_link_ops __read_mostly = {
48094+static struct rtnl_link_ops can_link_ops = {
48095 .kind = "can",
48096 .maxtype = IFLA_CAN_MAX,
48097 .policy = can_policy,
48098diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48099index 0ce868d..e5dc8bd 100644
48100--- a/drivers/net/can/vcan.c
48101+++ b/drivers/net/can/vcan.c
48102@@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
48103 dev->destructor = free_netdev;
48104 }
48105
48106-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48107+static struct rtnl_link_ops vcan_link_ops = {
48108 .kind = "vcan",
48109 .setup = vcan_setup,
48110 };
48111diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48112index 49adbf1..fff7ff8 100644
48113--- a/drivers/net/dummy.c
48114+++ b/drivers/net/dummy.c
48115@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48116 return 0;
48117 }
48118
48119-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48120+static struct rtnl_link_ops dummy_link_ops = {
48121 .kind = DRV_NAME,
48122 .setup = dummy_setup,
48123 .validate = dummy_validate,
48124diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48125index 0443654..4f0aa18 100644
48126--- a/drivers/net/ethernet/8390/ax88796.c
48127+++ b/drivers/net/ethernet/8390/ax88796.c
48128@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48129 if (ax->plat->reg_offsets)
48130 ei_local->reg_offset = ax->plat->reg_offsets;
48131 else {
48132+ resource_size_t _mem_size = mem_size;
48133+ do_div(_mem_size, 0x18);
48134 ei_local->reg_offset = ax->reg_offsets;
48135 for (ret = 0; ret < 0x18; ret++)
48136- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48137+ ax->reg_offsets[ret] = _mem_size * ret;
48138 }
48139
48140 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48141diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48142index da48e66..2dbec80 100644
48143--- a/drivers/net/ethernet/altera/altera_tse_main.c
48144+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48145@@ -1256,7 +1256,7 @@ static int tse_shutdown(struct net_device *dev)
48146 return 0;
48147 }
48148
48149-static struct net_device_ops altera_tse_netdev_ops = {
48150+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48151 .ndo_open = tse_open,
48152 .ndo_stop = tse_shutdown,
48153 .ndo_start_xmit = tse_start_xmit,
48154@@ -1493,11 +1493,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48155 ndev->netdev_ops = &altera_tse_netdev_ops;
48156 altera_tse_set_ethtool_ops(ndev);
48157
48158+ pax_open_kernel();
48159 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48160
48161 if (priv->hash_filter)
48162 altera_tse_netdev_ops.ndo_set_rx_mode =
48163 tse_set_rx_mode_hashfilter;
48164+ pax_close_kernel();
48165
48166 /* Scatter/gather IO is not supported,
48167 * so it is turned off
48168diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48169index 34c28aa..5e06567 100644
48170--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48171+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48172@@ -1124,14 +1124,14 @@ do { \
48173 * operations, everything works on mask values.
48174 */
48175 #define XMDIO_READ(_pdata, _mmd, _reg) \
48176- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48177+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48178 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48179
48180 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48181 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48182
48183 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48184- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48185+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48186 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48187
48188 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48189diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48190index 8a50b01..39c1ad0 100644
48191--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48192+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48193@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48194
48195 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48196
48197- pdata->hw_if.config_dcb_tc(pdata);
48198+ pdata->hw_if->config_dcb_tc(pdata);
48199
48200 return 0;
48201 }
48202@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48203
48204 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48205
48206- pdata->hw_if.config_dcb_pfc(pdata);
48207+ pdata->hw_if->config_dcb_pfc(pdata);
48208
48209 return 0;
48210 }
48211diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48212index 5c92fb7..08be735 100644
48213--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48214+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48215@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48216
48217 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48218 {
48219- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48220+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48221 struct xgbe_channel *channel;
48222 struct xgbe_ring *ring;
48223 struct xgbe_ring_data *rdata;
48224@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48225
48226 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48227 {
48228- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48229+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48230 struct xgbe_channel *channel;
48231 struct xgbe_ring *ring;
48232 struct xgbe_ring_desc *rdesc;
48233@@ -620,17 +620,12 @@ err_out:
48234 return 0;
48235 }
48236
48237-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48238-{
48239- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48240-
48241- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48242- desc_if->free_ring_resources = xgbe_free_ring_resources;
48243- desc_if->map_tx_skb = xgbe_map_tx_skb;
48244- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48245- desc_if->unmap_rdata = xgbe_unmap_rdata;
48246- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48247- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48248-
48249- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48250-}
48251+struct xgbe_desc_if default_xgbe_desc_if = {
48252+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48253+ .free_ring_resources = xgbe_free_ring_resources,
48254+ .map_tx_skb = xgbe_map_tx_skb,
48255+ .map_rx_buffer = xgbe_map_rx_buffer,
48256+ .unmap_rdata = xgbe_unmap_rdata,
48257+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48258+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48259+};
48260diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48261index 21d9497..c74b40f 100644
48262--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48263+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48264@@ -2772,7 +2772,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48265
48266 static int xgbe_init(struct xgbe_prv_data *pdata)
48267 {
48268- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48269+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48270 int ret;
48271
48272 DBGPR("-->xgbe_init\n");
48273@@ -2838,106 +2838,101 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48274 return 0;
48275 }
48276
48277-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48278-{
48279- DBGPR("-->xgbe_init_function_ptrs\n");
48280-
48281- hw_if->tx_complete = xgbe_tx_complete;
48282-
48283- hw_if->set_mac_address = xgbe_set_mac_address;
48284- hw_if->config_rx_mode = xgbe_config_rx_mode;
48285-
48286- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48287- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48288-
48289- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48290- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48291- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48292- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48293- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48294-
48295- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48296- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48297-
48298- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48299- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48300- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48301-
48302- hw_if->enable_tx = xgbe_enable_tx;
48303- hw_if->disable_tx = xgbe_disable_tx;
48304- hw_if->enable_rx = xgbe_enable_rx;
48305- hw_if->disable_rx = xgbe_disable_rx;
48306-
48307- hw_if->powerup_tx = xgbe_powerup_tx;
48308- hw_if->powerdown_tx = xgbe_powerdown_tx;
48309- hw_if->powerup_rx = xgbe_powerup_rx;
48310- hw_if->powerdown_rx = xgbe_powerdown_rx;
48311-
48312- hw_if->dev_xmit = xgbe_dev_xmit;
48313- hw_if->dev_read = xgbe_dev_read;
48314- hw_if->enable_int = xgbe_enable_int;
48315- hw_if->disable_int = xgbe_disable_int;
48316- hw_if->init = xgbe_init;
48317- hw_if->exit = xgbe_exit;
48318+struct xgbe_hw_if default_xgbe_hw_if = {
48319+ .tx_complete = xgbe_tx_complete,
48320+
48321+ .set_mac_address = xgbe_set_mac_address,
48322+ .config_rx_mode = xgbe_config_rx_mode,
48323+
48324+ .enable_rx_csum = xgbe_enable_rx_csum,
48325+ .disable_rx_csum = xgbe_disable_rx_csum,
48326+
48327+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48328+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48329+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48330+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48331+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48332+
48333+ .read_mmd_regs = xgbe_read_mmd_regs,
48334+ .write_mmd_regs = xgbe_write_mmd_regs,
48335+
48336+ .set_gmii_speed = xgbe_set_gmii_speed,
48337+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48338+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48339+
48340+ .enable_tx = xgbe_enable_tx,
48341+ .disable_tx = xgbe_disable_tx,
48342+ .enable_rx = xgbe_enable_rx,
48343+ .disable_rx = xgbe_disable_rx,
48344+
48345+ .powerup_tx = xgbe_powerup_tx,
48346+ .powerdown_tx = xgbe_powerdown_tx,
48347+ .powerup_rx = xgbe_powerup_rx,
48348+ .powerdown_rx = xgbe_powerdown_rx,
48349+
48350+ .dev_xmit = xgbe_dev_xmit,
48351+ .dev_read = xgbe_dev_read,
48352+ .enable_int = xgbe_enable_int,
48353+ .disable_int = xgbe_disable_int,
48354+ .init = xgbe_init,
48355+ .exit = xgbe_exit,
48356
48357 /* Descriptor related Sequences have to be initialized here */
48358- hw_if->tx_desc_init = xgbe_tx_desc_init;
48359- hw_if->rx_desc_init = xgbe_rx_desc_init;
48360- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48361- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48362- hw_if->is_last_desc = xgbe_is_last_desc;
48363- hw_if->is_context_desc = xgbe_is_context_desc;
48364- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48365+ .tx_desc_init = xgbe_tx_desc_init,
48366+ .rx_desc_init = xgbe_rx_desc_init,
48367+ .tx_desc_reset = xgbe_tx_desc_reset,
48368+ .rx_desc_reset = xgbe_rx_desc_reset,
48369+ .is_last_desc = xgbe_is_last_desc,
48370+ .is_context_desc = xgbe_is_context_desc,
48371+ .tx_start_xmit = xgbe_tx_start_xmit,
48372
48373 /* For FLOW ctrl */
48374- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48375- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48376+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48377+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48378
48379 /* For RX coalescing */
48380- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48381- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48382- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48383- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48384+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48385+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48386+ .usec_to_riwt = xgbe_usec_to_riwt,
48387+ .riwt_to_usec = xgbe_riwt_to_usec,
48388
48389 /* For RX and TX threshold config */
48390- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48391- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48392+ .config_rx_threshold = xgbe_config_rx_threshold,
48393+ .config_tx_threshold = xgbe_config_tx_threshold,
48394
48395 /* For RX and TX Store and Forward Mode config */
48396- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48397- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48398+ .config_rsf_mode = xgbe_config_rsf_mode,
48399+ .config_tsf_mode = xgbe_config_tsf_mode,
48400
48401 /* For TX DMA Operating on Second Frame config */
48402- hw_if->config_osp_mode = xgbe_config_osp_mode;
48403+ .config_osp_mode = xgbe_config_osp_mode,
48404
48405 /* For RX and TX PBL config */
48406- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48407- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48408- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48409- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48410- hw_if->config_pblx8 = xgbe_config_pblx8;
48411+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48412+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48413+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48414+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48415+ .config_pblx8 = xgbe_config_pblx8,
48416
48417 /* For MMC statistics support */
48418- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48419- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48420- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48421+ .tx_mmc_int = xgbe_tx_mmc_int,
48422+ .rx_mmc_int = xgbe_rx_mmc_int,
48423+ .read_mmc_stats = xgbe_read_mmc_stats,
48424
48425 /* For PTP config */
48426- hw_if->config_tstamp = xgbe_config_tstamp;
48427- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48428- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48429- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48430- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48431+ .config_tstamp = xgbe_config_tstamp,
48432+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48433+ .set_tstamp_time = xgbe_set_tstamp_time,
48434+ .get_tstamp_time = xgbe_get_tstamp_time,
48435+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48436
48437 /* For Data Center Bridging config */
48438- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48439- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48440+ .config_dcb_tc = xgbe_config_dcb_tc,
48441+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48442
48443 /* For Receive Side Scaling */
48444- hw_if->enable_rss = xgbe_enable_rss;
48445- hw_if->disable_rss = xgbe_disable_rss;
48446- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48447- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48448-
48449- DBGPR("<--xgbe_init_function_ptrs\n");
48450-}
48451+ .enable_rss = xgbe_enable_rss,
48452+ .disable_rss = xgbe_disable_rss,
48453+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48454+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48455+};
48456diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48457index 9fd6c69..588ff02 100644
48458--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48459+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48460@@ -243,7 +243,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48461 * support, tell it now
48462 */
48463 if (ring->tx.xmit_more)
48464- pdata->hw_if.tx_start_xmit(channel, ring);
48465+ pdata->hw_if->tx_start_xmit(channel, ring);
48466
48467 return NETDEV_TX_BUSY;
48468 }
48469@@ -271,7 +271,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48470
48471 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48472 {
48473- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48474+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48475 struct xgbe_channel *channel;
48476 enum xgbe_int int_id;
48477 unsigned int i;
48478@@ -293,7 +293,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48479
48480 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48481 {
48482- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48483+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48484 struct xgbe_channel *channel;
48485 enum xgbe_int int_id;
48486 unsigned int i;
48487@@ -316,7 +316,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48488 static irqreturn_t xgbe_isr(int irq, void *data)
48489 {
48490 struct xgbe_prv_data *pdata = data;
48491- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48492+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48493 struct xgbe_channel *channel;
48494 unsigned int dma_isr, dma_ch_isr;
48495 unsigned int mac_isr, mac_tssr;
48496@@ -682,7 +682,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48497
48498 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48499 {
48500- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48501+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48502
48503 DBGPR("-->xgbe_init_tx_coalesce\n");
48504
48505@@ -696,7 +696,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48506
48507 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48508 {
48509- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48510+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48511
48512 DBGPR("-->xgbe_init_rx_coalesce\n");
48513
48514@@ -711,7 +711,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48515
48516 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48517 {
48518- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48519+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48520 struct xgbe_channel *channel;
48521 struct xgbe_ring *ring;
48522 struct xgbe_ring_data *rdata;
48523@@ -736,7 +736,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48524
48525 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48526 {
48527- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48528+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48529 struct xgbe_channel *channel;
48530 struct xgbe_ring *ring;
48531 struct xgbe_ring_data *rdata;
48532@@ -762,7 +762,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48533 static void xgbe_adjust_link(struct net_device *netdev)
48534 {
48535 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48536- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48537+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48538 struct phy_device *phydev = pdata->phydev;
48539 int new_state = 0;
48540
48541@@ -870,7 +870,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48542 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48543 {
48544 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48545- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48546+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48547 unsigned long flags;
48548
48549 DBGPR("-->xgbe_powerdown\n");
48550@@ -908,7 +908,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48551 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48552 {
48553 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48554- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48555+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48556 unsigned long flags;
48557
48558 DBGPR("-->xgbe_powerup\n");
48559@@ -945,7 +945,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48560
48561 static int xgbe_start(struct xgbe_prv_data *pdata)
48562 {
48563- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48564+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48565 struct net_device *netdev = pdata->netdev;
48566 int ret;
48567
48568@@ -984,7 +984,7 @@ err_napi:
48569
48570 static void xgbe_stop(struct xgbe_prv_data *pdata)
48571 {
48572- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48573+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48574 struct xgbe_channel *channel;
48575 struct net_device *netdev = pdata->netdev;
48576 struct netdev_queue *txq;
48577@@ -1211,7 +1211,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48578 return -ERANGE;
48579 }
48580
48581- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48582+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48583
48584 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48585
48586@@ -1360,7 +1360,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48587 static int xgbe_open(struct net_device *netdev)
48588 {
48589 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48590- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48591+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48592 int ret;
48593
48594 DBGPR("-->xgbe_open\n");
48595@@ -1432,7 +1432,7 @@ err_phy_init:
48596 static int xgbe_close(struct net_device *netdev)
48597 {
48598 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48599- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48600+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48601
48602 DBGPR("-->xgbe_close\n");
48603
48604@@ -1460,8 +1460,8 @@ static int xgbe_close(struct net_device *netdev)
48605 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48606 {
48607 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48608- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48609- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48610+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48611+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48612 struct xgbe_channel *channel;
48613 struct xgbe_ring *ring;
48614 struct xgbe_packet_data *packet;
48615@@ -1529,7 +1529,7 @@ tx_netdev_return:
48616 static void xgbe_set_rx_mode(struct net_device *netdev)
48617 {
48618 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48619- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48620+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48621
48622 DBGPR("-->xgbe_set_rx_mode\n");
48623
48624@@ -1541,7 +1541,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48625 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48626 {
48627 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48628- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48629+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48630 struct sockaddr *saddr = addr;
48631
48632 DBGPR("-->xgbe_set_mac_address\n");
48633@@ -1616,7 +1616,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48634
48635 DBGPR("-->%s\n", __func__);
48636
48637- pdata->hw_if.read_mmc_stats(pdata);
48638+ pdata->hw_if->read_mmc_stats(pdata);
48639
48640 s->rx_packets = pstats->rxframecount_gb;
48641 s->rx_bytes = pstats->rxoctetcount_gb;
48642@@ -1643,7 +1643,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48643 u16 vid)
48644 {
48645 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48646- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48647+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48648
48649 DBGPR("-->%s\n", __func__);
48650
48651@@ -1659,7 +1659,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48652 u16 vid)
48653 {
48654 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48655- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48656+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48657
48658 DBGPR("-->%s\n", __func__);
48659
48660@@ -1725,7 +1725,7 @@ static int xgbe_set_features(struct net_device *netdev,
48661 netdev_features_t features)
48662 {
48663 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48664- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48665+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48666 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48667 int ret = 0;
48668
48669@@ -1791,8 +1791,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48670 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48671 {
48672 struct xgbe_prv_data *pdata = channel->pdata;
48673- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48674- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48675+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48676+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48677 struct xgbe_ring *ring = channel->rx_ring;
48678 struct xgbe_ring_data *rdata;
48679
48680@@ -1847,8 +1847,8 @@ static struct sk_buff *xgbe_create_skb(struct napi_struct *napi,
48681 static int xgbe_tx_poll(struct xgbe_channel *channel)
48682 {
48683 struct xgbe_prv_data *pdata = channel->pdata;
48684- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48685- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48686+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48687+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48688 struct xgbe_ring *ring = channel->tx_ring;
48689 struct xgbe_ring_data *rdata;
48690 struct xgbe_ring_desc *rdesc;
48691@@ -1913,7 +1913,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48692 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48693 {
48694 struct xgbe_prv_data *pdata = channel->pdata;
48695- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48696+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48697 struct xgbe_ring *ring = channel->rx_ring;
48698 struct xgbe_ring_data *rdata;
48699 struct xgbe_packet_data *packet;
48700diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48701index 5f149e8..6736bf4 100644
48702--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48703+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48704@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48705
48706 DBGPR("-->%s\n", __func__);
48707
48708- pdata->hw_if.read_mmc_stats(pdata);
48709+ pdata->hw_if->read_mmc_stats(pdata);
48710 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48711 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48712 *data++ = *(u64 *)stat;
48713@@ -396,7 +396,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48714 struct ethtool_coalesce *ec)
48715 {
48716 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48717- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48718+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48719 unsigned int rx_frames, rx_riwt, rx_usecs;
48720 unsigned int tx_frames;
48721
48722@@ -521,7 +521,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48723 const u8 *key, const u8 hfunc)
48724 {
48725 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48726- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48727+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48728 unsigned int ret;
48729
48730 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48731diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48732index 7149053..889c5492 100644
48733--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48734+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48735@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48736 DBGPR("<--xgbe_default_config\n");
48737 }
48738
48739-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48740-{
48741- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48742- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48743-}
48744-
48745 #ifdef CONFIG_ACPI
48746 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48747 {
48748@@ -387,9 +381,8 @@ static int xgbe_probe(struct platform_device *pdev)
48749 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48750
48751 /* Set all the function pointers */
48752- xgbe_init_all_fptrs(pdata);
48753- hw_if = &pdata->hw_if;
48754- desc_if = &pdata->desc_if;
48755+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48756+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48757
48758 /* Issue software reset to device */
48759 hw_if->exit(pdata);
48760diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48761index 59e267f..0842a88 100644
48762--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48763+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48764@@ -126,7 +126,7 @@
48765 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48766 {
48767 struct xgbe_prv_data *pdata = mii->priv;
48768- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48769+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48770 int mmd_data;
48771
48772 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48773@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48774 u16 mmd_val)
48775 {
48776 struct xgbe_prv_data *pdata = mii->priv;
48777- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48778+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48779 int mmd_data = mmd_val;
48780
48781 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48782diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48783index b03e4f5..78e4cc4 100644
48784--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48785+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48786@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48787 tstamp_cc);
48788 u64 nsec;
48789
48790- nsec = pdata->hw_if.get_tstamp_time(pdata);
48791+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48792
48793 return nsec;
48794 }
48795@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48796
48797 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48798
48799- pdata->hw_if.update_tstamp_addend(pdata, addend);
48800+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48801
48802 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48803
48804diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48805index e62dfa2..7df28d5 100644
48806--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48807+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48808@@ -673,8 +673,8 @@ struct xgbe_prv_data {
48809 int dev_irq;
48810 unsigned int per_channel_irq;
48811
48812- struct xgbe_hw_if hw_if;
48813- struct xgbe_desc_if desc_if;
48814+ struct xgbe_hw_if *hw_if;
48815+ struct xgbe_desc_if *desc_if;
48816
48817 /* AXI DMA settings */
48818 unsigned int coherent;
48819@@ -797,6 +797,9 @@ struct xgbe_prv_data {
48820 #endif
48821 };
48822
48823+extern struct xgbe_hw_if default_xgbe_hw_if;
48824+extern struct xgbe_desc_if default_xgbe_desc_if;
48825+
48826 /* Function prototypes*/
48827
48828 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48829diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
48830index 783543a..a472348 100644
48831--- a/drivers/net/ethernet/broadcom/bcmsysport.c
48832+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
48833@@ -1721,7 +1721,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
48834 macaddr = of_get_mac_address(dn);
48835 if (!macaddr || !is_valid_ether_addr(macaddr)) {
48836 dev_warn(&pdev->dev, "using random Ethernet MAC\n");
48837- random_ether_addr(dev->dev_addr);
48838+ eth_hw_addr_random(dev);
48839 } else {
48840 ether_addr_copy(dev->dev_addr, macaddr);
48841 }
48842diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48843index d7a7175..7011194 100644
48844--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48845+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48846@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48847 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48848 {
48849 /* RX_MODE controlling object */
48850- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48851+ bnx2x_init_rx_mode_obj(bp);
48852
48853 /* multicast configuration controlling object */
48854 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48855diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48856index 07cdf9b..b08ecc7 100644
48857--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48858+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48859@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48860 return rc;
48861 }
48862
48863-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48864- struct bnx2x_rx_mode_obj *o)
48865+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48866 {
48867 if (CHIP_IS_E1x(bp)) {
48868- o->wait_comp = bnx2x_empty_rx_mode_wait;
48869- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48870+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48871+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48872 } else {
48873- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48874- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48875+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48876+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48877 }
48878 }
48879
48880diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48881index 86baecb..ff3bb46 100644
48882--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48883+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48884@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48885
48886 /********************* RX MODE ****************/
48887
48888-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48889- struct bnx2x_rx_mode_obj *o);
48890+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48891
48892 /**
48893 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48894diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48895index 31c9f82..e65e986 100644
48896--- a/drivers/net/ethernet/broadcom/tg3.h
48897+++ b/drivers/net/ethernet/broadcom/tg3.h
48898@@ -150,6 +150,7 @@
48899 #define CHIPREV_ID_5750_A0 0x4000
48900 #define CHIPREV_ID_5750_A1 0x4001
48901 #define CHIPREV_ID_5750_A3 0x4003
48902+#define CHIPREV_ID_5750_C1 0x4201
48903 #define CHIPREV_ID_5750_C2 0x4202
48904 #define CHIPREV_ID_5752_A0_HW 0x5000
48905 #define CHIPREV_ID_5752_A0 0x6000
48906diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48907index deb8da6..45d473b 100644
48908--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48909+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48910@@ -1694,10 +1694,10 @@ bna_cb_ioceth_reset(void *arg)
48911 }
48912
48913 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48914- bna_cb_ioceth_enable,
48915- bna_cb_ioceth_disable,
48916- bna_cb_ioceth_hbfail,
48917- bna_cb_ioceth_reset
48918+ .enable_cbfn = bna_cb_ioceth_enable,
48919+ .disable_cbfn = bna_cb_ioceth_disable,
48920+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48921+ .reset_cbfn = bna_cb_ioceth_reset
48922 };
48923
48924 static void bna_attr_init(struct bna_ioceth *ioceth)
48925diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48926index 8cffcdf..aadf043 100644
48927--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48928+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48929@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48930 */
48931 struct l2t_skb_cb {
48932 arp_failure_handler_func arp_failure_handler;
48933-};
48934+} __no_const;
48935
48936 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48937
48938diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48939index badff18..e15c4ec 100644
48940--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48941+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48942@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48943 for (i=0; i<ETH_ALEN; i++) {
48944 tmp.addr[i] = dev->dev_addr[i];
48945 }
48946- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48947+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48948 break;
48949
48950 case DE4X5_SET_HWADDR: /* Set the hardware address */
48951@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48952 spin_lock_irqsave(&lp->lock, flags);
48953 memcpy(&statbuf, &lp->pktStats, ioc->len);
48954 spin_unlock_irqrestore(&lp->lock, flags);
48955- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48956+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48957 return -EFAULT;
48958 break;
48959 }
48960diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48961index e43cc8a..f1cf67c 100644
48962--- a/drivers/net/ethernet/emulex/benet/be_main.c
48963+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48964@@ -539,7 +539,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48965
48966 if (wrapped)
48967 newacc += 65536;
48968- ACCESS_ONCE(*acc) = newacc;
48969+ ACCESS_ONCE_RW(*acc) = newacc;
48970 }
48971
48972 static void populate_erx_stats(struct be_adapter *adapter,
48973diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48974index 6d0c5d5..55be363 100644
48975--- a/drivers/net/ethernet/faraday/ftgmac100.c
48976+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48977@@ -30,6 +30,8 @@
48978 #include <linux/netdevice.h>
48979 #include <linux/phy.h>
48980 #include <linux/platform_device.h>
48981+#include <linux/interrupt.h>
48982+#include <linux/irqreturn.h>
48983 #include <net/ip.h>
48984
48985 #include "ftgmac100.h"
48986diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48987index dce5f7b..2433466 100644
48988--- a/drivers/net/ethernet/faraday/ftmac100.c
48989+++ b/drivers/net/ethernet/faraday/ftmac100.c
48990@@ -31,6 +31,8 @@
48991 #include <linux/module.h>
48992 #include <linux/netdevice.h>
48993 #include <linux/platform_device.h>
48994+#include <linux/interrupt.h>
48995+#include <linux/irqreturn.h>
48996
48997 #include "ftmac100.h"
48998
48999diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49000index a92b772..250fe69 100644
49001--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49002+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49003@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49004 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49005
49006 /* Update the base adjustement value. */
49007- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49008+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49009 smp_mb(); /* Force the above update. */
49010 }
49011
49012diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49013index e5ba040..d47531c 100644
49014--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49015+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49016@@ -782,7 +782,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49017 }
49018
49019 /* update the base incval used to calculate frequency adjustment */
49020- ACCESS_ONCE(adapter->base_incval) = incval;
49021+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49022 smp_mb();
49023
49024 /* need lock to prevent incorrect read while modifying cyclecounter */
49025diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
49026index 74d0389..086ac03 100644
49027--- a/drivers/net/ethernet/marvell/mvneta.c
49028+++ b/drivers/net/ethernet/marvell/mvneta.c
49029@@ -1462,7 +1462,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49030 struct mvneta_rx_queue *rxq)
49031 {
49032 struct net_device *dev = pp->dev;
49033- int rx_done, rx_filled;
49034+ int rx_done;
49035 u32 rcvd_pkts = 0;
49036 u32 rcvd_bytes = 0;
49037
49038@@ -1473,7 +1473,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49039 rx_todo = rx_done;
49040
49041 rx_done = 0;
49042- rx_filled = 0;
49043
49044 /* Fairness NAPI loop */
49045 while (rx_done < rx_todo) {
49046@@ -1484,7 +1483,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49047 int rx_bytes, err;
49048
49049 rx_done++;
49050- rx_filled++;
49051 rx_status = rx_desc->status;
49052 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
49053 data = (unsigned char *)rx_desc->buf_cookie;
49054@@ -1524,6 +1522,14 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49055 continue;
49056 }
49057
49058+ /* Refill processing */
49059+ err = mvneta_rx_refill(pp, rx_desc);
49060+ if (err) {
49061+ netdev_err(dev, "Linux processing - Can't refill\n");
49062+ rxq->missed++;
49063+ goto err_drop_frame;
49064+ }
49065+
49066 skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size);
49067 if (!skb)
49068 goto err_drop_frame;
49069@@ -1543,14 +1549,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49070 mvneta_rx_csum(pp, rx_status, skb);
49071
49072 napi_gro_receive(&pp->napi, skb);
49073-
49074- /* Refill processing */
49075- err = mvneta_rx_refill(pp, rx_desc);
49076- if (err) {
49077- netdev_err(dev, "Linux processing - Can't refill\n");
49078- rxq->missed++;
49079- rx_filled--;
49080- }
49081 }
49082
49083 if (rcvd_pkts) {
49084@@ -1563,7 +1561,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
49085 }
49086
49087 /* Update rxq management counters */
49088- mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_filled);
49089+ mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
49090
49091 return rx_done;
49092 }
49093diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49094index c10d98f..72914c6 100644
49095--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49096+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49097@@ -475,8 +475,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49098 wmb();
49099
49100 /* we want to dirty this cache line once */
49101- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49102- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49103+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49104+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49105
49106 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49107
49108diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49109index 6223930..975033d 100644
49110--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49111+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49112@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49113 struct __vxge_hw_fifo *fifo;
49114 struct vxge_hw_fifo_config *config;
49115 u32 txdl_size, txdl_per_memblock;
49116- struct vxge_hw_mempool_cbs fifo_mp_callback;
49117+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49118+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49119+ };
49120+
49121 struct __vxge_hw_virtualpath *vpath;
49122
49123 if ((vp == NULL) || (attr == NULL)) {
49124@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49125 goto exit;
49126 }
49127
49128- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49129-
49130 fifo->mempool =
49131 __vxge_hw_mempool_create(vpath->hldev,
49132 fifo->config->memblock_size,
49133diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49134index 33669c2..a29c75e 100644
49135--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49136+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49137@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49138 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49139 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49140 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49141- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49142+ pax_open_kernel();
49143+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49144+ pax_close_kernel();
49145 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49146 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49147 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49148diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49149index be7d7a6..a8983f8 100644
49150--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49151+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49152@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49153 case QLCNIC_NON_PRIV_FUNC:
49154 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49155 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49156- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49157+ pax_open_kernel();
49158+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49159+ pax_close_kernel();
49160 break;
49161 case QLCNIC_PRIV_FUNC:
49162 ahw->op_mode = QLCNIC_PRIV_FUNC;
49163 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49164- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49165+ pax_open_kernel();
49166+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49167+ pax_close_kernel();
49168 break;
49169 case QLCNIC_MGMT_FUNC:
49170 ahw->op_mode = QLCNIC_MGMT_FUNC;
49171 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49172- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49173+ pax_open_kernel();
49174+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49175+ pax_close_kernel();
49176 break;
49177 default:
49178 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49179diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49180index 332bb8a..e6adcd1 100644
49181--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49182+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49183@@ -1285,7 +1285,7 @@ flash_temp:
49184 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49185 {
49186 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49187- static const struct qlcnic_dump_operations *fw_dump_ops;
49188+ const struct qlcnic_dump_operations *fw_dump_ops;
49189 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49190 u32 entry_offset, dump, no_entries, buf_offset = 0;
49191 int i, k, ops_cnt, ops_index, dump_size = 0;
49192diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49193index 3df51fa..e9b517f 100644
49194--- a/drivers/net/ethernet/realtek/r8169.c
49195+++ b/drivers/net/ethernet/realtek/r8169.c
49196@@ -788,22 +788,22 @@ struct rtl8169_private {
49197 struct mdio_ops {
49198 void (*write)(struct rtl8169_private *, int, int);
49199 int (*read)(struct rtl8169_private *, int);
49200- } mdio_ops;
49201+ } __no_const mdio_ops;
49202
49203 struct pll_power_ops {
49204 void (*down)(struct rtl8169_private *);
49205 void (*up)(struct rtl8169_private *);
49206- } pll_power_ops;
49207+ } __no_const pll_power_ops;
49208
49209 struct jumbo_ops {
49210 void (*enable)(struct rtl8169_private *);
49211 void (*disable)(struct rtl8169_private *);
49212- } jumbo_ops;
49213+ } __no_const jumbo_ops;
49214
49215 struct csi_ops {
49216 void (*write)(struct rtl8169_private *, int, int);
49217 u32 (*read)(struct rtl8169_private *, int);
49218- } csi_ops;
49219+ } __no_const csi_ops;
49220
49221 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49222 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49223diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49224index a2e9aee..af41a0e 100644
49225--- a/drivers/net/ethernet/sfc/ptp.c
49226+++ b/drivers/net/ethernet/sfc/ptp.c
49227@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49228 ptp->start.dma_addr);
49229
49230 /* Clear flag that signals MC ready */
49231- ACCESS_ONCE(*start) = 0;
49232+ ACCESS_ONCE_RW(*start) = 0;
49233 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49234 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49235 EFX_BUG_ON_PARANOID(rc);
49236diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49237index 08c483b..2c4a553 100644
49238--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49239+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49240@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49241
49242 writel(value, ioaddr + MMC_CNTRL);
49243
49244- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49245- MMC_CNTRL, value);
49246+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49247+// MMC_CNTRL, value);
49248 }
49249
49250 /* To mask all all interrupts.*/
49251diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49252index de28504..7f1c1cd 100644
49253--- a/drivers/net/ethernet/via/via-rhine.c
49254+++ b/drivers/net/ethernet/via/via-rhine.c
49255@@ -2525,7 +2525,7 @@ static struct platform_driver rhine_driver_platform = {
49256 }
49257 };
49258
49259-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49260+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49261 {
49262 .ident = "EPIA-M",
49263 .matches = {
49264diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49265index 41071d3..6e362e1 100644
49266--- a/drivers/net/hyperv/hyperv_net.h
49267+++ b/drivers/net/hyperv/hyperv_net.h
49268@@ -176,7 +176,7 @@ struct rndis_device {
49269 enum rndis_device_state state;
49270 bool link_state;
49271 bool link_change;
49272- atomic_t new_req_id;
49273+ atomic_unchecked_t new_req_id;
49274
49275 spinlock_t request_lock;
49276 struct list_head req_list;
49277diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49278index 9118cea..1a8e06a 100644
49279--- a/drivers/net/hyperv/rndis_filter.c
49280+++ b/drivers/net/hyperv/rndis_filter.c
49281@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49282 * template
49283 */
49284 set = &rndis_msg->msg.set_req;
49285- set->req_id = atomic_inc_return(&dev->new_req_id);
49286+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49287
49288 /* Add to the request list */
49289 spin_lock_irqsave(&dev->request_lock, flags);
49290@@ -923,7 +923,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49291
49292 /* Setup the rndis set */
49293 halt = &request->request_msg.msg.halt_req;
49294- halt->req_id = atomic_inc_return(&dev->new_req_id);
49295+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49296
49297 /* Ignore return since this msg is optional. */
49298 rndis_filter_send_request(dev, request);
49299diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49300index 94570aa..1a798e1 100644
49301--- a/drivers/net/ifb.c
49302+++ b/drivers/net/ifb.c
49303@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49304 return 0;
49305 }
49306
49307-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49308+static struct rtnl_link_ops ifb_link_ops = {
49309 .kind = "ifb",
49310 .priv_size = sizeof(struct ifb_private),
49311 .setup = ifb_setup,
49312diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
49313index 54549a6..0799442 100644
49314--- a/drivers/net/ipvlan/ipvlan.h
49315+++ b/drivers/net/ipvlan/ipvlan.h
49316@@ -102,6 +102,11 @@ static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
49317 return rcu_dereference(d->rx_handler_data);
49318 }
49319
49320+static inline struct ipvl_port *ipvlan_port_get_rcu_bh(const struct net_device *d)
49321+{
49322+ return rcu_dereference_bh(d->rx_handler_data);
49323+}
49324+
49325 static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
49326 {
49327 return rtnl_dereference(d->rx_handler_data);
49328diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
49329index c30b5c3..b349dad 100644
49330--- a/drivers/net/ipvlan/ipvlan_core.c
49331+++ b/drivers/net/ipvlan/ipvlan_core.c
49332@@ -507,7 +507,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
49333 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
49334 {
49335 struct ipvl_dev *ipvlan = netdev_priv(dev);
49336- struct ipvl_port *port = ipvlan_port_get_rcu(ipvlan->phy_dev);
49337+ struct ipvl_port *port = ipvlan_port_get_rcu_bh(ipvlan->phy_dev);
49338
49339 if (!port)
49340 goto out;
49341diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49342index 9f59f17..52cb38f 100644
49343--- a/drivers/net/macvlan.c
49344+++ b/drivers/net/macvlan.c
49345@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49346 free_nskb:
49347 kfree_skb(nskb);
49348 err:
49349- atomic_long_inc(&skb->dev->rx_dropped);
49350+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49351 }
49352
49353 static void macvlan_flush_sources(struct macvlan_port *port,
49354@@ -1480,13 +1480,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49355 int macvlan_link_register(struct rtnl_link_ops *ops)
49356 {
49357 /* common fields */
49358- ops->priv_size = sizeof(struct macvlan_dev);
49359- ops->validate = macvlan_validate;
49360- ops->maxtype = IFLA_MACVLAN_MAX;
49361- ops->policy = macvlan_policy;
49362- ops->changelink = macvlan_changelink;
49363- ops->get_size = macvlan_get_size;
49364- ops->fill_info = macvlan_fill_info;
49365+ pax_open_kernel();
49366+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49367+ *(void **)&ops->validate = macvlan_validate;
49368+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49369+ *(const void **)&ops->policy = macvlan_policy;
49370+ *(void **)&ops->changelink = macvlan_changelink;
49371+ *(void **)&ops->get_size = macvlan_get_size;
49372+ *(void **)&ops->fill_info = macvlan_fill_info;
49373+ pax_close_kernel();
49374
49375 return rtnl_link_register(ops);
49376 };
49377@@ -1572,7 +1574,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49378 return NOTIFY_DONE;
49379 }
49380
49381-static struct notifier_block macvlan_notifier_block __read_mostly = {
49382+static struct notifier_block macvlan_notifier_block = {
49383 .notifier_call = macvlan_device_event,
49384 };
49385
49386diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49387index 8c350c5..30fdc98 100644
49388--- a/drivers/net/macvtap.c
49389+++ b/drivers/net/macvtap.c
49390@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49391 dev->tx_queue_len = TUN_READQ_SIZE;
49392 }
49393
49394-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49395+static struct rtnl_link_ops macvtap_link_ops = {
49396 .kind = "macvtap",
49397 .setup = macvtap_setup,
49398 .newlink = macvtap_newlink,
49399@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49400
49401 ret = 0;
49402 u = q->flags;
49403- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49404+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49405 put_user(u, &ifr->ifr_flags))
49406 ret = -EFAULT;
49407 macvtap_put_vlan(vlan);
49408@@ -1214,7 +1214,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49409 return NOTIFY_DONE;
49410 }
49411
49412-static struct notifier_block macvtap_notifier_block __read_mostly = {
49413+static struct notifier_block macvtap_notifier_block = {
49414 .notifier_call = macvtap_device_event,
49415 };
49416
49417@@ -1268,6 +1268,7 @@ static void macvtap_exit(void)
49418 class_unregister(macvtap_class);
49419 cdev_del(&macvtap_cdev);
49420 unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS);
49421+ idr_destroy(&minor_idr);
49422 }
49423 module_exit(macvtap_exit);
49424
49425diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49426index 34924df..a747360 100644
49427--- a/drivers/net/nlmon.c
49428+++ b/drivers/net/nlmon.c
49429@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49430 return 0;
49431 }
49432
49433-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49434+static struct rtnl_link_ops nlmon_link_ops = {
49435 .kind = "nlmon",
49436 .priv_size = sizeof(struct nlmon),
49437 .setup = nlmon_setup,
49438diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49439index d551df6..fa4c2df 100644
49440--- a/drivers/net/phy/phy_device.c
49441+++ b/drivers/net/phy/phy_device.c
49442@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49443 * zero on success.
49444 *
49445 */
49446-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49447+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49448 struct phy_c45_device_ids *c45_ids) {
49449 int phy_reg;
49450 int i, reg_addr;
49451@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49452 * its return value is in turn returned.
49453 *
49454 */
49455-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49456+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49457 bool is_c45, struct phy_c45_device_ids *c45_ids)
49458 {
49459 int phy_reg;
49460@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49461 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49462 {
49463 struct phy_c45_device_ids c45_ids = {0};
49464- u32 phy_id = 0;
49465+ int phy_id = 0;
49466 int r;
49467
49468 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49469diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49470index 9d15566..5ad4ef6 100644
49471--- a/drivers/net/ppp/ppp_generic.c
49472+++ b/drivers/net/ppp/ppp_generic.c
49473@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49474 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49475 struct ppp_stats stats;
49476 struct ppp_comp_stats cstats;
49477- char *vers;
49478
49479 switch (cmd) {
49480 case SIOCGPPPSTATS:
49481@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49482 break;
49483
49484 case SIOCGPPPVER:
49485- vers = PPP_VERSION;
49486- if (copy_to_user(addr, vers, strlen(vers) + 1))
49487+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49488 break;
49489 err = 0;
49490 break;
49491diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49492index 079f7ad..b2a2bfa7 100644
49493--- a/drivers/net/slip/slhc.c
49494+++ b/drivers/net/slip/slhc.c
49495@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49496 register struct tcphdr *thp;
49497 register struct iphdr *ip;
49498 register struct cstate *cs;
49499- int len, hdrlen;
49500+ long len, hdrlen;
49501 unsigned char *cp = icp;
49502
49503 /* We've got a compressed packet; read the change byte */
49504diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49505index 6928448..e30c57f 100644
49506--- a/drivers/net/team/team.c
49507+++ b/drivers/net/team/team.c
49508@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
49509 return TEAM_DEFAULT_NUM_RX_QUEUES;
49510 }
49511
49512-static struct rtnl_link_ops team_link_ops __read_mostly = {
49513+static struct rtnl_link_ops team_link_ops = {
49514 .kind = DRV_NAME,
49515 .priv_size = sizeof(struct team),
49516 .setup = team_setup,
49517@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
49518 return NOTIFY_DONE;
49519 }
49520
49521-static struct notifier_block team_notifier_block __read_mostly = {
49522+static struct notifier_block team_notifier_block = {
49523 .notifier_call = team_device_event,
49524 };
49525
49526diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49527index e470ae5..e812f5e 100644
49528--- a/drivers/net/tun.c
49529+++ b/drivers/net/tun.c
49530@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49531 return -EINVAL;
49532 }
49533
49534-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49535+static struct rtnl_link_ops tun_link_ops = {
49536 .kind = DRV_NAME,
49537 .priv_size = sizeof(struct tun_struct),
49538 .setup = tun_setup,
49539@@ -1828,7 +1828,7 @@ unlock:
49540 }
49541
49542 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49543- unsigned long arg, int ifreq_len)
49544+ unsigned long arg, size_t ifreq_len)
49545 {
49546 struct tun_file *tfile = file->private_data;
49547 struct tun_struct *tun;
49548@@ -1842,6 +1842,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49549 int le;
49550 int ret;
49551
49552+ if (ifreq_len > sizeof ifr)
49553+ return -EFAULT;
49554+
49555 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49556 if (copy_from_user(&ifr, argp, ifreq_len))
49557 return -EFAULT;
49558diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49559index 111d907..1ee643e 100644
49560--- a/drivers/net/usb/hso.c
49561+++ b/drivers/net/usb/hso.c
49562@@ -70,7 +70,7 @@
49563 #include <asm/byteorder.h>
49564 #include <linux/serial_core.h>
49565 #include <linux/serial.h>
49566-
49567+#include <asm/local.h>
49568
49569 #define MOD_AUTHOR "Option Wireless"
49570 #define MOD_DESCRIPTION "USB High Speed Option driver"
49571@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49572 struct urb *urb;
49573
49574 urb = serial->rx_urb[0];
49575- if (serial->port.count > 0) {
49576+ if (atomic_read(&serial->port.count) > 0) {
49577 count = put_rxbuf_data(urb, serial);
49578 if (count == -1)
49579 return;
49580@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49581 DUMP1(urb->transfer_buffer, urb->actual_length);
49582
49583 /* Anyone listening? */
49584- if (serial->port.count == 0)
49585+ if (atomic_read(&serial->port.count) == 0)
49586 return;
49587
49588 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49589@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49590 tty_port_tty_set(&serial->port, tty);
49591
49592 /* check for port already opened, if not set the termios */
49593- serial->port.count++;
49594- if (serial->port.count == 1) {
49595+ if (atomic_inc_return(&serial->port.count) == 1) {
49596 serial->rx_state = RX_IDLE;
49597 /* Force default termio settings */
49598 _hso_serial_set_termios(tty, NULL);
49599@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49600 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49601 if (result) {
49602 hso_stop_serial_device(serial->parent);
49603- serial->port.count--;
49604+ atomic_dec(&serial->port.count);
49605 } else {
49606 kref_get(&serial->parent->ref);
49607 }
49608@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49609
49610 /* reset the rts and dtr */
49611 /* do the actual close */
49612- serial->port.count--;
49613+ atomic_dec(&serial->port.count);
49614
49615- if (serial->port.count <= 0) {
49616- serial->port.count = 0;
49617+ if (atomic_read(&serial->port.count) <= 0) {
49618+ atomic_set(&serial->port.count, 0);
49619 tty_port_tty_set(&serial->port, NULL);
49620 if (!usb_gone)
49621 hso_stop_serial_device(serial->parent);
49622@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49623
49624 /* the actual setup */
49625 spin_lock_irqsave(&serial->serial_lock, flags);
49626- if (serial->port.count)
49627+ if (atomic_read(&serial->port.count))
49628 _hso_serial_set_termios(tty, old);
49629 else
49630 tty->termios = *old;
49631@@ -1891,7 +1890,7 @@ static void intr_callback(struct urb *urb)
49632 D1("Pending read interrupt on port %d\n", i);
49633 spin_lock(&serial->serial_lock);
49634 if (serial->rx_state == RX_IDLE &&
49635- serial->port.count > 0) {
49636+ atomic_read(&serial->port.count) > 0) {
49637 /* Setup and send a ctrl req read on
49638 * port i */
49639 if (!serial->rx_urb_filled[0]) {
49640@@ -3058,7 +3057,7 @@ static int hso_resume(struct usb_interface *iface)
49641 /* Start all serial ports */
49642 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49643 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49644- if (dev2ser(serial_table[i])->port.count) {
49645+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49646 result =
49647 hso_start_serial_device(serial_table[i], GFP_NOIO);
49648 hso_kick_transmit(dev2ser(serial_table[i]));
49649diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49650index aafa1a1..f59c651 100644
49651--- a/drivers/net/usb/r8152.c
49652+++ b/drivers/net/usb/r8152.c
49653@@ -602,7 +602,7 @@ struct r8152 {
49654 void (*unload)(struct r8152 *);
49655 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49656 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49657- } rtl_ops;
49658+ } __no_const rtl_ops;
49659
49660 int intr_interval;
49661 u32 saved_wolopts;
49662diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49663index a2515887..6d13233 100644
49664--- a/drivers/net/usb/sierra_net.c
49665+++ b/drivers/net/usb/sierra_net.c
49666@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49667 /* atomic counter partially included in MAC address to make sure 2 devices
49668 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49669 */
49670-static atomic_t iface_counter = ATOMIC_INIT(0);
49671+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49672
49673 /*
49674 * SYNC Timer Delay definition used to set the expiry time
49675@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49676 dev->net->netdev_ops = &sierra_net_device_ops;
49677
49678 /* change MAC addr to include, ifacenum, and to be unique */
49679- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49680+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49681 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49682
49683 /* we will have to manufacture ethernet headers, prepare template */
49684diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49685index 63c7810..4ad33aa 100644
49686--- a/drivers/net/virtio_net.c
49687+++ b/drivers/net/virtio_net.c
49688@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49689 #define RECEIVE_AVG_WEIGHT 64
49690
49691 /* Minimum alignment for mergeable packet buffers. */
49692-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49693+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49694
49695 #define VIRTNET_DRIVER_VERSION "1.0.0"
49696
49697diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
49698index 61c0840..92e7f7e 100644
49699--- a/drivers/net/vmxnet3/vmxnet3_drv.c
49700+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
49701@@ -1167,7 +1167,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49702 static const u32 rxprod_reg[2] = {
49703 VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
49704 };
49705- u32 num_rxd = 0;
49706+ u32 num_pkts = 0;
49707 bool skip_page_frags = false;
49708 struct Vmxnet3_RxCompDesc *rcd;
49709 struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
49710@@ -1185,13 +1185,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49711 struct Vmxnet3_RxDesc *rxd;
49712 u32 idx, ring_idx;
49713 struct vmxnet3_cmd_ring *ring = NULL;
49714- if (num_rxd >= quota) {
49715+ if (num_pkts >= quota) {
49716 /* we may stop even before we see the EOP desc of
49717 * the current pkt
49718 */
49719 break;
49720 }
49721- num_rxd++;
49722 BUG_ON(rcd->rqID != rq->qid && rcd->rqID != rq->qid2);
49723 idx = rcd->rxdIdx;
49724 ring_idx = rcd->rqID < adapter->num_rx_queues ? 0 : 1;
49725@@ -1323,6 +1322,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49726 napi_gro_receive(&rq->napi, skb);
49727
49728 ctx->skb = NULL;
49729+ num_pkts++;
49730 }
49731
49732 rcd_done:
49733@@ -1353,7 +1353,7 @@ rcd_done:
49734 &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
49735 }
49736
49737- return num_rxd;
49738+ return num_pkts;
49739 }
49740
49741
49742diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49743index 21a0fbf..055b54f 100644
49744--- a/drivers/net/vxlan.c
49745+++ b/drivers/net/vxlan.c
49746@@ -2878,7 +2878,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49747 return vxlan->net;
49748 }
49749
49750-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49751+static struct rtnl_link_ops vxlan_link_ops = {
49752 .kind = "vxlan",
49753 .maxtype = IFLA_VXLAN_MAX,
49754 .policy = vxlan_policy,
49755@@ -2926,7 +2926,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49756 return NOTIFY_DONE;
49757 }
49758
49759-static struct notifier_block vxlan_notifier_block __read_mostly = {
49760+static struct notifier_block vxlan_notifier_block = {
49761 .notifier_call = vxlan_lowerdev_event,
49762 };
49763
49764diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49765index 5920c99..ff2e4a5 100644
49766--- a/drivers/net/wan/lmc/lmc_media.c
49767+++ b/drivers/net/wan/lmc/lmc_media.c
49768@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49769 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49770
49771 lmc_media_t lmc_ds3_media = {
49772- lmc_ds3_init, /* special media init stuff */
49773- lmc_ds3_default, /* reset to default state */
49774- lmc_ds3_set_status, /* reset status to state provided */
49775- lmc_dummy_set_1, /* set clock source */
49776- lmc_dummy_set2_1, /* set line speed */
49777- lmc_ds3_set_100ft, /* set cable length */
49778- lmc_ds3_set_scram, /* set scrambler */
49779- lmc_ds3_get_link_status, /* get link status */
49780- lmc_dummy_set_1, /* set link status */
49781- lmc_ds3_set_crc_length, /* set CRC length */
49782- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49783- lmc_ds3_watchdog
49784+ .init = lmc_ds3_init, /* special media init stuff */
49785+ .defaults = lmc_ds3_default, /* reset to default state */
49786+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49787+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49788+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49789+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49790+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49791+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49792+ .set_link_status = lmc_dummy_set_1, /* set link status */
49793+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49794+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49795+ .watchdog = lmc_ds3_watchdog
49796 };
49797
49798 lmc_media_t lmc_hssi_media = {
49799- lmc_hssi_init, /* special media init stuff */
49800- lmc_hssi_default, /* reset to default state */
49801- lmc_hssi_set_status, /* reset status to state provided */
49802- lmc_hssi_set_clock, /* set clock source */
49803- lmc_dummy_set2_1, /* set line speed */
49804- lmc_dummy_set_1, /* set cable length */
49805- lmc_dummy_set_1, /* set scrambler */
49806- lmc_hssi_get_link_status, /* get link status */
49807- lmc_hssi_set_link_status, /* set link status */
49808- lmc_hssi_set_crc_length, /* set CRC length */
49809- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49810- lmc_hssi_watchdog
49811+ .init = lmc_hssi_init, /* special media init stuff */
49812+ .defaults = lmc_hssi_default, /* reset to default state */
49813+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49814+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49815+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49816+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49817+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49818+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49819+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49820+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49821+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49822+ .watchdog = lmc_hssi_watchdog
49823 };
49824
49825-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49826- lmc_ssi_default, /* reset to default state */
49827- lmc_ssi_set_status, /* reset status to state provided */
49828- lmc_ssi_set_clock, /* set clock source */
49829- lmc_ssi_set_speed, /* set line speed */
49830- lmc_dummy_set_1, /* set cable length */
49831- lmc_dummy_set_1, /* set scrambler */
49832- lmc_ssi_get_link_status, /* get link status */
49833- lmc_ssi_set_link_status, /* set link status */
49834- lmc_ssi_set_crc_length, /* set CRC length */
49835- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49836- lmc_ssi_watchdog
49837+lmc_media_t lmc_ssi_media = {
49838+ .init = lmc_ssi_init, /* special media init stuff */
49839+ .defaults = lmc_ssi_default, /* reset to default state */
49840+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49841+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49842+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49843+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49844+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49845+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49846+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49847+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49848+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49849+ .watchdog = lmc_ssi_watchdog
49850 };
49851
49852 lmc_media_t lmc_t1_media = {
49853- lmc_t1_init, /* special media init stuff */
49854- lmc_t1_default, /* reset to default state */
49855- lmc_t1_set_status, /* reset status to state provided */
49856- lmc_t1_set_clock, /* set clock source */
49857- lmc_dummy_set2_1, /* set line speed */
49858- lmc_dummy_set_1, /* set cable length */
49859- lmc_dummy_set_1, /* set scrambler */
49860- lmc_t1_get_link_status, /* get link status */
49861- lmc_dummy_set_1, /* set link status */
49862- lmc_t1_set_crc_length, /* set CRC length */
49863- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49864- lmc_t1_watchdog
49865+ .init = lmc_t1_init, /* special media init stuff */
49866+ .defaults = lmc_t1_default, /* reset to default state */
49867+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49868+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49869+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49870+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49871+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49872+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49873+ .set_link_status = lmc_dummy_set_1, /* set link status */
49874+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49875+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49876+ .watchdog = lmc_t1_watchdog
49877 };
49878
49879 static void
49880diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49881index feacc3b..5bac0de 100644
49882--- a/drivers/net/wan/z85230.c
49883+++ b/drivers/net/wan/z85230.c
49884@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49885
49886 struct z8530_irqhandler z8530_sync =
49887 {
49888- z8530_rx,
49889- z8530_tx,
49890- z8530_status
49891+ .rx = z8530_rx,
49892+ .tx = z8530_tx,
49893+ .status = z8530_status
49894 };
49895
49896 EXPORT_SYMBOL(z8530_sync);
49897@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49898 }
49899
49900 static struct z8530_irqhandler z8530_dma_sync = {
49901- z8530_dma_rx,
49902- z8530_dma_tx,
49903- z8530_dma_status
49904+ .rx = z8530_dma_rx,
49905+ .tx = z8530_dma_tx,
49906+ .status = z8530_dma_status
49907 };
49908
49909 static struct z8530_irqhandler z8530_txdma_sync = {
49910- z8530_rx,
49911- z8530_dma_tx,
49912- z8530_dma_status
49913+ .rx = z8530_rx,
49914+ .tx = z8530_dma_tx,
49915+ .status = z8530_dma_status
49916 };
49917
49918 /**
49919@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49920
49921 struct z8530_irqhandler z8530_nop=
49922 {
49923- z8530_rx_clear,
49924- z8530_tx_clear,
49925- z8530_status_clear
49926+ .rx = z8530_rx_clear,
49927+ .tx = z8530_tx_clear,
49928+ .status = z8530_status_clear
49929 };
49930
49931
49932diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49933index 0b60295..b8bfa5b 100644
49934--- a/drivers/net/wimax/i2400m/rx.c
49935+++ b/drivers/net/wimax/i2400m/rx.c
49936@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49937 if (i2400m->rx_roq == NULL)
49938 goto error_roq_alloc;
49939
49940- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49941+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49942 GFP_KERNEL);
49943 if (rd == NULL) {
49944 result = -ENOMEM;
49945diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49946index d0c97c2..108f59b 100644
49947--- a/drivers/net/wireless/airo.c
49948+++ b/drivers/net/wireless/airo.c
49949@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49950 struct airo_info *ai = dev->ml_priv;
49951 int ridcode;
49952 int enabled;
49953- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49954+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49955 unsigned char *iobuf;
49956
49957 /* Only super-user can write RIDs */
49958diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49959index 49219c5..3625441 100644
49960--- a/drivers/net/wireless/at76c50x-usb.c
49961+++ b/drivers/net/wireless/at76c50x-usb.c
49962@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49963 }
49964
49965 /* Convert timeout from the DFU status to jiffies */
49966-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49967+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49968 {
49969 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49970 | (s->poll_timeout[1] << 8)
49971diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49972index 2fd9e18..3f55bdd 100644
49973--- a/drivers/net/wireless/ath/ath10k/htc.c
49974+++ b/drivers/net/wireless/ath/ath10k/htc.c
49975@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49976 /* registered target arrival callback from the HIF layer */
49977 int ath10k_htc_init(struct ath10k *ar)
49978 {
49979- struct ath10k_hif_cb htc_callbacks;
49980+ static struct ath10k_hif_cb htc_callbacks = {
49981+ .rx_completion = ath10k_htc_rx_completion_handler,
49982+ .tx_completion = ath10k_htc_tx_completion_handler,
49983+ };
49984 struct ath10k_htc_ep *ep = NULL;
49985 struct ath10k_htc *htc = &ar->htc;
49986
49987@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49988 ath10k_htc_reset_endpoint_states(htc);
49989
49990 /* setup HIF layer callbacks */
49991- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49992- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49993 htc->ar = ar;
49994
49995 /* Get HIF default pipe for HTC message exchange */
49996diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49997index 527179c..a890150 100644
49998--- a/drivers/net/wireless/ath/ath10k/htc.h
49999+++ b/drivers/net/wireless/ath/ath10k/htc.h
50000@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
50001
50002 struct ath10k_htc_ops {
50003 void (*target_send_suspend_complete)(struct ath10k *ar);
50004-};
50005+} __no_const;
50006
50007 struct ath10k_htc_ep_ops {
50008 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
50009 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
50010 void (*ep_tx_credits)(struct ath10k *);
50011-};
50012+} __no_const;
50013
50014 /* service connection information */
50015 struct ath10k_htc_svc_conn_req {
50016diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50017index f816909..e56cd8b 100644
50018--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50019+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50020@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50021 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
50022 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
50023
50024- ACCESS_ONCE(ads->ds_link) = i->link;
50025- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
50026+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
50027+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
50028
50029 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
50030 ctl6 = SM(i->keytype, AR_EncrType);
50031@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50032
50033 if ((i->is_first || i->is_last) &&
50034 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
50035- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
50036+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
50037 | set11nTries(i->rates, 1)
50038 | set11nTries(i->rates, 2)
50039 | set11nTries(i->rates, 3)
50040 | (i->dur_update ? AR_DurUpdateEna : 0)
50041 | SM(0, AR_BurstDur);
50042
50043- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
50044+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
50045 | set11nRate(i->rates, 1)
50046 | set11nRate(i->rates, 2)
50047 | set11nRate(i->rates, 3);
50048 } else {
50049- ACCESS_ONCE(ads->ds_ctl2) = 0;
50050- ACCESS_ONCE(ads->ds_ctl3) = 0;
50051+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
50052+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
50053 }
50054
50055 if (!i->is_first) {
50056- ACCESS_ONCE(ads->ds_ctl0) = 0;
50057- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50058- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50059+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
50060+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50061+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50062 return;
50063 }
50064
50065@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50066 break;
50067 }
50068
50069- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50070+ ACCESS_ONCE_RW(ads->ds_ctl0) = (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@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50075 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50076 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50077
50078- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50079- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50080+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50081+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50082
50083 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50084 return;
50085
50086- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50087+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50088 | set11nPktDurRTSCTS(i->rates, 1);
50089
50090- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50091+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50092 | set11nPktDurRTSCTS(i->rates, 3);
50093
50094- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50095+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50096 | set11nRateFlags(i->rates, 1)
50097 | set11nRateFlags(i->rates, 2)
50098 | set11nRateFlags(i->rates, 3)
50099 | SM(i->rtscts_rate, AR_RTSCTSRate);
50100
50101- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50102- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50103- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50104+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50105+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50106+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50107 }
50108
50109 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50110diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50111index da84b70..83e4978 100644
50112--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50113+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50114@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50115 (i->qcu << AR_TxQcuNum_S) | desc_len;
50116
50117 checksum += val;
50118- ACCESS_ONCE(ads->info) = val;
50119+ ACCESS_ONCE_RW(ads->info) = val;
50120
50121 checksum += i->link;
50122- ACCESS_ONCE(ads->link) = i->link;
50123+ ACCESS_ONCE_RW(ads->link) = i->link;
50124
50125 checksum += i->buf_addr[0];
50126- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50127+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50128 checksum += i->buf_addr[1];
50129- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50130+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50131 checksum += i->buf_addr[2];
50132- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50133+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50134 checksum += i->buf_addr[3];
50135- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50136+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50137
50138 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50139- ACCESS_ONCE(ads->ctl3) = val;
50140+ ACCESS_ONCE_RW(ads->ctl3) = val;
50141 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50142- ACCESS_ONCE(ads->ctl5) = val;
50143+ ACCESS_ONCE_RW(ads->ctl5) = val;
50144 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50145- ACCESS_ONCE(ads->ctl7) = val;
50146+ ACCESS_ONCE_RW(ads->ctl7) = val;
50147 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50148- ACCESS_ONCE(ads->ctl9) = val;
50149+ ACCESS_ONCE_RW(ads->ctl9) = val;
50150
50151 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50152- ACCESS_ONCE(ads->ctl10) = checksum;
50153+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50154
50155 if (i->is_first || i->is_last) {
50156- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50157+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50158 | set11nTries(i->rates, 1)
50159 | set11nTries(i->rates, 2)
50160 | set11nTries(i->rates, 3)
50161 | (i->dur_update ? AR_DurUpdateEna : 0)
50162 | SM(0, AR_BurstDur);
50163
50164- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50165+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50166 | set11nRate(i->rates, 1)
50167 | set11nRate(i->rates, 2)
50168 | set11nRate(i->rates, 3);
50169 } else {
50170- ACCESS_ONCE(ads->ctl13) = 0;
50171- ACCESS_ONCE(ads->ctl14) = 0;
50172+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50173+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50174 }
50175
50176 ads->ctl20 = 0;
50177@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50178
50179 ctl17 = SM(i->keytype, AR_EncrType);
50180 if (!i->is_first) {
50181- ACCESS_ONCE(ads->ctl11) = 0;
50182- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50183- ACCESS_ONCE(ads->ctl15) = 0;
50184- ACCESS_ONCE(ads->ctl16) = 0;
50185- ACCESS_ONCE(ads->ctl17) = ctl17;
50186- ACCESS_ONCE(ads->ctl18) = 0;
50187- ACCESS_ONCE(ads->ctl19) = 0;
50188+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50189+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50190+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50191+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50192+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50193+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50194+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50195 return;
50196 }
50197
50198- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50199+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50200 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50201 | SM(i->txpower[0], AR_XmitPower0)
50202 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50203@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50204 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50205 ctl12 |= SM(val, AR_PAPRDChainMask);
50206
50207- ACCESS_ONCE(ads->ctl12) = ctl12;
50208- ACCESS_ONCE(ads->ctl17) = ctl17;
50209+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50210+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50211
50212- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50213+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50214 | set11nPktDurRTSCTS(i->rates, 1);
50215
50216- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50217+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50218 | set11nPktDurRTSCTS(i->rates, 3);
50219
50220- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50221+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50222 | set11nRateFlags(i->rates, 1)
50223 | set11nRateFlags(i->rates, 2)
50224 | set11nRateFlags(i->rates, 3)
50225 | SM(i->rtscts_rate, AR_RTSCTSRate);
50226
50227- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50228+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50229
50230- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50231- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50232- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50233+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50234+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50235+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50236 }
50237
50238 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50239diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50240index c1d2d03..08352db 100644
50241--- a/drivers/net/wireless/ath/ath9k/hw.h
50242+++ b/drivers/net/wireless/ath/ath9k/hw.h
50243@@ -671,7 +671,7 @@ struct ath_hw_private_ops {
50244 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50245 bool (*is_aic_enabled)(struct ath_hw *ah);
50246 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
50247-};
50248+} __no_const;
50249
50250 /**
50251 * struct ath_spec_scan - parameters for Atheros spectral scan
50252@@ -747,7 +747,7 @@ struct ath_hw_ops {
50253 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50254 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50255 #endif
50256-};
50257+} __no_const;
50258
50259 struct ath_nf_limits {
50260 s16 max;
50261diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50262index b0badef..3e3464c 100644
50263--- a/drivers/net/wireless/ath/ath9k/main.c
50264+++ b/drivers/net/wireless/ath/ath9k/main.c
50265@@ -2573,16 +2573,18 @@ void ath9k_fill_chanctx_ops(void)
50266 if (!ath9k_is_chanctx_enabled())
50267 return;
50268
50269- ath9k_ops.hw_scan = ath9k_hw_scan;
50270- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50271- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50272- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50273- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50274- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50275- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50276- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50277- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50278- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50279+ pax_open_kernel();
50280+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50281+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50282+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50283+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50284+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50285+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50286+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50287+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50288+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50289+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50290+ pax_close_kernel();
50291 }
50292
50293 #endif
50294diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50295index 058a9f2..d5cb1ba 100644
50296--- a/drivers/net/wireless/b43/phy_lp.c
50297+++ b/drivers/net/wireless/b43/phy_lp.c
50298@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50299 {
50300 struct ssb_bus *bus = dev->dev->sdev->bus;
50301
50302- static const struct b206x_channel *chandata = NULL;
50303+ const struct b206x_channel *chandata = NULL;
50304 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50305 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50306 u16 old_comm15, scale;
50307diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50308index e566580..2c218ca 100644
50309--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50310+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50311@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50312 */
50313 if (il3945_mod_params.disable_hw_scan) {
50314 D_INFO("Disabling hw_scan\n");
50315- il3945_mac_ops.hw_scan = NULL;
50316+ pax_open_kernel();
50317+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50318+ pax_close_kernel();
50319 }
50320
50321 D_INFO("*** LOAD DRIVER ***\n");
50322diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50323index 0ffb6ff..c0b7f0e 100644
50324--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50325+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50326@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50327 {
50328 struct iwl_priv *priv = file->private_data;
50329 char buf[64];
50330- int buf_size;
50331+ size_t buf_size;
50332 u32 offset, len;
50333
50334 memset(buf, 0, sizeof(buf));
50335@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50336 struct iwl_priv *priv = file->private_data;
50337
50338 char buf[8];
50339- int buf_size;
50340+ size_t buf_size;
50341 u32 reset_flag;
50342
50343 memset(buf, 0, sizeof(buf));
50344@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50345 {
50346 struct iwl_priv *priv = file->private_data;
50347 char buf[8];
50348- int buf_size;
50349+ size_t buf_size;
50350 int ht40;
50351
50352 memset(buf, 0, sizeof(buf));
50353@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50354 {
50355 struct iwl_priv *priv = file->private_data;
50356 char buf[8];
50357- int buf_size;
50358+ size_t buf_size;
50359 int value;
50360
50361 memset(buf, 0, sizeof(buf));
50362@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50363 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50364 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50365
50366-static const char *fmt_value = " %-30s %10u\n";
50367-static const char *fmt_hex = " %-30s 0x%02X\n";
50368-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50369-static const char *fmt_header =
50370+static const char fmt_value[] = " %-30s %10u\n";
50371+static const char fmt_hex[] = " %-30s 0x%02X\n";
50372+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50373+static const char fmt_header[] =
50374 "%-32s current cumulative delta max\n";
50375
50376 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50377@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50378 {
50379 struct iwl_priv *priv = file->private_data;
50380 char buf[8];
50381- int buf_size;
50382+ size_t buf_size;
50383 int clear;
50384
50385 memset(buf, 0, sizeof(buf));
50386@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50387 {
50388 struct iwl_priv *priv = file->private_data;
50389 char buf[8];
50390- int buf_size;
50391+ size_t buf_size;
50392 int trace;
50393
50394 memset(buf, 0, sizeof(buf));
50395@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50396 {
50397 struct iwl_priv *priv = file->private_data;
50398 char buf[8];
50399- int buf_size;
50400+ size_t buf_size;
50401 int missed;
50402
50403 memset(buf, 0, sizeof(buf));
50404@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50405
50406 struct iwl_priv *priv = file->private_data;
50407 char buf[8];
50408- int buf_size;
50409+ size_t buf_size;
50410 int plcp;
50411
50412 memset(buf, 0, sizeof(buf));
50413@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50414
50415 struct iwl_priv *priv = file->private_data;
50416 char buf[8];
50417- int buf_size;
50418+ size_t buf_size;
50419 int flush;
50420
50421 memset(buf, 0, sizeof(buf));
50422@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50423
50424 struct iwl_priv *priv = file->private_data;
50425 char buf[8];
50426- int buf_size;
50427+ size_t buf_size;
50428 int rts;
50429
50430 if (!priv->cfg->ht_params)
50431@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50432 {
50433 struct iwl_priv *priv = file->private_data;
50434 char buf[8];
50435- int buf_size;
50436+ size_t buf_size;
50437
50438 memset(buf, 0, sizeof(buf));
50439 buf_size = min(count, sizeof(buf) - 1);
50440@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50441 struct iwl_priv *priv = file->private_data;
50442 u32 event_log_flag;
50443 char buf[8];
50444- int buf_size;
50445+ size_t buf_size;
50446
50447 /* check that the interface is up */
50448 if (!iwl_is_ready(priv))
50449@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50450 struct iwl_priv *priv = file->private_data;
50451 char buf[8];
50452 u32 calib_disabled;
50453- int buf_size;
50454+ size_t buf_size;
50455
50456 memset(buf, 0, sizeof(buf));
50457 buf_size = min(count, sizeof(buf) - 1);
50458diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50459index dc17909..989c9fb 100644
50460--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50461+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50462@@ -1919,7 +1919,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50463 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50464
50465 char buf[8];
50466- int buf_size;
50467+ size_t buf_size;
50468 u32 reset_flag;
50469
50470 memset(buf, 0, sizeof(buf));
50471@@ -1940,7 +1940,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50472 {
50473 struct iwl_trans *trans = file->private_data;
50474 char buf[8];
50475- int buf_size;
50476+ size_t buf_size;
50477 int csr;
50478
50479 memset(buf, 0, sizeof(buf));
50480diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50481index d5c0a1a..d056b20 100644
50482--- a/drivers/net/wireless/mac80211_hwsim.c
50483+++ b/drivers/net/wireless/mac80211_hwsim.c
50484@@ -3149,20 +3149,20 @@ static int __init init_mac80211_hwsim(void)
50485 if (channels < 1)
50486 return -EINVAL;
50487
50488- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50489- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50490- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50491- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50492- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50493- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50494- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50495- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50496- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50497- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50498- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50499- mac80211_hwsim_assign_vif_chanctx;
50500- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50501- mac80211_hwsim_unassign_vif_chanctx;
50502+ pax_open_kernel();
50503+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50504+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50505+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50506+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50507+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50508+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50509+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50510+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50511+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50512+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50513+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50514+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50515+ pax_close_kernel();
50516
50517 spin_lock_init(&hwsim_radio_lock);
50518 INIT_LIST_HEAD(&hwsim_radios);
50519diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50520index d72ff8e..c209a45 100644
50521--- a/drivers/net/wireless/rndis_wlan.c
50522+++ b/drivers/net/wireless/rndis_wlan.c
50523@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50524
50525 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50526
50527- if (rts_threshold < 0 || rts_threshold > 2347)
50528+ if (rts_threshold > 2347)
50529 rts_threshold = 2347;
50530
50531 tmp = cpu_to_le32(rts_threshold);
50532diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50533index 9bb398b..b0cc047 100644
50534--- a/drivers/net/wireless/rt2x00/rt2x00.h
50535+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50536@@ -375,7 +375,7 @@ struct rt2x00_intf {
50537 * for hardware which doesn't support hardware
50538 * sequence counting.
50539 */
50540- atomic_t seqno;
50541+ atomic_unchecked_t seqno;
50542 };
50543
50544 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50545diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50546index 68b620b..92ecd9e 100644
50547--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50548+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50549@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50550 * sequence counter given by mac80211.
50551 */
50552 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50553- seqno = atomic_add_return(0x10, &intf->seqno);
50554+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50555 else
50556- seqno = atomic_read(&intf->seqno);
50557+ seqno = atomic_read_unchecked(&intf->seqno);
50558
50559 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50560 hdr->seq_ctrl |= cpu_to_le16(seqno);
50561diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50562index b661f896..ddf7d2b 100644
50563--- a/drivers/net/wireless/ti/wl1251/sdio.c
50564+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50565@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50566
50567 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50568
50569- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50570- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50571+ pax_open_kernel();
50572+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50573+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50574+ pax_close_kernel();
50575
50576 wl1251_info("using dedicated interrupt line");
50577 } else {
50578- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50579- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50580+ pax_open_kernel();
50581+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50582+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50583+ pax_close_kernel();
50584
50585 wl1251_info("using SDIO interrupt");
50586 }
50587diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50588index af0fe2e..d04986b 100644
50589--- a/drivers/net/wireless/ti/wl12xx/main.c
50590+++ b/drivers/net/wireless/ti/wl12xx/main.c
50591@@ -655,7 +655,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50592 sizeof(wl->conf.mem));
50593
50594 /* read data preparation is only needed by wl127x */
50595- wl->ops->prepare_read = wl127x_prepare_read;
50596+ pax_open_kernel();
50597+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50598+ pax_close_kernel();
50599
50600 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50601 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50602@@ -680,7 +682,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50603 sizeof(wl->conf.mem));
50604
50605 /* read data preparation is only needed by wl127x */
50606- wl->ops->prepare_read = wl127x_prepare_read;
50607+ pax_open_kernel();
50608+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50609+ pax_close_kernel();
50610
50611 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50612 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50613diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50614index 717c4f5..a813aeb 100644
50615--- a/drivers/net/wireless/ti/wl18xx/main.c
50616+++ b/drivers/net/wireless/ti/wl18xx/main.c
50617@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50618 }
50619
50620 if (!checksum_param) {
50621- wl18xx_ops.set_rx_csum = NULL;
50622- wl18xx_ops.init_vif = NULL;
50623+ pax_open_kernel();
50624+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50625+ *(void **)&wl18xx_ops.init_vif = NULL;
50626+ pax_close_kernel();
50627 }
50628
50629 /* Enable 11a Band only if we have 5G antennas */
50630diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50631index a912dc0..a8225ba 100644
50632--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50633+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50634@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50635 {
50636 struct zd_usb *usb = urb->context;
50637 struct zd_usb_interrupt *intr = &usb->intr;
50638- int len;
50639+ unsigned int len;
50640 u16 int_num;
50641
50642 ZD_ASSERT(in_interrupt());
50643diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
50644index 0d25943..0866c5d 100644
50645--- a/drivers/net/xen-netback/netback.c
50646+++ b/drivers/net/xen-netback/netback.c
50647@@ -1571,13 +1571,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
50648 smp_rmb();
50649
50650 while (dc != dp) {
50651- BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
50652+ BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
50653 pending_idx =
50654 queue->dealloc_ring[pending_index(dc++)];
50655
50656- pending_idx_release[gop-queue->tx_unmap_ops] =
50657+ pending_idx_release[gop - queue->tx_unmap_ops] =
50658 pending_idx;
50659- queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
50660+ queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
50661 queue->mmap_pages[pending_idx];
50662 gnttab_set_unmap_op(gop,
50663 idx_to_kaddr(queue, pending_idx),
50664diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50665index ce2e2cf..f81e500 100644
50666--- a/drivers/nfc/nfcwilink.c
50667+++ b/drivers/nfc/nfcwilink.c
50668@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50669
50670 static int nfcwilink_probe(struct platform_device *pdev)
50671 {
50672- static struct nfcwilink *drv;
50673+ struct nfcwilink *drv;
50674 int rc;
50675 __u32 protocols;
50676
50677diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50678index d251f72..0512865 100644
50679--- a/drivers/nfc/st21nfca/st21nfca.c
50680+++ b/drivers/nfc/st21nfca/st21nfca.c
50681@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50682 ST21NFCA_DEVICE_MGNT_GATE,
50683 ST21NFCA_DEVICE_MGNT_PIPE);
50684 if (r < 0)
50685- goto free_info;
50686+ return r;
50687
50688 /* Get pipe list */
50689 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50690 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50691 &skb_pipe_list);
50692 if (r < 0)
50693- goto free_info;
50694+ return r;
50695
50696 /* Complete the existing gate_pipe table */
50697 for (i = 0; i < skb_pipe_list->len; i++) {
50698@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50699 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50700 pr_err("Unexpected apdu_reader pipe on host %x\n",
50701 info->src_host_id);
50702+ kfree_skb(skb_pipe_info);
50703 continue;
50704 }
50705
50706@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50707 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50708 info->src_host_id;
50709 }
50710+ kfree_skb(skb_pipe_info);
50711 }
50712
50713 /*
50714@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50715 st21nfca_gates[i].gate,
50716 st21nfca_gates[i].pipe);
50717 if (r < 0)
50718- goto free_info;
50719+ goto free_list;
50720 }
50721 }
50722
50723 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50724-free_info:
50725- kfree_skb(skb_pipe_info);
50726+free_list:
50727 kfree_skb(skb_pipe_list);
50728 return r;
50729 }
50730diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50731index cde35c5d01..2dbfdbbf 100644
50732--- a/drivers/of/fdt.c
50733+++ b/drivers/of/fdt.c
50734@@ -1136,7 +1136,9 @@ static int __init of_fdt_raw_init(void)
50735 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50736 return 0;
50737 }
50738- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50739+ pax_open_kernel();
50740+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50741+ pax_close_kernel();
50742 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50743 }
50744 late_initcall(of_fdt_raw_init);
50745diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50746index 82f7000..d6d0447 100644
50747--- a/drivers/oprofile/buffer_sync.c
50748+++ b/drivers/oprofile/buffer_sync.c
50749@@ -345,7 +345,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50750 if (cookie == NO_COOKIE)
50751 offset = pc;
50752 if (cookie == INVALID_COOKIE) {
50753- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50754+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50755 offset = pc;
50756 }
50757 if (cookie != last_cookie) {
50758@@ -389,14 +389,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50759 /* add userspace sample */
50760
50761 if (!mm) {
50762- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50763+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50764 return 0;
50765 }
50766
50767 cookie = lookup_dcookie(mm, s->eip, &offset);
50768
50769 if (cookie == INVALID_COOKIE) {
50770- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50771+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50772 return 0;
50773 }
50774
50775@@ -554,7 +554,7 @@ void sync_buffer(int cpu)
50776 /* ignore backtraces if failed to add a sample */
50777 if (state == sb_bt_start) {
50778 state = sb_bt_ignore;
50779- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50780+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50781 }
50782 }
50783 release_mm(mm);
50784diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50785index c0cc4e7..44d4e54 100644
50786--- a/drivers/oprofile/event_buffer.c
50787+++ b/drivers/oprofile/event_buffer.c
50788@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50789 }
50790
50791 if (buffer_pos == buffer_size) {
50792- atomic_inc(&oprofile_stats.event_lost_overflow);
50793+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50794 return;
50795 }
50796
50797diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50798index ed2c3ec..deda85a 100644
50799--- a/drivers/oprofile/oprof.c
50800+++ b/drivers/oprofile/oprof.c
50801@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50802 if (oprofile_ops.switch_events())
50803 return;
50804
50805- atomic_inc(&oprofile_stats.multiplex_counter);
50806+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50807 start_switch_worker();
50808 }
50809
50810diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50811index ee2cfce..7f8f699 100644
50812--- a/drivers/oprofile/oprofile_files.c
50813+++ b/drivers/oprofile/oprofile_files.c
50814@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50815
50816 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50817
50818-static ssize_t timeout_read(struct file *file, char __user *buf,
50819+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50820 size_t count, loff_t *offset)
50821 {
50822 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50823diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50824index 59659ce..6c860a0 100644
50825--- a/drivers/oprofile/oprofile_stats.c
50826+++ b/drivers/oprofile/oprofile_stats.c
50827@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50828 cpu_buf->sample_invalid_eip = 0;
50829 }
50830
50831- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50832- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50833- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50834- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50835- atomic_set(&oprofile_stats.multiplex_counter, 0);
50836+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50837+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50838+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50839+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50840+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50841 }
50842
50843
50844diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50845index 1fc622b..8c48fc3 100644
50846--- a/drivers/oprofile/oprofile_stats.h
50847+++ b/drivers/oprofile/oprofile_stats.h
50848@@ -13,11 +13,11 @@
50849 #include <linux/atomic.h>
50850
50851 struct oprofile_stat_struct {
50852- atomic_t sample_lost_no_mm;
50853- atomic_t sample_lost_no_mapping;
50854- atomic_t bt_lost_no_mapping;
50855- atomic_t event_lost_overflow;
50856- atomic_t multiplex_counter;
50857+ atomic_unchecked_t sample_lost_no_mm;
50858+ atomic_unchecked_t sample_lost_no_mapping;
50859+ atomic_unchecked_t bt_lost_no_mapping;
50860+ atomic_unchecked_t event_lost_overflow;
50861+ atomic_unchecked_t multiplex_counter;
50862 };
50863
50864 extern struct oprofile_stat_struct oprofile_stats;
50865diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50866index dd92c5e..dfc04b5 100644
50867--- a/drivers/oprofile/oprofilefs.c
50868+++ b/drivers/oprofile/oprofilefs.c
50869@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50870
50871 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50872 {
50873- atomic_t *val = file->private_data;
50874- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50875+ atomic_unchecked_t *val = file->private_data;
50876+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50877 }
50878
50879
50880@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50881
50882
50883 int oprofilefs_create_ro_atomic(struct dentry *root,
50884- char const *name, atomic_t *val)
50885+ char const *name, atomic_unchecked_t *val)
50886 {
50887 return __oprofilefs_create_file(root, name,
50888 &atomic_ro_fops, 0444, val);
50889diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50890index bdef916..88c7dee 100644
50891--- a/drivers/oprofile/timer_int.c
50892+++ b/drivers/oprofile/timer_int.c
50893@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50894 return NOTIFY_OK;
50895 }
50896
50897-static struct notifier_block __refdata oprofile_cpu_notifier = {
50898+static struct notifier_block oprofile_cpu_notifier = {
50899 .notifier_call = oprofile_cpu_notify,
50900 };
50901
50902diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50903index 3b47080..6cd05dd 100644
50904--- a/drivers/parport/procfs.c
50905+++ b/drivers/parport/procfs.c
50906@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50907
50908 *ppos += len;
50909
50910- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50911+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50912 }
50913
50914 #ifdef CONFIG_PARPORT_1284
50915@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50916
50917 *ppos += len;
50918
50919- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50920+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50921 }
50922 #endif /* IEEE1284.3 support. */
50923
50924diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50925index ba46e58..90cfc24 100644
50926--- a/drivers/pci/host/pci-host-generic.c
50927+++ b/drivers/pci/host/pci-host-generic.c
50928@@ -26,9 +26,9 @@
50929 #include <linux/platform_device.h>
50930
50931 struct gen_pci_cfg_bus_ops {
50932+ struct pci_ops ops;
50933 u32 bus_shift;
50934- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50935-};
50936+} __do_const;
50937
50938 struct gen_pci_cfg_windows {
50939 struct resource res;
50940@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50941 }
50942
50943 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50944+ .ops = {
50945+ .map_bus = gen_pci_map_cfg_bus_cam,
50946+ .read = pci_generic_config_read,
50947+ .write = pci_generic_config_write,
50948+ },
50949 .bus_shift = 16,
50950- .map_bus = gen_pci_map_cfg_bus_cam,
50951 };
50952
50953 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50954@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50955 }
50956
50957 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50958+ .ops = {
50959+ .map_bus = gen_pci_map_cfg_bus_ecam,
50960+ .read = pci_generic_config_read,
50961+ .write = pci_generic_config_write,
50962+ },
50963 .bus_shift = 20,
50964- .map_bus = gen_pci_map_cfg_bus_ecam,
50965-};
50966-
50967-static struct pci_ops gen_pci_ops = {
50968- .read = pci_generic_config_read,
50969- .write = pci_generic_config_write,
50970 };
50971
50972 static const struct of_device_id gen_pci_of_match[] = {
50973@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50974 .private_data = (void **)&pci,
50975 .setup = gen_pci_setup,
50976 .map_irq = of_irq_parse_and_map_pci,
50977- .ops = &gen_pci_ops,
50978 };
50979
50980 if (!pci)
50981@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50982
50983 of_id = of_match_node(gen_pci_of_match, np);
50984 pci->cfg.ops = of_id->data;
50985- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50986+ hw.ops = &pci->cfg.ops->ops;
50987 pci->host.dev.parent = dev;
50988 INIT_LIST_HEAD(&pci->host.windows);
50989 INIT_LIST_HEAD(&pci->resources);
50990diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50991index 6ca2399..68d866b 100644
50992--- a/drivers/pci/hotplug/acpiphp_ibm.c
50993+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50994@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50995 goto init_cleanup;
50996 }
50997
50998- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50999+ pax_open_kernel();
51000+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
51001+ pax_close_kernel();
51002 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
51003
51004 return retval;
51005diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
51006index 66b7bbe..26bee78 100644
51007--- a/drivers/pci/hotplug/cpcihp_generic.c
51008+++ b/drivers/pci/hotplug/cpcihp_generic.c
51009@@ -73,7 +73,6 @@ static u16 port;
51010 static unsigned int enum_bit;
51011 static u8 enum_mask;
51012
51013-static struct cpci_hp_controller_ops generic_hpc_ops;
51014 static struct cpci_hp_controller generic_hpc;
51015
51016 static int __init validate_parameters(void)
51017@@ -139,6 +138,10 @@ static int query_enum(void)
51018 return ((value & enum_mask) == enum_mask);
51019 }
51020
51021+static struct cpci_hp_controller_ops generic_hpc_ops = {
51022+ .query_enum = query_enum,
51023+};
51024+
51025 static int __init cpcihp_generic_init(void)
51026 {
51027 int status;
51028@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
51029 pci_dev_put(dev);
51030
51031 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
51032- generic_hpc_ops.query_enum = query_enum;
51033 generic_hpc.ops = &generic_hpc_ops;
51034
51035 status = cpci_hp_register_controller(&generic_hpc);
51036diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
51037index 7ecf34e..effed62 100644
51038--- a/drivers/pci/hotplug/cpcihp_zt5550.c
51039+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
51040@@ -59,7 +59,6 @@
51041 /* local variables */
51042 static bool debug;
51043 static bool poll;
51044-static struct cpci_hp_controller_ops zt5550_hpc_ops;
51045 static struct cpci_hp_controller zt5550_hpc;
51046
51047 /* Primary cPCI bus bridge device */
51048@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
51049 return 0;
51050 }
51051
51052+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
51053+ .query_enum = zt5550_hc_query_enum,
51054+};
51055+
51056 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
51057 {
51058 int status;
51059@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
51060 dbg("returned from zt5550_hc_config");
51061
51062 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
51063- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
51064 zt5550_hpc.ops = &zt5550_hpc_ops;
51065 if (!poll) {
51066 zt5550_hpc.irq = hc_dev->irq;
51067 zt5550_hpc.irq_flags = IRQF_SHARED;
51068 zt5550_hpc.dev_id = hc_dev;
51069
51070- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51071- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51072- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51073+ pax_open_kernel();
51074+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51075+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51076+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51077+ pax_open_kernel();
51078 } else {
51079 info("using ENUM# polling mode");
51080 }
51081diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
51082index 1e08ff8c..3cd145f 100644
51083--- a/drivers/pci/hotplug/cpqphp_nvram.c
51084+++ b/drivers/pci/hotplug/cpqphp_nvram.c
51085@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
51086
51087 void compaq_nvram_init (void __iomem *rom_start)
51088 {
51089+#ifndef CONFIG_PAX_KERNEXEC
51090 if (rom_start)
51091 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
51092+#endif
51093
51094 dbg("int15 entry = %p\n", compaq_int15_entry_point);
51095
51096diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
51097index 56d8486..f26113f 100644
51098--- a/drivers/pci/hotplug/pci_hotplug_core.c
51099+++ b/drivers/pci/hotplug/pci_hotplug_core.c
51100@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
51101 return -EINVAL;
51102 }
51103
51104- slot->ops->owner = owner;
51105- slot->ops->mod_name = mod_name;
51106+ pax_open_kernel();
51107+ *(struct module **)&slot->ops->owner = owner;
51108+ *(const char **)&slot->ops->mod_name = mod_name;
51109+ pax_close_kernel();
51110
51111 mutex_lock(&pci_hp_mutex);
51112 /*
51113diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
51114index 07aa722..84514b4 100644
51115--- a/drivers/pci/hotplug/pciehp_core.c
51116+++ b/drivers/pci/hotplug/pciehp_core.c
51117@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
51118 struct slot *slot = ctrl->slot;
51119 struct hotplug_slot *hotplug = NULL;
51120 struct hotplug_slot_info *info = NULL;
51121- struct hotplug_slot_ops *ops = NULL;
51122+ hotplug_slot_ops_no_const *ops = NULL;
51123 char name[SLOT_NAME_SIZE];
51124 int retval = -ENOMEM;
51125
51126diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51127index c3e7dfc..cbd9625 100644
51128--- a/drivers/pci/msi.c
51129+++ b/drivers/pci/msi.c
51130@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51131 {
51132 struct attribute **msi_attrs;
51133 struct attribute *msi_attr;
51134- struct device_attribute *msi_dev_attr;
51135- struct attribute_group *msi_irq_group;
51136+ device_attribute_no_const *msi_dev_attr;
51137+ attribute_group_no_const *msi_irq_group;
51138 const struct attribute_group **msi_irq_groups;
51139 struct msi_desc *entry;
51140 int ret = -ENOMEM;
51141@@ -573,7 +573,7 @@ error_attrs:
51142 count = 0;
51143 msi_attr = msi_attrs[count];
51144 while (msi_attr) {
51145- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51146+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51147 kfree(msi_attr->name);
51148 kfree(msi_dev_attr);
51149 ++count;
51150diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51151index 312f23a..d21181c 100644
51152--- a/drivers/pci/pci-sysfs.c
51153+++ b/drivers/pci/pci-sysfs.c
51154@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51155 {
51156 /* allocate attribute structure, piggyback attribute name */
51157 int name_len = write_combine ? 13 : 10;
51158- struct bin_attribute *res_attr;
51159+ bin_attribute_no_const *res_attr;
51160 int retval;
51161
51162 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51163@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51164 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51165 {
51166 int retval;
51167- struct bin_attribute *attr;
51168+ bin_attribute_no_const *attr;
51169
51170 /* If the device has VPD, try to expose it in sysfs. */
51171 if (dev->vpd) {
51172@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51173 {
51174 int retval;
51175 int rom_size = 0;
51176- struct bin_attribute *attr;
51177+ bin_attribute_no_const *attr;
51178
51179 if (!sysfs_initialized)
51180 return -EACCES;
51181diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51182index 9bd762c2..6fb9504 100644
51183--- a/drivers/pci/pci.h
51184+++ b/drivers/pci/pci.h
51185@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51186 struct pci_vpd {
51187 unsigned int len;
51188 const struct pci_vpd_ops *ops;
51189- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51190+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51191 };
51192
51193 int pci_vpd_pci22_init(struct pci_dev *dev);
51194diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51195index 7d4fcdc..2f6d8f8 100644
51196--- a/drivers/pci/pcie/aspm.c
51197+++ b/drivers/pci/pcie/aspm.c
51198@@ -27,9 +27,9 @@
51199 #define MODULE_PARAM_PREFIX "pcie_aspm."
51200
51201 /* Note: those are not register definitions */
51202-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51203-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51204-#define ASPM_STATE_L1 (4) /* L1 state */
51205+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51206+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51207+#define ASPM_STATE_L1 (4U) /* L1 state */
51208 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51209 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51210
51211diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51212index be35da2..ec16cdb 100644
51213--- a/drivers/pci/pcie/portdrv_pci.c
51214+++ b/drivers/pci/pcie/portdrv_pci.c
51215@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51216 return 0;
51217 }
51218
51219-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51220+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51221 /*
51222 * Boxes that should not use MSI for PCIe PME signaling.
51223 */
51224diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51225index c911857..56f3f9d 100644
51226--- a/drivers/pci/probe.c
51227+++ b/drivers/pci/probe.c
51228@@ -176,7 +176,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51229 u16 orig_cmd;
51230 struct pci_bus_region region, inverted_region;
51231
51232- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51233+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51234
51235 /* No printks while decoding is disabled! */
51236 if (!dev->mmio_always_on) {
51237diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51238index 3f155e7..0f4b1f0 100644
51239--- a/drivers/pci/proc.c
51240+++ b/drivers/pci/proc.c
51241@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51242 static int __init pci_proc_init(void)
51243 {
51244 struct pci_dev *dev = NULL;
51245+
51246+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51247+#ifdef CONFIG_GRKERNSEC_PROC_USER
51248+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51249+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51250+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51251+#endif
51252+#else
51253 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51254+#endif
51255 proc_create("devices", 0, proc_bus_pci_dir,
51256 &proc_bus_pci_dev_operations);
51257 proc_initialized = 1;
51258diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51259index 3474920..acc9581 100644
51260--- a/drivers/platform/chrome/chromeos_pstore.c
51261+++ b/drivers/platform/chrome/chromeos_pstore.c
51262@@ -13,7 +13,7 @@
51263 #include <linux/platform_device.h>
51264 #include <linux/pstore_ram.h>
51265
51266-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51267+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51268 {
51269 /*
51270 * Today all Chromebooks/boxes ship with Google_* as version and
51271diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51272index 1e1e594..8fe59c5 100644
51273--- a/drivers/platform/x86/alienware-wmi.c
51274+++ b/drivers/platform/x86/alienware-wmi.c
51275@@ -150,7 +150,7 @@ struct wmax_led_args {
51276 } __packed;
51277
51278 static struct platform_device *platform_device;
51279-static struct device_attribute *zone_dev_attrs;
51280+static device_attribute_no_const *zone_dev_attrs;
51281 static struct attribute **zone_attrs;
51282 static struct platform_zone *zone_data;
51283
51284@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51285 }
51286 };
51287
51288-static struct attribute_group zone_attribute_group = {
51289+static attribute_group_no_const zone_attribute_group = {
51290 .name = "rgb_zones",
51291 };
51292
51293diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51294index 7543a56..367ca8ed 100644
51295--- a/drivers/platform/x86/asus-wmi.c
51296+++ b/drivers/platform/x86/asus-wmi.c
51297@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51298 int err;
51299 u32 retval = -1;
51300
51301+#ifdef CONFIG_GRKERNSEC_KMEM
51302+ return -EPERM;
51303+#endif
51304+
51305 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51306
51307 if (err < 0)
51308@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51309 int err;
51310 u32 retval = -1;
51311
51312+#ifdef CONFIG_GRKERNSEC_KMEM
51313+ return -EPERM;
51314+#endif
51315+
51316 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51317 &retval);
51318
51319@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51320 union acpi_object *obj;
51321 acpi_status status;
51322
51323+#ifdef CONFIG_GRKERNSEC_KMEM
51324+ return -EPERM;
51325+#endif
51326+
51327 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51328 1, asus->debug.method_id,
51329 &input, &output);
51330diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51331index b4e9447..9dc6ec34 100644
51332--- a/drivers/platform/x86/compal-laptop.c
51333+++ b/drivers/platform/x86/compal-laptop.c
51334@@ -765,7 +765,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51335 return 1;
51336 }
51337
51338-static struct dmi_system_id __initdata compal_dmi_table[] = {
51339+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51340 {
51341 .ident = "FL90/IFL90",
51342 .matches = {
51343diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51344index 458e6c9..089aee7 100644
51345--- a/drivers/platform/x86/hdaps.c
51346+++ b/drivers/platform/x86/hdaps.c
51347@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51348 "ThinkPad T42p", so the order of the entries matters.
51349 If your ThinkPad is not recognized, please update to latest
51350 BIOS. This is especially the case for some R52 ThinkPads. */
51351-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51352+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51353 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51354 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51355 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51356diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51357index 97c2be1..2ee50ce 100644
51358--- a/drivers/platform/x86/ibm_rtl.c
51359+++ b/drivers/platform/x86/ibm_rtl.c
51360@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51361 }
51362
51363
51364-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51365+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51366 { \
51367 .matches = { \
51368 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51369diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51370index 8037c8b..f88445c 100644
51371--- a/drivers/platform/x86/intel_oaktrail.c
51372+++ b/drivers/platform/x86/intel_oaktrail.c
51373@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51374 return 0;
51375 }
51376
51377-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51378+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51379 {
51380 .ident = "OakTrail platform",
51381 .matches = {
51382diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51383index 0859877..59d596d 100644
51384--- a/drivers/platform/x86/msi-laptop.c
51385+++ b/drivers/platform/x86/msi-laptop.c
51386@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51387 return 1;
51388 }
51389
51390-static struct dmi_system_id __initdata msi_dmi_table[] = {
51391+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51392 {
51393 .ident = "MSI S270",
51394 .matches = {
51395@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51396
51397 if (!quirks->ec_read_only) {
51398 /* allow userland write sysfs file */
51399- dev_attr_bluetooth.store = store_bluetooth;
51400- dev_attr_wlan.store = store_wlan;
51401- dev_attr_threeg.store = store_threeg;
51402- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51403- dev_attr_wlan.attr.mode |= S_IWUSR;
51404- dev_attr_threeg.attr.mode |= S_IWUSR;
51405+ pax_open_kernel();
51406+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51407+ *(void **)&dev_attr_wlan.store = store_wlan;
51408+ *(void **)&dev_attr_threeg.store = store_threeg;
51409+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51410+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51411+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51412+ pax_close_kernel();
51413 }
51414
51415 /* disable hardware control by fn key */
51416diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51417index 6d2bac0..ec2b029 100644
51418--- a/drivers/platform/x86/msi-wmi.c
51419+++ b/drivers/platform/x86/msi-wmi.c
51420@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51421 static void msi_wmi_notify(u32 value, void *context)
51422 {
51423 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51424- static struct key_entry *key;
51425+ struct key_entry *key;
51426 union acpi_object *obj;
51427 acpi_status status;
51428
51429diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51430index 9e701b2..c68a7b5 100644
51431--- a/drivers/platform/x86/samsung-laptop.c
51432+++ b/drivers/platform/x86/samsung-laptop.c
51433@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51434 return 0;
51435 }
51436
51437-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51438+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51439 {
51440 .matches = {
51441 DMI_MATCH(DMI_SYS_VENDOR,
51442diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51443index e6aac72..e11ff24 100644
51444--- a/drivers/platform/x86/samsung-q10.c
51445+++ b/drivers/platform/x86/samsung-q10.c
51446@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51447 return 1;
51448 }
51449
51450-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51451+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51452 {
51453 .ident = "Samsung Q10",
51454 .matches = {
51455diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51456index e51c1e7..71bb385 100644
51457--- a/drivers/platform/x86/sony-laptop.c
51458+++ b/drivers/platform/x86/sony-laptop.c
51459@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51460 }
51461
51462 /* High speed charging function */
51463-static struct device_attribute *hsc_handle;
51464+static device_attribute_no_const *hsc_handle;
51465
51466 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51467 struct device_attribute *attr,
51468@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51469 }
51470
51471 /* low battery function */
51472-static struct device_attribute *lowbatt_handle;
51473+static device_attribute_no_const *lowbatt_handle;
51474
51475 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51476 struct device_attribute *attr,
51477@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51478 }
51479
51480 /* fan speed function */
51481-static struct device_attribute *fan_handle, *hsf_handle;
51482+static device_attribute_no_const *fan_handle, *hsf_handle;
51483
51484 static ssize_t sony_nc_hsfan_store(struct device *dev,
51485 struct device_attribute *attr,
51486@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51487 }
51488
51489 /* USB charge function */
51490-static struct device_attribute *uc_handle;
51491+static device_attribute_no_const *uc_handle;
51492
51493 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51494 struct device_attribute *attr,
51495@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51496 }
51497
51498 /* Panel ID function */
51499-static struct device_attribute *panel_handle;
51500+static device_attribute_no_const *panel_handle;
51501
51502 static ssize_t sony_nc_panelid_show(struct device *dev,
51503 struct device_attribute *attr, char *buffer)
51504@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51505 }
51506
51507 /* smart connect function */
51508-static struct device_attribute *sc_handle;
51509+static device_attribute_no_const *sc_handle;
51510
51511 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51512 struct device_attribute *attr,
51513@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51514 .drv.pm = &sony_pic_pm,
51515 };
51516
51517-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51518+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51519 {
51520 .ident = "Sony Vaio",
51521 .matches = {
51522diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51523index 28f3281..171d8c3 100644
51524--- a/drivers/platform/x86/thinkpad_acpi.c
51525+++ b/drivers/platform/x86/thinkpad_acpi.c
51526@@ -2459,10 +2459,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51527 && !tp_features.bright_unkfw)
51528 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51529 }
51530+}
51531
51532 #undef TPACPI_COMPARE_KEY
51533 #undef TPACPI_MAY_SEND_KEY
51534-}
51535
51536 /*
51537 * Polling driver
51538diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51539index 438d4c7..ca8a2fb 100644
51540--- a/drivers/pnp/pnpbios/bioscalls.c
51541+++ b/drivers/pnp/pnpbios/bioscalls.c
51542@@ -59,7 +59,7 @@ do { \
51543 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51544 } while(0)
51545
51546-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51547+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51548 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51549
51550 /*
51551@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51552
51553 cpu = get_cpu();
51554 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51555+
51556+ pax_open_kernel();
51557 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51558+ pax_close_kernel();
51559
51560 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51561 spin_lock_irqsave(&pnp_bios_lock, flags);
51562@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51563 :"memory");
51564 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51565
51566+ pax_open_kernel();
51567 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51568+ pax_close_kernel();
51569+
51570 put_cpu();
51571
51572 /* If we get here and this is set then the PnP BIOS faulted on us. */
51573@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51574 return status;
51575 }
51576
51577-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51578+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51579 {
51580 int i;
51581
51582@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51583 pnp_bios_callpoint.offset = header->fields.pm16offset;
51584 pnp_bios_callpoint.segment = PNP_CS16;
51585
51586+ pax_open_kernel();
51587+
51588 for_each_possible_cpu(i) {
51589 struct desc_struct *gdt = get_cpu_gdt_table(i);
51590 if (!gdt)
51591@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51592 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51593 (unsigned long)__va(header->fields.pm16dseg));
51594 }
51595+
51596+ pax_close_kernel();
51597 }
51598diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51599index facd43b..b291260 100644
51600--- a/drivers/pnp/pnpbios/core.c
51601+++ b/drivers/pnp/pnpbios/core.c
51602@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51603 return 0;
51604 }
51605
51606-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51607+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51608 { /* PnPBIOS GPF on boot */
51609 .callback = exploding_pnp_bios,
51610 .ident = "Higraded P14H",
51611diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51612index dfe1ee8..67e820c 100644
51613--- a/drivers/power/pda_power.c
51614+++ b/drivers/power/pda_power.c
51615@@ -38,7 +38,11 @@ static struct power_supply *pda_psy_ac, *pda_psy_usb;
51616
51617 #if IS_ENABLED(CONFIG_USB_PHY)
51618 static struct usb_phy *transceiver;
51619-static struct notifier_block otg_nb;
51620+static int otg_handle_notification(struct notifier_block *nb,
51621+ unsigned long event, void *unused);
51622+static struct notifier_block otg_nb = {
51623+ .notifier_call = otg_handle_notification
51624+};
51625 #endif
51626
51627 static struct regulator *ac_draw;
51628@@ -373,7 +377,6 @@ static int pda_power_probe(struct platform_device *pdev)
51629
51630 #if IS_ENABLED(CONFIG_USB_PHY)
51631 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51632- otg_nb.notifier_call = otg_handle_notification;
51633 ret = usb_register_notifier(transceiver, &otg_nb);
51634 if (ret) {
51635 dev_err(dev, "failure to register otg notifier\n");
51636diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51637index cc439fd..8fa30df 100644
51638--- a/drivers/power/power_supply.h
51639+++ b/drivers/power/power_supply.h
51640@@ -16,12 +16,12 @@ struct power_supply;
51641
51642 #ifdef CONFIG_SYSFS
51643
51644-extern void power_supply_init_attrs(struct device_type *dev_type);
51645+extern void power_supply_init_attrs(void);
51646 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51647
51648 #else
51649
51650-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51651+static inline void power_supply_init_attrs(void) {}
51652 #define power_supply_uevent NULL
51653
51654 #endif /* CONFIG_SYSFS */
51655diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51656index 4bc0c7f..198c99d 100644
51657--- a/drivers/power/power_supply_core.c
51658+++ b/drivers/power/power_supply_core.c
51659@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51660 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51661 EXPORT_SYMBOL_GPL(power_supply_notifier);
51662
51663-static struct device_type power_supply_dev_type;
51664+extern const struct attribute_group *power_supply_attr_groups[];
51665+static struct device_type power_supply_dev_type = {
51666+ .groups = power_supply_attr_groups,
51667+};
51668
51669 #define POWER_SUPPLY_DEFERRED_REGISTER_TIME msecs_to_jiffies(10)
51670
51671@@ -921,7 +924,7 @@ static int __init power_supply_class_init(void)
51672 return PTR_ERR(power_supply_class);
51673
51674 power_supply_class->dev_uevent = power_supply_uevent;
51675- power_supply_init_attrs(&power_supply_dev_type);
51676+ power_supply_init_attrs();
51677
51678 return 0;
51679 }
51680diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51681index 9134e3d..45eee1e 100644
51682--- a/drivers/power/power_supply_sysfs.c
51683+++ b/drivers/power/power_supply_sysfs.c
51684@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51685 .is_visible = power_supply_attr_is_visible,
51686 };
51687
51688-static const struct attribute_group *power_supply_attr_groups[] = {
51689+const struct attribute_group *power_supply_attr_groups[] = {
51690 &power_supply_attr_group,
51691 NULL,
51692 };
51693
51694-void power_supply_init_attrs(struct device_type *dev_type)
51695+void power_supply_init_attrs(void)
51696 {
51697 int i;
51698
51699- dev_type->groups = power_supply_attr_groups;
51700-
51701 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51702 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51703 }
51704diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51705index 84419af..268ede8 100644
51706--- a/drivers/powercap/powercap_sys.c
51707+++ b/drivers/powercap/powercap_sys.c
51708@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51709 struct device_attribute name_attr;
51710 };
51711
51712+static ssize_t show_constraint_name(struct device *dev,
51713+ struct device_attribute *dev_attr,
51714+ char *buf);
51715+
51716 static struct powercap_constraint_attr
51717- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51718+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51719+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51720+ .power_limit_attr = {
51721+ .attr = {
51722+ .name = NULL,
51723+ .mode = S_IWUSR | S_IRUGO
51724+ },
51725+ .show = show_constraint_power_limit_uw,
51726+ .store = store_constraint_power_limit_uw
51727+ },
51728+
51729+ .time_window_attr = {
51730+ .attr = {
51731+ .name = NULL,
51732+ .mode = S_IWUSR | S_IRUGO
51733+ },
51734+ .show = show_constraint_time_window_us,
51735+ .store = store_constraint_time_window_us
51736+ },
51737+
51738+ .max_power_attr = {
51739+ .attr = {
51740+ .name = NULL,
51741+ .mode = S_IRUGO
51742+ },
51743+ .show = show_constraint_max_power_uw,
51744+ .store = NULL
51745+ },
51746+
51747+ .min_power_attr = {
51748+ .attr = {
51749+ .name = NULL,
51750+ .mode = S_IRUGO
51751+ },
51752+ .show = show_constraint_min_power_uw,
51753+ .store = NULL
51754+ },
51755+
51756+ .max_time_window_attr = {
51757+ .attr = {
51758+ .name = NULL,
51759+ .mode = S_IRUGO
51760+ },
51761+ .show = show_constraint_max_time_window_us,
51762+ .store = NULL
51763+ },
51764+
51765+ .min_time_window_attr = {
51766+ .attr = {
51767+ .name = NULL,
51768+ .mode = S_IRUGO
51769+ },
51770+ .show = show_constraint_min_time_window_us,
51771+ .store = NULL
51772+ },
51773+
51774+ .name_attr = {
51775+ .attr = {
51776+ .name = NULL,
51777+ .mode = S_IRUGO
51778+ },
51779+ .show = show_constraint_name,
51780+ .store = NULL
51781+ }
51782+ }
51783+};
51784
51785 /* A list of powercap control_types */
51786 static LIST_HEAD(powercap_cntrl_list);
51787@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51788 }
51789
51790 static int create_constraint_attribute(int id, const char *name,
51791- int mode,
51792- struct device_attribute *dev_attr,
51793- ssize_t (*show)(struct device *,
51794- struct device_attribute *, char *),
51795- ssize_t (*store)(struct device *,
51796- struct device_attribute *,
51797- const char *, size_t)
51798- )
51799+ struct device_attribute *dev_attr)
51800 {
51801+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51802
51803- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51804- id, name);
51805- if (!dev_attr->attr.name)
51806+ if (!name)
51807 return -ENOMEM;
51808- dev_attr->attr.mode = mode;
51809- dev_attr->show = show;
51810- dev_attr->store = store;
51811+
51812+ pax_open_kernel();
51813+ *(const char **)&dev_attr->attr.name = name;
51814+ pax_close_kernel();
51815
51816 return 0;
51817 }
51818@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51819
51820 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51821 ret = create_constraint_attribute(i, "power_limit_uw",
51822- S_IWUSR | S_IRUGO,
51823- &constraint_attrs[i].power_limit_attr,
51824- show_constraint_power_limit_uw,
51825- store_constraint_power_limit_uw);
51826+ &constraint_attrs[i].power_limit_attr);
51827 if (ret)
51828 goto err_alloc;
51829 ret = create_constraint_attribute(i, "time_window_us",
51830- S_IWUSR | S_IRUGO,
51831- &constraint_attrs[i].time_window_attr,
51832- show_constraint_time_window_us,
51833- store_constraint_time_window_us);
51834+ &constraint_attrs[i].time_window_attr);
51835 if (ret)
51836 goto err_alloc;
51837- ret = create_constraint_attribute(i, "name", S_IRUGO,
51838- &constraint_attrs[i].name_attr,
51839- show_constraint_name,
51840- NULL);
51841+ ret = create_constraint_attribute(i, "name",
51842+ &constraint_attrs[i].name_attr);
51843 if (ret)
51844 goto err_alloc;
51845- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51846- &constraint_attrs[i].max_power_attr,
51847- show_constraint_max_power_uw,
51848- NULL);
51849+ ret = create_constraint_attribute(i, "max_power_uw",
51850+ &constraint_attrs[i].max_power_attr);
51851 if (ret)
51852 goto err_alloc;
51853- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51854- &constraint_attrs[i].min_power_attr,
51855- show_constraint_min_power_uw,
51856- NULL);
51857+ ret = create_constraint_attribute(i, "min_power_uw",
51858+ &constraint_attrs[i].min_power_attr);
51859 if (ret)
51860 goto err_alloc;
51861 ret = create_constraint_attribute(i, "max_time_window_us",
51862- S_IRUGO,
51863- &constraint_attrs[i].max_time_window_attr,
51864- show_constraint_max_time_window_us,
51865- NULL);
51866+ &constraint_attrs[i].max_time_window_attr);
51867 if (ret)
51868 goto err_alloc;
51869 ret = create_constraint_attribute(i, "min_time_window_us",
51870- S_IRUGO,
51871- &constraint_attrs[i].min_time_window_attr,
51872- show_constraint_min_time_window_us,
51873- NULL);
51874+ &constraint_attrs[i].min_time_window_attr);
51875 if (ret)
51876 goto err_alloc;
51877
51878@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51879 power_zone->zone_dev_attrs[count++] =
51880 &dev_attr_max_energy_range_uj.attr;
51881 if (power_zone->ops->get_energy_uj) {
51882+ pax_open_kernel();
51883 if (power_zone->ops->reset_energy_uj)
51884- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51885+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51886 else
51887- dev_attr_energy_uj.attr.mode = S_IRUGO;
51888+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51889+ pax_close_kernel();
51890 power_zone->zone_dev_attrs[count++] =
51891 &dev_attr_energy_uj.attr;
51892 }
51893diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51894index 9c5d414..c7900ce 100644
51895--- a/drivers/ptp/ptp_private.h
51896+++ b/drivers/ptp/ptp_private.h
51897@@ -51,7 +51,7 @@ struct ptp_clock {
51898 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51899 wait_queue_head_t tsev_wq;
51900 int defunct; /* tells readers to go away when clock is being removed */
51901- struct device_attribute *pin_dev_attr;
51902+ device_attribute_no_const *pin_dev_attr;
51903 struct attribute **pin_attr;
51904 struct attribute_group pin_attr_group;
51905 };
51906diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51907index 302e626..12579af 100644
51908--- a/drivers/ptp/ptp_sysfs.c
51909+++ b/drivers/ptp/ptp_sysfs.c
51910@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51911 goto no_pin_attr;
51912
51913 for (i = 0; i < n_pins; i++) {
51914- struct device_attribute *da = &ptp->pin_dev_attr[i];
51915+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51916 sysfs_attr_init(&da->attr);
51917 da->attr.name = info->pin_config[i].name;
51918 da->attr.mode = 0644;
51919diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51920index 8a28116..05b0ad5 100644
51921--- a/drivers/regulator/core.c
51922+++ b/drivers/regulator/core.c
51923@@ -3603,7 +3603,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51924 const struct regulation_constraints *constraints = NULL;
51925 const struct regulator_init_data *init_data;
51926 struct regulator_config *config = NULL;
51927- static atomic_t regulator_no = ATOMIC_INIT(-1);
51928+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51929 struct regulator_dev *rdev;
51930 struct device *dev;
51931 int ret, i;
51932@@ -3686,7 +3686,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51933 rdev->dev.class = &regulator_class;
51934 rdev->dev.parent = dev;
51935 dev_set_name(&rdev->dev, "regulator.%lu",
51936- (unsigned long) atomic_inc_return(&regulator_no));
51937+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51938 ret = device_register(&rdev->dev);
51939 if (ret != 0) {
51940 put_device(&rdev->dev);
51941diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51942index 4071d74..260b15a 100644
51943--- a/drivers/regulator/max8660.c
51944+++ b/drivers/regulator/max8660.c
51945@@ -423,8 +423,10 @@ static int max8660_probe(struct i2c_client *client,
51946 max8660->shadow_regs[MAX8660_OVER1] = 5;
51947 } else {
51948 /* Otherwise devices can be toggled via software */
51949- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51950- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51951+ pax_open_kernel();
51952+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51953+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51954+ pax_close_kernel();
51955 }
51956
51957 /*
51958diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51959index c3d55c2..0dddfe6 100644
51960--- a/drivers/regulator/max8973-regulator.c
51961+++ b/drivers/regulator/max8973-regulator.c
51962@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51963 if (!pdata || !pdata->enable_ext_control) {
51964 max->desc.enable_reg = MAX8973_VOUT;
51965 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51966- max->ops.enable = regulator_enable_regmap;
51967- max->ops.disable = regulator_disable_regmap;
51968- max->ops.is_enabled = regulator_is_enabled_regmap;
51969+ pax_open_kernel();
51970+ *(void **)&max->ops.enable = regulator_enable_regmap;
51971+ *(void **)&max->ops.disable = regulator_disable_regmap;
51972+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51973+ pax_close_kernel();
51974 }
51975
51976 if (pdata) {
51977diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51978index 0d17c92..a29f627 100644
51979--- a/drivers/regulator/mc13892-regulator.c
51980+++ b/drivers/regulator/mc13892-regulator.c
51981@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51982 mc13xxx_unlock(mc13892);
51983
51984 /* update mc13892_vcam ops */
51985- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51986+ pax_open_kernel();
51987+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51988 sizeof(struct regulator_ops));
51989- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51990- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51991+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51992+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51993+ pax_close_kernel();
51994 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51995
51996 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51997diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51998index a82556a0..e842923 100644
51999--- a/drivers/rtc/rtc-cmos.c
52000+++ b/drivers/rtc/rtc-cmos.c
52001@@ -793,7 +793,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
52002 hpet_rtc_timer_init();
52003
52004 /* export at least the first block of NVRAM */
52005- nvram.size = address_space - NVRAM_OFFSET;
52006+ pax_open_kernel();
52007+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
52008+ pax_close_kernel();
52009 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
52010 if (retval < 0) {
52011 dev_dbg(dev, "can't create nvram file? %d\n", retval);
52012diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
52013index 799c34b..8e9786a 100644
52014--- a/drivers/rtc/rtc-dev.c
52015+++ b/drivers/rtc/rtc-dev.c
52016@@ -16,6 +16,7 @@
52017 #include <linux/module.h>
52018 #include <linux/rtc.h>
52019 #include <linux/sched.h>
52020+#include <linux/grsecurity.h>
52021 #include "rtc-core.h"
52022
52023 static dev_t rtc_devt;
52024@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
52025 if (copy_from_user(&tm, uarg, sizeof(tm)))
52026 return -EFAULT;
52027
52028+ gr_log_timechange();
52029+
52030 return rtc_set_time(rtc, &tm);
52031
52032 case RTC_PIE_ON:
52033diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
52034index 4ffabb3..1f87fca 100644
52035--- a/drivers/rtc/rtc-ds1307.c
52036+++ b/drivers/rtc/rtc-ds1307.c
52037@@ -107,7 +107,7 @@ struct ds1307 {
52038 u8 offset; /* register's offset */
52039 u8 regs[11];
52040 u16 nvram_offset;
52041- struct bin_attribute *nvram;
52042+ bin_attribute_no_const *nvram;
52043 enum ds_type type;
52044 unsigned long flags;
52045 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
52046diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
52047index 90abb5b..e0bf6dd 100644
52048--- a/drivers/rtc/rtc-m48t59.c
52049+++ b/drivers/rtc/rtc-m48t59.c
52050@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
52051 if (IS_ERR(m48t59->rtc))
52052 return PTR_ERR(m48t59->rtc);
52053
52054- m48t59_nvram_attr.size = pdata->offset;
52055+ pax_open_kernel();
52056+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
52057+ pax_close_kernel();
52058
52059 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
52060 if (ret)
52061diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
52062index 3a2da4c..e88493c 100644
52063--- a/drivers/rtc/rtc-test.c
52064+++ b/drivers/rtc/rtc-test.c
52065@@ -112,8 +112,10 @@ static int test_probe(struct platform_device *plat_dev)
52066 struct rtc_device *rtc;
52067
52068 if (test_mmss64) {
52069- test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
52070- test_rtc_ops.set_mmss = NULL;
52071+ pax_open_kernel();
52072+ *(void **)&test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
52073+ *(void **)&test_rtc_ops.set_mmss = NULL;
52074+ pax_close_kernel();
52075 }
52076
52077 rtc = devm_rtc_device_register(&plat_dev->dev, "test",
52078diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
52079index e693af6..2e525b6 100644
52080--- a/drivers/scsi/bfa/bfa_fcpim.h
52081+++ b/drivers/scsi/bfa/bfa_fcpim.h
52082@@ -36,7 +36,7 @@ struct bfa_iotag_s {
52083
52084 struct bfa_itn_s {
52085 bfa_isr_func_t isr;
52086-};
52087+} __no_const;
52088
52089 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
52090 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
52091diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
52092index 0f19455..ef7adb5 100644
52093--- a/drivers/scsi/bfa/bfa_fcs.c
52094+++ b/drivers/scsi/bfa/bfa_fcs.c
52095@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
52096 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
52097
52098 static struct bfa_fcs_mod_s fcs_modules[] = {
52099- { bfa_fcs_port_attach, NULL, NULL },
52100- { bfa_fcs_uf_attach, NULL, NULL },
52101- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
52102- bfa_fcs_fabric_modexit },
52103+ {
52104+ .attach = bfa_fcs_port_attach,
52105+ .modinit = NULL,
52106+ .modexit = NULL
52107+ },
52108+ {
52109+ .attach = bfa_fcs_uf_attach,
52110+ .modinit = NULL,
52111+ .modexit = NULL
52112+ },
52113+ {
52114+ .attach = bfa_fcs_fabric_attach,
52115+ .modinit = bfa_fcs_fabric_modinit,
52116+ .modexit = bfa_fcs_fabric_modexit
52117+ },
52118 };
52119
52120 /*
52121diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52122index ff75ef8..2dfe00a 100644
52123--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52124+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52125@@ -89,15 +89,26 @@ static struct {
52126 void (*offline) (struct bfa_fcs_lport_s *port);
52127 } __port_action[] = {
52128 {
52129- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52130- bfa_fcs_lport_unknown_offline}, {
52131- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52132- bfa_fcs_lport_fab_offline}, {
52133- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52134- bfa_fcs_lport_n2n_offline}, {
52135- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52136- bfa_fcs_lport_loop_offline},
52137- };
52138+ .init = bfa_fcs_lport_unknown_init,
52139+ .online = bfa_fcs_lport_unknown_online,
52140+ .offline = bfa_fcs_lport_unknown_offline
52141+ },
52142+ {
52143+ .init = bfa_fcs_lport_fab_init,
52144+ .online = bfa_fcs_lport_fab_online,
52145+ .offline = bfa_fcs_lport_fab_offline
52146+ },
52147+ {
52148+ .init = bfa_fcs_lport_n2n_init,
52149+ .online = bfa_fcs_lport_n2n_online,
52150+ .offline = bfa_fcs_lport_n2n_offline
52151+ },
52152+ {
52153+ .init = bfa_fcs_lport_loop_init,
52154+ .online = bfa_fcs_lport_loop_online,
52155+ .offline = bfa_fcs_lport_loop_offline
52156+ },
52157+};
52158
52159 /*
52160 * fcs_port_sm FCS logical port state machine
52161diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52162index a38aafa0..fe8f03b 100644
52163--- a/drivers/scsi/bfa/bfa_ioc.h
52164+++ b/drivers/scsi/bfa/bfa_ioc.h
52165@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52166 bfa_ioc_disable_cbfn_t disable_cbfn;
52167 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52168 bfa_ioc_reset_cbfn_t reset_cbfn;
52169-};
52170+} __no_const;
52171
52172 /*
52173 * IOC event notification mechanism.
52174@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52175 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52176 enum bfi_ioc_state fwstate);
52177 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52178-};
52179+} __no_const;
52180
52181 /*
52182 * Queue element to wait for room in request queue. FIFO order is
52183diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52184index a14c784..6de6790 100644
52185--- a/drivers/scsi/bfa/bfa_modules.h
52186+++ b/drivers/scsi/bfa/bfa_modules.h
52187@@ -78,12 +78,12 @@ enum {
52188 \
52189 extern struct bfa_module_s hal_mod_ ## __mod; \
52190 struct bfa_module_s hal_mod_ ## __mod = { \
52191- bfa_ ## __mod ## _meminfo, \
52192- bfa_ ## __mod ## _attach, \
52193- bfa_ ## __mod ## _detach, \
52194- bfa_ ## __mod ## _start, \
52195- bfa_ ## __mod ## _stop, \
52196- bfa_ ## __mod ## _iocdisable, \
52197+ .meminfo = bfa_ ## __mod ## _meminfo, \
52198+ .attach = bfa_ ## __mod ## _attach, \
52199+ .detach = bfa_ ## __mod ## _detach, \
52200+ .start = bfa_ ## __mod ## _start, \
52201+ .stop = bfa_ ## __mod ## _stop, \
52202+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52203 }
52204
52205 #define BFA_CACHELINE_SZ (256)
52206diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52207index 045c4e1..13de803 100644
52208--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52209+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52210@@ -33,8 +33,8 @@
52211 */
52212 #include "libfcoe.h"
52213
52214-static atomic_t ctlr_num;
52215-static atomic_t fcf_num;
52216+static atomic_unchecked_t ctlr_num;
52217+static atomic_unchecked_t fcf_num;
52218
52219 /*
52220 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52221@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52222 if (!ctlr)
52223 goto out;
52224
52225- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52226+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52227 ctlr->f = f;
52228 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52229 INIT_LIST_HEAD(&ctlr->fcfs);
52230@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52231 fcf->dev.parent = &ctlr->dev;
52232 fcf->dev.bus = &fcoe_bus_type;
52233 fcf->dev.type = &fcoe_fcf_device_type;
52234- fcf->id = atomic_inc_return(&fcf_num) - 1;
52235+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52236 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52237
52238 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52239@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52240 {
52241 int error;
52242
52243- atomic_set(&ctlr_num, 0);
52244- atomic_set(&fcf_num, 0);
52245+ atomic_set_unchecked(&ctlr_num, 0);
52246+ atomic_set_unchecked(&fcf_num, 0);
52247
52248 error = bus_register(&fcoe_bus_type);
52249 if (error)
52250diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52251index 8bb173e..20236b4 100644
52252--- a/drivers/scsi/hosts.c
52253+++ b/drivers/scsi/hosts.c
52254@@ -42,7 +42,7 @@
52255 #include "scsi_logging.h"
52256
52257
52258-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52259+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52260
52261
52262 static void scsi_host_cls_release(struct device *dev)
52263@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52264 * subtract one because we increment first then return, but we need to
52265 * know what the next host number was before increment
52266 */
52267- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52268+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52269 shost->dma_channel = 0xff;
52270
52271 /* These three are default values which can be overridden */
52272diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52273index 8eab107..599cd79 100644
52274--- a/drivers/scsi/hpsa.c
52275+++ b/drivers/scsi/hpsa.c
52276@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52277 struct reply_queue_buffer *rq = &h->reply_queue[q];
52278
52279 if (h->transMethod & CFGTBL_Trans_io_accel1)
52280- return h->access.command_completed(h, q);
52281+ return h->access->command_completed(h, q);
52282
52283 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52284- return h->access.command_completed(h, q);
52285+ return h->access->command_completed(h, q);
52286
52287 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52288 a = rq->head[rq->current_entry];
52289@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52290 break;
52291 default:
52292 set_performant_mode(h, c);
52293- h->access.submit_command(h, c);
52294+ h->access->submit_command(h, c);
52295 }
52296 }
52297
52298@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52299
52300 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52301 {
52302- return h->access.command_completed(h, q);
52303+ return h->access->command_completed(h, q);
52304 }
52305
52306 static inline bool interrupt_pending(struct ctlr_info *h)
52307 {
52308- return h->access.intr_pending(h);
52309+ return h->access->intr_pending(h);
52310 }
52311
52312 static inline long interrupt_not_for_us(struct ctlr_info *h)
52313 {
52314- return (h->access.intr_pending(h) == 0) ||
52315+ return (h->access->intr_pending(h) == 0) ||
52316 (h->interrupts_enabled == 0);
52317 }
52318
52319@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52320 if (prod_index < 0)
52321 return prod_index;
52322 h->product_name = products[prod_index].product_name;
52323- h->access = *(products[prod_index].access);
52324+ h->access = products[prod_index].access;
52325
52326 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52327 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52328@@ -6647,7 +6647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52329 unsigned long flags;
52330 u32 lockup_detected;
52331
52332- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52333+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52334 spin_lock_irqsave(&h->lock, flags);
52335 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52336 if (!lockup_detected) {
52337@@ -6922,7 +6922,7 @@ reinit_after_soft_reset:
52338 }
52339
52340 /* make sure the board interrupts are off */
52341- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52342+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52343
52344 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52345 goto clean2;
52346@@ -6958,7 +6958,7 @@ reinit_after_soft_reset:
52347 * fake ones to scoop up any residual completions.
52348 */
52349 spin_lock_irqsave(&h->lock, flags);
52350- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52351+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52352 spin_unlock_irqrestore(&h->lock, flags);
52353 hpsa_free_irqs(h);
52354 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52355@@ -6977,9 +6977,9 @@ reinit_after_soft_reset:
52356 dev_info(&h->pdev->dev, "Board READY.\n");
52357 dev_info(&h->pdev->dev,
52358 "Waiting for stale completions to drain.\n");
52359- h->access.set_intr_mask(h, HPSA_INTR_ON);
52360+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52361 msleep(10000);
52362- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52363+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52364
52365 rc = controller_reset_failed(h->cfgtable);
52366 if (rc)
52367@@ -7004,7 +7004,7 @@ reinit_after_soft_reset:
52368
52369
52370 /* Turn the interrupts on so we can service requests */
52371- h->access.set_intr_mask(h, HPSA_INTR_ON);
52372+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52373
52374 hpsa_hba_inquiry(h);
52375 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52376@@ -7077,7 +7077,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52377 * To write all data in the battery backed cache to disks
52378 */
52379 hpsa_flush_cache(h);
52380- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52381+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52382 hpsa_free_irqs_and_disable_msix(h);
52383 }
52384
52385@@ -7198,7 +7198,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52386 CFGTBL_Trans_enable_directed_msix |
52387 (trans_support & (CFGTBL_Trans_io_accel1 |
52388 CFGTBL_Trans_io_accel2));
52389- struct access_method access = SA5_performant_access;
52390+ struct access_method *access = &SA5_performant_access;
52391
52392 /* This is a bit complicated. There are 8 registers on
52393 * the controller which we write to to tell it 8 different
52394@@ -7240,7 +7240,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52395 * perform the superfluous readl() after each command submission.
52396 */
52397 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52398- access = SA5_performant_access_no_read;
52399+ access = &SA5_performant_access_no_read;
52400
52401 /* Controller spec: zero out this buffer. */
52402 for (i = 0; i < h->nreply_queues; i++)
52403@@ -7270,12 +7270,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52404 * enable outbound interrupt coalescing in accelerator mode;
52405 */
52406 if (trans_support & CFGTBL_Trans_io_accel1) {
52407- access = SA5_ioaccel_mode1_access;
52408+ access = &SA5_ioaccel_mode1_access;
52409 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52410 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52411 } else {
52412 if (trans_support & CFGTBL_Trans_io_accel2) {
52413- access = SA5_ioaccel_mode2_access;
52414+ access = &SA5_ioaccel_mode2_access;
52415 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52416 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52417 }
52418diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52419index 6577130..955f9a4 100644
52420--- a/drivers/scsi/hpsa.h
52421+++ b/drivers/scsi/hpsa.h
52422@@ -143,7 +143,7 @@ struct ctlr_info {
52423 unsigned int msix_vector;
52424 unsigned int msi_vector;
52425 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52426- struct access_method access;
52427+ struct access_method *access;
52428 char hba_mode_enabled;
52429
52430 /* queue and queue Info */
52431@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52432 }
52433
52434 static struct access_method SA5_access = {
52435- SA5_submit_command,
52436- SA5_intr_mask,
52437- SA5_intr_pending,
52438- SA5_completed,
52439+ .submit_command = SA5_submit_command,
52440+ .set_intr_mask = SA5_intr_mask,
52441+ .intr_pending = SA5_intr_pending,
52442+ .command_completed = SA5_completed,
52443 };
52444
52445 static struct access_method SA5_ioaccel_mode1_access = {
52446- SA5_submit_command,
52447- SA5_performant_intr_mask,
52448- SA5_ioaccel_mode1_intr_pending,
52449- SA5_ioaccel_mode1_completed,
52450+ .submit_command = SA5_submit_command,
52451+ .set_intr_mask = SA5_performant_intr_mask,
52452+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52453+ .command_completed = SA5_ioaccel_mode1_completed,
52454 };
52455
52456 static struct access_method SA5_ioaccel_mode2_access = {
52457- SA5_submit_command_ioaccel2,
52458- SA5_performant_intr_mask,
52459- SA5_performant_intr_pending,
52460- SA5_performant_completed,
52461+ .submit_command = SA5_submit_command_ioaccel2,
52462+ .set_intr_mask = SA5_performant_intr_mask,
52463+ .intr_pending = SA5_performant_intr_pending,
52464+ .command_completed = SA5_performant_completed,
52465 };
52466
52467 static struct access_method SA5_performant_access = {
52468- SA5_submit_command,
52469- SA5_performant_intr_mask,
52470- SA5_performant_intr_pending,
52471- SA5_performant_completed,
52472+ .submit_command = SA5_submit_command,
52473+ .set_intr_mask = SA5_performant_intr_mask,
52474+ .intr_pending = SA5_performant_intr_pending,
52475+ .command_completed = SA5_performant_completed,
52476 };
52477
52478 static struct access_method SA5_performant_access_no_read = {
52479- SA5_submit_command_no_read,
52480- SA5_performant_intr_mask,
52481- SA5_performant_intr_pending,
52482- SA5_performant_completed,
52483+ .submit_command = SA5_submit_command_no_read,
52484+ .set_intr_mask = SA5_performant_intr_mask,
52485+ .intr_pending = SA5_performant_intr_pending,
52486+ .command_completed = SA5_performant_completed,
52487 };
52488
52489 struct board_type {
52490diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52491index 1b3a094..068e683 100644
52492--- a/drivers/scsi/libfc/fc_exch.c
52493+++ b/drivers/scsi/libfc/fc_exch.c
52494@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52495 u16 pool_max_index;
52496
52497 struct {
52498- atomic_t no_free_exch;
52499- atomic_t no_free_exch_xid;
52500- atomic_t xid_not_found;
52501- atomic_t xid_busy;
52502- atomic_t seq_not_found;
52503- atomic_t non_bls_resp;
52504+ atomic_unchecked_t no_free_exch;
52505+ atomic_unchecked_t no_free_exch_xid;
52506+ atomic_unchecked_t xid_not_found;
52507+ atomic_unchecked_t xid_busy;
52508+ atomic_unchecked_t seq_not_found;
52509+ atomic_unchecked_t non_bls_resp;
52510 } stats;
52511 };
52512
52513@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52514 /* allocate memory for exchange */
52515 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52516 if (!ep) {
52517- atomic_inc(&mp->stats.no_free_exch);
52518+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52519 goto out;
52520 }
52521 memset(ep, 0, sizeof(*ep));
52522@@ -874,7 +874,7 @@ out:
52523 return ep;
52524 err:
52525 spin_unlock_bh(&pool->lock);
52526- atomic_inc(&mp->stats.no_free_exch_xid);
52527+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52528 mempool_free(ep, mp->ep_pool);
52529 return NULL;
52530 }
52531@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52532 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52533 ep = fc_exch_find(mp, xid);
52534 if (!ep) {
52535- atomic_inc(&mp->stats.xid_not_found);
52536+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52537 reject = FC_RJT_OX_ID;
52538 goto out;
52539 }
52540@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52541 ep = fc_exch_find(mp, xid);
52542 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52543 if (ep) {
52544- atomic_inc(&mp->stats.xid_busy);
52545+ atomic_inc_unchecked(&mp->stats.xid_busy);
52546 reject = FC_RJT_RX_ID;
52547 goto rel;
52548 }
52549@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52550 }
52551 xid = ep->xid; /* get our XID */
52552 } else if (!ep) {
52553- atomic_inc(&mp->stats.xid_not_found);
52554+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52555 reject = FC_RJT_RX_ID; /* XID not found */
52556 goto out;
52557 }
52558@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52559 } else {
52560 sp = &ep->seq;
52561 if (sp->id != fh->fh_seq_id) {
52562- atomic_inc(&mp->stats.seq_not_found);
52563+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52564 if (f_ctl & FC_FC_END_SEQ) {
52565 /*
52566 * Update sequence_id based on incoming last
52567@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52568
52569 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52570 if (!ep) {
52571- atomic_inc(&mp->stats.xid_not_found);
52572+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52573 goto out;
52574 }
52575 if (ep->esb_stat & ESB_ST_COMPLETE) {
52576- atomic_inc(&mp->stats.xid_not_found);
52577+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52578 goto rel;
52579 }
52580 if (ep->rxid == FC_XID_UNKNOWN)
52581 ep->rxid = ntohs(fh->fh_rx_id);
52582 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52583- atomic_inc(&mp->stats.xid_not_found);
52584+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52585 goto rel;
52586 }
52587 if (ep->did != ntoh24(fh->fh_s_id) &&
52588 ep->did != FC_FID_FLOGI) {
52589- atomic_inc(&mp->stats.xid_not_found);
52590+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52591 goto rel;
52592 }
52593 sof = fr_sof(fp);
52594@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52595 sp->ssb_stat |= SSB_ST_RESP;
52596 sp->id = fh->fh_seq_id;
52597 } else if (sp->id != fh->fh_seq_id) {
52598- atomic_inc(&mp->stats.seq_not_found);
52599+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52600 goto rel;
52601 }
52602
52603@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52604 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52605
52606 if (!sp)
52607- atomic_inc(&mp->stats.xid_not_found);
52608+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52609 else
52610- atomic_inc(&mp->stats.non_bls_resp);
52611+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52612
52613 fc_frame_free(fp);
52614 }
52615@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52616
52617 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52618 mp = ema->mp;
52619- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52620+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52621 st->fc_no_free_exch_xid +=
52622- atomic_read(&mp->stats.no_free_exch_xid);
52623- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52624- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52625- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52626- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52627+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52628+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52629+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52630+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52631+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52632 }
52633 }
52634 EXPORT_SYMBOL(fc_exch_update_stats);
52635diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52636index 9c706d8..d3e3ed2 100644
52637--- a/drivers/scsi/libsas/sas_ata.c
52638+++ b/drivers/scsi/libsas/sas_ata.c
52639@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52640 .postreset = ata_std_postreset,
52641 .error_handler = ata_std_error_handler,
52642 .post_internal_cmd = sas_ata_post_internal,
52643- .qc_defer = ata_std_qc_defer,
52644+ .qc_defer = ata_std_qc_defer,
52645 .qc_prep = ata_noop_qc_prep,
52646 .qc_issue = sas_ata_qc_issue,
52647 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52648diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52649index 9b81a34..a9b7b8c 100644
52650--- a/drivers/scsi/lpfc/lpfc.h
52651+++ b/drivers/scsi/lpfc/lpfc.h
52652@@ -433,7 +433,7 @@ struct lpfc_vport {
52653 struct dentry *debug_nodelist;
52654 struct dentry *vport_debugfs_root;
52655 struct lpfc_debugfs_trc *disc_trc;
52656- atomic_t disc_trc_cnt;
52657+ atomic_unchecked_t disc_trc_cnt;
52658 #endif
52659 uint8_t stat_data_enabled;
52660 uint8_t stat_data_blocked;
52661@@ -883,8 +883,8 @@ struct lpfc_hba {
52662 struct timer_list fabric_block_timer;
52663 unsigned long bit_flags;
52664 #define FABRIC_COMANDS_BLOCKED 0
52665- atomic_t num_rsrc_err;
52666- atomic_t num_cmd_success;
52667+ atomic_unchecked_t num_rsrc_err;
52668+ atomic_unchecked_t num_cmd_success;
52669 unsigned long last_rsrc_error_time;
52670 unsigned long last_ramp_down_time;
52671 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52672@@ -919,7 +919,7 @@ struct lpfc_hba {
52673
52674 struct dentry *debug_slow_ring_trc;
52675 struct lpfc_debugfs_trc *slow_ring_trc;
52676- atomic_t slow_ring_trc_cnt;
52677+ atomic_unchecked_t slow_ring_trc_cnt;
52678 /* iDiag debugfs sub-directory */
52679 struct dentry *idiag_root;
52680 struct dentry *idiag_pci_cfg;
52681diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52682index 513edcb..805c6a8 100644
52683--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52684+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52685@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52686
52687 #include <linux/debugfs.h>
52688
52689-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52690+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52691 static unsigned long lpfc_debugfs_start_time = 0L;
52692
52693 /* iDiag */
52694@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52695 lpfc_debugfs_enable = 0;
52696
52697 len = 0;
52698- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52699+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52700 (lpfc_debugfs_max_disc_trc - 1);
52701 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52702 dtp = vport->disc_trc + i;
52703@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52704 lpfc_debugfs_enable = 0;
52705
52706 len = 0;
52707- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52708+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52709 (lpfc_debugfs_max_slow_ring_trc - 1);
52710 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52711 dtp = phba->slow_ring_trc + i;
52712@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52713 !vport || !vport->disc_trc)
52714 return;
52715
52716- index = atomic_inc_return(&vport->disc_trc_cnt) &
52717+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52718 (lpfc_debugfs_max_disc_trc - 1);
52719 dtp = vport->disc_trc + index;
52720 dtp->fmt = fmt;
52721 dtp->data1 = data1;
52722 dtp->data2 = data2;
52723 dtp->data3 = data3;
52724- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52725+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52726 dtp->jif = jiffies;
52727 #endif
52728 return;
52729@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52730 !phba || !phba->slow_ring_trc)
52731 return;
52732
52733- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52734+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52735 (lpfc_debugfs_max_slow_ring_trc - 1);
52736 dtp = phba->slow_ring_trc + index;
52737 dtp->fmt = fmt;
52738 dtp->data1 = data1;
52739 dtp->data2 = data2;
52740 dtp->data3 = data3;
52741- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52742+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52743 dtp->jif = jiffies;
52744 #endif
52745 return;
52746@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52747 "slow_ring buffer\n");
52748 goto debug_failed;
52749 }
52750- atomic_set(&phba->slow_ring_trc_cnt, 0);
52751+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52752 memset(phba->slow_ring_trc, 0,
52753 (sizeof(struct lpfc_debugfs_trc) *
52754 lpfc_debugfs_max_slow_ring_trc));
52755@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52756 "buffer\n");
52757 goto debug_failed;
52758 }
52759- atomic_set(&vport->disc_trc_cnt, 0);
52760+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52761
52762 snprintf(name, sizeof(name), "discovery_trace");
52763 vport->debug_disc_trc =
52764diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52765index e8c8c1e..5f2e11c 100644
52766--- a/drivers/scsi/lpfc/lpfc_init.c
52767+++ b/drivers/scsi/lpfc/lpfc_init.c
52768@@ -11406,8 +11406,10 @@ lpfc_init(void)
52769 "misc_register returned with status %d", error);
52770
52771 if (lpfc_enable_npiv) {
52772- lpfc_transport_functions.vport_create = lpfc_vport_create;
52773- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52774+ pax_open_kernel();
52775+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52776+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52777+ pax_close_kernel();
52778 }
52779 lpfc_transport_template =
52780 fc_attach_transport(&lpfc_transport_functions);
52781diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52782index c140f99..11b2505 100644
52783--- a/drivers/scsi/lpfc/lpfc_scsi.c
52784+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52785@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52786 unsigned long expires;
52787
52788 spin_lock_irqsave(&phba->hbalock, flags);
52789- atomic_inc(&phba->num_rsrc_err);
52790+ atomic_inc_unchecked(&phba->num_rsrc_err);
52791 phba->last_rsrc_error_time = jiffies;
52792
52793 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52794@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52795 unsigned long num_rsrc_err, num_cmd_success;
52796 int i;
52797
52798- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52799- num_cmd_success = atomic_read(&phba->num_cmd_success);
52800+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52801+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52802
52803 /*
52804 * The error and success command counters are global per
52805@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52806 }
52807 }
52808 lpfc_destroy_vport_work_array(phba, vports);
52809- atomic_set(&phba->num_rsrc_err, 0);
52810- atomic_set(&phba->num_cmd_success, 0);
52811+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52812+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52813 }
52814
52815 /**
52816diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52817index 3f26147..ee8efd1 100644
52818--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52819+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52820@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52821 {
52822 struct scsi_device *sdev = to_scsi_device(dev);
52823 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52824- static struct _raid_device *raid_device;
52825+ struct _raid_device *raid_device;
52826 unsigned long flags;
52827 Mpi2RaidVolPage0_t vol_pg0;
52828 Mpi2ConfigReply_t mpi_reply;
52829@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52830 {
52831 struct scsi_device *sdev = to_scsi_device(dev);
52832 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52833- static struct _raid_device *raid_device;
52834+ struct _raid_device *raid_device;
52835 unsigned long flags;
52836 Mpi2RaidVolPage0_t vol_pg0;
52837 Mpi2ConfigReply_t mpi_reply;
52838@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52839 Mpi2EventDataIrOperationStatus_t *event_data =
52840 (Mpi2EventDataIrOperationStatus_t *)
52841 fw_event->event_data;
52842- static struct _raid_device *raid_device;
52843+ struct _raid_device *raid_device;
52844 unsigned long flags;
52845 u16 handle;
52846
52847@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52848 u64 sas_address;
52849 struct _sas_device *sas_device;
52850 struct _sas_node *expander_device;
52851- static struct _raid_device *raid_device;
52852+ struct _raid_device *raid_device;
52853 u8 retry_count;
52854 unsigned long flags;
52855
52856diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52857index ed31d8c..ab856b3 100644
52858--- a/drivers/scsi/pmcraid.c
52859+++ b/drivers/scsi/pmcraid.c
52860@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52861 res->scsi_dev = scsi_dev;
52862 scsi_dev->hostdata = res;
52863 res->change_detected = 0;
52864- atomic_set(&res->read_failures, 0);
52865- atomic_set(&res->write_failures, 0);
52866+ atomic_set_unchecked(&res->read_failures, 0);
52867+ atomic_set_unchecked(&res->write_failures, 0);
52868 rc = 0;
52869 }
52870 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52871@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52872
52873 /* If this was a SCSI read/write command keep count of errors */
52874 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52875- atomic_inc(&res->read_failures);
52876+ atomic_inc_unchecked(&res->read_failures);
52877 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52878- atomic_inc(&res->write_failures);
52879+ atomic_inc_unchecked(&res->write_failures);
52880
52881 if (!RES_IS_GSCSI(res->cfg_entry) &&
52882 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52883@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52884 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52885 * hrrq_id assigned here in queuecommand
52886 */
52887- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52888+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52889 pinstance->num_hrrq;
52890 cmd->cmd_done = pmcraid_io_done;
52891
52892@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52893 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52894 * hrrq_id assigned here in queuecommand
52895 */
52896- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52897+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52898 pinstance->num_hrrq;
52899
52900 if (request_size) {
52901@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52902
52903 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52904 /* add resources only after host is added into system */
52905- if (!atomic_read(&pinstance->expose_resources))
52906+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52907 return;
52908
52909 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52910@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52911 init_waitqueue_head(&pinstance->reset_wait_q);
52912
52913 atomic_set(&pinstance->outstanding_cmds, 0);
52914- atomic_set(&pinstance->last_message_id, 0);
52915- atomic_set(&pinstance->expose_resources, 0);
52916+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52917+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52918
52919 INIT_LIST_HEAD(&pinstance->free_res_q);
52920 INIT_LIST_HEAD(&pinstance->used_res_q);
52921@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52922 /* Schedule worker thread to handle CCN and take care of adding and
52923 * removing devices to OS
52924 */
52925- atomic_set(&pinstance->expose_resources, 1);
52926+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52927 schedule_work(&pinstance->worker_q);
52928 return rc;
52929
52930diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52931index e1d150f..6c6df44 100644
52932--- a/drivers/scsi/pmcraid.h
52933+++ b/drivers/scsi/pmcraid.h
52934@@ -748,7 +748,7 @@ struct pmcraid_instance {
52935 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52936
52937 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52938- atomic_t last_message_id;
52939+ atomic_unchecked_t last_message_id;
52940
52941 /* configuration table */
52942 struct pmcraid_config_table *cfg_table;
52943@@ -777,7 +777,7 @@ struct pmcraid_instance {
52944 atomic_t outstanding_cmds;
52945
52946 /* should add/delete resources to mid-layer now ?*/
52947- atomic_t expose_resources;
52948+ atomic_unchecked_t expose_resources;
52949
52950
52951
52952@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52953 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52954 };
52955 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52956- atomic_t read_failures; /* count of failed READ commands */
52957- atomic_t write_failures; /* count of failed WRITE commands */
52958+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52959+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52960
52961 /* To indicate add/delete/modify during CCN */
52962 u8 change_detected;
52963diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52964index 82b92c4..3178171 100644
52965--- a/drivers/scsi/qla2xxx/qla_attr.c
52966+++ b/drivers/scsi/qla2xxx/qla_attr.c
52967@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52968 return 0;
52969 }
52970
52971-struct fc_function_template qla2xxx_transport_functions = {
52972+fc_function_template_no_const qla2xxx_transport_functions = {
52973
52974 .show_host_node_name = 1,
52975 .show_host_port_name = 1,
52976@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52977 .bsg_timeout = qla24xx_bsg_timeout,
52978 };
52979
52980-struct fc_function_template qla2xxx_transport_vport_functions = {
52981+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52982
52983 .show_host_node_name = 1,
52984 .show_host_port_name = 1,
52985diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52986index 7686bfe..4710893 100644
52987--- a/drivers/scsi/qla2xxx/qla_gbl.h
52988+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52989@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52990 struct device_attribute;
52991 extern struct device_attribute *qla2x00_host_attrs[];
52992 struct fc_function_template;
52993-extern struct fc_function_template qla2xxx_transport_functions;
52994-extern struct fc_function_template qla2xxx_transport_vport_functions;
52995+extern fc_function_template_no_const qla2xxx_transport_functions;
52996+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52997 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52998 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52999 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
53000diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
53001index 7462dd7..5b64c24 100644
53002--- a/drivers/scsi/qla2xxx/qla_os.c
53003+++ b/drivers/scsi/qla2xxx/qla_os.c
53004@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
53005 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
53006 /* Ok, a 64bit DMA mask is applicable. */
53007 ha->flags.enable_64bit_addressing = 1;
53008- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
53009- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
53010+ pax_open_kernel();
53011+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
53012+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
53013+ pax_close_kernel();
53014 return;
53015 }
53016 }
53017diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
53018index 8f6d0fb..1b21097 100644
53019--- a/drivers/scsi/qla4xxx/ql4_def.h
53020+++ b/drivers/scsi/qla4xxx/ql4_def.h
53021@@ -305,7 +305,7 @@ struct ddb_entry {
53022 * (4000 only) */
53023 atomic_t relogin_timer; /* Max Time to wait for
53024 * relogin to complete */
53025- atomic_t relogin_retry_count; /* Num of times relogin has been
53026+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
53027 * retried */
53028 uint32_t default_time2wait; /* Default Min time between
53029 * relogins (+aens) */
53030diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
53031index 6d25879..3031a9f 100644
53032--- a/drivers/scsi/qla4xxx/ql4_os.c
53033+++ b/drivers/scsi/qla4xxx/ql4_os.c
53034@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
53035 */
53036 if (!iscsi_is_session_online(cls_sess)) {
53037 /* Reset retry relogin timer */
53038- atomic_inc(&ddb_entry->relogin_retry_count);
53039+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
53040 DEBUG2(ql4_printk(KERN_INFO, ha,
53041 "%s: index[%d] relogin timed out-retrying"
53042 " relogin (%d), retry (%d)\n", __func__,
53043 ddb_entry->fw_ddb_index,
53044- atomic_read(&ddb_entry->relogin_retry_count),
53045+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
53046 ddb_entry->default_time2wait + 4));
53047 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
53048 atomic_set(&ddb_entry->retry_relogin_timer,
53049@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
53050
53051 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
53052 atomic_set(&ddb_entry->relogin_timer, 0);
53053- atomic_set(&ddb_entry->relogin_retry_count, 0);
53054+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
53055 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
53056 ddb_entry->default_relogin_timeout =
53057 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
53058diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
53059index 3833bf5..95feaf1 100644
53060--- a/drivers/scsi/scsi.c
53061+++ b/drivers/scsi/scsi.c
53062@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
53063
53064 good_bytes = scsi_bufflen(cmd);
53065 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
53066- int old_good_bytes = good_bytes;
53067+ unsigned int old_good_bytes = good_bytes;
53068 drv = scsi_cmd_to_driver(cmd);
53069 if (drv->done)
53070 good_bytes = drv->done(cmd);
53071diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
53072index b1a2631..5bcd9c8 100644
53073--- a/drivers/scsi/scsi_lib.c
53074+++ b/drivers/scsi/scsi_lib.c
53075@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
53076 shost = sdev->host;
53077 scsi_init_cmd_errh(cmd);
53078 cmd->result = DID_NO_CONNECT << 16;
53079- atomic_inc(&cmd->device->iorequest_cnt);
53080+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53081
53082 /*
53083 * SCSI request completion path will do scsi_device_unbusy(),
53084@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
53085
53086 INIT_LIST_HEAD(&cmd->eh_entry);
53087
53088- atomic_inc(&cmd->device->iodone_cnt);
53089+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
53090 if (cmd->result)
53091- atomic_inc(&cmd->device->ioerr_cnt);
53092+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
53093
53094 disposition = scsi_decide_disposition(cmd);
53095 if (disposition != SUCCESS &&
53096@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
53097 struct Scsi_Host *host = cmd->device->host;
53098 int rtn = 0;
53099
53100- atomic_inc(&cmd->device->iorequest_cnt);
53101+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53102
53103 /* check if the device is still usable */
53104 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
53105diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
53106index 1ac38e7..6acc656 100644
53107--- a/drivers/scsi/scsi_sysfs.c
53108+++ b/drivers/scsi/scsi_sysfs.c
53109@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
53110 char *buf) \
53111 { \
53112 struct scsi_device *sdev = to_scsi_device(dev); \
53113- unsigned long long count = atomic_read(&sdev->field); \
53114+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
53115 return snprintf(buf, 20, "0x%llx\n", count); \
53116 } \
53117 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53118diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53119index 24eaaf6..de30ec9 100644
53120--- a/drivers/scsi/scsi_transport_fc.c
53121+++ b/drivers/scsi/scsi_transport_fc.c
53122@@ -502,7 +502,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53123 * Netlink Infrastructure
53124 */
53125
53126-static atomic_t fc_event_seq;
53127+static atomic_unchecked_t fc_event_seq;
53128
53129 /**
53130 * fc_get_event_number - Obtain the next sequential FC event number
53131@@ -515,7 +515,7 @@ static atomic_t fc_event_seq;
53132 u32
53133 fc_get_event_number(void)
53134 {
53135- return atomic_add_return(1, &fc_event_seq);
53136+ return atomic_add_return_unchecked(1, &fc_event_seq);
53137 }
53138 EXPORT_SYMBOL(fc_get_event_number);
53139
53140@@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
53141 {
53142 int error;
53143
53144- atomic_set(&fc_event_seq, 0);
53145+ atomic_set_unchecked(&fc_event_seq, 0);
53146
53147 error = transport_class_register(&fc_host_class);
53148 if (error)
53149@@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53150 char *cp;
53151
53152 *val = simple_strtoul(buf, &cp, 0);
53153- if ((*cp && (*cp != '\n')) || (*val < 0))
53154+ if (*cp && (*cp != '\n'))
53155 return -EINVAL;
53156 /*
53157 * Check for overflow; dev_loss_tmo is u32
53158diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53159index 67d43e3..8cee73c 100644
53160--- a/drivers/scsi/scsi_transport_iscsi.c
53161+++ b/drivers/scsi/scsi_transport_iscsi.c
53162@@ -79,7 +79,7 @@ struct iscsi_internal {
53163 struct transport_container session_cont;
53164 };
53165
53166-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53167+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53168 static struct workqueue_struct *iscsi_eh_timer_workq;
53169
53170 static DEFINE_IDA(iscsi_sess_ida);
53171@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53172 int err;
53173
53174 ihost = shost->shost_data;
53175- session->sid = atomic_add_return(1, &iscsi_session_nr);
53176+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53177
53178 if (target_id == ISCSI_MAX_TARGET) {
53179 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53180@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53181 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53182 ISCSI_TRANSPORT_VERSION);
53183
53184- atomic_set(&iscsi_session_nr, 0);
53185+ atomic_set_unchecked(&iscsi_session_nr, 0);
53186
53187 err = class_register(&iscsi_transport_class);
53188 if (err)
53189diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53190index f115f67..b80b2c1 100644
53191--- a/drivers/scsi/scsi_transport_srp.c
53192+++ b/drivers/scsi/scsi_transport_srp.c
53193@@ -35,7 +35,7 @@
53194 #include "scsi_priv.h"
53195
53196 struct srp_host_attrs {
53197- atomic_t next_port_id;
53198+ atomic_unchecked_t next_port_id;
53199 };
53200 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53201
53202@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53203 struct Scsi_Host *shost = dev_to_shost(dev);
53204 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53205
53206- atomic_set(&srp_host->next_port_id, 0);
53207+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53208 return 0;
53209 }
53210
53211@@ -744,7 +744,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53212 rport_fast_io_fail_timedout);
53213 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53214
53215- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53216+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53217 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53218
53219 transport_setup_device(&rport->dev);
53220diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53221index 7f9d65f..e856438 100644
53222--- a/drivers/scsi/sd.c
53223+++ b/drivers/scsi/sd.c
53224@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53225 static void sd_rescan(struct device *);
53226 static int sd_init_command(struct scsi_cmnd *SCpnt);
53227 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53228-static int sd_done(struct scsi_cmnd *);
53229+static unsigned int sd_done(struct scsi_cmnd *);
53230 static int sd_eh_action(struct scsi_cmnd *, int);
53231 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53232 static void scsi_disk_release(struct device *cdev);
53233@@ -1646,7 +1646,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53234 *
53235 * Note: potentially run from within an ISR. Must not block.
53236 **/
53237-static int sd_done(struct scsi_cmnd *SCpnt)
53238+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53239 {
53240 int result = SCpnt->result;
53241 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53242@@ -2973,7 +2973,7 @@ static int sd_probe(struct device *dev)
53243 sdkp->disk = gd;
53244 sdkp->index = index;
53245 atomic_set(&sdkp->openers, 0);
53246- atomic_set(&sdkp->device->ioerr_cnt, 0);
53247+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53248
53249 if (!sdp->request_queue->rq_timeout) {
53250 if (sdp->type != TYPE_MOD)
53251diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53252index 9d7b7db..33ecc51 100644
53253--- a/drivers/scsi/sg.c
53254+++ b/drivers/scsi/sg.c
53255@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53256 sdp->disk->disk_name,
53257 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53258 NULL,
53259- (char *)arg);
53260+ (char __user *)arg);
53261 case BLKTRACESTART:
53262 return blk_trace_startstop(sdp->device->request_queue, 1);
53263 case BLKTRACESTOP:
53264diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53265index 8bd54a6..dd037a5 100644
53266--- a/drivers/scsi/sr.c
53267+++ b/drivers/scsi/sr.c
53268@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53269 static int sr_probe(struct device *);
53270 static int sr_remove(struct device *);
53271 static int sr_init_command(struct scsi_cmnd *SCpnt);
53272-static int sr_done(struct scsi_cmnd *);
53273+static unsigned int sr_done(struct scsi_cmnd *);
53274 static int sr_runtime_suspend(struct device *dev);
53275
53276 static struct dev_pm_ops sr_pm_ops = {
53277@@ -312,11 +312,11 @@ do_tur:
53278 * It will be notified on the end of a SCSI read / write, and will take one
53279 * of several actions based on success or failure.
53280 */
53281-static int sr_done(struct scsi_cmnd *SCpnt)
53282+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53283 {
53284 int result = SCpnt->result;
53285- int this_count = scsi_bufflen(SCpnt);
53286- int good_bytes = (result == 0 ? this_count : 0);
53287+ unsigned int this_count = scsi_bufflen(SCpnt);
53288+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53289 int block_sectors = 0;
53290 long error_sector;
53291 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53292diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
53293index 9a1c342..525ab4c 100644
53294--- a/drivers/scsi/st.c
53295+++ b/drivers/scsi/st.c
53296@@ -1274,9 +1274,9 @@ static int st_open(struct inode *inode, struct file *filp)
53297 spin_lock(&st_use_lock);
53298 STp->in_use = 0;
53299 spin_unlock(&st_use_lock);
53300- scsi_tape_put(STp);
53301 if (resumed)
53302 scsi_autopm_put_device(STp->device);
53303+ scsi_tape_put(STp);
53304 return retval;
53305
53306 }
53307diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53308index c0d660f..24a5854 100644
53309--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53310+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53311@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53312 return i;
53313 }
53314
53315-static struct bin_attribute fuse_bin_attr = {
53316+static bin_attribute_no_const fuse_bin_attr = {
53317 .attr = { .name = "fuse", .mode = S_IRUGO, },
53318 .read = fuse_read,
53319 };
53320diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53321index d35c1a1..eda08dc 100644
53322--- a/drivers/spi/spi.c
53323+++ b/drivers/spi/spi.c
53324@@ -2206,7 +2206,7 @@ int spi_bus_unlock(struct spi_master *master)
53325 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53326
53327 /* portable code must never pass more than 32 bytes */
53328-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53329+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53330
53331 static u8 *buf;
53332
53333diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53334index b41429f..2de5373 100644
53335--- a/drivers/staging/android/timed_output.c
53336+++ b/drivers/staging/android/timed_output.c
53337@@ -25,7 +25,7 @@
53338 #include "timed_output.h"
53339
53340 static struct class *timed_output_class;
53341-static atomic_t device_count;
53342+static atomic_unchecked_t device_count;
53343
53344 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53345 char *buf)
53346@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53347 timed_output_class = class_create(THIS_MODULE, "timed_output");
53348 if (IS_ERR(timed_output_class))
53349 return PTR_ERR(timed_output_class);
53350- atomic_set(&device_count, 0);
53351+ atomic_set_unchecked(&device_count, 0);
53352 timed_output_class->dev_groups = timed_output_groups;
53353 }
53354
53355@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53356 if (ret < 0)
53357 return ret;
53358
53359- tdev->index = atomic_inc_return(&device_count);
53360+ tdev->index = atomic_inc_return_unchecked(&device_count);
53361 tdev->dev = device_create(timed_output_class, NULL,
53362 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53363 if (IS_ERR(tdev->dev))
53364diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53365index e78ddbe..ac437c0 100644
53366--- a/drivers/staging/comedi/comedi_fops.c
53367+++ b/drivers/staging/comedi/comedi_fops.c
53368@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53369 }
53370 cfp->last_attached = dev->attached;
53371 cfp->last_detach_count = dev->detach_count;
53372- ACCESS_ONCE(cfp->read_subdev) = read_s;
53373- ACCESS_ONCE(cfp->write_subdev) = write_s;
53374+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53375+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53376 }
53377
53378 static void comedi_file_check(struct file *file)
53379@@ -1951,7 +1951,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53380 !(s_old->async->cmd.flags & CMDF_WRITE))
53381 return -EBUSY;
53382
53383- ACCESS_ONCE(cfp->read_subdev) = s_new;
53384+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53385 return 0;
53386 }
53387
53388@@ -1993,7 +1993,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53389 (s_old->async->cmd.flags & CMDF_WRITE))
53390 return -EBUSY;
53391
53392- ACCESS_ONCE(cfp->write_subdev) = s_new;
53393+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53394 return 0;
53395 }
53396
53397diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53398index 53b748b..a5ae0b3 100644
53399--- a/drivers/staging/fbtft/fbtft-core.c
53400+++ b/drivers/staging/fbtft/fbtft-core.c
53401@@ -680,7 +680,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53402 {
53403 struct fb_info *info;
53404 struct fbtft_par *par;
53405- struct fb_ops *fbops = NULL;
53406+ fb_ops_no_const *fbops = NULL;
53407 struct fb_deferred_io *fbdefio = NULL;
53408 struct fbtft_platform_data *pdata = dev->platform_data;
53409 u8 *vmem = NULL;
53410diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53411index 9fd98cb..a9cf912 100644
53412--- a/drivers/staging/fbtft/fbtft.h
53413+++ b/drivers/staging/fbtft/fbtft.h
53414@@ -106,7 +106,7 @@ struct fbtft_ops {
53415
53416 int (*set_var)(struct fbtft_par *par);
53417 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53418-};
53419+} __no_const;
53420
53421 /**
53422 * struct fbtft_display - Describes the display properties
53423diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53424index 001348c..cfaac8a 100644
53425--- a/drivers/staging/gdm724x/gdm_tty.c
53426+++ b/drivers/staging/gdm724x/gdm_tty.c
53427@@ -44,7 +44,7 @@
53428 #define gdm_tty_send_control(n, r, v, d, l) (\
53429 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53430
53431-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53432+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53433
53434 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53435 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53436diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53437index d23c3c2..eb63c81 100644
53438--- a/drivers/staging/i2o/i2o.h
53439+++ b/drivers/staging/i2o/i2o.h
53440@@ -565,7 +565,7 @@ struct i2o_controller {
53441 struct i2o_device *exec; /* Executive */
53442 #if BITS_PER_LONG == 64
53443 spinlock_t context_list_lock; /* lock for context_list */
53444- atomic_t context_list_counter; /* needed for unique contexts */
53445+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53446 struct list_head context_list; /* list of context id's
53447 and pointers */
53448 #endif
53449diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53450index 780fee3..ca9dcae 100644
53451--- a/drivers/staging/i2o/i2o_proc.c
53452+++ b/drivers/staging/i2o/i2o_proc.c
53453@@ -253,12 +253,6 @@ static char *scsi_devices[] = {
53454 "Array Controller Device"
53455 };
53456
53457-static char *chtostr(char *tmp, u8 *chars, int n)
53458-{
53459- tmp[0] = 0;
53460- return strncat(tmp, (char *)chars, n);
53461-}
53462-
53463 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53464 char *group)
53465 {
53466@@ -711,9 +705,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53467 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53468 {
53469 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53470- static u32 work32[5];
53471- static u8 *work8 = (u8 *) work32;
53472- static u16 *work16 = (u16 *) work32;
53473+ u32 work32[5];
53474+ u8 *work8 = (u8 *) work32;
53475+ u16 *work16 = (u16 *) work32;
53476 int token;
53477 u32 hwcap;
53478
53479@@ -794,7 +788,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53480 } *result;
53481
53482 i2o_exec_execute_ddm_table ddm_table;
53483- char tmp[28 + 1];
53484
53485 result = kmalloc(sizeof(*result), GFP_KERNEL);
53486 if (!result)
53487@@ -829,8 +822,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53488
53489 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53490 seq_printf(seq, "%-#8x", ddm_table.module_id);
53491- seq_printf(seq, "%-29s",
53492- chtostr(tmp, ddm_table.module_name_version, 28));
53493+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53494 seq_printf(seq, "%9d ", ddm_table.data_size);
53495 seq_printf(seq, "%8d", ddm_table.code_size);
53496
53497@@ -897,7 +889,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53498
53499 i2o_driver_result_table *result;
53500 i2o_driver_store_table *dst;
53501- char tmp[28 + 1];
53502
53503 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53504 if (result == NULL)
53505@@ -932,9 +923,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53506
53507 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53508 seq_printf(seq, "%-#8x", dst->module_id);
53509- seq_printf(seq, "%-29s",
53510- chtostr(tmp, dst->module_name_version, 28));
53511- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53512+ seq_printf(seq, "%-.28s", dst->module_name_version);
53513+ seq_printf(seq, "%-.8s", dst->date);
53514 seq_printf(seq, "%8d ", dst->module_size);
53515 seq_printf(seq, "%8d ", dst->mpb_size);
53516 seq_printf(seq, "0x%04x", dst->module_flags);
53517@@ -1250,11 +1240,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53518 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53519 {
53520 struct i2o_device *d = (struct i2o_device *)seq->private;
53521- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53522+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53523 // == (allow) 512d bytes (max)
53524- static u16 *work16 = (u16 *) work32;
53525+ u16 *work16 = (u16 *) work32;
53526 int token;
53527- char tmp[16 + 1];
53528
53529 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53530
53531@@ -1266,14 +1255,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53532 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53533 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53534 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53535- seq_printf(seq, "Vendor info : %s\n",
53536- chtostr(tmp, (u8 *) (work32 + 2), 16));
53537- seq_printf(seq, "Product info : %s\n",
53538- chtostr(tmp, (u8 *) (work32 + 6), 16));
53539- seq_printf(seq, "Description : %s\n",
53540- chtostr(tmp, (u8 *) (work32 + 10), 16));
53541- seq_printf(seq, "Product rev. : %s\n",
53542- chtostr(tmp, (u8 *) (work32 + 14), 8));
53543+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53544+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53545+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53546+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53547
53548 seq_printf(seq, "Serial number : ");
53549 print_serial_number(seq, (u8 *) (work32 + 16),
53550@@ -1310,8 +1295,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53551 u8 pad[256]; // allow up to 256 byte (max) serial number
53552 } result;
53553
53554- char tmp[24 + 1];
53555-
53556 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53557
53558 if (token < 0) {
53559@@ -1320,10 +1303,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53560 }
53561
53562 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53563- seq_printf(seq, "Module name : %s\n",
53564- chtostr(tmp, result.module_name, 24));
53565- seq_printf(seq, "Module revision : %s\n",
53566- chtostr(tmp, result.module_rev, 8));
53567+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53568+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53569
53570 seq_printf(seq, "Serial number : ");
53571 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53572@@ -1347,8 +1328,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53573 u8 instance_number[4];
53574 } result;
53575
53576- char tmp[64 + 1];
53577-
53578 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53579
53580 if (token < 0) {
53581@@ -1356,14 +1335,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53582 return 0;
53583 }
53584
53585- seq_printf(seq, "Device name : %s\n",
53586- chtostr(tmp, result.device_name, 64));
53587- seq_printf(seq, "Service name : %s\n",
53588- chtostr(tmp, result.service_name, 64));
53589- seq_printf(seq, "Physical name : %s\n",
53590- chtostr(tmp, result.physical_location, 64));
53591- seq_printf(seq, "Instance number : %s\n",
53592- chtostr(tmp, result.instance_number, 4));
53593+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53594+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53595+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53596+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53597
53598 return 0;
53599 }
53600@@ -1372,9 +1347,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53601 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53602 {
53603 struct i2o_device *d = (struct i2o_device *)seq->private;
53604- static u32 work32[12];
53605- static u16 *work16 = (u16 *) work32;
53606- static u8 *work8 = (u8 *) work32;
53607+ u32 work32[12];
53608+ u16 *work16 = (u16 *) work32;
53609+ u8 *work8 = (u8 *) work32;
53610 int token;
53611
53612 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53613diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53614index 23bdbe4..4e1f340 100644
53615--- a/drivers/staging/i2o/iop.c
53616+++ b/drivers/staging/i2o/iop.c
53617@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53618
53619 spin_lock_irqsave(&c->context_list_lock, flags);
53620
53621- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53622- atomic_inc(&c->context_list_counter);
53623+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53624+ atomic_inc_unchecked(&c->context_list_counter);
53625
53626- entry->context = atomic_read(&c->context_list_counter);
53627+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53628
53629 list_add(&entry->list, &c->context_list);
53630
53631@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53632
53633 #if BITS_PER_LONG == 64
53634 spin_lock_init(&c->context_list_lock);
53635- atomic_set(&c->context_list_counter, 0);
53636+ atomic_set_unchecked(&c->context_list_counter, 0);
53637 INIT_LIST_HEAD(&c->context_list);
53638 #endif
53639
53640diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
53641index b892f2c..9b4898a 100644
53642--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
53643+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
53644@@ -118,7 +118,7 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
53645 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
53646 indio_dev->masklength);
53647
53648- rx_array = kcalloc(4, scan_count, GFP_KERNEL);
53649+ rx_array = kcalloc(scan_count, 4, GFP_KERNEL);
53650 if (!rx_array)
53651 return -ENOMEM;
53652 ret = lis3l02dq_read_all(indio_dev, rx_array);
53653diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
53654index d98e229..9c59bc2 100644
53655--- a/drivers/staging/iio/adc/ad7280a.c
53656+++ b/drivers/staging/iio/adc/ad7280a.c
53657@@ -547,8 +547,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
53658 {
53659 int dev, ch, cnt;
53660
53661- st->iio_attr = kcalloc(2, sizeof(*st->iio_attr) *
53662- (st->slave_num + 1) * AD7280A_CELLS_PER_DEV,
53663+ st->iio_attr = kcalloc(sizeof(*st->iio_attr) *
53664+ (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, 2,
53665 GFP_KERNEL);
53666 if (st->iio_attr == NULL)
53667 return -ENOMEM;
53668diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53669index 658f458..0564216 100644
53670--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53671+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53672@@ -487,13 +487,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53673 return 0;
53674 }
53675
53676-sfw_test_client_ops_t brw_test_client;
53677-void brw_init_test_client(void)
53678-{
53679- brw_test_client.tso_init = brw_client_init;
53680- brw_test_client.tso_fini = brw_client_fini;
53681- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53682- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53683+sfw_test_client_ops_t brw_test_client = {
53684+ .tso_init = brw_client_init,
53685+ .tso_fini = brw_client_fini,
53686+ .tso_prep_rpc = brw_client_prep_rpc,
53687+ .tso_done_rpc = brw_client_done_rpc,
53688 };
53689
53690 srpc_service_t brw_test_service;
53691diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53692index a93a90d..c51dde6 100644
53693--- a/drivers/staging/lustre/lnet/selftest/framework.c
53694+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53695@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53696
53697 extern sfw_test_client_ops_t ping_test_client;
53698 extern srpc_service_t ping_test_service;
53699-extern void ping_init_test_client(void);
53700 extern void ping_init_test_service(void);
53701
53702 extern sfw_test_client_ops_t brw_test_client;
53703 extern srpc_service_t brw_test_service;
53704-extern void brw_init_test_client(void);
53705 extern void brw_init_test_service(void);
53706
53707
53708@@ -1675,12 +1673,10 @@ sfw_startup(void)
53709 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53710 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53711
53712- brw_init_test_client();
53713 brw_init_test_service();
53714 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53715 LASSERT(rc == 0);
53716
53717- ping_init_test_client();
53718 ping_init_test_service();
53719 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53720 LASSERT(rc == 0);
53721diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53722index 644069a..83cbd26 100644
53723--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53724+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53725@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53726 return 0;
53727 }
53728
53729-sfw_test_client_ops_t ping_test_client;
53730-void ping_init_test_client(void)
53731-{
53732- ping_test_client.tso_init = ping_client_init;
53733- ping_test_client.tso_fini = ping_client_fini;
53734- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53735- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53736-}
53737+sfw_test_client_ops_t ping_test_client = {
53738+ .tso_init = ping_client_init,
53739+ .tso_fini = ping_client_fini,
53740+ .tso_prep_rpc = ping_client_prep_rpc,
53741+ .tso_done_rpc = ping_client_done_rpc,
53742+};
53743
53744 srpc_service_t ping_test_service;
53745 void ping_init_test_service(void)
53746diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53747index bac9902..0225fe1 100644
53748--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53749+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53750@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53751 ldlm_completion_callback lcs_completion;
53752 ldlm_blocking_callback lcs_blocking;
53753 ldlm_glimpse_callback lcs_glimpse;
53754-};
53755+} __no_const;
53756
53757 /* ldlm_lockd.c */
53758 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53759diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53760index 2a88b80..62e7e5f 100644
53761--- a/drivers/staging/lustre/lustre/include/obd.h
53762+++ b/drivers/staging/lustre/lustre/include/obd.h
53763@@ -1362,7 +1362,7 @@ struct md_ops {
53764 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53765 * wrapper function in include/linux/obd_class.h.
53766 */
53767-};
53768+} __no_const;
53769
53770 struct lsm_operations {
53771 void (*lsm_free)(struct lov_stripe_md *);
53772diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53773index a4c252f..b21acac 100644
53774--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53775+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53776@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53777 int added = (mode == LCK_NL);
53778 int overlaps = 0;
53779 int splitted = 0;
53780- const struct ldlm_callback_suite null_cbs = { NULL };
53781+ const struct ldlm_callback_suite null_cbs = { };
53782
53783 CDEBUG(D_DLMTRACE,
53784 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53785diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53786index f0ee76a..1d01af9 100644
53787--- a/drivers/staging/lustre/lustre/libcfs/module.c
53788+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53789@@ -380,11 +380,11 @@ out:
53790
53791
53792 struct cfs_psdev_ops libcfs_psdev_ops = {
53793- libcfs_psdev_open,
53794- libcfs_psdev_release,
53795- NULL,
53796- NULL,
53797- libcfs_ioctl
53798+ .p_open = libcfs_psdev_open,
53799+ .p_close = libcfs_psdev_release,
53800+ .p_read = NULL,
53801+ .p_write = NULL,
53802+ .p_ioctl = libcfs_ioctl
53803 };
53804
53805 static int init_libcfs_module(void)
53806@@ -631,7 +631,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53807 loff_t *ppos)
53808 {
53809 int rc, max_delay_cs;
53810- struct ctl_table dummy = *table;
53811+ ctl_table_no_const dummy = *table;
53812 long d;
53813
53814 dummy.data = &max_delay_cs;
53815@@ -664,7 +664,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53816 loff_t *ppos)
53817 {
53818 int rc, min_delay_cs;
53819- struct ctl_table dummy = *table;
53820+ ctl_table_no_const dummy = *table;
53821 long d;
53822
53823 dummy.data = &min_delay_cs;
53824@@ -696,7 +696,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53825 void __user *buffer, size_t *lenp, loff_t *ppos)
53826 {
53827 int rc, backoff;
53828- struct ctl_table dummy = *table;
53829+ ctl_table_no_const dummy = *table;
53830
53831 dummy.data = &backoff;
53832 dummy.proc_handler = &proc_dointvec;
53833diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53834index 22667db..8b703b6 100644
53835--- a/drivers/staging/octeon/ethernet-rx.c
53836+++ b/drivers/staging/octeon/ethernet-rx.c
53837@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53838 /* Increment RX stats for virtual ports */
53839 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53840 #ifdef CONFIG_64BIT
53841- atomic64_add(1,
53842+ atomic64_add_unchecked(1,
53843 (atomic64_t *)&priv->stats.rx_packets);
53844- atomic64_add(skb->len,
53845+ atomic64_add_unchecked(skb->len,
53846 (atomic64_t *)&priv->stats.rx_bytes);
53847 #else
53848- atomic_add(1,
53849+ atomic_add_unchecked(1,
53850 (atomic_t *)&priv->stats.rx_packets);
53851- atomic_add(skb->len,
53852+ atomic_add_unchecked(skb->len,
53853 (atomic_t *)&priv->stats.rx_bytes);
53854 #endif
53855 }
53856@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53857 dev->name);
53858 */
53859 #ifdef CONFIG_64BIT
53860- atomic64_add(1,
53861+ atomic64_add_unchecked(1,
53862 (atomic64_t *)&priv->stats.rx_dropped);
53863 #else
53864- atomic_add(1,
53865+ atomic_add_unchecked(1,
53866 (atomic_t *)&priv->stats.rx_dropped);
53867 #endif
53868 dev_kfree_skb_irq(skb);
53869diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53870index fbbe866..2943243 100644
53871--- a/drivers/staging/octeon/ethernet.c
53872+++ b/drivers/staging/octeon/ethernet.c
53873@@ -251,11 +251,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53874 * since the RX tasklet also increments it.
53875 */
53876 #ifdef CONFIG_64BIT
53877- atomic64_add(rx_status.dropped_packets,
53878- (atomic64_t *)&priv->stats.rx_dropped);
53879+ atomic64_add_unchecked(rx_status.dropped_packets,
53880+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53881 #else
53882- atomic_add(rx_status.dropped_packets,
53883- (atomic_t *)&priv->stats.rx_dropped);
53884+ atomic_add_unchecked(rx_status.dropped_packets,
53885+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53886 #endif
53887 }
53888
53889diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53890index 3b476d8..f522d68 100644
53891--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53892+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53893@@ -225,7 +225,7 @@ struct hal_ops {
53894
53895 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53896 void (*hal_reset_security_engine)(struct adapter *adapter);
53897-};
53898+} __no_const;
53899
53900 enum rt_eeprom_type {
53901 EEPROM_93C46,
53902diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53903index 070cc03..6806e37 100644
53904--- a/drivers/staging/rtl8712/rtl871x_io.h
53905+++ b/drivers/staging/rtl8712/rtl871x_io.h
53906@@ -108,7 +108,7 @@ struct _io_ops {
53907 u8 *pmem);
53908 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53909 u8 *pmem);
53910-};
53911+} __no_const;
53912
53913 struct io_req {
53914 struct list_head list;
53915diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
53916index dbbb2f8..5232114 100644
53917--- a/drivers/staging/sm750fb/sm750.c
53918+++ b/drivers/staging/sm750fb/sm750.c
53919@@ -780,6 +780,7 @@ static struct fb_ops lynxfb_ops = {
53920 .fb_set_par = lynxfb_ops_set_par,
53921 .fb_setcolreg = lynxfb_ops_setcolreg,
53922 .fb_blank = lynxfb_ops_blank,
53923+ .fb_pan_display = lynxfb_ops_pan_display,
53924 .fb_fillrect = cfb_fillrect,
53925 .fb_imageblit = cfb_imageblit,
53926 .fb_copyarea = cfb_copyarea,
53927@@ -827,8 +828,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53928 par->index = index;
53929 output->channel = &crtc->channel;
53930 sm750fb_set_drv(par);
53931- lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53932
53933+ pax_open_kernel();
53934+ *(void **)&lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53935+ pax_close_kernel();
53936
53937 /* set current cursor variable and proc pointer,
53938 * must be set after crtc member initialized */
53939@@ -850,7 +853,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53940 crtc->cursor.share = share;
53941 memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
53942 if (!g_hwcursor) {
53943- lynxfb_ops.fb_cursor = NULL;
53944+ pax_open_kernel();
53945+ *(void **)&lynxfb_ops.fb_cursor = NULL;
53946+ pax_close_kernel();
53947 crtc->cursor.disable(&crtc->cursor);
53948 }
53949
53950@@ -858,9 +863,11 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53951 /* set info->fbops, must be set before fb_find_mode */
53952 if (!share->accel_off) {
53953 /* use 2d acceleration */
53954- lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53955- lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53956- lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53957+ pax_open_kernel();
53958+ *(void **)&lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53959+ *(void **)&lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53960+ *(void **)&lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53961+ pax_close_kernel();
53962 }
53963 info->fbops = &lynxfb_ops;
53964
53965diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53966index bd46df9..a0a5274 100644
53967--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53968+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53969@@ -170,7 +170,7 @@ struct visorchipset_busdev_notifiers {
53970 void (*device_resume)(ulong bus_no, ulong dev_no);
53971 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53972 ulong *max_size);
53973-};
53974+} __no_const;
53975
53976 /* These functions live inside visorchipset, and will be called to indicate
53977 * responses to specific events (by code outside of visorchipset).
53978@@ -185,7 +185,7 @@ struct visorchipset_busdev_responders {
53979 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53980 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53981 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53982-};
53983+} __no_const;
53984
53985 /** Register functions (in the bus driver) to get called by visorchipset
53986 * whenever a bus or device appears for which this service partition is
53987diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53988index 18b0f97..9c7716e 100644
53989--- a/drivers/target/sbp/sbp_target.c
53990+++ b/drivers/target/sbp/sbp_target.c
53991@@ -61,7 +61,7 @@ static const u32 sbp_unit_directory_template[] = {
53992
53993 #define SESSION_MAINTENANCE_INTERVAL HZ
53994
53995-static atomic_t login_id = ATOMIC_INIT(0);
53996+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53997
53998 static void session_maintenance_work(struct work_struct *);
53999 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
54000@@ -443,7 +443,7 @@ static void sbp_management_request_login(
54001 login->lun = se_lun;
54002 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
54003 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
54004- login->login_id = atomic_inc_return(&login_id);
54005+ login->login_id = atomic_inc_return_unchecked(&login_id);
54006
54007 login->tgt_agt = sbp_target_agent_register(login);
54008 if (IS_ERR(login->tgt_agt)) {
54009diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
54010index ce5f768..a4f884a 100644
54011--- a/drivers/target/target_core_device.c
54012+++ b/drivers/target/target_core_device.c
54013@@ -1496,7 +1496,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
54014 spin_lock_init(&dev->se_tmr_lock);
54015 spin_lock_init(&dev->qf_cmd_lock);
54016 sema_init(&dev->caw_sem, 1);
54017- atomic_set(&dev->dev_ordered_id, 0);
54018+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
54019 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
54020 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
54021 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
54022diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
54023index 675f2d9..1389429 100644
54024--- a/drivers/target/target_core_transport.c
54025+++ b/drivers/target/target_core_transport.c
54026@@ -1208,7 +1208,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
54027 * Used to determine when ORDERED commands should go from
54028 * Dormant to Active status.
54029 */
54030- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
54031+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
54032 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
54033 cmd->se_ordered_id, cmd->sam_task_attr,
54034 dev->transport->name);
54035diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
54036index 031018e..90981a1 100644
54037--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
54038+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
54039@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
54040 platform_set_drvdata(pdev, priv);
54041
54042 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
54043- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
54044- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
54045+ pax_open_kernel();
54046+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
54047+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
54048+ pax_close_kernel();
54049 }
54050 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
54051 priv, &int3400_thermal_ops,
54052diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
54053index 668fb1b..2737bbe 100644
54054--- a/drivers/thermal/of-thermal.c
54055+++ b/drivers/thermal/of-thermal.c
54056@@ -31,6 +31,7 @@
54057 #include <linux/export.h>
54058 #include <linux/string.h>
54059 #include <linux/thermal.h>
54060+#include <linux/mm.h>
54061
54062 #include "thermal_core.h"
54063
54064@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
54065 tz->ops = ops;
54066 tz->sensor_data = data;
54067
54068- tzd->ops->get_temp = of_thermal_get_temp;
54069- tzd->ops->get_trend = of_thermal_get_trend;
54070- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
54071+ pax_open_kernel();
54072+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
54073+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
54074+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
54075+ pax_close_kernel();
54076 mutex_unlock(&tzd->lock);
54077
54078 return tzd;
54079@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
54080 return;
54081
54082 mutex_lock(&tzd->lock);
54083- tzd->ops->get_temp = NULL;
54084- tzd->ops->get_trend = NULL;
54085- tzd->ops->set_emul_temp = NULL;
54086+ pax_open_kernel();
54087+ *(void **)&tzd->ops->get_temp = NULL;
54088+ *(void **)&tzd->ops->get_trend = NULL;
54089+ *(void **)&tzd->ops->set_emul_temp = NULL;
54090+ pax_close_kernel();
54091
54092 tz->ops = NULL;
54093 tz->sensor_data = NULL;
54094diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
54095index 9ea3d9d..53e8792 100644
54096--- a/drivers/thermal/x86_pkg_temp_thermal.c
54097+++ b/drivers/thermal/x86_pkg_temp_thermal.c
54098@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
54099 return NOTIFY_OK;
54100 }
54101
54102-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
54103+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
54104 .notifier_call = pkg_temp_thermal_cpu_callback,
54105 };
54106
54107diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
54108index fd66f57..48e6376 100644
54109--- a/drivers/tty/cyclades.c
54110+++ b/drivers/tty/cyclades.c
54111@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
54112 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
54113 info->port.count);
54114 #endif
54115- info->port.count++;
54116+ atomic_inc(&info->port.count);
54117 #ifdef CY_DEBUG_COUNT
54118 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
54119- current->pid, info->port.count);
54120+ current->pid, atomic_read(&info->port.count));
54121 #endif
54122
54123 /*
54124@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
54125 for (j = 0; j < cy_card[i].nports; j++) {
54126 info = &cy_card[i].ports[j];
54127
54128- if (info->port.count) {
54129+ if (atomic_read(&info->port.count)) {
54130 /* XXX is the ldisc num worth this? */
54131 struct tty_struct *tty;
54132 struct tty_ldisc *ld;
54133diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
54134index 4fcec1d..5a036f7 100644
54135--- a/drivers/tty/hvc/hvc_console.c
54136+++ b/drivers/tty/hvc/hvc_console.c
54137@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
54138
54139 spin_lock_irqsave(&hp->port.lock, flags);
54140 /* Check and then increment for fast path open. */
54141- if (hp->port.count++ > 0) {
54142+ if (atomic_inc_return(&hp->port.count) > 1) {
54143 spin_unlock_irqrestore(&hp->port.lock, flags);
54144 hvc_kick();
54145 return 0;
54146@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54147
54148 spin_lock_irqsave(&hp->port.lock, flags);
54149
54150- if (--hp->port.count == 0) {
54151+ if (atomic_dec_return(&hp->port.count) == 0) {
54152 spin_unlock_irqrestore(&hp->port.lock, flags);
54153 /* We are done with the tty pointer now. */
54154 tty_port_tty_set(&hp->port, NULL);
54155@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54156 */
54157 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
54158 } else {
54159- if (hp->port.count < 0)
54160+ if (atomic_read(&hp->port.count) < 0)
54161 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
54162- hp->vtermno, hp->port.count);
54163+ hp->vtermno, atomic_read(&hp->port.count));
54164 spin_unlock_irqrestore(&hp->port.lock, flags);
54165 }
54166 }
54167@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
54168 * open->hangup case this can be called after the final close so prevent
54169 * that from happening for now.
54170 */
54171- if (hp->port.count <= 0) {
54172+ if (atomic_read(&hp->port.count) <= 0) {
54173 spin_unlock_irqrestore(&hp->port.lock, flags);
54174 return;
54175 }
54176
54177- hp->port.count = 0;
54178+ atomic_set(&hp->port.count, 0);
54179 spin_unlock_irqrestore(&hp->port.lock, flags);
54180 tty_port_tty_set(&hp->port, NULL);
54181
54182@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
54183 return -EPIPE;
54184
54185 /* FIXME what's this (unprotected) check for? */
54186- if (hp->port.count <= 0)
54187+ if (atomic_read(&hp->port.count) <= 0)
54188 return -EIO;
54189
54190 spin_lock_irqsave(&hp->lock, flags);
54191diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54192index 81ff7e1..dfb7b71 100644
54193--- a/drivers/tty/hvc/hvcs.c
54194+++ b/drivers/tty/hvc/hvcs.c
54195@@ -83,6 +83,7 @@
54196 #include <asm/hvcserver.h>
54197 #include <asm/uaccess.h>
54198 #include <asm/vio.h>
54199+#include <asm/local.h>
54200
54201 /*
54202 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54203@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54204
54205 spin_lock_irqsave(&hvcsd->lock, flags);
54206
54207- if (hvcsd->port.count > 0) {
54208+ if (atomic_read(&hvcsd->port.count) > 0) {
54209 spin_unlock_irqrestore(&hvcsd->lock, flags);
54210 printk(KERN_INFO "HVCS: vterm state unchanged. "
54211 "The hvcs device node is still in use.\n");
54212@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54213 }
54214 }
54215
54216- hvcsd->port.count = 0;
54217+ atomic_set(&hvcsd->port.count, 0);
54218 hvcsd->port.tty = tty;
54219 tty->driver_data = hvcsd;
54220
54221@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54222 unsigned long flags;
54223
54224 spin_lock_irqsave(&hvcsd->lock, flags);
54225- hvcsd->port.count++;
54226+ atomic_inc(&hvcsd->port.count);
54227 hvcsd->todo_mask |= HVCS_SCHED_READ;
54228 spin_unlock_irqrestore(&hvcsd->lock, flags);
54229
54230@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54231 hvcsd = tty->driver_data;
54232
54233 spin_lock_irqsave(&hvcsd->lock, flags);
54234- if (--hvcsd->port.count == 0) {
54235+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54236
54237 vio_disable_interrupts(hvcsd->vdev);
54238
54239@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54240
54241 free_irq(irq, hvcsd);
54242 return;
54243- } else if (hvcsd->port.count < 0) {
54244+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54245 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54246 " is missmanaged.\n",
54247- hvcsd->vdev->unit_address, hvcsd->port.count);
54248+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54249 }
54250
54251 spin_unlock_irqrestore(&hvcsd->lock, flags);
54252@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54253
54254 spin_lock_irqsave(&hvcsd->lock, flags);
54255 /* Preserve this so that we know how many kref refs to put */
54256- temp_open_count = hvcsd->port.count;
54257+ temp_open_count = atomic_read(&hvcsd->port.count);
54258
54259 /*
54260 * Don't kref put inside the spinlock because the destruction
54261@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54262 tty->driver_data = NULL;
54263 hvcsd->port.tty = NULL;
54264
54265- hvcsd->port.count = 0;
54266+ atomic_set(&hvcsd->port.count, 0);
54267
54268 /* This will drop any buffered data on the floor which is OK in a hangup
54269 * scenario. */
54270@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54271 * the middle of a write operation? This is a crummy place to do this
54272 * but we want to keep it all in the spinlock.
54273 */
54274- if (hvcsd->port.count <= 0) {
54275+ if (atomic_read(&hvcsd->port.count) <= 0) {
54276 spin_unlock_irqrestore(&hvcsd->lock, flags);
54277 return -ENODEV;
54278 }
54279@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54280 {
54281 struct hvcs_struct *hvcsd = tty->driver_data;
54282
54283- if (!hvcsd || hvcsd->port.count <= 0)
54284+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54285 return 0;
54286
54287 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54288diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54289index 4190199..06d5bfa 100644
54290--- a/drivers/tty/hvc/hvsi.c
54291+++ b/drivers/tty/hvc/hvsi.c
54292@@ -85,7 +85,7 @@ struct hvsi_struct {
54293 int n_outbuf;
54294 uint32_t vtermno;
54295 uint32_t virq;
54296- atomic_t seqno; /* HVSI packet sequence number */
54297+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54298 uint16_t mctrl;
54299 uint8_t state; /* HVSI protocol state */
54300 uint8_t flags;
54301@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54302
54303 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54304 packet.hdr.len = sizeof(struct hvsi_query_response);
54305- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54306+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54307 packet.verb = VSV_SEND_VERSION_NUMBER;
54308 packet.u.version = HVSI_VERSION;
54309 packet.query_seqno = query_seqno+1;
54310@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54311
54312 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54313 packet.hdr.len = sizeof(struct hvsi_query);
54314- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54315+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54316 packet.verb = verb;
54317
54318 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54319@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54320 int wrote;
54321
54322 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54323- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54324+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54325 packet.hdr.len = sizeof(struct hvsi_control);
54326 packet.verb = VSV_SET_MODEM_CTL;
54327 packet.mask = HVSI_TSDTR;
54328@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54329 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54330
54331 packet.hdr.type = VS_DATA_PACKET_HEADER;
54332- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54333+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54334 packet.hdr.len = count + sizeof(struct hvsi_header);
54335 memcpy(&packet.data, buf, count);
54336
54337@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54338 struct hvsi_control packet __ALIGNED__;
54339
54340 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54341- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54342+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54343 packet.hdr.len = 6;
54344 packet.verb = VSV_CLOSE_PROTOCOL;
54345
54346@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54347
54348 tty_port_tty_set(&hp->port, tty);
54349 spin_lock_irqsave(&hp->lock, flags);
54350- hp->port.count++;
54351+ atomic_inc(&hp->port.count);
54352 atomic_set(&hp->seqno, 0);
54353 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54354 spin_unlock_irqrestore(&hp->lock, flags);
54355@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54356
54357 spin_lock_irqsave(&hp->lock, flags);
54358
54359- if (--hp->port.count == 0) {
54360+ if (atomic_dec_return(&hp->port.count) == 0) {
54361 tty_port_tty_set(&hp->port, NULL);
54362 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54363
54364@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54365
54366 spin_lock_irqsave(&hp->lock, flags);
54367 }
54368- } else if (hp->port.count < 0)
54369+ } else if (atomic_read(&hp->port.count) < 0)
54370 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54371- hp - hvsi_ports, hp->port.count);
54372+ hp - hvsi_ports, atomic_read(&hp->port.count));
54373
54374 spin_unlock_irqrestore(&hp->lock, flags);
54375 }
54376@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54377 tty_port_tty_set(&hp->port, NULL);
54378
54379 spin_lock_irqsave(&hp->lock, flags);
54380- hp->port.count = 0;
54381+ atomic_set(&hp->port.count, 0);
54382 hp->n_outbuf = 0;
54383 spin_unlock_irqrestore(&hp->lock, flags);
54384 }
54385diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54386index a270f04..7c77b5d 100644
54387--- a/drivers/tty/hvc/hvsi_lib.c
54388+++ b/drivers/tty/hvc/hvsi_lib.c
54389@@ -8,7 +8,7 @@
54390
54391 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54392 {
54393- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54394+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54395
54396 /* Assumes that always succeeds, works in practice */
54397 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54398@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54399
54400 /* Reset state */
54401 pv->established = 0;
54402- atomic_set(&pv->seqno, 0);
54403+ atomic_set_unchecked(&pv->seqno, 0);
54404
54405 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54406
54407diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54408index 345cebb..d5a1e9e 100644
54409--- a/drivers/tty/ipwireless/tty.c
54410+++ b/drivers/tty/ipwireless/tty.c
54411@@ -28,6 +28,7 @@
54412 #include <linux/tty_driver.h>
54413 #include <linux/tty_flip.h>
54414 #include <linux/uaccess.h>
54415+#include <asm/local.h>
54416
54417 #include "tty.h"
54418 #include "network.h"
54419@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54420 return -ENODEV;
54421
54422 mutex_lock(&tty->ipw_tty_mutex);
54423- if (tty->port.count == 0)
54424+ if (atomic_read(&tty->port.count) == 0)
54425 tty->tx_bytes_queued = 0;
54426
54427- tty->port.count++;
54428+ atomic_inc(&tty->port.count);
54429
54430 tty->port.tty = linux_tty;
54431 linux_tty->driver_data = tty;
54432@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54433
54434 static void do_ipw_close(struct ipw_tty *tty)
54435 {
54436- tty->port.count--;
54437-
54438- if (tty->port.count == 0) {
54439+ if (atomic_dec_return(&tty->port.count) == 0) {
54440 struct tty_struct *linux_tty = tty->port.tty;
54441
54442 if (linux_tty != NULL) {
54443@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54444 return;
54445
54446 mutex_lock(&tty->ipw_tty_mutex);
54447- if (tty->port.count == 0) {
54448+ if (atomic_read(&tty->port.count) == 0) {
54449 mutex_unlock(&tty->ipw_tty_mutex);
54450 return;
54451 }
54452@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54453
54454 mutex_lock(&tty->ipw_tty_mutex);
54455
54456- if (!tty->port.count) {
54457+ if (!atomic_read(&tty->port.count)) {
54458 mutex_unlock(&tty->ipw_tty_mutex);
54459 return;
54460 }
54461@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54462 return -ENODEV;
54463
54464 mutex_lock(&tty->ipw_tty_mutex);
54465- if (!tty->port.count) {
54466+ if (!atomic_read(&tty->port.count)) {
54467 mutex_unlock(&tty->ipw_tty_mutex);
54468 return -EINVAL;
54469 }
54470@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54471 if (!tty)
54472 return -ENODEV;
54473
54474- if (!tty->port.count)
54475+ if (!atomic_read(&tty->port.count))
54476 return -EINVAL;
54477
54478 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54479@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54480 if (!tty)
54481 return 0;
54482
54483- if (!tty->port.count)
54484+ if (!atomic_read(&tty->port.count))
54485 return 0;
54486
54487 return tty->tx_bytes_queued;
54488@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54489 if (!tty)
54490 return -ENODEV;
54491
54492- if (!tty->port.count)
54493+ if (!atomic_read(&tty->port.count))
54494 return -EINVAL;
54495
54496 return get_control_lines(tty);
54497@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54498 if (!tty)
54499 return -ENODEV;
54500
54501- if (!tty->port.count)
54502+ if (!atomic_read(&tty->port.count))
54503 return -EINVAL;
54504
54505 return set_control_lines(tty, set, clear);
54506@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54507 if (!tty)
54508 return -ENODEV;
54509
54510- if (!tty->port.count)
54511+ if (!atomic_read(&tty->port.count))
54512 return -EINVAL;
54513
54514 /* FIXME: Exactly how is the tty object locked here .. */
54515@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54516 * are gone */
54517 mutex_lock(&ttyj->ipw_tty_mutex);
54518 }
54519- while (ttyj->port.count)
54520+ while (atomic_read(&ttyj->port.count))
54521 do_ipw_close(ttyj);
54522 ipwireless_disassociate_network_ttys(network,
54523 ttyj->channel_idx);
54524diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54525index 14c54e0..1efd4f2 100644
54526--- a/drivers/tty/moxa.c
54527+++ b/drivers/tty/moxa.c
54528@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54529 }
54530
54531 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54532- ch->port.count++;
54533+ atomic_inc(&ch->port.count);
54534 tty->driver_data = ch;
54535 tty_port_tty_set(&ch->port, tty);
54536 mutex_lock(&ch->port.mutex);
54537diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54538index 2c34c32..81d10e1 100644
54539--- a/drivers/tty/n_gsm.c
54540+++ b/drivers/tty/n_gsm.c
54541@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54542 spin_lock_init(&dlci->lock);
54543 mutex_init(&dlci->mutex);
54544 dlci->fifo = &dlci->_fifo;
54545- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54546+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54547 kfree(dlci);
54548 return NULL;
54549 }
54550@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54551 struct gsm_dlci *dlci = tty->driver_data;
54552 struct tty_port *port = &dlci->port;
54553
54554- port->count++;
54555+ atomic_inc(&port->count);
54556 tty_port_tty_set(port, tty);
54557
54558 dlci->modem_rx = 0;
54559diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54560index 396344c..875c1d6 100644
54561--- a/drivers/tty/n_tty.c
54562+++ b/drivers/tty/n_tty.c
54563@@ -116,7 +116,7 @@ struct n_tty_data {
54564 int minimum_to_wake;
54565
54566 /* consumer-published */
54567- size_t read_tail;
54568+ size_t read_tail __intentional_overflow(-1);
54569 size_t line_start;
54570
54571 /* protected by output lock */
54572@@ -2572,6 +2572,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54573 {
54574 *ops = tty_ldisc_N_TTY;
54575 ops->owner = NULL;
54576- ops->refcount = ops->flags = 0;
54577+ atomic_set(&ops->refcount, 0);
54578+ ops->flags = 0;
54579 }
54580 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54581diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54582index 4d5e840..a2340a6 100644
54583--- a/drivers/tty/pty.c
54584+++ b/drivers/tty/pty.c
54585@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54586 panic("Couldn't register Unix98 pts driver");
54587
54588 /* Now create the /dev/ptmx special device */
54589+ pax_open_kernel();
54590 tty_default_fops(&ptmx_fops);
54591- ptmx_fops.open = ptmx_open;
54592+ *(void **)&ptmx_fops.open = ptmx_open;
54593+ pax_close_kernel();
54594
54595 cdev_init(&ptmx_cdev, &ptmx_fops);
54596 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54597diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54598index c8dd8dc..dca6cfd 100644
54599--- a/drivers/tty/rocket.c
54600+++ b/drivers/tty/rocket.c
54601@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54602 tty->driver_data = info;
54603 tty_port_tty_set(port, tty);
54604
54605- if (port->count++ == 0) {
54606+ if (atomic_inc_return(&port->count) == 1) {
54607 atomic_inc(&rp_num_ports_open);
54608
54609 #ifdef ROCKET_DEBUG_OPEN
54610@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54611 #endif
54612 }
54613 #ifdef ROCKET_DEBUG_OPEN
54614- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54615+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54616 #endif
54617
54618 /*
54619@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54620 spin_unlock_irqrestore(&info->port.lock, flags);
54621 return;
54622 }
54623- if (info->port.count)
54624+ if (atomic_read(&info->port.count))
54625 atomic_dec(&rp_num_ports_open);
54626 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54627 spin_unlock_irqrestore(&info->port.lock, flags);
54628diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
54629index 4506e40..ac0b470 100644
54630--- a/drivers/tty/serial/8250/8250_core.c
54631+++ b/drivers/tty/serial/8250/8250_core.c
54632@@ -3241,9 +3241,9 @@ static void univ8250_release_port(struct uart_port *port)
54633
54634 static void univ8250_rsa_support(struct uart_ops *ops)
54635 {
54636- ops->config_port = univ8250_config_port;
54637- ops->request_port = univ8250_request_port;
54638- ops->release_port = univ8250_release_port;
54639+ *(void **)&ops->config_port = univ8250_config_port;
54640+ *(void **)&ops->request_port = univ8250_request_port;
54641+ *(void **)&ops->release_port = univ8250_release_port;
54642 }
54643
54644 #else
54645@@ -3286,8 +3286,10 @@ static void __init serial8250_isa_init_ports(void)
54646 }
54647
54648 /* chain base port ops to support Remote Supervisor Adapter */
54649- univ8250_port_ops = *base_ops;
54650+ pax_open_kernel();
54651+ memcpy((void *)&univ8250_port_ops, base_ops, sizeof univ8250_port_ops);
54652 univ8250_rsa_support(&univ8250_port_ops);
54653+ pax_close_kernel();
54654
54655 if (share_irqs)
54656 irqflag = IRQF_SHARED;
54657diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54658index aa28209..e08fb85 100644
54659--- a/drivers/tty/serial/ioc4_serial.c
54660+++ b/drivers/tty/serial/ioc4_serial.c
54661@@ -437,7 +437,7 @@ struct ioc4_soft {
54662 } is_intr_info[MAX_IOC4_INTR_ENTS];
54663
54664 /* Number of entries active in the above array */
54665- atomic_t is_num_intrs;
54666+ atomic_unchecked_t is_num_intrs;
54667 } is_intr_type[IOC4_NUM_INTR_TYPES];
54668
54669 /* is_ir_lock must be held while
54670@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54671 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54672 || (type == IOC4_OTHER_INTR_TYPE)));
54673
54674- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54675+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54676 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54677
54678 /* Save off the lower level interrupt handler */
54679@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54680
54681 soft = arg;
54682 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54683- num_intrs = (int)atomic_read(
54684+ num_intrs = (int)atomic_read_unchecked(
54685 &soft->is_intr_type[intr_type].is_num_intrs);
54686
54687 this_mir = this_ir = pending_intrs(soft, intr_type);
54688diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54689index 129dc5b..1da5bb8 100644
54690--- a/drivers/tty/serial/kgdb_nmi.c
54691+++ b/drivers/tty/serial/kgdb_nmi.c
54692@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54693 * I/O utilities that messages sent to the console will automatically
54694 * be displayed on the dbg_io.
54695 */
54696- dbg_io_ops->is_console = true;
54697+ pax_open_kernel();
54698+ *(int *)&dbg_io_ops->is_console = true;
54699+ pax_close_kernel();
54700
54701 return 0;
54702 }
54703diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54704index a260cde..6b2b5ce 100644
54705--- a/drivers/tty/serial/kgdboc.c
54706+++ b/drivers/tty/serial/kgdboc.c
54707@@ -24,8 +24,9 @@
54708 #define MAX_CONFIG_LEN 40
54709
54710 static struct kgdb_io kgdboc_io_ops;
54711+static struct kgdb_io kgdboc_io_ops_console;
54712
54713-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54714+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54715 static int configured = -1;
54716
54717 static char config[MAX_CONFIG_LEN];
54718@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54719 kgdboc_unregister_kbd();
54720 if (configured == 1)
54721 kgdb_unregister_io_module(&kgdboc_io_ops);
54722+ else if (configured == 2)
54723+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54724 }
54725
54726 static int configure_kgdboc(void)
54727@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54728 int err;
54729 char *cptr = config;
54730 struct console *cons;
54731+ int is_console = 0;
54732
54733 err = kgdboc_option_setup(config);
54734 if (err || !strlen(config) || isspace(config[0]))
54735 goto noconfig;
54736
54737 err = -ENODEV;
54738- kgdboc_io_ops.is_console = 0;
54739 kgdb_tty_driver = NULL;
54740
54741 kgdboc_use_kms = 0;
54742@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54743 int idx;
54744 if (cons->device && cons->device(cons, &idx) == p &&
54745 idx == tty_line) {
54746- kgdboc_io_ops.is_console = 1;
54747+ is_console = 1;
54748 break;
54749 }
54750 cons = cons->next;
54751@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54752 kgdb_tty_line = tty_line;
54753
54754 do_register:
54755- err = kgdb_register_io_module(&kgdboc_io_ops);
54756+ if (is_console) {
54757+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54758+ configured = 2;
54759+ } else {
54760+ err = kgdb_register_io_module(&kgdboc_io_ops);
54761+ configured = 1;
54762+ }
54763 if (err)
54764 goto noconfig;
54765
54766@@ -205,8 +214,6 @@ do_register:
54767 if (err)
54768 goto nmi_con_failed;
54769
54770- configured = 1;
54771-
54772 return 0;
54773
54774 nmi_con_failed:
54775@@ -223,7 +230,7 @@ noconfig:
54776 static int __init init_kgdboc(void)
54777 {
54778 /* Already configured? */
54779- if (configured == 1)
54780+ if (configured >= 1)
54781 return 0;
54782
54783 return configure_kgdboc();
54784@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54785 if (config[len - 1] == '\n')
54786 config[len - 1] = '\0';
54787
54788- if (configured == 1)
54789+ if (configured >= 1)
54790 cleanup_kgdboc();
54791
54792 /* Go and configure with the new params. */
54793@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54794 .post_exception = kgdboc_post_exp_handler,
54795 };
54796
54797+static struct kgdb_io kgdboc_io_ops_console = {
54798+ .name = "kgdboc",
54799+ .read_char = kgdboc_get_char,
54800+ .write_char = kgdboc_put_char,
54801+ .pre_exception = kgdboc_pre_exp_handler,
54802+ .post_exception = kgdboc_post_exp_handler,
54803+ .is_console = 1
54804+};
54805+
54806 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54807 /* This is only available if kgdboc is a built in for early debugging */
54808 static int __init kgdboc_early_init(char *opt)
54809diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54810index b73889c..9f74f0a 100644
54811--- a/drivers/tty/serial/msm_serial.c
54812+++ b/drivers/tty/serial/msm_serial.c
54813@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54814 .cons = MSM_CONSOLE,
54815 };
54816
54817-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54818+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54819
54820 static const struct of_device_id msm_uartdm_table[] = {
54821 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54822@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54823 line = pdev->id;
54824
54825 if (line < 0)
54826- line = atomic_inc_return(&msm_uart_next_id) - 1;
54827+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54828
54829 if (unlikely(line < 0 || line >= UART_NR))
54830 return -ENXIO;
54831diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54832index a0ae942..befa48d 100644
54833--- a/drivers/tty/serial/samsung.c
54834+++ b/drivers/tty/serial/samsung.c
54835@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54836 ourport->tx_in_progress = 0;
54837 }
54838
54839+static int s3c64xx_serial_startup(struct uart_port *port);
54840 static int s3c24xx_serial_startup(struct uart_port *port)
54841 {
54842 struct s3c24xx_uart_port *ourport = to_ourport(port);
54843 int ret;
54844
54845+ /* Startup sequence is different for s3c64xx and higher SoC's */
54846+ if (s3c24xx_serial_has_interrupt_mask(port))
54847+ return s3c64xx_serial_startup(port);
54848+
54849 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54850 port, (unsigned long long)port->mapbase, port->membase);
54851
54852@@ -1698,10 +1703,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54853 /* setup info for port */
54854 port->dev = &platdev->dev;
54855
54856- /* Startup sequence is different for s3c64xx and higher SoC's */
54857- if (s3c24xx_serial_has_interrupt_mask(port))
54858- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54859-
54860 port->uartclk = 1;
54861
54862 if (cfg->uart_flags & UPF_CONS_FLOW) {
54863diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54864index 0b7bb12..ebe191a 100644
54865--- a/drivers/tty/serial/serial_core.c
54866+++ b/drivers/tty/serial/serial_core.c
54867@@ -1376,7 +1376,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54868 state = drv->state + tty->index;
54869 port = &state->port;
54870 spin_lock_irq(&port->lock);
54871- --port->count;
54872+ atomic_dec(&port->count);
54873 spin_unlock_irq(&port->lock);
54874 return;
54875 }
54876@@ -1386,7 +1386,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54877
54878 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54879
54880- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54881+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54882 return;
54883
54884 /*
54885@@ -1510,7 +1510,7 @@ static void uart_hangup(struct tty_struct *tty)
54886 uart_flush_buffer(tty);
54887 uart_shutdown(tty, state);
54888 spin_lock_irqsave(&port->lock, flags);
54889- port->count = 0;
54890+ atomic_set(&port->count, 0);
54891 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54892 spin_unlock_irqrestore(&port->lock, flags);
54893 tty_port_tty_set(port, NULL);
54894@@ -1597,7 +1597,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54895 pr_debug("uart_open(%d) called\n", line);
54896
54897 spin_lock_irq(&port->lock);
54898- ++port->count;
54899+ atomic_inc(&port->count);
54900 spin_unlock_irq(&port->lock);
54901
54902 /*
54903diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
54904index b1c6bd3..5f038e2 100644
54905--- a/drivers/tty/serial/uartlite.c
54906+++ b/drivers/tty/serial/uartlite.c
54907@@ -341,13 +341,13 @@ static int ulite_request_port(struct uart_port *port)
54908 return -EBUSY;
54909 }
54910
54911- port->private_data = &uartlite_be;
54912+ port->private_data = (void *)&uartlite_be;
54913 ret = uart_in32(ULITE_CONTROL, port);
54914 uart_out32(ULITE_CONTROL_RST_TX, ULITE_CONTROL, port);
54915 ret = uart_in32(ULITE_STATUS, port);
54916 /* Endianess detection */
54917 if ((ret & ULITE_STATUS_TXEMPTY) != ULITE_STATUS_TXEMPTY)
54918- port->private_data = &uartlite_le;
54919+ port->private_data = (void *)&uartlite_le;
54920
54921 return 0;
54922 }
54923diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54924index b799170..87dafd5 100644
54925--- a/drivers/tty/synclink.c
54926+++ b/drivers/tty/synclink.c
54927@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54928
54929 if (debug_level >= DEBUG_LEVEL_INFO)
54930 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54931- __FILE__,__LINE__, info->device_name, info->port.count);
54932+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54933
54934 if (tty_port_close_start(&info->port, tty, filp) == 0)
54935 goto cleanup;
54936@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54937 cleanup:
54938 if (debug_level >= DEBUG_LEVEL_INFO)
54939 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54940- tty->driver->name, info->port.count);
54941+ tty->driver->name, atomic_read(&info->port.count));
54942
54943 } /* end of mgsl_close() */
54944
54945@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54946
54947 mgsl_flush_buffer(tty);
54948 shutdown(info);
54949-
54950- info->port.count = 0;
54951+
54952+ atomic_set(&info->port.count, 0);
54953 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54954 info->port.tty = NULL;
54955
54956@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54957
54958 if (debug_level >= DEBUG_LEVEL_INFO)
54959 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54960- __FILE__,__LINE__, tty->driver->name, port->count );
54961+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54962
54963 spin_lock_irqsave(&info->irq_spinlock, flags);
54964- port->count--;
54965+ atomic_dec(&port->count);
54966 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54967 port->blocked_open++;
54968
54969@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54970
54971 if (debug_level >= DEBUG_LEVEL_INFO)
54972 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54973- __FILE__,__LINE__, tty->driver->name, port->count );
54974+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54975
54976 tty_unlock(tty);
54977 schedule();
54978@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54979
54980 /* FIXME: Racy on hangup during close wait */
54981 if (!tty_hung_up_p(filp))
54982- port->count++;
54983+ atomic_inc(&port->count);
54984 port->blocked_open--;
54985
54986 if (debug_level >= DEBUG_LEVEL_INFO)
54987 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54988- __FILE__,__LINE__, tty->driver->name, port->count );
54989+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54990
54991 if (!retval)
54992 port->flags |= ASYNC_NORMAL_ACTIVE;
54993@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54994
54995 if (debug_level >= DEBUG_LEVEL_INFO)
54996 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54997- __FILE__,__LINE__,tty->driver->name, info->port.count);
54998+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54999
55000 /* If port is closing, signal caller to try again */
55001 if (info->port.flags & ASYNC_CLOSING){
55002@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
55003 spin_unlock_irqrestore(&info->netlock, flags);
55004 goto cleanup;
55005 }
55006- info->port.count++;
55007+ atomic_inc(&info->port.count);
55008 spin_unlock_irqrestore(&info->netlock, flags);
55009
55010- if (info->port.count == 1) {
55011+ if (atomic_read(&info->port.count) == 1) {
55012 /* 1st open on this device, init hardware */
55013 retval = startup(info);
55014 if (retval < 0)
55015@@ -3442,8 +3442,8 @@ cleanup:
55016 if (retval) {
55017 if (tty->count == 1)
55018 info->port.tty = NULL; /* tty layer will release tty struct */
55019- if(info->port.count)
55020- info->port.count--;
55021+ if (atomic_read(&info->port.count))
55022+ atomic_dec(&info->port.count);
55023 }
55024
55025 return retval;
55026@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55027 unsigned short new_crctype;
55028
55029 /* return error if TTY interface open */
55030- if (info->port.count)
55031+ if (atomic_read(&info->port.count))
55032 return -EBUSY;
55033
55034 switch (encoding)
55035@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
55036
55037 /* arbitrate between network and tty opens */
55038 spin_lock_irqsave(&info->netlock, flags);
55039- if (info->port.count != 0 || info->netcount != 0) {
55040+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55041 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55042 spin_unlock_irqrestore(&info->netlock, flags);
55043 return -EBUSY;
55044@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55045 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55046
55047 /* return error if TTY interface open */
55048- if (info->port.count)
55049+ if (atomic_read(&info->port.count))
55050 return -EBUSY;
55051
55052 if (cmd != SIOCWANDEV)
55053diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
55054index 0e8c39b..e0cb171 100644
55055--- a/drivers/tty/synclink_gt.c
55056+++ b/drivers/tty/synclink_gt.c
55057@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55058 tty->driver_data = info;
55059 info->port.tty = tty;
55060
55061- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
55062+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
55063
55064 /* If port is closing, signal caller to try again */
55065 if (info->port.flags & ASYNC_CLOSING){
55066@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55067 mutex_unlock(&info->port.mutex);
55068 goto cleanup;
55069 }
55070- info->port.count++;
55071+ atomic_inc(&info->port.count);
55072 spin_unlock_irqrestore(&info->netlock, flags);
55073
55074- if (info->port.count == 1) {
55075+ if (atomic_read(&info->port.count) == 1) {
55076 /* 1st open on this device, init hardware */
55077 retval = startup(info);
55078 if (retval < 0) {
55079@@ -715,8 +715,8 @@ cleanup:
55080 if (retval) {
55081 if (tty->count == 1)
55082 info->port.tty = NULL; /* tty layer will release tty struct */
55083- if(info->port.count)
55084- info->port.count--;
55085+ if(atomic_read(&info->port.count))
55086+ atomic_dec(&info->port.count);
55087 }
55088
55089 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
55090@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55091
55092 if (sanity_check(info, tty->name, "close"))
55093 return;
55094- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
55095+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
55096
55097 if (tty_port_close_start(&info->port, tty, filp) == 0)
55098 goto cleanup;
55099@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55100 tty_port_close_end(&info->port, tty);
55101 info->port.tty = NULL;
55102 cleanup:
55103- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
55104+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
55105 }
55106
55107 static void hangup(struct tty_struct *tty)
55108@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
55109 shutdown(info);
55110
55111 spin_lock_irqsave(&info->port.lock, flags);
55112- info->port.count = 0;
55113+ atomic_set(&info->port.count, 0);
55114 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55115 info->port.tty = NULL;
55116 spin_unlock_irqrestore(&info->port.lock, flags);
55117@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55118 unsigned short new_crctype;
55119
55120 /* return error if TTY interface open */
55121- if (info->port.count)
55122+ if (atomic_read(&info->port.count))
55123 return -EBUSY;
55124
55125 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
55126@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
55127
55128 /* arbitrate between network and tty opens */
55129 spin_lock_irqsave(&info->netlock, flags);
55130- if (info->port.count != 0 || info->netcount != 0) {
55131+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55132 DBGINFO(("%s hdlc_open busy\n", dev->name));
55133 spin_unlock_irqrestore(&info->netlock, flags);
55134 return -EBUSY;
55135@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55136 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
55137
55138 /* return error if TTY interface open */
55139- if (info->port.count)
55140+ if (atomic_read(&info->port.count))
55141 return -EBUSY;
55142
55143 if (cmd != SIOCWANDEV)
55144@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
55145 if (port == NULL)
55146 continue;
55147 spin_lock(&port->lock);
55148- if ((port->port.count || port->netcount) &&
55149+ if ((atomic_read(&port->port.count) || port->netcount) &&
55150 port->pending_bh && !port->bh_running &&
55151 !port->bh_requested) {
55152 DBGISR(("%s bh queued\n", port->device_name));
55153@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55154 add_wait_queue(&port->open_wait, &wait);
55155
55156 spin_lock_irqsave(&info->lock, flags);
55157- port->count--;
55158+ atomic_dec(&port->count);
55159 spin_unlock_irqrestore(&info->lock, flags);
55160 port->blocked_open++;
55161
55162@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55163 remove_wait_queue(&port->open_wait, &wait);
55164
55165 if (!tty_hung_up_p(filp))
55166- port->count++;
55167+ atomic_inc(&port->count);
55168 port->blocked_open--;
55169
55170 if (!retval)
55171diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
55172index c3f9091..abe4601 100644
55173--- a/drivers/tty/synclinkmp.c
55174+++ b/drivers/tty/synclinkmp.c
55175@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55176
55177 if (debug_level >= DEBUG_LEVEL_INFO)
55178 printk("%s(%d):%s open(), old ref count = %d\n",
55179- __FILE__,__LINE__,tty->driver->name, info->port.count);
55180+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
55181
55182 /* If port is closing, signal caller to try again */
55183 if (info->port.flags & ASYNC_CLOSING){
55184@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55185 spin_unlock_irqrestore(&info->netlock, flags);
55186 goto cleanup;
55187 }
55188- info->port.count++;
55189+ atomic_inc(&info->port.count);
55190 spin_unlock_irqrestore(&info->netlock, flags);
55191
55192- if (info->port.count == 1) {
55193+ if (atomic_read(&info->port.count) == 1) {
55194 /* 1st open on this device, init hardware */
55195 retval = startup(info);
55196 if (retval < 0)
55197@@ -796,8 +796,8 @@ cleanup:
55198 if (retval) {
55199 if (tty->count == 1)
55200 info->port.tty = NULL; /* tty layer will release tty struct */
55201- if(info->port.count)
55202- info->port.count--;
55203+ if(atomic_read(&info->port.count))
55204+ atomic_dec(&info->port.count);
55205 }
55206
55207 return retval;
55208@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55209
55210 if (debug_level >= DEBUG_LEVEL_INFO)
55211 printk("%s(%d):%s close() entry, count=%d\n",
55212- __FILE__,__LINE__, info->device_name, info->port.count);
55213+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55214
55215 if (tty_port_close_start(&info->port, tty, filp) == 0)
55216 goto cleanup;
55217@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55218 cleanup:
55219 if (debug_level >= DEBUG_LEVEL_INFO)
55220 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55221- tty->driver->name, info->port.count);
55222+ tty->driver->name, atomic_read(&info->port.count));
55223 }
55224
55225 /* Called by tty_hangup() when a hangup is signaled.
55226@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55227 shutdown(info);
55228
55229 spin_lock_irqsave(&info->port.lock, flags);
55230- info->port.count = 0;
55231+ atomic_set(&info->port.count, 0);
55232 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55233 info->port.tty = NULL;
55234 spin_unlock_irqrestore(&info->port.lock, flags);
55235@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55236 unsigned short new_crctype;
55237
55238 /* return error if TTY interface open */
55239- if (info->port.count)
55240+ if (atomic_read(&info->port.count))
55241 return -EBUSY;
55242
55243 switch (encoding)
55244@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55245
55246 /* arbitrate between network and tty opens */
55247 spin_lock_irqsave(&info->netlock, flags);
55248- if (info->port.count != 0 || info->netcount != 0) {
55249+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55250 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55251 spin_unlock_irqrestore(&info->netlock, flags);
55252 return -EBUSY;
55253@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55254 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55255
55256 /* return error if TTY interface open */
55257- if (info->port.count)
55258+ if (atomic_read(&info->port.count))
55259 return -EBUSY;
55260
55261 if (cmd != SIOCWANDEV)
55262@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55263 * do not request bottom half processing if the
55264 * device is not open in a normal mode.
55265 */
55266- if ( port && (port->port.count || port->netcount) &&
55267+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55268 port->pending_bh && !port->bh_running &&
55269 !port->bh_requested ) {
55270 if ( debug_level >= DEBUG_LEVEL_ISR )
55271@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55272
55273 if (debug_level >= DEBUG_LEVEL_INFO)
55274 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55275- __FILE__,__LINE__, tty->driver->name, port->count );
55276+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55277
55278 spin_lock_irqsave(&info->lock, flags);
55279- port->count--;
55280+ atomic_dec(&port->count);
55281 spin_unlock_irqrestore(&info->lock, flags);
55282 port->blocked_open++;
55283
55284@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55285
55286 if (debug_level >= DEBUG_LEVEL_INFO)
55287 printk("%s(%d):%s block_til_ready() count=%d\n",
55288- __FILE__,__LINE__, tty->driver->name, port->count );
55289+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55290
55291 tty_unlock(tty);
55292 schedule();
55293@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55294 set_current_state(TASK_RUNNING);
55295 remove_wait_queue(&port->open_wait, &wait);
55296 if (!tty_hung_up_p(filp))
55297- port->count++;
55298+ atomic_inc(&port->count);
55299 port->blocked_open--;
55300
55301 if (debug_level >= DEBUG_LEVEL_INFO)
55302 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55303- __FILE__,__LINE__, tty->driver->name, port->count );
55304+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55305
55306 if (!retval)
55307 port->flags |= ASYNC_NORMAL_ACTIVE;
55308diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55309index 843f2cd..7d530a6 100644
55310--- a/drivers/tty/sysrq.c
55311+++ b/drivers/tty/sysrq.c
55312@@ -1086,7 +1086,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55313 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55314 size_t count, loff_t *ppos)
55315 {
55316- if (count) {
55317+ if (count && capable(CAP_SYS_ADMIN)) {
55318 char c;
55319
55320 if (get_user(c, buf))
55321diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55322index e569546..fbce20c 100644
55323--- a/drivers/tty/tty_io.c
55324+++ b/drivers/tty/tty_io.c
55325@@ -3509,7 +3509,7 @@ EXPORT_SYMBOL(tty_devnum);
55326
55327 void tty_default_fops(struct file_operations *fops)
55328 {
55329- *fops = tty_fops;
55330+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55331 }
55332
55333 /*
55334diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55335index 3737f55..7cef448 100644
55336--- a/drivers/tty/tty_ldisc.c
55337+++ b/drivers/tty/tty_ldisc.c
55338@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55339 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55340 tty_ldiscs[disc] = new_ldisc;
55341 new_ldisc->num = disc;
55342- new_ldisc->refcount = 0;
55343+ atomic_set(&new_ldisc->refcount, 0);
55344 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55345
55346 return ret;
55347@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55348 return -EINVAL;
55349
55350 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55351- if (tty_ldiscs[disc]->refcount)
55352+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55353 ret = -EBUSY;
55354 else
55355 tty_ldiscs[disc] = NULL;
55356@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55357 if (ldops) {
55358 ret = ERR_PTR(-EAGAIN);
55359 if (try_module_get(ldops->owner)) {
55360- ldops->refcount++;
55361+ atomic_inc(&ldops->refcount);
55362 ret = ldops;
55363 }
55364 }
55365@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55366 unsigned long flags;
55367
55368 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55369- ldops->refcount--;
55370+ atomic_dec(&ldops->refcount);
55371 module_put(ldops->owner);
55372 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55373 }
55374diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55375index 40b31835..94d92ae 100644
55376--- a/drivers/tty/tty_port.c
55377+++ b/drivers/tty/tty_port.c
55378@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55379 unsigned long flags;
55380
55381 spin_lock_irqsave(&port->lock, flags);
55382- port->count = 0;
55383+ atomic_set(&port->count, 0);
55384 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55385 tty = port->tty;
55386 if (tty)
55387@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55388
55389 /* The port lock protects the port counts */
55390 spin_lock_irqsave(&port->lock, flags);
55391- port->count--;
55392+ atomic_dec(&port->count);
55393 port->blocked_open++;
55394 spin_unlock_irqrestore(&port->lock, flags);
55395
55396@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55397 we must not mess that up further */
55398 spin_lock_irqsave(&port->lock, flags);
55399 if (!tty_hung_up_p(filp))
55400- port->count++;
55401+ atomic_inc(&port->count);
55402 port->blocked_open--;
55403 if (retval == 0)
55404 port->flags |= ASYNC_NORMAL_ACTIVE;
55405@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55406 return 0;
55407
55408 spin_lock_irqsave(&port->lock, flags);
55409- if (tty->count == 1 && port->count != 1) {
55410+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55411 printk(KERN_WARNING
55412 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55413- port->count);
55414- port->count = 1;
55415+ atomic_read(&port->count));
55416+ atomic_set(&port->count, 1);
55417 }
55418- if (--port->count < 0) {
55419+ if (atomic_dec_return(&port->count) < 0) {
55420 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55421- port->count);
55422- port->count = 0;
55423+ atomic_read(&port->count));
55424+ atomic_set(&port->count, 0);
55425 }
55426
55427- if (port->count) {
55428+ if (atomic_read(&port->count)) {
55429 spin_unlock_irqrestore(&port->lock, flags);
55430 return 0;
55431 }
55432@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55433 struct file *filp)
55434 {
55435 spin_lock_irq(&port->lock);
55436- ++port->count;
55437+ atomic_inc(&port->count);
55438 spin_unlock_irq(&port->lock);
55439 tty_port_tty_set(port, tty);
55440
55441diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55442index 8a89f6e..50b32af 100644
55443--- a/drivers/tty/vt/keyboard.c
55444+++ b/drivers/tty/vt/keyboard.c
55445@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55446 kbd->kbdmode == VC_OFF) &&
55447 value != KVAL(K_SAK))
55448 return; /* SAK is allowed even in raw mode */
55449+
55450+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55451+ {
55452+ void *func = fn_handler[value];
55453+ if (func == fn_show_state || func == fn_show_ptregs ||
55454+ func == fn_show_mem)
55455+ return;
55456+ }
55457+#endif
55458+
55459 fn_handler[value](vc);
55460 }
55461
55462@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55463 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55464 return -EFAULT;
55465
55466- if (!capable(CAP_SYS_TTY_CONFIG))
55467- perm = 0;
55468-
55469 switch (cmd) {
55470 case KDGKBENT:
55471 /* Ensure another thread doesn't free it under us */
55472@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55473 spin_unlock_irqrestore(&kbd_event_lock, flags);
55474 return put_user(val, &user_kbe->kb_value);
55475 case KDSKBENT:
55476+ if (!capable(CAP_SYS_TTY_CONFIG))
55477+ perm = 0;
55478+
55479 if (!perm)
55480 return -EPERM;
55481 if (!i && v == K_NOSUCHMAP) {
55482@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55483 int i, j, k;
55484 int ret;
55485
55486- if (!capable(CAP_SYS_TTY_CONFIG))
55487- perm = 0;
55488-
55489 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55490 if (!kbs) {
55491 ret = -ENOMEM;
55492@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55493 kfree(kbs);
55494 return ((p && *p) ? -EOVERFLOW : 0);
55495 case KDSKBSENT:
55496+ if (!capable(CAP_SYS_TTY_CONFIG))
55497+ perm = 0;
55498+
55499 if (!perm) {
55500 ret = -EPERM;
55501 goto reterr;
55502diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55503index 65bf067..b3b2e13 100644
55504--- a/drivers/uio/uio.c
55505+++ b/drivers/uio/uio.c
55506@@ -25,6 +25,7 @@
55507 #include <linux/kobject.h>
55508 #include <linux/cdev.h>
55509 #include <linux/uio_driver.h>
55510+#include <asm/local.h>
55511
55512 #define UIO_MAX_DEVICES (1U << MINORBITS)
55513
55514@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55515 struct device_attribute *attr, char *buf)
55516 {
55517 struct uio_device *idev = dev_get_drvdata(dev);
55518- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55519+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55520 }
55521 static DEVICE_ATTR_RO(event);
55522
55523@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55524 {
55525 struct uio_device *idev = info->uio_dev;
55526
55527- atomic_inc(&idev->event);
55528+ atomic_inc_unchecked(&idev->event);
55529 wake_up_interruptible(&idev->wait);
55530 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55531 }
55532@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55533 }
55534
55535 listener->dev = idev;
55536- listener->event_count = atomic_read(&idev->event);
55537+ listener->event_count = atomic_read_unchecked(&idev->event);
55538 filep->private_data = listener;
55539
55540 if (idev->info->open) {
55541@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55542 return -EIO;
55543
55544 poll_wait(filep, &idev->wait, wait);
55545- if (listener->event_count != atomic_read(&idev->event))
55546+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55547 return POLLIN | POLLRDNORM;
55548 return 0;
55549 }
55550@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55551 do {
55552 set_current_state(TASK_INTERRUPTIBLE);
55553
55554- event_count = atomic_read(&idev->event);
55555+ event_count = atomic_read_unchecked(&idev->event);
55556 if (event_count != listener->event_count) {
55557 if (copy_to_user(buf, &event_count, count))
55558 retval = -EFAULT;
55559@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55560 static int uio_find_mem_index(struct vm_area_struct *vma)
55561 {
55562 struct uio_device *idev = vma->vm_private_data;
55563+ unsigned long size;
55564
55565 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55566- if (idev->info->mem[vma->vm_pgoff].size == 0)
55567+ size = idev->info->mem[vma->vm_pgoff].size;
55568+ if (size == 0)
55569+ return -1;
55570+ if (vma->vm_end - vma->vm_start > size)
55571 return -1;
55572 return (int)vma->vm_pgoff;
55573 }
55574@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55575 idev->owner = owner;
55576 idev->info = info;
55577 init_waitqueue_head(&idev->wait);
55578- atomic_set(&idev->event, 0);
55579+ atomic_set_unchecked(&idev->event, 0);
55580
55581 ret = uio_get_minor(idev);
55582 if (ret)
55583diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55584index 813d4d3..a71934f 100644
55585--- a/drivers/usb/atm/cxacru.c
55586+++ b/drivers/usb/atm/cxacru.c
55587@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55588 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55589 if (ret < 2)
55590 return -EINVAL;
55591- if (index < 0 || index > 0x7f)
55592+ if (index > 0x7f)
55593 return -EINVAL;
55594 pos += tmp;
55595
55596diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55597index dada014..1d0d517 100644
55598--- a/drivers/usb/atm/usbatm.c
55599+++ b/drivers/usb/atm/usbatm.c
55600@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55601 if (printk_ratelimit())
55602 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55603 __func__, vpi, vci);
55604- atomic_inc(&vcc->stats->rx_err);
55605+ atomic_inc_unchecked(&vcc->stats->rx_err);
55606 return;
55607 }
55608
55609@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55610 if (length > ATM_MAX_AAL5_PDU) {
55611 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55612 __func__, length, vcc);
55613- atomic_inc(&vcc->stats->rx_err);
55614+ atomic_inc_unchecked(&vcc->stats->rx_err);
55615 goto out;
55616 }
55617
55618@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55619 if (sarb->len < pdu_length) {
55620 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55621 __func__, pdu_length, sarb->len, vcc);
55622- atomic_inc(&vcc->stats->rx_err);
55623+ atomic_inc_unchecked(&vcc->stats->rx_err);
55624 goto out;
55625 }
55626
55627 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55628 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55629 __func__, vcc);
55630- atomic_inc(&vcc->stats->rx_err);
55631+ atomic_inc_unchecked(&vcc->stats->rx_err);
55632 goto out;
55633 }
55634
55635@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55636 if (printk_ratelimit())
55637 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55638 __func__, length);
55639- atomic_inc(&vcc->stats->rx_drop);
55640+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55641 goto out;
55642 }
55643
55644@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55645
55646 vcc->push(vcc, skb);
55647
55648- atomic_inc(&vcc->stats->rx);
55649+ atomic_inc_unchecked(&vcc->stats->rx);
55650 out:
55651 skb_trim(sarb, 0);
55652 }
55653@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55654 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55655
55656 usbatm_pop(vcc, skb);
55657- atomic_inc(&vcc->stats->tx);
55658+ atomic_inc_unchecked(&vcc->stats->tx);
55659
55660 skb = skb_dequeue(&instance->sndqueue);
55661 }
55662@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55663 if (!left--)
55664 return sprintf(page,
55665 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55666- atomic_read(&atm_dev->stats.aal5.tx),
55667- atomic_read(&atm_dev->stats.aal5.tx_err),
55668- atomic_read(&atm_dev->stats.aal5.rx),
55669- atomic_read(&atm_dev->stats.aal5.rx_err),
55670- atomic_read(&atm_dev->stats.aal5.rx_drop));
55671+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55672+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55673+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55674+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55675+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55676
55677 if (!left--) {
55678 if (instance->disconnected)
55679diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55680index 2a3bbdf..91d72cf 100644
55681--- a/drivers/usb/core/devices.c
55682+++ b/drivers/usb/core/devices.c
55683@@ -126,7 +126,7 @@ static const char format_endpt[] =
55684 * time it gets called.
55685 */
55686 static struct device_connect_event {
55687- atomic_t count;
55688+ atomic_unchecked_t count;
55689 wait_queue_head_t wait;
55690 } device_event = {
55691 .count = ATOMIC_INIT(1),
55692@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55693
55694 void usbfs_conn_disc_event(void)
55695 {
55696- atomic_add(2, &device_event.count);
55697+ atomic_add_unchecked(2, &device_event.count);
55698 wake_up(&device_event.wait);
55699 }
55700
55701@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55702
55703 poll_wait(file, &device_event.wait, wait);
55704
55705- event_count = atomic_read(&device_event.count);
55706+ event_count = atomic_read_unchecked(&device_event.count);
55707 if (file->f_version != event_count) {
55708 file->f_version = event_count;
55709 return POLLIN | POLLRDNORM;
55710diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55711index 4b0448c..fc84bec 100644
55712--- a/drivers/usb/core/devio.c
55713+++ b/drivers/usb/core/devio.c
55714@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55715 struct usb_dev_state *ps = file->private_data;
55716 struct usb_device *dev = ps->dev;
55717 ssize_t ret = 0;
55718- unsigned len;
55719+ size_t len;
55720 loff_t pos;
55721 int i;
55722
55723@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55724 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55725 struct usb_config_descriptor *config =
55726 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55727- unsigned int length = le16_to_cpu(config->wTotalLength);
55728+ size_t length = le16_to_cpu(config->wTotalLength);
55729
55730 if (*ppos < pos + length) {
55731
55732 /* The descriptor may claim to be longer than it
55733 * really is. Here is the actual allocated length. */
55734- unsigned alloclen =
55735+ size_t alloclen =
55736 le16_to_cpu(dev->config[i].desc.wTotalLength);
55737
55738- len = length - (*ppos - pos);
55739+ len = length + pos - *ppos;
55740 if (len > nbytes)
55741 len = nbytes;
55742
55743 /* Simply don't write (skip over) unallocated parts */
55744 if (alloclen > (*ppos - pos)) {
55745- alloclen -= (*ppos - pos);
55746+ alloclen = alloclen + pos - *ppos;
55747 if (copy_to_user(buf,
55748 dev->rawdescriptors[i] + (*ppos - pos),
55749 min(len, alloclen))) {
55750diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55751index 45a915c..09f9735 100644
55752--- a/drivers/usb/core/hcd.c
55753+++ b/drivers/usb/core/hcd.c
55754@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55755 */
55756 usb_get_urb(urb);
55757 atomic_inc(&urb->use_count);
55758- atomic_inc(&urb->dev->urbnum);
55759+ atomic_inc_unchecked(&urb->dev->urbnum);
55760 usbmon_urb_submit(&hcd->self, urb);
55761
55762 /* NOTE requirements on root-hub callers (usbfs and the hub
55763@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55764 urb->hcpriv = NULL;
55765 INIT_LIST_HEAD(&urb->urb_list);
55766 atomic_dec(&urb->use_count);
55767- atomic_dec(&urb->dev->urbnum);
55768+ atomic_dec_unchecked(&urb->dev->urbnum);
55769 if (atomic_read(&urb->reject))
55770 wake_up(&usb_kill_urb_queue);
55771 usb_put_urb(urb);
55772diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55773index 3b71516..1f26579 100644
55774--- a/drivers/usb/core/hub.c
55775+++ b/drivers/usb/core/hub.c
55776@@ -26,6 +26,7 @@
55777 #include <linux/mutex.h>
55778 #include <linux/random.h>
55779 #include <linux/pm_qos.h>
55780+#include <linux/grsecurity.h>
55781
55782 #include <asm/uaccess.h>
55783 #include <asm/byteorder.h>
55784@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55785 goto done;
55786 return;
55787 }
55788+
55789+ if (gr_handle_new_usb())
55790+ goto done;
55791+
55792 if (hub_is_superspeed(hub->hdev))
55793 unit_load = 150;
55794 else
55795diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55796index f368d20..0c30ac5 100644
55797--- a/drivers/usb/core/message.c
55798+++ b/drivers/usb/core/message.c
55799@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55800 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55801 * error number.
55802 */
55803-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55804+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55805 __u8 requesttype, __u16 value, __u16 index, void *data,
55806 __u16 size, int timeout)
55807 {
55808@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55809 * If successful, 0. Otherwise a negative error number. The number of actual
55810 * bytes transferred will be stored in the @actual_length parameter.
55811 */
55812-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55813+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55814 void *data, int len, int *actual_length, int timeout)
55815 {
55816 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55817@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55818 * bytes transferred will be stored in the @actual_length parameter.
55819 *
55820 */
55821-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55822+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55823 void *data, int len, int *actual_length, int timeout)
55824 {
55825 struct urb *urb;
55826diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55827index d269738..7340cd7 100644
55828--- a/drivers/usb/core/sysfs.c
55829+++ b/drivers/usb/core/sysfs.c
55830@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55831 struct usb_device *udev;
55832
55833 udev = to_usb_device(dev);
55834- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55835+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55836 }
55837 static DEVICE_ATTR_RO(urbnum);
55838
55839diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55840index 8d5b2f4..3896940 100644
55841--- a/drivers/usb/core/usb.c
55842+++ b/drivers/usb/core/usb.c
55843@@ -447,7 +447,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55844 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55845 dev->state = USB_STATE_ATTACHED;
55846 dev->lpm_disable_count = 1;
55847- atomic_set(&dev->urbnum, 0);
55848+ atomic_set_unchecked(&dev->urbnum, 0);
55849
55850 INIT_LIST_HEAD(&dev->ep0.urb_list);
55851 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55852diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55853index 8cfc319..4868255 100644
55854--- a/drivers/usb/early/ehci-dbgp.c
55855+++ b/drivers/usb/early/ehci-dbgp.c
55856@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55857
55858 #ifdef CONFIG_KGDB
55859 static struct kgdb_io kgdbdbgp_io_ops;
55860-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55861+static struct kgdb_io kgdbdbgp_io_ops_console;
55862+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55863 #else
55864 #define dbgp_kgdb_mode (0)
55865 #endif
55866@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55867 .write_char = kgdbdbgp_write_char,
55868 };
55869
55870+static struct kgdb_io kgdbdbgp_io_ops_console = {
55871+ .name = "kgdbdbgp",
55872+ .read_char = kgdbdbgp_read_char,
55873+ .write_char = kgdbdbgp_write_char,
55874+ .is_console = 1
55875+};
55876+
55877 static int kgdbdbgp_wait_time;
55878
55879 static int __init kgdbdbgp_parse_config(char *str)
55880@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55881 ptr++;
55882 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55883 }
55884- kgdb_register_io_module(&kgdbdbgp_io_ops);
55885- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55886+ if (early_dbgp_console.index != -1)
55887+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55888+ else
55889+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55890
55891 return 0;
55892 }
55893diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55894index 0495c94..289e201 100644
55895--- a/drivers/usb/gadget/configfs.c
55896+++ b/drivers/usb/gadget/configfs.c
55897@@ -571,7 +571,7 @@ static struct config_group *function_make(
55898 if (IS_ERR(fi))
55899 return ERR_CAST(fi);
55900
55901- ret = config_item_set_name(&fi->group.cg_item, name);
55902+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
55903 if (ret) {
55904 usb_put_function_instance(fi);
55905 return ERR_PTR(ret);
55906diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55907index 7856b33..8b7fe09 100644
55908--- a/drivers/usb/gadget/function/f_uac1.c
55909+++ b/drivers/usb/gadget/function/f_uac1.c
55910@@ -14,6 +14,7 @@
55911 #include <linux/module.h>
55912 #include <linux/device.h>
55913 #include <linux/atomic.h>
55914+#include <linux/module.h>
55915
55916 #include "u_uac1.h"
55917
55918diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55919index 7ee05793..2e31e99 100644
55920--- a/drivers/usb/gadget/function/u_serial.c
55921+++ b/drivers/usb/gadget/function/u_serial.c
55922@@ -732,9 +732,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55923 spin_lock_irq(&port->port_lock);
55924
55925 /* already open? Great. */
55926- if (port->port.count) {
55927+ if (atomic_read(&port->port.count)) {
55928 status = 0;
55929- port->port.count++;
55930+ atomic_inc(&port->port.count);
55931
55932 /* currently opening/closing? wait ... */
55933 } else if (port->openclose) {
55934@@ -793,7 +793,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55935 tty->driver_data = port;
55936 port->port.tty = tty;
55937
55938- port->port.count = 1;
55939+ atomic_set(&port->port.count, 1);
55940 port->openclose = false;
55941
55942 /* if connected, start the I/O stream */
55943@@ -835,11 +835,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55944
55945 spin_lock_irq(&port->port_lock);
55946
55947- if (port->port.count != 1) {
55948- if (port->port.count == 0)
55949+ if (atomic_read(&port->port.count) != 1) {
55950+ if (atomic_read(&port->port.count) == 0)
55951 WARN_ON(1);
55952 else
55953- --port->port.count;
55954+ atomic_dec(&port->port.count);
55955 goto exit;
55956 }
55957
55958@@ -849,7 +849,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55959 * and sleep if necessary
55960 */
55961 port->openclose = true;
55962- port->port.count = 0;
55963+ atomic_set(&port->port.count, 0);
55964
55965 gser = port->port_usb;
55966 if (gser && gser->disconnect)
55967@@ -1065,7 +1065,7 @@ static int gs_closed(struct gs_port *port)
55968 int cond;
55969
55970 spin_lock_irq(&port->port_lock);
55971- cond = (port->port.count == 0) && !port->openclose;
55972+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55973 spin_unlock_irq(&port->port_lock);
55974 return cond;
55975 }
55976@@ -1208,7 +1208,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55977 /* if it's already open, start I/O ... and notify the serial
55978 * protocol about open/close status (connect/disconnect).
55979 */
55980- if (port->port.count) {
55981+ if (atomic_read(&port->port.count)) {
55982 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55983 gs_start_io(port);
55984 if (gser->connect)
55985@@ -1255,7 +1255,7 @@ void gserial_disconnect(struct gserial *gser)
55986
55987 port->port_usb = NULL;
55988 gser->ioport = NULL;
55989- if (port->port.count > 0 || port->openclose) {
55990+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55991 wake_up_interruptible(&port->drain_wait);
55992 if (port->port.tty)
55993 tty_hangup(port->port.tty);
55994@@ -1271,7 +1271,7 @@ void gserial_disconnect(struct gserial *gser)
55995
55996 /* finally, free any unused/unusable I/O buffers */
55997 spin_lock_irqsave(&port->port_lock, flags);
55998- if (port->port.count == 0 && !port->openclose)
55999+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
56000 gs_buf_free(&port->port_write_buf);
56001 gs_free_requests(gser->out, &port->read_pool, NULL);
56002 gs_free_requests(gser->out, &port->read_queue, NULL);
56003diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
56004index c78c841..48fd281 100644
56005--- a/drivers/usb/gadget/function/u_uac1.c
56006+++ b/drivers/usb/gadget/function/u_uac1.c
56007@@ -17,6 +17,7 @@
56008 #include <linux/ctype.h>
56009 #include <linux/random.h>
56010 #include <linux/syscalls.h>
56011+#include <linux/module.h>
56012
56013 #include "u_uac1.h"
56014
56015diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
56016index 6920844..480bb7e 100644
56017--- a/drivers/usb/host/ehci-hub.c
56018+++ b/drivers/usb/host/ehci-hub.c
56019@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
56020 urb->transfer_flags = URB_DIR_IN;
56021 usb_get_urb(urb);
56022 atomic_inc(&urb->use_count);
56023- atomic_inc(&urb->dev->urbnum);
56024+ atomic_inc_unchecked(&urb->dev->urbnum);
56025 urb->setup_dma = dma_map_single(
56026 hcd->self.controller,
56027 urb->setup_packet,
56028@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
56029 urb->status = -EINPROGRESS;
56030 usb_get_urb(urb);
56031 atomic_inc(&urb->use_count);
56032- atomic_inc(&urb->dev->urbnum);
56033+ atomic_inc_unchecked(&urb->dev->urbnum);
56034 retval = submit_single_step_set_feature(hcd, urb, 0);
56035 if (!retval && !wait_for_completion_timeout(&done,
56036 msecs_to_jiffies(2000))) {
56037diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
56038index 1db0626..4948782 100644
56039--- a/drivers/usb/host/hwa-hc.c
56040+++ b/drivers/usb/host/hwa-hc.c
56041@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
56042 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
56043 struct wahc *wa = &hwahc->wa;
56044 struct device *dev = &wa->usb_iface->dev;
56045- u8 mas_le[UWB_NUM_MAS/8];
56046+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
56047+
56048+ if (mas_le == NULL)
56049+ return -ENOMEM;
56050
56051 /* Set the stream index */
56052 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
56053@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
56054 WUSB_REQ_SET_WUSB_MAS,
56055 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
56056 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
56057- mas_le, 32, USB_CTRL_SET_TIMEOUT);
56058+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
56059 if (result < 0)
56060 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
56061 out:
56062+ kfree(mas_le);
56063+
56064 return result;
56065 }
56066
56067diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
56068index a0a3827..d7ec10b 100644
56069--- a/drivers/usb/misc/appledisplay.c
56070+++ b/drivers/usb/misc/appledisplay.c
56071@@ -84,7 +84,7 @@ struct appledisplay {
56072 struct mutex sysfslock; /* concurrent read and write */
56073 };
56074
56075-static atomic_t count_displays = ATOMIC_INIT(0);
56076+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
56077 static struct workqueue_struct *wq;
56078
56079 static void appledisplay_complete(struct urb *urb)
56080@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
56081
56082 /* Register backlight device */
56083 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
56084- atomic_inc_return(&count_displays) - 1);
56085+ atomic_inc_return_unchecked(&count_displays) - 1);
56086 memset(&props, 0, sizeof(struct backlight_properties));
56087 props.type = BACKLIGHT_RAW;
56088 props.max_brightness = 0xff;
56089diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
56090index 3806e70..55c508b 100644
56091--- a/drivers/usb/serial/console.c
56092+++ b/drivers/usb/serial/console.c
56093@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
56094
56095 info->port = port;
56096
56097- ++port->port.count;
56098+ atomic_inc(&port->port.count);
56099 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
56100 if (serial->type->set_termios) {
56101 /*
56102@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
56103 }
56104 /* Now that any required fake tty operations are completed restore
56105 * the tty port count */
56106- --port->port.count;
56107+ atomic_dec(&port->port.count);
56108 /* The console is special in terms of closing the device so
56109 * indicate this port is now acting as a system console. */
56110 port->port.console = 1;
56111@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
56112 put_tty:
56113 tty_kref_put(tty);
56114 reset_open_count:
56115- port->port.count = 0;
56116+ atomic_set(&port->port.count, 0);
56117 usb_autopm_put_interface(serial->interface);
56118 error_get_interface:
56119 usb_serial_put(serial);
56120@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
56121 static void usb_console_write(struct console *co,
56122 const char *buf, unsigned count)
56123 {
56124- static struct usbcons_info *info = &usbcons_info;
56125+ struct usbcons_info *info = &usbcons_info;
56126 struct usb_serial_port *port = info->port;
56127 struct usb_serial *serial;
56128 int retval = -ENODEV;
56129diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
56130index 307e339..6aa97cb 100644
56131--- a/drivers/usb/storage/usb.h
56132+++ b/drivers/usb/storage/usb.h
56133@@ -63,7 +63,7 @@ struct us_unusual_dev {
56134 __u8 useProtocol;
56135 __u8 useTransport;
56136 int (*initFunction)(struct us_data *);
56137-};
56138+} __do_const;
56139
56140
56141 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
56142diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
56143index a863a98..d272795 100644
56144--- a/drivers/usb/usbip/vhci.h
56145+++ b/drivers/usb/usbip/vhci.h
56146@@ -83,7 +83,7 @@ struct vhci_hcd {
56147 unsigned resuming:1;
56148 unsigned long re_timeout;
56149
56150- atomic_t seqnum;
56151+ atomic_unchecked_t seqnum;
56152
56153 /*
56154 * NOTE:
56155diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
56156index e9ef1ec..c3a0b04 100644
56157--- a/drivers/usb/usbip/vhci_hcd.c
56158+++ b/drivers/usb/usbip/vhci_hcd.c
56159@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
56160
56161 spin_lock(&vdev->priv_lock);
56162
56163- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
56164+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56165 if (priv->seqnum == 0xffff)
56166 dev_info(&urb->dev->dev, "seqnum max\n");
56167
56168@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
56169 return -ENOMEM;
56170 }
56171
56172- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
56173+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56174 if (unlink->seqnum == 0xffff)
56175 pr_info("seqnum max\n");
56176
56177@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
56178 vdev->rhport = rhport;
56179 }
56180
56181- atomic_set(&vhci->seqnum, 0);
56182+ atomic_set_unchecked(&vhci->seqnum, 0);
56183 spin_lock_init(&vhci->lock);
56184
56185 hcd->power_budget = 0; /* no limit */
56186diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
56187index 00e4a54..d676f85 100644
56188--- a/drivers/usb/usbip/vhci_rx.c
56189+++ b/drivers/usb/usbip/vhci_rx.c
56190@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
56191 if (!urb) {
56192 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
56193 pr_info("max seqnum %d\n",
56194- atomic_read(&the_controller->seqnum));
56195+ atomic_read_unchecked(&the_controller->seqnum));
56196 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
56197 return;
56198 }
56199diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
56200index edc7267..9f65ce2 100644
56201--- a/drivers/usb/wusbcore/wa-hc.h
56202+++ b/drivers/usb/wusbcore/wa-hc.h
56203@@ -240,7 +240,7 @@ struct wahc {
56204 spinlock_t xfer_list_lock;
56205 struct work_struct xfer_enqueue_work;
56206 struct work_struct xfer_error_work;
56207- atomic_t xfer_id_count;
56208+ atomic_unchecked_t xfer_id_count;
56209
56210 kernel_ulong_t quirks;
56211 };
56212@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56213 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56214 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56215 wa->dto_in_use = 0;
56216- atomic_set(&wa->xfer_id_count, 1);
56217+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56218 /* init the buf in URBs */
56219 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56220 usb_init_urb(&(wa->buf_in_urbs[index]));
56221diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56222index 69af4fd..da390d7 100644
56223--- a/drivers/usb/wusbcore/wa-xfer.c
56224+++ b/drivers/usb/wusbcore/wa-xfer.c
56225@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56226 */
56227 static void wa_xfer_id_init(struct wa_xfer *xfer)
56228 {
56229- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56230+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56231 }
56232
56233 /* Return the xfer's ID. */
56234diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56235index e1278fe..7fdeac4 100644
56236--- a/drivers/vfio/vfio.c
56237+++ b/drivers/vfio/vfio.c
56238@@ -517,7 +517,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56239 return 0;
56240
56241 /* TODO Prevent device auto probing */
56242- WARN("Device %s added to live group %d!\n", dev_name(dev),
56243+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56244 iommu_group_id(group->iommu_group));
56245
56246 return 0;
56247diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56248index 3bb02c6..a01ff38 100644
56249--- a/drivers/vhost/vringh.c
56250+++ b/drivers/vhost/vringh.c
56251@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56252 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56253 {
56254 __virtio16 v = 0;
56255- int rc = get_user(v, (__force __virtio16 __user *)p);
56256+ int rc = get_user(v, (__force_user __virtio16 *)p);
56257 *val = vringh16_to_cpu(vrh, v);
56258 return rc;
56259 }
56260@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56261 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56262 {
56263 __virtio16 v = cpu_to_vringh16(vrh, val);
56264- return put_user(v, (__force __virtio16 __user *)p);
56265+ return put_user(v, (__force_user __virtio16 *)p);
56266 }
56267
56268 static inline int copydesc_user(void *dst, const void *src, size_t len)
56269 {
56270- return copy_from_user(dst, (__force void __user *)src, len) ?
56271+ return copy_from_user(dst, (void __force_user *)src, len) ?
56272 -EFAULT : 0;
56273 }
56274
56275@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56276 const struct vring_used_elem *src,
56277 unsigned int num)
56278 {
56279- return copy_to_user((__force void __user *)dst, src,
56280+ return copy_to_user((void __force_user *)dst, src,
56281 sizeof(*dst) * num) ? -EFAULT : 0;
56282 }
56283
56284 static inline int xfer_from_user(void *src, void *dst, size_t len)
56285 {
56286- return copy_from_user(dst, (__force void __user *)src, len) ?
56287+ return copy_from_user(dst, (void __force_user *)src, len) ?
56288 -EFAULT : 0;
56289 }
56290
56291 static inline int xfer_to_user(void *dst, void *src, size_t len)
56292 {
56293- return copy_to_user((__force void __user *)dst, src, len) ?
56294+ return copy_to_user((void __force_user *)dst, src, len) ?
56295 -EFAULT : 0;
56296 }
56297
56298@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56299 vrh->last_used_idx = 0;
56300 vrh->vring.num = num;
56301 /* vring expects kernel addresses, but only used via accessors. */
56302- vrh->vring.desc = (__force struct vring_desc *)desc;
56303- vrh->vring.avail = (__force struct vring_avail *)avail;
56304- vrh->vring.used = (__force struct vring_used *)used;
56305+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56306+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56307+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56308 return 0;
56309 }
56310 EXPORT_SYMBOL(vringh_init_user);
56311@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56312
56313 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56314 {
56315- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56316+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56317 return 0;
56318 }
56319
56320diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56321index 84a110a..96312c3 100644
56322--- a/drivers/video/backlight/kb3886_bl.c
56323+++ b/drivers/video/backlight/kb3886_bl.c
56324@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56325 static unsigned long kb3886bl_flags;
56326 #define KB3886BL_SUSPENDED 0x01
56327
56328-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56329+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56330 {
56331 .ident = "Sahara Touch-iT",
56332 .matches = {
56333diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56334index 1b0b233..6f34c2c 100644
56335--- a/drivers/video/fbdev/arcfb.c
56336+++ b/drivers/video/fbdev/arcfb.c
56337@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56338 return -ENOSPC;
56339
56340 err = 0;
56341- if ((count + p) > fbmemlength) {
56342+ if (count > (fbmemlength - p)) {
56343 count = fbmemlength - p;
56344 err = -ENOSPC;
56345 }
56346diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56347index 0156954..c07d4e0 100644
56348--- a/drivers/video/fbdev/aty/aty128fb.c
56349+++ b/drivers/video/fbdev/aty/aty128fb.c
56350@@ -149,7 +149,7 @@ enum {
56351 };
56352
56353 /* Must match above enum */
56354-static char * const r128_family[] = {
56355+static const char * const r128_family[] = {
56356 "AGP",
56357 "PCI",
56358 "PRO AGP",
56359diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56360index 8789e48..698fe4c 100644
56361--- a/drivers/video/fbdev/aty/atyfb_base.c
56362+++ b/drivers/video/fbdev/aty/atyfb_base.c
56363@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56364 par->accel_flags = var->accel_flags; /* hack */
56365
56366 if (var->accel_flags) {
56367- info->fbops->fb_sync = atyfb_sync;
56368+ pax_open_kernel();
56369+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56370+ pax_close_kernel();
56371 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56372 } else {
56373- info->fbops->fb_sync = NULL;
56374+ pax_open_kernel();
56375+ *(void **)&info->fbops->fb_sync = NULL;
56376+ pax_close_kernel();
56377 info->flags |= FBINFO_HWACCEL_DISABLED;
56378 }
56379
56380diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56381index 2fa0317..4983f2a 100644
56382--- a/drivers/video/fbdev/aty/mach64_cursor.c
56383+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56384@@ -8,6 +8,7 @@
56385 #include "../core/fb_draw.h"
56386
56387 #include <asm/io.h>
56388+#include <asm/pgtable.h>
56389
56390 #ifdef __sparc__
56391 #include <asm/fbio.h>
56392@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56393 info->sprite.buf_align = 16; /* and 64 lines tall. */
56394 info->sprite.flags = FB_PIXMAP_IO;
56395
56396- info->fbops->fb_cursor = atyfb_cursor;
56397+ pax_open_kernel();
56398+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56399+ pax_close_kernel();
56400
56401 return 0;
56402 }
56403diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56404index d6cab1f..112f680 100644
56405--- a/drivers/video/fbdev/core/fb_defio.c
56406+++ b/drivers/video/fbdev/core/fb_defio.c
56407@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56408
56409 BUG_ON(!fbdefio);
56410 mutex_init(&fbdefio->lock);
56411- info->fbops->fb_mmap = fb_deferred_io_mmap;
56412+ pax_open_kernel();
56413+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56414+ pax_close_kernel();
56415 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56416 INIT_LIST_HEAD(&fbdefio->pagelist);
56417 if (fbdefio->delay == 0) /* set a default of 1 s */
56418@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56419 page->mapping = NULL;
56420 }
56421
56422- info->fbops->fb_mmap = NULL;
56423+ *(void **)&info->fbops->fb_mmap = NULL;
56424 mutex_destroy(&fbdefio->lock);
56425 }
56426 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56427diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56428index 0705d88..d9429bf 100644
56429--- a/drivers/video/fbdev/core/fbmem.c
56430+++ b/drivers/video/fbdev/core/fbmem.c
56431@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56432 __u32 data;
56433 int err;
56434
56435- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56436+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56437
56438 data = (__u32) (unsigned long) fix->smem_start;
56439 err |= put_user(data, &fix32->smem_start);
56440diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56441index 807ee22..7814cd6 100644
56442--- a/drivers/video/fbdev/hyperv_fb.c
56443+++ b/drivers/video/fbdev/hyperv_fb.c
56444@@ -240,7 +240,7 @@ static uint screen_fb_size;
56445 static inline int synthvid_send(struct hv_device *hdev,
56446 struct synthvid_msg *msg)
56447 {
56448- static atomic64_t request_id = ATOMIC64_INIT(0);
56449+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56450 int ret;
56451
56452 msg->pipe_hdr.type = PIPE_MSG_DATA;
56453@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56454
56455 ret = vmbus_sendpacket(hdev->channel, msg,
56456 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56457- atomic64_inc_return(&request_id),
56458+ atomic64_inc_return_unchecked(&request_id),
56459 VM_PKT_DATA_INBAND, 0);
56460
56461 if (ret)
56462diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56463index 7672d2e..b56437f 100644
56464--- a/drivers/video/fbdev/i810/i810_accel.c
56465+++ b/drivers/video/fbdev/i810/i810_accel.c
56466@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56467 }
56468 }
56469 printk("ringbuffer lockup!!!\n");
56470+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56471 i810_report_error(mmio);
56472 par->dev_flags |= LOCKUP;
56473 info->pixmap.scan_align = 1;
56474diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56475index a01147f..5d896f8 100644
56476--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56477+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56478@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56479
56480 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56481 struct matrox_switch matrox_mystique = {
56482- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56483+ .preinit = MGA1064_preinit,
56484+ .reset = MGA1064_reset,
56485+ .init = MGA1064_init,
56486+ .restore = MGA1064_restore,
56487 };
56488 EXPORT_SYMBOL(matrox_mystique);
56489 #endif
56490
56491 #ifdef CONFIG_FB_MATROX_G
56492 struct matrox_switch matrox_G100 = {
56493- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56494+ .preinit = MGAG100_preinit,
56495+ .reset = MGAG100_reset,
56496+ .init = MGAG100_init,
56497+ .restore = MGAG100_restore,
56498 };
56499 EXPORT_SYMBOL(matrox_G100);
56500 #endif
56501diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56502index 195ad7c..09743fc 100644
56503--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56504+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56505@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56506 }
56507
56508 struct matrox_switch matrox_millennium = {
56509- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56510+ .preinit = Ti3026_preinit,
56511+ .reset = Ti3026_reset,
56512+ .init = Ti3026_init,
56513+ .restore = Ti3026_restore
56514 };
56515 EXPORT_SYMBOL(matrox_millennium);
56516 #endif
56517diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56518index fe92eed..106e085 100644
56519--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56520+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56521@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56522 struct mb862xxfb_par *par = info->par;
56523
56524 if (info->var.bits_per_pixel == 32) {
56525- info->fbops->fb_fillrect = cfb_fillrect;
56526- info->fbops->fb_copyarea = cfb_copyarea;
56527- info->fbops->fb_imageblit = cfb_imageblit;
56528+ pax_open_kernel();
56529+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56530+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56531+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56532+ pax_close_kernel();
56533 } else {
56534 outreg(disp, GC_L0EM, 3);
56535- info->fbops->fb_fillrect = mb86290fb_fillrect;
56536- info->fbops->fb_copyarea = mb86290fb_copyarea;
56537- info->fbops->fb_imageblit = mb86290fb_imageblit;
56538+ pax_open_kernel();
56539+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56540+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56541+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56542+ pax_close_kernel();
56543 }
56544 outreg(draw, GDC_REG_DRAW_BASE, 0);
56545 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56546diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56547index 4273c6e..b413013 100644
56548--- a/drivers/video/fbdev/nvidia/nvidia.c
56549+++ b/drivers/video/fbdev/nvidia/nvidia.c
56550@@ -665,19 +665,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56551 info->fix.line_length = (info->var.xres_virtual *
56552 info->var.bits_per_pixel) >> 3;
56553 if (info->var.accel_flags) {
56554- info->fbops->fb_imageblit = nvidiafb_imageblit;
56555- info->fbops->fb_fillrect = nvidiafb_fillrect;
56556- info->fbops->fb_copyarea = nvidiafb_copyarea;
56557- info->fbops->fb_sync = nvidiafb_sync;
56558+ pax_open_kernel();
56559+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56560+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56561+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56562+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56563+ pax_close_kernel();
56564 info->pixmap.scan_align = 4;
56565 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56566 info->flags |= FBINFO_READS_FAST;
56567 NVResetGraphics(info);
56568 } else {
56569- info->fbops->fb_imageblit = cfb_imageblit;
56570- info->fbops->fb_fillrect = cfb_fillrect;
56571- info->fbops->fb_copyarea = cfb_copyarea;
56572- info->fbops->fb_sync = NULL;
56573+ pax_open_kernel();
56574+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56575+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56576+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56577+ *(void **)&info->fbops->fb_sync = NULL;
56578+ pax_close_kernel();
56579 info->pixmap.scan_align = 1;
56580 info->flags |= FBINFO_HWACCEL_DISABLED;
56581 info->flags &= ~FBINFO_READS_FAST;
56582@@ -1169,8 +1173,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56583 info->pixmap.size = 8 * 1024;
56584 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56585
56586- if (!hwcur)
56587- info->fbops->fb_cursor = NULL;
56588+ if (!hwcur) {
56589+ pax_open_kernel();
56590+ *(void **)&info->fbops->fb_cursor = NULL;
56591+ pax_close_kernel();
56592+ }
56593
56594 info->var.accel_flags = (!noaccel);
56595
56596diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56597index ef5b902..47cf7f5 100644
56598--- a/drivers/video/fbdev/omap2/dss/display.c
56599+++ b/drivers/video/fbdev/omap2/dss/display.c
56600@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56601 if (dssdev->name == NULL)
56602 dssdev->name = dssdev->alias;
56603
56604+ pax_open_kernel();
56605 if (drv && drv->get_resolution == NULL)
56606- drv->get_resolution = omapdss_default_get_resolution;
56607+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56608 if (drv && drv->get_recommended_bpp == NULL)
56609- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56610+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56611 if (drv && drv->get_timings == NULL)
56612- drv->get_timings = omapdss_default_get_timings;
56613+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56614+ pax_close_kernel();
56615
56616 mutex_lock(&panel_list_mutex);
56617 list_add_tail(&dssdev->panel_list, &panel_list);
56618diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56619index 83433cb..71e9b98 100644
56620--- a/drivers/video/fbdev/s1d13xxxfb.c
56621+++ b/drivers/video/fbdev/s1d13xxxfb.c
56622@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56623
56624 switch(prod_id) {
56625 case S1D13506_PROD_ID: /* activate acceleration */
56626- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56627- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56628+ pax_open_kernel();
56629+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56630+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56631+ pax_close_kernel();
56632 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56633 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56634 break;
56635diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56636index 82c0a8c..42499a1 100644
56637--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56638+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56639@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56640 }
56641
56642 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56643- lcdc_sys_write_index,
56644- lcdc_sys_write_data,
56645- lcdc_sys_read_data,
56646+ .write_index = lcdc_sys_write_index,
56647+ .write_data = lcdc_sys_write_data,
56648+ .read_data = lcdc_sys_read_data,
56649 };
56650
56651 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56652diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56653index 9279e5f..d5f5276 100644
56654--- a/drivers/video/fbdev/smscufx.c
56655+++ b/drivers/video/fbdev/smscufx.c
56656@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56657 fb_deferred_io_cleanup(info);
56658 kfree(info->fbdefio);
56659 info->fbdefio = NULL;
56660- info->fbops->fb_mmap = ufx_ops_mmap;
56661+ pax_open_kernel();
56662+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56663+ pax_close_kernel();
56664 }
56665
56666 pr_debug("released /dev/fb%d user=%d count=%d",
56667diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56668index ff2b873..626a8d5 100644
56669--- a/drivers/video/fbdev/udlfb.c
56670+++ b/drivers/video/fbdev/udlfb.c
56671@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56672 dlfb_urb_completion(urb);
56673
56674 error:
56675- atomic_add(bytes_sent, &dev->bytes_sent);
56676- atomic_add(bytes_identical, &dev->bytes_identical);
56677- atomic_add(width*height*2, &dev->bytes_rendered);
56678+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56679+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56680+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56681 end_cycles = get_cycles();
56682- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56683+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56684 >> 10)), /* Kcycles */
56685 &dev->cpu_kcycles_used);
56686
56687@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56688 dlfb_urb_completion(urb);
56689
56690 error:
56691- atomic_add(bytes_sent, &dev->bytes_sent);
56692- atomic_add(bytes_identical, &dev->bytes_identical);
56693- atomic_add(bytes_rendered, &dev->bytes_rendered);
56694+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56695+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56696+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56697 end_cycles = get_cycles();
56698- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56699+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56700 >> 10)), /* Kcycles */
56701 &dev->cpu_kcycles_used);
56702 }
56703@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56704 fb_deferred_io_cleanup(info);
56705 kfree(info->fbdefio);
56706 info->fbdefio = NULL;
56707- info->fbops->fb_mmap = dlfb_ops_mmap;
56708+ pax_open_kernel();
56709+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56710+ pax_close_kernel();
56711 }
56712
56713 pr_warn("released /dev/fb%d user=%d count=%d\n",
56714@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56715 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56716 struct dlfb_data *dev = fb_info->par;
56717 return snprintf(buf, PAGE_SIZE, "%u\n",
56718- atomic_read(&dev->bytes_rendered));
56719+ atomic_read_unchecked(&dev->bytes_rendered));
56720 }
56721
56722 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56723@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56724 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56725 struct dlfb_data *dev = fb_info->par;
56726 return snprintf(buf, PAGE_SIZE, "%u\n",
56727- atomic_read(&dev->bytes_identical));
56728+ atomic_read_unchecked(&dev->bytes_identical));
56729 }
56730
56731 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56732@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56733 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56734 struct dlfb_data *dev = fb_info->par;
56735 return snprintf(buf, PAGE_SIZE, "%u\n",
56736- atomic_read(&dev->bytes_sent));
56737+ atomic_read_unchecked(&dev->bytes_sent));
56738 }
56739
56740 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56741@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56742 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56743 struct dlfb_data *dev = fb_info->par;
56744 return snprintf(buf, PAGE_SIZE, "%u\n",
56745- atomic_read(&dev->cpu_kcycles_used));
56746+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56747 }
56748
56749 static ssize_t edid_show(
56750@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56751 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56752 struct dlfb_data *dev = fb_info->par;
56753
56754- atomic_set(&dev->bytes_rendered, 0);
56755- atomic_set(&dev->bytes_identical, 0);
56756- atomic_set(&dev->bytes_sent, 0);
56757- atomic_set(&dev->cpu_kcycles_used, 0);
56758+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56759+ atomic_set_unchecked(&dev->bytes_identical, 0);
56760+ atomic_set_unchecked(&dev->bytes_sent, 0);
56761+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56762
56763 return count;
56764 }
56765diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56766index d32d1c4..46722e6 100644
56767--- a/drivers/video/fbdev/uvesafb.c
56768+++ b/drivers/video/fbdev/uvesafb.c
56769@@ -19,6 +19,7 @@
56770 #include <linux/io.h>
56771 #include <linux/mutex.h>
56772 #include <linux/slab.h>
56773+#include <linux/moduleloader.h>
56774 #include <video/edid.h>
56775 #include <video/uvesafb.h>
56776 #ifdef CONFIG_X86
56777@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56778 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56779 par->pmi_setpal = par->ypan = 0;
56780 } else {
56781+
56782+#ifdef CONFIG_PAX_KERNEXEC
56783+#ifdef CONFIG_MODULES
56784+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56785+#endif
56786+ if (!par->pmi_code) {
56787+ par->pmi_setpal = par->ypan = 0;
56788+ return 0;
56789+ }
56790+#endif
56791+
56792 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56793 + task->t.regs.edi);
56794+
56795+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56796+ pax_open_kernel();
56797+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56798+ pax_close_kernel();
56799+
56800+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56801+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56802+#else
56803 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56804 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56805+#endif
56806+
56807 printk(KERN_INFO "uvesafb: protected mode interface info at "
56808 "%04x:%04x\n",
56809 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56810@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56811 par->ypan = ypan;
56812
56813 if (par->pmi_setpal || par->ypan) {
56814+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56815 if (__supported_pte_mask & _PAGE_NX) {
56816 par->pmi_setpal = par->ypan = 0;
56817 printk(KERN_WARNING "uvesafb: NX protection is active, "
56818 "better not use the PMI.\n");
56819- } else {
56820+ } else
56821+#endif
56822 uvesafb_vbe_getpmi(task, par);
56823- }
56824 }
56825 #else
56826 /* The protected mode interface is not available on non-x86. */
56827@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56828 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56829
56830 /* Disable blanking if the user requested so. */
56831- if (!blank)
56832- info->fbops->fb_blank = NULL;
56833+ if (!blank) {
56834+ pax_open_kernel();
56835+ *(void **)&info->fbops->fb_blank = NULL;
56836+ pax_close_kernel();
56837+ }
56838
56839 /*
56840 * Find out how much IO memory is required for the mode with
56841@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56842 info->flags = FBINFO_FLAG_DEFAULT |
56843 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56844
56845- if (!par->ypan)
56846- info->fbops->fb_pan_display = NULL;
56847+ if (!par->ypan) {
56848+ pax_open_kernel();
56849+ *(void **)&info->fbops->fb_pan_display = NULL;
56850+ pax_close_kernel();
56851+ }
56852 }
56853
56854 static void uvesafb_init_mtrr(struct fb_info *info)
56855@@ -1786,6 +1816,11 @@ out_mode:
56856 out:
56857 kfree(par->vbe_modes);
56858
56859+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56860+ if (par->pmi_code)
56861+ module_memfree_exec(par->pmi_code);
56862+#endif
56863+
56864 framebuffer_release(info);
56865 return err;
56866 }
56867@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56868 kfree(par->vbe_state_orig);
56869 kfree(par->vbe_state_saved);
56870
56871+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56872+ if (par->pmi_code)
56873+ module_memfree_exec(par->pmi_code);
56874+#endif
56875+
56876 framebuffer_release(info);
56877 }
56878 return 0;
56879diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56880index d79a0ac..2d0c3d4 100644
56881--- a/drivers/video/fbdev/vesafb.c
56882+++ b/drivers/video/fbdev/vesafb.c
56883@@ -9,6 +9,7 @@
56884 */
56885
56886 #include <linux/module.h>
56887+#include <linux/moduleloader.h>
56888 #include <linux/kernel.h>
56889 #include <linux/errno.h>
56890 #include <linux/string.h>
56891@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56892 static int vram_total; /* Set total amount of memory */
56893 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56894 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56895-static void (*pmi_start)(void) __read_mostly;
56896-static void (*pmi_pal) (void) __read_mostly;
56897+static void (*pmi_start)(void) __read_only;
56898+static void (*pmi_pal) (void) __read_only;
56899 static int depth __read_mostly;
56900 static int vga_compat __read_mostly;
56901 /* --------------------------------------------------------------------- */
56902@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56903 unsigned int size_remap;
56904 unsigned int size_total;
56905 char *option = NULL;
56906+ void *pmi_code = NULL;
56907
56908 /* ignore error return of fb_get_options */
56909 fb_get_options("vesafb", &option);
56910@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56911 size_remap = size_total;
56912 vesafb_fix.smem_len = size_remap;
56913
56914-#ifndef __i386__
56915- screen_info.vesapm_seg = 0;
56916-#endif
56917-
56918 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56919 printk(KERN_WARNING
56920 "vesafb: cannot reserve video memory at 0x%lx\n",
56921@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56922 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56923 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56924
56925+#ifdef __i386__
56926+
56927+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56928+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56929+ if (!pmi_code)
56930+#elif !defined(CONFIG_PAX_KERNEXEC)
56931+ if (0)
56932+#endif
56933+
56934+#endif
56935+ screen_info.vesapm_seg = 0;
56936+
56937 if (screen_info.vesapm_seg) {
56938- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56939- screen_info.vesapm_seg,screen_info.vesapm_off);
56940+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56941+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56942 }
56943
56944 if (screen_info.vesapm_seg < 0xc000)
56945@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56946
56947 if (ypan || pmi_setpal) {
56948 unsigned short *pmi_base;
56949+
56950 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56951- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56952- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56953+
56954+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56955+ pax_open_kernel();
56956+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56957+#else
56958+ pmi_code = pmi_base;
56959+#endif
56960+
56961+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56962+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56963+
56964+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56965+ pmi_start = ktva_ktla(pmi_start);
56966+ pmi_pal = ktva_ktla(pmi_pal);
56967+ pax_close_kernel();
56968+#endif
56969+
56970 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56971 if (pmi_base[3]) {
56972 printk(KERN_INFO "vesafb: pmi: ports = ");
56973@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56974 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56975 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56976
56977- if (!ypan)
56978- info->fbops->fb_pan_display = NULL;
56979+ if (!ypan) {
56980+ pax_open_kernel();
56981+ *(void **)&info->fbops->fb_pan_display = NULL;
56982+ pax_close_kernel();
56983+ }
56984
56985 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56986 err = -ENOMEM;
56987@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56988 fb_info(info, "%s frame buffer device\n", info->fix.id);
56989 return 0;
56990 err:
56991+
56992+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56993+ module_memfree_exec(pmi_code);
56994+#endif
56995+
56996 if (info->screen_base)
56997 iounmap(info->screen_base);
56998 framebuffer_release(info);
56999diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
57000index 88714ae..16c2e11 100644
57001--- a/drivers/video/fbdev/via/via_clock.h
57002+++ b/drivers/video/fbdev/via/via_clock.h
57003@@ -56,7 +56,7 @@ struct via_clock {
57004
57005 void (*set_engine_pll_state)(u8 state);
57006 void (*set_engine_pll)(struct via_pll_config config);
57007-};
57008+} __no_const;
57009
57010
57011 static inline u32 get_pll_internal_frequency(u32 ref_freq,
57012diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
57013index 3c14e43..2630570 100644
57014--- a/drivers/video/logo/logo_linux_clut224.ppm
57015+++ b/drivers/video/logo/logo_linux_clut224.ppm
57016@@ -2,1603 +2,1123 @@ P3
57017 # Standard 224-color Linux logo
57018 80 80
57019 255
57020- 0 0 0 0 0 0 0 0 0 0 0 0
57021- 0 0 0 0 0 0 0 0 0 0 0 0
57022- 0 0 0 0 0 0 0 0 0 0 0 0
57023- 0 0 0 0 0 0 0 0 0 0 0 0
57024- 0 0 0 0 0 0 0 0 0 0 0 0
57025- 0 0 0 0 0 0 0 0 0 0 0 0
57026- 0 0 0 0 0 0 0 0 0 0 0 0
57027- 0 0 0 0 0 0 0 0 0 0 0 0
57028- 0 0 0 0 0 0 0 0 0 0 0 0
57029- 6 6 6 6 6 6 10 10 10 10 10 10
57030- 10 10 10 6 6 6 6 6 6 6 6 6
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- 0 0 0 0 0 0 0 0 0 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 0 0 0
57042- 0 0 0 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 0 0 0 0 0 0
57045- 0 0 0 0 0 0 0 0 0 0 0 0
57046- 0 0 0 0 0 0 0 0 0 0 0 0
57047- 0 0 0 0 0 0 0 0 0 0 0 0
57048- 0 0 0 6 6 6 10 10 10 14 14 14
57049- 22 22 22 26 26 26 30 30 30 34 34 34
57050- 30 30 30 30 30 30 26 26 26 18 18 18
57051- 14 14 14 10 10 10 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
57057- 0 0 0 0 0 0 0 0 0 0 0 0
57058- 0 0 0 0 0 0 0 0 0 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 1 0 0 1 0 0 0
57062- 0 0 0 0 0 0 0 0 0 0 0 0
57063- 0 0 0 0 0 0 0 0 0 0 0 0
57064- 0 0 0 0 0 0 0 0 0 0 0 0
57065- 0 0 0 0 0 0 0 0 0 0 0 0
57066- 0 0 0 0 0 0 0 0 0 0 0 0
57067- 0 0 0 0 0 0 0 0 0 0 0 0
57068- 6 6 6 14 14 14 26 26 26 42 42 42
57069- 54 54 54 66 66 66 78 78 78 78 78 78
57070- 78 78 78 74 74 74 66 66 66 54 54 54
57071- 42 42 42 26 26 26 18 18 18 10 10 10
57072- 6 6 6 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- 0 0 0 0 0 0 0 0 0 0 0 0
57077- 0 0 0 0 0 0 0 0 0 0 0 0
57078- 0 0 0 0 0 0 0 0 0 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 1 0 0 0 0 0 0 0 0 0
57082- 0 0 0 0 0 0 0 0 0 0 0 0
57083- 0 0 0 0 0 0 0 0 0 0 0 0
57084- 0 0 0 0 0 0 0 0 0 0 0 0
57085- 0 0 0 0 0 0 0 0 0 0 0 0
57086- 0 0 0 0 0 0 0 0 0 0 0 0
57087- 0 0 0 0 0 0 0 0 0 10 10 10
57088- 22 22 22 42 42 42 66 66 66 86 86 86
57089- 66 66 66 38 38 38 38 38 38 22 22 22
57090- 26 26 26 34 34 34 54 54 54 66 66 66
57091- 86 86 86 70 70 70 46 46 46 26 26 26
57092- 14 14 14 6 6 6 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 0 0 0
57095- 0 0 0 0 0 0 0 0 0 0 0 0
57096- 0 0 0 0 0 0 0 0 0 0 0 0
57097- 0 0 0 0 0 0 0 0 0 0 0 0
57098- 0 0 0 0 0 0 0 0 0 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 1 0 0 1 0 0 1 0 0 0
57102- 0 0 0 0 0 0 0 0 0 0 0 0
57103- 0 0 0 0 0 0 0 0 0 0 0 0
57104- 0 0 0 0 0 0 0 0 0 0 0 0
57105- 0 0 0 0 0 0 0 0 0 0 0 0
57106- 0 0 0 0 0 0 0 0 0 0 0 0
57107- 0 0 0 0 0 0 10 10 10 26 26 26
57108- 50 50 50 82 82 82 58 58 58 6 6 6
57109- 2 2 6 2 2 6 2 2 6 2 2 6
57110- 2 2 6 2 2 6 2 2 6 2 2 6
57111- 6 6 6 54 54 54 86 86 86 66 66 66
57112- 38 38 38 18 18 18 6 6 6 0 0 0
57113- 0 0 0 0 0 0 0 0 0 0 0 0
57114- 0 0 0 0 0 0 0 0 0 0 0 0
57115- 0 0 0 0 0 0 0 0 0 0 0 0
57116- 0 0 0 0 0 0 0 0 0 0 0 0
57117- 0 0 0 0 0 0 0 0 0 0 0 0
57118- 0 0 0 0 0 0 0 0 0 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 0 0 0
57122- 0 0 0 0 0 0 0 0 0 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 0 0 0 0 0 0 0 0 0 0 0 0
57125- 0 0 0 0 0 0 0 0 0 0 0 0
57126- 0 0 0 0 0 0 0 0 0 0 0 0
57127- 0 0 0 6 6 6 22 22 22 50 50 50
57128- 78 78 78 34 34 34 2 2 6 2 2 6
57129- 2 2 6 2 2 6 2 2 6 2 2 6
57130- 2 2 6 2 2 6 2 2 6 2 2 6
57131- 2 2 6 2 2 6 6 6 6 70 70 70
57132- 78 78 78 46 46 46 22 22 22 6 6 6
57133- 0 0 0 0 0 0 0 0 0 0 0 0
57134- 0 0 0 0 0 0 0 0 0 0 0 0
57135- 0 0 0 0 0 0 0 0 0 0 0 0
57136- 0 0 0 0 0 0 0 0 0 0 0 0
57137- 0 0 0 0 0 0 0 0 0 0 0 0
57138- 0 0 0 0 0 0 0 0 0 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 1 0 0 1 0 0 1 0 0 0
57142- 0 0 0 0 0 0 0 0 0 0 0 0
57143- 0 0 0 0 0 0 0 0 0 0 0 0
57144- 0 0 0 0 0 0 0 0 0 0 0 0
57145- 0 0 0 0 0 0 0 0 0 0 0 0
57146- 0 0 0 0 0 0 0 0 0 0 0 0
57147- 6 6 6 18 18 18 42 42 42 82 82 82
57148- 26 26 26 2 2 6 2 2 6 2 2 6
57149- 2 2 6 2 2 6 2 2 6 2 2 6
57150- 2 2 6 2 2 6 2 2 6 14 14 14
57151- 46 46 46 34 34 34 6 6 6 2 2 6
57152- 42 42 42 78 78 78 42 42 42 18 18 18
57153- 6 6 6 0 0 0 0 0 0 0 0 0
57154- 0 0 0 0 0 0 0 0 0 0 0 0
57155- 0 0 0 0 0 0 0 0 0 0 0 0
57156- 0 0 0 0 0 0 0 0 0 0 0 0
57157- 0 0 0 0 0 0 0 0 0 0 0 0
57158- 0 0 0 0 0 0 0 0 0 0 0 0
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 1 0 0 0 0 0 1 0 0 0
57162- 0 0 0 0 0 0 0 0 0 0 0 0
57163- 0 0 0 0 0 0 0 0 0 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 10 10 10 30 30 30 66 66 66 58 58 58
57168- 2 2 6 2 2 6 2 2 6 2 2 6
57169- 2 2 6 2 2 6 2 2 6 2 2 6
57170- 2 2 6 2 2 6 2 2 6 26 26 26
57171- 86 86 86 101 101 101 46 46 46 10 10 10
57172- 2 2 6 58 58 58 70 70 70 34 34 34
57173- 10 10 10 0 0 0 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 0 0 0
57175- 0 0 0 0 0 0 0 0 0 0 0 0
57176- 0 0 0 0 0 0 0 0 0 0 0 0
57177- 0 0 0 0 0 0 0 0 0 0 0 0
57178- 0 0 0 0 0 0 0 0 0 0 0 0
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 1 0 0 1 0 0 1 0 0 0
57182- 0 0 0 0 0 0 0 0 0 0 0 0
57183- 0 0 0 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 14 14 14 42 42 42 86 86 86 10 10 10
57188- 2 2 6 2 2 6 2 2 6 2 2 6
57189- 2 2 6 2 2 6 2 2 6 2 2 6
57190- 2 2 6 2 2 6 2 2 6 30 30 30
57191- 94 94 94 94 94 94 58 58 58 26 26 26
57192- 2 2 6 6 6 6 78 78 78 54 54 54
57193- 22 22 22 6 6 6 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 0 0 0
57195- 0 0 0 0 0 0 0 0 0 0 0 0
57196- 0 0 0 0 0 0 0 0 0 0 0 0
57197- 0 0 0 0 0 0 0 0 0 0 0 0
57198- 0 0 0 0 0 0 0 0 0 0 0 0
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 0 0 0
57202- 0 0 0 0 0 0 0 0 0 0 0 0
57203- 0 0 0 0 0 0 0 0 0 0 0 0
57204- 0 0 0 0 0 0 0 0 0 0 0 0
57205- 0 0 0 0 0 0 0 0 0 0 0 0
57206- 0 0 0 0 0 0 0 0 0 6 6 6
57207- 22 22 22 62 62 62 62 62 62 2 2 6
57208- 2 2 6 2 2 6 2 2 6 2 2 6
57209- 2 2 6 2 2 6 2 2 6 2 2 6
57210- 2 2 6 2 2 6 2 2 6 26 26 26
57211- 54 54 54 38 38 38 18 18 18 10 10 10
57212- 2 2 6 2 2 6 34 34 34 82 82 82
57213- 38 38 38 14 14 14 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 0 0 0
57215- 0 0 0 0 0 0 0 0 0 0 0 0
57216- 0 0 0 0 0 0 0 0 0 0 0 0
57217- 0 0 0 0 0 0 0 0 0 0 0 0
57218- 0 0 0 0 0 0 0 0 0 0 0 0
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 1 0 0 1 0 0 0
57222- 0 0 0 0 0 0 0 0 0 0 0 0
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 6 6 6
57227- 30 30 30 78 78 78 30 30 30 2 2 6
57228- 2 2 6 2 2 6 2 2 6 2 2 6
57229- 2 2 6 2 2 6 2 2 6 2 2 6
57230- 2 2 6 2 2 6 2 2 6 10 10 10
57231- 10 10 10 2 2 6 2 2 6 2 2 6
57232- 2 2 6 2 2 6 2 2 6 78 78 78
57233- 50 50 50 18 18 18 6 6 6 0 0 0
57234- 0 0 0 0 0 0 0 0 0 0 0 0
57235- 0 0 0 0 0 0 0 0 0 0 0 0
57236- 0 0 0 0 0 0 0 0 0 0 0 0
57237- 0 0 0 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 1 0 0 0 0 0 0 0 0 0
57242- 0 0 0 0 0 0 0 0 0 0 0 0
57243- 0 0 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 10 10 10
57247- 38 38 38 86 86 86 14 14 14 2 2 6
57248- 2 2 6 2 2 6 2 2 6 2 2 6
57249- 2 2 6 2 2 6 2 2 6 2 2 6
57250- 2 2 6 2 2 6 2 2 6 2 2 6
57251- 2 2 6 2 2 6 2 2 6 2 2 6
57252- 2 2 6 2 2 6 2 2 6 54 54 54
57253- 66 66 66 26 26 26 6 6 6 0 0 0
57254- 0 0 0 0 0 0 0 0 0 0 0 0
57255- 0 0 0 0 0 0 0 0 0 0 0 0
57256- 0 0 0 0 0 0 0 0 0 0 0 0
57257- 0 0 0 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 1 0 0 1 0 0 0
57262- 0 0 0 0 0 0 0 0 0 0 0 0
57263- 0 0 0 0 0 0 0 0 0 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 14 14 14
57267- 42 42 42 82 82 82 2 2 6 2 2 6
57268- 2 2 6 6 6 6 10 10 10 2 2 6
57269- 2 2 6 2 2 6 2 2 6 2 2 6
57270- 2 2 6 2 2 6 2 2 6 6 6 6
57271- 14 14 14 10 10 10 2 2 6 2 2 6
57272- 2 2 6 2 2 6 2 2 6 18 18 18
57273- 82 82 82 34 34 34 10 10 10 0 0 0
57274- 0 0 0 0 0 0 0 0 0 0 0 0
57275- 0 0 0 0 0 0 0 0 0 0 0 0
57276- 0 0 0 0 0 0 0 0 0 0 0 0
57277- 0 0 0 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 1 0 0 0 0 0 0 0 0 0
57282- 0 0 0 0 0 0 0 0 0 0 0 0
57283- 0 0 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 14 14 14
57287- 46 46 46 86 86 86 2 2 6 2 2 6
57288- 6 6 6 6 6 6 22 22 22 34 34 34
57289- 6 6 6 2 2 6 2 2 6 2 2 6
57290- 2 2 6 2 2 6 18 18 18 34 34 34
57291- 10 10 10 50 50 50 22 22 22 2 2 6
57292- 2 2 6 2 2 6 2 2 6 10 10 10
57293- 86 86 86 42 42 42 14 14 14 0 0 0
57294- 0 0 0 0 0 0 0 0 0 0 0 0
57295- 0 0 0 0 0 0 0 0 0 0 0 0
57296- 0 0 0 0 0 0 0 0 0 0 0 0
57297- 0 0 0 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 0 0 1 0 0 1 0 0 1 0 0 0
57302- 0 0 0 0 0 0 0 0 0 0 0 0
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 14 14 14
57307- 46 46 46 86 86 86 2 2 6 2 2 6
57308- 38 38 38 116 116 116 94 94 94 22 22 22
57309- 22 22 22 2 2 6 2 2 6 2 2 6
57310- 14 14 14 86 86 86 138 138 138 162 162 162
57311-154 154 154 38 38 38 26 26 26 6 6 6
57312- 2 2 6 2 2 6 2 2 6 2 2 6
57313- 86 86 86 46 46 46 14 14 14 0 0 0
57314- 0 0 0 0 0 0 0 0 0 0 0 0
57315- 0 0 0 0 0 0 0 0 0 0 0 0
57316- 0 0 0 0 0 0 0 0 0 0 0 0
57317- 0 0 0 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 0 0 0
57321- 0 0 0 0 0 0 0 0 0 0 0 0
57322- 0 0 0 0 0 0 0 0 0 0 0 0
57323- 0 0 0 0 0 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 14 14 14
57327- 46 46 46 86 86 86 2 2 6 14 14 14
57328-134 134 134 198 198 198 195 195 195 116 116 116
57329- 10 10 10 2 2 6 2 2 6 6 6 6
57330-101 98 89 187 187 187 210 210 210 218 218 218
57331-214 214 214 134 134 134 14 14 14 6 6 6
57332- 2 2 6 2 2 6 2 2 6 2 2 6
57333- 86 86 86 50 50 50 18 18 18 6 6 6
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 0 0 0 0 0 0 0 0 0
57336- 0 0 0 0 0 0 0 0 0 0 0 0
57337- 0 0 0 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 1 0 0 0
57341- 0 0 1 0 0 1 0 0 1 0 0 0
57342- 0 0 0 0 0 0 0 0 0 0 0 0
57343- 0 0 0 0 0 0 0 0 0 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 14 14 14
57347- 46 46 46 86 86 86 2 2 6 54 54 54
57348-218 218 218 195 195 195 226 226 226 246 246 246
57349- 58 58 58 2 2 6 2 2 6 30 30 30
57350-210 210 210 253 253 253 174 174 174 123 123 123
57351-221 221 221 234 234 234 74 74 74 2 2 6
57352- 2 2 6 2 2 6 2 2 6 2 2 6
57353- 70 70 70 58 58 58 22 22 22 6 6 6
57354- 0 0 0 0 0 0 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 0 0 0
57356- 0 0 0 0 0 0 0 0 0 0 0 0
57357- 0 0 0 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 0 0 0
57361- 0 0 0 0 0 0 0 0 0 0 0 0
57362- 0 0 0 0 0 0 0 0 0 0 0 0
57363- 0 0 0 0 0 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 14 14 14
57367- 46 46 46 82 82 82 2 2 6 106 106 106
57368-170 170 170 26 26 26 86 86 86 226 226 226
57369-123 123 123 10 10 10 14 14 14 46 46 46
57370-231 231 231 190 190 190 6 6 6 70 70 70
57371- 90 90 90 238 238 238 158 158 158 2 2 6
57372- 2 2 6 2 2 6 2 2 6 2 2 6
57373- 70 70 70 58 58 58 22 22 22 6 6 6
57374- 0 0 0 0 0 0 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 0 0 0
57376- 0 0 0 0 0 0 0 0 0 0 0 0
57377- 0 0 0 0 0 0 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 1 0 0 0
57381- 0 0 1 0 0 1 0 0 1 0 0 0
57382- 0 0 0 0 0 0 0 0 0 0 0 0
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 14 14 14
57387- 42 42 42 86 86 86 6 6 6 116 116 116
57388-106 106 106 6 6 6 70 70 70 149 149 149
57389-128 128 128 18 18 18 38 38 38 54 54 54
57390-221 221 221 106 106 106 2 2 6 14 14 14
57391- 46 46 46 190 190 190 198 198 198 2 2 6
57392- 2 2 6 2 2 6 2 2 6 2 2 6
57393- 74 74 74 62 62 62 22 22 22 6 6 6
57394- 0 0 0 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 0 0 0
57396- 0 0 0 0 0 0 0 0 0 0 0 0
57397- 0 0 0 0 0 0 0 0 0 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 0 0 0 0 0 0 0 0 1 0 0 0
57401- 0 0 1 0 0 0 0 0 1 0 0 0
57402- 0 0 0 0 0 0 0 0 0 0 0 0
57403- 0 0 0 0 0 0 0 0 0 0 0 0
57404- 0 0 0 0 0 0 0 0 0 0 0 0
57405- 0 0 0 0 0 0 0 0 0 0 0 0
57406- 0 0 0 0 0 0 0 0 0 14 14 14
57407- 42 42 42 94 94 94 14 14 14 101 101 101
57408-128 128 128 2 2 6 18 18 18 116 116 116
57409-118 98 46 121 92 8 121 92 8 98 78 10
57410-162 162 162 106 106 106 2 2 6 2 2 6
57411- 2 2 6 195 195 195 195 195 195 6 6 6
57412- 2 2 6 2 2 6 2 2 6 2 2 6
57413- 74 74 74 62 62 62 22 22 22 6 6 6
57414- 0 0 0 0 0 0 0 0 0 0 0 0
57415- 0 0 0 0 0 0 0 0 0 0 0 0
57416- 0 0 0 0 0 0 0 0 0 0 0 0
57417- 0 0 0 0 0 0 0 0 0 0 0 0
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 0 0 0 0 0 0 0 0 1 0 0 1
57421- 0 0 1 0 0 0 0 0 1 0 0 0
57422- 0 0 0 0 0 0 0 0 0 0 0 0
57423- 0 0 0 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 10 10 10
57427- 38 38 38 90 90 90 14 14 14 58 58 58
57428-210 210 210 26 26 26 54 38 6 154 114 10
57429-226 170 11 236 186 11 225 175 15 184 144 12
57430-215 174 15 175 146 61 37 26 9 2 2 6
57431- 70 70 70 246 246 246 138 138 138 2 2 6
57432- 2 2 6 2 2 6 2 2 6 2 2 6
57433- 70 70 70 66 66 66 26 26 26 6 6 6
57434- 0 0 0 0 0 0 0 0 0 0 0 0
57435- 0 0 0 0 0 0 0 0 0 0 0 0
57436- 0 0 0 0 0 0 0 0 0 0 0 0
57437- 0 0 0 0 0 0 0 0 0 0 0 0
57438- 0 0 0 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 0 0 0 0 0 0 0 0 0 0 0 0
57441- 0 0 0 0 0 0 0 0 0 0 0 0
57442- 0 0 0 0 0 0 0 0 0 0 0 0
57443- 0 0 0 0 0 0 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 10 10 10
57447- 38 38 38 86 86 86 14 14 14 10 10 10
57448-195 195 195 188 164 115 192 133 9 225 175 15
57449-239 182 13 234 190 10 232 195 16 232 200 30
57450-245 207 45 241 208 19 232 195 16 184 144 12
57451-218 194 134 211 206 186 42 42 42 2 2 6
57452- 2 2 6 2 2 6 2 2 6 2 2 6
57453- 50 50 50 74 74 74 30 30 30 6 6 6
57454- 0 0 0 0 0 0 0 0 0 0 0 0
57455- 0 0 0 0 0 0 0 0 0 0 0 0
57456- 0 0 0 0 0 0 0 0 0 0 0 0
57457- 0 0 0 0 0 0 0 0 0 0 0 0
57458- 0 0 0 0 0 0 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 0 0 0
57460- 0 0 0 0 0 0 0 0 0 0 0 0
57461- 0 0 0 0 0 0 0 0 0 0 0 0
57462- 0 0 0 0 0 0 0 0 0 0 0 0
57463- 0 0 0 0 0 0 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 10 10 10
57467- 34 34 34 86 86 86 14 14 14 2 2 6
57468-121 87 25 192 133 9 219 162 10 239 182 13
57469-236 186 11 232 195 16 241 208 19 244 214 54
57470-246 218 60 246 218 38 246 215 20 241 208 19
57471-241 208 19 226 184 13 121 87 25 2 2 6
57472- 2 2 6 2 2 6 2 2 6 2 2 6
57473- 50 50 50 82 82 82 34 34 34 10 10 10
57474- 0 0 0 0 0 0 0 0 0 0 0 0
57475- 0 0 0 0 0 0 0 0 0 0 0 0
57476- 0 0 0 0 0 0 0 0 0 0 0 0
57477- 0 0 0 0 0 0 0 0 0 0 0 0
57478- 0 0 0 0 0 0 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 0 0 0
57480- 0 0 0 0 0 0 0 0 0 0 0 0
57481- 0 0 0 0 0 0 0 0 0 0 0 0
57482- 0 0 0 0 0 0 0 0 0 0 0 0
57483- 0 0 0 0 0 0 0 0 0 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 10 10 10
57487- 34 34 34 82 82 82 30 30 30 61 42 6
57488-180 123 7 206 145 10 230 174 11 239 182 13
57489-234 190 10 238 202 15 241 208 19 246 218 74
57490-246 218 38 246 215 20 246 215 20 246 215 20
57491-226 184 13 215 174 15 184 144 12 6 6 6
57492- 2 2 6 2 2 6 2 2 6 2 2 6
57493- 26 26 26 94 94 94 42 42 42 14 14 14
57494- 0 0 0 0 0 0 0 0 0 0 0 0
57495- 0 0 0 0 0 0 0 0 0 0 0 0
57496- 0 0 0 0 0 0 0 0 0 0 0 0
57497- 0 0 0 0 0 0 0 0 0 0 0 0
57498- 0 0 0 0 0 0 0 0 0 0 0 0
57499- 0 0 0 0 0 0 0 0 0 0 0 0
57500- 0 0 0 0 0 0 0 0 0 0 0 0
57501- 0 0 0 0 0 0 0 0 0 0 0 0
57502- 0 0 0 0 0 0 0 0 0 0 0 0
57503- 0 0 0 0 0 0 0 0 0 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 10 10 10
57507- 30 30 30 78 78 78 50 50 50 104 69 6
57508-192 133 9 216 158 10 236 178 12 236 186 11
57509-232 195 16 241 208 19 244 214 54 245 215 43
57510-246 215 20 246 215 20 241 208 19 198 155 10
57511-200 144 11 216 158 10 156 118 10 2 2 6
57512- 2 2 6 2 2 6 2 2 6 2 2 6
57513- 6 6 6 90 90 90 54 54 54 18 18 18
57514- 6 6 6 0 0 0 0 0 0 0 0 0
57515- 0 0 0 0 0 0 0 0 0 0 0 0
57516- 0 0 0 0 0 0 0 0 0 0 0 0
57517- 0 0 0 0 0 0 0 0 0 0 0 0
57518- 0 0 0 0 0 0 0 0 0 0 0 0
57519- 0 0 0 0 0 0 0 0 0 0 0 0
57520- 0 0 0 0 0 0 0 0 0 0 0 0
57521- 0 0 0 0 0 0 0 0 0 0 0 0
57522- 0 0 0 0 0 0 0 0 0 0 0 0
57523- 0 0 0 0 0 0 0 0 0 0 0 0
57524- 0 0 0 0 0 0 0 0 0 0 0 0
57525- 0 0 0 0 0 0 0 0 0 0 0 0
57526- 0 0 0 0 0 0 0 0 0 10 10 10
57527- 30 30 30 78 78 78 46 46 46 22 22 22
57528-137 92 6 210 162 10 239 182 13 238 190 10
57529-238 202 15 241 208 19 246 215 20 246 215 20
57530-241 208 19 203 166 17 185 133 11 210 150 10
57531-216 158 10 210 150 10 102 78 10 2 2 6
57532- 6 6 6 54 54 54 14 14 14 2 2 6
57533- 2 2 6 62 62 62 74 74 74 30 30 30
57534- 10 10 10 0 0 0 0 0 0 0 0 0
57535- 0 0 0 0 0 0 0 0 0 0 0 0
57536- 0 0 0 0 0 0 0 0 0 0 0 0
57537- 0 0 0 0 0 0 0 0 0 0 0 0
57538- 0 0 0 0 0 0 0 0 0 0 0 0
57539- 0 0 0 0 0 0 0 0 0 0 0 0
57540- 0 0 0 0 0 0 0 0 0 0 0 0
57541- 0 0 0 0 0 0 0 0 0 0 0 0
57542- 0 0 0 0 0 0 0 0 0 0 0 0
57543- 0 0 0 0 0 0 0 0 0 0 0 0
57544- 0 0 0 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 10 10 10
57547- 34 34 34 78 78 78 50 50 50 6 6 6
57548- 94 70 30 139 102 15 190 146 13 226 184 13
57549-232 200 30 232 195 16 215 174 15 190 146 13
57550-168 122 10 192 133 9 210 150 10 213 154 11
57551-202 150 34 182 157 106 101 98 89 2 2 6
57552- 2 2 6 78 78 78 116 116 116 58 58 58
57553- 2 2 6 22 22 22 90 90 90 46 46 46
57554- 18 18 18 6 6 6 0 0 0 0 0 0
57555- 0 0 0 0 0 0 0 0 0 0 0 0
57556- 0 0 0 0 0 0 0 0 0 0 0 0
57557- 0 0 0 0 0 0 0 0 0 0 0 0
57558- 0 0 0 0 0 0 0 0 0 0 0 0
57559- 0 0 0 0 0 0 0 0 0 0 0 0
57560- 0 0 0 0 0 0 0 0 0 0 0 0
57561- 0 0 0 0 0 0 0 0 0 0 0 0
57562- 0 0 0 0 0 0 0 0 0 0 0 0
57563- 0 0 0 0 0 0 0 0 0 0 0 0
57564- 0 0 0 0 0 0 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 10 10 10
57567- 38 38 38 86 86 86 50 50 50 6 6 6
57568-128 128 128 174 154 114 156 107 11 168 122 10
57569-198 155 10 184 144 12 197 138 11 200 144 11
57570-206 145 10 206 145 10 197 138 11 188 164 115
57571-195 195 195 198 198 198 174 174 174 14 14 14
57572- 2 2 6 22 22 22 116 116 116 116 116 116
57573- 22 22 22 2 2 6 74 74 74 70 70 70
57574- 30 30 30 10 10 10 0 0 0 0 0 0
57575- 0 0 0 0 0 0 0 0 0 0 0 0
57576- 0 0 0 0 0 0 0 0 0 0 0 0
57577- 0 0 0 0 0 0 0 0 0 0 0 0
57578- 0 0 0 0 0 0 0 0 0 0 0 0
57579- 0 0 0 0 0 0 0 0 0 0 0 0
57580- 0 0 0 0 0 0 0 0 0 0 0 0
57581- 0 0 0 0 0 0 0 0 0 0 0 0
57582- 0 0 0 0 0 0 0 0 0 0 0 0
57583- 0 0 0 0 0 0 0 0 0 0 0 0
57584- 0 0 0 0 0 0 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 6 6 6 18 18 18
57587- 50 50 50 101 101 101 26 26 26 10 10 10
57588-138 138 138 190 190 190 174 154 114 156 107 11
57589-197 138 11 200 144 11 197 138 11 192 133 9
57590-180 123 7 190 142 34 190 178 144 187 187 187
57591-202 202 202 221 221 221 214 214 214 66 66 66
57592- 2 2 6 2 2 6 50 50 50 62 62 62
57593- 6 6 6 2 2 6 10 10 10 90 90 90
57594- 50 50 50 18 18 18 6 6 6 0 0 0
57595- 0 0 0 0 0 0 0 0 0 0 0 0
57596- 0 0 0 0 0 0 0 0 0 0 0 0
57597- 0 0 0 0 0 0 0 0 0 0 0 0
57598- 0 0 0 0 0 0 0 0 0 0 0 0
57599- 0 0 0 0 0 0 0 0 0 0 0 0
57600- 0 0 0 0 0 0 0 0 0 0 0 0
57601- 0 0 0 0 0 0 0 0 0 0 0 0
57602- 0 0 0 0 0 0 0 0 0 0 0 0
57603- 0 0 0 0 0 0 0 0 0 0 0 0
57604- 0 0 0 0 0 0 0 0 0 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 10 10 10 34 34 34
57607- 74 74 74 74 74 74 2 2 6 6 6 6
57608-144 144 144 198 198 198 190 190 190 178 166 146
57609-154 121 60 156 107 11 156 107 11 168 124 44
57610-174 154 114 187 187 187 190 190 190 210 210 210
57611-246 246 246 253 253 253 253 253 253 182 182 182
57612- 6 6 6 2 2 6 2 2 6 2 2 6
57613- 2 2 6 2 2 6 2 2 6 62 62 62
57614- 74 74 74 34 34 34 14 14 14 0 0 0
57615- 0 0 0 0 0 0 0 0 0 0 0 0
57616- 0 0 0 0 0 0 0 0 0 0 0 0
57617- 0 0 0 0 0 0 0 0 0 0 0 0
57618- 0 0 0 0 0 0 0 0 0 0 0 0
57619- 0 0 0 0 0 0 0 0 0 0 0 0
57620- 0 0 0 0 0 0 0 0 0 0 0 0
57621- 0 0 0 0 0 0 0 0 0 0 0 0
57622- 0 0 0 0 0 0 0 0 0 0 0 0
57623- 0 0 0 0 0 0 0 0 0 0 0 0
57624- 0 0 0 0 0 0 0 0 0 0 0 0
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 10 10 10 22 22 22 54 54 54
57627- 94 94 94 18 18 18 2 2 6 46 46 46
57628-234 234 234 221 221 221 190 190 190 190 190 190
57629-190 190 190 187 187 187 187 187 187 190 190 190
57630-190 190 190 195 195 195 214 214 214 242 242 242
57631-253 253 253 253 253 253 253 253 253 253 253 253
57632- 82 82 82 2 2 6 2 2 6 2 2 6
57633- 2 2 6 2 2 6 2 2 6 14 14 14
57634- 86 86 86 54 54 54 22 22 22 6 6 6
57635- 0 0 0 0 0 0 0 0 0 0 0 0
57636- 0 0 0 0 0 0 0 0 0 0 0 0
57637- 0 0 0 0 0 0 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 0 0 0
57639- 0 0 0 0 0 0 0 0 0 0 0 0
57640- 0 0 0 0 0 0 0 0 0 0 0 0
57641- 0 0 0 0 0 0 0 0 0 0 0 0
57642- 0 0 0 0 0 0 0 0 0 0 0 0
57643- 0 0 0 0 0 0 0 0 0 0 0 0
57644- 0 0 0 0 0 0 0 0 0 0 0 0
57645- 0 0 0 0 0 0 0 0 0 0 0 0
57646- 6 6 6 18 18 18 46 46 46 90 90 90
57647- 46 46 46 18 18 18 6 6 6 182 182 182
57648-253 253 253 246 246 246 206 206 206 190 190 190
57649-190 190 190 190 190 190 190 190 190 190 190 190
57650-206 206 206 231 231 231 250 250 250 253 253 253
57651-253 253 253 253 253 253 253 253 253 253 253 253
57652-202 202 202 14 14 14 2 2 6 2 2 6
57653- 2 2 6 2 2 6 2 2 6 2 2 6
57654- 42 42 42 86 86 86 42 42 42 18 18 18
57655- 6 6 6 0 0 0 0 0 0 0 0 0
57656- 0 0 0 0 0 0 0 0 0 0 0 0
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 0 0 0 0 0 0
57659- 0 0 0 0 0 0 0 0 0 0 0 0
57660- 0 0 0 0 0 0 0 0 0 0 0 0
57661- 0 0 0 0 0 0 0 0 0 0 0 0
57662- 0 0 0 0 0 0 0 0 0 0 0 0
57663- 0 0 0 0 0 0 0 0 0 0 0 0
57664- 0 0 0 0 0 0 0 0 0 0 0 0
57665- 0 0 0 0 0 0 0 0 0 6 6 6
57666- 14 14 14 38 38 38 74 74 74 66 66 66
57667- 2 2 6 6 6 6 90 90 90 250 250 250
57668-253 253 253 253 253 253 238 238 238 198 198 198
57669-190 190 190 190 190 190 195 195 195 221 221 221
57670-246 246 246 253 253 253 253 253 253 253 253 253
57671-253 253 253 253 253 253 253 253 253 253 253 253
57672-253 253 253 82 82 82 2 2 6 2 2 6
57673- 2 2 6 2 2 6 2 2 6 2 2 6
57674- 2 2 6 78 78 78 70 70 70 34 34 34
57675- 14 14 14 6 6 6 0 0 0 0 0 0
57676- 0 0 0 0 0 0 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 0 0 0 0 0 0
57679- 0 0 0 0 0 0 0 0 0 0 0 0
57680- 0 0 0 0 0 0 0 0 0 0 0 0
57681- 0 0 0 0 0 0 0 0 0 0 0 0
57682- 0 0 0 0 0 0 0 0 0 0 0 0
57683- 0 0 0 0 0 0 0 0 0 0 0 0
57684- 0 0 0 0 0 0 0 0 0 0 0 0
57685- 0 0 0 0 0 0 0 0 0 14 14 14
57686- 34 34 34 66 66 66 78 78 78 6 6 6
57687- 2 2 6 18 18 18 218 218 218 253 253 253
57688-253 253 253 253 253 253 253 253 253 246 246 246
57689-226 226 226 231 231 231 246 246 246 253 253 253
57690-253 253 253 253 253 253 253 253 253 253 253 253
57691-253 253 253 253 253 253 253 253 253 253 253 253
57692-253 253 253 178 178 178 2 2 6 2 2 6
57693- 2 2 6 2 2 6 2 2 6 2 2 6
57694- 2 2 6 18 18 18 90 90 90 62 62 62
57695- 30 30 30 10 10 10 0 0 0 0 0 0
57696- 0 0 0 0 0 0 0 0 0 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 0 0 0 0 0 0 0 0 0
57699- 0 0 0 0 0 0 0 0 0 0 0 0
57700- 0 0 0 0 0 0 0 0 0 0 0 0
57701- 0 0 0 0 0 0 0 0 0 0 0 0
57702- 0 0 0 0 0 0 0 0 0 0 0 0
57703- 0 0 0 0 0 0 0 0 0 0 0 0
57704- 0 0 0 0 0 0 0 0 0 0 0 0
57705- 0 0 0 0 0 0 10 10 10 26 26 26
57706- 58 58 58 90 90 90 18 18 18 2 2 6
57707- 2 2 6 110 110 110 253 253 253 253 253 253
57708-253 253 253 253 253 253 253 253 253 253 253 253
57709-250 250 250 253 253 253 253 253 253 253 253 253
57710-253 253 253 253 253 253 253 253 253 253 253 253
57711-253 253 253 253 253 253 253 253 253 253 253 253
57712-253 253 253 231 231 231 18 18 18 2 2 6
57713- 2 2 6 2 2 6 2 2 6 2 2 6
57714- 2 2 6 2 2 6 18 18 18 94 94 94
57715- 54 54 54 26 26 26 10 10 10 0 0 0
57716- 0 0 0 0 0 0 0 0 0 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 0 0 0 0 0 0 0 0 0
57719- 0 0 0 0 0 0 0 0 0 0 0 0
57720- 0 0 0 0 0 0 0 0 0 0 0 0
57721- 0 0 0 0 0 0 0 0 0 0 0 0
57722- 0 0 0 0 0 0 0 0 0 0 0 0
57723- 0 0 0 0 0 0 0 0 0 0 0 0
57724- 0 0 0 0 0 0 0 0 0 0 0 0
57725- 0 0 0 6 6 6 22 22 22 50 50 50
57726- 90 90 90 26 26 26 2 2 6 2 2 6
57727- 14 14 14 195 195 195 250 250 250 253 253 253
57728-253 253 253 253 253 253 253 253 253 253 253 253
57729-253 253 253 253 253 253 253 253 253 253 253 253
57730-253 253 253 253 253 253 253 253 253 253 253 253
57731-253 253 253 253 253 253 253 253 253 253 253 253
57732-250 250 250 242 242 242 54 54 54 2 2 6
57733- 2 2 6 2 2 6 2 2 6 2 2 6
57734- 2 2 6 2 2 6 2 2 6 38 38 38
57735- 86 86 86 50 50 50 22 22 22 6 6 6
57736- 0 0 0 0 0 0 0 0 0 0 0 0
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 0 0 0 0 0 0 0 0 0 0 0 0
57739- 0 0 0 0 0 0 0 0 0 0 0 0
57740- 0 0 0 0 0 0 0 0 0 0 0 0
57741- 0 0 0 0 0 0 0 0 0 0 0 0
57742- 0 0 0 0 0 0 0 0 0 0 0 0
57743- 0 0 0 0 0 0 0 0 0 0 0 0
57744- 0 0 0 0 0 0 0 0 0 0 0 0
57745- 6 6 6 14 14 14 38 38 38 82 82 82
57746- 34 34 34 2 2 6 2 2 6 2 2 6
57747- 42 42 42 195 195 195 246 246 246 253 253 253
57748-253 253 253 253 253 253 253 253 253 250 250 250
57749-242 242 242 242 242 242 250 250 250 253 253 253
57750-253 253 253 253 253 253 253 253 253 253 253 253
57751-253 253 253 250 250 250 246 246 246 238 238 238
57752-226 226 226 231 231 231 101 101 101 6 6 6
57753- 2 2 6 2 2 6 2 2 6 2 2 6
57754- 2 2 6 2 2 6 2 2 6 2 2 6
57755- 38 38 38 82 82 82 42 42 42 14 14 14
57756- 6 6 6 0 0 0 0 0 0 0 0 0
57757- 0 0 0 0 0 0 0 0 0 0 0 0
57758- 0 0 0 0 0 0 0 0 0 0 0 0
57759- 0 0 0 0 0 0 0 0 0 0 0 0
57760- 0 0 0 0 0 0 0 0 0 0 0 0
57761- 0 0 0 0 0 0 0 0 0 0 0 0
57762- 0 0 0 0 0 0 0 0 0 0 0 0
57763- 0 0 0 0 0 0 0 0 0 0 0 0
57764- 0 0 0 0 0 0 0 0 0 0 0 0
57765- 10 10 10 26 26 26 62 62 62 66 66 66
57766- 2 2 6 2 2 6 2 2 6 6 6 6
57767- 70 70 70 170 170 170 206 206 206 234 234 234
57768-246 246 246 250 250 250 250 250 250 238 238 238
57769-226 226 226 231 231 231 238 238 238 250 250 250
57770-250 250 250 250 250 250 246 246 246 231 231 231
57771-214 214 214 206 206 206 202 202 202 202 202 202
57772-198 198 198 202 202 202 182 182 182 18 18 18
57773- 2 2 6 2 2 6 2 2 6 2 2 6
57774- 2 2 6 2 2 6 2 2 6 2 2 6
57775- 2 2 6 62 62 62 66 66 66 30 30 30
57776- 10 10 10 0 0 0 0 0 0 0 0 0
57777- 0 0 0 0 0 0 0 0 0 0 0 0
57778- 0 0 0 0 0 0 0 0 0 0 0 0
57779- 0 0 0 0 0 0 0 0 0 0 0 0
57780- 0 0 0 0 0 0 0 0 0 0 0 0
57781- 0 0 0 0 0 0 0 0 0 0 0 0
57782- 0 0 0 0 0 0 0 0 0 0 0 0
57783- 0 0 0 0 0 0 0 0 0 0 0 0
57784- 0 0 0 0 0 0 0 0 0 0 0 0
57785- 14 14 14 42 42 42 82 82 82 18 18 18
57786- 2 2 6 2 2 6 2 2 6 10 10 10
57787- 94 94 94 182 182 182 218 218 218 242 242 242
57788-250 250 250 253 253 253 253 253 253 250 250 250
57789-234 234 234 253 253 253 253 253 253 253 253 253
57790-253 253 253 253 253 253 253 253 253 246 246 246
57791-238 238 238 226 226 226 210 210 210 202 202 202
57792-195 195 195 195 195 195 210 210 210 158 158 158
57793- 6 6 6 14 14 14 50 50 50 14 14 14
57794- 2 2 6 2 2 6 2 2 6 2 2 6
57795- 2 2 6 6 6 6 86 86 86 46 46 46
57796- 18 18 18 6 6 6 0 0 0 0 0 0
57797- 0 0 0 0 0 0 0 0 0 0 0 0
57798- 0 0 0 0 0 0 0 0 0 0 0 0
57799- 0 0 0 0 0 0 0 0 0 0 0 0
57800- 0 0 0 0 0 0 0 0 0 0 0 0
57801- 0 0 0 0 0 0 0 0 0 0 0 0
57802- 0 0 0 0 0 0 0 0 0 0 0 0
57803- 0 0 0 0 0 0 0 0 0 0 0 0
57804- 0 0 0 0 0 0 0 0 0 6 6 6
57805- 22 22 22 54 54 54 70 70 70 2 2 6
57806- 2 2 6 10 10 10 2 2 6 22 22 22
57807-166 166 166 231 231 231 250 250 250 253 253 253
57808-253 253 253 253 253 253 253 253 253 250 250 250
57809-242 242 242 253 253 253 253 253 253 253 253 253
57810-253 253 253 253 253 253 253 253 253 253 253 253
57811-253 253 253 253 253 253 253 253 253 246 246 246
57812-231 231 231 206 206 206 198 198 198 226 226 226
57813- 94 94 94 2 2 6 6 6 6 38 38 38
57814- 30 30 30 2 2 6 2 2 6 2 2 6
57815- 2 2 6 2 2 6 62 62 62 66 66 66
57816- 26 26 26 10 10 10 0 0 0 0 0 0
57817- 0 0 0 0 0 0 0 0 0 0 0 0
57818- 0 0 0 0 0 0 0 0 0 0 0 0
57819- 0 0 0 0 0 0 0 0 0 0 0 0
57820- 0 0 0 0 0 0 0 0 0 0 0 0
57821- 0 0 0 0 0 0 0 0 0 0 0 0
57822- 0 0 0 0 0 0 0 0 0 0 0 0
57823- 0 0 0 0 0 0 0 0 0 0 0 0
57824- 0 0 0 0 0 0 0 0 0 10 10 10
57825- 30 30 30 74 74 74 50 50 50 2 2 6
57826- 26 26 26 26 26 26 2 2 6 106 106 106
57827-238 238 238 253 253 253 253 253 253 253 253 253
57828-253 253 253 253 253 253 253 253 253 253 253 253
57829-253 253 253 253 253 253 253 253 253 253 253 253
57830-253 253 253 253 253 253 253 253 253 253 253 253
57831-253 253 253 253 253 253 253 253 253 253 253 253
57832-253 253 253 246 246 246 218 218 218 202 202 202
57833-210 210 210 14 14 14 2 2 6 2 2 6
57834- 30 30 30 22 22 22 2 2 6 2 2 6
57835- 2 2 6 2 2 6 18 18 18 86 86 86
57836- 42 42 42 14 14 14 0 0 0 0 0 0
57837- 0 0 0 0 0 0 0 0 0 0 0 0
57838- 0 0 0 0 0 0 0 0 0 0 0 0
57839- 0 0 0 0 0 0 0 0 0 0 0 0
57840- 0 0 0 0 0 0 0 0 0 0 0 0
57841- 0 0 0 0 0 0 0 0 0 0 0 0
57842- 0 0 0 0 0 0 0 0 0 0 0 0
57843- 0 0 0 0 0 0 0 0 0 0 0 0
57844- 0 0 0 0 0 0 0 0 0 14 14 14
57845- 42 42 42 90 90 90 22 22 22 2 2 6
57846- 42 42 42 2 2 6 18 18 18 218 218 218
57847-253 253 253 253 253 253 253 253 253 253 253 253
57848-253 253 253 253 253 253 253 253 253 253 253 253
57849-253 253 253 253 253 253 253 253 253 253 253 253
57850-253 253 253 253 253 253 253 253 253 253 253 253
57851-253 253 253 253 253 253 253 253 253 253 253 253
57852-253 253 253 253 253 253 250 250 250 221 221 221
57853-218 218 218 101 101 101 2 2 6 14 14 14
57854- 18 18 18 38 38 38 10 10 10 2 2 6
57855- 2 2 6 2 2 6 2 2 6 78 78 78
57856- 58 58 58 22 22 22 6 6 6 0 0 0
57857- 0 0 0 0 0 0 0 0 0 0 0 0
57858- 0 0 0 0 0 0 0 0 0 0 0 0
57859- 0 0 0 0 0 0 0 0 0 0 0 0
57860- 0 0 0 0 0 0 0 0 0 0 0 0
57861- 0 0 0 0 0 0 0 0 0 0 0 0
57862- 0 0 0 0 0 0 0 0 0 0 0 0
57863- 0 0 0 0 0 0 0 0 0 0 0 0
57864- 0 0 0 0 0 0 6 6 6 18 18 18
57865- 54 54 54 82 82 82 2 2 6 26 26 26
57866- 22 22 22 2 2 6 123 123 123 253 253 253
57867-253 253 253 253 253 253 253 253 253 253 253 253
57868-253 253 253 253 253 253 253 253 253 253 253 253
57869-253 253 253 253 253 253 253 253 253 253 253 253
57870-253 253 253 253 253 253 253 253 253 253 253 253
57871-253 253 253 253 253 253 253 253 253 253 253 253
57872-253 253 253 253 253 253 253 253 253 250 250 250
57873-238 238 238 198 198 198 6 6 6 38 38 38
57874- 58 58 58 26 26 26 38 38 38 2 2 6
57875- 2 2 6 2 2 6 2 2 6 46 46 46
57876- 78 78 78 30 30 30 10 10 10 0 0 0
57877- 0 0 0 0 0 0 0 0 0 0 0 0
57878- 0 0 0 0 0 0 0 0 0 0 0 0
57879- 0 0 0 0 0 0 0 0 0 0 0 0
57880- 0 0 0 0 0 0 0 0 0 0 0 0
57881- 0 0 0 0 0 0 0 0 0 0 0 0
57882- 0 0 0 0 0 0 0 0 0 0 0 0
57883- 0 0 0 0 0 0 0 0 0 0 0 0
57884- 0 0 0 0 0 0 10 10 10 30 30 30
57885- 74 74 74 58 58 58 2 2 6 42 42 42
57886- 2 2 6 22 22 22 231 231 231 253 253 253
57887-253 253 253 253 253 253 253 253 253 253 253 253
57888-253 253 253 253 253 253 253 253 253 250 250 250
57889-253 253 253 253 253 253 253 253 253 253 253 253
57890-253 253 253 253 253 253 253 253 253 253 253 253
57891-253 253 253 253 253 253 253 253 253 253 253 253
57892-253 253 253 253 253 253 253 253 253 253 253 253
57893-253 253 253 246 246 246 46 46 46 38 38 38
57894- 42 42 42 14 14 14 38 38 38 14 14 14
57895- 2 2 6 2 2 6 2 2 6 6 6 6
57896- 86 86 86 46 46 46 14 14 14 0 0 0
57897- 0 0 0 0 0 0 0 0 0 0 0 0
57898- 0 0 0 0 0 0 0 0 0 0 0 0
57899- 0 0 0 0 0 0 0 0 0 0 0 0
57900- 0 0 0 0 0 0 0 0 0 0 0 0
57901- 0 0 0 0 0 0 0 0 0 0 0 0
57902- 0 0 0 0 0 0 0 0 0 0 0 0
57903- 0 0 0 0 0 0 0 0 0 0 0 0
57904- 0 0 0 6 6 6 14 14 14 42 42 42
57905- 90 90 90 18 18 18 18 18 18 26 26 26
57906- 2 2 6 116 116 116 253 253 253 253 253 253
57907-253 253 253 253 253 253 253 253 253 253 253 253
57908-253 253 253 253 253 253 250 250 250 238 238 238
57909-253 253 253 253 253 253 253 253 253 253 253 253
57910-253 253 253 253 253 253 253 253 253 253 253 253
57911-253 253 253 253 253 253 253 253 253 253 253 253
57912-253 253 253 253 253 253 253 253 253 253 253 253
57913-253 253 253 253 253 253 94 94 94 6 6 6
57914- 2 2 6 2 2 6 10 10 10 34 34 34
57915- 2 2 6 2 2 6 2 2 6 2 2 6
57916- 74 74 74 58 58 58 22 22 22 6 6 6
57917- 0 0 0 0 0 0 0 0 0 0 0 0
57918- 0 0 0 0 0 0 0 0 0 0 0 0
57919- 0 0 0 0 0 0 0 0 0 0 0 0
57920- 0 0 0 0 0 0 0 0 0 0 0 0
57921- 0 0 0 0 0 0 0 0 0 0 0 0
57922- 0 0 0 0 0 0 0 0 0 0 0 0
57923- 0 0 0 0 0 0 0 0 0 0 0 0
57924- 0 0 0 10 10 10 26 26 26 66 66 66
57925- 82 82 82 2 2 6 38 38 38 6 6 6
57926- 14 14 14 210 210 210 253 253 253 253 253 253
57927-253 253 253 253 253 253 253 253 253 253 253 253
57928-253 253 253 253 253 253 246 246 246 242 242 242
57929-253 253 253 253 253 253 253 253 253 253 253 253
57930-253 253 253 253 253 253 253 253 253 253 253 253
57931-253 253 253 253 253 253 253 253 253 253 253 253
57932-253 253 253 253 253 253 253 253 253 253 253 253
57933-253 253 253 253 253 253 144 144 144 2 2 6
57934- 2 2 6 2 2 6 2 2 6 46 46 46
57935- 2 2 6 2 2 6 2 2 6 2 2 6
57936- 42 42 42 74 74 74 30 30 30 10 10 10
57937- 0 0 0 0 0 0 0 0 0 0 0 0
57938- 0 0 0 0 0 0 0 0 0 0 0 0
57939- 0 0 0 0 0 0 0 0 0 0 0 0
57940- 0 0 0 0 0 0 0 0 0 0 0 0
57941- 0 0 0 0 0 0 0 0 0 0 0 0
57942- 0 0 0 0 0 0 0 0 0 0 0 0
57943- 0 0 0 0 0 0 0 0 0 0 0 0
57944- 6 6 6 14 14 14 42 42 42 90 90 90
57945- 26 26 26 6 6 6 42 42 42 2 2 6
57946- 74 74 74 250 250 250 253 253 253 253 253 253
57947-253 253 253 253 253 253 253 253 253 253 253 253
57948-253 253 253 253 253 253 242 242 242 242 242 242
57949-253 253 253 253 253 253 253 253 253 253 253 253
57950-253 253 253 253 253 253 253 253 253 253 253 253
57951-253 253 253 253 253 253 253 253 253 253 253 253
57952-253 253 253 253 253 253 253 253 253 253 253 253
57953-253 253 253 253 253 253 182 182 182 2 2 6
57954- 2 2 6 2 2 6 2 2 6 46 46 46
57955- 2 2 6 2 2 6 2 2 6 2 2 6
57956- 10 10 10 86 86 86 38 38 38 10 10 10
57957- 0 0 0 0 0 0 0 0 0 0 0 0
57958- 0 0 0 0 0 0 0 0 0 0 0 0
57959- 0 0 0 0 0 0 0 0 0 0 0 0
57960- 0 0 0 0 0 0 0 0 0 0 0 0
57961- 0 0 0 0 0 0 0 0 0 0 0 0
57962- 0 0 0 0 0 0 0 0 0 0 0 0
57963- 0 0 0 0 0 0 0 0 0 0 0 0
57964- 10 10 10 26 26 26 66 66 66 82 82 82
57965- 2 2 6 22 22 22 18 18 18 2 2 6
57966-149 149 149 253 253 253 253 253 253 253 253 253
57967-253 253 253 253 253 253 253 253 253 253 253 253
57968-253 253 253 253 253 253 234 234 234 242 242 242
57969-253 253 253 253 253 253 253 253 253 253 253 253
57970-253 253 253 253 253 253 253 253 253 253 253 253
57971-253 253 253 253 253 253 253 253 253 253 253 253
57972-253 253 253 253 253 253 253 253 253 253 253 253
57973-253 253 253 253 253 253 206 206 206 2 2 6
57974- 2 2 6 2 2 6 2 2 6 38 38 38
57975- 2 2 6 2 2 6 2 2 6 2 2 6
57976- 6 6 6 86 86 86 46 46 46 14 14 14
57977- 0 0 0 0 0 0 0 0 0 0 0 0
57978- 0 0 0 0 0 0 0 0 0 0 0 0
57979- 0 0 0 0 0 0 0 0 0 0 0 0
57980- 0 0 0 0 0 0 0 0 0 0 0 0
57981- 0 0 0 0 0 0 0 0 0 0 0 0
57982- 0 0 0 0 0 0 0 0 0 0 0 0
57983- 0 0 0 0 0 0 0 0 0 6 6 6
57984- 18 18 18 46 46 46 86 86 86 18 18 18
57985- 2 2 6 34 34 34 10 10 10 6 6 6
57986-210 210 210 253 253 253 253 253 253 253 253 253
57987-253 253 253 253 253 253 253 253 253 253 253 253
57988-253 253 253 253 253 253 234 234 234 242 242 242
57989-253 253 253 253 253 253 253 253 253 253 253 253
57990-253 253 253 253 253 253 253 253 253 253 253 253
57991-253 253 253 253 253 253 253 253 253 253 253 253
57992-253 253 253 253 253 253 253 253 253 253 253 253
57993-253 253 253 253 253 253 221 221 221 6 6 6
57994- 2 2 6 2 2 6 6 6 6 30 30 30
57995- 2 2 6 2 2 6 2 2 6 2 2 6
57996- 2 2 6 82 82 82 54 54 54 18 18 18
57997- 6 6 6 0 0 0 0 0 0 0 0 0
57998- 0 0 0 0 0 0 0 0 0 0 0 0
57999- 0 0 0 0 0 0 0 0 0 0 0 0
58000- 0 0 0 0 0 0 0 0 0 0 0 0
58001- 0 0 0 0 0 0 0 0 0 0 0 0
58002- 0 0 0 0 0 0 0 0 0 0 0 0
58003- 0 0 0 0 0 0 0 0 0 10 10 10
58004- 26 26 26 66 66 66 62 62 62 2 2 6
58005- 2 2 6 38 38 38 10 10 10 26 26 26
58006-238 238 238 253 253 253 253 253 253 253 253 253
58007-253 253 253 253 253 253 253 253 253 253 253 253
58008-253 253 253 253 253 253 231 231 231 238 238 238
58009-253 253 253 253 253 253 253 253 253 253 253 253
58010-253 253 253 253 253 253 253 253 253 253 253 253
58011-253 253 253 253 253 253 253 253 253 253 253 253
58012-253 253 253 253 253 253 253 253 253 253 253 253
58013-253 253 253 253 253 253 231 231 231 6 6 6
58014- 2 2 6 2 2 6 10 10 10 30 30 30
58015- 2 2 6 2 2 6 2 2 6 2 2 6
58016- 2 2 6 66 66 66 58 58 58 22 22 22
58017- 6 6 6 0 0 0 0 0 0 0 0 0
58018- 0 0 0 0 0 0 0 0 0 0 0 0
58019- 0 0 0 0 0 0 0 0 0 0 0 0
58020- 0 0 0 0 0 0 0 0 0 0 0 0
58021- 0 0 0 0 0 0 0 0 0 0 0 0
58022- 0 0 0 0 0 0 0 0 0 0 0 0
58023- 0 0 0 0 0 0 0 0 0 10 10 10
58024- 38 38 38 78 78 78 6 6 6 2 2 6
58025- 2 2 6 46 46 46 14 14 14 42 42 42
58026-246 246 246 253 253 253 253 253 253 253 253 253
58027-253 253 253 253 253 253 253 253 253 253 253 253
58028-253 253 253 253 253 253 231 231 231 242 242 242
58029-253 253 253 253 253 253 253 253 253 253 253 253
58030-253 253 253 253 253 253 253 253 253 253 253 253
58031-253 253 253 253 253 253 253 253 253 253 253 253
58032-253 253 253 253 253 253 253 253 253 253 253 253
58033-253 253 253 253 253 253 234 234 234 10 10 10
58034- 2 2 6 2 2 6 22 22 22 14 14 14
58035- 2 2 6 2 2 6 2 2 6 2 2 6
58036- 2 2 6 66 66 66 62 62 62 22 22 22
58037- 6 6 6 0 0 0 0 0 0 0 0 0
58038- 0 0 0 0 0 0 0 0 0 0 0 0
58039- 0 0 0 0 0 0 0 0 0 0 0 0
58040- 0 0 0 0 0 0 0 0 0 0 0 0
58041- 0 0 0 0 0 0 0 0 0 0 0 0
58042- 0 0 0 0 0 0 0 0 0 0 0 0
58043- 0 0 0 0 0 0 6 6 6 18 18 18
58044- 50 50 50 74 74 74 2 2 6 2 2 6
58045- 14 14 14 70 70 70 34 34 34 62 62 62
58046-250 250 250 253 253 253 253 253 253 253 253 253
58047-253 253 253 253 253 253 253 253 253 253 253 253
58048-253 253 253 253 253 253 231 231 231 246 246 246
58049-253 253 253 253 253 253 253 253 253 253 253 253
58050-253 253 253 253 253 253 253 253 253 253 253 253
58051-253 253 253 253 253 253 253 253 253 253 253 253
58052-253 253 253 253 253 253 253 253 253 253 253 253
58053-253 253 253 253 253 253 234 234 234 14 14 14
58054- 2 2 6 2 2 6 30 30 30 2 2 6
58055- 2 2 6 2 2 6 2 2 6 2 2 6
58056- 2 2 6 66 66 66 62 62 62 22 22 22
58057- 6 6 6 0 0 0 0 0 0 0 0 0
58058- 0 0 0 0 0 0 0 0 0 0 0 0
58059- 0 0 0 0 0 0 0 0 0 0 0 0
58060- 0 0 0 0 0 0 0 0 0 0 0 0
58061- 0 0 0 0 0 0 0 0 0 0 0 0
58062- 0 0 0 0 0 0 0 0 0 0 0 0
58063- 0 0 0 0 0 0 6 6 6 18 18 18
58064- 54 54 54 62 62 62 2 2 6 2 2 6
58065- 2 2 6 30 30 30 46 46 46 70 70 70
58066-250 250 250 253 253 253 253 253 253 253 253 253
58067-253 253 253 253 253 253 253 253 253 253 253 253
58068-253 253 253 253 253 253 231 231 231 246 246 246
58069-253 253 253 253 253 253 253 253 253 253 253 253
58070-253 253 253 253 253 253 253 253 253 253 253 253
58071-253 253 253 253 253 253 253 253 253 253 253 253
58072-253 253 253 253 253 253 253 253 253 253 253 253
58073-253 253 253 253 253 253 226 226 226 10 10 10
58074- 2 2 6 6 6 6 30 30 30 2 2 6
58075- 2 2 6 2 2 6 2 2 6 2 2 6
58076- 2 2 6 66 66 66 58 58 58 22 22 22
58077- 6 6 6 0 0 0 0 0 0 0 0 0
58078- 0 0 0 0 0 0 0 0 0 0 0 0
58079- 0 0 0 0 0 0 0 0 0 0 0 0
58080- 0 0 0 0 0 0 0 0 0 0 0 0
58081- 0 0 0 0 0 0 0 0 0 0 0 0
58082- 0 0 0 0 0 0 0 0 0 0 0 0
58083- 0 0 0 0 0 0 6 6 6 22 22 22
58084- 58 58 58 62 62 62 2 2 6 2 2 6
58085- 2 2 6 2 2 6 30 30 30 78 78 78
58086-250 250 250 253 253 253 253 253 253 253 253 253
58087-253 253 253 253 253 253 253 253 253 253 253 253
58088-253 253 253 253 253 253 231 231 231 246 246 246
58089-253 253 253 253 253 253 253 253 253 253 253 253
58090-253 253 253 253 253 253 253 253 253 253 253 253
58091-253 253 253 253 253 253 253 253 253 253 253 253
58092-253 253 253 253 253 253 253 253 253 253 253 253
58093-253 253 253 253 253 253 206 206 206 2 2 6
58094- 22 22 22 34 34 34 18 14 6 22 22 22
58095- 26 26 26 18 18 18 6 6 6 2 2 6
58096- 2 2 6 82 82 82 54 54 54 18 18 18
58097- 6 6 6 0 0 0 0 0 0 0 0 0
58098- 0 0 0 0 0 0 0 0 0 0 0 0
58099- 0 0 0 0 0 0 0 0 0 0 0 0
58100- 0 0 0 0 0 0 0 0 0 0 0 0
58101- 0 0 0 0 0 0 0 0 0 0 0 0
58102- 0 0 0 0 0 0 0 0 0 0 0 0
58103- 0 0 0 0 0 0 6 6 6 26 26 26
58104- 62 62 62 106 106 106 74 54 14 185 133 11
58105-210 162 10 121 92 8 6 6 6 62 62 62
58106-238 238 238 253 253 253 253 253 253 253 253 253
58107-253 253 253 253 253 253 253 253 253 253 253 253
58108-253 253 253 253 253 253 231 231 231 246 246 246
58109-253 253 253 253 253 253 253 253 253 253 253 253
58110-253 253 253 253 253 253 253 253 253 253 253 253
58111-253 253 253 253 253 253 253 253 253 253 253 253
58112-253 253 253 253 253 253 253 253 253 253 253 253
58113-253 253 253 253 253 253 158 158 158 18 18 18
58114- 14 14 14 2 2 6 2 2 6 2 2 6
58115- 6 6 6 18 18 18 66 66 66 38 38 38
58116- 6 6 6 94 94 94 50 50 50 18 18 18
58117- 6 6 6 0 0 0 0 0 0 0 0 0
58118- 0 0 0 0 0 0 0 0 0 0 0 0
58119- 0 0 0 0 0 0 0 0 0 0 0 0
58120- 0 0 0 0 0 0 0 0 0 0 0 0
58121- 0 0 0 0 0 0 0 0 0 0 0 0
58122- 0 0 0 0 0 0 0 0 0 6 6 6
58123- 10 10 10 10 10 10 18 18 18 38 38 38
58124- 78 78 78 142 134 106 216 158 10 242 186 14
58125-246 190 14 246 190 14 156 118 10 10 10 10
58126- 90 90 90 238 238 238 253 253 253 253 253 253
58127-253 253 253 253 253 253 253 253 253 253 253 253
58128-253 253 253 253 253 253 231 231 231 250 250 250
58129-253 253 253 253 253 253 253 253 253 253 253 253
58130-253 253 253 253 253 253 253 253 253 253 253 253
58131-253 253 253 253 253 253 253 253 253 253 253 253
58132-253 253 253 253 253 253 253 253 253 246 230 190
58133-238 204 91 238 204 91 181 142 44 37 26 9
58134- 2 2 6 2 2 6 2 2 6 2 2 6
58135- 2 2 6 2 2 6 38 38 38 46 46 46
58136- 26 26 26 106 106 106 54 54 54 18 18 18
58137- 6 6 6 0 0 0 0 0 0 0 0 0
58138- 0 0 0 0 0 0 0 0 0 0 0 0
58139- 0 0 0 0 0 0 0 0 0 0 0 0
58140- 0 0 0 0 0 0 0 0 0 0 0 0
58141- 0 0 0 0 0 0 0 0 0 0 0 0
58142- 0 0 0 6 6 6 14 14 14 22 22 22
58143- 30 30 30 38 38 38 50 50 50 70 70 70
58144-106 106 106 190 142 34 226 170 11 242 186 14
58145-246 190 14 246 190 14 246 190 14 154 114 10
58146- 6 6 6 74 74 74 226 226 226 253 253 253
58147-253 253 253 253 253 253 253 253 253 253 253 253
58148-253 253 253 253 253 253 231 231 231 250 250 250
58149-253 253 253 253 253 253 253 253 253 253 253 253
58150-253 253 253 253 253 253 253 253 253 253 253 253
58151-253 253 253 253 253 253 253 253 253 253 253 253
58152-253 253 253 253 253 253 253 253 253 228 184 62
58153-241 196 14 241 208 19 232 195 16 38 30 10
58154- 2 2 6 2 2 6 2 2 6 2 2 6
58155- 2 2 6 6 6 6 30 30 30 26 26 26
58156-203 166 17 154 142 90 66 66 66 26 26 26
58157- 6 6 6 0 0 0 0 0 0 0 0 0
58158- 0 0 0 0 0 0 0 0 0 0 0 0
58159- 0 0 0 0 0 0 0 0 0 0 0 0
58160- 0 0 0 0 0 0 0 0 0 0 0 0
58161- 0 0 0 0 0 0 0 0 0 0 0 0
58162- 6 6 6 18 18 18 38 38 38 58 58 58
58163- 78 78 78 86 86 86 101 101 101 123 123 123
58164-175 146 61 210 150 10 234 174 13 246 186 14
58165-246 190 14 246 190 14 246 190 14 238 190 10
58166-102 78 10 2 2 6 46 46 46 198 198 198
58167-253 253 253 253 253 253 253 253 253 253 253 253
58168-253 253 253 253 253 253 234 234 234 242 242 242
58169-253 253 253 253 253 253 253 253 253 253 253 253
58170-253 253 253 253 253 253 253 253 253 253 253 253
58171-253 253 253 253 253 253 253 253 253 253 253 253
58172-253 253 253 253 253 253 253 253 253 224 178 62
58173-242 186 14 241 196 14 210 166 10 22 18 6
58174- 2 2 6 2 2 6 2 2 6 2 2 6
58175- 2 2 6 2 2 6 6 6 6 121 92 8
58176-238 202 15 232 195 16 82 82 82 34 34 34
58177- 10 10 10 0 0 0 0 0 0 0 0 0
58178- 0 0 0 0 0 0 0 0 0 0 0 0
58179- 0 0 0 0 0 0 0 0 0 0 0 0
58180- 0 0 0 0 0 0 0 0 0 0 0 0
58181- 0 0 0 0 0 0 0 0 0 0 0 0
58182- 14 14 14 38 38 38 70 70 70 154 122 46
58183-190 142 34 200 144 11 197 138 11 197 138 11
58184-213 154 11 226 170 11 242 186 14 246 190 14
58185-246 190 14 246 190 14 246 190 14 246 190 14
58186-225 175 15 46 32 6 2 2 6 22 22 22
58187-158 158 158 250 250 250 253 253 253 253 253 253
58188-253 253 253 253 253 253 253 253 253 253 253 253
58189-253 253 253 253 253 253 253 253 253 253 253 253
58190-253 253 253 253 253 253 253 253 253 253 253 253
58191-253 253 253 253 253 253 253 253 253 253 253 253
58192-253 253 253 250 250 250 242 242 242 224 178 62
58193-239 182 13 236 186 11 213 154 11 46 32 6
58194- 2 2 6 2 2 6 2 2 6 2 2 6
58195- 2 2 6 2 2 6 61 42 6 225 175 15
58196-238 190 10 236 186 11 112 100 78 42 42 42
58197- 14 14 14 0 0 0 0 0 0 0 0 0
58198- 0 0 0 0 0 0 0 0 0 0 0 0
58199- 0 0 0 0 0 0 0 0 0 0 0 0
58200- 0 0 0 0 0 0 0 0 0 0 0 0
58201- 0 0 0 0 0 0 0 0 0 6 6 6
58202- 22 22 22 54 54 54 154 122 46 213 154 11
58203-226 170 11 230 174 11 226 170 11 226 170 11
58204-236 178 12 242 186 14 246 190 14 246 190 14
58205-246 190 14 246 190 14 246 190 14 246 190 14
58206-241 196 14 184 144 12 10 10 10 2 2 6
58207- 6 6 6 116 116 116 242 242 242 253 253 253
58208-253 253 253 253 253 253 253 253 253 253 253 253
58209-253 253 253 253 253 253 253 253 253 253 253 253
58210-253 253 253 253 253 253 253 253 253 253 253 253
58211-253 253 253 253 253 253 253 253 253 253 253 253
58212-253 253 253 231 231 231 198 198 198 214 170 54
58213-236 178 12 236 178 12 210 150 10 137 92 6
58214- 18 14 6 2 2 6 2 2 6 2 2 6
58215- 6 6 6 70 47 6 200 144 11 236 178 12
58216-239 182 13 239 182 13 124 112 88 58 58 58
58217- 22 22 22 6 6 6 0 0 0 0 0 0
58218- 0 0 0 0 0 0 0 0 0 0 0 0
58219- 0 0 0 0 0 0 0 0 0 0 0 0
58220- 0 0 0 0 0 0 0 0 0 0 0 0
58221- 0 0 0 0 0 0 0 0 0 10 10 10
58222- 30 30 30 70 70 70 180 133 36 226 170 11
58223-239 182 13 242 186 14 242 186 14 246 186 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 232 195 16 98 70 6 2 2 6
58227- 2 2 6 2 2 6 66 66 66 221 221 221
58228-253 253 253 253 253 253 253 253 253 253 253 253
58229-253 253 253 253 253 253 253 253 253 253 253 253
58230-253 253 253 253 253 253 253 253 253 253 253 253
58231-253 253 253 253 253 253 253 253 253 253 253 253
58232-253 253 253 206 206 206 198 198 198 214 166 58
58233-230 174 11 230 174 11 216 158 10 192 133 9
58234-163 110 8 116 81 8 102 78 10 116 81 8
58235-167 114 7 197 138 11 226 170 11 239 182 13
58236-242 186 14 242 186 14 162 146 94 78 78 78
58237- 34 34 34 14 14 14 6 6 6 0 0 0
58238- 0 0 0 0 0 0 0 0 0 0 0 0
58239- 0 0 0 0 0 0 0 0 0 0 0 0
58240- 0 0 0 0 0 0 0 0 0 0 0 0
58241- 0 0 0 0 0 0 0 0 0 6 6 6
58242- 30 30 30 78 78 78 190 142 34 226 170 11
58243-239 182 13 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 241 196 14 203 166 17 22 18 6
58247- 2 2 6 2 2 6 2 2 6 38 38 38
58248-218 218 218 253 253 253 253 253 253 253 253 253
58249-253 253 253 253 253 253 253 253 253 253 253 253
58250-253 253 253 253 253 253 253 253 253 253 253 253
58251-253 253 253 253 253 253 253 253 253 253 253 253
58252-250 250 250 206 206 206 198 198 198 202 162 69
58253-226 170 11 236 178 12 224 166 10 210 150 10
58254-200 144 11 197 138 11 192 133 9 197 138 11
58255-210 150 10 226 170 11 242 186 14 246 190 14
58256-246 190 14 246 186 14 225 175 15 124 112 88
58257- 62 62 62 30 30 30 14 14 14 6 6 6
58258- 0 0 0 0 0 0 0 0 0 0 0 0
58259- 0 0 0 0 0 0 0 0 0 0 0 0
58260- 0 0 0 0 0 0 0 0 0 0 0 0
58261- 0 0 0 0 0 0 0 0 0 10 10 10
58262- 30 30 30 78 78 78 174 135 50 224 166 10
58263-239 182 13 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 190 14 246 190 14 241 196 14 139 102 15
58267- 2 2 6 2 2 6 2 2 6 2 2 6
58268- 78 78 78 250 250 250 253 253 253 253 253 253
58269-253 253 253 253 253 253 253 253 253 253 253 253
58270-253 253 253 253 253 253 253 253 253 253 253 253
58271-253 253 253 253 253 253 253 253 253 253 253 253
58272-250 250 250 214 214 214 198 198 198 190 150 46
58273-219 162 10 236 178 12 234 174 13 224 166 10
58274-216 158 10 213 154 11 213 154 11 216 158 10
58275-226 170 11 239 182 13 246 190 14 246 190 14
58276-246 190 14 246 190 14 242 186 14 206 162 42
58277-101 101 101 58 58 58 30 30 30 14 14 14
58278- 6 6 6 0 0 0 0 0 0 0 0 0
58279- 0 0 0 0 0 0 0 0 0 0 0 0
58280- 0 0 0 0 0 0 0 0 0 0 0 0
58281- 0 0 0 0 0 0 0 0 0 10 10 10
58282- 30 30 30 74 74 74 174 135 50 216 158 10
58283-236 178 12 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 246 190 14
58286-246 190 14 246 190 14 241 196 14 226 184 13
58287- 61 42 6 2 2 6 2 2 6 2 2 6
58288- 22 22 22 238 238 238 253 253 253 253 253 253
58289-253 253 253 253 253 253 253 253 253 253 253 253
58290-253 253 253 253 253 253 253 253 253 253 253 253
58291-253 253 253 253 253 253 253 253 253 253 253 253
58292-253 253 253 226 226 226 187 187 187 180 133 36
58293-216 158 10 236 178 12 239 182 13 236 178 12
58294-230 174 11 226 170 11 226 170 11 230 174 11
58295-236 178 12 242 186 14 246 190 14 246 190 14
58296-246 190 14 246 190 14 246 186 14 239 182 13
58297-206 162 42 106 106 106 66 66 66 34 34 34
58298- 14 14 14 6 6 6 0 0 0 0 0 0
58299- 0 0 0 0 0 0 0 0 0 0 0 0
58300- 0 0 0 0 0 0 0 0 0 0 0 0
58301- 0 0 0 0 0 0 0 0 0 6 6 6
58302- 26 26 26 70 70 70 163 133 67 213 154 11
58303-236 178 12 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 246 190 14 246 190 14 246 190 14
58306-246 190 14 246 190 14 246 190 14 241 196 14
58307-190 146 13 18 14 6 2 2 6 2 2 6
58308- 46 46 46 246 246 246 253 253 253 253 253 253
58309-253 253 253 253 253 253 253 253 253 253 253 253
58310-253 253 253 253 253 253 253 253 253 253 253 253
58311-253 253 253 253 253 253 253 253 253 253 253 253
58312-253 253 253 221 221 221 86 86 86 156 107 11
58313-216 158 10 236 178 12 242 186 14 246 186 14
58314-242 186 14 239 182 13 239 182 13 242 186 14
58315-242 186 14 246 186 14 246 190 14 246 190 14
58316-246 190 14 246 190 14 246 190 14 246 190 14
58317-242 186 14 225 175 15 142 122 72 66 66 66
58318- 30 30 30 10 10 10 0 0 0 0 0 0
58319- 0 0 0 0 0 0 0 0 0 0 0 0
58320- 0 0 0 0 0 0 0 0 0 0 0 0
58321- 0 0 0 0 0 0 0 0 0 6 6 6
58322- 26 26 26 70 70 70 163 133 67 210 150 10
58323-236 178 12 246 190 14 246 190 14 246 190 14
58324-246 190 14 246 190 14 246 190 14 246 190 14
58325-246 190 14 246 190 14 246 190 14 246 190 14
58326-246 190 14 246 190 14 246 190 14 246 190 14
58327-232 195 16 121 92 8 34 34 34 106 106 106
58328-221 221 221 253 253 253 253 253 253 253 253 253
58329-253 253 253 253 253 253 253 253 253 253 253 253
58330-253 253 253 253 253 253 253 253 253 253 253 253
58331-253 253 253 253 253 253 253 253 253 253 253 253
58332-242 242 242 82 82 82 18 14 6 163 110 8
58333-216 158 10 236 178 12 242 186 14 246 190 14
58334-246 190 14 246 190 14 246 190 14 246 190 14
58335-246 190 14 246 190 14 246 190 14 246 190 14
58336-246 190 14 246 190 14 246 190 14 246 190 14
58337-246 190 14 246 190 14 242 186 14 163 133 67
58338- 46 46 46 18 18 18 6 6 6 0 0 0
58339- 0 0 0 0 0 0 0 0 0 0 0 0
58340- 0 0 0 0 0 0 0 0 0 0 0 0
58341- 0 0 0 0 0 0 0 0 0 10 10 10
58342- 30 30 30 78 78 78 163 133 67 210 150 10
58343-236 178 12 246 186 14 246 190 14 246 190 14
58344-246 190 14 246 190 14 246 190 14 246 190 14
58345-246 190 14 246 190 14 246 190 14 246 190 14
58346-246 190 14 246 190 14 246 190 14 246 190 14
58347-241 196 14 215 174 15 190 178 144 253 253 253
58348-253 253 253 253 253 253 253 253 253 253 253 253
58349-253 253 253 253 253 253 253 253 253 253 253 253
58350-253 253 253 253 253 253 253 253 253 253 253 253
58351-253 253 253 253 253 253 253 253 253 218 218 218
58352- 58 58 58 2 2 6 22 18 6 167 114 7
58353-216 158 10 236 178 12 246 186 14 246 190 14
58354-246 190 14 246 190 14 246 190 14 246 190 14
58355-246 190 14 246 190 14 246 190 14 246 190 14
58356-246 190 14 246 190 14 246 190 14 246 190 14
58357-246 190 14 246 186 14 242 186 14 190 150 46
58358- 54 54 54 22 22 22 6 6 6 0 0 0
58359- 0 0 0 0 0 0 0 0 0 0 0 0
58360- 0 0 0 0 0 0 0 0 0 0 0 0
58361- 0 0 0 0 0 0 0 0 0 14 14 14
58362- 38 38 38 86 86 86 180 133 36 213 154 11
58363-236 178 12 246 186 14 246 190 14 246 190 14
58364-246 190 14 246 190 14 246 190 14 246 190 14
58365-246 190 14 246 190 14 246 190 14 246 190 14
58366-246 190 14 246 190 14 246 190 14 246 190 14
58367-246 190 14 232 195 16 190 146 13 214 214 214
58368-253 253 253 253 253 253 253 253 253 253 253 253
58369-253 253 253 253 253 253 253 253 253 253 253 253
58370-253 253 253 253 253 253 253 253 253 253 253 253
58371-253 253 253 250 250 250 170 170 170 26 26 26
58372- 2 2 6 2 2 6 37 26 9 163 110 8
58373-219 162 10 239 182 13 246 186 14 246 190 14
58374-246 190 14 246 190 14 246 190 14 246 190 14
58375-246 190 14 246 190 14 246 190 14 246 190 14
58376-246 190 14 246 190 14 246 190 14 246 190 14
58377-246 186 14 236 178 12 224 166 10 142 122 72
58378- 46 46 46 18 18 18 6 6 6 0 0 0
58379- 0 0 0 0 0 0 0 0 0 0 0 0
58380- 0 0 0 0 0 0 0 0 0 0 0 0
58381- 0 0 0 0 0 0 6 6 6 18 18 18
58382- 50 50 50 109 106 95 192 133 9 224 166 10
58383-242 186 14 246 190 14 246 190 14 246 190 14
58384-246 190 14 246 190 14 246 190 14 246 190 14
58385-246 190 14 246 190 14 246 190 14 246 190 14
58386-246 190 14 246 190 14 246 190 14 246 190 14
58387-242 186 14 226 184 13 210 162 10 142 110 46
58388-226 226 226 253 253 253 253 253 253 253 253 253
58389-253 253 253 253 253 253 253 253 253 253 253 253
58390-253 253 253 253 253 253 253 253 253 253 253 253
58391-198 198 198 66 66 66 2 2 6 2 2 6
58392- 2 2 6 2 2 6 50 34 6 156 107 11
58393-219 162 10 239 182 13 246 186 14 246 190 14
58394-246 190 14 246 190 14 246 190 14 246 190 14
58395-246 190 14 246 190 14 246 190 14 246 190 14
58396-246 190 14 246 190 14 246 190 14 242 186 14
58397-234 174 13 213 154 11 154 122 46 66 66 66
58398- 30 30 30 10 10 10 0 0 0 0 0 0
58399- 0 0 0 0 0 0 0 0 0 0 0 0
58400- 0 0 0 0 0 0 0 0 0 0 0 0
58401- 0 0 0 0 0 0 6 6 6 22 22 22
58402- 58 58 58 154 121 60 206 145 10 234 174 13
58403-242 186 14 246 186 14 246 190 14 246 190 14
58404-246 190 14 246 190 14 246 190 14 246 190 14
58405-246 190 14 246 190 14 246 190 14 246 190 14
58406-246 190 14 246 190 14 246 190 14 246 190 14
58407-246 186 14 236 178 12 210 162 10 163 110 8
58408- 61 42 6 138 138 138 218 218 218 250 250 250
58409-253 253 253 253 253 253 253 253 253 250 250 250
58410-242 242 242 210 210 210 144 144 144 66 66 66
58411- 6 6 6 2 2 6 2 2 6 2 2 6
58412- 2 2 6 2 2 6 61 42 6 163 110 8
58413-216 158 10 236 178 12 246 190 14 246 190 14
58414-246 190 14 246 190 14 246 190 14 246 190 14
58415-246 190 14 246 190 14 246 190 14 246 190 14
58416-246 190 14 239 182 13 230 174 11 216 158 10
58417-190 142 34 124 112 88 70 70 70 38 38 38
58418- 18 18 18 6 6 6 0 0 0 0 0 0
58419- 0 0 0 0 0 0 0 0 0 0 0 0
58420- 0 0 0 0 0 0 0 0 0 0 0 0
58421- 0 0 0 0 0 0 6 6 6 22 22 22
58422- 62 62 62 168 124 44 206 145 10 224 166 10
58423-236 178 12 239 182 13 242 186 14 242 186 14
58424-246 186 14 246 190 14 246 190 14 246 190 14
58425-246 190 14 246 190 14 246 190 14 246 190 14
58426-246 190 14 246 190 14 246 190 14 246 190 14
58427-246 190 14 236 178 12 216 158 10 175 118 6
58428- 80 54 7 2 2 6 6 6 6 30 30 30
58429- 54 54 54 62 62 62 50 50 50 38 38 38
58430- 14 14 14 2 2 6 2 2 6 2 2 6
58431- 2 2 6 2 2 6 2 2 6 2 2 6
58432- 2 2 6 6 6 6 80 54 7 167 114 7
58433-213 154 11 236 178 12 246 190 14 246 190 14
58434-246 190 14 246 190 14 246 190 14 246 190 14
58435-246 190 14 242 186 14 239 182 13 239 182 13
58436-230 174 11 210 150 10 174 135 50 124 112 88
58437- 82 82 82 54 54 54 34 34 34 18 18 18
58438- 6 6 6 0 0 0 0 0 0 0 0 0
58439- 0 0 0 0 0 0 0 0 0 0 0 0
58440- 0 0 0 0 0 0 0 0 0 0 0 0
58441- 0 0 0 0 0 0 6 6 6 18 18 18
58442- 50 50 50 158 118 36 192 133 9 200 144 11
58443-216 158 10 219 162 10 224 166 10 226 170 11
58444-230 174 11 236 178 12 239 182 13 239 182 13
58445-242 186 14 246 186 14 246 190 14 246 190 14
58446-246 190 14 246 190 14 246 190 14 246 190 14
58447-246 186 14 230 174 11 210 150 10 163 110 8
58448-104 69 6 10 10 10 2 2 6 2 2 6
58449- 2 2 6 2 2 6 2 2 6 2 2 6
58450- 2 2 6 2 2 6 2 2 6 2 2 6
58451- 2 2 6 2 2 6 2 2 6 2 2 6
58452- 2 2 6 6 6 6 91 60 6 167 114 7
58453-206 145 10 230 174 11 242 186 14 246 190 14
58454-246 190 14 246 190 14 246 186 14 242 186 14
58455-239 182 13 230 174 11 224 166 10 213 154 11
58456-180 133 36 124 112 88 86 86 86 58 58 58
58457- 38 38 38 22 22 22 10 10 10 6 6 6
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- 0 0 0 0 0 0 0 0 0 14 14 14
58462- 34 34 34 70 70 70 138 110 50 158 118 36
58463-167 114 7 180 123 7 192 133 9 197 138 11
58464-200 144 11 206 145 10 213 154 11 219 162 10
58465-224 166 10 230 174 11 239 182 13 242 186 14
58466-246 186 14 246 186 14 246 186 14 246 186 14
58467-239 182 13 216 158 10 185 133 11 152 99 6
58468-104 69 6 18 14 6 2 2 6 2 2 6
58469- 2 2 6 2 2 6 2 2 6 2 2 6
58470- 2 2 6 2 2 6 2 2 6 2 2 6
58471- 2 2 6 2 2 6 2 2 6 2 2 6
58472- 2 2 6 6 6 6 80 54 7 152 99 6
58473-192 133 9 219 162 10 236 178 12 239 182 13
58474-246 186 14 242 186 14 239 182 13 236 178 12
58475-224 166 10 206 145 10 192 133 9 154 121 60
58476- 94 94 94 62 62 62 42 42 42 22 22 22
58477- 14 14 14 6 6 6 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 0 0 0 0 0 0 6 6 6
58482- 18 18 18 34 34 34 58 58 58 78 78 78
58483-101 98 89 124 112 88 142 110 46 156 107 11
58484-163 110 8 167 114 7 175 118 6 180 123 7
58485-185 133 11 197 138 11 210 150 10 219 162 10
58486-226 170 11 236 178 12 236 178 12 234 174 13
58487-219 162 10 197 138 11 163 110 8 130 83 6
58488- 91 60 6 10 10 10 2 2 6 2 2 6
58489- 18 18 18 38 38 38 38 38 38 38 38 38
58490- 38 38 38 38 38 38 38 38 38 38 38 38
58491- 38 38 38 38 38 38 26 26 26 2 2 6
58492- 2 2 6 6 6 6 70 47 6 137 92 6
58493-175 118 6 200 144 11 219 162 10 230 174 11
58494-234 174 13 230 174 11 219 162 10 210 150 10
58495-192 133 9 163 110 8 124 112 88 82 82 82
58496- 50 50 50 30 30 30 14 14 14 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 0 0 0
58502- 6 6 6 14 14 14 22 22 22 34 34 34
58503- 42 42 42 58 58 58 74 74 74 86 86 86
58504-101 98 89 122 102 70 130 98 46 121 87 25
58505-137 92 6 152 99 6 163 110 8 180 123 7
58506-185 133 11 197 138 11 206 145 10 200 144 11
58507-180 123 7 156 107 11 130 83 6 104 69 6
58508- 50 34 6 54 54 54 110 110 110 101 98 89
58509- 86 86 86 82 82 82 78 78 78 78 78 78
58510- 78 78 78 78 78 78 78 78 78 78 78 78
58511- 78 78 78 82 82 82 86 86 86 94 94 94
58512-106 106 106 101 101 101 86 66 34 124 80 6
58513-156 107 11 180 123 7 192 133 9 200 144 11
58514-206 145 10 200 144 11 192 133 9 175 118 6
58515-139 102 15 109 106 95 70 70 70 42 42 42
58516- 22 22 22 10 10 10 0 0 0 0 0 0
58517- 0 0 0 0 0 0 0 0 0 0 0 0
58518- 0 0 0 0 0 0 0 0 0 0 0 0
58519- 0 0 0 0 0 0 0 0 0 0 0 0
58520- 0 0 0 0 0 0 0 0 0 0 0 0
58521- 0 0 0 0 0 0 0 0 0 0 0 0
58522- 0 0 0 0 0 0 6 6 6 10 10 10
58523- 14 14 14 22 22 22 30 30 30 38 38 38
58524- 50 50 50 62 62 62 74 74 74 90 90 90
58525-101 98 89 112 100 78 121 87 25 124 80 6
58526-137 92 6 152 99 6 152 99 6 152 99 6
58527-138 86 6 124 80 6 98 70 6 86 66 30
58528-101 98 89 82 82 82 58 58 58 46 46 46
58529- 38 38 38 34 34 34 34 34 34 34 34 34
58530- 34 34 34 34 34 34 34 34 34 34 34 34
58531- 34 34 34 34 34 34 38 38 38 42 42 42
58532- 54 54 54 82 82 82 94 86 76 91 60 6
58533-134 86 6 156 107 11 167 114 7 175 118 6
58534-175 118 6 167 114 7 152 99 6 121 87 25
58535-101 98 89 62 62 62 34 34 34 18 18 18
58536- 6 6 6 0 0 0 0 0 0 0 0 0
58537- 0 0 0 0 0 0 0 0 0 0 0 0
58538- 0 0 0 0 0 0 0 0 0 0 0 0
58539- 0 0 0 0 0 0 0 0 0 0 0 0
58540- 0 0 0 0 0 0 0 0 0 0 0 0
58541- 0 0 0 0 0 0 0 0 0 0 0 0
58542- 0 0 0 0 0 0 0 0 0 0 0 0
58543- 0 0 0 6 6 6 6 6 6 10 10 10
58544- 18 18 18 22 22 22 30 30 30 42 42 42
58545- 50 50 50 66 66 66 86 86 86 101 98 89
58546-106 86 58 98 70 6 104 69 6 104 69 6
58547-104 69 6 91 60 6 82 62 34 90 90 90
58548- 62 62 62 38 38 38 22 22 22 14 14 14
58549- 10 10 10 10 10 10 10 10 10 10 10 10
58550- 10 10 10 10 10 10 6 6 6 10 10 10
58551- 10 10 10 10 10 10 10 10 10 14 14 14
58552- 22 22 22 42 42 42 70 70 70 89 81 66
58553- 80 54 7 104 69 6 124 80 6 137 92 6
58554-134 86 6 116 81 8 100 82 52 86 86 86
58555- 58 58 58 30 30 30 14 14 14 6 6 6
58556- 0 0 0 0 0 0 0 0 0 0 0 0
58557- 0 0 0 0 0 0 0 0 0 0 0 0
58558- 0 0 0 0 0 0 0 0 0 0 0 0
58559- 0 0 0 0 0 0 0 0 0 0 0 0
58560- 0 0 0 0 0 0 0 0 0 0 0 0
58561- 0 0 0 0 0 0 0 0 0 0 0 0
58562- 0 0 0 0 0 0 0 0 0 0 0 0
58563- 0 0 0 0 0 0 0 0 0 0 0 0
58564- 0 0 0 6 6 6 10 10 10 14 14 14
58565- 18 18 18 26 26 26 38 38 38 54 54 54
58566- 70 70 70 86 86 86 94 86 76 89 81 66
58567- 89 81 66 86 86 86 74 74 74 50 50 50
58568- 30 30 30 14 14 14 6 6 6 0 0 0
58569- 0 0 0 0 0 0 0 0 0 0 0 0
58570- 0 0 0 0 0 0 0 0 0 0 0 0
58571- 0 0 0 0 0 0 0 0 0 0 0 0
58572- 6 6 6 18 18 18 34 34 34 58 58 58
58573- 82 82 82 89 81 66 89 81 66 89 81 66
58574- 94 86 66 94 86 76 74 74 74 50 50 50
58575- 26 26 26 14 14 14 6 6 6 0 0 0
58576- 0 0 0 0 0 0 0 0 0 0 0 0
58577- 0 0 0 0 0 0 0 0 0 0 0 0
58578- 0 0 0 0 0 0 0 0 0 0 0 0
58579- 0 0 0 0 0 0 0 0 0 0 0 0
58580- 0 0 0 0 0 0 0 0 0 0 0 0
58581- 0 0 0 0 0 0 0 0 0 0 0 0
58582- 0 0 0 0 0 0 0 0 0 0 0 0
58583- 0 0 0 0 0 0 0 0 0 0 0 0
58584- 0 0 0 0 0 0 0 0 0 0 0 0
58585- 6 6 6 6 6 6 14 14 14 18 18 18
58586- 30 30 30 38 38 38 46 46 46 54 54 54
58587- 50 50 50 42 42 42 30 30 30 18 18 18
58588- 10 10 10 0 0 0 0 0 0 0 0 0
58589- 0 0 0 0 0 0 0 0 0 0 0 0
58590- 0 0 0 0 0 0 0 0 0 0 0 0
58591- 0 0 0 0 0 0 0 0 0 0 0 0
58592- 0 0 0 6 6 6 14 14 14 26 26 26
58593- 38 38 38 50 50 50 58 58 58 58 58 58
58594- 54 54 54 42 42 42 30 30 30 18 18 18
58595- 10 10 10 0 0 0 0 0 0 0 0 0
58596- 0 0 0 0 0 0 0 0 0 0 0 0
58597- 0 0 0 0 0 0 0 0 0 0 0 0
58598- 0 0 0 0 0 0 0 0 0 0 0 0
58599- 0 0 0 0 0 0 0 0 0 0 0 0
58600- 0 0 0 0 0 0 0 0 0 0 0 0
58601- 0 0 0 0 0 0 0 0 0 0 0 0
58602- 0 0 0 0 0 0 0 0 0 0 0 0
58603- 0 0 0 0 0 0 0 0 0 0 0 0
58604- 0 0 0 0 0 0 0 0 0 0 0 0
58605- 0 0 0 0 0 0 0 0 0 6 6 6
58606- 6 6 6 10 10 10 14 14 14 18 18 18
58607- 18 18 18 14 14 14 10 10 10 6 6 6
58608- 0 0 0 0 0 0 0 0 0 0 0 0
58609- 0 0 0 0 0 0 0 0 0 0 0 0
58610- 0 0 0 0 0 0 0 0 0 0 0 0
58611- 0 0 0 0 0 0 0 0 0 0 0 0
58612- 0 0 0 0 0 0 0 0 0 6 6 6
58613- 14 14 14 18 18 18 22 22 22 22 22 22
58614- 18 18 18 14 14 14 10 10 10 6 6 6
58615- 0 0 0 0 0 0 0 0 0 0 0 0
58616- 0 0 0 0 0 0 0 0 0 0 0 0
58617- 0 0 0 0 0 0 0 0 0 0 0 0
58618- 0 0 0 0 0 0 0 0 0 0 0 0
58619- 0 0 0 0 0 0 0 0 0 0 0 0
58620+4 4 4 4 4 4 4 4 4 4 4 4 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+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58627+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58633+4 4 4 4 4 4
58634+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58641+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
58644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58647+4 4 4 4 4 4
58648+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58655+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58661+4 4 4 4 4 4
58662+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4
58666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58669+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58675+4 4 4 4 4 4
58676+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
58680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58682+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58683+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58689+4 4 4 4 4 4
58690+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4
58694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58696+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58697+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58703+4 4 4 4 4 4
58704+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58708+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58709+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58710+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58711+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58713+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58714+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58715+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58717+4 4 4 4 4 4
58718+4 4 4 4 4 4 4 4 4 4 4 4 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+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58722+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58723+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58724+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58725+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58727+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58728+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58729+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58730+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58731+4 4 4 4 4 4
58732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58736+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58737+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58738+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58739+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58741+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58742+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58743+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58744+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58745+4 4 4 4 4 4
58746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58749+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58750+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58751+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58752+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58753+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58754+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58755+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58756+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58757+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58758+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58759+4 4 4 4 4 4
58760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58762+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58763+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58764+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58765+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58766+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58767+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58768+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58769+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58770+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58771+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58772+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58773+4 4 4 4 4 4
58774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58777+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58778+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58779+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58780+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58781+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58782+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58783+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58784+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58785+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58786+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58787+4 4 4 4 4 4
58788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58790+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58791+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58792+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58793+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58794+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58795+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58796+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58797+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58798+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58799+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58800+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58801+4 4 4 4 4 4
58802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58804+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58805+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58806+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58807+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58808+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58809+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58810+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58811+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58812+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58813+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58814+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58815+4 4 4 4 4 4
58816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58818+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58819+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58820+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58821+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58822+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58823+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58824+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58825+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58826+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58827+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58828+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58829+4 4 4 4 4 4
58830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58832+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58833+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58834+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58835+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58836+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58837+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58838+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58839+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58840+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58841+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58842+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58843+4 4 4 4 4 4
58844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58845+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58846+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58847+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58848+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58849+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58850+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58851+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58852+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58853+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58854+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58855+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58856+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58857+4 4 4 4 4 4
58858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58859+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58860+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58861+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58862+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58863+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58864+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58865+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58866+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58867+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58868+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58869+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58870+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58871+0 0 0 4 4 4
58872+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58873+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58874+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58875+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58876+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58877+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58878+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58879+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58880+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58881+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58882+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58883+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58884+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58885+2 0 0 0 0 0
58886+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58887+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58888+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58889+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58890+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58891+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58892+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58893+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58894+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58895+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58896+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58897+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58898+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58899+37 38 37 0 0 0
58900+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58901+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58902+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58903+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58904+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58905+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58906+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58907+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58908+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58909+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58910+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58911+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58912+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58913+85 115 134 4 0 0
58914+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58915+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58916+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58917+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58918+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58919+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58920+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58921+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58922+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58923+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58924+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58925+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58926+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58927+60 73 81 4 0 0
58928+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58929+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58930+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58931+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58932+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58933+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58934+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58935+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58936+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58937+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58938+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58939+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58940+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58941+16 19 21 4 0 0
58942+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58943+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58944+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58945+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58946+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58947+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58948+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58949+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58950+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58951+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58952+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58953+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58954+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58955+4 0 0 4 3 3
58956+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58957+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58958+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58960+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58961+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58962+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58963+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58964+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58965+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58966+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58967+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58968+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58969+3 2 2 4 4 4
58970+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58971+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58972+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58973+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58974+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58975+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58976+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58977+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58978+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58979+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58980+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58981+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58982+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58983+4 4 4 4 4 4
58984+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58985+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58986+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58987+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58988+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58989+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58990+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58991+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58992+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58993+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58994+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58995+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58996+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58997+4 4 4 4 4 4
58998+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58999+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
59000+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
59001+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
59002+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
59003+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
59004+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
59005+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
59006+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
59007+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
59008+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
59009+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
59010+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
59011+5 5 5 5 5 5
59012+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
59013+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
59014+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
59015+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
59016+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
59017+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59018+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
59019+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
59020+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
59021+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
59022+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
59023+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
59024+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59025+5 5 5 4 4 4
59026+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
59027+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
59028+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
59029+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
59030+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59031+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
59032+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
59033+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
59034+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
59035+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
59036+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
59037+4 0 0 4 0 0 5 5 5 5 5 5 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
59040+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
59041+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
59042+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
59043+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
59044+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
59045+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59046+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59047+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
59048+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
59049+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
59050+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
59051+3 3 3 5 5 5 6 6 6 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
59054+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
59055+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
59056+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
59057+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
59058+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59059+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
59060+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
59061+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
59062+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
59063+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
59064+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
59065+4 4 4 4 4 4 4 4 4 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
59068+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
59069+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
59070+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
59071+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
59072+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59073+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59074+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
59075+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
59076+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
59077+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
59078+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
59079+4 4 4 4 4 4 4 4 4 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
59082+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
59083+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
59084+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
59085+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
59086+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59087+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
59088+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
59089+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
59090+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
59091+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
59092+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59093+4 4 4 4 4 4 4 4 4 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
59096+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
59097+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
59098+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
59099+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
59100+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
59101+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
59102+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
59103+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
59104+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
59105+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
59106+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
59107+4 4 4 4 4 4 4 4 4 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
59110+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
59111+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
59112+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
59113+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
59114+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59115+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
59116+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
59117+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
59118+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
59119+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
59120+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
59121+4 4 4 4 4 4 4 4 4 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
59124+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
59125+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
59126+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
59127+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59128+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
59129+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
59130+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
59131+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
59132+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
59133+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
59134+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59135+4 4 4 4 4 4 4 4 4 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
59138+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
59139+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
59140+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
59141+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59142+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59143+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
59144+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
59145+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
59146+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
59147+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
59148+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59149+4 4 4 4 4 4 4 4 4 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
59152+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
59153+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
59154+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59155+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59156+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59157+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
59158+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
59159+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
59160+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
59161+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
59162+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59163+4 4 4 4 4 4 4 4 4 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
59166+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
59167+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
59168+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59169+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59170+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59171+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
59172+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
59173+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
59174+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59175+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59176+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59177+4 4 4 4 4 4 4 4 4 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
59180+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59181+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
59182+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59183+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
59184+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
59185+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
59186+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
59187+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
59188+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59189+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59190+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59191+4 4 4 4 4 4 4 4 4 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
59194+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59195+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
59196+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59197+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
59198+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59199+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
59200+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
59201+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
59202+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59203+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59204+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59205+4 4 4 4 4 4 4 4 4 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
59208+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59209+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59210+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59211+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59212+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59213+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59214+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59215+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59216+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59217+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59218+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59219+4 4 4 4 4 4 4 4 4 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
59222+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59223+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59224+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59225+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59226+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59227+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59228+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59229+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59230+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59231+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59232+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59233+4 4 4 4 4 4 4 4 4 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
59236+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59237+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59238+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59239+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59240+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59241+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59242+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59243+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59244+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59245+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59246+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59247+4 4 4 4 4 4 4 4 4 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
59250+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59251+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59252+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59253+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59254+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59255+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59256+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59257+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59258+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59259+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59260+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59261+4 4 4 4 4 4 4 4 4 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
59264+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59265+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59266+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59267+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59268+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59269+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59270+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59271+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59272+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59273+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59274+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59275+4 4 4 4 4 4 4 4 4 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
59278+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59279+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59280+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59281+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59282+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59283+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59284+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59285+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59286+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59287+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59288+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59289+4 4 4 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
59292+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59293+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59294+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59295+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59296+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59297+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59298+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59299+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59300+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59301+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59302+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59303+4 4 4 4 4 4 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
59306+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59307+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59308+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59309+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59310+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59311+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59312+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59313+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59314+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59315+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59316+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59317+4 4 4 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
59320+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59321+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59322+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59323+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59324+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59325+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59326+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59327+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59328+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59329+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59330+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
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
59334+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59335+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59336+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59337+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59338+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59339+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59340+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59341+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59342+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59343+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59344+0 0 0 3 3 3 5 5 5 4 4 4 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
59348+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59349+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59350+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59351+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59352+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59353+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59354+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59355+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59356+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59357+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59358+0 0 0 3 3 3 5 5 5 4 4 4 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
59362+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59363+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59364+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59365+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59366+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59367+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59368+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59369+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59370+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59371+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59372+0 0 0 3 3 3 5 5 5 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
59376+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59377+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59378+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59379+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59380+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59381+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59382+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59383+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59384+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59385+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59386+0 0 0 3 3 3 5 5 5 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
59390+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59391+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59392+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59393+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59394+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59395+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59396+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59397+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59398+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59399+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59400+0 0 0 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
59404+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59405+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59406+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59407+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59408+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59409+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59410+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59411+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59412+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59413+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59414+4 3 3 5 5 5 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
59418+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59419+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59420+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59421+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59422+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59423+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59424+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59425+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59426+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59427+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59428+5 5 5 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
59432+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59433+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59434+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59435+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59436+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59437+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59438+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59439+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59440+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59441+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
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
59446+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59447+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59448+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59449+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59450+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59451+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59452+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59453+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59454+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59455+13 16 17 4 0 0 4 0 0 4 3 3 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
59460+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59461+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59462+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59463+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59464+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59465+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59466+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59467+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59468+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59469+4 0 0 4 0 0 5 5 5 5 5 5 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
59474+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59475+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59476+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59477+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59478+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59479+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59480+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59481+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59482+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59483+4 3 3 5 5 5 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
59488+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59489+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59490+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59491+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59492+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59493+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59494+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59495+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59496+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
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
59502+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59503+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59504+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59505+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59506+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59507+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59508+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59509+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59510+4 0 0 4 0 0 4 0 0 6 6 6 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
59516+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59517+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59518+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59519+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59520+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59521+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59522+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59523+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59524+4 0 0 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
59530+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59531+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59532+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59533+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59534+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59535+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59536+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59537+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
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
59544+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59545+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59546+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59547+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59548+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59549+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59550+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59551+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 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
59558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59559+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59560+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59561+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59562+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59563+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59564+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59565+4 0 0 4 3 3 6 6 6 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
59572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59573+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59574+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59575+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59576+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59577+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59578+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59579+6 6 6 6 6 6 4 3 3 5 5 5 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
59586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59587+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59588+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59589+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59590+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59591+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59592+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59593+5 5 5 5 5 5 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
59600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59602+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59603+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59604+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59605+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59606+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59607+4 3 3 5 5 5 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
59614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59617+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59618+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59619+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59620+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
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
59628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59631+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59632+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59633+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59634+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59641+4 4 4 4 4 4
59642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59643+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59645+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59646+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59647+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59648+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59654+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59655+4 4 4 4 4 4
59656+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59659+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59660+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59661+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59662+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59668+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59669+4 4 4 4 4 4
59670+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59674+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59675+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59676+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59679+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59682+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59683+4 4 4 4 4 4
59684+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59688+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59689+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59690+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59693+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59696+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59697+4 4 4 4 4 4
59698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59702+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59703+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59704+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59707+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59710+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59711+4 4 4 4 4 4
59712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59716+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59717+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59721+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59724+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59725+4 4 4 4 4 4
59726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59730+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59731+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59734+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59735+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59738+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59739+4 4 4 4 4 4
59740diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59741index 3838795..0d48d61 100644
59742--- a/drivers/xen/events/events_base.c
59743+++ b/drivers/xen/events/events_base.c
59744@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59745 restore_pirqs();
59746 }
59747
59748-static struct irq_chip xen_dynamic_chip __read_mostly = {
59749+static struct irq_chip xen_dynamic_chip = {
59750 .name = "xen-dyn",
59751
59752 .irq_disable = disable_dynirq,
59753@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59754 .irq_retrigger = retrigger_dynirq,
59755 };
59756
59757-static struct irq_chip xen_pirq_chip __read_mostly = {
59758+static struct irq_chip xen_pirq_chip = {
59759 .name = "xen-pirq",
59760
59761 .irq_startup = startup_pirq,
59762@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59763 .irq_retrigger = retrigger_dynirq,
59764 };
59765
59766-static struct irq_chip xen_percpu_chip __read_mostly = {
59767+static struct irq_chip xen_percpu_chip = {
59768 .name = "xen-percpu",
59769
59770 .irq_disable = disable_dynirq,
59771diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
59772index 00f40f0..e3c0b15 100644
59773--- a/drivers/xen/evtchn.c
59774+++ b/drivers/xen/evtchn.c
59775@@ -201,8 +201,8 @@ static ssize_t evtchn_read(struct file *file, char __user *buf,
59776
59777 /* Byte lengths of two chunks. Chunk split (if any) is at ring wrap. */
59778 if (((c ^ p) & EVTCHN_RING_SIZE) != 0) {
59779- bytes1 = (EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c)) *
59780- sizeof(evtchn_port_t);
59781+ bytes1 = EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c);
59782+ bytes1 *= sizeof(evtchn_port_t);
59783 bytes2 = EVTCHN_RING_MASK(p) * sizeof(evtchn_port_t);
59784 } else {
59785 bytes1 = (p - c) * sizeof(evtchn_port_t);
59786diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59787index fef20db..d28b1ab 100644
59788--- a/drivers/xen/xenfs/xenstored.c
59789+++ b/drivers/xen/xenfs/xenstored.c
59790@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59791 static int xsd_kva_open(struct inode *inode, struct file *file)
59792 {
59793 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59794+#ifdef CONFIG_GRKERNSEC_HIDESYM
59795+ NULL);
59796+#else
59797 xen_store_interface);
59798+#endif
59799+
59800 if (!file->private_data)
59801 return -ENOMEM;
59802 return 0;
59803diff --git a/firmware/Makefile b/firmware/Makefile
59804index e297e1b..aeb0982 100644
59805--- a/firmware/Makefile
59806+++ b/firmware/Makefile
59807@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59808 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59809 bnx2x/bnx2x-e2-6.2.9.0.fw
59810 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59811+ bnx2/bnx2-mips-09-6.2.1b.fw \
59812 bnx2/bnx2-rv2p-09-6.0.17.fw \
59813 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59814 bnx2/bnx2-mips-06-6.2.1.fw \
59815+ bnx2/bnx2-mips-06-6.2.3.fw \
59816 bnx2/bnx2-rv2p-06-6.0.15.fw
59817 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
59818 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
59819diff --git a/firmware/WHENCE b/firmware/WHENCE
59820index 0c4d96d..b17700f 100644
59821--- a/firmware/WHENCE
59822+++ b/firmware/WHENCE
59823@@ -653,21 +653,23 @@ Found in hex form in kernel source.
59824 Driver: BNX2 - Broadcom NetXtremeII
59825
59826 File: bnx2/bnx2-mips-06-6.2.1.fw
59827+File: bnx2/bnx2-mips-06-6.2.3.fw
59828 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59829 File: bnx2/bnx2-mips-09-6.2.1a.fw
59830+File: bnx2/bnx2-mips-09-6.2.1b.fw
59831 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59832 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59833
59834 Licence:
59835-
59836- This file contains firmware data derived from proprietary unpublished
59837- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59838-
59839- Permission is hereby granted for the distribution of this firmware data
59840- in hexadecimal or equivalent format, provided this copyright notice is
59841- accompanying it.
59842-
59843-Found in hex form in kernel source.
59844+
59845+ This file contains firmware data derived from proprietary unpublished
59846+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59847+
59848+ Permission is hereby granted for the distribution of this firmware data
59849+ in hexadecimal or equivalent format, provided this copyright notice is
59850+ accompanying it.
59851+
59852+Found in hex form in kernel source.
59853
59854 --------------------------------------------------------------------------
59855
59856diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59857new file mode 100644
59858index 0000000..da72bf1
59859--- /dev/null
59860+++ b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59861@@ -0,0 +1,5804 @@
59862+:10000000080001180800000000004A68000000C84D
59863+:1000100000000000000000000000000008004A6826
59864+:100020000000001400004B30080000A00800000091
59865+:100030000000569400004B44080058200000008443
59866+:100040000000A1D808005694000001580000A25CEE
59867+:100050000800321008000000000072F00000A3B495
59868+:10006000000000000000000000000000080072F026
59869+:1000700000000024000116A40800049008000400F9
59870+:10008000000017D4000116C80000000000000000A6
59871+:100090000000000000000000000000000000000060
59872+:1000A000080000A80800000000003BFC00012E9C96
59873+:1000B0000000000000000000000000000000000040
59874+:1000C00000000000000000000A00004600000000E0
59875+:1000D000000000000000000D636F6D362E322E33DD
59876+:1000E0000000000006020302000000000000000300
59877+:1000F000000000C800000032000000030000000003
59878+:1001000000000000000000000000000000000000EF
59879+:1001100000000010000001360000EA600000000549
59880+:1001200000000000000000000000000000000008C7
59881+:1001300000000000000000000000000000000000BF
59882+:1001400000000000000000000000000000000000AF
59883+:10015000000000000000000000000000000000009F
59884+:10016000000000020000000000000000000000008D
59885+:10017000000000000000000000000000000000007F
59886+:10018000000000000000000000000010000000005F
59887+:10019000000000000000000000000000000000005F
59888+:1001A000000000000000000000000000000000004F
59889+:1001B000000000000000000000000000000000003F
59890+:1001C000000000000000000000000000000000002F
59891+:1001D000000000000000000000000000000000001F
59892+:1001E0000000000010000003000000000000000DEF
59893+:1001F0000000000D3C02080024424AA03C03080015
59894+:1002000024634B9CAC4000000043202B1480FFFD76
59895+:10021000244200043C1D080037BD7FFC03A0F021F0
59896+:100220003C100800261001183C1C0800279C4AA01E
59897+:100230000E000168000000000000000D27470100CB
59898+:1002400090E3000B2402001A94E5000814620028D1
59899+:10025000000020218CE200003C0308008C63004475
59900+:1002600094E60014000211C20002104030A4000203
59901+:10027000005A10212463000130A50004A446008028
59902+:100280003C010800AC23004410A000190004202BFE
59903+:100290008F4202B804410008240400013C02080017
59904+:1002A0008C420060244200013C010800AC22006046
59905+:1002B00003E00008008010218CE2002094E3001687
59906+:1002C00000002021AF4202808CE20004A743028498
59907+:1002D000AF4202883C021000AF4202B83C02080064
59908+:1002E0008C42005C244200013C010800AC22005C0E
59909+:1002F00003E00008008010212747010090E3000B75
59910+:100300002402000394E50008146200280000202164
59911+:100310008CE200003C0308008C63004494E6001467
59912+:10032000000211C20002104030A40002005A102145
59913+:100330002463000130A50004A44600803C010800AD
59914+:10034000AC23004410A000190004202B8F4202B8F7
59915+:1003500004410008240400013C0208008C420060B3
59916+:10036000244200013C010800AC22006003E00008C8
59917+:10037000008010218CE2002094E300160000202170
59918+:10038000AF4202808CE20004A7430284AF4202889D
59919+:100390003C021000AF4202B83C0208008C42005CF4
59920+:1003A000244200013C010800AC22005C03E000088C
59921+:1003B000008010218F4301002402010050620003DD
59922+:1003C000000311C20000000D000311C20002104022
59923+:1003D000005A1021A440008003E000080000102112
59924+:1003E0009362000003E00008AF80000003E0000813
59925+:1003F0000000102103E00008000010212402010089
59926+:1004000014820008000000003C0208008C4200FC3E
59927+:10041000244200013C010800AC2200FC0A0000DD7F
59928+:1004200030A200203C0208008C42008424420001DB
59929+:100430003C010800AC22008430A2002010400008DB
59930+:1004400030A300103C0208008C4201082442000145
59931+:100450003C010800AC22010803E000080000000095
59932+:1004600010600008000000003C0208008C420104FB
59933+:10047000244200013C010800AC22010403E0000812
59934+:10048000000000003C0208008C42010024420001F0
59935+:100490003C010800AC22010003E00008000000005D
59936+:1004A00027BDFFE8AFBF0010274401009483000878
59937+:1004B000306200041040001B306600028F4202B818
59938+:1004C00004410008240500013C0208008C42006041
59939+:1004D000244200013C010800AC2200600A0001290E
59940+:1004E0008FBF00108C82002094830016000028210A
59941+:1004F000AF4202808C820004A7430284AF4202888C
59942+:100500003C021000AF4202B83C0208008C42005C82
59943+:10051000244200013C010800AC22005C0A000129D1
59944+:100520008FBF001010C00006006028218F4401001A
59945+:100530000E0000CD000000000A0001282405000183
59946+:100540008F8200088F4301045043000700002821D8
59947+:100550008F4401000E0000CD000000008F42010416
59948+:10056000AF820008000028218FBF001000A01021DA
59949+:1005700003E0000827BD001827BDFFE8AFBF001447
59950+:10058000AFB00010974201083043700024022000F1
59951+:100590001062000B286220011440002F000010217F
59952+:1005A00024024000106200250000000024026000C8
59953+:1005B00010620026000010210A0001658FBF0014A0
59954+:1005C00027500100920200091040001A2403000184
59955+:1005D0003C0208008C420020104000160000182148
59956+:1005E0000E00049300000000960300083C0608007B
59957+:1005F00094C64B5E8E0400188F8200209605000C76
59958+:1006000000031C0000661825AC440000AC45000443
59959+:1006100024040001AC400008AC40000CAC400010C9
59960+:10062000AC400014AC4000180E0004B8AC43001CF1
59961+:10063000000018210A000164006010210E0003254B
59962+:10064000000000000A000164000010210E000EE905
59963+:1006500000000000000010218FBF00148FB00010B8
59964+:1006600003E0000827BD001827BDFFE0AFB2001867
59965+:100670003C036010AFBF001CAFB10014AFB000105E
59966+:100680008C6450002402FF7F3C1A800000822024EA
59967+:100690003484380C24020037AC6450003C1208004B
59968+:1006A00026524AD8AF42000824020C80AF420024F0
59969+:1006B0003C1B80083C06080024C60324024010218D
59970+:1006C0002404001D2484FFFFAC4600000481FFFDCC
59971+:1006D000244200043C020800244204B03C0108000B
59972+:1006E000AC224AE03C020800244202303C010800EF
59973+:1006F000AC224AE43C020800244201743C03080096
59974+:100700002463032C3C040800248403D83C0508001F
59975+:1007100024A538F03C010800AC224B403C02080004
59976+:10072000244202EC3C010800AC264B243C010800AA
59977+:10073000AC254B343C010800AC234B3C3C01080089
59978+:10074000AC244B443C010800AC224B483C0108005F
59979+:10075000AC234ADC3C010800AC204AE83C0108001C
59980+:10076000AC204AEC3C010800AC204AF03C010800F7
59981+:10077000AC204AF43C010800AC204AF83C010800D7
59982+:10078000AC204AFC3C010800AC204B003C010800B6
59983+:10079000AC244B043C010800AC204B083C01080091
59984+:1007A000AC204B0C3C010800AC204B103C01080075
59985+:1007B000AC204B143C010800AC204B183C01080055
59986+:1007C000AC264B1C3C010800AC264B203C01080029
59987+:1007D000AC254B303C010800AC234B380E000623FF
59988+:1007E000000000003C028000344200708C42000097
59989+:1007F000AF8200143C0308008C6300208F82000449
59990+:10080000104300043C0280000E00045BAF83000430
59991+:100810003C028000344600703C0308008C6300A05A
59992+:100820003C0208008C4200A4104300048F84001492
59993+:100830003C010800AC2300A4A743009E8CCA000022
59994+:100840003C0308008C6300BC3C0208008C4200B8EA
59995+:100850000144202300641821000040210064202B63
59996+:1008600000481021004410213C010800AC2300BCCA
59997+:100870003C010800AC2200B88F5100003222000772
59998+:100880001040FFDCAF8A00148CC600003C05080055
59999+:100890008CA500BC3C0408008C8400B800CA30233E
60000+:1008A00000A628210000102100A6302B0082202164
60001+:1008B00000862021322700013C010800AC2500BC45
60002+:1008C0003C010800AC2400B810E0001F32220002F6
60003+:1008D0008F420100AF4200208F420104AF4200A8C6
60004+:1008E0009342010B0E0000C6305000FF2E02001E86
60005+:1008F00054400004001010800E0000C90A000213CA
60006+:1009000000000000005210218C4200000040F80955
60007+:1009100000000000104000053C0240008F4301042D
60008+:100920003C026020AC4300143C024000AF4201385E
60009+:100930003C0208008C420034244200013C010800C3
60010+:10094000AC220034322200021040000E3222000499
60011+:100950008F4201400E0000C6AF4200200E000295FB
60012+:10096000000000003C024000AF4201783C02080059
60013+:100970008C420038244200013C010800AC220038BF
60014+:10098000322200041040FF983C0280008F42018018
60015+:100990000E0000C6AF4200208F43018024020F00EA
60016+:1009A00014620005000000008F420188A742009CED
60017+:1009B0000A0002483C0240009362000024030050F9
60018+:1009C000304200FF144300083C0240000E00027B4E
60019+:1009D00000000000544000043C0240000E000D7571
60020+:1009E000000000003C024000AF4201B83C02080099
60021+:1009F0008C42003C244200013C010800AC22003C37
60022+:100A00000A0001C83C0280003C0290003442000110
60023+:100A100000822025AF4400208F4200200440FFFECA
60024+:100A20000000000003E00008000000003C0280001D
60025+:100A3000344200010082202503E00008AF4400207A
60026+:100A400027BDFFE0AFB10014AFB0001000808821D7
60027+:100A5000AFBF00180E00025030B000FF9362007D5F
60028+:100A60000220202102028025A370007D8F70007477
60029+:100A70003C0280000E000259020280241600000988
60030+:100A80008FBF00188F4201F80440FFFE24020002CD
60031+:100A9000AF5101C0A34201C43C021000AF4201F8B3
60032+:100AA0008FBF00188FB100148FB0001003E0000852
60033+:100AB00027BD002027BDFFE8AFBF0010974201848B
60034+:100AC0008F440188304202001040000500002821B8
60035+:100AD0000E000FAA000000000A00028D240500018C
60036+:100AE0003C02FF0004800005008218243C02040040
60037+:100AF000506200019362003E240500018FBF001088
60038+:100B000000A0102103E0000827BD0018A360002208
60039+:100B10008F4401400A00025E2405000127BDFFE862
60040+:100B2000AFBF0014AFB0001093620000304400FF6C
60041+:100B300038830020388200300003182B0002102B6D
60042+:100B40000062182410600003240200501482008008
60043+:100B50008FBF001493620005304200011040007CFA
60044+:100B60008FBF0014934201482443FFFF2C6200050D
60045+:100B7000104000788FB00010000310803C03080084
60046+:100B800024634A68004310218C42000000400008A2
60047+:100B9000000000000E0002508F4401408F70000CD6
60048+:100BA0008F4201441602000224020001AF62000CD1
60049+:100BB0000E0002598F4401408F420144145000043A
60050+:100BC0008FBF00148FB000100A000F2027BD00183F
60051+:100BD0008F62000C0A0003040000000097620010FE
60052+:100BE0008F4301443042FFFF1462001A00000000EE
60053+:100BF00024020001A76200108F4202380443001053
60054+:100C00008F4201403C02003F3446F0003C0560004A
60055+:100C10003C04FFC08CA22BBC0044182400461024C6
60056+:100C20000002130200031D82106200390000000060
60057+:100C30008F4202380440FFF7000000008F4201405D
60058+:100C4000AF4202003C021000AF4202380A00032209
60059+:100C50008FBF0014976200100A0003040000000018
60060+:100C60000E0002508F440140976200128F430144EE
60061+:100C70003050FFFF1603000224020001A762001299
60062+:100C80000E0002598F4401408F42014416020004B5
60063+:100C90008FBF00148FB000100A00029127BD00180A
60064+:100CA000976200120A00030400000000976200141B
60065+:100CB0008F4301443042FFFF14620006240200010A
60066+:100CC0008FBF00148FB00010A76200140A00124AF0
60067+:100CD00027BD0018976200141440001D8FBF001438
60068+:100CE0000A00031C00000000976200168F430144B5
60069+:100CF0003042FFFF1462000B240200018FBF00147A
60070+:100D00008FB00010A76200160A000B1227BD001852
60071+:100D10009742007824420004A76200100A000322D0
60072+:100D20008FBF001497620016240300013042FFFFBA
60073+:100D3000144300078FBF00143C0208008C4200706F
60074+:100D4000244200013C010800AC2200708FBF001457
60075+:100D50008FB0001003E0000827BD001827BDFFE892
60076+:100D6000AFBF0014AFB000108F50010093620000BD
60077+:100D700093430109304400FF2402001F106200A5C4
60078+:100D80002862002010400018240200382862000A5F
60079+:100D90001040000C2402000B286200081040002CB8
60080+:100DA00000000000046000E52862000214400028F2
60081+:100DB00024020006106200268FBF00140A00041FE0
60082+:100DC0008FB000101062005E2862000B144000DC3F
60083+:100DD0008FBF00142402000E106200738FB0001049
60084+:100DE0000A00041F00000000106200C028620039E1
60085+:100DF0001040000A2402008024020036106200CA5B
60086+:100E000028620037104000B424020035106200C18F
60087+:100E10008FBF00140A00041F8FB000101062002B57
60088+:100E20002862008110400006240200C82402003914
60089+:100E3000106200B48FBF00140A00041F8FB00010AE
60090+:100E4000106200998FBF00140A00041F8FB00010B9
60091+:100E50003C0208008C420020104000B98FBF0014F3
60092+:100E60000E000493000000008F4201008F830020D9
60093+:100E70009745010C97460108AC6200008F420104BF
60094+:100E80003C04080094844B5E00052C00AC62000416
60095+:100E90008F4201180006340000C43025AC620008FF
60096+:100EA0008F42011C24040001AC62000C9342010A31
60097+:100EB00000A22825AC650010AC600014AC600018DE
60098+:100EC000AC66001C0A0003F58FBF00143C0208004A
60099+:100ED0008C4200201040009A8FBF00140E00049333
60100+:100EE00000000000974401083C03080094634B5E37
60101+:100EF0009745010C000422029746010E8F820020C4
60102+:100F0000000426000083202500052C003C030080FF
60103+:100F100000A6282500832025AC400000AC4000043A
60104+:100F2000AC400008AC40000CAC450010AC400014D4
60105+:100F3000AC400018AC44001C0A0003F42404000177
60106+:100F40009742010C14400015000000009362000558
60107+:100F50003042001014400011000000000E0002504A
60108+:100F6000020020219362000502002021344200107B
60109+:100F70000E000259A36200059362000024030020C2
60110+:100F8000304200FF1043006D020020218FBF00148B
60111+:100F90008FB000100A000FC027BD00180000000D20
60112+:100FA0000A00041E8FBF00143C0208008C4200207F
60113+:100FB000104000638FBF00140E0004930000000077
60114+:100FC0008F4201048F8300209744010C3C050800E8
60115+:100FD00094A54B5EAC6200009762002C00042400D4
60116+:100FE0003042FFFF008220253C02400E00A228254F
60117+:100FF000AC640004AC600008AC60000CAC60001095
60118+:10100000AC600014AC600018AC65001C0A0003F46E
60119+:10101000240400010E00025002002021A7600008F5
60120+:101020000E00025902002021020020210E00025E63
60121+:10103000240500013C0208008C42002010400040C2
60122+:101040008FBF00140E000493000000009742010CB3
60123+:101050008F8300203C05080094A54B5E000214001D
60124+:10106000AC700000AC620004AC6000088F64004CFF
60125+:101070003C02401F00A22825AC64000C8F62005087
60126+:1010800024040001AC6200108F620054AC620014B2
60127+:10109000AC600018AC65001C8FBF00148FB000104E
60128+:1010A0000A0004B827BD0018240200205082002541
60129+:1010B0008FB000100E000F0A020020211040002007
60130+:1010C0008FBF0014020020218FB0001000002821E3
60131+:1010D0000A00025E27BD0018020020218FBF001405
60132+:1010E0008FB000100A00058027BD00189745010C3D
60133+:1010F000020020218FBF00148FB000100A0005A04D
60134+:1011000027BD0018020020218FB000100A0005C57D
60135+:1011100027BD00189345010D020020218FB000105B
60136+:101120000A00060F27BD0018020020218FBF0014FF
60137+:101130008FB000100A0005EB27BD00188FBF001408
60138+:101140008FB0001003E0000827BD00188F4202781E
60139+:101150000440FFFE2402000234840080AF440240B9
60140+:10116000A34202443C02100003E00008AF420278B0
60141+:101170003C04080094844B6A3C0208008C424B7487
60142+:101180003083FFFF000318C000431021AF42003C32
60143+:101190003C0208008C424B70AF4200383C020050C9
60144+:1011A00034420008AF4200300000000000000000A0
60145+:1011B000000000008F420000304200201040FFFD80
60146+:1011C000000000008F4204003C010800AC224B608C
60147+:1011D0008F4204043C010800AC224B643C02002016
60148+:1011E000AF420030000000003C02080094424B680F
60149+:1011F0003C03080094634B6C3C05080094A54B6EBF
60150+:1012000024840001004310213083FFFF3C010800CB
60151+:10121000A4224B683C010800A4244B6A1465000317
60152+:10122000000000003C010800A4204B6A03E0000815
60153+:10123000000000003C05000A27BDFFE80345282107
60154+:101240003C04080024844B50AFBF00100E00051D65
60155+:101250002406000A3C02080094424B523C0308005A
60156+:1012600094634B6E3042000F244200030043180485
60157+:1012700024027FFF0043102B10400002AF83001CAC
60158+:101280000000000D0E00042A000000003C020800CF
60159+:1012900094424B5A8FBF001027BD001803E000088E
60160+:1012A000A74200A23C02000A034210219443000618
60161+:1012B0003C02080094424B5A3C010800A4234B56C0
60162+:1012C000004310238F83001C00021400000214034B
60163+:1012D0000043102B03E000083842000127BDFFE85F
60164+:1012E000AFBF00103C02000A0342102194420006E6
60165+:1012F0003C010800A4224B560E00047700000000B9
60166+:101300005440FFF93C02000A8FBF001003E00008C0
60167+:1013100027BD001827BDFFE8AFBF00100E000477FF
60168+:101320000000000010400003000000000E000485D3
60169+:10133000000000003C0208008C424B608FBF001090
60170+:1013400027430400AF4200383C0208008C424B6443
60171+:1013500027BD0018AF830020AF42003C3C020005CF
60172+:10136000AF42003003E00008AF8000188F82001801
60173+:101370003C0300060002114000431025AF4200303C
60174+:101380000000000000000000000000008F4200008C
60175+:10139000304200101040FFFD27420400AF820020C1
60176+:1013A00003E00008AF8000183C0608008CC64B64C0
60177+:1013B0008F8500188F8300203C02080094424B5A0E
60178+:1013C00027BDFFE024A50001246300202442000182
60179+:1013D00024C70020AFB10014AFB00010AFBF001899
60180+:1013E000AF850018AF8300203C010800A4224B5AAF
60181+:1013F000309000FF3C010800AC274B6404C100089A
60182+:101400000000882104E00006000000003C02080003
60183+:101410008C424B60244200013C010800AC224B602E
60184+:101420003C02080094424B5A3C03080094634B680A
60185+:101430000010202B004310262C42000100441025F0
60186+:10144000144000048F830018240200101462000F5F
60187+:10145000000000000E0004A9241100013C03080054
60188+:1014600094634B5A3C02080094424B681462000398
60189+:10147000000000000E00042A000000001600000317
60190+:10148000000000000E000493000000003C03080070
60191+:1014900094634B5E3C02080094424B5C2463000161
60192+:1014A0003064FFFF3C010800A4234B5E148200035C
60193+:1014B000000000003C010800A4204B5E1200000662
60194+:1014C000000000003C02080094424B5AA74200A2D0
60195+:1014D0000A00050B022010210E0004770000000016
60196+:1014E00010400004022010210E00048500000000BE
60197+:1014F000022010218FBF00188FB100148FB0001090
60198+:1015000003E0000827BD00203084FFFF30A5FFFF67
60199+:101510000000182110800007000000003082000148
60200+:101520001040000200042042006518210A00051343
60201+:101530000005284003E000080060102110C00006EC
60202+:1015400024C6FFFF8CA2000024A50004AC8200008A
60203+:101550000A00051D2484000403E0000800000000C8
60204+:1015600010A0000824A3FFFFAC86000000000000CC
60205+:10157000000000002402FFFF2463FFFF1462FFFA53
60206+:101580002484000403E0000800000000240200019D
60207+:10159000AF62000CA7620010A7620012A7620014DD
60208+:1015A00003E00008A76200163082007F034210218A
60209+:1015B0003C08000E004818213C0208008C42002024
60210+:1015C00027BDFFD82407FF80AFB3001CAFB20018BF
60211+:1015D000AFB10014AFB00010AFBF00200080802179
60212+:1015E00030B100FF0087202430D200FF1040002FD0
60213+:1015F00000009821AF44002C9062000024030050AA
60214+:10160000304200FF1443000E000000003C020800BE
60215+:101610008C4200E00202102100471024AF42002C4F
60216+:101620003C0208008C4200E0020210213042007FA0
60217+:101630000342102100481021944200D43053FFFF90
60218+:101640000E000493000000003C02080094424B5E30
60219+:101650008F8300200011340000C2302500122C00BE
60220+:101660003C02400000C2302534A50001AC700000EF
60221+:101670008FBF0020AC6000048FB20018AC7300086C
60222+:101680008FB10014AC60000C8FB3001CAC6500106F
60223+:101690008FB00010AC60001424040001AC6000188E
60224+:1016A00027BD00280A0004B8AC66001C8FBF0020CC
60225+:1016B0008FB3001C8FB200188FB100148FB00010D0
60226+:1016C00003E0000827BD00289343010F2402001007
60227+:1016D0001062000E2865001110A0000724020012FD
60228+:1016E000240200082405003A1062000600003021A0
60229+:1016F00003E0000800000000240500351462FFFC30
60230+:10170000000030210A000538000000008F420074FC
60231+:1017100024420FA003E00008AF62000C27BDFFE8E1
60232+:10172000AFBF00100E00025E240500018FBF001045
60233+:1017300024020001A762001227BD00182402000144
60234+:1017400003E00008A360002227BDFFE0AFB1001452
60235+:10175000AFB00010AFBF001830B1FFFF0E00025055
60236+:10176000008080219362003F24030004304200FF88
60237+:101770001443000C02002021122000082402000A59
60238+:101780000E00053100000000936200052403FFFEF7
60239+:1017900000431024A362000524020012A362003F4C
60240+:1017A000020020210E000259A360008116200003D0
60241+:1017B000020020210E0005950000000002002021FB
60242+:1017C000322600FF8FBF00188FB100148FB00010B9
60243+:1017D000240500380A00053827BD002027BDFFE09A
60244+:1017E000AFBF001CAFB20018AFB10014AFB0001013
60245+:1017F0000E000250008080210E0005310000000024
60246+:101800009362003F24120018305100FF123200038F
60247+:101810000200202124020012A362003F936200050F
60248+:101820002403FFFE004310240E000259A3620005AA
60249+:10183000020020212405002016320007000030217C
60250+:101840008FBF001C8FB200188FB100148FB0001032
60251+:101850000A00025E27BD00208FBF001C8FB2001857
60252+:101860008FB100148FB00010240500390A0005382C
60253+:1018700027BD002027BDFFE8AFB00010AFBF0014A8
60254+:101880009742010C2405003600808021144000108E
60255+:10189000304600FF0E00025000000000240200123B
60256+:1018A000A362003F93620005344200100E00053130
60257+:1018B000A36200050E00025902002021020020212F
60258+:1018C0000E00025E240500200A000604000000004D
60259+:1018D0000E000538000000000E000250020020211A
60260+:1018E000936200232403FF9F020020210043102461
60261+:1018F0008FBF00148FB00010A36200230A000259AA
60262+:1019000027BD001827BDFFE0AFBF0018AFB100141E
60263+:10191000AFB0001030B100FF0E00025000808021F7
60264+:10192000240200120E000531A362003F0E0002598E
60265+:101930000200202102002021022030218FBF001848
60266+:101940008FB100148FB00010240500350A0005384F
60267+:1019500027BD0020A380002C03E00008A380002DF9
60268+:101960008F4202780440FFFE8F820034AF42024073
60269+:1019700024020002A34202443C02100003E00008DB
60270+:10198000AF4202783C0360008C6254003042000891
60271+:101990001440FFFD000000008C625408AF82000C70
60272+:1019A00024020052AC605408AC645430AC6254342D
60273+:1019B0002402000803E00008AC6254003C0260000E
60274+:1019C0008C42540030420008104000053C03600087
60275+:1019D0008C625400304200081440FFFD00000000FB
60276+:1019E0008F83000C3C02600003E00008AC43540805
60277+:1019F00090A3000024020005008040213063003FD6
60278+:101A000000004821146200050000502190A2001C33
60279+:101A100094A3001E304900FF306AFFFFAD00000CA8
60280+:101A2000AD000010AD000024950200148D05001CCF
60281+:101A30008D0400183042FFFF0049102300021100FE
60282+:101A4000000237C3004038210086202300A2102B5B
60283+:101A50000082202300A72823AD05001CAD04001838
60284+:101A6000A5090014A5090020A50A001603E0000836
60285+:101A7000A50A00228F4201F80440FFFE2402000262
60286+:101A8000AF4401C0A34201C43C02100003E00008BF
60287+:101A9000AF4201F83C0208008C4200B427BDFFE8C9
60288+:101AA000AFBF001424420001AFB000103C01080099
60289+:101AB000AC2200B48F4300243C02001F30AA00FF78
60290+:101AC0003442FF8030D800FF006280240080F8217B
60291+:101AD00030EF00FF1158003B01405821240CFF80DB
60292+:101AE0003C19000A3163007F000310C00003194055
60293+:101AF000006218213C0208008C4200DC25680001CD
60294+:101B0000310D007F03E21021004310213043007F9C
60295+:101B100003431821004C102400794821AF420024CF
60296+:101B20008D220024016C1824006C7026AD22000C5C
60297+:101B30008D220024310800FFAD22001095220014F0
60298+:101B4000952300208D27001C3042FFFF3063FFFFEC
60299+:101B50008D2600180043102300021100000227C345
60300+:101B60000040282100C4302300E2102B00C23023A3
60301+:101B700000E53823AD27001CAD2600189522002073
60302+:101B8000A522001495220022154B000AA52200165A
60303+:101B90008D2300248D220008254600013145008058
60304+:101BA0001462000430C4007F108F000238AA008045
60305+:101BB00000C0502151AF000131C800FF1518FFC906
60306+:101BC000010058218F8400343082007F03421821A5
60307+:101BD0003C02000A006218212402FF8000822024B7
60308+:101BE000AF440024A06A0079A06A00838C62005090
60309+:101BF0008F840034AC6200708C6500743C027FFFFF
60310+:101C00003442FFFF00A228240E00066BAC6500746E
60311+:101C1000AF5000248FBF00148FB0001003E0000805
60312+:101C200027BD001827BDFFC0AFBE0038AFB70034D6
60313+:101C3000AFB5002CAFB20020AFB1001CAFB00018A0
60314+:101C4000AFBF003CAFB60030AFB40028AFB3002444
60315+:101C50008F4500248F4600288F43002C3C02001F34
60316+:101C60003442FF800062182400C230240080A82182
60317+:101C7000AFA3001400A2F0240E00062FAFA60010A0
60318+:101C80003C0208008C4200E02410FF8003608821A1
60319+:101C900002A2102100501024AF4200243C02080090
60320+:101CA0008C4200E002A210213042007F0342182142
60321+:101CB0003C02000A00629021924200D293630084A9
60322+:101CC000305700FF306300FF24020001106200342F
60323+:101CD000036020212402000214620036000000008C
60324+:101CE0000E001216024028219223008392220083C4
60325+:101CF0003063007F3042007F000210C000031940B3
60326+:101D0000006218213C0208008C4200DC02A2102173
60327+:101D10000043382100F01024AF42002892250078BB
60328+:101D20009224008330E2007F034218213C02000C21
60329+:101D300014850007006280212402FFFFA24200F107
60330+:101D40002402FFFFA64200F20A0007272402FFFF39
60331+:101D500096020020A24200F196020022A64200F262
60332+:101D60008E020024AE4200F492220083A24200F0D0
60333+:101D70008E4200C8AE4200FC8E4200C4AE4200F863
60334+:101D80008E220050AE4201008E4200CCAE420104D1
60335+:101D9000922200853042003F0A0007823442004010
60336+:101DA0000E00123902402821922200850A00078283
60337+:101DB0003042003F936200852403FFDF3042003F42
60338+:101DC000A36200859362008500431024A36200850E
60339+:101DD0009363008393620078307400FF304200FF09
60340+:101DE00010540036240AFF803C0C000C3283007F24
60341+:101DF000000310C000031940006218213C020800D3
60342+:101E00008C4200DC268800013109007F02A21021EB
60343+:101E10000043382130E2007F0342182100EA1024F9
60344+:101E2000AF420028006C80218E020024028A182410
60345+:101E3000006A5826AE02000C8E020024310800FF12
60346+:101E4000AE02001096020014960300208E07001CBC
60347+:101E50003042FFFF3063FFFF8E060018004310235F
60348+:101E600000021100000227C30040282100C43023D3
60349+:101E700000E2102B00C2302300E53823AE07001C1F
60350+:101E8000AE06001896020020A60200149602002258
60351+:101E9000A602001692220079304200FF105400077B
60352+:101EA0000000000051370001316800FF92220078E5
60353+:101EB000304200FF1448FFCD0100A0219222008390
60354+:101EC000A22200798E2200500A0007E2AE220070A2
60355+:101ED000A22200858E22004C2405FF80AE42010C18
60356+:101EE0009222008534420020A2220085924200D135
60357+:101EF0003C0308008C6300DC305400FF3C02080007
60358+:101F00008C4200E400143140001420C002A31821C8
60359+:101F100000C4202102A210210064382100461021B3
60360+:101F20000045182400E52824AF450028AF43002CC5
60361+:101F30003042007F924400D030E3007F03422821EA
60362+:101F4000034318213C02000C006280213C02000E79
60363+:101F5000309600FF00A298211296002A000000008F
60364+:101F60008E02000C02002021026028211040002572
60365+:101F7000261000280E00064A000000009262000DA4
60366+:101F800026830001307400FF3042007FA262000D02
60367+:101F90002404FF801697FFF0267300203C020800FF
60368+:101FA0008C4200DC0000A02102A210210044102479
60369+:101FB000AF4200283C0208008C4200E43C030800C9
60370+:101FC0008C6300DC02A2102100441024AF42002CDC
60371+:101FD0003C0208008C4200E402A318213063007F19
60372+:101FE00002A210213042007F034220210343182126
60373+:101FF0003C02000C006280213C02000E0A0007A493
60374+:10200000008298218E4200D8AE2200508E4200D825
60375+:10201000AE22007092250083924600D19223008365
60376+:10202000924400D12402FF8000A228243063007F64
60377+:10203000308400FF00A628250064182A10600002E2
60378+:1020400030A500FF38A50080A2250083A2250079D5
60379+:102050000E00063D000000009222007E02A020211A
60380+:10206000A222007A8E2300743C027FFF3442FFFFDD
60381+:10207000006218240E00066BAE2300748FA20010BD
60382+:10208000AF5E00248FBF003CAF4200288FBE0038F7
60383+:102090008FA200148FB700348FB600308FB5002C9C
60384+:1020A0008FB400288FB300248FB200208FB1001CA2
60385+:1020B0008FB0001827BD004003E00008AF42002C9D
60386+:1020C00090A2000024420001A0A200003C030800EE
60387+:1020D0008C6300F4304200FF1443000F0080302175
60388+:1020E000A0A000003C0208008C4200E48F84003471
60389+:1020F000008220213082007F034218213C02000C24
60390+:10210000006218212402FF8000822024ACC300005A
60391+:1021100003E00008AF4400288C8200002442002025
60392+:1021200003E00008AC82000094C200003C080800F4
60393+:10213000950800CA30E7FFFF008048210102102106
60394+:10214000A4C2000094C200003042FFFF00E2102B46
60395+:1021500054400001A4C7000094A200003C03080002
60396+:102160008C6300CC24420001A4A2000094A20000D1
60397+:102170003042FFFF544300078F8600280107102BD1
60398+:10218000A4A000005440000101003821A4C70000B1
60399+:102190008F8600288CC4001CAF44003C94A2000031
60400+:1021A0008F43003C3042FFFF000210C00062182144
60401+:1021B000AF43003C8F42003C008220231880000483
60402+:1021C000000000008CC200180A00084324420001ED
60403+:1021D0008CC20018AF4200383C020050344200105C
60404+:1021E000AF420030000000000000000000000000CE
60405+:1021F0008F420000304200201040FFFD0000000030
60406+:102200008F420404AD2200048F420400AD2200007E
60407+:102210003C020020AF42003003E000080000000054
60408+:1022200027BDFFE0AFB20018AFB10014AFB000108F
60409+:10223000AFBF001C94C2000000C080213C12080007
60410+:10224000965200C624420001A60200009603000038
60411+:1022500094E2000000E03021144300058FB100300B
60412+:102260000E000818024038210A000875000000001E
60413+:102270008C8300048C820004244200400461000727
60414+:10228000AC8200048C8200040440000400000000C2
60415+:102290008C82000024420001AC8200009602000003
60416+:1022A0003042FFFF50520001A600000096220000BD
60417+:1022B00024420001A62200008F82002896230000FD
60418+:1022C00094420016144300048FBF001C2402000136
60419+:1022D000A62200008FBF001C8FB200188FB100141F
60420+:1022E0008FB0001003E0000827BD00208F89002870
60421+:1022F00027BDFFE0AFBF00188D220028274804004B
60422+:1023000030E700FFAF4200388D22002CAF8800304C
60423+:10231000AF42003C3C020005AF420030000000002C
60424+:1023200000000000000000000000000000000000AD
60425+:10233000000000008C82000C8C82000CAD020000BA
60426+:102340008C820010AD0200048C820018AD020008DF
60427+:102350008C82001CAD02000C8CA20014AD02001097
60428+:102360008C820020AD02001490820005304200FFF4
60429+:1023700000021200AD0200188CA20018AD02001C71
60430+:102380008CA2000CAD0200208CA20010AD02002433
60431+:102390008CA2001CAD0200288CA20020AD02002CF3
60432+:1023A000AD060030AD000034978300263402FFFFF5
60433+:1023B00014620002006020213404FFFF10E00011CD
60434+:1023C000AD04003895230036952400362402000120
60435+:1023D0003063FFFF000318C20069182190650040B8
60436+:1023E000308400070082100400451025A0620040E0
60437+:1023F0008F820028944200563042FFFF0A0008DC1A
60438+:10240000AD02003C952300369524003624020001DD
60439+:102410003063FFFF000318C2006918219065004077
60440+:1024200030840007008210040002102700451024A9
60441+:10243000A0620040AD00003C000000000000000071
60442+:10244000000000003C02000634420040AF42003071
60443+:102450000000000000000000000000008F420000AB
60444+:10246000304200101040FFFD8F860028AF880030FA
60445+:1024700024C2005624C7003C24C4002824C50032CE
60446+:1024800024C600360E000856AFA200108FBF0018F9
60447+:1024900003E0000827BD00208F8300243C060800CD
60448+:1024A0008CC600E88F82003430633FFF0003198040
60449+:1024B00000461021004310212403FF803046007F96
60450+:1024C00000431024AF420028034618213C02000CB0
60451+:1024D0000062302190C2000D30A500FF00003821BD
60452+:1024E00034420010A0C2000D8F8900288F8A00247A
60453+:1024F00095230036000A13823048000324020001AD
60454+:10250000A4C3000E1102000B2902000210400005B6
60455+:10251000240200021100000C240300010A0009201B
60456+:102520000000182111020006000000000A00092026
60457+:10253000000018218CC2002C0A000920244300014D
60458+:102540008CC20014244300018CC200180043102BDD
60459+:1025500050400009240700012402002714A20003B0
60460+:10256000000000000A00092C240700019522003E0B
60461+:1025700024420001A522003E000A138230430003DA
60462+:102580002C62000210400009008028211460000421
60463+:102590000000000094C200360A00093C3046FFFFEC
60464+:1025A0008CC600380A00093C008028210000302138
60465+:1025B0003C04080024844B780A00088900000000CD
60466+:1025C000274901008D22000C9523000601202021BF
60467+:1025D000000216023046003F3063FFFF240200274E
60468+:1025E00000C0282128C7002810C2000EAF83002495
60469+:1025F00010E00008240200312402002110C200096A
60470+:102600002402002510C200079382002D0A00095BF6
60471+:102610000000000010C200059382002D0A00095B33
60472+:10262000000000000A0008F4000000000A0006266E
60473+:102630000000000095230006912400058D25000C64
60474+:102640008D2600108D2700188D28001C8D29002054
60475+:10265000244200013C010800A4234B7E3C010800F9
60476+:10266000A0244B7D3C010800AC254B843C010800B4
60477+:10267000AC264B883C010800AC274B903C0108007D
60478+:10268000AC284B943C010800AC294B9803E00008AF
60479+:10269000A382002D8F87002827BDFFC0AFB3003471
60480+:1026A000AFB20030AFB1002CAFB00028AFBF0038E0
60481+:1026B0003C0208008C4200D094E3003030B0FFFFB1
60482+:1026C000005010073045FFFF3063FFFF00C0982126
60483+:1026D000A7A200103C110800963100C614A3000602
60484+:1026E0003092FFFF8CE2002424420030AF42003CD5
60485+:1026F0000A0009948CE2002094E200323042FFFF8D
60486+:1027000054A2000827A400188CE2002C24420030B8
60487+:10271000AF42003C8CE20028AF4200380A0009A218
60488+:102720008F84002827A5001027A60020022038212A
60489+:102730000E000818A7A000208FA200182442003025
60490+:10274000AF4200388FA2001CAF42003C8F840028AB
60491+:102750003C020005AF42003094820034274304005D
60492+:102760003042FFFF0202102B14400007AF830030FD
60493+:1027700094820054948300340202102100431023F9
60494+:102780000A0009B63043FFFF94830054948200345A
60495+:102790000223182100501023006218233063FFFF2A
60496+:1027A000948200163042FFFF144300030000000033
60497+:1027B0000A0009C424030001948200163042FFFF7E
60498+:1027C0000043102B104000058F82003094820016C9
60499+:1027D000006210233043FFFF8F820030AC530000B3
60500+:1027E000AC400004AC520008AC43000C3C020006B4
60501+:1027F00034420010AF420030000000000000000032
60502+:10280000000000008F420000304200101040FFFD29
60503+:10281000001018C2006418219065004032040007BF
60504+:10282000240200018FBF00388FB300348FB2003014
60505+:102830008FB1002C8FB000280082100400451025B5
60506+:1028400027BD004003E00008A062004027BDFFA8AC
60507+:10285000AFB60050AFB5004CAFB40048AFB30044C2
60508+:10286000AFB1003CAFBF0054AFB20040AFB00038D2
60509+:102870008C9000003C0208008C4200E88F860034F7
60510+:10288000960300022413FF8000C2302130633FFF13
60511+:102890000003198000C3382100F3102490B2000017
60512+:1028A000AF42002C9203000230E2007F034230214D
60513+:1028B0003C02000E00C28821306300C024020040A8
60514+:1028C0000080A82100A0B021146200260000A021F1
60515+:1028D0008E3400388E2200181440000224020001B9
60516+:1028E000AE2200189202000D304200201440001564
60517+:1028F0008F8200343C0308008C6300DC001238C077
60518+:10290000001231400043102100C730210046382119
60519+:1029100030E300073C02008030E6007800C230253A
60520+:102920000343182100F31024AF4208002463090078
60521+:10293000AF4608108E2200188C6300080043102157
60522+:10294000AE2200188E22002C8E2300182442000193
60523+:102950000062182B1060003D000000000A000A7899
60524+:1029600000000000920300022402FFC00043102474
60525+:10297000304200FF1440000524020001AE2200187E
60526+:10298000962200360A000A613054FFFF8E2200149E
60527+:1029900024420001AE22001892020000000216003C
60528+:1029A0000002160304410029000000009602000204
60529+:1029B00027A4001000802821A7A20016960200027A
60530+:1029C00024070001000030213042FFFFAF820024C5
60531+:1029D0000E000889AFA0001C960300023C0408000A
60532+:1029E0008C8400E88F82003430633FFF000319803D
60533+:1029F00000441021004310213043007F3C05000CAF
60534+:102A00000053102403431821AF4200280065182109
60535+:102A10009062000D001221403042007FA062000D44
60536+:102A20003C0308008C6300E48F82003400431021D3
60537+:102A30000044382130E2007F03421021004510217C
60538+:102A400000F31824AF430028AEA200009222000D2C
60539+:102A5000304200101040001302A020218F83002874
60540+:102A60008EA40000028030219462003E2442FFFFC9
60541+:102A7000A462003E948400029625000E3084FFFF7D
60542+:102A80000E00097330A5FFFF8F82002894430034A5
60543+:102A90009622000E1443000302A02021240200010C
60544+:102AA000A382002C02C028210E0007FE00000000B7
60545+:102AB0008FBF00548FB600508FB5004C8FB40048C4
60546+:102AC0008FB300448FB200408FB1003C8FB000380C
60547+:102AD00003E0000827BD00588F82002827BDFFD0E3
60548+:102AE000AFB40028AFB20020AFBF002CAFB30024BA
60549+:102AF000AFB1001CAFB00018904400D0904300D19B
60550+:102B00000000A021309200FFA3A30010306300FF5B
60551+:102B10008C5100D88C5300DC1072002B2402000171
60552+:102B20003C0308008C6300E493A400108F820034FF
60553+:102B30002406FF800004214000431021004410219E
60554+:102B40003043007F00461024AF4200280343182181
60555+:102B50003C02000C006218218C62000427A40014BF
60556+:102B600027A50010022280210270102304400015C6
60557+:102B7000AFA300149062000D00C21024304200FF89
60558+:102B800014400007020088219062000D344200408A
60559+:102B90000E0007FEA062000D0A000ABD93A20010FD
60560+:102BA0000E0009E1241400018F830028AC7000D8C6
60561+:102BB00093A20010A06200D193A200101452FFD87B
60562+:102BC0000000000024020001168200048FBF002CC8
60563+:102BD0000E000626000000008FBF002C8FB40028D6
60564+:102BE0008FB300248FB200208FB1001C8FB000186B
60565+:102BF00003E0000827BD003027BDFFD8AFB3001C9D
60566+:102C0000AFB20018AFB10014AFB00010AFBF0020DA
60567+:102C10000080982100E0802130B1FFFF0E00049376
60568+:102C200030D200FF000000000000000000000000A3
60569+:102C30008F820020AC510000AC520004AC5300085D
60570+:102C4000AC40000CAC400010AC400014AC4000188C
60571+:102C50003C03080094634B5E02038025AC50001CCB
60572+:102C6000000000000000000000000000240400013B
60573+:102C70008FBF00208FB3001C8FB200188FB10014DB
60574+:102C80008FB000100A0004B827BD002827BDFFE858
60575+:102C9000AFB00010AFBF001430A5FFFF30C600FF7B
60576+:102CA0000080802124020C80AF420024000000003C
60577+:102CB0000000000000000000000000000000000014
60578+:102CC0000E000ACC000000003C040800248400E050
60579+:102CD0008C8200002403FF808FBF001402021021A9
60580+:102CE00000431024AF4200248C8200003C03000A01
60581+:102CF000020280213210007F035010218FB000109B
60582+:102D00000043102127BD001803E00008AF8200280F
60583+:102D100027BDFFE8AFBF00108F4401403C0308000F
60584+:102D20008C6300E02402FF80AF840034008318210C
60585+:102D300000621024AF4200243C02000803424021FC
60586+:102D4000950500023063007F3C02000A034318210E
60587+:102D50000062182130A5FFFF3402FFFF0000302180
60588+:102D60003C07602010A20006AF8300282402FFFF6A
60589+:102D7000A5020002946500D40E000AF130A5FFFF01
60590+:102D80008FBF001024020C8027BD001803E000084C
60591+:102D9000AF4200243C020008034240219502000299
60592+:102DA0003C0A0800954A00C63046FFFF14C00007E1
60593+:102DB0003402FFFF8F8200288F8400343C0760209C
60594+:102DC000944500D40A000B5A30A5FFFF10C200241E
60595+:102DD0008F87002894E2005494E400163045FFFFEA
60596+:102DE00000A6102300A6182B3089FFFF10600004F6
60597+:102DF0003044FFFF00C51023012210233044FFFFA1
60598+:102E0000008A102B1040000C012A1023240200011C
60599+:102E1000A50200162402FFFFA502000294E500D4DB
60600+:102E20008F8400340000302130A5FFFF3C07602074
60601+:102E30000A000AF1000000000044102A10400008B7
60602+:102E4000000000009502001630420001104000040E
60603+:102E5000000000009742007E24420014A5020016E4
60604+:102E600003E00008000000008F84002827BDFFE079
60605+:102E7000AFBF0018948200349483003E1060001AA3
60606+:102E80003048FFFF9383002C2402000114620027C6
60607+:102E90008FBF00188F820028000818C23108000771
60608+:102EA000006218212447003A244900542444002099
60609+:102EB000244500302446003490620040304200FF38
60610+:102EC0000102100730420001104000168FBF0018A9
60611+:102ED0000E000856AFA900108F82002894420034DB
60612+:102EE0000A000B733048FFFF94830036948200344D
60613+:102EF0001043000E8FBF001894820036A482003465
60614+:102F000094820056A48200548C82002CAC8200244F
60615+:102F100094820032A48200309482003CA482003A61
60616+:102F20008FBF00180A000B3327BD002003E0000804
60617+:102F300027BD002027BDFFE8AFBF00108F4A01006A
60618+:102F40003C0508008CA500E03C02080090424B8440
60619+:102F50003C0C0800958C4B7E01452821304B003FEE
60620+:102F600030A2007F03424021396900323C02000A4E
60621+:102F70003963003F2C630001010240212D2900012B
60622+:102F80002402FF8000A2282401234825AF8A0034B0
60623+:102F900000801821AF450024000030210080282146
60624+:102FA00024070001AF8800283C04080024844B78E3
60625+:102FB000AF8C002415200007A380002D24020020E0
60626+:102FC0005562000F006020213402FFFF5582000C83
60627+:102FD000006020212402002015620005000000008E
60628+:102FE0008C6300142402FFFF106200070000000041
60629+:102FF0000E000889000000000A000BD0000000004D
60630+:103000000E0008F4016028210E000B68000000008B
60631+:103010008FBF001024020C8027BD001803E00008B9
60632+:10302000AF4200243C0208008C4200E027BDFFA014
60633+:10303000AFB1003C008210212411FF80AFBE0058C8
60634+:10304000AFB70054AFB20040AFB00038AFBF005CC4
60635+:10305000AFB60050AFB5004CAFB40048AFB30044BA
60636+:10306000005110248F4800248F4900288F470028E2
60637+:10307000AF4200243C0208008C4200E00080902116
60638+:1030800024060006008210213042007F03421821EE
60639+:103090003C02000A006280213C02001F3442FF8093
60640+:1030A00000E2382427A40010260500F00122F024B5
60641+:1030B0000102B8240E00051DAFA700308FA2001832
60642+:1030C000AE0200C48FA2001CAE0200C88FA2002472
60643+:1030D000AE0200CC93A40010920300D12402FF8022
60644+:1030E0000082102400431025304900FF3083007F08
60645+:1030F0003122007F0062102A10400004000310C03B
60646+:1031000001311026304900FF000310C000031940B0
60647+:10311000006218213C0208008C4200DC920400D2BC
60648+:10312000024210210043102100511024AF42002818
60649+:1031300093A300103063007F000310C00003194008
60650+:10314000006218213C0208008C4200DC024210217F
60651+:10315000004310213042007F034218213C02000C42
60652+:10316000006240218FA300142402FFFF1062003090
60653+:10317000309500FF93A2001195030014304400FF26
60654+:103180003063FFFF0064182B1060000D000000008A
60655+:10319000950400148D07001C8D0600183084FFFF75
60656+:1031A00000442023000421000000102100E4382105
60657+:1031B00000E4202B00C230210A000C4A00C4302158
60658+:1031C000950400148D07001C8D0600183084FFFF45
60659+:1031D000008220230004210000001021008018211B
60660+:1031E00000C2302300E4202B00C4302300E3382346
60661+:1031F000AD07001CAD06001893A20011A502001433
60662+:1032000097A20012A50200168FA20014AD020010B2
60663+:103210008FA20014AD02000C93A20011A5020020A1
60664+:1032200097A20012A50200228FA20014AD02002472
60665+:103230002406FF80024610243256007FAF4200244D
60666+:10324000035618213C02000A006280218E02004CC5
60667+:103250008FA200203124007F000428C0AE0200505D
60668+:103260008FA200200004214000852821AE020070BA
60669+:1032700093A2001001208821A202008393A20010D3
60670+:10328000A2020079920200853042003FA20200852E
60671+:103290003C0208008C4200DC024210210045102153
60672+:1032A00000461024AF42002C3C0208008C4200E48F
60673+:1032B0003C0308008C6300DC024210210044102112
60674+:1032C00000461024AF4200283C0208008C4200E473
60675+:1032D00002431821006518210242102100441021E8
60676+:1032E0003042007F3063007F93A50010034220210D
60677+:1032F000034318213C02000E006240213C02000CF6
60678+:1033000010B1008C008248213233007F1660001912
60679+:103310002404FF803C0208008C4200DC02421021A1
60680+:1033200000441024AF42002C3C0208008C4200E410
60681+:103330003C0308008C6300DC02421021004410248E
60682+:10334000AF4200283C0208008C4200E402431821EE
60683+:103350003063007F024210213042007F034220216F
60684+:10336000034318213C02000E006240213C02000C85
60685+:10337000008248219124000D2414FF8000001021B8
60686+:1033800000942025A124000D950400029505001449
60687+:103390008D07001C3084FFFF30A5FFFF8D0600184D
60688+:1033A000008520230004210000E4382100C23021E0
60689+:1033B00000E4202B00C43021AD07001CAD0600182E
60690+:1033C00095020002A5020014A50000168D02000857
60691+:1033D000AD0200108D020008AD02000C9502000243
60692+:1033E000A5020020A50000228D020008AD020024E5
60693+:1033F0009122000D30420040104000422622000180
60694+:103400003C0208008C4200E0A3B300283C10000AF4
60695+:103410000242102100541024AF4200243C02080054
60696+:103420008C4200E0A380002C27A4002C0242102133
60697+:103430003042007F03421821007018218C6200D8AE
60698+:103440008D26000427A50028AFA9002C00461021D6
60699+:10345000AC6200D80E0009E1AF83002893A30028D6
60700+:103460008F8200280E000626A04300D10E000B68B4
60701+:103470000000000002541024AF4200243C02080067
60702+:103480008C4200DC00132940001320C000A420213E
60703+:10349000024210210044102100541024AF42002C9D
60704+:1034A0003C0208008C4200E43C0308008C6300DC12
60705+:1034B00003563021024210210045102100541024EF
60706+:1034C000AF4200283C0208008C4200E4024318216D
60707+:1034D0000064182102421021004510213042007F73
60708+:1034E0003063007F03422021034318213C02000E79
60709+:1034F000006240213C02000C00D080210082482163
60710+:10350000262200013043007F14750005304400FF7F
60711+:103510002403FF800223102400431026304400FFC0
60712+:1035200093A2001000808821250800281444FF760B
60713+:103530002529002093A400108FA300142402FFFF6C
60714+:103540001062000A308900FF2482000124830001F8
60715+:103550003042007F14550005306900FF2403FF80CE
60716+:103560000083102400431026304900FF92020078A7
60717+:10357000305300FF11330032012088213C02080043
60718+:103580008C4200DC3225007F000520C00005294068
60719+:1035900000A42021024210212406FF8000441021B3
60720+:1035A00000461024AF42002C3C0308008C6300DC72
60721+:1035B0003C0208008C4200E4024318210242102120
60722+:1035C0000045102100641821004610243063007F5C
60723+:1035D000AF420028034318213C02000E0062402144
60724+:1035E0003C0208008C4200E48D06000C0100202102
60725+:1035F00002421021004510213042007F0342182171
60726+:103600003C02000C0062482110C0000D012028215E
60727+:103610000E00064A000000002402FF800222182447
60728+:1036200026240001006228263082007F1455000203
60729+:10363000308300FF30A300FF1473FFD000608821A7
60730+:103640008E0300743C027FFF3442FFFF00621824A7
60731+:10365000AE0300740E00066B02402021AF57002419
60732+:103660008FA20030AF5E00288FBF005C8FBE005875
60733+:103670008FB700548FB600508FB5004C8FB4004800
60734+:103680008FB300448FB200408FB1003C8FB0003840
60735+:1036900027BD006003E00008AF42002C27BDFFD823
60736+:1036A000AFB1001CAFBF0020AFB000182751018898
60737+:1036B000922200032408FF803C03000A3047007F69
60738+:1036C000A3A700108F4601803C0208008C4200E056
60739+:1036D000AF86003400C2282100A81024AF42002485
60740+:1036E0009224000030A2007F0342102100431021E9
60741+:1036F000AF8200283084007F24020002148200255B
60742+:10370000000719403C0208008C4200E400C210216E
60743+:103710000043282130A2007F0342182100A8102472
60744+:10372000AF4200283C02000C006218219062000D9C
60745+:10373000AFA3001400481025A062000D8FA3001451
60746+:103740009062000D304200405040006A8FBF002060
60747+:103750008F860028A380002C27A400148CC200D8D8
60748+:103760008C63000427A50010004310210E0009E11E
60749+:10377000ACC200D893A300108F8200280E0006264A
60750+:10378000A04300D10E000B68000000000A000E0BE1
60751+:103790008FBF00200E00062F00C020210E00063D26
60752+:1037A000000000003C020008034280219223000137
60753+:1037B0009202007B1443004F8FBF00209222000032
60754+:1037C0003044007F24020004108200172882000584
60755+:1037D00010400006240200052402000310820007A6
60756+:1037E0008FB1001C0A000E0C0000000010820012B5
60757+:1037F0008FBF00200A000E0C8FB1001C92050083C1
60758+:10380000920600788E0700748F84003430A500FF84
60759+:1038100000073E0230C600FF0E00067330E7007F4F
60760+:103820000A000E0B8FBF00200E000BD78F840034D0
60761+:103830000A000E0B8FBF002024020C80AF42002430
60762+:103840009202003E30420040104000200000000084
60763+:103850009202003E00021600000216030441000618
60764+:10386000000000008F8400340E0005A024050093A2
60765+:103870000A000E0B8FBF00209202003F24030018A5
60766+:10388000304200FF1443000C8F84003424050039BB
60767+:103890000E000538000030210E0002508F840034E5
60768+:1038A00024020012A202003F0E0002598F8400344D
60769+:1038B0000A000E0B8FBF0020240500360E000538CD
60770+:1038C000000030210A000E0B8FBF00200E000250B6
60771+:1038D0008F8400349202000534420020A2020005C9
60772+:1038E0000E0002598F8400340E000FC08F84003404
60773+:1038F0008FBF00208FB1001C8FB0001824020C80F5
60774+:1039000027BD002803E00008AF42002427BDFFE8E0
60775+:10391000AFB00010AFBF001427430100946200084D
60776+:103920000002140000021403044100020000802180
60777+:103930002410000194620008304200801040001AF8
60778+:10394000020010219462000830422000104000164E
60779+:10395000020010218C6300183C021C2D344219ED2A
60780+:10396000240600061062000F3C0760213C0208009C
60781+:103970008C4200D4104000078F8200288F830028DB
60782+:10398000906200623042000F34420040A062006248
60783+:103990008F8200288F840034944500D40E000AF1F1
60784+:1039A00030A5FFFF020010218FBF00148FB0001060
60785+:1039B00003E0000827BD001827BDFFE0AFB10014E9
60786+:1039C000AFB00010A380002CAFBF00188F450100DE
60787+:1039D0003C0308008C6300E02402FF80AF850034C4
60788+:1039E00000A318213064007F0344202100621824C2
60789+:1039F0003C02000A00822021AF430024275001002E
60790+:103A00008E0200148C8300DCAF8400280043102356
60791+:103A100018400004000088218E0200140E000A8461
60792+:103A2000AC8200DC9202000B24030002304200FF53
60793+:103A30001443002F0000000096020008304300FFEE
60794+:103A40002402008214620005240200840E00093E54
60795+:103A5000000000000A000E97000000001462000938
60796+:103A6000240200818F8200288F8400343C0760216B
60797+:103A7000944500D49206000530A5FFFF0A000E868B
60798+:103A800030C600FF14620027000000009202000A06
60799+:103A9000304300FF306200201040000430620040DC
60800+:103AA0008F8400340A000E82240600401040000477
60801+:103AB000000316008F8400340A000E8224060041A1
60802+:103AC00000021603044100178F84003424060042CC
60803+:103AD0008F8200283C076019944500D430A5FFFF71
60804+:103AE0000E000AF1000000000A000E97000000001E
60805+:103AF0009202000B24030016304200FF1043000620
60806+:103B0000000000009202000B24030017304200FF67
60807+:103B100014430004000000000E000E11000000001D
60808+:103B2000004088210E000B68000000009202000A8D
60809+:103B3000304200081040000624020C808F850028C7
60810+:103B40003C0400080E0011EE0344202124020C80E6
60811+:103B5000AF4200248FBF0018022010218FB0001048
60812+:103B60008FB1001403E0000827BD002027BDFFE847
60813+:103B7000AFBF0014AFB000108F5000243C0308000A
60814+:103B80008C6300E08F4501002402FF8000A3182110
60815+:103B90003064007F03442021006218243C02000AA4
60816+:103BA00000822021AF850034AF4300249082006260
60817+:103BB000AF8400283042000F34420050A0820062DF
60818+:103BC0003C02001F3442FF800E00062602028024C1
60819+:103BD000AF5000248FBF00148FB0001003E0000826
60820+:103BE00027BD00183C0208008C4200201040001D38
60821+:103BF0002745010090A300093C0200080342202150
60822+:103C000024020018546200033C0200080A000ED887
60823+:103C10002402000803422021240200161462000539
60824+:103C20002402001724020012A082003F0A000EE2C4
60825+:103C300094A700085462000694A700089362000548
60826+:103C40002403FFFE00431024A362000594A700088C
60827+:103C500090A6001B8CA4000094A500060A000ACCC4
60828+:103C600000073C0003E000080000000027440100BA
60829+:103C700094820008304500FF38A3008238A20084F7
60830+:103C80002C6300012C420001006218251060000620
60831+:103C9000240200839382002D1040000D00000000DC
60832+:103CA0000A000B9B0000000014A2000524A2FF8064
60833+:103CB0008F4301043C02602003E00008AC43001481
60834+:103CC000304200FF2C420002104000032402002278
60835+:103CD0000A000E3C0000000014A2000300000000D7
60836+:103CE0000A000EA9000000000A000EC70000000034
60837+:103CF0009363007E9362007A144300090000202140
60838+:103D00009362000024030050304200FF144300047B
60839+:103D1000240400019362007E24420001A362007E1D
60840+:103D200003E00008008010218F4201F80440FFFEEC
60841+:103D300024020002AF4401C0A34201C43C021000AF
60842+:103D400003E00008AF4201F827BDFFE8AFBF001055
60843+:103D50009362003F2403000A304200FF14430046F0
60844+:103D6000000000008F6300548F62004C1062007DE1
60845+:103D7000036030219362000024030050304200FFB2
60846+:103D80001443002F000000008F4401403C02080053
60847+:103D90008C4200E02403FF800082102100431024A5
60848+:103DA000AF4200243C0208008C4200E08F650054C2
60849+:103DB0003C03000A008220213084007F034410214C
60850+:103DC00000431021AC4501089762003C8F63004C12
60851+:103DD0003042FFFF0002104000621821AF63005C18
60852+:103DE0008F6300548F64004C9762003C006418237A
60853+:103DF0003042FFFF00031843000210400043102A26
60854+:103E000010400006000000008F6200548F63004CD9
60855+:103E1000004310230A000F58000210439762003C31
60856+:103E20003042FFFF00021040ACC2006424020001D7
60857+:103E3000A0C0007CA0C2008424020C80AF420024F9
60858+:103E40000E000F0A8F440140104000478FBF001042
60859+:103E50008F4301408F4201F80440FFFE240200021C
60860+:103E6000AF4301C0A34201C43C021000AF4201F8BD
60861+:103E70000A000FA88FBF00109362003F24030010B8
60862+:103E8000304200FF14430004000000008F44014052
60863+:103E90000A000F94000028219362003F24030016BB
60864+:103EA000304200FF1443000424020014A362003FC8
60865+:103EB0000A000FA2000000008F62004C8F630050C8
60866+:103EC00000431023044100288FBF0010936200813B
60867+:103ED00024420001A3620081936200812C4200040D
60868+:103EE00014400010000000009362003F240300040F
60869+:103EF000304200FF14430006000000008F440140E0
60870+:103F00008FBF0010240500930A0005A027BD0018EC
60871+:103F10008F440140240500938FBF00100A00060F54
60872+:103F200027BD00188F4401400E0002500000000021
60873+:103F30008F6200542442FFFFAF6200548F62005032
60874+:103F40002442FFFFAF6200500E0002598F4401402F
60875+:103F50008F4401408FBF0010240500040A00025E58
60876+:103F600027BD00188FBF001003E0000827BD001810
60877+:103F70008F4201889363007E00021402304400FFE8
60878+:103F8000306300FF1464000D0000000093620080A5
60879+:103F9000304200FF1044000900000000A3640080CC
60880+:103FA0009362000024030050304200FF14430004D9
60881+:103FB000000000000A0006D78F440180A36400803F
60882+:103FC00003E000080000000027BDFFE8AFB00010CC
60883+:103FD000AFBF00149362000524030030304200306C
60884+:103FE00014430089008080213C0208008C4200209C
60885+:103FF00010400080020020210E0004930000000009
60886+:104000008F850020ACB000009362003E9363003FB8
60887+:10401000304200FF00021200306300FF0043102511
60888+:10402000ACA2000493620082000216000002160394
60889+:1040300004410005000000003C0308008C630048B8
60890+:104040000A000FE6000000009362003E304200408C
60891+:10405000144000030000182193620081304300FFE8
60892+:104060009362008200031E00304200FF0002140031
60893+:1040700000621825ACA300088F620040ACA2000CBF
60894+:104080008F620048ACA200108F62004CACA20014FA
60895+:104090008F6200508F63004C0043102304410003E3
60896+:1040A000000000000A000FFA8F62004C8F6200507F
60897+:1040B000ACA200183C02080094424B5E3C03C00BCB
60898+:1040C00000002021004310250E0004B8ACA2001C03
60899+:1040D0008F6200548F840020AC8200008F620058F1
60900+:1040E000AC8200048F62005CAC8200088F620060CA
60901+:1040F0008F43007400431021AC82000C8F62006477
60902+:10410000AC820010976300689762006A00031C008D
60903+:104110003042FFFF00621825AC83001493620082D6
60904+:1041200024030080304200FF14430003000000001D
60905+:104130000A00102EAC8000188F63000C24020001CE
60906+:104140001062000E2402FFFF9362003E30420040E6
60907+:104150001440000A2402FFFF8F63000C8F4200749A
60908+:10416000006218233C020800006210241440000280
60909+:10417000000028210060282100051043AC820018AF
60910+:104180003C02080094424B5E3C03C00C000020211E
60911+:10419000004310258F8300200E0004B8AC62001C81
60912+:1041A0008F6200188F8300203C05080094A54B5EA9
60913+:1041B00024040001AC620000AC6000048F66006C57
60914+:1041C0003C02400D00A22825AC6600088F6200DC8E
60915+:1041D000AC62000CAC600010936200050002160097
60916+:1041E000AC620014AC6000180E0004B8AC65001C92
60917+:1041F000020020218FBF00148FB00010A3600005C3
60918+:104200000A00042127BD00188FBF00148FB00010D2
60919+:1042100003E0000827BD00189742007C30C600FF6D
60920+:10422000A08600843047FFFF2402000514C2000B63
60921+:1042300024E3465090A201122C42000710400007D0
60922+:1042400024E30A0090A30112240200140062100467
60923+:1042500000E210210A0010663047FFFF3067FFFFC1
60924+:1042600003E00008A4870014AC87004C8CA201086E
60925+:104270000080402100A0482100E2102330C600FF4A
60926+:104280001840000393AA001324E2FFFCACA201082B
60927+:1042900030C2000110400008000000008D020050F4
60928+:1042A00000E2102304410013240600058D0200548F
60929+:1042B00010E20010000000008D02005414E2001A09
60930+:1042C000000000003C0208008C4200D83042002070
60931+:1042D0001040000A2402000191030078910200833B
60932+:1042E000144300062402000101002021012028219E
60933+:1042F000240600040A00105400000000A1000084FD
60934+:1043000011400009A50200148F4301008F4201F8FB
60935+:104310000440FFFE24020002AF4301C0A34201C4D7
60936+:104320003C021000AF4201F803E00008000000006A
60937+:1043300027BDFFE88FA90028AFBF001000804021F3
60938+:1043400000E918231860007330C600FFA080007CCD
60939+:10435000A08000818CA2010800E210230440004DDF
60940+:10436000000000008C8200509483003C8C84006428
60941+:10437000004748233063FFFF012318210083202BCF
60942+:1043800010800004000000008D0200640A0010B7D5
60943+:1043900000E210219502003C3042FFFF0122102173
60944+:1043A00000E21021AD02005C9502003C8D03005C30
60945+:1043B0003042FFFF0002104000E210210043102BAA
60946+:1043C00010400003000000000A0010C68D02005CCF
60947+:1043D0009502003C3042FFFF0002104000E2102135
60948+:1043E000AD02005CA1000084AD07004C8CA2010866
60949+:1043F00000E210231840000224E2FFFCACA20108F6
60950+:1044000030C200011040000A000000008D02005080
60951+:1044100000E2102304410004010020218D02005419
60952+:1044200014E20003000000000A0010E82406000562
60953+:104430008D02005414E200478FBF00103C020800B8
60954+:104440008C4200D8304200201040000A24020001B3
60955+:1044500091030078910200831443000624020001B6
60956+:1044600001002021240600048FBF00100A00105410
60957+:1044700027BD0018A1000084A50200148F4301008D
60958+:104480008F4201F80440FFFE240200020A00110DD1
60959+:10449000000000008C82005C004910230043102BB8
60960+:1044A00054400001AC87005C9502003C3042FFFFA5
60961+:1044B0000062102B14400007240200029502003C09
60962+:1044C0008D03005C3042FFFF00621821AD03005CE9
60963+:1044D00024020002AD07004CA10200840E000F0A66
60964+:1044E0008F4401001040001B8FBF00108F4301005C
60965+:1044F0008F4201F80440FFFE24020002AF4301C0D6
60966+:10450000A34201C43C021000AF4201F80A0011238B
60967+:104510008FBF001030C200101040000E8FBF00107F
60968+:104520008C83005C9482003C006918233042FFFFBA
60969+:10453000006218213C023FFF3444FFFF0083102B30
60970+:10454000544000010080182101231021AD02005CBD
60971+:104550008FBF001003E0000827BD001827BDFFE84B
60972+:104560008FAA0028AFBF00100080402100EA482336
60973+:104570001920002130C600FF8C83005C8C8200640F
60974+:10458000006A18230043102B5040001000691821C6
60975+:1045900094A2011001221021A4A2011094A20110E2
60976+:1045A0003042FFFF0043102B1440000A3C023FFF43
60977+:1045B00094A2011000431023A4A201109482003C95
60978+:1045C0003042FFFF0A00114200621821A4A001102E
60979+:1045D0003C023FFF3444FFFF0083102B5440000196
60980+:1045E0000080182100671021AD02005CA100007C52
60981+:1045F0000A00118AA100008130C200101040003C66
60982+:10460000000000008C820050004A1023184000383F
60983+:10461000000000009082007C24420001A082007C07
60984+:104620009082007C3C0308008C630024304200FF31
60985+:104630000043102B1440005C8FBF00108CA20108B7
60986+:1046400000E2102318400058000000008C83005442
60987+:104650009482003C006A18233042FFFF0003184395
60988+:10466000000210400043102A104000050000000026
60989+:104670008C820054004A10230A001171000210437A
60990+:104680009482003C3042FFFF00021040AD02006403
60991+:104690009502003C8D0400649503003C3042FFFF0E
60992+:1046A00000021040008220213063FFFF00831821A8
60993+:1046B00001431021AD02005C8D020054ACA2010840
60994+:1046C00024020002A10200840E000F0A8F440100A0
60995+:1046D000104000358FBF00108F4301008F4201F85A
60996+:1046E0000440FFFE240200020A0011B30000000093
60997+:1046F000AD07004C8CA2010800E210231840000214
60998+:1047000024E2FFFCACA2010830C200011040000A04
60999+:10471000000000008D02005000E21023044100045C
61000+:10472000010020218D02005414E20003000000006B
61001+:104730000A0011AA240600058D02005414E2001A92
61002+:104740008FBF00103C0208008C4200D8304200208D
61003+:104750001040000A240200019103007891020083B6
61004+:104760001443000624020001010020212406000455
61005+:104770008FBF00100A00105427BD0018A10000844C
61006+:10478000A50200148F4301008F4201F80440FFFE90
61007+:1047900024020002AF4301C0A34201C43C02100046
61008+:1047A000AF4201F88FBF001003E0000827BD0018DA
61009+:1047B0008FAA00108C8200500080402130C600FF7C
61010+:1047C000004A102300A048211840000700E01821EB
61011+:1047D00024020001A0800084A0A00112A482001481
61012+:1047E0000A001125AFAA0010A0800081AD07004C7F
61013+:1047F0008CA2010800E210231840000224E2FFFC12
61014+:10480000ACA2010830C20001104000080000000006
61015+:104810008D0200500062102304410013240600059D
61016+:104820008D02005410620010000000008D02005440
61017+:1048300014620011000000003C0208008C4200D805
61018+:10484000304200201040000A240200019103007849
61019+:10485000910200831443000624020001010020217C
61020+:1048600001202821240600040A0010540000000042
61021+:10487000A1000084A502001403E00008000000006D
61022+:1048800027BDFFE0AFBF0018274201009046000A95
61023+:104890008C4800148C8B004C9082008430C900FF3F
61024+:1048A00001681823304A00FF1C60001A2D460006DC
61025+:1048B000240200010142100410C00016304300031E
61026+:1048C000012030210100382114600007304C000C19
61027+:1048D00015800009304200301440000B8FBF0018D3
61028+:1048E0000A001214000000000E001125AFAB0010EA
61029+:1048F0000A0012148FBF00180E00109AAFAB001000
61030+:104900000A0012148FBF0018AFAB00100E0011BACE
61031+:10491000AFAA00148FBF001803E0000827BD0020D5
61032+:1049200024020003A08200848C82005403E000086B
61033+:10493000ACA201083C0200080342182190620081E9
61034+:10494000240600433C07601924420001A062008154
61035+:10495000906300813C0208008C4200C0306300FF7D
61036+:10496000146200102403FF803C0208008C4200E027
61037+:104970000082102100431024AF4200243C020800B2
61038+:104980008C4200E03C03000A008210213042007F8C
61039+:104990000342102100431021944500D40A000AF17B
61040+:1049A00030A5FFFF03E000080000000027BDFFE086
61041+:1049B000AFBF0018AFB10014AFB000108F4201803C
61042+:1049C0000080802100A088210E00121B00402021C1
61043+:1049D000A20000848E0200548FBF00188FB0001018
61044+:1049E000AE2201088FB1001403E0000827BD0020AB
61045+:1049F00027BDFFE03C020008AFB00010AFBF0018B9
61046+:104A0000AFB10014034280218F5101409203008412
61047+:104A10008E0400508E02004C14820040306600FF6D
61048+:104A20003C0208008C4200E02403FF800222102197
61049+:104A300000431024AF4200243C0208008C4200E0F6
61050+:104A40009744007C92050081022210213042007FB1
61051+:104A5000034218213C02000A0062182114A0000B36
61052+:104A60003084FFFF2402000554C20014248205DCB8
61053+:104A70009062011224420001A062011224020C8003
61054+:104A8000AF4200240A00127324020005A060011244
61055+:104A90002402000514C20009248205DC9202008170
61056+:104AA0002C4200075040000524820A009203008136
61057+:104AB0002402001400621004008210213044FFFF21
61058+:104AC000A60400140E00121B022020219602003CB6
61059+:104AD0008E03004C022020213042FFFF00021040D4
61060+:104AE000006218210E000250AE03005C9202007DAD
61061+:104AF00002202021344200400E000259A202007D13
61062+:104B00008F4201F80440FFFE24020002AF5101C0B1
61063+:104B1000A34201C43C021000AF4201F88FBF00184D
61064+:104B20008FB100148FB0001003E0000827BD0020F3
61065+:104B300008000ACC08000B1408000B9808000BE4CE
61066+:104B400008000C200A0000280000000000000000FF
61067+:104B50000000000D6370362E322E3300000000007E
61068+:104B60000602030400000000000000000000000036
61069+:104B70000000000000000000000000000000000035
61070+:104B80000000000000000000000000000000002005
61071+:104B90000000000000000000000000000000000015
61072+:104BA0000000000000000000000000000000000005
61073+:104BB00000000000000000000000000000000001F4
61074+:104BC0000000002B000000000000000400030D4066
61075+:104BD00000000000000000000000000000000000D5
61076+:104BE00000000000000000001000000300000000B2
61077+:104BF0000000000D0000000D3C020800244258A4F3
61078+:104C00003C03080024635F70AC4000000043202B8D
61079+:104C10001480FFFD244200043C1D080037BD7FFCCA
61080+:104C200003A0F0213C100800261000A03C1C080046
61081+:104C3000279C58A40E0001AC000000000000000DED
61082+:104C400027BDFFE83C096018AFBF00108D2C500055
61083+:104C5000240DFF7F24080031018D5824356A380C5B
61084+:104C600024070C003C1A8000AD2A50003C04800A46
61085+:104C7000AF4800083C1B8008AF4700240E00091510
61086+:104C8000AF8400100E0008D8000000000E000825B8
61087+:104C9000000000000E001252000000003C046016EC
61088+:104CA0008C8500003C06FFFF3C02535300A61824ED
61089+:104CB0001062004734867C0094C201F2A780002C69
61090+:104CC00010400003A78000CC38581E1EA798002C67
61091+:104CD00094C201F810400004978300CC38591E1E7E
61092+:104CE000A79900CC978300CC2C7F006753E000018C
61093+:104CF000240300669784002C2C82040114400002D7
61094+:104D000000602821240404003C0760008CE904387A
61095+:104D10002403103C3128FFFF1103001F30B9FFFFAF
61096+:104D200057200010A38000CE24020050A38200CEA2
61097+:104D3000939F00CE53E0000FA78500CCA78000CC46
61098+:104D4000978500CC8FBF0010A780002CA78000346F
61099+:104D5000A78000E63C010800AC25008003E00008C5
61100+:104D600027BD0018939F00CE57E0FFF5A78000CC29
61101+:104D7000A78500CC978500CC8FBF0010A784002C9E
61102+:104D8000A7800034A78000E63C010800AC25008025
61103+:104D900003E0000827BD0018A38000CE8CCB003CA8
61104+:104DA000316A00011140000E0000000030A7FFFF33
61105+:104DB00010E0FFDE240200508CCC00C831860001D8
61106+:104DC00014C0FFDC939F00CE0A00007A2402005139
61107+:104DD0008C8F00043C0E60000A00005D01EE302163
61108+:104DE0008CEF0808240D5708000F740211CD000441
61109+:104DF00030B8FFFF240500660A00007B240404008D
61110+:104E00001700FFCC939F00CE0A00007A24020050C6
61111+:104E10008F8600103089FFFF000939408CC30010D5
61112+:104E20003C08005000E82025AF4300388CC5001432
61113+:104E300027420400AF82001CAF45003CAF44003065
61114+:104E40000000000000000000000000000000000062
61115+:104E50000000000000000000000000000000000052
61116+:104E60008F4B0000316A00201140FFFD0000000060
61117+:104E700003E00008000000008F840010948A001AEC
61118+:104E80008C8700243149FFFF000940C000E8302131
61119+:104E9000AF46003C8C8500248F43003C00A31023C8
61120+:104EA00018400029000000008C8B002025620001C2
61121+:104EB0003C0D005035AC0008AF420038AF4C00301C
61122+:104EC00000000000000000000000000000000000E2
61123+:104ED00000000000000000000000000000000000D2
61124+:104EE0008F4F000031EE002011C0FFFD00000000D8
61125+:104EF0008F4A04003C080020AC8A00108F4904044B
61126+:104F0000AC890014AF4800300000000094860018FF
61127+:104F10009487001C00C71821A48300189485001AE8
61128+:104F200024A20001A482001A9498001A9499001EE9
61129+:104F3000133800030000000003E000080000000038
61130+:104F400003E00008A480001A8C8200200A0000DC24
61131+:104F50003C0D00500A0000CD000000003C0308009A
61132+:104F60008C6300208F82001827BDFFE810620008C4
61133+:104F7000AFBF00100E000104AF8300183C0308000F
61134+:104F80008C63002024040001106400048F89001049
61135+:104F90008FBF001003E0000827BD00188FBF00106E
61136+:104FA0003C076012A520000A9528000A34E500108D
61137+:104FB00027BD00183106FFFF03E00008ACA60090F3
61138+:104FC0003C0208008C42002027BDFFC8AFBF003460
61139+:104FD000AFBE0030AFB7002CAFB60028AFB500248D
61140+:104FE000AFB40020AFB3001CAFB20018AFB10014D3
61141+:104FF00010400050AFB000108F840010948600065F
61142+:105000009483000A00C3282330B6FFFF12C0004A71
61143+:105010008FBF003494890018948A000A012A402323
61144+:105020003102FFFF02C2382B14E0000202C020212F
61145+:10503000004020212C8C0005158000020080A0215A
61146+:10504000241400040E0000B3028020218F8700107A
61147+:1050500002809821AF80001494ED000A028088211C
61148+:105060001280004E31B2FFFF3C1770003C1540002B
61149+:105070003C1E60008F8F001C8DEE000001D71824AD
61150+:10508000507500500220202102A3802B160000350D
61151+:105090003C182000507800470220202124100001F5
61152+:1050A0008F83001414600039029158230230F823D2
61153+:1050B0000250C82133F1FFFF1620FFEE3332FFFF0D
61154+:1050C0008F8700103C110020AF510030000000001D
61155+:1050D00094E6000A3C1E601237D5001002662821B3
61156+:1050E000A4E5000A94E2000A94F2000A94F400187D
61157+:1050F0003057FFFF1292003BAEB700908CED0014CA
61158+:105100008CE400100013714001AE4021000E5FC31B
61159+:10511000010E502B008B4821012A1821ACE8001405
61160+:10512000ACE3001002D3382330F6FFFF16C0FFB9FE
61161+:105130008F8400108FBF00348FBE00308FB7002CDB
61162+:105140008FB600288FB500248FB400208FB3001CC9
61163+:105150008FB200188FB100148FB0001003E0000868
61164+:1051600027BD0038107E001B000000001477FFCC24
61165+:10517000241000010E00159B000000008F83001416
61166+:105180001060FFCB0230F823029158238F87001064
61167+:10519000017020210A0001973093FFFF8F830014D4
61168+:1051A0001460FFCB3C110020AF5100300A000163B6
61169+:1051B000000000000E00077D024028210A00015770
61170+:1051C000004080210E00033A024028210A000157C6
61171+:1051D000004080210E001463022020210A000157A4
61172+:1051E000004080210E0000CD000000000A0001797F
61173+:1051F00002D3382327BDFFE8AFB00010AFBF0014C3
61174+:105200000E00003F000000003C028000345000709F
61175+:105210000A0001BA8E0600008F4F000039EE00012F
61176+:1052200031C20001104000248F8600A88E070000C4
61177+:105230003C0C08008D8C003C3C0908008D2900388E
61178+:1052400000E66823018D28210000502100AD302B9D
61179+:10525000012A4021010620213C010800AC25003C28
61180+:10526000AF8700A83C010800AC2400380E000106FE
61181+:10527000000000003C0308008C6300701060FFE633
61182+:10528000006020213C0508008CA500683C06080051
61183+:105290008CC6006C0E00152A000000003C010800BE
61184+:1052A000AC2000708F4F000039EE000131C20001C8
61185+:1052B0001440FFDE8F8600A88E0A00008F8B00A8A6
61186+:1052C0003C0508008CA5003C3C0408008C84003898
61187+:1052D000014B482300A938210082182100E9402B06
61188+:1052E000006810213C010800AC27003C3C0108008C
61189+:1052F000AC2200388F5F01002419FF0024180C0035
61190+:1053000003F9202410980012AF840000AF4400205D
61191+:10531000936D0000240C002031A600FF10CC001279
61192+:10532000240E005010CE00043C194000AF59013843
61193+:105330000A0001B3000000000E0011C800000000C8
61194+:105340003C194000AF5901380A0001B300000000C9
61195+:105350000E00011F000000003C194000AF59013849
61196+:105360000A0001B3000000008F58010000802821CE
61197+:10537000330F00FF01E020210E0002F1AF8F000487
61198+:105380003C194000AF5901380A0001B30000000089
61199+:1053900000A4102B2403000110400009000030215C
61200+:1053A0000005284000A4102B04A0000300031840AF
61201+:1053B0005440FFFC000528405060000A0004182BF0
61202+:1053C0000085382B54E000040003184200C3302548
61203+:1053D00000852023000318421460FFF900052842CD
61204+:1053E0000004182B03E0000800C310218F4201B80D
61205+:1053F0000440FFFE00000000AF4401803C031000A9
61206+:1054000024040040AF450184A3440188A3460189D8
61207+:10541000A747018A03E00008AF4301B83084FFFFCB
61208+:105420000080382130A5FFFF000020210A00022A59
61209+:10543000240600803087FFFF8CA40000240600387B
61210+:105440000A00022A000028218F8300388F8600304E
61211+:105450001066000B008040213C07080024E75A1822
61212+:10546000000328C000A710218C4400002463000121
61213+:10547000108800053063000F5466FFFA000328C04F
61214+:1054800003E00008000010213C07080024E75A1C34
61215+:1054900000A7302103E000088CC200003C0390000C
61216+:1054A0003462000100822025AF4400208F45002097
61217+:1054B00004A0FFFE0000000003E000080000000060
61218+:1054C0003C038000346200010082202503E00008D4
61219+:1054D000AF44002027BDFFE0AFB100143091FFFFC3
61220+:1054E000AFB00010AFBF00181220001300A0802141
61221+:1054F0008CA2000024040002240601401040000F8A
61222+:10550000004028210E000C5C00000000000010216B
61223+:10551000AE000000022038218FBF00188FB10014A8
61224+:105520008FB0001000402021000028210000302111
61225+:105530000A00022A27BD00208CA200000220382188
61226+:105540008FBF00188FB100148FB0001000402021D1
61227+:1055500000002821000030210A00022A27BD002077
61228+:1055600000A010213087FFFF8CA500048C440000B0
61229+:105570000A00022A2406000627BDFFE0AFB0001093
61230+:10558000AFBF0018AFB100149363003E00808021CC
61231+:105590000080282130620040000020211040000FD0
61232+:1055A0008E1100000E000851022020219367000098
61233+:1055B0002404005030E500FF50A400128E0F0000BC
61234+:1055C000022020218FBF00188FB100148FB000106F
61235+:1055D000A762013C0A00091127BD00200E000287C6
61236+:1055E000000000000E0008510220202193670000F7
61237+:1055F0002404005030E500FF14A4FFF20220202113
61238+:105600008E0F00003C1008008E1000503C0D000C66
61239+:10561000240BFF8001F05021314E007F01DA602120
61240+:10562000018D4021014B4824AF4900280220202150
61241+:105630008FBF00188FB100148FB00010A50200D6E4
61242+:1056400027BD00200A000911AF8800D027BDFFE068
61243+:10565000AFBF0018AFB10014AFB0001093660001E7
61244+:10566000008080210E00025630D1000493640005B2
61245+:10567000001029C2A765000034830040A363000521
61246+:105680000E00025F020020210E00091302002021FB
61247+:1056900024020001AF62000C02002821A762001062
61248+:1056A00024040002A762001224060140A76200142D
61249+:1056B0000E000C5CA76200161620000F8FBF0018AA
61250+:1056C000978C00343C0B08008D6B00782588FFFF19
61251+:1056D0003109FFFF256A0001012A382B10E000067E
61252+:1056E000A78800343C0F6006240E001635ED00102C
61253+:1056F000ADAE00508FBF00188FB100148FB00010F6
61254+:1057000003E0000827BD002027BDFFE0AFB1001473
61255+:10571000AFBF0018AFB0001000A088211080000AB1
61256+:105720003C03600024020080108200120000000090
61257+:105730000000000D8FBF00188FB100148FB0001053
61258+:1057400003E0000827BD00208C682BF80500FFFE51
61259+:1057500000000000AC712BC08FBF00188FB1001487
61260+:105760008FB000103C09100027BD002003E00008A6
61261+:10577000AC692BF80E00025600A0202193650005AD
61262+:10578000022020210E00025F30B000FF2403003E03
61263+:105790001603FFE7000000008F4401780480FFFE3D
61264+:1057A000240700073C061000AF51014002202021D1
61265+:1057B000A34701448FBF00188FB100148FB00010B1
61266+:1057C000AF4601780A0002C227BD002027BDFFE8CE
61267+:1057D000AFBF0014AFB000108F50002000000000D9
61268+:1057E0000E000913AF440020AF5000208FBF0014FB
61269+:1057F0008FB0001003E0000827BD00183084FFFFC1
61270+:10580000008038212406003500A020210A00022A49
61271+:10581000000028213084FFFF008038212406003654
61272+:1058200000A020210A00022A0000282127BDFFD065
61273+:10583000AFB3001C3093FFFFAFB50024AFB2001828
61274+:10584000AFBF0028AFB40020AFB10014AFB000105C
61275+:1058500030B5FFFF12600027000090218F90001CE0
61276+:105860008E0300003C0680002402004000033E023C
61277+:1058700000032C0230E4007F006688241482001D9F
61278+:1058800030A500FF8F8300282C68000A510000100B
61279+:105890008F910014000358803C0C0800258C56940E
61280+:1058A000016C50218D49000001200008000000001B
61281+:1058B00002B210213045FFFF0E000236240400849E
61282+:1058C000162000028F90001CAF8000288F910014DA
61283+:1058D000260C002026430001018080213072FFFF4A
61284+:1058E00016200004AF8C001C0253502B1540FFDC27
61285+:1058F00000000000024010218FBF00288FB5002457
61286+:105900008FB400208FB3001C8FB200188FB1001429
61287+:105910008FB0001003E0000827BD0030240E0034D3
61288+:1059200014AE00F9000000009203000E241F168040
61289+:105930003C07000CA36300219202000D0347C8211D
61290+:105940003C066000A3620020961100123C0A7FFF13
61291+:10595000354CFFFFA771003C960B00102403000597
61292+:105960003168FFFFAF6800848E05001CAF5F002820
61293+:105970008F3800008CC4444803057826008F3021FE
61294+:10598000AF66004C8F69004C24CE00013C057F00BF
61295+:10599000AF6900508F740050AF740054AF66007050
61296+:1059A000AF6E00588F6D005824140050AF6D005C2E
61297+:1059B000A3600023AF6C0064A36300378E02001461
61298+:1059C000AF6200488F710048AF7100248E0B001841
61299+:1059D000AF6B006C9208000CA3680036937F003E0A
61300+:1059E00037F90020A379003E8F78007403058024E6
61301+:1059F000360F4000AF6F007493640000308900FFE1
61302+:105A0000513402452404FF803C04080024845A9841
61303+:105A10000E00028D000000003C1008008E105A9805
61304+:105A20000E00025602002021240600042407000173
61305+:105A3000A366007D020020210E00025FA36700051F
61306+:105A40008F5F017807E0FFFE240B0002AF5001409A
61307+:105A5000A34B01448F90001C3C081000AF48017814
61308+:105A60000A000362AF8000282CAD003751A0FF98D8
61309+:105A70008F9100140005A0803C180800271856BC20
61310+:105A8000029878218DEE000001C00008000000009F
61311+:105A90002418000614B80011000000003C0808009B
61312+:105AA0008D085A9824040005AF4800208E1F001866
61313+:105AB000AF7F00188F79004CAF79001C8F650050C4
61314+:105AC000122000C0AF6500700A000362AF84002896
61315+:105AD0002406000710A60083240300063C050800E6
61316+:105AE00024A55A980E000264240400818F90001CA3
61317+:105AF0000011102B0A000362AF8200282407000463
61318+:105B000014A7FFF6240500503C1808008F185A9877
61319+:105B1000AF5800208E0F0008AF6F00408E090008BC
61320+:105B2000AF6900448E14000CAF7400488E0E001054
61321+:105B3000AF6E004C8E0D0010AF6D00848E0A001405
61322+:105B4000AF6A00508E0C0018AF6C00548E04001C1D
61323+:105B5000AF64005893630000306B00FF116501D8FB
61324+:105B6000000000008F7400488F6900400289702394
61325+:105B700005C000042404008C1620FFDE240200036C
61326+:105B8000240400823C05080024A55A980E000287D0
61327+:105B9000000000008F90001C000010210A0003622A
61328+:105BA000AF820028240F000514AFFFCC240520008D
61329+:105BB0003C0708008CE75A98AF4700208E06000487
61330+:105BC000AF66005C9208000824100008A36800215A
61331+:105BD0008F9F001C93F90009A37900208F86001C79
61332+:105BE00090D8000A330400FF10900011000000005C
61333+:105BF0002885000914A0006924020002240A00205C
61334+:105C0000108A000B34058000288D002115A00008A3
61335+:105C100024054000240E0040108E00053C050001C4
61336+:105C200024140080109400023C050002240540006A
61337+:105C30008F7800743C19FF00031980240205782531
61338+:105C4000AF6F007490C4000BA36400818F84001CAC
61339+:105C50009489000C11200192000000009490000C27
61340+:105C60002406FFBF24050004A770003C908F000E9F
61341+:105C7000A36F003E8F84001C9089000FA369003F32
61342+:105C80008F8B001C8D6E00108F54007401D468231C
61343+:105C9000AF6D00608D6A0014AF6A0064956C0018E7
61344+:105CA000A76C00689563001AA763006A8D62001CE8
61345+:105CB000AF62006C9167000EA367003E9368003EE0
61346+:105CC0000106F8241220014BA37F003E8F90001C98
61347+:105CD0000A000362AF8500282407002214A7FF7F73
61348+:105CE000240300073C0B08008D6B5A981220000C0F
61349+:105CF000AF4B00200A000362AF830028240C00335E
61350+:105D000010AC0014240A00283C05080024A55A9869
61351+:105D10000E00023C240400810A0003EB8F90001C5B
61352+:105D20003C04080024845A980E00028D00000000F4
61353+:105D30009363000024110050306200FF10510135C0
61354+:105D4000000000008F90001C000018210A00036270
61355+:105D5000AF8300283C0D08008DAD5A9824040081C3
61356+:105D6000AF4D00203C05080024A55A980E00023CC7
61357+:105D7000A36A00348F90001C240200090A00036209
61358+:105D8000AF82002802B288213225FFFF0E000236C2
61359+:105D9000240400840A0003628F90001C1082FFA478
61360+:105DA00024050400288B000311600170240C0004FA
61361+:105DB000240300015483FF9E240540000A00043B95
61362+:105DC000240501003C04080024845A988F62004C8A
61363+:105DD0000E00028D8F6300508F90001C0000202168
61364+:105DE0000A000362AF8400288E1000042404008A95
61365+:105DF000AF50002093790005333800021700015F8F
61366+:105E0000020028219368002302002821311F00206E
61367+:105E100017E0015A2404008D9367003F2406001206
61368+:105E200030E200FF10460155240400810E000256A6
61369+:105E30000200202193630023240500040200202196
61370+:105E4000346B0042A36B00230E00025FA365007D4C
61371+:105E50008F4401780480FFFE240A0002AF50014005
61372+:105E6000A34A01448F90001C3C0C1000AF4C0178F9
61373+:105E70000A0003EC0011102B8E1000042404008A89
61374+:105E8000AF500020936E000531CD000215A0001622
61375+:105E900002002821936F003F2414000402002821EF
61376+:105EA00031E900FF11340010240400810E00025675
61377+:105EB000020020219362002324080012241FFFFE09
61378+:105EC00034460020A3660023A368003F93790005B1
61379+:105ED00002002021033FC0240E00025FA3780005CA
61380+:105EE00002002821000020210E00033400000000E1
61381+:105EF0000A0003EB8F90001C8E1000043C03000886
61382+:105F00000343A021AF500020928B000024050050D5
61383+:105F1000316400FF10850161240700880200202100
61384+:105F2000000028210E00022A2406000E928D000097
61385+:105F3000240EFF800200282101AE8025A2900000DF
61386+:105F4000240400040E000C5C240600300A0003EB5D
61387+:105F50008F90001C8E0800043C14080026945A9868
61388+:105F60003C010800AC285A98AF480020921F00035B
61389+:105F700033F9000413200002240200122402000658
61390+:105F8000A362003F920B001B2404FFC03165003F59
61391+:105F900000A43825A367003E9206000330C200012A
61392+:105FA00014400132000000008E020008AE8200089A
61393+:105FB0003C0208008C425AA010400131000249C244
61394+:105FC000A76900088E14000C240C0001240300149F
61395+:105FD000AF74002C8E0E0010AF6E0030960D0016C0
61396+:105FE000A76D0038960A0014A76A003AAF6C000C3F
61397+:105FF000A76C0010A76C0012A76C0014A76C001609
61398+:1060000012200136A3630034920F000331F0000226
61399+:106010002E1100018F90001C262200080A00036246
61400+:10602000AF8200288E0400043C0E0008034E30218D
61401+:10603000AF4400208E05000890CD0000240C0050D5
61402+:1060400031AA00FF114C00862407008824060009AD
61403+:106050000E00022A000000000A0003EB8F90001CD3
61404+:106060008E04001C0E00024100000000104000F4ED
61405+:10607000004050218F89001C240700890140202105
61406+:106080008D25001C240600010E00022A00000000DD
61407+:106090000A0003EB8F90001C960D00023C140800D0
61408+:1060A00026945A9831AA0004514000B83C10600070
61409+:1060B0008E0E001C3C010800AC2E5A98AF4E0020FA
61410+:1060C000920700102408001430E200FF144800D6A4
61411+:1060D00000000000960B00023163000114600165AE
61412+:1060E000000000008E020004AE8200083C1408008C
61413+:1060F0008E945AA01280015B000000008F7400741F
61414+:106100003C0380002404000102835825AF6B007417
61415+:10611000A3600005AF64000C3C0708008CE75AA0A0
61416+:106120008F86001CA7640010000711C2A76400122C
61417+:10613000A7640014A7640016A76200088CC80008B2
61418+:1061400024040002AF68002C8CC5000CAF65003041
61419+:1061500090DF0010A37F00348F99001C9330001152
61420+:10616000A37000358F98001C930F0012A36F0036A8
61421+:106170008F89001C912E0013A36E00378F90001C96
61422+:10618000960D0014A76D0038960A0016A76A003A0B
61423+:106190008E0C0018AF6C00245620FDCCAF84002874
61424+:1061A0003C05080024A55A980E0002640000202136
61425+:1061B0008F90001C0A0004A7000020218E1000040C
61426+:1061C00024070081AF500020936900233134001070
61427+:1061D000128000170000000002002021000028218A
61428+:1061E0002406001F0E00022A000000000A0003EB34
61429+:1061F0008F90001C3C05080024A55A980E000287C9
61430+:10620000240400828F90001C000028210A000362F1
61431+:10621000AF8500283C0408008C845A980E0014E8CE
61432+:10622000000000008F90001C0A000482000018216A
61433+:106230000E00025602002021937800230200202144
61434+:10624000370F00100E00025FA36F002300003821FB
61435+:1062500002002021000028210A0005A82406001FB2
61436+:10626000920F000C31E90001112000030000000032
61437+:106270009618000EA4D8002C921F000C33F90002CF
61438+:1062800013200005000038218E0200149608001229
61439+:10629000ACC2001CA4C8001A0A0005432406000969
61440+:1062A0003C05080024A55A980E0002872404008BA0
61441+:1062B0008F90001C0011282B0A000362AF85002874
61442+:1062C000AF6000843C0A08008D4A5A983C0D0800D3
61443+:1062D0008DAD0050240CFF803C02000C014D1821B4
61444+:1062E000006C2024AF4400288E070014306B007F20
61445+:1062F000017A282100A2C821AF2700D88E060014F9
61446+:10630000AF9900D0AF2600DC8E080010251FFFFEDD
61447+:106310000A000408AF3F01083C0508008CA55A9804
61448+:106320003C1908008F39005024CCFFFE00B9C02171
61449+:1063300003047824AF4F00283C1408008E945A9828
61450+:106340003C0908008D2900500289702131CD007F61
61451+:1063500001BA502101478021AE0600D8AF9000D08D
61452+:10636000AE0000DC0A0003B1AE0C0108548CFE3014
61453+:10637000240540000A00043B240510000E00032EF3
61454+:10638000000000000A0003EB8F90001C8E0F442CCD
61455+:106390003C186C62370979703C010800AC205A98AF
61456+:1063A00015E9000824050140979F00349786002CCA
61457+:1063B0000280282103E6C82B132000112404009238
61458+:1063C000240501400E000C7A240400023C01080060
61459+:1063D000AC225A98AF4200203C0508008CA55A9880
61460+:1063E00010A00005240400830E00084500000000F2
61461+:1063F00010400009240400833C05080024A55A9895
61462+:106400000E000264000000008F90001C0011202B81
61463+:106410000A000362AF8400280E0008490000000053
61464+:106420000A00055F8F90001C0E00084D0000000060
61465+:106430003C05080024A55A980A00062F2404008B66
61466+:10644000240400040E000C7A240500301440002AB5
61467+:10645000004050218F89001C240700830140202127
61468+:106460008D25001C0A000551240600018E04000839
61469+:106470000E000241000000000A00051BAE82000869
61470+:106480003C05080024A55A980E00023C240400870D
61471+:106490008F90001C0A0005360011102B8F830038E6
61472+:1064A0008F8600301066FE9D000038213C070800F2
61473+:1064B00024E75A1C000320C0008728218CAC000070
61474+:1064C00011900061246A00013143000F5466FFFA05
61475+:1064D000000320C00A0004F6000038213C05080033
61476+:1064E00024A55A980E000287240400828F90001C75
61477+:1064F0000A000536000010213C0B0008034B202148
61478+:106500002403005024070001AF420020A0830000B4
61479+:10651000A08700018F82001C90480004A08800180A
61480+:106520008F85001C90A60005A08600198F9F001C77
61481+:1065300093F90006A099001A8F90001C921800078A
61482+:10654000A098001B8F94001C928F0008A08F001C45
61483+:106550008F89001C912E0009A08E001D8F8D001CBC
61484+:1065600091AC000AA08C001E8F8B001C3C0C080014
61485+:10657000258C5A1C9163000B3C0B0800256B5A18A4
61486+:10658000A083001F8F87001C90E8000CA0880020CB
61487+:106590008F82001C9045000D24024646A0850021F4
61488+:1065A0008F86001C90DF000EA09F00228F99001C98
61489+:1065B0009330000FA09000238F98001C93140010BC
61490+:1065C000A09400248F8F001C91E90011A089002560
61491+:1065D0008F89001C8F8E00308F900038952D00140D
61492+:1065E000000E18C025C80001A48D002895270016AC
61493+:1065F000006C3021006BC821A487002A9525001863
61494+:106600003108000FA485002CA482002E8D3F001CB1
61495+:10661000ACCA0000AF88003011100006AF3F000088
61496+:10662000000038218D25001C014020210A00055161
61497+:1066300024060001250C00013184000F00003821E0
61498+:106640000A0006B8AF8400383C07080024E75A184F
61499+:106650000087302100003821ACA000000A0004F6B9
61500+:10666000ACC000003C05080024A55A980A00062F7B
61501+:10667000240400878E0400040E0002410000000084
61502+:106680000A00056AAE8200083084FFFF30C600FFB2
61503+:106690008F4201B80440FFFE00064400010430258B
61504+:1066A0003C07200000C720253C031000AF400180BC
61505+:1066B000AF450184AF44018803E00008AF4301B84F
61506+:1066C00027BDFFE8AFB00010AFBF00143C0760006B
61507+:1066D000240600021080000600A080210010102B6C
61508+:1066E0008FBF00148FB0001003E0000827BD001812
61509+:1066F0003C09600EAD2000348CE5201C8F82001C0C
61510+:106700002408FFFC00A81824ACE3201C0E0006D1CE
61511+:106710008C45000C0010102B8FBF00148FB00010A0
61512+:1067200003E0000827BD00183C02600E344701005A
61513+:1067300024090018274A040000000000000000009F
61514+:10674000000000003C06005034C30200AF44003893
61515+:10675000AF45003CAF430030014018218F4B000093
61516+:10676000316800201100FFFD2406007F2408FFFF90
61517+:106770008C6C000024C6FFFF24630004ACEC000016
61518+:1067800014C8FFFB24E70004000000000000000024
61519+:10679000000000003C0F0020AF4F00300000000060
61520+:1067A00024AD020001A5702B2529FFFF008E2021BA
61521+:1067B0001520FFE101A0282103E0000800000000EF
61522+:1067C00027BDFFE0AFB10014AFBF0018AFB000109D
61523+:1067D0003C05600E8CA20034008088211440000625
61524+:1067E0003C0460008C87201C2408FFFC00E8302457
61525+:1067F00034C30001AC83201C8F8B001C24090001D2
61526+:10680000ACA90034956900028D6500148D70000CF0
61527+:106810002D2400818D6700048D660008108000071C
61528+:106820008D6A00102D2C00041580000E30CE00075C
61529+:10683000312D000311A0000B000000002404008B88
61530+:10684000020028210E0006D1240600030011102B9F
61531+:106850008FBF00188FB100148FB0001003E0000844
61532+:1068600027BD002015C0FFF62404008B3C03002048
61533+:10687000AF4300300000000024020001AF8200148A
61534+:106880000000000000000000000000003C1F01505C
61535+:10689000013FC825253800033C0F600EAF47003884
61536+:1068A00000181882AF46003C35E8003CAF59003074
61537+:1068B000274704008F4400003086002010C0FFFDF1
61538+:1068C00000000000106000082466FFFF2403FFFFA3
61539+:1068D0008CEB000024C6FFFF24E70004AD0B000092
61540+:1068E00014C3FFFB250800043C08600EAD09003806
61541+:1068F0000000000000000000000000003C07002035
61542+:10690000AF470030000000000E0006F901402021D2
61543+:1069100002002821000020210E0006D124060003D9
61544+:106920000011102B8FBF00188FB100148FB0001012
61545+:1069300003E0000827BD002027BDFFE0AFB200182C
61546+:106940003092FFFFAFB10014AFBF001CAFB000101A
61547+:106950001640000D000088210A0007AA022010211D
61548+:1069600024050001508500278CE5000C0000000D77
61549+:10697000262300013071FFFF24E200200232382B71
61550+:1069800010E00019AF82001C8F8200141440001622
61551+:106990008F87001C3C0670003C0320008CE5000043
61552+:1069A00000A62024148300108F84003C00054402BC
61553+:1069B0003C09800000A980241480FFE9310600FF13
61554+:1069C0002CCA00095140FFEB262300010006688015
61555+:1069D0003C0E080025CE579801AE60218D8B00003B
61556+:1069E0000160000800000000022010218FBF001C81
61557+:1069F0008FB200188FB100148FB0001003E00008B0
61558+:106A000027BD00200E0006D1240400841600FFD804
61559+:106A10008F87001C0A00078BAF80003C90EF0002BC
61560+:106A200000002021240600090E0006D1000F2E00D0
61561+:106A30008F87001C0010102B0A00078BAF82003CD0
61562+:106A4000020028210E0006DF240400018F87001CAD
61563+:106A50000A00078BAF82003C020028210E0006DFEF
61564+:106A6000000020210A0007C38F87001C0E00071FAB
61565+:106A7000020020210A0007C38F87001C30B0FFFFEF
61566+:106A8000001019C08F5801B80700FFFE3C1F2004FA
61567+:106A90003C191000AF430180AF400184AF5F018813
61568+:106AA000AF5901B80A00078C262300013082FFFF8E
61569+:106AB00014400003000018210004240224030010E5
61570+:106AC000308500FF14A000053087000F2466000801
61571+:106AD0000004220230C300FF3087000F14E00005DD
61572+:106AE000308900032468000400042102310300FF00
61573+:106AF0003089000315200005388B0001246A00024C
61574+:106B000000042082314300FF388B00013164000112
61575+:106B100010800002246C0001318300FF03E00008B4
61576+:106B200000601021308BFFFF000B394230E600FF80
61577+:106B30003C09080025295998000640800109602178
61578+:106B40008D8700003164001F240A0001008A1804A8
61579+:106B500030A500FF00E3202514A000020003102749
61580+:106B600000E22024240F000100CF700401096821F5
61581+:106B7000000E282714800005ADA400008F86000CAD
61582+:106B800000A6102403E00008AF82000C8F88000CE0
61583+:106B900001C8102503E00008AF82000C3C06001F6E
61584+:106BA0003C0360003084FFFF34C5FF8024020020D6
61585+:106BB000AC602008AC60200CAC602010AC652014E8
61586+:106BC000AC642018AC62200000000000000000004F
61587+:106BD00003E000080000000027BDFFE82402FFFFDB
61588+:106BE000AFBF0010AF82000C000020213C0608005F
61589+:106BF00024C659982405FFFF248900010004408021
61590+:106C00003124FFFF010618212C87002014E0FFFA31
61591+:106C1000AC6500000E0008160000202124020001CF
61592+:106C20003C04600024050020AC822018AC852000C4
61593+:106C3000000000000000000000000000244A0001E5
61594+:106C40003142FFFF2C46040014C0FFF78FBF001035
61595+:106C500003E0000827BD00188F8300082C620400A1
61596+:106C600003E00008384200018F830008246200011D
61597+:106C700003E00008AF8200088F8300082462FFFF52
61598+:106C800003E00008AF82000827BDFFE0AFB10014A9
61599+:106C9000AFBF0018AFB000108F6B00303C06600033
61600+:106CA00000808821ACCB20088F6A002C3C02800039
61601+:106CB00024030008ACCA200C9769003A9768003892
61602+:106CC00000092C003107FFFF00A72025ACC42010CD
61603+:106CD000ACC22014ACC32000000000000000000083
61604+:106CE000000000003C0360008C6D200031AC000807
61605+:106CF0001580FFF9000000008C6E201405C00020F4
61606+:106D0000000000000E0007DA8F84000C00024080B3
61607+:106D10003C09080025295998010938218CE4000014
61608+:106D20000E0007DA00028140020220213090FFFFAE
61609+:106D3000020020210E0007F8000028213C0C8000F2
61610+:106D4000022C58253210FFFF3C116000240A00205D
61611+:106D5000AE2B2014AE302018AE2A20000000000018
61612+:106D60000000000000000000020010218FBF00188A
61613+:106D70008FB100148FB0001003E0000827BD002081
61614+:106D80008C6620143C02001F3443FF803C1FFFE848
61615+:106D900000C3C02437F9080003198021001079C20C
61616+:106DA0003C0C8000022C582531F0FFFF3C116000A4
61617+:106DB000240A0020AE2B2014AE302018AE2A20006A
61618+:106DC0000000000000000000000000000200102190
61619+:106DD0008FBF00188FB100148FB0001003E00008BF
61620+:106DE00027BD002027BDFFE8AFB000103402FFFF31
61621+:106DF0003090FFFFAFBF00141202000602002021F6
61622+:106E00000E00081600000000020020210E0007F806
61623+:106E1000240500018F8400088FBF00148FB000107C
61624+:106E20002483FFFF27BD001803E00008AF8300089C
61625+:106E3000000439C230E6003F00043B42000718401E
61626+:106E4000240210002CC4002024C8FFE0AF42002C14
61627+:106E5000246300011480000330A900FF00071840DC
61628+:106E6000310600FF0003608024080001019A5821C8
61629+:106E70003C0A000E00C82804016A382111200005D0
61630+:106E8000000530278CE900000125302503E00008CB
61631+:106E9000ACE600008CEE000001C6682403E00008A8
61632+:106EA000ACED000027BDFFE8AFBF0014AFB000108D
61633+:106EB0003C0460008C8508083403F00030A2F00028
61634+:106EC00050430006240200018C8708083404E000C7
61635+:106ED00030E6F00010C4001E24020002AF82004021
61636+:106EE0003C1060003C0A0200AE0A0814240910009D
61637+:106EF0003C08000E8E03440003482021AF49002CBB
61638+:106F0000240501200E000CC0000030218F830040BA
61639+:106F1000106000043C021691240B0001106B000E5F
61640+:106F20003C023D2C344F0090AE0F44088FBF00143C
61641+:106F30008FB000103C0C6000240E10003C0D0200CD
61642+:106F400027BD0018AD8E442003E00008AD8D081069
61643+:106F50000A0008E7AF8000403C0218DA344F009086
61644+:106F6000AE0F44088FBF00148FB000103C0C6000BF
61645+:106F7000240E10003C0D020027BD0018AD8E4420E9
61646+:106F800003E00008AD8D08100A0008BB24050001CD
61647+:106F90000A0008BB000028213C08080025085DA461
61648+:106FA0002404FFFF010018212402001E2442FFFFD9
61649+:106FB000AC6400000441FFFD246300043C070800AA
61650+:106FC00024E75E208CE5FFFC2404001C240600015D
61651+:106FD000308A001F0146480424840001000910275C
61652+:106FE0002C8300201460FFFA00A22824ACE5FFFCEB
61653+:106FF0003C05666634A4616E3C06080024C65EE06B
61654+:10700000AF840058AF88009C2404FFFF00C0182103
61655+:107010002402001F2442FFFFAC6400000441FFFD76
61656+:10702000246300043C0766663C05080024A55EA0B6
61657+:10703000AF86004834E6616EAF8600982404FFFFF7
61658+:1070400000A018212402000F2442FFFFAC640000BE
61659+:107050000441FFFD246300043C0B66663C06080007
61660+:1070600024C65E203568616EAF8500A4AF880070CD
61661+:107070002404FFFF00C018212402001F2442FFFF48
61662+:10708000AC6400000441FFFD246300043C0D66660F
61663+:107090003C0A0800254A5F6035AC616EAF860090FF
61664+:1070A000AF8C005C2404FFFF014018212402000380
61665+:1070B0002442FFFFAC6400000441FFFD2463000490
61666+:1070C0003C09080025295F708D27FFFC2404000679
61667+:1070D000240500013099001F0325C0042484000109
61668+:1070E000001878272C8E002015C0FFFA00EF3824F6
61669+:1070F000AD27FFFC3C09666624030400240403DC7E
61670+:1071000024050200240600663522616E3C08080052
61671+:1071100025085AA4AF820074AF830044AF83006C8B
61672+:10712000AF830050AF830084AF8A008CAF840064CB
61673+:10713000AF85004CAF860054AF840078AF85006007
61674+:10714000AF86008001001821240200022442FFFFC4
61675+:10715000AC6000000441FFFD24630004240400032C
61676+:107160002403000C3C0A0800254A5AB0AF8A006884
61677+:107170000A00098E2405FFFF000418802484000102
61678+:10718000006858212C8700C014E0FFFBAD650000AB
61679+:107190003C0E666635CD616E240C17A024081800DD
61680+:1071A000AF8D0088AF8C009403E00008AF88007CAE
61681+:1071B0002484007F000421C200004021000030210F
61682+:1071C00000003821000028210A0009A5AF8400A092
61683+:1071D0001060000624E7000100C4302124A500014E
61684+:1071E0002CC20BF51440FFFA2CA300663C090800E2
61685+:1071F00025295F6001201821240200032442FFFF9B
61686+:10720000AC6000000441FFFD2463000410E0001A9C
61687+:1072100024E3FFFF0003294210A0000A0000202100
61688+:107220002406FFFF3C03080024635F602484000100
61689+:107230000085502BAC660000250800011540FFFBBF
61690+:107240002463000430E2001F10400008000868803A
61691+:10725000240C0001004C38040008588001692821E2
61692+:1072600024E6FFFF03E00008ACA6000001A94021CE
61693+:107270002409FFFFAD09000003E000080000000042
61694+:10728000AF4400283C04000C034420210005288260
61695+:107290000A000CC000003021000421803C03600083
61696+:1072A000AC6410080000000000052980AC65100CDB
61697+:1072B0000000000003E000088C62100C27BDFFE80E
61698+:1072C0000080282124040038AFBF00140E0009D527
61699+:1072D000AFB0001024040E00AF4400283C10000C96
61700+:1072E00003502021240500100E000CC000003021A6
61701+:1072F00003501021AC400000AC40000424040038CE
61702+:107300008FBF00148FB0001024053FFF27BD001869
61703+:107310000A0009D58C430000000421803C03600072
61704+:10732000AC641008000000008C62100C03E0000840
61705+:107330000002118227BDFFC8AFB400208F940068FF
61706+:10734000AFBE0030AFB7002CAFB600280000B821A8
61707+:107350000080B021241E00C0AFBF0034AFB50024B0
61708+:10736000AFB3001CAFB20018AFB10014AFB0001043
61709+:107370000A000A12AFA5003C504000018F9400683B
61710+:1073800027DEFFFF13C00028269400048E92000021
61711+:107390003C03080024635DA01240FFF70283102B1A
61712+:1073A0003C04080024845AA4028410230002A8C0CC
61713+:1073B000000098210A000A212411000100118840D0
61714+:1073C000122000260000000002B380210251282470
61715+:1073D0000200202110A0FFF9267300010E0009DE33
61716+:1073E000000000000016684032EC000101AC2021D2
61717+:1073F0000E0009D5020028218F89009426F700018C
61718+:107400008FA6003C3AEB0001316A00012528FFFFFE
61719+:107410000011382702CAB021AF88009416E6FFE7B2
61720+:1074200002479024AE92000002E010218FBF00348A
61721+:107430008FBE00308FB7002C8FB600288FB5002488
61722+:107440008FB400208FB3001C8FB200188FB10014CE
61723+:107450008FB0001003E0000827BD00383C0E080084
61724+:1074600025CE5DA0028E102B0A000A0DAE92000000
61725+:1074700027BDFFD8AFB10014AFB00010AFBF0020E0
61726+:10748000AFB3001CAFB2001800A0882110A0001FED
61727+:10749000000480403C13080026735AA40A000A5ACC
61728+:1074A0002412000112200019261000010E0009F517
61729+:1074B00002002021000231422444FFA0000618806F
61730+:1074C0003045001F2C8217A1007318212631FFFFC1
61731+:1074D0001040FFF400B230048C690000020020214B
61732+:1074E00024053FFF012640241500FFEE0126382524
61733+:1074F0000E0009D5AC6700008F8A009426100001A9
61734+:10750000254700011620FFE9AF8700948FBF0020B8
61735+:107510008FB3001C8FB200188FB100148FB0001011
61736+:1075200003E0000827BD00288F85009C00805821BB
61737+:107530000000402100004821240A001F3C0C0800E4
61738+:10754000258C5E1C3C0D080025AD5DA48CA60000BA
61739+:1075500050C000140000402100AD1023000238C0CC
61740+:10756000240300010A000A930000202115000003F3
61741+:1075700000E410212448202400004821252900018E
61742+:10758000512B00132506DFDC106000062484000167
61743+:1075900000C3702415C0FFF5000318400A000A91CB
61744+:1075A0000000402110AC002624A300040060282124
61745+:1075B000254AFFFF1540FFE5AF85009C512B0004D5
61746+:1075C0002506DFDC0000402103E000080100102157
61747+:1075D0000006614230C5001F000C50803C070800C7
61748+:1075E00024E75DA424040001014730211120000F8D
61749+:1075F00000A420043C05080024A55E20148000059A
61750+:107600002529FFFF24C6000410C50011000000005A
61751+:10761000240400018CCF00000004C0270004204097
61752+:1076200001F868241520FFF5ACCD00008F99007893
61753+:1076300001001021032B482303E00008AF890078E4
61754+:107640003C05080024A55DA40A000A9B0000402117
61755+:107650003C06080024C65DA40A000AB42404000104
61756+:10766000308800FF240200021102000A24030003F4
61757+:107670001103005C8F8900A4240400041104005F3E
61758+:1076800024050005110500670000182103E000082B
61759+:10769000006010218F8900483C0C0800258C5EE0BA
61760+:1076A0003C04080024845F60240300201060000F65
61761+:1076B00000005821240D0002240E00033C0F080096
61762+:1076C00025EF5EE08D27000014E0000B30F9FFFF8E
61763+:1076D000252900040124C02B53000001018048210A
61764+:1076E0002463FFFF5460FFF88D270000016018211C
61765+:1076F00003E0000800601021132000323C0500FF69
61766+:1077000030E200FF004030211040004200005021D4
61767+:1077100024050001000020210005C84000A6C02467
61768+:1077200017000003332500FF14A0FFFB2484000191
61769+:10773000012CC023001828C000AA6021008C502111
61770+:107740003144001F240C0001008C18040003102792
61771+:1077500000E23024110D0041AD260000110E004C56
61772+:10776000000A1840110D00368F87006C510E00562C
61773+:107770008F8C0060240D0004110D005A8F8E008440
61774+:10778000240E0005150EFFDA01601821240B1430B9
61775+:1077900011400006000018218F8400A0246300011E
61776+:1077A000006A402B1500FFFD016458218F8A00807C
61777+:1077B000AF89008C016018212549FFFF0A000AEB00
61778+:1077C000AF89008000E52024000736021080FFD03A
61779+:1077D000240A001800075402314600FF0A000AF389
61780+:1077E000240A00103C0C0800258C5EA03C04080014
61781+:1077F00024845EE00A000ADA240300103C0C08002E
61782+:10780000258C5E203C04080024845EA00A000AD96E
61783+:107810008F89009000071A02306600FF0A000AF301
61784+:10782000240A00088F89008C3C0C0800258C5F60BE
61785+:107830003C04080024845F700A000ADA2403000470
61786+:10784000000A4080250B003024E6FFFF016018216C
61787+:10785000AF8900480A000AEBAF86006C000AC982B3
61788+:10786000001978803C07080024E75EA001E720218A
61789+:10787000000A18428C8F00003079001F032C380456
61790+:107880000007C02701F860240A000B08AC8C000038
61791+:10789000000331420006288000AF28213062001F1B
61792+:1078A0008CB8000024630001004CC804000321428E
61793+:1078B000001938270004108003073024004F2021CE
61794+:1078C0000A000B4CACA60000000A68C025AB0032D1
61795+:1078D000258AFFFF01601821AF8900A40A000AEB86
61796+:1078E000AF8A0060254B1030AF89009001601821ED
61797+:1078F00025C9FFFF0A000AEBAF8900843086000724
61798+:107900002CC2000610400014000000000006408059
61799+:107910003C030800246357BC010338218CE40000B9
61800+:1079200000800008000000002409000310A9000ED8
61801+:1079300000000000240A000510AA000B000000004F
61802+:10794000240B000110AB0008000000008F8C00A089
61803+:1079500010AC00050000000003E00008000010214A
61804+:107960000A000A7900A020210A000AC700C02021CD
61805+:1079700027BDFFE8308400FF240300021083000BC2
61806+:10798000AFBF0010240600031086003A240800044C
61807+:1079900010880068240E0005108E007F2CAF143074
61808+:1079A0008FBF001003E0000827BD00182CA2003094
61809+:1079B0001440FFFC8FBF001024A5FFD0000531C28A
61810+:1079C000000668803C07080024E75EE001A730213C
61811+:1079D0008CC900000005288230AC001F240B000178
61812+:1079E000018B50048F840048012A4025ACC8000058
61813+:1079F0008C83000050600001AF8600488F98006CB7
61814+:107A000030AE000124A6FFFF270F000115C00002C1
61815+:107A1000AF8F006C24A600010006414200082080C0
61816+:107A2000008718218C79000030C2001F2406000155
61817+:107A30000046F804033F382410E0FFDA8FBF00103F
61818+:107A40000005C182001870803C0F080025EF5EA081
61819+:107A500001CF48218D2B00000005684231A5001F91
61820+:107A600000A66004016C502527BD001803E0000843
61821+:107A7000AD2A00002CA7003014E0FFCA8FBF001011
61822+:107A800030B900071723FFC724A8FFCE00086A02F9
61823+:107A9000000D60803C0B0800256B5EA0018B30213F
61824+:107AA0008CC40000000828C230AA001F240800016E
61825+:107AB000014848048F8200A400891825ACC3000047
61826+:107AC0008C5F000053E00001AF8600A40005704009
61827+:107AD000000E7942000F28803C04080024845EE0F8
61828+:107AE00000A418218C6B000025DF000131CD001FA0
61829+:107AF000001F514201A86004016C4825000A108053
61830+:107B0000AC690000004428218CA600008F9800601A
61831+:107B100033F9001F8FBF00100328380400C77825F1
61832+:107B2000270E000127BD0018ACAF000003E00008DD
61833+:107B3000AF8E006024A5EFD02CB804001300FF998D
61834+:107B40008FBF001000053142000658803C0A080033
61835+:107B5000254A5E20016A30218CC4000030A3001F3A
61836+:107B600024090001006910048F9900900082F82513
61837+:107B7000ACDF00008F27000050E00001AF860090CE
61838+:107B80008F8D00848FBF001027BD001825AC000129
61839+:107B900003E00008AF8C008415E0FF828FBF001067
61840+:107BA0008F8600A0000610400046F821001F21002B
61841+:107BB00003E4C8210019384024F8143000B8402BE1
61842+:107BC0001100FF788FBF001024A4EBD00E00021329
61843+:107BD00000C0282100027942000F70803C0D08008F
61844+:107BE00025AD5F6001CD20218C8B0000304C001F43
61845+:107BF00024060001018618048F89008C016350253A
61846+:107C0000AC8A00008D25000050A00001AF84008CDC
61847+:107C10008F9800808FBF001027BD00182708000133
61848+:107C200003E00008AF88008030A5000724030003AC
61849+:107C300010A3001028A2000414400008240700022A
61850+:107C40002403000410A300152408000510A8000F49
61851+:107C50008F8500A003E000080000000014A7FFFDCE
61852+:107C60000080282114C3FFFB240400020A000B8BB0
61853+:107C700000000000240900050080282110C9FFFB36
61854+:107C80002404000303E000080000000014C5FFF115
61855+:107C9000008028210A000B8B24040005240A00011F
61856+:107CA0000080282110CAFFF12404000403E000082A
61857+:107CB0000000000027BDFFE0AFB00010000581C24A
61858+:107CC0002603FFD024C5003F2C6223D024C6007FAA
61859+:107CD000AFB20018AFB10014AFBF001C309100FF6D
61860+:107CE000000691C2000529820200202110400008F0
61861+:107CF0002403FFFF0E000A4B0000000002002021B9
61862+:107D0000022028210E000C390240302100001821E9
61863+:107D10008FBF001C8FB200188FB100148FB00010FD
61864+:107D20000060102103E0000827BD002027BDFFD818
61865+:107D300024A2007FAFB3001CAFB20018000299C2AA
61866+:107D4000309200FF24A3003F02402021026028213E
61867+:107D5000AFB10014AFB00010AFBF00200E000B6E2B
61868+:107D60000003898200408021004020210220282138
61869+:107D700014400009000018218FBF00208FB3001CA1
61870+:107D80008FB200188FB100148FB000100060102166
61871+:107D900003E0000827BD00280E0009FC00000000D9
61872+:107DA00000402821020020211051FFF3001019C0CB
61873+:107DB0000E000A4B00000000020020210240282192
61874+:107DC0000E000C39026030218FBF00208FB3001CE1
61875+:107DD0008FB200188FB100148FB00010000018216E
61876+:107DE0000060102103E0000827BD00283084FFFF59
61877+:107DF00030A5FFFF1080000700001821308200012D
61878+:107E00001040000200042042006518211480FFFB8E
61879+:107E10000005284003E000080060102110C00007A2
61880+:107E2000000000008CA2000024C6FFFF24A500046F
61881+:107E3000AC82000014C0FFFB2484000403E00008AF
61882+:107E40000000000010A0000824A3FFFFAC86000083
61883+:107E500000000000000000002402FFFF2463FFFF79
61884+:107E60001462FFFA2484000403E00008000000000C
61885+:107E700030A5FFFF8F4201B80440FFFE3C076015AC
61886+:107E800000A730253C031000AF440180AF400184BF
61887+:107E9000AF46018803E00008AF4301B88F8500D0EA
61888+:107EA0002C864000008018218CA700840087102BAE
61889+:107EB00014400010000000008CA800842D06400033
61890+:107EC00050C0000F240340008CAA0084008A482B75
61891+:107ED000512000018CA3008400035A42000B208033
61892+:107EE0003C05080024A558200085182103E000085F
61893+:107EF0008C62000014C0FFF4000000002403400066
61894+:107F000000035A42000B20803C05080024A558209D
61895+:107F10000085182103E000088C6200008F8300D0E8
61896+:107F2000906600D024C50001A06500D08F8500D0E8
61897+:107F3000906400D090A200D210440017000000000E
61898+:107F4000936C00788F8B00BC318A00FFA16A000C13
61899+:107F500025490001938700C4312200FF3048007F8B
61900+:107F60001107000B00026827A36200788F4E01788A
61901+:107F700005C0FFFE8F9900B0241800023C0F1000CE
61902+:107F8000AF590140A358014403E00008AF4F017806
61903+:107F90000A000D0931A20080A0A000D00A000CFF49
61904+:107FA000000000008F8700D027BDFFC8AFBF0030A2
61905+:107FB000AFB7002CAFB60028AFB50024AFB4002097
61906+:107FC000AFB3001CAFB20018AFB10014AFB00010D7
61907+:107FD00094E300E094E200E2104300D72405FFFFA1
61908+:107FE0003C047FFF3497FFFF2415FF800A000DF04B
61909+:107FF0003C16000E108A00D18FBF00308F9100B068
61910+:108000003C1808008F18005C001230C0001291402C
61911+:108010000311702101D57824AF4F002C94EC00E2BD
61912+:1080200031CD007F01BA5821318A7FFF0176482186
61913+:10803000000A804002091021945300003C08080007
61914+:108040008D0800580246C02132733FFF001319808B
61915+:10805000010320210224282130BF007F03FAC82118
61916+:1080600000B5A024AF54002C0336A0218E87001049
61917+:108070008E8F003003785821256D008800EF702323
61918+:10808000240C0002AE8E0010AF8D00ACA16C0088F5
61919+:10809000976A003C8E8400308F9100AC0E000CD6A5
61920+:1080A0003150FFFF00024B80020940253C02420094
61921+:1080B00001022025AE2400048E8300048F8D00ACC5
61922+:1080C0008E860000240E0008ADA3001CADA600188B
61923+:1080D000ADA0000CADA00010929F000A33F900FF84
61924+:1080E000A5B90014968500083C1F000CA5A5001634
61925+:1080F0009298000A331100FFA5B100209690000865
61926+:1081000024180005A5B00022ADA00024928F000B1A
61927+:108110002410C00031E700FFA5A70002A1AE0001B6
61928+:108120008E8C00308F8B00AC8F8400B0AD6C00085B
61929+:108130003C0A08008D4A005401444821013540247E
61930+:10814000AF4800283C0208008C4200540044302113
61931+:1081500030C3007F007AC821033F282102458821CF
61932+:10816000AF9100BCAF8500C0A23800008F8A00BC70
61933+:108170002403FFBF2418FFDF954F000201F03824CD
61934+:1081800000F37025A54E0002914D000231AC003F76
61935+:10819000358B0040A14B00028F8600BC8F8900D038
61936+:1081A000ACC000048D28007C3C098000ACC80008ED
61937+:1081B00090C4000D3082007FA0C2000D8F8500BCEE
61938+:1081C00090BF000D03E3C824A0B9000D8F9100BC3F
61939+:1081D0009233000D02789024A232000D8E9000346C
61940+:1081E0008F8B00BCAD7000108E87002C8E8F0030FE
61941+:1081F00000EF7023AD6E0014916D001831AC007F5C
61942+:10820000A16C00188F9F00BC8E8A00308FE8001888
61943+:10821000015720240109302400C41025AFE20018C2
61944+:108220009283000AA3E3001C969900088F8500BC86
61945+:108230008F9800D0A4B9001E8E9000308E8400303C
61946+:108240000E0002138F0500848F8500D0000291403C
61947+:108250000002990090AF00BC0253882100403021F9
61948+:1082600031E7000210E0000302118021000290803B
61949+:108270000212802190B900BC3327000410E00002F4
61950+:108280000006F880021F80218E9800308F8B00BC82
61951+:1082900024068000330F0003000F702331CD00034C
61952+:1082A000020D6021AD6C000494A400E294AA00E2E7
61953+:1082B00094B000E231497FFF2522000130537FFF57
61954+:1082C0000206182400734025A4A800E294A400E24A
61955+:1082D0003C1408008E94006030917FFF123400221D
61956+:1082E000000000000E000CF6000000008F8700D098
61957+:1082F0000000282194F300E094F000E21213000F34
61958+:108300008FBF003090E900D090E800D1313200FFFB
61959+:10831000310400FF0244302B14C0FF36264A00010E
61960+:1083200090EE00D2264B000131CD00FF008D602180
61961+:10833000158BFF338F9100B08FBF00308FB7002CAB
61962+:108340008FB600288FB500248FB400208FB3001C97
61963+:108350008FB200188FB100148FB0001000A0102150
61964+:1083600003E0000827BD003894A300E20066402423
61965+:10837000A4A800E290A400E290B900E2309100FFCE
61966+:108380000011A1C20014F827001F39C03332007F4A
61967+:10839000024730250A000DE8A0A600E23084FFFF66
61968+:1083A00030A5FFFFAF440018AF45001C03E00008F4
61969+:1083B0008F42001427BDFFB8AFB000208F9000D0CF
61970+:1083C0003084FFFFAFA40010AFBF0044AFBE004039
61971+:1083D000AFB7003CAFB60038AFB50034AFB4003033
61972+:1083E000AFB3002CAFB20028AFB10024A7A0001893
61973+:1083F000920600D1920500D030C400FF30A300FFE8
61974+:108400000064102B10400122AFA00014920900D08C
61975+:108410008FB50010312800FF0088382324F4FFFFB7
61976+:108420000014882B0015982B02339024524001260B
61977+:108430008FB40014961E0012961F00108FB7001004
61978+:1084400003DFC823001714000019C400000224032E
61979+:108450000018140302E2B02A52C00001004020219B
61980+:108460000284282B10A0000200801821028018210D
61981+:1084700000033C0000071C033064FFFF2C8600094A
61982+:1084800014C000020060B821241700088E0A0008FA
61983+:10849000001769808E09000C31ABFFFF3C0C001007
61984+:1084A000016C402527520400AF4A0038AF9200B853
61985+:1084B000AF49003CAF480030000000000000000061
61986+:1084C00000000000000000000000000000000000AC
61987+:1084D00000000000000000008F4F000031EE00207F
61988+:1084E00011C0FFFD0017982A027110240A000E83A4
61989+:1084F0000000B02155E001019258000131130080C5
61990+:10850000126001CF012020219655001232A5FFFFF5
61991+:108510000E000CCBA7B500188F9000D00291A023BD
61992+:1085200026CD00018F9100B8000DB4000016B403F1
61993+:108530002638004002D7582A0014882B2405000151
61994+:108540000300902101711024AF9800B8AFA500146A
61995+:10855000104001BC8F8900B03C0C08008D8C005489
61996+:10856000240BFF80921E00D001895021014B28244A
61997+:10857000921900D0AF4500288E4700103C08080033
61998+:108580008D0800583C1808008F18005430E33FFF56
61999+:108590000003218001043021012658212402FF809C
62000+:1085A0000162F824920C00D0AF5F002C92480000CA
62001+:1085B00033D100FF333500FF0309982100117140CA
62002+:1085C000001578C0326D007F01CF382101BA282113
62003+:1085D000318300FF3164007F3C0A000C00AA88212F
62004+:1085E0000367F02100033140009A10213108003F59
62005+:1085F0003C1F000E00D1C021005F982127D90088C0
62006+:108600002D150008AF9100C0AF9900ACAF9800BC29
62007+:10861000AF9300B412A0018A00008821240E00014B
62008+:10862000010E4004310D005D11A0FFB2310F0002B8
62009+:108630008E4A00283C0300803C04FFEFAE6A000035
62010+:108640008E450024A260000A3488FFFFAE65000456
62011+:108650009247002C3C1FFF9F37FEFFFFA267000CD4
62012+:108660008E62000C3C180040A267000B00433025CE
62013+:1086700000C8C824033E88240238A825AE75000C23
62014+:108680008E490004AE6000183C0F00FFAE69001474
62015+:108690008E4D002C35EEFFFF8F8B00B001AE6024B5
62016+:1086A000AE6C00108E470008A660000896450012C8
62017+:1086B000AE6700208E42000C30B03FFF00105180AA
62018+:1086C000AE6200248E5E0014014B182130A400011C
62019+:1086D000AE7E00288E590018000331C2000443808A
62020+:1086E000AE79002C8E51001C00C8F821A67F001C1A
62021+:1086F000AE710030965800028E550020A678001EFC
62022+:10870000AE75003492490033313000045600000544
62023+:10871000925000008F8C00D08D8B007CAE6B0030AF
62024+:10872000925000008F8F00BCA1F00000924E0033E9
62025+:1087300031CD000251A00007925E00018F8900BC7C
62026+:108740002418FF80913100000311A825A1350000F5
62027+:10875000925E00018F9900BC2409FFBF240BFFDF4C
62028+:10876000A33E00018F9500BC92B8000D3311007F2D
62029+:10877000A2B1000D8F8E00BC91D0000D02097824AB
62030+:10878000A1CF000D8F8800BC8E6D0014910A000DE2
62031+:108790002DAC0001000C2940014B382400E51825C0
62032+:1087A000A103000D964200128F8800BC8F8700D075
62033+:1087B000A50200028E45000490FF00BC30A4000317
62034+:1087C0000004302330DE000300BE102133F9000224
62035+:1087D00017200002244400342444003090E200BCFE
62036+:1087E00000A2302430DF000417E0000224830004DC
62037+:1087F000008018218F8F00AC24090002AD03000413
62038+:10880000A1E90000924E003F8F8D00ACA1AE0001A7
62039+:108810008F9500AC924C003F8E440004A6AC000241
62040+:10882000976B003C0E000CD63170FFFF00025380A6
62041+:10883000020A38253C05420000E51825AEA30004D5
62042+:108840008F8600AC8E480038ACC800188E440034C7
62043+:10885000ACC4001CACC0000CACC00010A4C0001420
62044+:10886000A4C00016A4C00020A4C00022ACC00024F4
62045+:108870008E6400145080000124040001ACC4000880
62046+:108880000E000CF6241100010A000E768F9000D025
62047+:10889000920F00D2920E00D08FB5001031EB00FF86
62048+:1088A00031CD00FF008D6023016C50212554FFFF66
62049+:1088B0000014882B0015982B023390241640FEDDFF
62050+:1088C000000000008FB400148FBF00448FBE004032
62051+:1088D0003A8200018FB7003C8FB600388FB5003464
62052+:1088E0008FB400308FB3002C8FB200288FB10024DA
62053+:1088F0008FB0002003E0000827BD0048331100209E
62054+:10890000122000EF24150001921E00BC241F00015C
62055+:108910000000A82133D900011320000DAFBF001CB7
62056+:108920008E4400148E0800840088102B144000022E
62057+:10893000008030218E0600848E03006400C3A82BC3
62058+:1089400016A0000200C020218E0400640080A8212F
62059+:108950008E4700148E05006400E5302B14C0000221
62060+:1089600000E020218E0400640095F02313C0000471
62061+:108970008FAC001C240A0002AFAA001C8FAC001CA4
62062+:10898000028C582B156000A8000018218E4F00386B
62063+:108990008E6D000C3C0E0080AE6F00008E4A0034DD
62064+:1089A0003C10FF9F01AE5825AE6A00049246003F7E
62065+:1089B000360CFFFF016C38243C0500203C03FFEF20
62066+:1089C000A266000B00E510253468FFFF8F8700B812
62067+:1089D0000048F8243C04000803E4C825AE79000CE4
62068+:1089E0008CF80014AE60001802BE7821AE78001436
62069+:1089F0008CF10018AE71001C8CE90008AE690024EF
62070+:108A00008CEE000CAE6F002CAE600028AE6E002025
62071+:108A1000A6600038A660003A8CED001401B58023F2
62072+:108A2000021E902312400011AE72001090EA003D29
62073+:108A30008E6500048E640000000A310000A6C82183
62074+:108A4000000010210326402B0082F82103E8C021FA
62075+:108A5000AE790004AE78000090F1003DA271000AEA
62076+:108A60008F8900B895320006A67200088F9800AC76
62077+:108A70002419000202A02021A31900009769003CDC
62078+:108A80008F9200AC0E000CD63131FFFF00027B80CC
62079+:108A90008F8500B8022F68253C0E420001AE80256C
62080+:108AA000AE5000048F8400AC8CAC0038AC8C001845
62081+:108AB0008CAB0034AC8B001CAC80000CAC80001084
62082+:108AC000A4800014A4800016A4800020A4800022AA
62083+:108AD000AC80002490A7003FA487000212A00135BB
62084+:108AE0002403000153C0000290A2003D90A2003E6A
62085+:108AF00024480001A08800018F9F00ACAFF500085A
62086+:108B00008F8300D024070034906600BC30C500027B
62087+:108B100050A00001240700308F9200B88F8A00BC5B
62088+:108B2000906D00BC924B00002412C00032A50003DF
62089+:108B3000A14B00008F8600B88F8800BC240200047F
62090+:108B400090C400010045182330790003A1040001FE
62091+:108B50008F8A00BC8F9F00B800F53821955800021D
62092+:108B600097E9001200F9382103128824312F3FFFC2
62093+:108B7000022F7025A54E00029150000231A800047A
62094+:108B8000320C003F358B0040A14B000212A00002C6
62095+:108B90008F8500BC00E838218F8E00D0ACA7000480
62096+:108BA000240BFFBF8DCD007C2EA400012403FFDF2A
62097+:108BB000ACAD000890B0000D00044140320C007FC5
62098+:108BC000A0AC000D8F8600BC90CA000D014B102494
62099+:108BD000A0C2000D8F8700BC90E5000D00A3F82413
62100+:108BE00003E8C825A0F9000D8F9100B88F8D00BC57
62101+:108BF0008E380020ADB800108E290024ADA90014D5
62102+:108C00008E2F0028ADAF00188E2E002C0E000CF613
62103+:108C1000ADAE001C8FB0001C240C0002120C00EE44
62104+:108C20008F9000D08FA3001C006088211460000288
62105+:108C30000060A8210000A02156A0FE390291A023C7
62106+:108C40000014882B8FA90010960700103C1E0020EE
62107+:108C50000136402302C750213112FFFFA60A00103F
62108+:108C6000AFB20010AF5E0030000000009617001099
62109+:108C7000961300121277008F000000008E05000C82
62110+:108C80008E0B00080016698000AD7021000DC7C36F
62111+:108C900001CDA82B0178782101F56021AE0E000CE2
62112+:108CA000AE0C00088FB300100013B82B02378024DD
62113+:108CB0001200FF048F9000D00A000E3C000000005C
62114+:108CC0008E4D0038A6600008240B0003AE6D000036
62115+:108CD0008E500034A260000A8F9800B8AE70000475
62116+:108CE0003C0500809311003FA26B000C8E6F000CBE
62117+:108CF0003C0EFF9FA271000B01E5102535CCFFFF54
62118+:108D00003C03FFEF8F9200B8004C30243464FFFF27
62119+:108D100000C4F824AE7F000C8E590014964800124F
62120+:108D20008F8A00B0AE7900108E490014AE60001832
62121+:108D3000AE600020AE690014AE6000248E470018BB
62122+:108D400031093FFF0009F180AE6700288E4D000811
62123+:108D500003CA802131180001AE6D00308E4F000C27
62124+:108D60008F8C00AC001089C200185B80022B282178
62125+:108D7000240E0002A665001CA6600036AE6F002C13
62126+:108D8000A18E00009763003C8F8A00AC3C04420037
62127+:108D90003062FFFF00443025AD4600048F9F00B8CD
62128+:108DA000240700012411C0008FF30038240600348A
62129+:108DB000AD5300188FF90034AD59001CAD40000CC4
62130+:108DC000AD400010A5400014A5400016A5400020AD
62131+:108DD000A5400022AD400024A5550002A147000196
62132+:108DE0008F9E00AC8F8800B88F9200BCAFD5000872
62133+:108DF000910D0000A24D00008F9000B88F8B00BC39
62134+:108E000092180001A17800018F8400BC94850002B3
62135+:108E100000B1782401E97025A48E0002908C000234
62136+:108E20003183003FA08300028F8300D08F8400BC79
62137+:108E3000906200BC305300025260000124060030F2
62138+:108E4000AC8600048C6F007C2403FFBF02A0882145
62139+:108E5000AC8F0008908E000D31CC007FA08C000DEF
62140+:108E60008F8600BC90C2000D00432024A0C4000DDA
62141+:108E70008F8900BC913F000D37F90020A139000D0A
62142+:108E80008F8800B88F9300BC8D070020AE6700105C
62143+:108E90008D0A0024AE6A00148D1E0028AE7E0018D4
62144+:108EA0008D12002C0E000CF6AE72001C0A00103D54
62145+:108EB0008F9000D0960E00148E03000431CCFFFF7B
62146+:108EC000000C10C000622021AF44003C8E1F000443
62147+:108ED0008F46003C03E6C8231B20003C0000000036
62148+:108EE0008E0F000025E200013C05001034B500089B
62149+:108EF000AF420038AF550030000000000000000015
62150+:108F00000000000000000000000000000000000061
62151+:108F100000000000000000008F580000330B00200C
62152+:108F20001160FFFD000000008F5304003C0D002085
62153+:108F3000AE1300088F570404AE17000CAF4D00307D
62154+:108F4000000000003C0608008CC600442416000106
62155+:108F500010D600BD00000000961F00123C0508005E
62156+:108F60008CA5004000BFC821A61900129609001464
62157+:108F700025270001A6070014960A00143144FFFFBC
62158+:108F80005486FF498FB30010A60000140E000E1681
62159+:108F900030A5FFFF3C0408008C84002496030012D7
62160+:108FA0000044102300623023A60600120A00105964
62161+:108FB0008FB30010A08300018F8200AC2404000155
62162+:108FC000AC4400080A000FF08F8300D08E0200002E
62163+:108FD0000A0010EA3C0500108F8200C08FA7001C19
62164+:108FE000921800D0920B00D0920E00D0331100FFE7
62165+:108FF000316900FF00117940000928C001E56021B6
62166+:1090000031C300FF036C50210003314000C2C8216E
62167+:10901000255F0088AF9F00ACAF9900BCA1470088D6
62168+:109020009768003C03C020218F9100AC0E000CD645
62169+:109030003110FFFF00026B80020DC0253C0442008E
62170+:109040008F8D00B803045825AE2B00048DA900387D
62171+:109050008F8B00AC0000882100118100AD690018E1
62172+:109060008DAF00343C087FFF3504FFFFAD6F001C5F
62173+:1090700091AC003E8D65001C8D660018000C190037
62174+:10908000000C770200A33821020E102500E3F82B14
62175+:1090900000C2C821033F5021AD67001CAD6A001813
62176+:1090A000AD60000CAD60001091B8003E24050005D5
62177+:1090B00003C45024A578001495A9000403C02021FE
62178+:1090C000A569001691AF003EA56F002095B1000480
62179+:1090D000A5710022AD60002491AE003FA56E000294
62180+:1090E00091B0003E91AC003D01901023244300015B
62181+:1090F000A16300018F8600AC8F9F00BCACDE00082E
62182+:10910000A3E500008F9000BC8F9900B82405FFBF35
62183+:1091100096070002973800120247782433093FFF70
62184+:1091200001E98825A6110002921200022418FFDF2F
62185+:10913000324E003F35CD0040A20D00028F8600BCAC
62186+:109140008F8C00D02412FFFFACC000048D8B007CFC
62187+:109150003C0C8000ACCB000890C2000D3043007F77
62188+:10916000A0C3000D8F8700BC90FF000D03E5C8244D
62189+:10917000A0F9000D8F9100BC9229000D01387824D0
62190+:10918000A22F000D8F9000BCAE120010AE1500147F
62191+:10919000920E00182415FF8002AE6825A20D00185B
62192+:1091A0008F8500BC8F8300B88CAB0018016C102435
62193+:1091B000004A3025ACA600189068003EA0A8001C0C
62194+:1091C0008F9F00B88F8700BC8F9800D097F900045C
62195+:1091D000A4F9001E0E0002138F0500848F8600D0B4
62196+:1091E000000279400002490090D200BC01E98821C8
62197+:1091F000004028213255000212A0000303D1202193
62198+:109200000002A8800095202190CD00BC31B200045E
62199+:109210001240000333DF0003000540800088202156
62200+:10922000240600048F9E00BC00DFC8233327000300
62201+:1092300000875021AFCA00040E000CF6A665003866
62202+:109240000A0010388F9000D0961E00123C080800CB
62203+:109250008D080024011E9021A61200120A00105948
62204+:109260008FB3001027BDFFE03C1808008F18005096
62205+:10927000AFB00010AFBF0018AFB10014AF8400B0A2
62206+:1092800093710074030478212410FF8031EE007F75
62207+:109290003225007F01F0582401DA68213C0C000AD5
62208+:1092A000A38500C401AC2821AF4B002494A9001071
62209+:1092B0009768000690A600620080382124020030E2
62210+:1092C0000109202330C300F0AF8500D010620019DF
62211+:1092D0003090FFFF90AE0062240DFFF0240A005092
62212+:1092E00001AE6024318B00FF116A002F00000000E6
62213+:1092F00016000007241F0C00AF5F00248FB100147C
62214+:109300008FBF00188FB0001003E0000827BD0020B9
62215+:109310000E000E1C02002021241F0C00AF5F002451
62216+:109320008FB100148FBF00188FB0001003E0000849
62217+:1093300027BD002094A200E094A400E290BF011396
62218+:10934000008218263079FFFF33E700C014E00009DF
62219+:109350002F31000116000038000000005620FFE603
62220+:10936000241F0C000E000D18000000000A0011ED73
62221+:10937000241F0C001620FFDE000000000E000D1858
62222+:10938000000000001440FFDC241F0C001600002227
62223+:109390008F8300D0906901133122003FA062011336
62224+:1093A0000A0011ED241F0C0094AF00D48F8600D466
62225+:1093B00000E02821240400050E000C5C31F0FFFFC2
62226+:1093C0001440000524030003979100E600001821D3
62227+:1093D0002625FFFFA78500E68F5801B80700FFFE8E
62228+:1093E0003C196013AF400180241F0C00AF50018472
62229+:1093F000007938253C101000AF4701888FB1001468
62230+:10940000AF5001B8AF5F00248FB000108FBF0018BD
62231+:1094100003E0000827BD00200E000E1C02002021E2
62232+:109420005040FFB5241F0C008F8300D090690113BA
62233+:109430000A0012163122003F0E000E1C02002021ED
62234+:109440001440FFAD241F0C00122000078F8300D0B2
62235+:10945000906801133106003F34C20040A06201133E
62236+:109460000A0011ED241F0C000E000D180000000072
62237+:109470005040FFA1241F0C008F8300D0906801137F
62238+:109480003106003F0A00124634C20040AF9B00C8BC
62239+:1094900003E00008AF8000EC3089FFFF0009404284
62240+:1094A0002D020041000921801440000200095040B3
62241+:1094B00024080040000830C0000811400046582130
62242+:1094C000256701A800E2C821272F007F2418FF800C
62243+:1094D00001F818240064302100CA702125CC00FF57
62244+:1094E000240DFF00018D202425650088240A0088B2
62245+:1094F0003C010800AC2A004C3C010800AC2500509F
62246+:10950000AF8400D43C010800AC2900603C01080095
62247+:10951000AC2800643C010800AC2700543C01080062
62248+:10952000AC2300583C010800AC26005C03E00008B6
62249+:1095300000000000308300FF30C6FFFF30E400FF72
62250+:109540008F4201B80440FFFE00034C00012438257F
62251+:109550003C08600000E820253C031000AF45018076
62252+:10956000AF460184AF44018803E00008AF4301B86F
62253+:109570008F86001C3C096012352700108CCB00043C
62254+:109580003C0C600E35850010316A00062D48000144
62255+:10959000ACE800C48CC40004ACA431808CC20008C8
62256+:1095A00094C30002ACA2318403E00008A78300E466
62257+:1095B0003C0308008C6300508F8400E88F86001CF9
62258+:1095C0002402FF800064C0210302C824AF59002890
62259+:1095D0008CCD00043305007F00BA78213C0E000CCE
62260+:1095E00001EE2821ACAD00588CC80008AF8500D032
62261+:1095F0003C076012ACA8005C8CCC001034E8001072
62262+:10960000ACAC000C8CCB000CACAB000894AA0014E2
62263+:109610003C0208008C42004425490001A4A9001422
62264+:1096200094A400143083FFFF106200178F8400D0D1
62265+:109630003C0A08008D4A0040A4AA00128CCE0018F3
62266+:10964000AC8E00248CCD0014AC8D00208CC700188B
62267+:10965000AC87002C8CCC001424060001AC8C0028B4
62268+:109660008D0B00BC5166001A8D0200B48D0200B84B
62269+:10967000A482003A948F003AA48F003C948800D4CE
62270+:1096800003E000083102FFFF3C0908008D29002497
62271+:10969000A4A000148F8400D0A4A900128CCE0018BE
62272+:1096A000AC8E00248CCD0014AC8D00208CC700182B
62273+:1096B000AC87002C8CCC001424060001AC8C002854
62274+:1096C0008D0B00BC5566FFEA8D0200B88D0200B418
62275+:1096D000A482003A948F003AA48F003C948800D46E
62276+:1096E00003E000083102FFFF8F86001C3C0C0800DD
62277+:1096F0008D8C0050240BFF808CCD00083C03000CA7
62278+:10970000000D51C0018A4021010B4824AF8A00E8B6
62279+:10971000AF49002890C700073105007F00BA10212B
62280+:109720000043282130E4000410800039AF8500D0C8
62281+:1097300090CF000731EE000811C000380000000093
62282+:109740008CD9000C8CC400140324C02B13000030EF
62283+:10975000000000008CC2000CACA200648CCD00188C
62284+:109760002402FFF8ACAD00688CCC0010ACAC0080DB
62285+:109770008CCB000CACAB00848CCA001CACAA007C67
62286+:1097800090A900BC01224024A0A800BC90C30007FF
62287+:109790003067000810E000048F8500D090AF00BC57
62288+:1097A00035EE0001A0AE00BC90D9000733380001AF
62289+:1097B000130000088F8300D08F8700D0240400346A
62290+:1097C00090E800BC35030002A0E300BC8F8300D00A
62291+:1097D000AC6400C090C900073126000210C000052B
62292+:1097E00000000000906A00BC35420004A06200BC8A
62293+:1097F0008F8300D09065011330AD003FA06D011341
62294+:109800008F8C00D0958B00D403E000083162FFFFFD
62295+:109810008CC200140A001305000000000A001306A1
62296+:10982000ACA0006427BDFFD8AFB000108F90001C23
62297+:10983000AFBF0024AFB40020AFB20018AFB1001426
62298+:10984000AFB3001C9613000E3C07600A3C14600680
62299+:109850003264FFFF369300100E00125534F40410EA
62300+:109860008F8400D43C11600E0E00099B363100102D
62301+:10987000920E00153C0708008CE700603C12601255
62302+:1098800031CD000FA38D00F08E0E00048E0D000868
62303+:1098900096080012961F00109619001A9618001EBE
62304+:1098A000960F001C310CFFFF33EBFFFF332AFFFF45
62305+:1098B0003309FFFF31E6FFFF3C010800AC2B0040FD
62306+:1098C0003C010800AC2C00243C010800AC2A0044F8
62307+:1098D000AE293178AE26317C92020015960300162F
62308+:1098E00036520010304400FF3065FFFF3C06080090
62309+:1098F0008CC60064AE243188AE4500B492080014D2
62310+:1099000096190018241F0001011FC004332FFFFF08
62311+:109910003C0508008CA50058AE5800B8AE4F00BCFE
62312+:10992000920C0014AF8E00D8AF8D00DC318B00FF9D
62313+:10993000AE4B00C0920A0015AE670048AE66004C00
62314+:10994000314900FFAE4900C8AE65007C3C03080009
62315+:109950008C6300503C0408008C84004C3C080800D8
62316+:109960008D0800543C0208008C42005C8FBF00242C
62317+:10997000AE6300808FB00010AE8300748FB3001C04
62318+:10998000AE22319CAE4200DCAE2731A0AE2631A41F
62319+:10999000AE24318CAE233190AE283194AE2531986F
62320+:1099A000AE870050AE860054AE8500708FB10014B3
62321+:1099B000AE4700E0AE4600E4AE4400CCAE4300D07B
62322+:1099C000AE4800D4AE4500D88FB400208FB2001846
62323+:1099D00003E0000827BD002827BDFFE0AFB1001459
62324+:1099E000AFBF0018241100010E000845AFB00010F1
62325+:1099F00010510005978400E6978300CC0083102B5C
62326+:109A0000144000088F8500D4240700028FBF00187F
62327+:109A10008FB100148FB0001000E0102103E00008A7
62328+:109A200027BD00200E000C7A24040005AF8200E858
62329+:109A30001040FFF6240700020E0008498F90001C1A
62330+:109A4000979F00E68F9900E88F8D00C827EF0001EF
62331+:109A5000240E0050AF590020A78F00E6A1AE0000F1
62332+:109A60003C0C08008D8C00648F8600C8240A80009E
62333+:109A7000000C5E00ACCB0074A4C0000694C9000AC0
62334+:109A8000241FFF803C0D000C012AC024A4D8000A2A
62335+:109A900090C8000A24182000011F1825A0C3000A3E
62336+:109AA0008F8700C8A0E000788F8500C800003821AB
62337+:109AB000A0A000833C0208008C4200508F8400E884
62338+:109AC0000044782101FFC824AF590028960B0002FA
62339+:109AD00031EE007F01DA6021018D3021A4CB00D46A
62340+:109AE000960A0002AF8600D03C0E000425492401EE
62341+:109AF000A4C900E68E080004ACC800048E03000868
62342+:109B0000ACC30000A4C00010A4C00014A0C000D0CA
62343+:109B10008F8500D02403FFBFA0A000D13C04080023
62344+:109B20008C8400648F8200D0A04400D28E1F000C71
62345+:109B30008F8A00D0978F00E4AD5F001C8E19001053
62346+:109B400024100030AD590018A5400030A551005434
62347+:109B5000A5510056A54F0016AD4E0068AD580080C7
62348+:109B6000AD580084914D006231AC000F358B001070
62349+:109B7000A14B00628F8600D090C900633128007F1E
62350+:109B8000A0C800638F8400D02406FFFF9085006387
62351+:109B900000A31024A08200638F9100D000E0102168
62352+:109BA000923F00BC37F90001A23900BC8F8A00D077
62353+:109BB000938F00F0AD580064AD5000C0914E00D3BB
62354+:109BC000000F690031CC000F018D5825A14B00D347
62355+:109BD0008F8500D08F8900DCACA900E88F8800D881
62356+:109BE0008FBF00188FB100148FB0001027BD002068
62357+:109BF000ACA800ECA4A600D6A4A000E0A4A000E2BB
62358+:109C000003E000080000000027BDFFE0AFB0001037
62359+:109C10008F90001CAFB10014AFBF00188E19000464
62360+:109C20003C1808008F180050240FFF80001989C0CD
62361+:109C30000238702131CD007F01CF602401BA50215C
62362+:109C40003C0B000CAF4C0028014B4021950900D47F
62363+:109C5000950400D68E0700043131FFFFAF8800D095
62364+:109C60000E000913000721C08E0600048F8300C870
62365+:109C7000000629C0AF4500209064003E30820040BD
62366+:109C8000144000068F8400D0341FFFFF948300D659
62367+:109C90003062FFFF145F000400000000948400D6CF
62368+:109CA0000E0008A83084FFFF8E050004022030213A
62369+:109CB0008FBF00188FB100148FB000102404002251
62370+:109CC00000003821000529C00A00127C27BD0020B1
62371+:109CD00027BDFFE0AFB100143091FFFFAFB000101F
62372+:109CE000AFBF00181220001D000080218F86001CCD
62373+:109CF0008CC500002403000600053F020005140285
62374+:109D000030E4000714830015304500FF2CA800063E
62375+:109D10001100004D000558803C0C0800258C57D4DC
62376+:109D2000016C50218D490000012000080000000056
62377+:109D30008F8E00EC240D000111CD005900000000B1
62378+:109D4000260B00013170FFFF24CA00200211202BD6
62379+:109D5000014030211480FFE6AF8A001C0200102170
62380+:109D60008FBF00188FB100148FB0001003E00008FF
62381+:109D700027BD0020938700CE14E00038240400148F
62382+:109D80000E001338000000008F86001C2402000122
62383+:109D90000A00147FAF8200EC8F8900EC24080002D7
62384+:109DA0001128003B2404001300002821000030216A
62385+:109DB000240700010E00127C000000000A00147F3E
62386+:109DC0008F86001C8F8700EC2405000214E5FFF647
62387+:109DD000240400120E0012E9000000008F8500E844
62388+:109DE00000403021240400120E00127C00003821B3
62389+:109DF0000A00147F8F86001C8F8300EC241F000351
62390+:109E0000147FFFD0260B00010E00129B0000000003
62391+:109E10008F8500E800403021240200022404001055
62392+:109E200000003821AF8200EC0E00127C0000000020
62393+:109E30000A00147F8F86001C8F8F00EC240600021E
62394+:109E400011E6000B0000000024040010000028218F
62395+:109E5000000030210A00149C240700010000282182
62396+:109E60000E00127C000030210A00147F8F86001C37
62397+:109E70000E0013A500000000144000128F99001C72
62398+:109E80008F86001C240200030A00147FAF8200ECBE
62399+:109E90000E001431000000000A00147F8F86001CA1
62400+:109EA0000E00128B000000002402000224040014A3
62401+:109EB0000000282100003021000038210A0014B9D8
62402+:109EC000AF8200EC004038212404001097380002D3
62403+:109ED000000028210E00127C3306FFFF0A00147FC9
62404+:109EE0008F86001C8F8400C83C077FFF34E6FFFF8D
62405+:109EF0008C8500742402000100A61824AC83007431
62406+:109F000003E00008A082000510A000362CA200800B
62407+:109F1000274A04003C0B000524090080104000077C
62408+:109F20002408008030A6000F00C540212D030081C9
62409+:109F30001460000200A0482124080080AF4B0030CC
62410+:109F400000000000000000000000000011000009F7
62411+:109F500000003821014030218C8D000024E70004EE
62412+:109F600000E8602BACCD0000248400041580FFFACB
62413+:109F700024C60004000000000000000000000000F3
62414+:109F80003C0E0006010E3825AF47003000000000EF
62415+:109F900000000000000000008F4F000031E80010BA
62416+:109FA0001100FFFD000000008F42003C8F43003C89
62417+:109FB0000049C8210323C02B130000040000000047
62418+:109FC0008F4C003825860001AF4600388F47003C93
62419+:109FD00000A9282300E96821AF4D003C14A0FFCE62
62420+:109FE0002CA2008003E000080000000027BDFFD085
62421+:109FF0003C020002AFB100143C11000CAF45003828
62422+:10A00000AFB3001CAF46003C00809821AF42003047
62423+:10A0100024050088AF44002803512021AFBF002849
62424+:10A02000AFB50024AFB40020AFB200180E0014F199
62425+:10A03000AFB000103C1F08008FFF004C3C18080018
62426+:10A040008F1800642410FF8003F3A82132B9007F29
62427+:10A0500002B078240018A0C0033A70210018914083
62428+:10A0600001D12021AF4F00280E0014F10254282105
62429+:10A070003C0D08008DAD00502405012001B358218E
62430+:10A08000316C007F01705024019A48210131202158
62431+:10A090000E0014F1AF4A00283C0808008D08005457
62432+:10A0A0003C0508008CA500640113382130E6007FD0
62433+:10A0B00000F0182400DA202100912021AF4300286D
62434+:10A0C0000E0014F1000529403C0208008C420058A3
62435+:10A0D0003C1008008E1000601200001C0053882104
62436+:10A0E0002415FF800A0015743C14000C3226007FF2
62437+:10A0F0000235182400DA202102402821AF4300282D
62438+:10A10000009420210E0014F12610FFC01200000F51
62439+:10A11000023288212E05004110A0FFF42412100005
62440+:10A120003226007F001091800235182400DA2021A9
62441+:10A1300002402821AF430028009420210E0014F192
62442+:10A14000000080211600FFF3023288213C0B08003A
62443+:10A150008D6B005C240AFF802405000201734021FE
62444+:10A16000010A4824AF4900283C0408009484006296
62445+:10A170003110007F021A88213C07000C0E000CAA47
62446+:10A180000227982100402821026020218FBF00284B
62447+:10A190008FB500248FB400208FB3001C8FB200183D
62448+:10A1A0008FB100148FB000100A0014F127BD0030E9
62449+:10A1B0008F83001C8C62000410400003000000002C
62450+:10A1C00003E00008000000008C6400108C650008AB
62451+:10A1D0000A00152A8C66000C000000000000001B1D
62452+:10A1E0000000000F0000000A000000080000000648
62453+:10A1F000000000050000000500000004000000044D
62454+:10A200000000000300000003000000030000000342
62455+:10A210000000000300000002000000020000000235
62456+:10A220000000000200000002000000020000000226
62457+:10A230000000000200000002000000020000000216
62458+:10A240000000000200000002000000020000000206
62459+:10A2500000000001000000010000000108000F24C0
62460+:10A2600008000D6C08000FB80800106008000F4CC3
62461+:10A2700008000F8C0800119408000D88080011B820
62462+:10A2800008000DD8080015540800151C08000D889A
62463+:10A2900008000D8808000D880800124008001240D0
62464+:10A2A00008000D8808000D88080014E008000D88DB
62465+:10A2B00008000D8808000D8808000D88080013B4F8
62466+:10A2C00008000D8808000D8808000D8808000D881A
62467+:10A2D00008000D8808000D8808000D8808000D880A
62468+:10A2E00008000D8808000D8808000D8808000D88FA
62469+:10A2F00008000D8808000D8808000FAC08000D88C4
62470+:10A3000008000D880800167808000D8808000D88E0
62471+:10A3100008000D8808000D8808000D8808000D88C9
62472+:10A3200008000D8808000D8808000D8808000D88B9
62473+:10A3300008000D8808000D8808000D8808000D88A9
62474+:10A3400008000D8808000D8808000D88080014100A
62475+:10A3500008000D8808000D8808001334080012A4B6
62476+:10A3600008001E2C08001EFC08001F1408001F28EF
62477+:10A3700008001F3808001E2C08001E2C08001E2C88
62478+:10A3800008001ED808002E1408002E1C08002DE41A
62479+:10A3900008002DF008002DFC08002E08080052F4DB
62480+:10A3A000080052B40800528008005254080052308D
62481+:10A3B000080051EC0A000C840000000000000000BE
62482+:10A3C0000000000D727870362E322E33000000002F
62483+:10A3D000060203030000000000000001000000006E
62484+:10A3E000000000000000000000000000000000006D
62485+:10A3F000000000000000000000000000000000005D
62486+:10A40000000000000000000000000000000000004C
62487+:10A41000000000000000000000000000000000003C
62488+:10A42000000000000000000000000000000000002C
62489+:10A43000000000000000000000000000000000001C
62490+:10A44000000000000000000000000000000000000C
62491+:10A4500000000000000000000000000000000000FC
62492+:10A4600000000000000000000000000000000000EC
62493+:10A4700000000000000000000000000000000000DC
62494+:10A4800000000000000000000000000000000000CC
62495+:10A4900000000000000000000000000000000000BC
62496+:10A4A00000000000000000000000000000000000AC
62497+:10A4B000000000000000000000000000000000009C
62498+:10A4C000000000000000000000000000000000008C
62499+:10A4D000000000000000000000000000000000007C
62500+:10A4E000000000000000000000000000000000006C
62501+:10A4F000000000000000000000000000000000005C
62502+:10A50000000000000000000000000000000000004B
62503+:10A51000000000000000000000000000000000003B
62504+:10A52000000000000000000000000000000000002B
62505+:10A53000000000000000000000000000000000001B
62506+:10A54000000000000000000000000000000000000B
62507+:10A5500000000000000000000000000000000000FB
62508+:10A5600000000000000000000000000000000000EB
62509+:10A5700000000000000000000000000000000000DB
62510+:10A5800000000000000000000000000000000000CB
62511+:10A5900000000000000000000000000000000000BB
62512+:10A5A00000000000000000000000000000000000AB
62513+:10A5B000000000000000000000000000000000009B
62514+:10A5C000000000000000000000000000000000008B
62515+:10A5D000000000000000000000000000000000007B
62516+:10A5E000000000000000000000000000000000006B
62517+:10A5F000000000000000000000000000000000005B
62518+:10A60000000000000000000000000000000000004A
62519+:10A61000000000000000000000000000000000003A
62520+:10A62000000000000000000000000000000000002A
62521+:10A63000000000000000000000000000000000001A
62522+:10A64000000000000000000000000000000000000A
62523+:10A6500000000000000000000000000000000000FA
62524+:10A6600000000000000000000000000000000000EA
62525+:10A6700000000000000000000000000000000000DA
62526+:10A6800000000000000000000000000000000000CA
62527+:10A6900000000000000000000000000000000000BA
62528+:10A6A00000000000000000000000000000000000AA
62529+:10A6B000000000000000000000000000000000009A
62530+:10A6C000000000000000000000000000000000008A
62531+:10A6D000000000000000000000000000000000007A
62532+:10A6E000000000000000000000000000000000006A
62533+:10A6F000000000000000000000000000000000005A
62534+:10A700000000000000000000000000000000000049
62535+:10A710000000000000000000000000000000000039
62536+:10A720000000000000000000000000000000000029
62537+:10A730000000000000000000000000000000000019
62538+:10A740000000000000000000000000000000000009
62539+:10A7500000000000000000000000000000000000F9
62540+:10A7600000000000000000000000000000000000E9
62541+:10A7700000000000000000000000000000000000D9
62542+:10A7800000000000000000000000000000000000C9
62543+:10A7900000000000000000000000000000000000B9
62544+:10A7A00000000000000000000000000000000000A9
62545+:10A7B0000000000000000000000000000000000099
62546+:10A7C0000000000000000000000000000000000089
62547+:10A7D0000000000000000000000000000000000079
62548+:10A7E0000000000000000000000000000000000069
62549+:10A7F0000000000000000000000000000000000059
62550+:10A800000000000000000000000000000000000048
62551+:10A810000000000000000000000000000000000038
62552+:10A820000000000000000000000000000000000028
62553+:10A830000000000000000000000000000000000018
62554+:10A840000000000000000000000000000000000008
62555+:10A8500000000000000000000000000000000000F8
62556+:10A8600000000000000000000000000000000000E8
62557+:10A8700000000000000000000000000000000000D8
62558+:10A8800000000000000000000000000000000000C8
62559+:10A8900000000000000000000000000000000000B8
62560+:10A8A00000000000000000000000000000000000A8
62561+:10A8B0000000000000000000000000000000000098
62562+:10A8C0000000000000000000000000000000000088
62563+:10A8D0000000000000000000000000000000000078
62564+:10A8E0000000000000000000000000000000000068
62565+:10A8F0000000000000000000000000000000000058
62566+:10A900000000000000000000000000000000000047
62567+:10A910000000000000000000000000000000000037
62568+:10A920000000000000000000000000000000000027
62569+:10A930000000000000000000000000000000000017
62570+:10A940000000000000000000000000000000000007
62571+:10A9500000000000000000000000000000000000F7
62572+:10A9600000000000000000000000000000000000E7
62573+:10A9700000000000000000000000000000000000D7
62574+:10A9800000000000000000000000000000000000C7
62575+:10A9900000000000000000000000000000000000B7
62576+:10A9A00000000000000000000000000000000000A7
62577+:10A9B0000000000000000000000000000000000097
62578+:10A9C0000000000000000000000000000000000087
62579+:10A9D0000000000000000000000000000000000077
62580+:10A9E0000000000000000000000000000000000067
62581+:10A9F0000000000000000000000000000000000057
62582+:10AA00000000000000000000000000000000000046
62583+:10AA10000000000000000000000000000000000036
62584+:10AA20000000000000000000000000000000000026
62585+:10AA30000000000000000000000000000000000016
62586+:10AA40000000000000000000000000000000000006
62587+:10AA500000000000000000000000000000000000F6
62588+:10AA600000000000000000000000000000000000E6
62589+:10AA700000000000000000000000000000000000D6
62590+:10AA800000000000000000000000000000000000C6
62591+:10AA900000000000000000000000000000000000B6
62592+:10AAA00000000000000000000000000000000000A6
62593+:10AAB0000000000000000000000000000000000096
62594+:10AAC0000000000000000000000000000000000086
62595+:10AAD0000000000000000000000000000000000076
62596+:10AAE0000000000000000000000000000000000066
62597+:10AAF0000000000000000000000000000000000056
62598+:10AB00000000000000000000000000000000000045
62599+:10AB10000000000000000000000000000000000035
62600+:10AB20000000000000000000000000000000000025
62601+:10AB30000000000000000000000000000000000015
62602+:10AB40000000000000000000000000000000000005
62603+:10AB500000000000000000000000000000000000F5
62604+:10AB600000000000000000000000000000000000E5
62605+:10AB700000000000000000000000000000000000D5
62606+:10AB800000000000000000000000000000000000C5
62607+:10AB900000000000000000000000000000000000B5
62608+:10ABA00000000000000000000000000000000000A5
62609+:10ABB0000000000000000000000000000000000095
62610+:10ABC0000000000000000000000000000000000085
62611+:10ABD0000000000000000000000000000000000075
62612+:10ABE0000000000000000000000000000000000065
62613+:10ABF0000000000000000000000000000000000055
62614+:10AC00000000000000000000000000000000000044
62615+:10AC10000000000000000000000000000000000034
62616+:10AC20000000000000000000000000000000000024
62617+:10AC30000000000000000000000000000000000014
62618+:10AC40000000000000000000000000000000000004
62619+:10AC500000000000000000000000000000000000F4
62620+:10AC600000000000000000000000000000000000E4
62621+:10AC700000000000000000000000000000000000D4
62622+:10AC800000000000000000000000000000000000C4
62623+:10AC900000000000000000000000000000000000B4
62624+:10ACA00000000000000000000000000000000000A4
62625+:10ACB0000000000000000000000000000000000094
62626+:10ACC0000000000000000000000000000000000084
62627+:10ACD0000000000000000000000000000000000074
62628+:10ACE0000000000000000000000000000000000064
62629+:10ACF0000000000000000000000000000000000054
62630+:10AD00000000000000000000000000000000000043
62631+:10AD10000000000000000000000000000000000033
62632+:10AD20000000000000000000000000000000000023
62633+:10AD30000000000000000000000000000000000013
62634+:10AD40000000000000000000000000000000000003
62635+:10AD500000000000000000000000000000000000F3
62636+:10AD600000000000000000000000000000000000E3
62637+:10AD700000000000000000000000000000000000D3
62638+:10AD800000000000000000000000000000000000C3
62639+:10AD900000000000000000000000000000000000B3
62640+:10ADA00000000000000000000000000000000000A3
62641+:10ADB0000000000000000000000000000000000093
62642+:10ADC0000000000000000000000000000000000083
62643+:10ADD0000000000000000000000000000000000073
62644+:10ADE0000000000000000000000000000000000063
62645+:10ADF0000000000000000000000000000000000053
62646+:10AE00000000000000000000000000000000000042
62647+:10AE10000000000000000000000000000000000032
62648+:10AE20000000000000000000000000000000000022
62649+:10AE30000000000000000000000000000000000012
62650+:10AE40000000000000000000000000000000000002
62651+:10AE500000000000000000000000000000000000F2
62652+:10AE600000000000000000000000000000000000E2
62653+:10AE700000000000000000000000000000000000D2
62654+:10AE800000000000000000000000000000000000C2
62655+:10AE900000000000000000000000000000000000B2
62656+:10AEA00000000000000000000000000000000000A2
62657+:10AEB0000000000000000000000000000000000092
62658+:10AEC0000000000000000000000000000000000082
62659+:10AED0000000000000000000000000000000000072
62660+:10AEE0000000000000000000000000000000000062
62661+:10AEF0000000000000000000000000000000000052
62662+:10AF00000000000000000000000000000000000041
62663+:10AF10000000000000000000000000000000000031
62664+:10AF20000000000000000000000000000000000021
62665+:10AF30000000000000000000000000000000000011
62666+:10AF40000000000000000000000000000000000001
62667+:10AF500000000000000000000000000000000000F1
62668+:10AF600000000000000000000000000000000000E1
62669+:10AF700000000000000000000000000000000000D1
62670+:10AF800000000000000000000000000000000000C1
62671+:10AF900000000000000000000000000000000000B1
62672+:10AFA00000000000000000000000000000000000A1
62673+:10AFB0000000000000000000000000000000000091
62674+:10AFC0000000000000000000000000000000000081
62675+:10AFD0000000000000000000000000000000000071
62676+:10AFE0000000000000000000000000000000000061
62677+:10AFF0000000000000000000000000000000000051
62678+:10B000000000000000000000000000000000000040
62679+:10B010000000000000000000000000000000000030
62680+:10B020000000000000000000000000000000000020
62681+:10B030000000000000000000000000000000000010
62682+:10B040000000000000000000000000000000000000
62683+:10B0500000000000000000000000000000000000F0
62684+:10B0600000000000000000000000000000000000E0
62685+:10B0700000000000000000000000000000000000D0
62686+:10B0800000000000000000000000000000000000C0
62687+:10B0900000000000000000000000000000000000B0
62688+:10B0A00000000000000000000000000000000000A0
62689+:10B0B0000000000000000000000000000000000090
62690+:10B0C0000000000000000000000000000000000080
62691+:10B0D0000000000000000000000000000000000070
62692+:10B0E0000000000000000000000000000000000060
62693+:10B0F0000000000000000000000000000000000050
62694+:10B10000000000000000000000000000000000003F
62695+:10B11000000000000000000000000000000000002F
62696+:10B12000000000000000000000000000000000001F
62697+:10B13000000000000000000000000000000000000F
62698+:10B1400000000000000000000000000000000000FF
62699+:10B1500000000000000000000000000000000000EF
62700+:10B1600000000000000000000000000000000000DF
62701+:10B1700000000000000000000000000000000000CF
62702+:10B1800000000000000000000000000000000000BF
62703+:10B1900000000000000000000000000000000000AF
62704+:10B1A000000000000000000000000000000000009F
62705+:10B1B000000000000000000000000000000000008F
62706+:10B1C000000000000000000000000000000000007F
62707+:10B1D000000000000000000000000000000000006F
62708+:10B1E000000000000000000000000000000000005F
62709+:10B1F000000000000000000000000000000000004F
62710+:10B20000000000000000000000000000000000003E
62711+:10B21000000000000000000000000000000000002E
62712+:10B22000000000000000000000000000000000001E
62713+:10B23000000000000000000000000000000000000E
62714+:10B2400000000000000000000000000000000000FE
62715+:10B2500000000000000000000000000000000000EE
62716+:10B2600000000000000000000000000000000000DE
62717+:10B2700000000000000000000000000000000000CE
62718+:10B2800000000000000000000000000000000000BE
62719+:10B2900000000000000000000000000000000000AE
62720+:10B2A000000000000000000000000000000000009E
62721+:10B2B000000000000000000000000000000000008E
62722+:10B2C000000000000000000000000000000000007E
62723+:10B2D000000000000000000000000000000000006E
62724+:10B2E000000000000000000000000000000000005E
62725+:10B2F000000000000000000000000000000000004E
62726+:10B30000000000000000000000000000000000003D
62727+:10B31000000000000000000000000000000000002D
62728+:10B32000000000000000000000000000000000001D
62729+:10B33000000000000000000000000000000000000D
62730+:10B3400000000000000000000000000000000000FD
62731+:10B3500000000000000000000000000000000000ED
62732+:10B3600000000000000000000000000000000000DD
62733+:10B3700000000000000000000000000000000000CD
62734+:10B3800000000000000000000000000000000000BD
62735+:10B3900000000000000000000000000000000000AD
62736+:10B3A000000000000000000000000000000000009D
62737+:10B3B000000000000000000000000000000000008D
62738+:10B3C000000000000000000000000000000000007D
62739+:10B3D000000000000000000000000000000000006D
62740+:10B3E000000000000000000000000000000000005D
62741+:10B3F000000000000000000000000000000000004D
62742+:10B40000000000000000000000000000000000003C
62743+:10B41000000000000000000000000000000000002C
62744+:10B42000000000000000000000000000000000001C
62745+:10B43000000000000000000000000000000000000C
62746+:10B4400000000000000000000000000000000000FC
62747+:10B4500000000000000000000000000000000000EC
62748+:10B4600000000000000000000000000000000000DC
62749+:10B4700000000000000000000000000000000000CC
62750+:10B4800000000000000000000000000000000000BC
62751+:10B4900000000000000000000000000000000000AC
62752+:10B4A000000000000000000000000000000000009C
62753+:10B4B000000000000000000000000000000000008C
62754+:10B4C000000000000000000000000000000000007C
62755+:10B4D000000000000000000000000000000000006C
62756+:10B4E000000000000000000000000000000000005C
62757+:10B4F000000000000000000000000000000000004C
62758+:10B50000000000000000000000000000000000003B
62759+:10B51000000000000000000000000000000000002B
62760+:10B52000000000000000000000000000000000001B
62761+:10B53000000000000000000000000000000000000B
62762+:10B5400000000000000000000000000000000000FB
62763+:10B5500000000000000000000000000000000000EB
62764+:10B5600000000000000000000000000000000000DB
62765+:10B5700000000000000000000000000000000000CB
62766+:10B5800000000000000000000000000000000000BB
62767+:10B5900000000000000000000000000000000000AB
62768+:10B5A000000000000000000000000000000000009B
62769+:10B5B000000000000000000000000000000000008B
62770+:10B5C000000000000000000000000000000000007B
62771+:10B5D000000000000000000000000000000000006B
62772+:10B5E000000000000000000000000000000000005B
62773+:10B5F000000000000000000000000000000000004B
62774+:10B60000000000000000000000000000000000003A
62775+:10B61000000000000000000000000000000000002A
62776+:10B62000000000000000000000000000000000001A
62777+:10B63000000000000000000000000000000000000A
62778+:10B6400000000000000000000000000000000000FA
62779+:10B6500000000000000000000000000000000000EA
62780+:10B6600000000000000000000000000000000000DA
62781+:10B6700000000000000000000000000000000000CA
62782+:10B6800000000000000000000000000000000000BA
62783+:10B6900000000000000000000000000000000000AA
62784+:10B6A000000000000000000000000000000000009A
62785+:10B6B000000000000000000000000000000000008A
62786+:10B6C000000000000000000000000000000000007A
62787+:10B6D000000000000000000000000000000000006A
62788+:10B6E000000000000000000000000000000000005A
62789+:10B6F000000000000000000000000000000000004A
62790+:10B700000000000000000000000000000000000039
62791+:10B710000000000000000000000000000000000029
62792+:10B720000000000000000000000000000000000019
62793+:10B730000000000000000000000000000000000009
62794+:10B7400000000000000000000000000000000000F9
62795+:10B7500000000000000000000000000000000000E9
62796+:10B7600000000000000000000000000000000000D9
62797+:10B7700000000000000000000000000000000000C9
62798+:10B7800000000000000000000000000000000000B9
62799+:10B7900000000000000000000000000000000000A9
62800+:10B7A0000000000000000000000000000000000099
62801+:10B7B0000000000000000000000000000000000089
62802+:10B7C0000000000000000000000000000000000079
62803+:10B7D0000000000000000000000000000000000069
62804+:10B7E0000000000000000000000000000000000059
62805+:10B7F0000000000000000000000000000000000049
62806+:10B800000000000000000000000000000000000038
62807+:10B810000000000000000000000000000000000028
62808+:10B820000000000000000000000000000000000018
62809+:10B830000000000000000000000000000000000008
62810+:10B8400000000000000000000000000000000000F8
62811+:10B8500000000000000000000000000000000000E8
62812+:10B8600000000000000000000000000000000000D8
62813+:10B8700000000000000000000000000000000000C8
62814+:10B8800000000000000000000000000000000000B8
62815+:10B8900000000000000000000000000000000000A8
62816+:10B8A0000000000000000000000000000000000098
62817+:10B8B0000000000000000000000000000000000088
62818+:10B8C0000000000000000000000000000000000078
62819+:10B8D0000000000000000000000000000000000068
62820+:10B8E0000000000000000000000000000000000058
62821+:10B8F0000000000000000000000000000000000048
62822+:10B900000000000000000000000000000000000037
62823+:10B910000000000000000000000000000000000027
62824+:10B920000000000000000000000000000000000017
62825+:10B930000000000000000000000000000000000007
62826+:10B9400000000000000000000000000000000000F7
62827+:10B9500000000000000000000000000000000000E7
62828+:10B9600000000000000000000000000000000000D7
62829+:10B9700000000000000000000000000000000000C7
62830+:10B9800000000000000000000000000000000000B7
62831+:10B9900000000000000000000000000000000000A7
62832+:10B9A0000000000000000000000000000000000097
62833+:10B9B0000000000000000000000000000000000087
62834+:10B9C0000000000000000000000000000000000077
62835+:10B9D0000000000000000000000000000000000067
62836+:10B9E0000000000000000000000000000000000057
62837+:10B9F0000000000000000000000000000000000047
62838+:10BA00000000000000000000000000000000000036
62839+:10BA10000000000000000000000000000000000026
62840+:10BA20000000000000000000000000000000000016
62841+:10BA30000000000000000000000000000000000006
62842+:10BA400000000000000000000000000000000000F6
62843+:10BA500000000000000000000000000000000000E6
62844+:10BA600000000000000000000000000000000000D6
62845+:10BA700000000000000000000000000000000000C6
62846+:10BA800000000000000000000000000000000000B6
62847+:10BA900000000000000000000000000000000000A6
62848+:10BAA0000000000000000000000000000000000096
62849+:10BAB0000000000000000000000000000000000086
62850+:10BAC0000000000000000000000000000000000076
62851+:10BAD0000000000000000000000000000000000066
62852+:10BAE0000000000000000000000000000000000056
62853+:10BAF0000000000000000000000000000000000046
62854+:10BB00000000000000000000000000000000000035
62855+:10BB10000000000000000000000000000000000025
62856+:10BB20000000000000000000000000000000000015
62857+:10BB30000000000000000000000000000000000005
62858+:10BB400000000000000000000000000000000000F5
62859+:10BB500000000000000000000000000000000000E5
62860+:10BB600000000000000000000000000000000000D5
62861+:10BB700000000000000000000000000000000000C5
62862+:10BB800000000000000000000000000000000000B5
62863+:10BB900000000000000000000000000000000000A5
62864+:10BBA0000000000000000000000000000000000095
62865+:10BBB0000000000000000000000000000000000085
62866+:10BBC0000000000000000000000000000000000075
62867+:10BBD0000000000000000000000000000000000065
62868+:10BBE0000000000000000000000000000000000055
62869+:10BBF0000000000000000000000000000000000045
62870+:10BC00000000000000000000000000000000000034
62871+:10BC10000000000000000000000000000000000024
62872+:10BC20000000000000000000000000000000000014
62873+:10BC30000000000000000000000000000000000004
62874+:10BC400000000000000000000000000000000000F4
62875+:10BC500000000000000000000000000000000000E4
62876+:10BC600000000000000000000000000000000000D4
62877+:10BC700000000000000000000000000000000000C4
62878+:10BC800000000000000000000000000000000000B4
62879+:10BC900000000000000000000000000000000000A4
62880+:10BCA0000000000000000000000000000000000094
62881+:10BCB0000000000000000000000000000000000084
62882+:10BCC0000000000000000000000000000000000074
62883+:10BCD0000000000000000000000000000000000064
62884+:10BCE0000000000000000000000000000000000054
62885+:10BCF0000000000000000000000000000000000044
62886+:10BD00000000000000000000000000000000000033
62887+:10BD10000000000000000000000000000000000023
62888+:10BD20000000000000000000000000000000000013
62889+:10BD30000000000000000000000000000000000003
62890+:10BD400000000000000000000000000000000000F3
62891+:10BD500000000000000000000000000000000000E3
62892+:10BD600000000000000000000000000000000000D3
62893+:10BD700000000000000000000000000000000000C3
62894+:10BD800000000000000000000000000000000000B3
62895+:10BD900000000000000000000000000000000000A3
62896+:10BDA0000000000000000000000000000000000093
62897+:10BDB0000000000000000000000000000000000083
62898+:10BDC0000000000000000000000000000000000073
62899+:10BDD0000000000000000000000000000000000063
62900+:10BDE0000000000000000000000000000000000053
62901+:10BDF0000000000000000000000000000000000043
62902+:10BE00000000000000000000000000000000000032
62903+:10BE10000000000000000000000000000000000022
62904+:10BE20000000000000000000000000000000000012
62905+:10BE30000000000000000000000000000000000002
62906+:10BE400000000000000000000000000000000000F2
62907+:10BE500000000000000000000000000000000000E2
62908+:10BE600000000000000000000000000000000000D2
62909+:10BE700000000000000000000000000000000000C2
62910+:10BE800000000000000000000000000000000000B2
62911+:10BE900000000000000000000000000000000000A2
62912+:10BEA0000000000000000000000000000000000092
62913+:10BEB0000000000000000000000000000000000082
62914+:10BEC0000000000000000000000000000000000072
62915+:10BED0000000000000000000000000000000000062
62916+:10BEE0000000000000000000000000000000000052
62917+:10BEF0000000000000000000000000000000000042
62918+:10BF00000000000000000000000000000000000031
62919+:10BF10000000000000000000000000000000000021
62920+:10BF20000000000000000000000000000000000011
62921+:10BF30000000000000000000000000000000000001
62922+:10BF400000000000000000000000000000000000F1
62923+:10BF500000000000000000000000000000000000E1
62924+:10BF600000000000000000000000000000000000D1
62925+:10BF700000000000000000000000000000000000C1
62926+:10BF800000000000000000000000000000000000B1
62927+:10BF900000000000000000000000000000000000A1
62928+:10BFA0000000000000000000000000000000000091
62929+:10BFB0000000000000000000000000000000000081
62930+:10BFC0000000000000000000000000000000000071
62931+:10BFD0000000000000000000000000000000000061
62932+:10BFE0000000000000000000000000000000000051
62933+:10BFF0000000000000000000000000000000000041
62934+:10C000000000000000000000000000000000000030
62935+:10C010000000000000000000000000000000000020
62936+:10C020000000000000000000000000000000000010
62937+:10C030000000000000000000000000000000000000
62938+:10C0400000000000000000000000000000000000F0
62939+:10C0500000000000000000000000000000000000E0
62940+:10C0600000000000000000000000000000000000D0
62941+:10C0700000000000000000000000000000000000C0
62942+:10C0800000000000000000000000000000000000B0
62943+:10C0900000000000000000000000000000000000A0
62944+:10C0A0000000000000000000000000000000000090
62945+:10C0B0000000000000000000000000000000000080
62946+:10C0C0000000000000000000000000000000000070
62947+:10C0D0000000000000000000000000000000000060
62948+:10C0E0000000000000000000000000000000000050
62949+:10C0F0000000000000000000000000000000000040
62950+:10C10000000000000000000000000000000000002F
62951+:10C11000000000000000000000000000000000001F
62952+:10C12000000000000000000000000000000000000F
62953+:10C1300000000000000000000000000000000000FF
62954+:10C1400000000000000000000000000000000000EF
62955+:10C1500000000000000000000000000000000000DF
62956+:10C1600000000000000000000000000000000000CF
62957+:10C1700000000000000000000000000000000000BF
62958+:10C1800000000000000000000000000000000000AF
62959+:10C19000000000000000000000000000000000009F
62960+:10C1A000000000000000000000000000000000008F
62961+:10C1B000000000000000000000000000000000007F
62962+:10C1C000000000000000000000000000000000006F
62963+:10C1D000000000000000000000000000000000005F
62964+:10C1E000000000000000000000000000000000004F
62965+:10C1F000000000000000000000000000000000003F
62966+:10C20000000000000000000000000000000000002E
62967+:10C21000000000000000000000000000000000001E
62968+:10C22000000000000000000000000000000000000E
62969+:10C2300000000000000000000000000000000000FE
62970+:10C2400000000000000000000000000000000000EE
62971+:10C2500000000000000000000000000000000000DE
62972+:10C2600000000000000000000000000000000000CE
62973+:10C2700000000000000000000000000000000000BE
62974+:10C2800000000000000000000000000000000000AE
62975+:10C29000000000000000000000000000000000009E
62976+:10C2A000000000000000000000000000000000008E
62977+:10C2B000000000000000000000000000000000007E
62978+:10C2C000000000000000000000000000000000006E
62979+:10C2D000000000000000000000000000000000005E
62980+:10C2E000000000000000000000000000000000004E
62981+:10C2F000000000000000000000000000000000003E
62982+:10C30000000000000000000000000000000000002D
62983+:10C31000000000000000000000000000000000001D
62984+:10C32000000000000000000000000000000000000D
62985+:10C3300000000000000000000000000000000000FD
62986+:10C3400000000000000000000000000000000000ED
62987+:10C3500000000000000000000000000000000000DD
62988+:10C3600000000000000000000000000000000000CD
62989+:10C3700000000000000000000000000000000000BD
62990+:10C3800000000000000000000000000000000000AD
62991+:10C39000000000000000000000000000000000009D
62992+:10C3A000000000000000000000000000000000008D
62993+:10C3B000000000000000000000000000000000007D
62994+:10C3C000000000000000000000000000000000006D
62995+:10C3D000000000000000000000000000000000005D
62996+:10C3E000000000000000000000000000000000004D
62997+:10C3F000000000000000000000000000000000003D
62998+:10C40000000000000000000000000000000000002C
62999+:10C41000000000000000000000000000000000001C
63000+:10C42000000000000000000000000000000000000C
63001+:10C4300000000000000000000000000000000000FC
63002+:10C4400000000000000000000000000000000000EC
63003+:10C4500000000000000000000000000000000000DC
63004+:10C4600000000000000000000000000000000000CC
63005+:10C4700000000000000000000000000000000000BC
63006+:10C4800000000000000000000000000000000000AC
63007+:10C49000000000000000000000000000000000009C
63008+:10C4A000000000000000000000000000000000008C
63009+:10C4B000000000000000000000000000000000007C
63010+:10C4C000000000000000000000000000000000006C
63011+:10C4D000000000000000000000000000000000005C
63012+:10C4E000000000000000000000000000000000004C
63013+:10C4F000000000000000000000000000000000003C
63014+:10C50000000000000000000000000000000000002B
63015+:10C51000000000000000000000000000000000001B
63016+:10C52000000000000000000000000000000000000B
63017+:10C5300000000000000000000000000000000000FB
63018+:10C5400000000000000000000000000000000000EB
63019+:10C5500000000000000000000000000000000000DB
63020+:10C5600000000000000000000000000000000000CB
63021+:10C5700000000000000000000000000000000000BB
63022+:10C5800000000000000000000000000000000000AB
63023+:10C59000000000000000000000000000000000009B
63024+:10C5A000000000000000000000000000000000008B
63025+:10C5B000000000000000000000000000000000007B
63026+:10C5C000000000000000000000000000000000006B
63027+:10C5D000000000000000000000000000000000005B
63028+:10C5E000000000000000000000000000000000004B
63029+:10C5F000000000000000000000000000000000003B
63030+:10C60000000000000000000000000000000000002A
63031+:10C61000000000000000000000000000000000001A
63032+:10C62000000000000000000000000000000000000A
63033+:10C6300000000000000000000000000000000000FA
63034+:10C6400000000000000000000000000000000000EA
63035+:10C6500000000000000000000000000000000000DA
63036+:10C6600000000000000000000000000000000000CA
63037+:10C6700000000000000000000000000000000000BA
63038+:10C6800000000000000000000000000000000000AA
63039+:10C69000000000000000000000000000000000009A
63040+:10C6A000000000000000000000000000000000008A
63041+:10C6B000000000000000000000000000000000007A
63042+:10C6C000000000000000000000000000000000006A
63043+:10C6D000000000000000000000000000000000005A
63044+:10C6E000000000000000000000000000000000004A
63045+:10C6F000000000000000000000000000000000003A
63046+:10C700000000000000000000000000000000000029
63047+:10C710000000000000000000000000000000000019
63048+:10C720000000000000000000000000000000000009
63049+:10C7300000000000000000000000000000000000F9
63050+:10C7400000000000000000000000000000000000E9
63051+:10C7500000000000000000000000000000000000D9
63052+:10C7600000000000000000000000000000000000C9
63053+:10C7700000000000000000000000000000000000B9
63054+:10C7800000000000000000000000000000000000A9
63055+:10C790000000000000000000000000000000000099
63056+:10C7A0000000000000000000000000000000000089
63057+:10C7B0000000000000000000000000000000000079
63058+:10C7C0000000000000000000000000000000000069
63059+:10C7D0000000000000000000000000000000000059
63060+:10C7E0000000000000000000000000000000000049
63061+:10C7F0000000000000000000000000000000000039
63062+:10C800000000000000000000000000000000000028
63063+:10C810000000000000000000000000000000000018
63064+:10C820000000000000000000000000000000000008
63065+:10C8300000000000000000000000000000000000F8
63066+:10C8400000000000000000000000000000000000E8
63067+:10C8500000000000000000000000000000000000D8
63068+:10C8600000000000000000000000000000000000C8
63069+:10C8700000000000000000000000000000000000B8
63070+:10C8800000000000000000000000000000000000A8
63071+:10C890000000000000000000000000000000000098
63072+:10C8A0000000000000000000000000000000000088
63073+:10C8B0000000000000000000000000000000000078
63074+:10C8C0000000000000000000000000000000000068
63075+:10C8D0000000000000000000000000000000000058
63076+:10C8E0000000000000000000000000000000000048
63077+:10C8F0000000000000000000000000000000000038
63078+:10C900000000000000000000000000000000000027
63079+:10C910000000000000000000000000000000000017
63080+:10C920000000000000000000000000000000000007
63081+:10C9300000000000000000000000000000000000F7
63082+:10C9400000000000000000000000000000000000E7
63083+:10C9500000000000000000000000000000000000D7
63084+:10C9600000000000000000000000000000000000C7
63085+:10C9700000000000000000000000000000000000B7
63086+:10C9800000000000000000000000000000000000A7
63087+:10C990000000000000000000000000000000000097
63088+:10C9A0000000000000000000000000000000000087
63089+:10C9B0000000000000000000000000000000000077
63090+:10C9C0000000000000000000000000000000000067
63091+:10C9D0000000000000000000000000000000000057
63092+:10C9E0000000000000000000000000000000000047
63093+:10C9F0000000000000000000000000000000000037
63094+:10CA00000000000000000000000000000000000026
63095+:10CA10000000000000000000000000000000000016
63096+:10CA20000000000000000000000000000000000006
63097+:10CA300000000000000000000000000000000000F6
63098+:10CA400000000000000000000000000000000000E6
63099+:10CA500000000000000000000000000000000000D6
63100+:10CA600000000000000000000000000000000000C6
63101+:10CA700000000000000000000000000000000000B6
63102+:10CA800000000000000000000000000000000000A6
63103+:10CA90000000000000000000000000000000000096
63104+:10CAA0000000000000000000000000000000000086
63105+:10CAB0000000000000000000000000000000000076
63106+:10CAC0000000000000000000000000000000000066
63107+:10CAD0000000000000000000000000000000000056
63108+:10CAE0000000000000000000000000000000000046
63109+:10CAF0000000000000000000000000000000000036
63110+:10CB00000000000000000000000000000000000025
63111+:10CB10000000000000000000000000000000000015
63112+:10CB20000000000000000000000000000000000005
63113+:10CB300000000000000000000000000000000000F5
63114+:10CB400000000000000000000000000000000000E5
63115+:10CB500000000000000000000000000000000000D5
63116+:10CB600000000000000000000000000000000000C5
63117+:10CB700000000000000000000000000000000000B5
63118+:10CB800000000000000000000000000000000000A5
63119+:10CB90000000000000000000000000000000000095
63120+:10CBA0000000000000000000000000000000000085
63121+:10CBB0000000000000000000000000000000000075
63122+:10CBC0000000000000000000000000000000000065
63123+:10CBD0000000000000000000000000000000000055
63124+:10CBE0000000000000000000000000000000000045
63125+:10CBF0000000000000000000000000000000000035
63126+:10CC00000000000000000000000000000000000024
63127+:10CC10000000000000000000000000000000000014
63128+:10CC20000000000000000000000000000000000004
63129+:10CC300000000000000000000000000000000000F4
63130+:10CC400000000000000000000000000000000000E4
63131+:10CC500000000000000000000000000000000000D4
63132+:10CC600000000000000000000000000000000000C4
63133+:10CC700000000000000000000000000000000000B4
63134+:10CC800000000000000000000000000000000000A4
63135+:10CC90000000000000000000000000000000000094
63136+:10CCA0000000000000000000000000000000000084
63137+:10CCB0000000000000000000000000000000000074
63138+:10CCC0000000000000000000000000000000000064
63139+:10CCD0000000000000000000000000000000000054
63140+:10CCE0000000000000000000000000000000000044
63141+:10CCF0000000000000000000000000000000000034
63142+:10CD00000000000000000000000000000000000023
63143+:10CD10000000000000000000000000000000000013
63144+:10CD20000000000000000000000000000000000003
63145+:10CD300000000000000000000000000000000000F3
63146+:10CD400000000000000000000000000000000000E3
63147+:10CD500000000000000000000000000000000000D3
63148+:10CD600000000000000000000000000000000000C3
63149+:10CD700000000000000000000000000000000000B3
63150+:10CD800000000000000000000000000000000000A3
63151+:10CD90000000000000000000000000000000000093
63152+:10CDA0000000000000000000000000000000000083
63153+:10CDB0000000000000000000000000000000000073
63154+:10CDC0000000000000000000000000000000000063
63155+:10CDD0000000000000000000000000000000000053
63156+:10CDE0000000000000000000000000000000000043
63157+:10CDF0000000000000000000000000000000000033
63158+:10CE00000000000000000000000000000000000022
63159+:10CE10000000000000000000000000000000000012
63160+:10CE20000000000000000000000000000000000002
63161+:10CE300000000000000000000000000000000000F2
63162+:10CE400000000000000000000000000000000000E2
63163+:10CE500000000000000000000000000000000000D2
63164+:10CE600000000000000000000000000000000000C2
63165+:10CE700000000000000000000000000000000000B2
63166+:10CE800000000000000000000000000000000000A2
63167+:10CE90000000000000000000000000000000000092
63168+:10CEA0000000000000000000000000000000000082
63169+:10CEB0000000000000000000000000000000000072
63170+:10CEC0000000000000000000000000000000000062
63171+:10CED0000000000000000000000000000000000052
63172+:10CEE0000000000000000000000000000000000042
63173+:10CEF0000000000000000000000000000000000032
63174+:10CF00000000000000000000000000000000000021
63175+:10CF10000000000000000000000000000000000011
63176+:10CF20000000000000000000000000000000000001
63177+:10CF300000000000000000000000000000000000F1
63178+:10CF400000000000000000000000000000000000E1
63179+:10CF500000000000000000000000000000000000D1
63180+:10CF600000000000000000000000000000000000C1
63181+:10CF700000000000000000000000000000000000B1
63182+:10CF800000000000000000000000000000000000A1
63183+:10CF90000000000000000000000000000000000091
63184+:10CFA0000000000000000000000000000000000081
63185+:10CFB0000000000000000000000000000000000071
63186+:10CFC0000000000000000000000000000000000061
63187+:10CFD0000000000000000000000000000000000051
63188+:10CFE0000000000000000000000000000000000041
63189+:10CFF0000000000000000000000000000000000031
63190+:10D000000000000000000000000000000000000020
63191+:10D010000000000000000000000000000000000010
63192+:10D020000000000000000000000000000000000000
63193+:10D0300000000000000000000000000000000000F0
63194+:10D0400000000000000000000000000000000000E0
63195+:10D0500000000000000000000000000000000000D0
63196+:10D0600000000000000000000000000000000000C0
63197+:10D0700000000000000000000000000000000000B0
63198+:10D0800000000000000000000000000000000000A0
63199+:10D090000000000000000000000000000000000090
63200+:10D0A0000000000000000000000000000000000080
63201+:10D0B0000000000000000000000000000000000070
63202+:10D0C0000000000000000000000000000000000060
63203+:10D0D0000000000000000000000000000000000050
63204+:10D0E0000000000000000000000000000000000040
63205+:10D0F0000000000000000000000000000000000030
63206+:10D10000000000000000000000000000000000001F
63207+:10D11000000000000000000000000000000000000F
63208+:10D1200000000000000000000000000000000000FF
63209+:10D1300000000000000000000000000000000000EF
63210+:10D1400000000000000000000000000000000000DF
63211+:10D1500000000000000000000000000000000000CF
63212+:10D1600000000000000000000000000000000000BF
63213+:10D1700000000000000000000000000000000000AF
63214+:10D18000000000000000000000000000000000009F
63215+:10D19000000000000000000000000000000000008F
63216+:10D1A000000000000000000000000000000000007F
63217+:10D1B000000000000000000000000000000000006F
63218+:10D1C000000000000000000000000000000000005F
63219+:10D1D000000000000000000000000000000000004F
63220+:10D1E000000000000000000000000000000000003F
63221+:10D1F000000000000000000000000000000000002F
63222+:10D20000000000000000000000000000000000001E
63223+:10D21000000000000000000000000000000000000E
63224+:10D2200000000000000000000000000000000000FE
63225+:10D2300000000000000000000000000000000000EE
63226+:10D2400000000000000000000000000000000000DE
63227+:10D2500000000000000000000000000000000000CE
63228+:10D2600000000000000000000000000000000000BE
63229+:10D2700000000000000000000000000000000000AE
63230+:10D28000000000000000000000000000000000009E
63231+:10D29000000000000000000000000000000000008E
63232+:10D2A000000000000000000000000000000000007E
63233+:10D2B000000000000000000000000000000000006E
63234+:10D2C000000000000000000000000000000000005E
63235+:10D2D000000000000000000000000000000000004E
63236+:10D2E000000000000000000000000000000000003E
63237+:10D2F000000000000000000000000000000000002E
63238+:10D30000000000000000000000000000000000001D
63239+:10D31000000000000000000000000000000000000D
63240+:10D3200000000000000000000000000000000000FD
63241+:10D3300000000000000000000000000000000000ED
63242+:10D3400000000000000000000000000000000000DD
63243+:10D3500000000000000000000000000000000000CD
63244+:10D3600000000000000000000000000000000000BD
63245+:10D3700000000000000000000000000000000000AD
63246+:10D38000000000000000000000000000000000009D
63247+:10D39000000000000000000000000000000000008D
63248+:10D3A000000000000000000000000000000000007D
63249+:10D3B000000000000000000000000000000000006D
63250+:10D3C000000000000000000000000000000000005D
63251+:10D3D000000000000000000000000000000000004D
63252+:10D3E000000000000000000000000000000000003D
63253+:10D3F000000000000000000000000000000000002D
63254+:10D40000000000000000000000000000000000001C
63255+:10D41000000000000000000000000000000000000C
63256+:10D4200000000000000000000000000000000000FC
63257+:10D4300000000000000000000000000000000000EC
63258+:10D4400000000000000000000000000000000000DC
63259+:10D4500000000000000000000000000000000000CC
63260+:10D4600000000000000000000000000000000000BC
63261+:10D4700000000000000000000000000000000000AC
63262+:10D48000000000000000000000000000000000009C
63263+:10D49000000000000000000000000000000000008C
63264+:10D4A000000000000000000000000000000000007C
63265+:10D4B000000000000000000000000000000000006C
63266+:10D4C000000000000000000000000000000000005C
63267+:10D4D000000000000000000000000000000000004C
63268+:10D4E000000000000000000000000000000000003C
63269+:10D4F000000000000000000000000000000000002C
63270+:10D50000000000000000000000000000000000001B
63271+:10D51000000000000000000000000000000000000B
63272+:10D5200000000000000000000000000000000000FB
63273+:10D5300000000000000000000000000000000000EB
63274+:10D5400000000000000000000000000000000000DB
63275+:10D5500000000000000000000000000000000000CB
63276+:10D5600000000000000000000000000000000000BB
63277+:10D5700000000000000000000000000000000000AB
63278+:10D58000000000000000000000000000000000009B
63279+:10D59000000000000000008000000000000000000B
63280+:10D5A000000000000000000000000000000000007B
63281+:10D5B00000000000000000000000000A0000000061
63282+:10D5C0000000000000000000100000030000000048
63283+:10D5D0000000000D0000000D3C02080024427340D2
63284+:10D5E0003C030800246377CCAC4000000043202BB0
63285+:10D5F0001480FFFD244200043C1D080037BD7FFC61
63286+:10D6000003A0F0213C100800261032103C1C08003A
63287+:10D61000279C73400E0010FE000000000000000D6B
63288+:10D6200030A5FFFF30C600FF274301808F4201B8BD
63289+:10D630000440FFFE24020002AC640000A465000860
63290+:10D64000A066000AA062000B3C021000AC67001844
63291+:10D6500003E00008AF4201B83C0360008C624FF861
63292+:10D660000440FFFE3C020200AC644FC0AC624FC4F9
63293+:10D670003C02100003E00008AC624FF89482000CFA
63294+:10D680002486001400A0382100021302000210803A
63295+:10D690000082402100C8102B1040005700000000FD
63296+:10D6A00090C300002C6200095040005190C200015C
63297+:10D6B000000310803C030800246372F00043102133
63298+:10D6C0008C420000004000080000000090C30001F0
63299+:10D6D0002402000A1462003A000000000106102330
63300+:10D6E0002C42000A1440003624C600028CE20000DE
63301+:10D6F00034420100ACE2000090C2000090C300017F
63302+:10D7000090C4000290C5000300031C000002160034
63303+:10D710000043102500042200004410250045102578
63304+:10D7200024C60004ACE2000490C2000090C30001D3
63305+:10D7300090C4000290C500030002160000031C0004
63306+:10D740000043102500042200004410250045102548
63307+:10D7500024C600040A000CB8ACE2000890C3000123
63308+:10D76000240200041462001624C6000290C20000C5
63309+:10D7700090C400018CE30000000212000044102558
63310+:10D780003463000424C60002ACE2000C0A000CB8AA
63311+:10D79000ACE3000090C300012402000314620008FF
63312+:10D7A00024C600028CE2000090C3000024C60001E1
63313+:10D7B00034420008A0E300100A000CB8ACE20000FC
63314+:10D7C00003E000082402000190C3000124020002CB
63315+:10D7D0001062000224C40002010020210A000CB8DB
63316+:10D7E000008030210A000CB824C6000190C200015C
63317+:10D7F0000A000CB800C2302103E00008000010212C
63318+:10D8000027BDFFE8AFBF0014AFB000100E00130239
63319+:10D8100000808021936200052403FFFE0200202186
63320+:10D82000004310248FBF00148FB00010A3620005C6
63321+:10D830000A00130B27BD001827BDFFE8AFB000108A
63322+:10D84000AFBF00140E000F3C0080802193620000E7
63323+:10D8500024030050304200FF14430004240201005E
63324+:10D86000AF4201800A000D3002002021AF4001804C
63325+:10D87000020020218FBF00148FB000100A000FE7B4
63326+:10D8800027BD001827BDFF80AFBE0078AFB700747A
63327+:10D89000AFB20060AFBF007CAFB60070AFB5006C38
63328+:10D8A000AFB40068AFB30064AFB1005CAFB0005874
63329+:10D8B0008F5001283C0208008C4231A02403FF80D5
63330+:10D8C0009365003F0202102100431024AF42002460
63331+:10D8D0003C0208008C4231A09364000530B200FF86
63332+:10D8E000020210213042007F034218210004202749
63333+:10D8F0003C02000A0062182130840001AF8300144A
63334+:10D900000000F0210000B82114800053AFA00050A7
63335+:10D9100093430116934401128F450104306300FFC5
63336+:10D920003C020001308400FF00A2282403431021A0
63337+:10D9300003441821245640002467400014A001CD60
63338+:10D940002402000193620000304300FF2402002003
63339+:10D950001062000524020050106200060000000062
63340+:10D960000A000D74000000000000000D0A000D7D8B
63341+:10D97000AFA000303C1E080027DE738C0A000D7D2E
63342+:10D98000AFA000303C0208008C4200DC24420001C1
63343+:10D990003C010800AC2200DC0E00139F00000000D8
63344+:10D9A0000A000F318FBF007C8F4201043C0300202E
63345+:10D9B00092D3000D004310240002202B00042140CC
63346+:10D9C000AFA400308F4301043C02004000621824E1
63347+:10D9D000146000023485004000802821326200205B
63348+:10D9E000AFA500301440000234A6008000A0302112
63349+:10D9F00010C0000BAFA6003093C500088F67004C25
63350+:10DA00000200202100052B0034A5008130A5F08103
63351+:10DA10000E000C9B30C600FF0A000F2E0000000015
63352+:10DA20009362003E304200401040000F2402000488
63353+:10DA300056420007240200120200202100E02821A3
63354+:10DA40000E0013F702C030210A000F318FBF007C97
63355+:10DA500016420005000000000E000D2100002021EC
63356+:10DA60000A000F318FBF007C9743011A96C4000E45
63357+:10DA700093620035326500043075FFFF00442004D6
63358+:10DA8000AFA400548ED1000410A000158ED400085D
63359+:10DA90009362003E3042004010400007000000004A
63360+:10DAA0000E0013E0022020211040000D00000000B5
63361+:10DAB0000A000F2E000000008F6200440222102393
63362+:10DAC0000440016A000000008F6200480222102317
63363+:10DAD00004410166240400160A000E218FC20004CE
63364+:10DAE0008F6200480222102304400008000000005A
63365+:10DAF0003C0208008C423100244200013C01080035
63366+:10DB0000AC2231000A000F23000000008F620040A9
63367+:10DB100002221023184000128F8400143C020800D7
63368+:10DB20008C423100327300FC0000A8212442000125
63369+:10DB30003C010800AC2231008F6300409482011C3C
63370+:10DB4000022318233042FFFF0043102A50400010E8
63371+:10DB50002402000C8F6200400A000DF20222102302
63372+:10DB60009483011C9762003C0043102B1040000678
63373+:10DB7000000000009482011C00551023A482011CA7
63374+:10DB80000A000DF72402000CA480011C2402000CE2
63375+:10DB9000AFA200308F620040005120231880000D9A
63376+:10DBA00002A4102A1440012600000000149500066B
63377+:10DBB00002A410233A620001304200011440012007
63378+:10DBC0000000000002A41023022488210A000E098C
63379+:10DBD0003055FFFF00002021326200021040001A81
63380+:10DBE000326200109362003E30420040504000110B
63381+:10DBF0008FC200040E00130202002021240200182C
63382+:10DC0000A362003F936200052403FFFE020020216F
63383+:10DC1000004310240E00130BA362000524040039F6
63384+:10DC2000000028210E0013C9240600180A000F3036
63385+:10DC300024020001240400170040F809000000003D
63386+:10DC40000A000F302402000110400108000000000B
63387+:10DC50008F63004C8F620054028210231C4001032A
63388+:10DC600002831023044200010060A021AFA4001829
63389+:10DC7000AFB10010AFB50014934201208F65004092
63390+:10DC80009763003C304200FF034210210044102102
63391+:10DC90008FA400543063FFFF244240000083182B00
63392+:10DCA0008FA40030AFA20020AFA50028008320255C
63393+:10DCB000AFA40030AFA50024AFA0002CAFB4003457
63394+:10DCC0009362003E30420008504000118FC20000B5
63395+:10DCD00002C0202127A500380E000CB2AFA00038EA
63396+:10DCE0005440000B8FC200008FA200383042010068
63397+:10DCF000504000078FC200008FA3003C8F6200607D
63398+:10DD00000062102304430001AF6300608FC2000073
63399+:10DD10000040F80927A400108FA200303042000212
63400+:10DD200054400001327300FE9362003E30420040D6
63401+:10DD3000104000378FA200248F6200541682001A10
63402+:10DD40003262000124020014124200102A4200151F
63403+:10DD500010400006240200162402000C12420007A4
63404+:10DD6000326200010A000E7D000000001242000530
63405+:10DD7000326200010A000E7D000000000A000E78E9
63406+:10DD80002417000E0A000E78241700100A000E7CDB
63407+:10DD900024170012936200232403FFBD00431024C4
63408+:10DDA000A362002332620001104000198FA20024F8
63409+:10DDB0002402000C1242000E2A42000D1040000600
63410+:10DDC0002402000E2402000A124200078FA200243F
63411+:10DDD0000A000E9524420001124200088FA200247E
63412+:10DDE0000A000E95244200010A000E932417000831
63413+:10DDF0002402000E16E20002241700162417001059
63414+:10DE00008FA2002424420001AFA200248FA200248C
63415+:10DE10008FA300148F76004000431021AF620040B2
63416+:10DE20008F8200149442011C104000090000000081
63417+:10DE30008F6200488F6400409763003C00441023C9
63418+:10DE40003063FFFF0043102A104000088FA20054E7
63419+:10DE5000936400368F6300403402FFFC008210049C
63420+:10DE600000621821AF6300488FA200548FA60030D3
63421+:10DE70000282902130C200081040000E0000000015
63422+:10DE80008F6200581642000430C600FF9742011A04
63423+:10DE90005040000134C6001093C500088FA700341D
63424+:10DEA0000200202100052B0034A500800E000C9BF1
63425+:10DEB00030A5F0808F620040005610231840001BF0
63426+:10DEC0008FA200183C0208008C42319830420010AA
63427+:10DED0001040000D24020001976200681440000AFF
63428+:10DEE000240200018F8200149442011C1440000699
63429+:10DEF00024020001A76200689742007A244200646D
63430+:10DF00000A000EE9A7620012A76200120E001302B7
63431+:10DF1000020020219362007D2403000102002021E1
63432+:10DF2000344200010A000EE7AFA300501840000A77
63433+:10DF3000000000000E001302020020219362007D09
63434+:10DF40002403000102002021AFA30050344200044A
63435+:10DF50000E00130BA362007D9362003E304200402E
63436+:10DF60001440000C326200011040000A0000000062
63437+:10DF70008F6300408FC20004240400182463000152
63438+:10DF80000040F809AF6300408FA200300A000F3054
63439+:10DF9000304200048F620058105200100000000050
63440+:10DFA0008F620018022210231C4000082404000184
63441+:10DFB0008F62001816220009000000008F62001C0A
63442+:10DFC000028210230440000500000000AF720058D8
63443+:10DFD000AFA40050AF710018AF74001C12E0000B2A
63444+:10DFE0008FA200500E00130202002021A377003FF1
63445+:10DFF0000E00130B0200202102E030212404003720
63446+:10E000000E0013C9000028218FA200501040000309
63447+:10E01000000000000E000CA90200202112A0000543
63448+:10E02000000018218FA2003030420004504000113F
63449+:10E0300000601021240300010A000F30006010214D
63450+:10E040000E001302020020219362007D02002021B5
63451+:10E05000344200040E00130BA362007D0E000CA9D5
63452+:10E06000020020210A000F3024020001AF400044CA
63453+:10E07000240200018FBF007C8FBE00788FB7007430
63454+:10E080008FB600708FB5006C8FB400688FB30064DA
63455+:10E090008FB200608FB1005C8FB0005803E00008C1
63456+:10E0A00027BD00808F4201B80440FFFE2402080013
63457+:10E0B000AF4201B803E00008000000003C02000885
63458+:10E0C00003421021944200483084FFFF2484001250
63459+:10E0D0003045FFFF10A0001700A4102B10400016C1
63460+:10E0E00024020003934201202403001AA343018B5E
63461+:10E0F000304200FF2446FFFE8F82000000A6182B4E
63462+:10E100003863000100021382004310241040000510
63463+:10E110008F84000434820001A746019403E00008C4
63464+:10E12000AF8200042402FFFE0082102403E00008F6
63465+:10E13000AF8200042402000303E00008A342018B25
63466+:10E1400027BDFFE0AFB10014AFB00010AFBF0018A3
63467+:10E1500030B0FFFF30D1FFFF8F4201B80440FFFE17
63468+:10E1600000000000AF440180AF4400200E000F42C9
63469+:10E17000020020218F8300008F840004A750019AA1
63470+:10E18000A750018EA74301908F8300083082800042
63471+:10E19000AF4301A8A75101881040000E8F820004F0
63472+:10E1A00093420116304200FC24420004005A102120
63473+:10E1B0008C4240003042FFFF144000068F82000472
63474+:10E1C0003C02FFFF34427FFF00821024AF82000434
63475+:10E1D0008F8200042403BFFF00431024A74201A63E
63476+:10E1E0009743010C8F42010400031C003042FFFFE3
63477+:10E1F00000621825AF4301AC3C021000AF4201B8E9
63478+:10E200008FBF00188FB100148FB0001003E000081A
63479+:10E2100027BD00208F470070934201128F830000BA
63480+:10E2200027BDFFF0304200FF00022882306201006B
63481+:10E23000000030211040004324A40003306240005D
63482+:10E24000104000103062200000041080005A10219D
63483+:10E250008C43400024A4000400041080AFA30000FD
63484+:10E26000005A10218C424000AFA2000493420116D4
63485+:10E27000304200FC005A10218C4240000A000FC0BE
63486+:10E28000AFA200081040002F0000302100041080D1
63487+:10E29000005A10218C43400024A400040004108084
63488+:10E2A000AFA30000005A10218C424000AFA000082C
63489+:10E2B000AFA200048FA80008000030210000202138
63490+:10E2C000240A00083C0908002529010003A41021A4
63491+:10E2D000148A000300042A001100000A0000000054
63492+:10E2E00090420000248400012C83000C00A2102125
63493+:10E2F00000021080004910218C4200001460FFF3DE
63494+:10E3000000C230263C0408008C8431048F42007027
63495+:10E310002C83002010600009004738233C030800CC
63496+:10E32000246331080004108000431021248300017D
63497+:10E33000AC4700003C010800AC233104AF86000864
63498+:10E340002406000100C0102103E0000827BD0010D2
63499+:10E350003C0208008C42003827BDFFD0AFB5002436
63500+:10E36000AFB40020AFB10014AFBF0028AFB3001CA2
63501+:10E37000AFB20018AFB00010000088213C150800B3
63502+:10E3800026B50038144000022454FFFF0000A021ED
63503+:10E390009742010E8F8400003042FFFF308340001F
63504+:10E3A0001060000A245200043C0200200082102465
63505+:10E3B00050400007308280008F8200042403BFFF9A
63506+:10E3C000008318240A0010103442100030828000AC
63507+:10E3D0001040000A3C020020008210241040000778
63508+:10E3E0008F8200043C03FFFF34637FFF0083182407
63509+:10E3F00034428000AF820004AF8300000E000F980B
63510+:10E400000000000014400007000000009743011EB8
63511+:10E410009742011C3063FFFF0002140000621825C0
63512+:10E42000AF8300089742010C8F4340003045FFFF47
63513+:10E430003402FFFF14620003000000000A001028ED
63514+:10E44000241100208F42400030420100544000015E
63515+:10E45000241100108F8400003082100050400014FE
63516+:10E4600036310001308200201440000B3C021000C5
63517+:10E47000008210245040000E363100013C030E0093
63518+:10E480003C020DFF008318243442FFFF0043102B91
63519+:10E4900050400007363100013C0208008C42002C3D
63520+:10E4A000244200013C010800AC22002C363100055A
63521+:10E4B0003C0608008CC6003454C000238F85000041
63522+:10E4C0008F820004304240005440001F8F850000BE
63523+:10E4D0003C021F01008210243C0310005443001A28
63524+:10E4E0008F85000030A20200144000178F850000C5
63525+:10E4F0003250FFFF363100028F4201B80440FFFE68
63526+:10E5000000000000AF400180020020210E000F42F9
63527+:10E51000AF4000208F8300042402BFFFA750019A60
63528+:10E52000006218248F820000A750018EA751018835
63529+:10E53000A74301A6A74201903C021000AF4201B8D8
63530+:10E540000A0010F5000010213C02100000A2102467
63531+:10E550001040003A0000000010C0000F0000000052
63532+:10E5600030A201001040000C3C0302003C020F00EE
63533+:10E5700000A2102410430008000000008F82000851
63534+:10E58000005410240055102190420004244200043D
63535+:10E590000A00109F000221C00000000000051602C2
63536+:10E5A0003050000F3A0300022E4203EF38420001C0
63537+:10E5B0002C6300010062182414600073240200011F
63538+:10E5C0003C0308008C6300D02E06000C386200016A
63539+:10E5D0002C4200010046102414400015001021C0F8
63540+:10E5E0002602FFFC2C4200045440001100002021B0
63541+:10E5F000386200022C420001004610241040000343
63542+:10E60000000512420A00109F000020210010182B64
63543+:10E610000043102450400006001021C000002021BB
63544+:10E620003245FFFF0E000F633226FFFB001021C0B2
63545+:10E630003245FFFF0A0010F2362600028F424000EA
63546+:10E640003C0308008C630024304201001040004667
63547+:10E6500030620001322200043070000D14400002CC
63548+:10E660002413000424130002000512C238420001E2
63549+:10E670002E4303EF304200013863000100431025B0
63550+:10E68000104000033231FFFB2402FFFB0202802412
63551+:10E6900010C000183202000130A201001040001525
63552+:10E6A000320200013C020F0000A210243C030200D1
63553+:10E6B0001043000F8F8200082403FFFE0203802412
63554+:10E6C00000541024005510219042000402333025DC
63555+:10E6D0002442000412000002000221C03226FFFF83
63556+:10E6E0000E000F633245FFFF1200002700001021CB
63557+:10E6F000320200011040000D320200042402000129
63558+:10E7000012020002023330253226FFFF00002021D2
63559+:10E710000E000F633245FFFF2402FFFE0202802439
63560+:10E7200012000019000010213202000410400016EF
63561+:10E7300024020001240200041202000202333025E8
63562+:10E740003226FFFF3245FFFF0E000F632404010055
63563+:10E750002402FFFB020280241200000B00001021A3
63564+:10E760000A0010F5240200011040000700001021EB
63565+:10E770003245FFFF36260002000020210E000F6305
63566+:10E7800000000000000010218FBF00288FB500247A
63567+:10E790008FB400208FB3001C8FB200188FB100140B
63568+:10E7A0008FB0001003E0000827BD003027BDFFD068
63569+:10E7B000AFB000103C04600CAFBF002CAFB6002817
63570+:10E7C000AFB50024AFB40020AFB3001CAFB2001847
63571+:10E7D000AFB100148C8250002403FF7F3C1A8000EC
63572+:10E7E000004310243442380CAC8250002402000351
63573+:10E7F0003C106000AF4200088E0208083C1B8008F5
63574+:10E800003C010800AC2000203042FFF038420010EC
63575+:10E810002C4200010E001B8DAF8200183C04FFFF4C
63576+:10E820003C020400348308063442000CAE0219484E
63577+:10E83000AE03194C3C0560168E0219808CA30000B3
63578+:10E840003442020000641824AE0219803C02535383
63579+:10E850001462000334A47C008CA200040050202128
63580+:10E860008C82007C8C830078AF820010AF83000C18
63581+:10E870008F55000032A200031040FFFD32A20001BC
63582+:10E880001040013D32A200028F420128AF42002019
63583+:10E890008F4201048F430100AF8200000E000F3C45
63584+:10E8A000AF8300043C0208008C4200C01040000806
63585+:10E8B0008F8400003C0208008C4200C42442000106
63586+:10E8C0003C010800AC2200C40A00126900000000EC
63587+:10E8D0003C020010008210241440010C8F830004BD
63588+:10E8E0003C0208008C4200203C0308008C63003886
63589+:10E8F00000008821244200013C010800AC220020D5
63590+:10E900003C16080026D60038146000022474FFFF6D
63591+:10E910000000A0219742010E308340003042FFFFEB
63592+:10E920001060000A245200043C02002000821024DF
63593+:10E9300050400007308280008F8200042403BFFF14
63594+:10E94000008318240A0011703442100030828000C5
63595+:10E950001040000A3C0200200082102410400007F2
63596+:10E960008F8200043C03FFFF34637FFF0083182481
63597+:10E9700034428000AF820004AF8300000E000F9885
63598+:10E980000000000014400007000000009743011E33
63599+:10E990009742011C3063FFFF00021400006218253B
63600+:10E9A000AF8300089742010C8F4340003045FFFFC2
63601+:10E9B0003402FFFF14620003000000000A00118807
63602+:10E9C000241100208F4240003042010054400001D9
63603+:10E9D000241100108F840000308210005040001479
63604+:10E9E00036310001308200201440000B3C02100040
63605+:10E9F000008210245040000E363100013C030E000E
63606+:10EA00003C020DFF008318243442FFFF0043102B0B
63607+:10EA100050400007363100013C0208008C42002CB7
63608+:10EA2000244200013C010800AC22002C36310005D4
63609+:10EA30003C0608008CC6003454C000238F850000BB
63610+:10EA40008F820004304240005440001F8F85000038
63611+:10EA50003C021F01008210243C0310005443001AA2
63612+:10EA60008F85000030A20200144000178F8500003F
63613+:10EA70003250FFFF363100028F4201B80440FFFEE2
63614+:10EA800000000000AF400180020020210E000F4274
63615+:10EA9000AF4000208F8300042402BFFFA750019ADB
63616+:10EAA000006218248F820000A750018EA7510188B0
63617+:10EAB000A74301A6A74201903C021000AF4201B853
63618+:10EAC0000A001267000010213C02100000A210246E
63619+:10EAD0001040003A0000000010C0000F00000000CD
63620+:10EAE00030A201001040000C3C0302003C020F0069
63621+:10EAF00000A2102410430008000000008F820008CC
63622+:10EB000000541024005610219042000424420004B6
63623+:10EB10000A0011FF000221C00000000000051602DB
63624+:10EB20003050000F3A0300022E4203EF384200013A
63625+:10EB30002C63000100621824146000852402000187
63626+:10EB40003C0308008C6300D02E06000C38620001E4
63627+:10EB50002C4200010046102414400015001021C072
63628+:10EB60002602FFFC2C42000454400011000020212A
63629+:10EB7000386200022C42000100461024504000037D
63630+:10EB8000000512420A0011FF000020210010182B7E
63631+:10EB90000043102450400006001021C00000202136
63632+:10EBA0003245FFFF0E000F633226FFFB001021C02D
63633+:10EBB0003245FFFF0A001252362600028F42400003
63634+:10EBC0003C0308008C6300243042010010400046E2
63635+:10EBD00030620001322200043070000D1440000247
63636+:10EBE0002413000424130002000512C2384200015D
63637+:10EBF0002E4303EF3042000138630001004310252B
63638+:10EC0000104000033231FFFB2402FFFB020280248C
63639+:10EC100010C000183202000130A20100104000159F
63640+:10EC2000320200013C020F0000A210243C0302004B
63641+:10EC30001043000F8F8200082403FFFE020380248C
63642+:10EC40000054102400561021904200040233302555
63643+:10EC50002442000412000002000221C03226FFFFFD
63644+:10EC60000E000F633245FFFF120000390000102133
63645+:10EC7000320200011040000D3202000424020001A3
63646+:10EC800012020002023330253226FFFF000020214D
63647+:10EC90000E000F633245FFFF2402FFFE02028024B4
63648+:10ECA0001200002B00001021320200041040002846
63649+:10ECB0002402000124020004120200020233302563
63650+:10ECC0003226FFFF3245FFFF0E000F6324040100D0
63651+:10ECD0002402FFFB020280241200001D000010210C
63652+:10ECE0000A001267240200015040001900001021A0
63653+:10ECF0003245FFFF36260002000020210E000F6380
63654+:10ED0000000000000A001267000010212402BFFF6B
63655+:10ED1000006210241040000800000000240287FF59
63656+:10ED200000621024144000083C020060008210249D
63657+:10ED300010400005000000000E000D34000000002F
63658+:10ED40000A001267000000000E0012C70000000059
63659+:10ED5000104000063C0240008F4301243C0260202A
63660+:10ED6000AC430014000000003C024000AF420138F8
63661+:10ED70000000000032A200021040FEBD00000000B2
63662+:10ED80008F4201403C044000AF4200208F430148C5
63663+:10ED90003C02700000621824106400420000000071
63664+:10EDA0000083102B144000063C0260003C0220004F
63665+:10EDB000106200073C0240000A0012C3000000007D
63666+:10EDC0001062003C3C0240000A0012C30000000038
63667+:10EDD0008F4501408F4601448F42014800021402D2
63668+:10EDE000304300FF240200041462000A274401801B
63669+:10EDF0008F4201B80440FFFE2402001CAC850000D5
63670+:10EE0000A082000B3C021000AF4201B80A0012C3FE
63671+:10EE10003C0240002402000914620012000616029F
63672+:10EE2000000229C0AF4500208F4201B80440FFFE18
63673+:10EE30002402000124030003AF450180A343018B9A
63674+:10EE4000A740018EA740019AA7400190AF4001A8BA
63675+:10EE5000A7420188A74201A6AF4001AC3C021000C6
63676+:10EE6000AF4201B88F4201B80440FFFE000000002D
63677+:10EE7000AC8500008F42014800021402A482000801
63678+:10EE800024020002A082000B8F420148A4820010DD
63679+:10EE90003C021000AC860024AF4201B80A0012C345
63680+:10EEA0003C0240000E001310000000000A0012C3D4
63681+:10EEB0003C0240000E001BC2000000003C0240006B
63682+:10EEC000AF420178000000000A00112F000000008E
63683+:10EED0008F4201003042003E144000112402000124
63684+:10EEE000AF4000488F420100304207C0104000058B
63685+:10EEF00000000000AF40004CAF40005003E00008AD
63686+:10EF000024020001AF400054AF4000408F42010096
63687+:10EF10003042380054400001AF4000442402000158
63688+:10EF200003E00008000000008F4201B80440FFFE2B
63689+:10EF300024020001AF440180AF400184A74501884D
63690+:10EF4000A342018A24020002A342018B9742014A94
63691+:10EF500014C00004A7420190AF4001A40A0012EFC0
63692+:10EF60003C0210008F420144AF4201A43C02100059
63693+:10EF7000AF4001A803E00008AF4201B88F4201B8DA
63694+:10EF80000440FFFE24020002AF440180AF4401842C
63695+:10EF9000A7450188A342018AA342018B9742014AF7
63696+:10EFA000A7420190AF4001A48F420144AF4201A8A3
63697+:10EFB0003C02100003E00008AF4201B83C029000A0
63698+:10EFC0003442000100822025AF4400208F420020FF
63699+:10EFD0000440FFFE0000000003E000080000000005
63700+:10EFE0003C028000344200010082202503E000083A
63701+:10EFF000AF44002027BDFFE8AFBF0014AFB0001042
63702+:10F000008F50014093430149934201489344014882
63703+:10F01000306300FF304200FF00021200006228252A
63704+:10F020002402001910620076308400802862001AE1
63705+:10F030001040001C24020020240200081062007707
63706+:10F04000286200091040000E2402000B2402000177
63707+:10F0500010620034286200025040000524020006BD
63708+:10F0600050600034020020210A00139A00000000C2
63709+:10F0700010620030020020210A00139A00000000F4
63710+:10F080001062003B2862000C504000022402000E77
63711+:10F090002402000910620056020020210A00139A7F
63712+:10F0A0000000000010620056286200211040000F8E
63713+:10F0B000240200382402001C106200582862001D3F
63714+:10F0C000104000062402001F2402001B1062004CA6
63715+:10F0D000000000000A00139A000000001062004ABD
63716+:10F0E000020020210A00139A00000000106200456F
63717+:10F0F0002862003910400007240200802462FFCB00
63718+:10F100002C42000210400045020020210A00139604
63719+:10F110000000302110620009000000000A00139A6C
63720+:10F12000000000001480003D020020210A0013901E
63721+:10F130008FBF00140A001396240600018F4201B805
63722+:10F140000440FFFE24020002A342018BA745018870
63723+:10F150009742014AA74201908F420144A74201927F
63724+:10F160003C021000AF4201B80A00139C8FBF00148C
63725+:10F170009742014A144000290000000093620005F4
63726+:10F180003042000414400025000000000E0013026D
63727+:10F190000200202193620005020020213442000475
63728+:10F1A0000E00130BA36200059362000530420004B9
63729+:10F1B00014400002000000000000000D93620000F7
63730+:10F1C00024030020304200FF14430014000000001C
63731+:10F1D0008F4201B80440FFFE24020005AF500180B9
63732+:10F1E000A342018B3C0210000A00139AAF4201B8FF
63733+:10F1F0008FBF00148FB000100A0012F227BD001854
63734+:10F200000000000D02002021000030218FBF0014FB
63735+:10F210008FB000100A0012DD27BD00180000000D9D
63736+:10F220008FBF00148FB0001003E0000827BD001846
63737+:10F2300027BDFFE8AFBF00100E000F3C000000002C
63738+:10F24000AF4001808FBF0010000020210A000FE7AF
63739+:10F2500027BD00183084FFFF30A5FFFF00001821F4
63740+:10F260001080000700000000308200011040000202
63741+:10F2700000042042006518210A0013AB0005284055
63742+:10F2800003E000080060102110C0000624C6FFFF44
63743+:10F290008CA2000024A50004AC8200000A0013B573
63744+:10F2A0002484000403E000080000000010A000080F
63745+:10F2B00024A3FFFFAC860000000000000000000057
63746+:10F2C0002402FFFF2463FFFF1462FFFA248400047A
63747+:10F2D00003E0000800000000308300FF30A500FFBD
63748+:10F2E00030C600FF274701808F4201B80440FFFE6F
63749+:10F2F000000000008F42012834634000ACE20000AF
63750+:10F3000024020001ACE00004A4E30008A0E2000A2B
63751+:10F3100024020002A0E2000B3C021000A4E5001051
63752+:10F32000ACE00024ACE00028A4E6001203E00008F2
63753+:10F33000AF4201B827BDFFE8AFBF00109362003FA6
63754+:10F3400024030012304200FF1043000D00803021E2
63755+:10F350008F620044008210230440000A8FBF001017
63756+:10F360008F620048240400390000282100C21023C5
63757+:10F3700004410004240600120E0013C9000000001E
63758+:10F380008FBF00102402000103E0000827BD001811
63759+:10F3900027BDFFC8AFB20030AFB1002CAFBF003403
63760+:10F3A000AFB0002890C5000D0080902130A400105F
63761+:10F3B0001080000B00C088218CC300088F620054AD
63762+:10F3C0001062000730A20005144000B524040001BB
63763+:10F3D0000E000D21000020210A0014BB0040202156
63764+:10F3E00030A200051040000930A30012108000ACCC
63765+:10F3F000240400018E2300088F620054146200A9C7
63766+:10F400008FBF00340A00142C240400382402001298
63767+:10F41000146200A3240400010220202127A500106B
63768+:10F420000E000CB2AFA000101040001102402021CD
63769+:10F430008E220008AF620084AF6000400E0013020D
63770+:10F44000000000009362007D024020213442002031
63771+:10F450000E00130BA362007D0E000CA902402021B8
63772+:10F46000240400382405008D0A0014B82406001274
63773+:10F470009362003E304200081040000F8FA200103F
63774+:10F4800030420100104000078FA300148F6200601B
63775+:10F490000062102304430008AF6300600A001441B7
63776+:10F4A00000000000AF6000609362003E2403FFF79D
63777+:10F4B00000431024A362003E9362003E30420008E5
63778+:10F4C000144000022406000300003021936200343F
63779+:10F4D000936300378F640084304200FF306300FF85
63780+:10F4E00000661821000318800043282100A4202B67
63781+:10F4F0001080000B000000009763003C8F620084C6
63782+:10F500003063FFFF004510230062182B14600004D5
63783+:10F51000000000008F6200840A00145D0045802313
63784+:10F520009762003C3050FFFF8FA300103062000450
63785+:10F5300010400004000628808FA2001C0A001465F9
63786+:10F540000202102B2E02021850400003240202185F
63787+:10F550000A00146E020510233063000410600003DB
63788+:10F56000004510238FA2001C00451023004080217D
63789+:10F570002C42008054400001241000800E00130231
63790+:10F580000240202124020001AF62000C9362003E81
63791+:10F59000001020403042007FA362003E8E22000413
63792+:10F5A00024420001AF620040A770003C8F6200500F
63793+:10F5B0009623000E00431021AF6200588F62005066
63794+:10F5C00000441021AF62005C8E220004AF6200187C
63795+:10F5D0008E220008AF62001C8FA20010304200088B
63796+:10F5E0005440000A93A20020A360003693620036C4
63797+:10F5F0002403FFDFA36200359362003E0043102422
63798+:10F60000A362003E0A0014988E220008A36200350F
63799+:10F610008E220008AF62004C8F6200248F6300408E
63800+:10F6200000431021AF6200489362000024030050A1
63801+:10F63000304200FF144300122403FF803C02080004
63802+:10F640008C4231A00242102100431024AF42002816
63803+:10F650003C0208008C4231A08E2400083C03000CC0
63804+:10F66000024210213042007F03421021004310214A
63805+:10F67000AC4400D88E230008AF820014AC4300DCF9
63806+:10F680000E00130B02402021240400380000282122
63807+:10F690002406000A0E0013C9000000002404000123
63808+:10F6A0008FBF00348FB200308FB1002C8FB0002894
63809+:10F6B0000080102103E0000827BD003827BDFFF8B7
63810+:10F6C00027420180AFA20000308A00FF8F4201B8BC
63811+:10F6D0000440FFFE000000008F4601283C020800A5
63812+:10F6E0008C4231A02403FF80AF86004800C2102165
63813+:10F6F00000431024AF4200243C0208008C4231A099
63814+:10F700008FA900008FA8000000C210213042007FA6
63815+:10F71000034218213C02000A00621821946400D4BC
63816+:10F720008FA700008FA5000024020002AF83001401
63817+:10F73000A0A2000B8FA30000354260003084FFFFC1
63818+:10F74000A4E200083C021000AD260000AD04000455
63819+:10F75000AC60002427BD0008AF4201B803E00008F8
63820+:10F76000240200018F88003C938200288F830014BC
63821+:10F770003C07080024E7779800481023304200FF38
63822+:10F78000304900FC246500888F860040304A000321
63823+:10F790001120000900002021248200048CA3000015
63824+:10F7A000304400FF0089102AACE3000024A50004C7
63825+:10F7B0001440FFF924E70004114000090000202153
63826+:10F7C0002482000190A30000304400FF008A102B27
63827+:10F7D000A0E3000024A500011440FFF924E7000184
63828+:10F7E00030C20003144000048F85003C3102000346
63829+:10F7F0001040000D0000000010A0000900002021B2
63830+:10F800002482000190C30000304400FF0085102BCB
63831+:10F81000A0E3000024C600011440FFF924E7000122
63832+:10F8200003E00008000000001100FFFD000020219F
63833+:10F83000248200048CC30000304400FF0088102B99
63834+:10F84000ACE3000024C600041440FFF924E70004E0
63835+:10F8500003E00008000000008F83003C9382002832
63836+:10F8600030C600FF30A500FF00431023304300FFE7
63837+:10F870008F820014008038210043102114C0000240
63838+:10F88000244800880083382130E20003144000053A
63839+:10F8900030A2000314400003306200031040000D4A
63840+:10F8A0000000000010A000090000202124820001B7
63841+:10F8B00090E30000304400FF0085102BA1030000FE
63842+:10F8C00024E700011440FFF92508000103E00008C7
63843+:10F8D0000000000010A0FFFD000020212482000491
63844+:10F8E0008CE30000304400FF0085102BAD030000C6
63845+:10F8F00024E700041440FFF92508000403E0000891
63846+:10F90000000000000080482130AAFFFF30C600FF41
63847+:10F9100030E7FFFF274801808F4201B80440FFFE17
63848+:10F920008F820048AD0200008F420124AD02000426
63849+:10F930008D220020A5070008A102000A240200165B
63850+:10F94000A102000B934301208D2200088D240004A6
63851+:10F95000306300FF004310219783003A00441021D8
63852+:10F960008D250024004310233C0308008C6331A044
63853+:10F970008F840014A502000C246300E82402FFFF1A
63854+:10F98000A50A000EA5030010A5060012AD0500187B
63855+:10F99000AD020024948201142403FFF73042FFFFDC
63856+:10F9A000AD0200288C820118AD02002C3C02100030
63857+:10F9B000AD000030AF4201B88D220020004310247A
63858+:10F9C00003E00008AD2200208F82001430E7FFFF23
63859+:10F9D00000804821904200D330A5FFFF30C600FFD1
63860+:10F9E0000002110030420F0000E238252748018054
63861+:10F9F0008F4201B80440FFFE8F820048AD02000034
63862+:10FA00008F420124AD0200048D220020A5070008CA
63863+:10FA1000A102000A24020017A102000B9343012057
63864+:10FA20008D2200088D240004306300FF0043102164
63865+:10FA30009783003A004410218F8400140043102360
63866+:10FA40003C0308008C6331A0A502000CA505000E44
63867+:10FA5000246300E8A5030010A5060012AD00001401
63868+:10FA60008D220024AD0200188C82005CAD02001CC7
63869+:10FA70008C820058AD0200202402FFFFAD0200245A
63870+:10FA8000948200E63042FFFFAD02002894820060BD
63871+:10FA9000948300BE30427FFF3063FFFF00021200FC
63872+:10FAA00000431021AD02002C3C021000AD000030DC
63873+:10FAB000AF4201B8948200BE2403FFF700A21021D8
63874+:10FAC000A48200BE8D2200200043102403E0000821
63875+:10FAD000AD220020274301808F4201B80440FFFE81
63876+:10FAE0008F8200249442001C3042FFFF000211C0AC
63877+:10FAF000AC62000024020019A062000B3C0210005E
63878+:10FB0000AC60003003E00008AF4201B88F87002CE2
63879+:10FB100030C300FF8F4201B80440FFFE8F820048CF
63880+:10FB200034636000ACA2000093820044A0A20005F0
63881+:10FB30008CE20010A4A20006A4A300088C8200207E
63882+:10FB40002403FFF7A0A2000A24020002A0A2000BD7
63883+:10FB50008CE20000ACA200108CE20004ACA2001405
63884+:10FB60008CE2001CACA200248CE20020ACA2002895
63885+:10FB70008CE2002CACA2002C8C820024ACA20018D9
63886+:10FB80003C021000AF4201B88C82002000431024D8
63887+:10FB900003E00008AC8200208F86001427BDFFE838
63888+:10FBA000AFBF0014AFB0001090C20063304200201D
63889+:10FBB0001040000830A500FF8CC2007C2403FFDF4A
63890+:10FBC00024420001ACC2007C90C2006300431024B8
63891+:10FBD000A0C2006310A000238F830014275001806F
63892+:10FBE000020028210E0015D6240600828F82001400
63893+:10FBF000904200633042004050400019A38000440E
63894+:10FC00008F83002C8F4201B80440FFFE8F82004892
63895+:10FC1000AE02000024026082A60200082402000254
63896+:10FC2000A202000B8C620008AE0200108C62000C75
63897+:10FC3000AE0200148C620014AE0200188C62001830
63898+:10FC4000AE0200248C620024AE0200288C620028E0
63899+:10FC5000AE02002C3C021000AF4201B8A380004469
63900+:10FC60008F8300148FBF00148FB000109062006368
63901+:10FC700027BD00183042007FA06200639782003ADF
63902+:10FC80008F86003C8F850014938300280046102344
63903+:10FC9000A782003AA4A000E490A400638F820040F1
63904+:10FCA000AF83003C2403FFBF0046102100832024C3
63905+:10FCB000AF820040A0A400638F820014A04000BD6A
63906+:10FCC0008F82001403E00008A44000BE8F8A001455
63907+:10FCD00027BDFFE0AFB10014AFB000108F88003C2B
63908+:10FCE000AFBF00189389001C954200E430D100FF9B
63909+:10FCF0000109182B0080802130AC00FF3047FFFF46
63910+:10FD00000000582114600003310600FF012030215B
63911+:10FD1000010958239783003A0068102B1440003CD7
63912+:10FD20000000000014680007240200018E02002079
63913+:10FD30002403FFFB34E7800000431024AE020020C0
63914+:10FD40002402000134E70880158200053165FFFFB9
63915+:10FD50000E001554020020210A00169102002021F5
63916+:10FD60000E001585020020218F8400482743018062
63917+:10FD70008F4201B80440FFFE24020018AC6400006A
63918+:10FD8000A062000B8F840014948200E6A46200102D
63919+:10FD90003C021000AC600030AF4201B894820060B9
63920+:10FDA00024420001A4820060948200603C030800A9
63921+:10FDB0008C63318830427FFF5443000F02002021C2
63922+:10FDC000948200602403800000431024A482006019
63923+:10FDD0009082006090830060304200FF000211C2F8
63924+:10FDE00000021027000211C03063007F0062182556
63925+:10FDF000A083006002002021022028218FBF00186C
63926+:10FE00008FB100148FB000100A0015F927BD002033
63927+:10FE1000914200632403FF8000431025A142006348
63928+:10FE20009782003A3048FFFF110000209383001CA6
63929+:10FE30008F840014004B1023304600FF948300E4AD
63930+:10FE40002402EFFF0168282B00621824A48300E439
63931+:10FE500014A000038E020020010058210000302170
63932+:10FE60002403FFFB34E7800000431024AE0200208F
63933+:10FE700024020001158200053165FFFF0E001554B4
63934+:10FE8000020020210A0016B99783003A0E0015855A
63935+:10FE9000020020219783003A8F82003CA780003A1D
63936+:10FEA00000431023AF82003C9383001C8F82001418
63937+:10FEB0008FBF00188FB100148FB0001027BD002035
63938+:10FEC00003E00008A04300BD938200442403000126
63939+:10FED00027BDFFE8004330042C420020AFB00010E3
63940+:10FEE000AFBF00142410FFFE10400005274501801D
63941+:10FEF0003C0208008C4231900A0016D600461024BD
63942+:10FF00003C0208008C423194004610241440000743
63943+:10FF1000240600848F8300142410FFFF9062006287
63944+:10FF20003042000F34420040A06200620E0015D63D
63945+:10FF300000000000020010218FBF00148FB00010DD
63946+:10FF400003E0000827BD00188F83002427BDFFE0D1
63947+:10FF5000AFB20018AFB10014AFB00010AFBF001CBB
63948+:10FF60009062000D00A0902130D100FF3042007F50
63949+:10FF7000A062000D8F8500148E4300180080802140
63950+:10FF80008CA2007C146200052402000E90A2006383
63951+:10FF9000344200200A0016FFA0A200630E0016C51E
63952+:10FFA000A38200442403FFFF104300472404FFFF03
63953+:10FFB00052200045000020218E4300003C0200102A
63954+:10FFC00000621024504000043C020008020020217E
63955+:10FFD0000A00170E24020015006210245040000988
63956+:10FFE0008E45000002002021240200140E0016C5D8
63957+:10FFF000A38200442403FFFF104300332404FFFFC7
63958+:020000021000EC
63959+:100000008E4500003C02000200A2102410400016A1
63960+:100010003C0200048F8600248CC200148CC30010A4
63961+:100020008CC40014004310230044102B50400005E2
63962+:10003000020020218E43002C8CC2001010620003AD
63963+:10004000020020210A00173F240200123C02000493
63964+:1000500000A210245040001C00002021020020219A
63965+:100060000A00173F2402001300A2102410400006CB
63966+:100070008F8300248C620010504000130000202168
63967+:100080000A001739020020218C6200105040000441
63968+:100090008E42002C020020210A00173F240200118A
63969+:1000A00050400009000020210200202124020017F6
63970+:1000B0000E0016C5A38200442403FFFF1043000274
63971+:1000C0002404FFFF000020218FBF001C8FB2001806
63972+:1000D0008FB100148FB000100080102103E00008E1
63973+:1000E00027BD00208F83001427BDFFD8AFB40020A8
63974+:1000F000AFB3001CAFB20018AFB10014AFB0001026
63975+:10010000AFBF0024906200638F91002C2412FFFF88
63976+:100110003442004092250000A06200638E2200104D
63977+:100120000080982130B0003F105200060360A021EB
63978+:100130002402000D0E0016C5A38200441052005484
63979+:100140002404FFFF8F8300148E2200188C63007C30
63980+:1001500010430007026020212402000E0E0016C585
63981+:10016000A38200442403FFFF104300492404FFFF3F
63982+:1001700024040020120400048F83001490620063A2
63983+:1001800034420020A06200638F85003410A000205C
63984+:1001900000000000560400048F8200140260202139
63985+:1001A0000A0017902402000A9683000A9442006015
63986+:1001B0003042FFFF144300048F8200202404FFFD1F
63987+:1001C0000A0017B7AF82003C3C0208008C42318C19
63988+:1001D0000045102B14400006026020210000282159
63989+:1001E0000E001646240600010A0017B70000202161
63990+:1001F0002402002D0E0016C5A38200442403FFFF35
63991+:10020000104300232404FFFF0A0017B70000202139
63992+:10021000160400058F8400148E2300142402FFFFAF
63993+:100220005062001802602021948200602442000184
63994+:10023000A4820060948200603C0308008C633188D3
63995+:1002400030427FFF5443000F0260202194820060FF
63996+:100250002403800000431024A48200609082006088
63997+:1002600090830060304200FF000211C2000210279C
63998+:10027000000211C03063007F00621825A083006077
63999+:10028000026020210E0015F9240500010000202144
64000+:100290008FBF00248FB400208FB3001C8FB20018D2
64001+:1002A0008FB100148FB000100080102103E000080F
64002+:1002B00027BD00288F83001427BDFFE8AFB00010D2
64003+:1002C000AFBF0014906200638F87002C00808021F4
64004+:1002D000344200408CE60010A06200633C0308003A
64005+:1002E0008C6331B030C23FFF0043102B1040004EF2
64006+:1002F0008F8500302402FF8090A3000D004310245E
64007+:10030000304200FF504000490200202100061382C5
64008+:10031000304800032402000255020044020020215C
64009+:1003200094A2001C8F85001424030023A4A20114AE
64010+:100330008CE60000000616023042003F1043001019
64011+:100340003C0300838CE300188CA2007C1062000642
64012+:100350002402000E0E0016C5A38200442403FFFFF2
64013+:10036000104300382404FFFF8F8300149062006361
64014+:1003700034420020A06200630A0017FC8F8300242F
64015+:1003800000C31024144300078F83002490A200624E
64016+:100390003042000F34420020A0A20062A38800383F
64017+:1003A0008F8300249062000D3042007FA062000D18
64018+:1003B0008F83003410600018020020218F840030E9
64019+:1003C0008C8200100043102B1040000924020018FA
64020+:1003D000020020210E0016C5A38200442403FFFF63
64021+:1003E000104300182404FFFF0A00182400002021F5
64022+:1003F0008C820010240500010200202100431023FC
64023+:100400008F830024240600010E001646AC62001003
64024+:100410000A001824000020210E0015F9240500010F
64025+:100420000A00182400002021020020212402000DCF
64026+:100430008FBF00148FB0001027BD00180A0016C52A
64027+:10044000A38200448FBF00148FB0001000801021E1
64028+:1004500003E0000827BD001827BDFFC8AFB2002089
64029+:10046000AFBF0034AFB60030AFB5002CAFB400283A
64030+:10047000AFB30024AFB1001CAFB000188F46012805
64031+:100480003C0308008C6331A02402FF80AF86004843
64032+:1004900000C318213065007F03452821006218241D
64033+:1004A0003C02000AAF43002400A2282190A200626F
64034+:1004B00000809021AF850014304200FF000211023D
64035+:1004C000A382003890A200BC304200021440000217
64036+:1004D00024030034240300308F820014A3830028F7
64037+:1004E000938300388C4200C0A3800044AF82003C5C
64038+:1004F000240200041062031C8F84003C8E4400041C
64039+:10050000508003198F84003C8E4200103083FFFF1F
64040+:10051000A784003A106002FFAF8200408F8400146D
64041+:100520002403FF809082006300621024304200FFA9
64042+:10053000144002CF9785003A9383003824020002CA
64043+:1005400030B6FFFF14620005000088219382002866
64044+:100550002403FFFD0A001B19AF82003C8F82003C80
64045+:1005600002C2102B144002A18F8400400E0014EC34
64046+:1005700000000000938300283C040800248477983E
64047+:10058000240200341462002EAF84002C3C0A0800C0
64048+:100590008D4A77C82402FFFFAFA2001000803821E7
64049+:1005A0002405002F3C09080025297398240800FF22
64050+:1005B0002406FFFF90E2000024A3FFFF00062202B2
64051+:1005C00000C21026304200FF0002108000491021B6
64052+:1005D0008C420000306500FF24E7000114A8FFF5FD
64053+:1005E0000082302600061027AFA20014AFA2001030
64054+:1005F0000000282127A7001027A6001400C51023FB
64055+:100600009044000324A2000100A71821304500FFF8
64056+:100610002CA200041440FFF9A06400008FA2001077
64057+:100620001142000724020005024020210E0016C5D9
64058+:10063000A38200442403FFFF104300642404FFFF4F
64059+:100640003C0208009042779C104000098F82001401
64060+:10065000024020212402000C0E0016C5A382004493
64061+:100660002403FFFF104300592404FFFF8F8200146E
64062+:10067000A380001C3C0308008C63779C8C440080A2
64063+:100680003C0200FF3442FFFF006218240083202B4D
64064+:1006900010800008AF83003402402021240200199A
64065+:1006A0000E0016C5A38200442403FFFF1043004739
64066+:1006B0002404FFFF8F87003C9782003A8F85003427
64067+:1006C000AF8700200047202310A0003BA784003AFA
64068+:1006D0008F86001430A200030002102390C300BCD8
64069+:1006E0003050000300B0282100031882307300014D
64070+:1006F0000013108000A228213C0308008C6331A065
64071+:100700008F8200483084FFFF0085202B004310219A
64072+:1007100010800011244200888F84002C1082000E6B
64073+:100720003C033F013C0208008C42779800431024B0
64074+:100730003C0325001443000630E500FF8C820000D6
64075+:10074000ACC200888C8200100A0018E9ACC2009884
64076+:100750000E001529000030219382001C8F850014A3
64077+:100760008F830040020238218F82003CA387001C47
64078+:1007700094A400E4006218218F82003434841000B5
64079+:10078000AF83004000503021A4A400E41260000EAA
64080+:10079000AF86003C24E20004A382001C94A200E483
64081+:1007A00024C30004AF83003C34422000A4A200E430
64082+:1007B0000A001906000020218F820040AF80003C13
64083+:1007C00000471021AF820040000020212414FFFFC9
64084+:1007D000109402112403FFFF3C0808008D0877A83D
64085+:1007E0003C0208008C4231B03C03080090637798CB
64086+:1007F00031043FFF0082102B1040001B3067003F88
64087+:100800003C0208008C4231A88F83004800042180FC
64088+:1008100000621821006418213062007F0342282101
64089+:100820003C02000C00A228213C020080344200015E
64090+:100830003066007800C230252402FF800062102458
64091+:10084000AF42002830640007AF4208048F820014D2
64092+:100850000344202124840940AF460814AF850024B6
64093+:10086000AF840030AC4301189383003824020003A6
64094+:10087000146201CF240200012402002610E201D1FB
64095+:1008800028E2002710400013240200322402002234
64096+:1008900010E201CC28E200231040000824020024CA
64097+:1008A0002402002010E201B82402002110E20147D6
64098+:1008B000024020210A001AFB2402000B10E201C1B1
64099+:1008C0002402002510E20010024020210A001AFB39
64100+:1008D0002402000B10E201AE28E2003310400006B3
64101+:1008E0002402003F2402003110E2009A024020213D
64102+:1008F0000A001AFB2402000B10E201A5024020218D
64103+:100900000A001AFB2402000B8F90002C3C03080005
64104+:100910008C6331B08F8500308E0400100000A82158
64105+:100920008CB3001430823FFF0043102B8CB10020A9
64106+:100930005040018F0240202190A3000D2402FF802F
64107+:1009400000431024304200FF504001890240202122
64108+:10095000000413823042000314400185024020212C
64109+:1009600094A3001C8F8200148E040028A443011459
64110+:100970008CA20010026218231064000302402021A0
64111+:100980000A00197C2402001F8F82003400621021AB
64112+:100990000262102B104000088F83002402402021A7
64113+:1009A000240200180E0016C5A382004410540174DE
64114+:1009B0002404FFFF8F8300248F8400348C62001096
64115+:1009C0000224882100441023AC6200108F8200149E
64116+:1009D000AC7100208C4200680051102B10400009BF
64117+:1009E0008F830030024020212402001D0E0016C516
64118+:1009F000A38200442403FFFF104301612404FFFF8E
64119+:100A00008F8300308E0200248C6300241043000783
64120+:100A1000024020212402001C0E0016C5A3820044BF
64121+:100A20002403FFFF104301562404FFFF8F8400249A
64122+:100A30008C82002424420001AC8200241233000482
64123+:100A40008F8200148C4200685622000E8E02000035
64124+:100A50008E0200003C030080004310241440000D6F
64125+:100A60002402001A024020210E0016C5A382004471
64126+:100A70002403FFFF104301422404FFFF0A0019BAB8
64127+:100A80008E0200143C0300800043102450400003F9
64128+:100A90008E020014AC8000208E0200142411FFFF8F
64129+:100AA0001051000E3C0308003C0208008C423190BB
64130+:100AB000004310242403001B14400007A3830044B8
64131+:100AC0000E0016C5024020211051012D2404FFFF05
64132+:100AD0000A0019CB8E030000A38000448E0300009F
64133+:100AE0003C02000100621024104000123C02008011
64134+:100AF0000062102414400008024020212402001A41
64135+:100B00000E0016C5A38200442403FFFF1043011CFE
64136+:100B10002404FFFF02402021020028210E0016E5D8
64137+:100B2000240600012403FFFF104301152404FFFFE6
64138+:100B3000241500018F83002402A0302102402021CF
64139+:100B40009462003624050001244200010A001ADFE5
64140+:100B5000A46200368F90002C3C0308008C6331B0F7
64141+:100B60008E13001032623FFF0043102B10400089AB
64142+:100B70008F8400302402FF809083000D00431024F6
64143+:100B8000304200FF104000842402000D0013138245
64144+:100B900030420003240300011443007F2402000DAF
64145+:100BA0009082000D30420008544000048F820034CF
64146+:100BB000024020210A001A102402002450400004A0
64147+:100BC0008E03000C024020210A001A102402002784
64148+:100BD0008C82002054620006024020218E0300080F
64149+:100BE0008C820024506200098E02001402402021F1
64150+:100BF000240200200E0016C5A38200441054007188
64151+:100C00002403FFFF0A001A458F8400242411FFFFEC
64152+:100C1000145100048F860014024020210A001A405B
64153+:100C2000240200258E0300188CC2007C1062000391
64154+:100C30002402000E0A001A40024020218E030024E4
64155+:100C40008C82002810620003240200210A001A404E
64156+:100C5000024020218E0500288C82002C10A2000367
64157+:100C60002402001F0A001A40024020218E03002C9B
64158+:100C700014600003240200230A001A4002402021CD
64159+:100C80008CC200680043102B104000032402002691
64160+:100C90000A001A40024020218C82001400651821AD
64161+:100CA0000043102B104000088F84002402402021B4
64162+:100CB000240200220E0016C5A382004410510041F8
64163+:100CC0002403FFFF8F8400242403FFF79082000D8C
64164+:100CD00000431024A082000D8F8600143C030800FE
64165+:100CE0008C6331AC8F82004894C400E08F8500246F
64166+:100CF0000043102130847FFF000420400044102175
64167+:100D00003043007F034320213C03000E0083202159
64168+:100D10002403FF8000431024AF42002CA493000062
64169+:100D20008CA2002824420001ACA200288CA2002C36
64170+:100D30008E03002C00431021ACA2002C8E02002C4C
64171+:100D4000ACA200308E020014ACA2003494A2003A8F
64172+:100D500024420001A4A2003A94C600E03C0208002C
64173+:100D60008C4231B024C4000130837FFF1462000F35
64174+:100D700000803021240280000082302430C2FFFF36
64175+:100D8000000213C2304200FF000210270A001A7E40
64176+:100D9000000233C02402000D024020210E0016C5BF
64177+:100DA000A38200440A001A84004018218F82001494
64178+:100DB00002402021240500010E0015F9A44600E0A0
64179+:100DC000000018210A001B16006088218F90002C5B
64180+:100DD0003C0308008C6331B08E05001030A23FFF49
64181+:100DE0000043102B104000612402FF808F840030EC
64182+:100DF0009083000D00431024304200FF5040005CFF
64183+:100E0000024020218F8200341040000B0005138225
64184+:100E10008F8200149763000A944200603042FFFF03
64185+:100E200014430005000513828F8200202404FFFD77
64186+:100E30000A001AF3AF82003C304200031440000E57
64187+:100E40000000000092020002104000058E03002402
64188+:100E500050600015920300030A001AAF02402021DF
64189+:100E60008C82002450620010920300030240202173
64190+:100E70000A001AB72402000F9082000D30420008C9
64191+:100E80005440000992030003024020212402001074
64192+:100E90000E0016C5A38200442403FFFF1043003850
64193+:100EA0002404FFFF92030003240200025462000C9A
64194+:100EB000920200038F820034544000099202000322
64195+:100EC000024020212402002C0E0016C5A3820044FB
64196+:100ED0002403FFFF1043002A2404FFFF92020003B3
64197+:100EE0000200282102402021384600102CC60001B3
64198+:100EF0002C4200010E0016E5004630252410FFFFAD
64199+:100F00001050001F2404FFFF8F8300341060001373
64200+:100F1000024020213C0208008C42318C0043102BFF
64201+:100F200014400007000000000000282124060001F2
64202+:100F30000E001646000000000A001AF300002021EF
64203+:100F40002402002D0E0016C5A38200441050000C90
64204+:100F50002404FFFF0A001AF3000020210E0015F9F7
64205+:100F6000240500010A001AF300002021024020217C
64206+:100F70002402000D0E0016C5A3820044004020216B
64207+:100F80000A001B16008088211514000E00000000C6
64208+:100F90000E00174C024020210A001B160040882139
64209+:100FA0000E0016C5A38200440A001B1600408821CB
64210+:100FB00014620017022018212402002314E2000505
64211+:100FC0002402000B0E0017C0024020210A001B164D
64212+:100FD0000040882102402021A38200440E0016C553
64213+:100FE0002411FFFF0A001B170220182130A500FF63
64214+:100FF0000E001529240600019783003A8F82003CD9
64215+:10100000A780003A00431023AF82003C0220182141
64216+:101010001220003E9782003A2402FFFD5462003EF7
64217+:101020008E4300208E4200048F830014005610234C
64218+:10103000AE420004906200633042007FA062006311
64219+:101040008E4200208F840014A780003A34420002B0
64220+:10105000AE420020A48000E4908200632403FFBF1E
64221+:1010600000431024A08200630A001B598E43002015
64222+:101070009082006300621024304200FF1040002381
64223+:101080009782003A90820088908300BD2485008872
64224+:101090003042003F2444FFE02C820020A383001C48
64225+:1010A00010400019AF85002C2402000100821804B2
64226+:1010B000306200191440000C3C02800034420002EF
64227+:1010C000006210241440000B306200201040000F1A
64228+:1010D0009782003A90A600010240202124050001D9
64229+:1010E0000A001B5330C60001024020210A001B5297
64230+:1010F00024050001024020210000282124060001CF
64231+:101100000E001646000000009782003A1440FD04CD
64232+:101110008F8400148E4300203062000410400012BF
64233+:101120008F84003C2402FFFB00621024AE420020AA
64234+:10113000274301808F4201B80440FFFE8F820048A0
64235+:10114000AC6200008F420124AC6200042402608380
64236+:10115000A462000824020002A062000B3C021000FE
64237+:10116000AF4201B88F84003C8F8300148FBF0034DE
64238+:101170008FB600308FB5002C8FB400288FB30024B9
64239+:101180008FB200208FB1001C8FB000182402000124
64240+:1011900027BD003803E00008AC6400C030A500FFA4
64241+:1011A0002403000124A900010069102B1040000C49
64242+:1011B00000004021240A000100A31023004A380443
64243+:1011C00024630001308200010069302B10400002CE
64244+:1011D000000420420107402554C0FFF800A310235B
64245+:1011E00003E00008010010213C020800244260A432
64246+:1011F0003C010800AC22738C3C02080024425308D6
64247+:101200003C010800AC2273902402000627BDFFE0D9
64248+:101210003C010800A02273943C021EDCAFB200180F
64249+:10122000AFB10014AFBF001CAFB0001034526F411B
64250+:1012300000008821240500080E001B7A02202021CE
64251+:10124000001180803C07080024E773980002160014
64252+:1012500002071821AC6200000000282124A200012E
64253+:101260003045FFFF8C6200002CA6000804410002FC
64254+:10127000000220400092202614C0FFF8AC64000059
64255+:10128000020780218E0400000E001B7A2405002036
64256+:10129000262300013071FFFF2E2301001460FFE5BB
64257+:1012A000AE0200008FBF001C8FB200188FB1001477
64258+:1012B0008FB0001003E0000827BD002027BDFFD835
64259+:1012C000AFB3001CAFB20018AFBF0020AFB1001425
64260+:1012D000AFB000108F5101408F48014800089402C0
64261+:1012E000324300FF311300FF8F4201B80440FFFE7C
64262+:1012F00027500180AE1100008F420144AE0200046D
64263+:1013000024020002A6120008A202000B240200140C
64264+:10131000AE1300241062002528620015104000085A
64265+:101320002402001524020010106200302402001272
64266+:10133000106200098FBF00200A001CB58FB3001C8B
64267+:101340001062007024020022106200378FBF00205C
64268+:101350000A001CB58FB3001C3C0208008C4231A06F
64269+:101360002403FF800222102100431024AF420024F6
64270+:101370003C0208008C4231A0022210213042007F42
64271+:10138000034218213C02000A00621821166000BCCA
64272+:10139000AF830014906200623042000F344200308C
64273+:1013A000A06200620A001CB48FBF00203C046000F1
64274+:1013B0008C832C083C02F0033442FFFF00621824A7
64275+:1013C000AC832C083C0208008C4231A08C832C0892
64276+:1013D000244200740002108200021480006218256A
64277+:1013E000AC832C080A001CB48FBF00203C0208000C
64278+:1013F0008C4231A02403FF800222102100431024DC
64279+:10140000AF4200243C0208008C4231A03C03000A99
64280+:10141000022210213042007F03421021004310219C
64281+:101420000A001CB3AF8200143C0208008C4231A0B9
64282+:101430002405FF800222102100451024AF42002421
64283+:101440003C0208008C4231A0022210213042007F71
64284+:10145000034218213C02000A0062182190620063D6
64285+:1014600000A21024304200FF10400085AF8300141A
64286+:1014700024620088944300123C0208008C4231A888
64287+:1014800030633FFF00031980022210210043102126
64288+:101490003043007F03432021004510243C03000C0F
64289+:1014A00000832021AF4200289082000D00A210246A
64290+:1014B000304200FF10400072AF8400249082000D83
64291+:1014C000304200101440006F8FBF00200E0015C87E
64292+:1014D000000000008F4201B80440FFFE0000000041
64293+:1014E000AE1100008F420144AE020004240200024B
64294+:1014F000A6120008A202000BAE1300240A001CB4BE
64295+:101500008FBF00202406FF8002261024AF42002057
64296+:101510003C0208008C4231A031043FFF00042180CE
64297+:101520000222102100461024AF4200243C03080090
64298+:101530008C6331A83C0208008C4231A03227007F26
64299+:101540000223182102221021006418213042007F5A
64300+:101550003064007F034228213C02000A0066182400
64301+:1015600000A22821034420213C02000C00822021FB
64302+:10157000AF4300283C020008034718210062902175
64303+:10158000AF850014AF8400240E0015C8010080212F
64304+:101590008F4201B80440FFFE8F8200248F84001424
64305+:1015A000274501809042000DACB10000A4B00006B8
64306+:1015B000000216000002160300021027000237C2C4
64307+:1015C00014C00016248200889442001232033FFFA8
64308+:1015D00030423FFF14430012240260829083006374
64309+:1015E0002402FF8000431024304200FF5040000CD2
64310+:1015F00024026082908200623042000F3442004038
64311+:10160000A082006224026084A4A200082402000DCB
64312+:10161000A0A200050A001C9E3C0227002402608252
64313+:10162000A4A20008A0A000053C02270000061C00A0
64314+:101630000062182524020002A0A2000BACA3001037
64315+:10164000ACA00014ACA00024ACA00028ACA0002CDE
64316+:101650008E42004C8F840024ACA200189083000DB1
64317+:101660002402FF8000431024304200FF1040000598
64318+:101670008FBF00209082000D3042007FA082000DBD
64319+:101680008FBF00208FB3001C8FB200188FB10014E1
64320+:101690008FB000103C02100027BD002803E00008B6
64321+:1016A000AF4201B80800343008003430080033A8D5
64322+:1016B000080033E0080034140800343808003438D7
64323+:1016C00008003438080033180A0001240000000024
64324+:1016D000000000000000000D747061362E322E33C1
64325+:1016E00000000000060203010000000000000000EE
64326+:1016F00000000000000000000000000000000000EA
64327+:1017000000000000000000000000000000000000D9
64328+:1017100000000000000000000000000000000000C9
64329+:1017200000000000000000000000000000000000B9
64330+:1017300000000000000000000000000000000000A9
64331+:101740000000000000000000000000000000000099
64332+:101750000000000000000000000000001000000376
64333+:10176000000000000000000D0000000D3C02080019
64334+:1017700024421C003C03080024632094AC40000079
64335+:101780000043202B1480FFFD244200043C1D080070
64336+:1017900037BD2FFC03A0F0213C1008002610049058
64337+:1017A0003C1C0800279C1C000E00015C000000008F
64338+:1017B0000000000D3084FFFF308200078F85001885
64339+:1017C00010400002248300073064FFF800853021B8
64340+:1017D00030C41FFF03441821247B4000AF85001C48
64341+:1017E000AF84001803E00008AF4400843084FFFF9A
64342+:1017F000308200078F8500208F860028104000026D
64343+:10180000248300073064FFF8008520210086182B10
64344+:1018100014600002AF8500240086202303442821A1
64345+:1018200034068000AF840020AF44008000A6202151
64346+:1018300003E00008AF84003827BDFFD8AFB3001C19
64347+:10184000AFB20018AFB00010AFBF0024AFB400209B
64348+:10185000AFB100143C0860088D1450002418FF7FBD
64349+:101860003C1A8000029898243672380CAD12500051
64350+:101870008F5100083C07601C3C08600036300001B6
64351+:10188000AF500008AF800018AF400080AF40008428
64352+:101890008CE600088D0F08083C0760168CEC0000F1
64353+:1018A00031EEFFF039CA00103C0DFFFF340B800011
64354+:1018B0003C030080034B48212D440001018D282466
64355+:1018C0003C0253533C010800AC230420AF8900388C
64356+:1018D000AF860028AF840010275B400014A20003ED
64357+:1018E00034E37C008CF90004032818218C7F007CF1
64358+:1018F0008C6500783C0280003C0B08008D6B048CEA
64359+:101900003C0A08008D4A048834520070AF85003CC0
64360+:10191000AF9F00403C13080026731C440240A021E6
64361+:101920008E4800008F46000038C30001306400017B
64362+:1019300010800017AF880034028048218D2F0000EE
64363+:101940003C0508008CA5045C3C1808008F1804585E
64364+:1019500001E8102300A280210000C8210202402BD0
64365+:1019600003198821022838213C010800AC30045CAE
64366+:101970003C010800AC2704588F4E000039CD00010F
64367+:1019800031AC00011580FFED01E04021AF8F003444
64368+:101990008E5100003C0708008CE7045C3C0D0800F9
64369+:1019A0008DAD04580228802300F0602100007021D2
64370+:1019B0000190302B01AE1821006620213C01080067
64371+:1019C000AC2C045C3C010800AC2404588F46010890
64372+:1019D0008F47010030C92000AF860000AF87000CA0
64373+:1019E0001120000A00C040213C1808008F18042C68
64374+:1019F000270800013C010800AC28042C3C184000DA
64375+:101A0000AF5801380A000196000000009749010410
64376+:101A100000002821014550213122FFFF0162582199
64377+:101A20000162F82B015F502130D902003C0108000F
64378+:101A3000AC2B048C3C010800AC2A0488172000154C
64379+:101A400024040F0010E400130000000024080D001F
64380+:101A500010E8023B30CD000611A0FFE93C18400021
64381+:101A6000936E00002409001031C400F01089027147
64382+:101A700024020070108202E58F880014250F0001F7
64383+:101A8000AF8F00143C184000AF5801380A0001968F
64384+:101A900000000000974C01041180FFD93C18400061
64385+:101AA00030C34000146000A1000000008F460178A0
64386+:101AB00004C0FFFE8F87003824100800240F0008A0
64387+:101AC0008CE30008AF500178A74F0140A7400142C6
64388+:101AD000974E01048F86000031C9FFFF30CD000111
64389+:101AE00011A002E1012040212531FFFE241800024F
64390+:101AF000A75801463228FFFFA75101483C190800AA
64391+:101B00008F39043C172002D08F8C000C30DF00206E
64392+:101B100017E00002240400092404000130C20C0074
64393+:101B2000240504005045000134840004A744014A00
64394+:101B30003C1108008E3104203C1800483C10000184
64395+:101B40000238182530CF00020070282511E000046B
64396+:101B5000000018213C19010000B9282524030001C8
64397+:101B600030DF000453E00005AF8300083C0600109E
64398+:101B700000A6282524030001AF830008AF4510000C
64399+:101B80000000000000000000000000000000000055
64400+:101B90008F83000810600023000000008F451000B4
64401+:101BA00004A1FFFE000000001060001E0000000005
64402+:101BB0008F4410003C0C0020008C102410400019B1
64403+:101BC0008F8E000031CD000211A000160000000031
64404+:101BD000974F101415E000130000000097591008EB
64405+:101BE0003338FFFF271100060011188200033080F0
64406+:101BF00000C7282132300001322300031200032CD9
64407+:101C00008CA200000000000D00C7F821AFE2000028
64408+:101C10003C0508008CA5043024A600013C01080006
64409+:101C2000AC2604308F6D00003402FFFFAF8D00043E
64410+:101C30008CEC0000118202A6000020218CED000037
64411+:101C400031AC01001180028A000000003C02080053
64412+:101C50008C4204743C0308008C63044C3C1F080055
64413+:101C60008FFF04703C1808008F1804480048382182
64414+:101C70000068802100E8282B03E430210208402B73
64415+:101C80000304882100C57021022878213C01080046
64416+:101C9000AC30044C3C010800AC2F04483C01080067
64417+:101CA000AC2704743C010800AC2E04708F8400182B
64418+:101CB0000120302131290007249F000833F91FFF3C
64419+:101CC00003594021AF84001CAF990018251B400028
64420+:101CD000AF590084112000038F83002024C2000725
64421+:101CE0003046FFF88F84002800C3282100A4302B41
64422+:101CF00014C00002AF83002400A428230345602100
64423+:101D0000340D8000018D10213C0F1000AF850020A4
64424+:101D1000AF820038AF450080AF4F01788F88001444
64425+:101D2000250F00010A0001EFAF8F00148F62000839
64426+:101D30008F670000240500300007760231C300F0F1
64427+:101D4000106500A7240F0040546FFF4C8F880014CB
64428+:101D50008F4B01780560FFFE0000000030CA0200D2
64429+:101D600015400003000612820000000D00061282DA
64430+:101D7000304D0003000D4900012D18210003808023
64431+:101D8000020D402100086080019380218E1F000019
64432+:101D900017E00002000000000000000D8F6E00043C
64433+:101DA00005C202BD92070006920E000592020004D1
64434+:101DB0003C090001000E18800070F8218FED00181A
64435+:101DC000277100082448000501A96021000830821D
64436+:101DD000AFEC0018022020210E00059E26050014FD
64437+:101DE000920A00068F7900043C0B7FFF000A2080D6
64438+:101DF000009178218DF800043566FFFF0326282422
64439+:101E000003053821ADE70004920E0005920D000491
64440+:101E1000960C0008000E10800051C8218F2300008E
64441+:101E2000974901043C07FFFF006758243128FFFF52
64442+:101E3000010DF82103EC50233144FFFF01643025EC
64443+:101E4000AF260000920300072418000110780275E5
64444+:101E5000240F0003106F0285000000008E050010A3
64445+:101E60002419000AA7590140A7450142921800040D
64446+:101E70008F860000240F0001A7580144A7400146A7
64447+:101E80009747010430D100023C050041A7470148B3
64448+:101E900000001821A74F014A1220000330CB000494
64449+:101EA0003C0501412403000151600005AF83000897
64450+:101EB0003C06001000A6282524030001AF8300087B
64451+:101EC000AF4510000000000000000000000000000E
64452+:101ED000000000008F8A000811400004000000008C
64453+:101EE0008F4410000481FFFE000000008F6B000093
64454+:101EF000920800043C1108008E310444AF8B0004AA
64455+:101F000097590104311800FF3C0E08008DCE0440A3
64456+:101F10003325FFFF0305382102276021000010212F
64457+:101F2000250F000A31E8FFFF0187482B01C2682115
64458+:101F300001A9F821311000073C010800AC2C044431
64459+:101F40003C010800AC3F0440120000038F8C0018D5
64460+:101F50002506000730C8FFF8010C682131BF1FFFBC
64461+:101F6000AF8C001CAF9F0018AF5F00849744010442
64462+:101F7000035F80213084FFFF308A00071140000397
64463+:101F8000261B4000248900073124FFF88F8200209F
64464+:101F90008F850028008220210085702B15C000024B
64465+:101FA000AF820024008520233C0B08008D6B048C3D
64466+:101FB0003C0A08008D4A04880344882134038000C9
64467+:101FC000022310213C0F1000AF840020AF820038A4
64468+:101FD000AF440080AF4F01780A0002968F8800144A
64469+:101FE0008F5001780600FFFE30D10200162000035A
64470+:101FF000000612820000000D00061282305F00030E
64471+:10200000001F1900007F302100062080009FC8219A
64472+:1020100000194880013380218E180000130000024F
64473+:10202000000000000000000D8F6C000C058001FB1B
64474+:102030008F870038240E0001AE0E00008CE30008EC
64475+:10204000A20000078F65000400055402314D00FF17
64476+:1020500025A80005000830822CCB00411560000245
64477+:10206000A20A00040000000D8F7800043C03FFFF6B
64478+:1020700000E02821330BFFFF256C000B000C1082C1
64479+:1020800000022080008748218D3F000026040014B4
64480+:10209000A618000803E3C8240E00059EAD39000011
64481+:1020A0008F4F01083C11100001F1382410E001AB02
64482+:1020B00000000000974D01049208000725AAFFECDC
64483+:1020C000350600023144FFFFA2060007960600080D
64484+:1020D0002CC7001354E0000592030007921100077B
64485+:1020E000362F0001A20F00079203000724180001F9
64486+:1020F000107801C224090003106901D58F880038C7
64487+:1021000030CBFFFF257100020011788331E400FF1E
64488+:1021100000042880A20F000500A848218D2D000092
64489+:10212000974A01043C0EFFFF01AEF8243143FFFF44
64490+:10213000006B1023244CFFFE03ECC825AD390000D2
64491+:10214000920600053C03FFF63462FFFF30D800FF23
64492+:102150000018388000F08821922F00143C04FF7F83
64493+:102160003487FFFF31EE000F01C65821316500FFB3
64494+:1021700000055080015068218DAC00200148F821F5
64495+:10218000A20B00060182C824AE0C000CAFF9000CB3
64496+:10219000920900068E11000C032778240009C080E4
64497+:1021A0000310702195C60026030828210227202449
64498+:1021B000AE04000CADCF0020ADC60024ACA60010CC
64499+:1021C0008F8800003C0B08008D6B048C3C0A0800D3
64500+:1021D0008D4A0488241F001024190002A75F0140C3
64501+:1021E000A7400142A7400144A7590146974901046D
64502+:1021F00024070001310600022538FFFEA7580148D8
64503+:102200003C050009A747014A10C00003000018213F
64504+:102210003C05010924030001310C00045180000534
64505+:10222000AF8300083C08001000A828252403000103
64506+:10223000AF830008AF451000000000000000000060
64507+:1022400000000000000000009205000424AE00021F
64508+:1022500031CD0007000D182330620007AE020010D8
64509+:102260008F90000812000004000000008F4F100043
64510+:1022700005E1FFFE000000008F7100008F8E001846
64511+:102280003C0308008C630444AF91000497450104AB
64512+:1022900025CF001031E61FFF30A2FFFFAF8E001CDC
64513+:1022A000AF860018AF4600842449FFFE3C0C0800AE
64514+:1022B0008D8C0440974D010401208021000947C303
64515+:1022C0000070C02131A9FFFF0310F82B0188C8213D
64516+:1022D000033F202103463821313100073C0108002B
64517+:1022E000AC3804443C010800AC2404401220000334
64518+:1022F00024FB40002527000730E9FFF88F860020E7
64519+:102300008F8400280126382100E4C02B170000022A
64520+:10231000AF86002400E438230347202134198000CD
64521+:10232000009910213C0F1000AF870020AF820038C9
64522+:10233000AF470080AF4F01780A0002968F880014E3
64523+:102340009747010410E0FDAE3C1840008F5801781B
64524+:102350000700FFFE30C5400010A000033C1F00082E
64525+:102360000000000D3C1F0008AF5F01402410080072
64526+:102370008F860000AF5001789744010430D90001E6
64527+:10238000132000ED3086FFFF24CCFFFE240D000259
64528+:10239000A74D0146A74C01488F9100182408000D55
64529+:1023A000A748014A8F630000262F000831E21FFF73
64530+:1023B0000342702130C90007AF830004AF91001CB5
64531+:1023C000AF82001800C03821AF4200841120000302
64532+:1023D00025DB400024D800073307FFF88F85002055
64533+:1023E0008F84002800E5302100C4382B14E000025F
64534+:1023F000AF85002400C430238F8400140346F821E5
64535+:10240000340C8000AF86002003EC8021AF460080B2
64536+:10241000249900013C0610003C184000AF460178AA
64537+:10242000AF900038AF990014AF5801380A000196F8
64538+:10243000000000008F630000975101043067FFFF28
64539+:102440003228FFFF8F4F017805E0FFFE30EC0007D8
64540+:10245000000CF82333F0000724F9FFFE2404000ADF
64541+:10246000A7440140A7500142A7590144A740014693
64542+:10247000A74801488F45010830B800201700000226
64543+:10248000240300092403000130CD0002A743014AC0
64544+:102490003C04004111A00003000018213C0401414C
64545+:1024A0002403000130C9000451200005AF83000857
64546+:1024B0003C0600100086202524030001AF8300089D
64547+:1024C000AF44100000000000000000000000000009
64548+:1024D000000000008F8E000811C000040000000002
64549+:1024E0008F4210000441FFFE000000008F7F0000BB
64550+:1024F000276400088F91003CAF9F0004948500087A
64551+:102500009490000A9499000C30AFFFFF0010C400B3
64552+:102510003323FFFF11F100A6030320253C0E080022
64553+:102520008DCE04443C0C08008D8C044000E88821CA
64554+:102530002626FFFE01C628210000682100A6F82BF0
64555+:10254000018D2021009F80213C010800AC2504441E
64556+:102550003C010800AC30044024E200083042FFFF98
64557+:102560003047000710E000038F830018244F000756
64558+:1025700031E2FFF83106FFFF30C800070043802139
64559+:1025800032191FFF0359C021AF83001CAF990018F7
64560+:10259000271B4000AF590084110000038F8C0020DE
64561+:1025A00024C5000730A6FFF88F84002800CC28211E
64562+:1025B00000A4F82B17E00002AF8C002400A428230D
64563+:1025C000AF850020AF4500803C0408008C840434B3
64564+:1025D00003454821340E8000012E6821108000053B
64565+:1025E000AF8D0038939100172406000E12260011BB
64566+:1025F0002407043F3C021000AF4201788F8800148A
64567+:10260000250F00010A0001EFAF8F00140E0005C472
64568+:1026100000E020218F8800143C0B08008D6B048C97
64569+:102620003C0A08008D4A0488250F00010A0001EFCA
64570+:10263000AF8F00143C021000A7470148AF42017859
64571+:102640000A0004CE8F88001424040F001184003D7A
64572+:1026500030CE002015C0000224030009240300012D
64573+:102660000A00021AA743014A0A00020DA7400146C8
64574+:1026700094EF000894F1000A94F0000C8F8C003C59
64575+:10268000001174003207FFFF31EDFFFF11AC00377E
64576+:1026900001C720253C1808008F1804443C0F08008F
64577+:1026A0008DEF0440000080210308682101A8382B29
64578+:1026B00001F0702101C760213C010800AC2D0444E9
64579+:1026C0003C010800AC2C04400A00027A8F840018F8
64580+:1026D0003C0208008C42047C3C0308008C630454D8
64581+:1026E0003C1F08008FFF04783C1808008F18045026
64582+:1026F000004838210068802100E8282B03E43021BD
64583+:102700000208402B0304882100C57021022878218B
64584+:102710003C010800AC3004543C010800AC2F0450CC
64585+:102720003C010800AC27047C3C010800AC2E047876
64586+:102730000A00027A8F840018A74001460A00043577
64587+:102740008F91001830CD002015A0FFC52403000D87
64588+:10275000240300050A00021AA743014A974E010408
64589+:1027600025C5FFF00A00038130A4FFFF8F980040C9
64590+:102770001498FFC8000010213C0508008CA5046CCB
64591+:102780003C1F08008FFF046800A8C8210328302BD5
64592+:1027900003E22021008640213C010800AC39046C92
64593+:1027A0003C010800AC2804680A00027A8F840018F3
64594+:1027B0008F8C0040148CFF5900E8C8213C18080099
64595+:1027C0008F18046C3C1108008E3104682723FFFE2B
64596+:1027D00003034821000010210123302B0222702125
64597+:1027E00001C668213C010800AC29046C3C010800CA
64598+:1027F000AC2D04680A0004A524E200088F88003884
64599+:102800003C03FFFF8D02000C0043F82403E4C825BD
64600+:10281000AD19000C0A00038F30CBFFFF0A0003C381
64601+:10282000AE000000974A0104920400048E26000CBA
64602+:10283000014458212579FFF200C7C0243325FFFF4A
64603+:1028400003053825AE27000C0A0002E68E050010AD
64604+:102850003C0DFFFF8D0A0010014D582401646025D6
64605+:10286000AD0C00100A00038F30CBFFFF974301042B
64606+:10287000920E00048E290010006E1021244DFFEEF0
64607+:102880000127602431A8FFFF0188F825AE3F001022
64608+:102890000A0002E68E0500108E0F000CAE0000004C
64609+:1028A00000078880023028210A0002B8ACAF00205F
64610+:1028B0001460000D3058FFFF3C04FFFF0044682403
64611+:1028C00001A47026000E602B000D102B004CF82484
64612+:1028D00013E00002000000000000000D8CAF0000BB
64613+:1028E0000A00025001E410253B03FFFF0003882B80
64614+:1028F0000018802B0211202410800002000000002C
64615+:102900000000000D8CB900000A0002503722FFFFC2
64616+:102910003084FFFF30A5FFFF108000070000182162
64617+:10292000308200011040000200042042006518219E
64618+:102930001480FFFB0005284003E000080060102120
64619+:1029400010C00007000000008CA2000024C6FFFF9A
64620+:1029500024A50004AC82000014C0FFFB2484000402
64621+:1029600003E000080000000010A0000824A3FFFFFF
64622+:10297000AC86000000000000000000002402FFFF01
64623+:102980002463FFFF1462FFFA2484000403E00008BC
64624+:1029900000000000308EFFFF30D8FFFF00057C00F4
64625+:1029A00001F8602539CDFFFF01AC5021014C582BB7
64626+:1029B000014B4821000944023127FFFF00E8302184
64627+:1029C0000006240230C5FFFF00A418213862FFFF73
64628+:1029D00003E000083042FFFF3C0C08008D8C0484AB
64629+:1029E000240BFF8027BDFFD001845021014B4824D8
64630+:1029F000AF4900203C0808008D080484AFB20020D5
64631+:102A0000AFB00018AFBF0028AFB30024AFB1001CB7
64632+:102A1000936600040104382130E4007F009A1021FD
64633+:102A20003C0300080043902130C500200360802152
64634+:102A30003C080111277B000814A000022646007004
64635+:102A40002646006C9213000497510104920F000473
64636+:102A50003267000F322EFFFF31ED004001C72823FF
64637+:102A600011A0000500004821925900BC3338000431
64638+:102A70001700009000000000924300BC307F00046B
64639+:102A800013E0000F0000000010A0000D0000000087
64640+:102A9000960E0002240AFF8000A7602125CDFFFECC
64641+:102AA000A74D1016920B0004014B2024308200FF2A
64642+:102AB00010400085010C40253C0F0400010F40250B
64643+:102AC0008F5301780660FFFE2404000AA7440140EA
64644+:102AD000960D00022404000931AC0007000C5823B5
64645+:102AE000316A0007A74A0142960200022443FFFE12
64646+:102AF000A7430144A7400146975F0104A75F01482F
64647+:102B00008F590108333800205300000124040001CC
64648+:102B1000920F000431EE001015C000023483001043
64649+:102B200000801821A743014A0000000000000000B7
64650+:102B30000000000000000000AF481000000000008E
64651+:102B40000000000000000000000000008F51100095
64652+:102B50000621FFFE3113FFFF12600003000000009A
64653+:102B60008F481018ACC8000096030006307FFFFFA6
64654+:102B700027F900020019988200138880023B302157
64655+:102B80008CD800001520005700183402920300046E
64656+:102B90002405FF8000A3F82433F100FF1220002C4D
64657+:102BA00000000000924700BC30F2000212400028F2
64658+:102BB00000000000974B100C2562FFFEA742101684
64659+:102BC000000000003C0A040035490030AF49100005
64660+:102BD00000000000000000000000000000000000F5
64661+:102BE0008F4C10000581FFFE000000009749100C7B
64662+:102BF0008F51101C00C020213127FFFF24F200302C
64663+:102C0000001218820003288000BBF8213226FFFF43
64664+:102C1000AFF100000E0005B300112C020013C880B4
64665+:102C2000033B98218E78000000027400AFB80010BA
64666+:102C30008FA80010310FFFFFAFAF00108FA400105E
64667+:102C400001C46825AFAD00108FA60010AE6600006D
64668+:102C500097730008976D000A9766000C8F8A003CF6
64669+:102C6000000D5C0030CCFFFF3262FFFF104A0036DF
64670+:102C7000016C2025960600023C10100024D30008A9
64671+:102C80000E00013B3264FFFF974C01040E00014926
64672+:102C90003184FFFFAF5001788FBF00288FB300242D
64673+:102CA0008FB200208FB1001C8FB0001803E0000825
64674+:102CB00027BD003010A0FF700000000024A5FFFC1D
64675+:102CC0000A0005EC240900048CD10000AF51101853
64676+:102CD0008F5301780660FF7A2404000A0A00060177
64677+:102CE0000000000000A7C8218F8800388F4E101CFC
64678+:102CF0000019C0820018788001E82021AC8E000005
64679+:102D0000000E2C0200C020210E0005B331C6FFFFCB
64680+:102D1000023B28218CAD000000025400004030210D
64681+:102D2000AFAD00108FAC0010318BFFFFAFAB0010C8
64682+:102D30008FA2001001424825AFA900108FA70010F4
64683+:102D40000A000631ACA700008F8F0040148FFFC926
64684+:102D50000000000097420104960B00023C050800A9
64685+:102D60008CA5046C3049FFFF316AFFFF3C1108005D
64686+:102D70008E310468012A382124F2FFFE00B240217E
64687+:102D80000012FFC30112C82B023FC02103192021EA
64688+:102D90003C010800AC28046C3C010800AC24046829
64689+:102DA0000A00066B0000000000A4102B1040000970
64690+:102DB000240300010005284000A4102B04A00003F8
64691+:102DC000000318405440FFFC000528401060000735
64692+:102DD000000000000085302B14C0000200031842E0
64693+:102DE000008520231460FFFB0005284203E0000853
64694+:102DF000008010218F85002C27BDFFE800053027BB
64695+:102E00002CC300012CA400020083102510400003F5
64696+:102E1000AFBF00102405007FAF85002C00052827D8
64697+:102E200030A5FFFF0E000592240426F58F830030A5
64698+:102E3000240402BD004030210083382B10E000093B
64699+:102E400024050001000420400083102B04800003AF
64700+:102E5000000528405440FFFC0004204010A000085A
64701+:102E600000C350210064402B1500000200052842D9
64702+:102E70000064182314A0FFFB0004204200C350216B
64703+:102E80008FBF0010000A4C02312200FF27BD00183E
64704+:102E9000AF8A002C03E00008AF8900300A00002A46
64705+:102EA00000000000000000000000000D7478703683
64706+:102EB0002E322E3300000000060203000000000046
64707+:102EC000000001360000EA60000000000000000081
64708+:102ED00000000000000000000000000000000000F2
64709+:102EE00000000000000000000000000000000000E2
64710+:102EF00000000000000000000000000000000016BC
64711+:102F000000000000000000000000000000000000C1
64712+:102F100000000000000000000000000000000000B1
64713+:102F200000000000000000000000000000000000A1
64714+:102F3000000000000000138800000000000005DC15
64715+:102F4000000000000000000010000003000000006E
64716+:102F50000000000D0000000D3C02080024423C204F
64717+:102F60003C03080024633DD4AC4000000043202B08
64718+:102F70001480FFFD244200043C1D080037BD7FFC87
64719+:102F800003A0F0213C100800261000A83C1C0800FB
64720+:102F9000279C3C200E0002BA000000000000000D3B
64721+:102FA0008F8300383C088000350700708CE50000F6
64722+:102FB000008330253C02900000C22025AF85003000
64723+:102FC000AF4400208F4900200520FFFE3C03800015
64724+:102FD000346200708C4500008F8600303C19080078
64725+:102FE0008F39007C3C0E08008DCE007800A620238F
64726+:102FF00003245821000078210164682B01CF60214F
64727+:10300000018D50213C010800AC2B007C3C010800E4
64728+:10301000AC2A007803E00008000000000A0000412C
64729+:10302000240400018F8400383C05800034A2000194
64730+:103030000082182503E00008AF43002003E00008E9
64731+:10304000000010213084FFFF30A5FFFF1080000733
64732+:1030500000001821308200011040000200042042CC
64733+:10306000006518211480FFFB0005284003E00008DC
64734+:103070000060102110C00007000000008CA20000BA
64735+:1030800024C6FFFF24A50004AC82000014C0FFFB8F
64736+:103090002484000403E000080000000010A00008E1
64737+:1030A00024A3FFFFAC860000000000000000000029
64738+:1030B0002402FFFF2463FFFF1462FFFA248400044C
64739+:1030C00003E0000800000000308AFFFF93A800130F
64740+:1030D000A74A014497490E1630C600FF3C02100073
64741+:1030E000A7490146AF450148A3460152A748015AE6
64742+:1030F000AF4701608FA400188FA30014A7440158A4
64743+:10310000AF43015403E00008AF42017803E0000838
64744+:10311000000000003C038000346200708C49000015
64745+:103120008F8800002484000727BDFFF83084FFF853
64746+:10313000AF890030974D008A31ACFFFFAFAC000083
64747+:103140008FAB0000016850232547FFFF30E61FFFCB
64748+:1031500000C4282B14A0FFF73C0C8000358B0070B6
64749+:103160008D6A00003C0708008CE700843C060800DC
64750+:103170008CC6008000081082014918230002788064
64751+:1031800000E370210000202101C3C82B00C4C0212E
64752+:1031900001FA4021031948212502400027BD0008FB
64753+:1031A0003C010800AC2E00843C010800AC290080E2
64754+:1031B00003E00008000000008F8200002486000762
64755+:1031C00030C5FFF800A2182130641FFF03E000089B
64756+:1031D000AF8400008F8700388F8A004027BDFFB87A
64757+:1031E0008F860044AFB60040AFBF0044AFB5003C8F
64758+:1031F000AFB40038AFB30034AFB20030AFB1002C81
64759+:10320000AFB000288F4501048D4900ACAF47008066
64760+:103210008CC8002000A938230000B021AF480E1050
64761+:103220008F440E1000004821AF440E148CC20024BD
64762+:10323000AF420E188F430E18AF430E1C10E001254D
64763+:103240002D230001936B0008116000D400000000E2
64764+:10325000976E001031CDFFFF00ED602B158000CF81
64765+:103260000000000097700010320FFFFFAF4F0E00FC
64766+:103270008F520000325100081220FFFD00000000B4
64767+:1032800097540E088F460E043285FFFF30B30001BD
64768+:1032900012600132000000000000000D30B8A040B4
64769+:1032A00024150040131500C030A9A0001120012DE5
64770+:1032B00000000000937F000813E0000800000000F9
64771+:1032C00097630010306BFFFF00CB402B1100000311
64772+:1032D00030AC00401180012300000000A785003CB5
64773+:1032E000AF8600349366000800E02821AFA70020D5
64774+:1032F00014C0012427B30020AF60000C9782003C6B
64775+:103300003047400014E00002240300162403000E9E
64776+:1033100024194007A363000AAF790014938A003E82
64777+:103320008F740014315800070018AA4002959025A8
64778+:10333000AF7200149784003C8F700014309100101D
64779+:1033400002117825AF6F0014978E003C31CD000834
64780+:1033500011A00147000028218F6700143C021000D3
64781+:103360003C0C810000E22825AF65001497460E0A48
64782+:103370002408000E3405FFFC30C3FFFF006C582505
64783+:10338000AF6B0004A3680002937F000A27E90004E2
64784+:10339000A369000A9786003C9363000A30CC1F00A3
64785+:1033A000000C598301634021251F0028A37F0009D9
64786+:1033B00097490E0CA769001093790009272A00028B
64787+:1033C000315800070018A82332B10007A371000B81
64788+:1033D00093740009976400108F910034978F003C1C
64789+:1033E000329200FF024480210205702131ED00403D
64790+:1033F00011A0000531C4FFFF0091282B3C12800072
64791+:1034000010A000140000A0210224382B14E0011B9E
64792+:103410008FA500208F4D0E14AF4D0E108F420E1C45
64793+:10342000AF420E18AF440E008F4F000031EE00087F
64794+:1034300011C0FFFD0000000097540E080080882195
64795+:1034400000009021A794003C8F500E04241400012A
64796+:10345000AF900034976400103095FFFF8E68000035
64797+:103460000111F82317E00009AE7F00008F650014FA
64798+:103470008F8B004434A60040AF6600148F4C0E10B2
64799+:10348000AD6C00208F430E18AD63002493670008D5
64800+:1034900014E000D2000000000E00009E2404001082
64801+:1034A0008F8900483C08320000402821312600FF67
64802+:1034B0000006FC0003E8502525390001AF990048BB
64803+:1034C000AC4A0000937800099370000A330400FFAF
64804+:1034D00000047400320F00FF01CF6825AC4D0004DA
64805+:1034E0008F820048064000EAACA20008ACA0000CA5
64806+:1034F0009783003C306B0008156000022628000608
64807+:1035000026280002974E0E148F450E1C8F6700046C
64808+:10351000936D000231C4FFFF31A200FFAFA2001083
64809+:103520008F6C0014AFA800180E00008BAFAC001415
64810+:10353000240400100E0000C7000000008E7200007E
64811+:1035400016400005000000008F6400142405FFBF32
64812+:1035500000859824AF7300148F79000C033538214F
64813+:10356000AF67000C9375000816A00008000000006B
64814+:1035700012800006000000008F7F00143C0BEFFF5C
64815+:103580003568FFFE03E84824AF690014A3740008FF
64816+:103590008FA500200A00024602202021AF470E001E
64817+:1035A0000A0000F5000000008F5901780720FFFE97
64818+:1035B000241F08008F840000AF5F0178974B008ABA
64819+:1035C000316AFFFF014448232528FFFF31021FFF16
64820+:1035D0002C4300081460FFF9000000008F8E0048A3
64821+:1035E0008F8D003800C048210344202125C60001EA
64822+:1035F000240C0F00AF86004800E9382324864000E1
64823+:1036000031CA00FF11AC0005240800019391003E6F
64824+:103610003230000700107A4035E80001000AAC00A3
64825+:103620003C18010002B8A025AC9440008F930048DC
64826+:1036300030B2003630A40008ACD3000410800097EC
64827+:1036400001123025974E0E0A8F8D00003C0281003A
64828+:1036500031CCFFFF25AB0008018240253C03100060
64829+:1036600031651FFF25390006241F000EAF48016099
64830+:1036700000C33025A75F015AAF850000A759015844
64831+:1036800014E0000A8F93003824120F0052720002D7
64832+:103690002416000134C600408F580E108F94004449
64833+:1036A000AE9800208F550E18AE9500248F450E144D
64834+:1036B000AF4501448F590E1CAF590148A34A01522E
64835+:1036C0003C0A1000AF460154AF4A017814E0FEDD19
64836+:1036D0002D2300010076A025128000178FBF004423
64837+:1036E0008F84003824160F0010960084000000001C
64838+:1036F0008F45017804A0FFFE24150F001095006E81
64839+:10370000000000008F470E14240202403C1F1000EE
64840+:10371000AF4701448F440E1CAF440148A3400152FF
64841+:10372000A740015AAF400160A7400158AF42015481
64842+:10373000AF5F01788FBF00448FB600408FB5003C6B
64843+:103740008FB400388FB300348FB200308FB1002CAB
64844+:103750008FB0002803E0000827BD004814C0FED049
64845+:1037600030B8A0408F420E148F84004400004821DE
64846+:10377000AC8200208F510E1CAC9100240A00020E76
64847+:103780002D2300018F910034978A003C3C12800069
64848+:103790000220A821315800401700FF300000A0216E
64849+:1037A000976900108F9200343139FFFF13320035D2
64850+:1037B00000002021008048211480FEA000A03821B4
64851+:1037C0008F420E148F840044AC8200208F510E1C57
64852+:1037D000AC9100240A00020E2D230001936A000917
64853+:1037E0009378000B315000FF330F00FF020F702160
64854+:1037F00025C2000A3050FFFF0E00009E020020216B
64855+:103800008F8600483C1F410024CD0001AF8D004849
64856+:10381000936C000930C600FF00064400318300FFAE
64857+:10382000246B0002010B4825013FC825AC5900005C
64858+:103830008F67000C97440E1400F22825AC45000455
64859+:103840008F450E1C8F670004936A00023084FFFFCF
64860+:10385000315800FFAFB800108F6F0014AFB10018DF
64861+:103860000E00008BAFAF00140A0001A60200202159
64862+:10387000AF6000040A00013EA36000020A00024695
64863+:1038800000002021000090210A0001702414000192
64864+:103890003C1280000A000195ACB2000C8F91000030
64865+:1038A00025240002A744015826300008320F1FFFCC
64866+:1038B0000A0001F9AF8F0000AF40014C1120002C2D
64867+:1038C000000000008F590E10AF5901448F430E18AD
64868+:1038D000240200403C1F1000AF430148A3400152A6
64869+:1038E000A740015AAF400160A7400158AF420154C0
64870+:1038F000AF5F01780A0002278FBF00441120000645
64871+:103900000000000097460E0830CC004015800002F1
64872+:10391000000000000000000D8F4D017805A0FFFEA3
64873+:103920000000000097530E103C120500240E2000EA
64874+:10393000326AFFFF0152C025AF58014C8F4F0E1461
64875+:103940003C021000AF4F01448F500E1CAF50014895
64876+:10395000A34001528F840038A740015AAF40016054
64877+:10396000A7400158AF4E01540A000215AF4201783A
64878+:103970008F490E14AF4901448F430E1C0A00028E7A
64879+:10398000240200403C0E20FF27BDFFE03C1A8000CF
64880+:103990003C0F800835CDFFFDAFBF001CAFB2001853
64881+:1039A000AFB10014AFB00010AF8F0040AF4D0E00AC
64882+:1039B0000000000000000000000000000000000007
64883+:1039C000000000003C0C00FF358BFFFDAF4B0E00EC
64884+:1039D0003C0660048CC95000240AFF7F3C11600043
64885+:1039E000012A40243507380CACC750008E24043817
64886+:1039F00024050009AF4500083083FFFF38622F71AE
64887+:103A00002450C0B3AF8000480E000068AF800000B3
64888+:103A100052000001AE20442C0E0004353C11800001
64889+:103A20000E000ED9363000708F8A00403C1208001C
64890+:103A300026523C88020088218E0800008F5F00001B
64891+:103A40003BF900013338000113000017AF88003044
64892+:103A5000022048218D2700003C0F08008DEF006CEC
64893+:103A60003C0C08008D8C006800E8C02301F8282178
64894+:103A70000000682100B8302B018D582101664021DB
64895+:103A80003C010800AC25006C3C010800AC28006833
64896+:103A90008F44000038830001306200011440FFEDC4
64897+:103AA00000E04021AF8700308E0C00003C0508008C
64898+:103AB0008CA5006C3C0408008C84006801883023CD
64899+:103AC00000A638210000102100E6402B00821821BA
64900+:103AD0000068F8213C010800AC27006C3C0108009C
64901+:103AE000AC3F00688F49010025590088AF99004418
64902+:103AF000AF890038AF4900208E070000AF87003043
64903+:103B00008F4D017805A0FFFE000000008E0600002A
64904+:103B10003C0B08008D6B00743C0408008C84007022
64905+:103B200000C728230165F8210000102103E5402B80
64906+:103B30000082382100E8C821240908003C0108005F
64907+:103B4000AC3F00743C010800AC390070AF4901780B
64908+:103B500093580108A398003E938F003E31EE000178
64909+:103B600015C000158F830038240E0D00106E00194B
64910+:103B7000240F0F00106F001D00000000915900007D
64911+:103B800024180050332900FF113800043C1F400066
64912+:103B9000AF5F01380A0002E7000000000E00090EC6
64913+:103BA000000000008F8A00403C1F4000AF5F0138DA
64914+:103BB0000A0002E700000000938D003E31AC0006D1
64915+:103BC000000C51000E0000CE0152D8210A00034320
64916+:103BD0008F8A00403C1B0800277B3D080E0000CE6A
64917+:103BE000000000000A0003438F8A00403C1B0800CD
64918+:103BF000277B3D280E0000CE000000000A00034392
64919+:103C00008F8A004090AA00018FAB00108CAC00108E
64920+:103C10003C0300FF8D680004AD6C00208CAD0014E7
64921+:103C200000E060213462FFFFAD6D00248CA7001816
64922+:103C30003C09FF000109C024AD6700288CAE001CC0
64923+:103C40000182C82403197825AD6F0004AD6E002CE5
64924+:103C50008CAD0008314A00FFAD6D001C94A9000234
64925+:103C60003128FFFFAD68001090A70000A56000029A
64926+:103C7000A1600004A167000090A30002306200FF71
64927+:103C80000002198210600005240500011065000E75
64928+:103C90000000000003E00008A16A00018CD80028A1
64929+:103CA000354A0080AD7800188CCF0014AD6F001439
64930+:103CB0008CCE0030AD6E00088CC4002CA16A0001CF
64931+:103CC00003E00008AD64000C8CCD001CAD6D001845
64932+:103CD0008CC90014AD6900148CC80024AD680008BC
64933+:103CE0008CC70020AD67000C8CC200148C8300646C
64934+:103CF0000043C82B13200007000000008CC20014F2
64935+:103D0000144CFFE400000000354A008003E0000886
64936+:103D1000A16A00018C8200640A000399000000007F
64937+:103D200090AA000027BDFFF88FA9001CA3AA0000DD
64938+:103D30008FAE00003C0FFF808FA8001835E2FFFF18
64939+:103D40008CCD002C01C26024AFAC0000A120000487
64940+:103D500000E06021A7A000028FB800008D270004BA
64941+:103D60000188182100A0582100C05021006D28268C
64942+:103D70003C06FF7F3C0F00FF2CAD000135EEFFFF3E
64943+:103D800034D9FFFF3C02FF0003193024000D1DC091
64944+:103D9000010EC82400E2C02400C370250319782551
64945+:103DA000AD2E0000AD2F00048D450024AFAE000005
64946+:103DB000AD2500088D4D00202405FFFFAD2D000C22
64947+:103DC000956800023107FFFFAD27001091660018CB
64948+:103DD00030C200FF000219C2506000018D4500345E
64949+:103DE000AD2500148D67000827BD0008AD27001C15
64950+:103DF0008C8B00CCAD2C0028AD20002CAD2B0024EA
64951+:103E0000AD20001803E00008AD20002027BDFFE032
64952+:103E1000AFB20018AFB10014AFB00010AFBF001CBC
64953+:103E20009098000000C088213C0D00FF330F007FF8
64954+:103E3000A0CF0000908E000135ACFFFF3C0AFF00D0
64955+:103E4000A0CE000194A6001EA22000048CAB00149A
64956+:103E50008E29000400A08021016C2824012A40241E
64957+:103E60000080902101052025A6260002AE24000432
64958+:103E700026050020262400080E00007624060002F5
64959+:103E800092470000260500282624001400071E0083
64960+:103E90000003160324060004044000032403FFFF6C
64961+:103EA000965900023323FFFF0E000076AE23001068
64962+:103EB000262400248FBF001C8FB200188FB100147D
64963+:103EC0008FB0001024050003000030210A0000809C
64964+:103ED00027BD002027BDFFD8AFB1001CAFB0001830
64965+:103EE000AFBF002090A80000240200018FB0003C6A
64966+:103EF0003103003F00808821106200148FAA00382F
64967+:103F0000240B0005506B0016AFAA001000A0202162
64968+:103F100000C028210E0003DC02003021922400BCE6
64969+:103F2000308300021060000326060030ACC00000A1
64970+:103F300024C600048FBF00208FB1001C8FB0001872
64971+:103F400000C0102103E0000827BD002801403821EF
64972+:103F50000E00035AAFB000100A0004200000000059
64973+:103F60000E0003A1AFB000140A00042000000000FE
64974+:103F70003C02000A034218213C04080024843D6CE2
64975+:103F80002405001A000030210A000080AF8300548D
64976+:103F90003C038000346200708C48000000A058216F
64977+:103FA00000C04821308A00FFAF8800308F4401787C
64978+:103FB0000480FFFE3C0C8000358600708CC500003C
64979+:103FC0003C0308008C6300743C1808008F180070D4
64980+:103FD00000A82023006468210000C82101A4782BD8
64981+:103FE0000319702101CF60213C010800AC2D007441
64982+:103FF0003C010800AC2C00708F480E14AF480144FF
64983+:10400000AF47014CA34A0152A74B01589346010800
64984+:1040100030C5000854A0000135291000934B090059
64985+:1040200024070050316A00FF11470007000000001C
64986+:104030008F450E1CAF450148AF4901543C091000A3
64987+:1040400003E00008AF490178934D010831A800084A
64988+:104050001100001000000000934F010831EE001025
64989+:1040600051C00001352900083C04080090843DD06F
64990+:10407000A34401508F4309A4AF4301488F4209A0D4
64991+:10408000AF420144AF4901543C09100003E000086D
64992+:10409000AF4901783C1908008F393D8C333800084E
64993+:1040A0005700FFF1352900080A00047300000000E2
64994+:1040B00024070040AF470814AF4008108F4209445E
64995+:1040C0008F4309508F4409548F45095C8F46094C32
64996+:1040D000AF820064AF830050AF84004CAF85005CBA
64997+:1040E00003E00008AF8600609346010930C5007FF9
64998+:1040F000000518C0000521400083102103E00008DE
64999+:10410000244200883C09080091293D9124A800021E
65000+:104110003C05110000093C0000E8302500C51825C9
65001+:1041200024820008AC83000003E00008AC80000497
65002+:104130009347010B8F4A002C974F09083C18000E3B
65003+:104140000358482131EEFFFF000E41C0AF48002C5C
65004+:1041500097430908952C001A008040212403000190
65005+:10416000318BFFFFAC8B00008D2D001C00A058216F
65006+:1041700000C06021AC8D00048D24002030E7004099
65007+:10418000AD04000891220019304400031083004858
65008+:104190002885000214A00062240600021086005642
65009+:1041A00024190003109900660000000010E0003A96
65010+:1041B000000000003C07080094E73D8624E200016F
65011+:1041C000934F0934934709219525002A31EE00FFCA
65012+:1041D000000E488230ED00FF978700580009360036
65013+:1041E000000D1C003044FFFF00C310250044C02513
65014+:1041F00000A778213C19400003197025000F4C00DE
65015+:10420000AD090004AD0E0000934D09203C030006EB
65016+:1042100025090014000D360000C32025AD04000858
65017+:104220008F59092C24E5000130A27FFFAD19000C45
65018+:104230008F580930A782005825020028AD180010B9
65019+:104240008F4F0938AD0F0014AD2B00048F4E09407D
65020+:10425000AD2E0008934D09373C05080090A53D9010
65021+:104260008F4409488F46094031A700FF00EC182110
65022+:10427000008678230003C7000005CC0003196025E1
65023+:1042800031E8FFFC01885825AD2B000CAD20001053
65024+:1042900003E00008AF4A002C3C0D080095AD3D86B8
65025+:1042A0003C0E080095CE3D800A0004C901AE1021E5
65026+:1042B0003C05080094A53D8A3C06080094C63D8054
65027+:1042C0003C18080097183D7C952E002400A6782104
65028+:1042D00001F86823000E240025A2FFF200821825B1
65029+:1042E00024190800AD03000CAD190014AD00001036
65030+:1042F0000A0004C4250800189526002495250028E6
65031+:104300000006C40000057C00370E810035ED080072
65032+:10431000AD0E000CAD0D00100A0004C425080014F9
65033+:104320001480FFA200000000952400240004140063
65034+:1043300034430800AD03000C0A0004C42508001033
65035+:104340003C03080094633D8A3C05080094A53D8029
65036+:104350003C06080094C63D7C953900249538002819
65037+:10436000006520210086782300196C000018740075
65038+:1043700025E2FFEE01C2202535A3810024190800A3
65039+:10438000AD03000CAD040010AD190018AD00001411
65040+:104390000A0004C42508001C03E00008240201F4FC
65041+:1043A00027BDFFE8AFB00010AFBF00140E000060E3
65042+:1043B0000080802124050040AF4508148F83005001
65043+:1043C0008F84004C8F85005C0070182100641023DE
65044+:1043D00018400004AF830050AF6300548F66005450
65045+:1043E000AF86004C1200000C000000008F440074E7
65046+:1043F000936800813409FA002D07000710E00005DA
65047+:1044000000891021936C0081240B01F4018B50046E
65048+:1044100001441021AF62000C8F4E095C01C5682376
65049+:1044200019A000048FBF00148F4F095CAF8F005C90
65050+:104430008FBF00148FB000100A00006227BD001863
65051+:104440008F8400648F8300508F82004CAF640044DF
65052+:10445000AF63005003E00008AF6200543C038000EB
65053+:10446000346200708C43000027BDFFF8308700FFE6
65054+:1044700030A900FF30C800FFAF8300308F440178BF
65055+:104480000480FFFE3C028000345900708F38000029
65056+:10449000A3A700033C0708008CE700748FAC000062
65057+:1044A0003C0608008CC60070030378233C0E7FFF97
65058+:1044B00000EFC82135CDFFFF00005021018D2824D9
65059+:1044C00000CA1821000847C0032F202B00A8102580
65060+:1044D0000064C021AFA200003C010800AC390074A8
65061+:1044E0003C010800AC380070934F010AA3A0000201
65062+:1044F0003C0E80FFA3AF00018FAC0000312B007F8A
65063+:1045000035CDFFFF018D4824000B5600012A4025C0
65064+:10451000240730002406FF803C05100027BD00085A
65065+:10452000AF48014CAF470154A7400158A346015280
65066+:1045300003E00008AF45017827BDFFE8AFBF0014D6
65067+:10454000AFB000108F6500743C068000309000FF13
65068+:1045500000A620250E000060AF6400749363000580
65069+:10456000346200080E000062A362000502002021F0
65070+:104570008FBF00148FB00010240500052406000131
65071+:104580000A00057027BD001827BDFFE03C0380002E
65072+:10459000AFB00010AFBF0018AFB1001434620070AC
65073+:1045A0008C470000309000FF30A800FFAF8700303C
65074+:1045B0008F4401780480FFFE3C18800037110070A2
65075+:1045C0008E2F00003C0D08008DAD00743C0A0800E1
65076+:1045D0008D4A007001E7702301AE282100005821A8
65077+:1045E00000AE302B014B4821012638213C01080048
65078+:1045F000AC250074000088213C010800AC27007045
65079+:104600001100000F000000008F6200742619FFFFE8
65080+:104610003208007F0002FE0233E5007F150000062D
65081+:10462000332200FF2407FF800207202624A3FFFF78
65082+:1046300000838025320200FF0040802124111008F1
65083+:104640000E000060000000008F49081831250004AA
65084+:1046500014A0FFFD3218007F001878C000187140C8
65085+:1046600001CF682125AC0088AF4C0818274A098083
65086+:104670008D4B0020AF4B01448D460024AF460148CE
65087+:10468000A35001500E000062A740015802201021E3
65088+:104690008FBF00188FB100148FB0001003E0000826
65089+:1046A00027BD002027BDFFE8308400FFAFBF00100A
65090+:1046B0000E0005BB30A500FF8F8300508FBF001098
65091+:1046C000344500402404FF903C02100027BD001830
65092+:1046D000AF43014CA3440152AF45015403E000082D
65093+:1046E000AF4201789343093E306200081040000D4C
65094+:1046F0003C0901013528080AAC8800008F47007486
65095+:10470000AC8700043C06080090C63D9030C5001000
65096+:1047100050A00006AC8000088F6A0060AC8A0008D8
65097+:104720002484000C03E00008008010210A00062207
65098+:104730002484000C27BDFFE8AFBF0014AFB0001009
65099+:104740009346093F00A050210005288000853823AA
65100+:1047500030C200FF240300063C09080095293D866D
65101+:1047600024E8FFD824050004104300372406000283
65102+:104770009750093C3C0F020400063400320EFFFF44
65103+:1047800001CF6825AC8D0000934C093E318B002091
65104+:104790001160000800000000934309363C02010349
65105+:1047A000345F0300307900FF033FC0252405000873
65106+:1047B000AC98000493430934935909210005F88209
65107+:1047C000306200FF0002C082332F00FF00186E002D
65108+:1047D000000F740001AE6025018920253C094000CE
65109+:1047E00000898025ACF0FFD8934309378F4F0948E3
65110+:1047F0008F580940306200FF004AC821033F7021F2
65111+:1048000001F86023000E6F0001A650253185FFFCE2
65112+:10481000001F58800145482501683821AD09002056
65113+:104820000E00006024F00028240400040E00006242
65114+:10483000A364003F020010218FBF00148FB000104E
65115+:1048400003E0000827BD00180A0006352406001200
65116+:1048500027BDFFD024090010AFB60028AFB5002453
65117+:10486000AFB40020AFB10014AFB000103C0108009D
65118+:10487000A0293D90AFBF002CAFB3001CAFB2001811
65119+:1048800097480908309400FF3C02000E3107FFFFF3
65120+:10489000000731C0AF46002C974409089344010B30
65121+:1048A00030B500FF03428021308300300000B0218A
65122+:1048B0001060012500008821240C00043C01080040
65123+:1048C000A02C3D90934B093E000B5600000A2E038E
65124+:1048D00004A0016000000000AF400048934F010BAE
65125+:1048E00031EE002011C00006000000009358093E80
65126+:1048F00000189E0000139603064001890000000086
65127+:104900009344010B30830040106000038F930050EC
65128+:104910008F8200502453FFFF9347093E30E6000882
65129+:1049200014C0000224120003000090219619002CEC
65130+:1049300093580934934F0937A7990058330C00FF57
65131+:1049400031EE00FF024E6821000D5880016C5021AD
65132+:10495000015140213C010800A4283D869205001821
65133+:1049600030A900FF010918213C010800A4233D885B
65134+:104970009211001816200002000000000000000D37
65135+:104980003C010800A4233D8A3C010800A4203D808E
65136+:104990003C010800A4203D7C935F010B3063FFFFC6
65137+:1049A00033F00040120000022464000A2464000B6B
65138+:1049B0003091FFFF0E00009E022020219358010B32
65139+:1049C0003C08080095083D8A0040202100185982C3
65140+:1049D000316700010E00049A01072821934C010B56
65141+:1049E0008F4B002C974E09083C0F000E034F4021BF
65142+:1049F00031CDFFFF000D51C0AF4A002C974309088D
65143+:104A00009505001A004038212404000130A9FFFF59
65144+:104A1000AC4900008D06001C00404821318A00404E
65145+:104A2000AC4600048D020020ACE20008910300199E
65146+:104A300030630003106400EC28790002172001188D
65147+:104A4000241000021070010C241F0003107F011EAF
65148+:104A500000000000114000DE000000003C090800DA
65149+:104A600095293D8625220001935F0934934E092143
65150+:104A70009504002A33F900FF0019C08231CF00FFEE
65151+:104A8000978E005800184600000F6C00010D80251D
65152+:104A90003045FFFF02051025008E50213C034000E9
65153+:104AA00000433025000A6400ACEC0004ACE60000D2
65154+:104AB000935F09203C19000624EC0014001FC60077
65155+:104AC00003197825ACEF00088F48092C25CD00018B
65156+:104AD00031A57FFFACE8000C8F500930A785005846
65157+:104AE00024E80028ACF000108F4409380100802130
65158+:104AF000ACE40014AD9300048F530940AD9300085B
65159+:104B0000934A09373C19080093393D908F4309486F
65160+:104B10008F460940314200FF0052F82100667023A1
65161+:104B2000001F7F000019C40001F8282531CDFFFCCB
65162+:104B300000AD2025AD84000CAD800010AF4B002CE3
65163+:104B4000934B093E317300081260000D3C060101D1
65164+:104B500034CC080AACEC00288F530074AD13000469
65165+:104B60003C0B0800916B3D903167001050E0000352
65166+:104B7000AD0000088F6A0060AD0A00082510000C27
65167+:104B800012C0003D000000009343093F24160006B8
65168+:104B900024060004306200FF105600C924070002FA
65169+:104BA0009758093C3C0F0204330DFFFF01AF40252D
65170+:104BB000AE0800009345093E30A400201080000894
65171+:104BC00000000000935309363C0B0103357F0300BE
65172+:104BD000327900FF033F7025AE0E00042406000862
65173+:104BE000934F093493480921312AFFFF31ED00FF2B
65174+:104BF000000D1082310300FF0002B60000032C00FC
65175+:104C000002C56025018A9825001220803C094000D9
65176+:104C10000204502302695825AD4BFFD8935F093732
65177+:104C20008F4F09488F58094033F900FF0332702134
65178+:104C30000006B08201D668210007440001F828234D
65179+:104C4000000D1F000068302530A2FFFC2547FFD86B
65180+:104C500000C260250016808002074821ACEC0020CD
65181+:104C6000253000280E00006024120004A372003FCB
65182+:104C70000E000062000000009347010B30F200407C
65183+:104C8000124000053C1900FF8E180000372EFFFF70
65184+:104C9000030E3024AE0600000E0000C702202021C3
65185+:104CA0003C10080092103D90321100031220000FBA
65186+:104CB00002A028218F89005025330001AF930050B6
65187+:104CC000AF7300508F6B00540173F8231BE0000298
65188+:104CD000026020218F640054AF6400548F4C007434
65189+:104CE000258401F4AF64000C02A028210280202159
65190+:104CF000A76000680E0005BB3C1410008F850050B3
65191+:104D000034550006AF45014C8F8A00488FBF002CF8
65192+:104D10008FB3001C25560001AF9600488FB20018D3
65193+:104D2000A34A01528FB60028AF5501548FB1001429
65194+:104D3000AF5401788FB500248FB400208FB00010DD
65195+:104D400003E0000827BD00309358093E00189E007C
65196+:104D500000139603064200362411000293440923EF
65197+:104D6000308300021060FEDD8F8600608F8200506D
65198+:104D700014C2FEDA000000000E0000600000000017
65199+:104D80009369003F24070016312800FF1107000C2B
65200+:104D9000240500083C0C0800918C3D90358B0001E7
65201+:104DA0003C010800A02B3D90936A003F314300FF77
65202+:104DB00010650065240D000A106D005E2402000CD1
65203+:104DC0000E000062000000000A00069000000000D3
65204+:104DD0003C09080095293D863C0A0800954A3D801B
65205+:104DE0000A0006F3012A10213C09080095293D8A92
65206+:104DF0003C04080094843D803C06080094C63D7C39
65207+:104E000095030024012410210046F8230003CC0060
65208+:104E100027F0FFF20330C025240F0800ACF8000C87
65209+:104E2000ACEF0014ACE000100A0006EE24E7001816
65210+:104E30003C010800A0313D90935F093E241600011B
65211+:104E400033F900201720FEA5241100080A0006905F
65212+:104E5000241100048F6E00848F4D094011A0FE9E26
65213+:104E6000AF8E0050240F00143C010800A02F3D908D
65214+:104E70000A00068F00000000950E0024950D002802
65215+:104E8000000E6400000D2C003589810034A6080056
65216+:104E9000ACE9000CACE600100A0006EE24E70014B2
65217+:104EA0001460FEEC000000009502002400021C00CB
65218+:104EB00034640800ACE4000C0A0006EE24E700109D
65219+:104EC0000A000741240700123C02080094423D8A70
65220+:104ED0003C06080094C63D803C03080094633D7C7A
65221+:104EE00095100024951900280046F82103E3C023FB
65222+:104EF00000106C0000197400270FFFEE01CF282569
65223+:104F000035AC8100ACEC000CACE5001024070800C7
65224+:104F1000AD2700182527001C0A0006EEAD2000145E
65225+:104F20008F7F004CAF7F00548F7900540A000699A0
65226+:104F3000AF790050A362003F0E0000620000000045
65227+:104F40000A00069000000000240200140A0008274E
65228+:104F5000A362003F27BDFFE8308400FFAFBF001011
65229+:104F60000E0005BB30A500FF9378007E9379007F8B
65230+:104F7000936E00809368007A332F00FF001866005C
65231+:104F8000000F6C0031CB00FF018D4825000B520053
65232+:104F90008FBF0010012A3825310600FF344470000D
65233+:104FA00000E628252402FF813C03100027BD0018DD
65234+:104FB000AF45014CAF440154A342015203E0000845
65235+:104FC000AF43017827BDFFD8AFB20018AFB10014CE
65236+:104FD000AFB00010AFBF0020AFB3001C9342010977
65237+:104FE000308600FF30B000FF000618C23204000215
65238+:104FF0003071000114800005305200FF93670005F6
65239+:1050000030E5000810A0000D30C80010024020213B
65240+:105010000E0005A702202821240400018FBF0020D4
65241+:105020008FB3001C8FB200188FB100148FB0001026
65242+:105030000080102103E0000827BD00281500003281
65243+:105040000000000093430109000028213062007F26
65244+:10505000000220C00002F94003E49821267900886C
65245+:10506000033B98218E7800248E6F0008130F0046B2
65246+:10507000000000008F640084241800020004FD82F8
65247+:1050800033F900031338007C0000000093660083AE
65248+:10509000934A0109514600043205007C10A00060CB
65249+:1050A000000000003205007C14A0005302402021C3
65250+:1050B00016200006320400018E7F00248F5901045F
65251+:1050C00017F9FFD600002021320400011080000AE9
65252+:1050D000024020218F4209408F9300641053000644
65253+:1050E000000000000E00066D022028218F430940B9
65254+:1050F000AF630044024020210E0006020220282156
65255+:105100000A000860240400013C0908008D2900649D
65256+:10511000252600013C010800AC26006416000012A0
65257+:10512000000000008F6D00843C0E00C001AE6024C2
65258+:1051300015800005024020210E00082E02202821A3
65259+:105140000A00086024040001240500040E00057014
65260+:1051500024060001024020210E00082E02202821F2
65261+:105160000A000860240400010E000041240400012C
65262+:10517000936B007D020B50250E000062A36A007D38
65263+:105180000A0008A38F6D00848F6600748F480104A5
65264+:105190008E67002400064E021507FFB63126007FF9
65265+:1051A000936B008326440001308A007F1146004340
65266+:1051B000316300FF5464FFB08F6400842645000112
65267+:1051C00030B1007F30A200FF122600042405000148
65268+:1051D000004090210A00087624110001240FFF806E
65269+:1051E000024F702401CF9026324200FF00409021F0
65270+:1051F0000A000876241100010E00066D0220282105
65271+:10520000321800301300FFAA321000820240202121
65272+:105210000E0005A7022028210A00086024040001CE
65273+:105220008F6E00743C0F80002405000301CF902591
65274+:10523000AF72007493710083240600010E000570A4
65275+:10524000322400FF0E00004124040001936D007D14
65276+:10525000020D60250E000062A36C007D3C0B08006F
65277+:105260008D6B0054257000013C010800AC300054E7
65278+:105270000A000860240400018F6800743C09800063
65279+:105280002405000401093825AF6700749363008387
65280+:10529000240600010E000570306400FF0E0000417E
65281+:1052A000240400019362007D020298250E00006232
65282+:1052B000A373007D0A00086024040001324D0080C1
65283+:1052C00039AC0080546CFF6C8F6400840A0008C9FC
65284+:1052D0002645000127BDFFC83C0A0008AFBF0030CB
65285+:1052E000AFB5002CAFB40028AFB30024AFB200209C
65286+:1052F000AFB1001CAFB00018034AD8212409004008
65287+:10530000AF490814AF4008108F4209448F43095039
65288+:105310008F4609548F47095C8F48094C9344010814
65289+:105320009345010BAF820064308400FF30A500FF7D
65290+:10533000AF830050AF86004CAF87005C0E00084A78
65291+:10534000AF8800601440017D8FBF0030A760006807
65292+:10535000934D0900240B00503C15080026B53D482C
65293+:1053600031AC00FF3C12080026523D58118B00035F
65294+:10537000000000000000A8210000902193510109C5
65295+:105380008F9F005024040010322E007F000E68C052
65296+:10539000000E6140018D282124B40088AF54081804
65297+:1053A0008F4901048F4A09A43C0B000E034BC02116
65298+:1053B000012A10233C010800AC223D6C8F430958A0
65299+:1053C0003C010800A0243D9097470908007F302346
65300+:1053D0003C010800AC263D7030E8FFFF0008C9C062
65301+:1053E0003C010800AC3F3D94AF59002C974209089E
65302+:1053F0009710002C8EB10000930F001803749821B1
65303+:10540000A7900058AF9300440220F80931F000FF44
65304+:10541000304E000215C001B2304F000111E0014FC3
65305+:10542000000000009343093E3066000814C00002EB
65306+:10543000241400030000A0218F5809A424130001A4
65307+:105440003C010800AC383D98934F0934935109371B
65308+:1054500031EC00FF322E00FF028E6821000D288003
65309+:1054600000AC5021015058213C010800A42B3D887C
65310+:105470003C010800A42A3D8693490934312200FFEB
65311+:1054800002022021249000103C010800A4303D8439
65312+:10549000240700068F9F00503C010800AC273D8C7C
65313+:1054A0008F88005C8F59095800008021011F282334
65314+:1054B00004A00149033F20230480014700A4302BAE
65315+:1054C00010C00149000000003C010800AC253D70FF
65316+:1054D0008E4200000040F809000000003043000246
65317+:1054E000146000F80040882130440001548000100E
65318+:1054F0008E4200043C0908008D293D743C0AC0001E
65319+:10550000012A8025AF500E008F45000030AB000807
65320+:105510001160FFFD00000000974D0E0824100001EF
65321+:10552000A78D003C8F4C0E04AF8C00348E420004DB
65322+:105530000040F8090000000002228825322E0002F7
65323+:1055400015C00180000000003C09080095293D7C41
65324+:105550003C06080094C63D883C0A0800954A3D7EFA
65325+:105560003C1908008F393D74012660213C18080061
65326+:105570008F183D983C03080094633D92018A2021D6
65327+:105580008F4E09400329F821248F000203E32821CC
65328+:10559000031968213C010800A42C3D8AAF8E0064E9
65329+:1055A0003C010800AC2D3D983C010800A4253D803D
65330+:1055B0000E00009E31E4FFFF8F870048004020214D
65331+:1055C0003C010800A0273D918E42000824E800011C
65332+:1055D000AF8800480040F809000000009344010B28
65333+:1055E0008F4C002C974A09083C0B000E034B4021BE
65334+:1055F0003149FFFF000919C08F8B0050AF43002CC9
65335+:10560000974309089506001A00403821308A004067
65336+:1056100030DFFFFFAC5F00008D19001C0040482107
65337+:10562000AC5900048D180020AC580008910F0019E7
65338+:1056300031E30003107300F0000000002862000254
65339+:105640001440010924050002106500FD240D00032B
65340+:10565000106D010D00000000114000D90000000095
65341+:105660003C0A0800954A3D8625420001934D0934C5
65342+:1056700093580921950E002A31A300FF00032082D0
65343+:10568000331F00FF9798005800047E00001FCC00D5
65344+:1056900001F940253049FFFF0109102501D83021CB
65345+:1056A0003C0540000045502500066C00ACED0004B0
65346+:1056B000ACEA0000934309203C04000624ED0014EA
65347+:1056C0000003FE0003E4C825ACF900088F49092C4B
65348+:1056D000270F000131EE7FFFACE9000C8F48093045
65349+:1056E000A78E005824E90028ACE800108F4509383F
65350+:1056F00001204021ACE50014ADAB00048F4209400D
65351+:10570000ADA20008934B09373C1F080093FF3D9062
65352+:105710008F4309488F4A0940316600FF00D4202199
65353+:10572000006A78230004C700001FCC000319282555
65354+:1057300031EEFFFC00AE1025ADA2000CADA00010B4
65355+:10574000AF4C002C934C093E318B00085160000F88
65356+:105750008E58000C3C06010134CA080AACEA002845
65357+:105760008F4B0074AD2B00043C0C0800918C3D90D5
65358+:105770003187001050E00003AD2000088F62006008
65359+:10578000AD2200082528000C8E58000C0300F809F3
65360+:10579000010020213C19080097393D8A3C1F080070
65361+:1057A00097FF3D7E033F782125E900020E0000C7E8
65362+:1057B0003124FFFF3C0E08008DCE3D6C3C080800F4
65363+:1057C0008D083D7401C828233C010800AC253D6CC0
65364+:1057D00014A00006000000003C0308008C633D8C10
65365+:1057E000346400403C010800AC243D8C1200007081
65366+:1057F0008F8C00448F470E108F900044AE0700201E
65367+:105800008F4D0E18AE0D00243C10080096103D8000
65368+:105810000E0000600000000024020040AF420814A7
65369+:105820008F8600508F8A004C00D01821006A5823C0
65370+:1058300019600004AF830050AF6300548F650054BB
65371+:10584000AF85004C1200000C000000008F44007473
65372+:10585000936800813409FA002D0E000711C000057D
65373+:1058600000891821937F0081241901F403F9780439
65374+:1058700001E41821AF63000C8F44095C8F83005C46
65375+:105880000083C0231B000003000000008F50095C50
65376+:10589000AF90005C0E000062000000008F8C005092
65377+:1058A0008E4700103C010800AC2C3D9400E0F80944
65378+:1058B000000000003C0D08008DAD3D6C55A0FEF5CC
65379+:1058C000240700068F450024975909088F8B006430
65380+:1058D0008F9400503C0F001F978200588F86005411
65381+:1058E0008F93004C3328FFFF35E9FF8000A9502437
65382+:1058F000000871C032320100AF4E0024A4C2002C57
65383+:10590000AF4A0024AF6B0044AF740050AF73005433
65384+:105910001640008032380010570000868EA4000424
65385+:10592000322300405460001B8EB100088EB0000C82
65386+:105930000200F809000000008FBF00308FB5002C76
65387+:105940008FB400288FB300248FB200208FB1001CC9
65388+:105950008FB0001803E0000827BD00389347010905
65389+:105960008F8800380007FE0003E8C825AF59008083
65390+:105970008F5809A08F5309A4AFB80010AF580E1468
65391+:105980008FB40010AF540E10AF530E1C0A00096202
65392+:10599000AF530E180220F809000000008EB0000C72
65393+:1059A0000200F809000000000A000AA88FBF0030BA
65394+:1059B000A5800020A59300220A000A5BAD93002475
65395+:1059C0003C09080095293D863C06080094C63D80A8
65396+:1059D0000A0009F4012610213C010800AC203D70AA
65397+:1059E0000A00098E8E4200003C010800AC243D7084
65398+:1059F0000A00098E8E4200003C03080094633D8A31
65399+:105A00003C04080094843D803C1F080097FF3D7CC7
65400+:105A1000951800240064C821033F782300186C0007
65401+:105A200025EEFFF201AE2825AC45000C240208004B
65402+:105A3000ACE20014ACE000100A0009EF24E7001803
65403+:105A400095060024950900280006240000091C0082
65404+:105A5000349F810034790800ACFF000CACF90010D1
65405+:105A60000A0009EF24E700141460FEFB00000000A8
65406+:105A70009518002400187C0035EE0800ACEE000CF0
65407+:105A80000A0009EF24E700103C07080094E73D8076
65408+:105A90003C04080094843D8A3C03080094633D7CE8
65409+:105AA00095190024951800280087F82103E378232E
65410+:105AB0002407080000192C0000186C0025EEFFEEEA
65411+:105AC00001AE302534A28100AD2700182527001C27
65412+:105AD000AD22000CAD2600100A0009EFAD20001425
65413+:105AE00093520109000028210E000602324400FFF3
65414+:105AF0008FBF00308FB5002C8FB400288FB30024E7
65415+:105B00008FB200208FB1001C8FB0001803E0000896
65416+:105B100027BD0038935F010933E400FF0E00066DD6
65417+:105B200000002821323800105300FF7E322300404D
65418+:105B30008EA400040080F809000000000A000AA2F8
65419+:105B4000322300401200FF5F000000008F540E144B
65420+:105B50008F920044AE5400208F530E1C0A000A8A14
65421+:105B6000AE5300248F82001C008040213C040100C1
65422+:105B70009047008530E3002010600009000000001D
65423+:105B80003C0708008CE73D948F83001800E3202336
65424+:105B9000048000089389000414E30003010020211D
65425+:105BA00003E00008008010213C04010003E000082D
65426+:105BB000008010211120000B006738238F8C0020FB
65427+:105BC00024090034918B00BC316A0002514000016D
65428+:105BD0002409003000E9682B15A0FFF10100202105
65429+:105BE00000E938232419FFFC00B9C02400F9782407
65430+:105BF00000F8702B15C0FFEA01E8202130C2000335
65431+:105C00000002182314C00012306900030000302184
65432+:105C100000A9702101C6682100ED602B1180FFE012
65433+:105C20003C0401002D2F00010006482B01053821FE
65434+:105C300001E9302414C0FFDA24E4FFFC2419FFFC3E
65435+:105C400000B9C0240308202103E0000800801021CF
65436+:105C50008F8B002024060004916A00BC31440004AC
65437+:105C60001480FFEC00A970210A000B5E00003021B7
65438+:105C700027BDFFE8AFBF00108F460100934A01091E
65439+:105C80003C1F08008FFF00902407FF80314F00FF6A
65440+:105C900031E8007F0008614003E6C821032CC021E1
65441+:105CA00027090120012770243C010800A02F3DD0C6
65442+:105CB000AF4E080C3C0D08008DAD00903C040080F8
65443+:105CC0003482000301A65821016C182124650120AB
65444+:105CD00030AA007801424025AF48081C3C1F08004C
65445+:105CE0008FFF00908F88004003E6C0213319000722
65446+:105CF00003074824033A7821AF49002825E909C061
65447+:105D0000952E00023C0D08008DAD008C3C0A080069
65448+:105D10008D4A009031CC3FFF01A61821000C59801C
65449+:105D2000006B282100A72024AF44002C95220002FC
65450+:105D30003C1F08008FFF008C9107008530593FFF02
65451+:105D400003E678210019C1800146702101F868211D
65452+:105D500031CC007F31AB007F019A2821017A50219C
65453+:105D60003C03000C3C04000E00A328210144102138
65454+:105D700030E6002027470980AF82002CAF88001C46
65455+:105D8000AF890024AF85002010C00006AF8700282F
65456+:105D90008D0200508CA4010C0044302318C0007701
65457+:105DA00000000000910C0085240DFFDF018D3824D8
65458+:105DB000A10700858F8B001C8F8900248F87002806
65459+:105DC0008D65004CAF850018912F000D31EE00203D
65460+:105DD00011C000170000000024090001A38900047D
65461+:105DE000AF80000C8CE400248F85000C240A00088E
65462+:105DF000AF800008AF8000103C010800A42A3D7E5F
65463+:105E00003C010800A4203D920E000B32000030211E
65464+:105E10008F8500248FBF0010AF82001490A8000D62
65465+:105E200027BD00180008394203E0000830E20001F5
65466+:105E3000913F00022418000133F900FF001921826C
65467+:105E400010980039240800021088005B8F86002C0F
65468+:105E50008CE5002414A0001B8F9F002091220000DD
65469+:105E6000240A00053046003F10CA00472404000100
65470+:105E70008F860008A3840004AF860010AF86000C54
65471+:105E80008CE400248F85000C240A00083C010800E3
65472+:105E9000A42A3D7E3C010800A4203D920E000B3256
65473+:105EA000000000008F8500248FBF0010AF82001417
65474+:105EB00090A8000D27BD00180008394203E0000833
65475+:105EC00030E200018CF800088CF900248FEE00C449
65476+:105ED000A38000048CE40024AF8E000C8F85000C9E
65477+:105EE0008F86000803197823240A0008AF8F00105A
65478+:105EF0003C010800A42A3D7E3C010800A4203D92FC
65479+:105F00000E000B32000000008F8500248FBF0010B0
65480+:105F1000AF82001490A8000D27BD00180008394278
65481+:105F200003E0000830E20001912300003062003FEE
65482+:105F3000104400278F8500208CE400241480002169
65483+:105F4000000000008D2E00183C187FFF8F85002078
65484+:105F5000370FFFFF01CF1824AF8300088F9F000881
65485+:105F60008CA8008403E8C82B1720000203E020213E
65486+:105F70008CA400840A000BEDAF8400088CA3010CF4
65487+:105F80000A000BCBAF8300188D2C00188F860008F9
65488+:105F90003C0D7FFF8F89002035A3FFFF018358242C
65489+:105FA00024040001AF8B0010AD2000CCA3840004BA
65490+:105FB0000A000BF9AF86000C8CCA00140A000BED26
65491+:105FC000AF8A00088CA300C80A000C30AF83000819
65492+:105FD0008F84002C8CAC00648C8D0014018D582BA8
65493+:105FE00011600004000000008CA200640A000C3064
65494+:105FF000AF8200088C8200140A000C30AF820008C7
65495+:106000008F85000C27BDFFE0AFBF0018AFB10014B3
65496+:1060100014A00007AFB000108F86002424020005F2
65497+:1060200090C400003083003F106200B68F840020CF
65498+:106030008F91000800A080218F8C00283C0508006B
65499+:106040008CA53D708D8B000431663FFF00C5502B41
65500+:106050005540000100C02821938D000411A0007359
65501+:1060600000B0F82B8F98002024040034930F00BC5C
65502+:1060700031EE000251C000012404003000A4C82BFE
65503+:10608000172000D10000000000A4282300B0F82B46
65504+:106090003C010800A4243D7C17E000680200202198
65505+:1060A0003C0308008C633D6C0083102B54400001BE
65506+:1060B000008018218F8800243C010800AC233D7427
65507+:1060C000000048219104000D308300205060000141
65508+:1060D0008F490E188F8300140123382B10E00059CC
65509+:1060E000000000003C0408008C843D7400895821A5
65510+:1060F000006B502B114000560090602B006930233C
65511+:1061000000C020213C010800AC263D7412000003B1
65512+:10611000241FFFFC1090008A32270003009FC82430
65513+:106120003C010800AC393D743C010800A4203D92BC
65514+:106130008F84000C120400078F830020AF910008A9
65515+:10614000020020218C7100CCAF90000C26300001A1
65516+:10615000AC7000CC3C0208008C423D748F8A001069
65517+:10616000240700180082202301422823AF84000C5A
65518+:1061700010800002AF850010240700108F86001CDD
65519+:106180003C010800A0273D902407004090CC0085EA
65520+:10619000318B00C0116700408F8D001414A00015D2
65521+:1061A00000002021934A01098F420974314500FF04
65522+:1061B0000002260224A300013090007F3071007F8E
65523+:1061C0001230007A2407FF80A0C300833C09080036
65524+:1061D0008D293D8C8F880024240D0002352C000869
65525+:1061E0003C010800A02D3DD13C010800AC2C3D8CA9
65526+:1061F00024040010910E000D31C6002010C00005CF
65527+:1062000000801821240800013C010800AC283D74DE
65528+:10621000348300018FBF00188FB100148FB00010BD
65529+:106220000060102103E0000827BD00203C010800A9
65530+:10623000A4203D7C13E0FF9A020020210A000C817B
65531+:1062400000A020213C0408008C843D740090602B49
65532+:106250001180FFAE000000003C0F080095EF3D7C70
65533+:1062600001E4702101C6682B11A000072C820004F4
65534+:106270003C1F60008FF954043338003F1700FFE5DE
65535+:10628000240300422C8200041040FFA0240300429B
65536+:106290000A000CDF8FBF0018152DFFC000000000A2
65537+:1062A0008CDF00743C0380002405FF8003E3C825D5
65538+:1062B000ACD9007490D80085240E0004240400108A
65539+:1062C000330F003F01E54025A0C800858F880024DA
65540+:1062D0003C010800A02E3DD1240300019106000DD1
65541+:1062E00030C9002015200003000000003C03080016
65542+:1062F0008C633D743C010800AC233D6C0A000CD655
65543+:10630000000000008F8700108C88008400E8282B94
65544+:1063100014A0000200E088218C910084240900016F
65545+:10632000A38900048F440E18022028210E000B328E
65546+:1063300002203021022080210A000C67AF82001465
65547+:1063400000071823306600033C010800A4263D9294
65548+:10635000122000058F8C0020918B00BC316A000454
65549+:106360001540001524CD00043C0F080095EF3D9228
65550+:1063700001E4702100AE302B50C0FF6E8F84000C02
65551+:106380002C85000514A0FFA32403004230980003CD
65552+:1063900017000002009818232483FFFC3C0108002A
65553+:1063A000AC233D740A000CA30000000000A7582491
65554+:1063B0000A000CCB016718263C010800A42D3D9271
65555+:1063C0000A000D33000000003C010800AC203D74C1
65556+:1063D0000A000CDE240300428F83001014600007C3
65557+:1063E000000010218F88002424050005910600007C
65558+:1063F00030C400FF108500030000000003E0000827
65559+:1064000000000000910A0018314900FF000939C25C
65560+:1064100014E0FFFA8F85001C3C04080094843D7C46
65561+:106420003C0308008C633D943C1908008F393D748F
65562+:106430003C0F080095EF3D920064C0218CAD0054E4
65563+:106440000319702101CF6021018D58231960001DAF
65564+:1064500000000000910E001C8F8C002C974B0E103A
65565+:1064600031CD00FF8D850004016D30238D88000043
65566+:1064700030CEFFFF000E510000AAC82100003821D5
65567+:1064800001072021032A182B0083C021AD990004A5
65568+:10649000AD980000918F000A01CF6821A18D000AFC
65569+:1064A0008F88002C974B0E12A50B0008950A003818
65570+:1064B00025490001A50900389107000D34E60008C0
65571+:1064C000A106000D03E000080000000027BDFFE06A
65572+:1064D000938700048F8F00248FAD00143C0E7FFF44
65573+:1064E0008F89000C35C8FFFFAFBF001CAFB000188C
65574+:1064F00001A8182491EA000D000717C03C1FBFFF38
65575+:10650000006258252D2E00018F90001837F9FFFFEB
65576+:106510003C1808008F183D943C0F080095EF3D8A09
65577+:1065200001796824000E47803C07EFFF3C05F0FF2F
65578+:1065300001A818253149002034E2FFFF34ACFFFFE9
65579+:106540000310582327A500102406000225EA0002A4
65580+:1065500000621824008080211520000200004021E4
65581+:106560008F480E1CA7AA0012056000372407000000
65582+:1065700030FF00FF001FCF008F8B001C00793825F3
65583+:10658000AFA70014916F00853C08080091083D9169
65584+:106590003C18DFFF31EE00C0370AFFFF000E182B5A
65585+:1065A0003C1F080097FF3D8400EA6824A3A800115F
65586+:1065B0000003174001A248258FB90010AFA90014AD
65587+:1065C0003C0A0800914A3D93A7BF00168FA800140B
65588+:1065D000032CC0243C0B01003C0F0FFF030B1825BC
65589+:1065E0003147000335EEFFFF010C68240007160059
65590+:1065F000006EF8243C09700001A2C82503E9582563
65591+:10660000AFB90014AFAB00100E000076A3A00015C8
65592+:106610008F8C0024260200089186000D30C40020D3
65593+:10662000108000068FBF001C3C05080094A53D802B
65594+:1066300024B0FFFF3C010800A4303D808FB000185B
65595+:1066400003E0000827BD00208F9800140118502B8C
65596+:106650005540FFC7240700010A000DB630FF00FFB8
65597+:106660009382000427BDFFE0AFBF00181040000F69
65598+:10667000008050218F880024240B00058F8900089A
65599+:10668000910700008F8400200100282130E3003FA3
65600+:106690008F86002C106B000800003821AFA9001075
65601+:1066A0000E00040EAFAA0014A38000048FBF0018D0
65602+:1066B00003E0000827BD00208D1900183C0F0800DA
65603+:1066C0008DEF3D748F9800103C027FFF8D08001401
65604+:1066D000345FFFFF033F682401F8702101AE60239F
65605+:1066E00001883821AFA900100E00040EAFAA0014D3
65606+:1066F0000A000E04A38000048F8700243C050800D4
65607+:1067000094A53D923C0208008C423D8C90E6000D21
65608+:106710000005240030C300201060002C00444025F8
65609+:106720008F85001C00006021240B000190A30085D0
65610+:1067300000004821240A00013C0F800035EE007063
65611+:106740008DC70000AF8700308F5801780700FFFE2B
65612+:106750003C038000347900708F3800003C0508004D
65613+:106760008CA500743C0D08008DAD007003077823E4
65614+:1067700000AF38210000102100EF302B01A22021B2
65615+:10678000008618213C010800AC2700743C01080079
65616+:10679000AC230070AF4B01483C1908008F393D9481
65617+:1067A000A7490144A74A0146AF59014C3C0B0800D8
65618+:1067B000916B3D91A34B0152AF4801543C0810002E
65619+:1067C000A74C015803E00008AF4801788F4B0E1C1E
65620+:1067D0003C0A08008D4A3D7497490E16974D0E14D9
65621+:1067E00001456021312AFFFF0A000E2731A9FFFF72
65622+:1067F0008F8300249064000D308200201040002917
65623+:10680000000000000000482100005021000040214D
65624+:106810003C07800034EB00708D670000AF870030CC
65625+:106820008F4C01780580FFFE3C0D800035AC007078
65626+:106830008D8B00003C0508008CA500743C0408000A
65627+:106840008C8400700167302300A67821000010219D
65628+:1068500001E6C82B0082C021031970213C01080009
65629+:10686000AC2F00743C010800AC2E0070AF49014809
65630+:106870003C0D08008DAD3D94A7480144240900401B
65631+:10688000A74A01463C081000240AFF91AF4D014C75
65632+:10689000A34A0152AF490154A740015803E0000840
65633+:1068A000AF4801788F490E1897460E1297450E1083
65634+:1068B00030CAFFFF0A000E5D30A8FFFF8F8300245F
65635+:1068C00027BDFFF89064000D308200201040003A90
65636+:1068D00000000000240B000100004821240A0001F0
65637+:1068E0003C088000350700708CE30000AF83003067
65638+:1068F0008F4C01780580FFFE3C0E80003C040800B0
65639+:1069000090843DD035C700708CEC00003C05080039
65640+:106910008CA50074A3A400033C1908008F390070F3
65641+:106920008FAD00000183302300A638210000102124
65642+:106930000322782100E6C02B01F8602101AE40253A
65643+:10694000AFA800003C010800AC2700743C0108001F
65644+:10695000AC2C00709346010A3C04080090843DD1A1
65645+:10696000A3A00002A3A600018FA300003C0580FFA6
65646+:106970003099007F34A2FFFF006278240019C6001E
65647+:1069800001F87025240D3000AF4E014C27BD0008E2
65648+:10699000AF4D0154A7400158AF4B0148A7490144EE
65649+:1069A000A74A01463C091000240AFF80A34A01526D
65650+:1069B00003E00008AF4901788F4B0E1897460E127E
65651+:1069C00097450E1030CAFFFF0A000E9130A9FFFF55
65652+:1069D0008F85001C2402008090A40085308300C0B5
65653+:1069E000106200058F8600208F8800088F87000CBA
65654+:1069F000ACC800C8ACC700C403E000080000000039
65655+:106A00003C0A0800254A39543C09080025293A2047
65656+:106A10003C08080025082DD43C07080024E73B3437
65657+:106A20003C06080024C637C43C05080024A5353CB4
65658+:106A30003C040800248431643C0308002463385C6F
65659+:106A40003C020800244236303C010800AC2A3D508C
65660+:106A50003C010800AC293D4C3C010800AC283D48F5
65661+:106A60003C010800AC273D543C010800AC263D64C5
65662+:106A70003C010800AC253D5C3C010800AC243D58BD
65663+:106A80003C010800AC233D683C010800AC223D609D
65664+:086A900003E000080000000013
65665+:00000001FF
65666diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65667new file mode 100644
65668index 0000000..43d7c4f
65669--- /dev/null
65670+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65671@@ -0,0 +1,6496 @@
65672+:10000000080001180800000000005594000000C816
65673+:1000100000000000000000000000000008005594EF
65674+:10002000000000380000565C080000A00800000036
65675+:100030000000574400005694080059200000008436
65676+:100040000000ADD808005744000001C00000AE5CBD
65677+:100050000800321008000000000092580000B01C98
65678+:10006000000000000000000000000000080092589E
65679+:100070000000033C000142740800049008000400E2
65680+:10008000000012FC000145B000000000000000006C
65681+:1000900000000000080016FC00000004000158AC3D
65682+:1000A000080000A80800000000003D00000158B052
65683+:1000B00000000000000000000000000008003D00FB
65684+:1000C00000000030000195B00A000046000000006A
65685+:1000D000000000000000000D636F6D362E322E31DF
65686+:1000E00062000000060201020000000000000003A0
65687+:1000F000000000C800000032000000030000000003
65688+:1001000000000000000000000000000000000000EF
65689+:1001100000000010000001360000EA600000000549
65690+:1001200000000000000000000000000000000008C7
65691+:1001300000000000000000000000000000000000BF
65692+:1001400000000000000000000000000000000000AF
65693+:10015000000000000000000000000000000000009F
65694+:10016000000000020000000000000000000000008D
65695+:10017000000000000000000000000000000000007F
65696+:10018000000000000000000000000010000000005F
65697+:10019000000000000000000000000000000000005F
65698+:1001A000000000000000000000000000000000004F
65699+:1001B000000000000000000000000000000000003F
65700+:1001C000000000000000000000000000000000002F
65701+:1001D000000000000000000000000000000000001F
65702+:1001E0000000000010000003000000000000000DEF
65703+:1001F0000000000D3C020800244256083C030800A1
65704+:1002000024635754AC4000000043202B1480FFFDB2
65705+:10021000244200043C1D080037BD9FFC03A0F021D0
65706+:100220003C100800261001183C1C0800279C5608AA
65707+:100230000E000256000000000000000D27BDFFB4B4
65708+:10024000AFA10000AFA20004AFA30008AFA4000C50
65709+:10025000AFA50010AFA60014AFA70018AFA8001CF0
65710+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
65711+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
65712+:10028000AFB90040AFBC0044AFBF00480E001544FA
65713+:10029000000000008FBF00488FBC00448FB90040B1
65714+:1002A0008FB8003C8FAF00388FAE00348FAD003078
65715+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
65716+:1002C0008FA8001C8FA700188FA600148FA5001000
65717+:1002D0008FA4000C8FA300088FA200048FA1000040
65718+:1002E00027BD004C3C1B60108F7A5030377B502864
65719+:1002F00003400008AF7A00008F82002427BDFFE092
65720+:10030000AFB00010AFBF0018AFB100148C42000CAA
65721+:100310003C1080008E110100104000348FBF001887
65722+:100320000E000D84000000008F85002024047FFF54
65723+:100330000091202BACB100008E030104960201084D
65724+:1003400000031C003042FFFF00621825ACA300042C
65725+:100350009202010A96030114304200FF3063FFFF4E
65726+:100360000002140000431025ACA200089603010C03
65727+:100370009602010E00031C003042FFFF00621825A8
65728+:10038000ACA3000C960301109602011200031C009E
65729+:100390003042FFFF00621825ACA300108E02011846
65730+:1003A000ACA200148E02011CACA20018148000083C
65731+:1003B0008F820024978200003C0420050044182509
65732+:1003C00024420001ACA3001C0A0000C6A782000062
65733+:1003D0003C0340189442001E00431025ACA2001CB0
65734+:1003E0000E000DB8240400018FBF00188FB1001457
65735+:1003F0008FB000100000102103E0000827BD00208E
65736+:100400003C0780008CE202B834E50100044100089A
65737+:10041000240300013C0208008C42006024420001D9
65738+:100420003C010800AC22006003E0000800601021DD
65739+:100430003C0208008C42005C8CA4002094A30016AF
65740+:100440008CA6000494A5000E24420001ACE40280B6
65741+:100450002463FFFC3C010800AC22005C3C0210005D
65742+:10046000A4E30284A4E5028600001821ACE6028819
65743+:10047000ACE202B803E000080060102127BDFFE0F5
65744+:100480003C028000AFB0001034420100AFBF001C3E
65745+:10049000AFB20018AFB100148C43000094450008BF
65746+:1004A0002462FE002C42038110400003000381C23D
65747+:1004B0000A00010226100004240201001462000553
65748+:1004C0003C1180003C02800890420004305000FF44
65749+:1004D0003C11800036320100964300143202000FB6
65750+:1004E00000021500004310253C0308008C63004403
65751+:1004F00030A40004AE220080246300013C01080007
65752+:10050000AC2300441080000730A200028FBF001C03
65753+:100510008FB200188FB100148FB000100A0000CE07
65754+:1005200027BD00201040002D0000182130A20080BF
65755+:1005300010400005362200708E44001C0E000C672F
65756+:10054000240500A0362200708C4400008F82000C2D
65757+:10055000008210232C43012C10600004AF82001095
65758+:10056000240300010A000145AF84000C8E42000400
65759+:100570003C036020AF84000CAC6200143C02080015
65760+:100580008C42005850400015000018218C62000475
65761+:10059000240301FE304203FF144300100000182121
65762+:1005A0002E020004104000032E0200080A00014041
65763+:1005B0000000802114400003000000000A000140F8
65764+:1005C0002610FFF90000000D2402000202021004B0
65765+:1005D0003C036000AC626914000018218FBF001C4E
65766+:1005E0008FB200188FB100148FB00010006010217E
65767+:1005F00003E0000827BD00203C0480008C8301003C
65768+:1006000024020100506200033C0280080000000D3B
65769+:100610003C02800890430004000010213063000F6A
65770+:1006200000031D0003E00008AC8300800004188074
65771+:100630002782FF9C00621821000410C00044102390
65772+:100640008C640000000210C03C030800246356E4E0
65773+:10065000004310213C038000AC64009003E00008DC
65774+:10066000AF8200243C0208008C42011410400019A3
65775+:100670003084400030A2007F000231C03C02020002
65776+:100680001080001400A218253C026020AC43001426
65777+:100690003C0408008C8456B83C0308008C630110AD
65778+:1006A0003C02800024050900AC4500200086202182
65779+:1006B000246300013C028008AC4400643C01080053
65780+:1006C000AC2301103C010800AC2456B803E000083C
65781+:1006D000000000003C02602003E00008AC4500146C
65782+:1006E00003E000080000102103E0000800001021D2
65783+:1006F00030A2000810400008240201003C0208005B
65784+:100700008C42010C244200013C010800AC22010C87
65785+:1007100003E0000800000000148200080000000050
65786+:100720003C0208008C4200FC244200013C0108000D
65787+:10073000AC2200FC0A0001A330A200203C02080009
65788+:100740008C420084244200013C010800AC22008459
65789+:1007500030A200201040000830A200103C02080027
65790+:100760008C420108244200013C010800AC2201082F
65791+:1007700003E0000800000000104000080000000036
65792+:100780003C0208008C420104244200013C010800A4
65793+:10079000AC22010403E00008000000003C02080055
65794+:1007A0008C420100244200013C010800AC220100FF
65795+:1007B00003E000080000000027BDFFE0AFB1001417
65796+:1007C0003C118000AFB20018AFBF001CAFB00010EA
65797+:1007D0003632010096500008320200041040000733
65798+:1007E000320300028FBF001C8FB200188FB10014BB
65799+:1007F0008FB000100A0000CE27BD00201060000B53
65800+:10080000020028218E2401000E00018A0000000051
65801+:100810003202008010400003240500A10E000C6786
65802+:100820008E44001C0A0001E3240200018E2301040F
65803+:100830008F82000810430006020028218E24010048
65804+:100840000E00018A000000008E220104AF82000821
65805+:10085000000010218FBF001C8FB200188FB1001450
65806+:100860008FB0001003E0000827BD00202C82000498
65807+:1008700014400002000018212483FFFD240200021E
65808+:10088000006210043C03600003E00008AC626914DD
65809+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
65810+:1008A000AFB000103C048000948201083043700017
65811+:1008B000240220001062000A2862200154400052E5
65812+:1008C0008FBF001C24024000106200482402600018
65813+:1008D0001062004A8FBF001C0A0002518FB200183C
65814+:1008E00034820100904300098C5000189451000C90
65815+:1008F000240200091062001C0000902128620009F7
65816+:10090000144000218F8200242402000A5062001249
65817+:10091000323100FF2402000B1062000F00000000C3
65818+:100920002402000C146200188F8200243C0208008C
65819+:100930008C4256B824030900AC83002000501021DB
65820+:100940003C038008AC6200643C010800AC2256B84D
65821+:100950000A0002508FBF001C0E0001E900102602A1
65822+:100960000A0002308F8200240E0001E900102602E6
65823+:100970003C0380089462001A8C72000C3042FFFF26
65824+:10098000020280258F8200248C42000C5040001E01
65825+:100990008FBF001C0E000D84000000003C02800090
65826+:1009A00034420100944300088F82002400031C009D
65827+:1009B0009444001E8F82002000641825AC50000073
65828+:1009C00024040001AC510004AC520008AC40000CFF
65829+:1009D000AC400010AC400014AC4000180E000DB844
65830+:1009E000AC43001C0A0002508FBF001C0E000440E4
65831+:1009F000000000000A0002508FBF001C0E000C9F78
65832+:100A0000000000008FBF001C8FB200188FB10014CF
65833+:100A10008FB000100000102103E0000827BD002067
65834+:100A200027BDFFD8AFB400203C036010AFBF002447
65835+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
65836+:100A40008C6450002402FF7F3C1408002694563822
65837+:100A5000008220243484380CAC6450003C028000B6
65838+:100A6000240300370E0014B0AC4300083C07080014
65839+:100A700024E70618028010212404001D2484FFFFAF
65840+:100A8000AC4700000481FFFD244200043C02080042
65841+:100A9000244207C83C010800AC2256403C02080032
65842+:100AA000244202303C030800246306203C04080072
65843+:100AB000248403B43C05080024A506F03C06080085
65844+:100AC00024C62C9C3C010800AC2256803C02080045
65845+:100AD000244205303C010800AC2756843C01080044
65846+:100AE000AC2656943C010800AC23569C3C010800FF
65847+:100AF000AC2456A03C010800AC2556A43C010800DB
65848+:100B0000AC2256A83C010800AC23563C3C0108002E
65849+:100B1000AC2456443C010800AC2056603C0108005F
65850+:100B2000AC2556643C010800AC2056703C0108001E
65851+:100B3000AC27567C3C010800AC2656903C010800CE
65852+:100B4000AC2356980E00056E00000000AF80000C2C
65853+:100B50003C0280008C5300008F8300043C0208009C
65854+:100B60008C420020106200213262000700008821C0
65855+:100B70002792FF9C3C100800261056E43C02080017
65856+:100B80008C42002024050001022518040043202483
65857+:100B90008F820004004310245044000C26310001D1
65858+:100BA00010800008AF9000248E4300003C028000BB
65859+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
65860+:100BC00026310001AE00000C263100012E22000269
65861+:100BD000261000381440FFE9265200043C020800A9
65862+:100BE0008C420020AF820004326200071040FFD91F
65863+:100BF0003C028000326200011040002D326200028F
65864+:100C00003C0580008CA2010000002021ACA2002045
65865+:100C10008CA301042C42078110400008ACA300A85B
65866+:100C200094A2010824032000304270001443000302
65867+:100C30003C02800890420005304400FF0E0001593C
65868+:100C4000000000003C0280009042010B304300FF96
65869+:100C50002C62001E54400004000310800E00018628
65870+:100C60000A0002EC00000000005410218C42000039
65871+:100C70000040F80900000000104000043C02800021
65872+:100C80008C4301043C026020AC4300143C02080089
65873+:100C90008C4200343C0440003C03800024420001AC
65874+:100CA000AC6401383C010800AC220034326200021E
65875+:100CB00010400010326200043C1080008E0201409F
65876+:100CC000000020210E000159AE0200200E00038317
65877+:100CD000000000003C024000AE0201783C02080027
65878+:100CE0008C420038244200013C010800AC2200384C
65879+:100CF000326200041040FF973C0280003C108000EC
65880+:100D00008E020180000020210E000159AE02002059
65881+:100D10008E03018024020F00546200073C02800809
65882+:100D20008E0201883C0300E03042FFFF00431025A3
65883+:100D30000A000328AE020080344200809042000086
65884+:100D400024030050304200FF14430007000000005D
65885+:100D50000E000362000000001440000300000000C9
65886+:100D60000E000971000000003C0208008C42003CAB
65887+:100D70003C0440003C03800024420001AC6401B804
65888+:100D80003C010800AC22003C0A0002A33C028000A7
65889+:100D90003C02900034420001008220253C02800089
65890+:100DA000AC4400203C0380008C6200200440FFFE25
65891+:100DB0000000000003E00008000000003C0280008A
65892+:100DC000344300010083202503E00008AC440020E8
65893+:100DD00027BDFFE0AFB10014AFB000100080882144
65894+:100DE000AFBF00180E00033230B000FF8F83FF94B6
65895+:100DF000022020219062002502028025A07000259B
65896+:100E00008C7000183C0280000E00033D020280241A
65897+:100E10001600000B8FBF00183C0480008C8201F884
65898+:100E20000440FFFE348201C024030002AC510000E4
65899+:100E3000A04300043C021000AC8201F88FBF0018F0
65900+:100E40008FB100148FB0001003E0000827BD002010
65901+:100E500027BDFFE83C028000AFBF00103442018094
65902+:100E6000944300048C4400083063020010600005C5
65903+:100E7000000028210E00100C000000000A0003787A
65904+:100E8000240500013C02FF000480000700821824B2
65905+:100E90003C02040014620004240500018F82FF94C8
65906+:100EA00090420008240500018FBF001000A010210F
65907+:100EB00003E0000827BD00188F82FF982405000179
65908+:100EC000A040001A3C028000344201400A00034264
65909+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
65910+:100EE000AFB20018AFB10014AFB0001090A2000074
65911+:100EF000304400FF38830020388200300003182B74
65912+:100F00000002102B0062182410600003240200501D
65913+:100F1000148200A88FBF001C90A20005304200017F
65914+:100F2000104000A48FBF001C3C02800034420140EE
65915+:100F3000904200082443FFFF2C6200051040009EF1
65916+:100F40008FB20018000310803C030800246355ACE6
65917+:100F5000004310218C420000004000080000000007
65918+:100F60003C028000345101400E0003328E24000008
65919+:100F70008F92FF948E2200048E50000C1602000205
65920+:100F800024020001AE42000C0E00033D8E2400003E
65921+:100F90008E220004145000068FBF001C8FB2001870
65922+:100FA0008FB100148FB000100A000F7827BD002009
65923+:100FB0008E42000C0A000419000000003C0480006E
65924+:100FC0003482014094A300108C4200043063FFFF80
65925+:100FD0001443001C0000000024020001A4A2001021
65926+:100FE0008C8202380441000F3C0380003C02003F29
65927+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
65928+:1010000000461824004810240002130200031D8229
65929+:10101000106200583C0280008C8202380440FFF7C6
65930+:101020003C038000346201408C44000034620200C2
65931+:10103000AC4400003C021000AC6202380A00043BE1
65932+:101040008FBF001C94A200100A00041900000000C9
65933+:10105000240200201482000F3C0280003C03800028
65934+:1010600094A20012346301408C6300043042FFFFFD
65935+:10107000146200050000000024020001A4A2001276
65936+:101080000A0004028FBF001C94A200120A00041977
65937+:1010900000000000345101400E0003328E24000095
65938+:1010A0008F92FF948E230004964200123050FFFF6F
65939+:1010B0001603000224020001A64200120E00033DA6
65940+:1010C0008E2400008E220004160200068FBF001C32
65941+:1010D0008FB200188FB100148FB000100A00037C8B
65942+:1010E00027BD0020964200120A00041900000000EB
65943+:1010F0003C03800094A20014346301408C6300041C
65944+:101100003042FFFF14620008240200018FBF001C60
65945+:101110008FB200188FB100148FB00010A4A2001479
65946+:101120000A00146327BD002094A20014144000217B
65947+:101130008FBF001C0A000435000000003C03800043
65948+:1011400094A20016346301408C6300043042FFFF18
65949+:101150001462000D240200018FBF001C8FB2001822
65950+:101160008FB100148FB00010A4A200160A000B1457
65951+:1011700027BD00209442007824420004A4A200105D
65952+:101180000A00043B8FBF001C94A200162403000138
65953+:101190003042FFFF144300078FBF001C3C020800D1
65954+:1011A0008C420070244200013C010800AC22007017
65955+:1011B0008FBF001C8FB200188FB100148FB00010C9
65956+:1011C00003E0000827BD002027BDFFD8AFB20018FC
65957+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
65958+:1011E000AFB000103C028000345101008C5001006F
65959+:1011F0009242000092230009304400FF2402001FA5
65960+:10120000106200AB28620020104000192402003850
65961+:101210002862000A1040000D2402000B286200081A
65962+:101220001040002E8F820024046001042862000216
65963+:101230001440002A8F820024240200061062002637
65964+:101240008FBF00200A00055F8FB3001C1062006092
65965+:101250002862000B144000FA8FBF00202402000E09
65966+:10126000106200788F8200240A00055F8FB3001C93
65967+:10127000106200D2286200391040000A2402008067
65968+:1012800024020036106200E528620037104000C3D7
65969+:1012900024020035106200D98FBF00200A00055FCC
65970+:1012A0008FB3001C1062002D2862008110400006E0
65971+:1012B000240200C824020039106200C98FBF002038
65972+:1012C0000A00055F8FB3001C106200A28FBF0020D0
65973+:1012D0000A00055F8FB3001C8F8200248C42000C33
65974+:1012E000104000D78FBF00200E000D8400000000CA
65975+:1012F0003C038000346301008C6200008F85002075
65976+:10130000946700089466000CACA200008C64000492
65977+:101310008F82002400063400ACA400049448001E10
65978+:101320008C62001800073C0000E83825ACA20008D9
65979+:101330008C62001C24040001ACA2000C9062000A24
65980+:1013400000C23025ACA60010ACA00014ACA0001860
65981+:10135000ACA7001C0A00051D8FBF00208F8200244F
65982+:101360008C42000C104000B68FBF00200E000D8490
65983+:10137000000000008F820024962400089625000CAF
65984+:101380009443001E000422029626000E8F82002045
65985+:10139000000426000083202500052C003C0300806B
65986+:1013A00000A6282500832025AC400000AC400004A6
65987+:1013B000AC400008AC40000CAC450010AC40001440
65988+:1013C000AC400018AC44001C0A00051C24040001B9
65989+:1013D0009622000C14400018000000009242000504
65990+:1013E0003042001014400014000000000E000332D0
65991+:1013F0000200202192420005020020213442001008
65992+:101400000E00033DA242000592420000240300208A
65993+:10141000304200FF10430089020020218FBF0020CE
65994+:101420008FB3001C8FB200188FB100148FB0001062
65995+:101430000A00107527BD00280000000D0A00055E97
65996+:101440008FBF00208C42000C1040007D8FBF002019
65997+:101450000E000D84000000008E2200048F84002006
65998+:101460009623000CAC8200003C0280089445002CBE
65999+:101470008F82002400031C0030A5FFFF9446001E4D
66000+:101480003C02400E0065182500C23025AC830004E4
66001+:10149000AC800008AC80000CAC800010AC80001464
66002+:1014A000AC800018AC86001C0A00051C2404000156
66003+:1014B0000E000332020020218F93FF9802002021AA
66004+:1014C0000E00033DA660000C020020210E00034226
66005+:1014D000240500018F8200248C42000C104000582B
66006+:1014E0008FBF00200E000D84000000009622000C2B
66007+:1014F0008F83002000021400AC700000AC62000476
66008+:10150000AC6000088E4400388F820024AC64000C6C
66009+:101510008E46003C9445001E3C02401FAC66001005
66010+:1015200000A228258E62000424040001AC6200148D
66011+:10153000AC600018AC65001C8FBF00208FB3001C8E
66012+:101540008FB200188FB100148FB000100A000DB8D0
66013+:1015500027BD0028240200201082003A8FB3001C0F
66014+:101560000E000F5E00000000104000358FBF00200D
66015+:101570003C0480008C8201F80440FFFE348201C0EC
66016+:1015800024030002AC500000A04300043C02100001
66017+:10159000AC8201F80A00055E8FBF00200200202106
66018+:1015A0008FBF00208FB3001C8FB200188FB10014C2
66019+:1015B0008FB000100A000EA727BD00289625000C4A
66020+:1015C000020020218FBF00208FB3001C8FB20018B3
66021+:1015D0008FB100148FB000100A000ECC27BD002878
66022+:1015E000020020218FB3001C8FB200188FB10014AD
66023+:1015F0008FB000100A000EF727BD00289225000DBD
66024+:10160000020020218FB3001C8FB200188FB100148C
66025+:101610008FB000100A000F4827BD002802002021CB
66026+:101620008FBF00208FB3001C8FB200188FB1001441
66027+:101630008FB000100A000F1F27BD00288FBF0020A9
66028+:101640008FB3001C8FB200188FB100148FB0001040
66029+:1016500003E0000827BD00283C0580008CA202782A
66030+:101660000440FFFE34A2024024030002AC44000008
66031+:10167000A04300043C02100003E00008ACA2027882
66032+:10168000A380001803E00008A38000193C03800039
66033+:101690008C6202780440FFFE8F82001CAC62024024
66034+:1016A00024020002A06202443C02100003E0000891
66035+:1016B000AC6202783C02600003E000088C425404F3
66036+:1016C0009083003024020005008040213063003FF9
66037+:1016D0000000482114620005000050219082004C57
66038+:1016E0009483004E304900FF306AFFFFAD00000CCC
66039+:1016F000AD000010AD000024950200148D05001C03
66040+:101700008D0400183042FFFF004910230002110031
66041+:10171000000237C3004038210086202300A2102B8E
66042+:101720000082202300A72823AD05001CAD0400186B
66043+:10173000A5090014A5090020A50A001603E0000869
66044+:10174000A50A002203E000080000000027BDFFD822
66045+:10175000AFB200183C128008AFB40020AFB3001C39
66046+:10176000AFB10014AFBF0024AFB00010365101007C
66047+:101770003C0260008C4254049222000C3C1408008D
66048+:10178000929400F7304300FF2402000110620032FF
66049+:101790000080982124020002146200353650008037
66050+:1017A0000E00143D000000009202004C2403FF8054
66051+:1017B0003C0480003042007F000211C024420240FD
66052+:1017C0000262102100431824AC8300949245000863
66053+:1017D0009204004C3042007F3C03800614850007D1
66054+:1017E000004380212402FFFFA22200112402FFFFF8
66055+:1017F000A62200120A0005D22402FFFF9602002052
66056+:10180000A222001196020022A62200128E020024BB
66057+:101810003C048008AE2200143485008090A2004C65
66058+:1018200034830100A06200108CA2003CAC6200185E
66059+:101830008C820068AC6200F48C820064AC6200F0C0
66060+:101840008C82006CAC6200F824020001A0A2006847
66061+:101850000A0005EE3C0480080E001456000000004B
66062+:1018600036420080A04000680A0005EE3C04800873
66063+:10187000A2000068A20000690A0006293C02800854
66064+:10188000348300808C62003834850100AC62006CC7
66065+:1018900024020001A062006990A200D59083000894
66066+:1018A000305100FF3072007F12320019001111C058
66067+:1018B00024420240026210212403FF8000431824C6
66068+:1018C0003C048000AC8300943042007F3C038006DF
66069+:1018D000004380218E02000C1040000D02002021E8
66070+:1018E0000E00057E0000000026220001305100FF9E
66071+:1018F0009203003C023410260002102B0002102339
66072+:101900003063007F022288240A0005F8A203003C0D
66073+:101910003C088008350401008C8200E03507008017
66074+:10192000ACE2003C8C8200E0AD02000090E5004C8F
66075+:10193000908600D590E3004C908400D52402FF806F
66076+:1019400000A228243063007F308400FF00A62825F1
66077+:101950000064182A1060000230A500FF38A500803E
66078+:10196000A0E5004CA10500093C0280089043000E50
66079+:10197000344400803C058000A043000A8C8300189A
66080+:101980003C027FFF3442FFFF00621824AC83001842
66081+:101990008CA201F80440FFFE00000000ACB301C0BF
66082+:1019A0008FBF00248FB400208FB3001C8FB20018AB
66083+:1019B0008FB100148FB0001024020002A0A201C455
66084+:1019C00027BD00283C02100003E00008ACA201F88B
66085+:1019D00090A2000024420001A0A200003C030800E5
66086+:1019E0008C6300F4304200FF144300020080302179
66087+:1019F000A0A0000090A200008F84001C000211C073
66088+:101A00002442024024830040008220212402FF80DF
66089+:101A1000008220243063007F3C02800A006218218B
66090+:101A20003C028000AC44002403E00008ACC300008A
66091+:101A300094820006908300058C85000C8C86001033
66092+:101A40008C8700188C88001C8C8400203C010800C6
66093+:101A5000A42256C63C010800A02356C53C0108003C
66094+:101A6000AC2556CC3C010800AC2656D03C01080001
66095+:101A7000AC2756D83C010800AC2856DC3C010800D5
66096+:101A8000AC2456E003E00008000000003C0280089F
66097+:101A9000344201008C4400343C038000346504006F
66098+:101AA000AC6400388C420038AF850028AC62003C42
66099+:101AB0003C020005AC6200300000000000000000A5
66100+:101AC00003E00008000000003C020006308400FF34
66101+:101AD000008220253C028000AC4400300000000061
66102+:101AE00000000000000000003C0380008C62000049
66103+:101AF000304200101040FFFD3462040003E0000893
66104+:101B0000AF82002894C200003C080800950800CA73
66105+:101B100030E7FFFF0080482101021021A4C200002D
66106+:101B200094C200003042FFFF00E2102B544000013D
66107+:101B3000A4C7000094A200003C0308008C6300CC02
66108+:101B400024420001A4A2000094A200003042FFFF42
66109+:101B5000144300073C0280080107102BA4A00000DA
66110+:101B60005440000101003821A4C700003C02800855
66111+:101B7000344601008CC3002894A200003C0480007D
66112+:101B80003042FFFE000210C000621021AC82003C17
66113+:101B90008C82003C006218231860000400000000E2
66114+:101BA0008CC200240A0006BA244200018CC2002420
66115+:101BB000AC8200383C020050344200103C038000EC
66116+:101BC000AC620030000000000000000000000000D7
66117+:101BD0008C620000304200201040FFFD0000000039
66118+:101BE00094A200003C04800030420001000210C0BA
66119+:101BF000004410218C430400AD2300008C420404F7
66120+:101C0000AD2200043C02002003E00008AC8200305A
66121+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
66122+:101C2000AFBF001C94C2000000C080213C1208001D
66123+:101C3000965200C624420001A6020000960300004E
66124+:101C400094E2000000E03021144300058FB1003021
66125+:101C50000E00068F024038210A0006F10000000045
66126+:101C60008C8300048C82000424420040046100073D
66127+:101C7000AC8200048C8200040440000400000000D8
66128+:101C80008C82000024420001AC8200009602000019
66129+:101C90003042FFFF50520001A600000096220000D3
66130+:101CA00024420001A62200003C02800834420100C8
66131+:101CB000962300009442003C144300048FBF001C94
66132+:101CC00024020001A62200008FBF001C8FB2001862
66133+:101CD0008FB100148FB0001003E0000827BD002072
66134+:101CE00027BDFFE03C028008AFBF0018344201006E
66135+:101CF0008C4800343C03800034690400AC68003830
66136+:101D00008C42003830E700FFAF890028AC62003C0D
66137+:101D10003C020005AC620030000000000000000042
66138+:101D200000000000000000000000000000000000B3
66139+:101D30008C82000C8C82000C97830016AD22000070
66140+:101D40008C82001000604021AD2200048C820018BB
66141+:101D5000AD2200088C82001CAD22000C8CA2001465
66142+:101D6000AD2200108C820020AD220014908200056C
66143+:101D7000304200FF00021200AD2200188CA20018B1
66144+:101D8000AD22001C8CA2000CAD2200208CA2001001
66145+:101D9000AD2200248CA2001CAD2200288CA20020C1
66146+:101DA000AD22002C3402FFFFAD260030AD20003400
66147+:101DB000506200013408FFFFAD28003850E00011E8
66148+:101DC0003C0280083C048008348401009482005066
66149+:101DD0003042FFFFAD22003C9483004494850044D0
66150+:101DE000240200013063FFFF000318C200641821C1
66151+:101DF0009064006430A5000700A210040A00075C8C
66152+:101E00000044102534420100AD20003C94430044BE
66153+:101E1000944400443063FFFF000318C2006218219D
66154+:101E200030840007906500642402000100821004E1
66155+:101E30000002102700451024A0620064000000008A
66156+:101E400000000000000000003C0200063442004098
66157+:101E50003C038000AC620030000000000000000085
66158+:101E6000000000008C620000304200101040FFFDB6
66159+:101E70003C06800834C201503463040034C7014A70
66160+:101E800034C4013434C5014034C60144AFA200104B
66161+:101E90000E0006D2AF8300288FBF001803E00008B1
66162+:101EA00027BD00208F8300143C0608008CC600E884
66163+:101EB0008F82001C30633FFF000319800046102111
66164+:101EC000004310212403FF80004318243C068000B7
66165+:101ED000ACC300283042007F3C03800C004330211B
66166+:101EE00090C2000D30A500FF0000382134420010E0
66167+:101EF000A0C2000D8F8900143C028008344201000A
66168+:101F00009443004400091382304800032402000176
66169+:101F1000A4C3000E1102000B2902000210400005AC
66170+:101F2000240200021100000C240300010A0007A48F
66171+:101F30000000182111020006000000000A0007A49A
66172+:101F4000000018218CC2002C0A0007A424430001C1
66173+:101F50008CC20014244300018CC200180043102BD3
66174+:101F60005040000A240700012402002714A20003A5
66175+:101F70003C0380080A0007B1240700013463010014
66176+:101F80009462004C24420001A462004C00091382B8
66177+:101F9000304300032C620002104000090080282119
66178+:101FA000146000040000000094C200340A0007C15D
66179+:101FB0003046FFFF8CC600380A0007C10080282188
66180+:101FC000000030213C040800248456C00A000706A3
66181+:101FD0000000000027BDFF90AFB60068AFB50064F9
66182+:101FE000AFB40060AFB3005CAFB20058AFB1005403
66183+:101FF000AFBF006CAFB000508C9000000080B021EB
66184+:102000003C0208008C4200E8960400328F83001CDA
66185+:102010002414FF8030843FFF0062182100042180D7
66186+:1020200000641821007410243C13800000A090214B
66187+:1020300090A50000AE620028920400323C02800CA1
66188+:102040003063007F00628821308400C02402004099
66189+:10205000148200320000A8218E3500388E2200182C
66190+:102060001440000224020001AE2200189202003C3B
66191+:10207000304200201440000E8F83001C000511C068
66192+:102080002442024000621821306400783C02008043
66193+:102090000082202500741824AE630800AE64081086
66194+:1020A0008E2200188E03000800431021AE22001873
66195+:1020B0008E22002C8E230018244200010062182B6F
66196+:1020C0001060004300000000924200002442000122
66197+:1020D000A24200003C0308008C6300F4304200FF81
66198+:1020E00050430001A2400000924200008F84001C77
66199+:1020F000000211C024420240248300403063007F6C
66200+:10210000008220213C02800A0094202400621821D1
66201+:10211000AE6400240A0008D2AEC30000920300326D
66202+:102120002402FFC000431024304200FF1440000589
66203+:1021300024020001AE220018962200340A00084250
66204+:102140003055FFFF8E22001424420001AE220018F9
66205+:102150009202003000021600000216030441001C27
66206+:10216000000000009602003227A400100080282101
66207+:10217000A7A20016960200320000302124070001B9
66208+:102180003042FFFFAF8200140E000706AFA0001C14
66209+:10219000960200328F83001C3C0408008C8400E807
66210+:1021A00030423FFF000211800064182100621821B4
66211+:1021B00000741024AE62002C3063007F3C02800E5D
66212+:1021C000006218219062000D3042007FA062000D75
66213+:1021D0009222000D304200105040007892420000E0
66214+:1021E0003C028008344401009482004C8EC30000FD
66215+:1021F0003C130800967300C62442FFFFA482004CE3
66216+:10220000946200329623000E3054FFFF3070FFFFBF
66217+:102210003C0308008C6300D000701807A7A30038A7
66218+:102220009482003E3063FFFF3042FFFF14620007DC
66219+:10223000000000008C8200303C038000244200300B
66220+:10224000AC62003C0A00086A8C82002C9482004038
66221+:102250003042FFFF5462000927A400408C820038FE
66222+:102260003C03800024420030AC62003C8C8200348D
66223+:10227000AC6200380A0008793C03800027A50038CA
66224+:1022800027A60048026038210E00068FA7A000484C
66225+:102290008FA300403C02800024630030AC43003830
66226+:1022A0008FA30044AC43003C3C0380003C0200058B
66227+:1022B000AC6200303C028008344401009482004249
66228+:1022C000346304003042FFFF0202102B1440000769
66229+:1022D000AF8300289482004E9483004202021021B2
66230+:1022E000004310230A00088F3043FFFF9483004E01
66231+:1022F00094820042026318210050102300621823C8
66232+:102300003063FFFF3C028008344401009482003CAB
66233+:102310003042FFFF14430003000000000A00089F42
66234+:10232000240300019482003C3042FFFF0062102B26
66235+:10233000144000058F8200289482003C0062102324
66236+:102340003043FFFF8F820028AC550000AC400004F2
66237+:10235000AC540008AC43000C3C02000634420010B0
66238+:102360003C038000AC620030000000000000000070
66239+:10237000000000008C620000304200101040FFFDA1
66240+:102380003C04800834840100001018C20064182145
66241+:102390009065006432020007240600010046100424
66242+:1023A00000451025A0620064948300429622000E2E
66243+:1023B00050430001A386001892420000244200010D
66244+:1023C000A24200003C0308008C6300F4304200FF8E
66245+:1023D00050430001A2400000924200008F84001C84
66246+:1023E000000211C0244202402483004000822021C8
66247+:1023F0002402FF80008220243063007F3C02800A98
66248+:10240000006218213C028000AC440024AEC30000EE
66249+:102410008FBF006C8FB600688FB500648FB400600A
66250+:102420008FB3005C8FB200588FB100548FB0005052
66251+:1024300003E0000827BD007027BDFFD8AFB3001C24
66252+:10244000AFB20018AFB10014AFB00010AFBF0020A2
66253+:102450000080982100E0802130B1FFFF0E000D8444
66254+:1024600030D200FF0000000000000000000000006B
66255+:102470008F8200208F830024AC510000AC520004F6
66256+:10248000AC530008AC40000CAC400010AC40001451
66257+:10249000AC4000189463001E02038025AC50001C61
66258+:1024A0000000000000000000000000002404000103
66259+:1024B0008FBF00208FB3001C8FB200188FB10014A3
66260+:1024C0008FB000100A000DB827BD002830A5FFFF0F
66261+:1024D0000A0008DC30C600FF3C02800834430100DB
66262+:1024E0009462000E3C080800950800C63046FFFFC5
66263+:1024F00014C000043402FFFF946500EA0A000929B1
66264+:102500008F84001C10C20027000000009462004E5F
66265+:102510009464003C3045FFFF00A6102300A6182B52
66266+:102520003087FFFF106000043044FFFF00C5102318
66267+:1025300000E210233044FFFF0088102B1040000EF3
66268+:1025400000E810233C028008344401002403000109
66269+:1025500034420080A44300162402FFFFA482000E30
66270+:10256000948500EA8F84001C0000302130A5FFFF15
66271+:102570000A0009013C0760200044102A10400009AD
66272+:102580003C0280083443008094620016304200010F
66273+:10259000104000043C0280009442007E244200145B
66274+:1025A000A462001603E000080000000027BDFFE061
66275+:1025B0003C028008AFBF001CAFB0001834420100DD
66276+:1025C000944300429442004C104000193068FFFFD1
66277+:1025D0009383001824020001146200298FBF001C9D
66278+:1025E0003C06800834D00100000810C200501021C1
66279+:1025F000904200643103000734C70148304200FFB5
66280+:10260000006210073042000134C9014E34C4012C6D
66281+:1026100034C5013E1040001634C601420E0006D2F9
66282+:10262000AFA90010960200420A0009463048FFFF99
66283+:102630003C028008344401009483004494820042A8
66284+:102640001043000F8FBF001C94820044A4820042FC
66285+:1026500094820050A482004E8C820038AC820030FC
66286+:1026600094820040A482003E9482004AA4820048E2
66287+:102670008FBF001C8FB000180A00090427BD00207E
66288+:102680008FB0001803E0000827BD002027BDFFA081
66289+:10269000AFB1004C3C118000AFBF0058AFB3005445
66290+:1026A000AFB20050AFB000483626018890C2000398
66291+:1026B0003044007FA3A400108E32018090C200003D
66292+:1026C0003043007F240200031062003BAF92001CE5
66293+:1026D00028620004104000062402000424020002C4
66294+:1026E000106200098FBF00580A000B0F8FB300540F
66295+:1026F0001062004D240200051062014E8FBF005889
66296+:102700000A000B0F8FB30054000411C002421021C5
66297+:102710002404FF8024420240004410242643004049
66298+:10272000AE2200243063007F3C02800A0062182140
66299+:102730009062003CAFA3003C00441025A062003C26
66300+:102740008FA3003C9062003C304200401040016C7E
66301+:102750008FBF00583C108008A3800018361001007D
66302+:102760008E0200E08C63003427A4003C27A50010F3
66303+:10277000004310210E0007C3AE0200E093A2001038
66304+:102780003C038000A20200D58C6202780440FFFE68
66305+:102790008F82001CAC62024024020002A06202444C
66306+:1027A0003C021000AC6202780E0009390000000003
66307+:1027B0000A000B0E8FBF00583C05800890C3000133
66308+:1027C00090A2000B1443014E8FBF005834A4008028
66309+:1027D0008C8200189082004C90A200083C0260009D
66310+:1027E0008C4254048C8300183C027FFF3442FFFF6C
66311+:1027F000006218243C0208008C4200B4AC8300182C
66312+:102800003C038000244200013C010800AC2200B4DB
66313+:102810008C6201F80440FFFE8F82001CAC6201C094
66314+:102820000A000AD6240200023C10800890C300016E
66315+:102830009202000B144301328FBF005827A40018E6
66316+:1028400036050110240600033C0260008C4254044B
66317+:102850000E000E470000000027A40028360501F0F6
66318+:102860000E000E47240600038FA200283603010045
66319+:10287000AE0200648FA2002CAE0200688FA200306E
66320+:10288000AE02006C93A40018906300D52402FF8070
66321+:102890000082102400431025304900FF3084007F5F
66322+:1028A0003122007F0082102A544000013929008023
66323+:1028B000000411C0244202402403FF800242102180
66324+:1028C00000431024AE220094264200403042007F94
66325+:1028D0003C038006004340218FA3001C2402FFFF1D
66326+:1028E000AFA800403C130800927300F71062003359
66327+:1028F00093A2001995030014304400FF3063FFFFDA
66328+:102900000064182B106000100000000095040014F3
66329+:102910008D07001C8D0600183084FFFF0044202323
66330+:102920000004210000E438210000102100E4202BE5
66331+:1029300000C2302100C43021AD07001CAD060018D4
66332+:102940000A000A2F93A20019950400148D07001C99
66333+:102950008D0600183084FFFF008220230004210030
66334+:10296000000010210080182100C2302300E4202B39
66335+:1029700000C4302300E33823AD07001CAD06001867
66336+:1029800093A200198FA30040A462001497A2001A1A
66337+:10299000A46200168FA2001CAC6200108FA2001C63
66338+:1029A000AC62000C93A20019A462002097A2001A46
66339+:1029B000A46200228FA2001CAC6200243C048008A8
66340+:1029C000348300808C6200388FA20020012088218F
66341+:1029D000AC62003C8FA20020AC82000093A20018E1
66342+:1029E000A062004C93A20018A0820009A0600068B9
66343+:1029F00093A20018105100512407FF803229007F54
66344+:102A0000000911C024420240024210213046007FDA
66345+:102A10003C03800000471024AC6200943C02800616
66346+:102A200000C2302190C2003CAFA60040000020212F
66347+:102A300000471025A0C2003C8FA80040950200026C
66348+:102A4000950300148D07001C3042FFFF3063FFFF29
66349+:102A50008D060018004310230002110000E2382107
66350+:102A600000E2102B00C4302100C23021AD07001C51
66351+:102A7000AD06001895020002A5020014A50000167C
66352+:102A80008D020008AD0200108D020008AD02000C9E
66353+:102A900095020002A5020020A50000228D02000878
66354+:102AA000AD0200249102003C304200401040001A68
66355+:102AB000262200013C108008A3A90038A38000183A
66356+:102AC000361001008E0200E08D03003427A4004080
66357+:102AD00027A50038004310210E0007C3AE0200E016
66358+:102AE00093A200383C038000A20200D58C620278D9
66359+:102AF0000440FFFE8F82001CAC62024024020002F0
66360+:102B0000A06202443C021000AC6202780E00093957
66361+:102B100000000000262200013043007F14730004EF
66362+:102B2000004020212403FF8002231024004320269C
66363+:102B300093A200180A000A4B309100FF93A40018DA
66364+:102B40008FA3001C2402FFFF1062000A308900FFDF
66365+:102B500024820001248300013042007F14530005C9
66366+:102B6000306900FF2403FF800083102400431026F7
66367+:102B7000304900FF3C028008904200080120882173
66368+:102B8000305000FF123000193222007F000211C0C5
66369+:102B900002421021244202402403FF8000431824F3
66370+:102BA0003C048000AC8300943042007F3C038006EC
66371+:102BB000004310218C43000C004020211060000BCA
66372+:102BC000AFA200400E00057E000000002623000199
66373+:102BD0002405FF803062007F145300020225202468
66374+:102BE000008518260A000AAF307100FF3C048008F7
66375+:102BF000348400808C8300183C027FFF3442FFFF46
66376+:102C000000621824AC8300183C0380008C6201F839
66377+:102C10000440FFFE00000000AC7201C0240200026C
66378+:102C2000A06201C43C021000AC6201F80A000B0E65
66379+:102C30008FBF00583C04800890C300019082000BB5
66380+:102C40001443002F8FBF0058349000809202000878
66381+:102C500030420040104000200000000092020008B6
66382+:102C60000002160000021603044100050240202164
66383+:102C70000E000ECC240500930A000B0E8FBF0058E7
66384+:102C80009202000924030018304200FF1443000D93
66385+:102C900002402021240500390E000E64000030217E
66386+:102CA0000E0003328F84001C8F82FF9424030012D5
66387+:102CB000A04300090E00033D8F84001C0A000B0E88
66388+:102CC0008FBF0058240500360E000E64000030212E
66389+:102CD0000A000B0E8FBF00580E0003320240202165
66390+:102CE000920200058F84001C344200200E00033D38
66391+:102CF000A20200050E0010758F84001C8FBF0058C3
66392+:102D00008FB300548FB200508FB1004C8FB0004889
66393+:102D100003E0000827BD00603C0280083445010044
66394+:102D20003C0280008C42014094A3000E0000302140
66395+:102D300000402021AF82001C3063FFFF3402FFFF00
66396+:102D4000106200063C0760202402FFFFA4A2000ED0
66397+:102D500094A500EA0A00090130A5FFFF03E000087E
66398+:102D60000000000027BDFFC83C0280003C06800830
66399+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
66400+:102D8000AFB30024AFB20020AFB00018345101003F
66401+:102D900034C501008C4301008E2200148CA400E491
66402+:102DA0000000A821AF83001C0044102318400052EB
66403+:102DB000A38000188E22001400005021ACA200E471
66404+:102DC00090C3000890A200D53073007FA3A200102A
66405+:102DD0008CB200E08CB400E4304200FF1053003BA2
66406+:102DE00093A200108F83001C2407FF80000211C0F3
66407+:102DF0000062102124420240246300400047102456
66408+:102E00003063007F3C0980003C08800A006818217C
66409+:102E1000AD2200248C62003427A4001427A50010E2
66410+:102E2000024280210290102304400028AFA3001426
66411+:102E30009062003C00E21024304200FF1440001970
66412+:102E4000020090219062003C34420040A062003CAD
66413+:102E50008F86001C93A3001024C200403042007FE4
66414+:102E6000004828213C0208008C4200F42463000141
66415+:102E7000306400FF14820002A3A30010A3A000107E
66416+:102E800093A20010AFA50014000211C0244202401A
66417+:102E900000C2102100471024AD2200240A000B4577
66418+:102EA00093A200100E0007C3000000003C0280083F
66419+:102EB00034420100AC5000E093A30010240A00014A
66420+:102EC000A04300D50A000B4593A200102402000184
66421+:102ED000154200093C0380008C6202780440FFFE2A
66422+:102EE0008F82001CAC62024024020002A0620244F5
66423+:102EF0003C021000AC6202789222000B2403000214
66424+:102F0000304200FF144300720000000096220008C7
66425+:102F1000304300FF24020082146200402402008437
66426+:102F20003C028000344901008D22000C95230006EC
66427+:102F3000000216023063FFFF3045003F24020027E5
66428+:102F400010A2000FAF83001428A200281040000830
66429+:102F5000240200312402002110A2000924020025CD
66430+:102F600010A20007938200190A000BBD00000000A8
66431+:102F700010A20007938200190A000BBD0000000098
66432+:102F80000E000777012020210A000C3D0000000000
66433+:102F90003C0380008C6202780440FFFE8F82001C9C
66434+:102FA000AC62024024020002A06202443C02100013
66435+:102FB000AC6202780A000C3D000000009523000678
66436+:102FC000912400058D25000C8D2600108D270018FA
66437+:102FD0008D28001C8D290020244200013C0108009E
66438+:102FE000A42356C63C010800A02456C53C01080095
66439+:102FF000AC2556CC3C010800AC2656D03C0108005C
66440+:10300000AC2756D83C010800AC2856DC3C0108002F
66441+:10301000AC2956E00A000C3DA38200191462000A94
66442+:10302000240200813C02800834420100944500EAF9
66443+:10303000922600058F84001C30A5FFFF30C600FFDC
66444+:103040000A000BFE3C0760211462005C00000000D7
66445+:103050009222000A304300FF306200201040000737
66446+:10306000306200403C02800834420100944500EA8E
66447+:103070008F84001C0A000BFC24060040104000074F
66448+:10308000000316003C02800834420100944500EA27
66449+:103090008F84001C0A000BFC24060041000216036A
66450+:1030A000044100463C02800834420100944500EA95
66451+:1030B0008F84001C2406004230A5FFFF3C076019E6
66452+:1030C0000E000901000000000A000C3D0000000095
66453+:1030D0009222000B24040016304200FF1044000628
66454+:1030E0003C0680009222000B24030017304200FFB0
66455+:1030F000144300320000000034C5010090A2000B10
66456+:10310000304200FF1444000B000080218CA20020FC
66457+:103110008CA400202403FF800043102400021140EF
66458+:103120003084007F004410253C032000004310251C
66459+:10313000ACC2083094A2000800021400000214037C
66460+:10314000044200012410000194A2000830420080D3
66461+:103150005040001A0200A82194A20008304220002A
66462+:10316000504000160200A8218CA300183C021C2D20
66463+:10317000344219ED106200110200A8213C0208003F
66464+:103180008C4200D4104000053C0280082403000457
66465+:1031900034420100A04300FC3C028008344201009C
66466+:1031A000944500EA8F84001C2406000630A5FFFF2A
66467+:1031B0000E0009013C0760210200A8210E00093918
66468+:1031C000000000009222000A304200081040000473
66469+:1031D00002A010210E0013790000000002A01021AF
66470+:1031E0008FBF00308FB5002C8FB400288FB3002420
66471+:1031F0008FB200208FB1001C8FB0001803E00008D0
66472+:1032000027BD00382402FF80008220243C02900069
66473+:1032100034420007008220253C028000AC4400209C
66474+:103220003C0380008C6200200440FFFE0000000090
66475+:1032300003E00008000000003C0380002402FF803F
66476+:10324000008220243462000700822025AC64002024
66477+:103250008C6200200440FFFE0000000003E0000834
66478+:103260000000000027BDFFD8AFB3001CAFB10014B1
66479+:10327000AFB00010AFBF0020AFB200183C1180000B
66480+:103280003C0280088E32002034530100AE2400201E
66481+:10329000966300EA000514003C074000004738250B
66482+:1032A00000A08021000030210E0009013065FFFFE1
66483+:1032B000240200A1160200022402FFFFA2620009FC
66484+:1032C000AE3200208FBF00208FB3001C8FB20018D9
66485+:1032D0008FB100148FB0001003E0000827BD002854
66486+:1032E0003C0280082403000527BDFFE834420100AA
66487+:1032F000A04300FCAFBF00103C0280008C420100E4
66488+:10330000240500A1004020210E000C67AF82001CA4
66489+:103310003C0380008C6202780440FFFE8F82001C18
66490+:103320008FBF001027BD0018AC62024024020002CB
66491+:10333000A06202443C021000AC62027803E0000884
66492+:103340000000000027BDFFE83C068000AFBF001072
66493+:1033500034C7010094E20008304400FF3883008243
66494+:10336000388200842C6300012C4200010062182581
66495+:103370001060002D24020083938200195040003B0E
66496+:103380008FBF00103C020800904256CC8CC4010054
66497+:103390003C06080094C656C63045003F38A30032AC
66498+:1033A00038A2003F2C6300012C4200010062182566
66499+:1033B000AF84001CAF860014A380001914600007BE
66500+:1033C00000E020212402002014A2001200000000CE
66501+:1033D0003402FFFF14C2000F00000000240200208E
66502+:1033E00014A2000500E028218CE300142402FFFF52
66503+:1033F0005062000B8FBF00103C040800248456C0AC
66504+:10340000000030210E000706240700010A000CD638
66505+:103410008FBF00100E000777000000008FBF001064
66506+:103420000A00093927BD001814820004240200850F
66507+:103430008CC501040A000CE1000020211482000662
66508+:103440002482FF808CC50104240440008FBF00103B
66509+:103450000A00016727BD0018304200FF2C4200021D
66510+:1034600010400004240200228FBF00100A000B2726
66511+:1034700027BD0018148200048F8200248FBF001023
66512+:103480000A000C8627BD00188C42000C1040001E5C
66513+:1034900000E0282190E300092402001814620003D0
66514+:1034A000240200160A000CFC240300081462000722
66515+:1034B00024020017240300123C02800834420080DA
66516+:1034C000A04300090A000D0994A7000854620007F0
66517+:1034D00094A700088F82FF942404FFFE9043000508
66518+:1034E00000641824A043000594A7000890A6001BC0
66519+:1034F0008CA4000094A500068FBF001000073C00BC
66520+:103500000A0008DC27BD00188FBF001003E0000888
66521+:1035100027BD00188F8500243C04800094A2002A57
66522+:103520008CA30034000230C02402FFF000C210243B
66523+:1035300000621821AC83003C8CA200303C03800068
66524+:10354000AC8200383C02005034420010AC620030C3
66525+:103550000000000000000000000000008C6200007D
66526+:10356000304200201040FFFD30C20008104000062D
66527+:103570003C0280008C620408ACA200208C62040C27
66528+:103580000A000D34ACA200248C430400ACA300203C
66529+:103590008C420404ACA200243C0300203C028000C6
66530+:1035A000AC4300303C0480008C8200300043102487
66531+:1035B0001440FFFD8F8600243C020040AC820030A6
66532+:1035C00094C3002A94C2002894C4002C94C5002EF1
66533+:1035D00024630001004410213064FFFFA4C20028CE
66534+:1035E00014850002A4C3002AA4C0002A03E0000836
66535+:1035F000000000008F84002427BDFFE83C05800404
66536+:1036000024840010AFBF00100E000E472406000AED
66537+:103610008F840024948200129483002E3042000F85
66538+:10362000244200030043180424027FFF0043102BB0
66539+:1036300010400002AC8300000000000D0E000D13CE
66540+:10364000000000008F8300248FBF001027BD0018EA
66541+:10365000946200149463001A3042000F00021500B7
66542+:10366000006218253C02800003E00008AC4300A083
66543+:103670008F8300243C028004944400069462001A64
66544+:103680008C650000A4640016004410233042FFFF44
66545+:103690000045102B03E00008384200018F8400240D
66546+:1036A0003C0780049486001A8C85000094E2000692
66547+:1036B000A482001694E3000600C310233042FFFFEB
66548+:1036C0000045102B384200011440FFF8A483001677
66549+:1036D00003E00008000000008F8400243C02800406
66550+:1036E000944200069483001A8C850000A482001680
66551+:1036F000006210233042FFFF0045102B38420001CA
66552+:103700005040000D8F850024006030213C0780046C
66553+:1037100094E20006A482001694E3000600C310237E
66554+:103720003042FFFF0045102B384200011440FFF8E3
66555+:10373000A48300168F8500243C03800034620400BB
66556+:103740008CA40020AF820020AC6400388CA200243E
66557+:10375000AC62003C3C020005AC62003003E00008B3
66558+:10376000ACA000048F8400243C0300068C8200047B
66559+:1037700000021140004310253C038000AC62003081
66560+:103780000000000000000000000000008C6200004B
66561+:10379000304200101040FFFD34620400AC80000491
66562+:1037A00003E00008AF8200208F86002427BDFFE0E1
66563+:1037B000AFB10014AFB00010AFBF00188CC300044D
66564+:1037C0008CC500248F820020309000FF94C4001A22
66565+:1037D00024630001244200202484000124A7002047
66566+:1037E000ACC30004AF820020A4C4001AACC70024FC
66567+:1037F00004A100060000882104E2000594C2001A1A
66568+:103800008CC2002024420001ACC2002094C2001AE5
66569+:1038100094C300282E040001004310262C4200010E
66570+:10382000004410245040000594C2001A24020001F4
66571+:10383000ACC2000894C2001A94C300280010202BC8
66572+:10384000004310262C4200010044102514400007BC
66573+:10385000000000008CC20008144000042402001084
66574+:103860008CC300041462000F8F8500240E000DA786
66575+:10387000241100018F820024944300289442001AEE
66576+:1038800014430003000000000E000D1300000000B0
66577+:10389000160000048F8500240E000D840000000037
66578+:1038A0008F85002494A2001E94A4001C24420001D1
66579+:1038B0003043FFFF14640002A4A2001EA4A0001E57
66580+:1038C0001200000A3C02800494A2001494A3001A7F
66581+:1038D0003042000F00021500006218253C028000F3
66582+:1038E000AC4300A00A000E1EACA0000894420006E3
66583+:1038F00094A3001A8CA40000A4A200160062102356
66584+:103900003042FFFF0044102B384200011040000DF0
66585+:1039100002201021006030213C07800494E2000660
66586+:10392000A4A2001694E3000600C310233042FFFF58
66587+:103930000044102B384200011440FFF8A4A30016E5
66588+:10394000022010218FBF00188FB100148FB000101B
66589+:1039500003E0000827BD002003E00008000000008D
66590+:103960008F82002C3C03000600021140004310250A
66591+:103970003C038000AC62003000000000000000004A
66592+:10398000000000008C620000304200101040FFFD7B
66593+:1039900034620400AF82002803E00008AF80002CEE
66594+:1039A00003E000080000102103E000080000000010
66595+:1039B0003084FFFF30A5FFFF0000182110800007B2
66596+:1039C000000000003082000110400002000420428C
66597+:1039D000006518210A000E3D0005284003E000089C
66598+:1039E0000060102110C0000624C6FFFF8CA200005A
66599+:1039F00024A50004AC8200000A000E4724840004C1
66600+:103A000003E000080000000010A0000824A3FFFF4E
66601+:103A1000AC86000000000000000000002402FFFF50
66602+:103A20002463FFFF1462FFFA2484000403E000080B
66603+:103A3000000000003C0280083442008024030001A2
66604+:103A4000AC43000CA4430010A4430012A443001490
66605+:103A500003E00008A44300168F82002427BDFFD88E
66606+:103A6000AFB3001CAFB20018AFB10014AFB000107C
66607+:103A7000AFBF00208C47000C248200802409FF8007
66608+:103A80003C08800E3043007F008080213C0A80008B
66609+:103A9000004920240068182130B100FF30D200FF17
66610+:103AA00010E000290000982126020100AD44002CFE
66611+:103AB000004928243042007F004820219062000005
66612+:103AC00024030050304200FF1443000400000000B3
66613+:103AD000AD45002C948200EA3053FFFF0E000D84A8
66614+:103AE000000000008F8200248F83002000112C0032
66615+:103AF0009442001E001224003484000100A22825F4
66616+:103B00003C02400000A22825AC7000008FBF0020BE
66617+:103B1000AC6000048FB20018AC7300088FB10014C1
66618+:103B2000AC60000C8FB3001CAC6400108FB00010B0
66619+:103B3000AC60001424040001AC60001827BD00280C
66620+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
66621+:103B50008FB200188FB100148FB0001003E000087E
66622+:103B600027BD00283C06800034C201009043000FAE
66623+:103B7000240200101062000E2865001110A000073A
66624+:103B800024020012240200082405003A10620006F4
66625+:103B90000000302103E0000800000000240500358B
66626+:103BA0001462FFFC000030210A000E6400000000D7
66627+:103BB0008CC200748F83FF9424420FA003E000089E
66628+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
66629+:103BD000240500013C0480088FBF0010240200016E
66630+:103BE00034830080A462001227BD00182402000163
66631+:103BF00003E00008A080001A27BDFFE0AFB2001864
66632+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
66633+:103C10000E000332008088213C028008345000806E
66634+:103C20009202000924030004304200FF1443000CF8
66635+:103C30003C028008124000082402000A0E000E5BBD
66636+:103C400000000000920200052403FFFE0043102440
66637+:103C5000A202000524020012A20200093C02800810
66638+:103C600034420080022020210E00033DA0400027A6
66639+:103C700016400003022020210E000EBF00000000AD
66640+:103C800002202021324600FF8FBF001C8FB2001897
66641+:103C90008FB100148FB00010240500380A000E64A4
66642+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
66643+:103CB000AFB10014AFB000100E00033200808021BD
66644+:103CC0000E000E5B000000003C02800834450080BE
66645+:103CD00090A2000924120018305100FF1232000394
66646+:103CE0000200202124020012A0A2000990A20005D7
66647+:103CF0002403FFFE004310240E00033DA0A2000594
66648+:103D00000200202124050020163200070000302187
66649+:103D10008FBF001C8FB200188FB100148FB000103D
66650+:103D20000A00034227BD00208FBF001C8FB200187D
66651+:103D30008FB100148FB00010240500390A000E6402
66652+:103D400027BD002027BDFFE83C028000AFB0001077
66653+:103D5000AFBF0014344201009442000C2405003629
66654+:103D60000080802114400012304600FF0E00033214
66655+:103D7000000000003C02800834420080240300124E
66656+:103D8000A043000990430005346300100E000E5B51
66657+:103D9000A04300050E00033D020020210200202167
66658+:103DA0000E000342240500200A000F3C0000000022
66659+:103DB0000E000E64000000000E00033202002021FD
66660+:103DC0003C0280089043001B2405FF9F0200202135
66661+:103DD000006518248FBF00148FB00010A043001B93
66662+:103DE0000A00033D27BD001827BDFFE0AFBF001844
66663+:103DF000AFB10014AFB0001030B100FF0E000332BD
66664+:103E0000008080213C02800824030012344200809C
66665+:103E10000E000E5BA04300090E00033D02002021AE
66666+:103E200002002021022030218FBF00188FB1001422
66667+:103E30008FB00010240500350A000E6427BD002055
66668+:103E40003C0480089083000E9082000A1443000B0B
66669+:103E5000000028218F82FF942403005024050001D4
66670+:103E600090420000304200FF1443000400000000B4
66671+:103E70009082000E24420001A082000E03E00008A0
66672+:103E800000A010213C0380008C6201F80440FFFE7A
66673+:103E900024020002AC6401C0A06201C43C02100014
66674+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
66675+:103EB0003C128008AFB10014AFBF001CAFB00010BF
66676+:103EC00036510080922200092403000A304200FF8C
66677+:103ED0001443003E000000008E4300048E22003890
66678+:103EE000506200808FBF001C92220000240300500B
66679+:103EF000304200FF144300253C0280008C42014008
66680+:103F00008E4300043642010002202821AC43001CED
66681+:103F10009622005C8E2300383042FFFF00021040E2
66682+:103F200000621821AE23001C8E4300048E2400384A
66683+:103F30009622005C006418233042FFFF0003184300
66684+:103F4000000210400043102A10400006000000004C
66685+:103F50008E4200048E230038004310230A000FAA6B
66686+:103F6000000220439622005C3042FFFF0002204006
66687+:103F70003C0280083443010034420080ACA4002C91
66688+:103F8000A040002424020001A062000C0E000F5E7D
66689+:103F900000000000104000538FBF001C3C02800056
66690+:103FA0008C4401403C0380008C6201F80440FFFE19
66691+:103FB00024020002AC6401C0A06201C43C021000F3
66692+:103FC000AC6201F80A0010078FBF001C92220009A2
66693+:103FD00024030010304200FF144300043C02800020
66694+:103FE0008C4401400A000FEE0000282192220009B3
66695+:103FF00024030016304200FF14430006240200147C
66696+:10400000A22200093C0280008C4401400A001001F9
66697+:104010008FBF001C8E2200388E23003C00431023EB
66698+:10402000044100308FBF001C92220027244200016F
66699+:10403000A2220027922200272C42000414400016DE
66700+:104040003C1080009222000924030004304200FF4B
66701+:10405000144300093C0280008C4401408FBF001CC7
66702+:104060008FB200188FB100148FB000102405009398
66703+:104070000A000ECC27BD00208C440140240500938B
66704+:104080008FBF001C8FB200188FB100148FB00010CA
66705+:104090000A000F4827BD00208E0401400E000332A5
66706+:1040A000000000008E4200042442FFFFAE420004E4
66707+:1040B0008E22003C2442FFFFAE22003C0E00033D56
66708+:1040C0008E0401408E0401408FBF001C8FB2001887
66709+:1040D0008FB100148FB00010240500040A000342C1
66710+:1040E00027BD00208FB200188FB100148FB00010D0
66711+:1040F00003E0000827BD00203C0680008CC2018838
66712+:104100003C038008346500809063000E00021402B6
66713+:10411000304400FF306300FF1464000E3C0280084E
66714+:1041200090A20026304200FF104400098F82FF94C5
66715+:10413000A0A400262403005090420000304200FF5B
66716+:1041400014430006000000000A0005A18CC4018091
66717+:104150003C02800834420080A044002603E00008AE
66718+:104160000000000027BDFFE030E700FFAFB20018FD
66719+:10417000AFBF001CAFB10014AFB0001000809021A1
66720+:1041800014E0000630C600FF000000000000000D33
66721+:10419000000000000A001060240001163C038008A3
66722+:1041A0009062000E304200FF14460023346200800B
66723+:1041B00090420026304200FF1446001F000000001D
66724+:1041C0009062000F304200FF1446001B0000000008
66725+:1041D0009062000A304200FF144600038F90FF9463
66726+:1041E0000000000D8F90FF948F82FF983C1180009B
66727+:1041F000AE05003CAC450000A066000A0E0003328C
66728+:104200008E240100A20000240E00033D8E24010034
66729+:104210003C0380008C6201F80440FFFE240200028F
66730+:10422000AC7201C0A06201C43C021000AC6201F893
66731+:104230000A0010618FBF001C000000000000000D8C
66732+:10424000000000002400013F8FBF001C8FB2001847
66733+:104250008FB100148FB0001003E0000827BD0020CC
66734+:104260008F83FF943C0280008C44010034420100A3
66735+:104270008C65003C9046001B0A00102724070001B3
66736+:104280003C0280089043000E9042000A0043102632
66737+:10429000304200FF03E000080002102B27BDFFE0C2
66738+:1042A0003C028008AFB10014AFB00010AFBF0018DF
66739+:1042B0003450008092020005240300303042003068
66740+:1042C00014430085008088218F8200248C42000CDA
66741+:1042D000104000828FBF00180E000D840000000007
66742+:1042E0008F860020ACD100009202000892030009E2
66743+:1042F000304200FF00021200306300FF004310252F
66744+:10430000ACC200049202004D000216000002160327
66745+:1043100004410005000000003C0308008C630048D5
66746+:104320000A00109F3C1080089202000830420040B2
66747+:10433000144000030000182192020027304300FFC0
66748+:104340003C108008361100809222004D00031E00B0
66749+:10435000304200FF0002140000621825ACC30008C0
66750+:104360008E2400308F820024ACC4000C8E250034D3
66751+:104370009443001E3C02C00BACC50010006218251F
66752+:104380008E22003800002021ACC200148E22003C96
66753+:10439000ACC200180E000DB8ACC3001C8E020004A5
66754+:1043A0008F8400203C058000AC8200008E2200201B
66755+:1043B000AC8200048E22001CAC8200088E220058C1
66756+:1043C0008CA3007400431021AC82000C8E22002CC0
66757+:1043D000AC8200108E2200408E23004400021400A4
66758+:1043E00000431025AC8200149222004D240300806B
66759+:1043F000304200FF1443000400000000AC800018AD
66760+:104400000A0010E38F8200248E23000C2402000196
66761+:104410001062000E2402FFFF92220008304200408A
66762+:104420001440000A2402FFFF8E23000C8CA20074AB
66763+:10443000006218233C0208000062102414400002AD
66764+:10444000000028210060282100051043AC820018DC
66765+:104450008F820024000020219443001E3C02C00CE7
66766+:10446000006218258F8200200E000DB8AC43001C9E
66767+:104470003C038008346201008C4200008F850020DC
66768+:10448000346300808FBF0018ACA20000ACA0000411
66769+:104490008C6400488F8200248FB10014ACA4000803
66770+:1044A000ACA0000CACA00010906300059446001E68
66771+:1044B0003C02400D00031E0000C23025ACA30014D6
66772+:1044C0008FB00010ACA0001824040001ACA6001CA2
66773+:1044D0000A000DB827BD00208FBF00188FB100144F
66774+:1044E0008FB0001003E0000827BD00203C028000D0
66775+:1044F0009443007C3C02800834460100308400FF75
66776+:104500003065FFFF2402000524A34650A0C4000C20
66777+:104510005482000C3065FFFF90C2000D2C42000752
66778+:104520001040000724A30A0090C3000D24020014C9
66779+:104530000062100400A210210A00111F3045FFFF85
66780+:104540003065FFFF3C0280083442008003E0000831
66781+:10455000A44500143C03800834680080AD05003891
66782+:10456000346701008CE2001C308400FF00A210239D
66783+:104570001840000330C600FF24A2FFFCACE2001C80
66784+:1045800030820001504000083C0380088D02003C4E
66785+:1045900000A2102304410012240400058C620004D0
66786+:1045A00010A2000F3C0380088C62000414A2001EBD
66787+:1045B000000000003C0208008C4200D8304200207D
66788+:1045C000104000093C0280083462008090630008BB
66789+:1045D0009042004C144300043C0280082404000470
66790+:1045E0000A00110900000000344300803442010039
66791+:1045F000A040000C24020001A462001410C0000AB4
66792+:104600003C0280008C4401003C0380008C6201F875
66793+:104610000440FFFE24020002AC6401C0A06201C499
66794+:104620003C021000AC6201F803E00008000000004A
66795+:1046300027BDFFE800A61823AFBF00101860008058
66796+:10464000308800FF3C02800834470080A0E000244E
66797+:1046500034440100A0E000278C82001C00A210233B
66798+:1046600004400056000000008CE2003C94E3005C33
66799+:104670008CE4002C004530233063FFFF00C3182179
66800+:104680000083202B1080000400E018218CE2002C15
66801+:104690000A00117800A2102194E2005C3042FFFF72
66802+:1046A00000C2102100A21021AC62001C3C02800854
66803+:1046B000344400809482005C8C83001C3042FFFFF5
66804+:1046C0000002104000A210210043102B10400004F3
66805+:1046D000000000008C82001C0A00118B3C06800840
66806+:1046E0009482005C3042FFFF0002104000A21021C3
66807+:1046F0003C06800834C3010034C70080AC82001C33
66808+:10470000A060000CACE500388C62001C00A21023F5
66809+:104710001840000224A2FFFCAC62001C3102000120
66810+:10472000104000083C0380088CE2003C00A21023EB
66811+:1047300004410012240400058CC2000410A20010E1
66812+:104740008FBF00108C62000414A2004F8FBF0010B6
66813+:104750003C0208008C4200D8304200201040000A81
66814+:104760003C02800834620080906300089042004C54
66815+:10477000144300053C028008240400048FBF00108D
66816+:104780000A00110927BD001834430080344201009B
66817+:10479000A040000C24020001A46200143C0280002E
66818+:1047A0008C4401003C0380008C6201F80440FFFE51
66819+:1047B000240200020A0011D8000000008CE2001C54
66820+:1047C000004610230043102B54400001ACE5001CB0
66821+:1047D00094E2005C3042FFFF0062102B144000079F
66822+:1047E0002402000294E2005C8CE3001C3042FFFFD4
66823+:1047F00000621821ACE3001C24020002ACE5003882
66824+:104800000E000F5EA082000C1040001F8FBF001032
66825+:104810003C0280008C4401003C0380008C6201F863
66826+:104820000440FFFE24020002AC6401C0A06201C487
66827+:104830003C021000AC6201F80A0011F08FBF0010BA
66828+:1048400031020010104000108FBF00103C028008A1
66829+:10485000344500808CA3001C94A2005C00661823E1
66830+:104860003042FFFF006218213C023FFF3444FFFF4B
66831+:104870000083102B544000010080182100C3102138
66832+:10488000ACA2001C8FBF001003E0000827BD001879
66833+:1048900027BDFFE800C0402100A63023AFBF0010B5
66834+:1048A00018C00026308A00FF3C028008344900808E
66835+:1048B0008D24001C8D23002C008820230064182BDD
66836+:1048C0001060000F344701008CE2002000461021E8
66837+:1048D000ACE200208CE200200044102B1440000BBE
66838+:1048E0003C023FFF8CE2002000441023ACE2002099
66839+:1048F0009522005C3042FFFF0A0012100082202146
66840+:10490000ACE00020008620213C023FFF3443FFFF43
66841+:104910000064102B54400001006020213C028008FC
66842+:104920003442008000851821AC43001CA0400024C4
66843+:10493000A04000270A0012623C03800831420010A8
66844+:10494000104000433C0380083C06800834C40080CB
66845+:104950008C82003C004810235840003E34660080A2
66846+:104960009082002424420001A0820024908200242E
66847+:104970003C0308008C630024304200FF0043102BEE
66848+:10498000144000688FBF001034C201008C42001C2C
66849+:1049900000A2102318400063000000008CC3000434
66850+:1049A0009482005C006818233042FFFF0003184324
66851+:1049B000000210400043102A1040000500000000D3
66852+:1049C0008CC20004004810230A0012450002104364
66853+:1049D0009482005C3042FFFF000210403C068008D9
66854+:1049E000AC82002C34C5008094A2005C8CA4002C06
66855+:1049F00094A3005C3042FFFF00021040008220219F
66856+:104A00003063FFFF0083202101041021ACA2001CB1
66857+:104A10008CC2000434C60100ACC2001C2402000297
66858+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
66859+:104A30003C0280008C4401003C0380008C6201F841
66860+:104A40000440FFFE240200020A001292000000004F
66861+:104A500034660080ACC50038346401008C82001CD0
66862+:104A600000A210231840000224A2FFFCAC82001C0C
66863+:104A7000314200015040000A3C0380088CC2003CD7
66864+:104A800000A2102304430014240400058C620004D7
66865+:104A900014A200033C0380080A00128424040005C9
66866+:104AA0008C62000414A2001F8FBF00103C0208009B
66867+:104AB0008C4200D8304200201040000A3C0280089E
66868+:104AC00034620080906300089042004C144300055B
66869+:104AD0003C028008240400048FBF00100A00110962
66870+:104AE00027BD00183443008034420100A040000C70
66871+:104AF00024020001A46200143C0280008C440100E6
66872+:104B00003C0380008C6201F80440FFFE2402000296
66873+:104B1000AC6401C0A06201C43C021000AC6201F8A8
66874+:104B20008FBF001003E0000827BD001827BDFFE875
66875+:104B30003C0A8008AFBF0010354900808D22003C40
66876+:104B400000C04021308400FF004610231840009D23
66877+:104B500030E700FF354701002402000100A63023A2
66878+:104B6000A0E0000CA0E0000DA522001418C0002455
66879+:104B7000308200108D23001C8D22002C0068182329
66880+:104B80000043102B1040000F000000008CE20020BA
66881+:104B900000461021ACE200208CE200200043102BE4
66882+:104BA0001440000B3C023FFF8CE200200043102326
66883+:104BB000ACE200209522005C3042FFFF0A0012C1E7
66884+:104BC00000621821ACE00020006618213C023FFF83
66885+:104BD0003446FFFF00C3102B5440000100C01821D1
66886+:104BE0003C0280083442008000651821AC43001C60
66887+:104BF000A0400024A04000270A00130F3C038008B7
66888+:104C0000104000403C0380088D22003C00481023E7
66889+:104C10005840003D34670080912200242442000166
66890+:104C2000A1220024912200243C0308008C6300246C
66891+:104C3000304200FF0043102B1440009A8FBF001039
66892+:104C40008CE2001C00A21023184000960000000017
66893+:104C50008D4300049522005C006818233042FFFF5A
66894+:104C600000031843000210400043102A10400005C2
66895+:104C7000012020218D420004004810230A0012F276
66896+:104C8000000210439522005C3042FFFF00021040FA
66897+:104C90003C068008AC82002C34C5008094A2005CE5
66898+:104CA0008CA4002C94A3005C3042FFFF0002104053
66899+:104CB000008220213063FFFF0083182101031021AF
66900+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
66901+:104CD000240200020E000F5EA0C2000C1040007102
66902+:104CE0008FBF00103C0280008C4401003C03800018
66903+:104CF0008C6201F80440FFFE240200020A0013390E
66904+:104D00000000000034670080ACE500383466010024
66905+:104D10008CC2001C00A210231840000224A2FFFC39
66906+:104D2000ACC2001C30820001504000083C038008E7
66907+:104D30008CE2003C00A2102304430051240400052F
66908+:104D40008C62000410A2003E3C0380088C620004C8
66909+:104D500054A200548FBF00103C0208008C4200D8BF
66910+:104D600030420020104000063C028008346200807F
66911+:104D7000906300089042004C104300403C028008C1
66912+:104D80003443008034420100A040000C24020001A2
66913+:104D9000A46200143C0280008C4401003C038000AB
66914+:104DA0008C6201F80440FFFE24020002AC6401C0E2
66915+:104DB000A06201C43C021000AC6201F80A00137743
66916+:104DC0008FBF001024020005A120002714E2000A72
66917+:104DD0003C038008354301009062000D2C42000620
66918+:104DE000504000053C0380089062000D2442000101
66919+:104DF000A062000D3C03800834670080ACE50038F9
66920+:104E0000346601008CC2001C00A21023184000026E
66921+:104E100024A2FFFCACC2001C308200015040000AFA
66922+:104E20003C0380088CE2003C00A2102304410014E3
66923+:104E3000240400058C62000414A200033C038008D3
66924+:104E40000A00136E240400058C62000414A20015ED
66925+:104E50008FBF00103C0208008C4200D83042002076
66926+:104E60001040000A3C028008346200809063000811
66927+:104E70009042004C144300053C02800824040004C6
66928+:104E80008FBF00100A00110927BD001834430080AD
66929+:104E900034420100A040000C24020001A46200146E
66930+:104EA0008FBF001003E0000827BD00183C0B8008EE
66931+:104EB00027BDFFE83C028000AFBF00103442010074
66932+:104EC000356A00809044000A356901008C45001461
66933+:104ED0008D4800389123000C308400FF0105102319
66934+:104EE0001C4000B3306700FF2CE20006504000B1C8
66935+:104EF0008FBF00102402000100E2300430C2000322
66936+:104F00005440000800A8302330C2000C144000A117
66937+:104F100030C20030144000A38FBF00100A00143BC1
66938+:104F20000000000018C00024308200108D43001CD7
66939+:104F30008D42002C006818230043102B1040000FF6
66940+:104F4000000000008D22002000461021AD2200202C
66941+:104F50008D2200200043102B1440000B3C023FFF29
66942+:104F60008D22002000431023AD2200209542005CDA
66943+:104F70003042FFFF0A0013AF00621821AD2000206D
66944+:104F8000006618213C023FFF3446FFFF00C3102B90
66945+:104F90005440000100C018213C02800834420080C7
66946+:104FA00000651821AC43001CA0400024A04000274D
66947+:104FB0000A0013FD3C038008104000403C038008B9
66948+:104FC0008D42003C004810231840003D34670080AB
66949+:104FD0009142002424420001A14200249142002475
66950+:104FE0003C0308008C630024304200FF0043102B78
66951+:104FF000144000708FBF00108D22001C00A21023EF
66952+:105000001840006C000000008D6300049542005CB5
66953+:10501000006818233042FFFF0003184300021040CD
66954+:105020000043102A10400005014020218D62000439
66955+:10503000004810230A0013E0000210439542005C70
66956+:105040003042FFFF000210403C068008AC82002C7A
66957+:1050500034C5008094A2005C8CA4002C94A3005C56
66958+:105060003042FFFF00021040008220213063FFFF2A
66959+:105070000083182101031021ACA2001C8CC2000483
66960+:1050800034C60100ACC2001C240200020E000F5EF8
66961+:10509000A0C2000C104000478FBF00103C028000EF
66962+:1050A0008C4401003C0380008C6201F80440FFFE48
66963+:1050B000240200020A00142D000000003467008062
66964+:1050C000ACE50038346601008CC2001C00A210233D
66965+:1050D0001840000224A2FFFCACC2001C3082000178
66966+:1050E0005040000A3C0380088CE2003C00A21023E0
66967+:1050F00004430014240400058C62000414A200037D
66968+:105100003C0380080A00141F240400058C6200047C
66969+:1051100014A200288FBF00103C0208008C4200D867
66970+:10512000304200201040000A3C02800834620080B7
66971+:10513000906300089042004C144300053C02800834
66972+:10514000240400048FBF00100A00110927BD0018B5
66973+:105150003443008034420100A040000C24020001CE
66974+:10516000A46200143C0280008C4401003C038000D7
66975+:105170008C6201F80440FFFE24020002AC6401C00E
66976+:10518000A06201C43C021000AC6201F80A00143BAA
66977+:105190008FBF00108FBF0010010030210A00115A8C
66978+:1051A00027BD0018010030210A00129927BD001800
66979+:1051B0008FBF001003E0000827BD00183C038008E3
66980+:1051C0003464010024020003A082000C8C620004FD
66981+:1051D00003E00008AC82001C3C05800834A300807A
66982+:1051E0009062002734A501002406004324420001F8
66983+:1051F000A0620027906300273C0208008C42004810
66984+:10520000306300FF146200043C07602194A500EAAB
66985+:105210000A00090130A5FFFF03E0000800000000BC
66986+:1052200027BDFFE8AFBF00103C0280000E00144411
66987+:105230008C4401803C02800834430100A060000CD3
66988+:105240008C4200048FBF001027BD001803E0000847
66989+:10525000AC62001C27BDFFE03C028008AFBF001815
66990+:10526000AFB10014AFB000103445008034460100E7
66991+:105270003C0880008D09014090C3000C8CA4003CC8
66992+:105280008CA200381482003B306700FF9502007C3E
66993+:1052900090A30027146000093045FFFF2402000599
66994+:1052A00054E200083C04800890C2000D2442000132
66995+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
66996+:1052C0003C048008348201009042000C2403000555
66997+:1052D000304200FF1443000A24A205DC348300801E
66998+:1052E000906200272C4200075040000524A20A00CB
66999+:1052F00090630027240200140062100400A2102111
67000+:105300003C108008361000803045FFFF012020212E
67001+:105310000E001444A60500149602005C8E030038AB
67002+:105320003C1180003042FFFF000210400062182153
67003+:10533000AE03001C0E0003328E24014092020025B1
67004+:1053400034420040A20200250E00033D8E2401409D
67005+:105350008E2401403C0380008C6201F80440FFFE73
67006+:1053600024020002AC6401C0A06201C43C0210002F
67007+:10537000AC6201F88FBF00188FB100148FB000101D
67008+:1053800003E0000827BD00203C0360103C02080039
67009+:1053900024420174AC62502C8C6250003C048000AA
67010+:1053A00034420080AC6250003C0208002442547C2D
67011+:1053B0003C010800AC2256003C020800244254384C
67012+:1053C0003C010800AC2256043C020002AC840008F8
67013+:1053D000AC82000C03E000082402000100A0302190
67014+:1053E0003C1C0800279C56083C0200023C050400B7
67015+:1053F00000852826008220260004102B2CA5000101
67016+:105400002C840001000210803C0308002463560035
67017+:105410000085202500431821108000030000102182
67018+:10542000AC6600002402000103E000080000000058
67019+:105430003C1C0800279C56083C0200023C05040066
67020+:1054400000852826008220260004102B2CA50001B0
67021+:105450002C840001000210803C03080024635600E5
67022+:105460000085202500431821108000050000102130
67023+:105470003C02080024425438AC62000024020001BF
67024+:1054800003E00008000000003C0200023C030400AE
67025+:1054900000821026008318262C4200012C63000194
67026+:1054A000004310251040000B000028213C1C080080
67027+:1054B000279C56083C0380008C62000824050001EC
67028+:1054C00000431025AC6200088C62000C00441025DB
67029+:1054D000AC62000C03E0000800A010213C1C080096
67030+:1054E000279C56083C0580008CA3000C0004202754
67031+:1054F000240200010064182403E00008ACA3000C9F
67032+:105500003C020002148200063C0560008CA208D018
67033+:105510002403FFFE0043102403E00008ACA208D0DF
67034+:105520003C02040014820005000000008CA208D098
67035+:105530002403FFFD00431024ACA208D003E00008C0
67036+:10554000000000003C02601A344200108C430080CE
67037+:1055500027BDFFF88C440084AFA3000093A3000094
67038+:10556000240200041462001AAFA4000493A20001F4
67039+:105570001040000797A300023062FFFC3C0380004C
67040+:10558000004310218C4200000A001536AFA200042F
67041+:105590003062FFFC3C03800000431021AC4400005B
67042+:1055A000A3A000003C0560008CA208D02403FFFEED
67043+:1055B0003C04601A00431024ACA208D08FA300045E
67044+:1055C0008FA2000034840010AC830084AC82008081
67045+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
67046+:1055E0003C1C0800279C56083C0280008C43000CA1
67047+:1055F0008C420004004318243C0200021060001496
67048+:10560000006228243C0204003C04000210A00005B3
67049+:10561000006210243C0208008C4256000A00155B10
67050+:1056200000000000104000073C0404003C02080099
67051+:105630008C4256040040F809000000000A00156082
67052+:10564000000000000000000D3C1C0800279C5608CC
67053+:105650008FBF001003E0000827BD0018800802403B
67054+:1056600080080100800800808008000000000C8095
67055+:105670000000320008000E9808000EF408000F88A1
67056+:1056800008001028080010748008010080080080BD
67057+:10569000800800000A000028000000000000000050
67058+:1056A0000000000D6370362E322E316200000000C3
67059+:1056B00006020104000000000000000000000000DD
67060+:1056C000000000000000000038003C000000000066
67061+:1056D00000000000000000000000000000000020AA
67062+:1056E00000000000000000000000000000000000BA
67063+:1056F00000000000000000000000000000000000AA
67064+:10570000000000000000000021003800000000013F
67065+:105710000000002B000000000000000400030D400A
67066+:105720000000000000000000000000000000000079
67067+:105730000000000000000000100000030000000056
67068+:105740000000000D0000000D3C020800244259AC8E
67069+:105750003C03080024635BF4AC4000000043202BB2
67070+:105760001480FFFD244200043C1D080037BD9FFC4F
67071+:1057700003A0F0213C100800261000A03C1C0800EB
67072+:10578000279C59AC0E0002F6000000000000000D3E
67073+:1057900027BDFFB4AFA10000AFA20004AFA3000873
67074+:1057A000AFA4000CAFA50010AFA60014AFA700185F
67075+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
67076+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
67077+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
67078+:1057E0000E000820000000008FBF00488FBC00445E
67079+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
67080+:105800008FAD00308FAC002C8FAB00288FAA002406
67081+:105810008FA900208FA8001C8FA700188FA6001446
67082+:105820008FA500108FA4000C8FA300088FA2000486
67083+:105830008FA1000027BD004C3C1B60188F7A5030B0
67084+:10584000377B502803400008AF7A000000A01821E1
67085+:1058500000801021008028213C0460003C0760008B
67086+:105860002406000810600006348420788C42000072
67087+:10587000ACE220088C63000003E00008ACE3200CDD
67088+:105880000A000F8100000000240300403C02600079
67089+:1058900003E00008AC4320003C0760008F86000452
67090+:1058A0008CE520740086102100A2182B14600007DC
67091+:1058B000000028218F8AFDA024050001A1440013C7
67092+:1058C0008F89000401244021AF88000403E0000810
67093+:1058D00000A010218F84FDA08F8500049086001306
67094+:1058E00030C300FF00A31023AF82000403E00008D0
67095+:1058F000A08000138F84FDA027BDFFE8AFB000108B
67096+:10590000AFBF001490890011908700112402002875
67097+:10591000312800FF3906002830E300FF2485002CE1
67098+:105920002CD00001106200162484001C0E00006EB2
67099+:10593000000000008F8FFDA03C05600024020204DF
67100+:1059400095EE003E95ED003C000E5C0031ACFFFF93
67101+:10595000016C5025ACAA2010520000012402000462
67102+:10596000ACA22000000000000000000000000000C9
67103+:105970008FBF00148FB0001003E0000827BD00188F
67104+:105980000A0000A6000028218F85FDA027BDFFD8B2
67105+:10599000AFBF0020AFB3001CAFB20018AFB100140E
67106+:1059A000AFB000100080982190A4001124B0001C1A
67107+:1059B00024B1002C308300FF386200280E000090D4
67108+:1059C0002C5200010E00009800000000020020216F
67109+:1059D0001240000202202821000028210E00006E43
67110+:1059E000000000008F8DFDA03C0880003C05600099
67111+:1059F00095AC003E95AB003C02683025000C4C0095
67112+:105A0000316AFFFF012A3825ACA7201024020202C8
67113+:105A1000ACA6201452400001240200028FBF0020D7
67114+:105A20008FB3001C8FB200188FB100148FB000101C
67115+:105A300027BD002803E00008ACA2200027BDFFE03E
67116+:105A4000AFB20018AFB10014AFB00010AFBF001C70
67117+:105A50003C1160008E2320748F82000430D0FFFF41
67118+:105A600030F2FFFF1062000C2406008F0E00006E63
67119+:105A7000000000003C06801F0010440034C5FF00F9
67120+:105A80000112382524040002AE2720100000302126
67121+:105A9000AE252014AE2420008FBF001C8FB200184A
67122+:105AA0008FB100148FB0001000C0102103E0000877
67123+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
67124+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
67125+:105AD00000102400009180253C036000AC70201071
67126+:105AE0008FBF00188FB100148FB000102402000483
67127+:105AF000AC62200027BD002003E000080000102158
67128+:105B000027BDFFE03C046018AFBF0018AFB1001420
67129+:105B1000AFB000108C8850002403FF7F34028071E6
67130+:105B20000103382434E5380C241F00313C1980006F
67131+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
67132+:105B40000E00054CAF9100400E00050A3C116000AC
67133+:105B50000E00007D000000008E3008083C0F570941
67134+:105B60002418FFF00218602435EEE00035EDF00057
67135+:105B7000018E5026018D58262D4600012D69000109
67136+:105B8000AF86004C0E000D09AF8900503C06601630
67137+:105B90008CC700003C0860148D0500A03C03FFFF8B
67138+:105BA00000E320243C02535300052FC2108200550D
67139+:105BB00034D07C00960201F2A780006C10400003F4
67140+:105BC000A780007C384B1E1EA78B006C960201F844
67141+:105BD000104000048F8D0050384C1E1EA78C007C96
67142+:105BE0008F8D005011A000058F83004C240E0020E3
67143+:105BF000A78E007CA78E006C8F83004C1060000580
67144+:105C00009785007C240F0020A78F007CA78F006C55
67145+:105C10009785007C2CB8008153000001240500808A
67146+:105C20009784006C2C91040152200001240404008C
67147+:105C30001060000B3C0260008FBF00188FB1001491
67148+:105C40008FB0001027BD0020A784006CA785007CC2
67149+:105C5000A380007EA780007403E00008A780009264
67150+:105C60008C4704382419103C30FFFFFF13F9000360
67151+:105C700030A8FFFF1100004624030050A380007EDF
67152+:105C80009386007E50C00024A785007CA780007CFE
67153+:105C90009798007CA780006CA7800074A780009272
67154+:105CA0003C010800AC3800800E00078700000000AF
67155+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
67156+:105CC000260C0388356A00100000482100002821B6
67157+:105CD00001AE20243C105709AF8C0010AF8A004859
67158+:105CE000AF89001810900023AF8500148FBF0018F3
67159+:105CF0008FB100148FB0001027BD002003E0000812
67160+:105D0000AF80005400055080014648218D260004D4
67161+:105D10000A00014800D180219798007CA784006C7C
67162+:105D2000A7800074A78000923C010800AC38008076
67163+:105D30000E000787000000003C0F60008DED080892
67164+:105D4000240EFFF03C0B600E260C0388356A001011
67165+:105D5000000048210000282101AE20243C105709F2
67166+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
67167+:105D7000AF85001424110001AF9100548FBF0018AB
67168+:105D80008FB100148FB0001003E0000827BD002081
67169+:105D90000A00017BA383007E3083FFFF8F880040D1
67170+:105DA0008F87003C000321403C0580003C020050EE
67171+:105DB000008248253C0660003C0A010034AC040027
67172+:105DC0008CCD08E001AA58241160000500000000F5
67173+:105DD0008CCF08E024E7000101EA7025ACCE08E092
67174+:105DE0008D19001001805821ACB900388D180014AD
67175+:105DF000ACB8003CACA9003000000000000000007E
67176+:105E00000000000000000000000000000000000092
67177+:105E100000000000000000003C0380008C640000D3
67178+:105E2000308200201040FFFD3C0F60008DED08E047
67179+:105E30003C0E010001AE18241460FFE100000000D8
67180+:105E4000AF87003C03E00008AF8B00588F8500400F
67181+:105E5000240BFFF03C06800094A7001A8CA90024B4
67182+:105E600030ECFFFF000C38C000EB5024012A402129
67183+:105E7000ACC8003C8CA400248CC3003C00831023DD
67184+:105E800018400033000000008CAD002025A2000166
67185+:105E90003C0F0050ACC2003835EE00103C068000CC
67186+:105EA000ACCE003000000000000000000000000048
67187+:105EB00000000000000000000000000000000000E2
67188+:105EC000000000003C0480008C9900003338002062
67189+:105ED0001300FFFD30E20008104000173C0980006D
67190+:105EE0008C880408ACA800108C83040CACA30014AC
67191+:105EF0003C1900203C188000AF19003094AE001807
67192+:105F000094AF001C01CF3021A4A6001894AD001A54
67193+:105F100025A70001A4A7001A94AB001A94AC001E98
67194+:105F2000118B00030000000003E0000800000000E7
67195+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
67196+:105F40008D240404ACA400140A0002183C1900209B
67197+:105F50008CA200200A0002003C0F00500A0001EE53
67198+:105F60000000000027BDFFE8AFBF00100E000232A6
67199+:105F7000000000008F8900408FBF00103C038000AC
67200+:105F8000A520000A9528000A9527000427BD0018BF
67201+:105F90003105FFFF30E6000F0006150000A22025A6
67202+:105FA00003E00008AC6400803C0508008CA50020DC
67203+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
67204+:105FC00010A300100000802124040001020430040A
67205+:105FD00000A6202400C3102450440006261000010F
67206+:105FE000001018802787FDA41480000A006718217C
67207+:105FF000261000012E0900025520FFF38F83000CAC
67208+:10600000AF85000C8FBF00148FB0001003E00008B4
67209+:1060100027BD00188C6800003C058000ACA8002457
67210+:106020000E000234261000013C0508008CA500205B
67211+:106030000A0002592E0900022405000100851804F7
67212+:106040003C0408008C84002027BDFFC8AFBF00348B
67213+:1060500000831024AFBE0030AFB7002CAFB60028CD
67214+:10606000AFB50024AFB40020AFB3001CAFB200182E
67215+:10607000AFB1001410400051AFB000108F84004049
67216+:10608000948700069488000A00E8302330D5FFFF8B
67217+:1060900012A0004B8FBF0034948B0018948C000A20
67218+:1060A000016C50233142FFFF02A2482B1520000251
67219+:1060B00002A02021004020212C8F000515E00002C5
67220+:1060C00000809821241300040E0001C102602021E9
67221+:1060D0008F87004002609021AF80004494F4000A52
67222+:1060E000026080211260004E3291FFFF3C1670006A
67223+:1060F0003C1440003C1E20003C1760008F99005863
67224+:106100008F380000031618241074004F0283F82BF8
67225+:1061100017E0003600000000107E00478F86004424
67226+:1061200014C0003A2403000102031023022320219B
67227+:106130003050FFFF1600FFF13091FFFF8F870040C6
67228+:106140003C1100203C108000AE11003094EB000A9E
67229+:106150003C178000024B5021A4EA000A94E9000A8F
67230+:1061600094E800043123FFFF3106000F00062D00E4
67231+:106170000065F025AEFE008094F3000A94F6001846
67232+:1061800012D30036001221408CFF00148CF4001052
67233+:1061900003E468210000C02101A4782B029870213B
67234+:1061A00001CF6021ACED0014ACEC001002B238233A
67235+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
67236+:1061C0008FBE00308FB7002C8FB600288FB500240B
67237+:1061D0008FB400208FB3001C8FB200188FB1001451
67238+:1061E0008FB0001003E0000827BD00381477FFCC03
67239+:1061F0008F8600440E000EE202002021004018218C
67240+:106200008F86004410C0FFC9020310230270702360
67241+:106210008F87004001C368210A0002E431B2FFFF0A
67242+:106220008F86004414C0FFC93C1100203C10800040
67243+:106230000A0002AEAE1100300E00046602002021FA
67244+:106240000A0002DB00401821020020210E0009395B
67245+:10625000022028210A0002DB004018210E0001EE76
67246+:10626000000000000A0002C702B2382327BDFFC8A1
67247+:10627000AFB7002CAFB60028AFB50024AFB40020F4
67248+:10628000AFB3001CAFB20018AFB10014AFB0001034
67249+:10629000AFBF00300E00011B241300013C047FFF40
67250+:1062A0003C0380083C0220003C010800AC20007048
67251+:1062B0003496FFFF34770080345200033C1512C03F
67252+:1062C000241400013C1080002411FF800E000245C0
67253+:1062D000000000008F8700488F8B00188F89001402
67254+:1062E0008CEA00EC8CE800E8014B302B01092823F4
67255+:1062F00000A6102314400006014B18231440000E82
67256+:106300003C05800002A3602B1180000B0000000000
67257+:106310003C0560008CEE00EC8CED00E88CA4180CC1
67258+:10632000AF8E001804800053AF8D00148F8F0010C3
67259+:10633000ADF400003C0580008CBF00003BF900017B
67260+:10634000333800011700FFE13C0380008C6201003C
67261+:1063500024060C0010460009000000008C680100B3
67262+:106360002D043080548000103C0480008C690100B2
67263+:106370002D2331811060000C3C0480008CAA0100A8
67264+:1063800011460004000020218CA6010024C5FF81D5
67265+:1063900030A400FF8E0B01000E000269AE0B00243A
67266+:1063A0000A00034F3C0480008C8D01002DAC3300AB
67267+:1063B00011800022000000003C0708008CE70098D4
67268+:1063C00024EE00013C010800AC2E00983C04800043
67269+:1063D0008C8201001440000300000000566000148D
67270+:1063E0003C0440008C9F01008C9801000000982123
67271+:1063F00003F1C82400193940330F007F00EF7025E6
67272+:1064000001D26825AC8D08308C8C01008C85010090
67273+:10641000258B0100017130240006514030A3007F1C
67274+:106420000143482501324025AC8808303C04400037
67275+:10643000AE0401380A00030E000000008C99010030
67276+:10644000240F0020AC99002092F80000330300FFD5
67277+:10645000106F000C241F0050547FFFDD3C048000AF
67278+:106460008C8401000E00154E000000000A00034F4E
67279+:106470003C04800000963824ACA7180C0A000327BF
67280+:106480008F8F00108C8501000E0008F72404008017
67281+:106490000A00034F3C04800000A4102B24030001D9
67282+:1064A00010400009000030210005284000A4102BF6
67283+:1064B00004A00003000318405440FFFC00052840DE
67284+:1064C0005060000A0004182B0085382B54E00004AB
67285+:1064D0000003184200C33025008520230003184222
67286+:1064E0001460FFF9000528420004182B03E000089F
67287+:1064F00000C310213084FFFF30C600FF3C0780003E
67288+:106500008CE201B80440FFFE00064C000124302557
67289+:106510003C08200000C820253C031000ACE00180AE
67290+:10652000ACE50184ACE4018803E00008ACE301B809
67291+:106530003C0660008CC5201C2402FFF03083020062
67292+:10654000308601001060000E00A2282434A500014E
67293+:106550003087300010E0000530830C0034A50004C3
67294+:106560003C04600003E00008AC85201C1060FFFDC7
67295+:106570003C04600034A5000803E00008AC85201C42
67296+:1065800054C0FFF334A500020A0003B03087300086
67297+:1065900027BDFFE8AFB00010AFBF00143C0760009C
67298+:1065A000240600021080001100A080218F83005873
67299+:1065B0000E0003A78C6400188F8200580000202171
67300+:1065C000240600018C45000C0E000398000000001A
67301+:1065D0001600000224020003000010218FBF0014E7
67302+:1065E0008FB0001003E0000827BD00188CE8201CC5
67303+:1065F0002409FFF001092824ACE5201C8F870058EE
67304+:106600000A0003CD8CE5000C3C02600E00804021A6
67305+:1066100034460100240900180000000000000000BA
67306+:10662000000000003C0A00503C0380003547020097
67307+:10663000AC68003834640400AC65003CAC670030E2
67308+:106640008C6C0000318B00201160FFFD2407FFFFE0
67309+:106650002403007F8C8D00002463FFFF248400044A
67310+:10666000ACCD00001467FFFB24C60004000000004E
67311+:10667000000000000000000024A402000085282B78
67312+:106680003C0300203C0E80002529FFFF010540212E
67313+:10669000ADC300301520FFE00080282103E0000892
67314+:1066A000000000008F82005827BDFFD8AFB3001C48
67315+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
67316+:1066C00094460002008098218C5200182CC300814F
67317+:1066D0008C4800048C4700088C51000C8C49001039
67318+:1066E000106000078C4A00142CC4000414800013AE
67319+:1066F00030EB000730C5000310A0001000000000C0
67320+:106700002410008B02002021022028210E00039873
67321+:10671000240600031660000224020003000010217A
67322+:106720008FBF00208FB3001C8FB200188FB10014F0
67323+:106730008FB0001003E0000827BD00281560FFF1AE
67324+:106740002410008B3C0C80003C030020241F00011F
67325+:10675000AD830030AF9F0044000000000000000047
67326+:10676000000000002419FFF024D8000F031978243A
67327+:106770003C1000D0AD88003801F0702524CD000316
67328+:106780003C08600EAD87003C35850400AD8E0030BE
67329+:10679000000D38823504003C3C0380008C6B000007
67330+:1067A000316200201040FFFD0000000010E00008F2
67331+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
67332+:1067C00024A50004AC8800001467FFFB24840004A7
67333+:1067D0003C05600EACA60038000000000000000080
67334+:1067E000000000008F8600543C0400203C0780001D
67335+:1067F000ACE4003054C000060120202102402021DA
67336+:106800000E0003A7000080210A00041D02002021C1
67337+:106810000E0003DD01402821024020210E0003A7C5
67338+:10682000000080210A00041D0200202127BDFFE096
67339+:10683000AFB200183092FFFFAFB10014AFBF001C21
67340+:10684000AFB000101640000D000088210A0004932C
67341+:106850000220102124050003508500278CE5000C40
67342+:106860000000000D262800013111FFFF24E2002066
67343+:106870000232802B12000019AF8200588F82004430
67344+:10688000144000168F8700583C0670003C0320001F
67345+:106890008CE5000000A62024148300108F84006083
67346+:1068A000000544023C09800000A980241480FFE90F
67347+:1068B000310600FF2CCA000B5140FFEB26280001D7
67348+:1068C000000668803C0E080025CE575801AE6021B6
67349+:1068D0008D8B0000016000080000000002201021E4
67350+:1068E0008FBF001C8FB200188FB100148FB0001042
67351+:1068F00003E0000827BD00200E0003982404008454
67352+:106900001600FFD88F8700580A000474AF8000601B
67353+:10691000020028210E0003BF240400018F870058C5
67354+:106920000A000474AF820060020028210E0003BF39
67355+:10693000000020210A0004A38F8700580E000404E1
67356+:10694000020020218F8700580A000474AF82006083
67357+:1069500030AFFFFF000F19C03C0480008C9001B8DD
67358+:106960000600FFFE3C1920043C181000AC83018097
67359+:10697000AC800184AC990188AC9801B80A00047518
67360+:106980002628000190E2000390E30002000020218D
67361+:106990000002FE0000033A0000FF2825240600083C
67362+:1069A0000E000398000000001600FFDC2402000324
67363+:1069B0008F870058000010210A000474AF82006025
67364+:1069C00090E8000200002021240600090A0004C308
67365+:1069D00000082E0090E4000C240900FF308500FF21
67366+:1069E00010A900150000302190F9000290F8000372
67367+:1069F000308F00FF94EB000400196E000018740043
67368+:106A0000000F62000186202501AE5025014B28258C
67369+:106A10003084FF8B0A0004C32406000A90E30002BE
67370+:106A200090FF0004000020210003360000DF28252D
67371+:106A30000A0004C32406000B0A0004D52406008BB8
67372+:106A4000000449C23127003F000443423C02800059
67373+:106A500000082040240316802CE60020AC43002CC4
67374+:106A600024EAFFE02482000114C0000330A900FFE3
67375+:106A700000801021314700FF000260803C0D800043
67376+:106A8000240A0001018D20213C0B000E00EA28049D
67377+:106A9000008B302111200005000538278CCE000026
67378+:106AA00001C5382503E00008ACC700008CD8000001
67379+:106AB0000307782403E00008ACCF000027BDFFE007
67380+:106AC000AFB10014AFB00010AFBF00183C076000BA
67381+:106AD0008CE408083402F0003C1160003083F000C0
67382+:106AE000240501C03C04800E000030211062000625
67383+:106AF000241000018CEA08083149F0003928E00030
67384+:106B00000008382B000780403C0D0200AE2D081411
67385+:106B1000240C16803C0B80008E2744000E000F8B47
67386+:106B2000AD6C002C120000043C02169124050001FB
67387+:106B3000120500103C023D2C345800E0AE384408E9
67388+:106B40003C1108008E31007C8FBF00183C066000AD
67389+:106B500000118540360F16808FB100148FB00010E1
67390+:106B60003C0E020027BD0020ACCF442003E000080B
67391+:106B7000ACCE08103C0218DA345800E0AE384408B5
67392+:106B80003C1108008E31007C8FBF00183C0660006D
67393+:106B900000118540360F16808FB100148FB00010A1
67394+:106BA0003C0E020027BD0020ACCF442003E00008CB
67395+:106BB000ACCE08100A0004EB240500010A0004EB27
67396+:106BC0000000282124020400A7820024A780001CC2
67397+:106BD000000020213C06080024C65A582405FFFF67
67398+:106BE00024890001000440803124FFFF01061821A0
67399+:106BF0002C87002014E0FFFAAC6500002404040098
67400+:106C0000A7840026A780001E000020213C06080063
67401+:106C100024C65AD82405FFFF248D0001000460809B
67402+:106C200031A4FFFF018658212C8A00201540FFFA6D
67403+:106C3000AD650000A7800028A7800020A780002263
67404+:106C4000000020213C06080024C65B582405FFFFF5
67405+:106C5000249900010004C0803324FFFF030678213B
67406+:106C60002C8E000415C0FFFAADE500003C05600065
67407+:106C70008CA73D002403E08F00E31024344601403C
67408+:106C800003E00008ACA63D002487007F000731C266
67409+:106C900024C5FFFF000518C2246400013082FFFFF5
67410+:106CA000000238C0A78400303C010800AC27003047
67411+:106CB000AF80002C0000282100002021000030219E
67412+:106CC0002489000100A728213124FFFF2CA81701E7
67413+:106CD000110000032C8300801460FFF924C600011A
67414+:106CE00000C02821AF86002C10C0001DA786002AF6
67415+:106CF00024CAFFFF000A11423C08080025085B581F
67416+:106D00001040000A00002021004030212407FFFF2E
67417+:106D1000248E00010004688031C4FFFF01A86021B7
67418+:106D20000086582B1560FFFAAD87000030A2001FC7
67419+:106D30005040000800043080240300010043C804D0
67420+:106D400000041080004878212738FFFF03E0000886
67421+:106D5000ADF8000000C820212405FFFFAC8500002D
67422+:106D600003E000080000000030A5FFFF30C6FFFF71
67423+:106D700030A8001F0080602130E700FF0005294295
67424+:106D80000000502110C0001D24090001240B000147
67425+:106D900025180001010B2004330800FF0126782686
67426+:106DA000390E00202DED00012DC2000101A2182591
67427+:106DB0001060000D014450250005C880032C4021BF
67428+:106DC0000100182110E0000F000A20278D040000A8
67429+:106DD000008A1825AD03000024AD00010000402109
67430+:106DE0000000502131A5FFFF252E000131C9FFFF12
67431+:106DF00000C9102B1040FFE72518000103E0000830
67432+:106E0000000000008D0A0000014440240A0005D162
67433+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
67434+:106E2000AFB00010AFBF001430E7FFFF00005021EB
67435+:106E30003410FFFF0000602124AF001F00C0482174
67436+:106E4000241800012419002005E0001601E010219B
67437+:106E50000002F943019F682A0009702B01AE40240B
67438+:106E600011000017000C18800064102110E00005CC
67439+:106E70008C4B000000F840040008382301675824B8
67440+:106E800000003821154000410000402155600016E7
67441+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
67442+:106EA00001E0102124A2003E0002F943019F682A5C
67443+:106EB0000009702B01AE40241500FFEB000C188078
67444+:106EC000154600053402FFFF020028210E0005B51B
67445+:106ED00000003821020010218FBF00148FB0001075
67446+:106EE00003E0000827BD00181520000301601821E9
67447+:106EF000000B1C0224080010306A00FF154000053A
67448+:106F0000306E000F250D000800031A0231A800FFA3
67449+:106F1000306E000F15C00005307F000325100004FF
67450+:106F200000031902320800FF307F000317E000055C
67451+:106F3000386900012502000200031882304800FF72
67452+:106F4000386900013123000110600004310300FFA3
67453+:106F5000250A0001314800FF310300FF000C6940A1
67454+:106F600001A34021240A000110CAFFD53110FFFF00
67455+:106F7000246E000131C800FF1119FFC638C9000195
67456+:106F80002D1F002053E0001C258B0001240D000163
67457+:106F90000A000648240E002051460017258B0001E8
67458+:106FA00025090001312800FF2D0900205120001281
67459+:106FB000258B000125430001010D5004014B1024D5
67460+:106FC000250900011440FFF4306AFFFF3127FFFF5D
67461+:106FD00010EE000C2582FFFF304CFFFF0000502117
67462+:106FE0003410FFFF312800FF2D0900205520FFF24B
67463+:106FF00025430001258B0001014648260A000602B0
67464+:10700000316CFFFF00003821000050210A000654B7
67465+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
67466+:10702000AFB10014001039423211FFE000071080A8
67467+:10703000AFB3001C00B1282330D3FFFFAFB200185C
67468+:1070400030A5FFFF00809021026030210044202104
67469+:10705000AFBF00200E0005E03207001F022288218A
67470+:107060003403FFFF0240202102002821026030216A
67471+:1070700000003821104300093231FFFF02201021A7
67472+:107080008FBF00208FB3001C8FB200188FB1001487
67473+:107090008FB0001003E0000827BD00280E0005E0B7
67474+:1070A0000000000000408821022010218FBF002036
67475+:1070B0008FB3001C8FB200188FB100148FB0001076
67476+:1070C00003E0000827BD0028000424003C03600002
67477+:1070D000AC603D0810A00002348210063482101605
67478+:1070E00003E00008AC623D0427BDFFE0AFB0001034
67479+:1070F000309000FF2E020006AFBF001810400008BD
67480+:10710000AFB10014001030803C03080024635784A2
67481+:1071100000C328218CA400000080000800000000AB
67482+:10712000000020218FBF00188FB100148FB0001015
67483+:107130000080102103E0000827BD00209791002A5D
67484+:1071400016200051000020213C020800904200332C
67485+:107150000A0006BB00000000978D002615A0003134
67486+:10716000000020210A0006BB2402000897870024A3
67487+:1071700014E0001A00001821006020212402000100
67488+:107180001080FFE98FBF0018000429C2004530219C
67489+:1071900000A6582B1160FFE43C0880003C0720004B
67490+:1071A000000569C001A76025AD0C00203C038008E4
67491+:1071B0002402001F2442FFFFAC6000000441FFFDD9
67492+:1071C0002463000424A5000100A6702B15C0FFF560
67493+:1071D000000569C00A0006A58FBF00189787001C2C
67494+:1071E0003C04080024845A58240504000E0006605C
67495+:1071F00024060001978B002424440001308AFFFFFD
67496+:107200002569FFFF2D48040000402821150000409B
67497+:10721000A789002424AC3800000C19C00A0006B964
67498+:10722000A780001C9787001E3C04080024845AD8BD
67499+:10723000240504000E00066024060001979900262C
67500+:10724000244400013098FFFF272FFFFF2F0E04007A
67501+:107250000040882115C0002CA78F0026A780001EA3
67502+:107260003A020003262401003084FFFF0E00068D41
67503+:107270002C4500010011F8C027F00100001021C0CA
67504+:107280000A0006BB240200089785002E978700227B
67505+:107290003C04080024845B580E00066024060001AC
67506+:1072A0009787002A8F89002C2445000130A8FFFF12
67507+:1072B00024E3FFFF0109302B0040802114C0001897
67508+:1072C000A783002AA7800022978500300E000F7543
67509+:1072D00002002021244A05003144FFFF0E00068DE4
67510+:1072E000240500013C05080094A500320E000F752E
67511+:1072F00002002021244521003C0208009042003376
67512+:107300000A0006BB000521C00A0006F3A784001E80
67513+:1073100024AC3800000C19C00A0006B9A784001C70
67514+:107320000A00070DA7850022308400FF27BDFFE873
67515+:107330002C820006AFBF0014AFB000101040001543
67516+:1073400000A03821000440803C0308002463579CBF
67517+:10735000010328218CA40000008000080000000028
67518+:1073600024CC007F000751C2000C59C23170FFFFCE
67519+:107370002547C40030E5FFFF2784001C02003021B0
67520+:107380000E0005B52407000197860028020620217B
67521+:10739000A78400288FBF00148FB0001003E00008FE
67522+:1073A00027BD00183C0508008CA50030000779C2F5
67523+:1073B0000E00038125E4DF003045FFFF3C04080098
67524+:1073C00024845B58240600010E0005B52407000143
67525+:1073D000978E002A8FBF00148FB0001025CD0001BA
67526+:1073E00027BD001803E00008A78D002A0007C9C2C6
67527+:1073F0002738FF00001878C231F0FFFF3C04080076
67528+:1074000024845AD802002821240600010E0005B564
67529+:1074100024070001978D0026260E0100000E84002F
67530+:1074200025AC00013C0B6000A78C0026AD603D0838
67531+:1074300036040006000030213C0760008CE23D0469
67532+:10744000305F000617E0FFFD24C9000100061B00A5
67533+:10745000312600FF006440252CC50004ACE83D0443
67534+:1074600014A0FFF68FBF00148FB0001003E00008D7
67535+:1074700027BD0018000751C22549C8002406000195
67536+:10748000240700013C04080024845A580E0005B566
67537+:107490003125FFFF978700248FBF00148FB00010A5
67538+:1074A00024E6000127BD001803E00008A786002499
67539+:1074B0003C0660183C090800252900FCACC9502C8A
67540+:1074C0008CC850003C0580003C020002350700805B
67541+:1074D000ACC750003C04080024841FE03C030800B3
67542+:1074E00024631F98ACA50008ACA2000C3C01080066
67543+:1074F000AC2459A43C010800AC2359A803E00008BF
67544+:107500002402000100A030213C1C0800279C59AC3B
67545+:107510003C0C04003C0B0002008B3826008C4026FB
67546+:107520002CE200010007502B2D050001000A4880C5
67547+:107530003C030800246359A4004520250123182199
67548+:107540001080000300001021AC660000240200013E
67549+:1075500003E00008000000003C1C0800279C59AC18
67550+:107560003C0B04003C0A0002008A3026008B3826BF
67551+:107570002CC200010006482B2CE5000100094080C8
67552+:107580003C030800246359A4004520250103182169
67553+:1075900010800005000010213C0C0800258C1F986D
67554+:1075A000AC6C00002402000103E0000800000000B1
67555+:1075B0003C0900023C080400008830260089382677
67556+:1075C0002CC30001008028212CE400010083102539
67557+:1075D0001040000B000030213C1C0800279C59ACD7
67558+:1075E0003C0A80008D4E00082406000101CA68256F
67559+:1075F000AD4D00088D4C000C01855825AD4B000C9D
67560+:1076000003E0000800C010213C1C0800279C59AC76
67561+:107610003C0580008CA6000C0004202724020001F9
67562+:1076200000C4182403E00008ACA3000C3C020002D4
67563+:107630001082000B3C0560003C070400108700032B
67564+:107640000000000003E00008000000008CA908D042
67565+:10765000240AFFFD012A402403E00008ACA808D05A
67566+:107660008CA408D02406FFFE0086182403E000083E
67567+:10767000ACA308D03C05601A34A600108CC300806F
67568+:1076800027BDFFF88CC50084AFA3000093A40000C1
67569+:107690002402001010820003AFA5000403E00008DC
67570+:1076A00027BD000893A7000114E0001497AC000266
67571+:1076B00097B800023C0F8000330EFFFC01CF682119
67572+:1076C000ADA50000A3A000003C0660008CC708D058
67573+:1076D0002408FFFE3C04601A00E82824ACC508D04A
67574+:1076E0008FA300048FA200003499001027BD00086A
67575+:1076F000AF22008003E00008AF2300843C0B800031
67576+:10770000318AFFFC014B48218D2800000A00080C3B
67577+:10771000AFA8000427BDFFE8AFBF00103C1C080065
67578+:10772000279C59AC3C0580008CA4000C8CA2000462
67579+:107730003C0300020044282410A0000A00A31824DF
67580+:107740003C0604003C0400021460000900A610245A
67581+:107750001440000F3C0404000000000D3C1C080015
67582+:10776000279C59AC8FBF001003E0000827BD00180C
67583+:107770003C0208008C4259A40040F80900000000B7
67584+:107780003C1C0800279C59AC0A0008358FBF00102C
67585+:107790003C0208008C4259A80040F8090000000093
67586+:1077A0000A00083B000000003C0880008D0201B880
67587+:1077B0000440FFFE35090180AD2400003C031000A9
67588+:1077C00024040040AD250004A1240008A1260009DE
67589+:1077D000A527000A03E00008AD0301B83084FFFFCD
67590+:1077E0000080382130A5FFFF000020210A00084555
67591+:1077F000240600803087FFFF8CA400002406003898
67592+:107800000A000845000028218F8300788F860070C9
67593+:107810001066000B008040213C07080024E75B68ED
67594+:10782000000328C000A710218C440000246300013D
67595+:10783000108800053063000F5466FFFA000328C06B
67596+:1078400003E00008000010213C07080024E75B6CFF
67597+:1078500000A7302103E000088CC200003C03900028
67598+:1078600034620001008220253C038000AC640020CB
67599+:107870008C65002004A0FFFE0000000003E000086B
67600+:10788000000000003C0280003443000100832025FA
67601+:1078900003E00008AC44002027BDFFE0AFB10014B6
67602+:1078A0003091FFFFAFB00010AFBF001812200013DF
67603+:1078B00000A080218CA20000240400022406020003
67604+:1078C0001040000F004028210E0007250000000096
67605+:1078D00000001021AE000000022038218FBF0018E8
67606+:1078E0008FB100148FB0001000402021000028212B
67607+:1078F000000030210A00084527BD00208CA20000AE
67608+:10790000022038218FBF00188FB100148FB00010F3
67609+:107910000040202100002821000030210A000845F5
67610+:1079200027BD002000A010213087FFFF8CA5000498
67611+:107930008C4400000A000845240600068F83FD9C45
67612+:1079400027BDFFE8AFBF0014AFB00010906700087C
67613+:10795000008010210080282130E600400000202116
67614+:1079600010C000088C5000000E0000BD0200202155
67615+:10797000020020218FBF00148FB000100A000548BC
67616+:1079800027BD00180E0008A4000000000E0000BD76
67617+:1079900002002021020020218FBF00148FB00010B0
67618+:1079A0000A00054827BD001827BDFFE0AFB0001052
67619+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
67620+:1079C00092060001008088210E00087230D2000467
67621+:1079D00092040005001129C2A6050000348300406E
67622+:1079E000A20300050E00087C022020210E00054A9B
67623+:1079F0000220202124020001AE02000C02202821D6
67624+:107A0000A602001024040002A602001224060200AE
67625+:107A1000A60200140E000725A60200161640000F4D
67626+:107A20008FBF001C978C00743C0B08008D6B007896
67627+:107A30002588FFFF3109FFFF256A0001012A382B45
67628+:107A400010E00006A78800743C0F6006240E0016A4
67629+:107A500035ED0010ADAE00508FBF001C8FB2001886
67630+:107A60008FB100148FB0001003E0000827BD002084
67631+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
67632+:107A80001080000400A088212402008010820007DA
67633+:107A9000000000000000000D8FBF00188FB100141F
67634+:107AA0008FB0001003E0000827BD00200E00087210
67635+:107AB00000A020218F86FD9C0220202190C500057A
67636+:107AC0000E00087C30B000FF2403003E1603FFF1D7
67637+:107AD0003C0680008CC401780480FFFE34C801405D
67638+:107AE000240900073C071000AD11000002202021EE
67639+:107AF000A10900048FBF00188FB100148FB00010CF
67640+:107B0000ACC701780A0008C527BD002027BDFFE0EB
67641+:107B1000AFB00010AFBF0018AFB100143C10800030
67642+:107B20008E110020000000000E00054AAE04002067
67643+:107B3000AE1100208FBF00188FB100148FB000105D
67644+:107B400003E0000827BD00203084FFFF00803821BB
67645+:107B50002406003500A020210A0008450000282145
67646+:107B60003084FFFF008038212406003600A0202149
67647+:107B70000A0008450000282127BDFFD0AFB500242A
67648+:107B80003095FFFFAFB60028AFB40020AFBF002C88
67649+:107B9000AFB3001CAFB20018AFB10014AFB000100B
67650+:107BA00030B6FFFF12A000270000A0218F920058DE
67651+:107BB0008E4300003C0680002402004000033E0289
67652+:107BC00000032C0230E4007F006698241482001D1C
67653+:107BD00030A500FF8F8300682C68000A1100001098
67654+:107BE0008F8D0044000358803C0C0800258C57B84A
67655+:107BF000016C50218D4900000120000800000000A8
67656+:107C000002D4302130C5FFFF0E0008522404008446
67657+:107C1000166000028F920058AF8000688F8D00447C
67658+:107C20002659002026980001032090213314FFFFDD
67659+:107C300015A00004AF9900580295202B1480FFDC9A
67660+:107C400000000000028010218FBF002C8FB600289A
67661+:107C50008FB500248FB400208FB3001C8FB20018A2
67662+:107C60008FB100148FB0001003E0000827BD003072
67663+:107C70002407003414A70149000000009247000EB9
67664+:107C80008F9FFDA08F90FD9C24181600A3E700197C
67665+:107C90009242000D3C0880003C07800CA3E20018D3
67666+:107CA000964A00123C0D60003C117FFFA60A005C62
67667+:107CB000964400103623FFFF240200053099FFFF91
67668+:107CC000AE1900548E46001CAD1800288CEF000041
67669+:107CD0008DAE444801E6482601C93021AE06003881
67670+:107CE0008E05003824CB00013C0E7F00AE05003C21
67671+:107CF0008E0C003CAFEC0004AE0B00208E13002075
67672+:107D0000AE13001CA3E0001BAE03002CA3E2001284
67673+:107D10008E4A001424130050AE0A00348E0400343E
67674+:107D2000AFE400148E590018AE1900489258000CA8
67675+:107D3000A218004E920D000835AF0020A20F0008D7
67676+:107D40008E090018012E282434AC4000AE0C001817
67677+:107D5000920B0000317200FF1253027F2403FF8058
67678+:107D60003C04080024845BE80E0008AA0000000020
67679+:107D70003C1108008E315BE80E00087202202021C1
67680+:107D80002405000424080001A2050025022020216A
67681+:107D90000E00087CA20800053C0580008CB001782C
67682+:107DA0000600FFFE8F92005834AE0140240F0002FF
67683+:107DB0003C091000ADD10000A1CF0004ACA90178AE
67684+:107DC0000A000962AF8000682CAD003751A0FF9413
67685+:107DD0008F8D0044000580803C110800263157E05B
67686+:107DE000021178218DEE000001C0000800000000A3
67687+:107DF0002411000414B1008C3C0780003C080800EA
67688+:107E00008D085BE88F86FD9CACE800208E4500085D
67689+:107E10008F99FDA0240D0050ACC500308E4C000899
67690+:107E2000ACCC00508E4B000CACCB00348E43001019
67691+:107E3000ACC300388E4A0010ACCA00548E42001405
67692+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
67693+:107E5000ACD0002090C40000309800FF130D024AFF
67694+:107E6000000000008CC400348CD00030009030231F
67695+:107E700004C000F12404008C126000EE2402000310
67696+:107E80000A000962AF8200682419000514B900666F
67697+:107E90003C0580003C0808008D085BE88F86FD9C4F
67698+:107EA000ACA800208E4C00048F8AFDA0240720007F
67699+:107EB000ACCC001C924B000824120008A14B001906
67700+:107EC0008F82005890430009A14300188F85005805
67701+:107ED00090BF000A33E400FF1092001028890009C7
67702+:107EE000152000BA240E0002240D0020108D000B76
67703+:107EF000340780002898002117000008240740005C
67704+:107F000024100040109000053C0700012419008057
67705+:107F1000109900023C070002240740008CC20018A0
67706+:107F20003C03FF00004350240147F825ACDF001854
67707+:107F300090B2000BA0D200278F8300589464000CED
67708+:107F4000108001FE000000009467000C3C1F8000C0
67709+:107F50002405FFBFA4C7005C9063000E2407000443
67710+:107F6000A0C300088F820058904A000FA0CA0009E1
67711+:107F70008F8900588D3200108FE400740244C823AA
67712+:107F8000ACD900588D300014ACD0002C95380018B6
67713+:107F9000330DFFFFACCD00409531001A322FFFFFAB
67714+:107FA000ACCF00448D2E001CACCE00489128000EB2
67715+:107FB000A0C8000890CC000801855824126001B6C2
67716+:107FC000A0CB00088F9200580A000962AF870068B2
67717+:107FD0002406000614A600143C0E80003C0F080086
67718+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
67719+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
67720+:1080000024040005ACA800048CCC003C1260008164
67721+:10801000AD6C00000A000962AF84006824110007FB
67722+:1080200010B1004B240400063C05080024A55BE8C1
67723+:108030000E000881240400818F9200580013102B39
67724+:108040000A000962AF820068241F002314BFFFF6F4
67725+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
67726+:10806000AD8500208F91FD9C8E4600042564002084
67727+:1080700026450014AE260028240600030E000F81BA
67728+:10808000257000308F87005802002021240600034D
67729+:108090000E000F8124E500083C04080024845BE8FE
67730+:1080A0000E0008AA0000000092230000240A0050DD
67731+:1080B000306200FF544AFFE18F9200580E000F6CAF
67732+:1080C000000000000A000A6A8F920058240800335A
67733+:1080D00014A800323C0380003C1108008E315BE89C
67734+:1080E0008F8FFDA0AC7100208E420008240D002867
67735+:1080F0008F89FD9CADE200308E4A000C24060009F9
67736+:10810000ADEA00348E5F0010ADFF00388E440014DD
67737+:10811000ADE400208E590018ADF900248E58001CE3
67738+:10812000ADF80028A1ED00118E4E00041260003160
67739+:10813000AD2E00288F9200580A000962AF860068B1
67740+:10814000240D002214ADFFB8000000002404000735
67741+:108150003C1008008E105BE83C188000AF10002037
67742+:108160005660FEAEAF8400683C04080024845BE8DF
67743+:108170000E0008AA241300508F84FD9C90920000EA
67744+:10818000325900FF1333014B000000008F9200585A
67745+:10819000000020210A000962AF8400683C05080045
67746+:1081A00024A55BE80E000858240400810A000A6A2E
67747+:1081B0008F92005802D498213265FFFF0E000852BA
67748+:1081C000240400840A0009628F920058108EFF5325
67749+:1081D000240704002887000310E00179241100041B
67750+:1081E000240F0001548FFF4D240740000A000A228B
67751+:1081F000240701003C05080024A55BE80E0008A444
67752+:10820000240400828F920058000030210A00096285
67753+:10821000AF8600683C04080024845BE88CC2003808
67754+:108220000E0008AA8CC3003C8F9200580A000AC0B6
67755+:1082300000002021240400823C05080024A55BE8FE
67756+:108240000E0008A4000000008F92005800001021CA
67757+:108250000A000962AF8200688E5000048F91FD9C75
67758+:108260003C078000ACF00020922C00050200282181
67759+:10827000318B0002156001562404008A8F92FDA004
67760+:108280002404008D9245001B30A6002014C001502C
67761+:1082900002002821922E00092408001231C900FF93
67762+:1082A0001128014B240400810E00087202002021D5
67763+:1082B0009258001B240F000402002021370D0042B9
67764+:1082C000A24D001B0E00087CA22F00253C0580005B
67765+:1082D0008CA401780480FFFE34B90140241F000201
67766+:1082E000AF300000A33F00048F9200583C101000F4
67767+:1082F000ACB001780A000A6B0013102B8E500004FA
67768+:108300008F91FD9C3C038000AC700020922A0005F8
67769+:108310000200282131420002144000172404008A80
67770+:10832000922C00092412000402002821318B00FF46
67771+:1083300011720011240400810E0008720200202135
67772+:108340008F89FDA0240800122405FFFE912F001B39
67773+:108350000200202135EE0020A12E001BA2280009DA
67774+:108360009226000500C538240E00087CA2270005CF
67775+:1083700002002821000020210E0009330000000027
67776+:108380000A000A6A8F9200588E4C00043C07800055
67777+:108390003C10080026105BE8ACEC00203C01080013
67778+:1083A000AC2C5BE8924B0003317100041220013BBE
67779+:1083B0008F84FD9C24020006A0820009924F001BBE
67780+:1083C000240EFFC031E9003F012E4025A08800089F
67781+:1083D0009245000330A6000114C0013200000000E5
67782+:1083E0008E420008AE0200083C0208008C425BF09E
67783+:1083F000104001318F90FDA0000219C28F8DFD9CAD
67784+:10840000A603000C8E4A000C24180001240400145A
67785+:10841000AE0A002C8E420010AE02001C965F0016C1
67786+:10842000A61F003C96590014A619003EADB8000CDA
67787+:10843000A5B80010A5B80012A5B80014A5B800167C
67788+:1084400012600144A2040011925100033232000272
67789+:108450002E5300018F920058266200080A0009621C
67790+:10846000AF8200688E4400043C1980003C068008FE
67791+:10847000AF2400208E45000890D80000240D005045
67792+:10848000331100FF122D009C2407008824060009E8
67793+:108490000E000845000000000A000A6A8F9200588A
67794+:1084A0008E5000043C0980003C118008AD30002053
67795+:1084B0009228000024050050310400FF10850110AF
67796+:1084C0002407008802002021000028210E00084512
67797+:1084D0002406000E922D00002418FF80020028219F
67798+:1084E00001B8802524040004240600300E0007256E
67799+:1084F000A23000000A000A6A8F9200588E500004D1
67800+:108500008F91FDA03C028000AC500020923F001BE8
67801+:1085100033F900101320006C240700810200202191
67802+:10852000000028212406001F0E000845000000005E
67803+:108530000A000A6A8F9200588E44001C0E00085DE3
67804+:1085400000000000104000E3004048218F880058E0
67805+:1085500024070089012020218D05001C240600012C
67806+:108560000E000845000000000A000A6A8F920058B9
67807+:10857000964900023C10080026105BE831280004F0
67808+:10858000110000973C0460008E4E001C3C0F8000E0
67809+:10859000ADEE00203C010800AC2E5BE896470002DF
67810+:1085A00030E40001148000E6000000008E42000468
67811+:1085B000AE0200083C1008008E105BF0120000ECC8
67812+:1085C0003C0F80008F92FD9C241000018E4E0018FD
67813+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
67814+:1085E000A2400005AE50000C3C0808008D085BF06E
67815+:1085F0008F840058A6500010000839C2A6500012FF
67816+:10860000A6500014A6500016A5A7000C8C8C0008DC
67817+:108610008F8B00588F8A0058ADAC002C8D63000CF6
67818+:1086200024070002ADA3001C91460010A1A6001172
67819+:108630008F82005890450011A3E500088F990058DB
67820+:1086400093380012A258004E8F910058922F0013B9
67821+:10865000A1AF00128F920058964E0014A5AE003CB8
67822+:1086600096490016A5A9003E8E480018ADA8001432
67823+:108670005660FD6AAF8700683C05080024A55BE8EA
67824+:108680000E000881000020218F9200580000382140
67825+:108690000A000962AF8700683C05080024A55BE872
67826+:1086A0000E0008A4240400828F9200580A000A4D8C
67827+:1086B000000038210E000F6C000000008F9200585F
67828+:1086C0000A000AC0000020210E00087202002021CA
67829+:1086D0009223001B02002021346A00100E00087C47
67830+:1086E000A22A001B000038210200202100002821BE
67831+:1086F0000A000BA52406001F9242000C305F000107
67832+:1087000013E0000300000000964A000EA4CA002CEB
67833+:10871000924B000C316300025060000600003821CB
67834+:108720008E470014964C0012ACC7001CA4CC001A53
67835+:10873000000038210A000B7F240600093C050800D0
67836+:1087400024A55BE80E0008A42404008B8F92005837
67837+:108750000A000A4D0013382B3C0C08008D8C5BE896
67838+:1087600024DFFFFE25930100326B007F016790211B
67839+:1087700002638824AD110028AE4600E0AE4000E45C
67840+:108780000A0009B3AE5F001CACC000543C0D0800E9
67841+:108790008DAD5BE83C18800C37090100ACED00287A
67842+:1087A0008E510014AD3100E08E4F0014AD2F00E467
67843+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
67844+:1087C0005491FDD6240740000A000A222407100015
67845+:1087D0000E00092D000000000A000A6A8F9200585E
67846+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
67847+:1087F000AC205BE810710062000000003C196C6264
67848+:1088000037387970147800082404000297850074C2
67849+:108810009782006C2404009200A2F82B13E0001948
67850+:1088200002002821240400020E00069524050200FF
67851+:108830003C068000ACC200203C010800AC225BE892
67852+:108840001040000D8F8C0058240A002824040003D7
67853+:10885000918B0010316300FF546A00012404000171
67854+:108860000E0000810000000010400004240400837A
67855+:108870000A000BC28F920058240400833C050800B4
67856+:1088800024A55BE80E000881000000008F920058CC
67857+:108890000013382B0A000962AF8700680A000B49F1
67858+:1088A000240200128E4400080E00085D0000000043
67859+:1088B0000A000B55AE0200083C05080024A55BE841
67860+:1088C0000E000858240400878F9200580A000B728B
67861+:1088D0000013102B240400040E000695240500301C
67862+:1088E0001440002A004048218F8800582407008344
67863+:1088F000012020218D05001C0A000BB32406000175
67864+:108900008F8300788F8600701066FEEE000038219D
67865+:108910003C07080024E75B6C000320C00087282187
67866+:108920008CAE000011D0005D246F000131E3000F18
67867+:108930005466FFFA000320C00A000B8C00003821A7
67868+:108940008E4400040E00085D000000000A000BC801
67869+:10895000AE0200083C05080024A55BE80E0008A450
67870+:10896000240400828F9200580A000B72000010212C
67871+:108970003C05080024A55BE80A000C7C2404008761
67872+:108980008C83442C0A000C5B3C196C628F88005865
67873+:108990003C0780083C0C8000240B0050240A000196
67874+:1089A000AD820020A0EB0000A0EA000191030004CA
67875+:1089B000A0E3001891040005A0E400199106000648
67876+:1089C0003C04080024845B6CA0E6001A91020007B6
67877+:1089D0003C06080024C65B68A0E2001B9105000865
67878+:1089E000A0E5001C911F0009A0FF001D9119000ABD
67879+:1089F000A0F9001E9118000BA0F8001F9112000CA6
67880+:108A0000A0F200209111000DA0F100219110000EA4
67881+:108A1000A0F00022910F000FA0EF0023910E001094
67882+:108A2000A0EE0024910D0011A0ED0025950C00147E
67883+:108A3000A4EC0028950B00168F8A00708F920078A6
67884+:108A4000A4EB002A95030018000A10C02545000178
67885+:108A5000A4E3002C8D1F001C0044C0210046C82147
67886+:108A600030A5000FAF3F0000AF09000010B20006B4
67887+:108A7000AF850070000038218D05001C01202021E9
67888+:108A80000A000BB32406000124AD000131A7000F3A
67889+:108A9000AF8700780A000CF9000038213C06080076
67890+:108AA00024C65B680086902100003821ACA000003D
67891+:108AB0000A000B8CAE4000003C0482013C036000C5
67892+:108AC00034820E02AC603D68AF80009803E000087D
67893+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
67894+:108AE000001018422C620041AFBF00141440000275
67895+:108AF00024040080240300403C010800AC300060E6
67896+:108B00003C010800AC2300640E000F7500602821B2
67897+:108B1000244802BF2409FF8001092824001039805D
67898+:108B2000001030408FBF00148FB0001000A720212C
67899+:108B300000861821AF8300803C010800AC25005856
67900+:108B40003C010800AC24005C03E0000827BD0018CD
67901+:108B5000308300FF30C6FFFF30E400FF3C08800098
67902+:108B60008D0201B80440FFFE000354000144382583
67903+:108B70003C09600000E920253C031000AD050180A0
67904+:108B8000AD060184AD04018803E00008AD0301B81F
67905+:108B90008F8500583C0A6012354800108CAC0004E8
67906+:108BA0003C0D600E35A60010318B00062D690001CA
67907+:108BB000AD0900C48CA70004ACC731808CA20008AA
67908+:108BC00094A40002ACC231848CA3001C0460000396
67909+:108BD000A784009003E00008000000008CAF00189C
67910+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
67911+:108BF0008F8500588F87FF288F86FF308CAE00044A
67912+:108C00003C0F601235E80010ACEE00788CAD000827
67913+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
67914+:108C2000ACCB004894CA00543C0208008C4200447B
67915+:108C300025490001A4C9005494C400543083FFFFA7
67916+:108C400010620017000000003C0208008C42004047
67917+:108C5000A4C200528CA30018ACE300308CA2001414
67918+:108C6000ACE2002C8CB90018ACF900388CB80014B8
67919+:108C700024050001ACF800348D0600BC50C5001975
67920+:108C80008D0200B48D0200B8A4E2004894E40048CC
67921+:108C9000A4E4004A94E800EA03E000083102FFFF80
67922+:108CA0003C0208008C420024A4C00054A4C200521C
67923+:108CB0008CA30018ACE300308CA20014ACE2002CB2
67924+:108CC0008CB90018ACF900388CB8001424050001E8
67925+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
67926+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
67927+:108CF00094E800EA03E000083102FFFF8F86005885
67928+:108D00003C0480008CC900088CC80008000929C0F8
67929+:108D1000000839C0AC87002090C30007306200040F
67930+:108D20001040003EAF85009490CB0007316A0008E8
67931+:108D30001140003D8F87FF2C8CCD000C8CCE001491
67932+:108D400001AE602B11800036000000008CC2000CC8
67933+:108D5000ACE200708CCB00188F85FF288F88FF3025
67934+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
67935+:108D70008CC9000CAD0900608CC4001CACA400D0F0
67936+:108D800090E3007C0062C824A0F9007C90D8000722
67937+:108D9000330F000811E000040000000090ED007C9B
67938+:108DA00035AC0001A0EC007C90CF000731EE000153
67939+:108DB00011C000060000000090E3007C241800347D
67940+:108DC00034790002A0F9007CACB800DC90C2000746
67941+:108DD0003046000210C000040000000090E8007C53
67942+:108DE00035040004A0E4007C90ED007D3C0B600E97
67943+:108DF000356A001031AC003FA0EC007D8D4931D4C4
67944+:108E00003127000110E00002240E0001A0AE00098D
67945+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
67946+:108E20000A000DAF8CC200140A000DB0ACE0007057
67947+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
67948+:108E4000AFB00010AFBF0020AFB10014918F00157C
67949+:108E50003C13600E3673001031EB000FA38B009CA7
67950+:108E60008D8F00048D8B0008959F0012959900103E
67951+:108E70009584001A9598001E958E001C33EDFFFF17
67952+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
67953+:108E90003C010800AC2D00243C010800AC29004432
67954+:108EA0003C010800AC2A0040AE683178AE67317CE6
67955+:108EB00091850015959100163C12601236520010F3
67956+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
67957+:108ED00091830014959F0018240600010066C804C1
67958+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
67959+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
67960+:108F0000918A00159584000E3C07600A314900FFE4
67961+:108F1000AF8B00883084FFFFAE4900C835110010C8
67962+:108F20000E000D1034F004103C0208008C4200606A
67963+:108F30003C0308008C6300643C0608008CC60058A3
67964+:108F40003C0508008CA5005C8F8400808FBF00204A
67965+:108F5000AE23004CAE65319CAE030054AE4500DC40
67966+:108F6000AE6231A0AE6331A4AE663198AE22004845
67967+:108F70008FB3001CAE0200508FB10014AE4200E06F
67968+:108F8000AE4300E4AE4600D88FB000108FB2001898
67969+:108F90000A00057D27BD0028978500929783007CF5
67970+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
67971+:108FB000240400058F900058104000552409000239
67972+:108FC0000E0006958F850080AF8200942404000374
67973+:108FD0001040004F240900023C0680000E00008172
67974+:108FE000ACC2002024070001240820001040004DDE
67975+:108FF00024040005978E00928F8AFF2C24090050CC
67976+:1090000025C50001A7850092A14900003C0D08007C
67977+:109010008DAD0064240380008F84FF28000D66005E
67978+:10902000AD4C0018A5400006954B000A8F85FF3017
67979+:109030002402FF8001633024A546000A915F000AE4
67980+:109040000000482103E2C825A159000AA0A0000899
67981+:10905000A140004CA08000D5961800029783009094
67982+:109060003C020004A49800EA960F00022418FFBFF7
67983+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
67984+:109080008E0C0008ACAC0040A4A00050A4A000547A
67985+:109090008E0B000C240C0030AC8B00288E060010C8
67986+:1090A000AC860024A480003EA487004EA487005014
67987+:1090B000A483003CAD420074AC8800D8ACA800602A
67988+:1090C000A08700FC909F00D433F9007FA09900D4C2
67989+:1090D000909000D402187824A08F00D4914E007C88
67990+:1090E00035CD0001A14D007C938B009CAD480070F4
67991+:1090F000AC8C00DCA08B00D68F8800888F87008422
67992+:10910000AC8800C4AC8700C8A5400078A540007AB0
67993+:109110008FBF00148FB000100120102103E0000861
67994+:1091200027BD00188F8500940E0007258F860080CC
67995+:109130000A000E9F2409000227BDFFE0AFB0001017
67996+:109140008F900058AFB10014AFBF00188E09000413
67997+:109150000E00054A000921C08E0800048F84FF28F4
67998+:109160008F82FF30000839C03C068000ACC7002069
67999+:10917000948500EA904300131460001C30B1FFFF97
68000+:109180008F8CFF2C918B0008316A00401540000B3A
68001+:10919000000000008E0D0004022030218FBF001857
68002+:1091A0008FB100148FB00010240400220000382179
68003+:1091B000000D29C00A000D2F27BD00200E000098C9
68004+:1091C000000000008E0D0004022030218FBF001827
68005+:1091D0008FB100148FB00010240400220000382149
68006+:1091E000000D29C00A000D2F27BD00200E000090A1
68007+:1091F000000000008E0D0004022030218FBF0018F7
68008+:109200008FB100148FB00010240400220000382118
68009+:10921000000D29C00A000D2F27BD002027BDFFE04B
68010+:10922000AFB200183092FFFFAFB00010AFBF001C0C
68011+:10923000AFB100141240001E000080218F8600583C
68012+:109240008CC500002403000600053F02000514023F
68013+:1092500030E4000714830016304500FF2CA80006F8
68014+:1092600011000040000558803C0C0800258C58BCBB
68015+:10927000016C50218D490000012000080000000011
68016+:109280008F8E0098240D000111CD005024020002A1
68017+:10929000AF820098260900013130FFFF24C800206A
68018+:1092A0000212202B010030211480FFE5AF88005806
68019+:1092B000020010218FBF001C8FB200188FB1001464
68020+:1092C0008FB0001003E0000827BD00209387007EC8
68021+:1092D00054E00034000030210E000DE700000000D3
68022+:1092E0008F8600580A000EFF240200018F87009825
68023+:1092F0002405000210E50031240400130000282199
68024+:1093000000003021240700010E000D2F0000000096
68025+:109310000A000F008F8600588F83009824020002F5
68026+:109320001462FFF6240400120E000D9A00000000E3
68027+:109330008F85009400403021240400120E000D2F70
68028+:10934000000038210A000F008F8600588F83009894
68029+:109350002411000310710029241F0002107FFFCE8A
68030+:1093600026090001240400100000282100003021FB
68031+:109370000A000F1D240700018F91009824060002A7
68032+:109380001626FFF9240400100E000E410000000014
68033+:10939000144000238F9800588F8600580A000EFF53
68034+:1093A00024020003240400140E000D2F00002821C5
68035+:1093B0008F8600580A000EFF240200020E000EA93C
68036+:1093C000000000000A000F008F8600580E000D3FBD
68037+:1093D00000000000241900022404001400002821C9
68038+:1093E0000000302100003821AF9900980E000D2FA9
68039+:1093F000000000000A000F008F8600580E000D5775
68040+:10940000000000008F8500942419000200403021E4
68041+:1094100024040010000038210A000F56AF9900986C
68042+:109420000040382124040010970F0002000028217A
68043+:109430000E000D2F31E6FFFF8F8600580A000F0047
68044+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
68045+:109450008C8500182402000100A61824AC83001893
68046+:1094600003E00008A08200053084FFFF30A5FFFF65
68047+:109470001080000700001821308200011040000217
68048+:1094800000042042006518211480FFFB00052840DD
68049+:1094900003E000080060102110C000070000000079
68050+:1094A0008CA2000024C6FFFF24A50004AC820000AB
68051+:1094B00014C0FFFB2484000403E000080000000047
68052+:1094C00010A0000824A3FFFFAC86000000000000ED
68053+:1094D000000000002402FFFF2463FFFF1462FFFA74
68054+:1094E0002484000403E0000800000000000411C010
68055+:1094F00003E000082442024027BDFFE8AFB000109F
68056+:1095000000808021AFBF00140E000F9600A0202124
68057+:1095100000504821240AFF808FBF00148FB0001034
68058+:10952000012A30243127007F3C08800A3C042100B6
68059+:1095300000E8102100C428253C03800027BD001846
68060+:10954000AC650024AF820038AC400000AC6500245C
68061+:1095500003E00008AC4000403C0D08008DAD005811
68062+:1095600000056180240AFF8001A45821016C482174
68063+:10957000012A30243127007F3C08800C3C04210064
68064+:1095800000E8102100C428253C038000AC650028B9
68065+:10959000AF82003403E00008AC40002430A5FFFF98
68066+:1095A0003C0680008CC201B80440FFFE3C086015F8
68067+:1095B00000A838253C031000ACC40180ACC0018475
68068+:1095C000ACC7018803E00008ACC301B83C0D08003B
68069+:1095D0008DAD005800056180240AFF8001A4582148
68070+:1095E000016C4021010A4824000931403107007F05
68071+:1095F00000C728253C04200000A418253C02800058
68072+:10960000AC43083003E00008AF80003427BDFFE81A
68073+:10961000AFB0001000808021AFBF00140E000F9685
68074+:1096200000A0202100504821240BFF80012B502452
68075+:10963000000A39403128007F3C0620008FBF00140B
68076+:109640008FB0001000E8282534C2000100A21825C0
68077+:109650003C04800027BD0018AC83083003E00008FC
68078+:10966000AF8000383C0580088CA700603C0680086D
68079+:109670000087102B144000112C8340008CA8006040
68080+:109680002D0340001060000F240340008CC90060CF
68081+:109690000089282B14A00002008018218CC30060D0
68082+:1096A00000035A42000B30803C0A0800254A59202A
68083+:1096B00000CA202103E000088C8200001460FFF340
68084+:1096C0002403400000035A42000B30803C0A08008B
68085+:1096D000254A592000CA202103E000088C8200009E
68086+:1096E0003C05800890A60008938400AB24C20001CA
68087+:1096F000304200FF3043007F1064000C0002382726
68088+:10970000A0A200083C0480008C85017804A0FFFE24
68089+:109710008F8A00A0240900023C081000AC8A014096
68090+:10972000A089014403E00008AC8801780A00101BFE
68091+:1097300030E2008027BDFFD8AFB200188F9200A49E
68092+:10974000AFBF0020AFB3001CAFB00010AFB100142A
68093+:109750008F9300348E5900283C1000803C0EFFEFA0
68094+:10976000AE7900008E580024A260000A35CDFFFFBC
68095+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
68096+:10978000A271000C8E6F000C3C080040A271000B0F
68097+:1097900001F06025018D4824012A382400E8302595
68098+:1097A000AE66000C8E450004AE6000183C0400FF5D
68099+:1097B000AE6500148E43002C3482FFFFA6600008C3
68100+:1097C0000062F824AE7F00108E5900088F9000A030
68101+:1097D000964E0012AE7900208E51000C31D83FFF1A
68102+:1097E00000187980AE7100248E4D001401F06021C4
68103+:1097F00031CB0001AE6D00288E4A0018000C41C22A
68104+:10980000000B4B80AE6A002C8E46001C01093821EB
68105+:10981000A667001CAE660030964500028E4400200C
68106+:10982000A665001EAE64003492430033306200042B
68107+:1098300054400006924700003C0280083443010077
68108+:109840008C7F00D0AE7F0030924700008F860038BA
68109+:10985000A0C700309245003330A4000250800007BA
68110+:10986000925100018F880038240BFF80910A00304C
68111+:10987000014B4825A1090030925100018F9000381A
68112+:10988000240CFFBF2404FFDFA21100318F8D0038AC
68113+:109890003C1880083711008091AF003C31EE007F0A
68114+:1098A000A1AE003C8F890038912B003C016C502404
68115+:1098B000A12A003C8F9F00388E68001493E6003C7C
68116+:1098C0002D0700010007114000C4282400A218251C
68117+:1098D000A3E3003C8F87003896590012A4F90032A8
68118+:1098E0008E450004922E007C30B0000300107823D7
68119+:1098F00031ED000300AD102131CC000215800002D3
68120+:1099000024460034244600303C0280083443008062
68121+:10991000907F007C00BFC824333800041700000289
68122+:1099200024C2000400C010218F98003824190002BE
68123+:10993000ACE20034A3190000924F003F8F8E003834
68124+:109940003C0C8008358B0080A1CF00018F9100383E
68125+:10995000924D003F8E440004A62D0002956A005CE3
68126+:109960000E000FF43150FFFF00024B800209382532
68127+:109970003C08420000E82825AE2500048E4400384B
68128+:109980008F850038ACA400188E460034ACA6001CAD
68129+:10999000ACA0000CACA00010A4A00014A4A0001661
68130+:1099A000A4A00020A4A00022ACA000248E62001479
68131+:1099B00050400001240200018FBF00208FB3001C23
68132+:1099C0008FB200188FB100148FB00010ACA2000845
68133+:1099D0000A00101327BD002827BDFFC83C058008DA
68134+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
68135+:1099F000AFB60028AFB50024AFB40020AFB3001C51
68136+:109A0000AFB20018AFB10014AFB00010948300786B
68137+:109A10009482007A104300512405FFFF0080F0215A
68138+:109A20000A0011230080B821108B004D8FBF003435
68139+:109A30008F8600A03C1808008F18005C2411FF805E
68140+:109A40003C1680000306782101F18024AED0002C62
68141+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
68142+:109A6000018D5021000B4840012AA82196A4000036
68143+:109A70003C0808008D0800582405FF8030953FFF02
68144+:109A800001061821001539800067C8210325F82434
68145+:109A90003C02010003E290253338007F3C11800C2A
68146+:109AA000AED20028031190219250000D320F000415
68147+:109AB00011E0003702E0982196E3007A96E8007AF8
68148+:109AC00096E5007A2404800031077FFF24E300013B
68149+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
68150+:109AE00096E6007A3C1408008E94006030D67FFF22
68151+:109AF00012D400C1000000008E5800188F8400A00E
68152+:109B000002A028212713FFFF0E000FCEAE53002C1A
68153+:109B100097D5007897D4007A12950010000028217C
68154+:109B20003C098008352401003C0A8008914800085F
68155+:109B3000908700D53114007F30E400FF0284302B81
68156+:109B400014C0FFB9268B0001938E00AB268C000158
68157+:109B5000008E682115ACFFB78F8600A08FBF003440
68158+:109B60008FBE00308FB7002C8FB600288FB5002431
68159+:109B70008FB400208FB3001C8FB200188FB1001477
68160+:109B80008FB0001000A0102103E0000827BD0038AE
68161+:109B900000C020210E000F99028028218E4B00105A
68162+:109BA0008E4C00308F84003824090002016C502351
68163+:109BB000AE4A0010A089000096E3005C8E4400309D
68164+:109BC0008F9100380E000FF43070FFFF00024380C9
68165+:109BD000020838253C02420000E22825AE25000498
68166+:109BE0008E5F00048F8A00388E590000240B000815
68167+:109BF000AD5F001CAD590018AD40000CAD40001029
68168+:109C00009246000A240400052408C00030D000FF5A
68169+:109C1000A550001496580008A55800169251000A45
68170+:109C20003C188008322F00FFA54F0020964E0008F8
68171+:109C300037110100A54E0022AD400024924D000BCB
68172+:109C400031AC00FFA54C0002A14B00018E49003051
68173+:109C50008F830038240BFFBFAC690008A06400307C
68174+:109C60008F9000382403FFDF9607003200E8282495
68175+:109C700000B51025A6020032921F003233F9003FD2
68176+:109C800037260040A20600328F8C0038AD800034A9
68177+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
68178+:109CA00031CD007FA18D003C8F84003835EEFFFF61
68179+:109CB000908A003C014B4824A089003C8F850038E5
68180+:109CC00090A8003C01033824A0A7003C8E42003439
68181+:109CD0008F9100383C038008AE2200408E59002C42
68182+:109CE0008E5F0030033F3023AE26004492300048A0
68183+:109CF0003218007FA23800488F8800388E4D00301F
68184+:109D00008D0C004801AE582401965024014B482583
68185+:109D1000AD0900489244000AA104004C964700088F
68186+:109D20008F850038A4A7004E8E5000308E4400303E
68187+:109D30000E0003818C65006092F9007C0002F940FE
68188+:109D4000004028210002110003E2302133360002D6
68189+:109D500012C00003020680210005B0800216802197
68190+:109D6000926D007C31B30004126000020005708027
68191+:109D7000020E80218E4B00308F8800382405800031
68192+:109D8000316A0003000A4823312400030204182129
68193+:109D9000AD03003496E4007A96F0007A96F1007AEA
68194+:109DA00032027FFF2447000130FF7FFF0225C824D5
68195+:109DB000033F3025A6E6007A96F8007A3C120800A8
68196+:109DC0008E520060330F7FFF11F200180000000078
68197+:109DD0008F8400A00E000FCE02A028218F8400A047
68198+:109DE0000E000FDE028028210E001013000000007C
68199+:109DF0000A00111F0000000096F1007A022480245E
68200+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
68201+:109E1000000E69C2000D6027000C51C03169007F3F
68202+:109E2000012A20250A001119A2E4007A96E6007A98
68203+:109E300000C5C024A6F8007A92EF007A92F3007A67
68204+:109E400031F200FF001271C2000E6827000DB1C090
68205+:109E5000326C007F01962825A2E5007A0A0011D015
68206+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
68207+:109E7000AC640018AC65001C03E000088C620014A0
68208+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
68209+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
68210+:109EA000AFB30044AFB20040AFB1003CAFB0003838
68211+:109EB00034C80100910500D590C700083084FFFF29
68212+:109EC00030A500FF30E2007F0045182AAFA4001043
68213+:109ED000A7A00018A7A0002610600055AFA000148E
68214+:109EE00090CA00083149007F00A9302324D3FFFF26
68215+:109EF0000013802B8FB400100014902B02128824C2
68216+:109F0000522000888FB300143C03800894790052DB
68217+:109F1000947E00508FB60010033EC0230018BC0092
68218+:109F2000001714030016FC0002C2A82A16A00002A3
68219+:109F3000001F2C030040282100133C0000072403CD
68220+:109F400000A4102A5440000100A020212885000907
68221+:109F500014A000020080A021241400083C0C8008FA
68222+:109F60008D860048001459808D88004C3C03800089
68223+:109F70003169FFFF3C0A0010012A202534710400DA
68224+:109F8000AC660038AF9100A4AC68003CAC64003013
68225+:109F900000000000000000000000000000000000C1
68226+:109FA00000000000000000000000000000000000B1
68227+:109FB0008C6E000031CD002011A0FFFD0014782A26
68228+:109FC00001F01024104000390000A8213C16800840
68229+:109FD00092D700083C1280008E44010032F6007FC8
68230+:109FE0000E000F9902C028218E3900108E44010006
68231+:109FF0000000902133373FFF0E000FB102E028210F
68232+:10A00000923800003302003F2C500008520000102C
68233+:10A0100000008821000210803C030800246358E4FB
68234+:10A020000043F8218FFE000003C00008000000007C
68235+:10A0300090CF0008938C00AB31EE007F00AE682318
68236+:10A04000018D58210A0012172573FFFF0000882197
68237+:10A050003C1E80008FC401000E000FCE02E02821BC
68238+:10A060008FC401000E000FDE02C028211220000F55
68239+:10A070000013802B8F8B00A426A400010004AC00E9
68240+:10A08000027298230015AC032578004002B4B02A70
68241+:10A090000013802B241700010300882102D0102414
68242+:10A0A000AF9800A41440FFC9AFB700143C07800864
68243+:10A0B00094E200508FAE00103C05800002A288217F
68244+:10A0C0003C060020A4F10050ACA6003094F40050EF
68245+:10A0D00094EF005201D51823306CFFFF11F4001EDD
68246+:10A0E000AFAC00108CEF004C001561808CF500487F
68247+:10A0F00001EC28210000202100AC582B02A4C02133
68248+:10A10000030BB021ACE5004CACF600488FB4001056
68249+:10A110000014902B021288241620FF7C3C03800838
68250+:10A120008FB300148FBF005C8FBE00583A620001ED
68251+:10A130008FB700548FB600508FB5004C8FB40048D5
68252+:10A140008FB300448FB200408FB1003C8FB0003815
68253+:10A1500003E0000827BD006094FE00548CF2004428
68254+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
68255+:10A170008CE800448CAD003C010D50231940003B9D
68256+:10A18000000000008CF7004026E20001ACA200387D
68257+:10A190003C05005034A700103C038000AC67003041
68258+:10A1A00000000000000000000000000000000000AF
68259+:10A1B000000000000000000000000000000000009F
68260+:10A1C0008C7800003316002012C0FFFD3C1180087F
68261+:10A1D000962200543C1580003C068008304E000159
68262+:10A1E000000E18C0007578218DEC04003C070800B3
68263+:10A1F0008CE700443C040020ACCC00488DF40404FF
68264+:10A20000240B0001ACD4004C10EB0260AEA4003073
68265+:10A21000963900523C0508008CA5004000B99021F9
68266+:10A22000A6320052963F005427ED0001A62D00549F
68267+:10A230009626005430C4FFFF5487FF2F8FB40010C0
68268+:10A2400030A5FFFF0E0011F4A62000543C070800C3
68269+:10A250008CE70024963E00520047B82303D74823DA
68270+:10A26000A62900520A0012198FB400108CE2004097
68271+:10A270000A0012BE00000000922400012407000121
68272+:10A280003085007F14A7001C97AD00268E2B00148C
68273+:10A29000240CC000316A3FFF01AC48243C06080092
68274+:10A2A0008CC60060012A402531043FFF0086882BC0
68275+:10A2B00012200011A7A800263C0508008CA5005814
68276+:10A2C0008F9100A0000439802402FF8000B1182182
68277+:10A2D0000067F82103E2F02433F8007F3C1280008D
68278+:10A2E0003C19800EAE5E002C0319702191D0000D38
68279+:10A2F000360F0004A1CF000D0E001028241200011B
68280+:10A30000241100013C1E80008FC401000E000FCEFE
68281+:10A3100002E028218FC401000E000FDE02C02821B8
68282+:10A320001620FF558F8B00A40A0012860013802B85
68283+:10A330008F8600A490C80001310400201080019194
68284+:10A34000241000013C048008348B0080916A007C5A
68285+:10A350008F9E0034AFA0002C314900011120000F66
68286+:10A36000AFB000288CCD00148C8E006001AE602B45
68287+:10A370001580000201A038218C8700603C188008FD
68288+:10A38000370300808C70007000F0782B15E000021D
68289+:10A3900000E020218C640070AFA4002C3C028008F7
68290+:10A3A000344500808CD200148CBF0070025FC82B33
68291+:10A3B00017200002024020218CA400708FA7002CDF
68292+:10A3C0000087182310600003AFA3003024050002AB
68293+:10A3D000AFA500288FA400280264882B162000BA9D
68294+:10A3E000000018218CD000388FCE000C3C0F00806C
68295+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
68296+:10A40000AFCD000490CA003F3586FFFF01662024CF
68297+:10A410003C0900203C08FFEFA3CA000B0089382547
68298+:10A420003511FFFF00F118243C0500088F8700A4B8
68299+:10A430000065C825AFD9000C8CE20014AFC000182D
68300+:10A440008FA60030AFC200148CF800188FB0002C1B
68301+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
68302+:10A4600003326824AFCF00248CEC000C020670216C
68303+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
68304+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
68305+:10A49000014B48230126402311000011AFC80010D2
68306+:10A4A00090EB003D8FC900048FC80000000B5100E5
68307+:10A4B000012A28210000102100AA882B010218215E
68308+:10A4C0000071F821AFC50004AFDF000090F2003D3D
68309+:10A4D000A3D2000A8F9900A497380006A7D80008D5
68310+:10A4E0008F910038240800023C038008A228000055
68311+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
68312+:10A500000E000FF48F9200380002CB808F8500A4DC
68313+:10A51000021978253C18420001F87025AE4E00045F
68314+:10A520008F8400388CAD0038AC8D00188CAC0034B2
68315+:10A53000AC8C001CAC80000CAC800010A48000141B
68316+:10A54000A4800016A4800020A4800022AC800024F7
68317+:10A5500090A6003F8FA7002CA486000250E0019235
68318+:10A56000240700018FA200305040000290A2003D5D
68319+:10A5700090A2003E244A0001A08A00018F84003886
68320+:10A580008FA9002CAC8900083C128008364D008051
68321+:10A5900091AC007C3186000214C000022407003414
68322+:10A5A000240700308F8500A43C198008373F0080C5
68323+:10A5B00090B0000093F9007C240E0004A0900030BD
68324+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
68325+:10A5D0003304000301C46023A1B200318F8E003820
68326+:10A5E0008F8600A42402C00095CA003294C90012CC
68327+:10A5F0008FAB002C0142402431233FFF010388250B
68328+:10A60000A5D1003291D000323185000300EBF82152
68329+:10A610003218003F370F0040A1CF00328FA4002C2A
68330+:10A6200003E5382133280004108000028F850038AC
68331+:10A6300000E838213C0A8008ACA700343549010005
68332+:10A640008D2800D08FA3002C2419FFBFACA80038A0
68333+:10A6500090B1003C2C640001240FFFDF3227007F03
68334+:10A66000A0A7003C8F98003800049140931F003C45
68335+:10A6700003F98024A310003C8F8C0038918E003C9D
68336+:10A6800001CF682401B23025A186003C8F8900A447
68337+:10A690008F8800388D2B0020AD0B00408D220024C8
68338+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
68339+:10A6B0000E001013AD03004C8FB1002824070002D8
68340+:10A6C000122700118FA300280003282B00058023E8
68341+:10A6D0000270982400608021006090210A00126FAF
68342+:10A6E0000010882B962900128F8400A00000902172
68343+:10A6F0003125FFFFA7A900180E000FC22411000189
68344+:10A700000A00131D3C1E80003C0B80003C12800898
68345+:10A710008D640100924900088F92FF340E000F995A
68346+:10A720003125007F8F9900388FA700288FA4003033
68347+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
68348+:10A740008F91003800026B80020D80253C0842008A
68349+:10A750008F8D00A402085025AE2A00048DA5003874
68350+:10A760008F8A003800007821000F1100AD450018D5
68351+:10A770008DB800343C047FFF3488FFFFAD58001CC7
68352+:10A7800091A6003E8D4C001C8D4900180006190052
68353+:10A79000000677020183C821004E58250323882B29
68354+:10A7A000012B382100F1F821AD59001CAD5F0018D4
68355+:10A7B000AD40000CAD40001091B0003E8FA40030C1
68356+:10A7C00024090005A550001495A500042419C00013
68357+:10A7D00000884024A545001691B8003EA5580020E9
68358+:10A7E00095AF0004A54F0022AD40002491AE003F7C
68359+:10A7F000A54E000291A6003E91AC003D01861023BB
68360+:10A80000244B0001A14B00018F9100388FA3003031
68361+:10A810003C028008344B0100AE230008A22900301E
68362+:10A820008F8C00388F8700A4959F003294F000121F
68363+:10A830002407FFBF033FC02432053FFF03057825EF
68364+:10A84000A58F0032918E00322418FFDF31CD003FFA
68365+:10A8500035A60040A18600328F910038240DFFFFFD
68366+:10A86000240CFF80AE2000348D6A00D0AE2A003860
68367+:10A870009223003C3069007FA229003C8F90003871
68368+:10A880003C0380009219003C0327F824A21F003CDF
68369+:10A890008F8E003891C5003C00B87824A1CF003CD1
68370+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
68371+:10A8B000AD46004491420048004C5825A14B004849
68372+:10A8C0008F9000388F9900A48E09004801238824B6
68373+:10A8D00002283825AE070048933F003EA21F004CD7
68374+:10A8E0008F9800A48F8F003897050004A5E5004ECF
68375+:10A8F0000E0003818DC500609246007C8FAC003055
68376+:10A9000000026940000291000040282130CB000283
68377+:10A9100001B21021156000AA018230213C0E80088E
68378+:10A9200035C20080904C007C31830004106000032D
68379+:10A930008FB900300005788000CF3021241F00043B
68380+:10A940008F910038332D000303ED8023320800037C
68381+:10A9500000C85021AE2A00343C188000A7C500383A
68382+:10A960003C0680088F04010090DE00080E000FDE18
68383+:10A9700033C5007F0E001013000000000A00140D04
68384+:10A980008FA300288F9800348CC90038241F00033F
68385+:10A99000A7000008AF0900008CC50034A300000A1E
68386+:10A9A0008F9900A4AF0500043C080080932D003F60
68387+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
68388+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
68389+:10A9D00003D170243646FFFF01C61824AF03000CD4
68390+:10A9E0008F2C0014972900128F8400A0AF0C001048
68391+:10A9F0008F2F0014AF000018AF000020AF0F00141D
68392+:10AA0000AF0000248F270018312F3FFF000F59801F
68393+:10AA1000AF0700288F2500080164F821312D0001BF
68394+:10AA2000AF0500308F31000C8F920038001F51C2EB
68395+:10AA3000000D438001481021241E00023C068008BE
68396+:10AA4000A702001CA7000034AF11002CA25E00007A
68397+:10AA500034D20080964E005C8F9900383C0342004F
68398+:10AA600031CCFFFF01833825AF2700048F8B00A472
68399+:10AA7000240500012402C0008D640038240700343E
68400+:10AA8000AF2400188D690034AF29001CAF20000CE2
68401+:10AA9000AF200010A7200014A7200016A720002038
68402+:10AAA000A7200022AF200024A7300002A325000128
68403+:10AAB0008F8800388F9F00A4AD10000893ED000030
68404+:10AAC000A10D00308F8A00A48F98003891510001A9
68405+:10AAD000A31100318F8B0038957E003203C27024A1
68406+:10AAE00001CF6025A56C0032916300323064003FD5
68407+:10AAF000A16400329249007C3125000214A00002BA
68408+:10AB00008F840038240700303C198008AC8700345B
68409+:10AB1000373201008E5F00D0240AFFBF020090216F
68410+:10AB2000AC9F0038908D003C31A8007FA088003C8D
68411+:10AB30008F9E003893C2003C004A8824A3D1003C79
68412+:10AB40008F8300380010882B9066003C34CE0020A4
68413+:10AB5000A06E003C8F8400A48F9800388C8C00205D
68414+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
68415+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
68416+:10AB80003C1E80000A0012700000000094C80052B1
68417+:10AB90003C0A08008D4A002401488821A4D10052B3
68418+:10ABA0000A0012198FB40010A08700018F840038AA
68419+:10ABB000240B0001AC8B00080A0013BE3C12800875
68420+:10ABC000000520800A0014A200C4302127BDFFE048
68421+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
68422+:10ABE000AFB1001435B200808E4C001835A80100BA
68423+:10ABF000964B000695A70050910900FC000C5602E8
68424+:10AC0000016728233143007F312600FF240200031F
68425+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
68426+:10AC2000910600FC2412000530C200FF10520033D0
68427+:10AC300000000000160000098FBF001C8FB2001832
68428+:10AC40008FB100148FB00010240D0C003C0C80005C
68429+:10AC500027BD002003E00008AD8D00240E0011FB8D
68430+:10AC6000020020218FBF001C8FB200188FB100148A
68431+:10AC70008FB00010240D0C003C0C800027BD00207C
68432+:10AC800003E00008AD8D0024965800789651007AB4
68433+:10AC9000924E007D0238782631E8FFFF31C400C0B3
68434+:10ACA000148000092D11000116000037000000007B
68435+:10ACB0005620FFE28FBF001C0E0010D100000000E4
68436+:10ACC0000A00156A8FBF001C1620FFDA0000000082
68437+:10ACD0000E0010D1000000001440FFD88FBF001CF0
68438+:10ACE0001600002200000000925F007D33E2003F6A
68439+:10ACF000A242007D0A00156A8FBF001C950900EA78
68440+:10AD00008F86008000802821240400050E0007257E
68441+:10AD10003130FFFF978300923C0480002465FFFFE1
68442+:10AD2000A78500928C8A01B80540FFFE0000000054
68443+:10AD3000AC8001808FBF001CAC9001848FB20018E2
68444+:10AD40008FB100148FB000103C0760133C0B100053
68445+:10AD5000240D0C003C0C800027BD0020AC8701882E
68446+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
68447+:10AD7000020020215040FFB18FBF001C925F007D78
68448+:10AD80000A00159733E2003F0E0011FB020020215C
68449+:10AD90001440FFAA8FBF001C122000070000000013
68450+:10ADA0009259007D3330003F36020040A242007DC0
68451+:10ADB0000A00156A8FBF001C0E0010D100000000B1
68452+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
68453+:10ADD0000A0015C636020040000000000000001BFB
68454+:10ADE0000000000F0000000A00000008000000063C
68455+:10ADF0000000000500000005000000040000000441
68456+:10AE00000000000300000003000000030000000336
68457+:10AE10000000000300000002000000020000000229
68458+:10AE2000000000020000000200000002000000021A
68459+:10AE3000000000020000000200000002000000020A
68460+:10AE400000000002000000020000000200000002FA
68461+:10AE50000000000100000001000000018008010066
68462+:10AE6000800800808008000000000C000000308096
68463+:10AE7000080011D00800127C08001294080012A8E3
68464+:10AE8000080012BC080011D0080011D0080012F010
68465+:10AE90000800132C080013400800138808001A8CBF
68466+:10AEA00008001A8C08001AC408001AC408001AD82E
68467+:10AEB00008001AA808001D0008001CCC08001D5836
68468+:10AEC00008001D5808001DE008001D108008024001
68469+:10AED000080027340800256C0800275C080027F4C8
68470+:10AEE0000800293C0800298808002AAC080029B479
68471+:10AEF00008002A38080025DC08002EDC08002EA4F3
68472+:10AF000008002588080025880800258808002B20CF
68473+:10AF100008002B20080025880800258808002DD06F
68474+:10AF2000080025880800258808002588080025884D
68475+:10AF300008002E0C080025880800258808002588B0
68476+:10AF4000080025880800258808002588080025882D
68477+:10AF5000080025880800258808002588080025881D
68478+:10AF6000080025880800258808002588080029A8E9
68479+:10AF7000080025880800258808002E680800258814
68480+:10AF800008002588080025880800258808002588ED
68481+:10AF900008002588080025880800258808002588DD
68482+:10AFA00008002588080025880800258808002588CD
68483+:10AFB00008002588080025880800258808002588BD
68484+:10AFC00008002CF4080025880800258808002C6853
68485+:10AFD00008002BC408003CE408003CB808003C848E
68486+:10AFE00008003C5808003C3808003BEC8008010091
68487+:10AFF00080080080800800008008008008004C6401
68488+:10B0000008004C9C08004BE408004C6408004C64A9
68489+:10B01000080049B808004C64080050500A000C842D
68490+:10B0200000000000000000000000000D7278703683
68491+:10B030002E322E31620000000602010300000000E3
68492+:10B0400000000001000000000000000000000000FF
68493+:10B0500000000000000000000000000000000000F0
68494+:10B0600000000000000000000000000000000000E0
68495+:10B0700000000000000000000000000000000000D0
68496+:10B0800000000000000000000000000000000000C0
68497+:10B0900000000000000000000000000000000000B0
68498+:10B0A00000000000000000000000000000000000A0
68499+:10B0B0000000000000000000000000000000000090
68500+:10B0C0000000000000000000000000000000000080
68501+:10B0D0000000000000000000000000000000000070
68502+:10B0E0000000000000000000000000000000000060
68503+:10B0F0000000000000000000000000000000000050
68504+:10B10000000000000000000000000000000000003F
68505+:10B11000000000000000000000000000000000002F
68506+:10B12000000000000000000000000000000000001F
68507+:10B13000000000000000000000000000000000000F
68508+:10B1400000000000000000000000000000000000FF
68509+:10B1500000000000000000000000000000000000EF
68510+:10B1600000000000000000000000000000000000DF
68511+:10B1700000000000000000000000000000000000CF
68512+:10B1800000000000000000000000000000000000BF
68513+:10B1900000000000000000000000000000000000AF
68514+:10B1A000000000000000000000000000000000009F
68515+:10B1B000000000000000000000000000000000008F
68516+:10B1C000000000000000000000000000000000007F
68517+:10B1D000000000000000000000000000000000006F
68518+:10B1E000000000000000000000000000000000005F
68519+:10B1F000000000000000000000000000000000004F
68520+:10B20000000000000000000000000000000000003E
68521+:10B21000000000000000000000000000000000002E
68522+:10B22000000000000000000000000000000000001E
68523+:10B23000000000000000000000000000000000000E
68524+:10B2400000000000000000000000000000000000FE
68525+:10B2500000000000000000000000000000000000EE
68526+:10B2600000000000000000000000000000000000DE
68527+:10B2700000000000000000000000000000000000CE
68528+:10B2800000000000000000000000000000000000BE
68529+:10B2900000000000000000000000000000000000AE
68530+:10B2A000000000000000000000000000000000009E
68531+:10B2B000000000000000000000000000000000008E
68532+:10B2C000000000000000000000000000000000007E
68533+:10B2D000000000000000000000000000000000006E
68534+:10B2E000000000000000000000000000000000005E
68535+:10B2F000000000000000000000000000000000004E
68536+:10B30000000000000000000000000000000000003D
68537+:10B31000000000000000000000000000000000002D
68538+:10B32000000000000000000000000000000000001D
68539+:10B33000000000000000000000000000000000000D
68540+:10B3400000000000000000000000000000000000FD
68541+:10B3500000000000000000000000000000000000ED
68542+:10B3600000000000000000000000000000000000DD
68543+:10B3700000000000000000000000000000000000CD
68544+:10B3800000000000000000000000000000000000BD
68545+:10B3900000000000000000000000000000000000AD
68546+:10B3A000000000000000000000000000000000009D
68547+:10B3B000000000000000000000000000000000008D
68548+:10B3C000000000000000000000000000000000007D
68549+:10B3D000000000000000000000000000000000006D
68550+:10B3E000000000000000000000000000000000005D
68551+:10B3F000000000000000000000000000000000004D
68552+:10B40000000000000000000000000000000000003C
68553+:10B41000000000000000000000000000000000002C
68554+:10B42000000000000000000000000000000000001C
68555+:10B43000000000000000000000000000000000000C
68556+:10B4400000000000000000000000000000000000FC
68557+:10B4500000000000000000000000000000000000EC
68558+:10B4600000000000000000000000000000000000DC
68559+:10B4700000000000000000000000000000000000CC
68560+:10B4800000000000000000000000000000000000BC
68561+:10B4900000000000000000000000000000000000AC
68562+:10B4A000000000000000000000000000000000009C
68563+:10B4B000000000000000000000000000000000008C
68564+:10B4C000000000000000000000000000000000007C
68565+:10B4D000000000000000000000000000000000006C
68566+:10B4E000000000000000000000000000000000005C
68567+:10B4F000000000000000000000000000000000004C
68568+:10B50000000000000000000000000000000000003B
68569+:10B51000000000000000000000000000000000002B
68570+:10B52000000000000000000000000000000000001B
68571+:10B53000000000000000000000000000000000000B
68572+:10B5400000000000000000000000000000000000FB
68573+:10B5500000000000000000000000000000000000EB
68574+:10B5600000000000000000000000000000000000DB
68575+:10B5700000000000000000000000000000000000CB
68576+:10B5800000000000000000000000000000000000BB
68577+:10B5900000000000000000000000000000000000AB
68578+:10B5A000000000000000000000000000000000009B
68579+:10B5B000000000000000000000000000000000008B
68580+:10B5C000000000000000000000000000000000007B
68581+:10B5D000000000000000000000000000000000006B
68582+:10B5E000000000000000000000000000000000005B
68583+:10B5F000000000000000000000000000000000004B
68584+:10B60000000000000000000000000000000000003A
68585+:10B61000000000000000000000000000000000002A
68586+:10B62000000000000000000000000000000000001A
68587+:10B63000000000000000000000000000000000000A
68588+:10B6400000000000000000000000000000000000FA
68589+:10B6500000000000000000000000000000000000EA
68590+:10B6600000000000000000000000000000000000DA
68591+:10B6700000000000000000000000000000000000CA
68592+:10B6800000000000000000000000000000000000BA
68593+:10B6900000000000000000000000000000000000AA
68594+:10B6A000000000000000000000000000000000009A
68595+:10B6B000000000000000000000000000000000008A
68596+:10B6C000000000000000000000000000000000007A
68597+:10B6D000000000000000000000000000000000006A
68598+:10B6E000000000000000000000000000000000005A
68599+:10B6F000000000000000000000000000000000004A
68600+:10B700000000000000000000000000000000000039
68601+:10B710000000000000000000000000000000000029
68602+:10B720000000000000000000000000000000000019
68603+:10B730000000000000000000000000000000000009
68604+:10B7400000000000000000000000000000000000F9
68605+:10B7500000000000000000000000000000000000E9
68606+:10B7600000000000000000000000000000000000D9
68607+:10B7700000000000000000000000000000000000C9
68608+:10B7800000000000000000000000000000000000B9
68609+:10B7900000000000000000000000000000000000A9
68610+:10B7A0000000000000000000000000000000000099
68611+:10B7B0000000000000000000000000000000000089
68612+:10B7C0000000000000000000000000000000000079
68613+:10B7D0000000000000000000000000000000000069
68614+:10B7E0000000000000000000000000000000000059
68615+:10B7F0000000000000000000000000000000000049
68616+:10B800000000000000000000000000000000000038
68617+:10B810000000000000000000000000000000000028
68618+:10B820000000000000000000000000000000000018
68619+:10B830000000000000000000000000000000000008
68620+:10B8400000000000000000000000000000000000F8
68621+:10B8500000000000000000000000000000000000E8
68622+:10B8600000000000000000000000000000000000D8
68623+:10B8700000000000000000000000000000000000C8
68624+:10B8800000000000000000000000000000000000B8
68625+:10B8900000000000000000000000000000000000A8
68626+:10B8A0000000000000000000000000000000000098
68627+:10B8B0000000000000000000000000000000000088
68628+:10B8C0000000000000000000000000000000000078
68629+:10B8D0000000000000000000000000000000000068
68630+:10B8E0000000000000000000000000000000000058
68631+:10B8F0000000000000000000000000000000000048
68632+:10B900000000000000000000000000000000000037
68633+:10B910000000000000000000000000000000000027
68634+:10B920000000000000000000000000000000000017
68635+:10B930000000000000000000000000000000000007
68636+:10B9400000000000000000000000000000000000F7
68637+:10B9500000000000000000000000000000000000E7
68638+:10B9600000000000000000000000000000000000D7
68639+:10B9700000000000000000000000000000000000C7
68640+:10B9800000000000000000000000000000000000B7
68641+:10B9900000000000000000000000000000000000A7
68642+:10B9A0000000000000000000000000000000000097
68643+:10B9B0000000000000000000000000000000000087
68644+:10B9C0000000000000000000000000000000000077
68645+:10B9D0000000000000000000000000000000000067
68646+:10B9E0000000000000000000000000000000000057
68647+:10B9F0000000000000000000000000000000000047
68648+:10BA00000000000000000000000000000000000036
68649+:10BA10000000000000000000000000000000000026
68650+:10BA20000000000000000000000000000000000016
68651+:10BA30000000000000000000000000000000000006
68652+:10BA400000000000000000000000000000000000F6
68653+:10BA500000000000000000000000000000000000E6
68654+:10BA600000000000000000000000000000000000D6
68655+:10BA700000000000000000000000000000000000C6
68656+:10BA800000000000000000000000000000000000B6
68657+:10BA900000000000000000000000000000000000A6
68658+:10BAA0000000000000000000000000000000000096
68659+:10BAB0000000000000000000000000000000000086
68660+:10BAC0000000000000000000000000000000000076
68661+:10BAD0000000000000000000000000000000000066
68662+:10BAE0000000000000000000000000000000000056
68663+:10BAF0000000000000000000000000000000000046
68664+:10BB00000000000000000000000000000000000035
68665+:10BB10000000000000000000000000000000000025
68666+:10BB20000000000000000000000000000000000015
68667+:10BB30000000000000000000000000000000000005
68668+:10BB400000000000000000000000000000000000F5
68669+:10BB500000000000000000000000000000000000E5
68670+:10BB600000000000000000000000000000000000D5
68671+:10BB700000000000000000000000000000000000C5
68672+:10BB800000000000000000000000000000000000B5
68673+:10BB900000000000000000000000000000000000A5
68674+:10BBA0000000000000000000000000000000000095
68675+:10BBB0000000000000000000000000000000000085
68676+:10BBC0000000000000000000000000000000000075
68677+:10BBD0000000000000000000000000000000000065
68678+:10BBE0000000000000000000000000000000000055
68679+:10BBF0000000000000000000000000000000000045
68680+:10BC00000000000000000000000000000000000034
68681+:10BC10000000000000000000000000000000000024
68682+:10BC20000000000000000000000000000000000014
68683+:10BC30000000000000000000000000000000000004
68684+:10BC400000000000000000000000000000000000F4
68685+:10BC500000000000000000000000000000000000E4
68686+:10BC600000000000000000000000000000000000D4
68687+:10BC700000000000000000000000000000000000C4
68688+:10BC800000000000000000000000000000000000B4
68689+:10BC900000000000000000000000000000000000A4
68690+:10BCA0000000000000000000000000000000000094
68691+:10BCB0000000000000000000000000000000000084
68692+:10BCC0000000000000000000000000000000000074
68693+:10BCD0000000000000000000000000000000000064
68694+:10BCE0000000000000000000000000000000000054
68695+:10BCF0000000000000000000000000000000000044
68696+:10BD00000000000000000000000000000000000033
68697+:10BD10000000000000000000000000000000000023
68698+:10BD20000000000000000000000000000000000013
68699+:10BD30000000000000000000000000000000000003
68700+:10BD400000000000000000000000000000000000F3
68701+:10BD500000000000000000000000000000000000E3
68702+:10BD600000000000000000000000000000000000D3
68703+:10BD700000000000000000000000000000000000C3
68704+:10BD800000000000000000000000000000000000B3
68705+:10BD900000000000000000000000000000000000A3
68706+:10BDA0000000000000000000000000000000000093
68707+:10BDB0000000000000000000000000000000000083
68708+:10BDC0000000000000000000000000000000000073
68709+:10BDD0000000000000000000000000000000000063
68710+:10BDE0000000000000000000000000000000000053
68711+:10BDF0000000000000000000000000000000000043
68712+:10BE00000000000000000000000000000000000032
68713+:10BE10000000000000000000000000000000000022
68714+:10BE20000000000000000000000000000000000012
68715+:10BE30000000000000000000000000000000000002
68716+:10BE400000000000000000000000000000000000F2
68717+:10BE500000000000000000000000000000000000E2
68718+:10BE600000000000000000000000000000000000D2
68719+:10BE700000000000000000000000000000000000C2
68720+:10BE800000000000000000000000000000000000B2
68721+:10BE900000000000000000000000000000000000A2
68722+:10BEA0000000000000000000000000000000000092
68723+:10BEB0000000000000000000000000000000000082
68724+:10BEC0000000000000000000000000000000000072
68725+:10BED0000000000000000000000000000000000062
68726+:10BEE0000000000000000000000000000000000052
68727+:10BEF0000000000000000000000000000000000042
68728+:10BF00000000000000000000000000000000000031
68729+:10BF10000000000000000000000000000000000021
68730+:10BF20000000000000000000000000000000000011
68731+:10BF30000000000000000000000000000000000001
68732+:10BF400000000000000000000000000000000000F1
68733+:10BF500000000000000000000000000000000000E1
68734+:10BF600000000000000000000000000000000000D1
68735+:10BF700000000000000000000000000000000000C1
68736+:10BF800000000000000000000000000000000000B1
68737+:10BF900000000000000000000000000000000000A1
68738+:10BFA0000000000000000000000000000000000091
68739+:10BFB0000000000000000000000000000000000081
68740+:10BFC0000000000000000000000000000000000071
68741+:10BFD0000000000000000000000000000000000061
68742+:10BFE0000000000000000000000000000000000051
68743+:10BFF0000000000000000000000000000000000041
68744+:10C000000000000000000000000000000000000030
68745+:10C010000000000000000000000000000000000020
68746+:10C020000000000000000000000000000000000010
68747+:10C030000000000000000000000000000000000000
68748+:10C0400000000000000000000000000000000000F0
68749+:10C0500000000000000000000000000000000000E0
68750+:10C0600000000000000000000000000000000000D0
68751+:10C0700000000000000000000000000000000000C0
68752+:10C0800000000000000000000000000000000000B0
68753+:10C0900000000000000000000000000000000000A0
68754+:10C0A0000000000000000000000000000000000090
68755+:10C0B0000000000000000000000000000000000080
68756+:10C0C0000000000000000000000000000000000070
68757+:10C0D0000000000000000000000000000000000060
68758+:10C0E0000000000000000000000000000000000050
68759+:10C0F0000000000000000000000000000000000040
68760+:10C10000000000000000000000000000000000002F
68761+:10C11000000000000000000000000000000000001F
68762+:10C12000000000000000000000000000000000000F
68763+:10C1300000000000000000000000000000000000FF
68764+:10C1400000000000000000000000000000000000EF
68765+:10C1500000000000000000000000000000000000DF
68766+:10C1600000000000000000000000000000000000CF
68767+:10C1700000000000000000000000000000000000BF
68768+:10C1800000000000000000000000000000000000AF
68769+:10C19000000000000000000000000000000000009F
68770+:10C1A000000000000000000000000000000000008F
68771+:10C1B000000000000000000000000000000000007F
68772+:10C1C000000000000000000000000000000000006F
68773+:10C1D000000000000000000000000000000000005F
68774+:10C1E000000000000000000000000000000000004F
68775+:10C1F000000000000000000000000000000000003F
68776+:10C20000000000000000000000000000000000002E
68777+:10C21000000000000000000000000000000000001E
68778+:10C22000000000000000000000000000000000000E
68779+:10C2300000000000000000000000000000000000FE
68780+:10C2400000000000000000000000000000000000EE
68781+:10C2500000000000000000000000000000000000DE
68782+:10C2600000000000000000000000000000000000CE
68783+:10C2700000000000000000000000000000000000BE
68784+:10C2800000000000000000000000000000000000AE
68785+:10C29000000000000000000000000000000000009E
68786+:10C2A000000000000000000000000000000000008E
68787+:10C2B000000000000000000000000000000000007E
68788+:10C2C000000000000000000000000000000000006E
68789+:10C2D000000000000000000000000000000000005E
68790+:10C2E000000000000000000000000000000000004E
68791+:10C2F000000000000000000000000000000000003E
68792+:10C30000000000000000000000000000000000002D
68793+:10C31000000000000000000000000000000000001D
68794+:10C32000000000000000000000000000000000000D
68795+:10C3300000000000000000000000000000000000FD
68796+:10C3400000000000000000000000000000000000ED
68797+:10C3500000000000000000000000000000000000DD
68798+:10C3600000000000000000000000000000000000CD
68799+:10C3700000000000000000000000000000000000BD
68800+:10C3800000000000000000000000000000000000AD
68801+:10C39000000000000000000000000000000000009D
68802+:10C3A000000000000000000000000000000000008D
68803+:10C3B000000000000000000000000000000000007D
68804+:10C3C000000000000000000000000000000000006D
68805+:10C3D000000000000000000000000000000000005D
68806+:10C3E000000000000000000000000000000000004D
68807+:10C3F000000000000000000000000000000000003D
68808+:10C40000000000000000000000000000000000002C
68809+:10C41000000000000000000000000000000000001C
68810+:10C42000000000000000000000000000000000000C
68811+:10C4300000000000000000000000000000000000FC
68812+:10C4400000000000000000000000000000000000EC
68813+:10C4500000000000000000000000000000000000DC
68814+:10C4600000000000000000000000000000000000CC
68815+:10C4700000000000000000000000000000000000BC
68816+:10C4800000000000000000000000000000000000AC
68817+:10C49000000000000000000000000000000000009C
68818+:10C4A000000000000000000000000000000000008C
68819+:10C4B000000000000000000000000000000000007C
68820+:10C4C000000000000000000000000000000000006C
68821+:10C4D000000000000000000000000000000000005C
68822+:10C4E000000000000000000000000000000000004C
68823+:10C4F000000000000000000000000000000000003C
68824+:10C50000000000000000000000000000000000002B
68825+:10C51000000000000000000000000000000000001B
68826+:10C52000000000000000000000000000000000000B
68827+:10C5300000000000000000000000000000000000FB
68828+:10C5400000000000000000000000000000000000EB
68829+:10C5500000000000000000000000000000000000DB
68830+:10C5600000000000000000000000000000000000CB
68831+:10C5700000000000000000000000000000000000BB
68832+:10C5800000000000000000000000000000000000AB
68833+:10C59000000000000000000000000000000000009B
68834+:10C5A000000000000000000000000000000000008B
68835+:10C5B000000000000000000000000000000000007B
68836+:10C5C000000000000000000000000000000000006B
68837+:10C5D000000000000000000000000000000000005B
68838+:10C5E000000000000000000000000000000000004B
68839+:10C5F000000000000000000000000000000000003B
68840+:10C60000000000000000000000000000000000002A
68841+:10C61000000000000000000000000000000000001A
68842+:10C62000000000000000000000000000000000000A
68843+:10C6300000000000000000000000000000000000FA
68844+:10C6400000000000000000000000000000000000EA
68845+:10C6500000000000000000000000000000000000DA
68846+:10C6600000000000000000000000000000000000CA
68847+:10C6700000000000000000000000000000000000BA
68848+:10C6800000000000000000000000000000000000AA
68849+:10C69000000000000000000000000000000000009A
68850+:10C6A000000000000000000000000000000000008A
68851+:10C6B000000000000000000000000000000000007A
68852+:10C6C000000000000000000000000000000000006A
68853+:10C6D000000000000000000000000000000000005A
68854+:10C6E000000000000000000000000000000000004A
68855+:10C6F000000000000000000000000000000000003A
68856+:10C700000000000000000000000000000000000029
68857+:10C710000000000000000000000000000000000019
68858+:10C720000000000000000000000000000000000009
68859+:10C7300000000000000000000000000000000000F9
68860+:10C7400000000000000000000000000000000000E9
68861+:10C7500000000000000000000000000000000000D9
68862+:10C7600000000000000000000000000000000000C9
68863+:10C7700000000000000000000000000000000000B9
68864+:10C7800000000000000000000000000000000000A9
68865+:10C790000000000000000000000000000000000099
68866+:10C7A0000000000000000000000000000000000089
68867+:10C7B0000000000000000000000000000000000079
68868+:10C7C0000000000000000000000000000000000069
68869+:10C7D0000000000000000000000000000000000059
68870+:10C7E0000000000000000000000000000000000049
68871+:10C7F0000000000000000000000000000000000039
68872+:10C800000000000000000000000000000000000028
68873+:10C810000000000000000000000000000000000018
68874+:10C820000000000000000000000000000000000008
68875+:10C8300000000000000000000000000000000000F8
68876+:10C8400000000000000000000000000000000000E8
68877+:10C8500000000000000000000000000000000000D8
68878+:10C8600000000000000000000000000000000000C8
68879+:10C8700000000000000000000000000000000000B8
68880+:10C8800000000000000000000000000000000000A8
68881+:10C890000000000000000000000000000000000098
68882+:10C8A0000000000000000000000000000000000088
68883+:10C8B0000000000000000000000000000000000078
68884+:10C8C0000000000000000000000000000000000068
68885+:10C8D0000000000000000000000000000000000058
68886+:10C8E0000000000000000000000000000000000048
68887+:10C8F0000000000000000000000000000000000038
68888+:10C900000000000000000000000000000000000027
68889+:10C910000000000000000000000000000000000017
68890+:10C920000000000000000000000000000000000007
68891+:10C9300000000000000000000000000000000000F7
68892+:10C9400000000000000000000000000000000000E7
68893+:10C9500000000000000000000000000000000000D7
68894+:10C9600000000000000000000000000000000000C7
68895+:10C9700000000000000000000000000000000000B7
68896+:10C9800000000000000000000000000000000000A7
68897+:10C990000000000000000000000000000000000097
68898+:10C9A0000000000000000000000000000000000087
68899+:10C9B0000000000000000000000000000000000077
68900+:10C9C0000000000000000000000000000000000067
68901+:10C9D0000000000000000000000000000000000057
68902+:10C9E0000000000000000000000000000000000047
68903+:10C9F0000000000000000000000000000000000037
68904+:10CA00000000000000000000000000000000000026
68905+:10CA10000000000000000000000000000000000016
68906+:10CA20000000000000000000000000000000000006
68907+:10CA300000000000000000000000000000000000F6
68908+:10CA400000000000000000000000000000000000E6
68909+:10CA500000000000000000000000000000000000D6
68910+:10CA600000000000000000000000000000000000C6
68911+:10CA700000000000000000000000000000000000B6
68912+:10CA800000000000000000000000000000000000A6
68913+:10CA90000000000000000000000000000000000096
68914+:10CAA0000000000000000000000000000000000086
68915+:10CAB0000000000000000000000000000000000076
68916+:10CAC0000000000000000000000000000000000066
68917+:10CAD0000000000000000000000000000000000056
68918+:10CAE0000000000000000000000000000000000046
68919+:10CAF0000000000000000000000000000000000036
68920+:10CB00000000000000000000000000000000000025
68921+:10CB10000000000000000000000000000000000015
68922+:10CB20000000000000000000000000000000000005
68923+:10CB300000000000000000000000000000000000F5
68924+:10CB400000000000000000000000000000000000E5
68925+:10CB500000000000000000000000000000000000D5
68926+:10CB600000000000000000000000000000000000C5
68927+:10CB700000000000000000000000000000000000B5
68928+:10CB800000000000000000000000000000000000A5
68929+:10CB90000000000000000000000000000000000095
68930+:10CBA0000000000000000000000000000000000085
68931+:10CBB0000000000000000000000000000000000075
68932+:10CBC0000000000000000000000000000000000065
68933+:10CBD0000000000000000000000000000000000055
68934+:10CBE0000000000000000000000000000000000045
68935+:10CBF0000000000000000000000000000000000035
68936+:10CC00000000000000000000000000000000000024
68937+:10CC10000000000000000000000000000000000014
68938+:10CC20000000000000000000000000000000000004
68939+:10CC300000000000000000000000000000000000F4
68940+:10CC400000000000000000000000000000000000E4
68941+:10CC500000000000000000000000000000000000D4
68942+:10CC600000000000000000000000000000000000C4
68943+:10CC700000000000000000000000000000000000B4
68944+:10CC800000000000000000000000000000000000A4
68945+:10CC90000000000000000000000000000000000094
68946+:10CCA0000000000000000000000000000000000084
68947+:10CCB0000000000000000000000000000000000074
68948+:10CCC0000000000000000000000000000000000064
68949+:10CCD0000000000000000000000000000000000054
68950+:10CCE0000000000000000000000000000000000044
68951+:10CCF0000000000000000000000000000000000034
68952+:10CD00000000000000000000000000000000000023
68953+:10CD10000000000000000000000000000000000013
68954+:10CD20000000000000000000000000000000000003
68955+:10CD300000000000000000000000000000000000F3
68956+:10CD400000000000000000000000000000000000E3
68957+:10CD500000000000000000000000000000000000D3
68958+:10CD600000000000000000000000000000000000C3
68959+:10CD700000000000000000000000000000000000B3
68960+:10CD800000000000000000000000000000000000A3
68961+:10CD90000000000000000000000000000000000093
68962+:10CDA0000000000000000000000000000000000083
68963+:10CDB0000000000000000000000000000000000073
68964+:10CDC0000000000000000000000000000000000063
68965+:10CDD0000000000000000000000000000000000053
68966+:10CDE0000000000000000000000000000000000043
68967+:10CDF0000000000000000000000000000000000033
68968+:10CE00000000000000000000000000000000000022
68969+:10CE10000000000000000000000000000000000012
68970+:10CE20000000000000000000000000000000000002
68971+:10CE300000000000000000000000000000000000F2
68972+:10CE400000000000000000000000000000000000E2
68973+:10CE500000000000000000000000000000000000D2
68974+:10CE600000000000000000000000000000000000C2
68975+:10CE700000000000000000000000000000000000B2
68976+:10CE800000000000000000000000000000000000A2
68977+:10CE90000000000000000000000000000000000092
68978+:10CEA0000000000000000000000000000000000082
68979+:10CEB0000000000000000000000000000000000072
68980+:10CEC0000000000000000000000000000000000062
68981+:10CED0000000000000000000000000000000000052
68982+:10CEE0000000000000000000000000000000000042
68983+:10CEF0000000000000000000000000000000000032
68984+:10CF00000000000000000000000000000000000021
68985+:10CF10000000000000000000000000000000000011
68986+:10CF20000000000000000000000000000000000001
68987+:10CF300000000000000000000000000000000000F1
68988+:10CF400000000000000000000000000000000000E1
68989+:10CF500000000000000000000000000000000000D1
68990+:10CF600000000000000000000000000000000000C1
68991+:10CF700000000000000000000000000000000000B1
68992+:10CF800000000000000000000000000000000000A1
68993+:10CF90000000000000000000000000000000000091
68994+:10CFA0000000000000000000000000000000000081
68995+:10CFB0000000000000000000000000000000000071
68996+:10CFC0000000000000000000000000000000000061
68997+:10CFD0000000000000000000000000000000000051
68998+:10CFE0000000000000000000000000000000000041
68999+:10CFF0000000000000000000000000000000000031
69000+:10D000000000000000000000000000000000000020
69001+:10D010000000000000000000000000000000000010
69002+:10D020000000000000000000000000000000000000
69003+:10D0300000000000000000000000000000000000F0
69004+:10D0400000000000000000000000000000000000E0
69005+:10D0500000000000000000000000000000000000D0
69006+:10D0600000000000000000000000000000000000C0
69007+:10D0700000000000000000000000000000000000B0
69008+:10D0800000000000000000000000000000000000A0
69009+:10D090000000000000000000000000000000000090
69010+:10D0A0000000000000000000000000000000000080
69011+:10D0B0000000000000000000000000000000000070
69012+:10D0C0000000000000000000000000000000000060
69013+:10D0D0000000000000000000000000000000000050
69014+:10D0E0000000000000000000000000000000000040
69015+:10D0F0000000000000000000000000000000000030
69016+:10D10000000000000000000000000000000000001F
69017+:10D11000000000000000000000000000000000000F
69018+:10D1200000000000000000000000000000000000FF
69019+:10D1300000000000000000000000000000000000EF
69020+:10D1400000000000000000000000000000000000DF
69021+:10D1500000000000000000000000000000000000CF
69022+:10D1600000000000000000000000000000000000BF
69023+:10D1700000000000000000000000000000000000AF
69024+:10D18000000000000000000000000000000000009F
69025+:10D19000000000000000000000000000000000008F
69026+:10D1A000000000000000000000000000000000007F
69027+:10D1B000000000000000000000000000000000006F
69028+:10D1C000000000000000000000000000000000005F
69029+:10D1D000000000000000000000000000000000004F
69030+:10D1E000000000000000000000000000000000003F
69031+:10D1F000000000000000000000000000000000002F
69032+:10D20000000000000000000000000000000000001E
69033+:10D21000000000000000000000000000000000000E
69034+:10D2200000000000000000000000000000000000FE
69035+:10D2300000000000000000000000000000000000EE
69036+:10D2400000000000000000000000000000000000DE
69037+:10D2500000000000000000000000000000000000CE
69038+:10D2600000000000000000000000000000000000BE
69039+:10D2700000000000000000000000000000000000AE
69040+:10D28000000000000000000000000000000000009E
69041+:10D29000000000000000000000000000000000008E
69042+:10D2A000000000000000000000000000000000007E
69043+:10D2B000000000000000000000000000000000006E
69044+:10D2C000000000000000000000000000000000005E
69045+:10D2D000000000000000000000000000000000004E
69046+:10D2E000000000000000000000000000000000003E
69047+:10D2F000000000000000000000000000000000002E
69048+:10D30000000000000000000000000000000000001D
69049+:10D31000000000000000000000000000000000000D
69050+:10D3200000000000000000000000000000000000FD
69051+:10D3300000000000000000000000000000000000ED
69052+:10D3400000000000000000000000000000000000DD
69053+:10D3500000000000000000000000000000000000CD
69054+:10D3600000000000000000000000000000000000BD
69055+:10D3700000000000000000000000000000000000AD
69056+:10D38000000000000000000000000000000000009D
69057+:10D39000000000000000000000000000000000008D
69058+:10D3A000000000000000000000000000000000007D
69059+:10D3B000000000000000000000000000000000006D
69060+:10D3C000000000000000000000000000000000005D
69061+:10D3D000000000000000000000000000000000004D
69062+:10D3E000000000000000000000000000000000003D
69063+:10D3F000000000000000000000000000000000002D
69064+:10D40000000000000000000000000000000000001C
69065+:10D41000000000000000000000000000000000000C
69066+:10D4200000000000000000000000000000000000FC
69067+:10D4300000000000000000000000000000000000EC
69068+:10D4400000000000000000000000000000000000DC
69069+:10D4500000000000000000000000000000000000CC
69070+:10D4600000000000000000000000000000000000BC
69071+:10D4700000000000000000000000000000000000AC
69072+:10D48000000000000000000000000000000000009C
69073+:10D49000000000000000000000000000000000008C
69074+:10D4A000000000000000000000000000000000007C
69075+:10D4B000000000000000000000000000000000006C
69076+:10D4C000000000000000000000000000000000005C
69077+:10D4D000000000000000000000000000000000004C
69078+:10D4E000000000000000000000000000000000003C
69079+:10D4F000000000000000000000000000000000002C
69080+:10D50000000000000000000000000000000000001B
69081+:10D51000000000000000000000000000000000000B
69082+:10D5200000000000000000000000000000000000FB
69083+:10D5300000000000000000000000000000000000EB
69084+:10D5400000000000000000000000000000000000DB
69085+:10D5500000000000000000000000000000000000CB
69086+:10D5600000000000000000000000000000000000BB
69087+:10D5700000000000000000000000000000000000AB
69088+:10D58000000000000000000000000000000000009B
69089+:10D59000000000000000000000000000000000008B
69090+:10D5A000000000000000000000000000000000007B
69091+:10D5B000000000000000000000000000000000006B
69092+:10D5C000000000000000000000000000000000005B
69093+:10D5D000000000000000000000000000000000004B
69094+:10D5E000000000000000000000000000000000003B
69095+:10D5F000000000000000000000000000000000002B
69096+:10D60000000000000000000000000000000000001A
69097+:10D61000000000000000000000000000000000000A
69098+:10D6200000000000000000000000000000000000FA
69099+:10D6300000000000000000000000000000000000EA
69100+:10D6400000000000000000000000000000000000DA
69101+:10D6500000000000000000000000000000000000CA
69102+:10D6600000000000000000000000000000000000BA
69103+:10D6700000000000000000000000000000000000AA
69104+:10D68000000000000000000000000000000000009A
69105+:10D69000000000000000000000000000000000008A
69106+:10D6A000000000000000000000000000000000007A
69107+:10D6B000000000000000000000000000000000006A
69108+:10D6C000000000000000000000000000000000005A
69109+:10D6D000000000000000000000000000000000004A
69110+:10D6E000000000000000000000000000000000003A
69111+:10D6F000000000000000000000000000000000002A
69112+:10D700000000000000000000000000000000000019
69113+:10D710000000000000000000000000000000000009
69114+:10D7200000000000000000000000000000000000F9
69115+:10D7300000000000000000000000000000000000E9
69116+:10D7400000000000000000000000000000000000D9
69117+:10D7500000000000000000000000000000000000C9
69118+:10D7600000000000000000000000000000000000B9
69119+:10D7700000000000000000000000000000000000A9
69120+:10D780000000000000000000000000000000000099
69121+:10D790000000000000000000000000000000000089
69122+:10D7A0000000000000000000000000000000000079
69123+:10D7B0000000000000000000000000000000000069
69124+:10D7C0000000000000000000000000000000000059
69125+:10D7D0000000000000000000000000000000000049
69126+:10D7E0000000000000000000000000000000000039
69127+:10D7F0000000000000000000000000000000000029
69128+:10D800000000000000000000000000000000000018
69129+:10D810000000000000000000000000000000000008
69130+:10D8200000000000000000000000000000000000F8
69131+:10D8300000000000000000000000000000000000E8
69132+:10D8400000000000000000000000000000000000D8
69133+:10D8500000000000000000000000000000000000C8
69134+:10D8600000000000000000000000000000000000B8
69135+:10D8700000000000000000000000000000000000A8
69136+:10D880000000000000000000000000000000000098
69137+:10D890000000000000000000000000000000000088
69138+:10D8A0000000000000000000000000000000000078
69139+:10D8B0000000000000000000000000000000000068
69140+:10D8C0000000000000000000000000000000000058
69141+:10D8D0000000000000000000000000000000000048
69142+:10D8E0000000000000000000000000000000000038
69143+:10D8F0000000000000000000000000000000000028
69144+:10D900000000000000000000000000000000000017
69145+:10D910000000000000000000000000000000000007
69146+:10D9200000000000000000000000000000000000F7
69147+:10D9300000000000000000000000000000000000E7
69148+:10D9400000000000000000000000000000000000D7
69149+:10D9500000000000000000000000000000000000C7
69150+:10D9600000000000000000000000000000000000B7
69151+:10D9700000000000000000000000000000000000A7
69152+:10D980000000000000000000000000000000000097
69153+:10D990000000000000000000000000000000000087
69154+:10D9A0000000000000000000000000000000000077
69155+:10D9B0000000000000000000000000000000000067
69156+:10D9C0000000000000000000000000000000000057
69157+:10D9D0000000000000000000000000000000000047
69158+:10D9E0000000000000000000000000000000000037
69159+:10D9F0000000000000000000000000000000000027
69160+:10DA00000000000000000000000000000000000016
69161+:10DA10000000000000000000000000000000000006
69162+:10DA200000000000000000000000000000000000F6
69163+:10DA300000000000000000000000000000000000E6
69164+:10DA400000000000000000000000000000000000D6
69165+:10DA500000000000000000000000000000000000C6
69166+:10DA600000000000000000000000000000000000B6
69167+:10DA700000000000000000000000000000000000A6
69168+:10DA80000000000000000000000000000000000096
69169+:10DA90000000000000000000000000000000000086
69170+:10DAA0000000000000000000000000000000000076
69171+:10DAB0000000000000000000000000000000000066
69172+:10DAC0000000000000000000000000000000000056
69173+:10DAD0000000000000000000000000000000000046
69174+:10DAE0000000000000000000000000000000000036
69175+:10DAF0000000000000000000000000000000000026
69176+:10DB00000000000000000000000000000000000015
69177+:10DB10000000000000000000000000000000000005
69178+:10DB200000000000000000000000000000000000F5
69179+:10DB300000000000000000000000000000000000E5
69180+:10DB400000000000000000000000000000000000D5
69181+:10DB500000000000000000000000000000000000C5
69182+:10DB600000000000000000000000000000000000B5
69183+:10DB700000000000000000000000000000000000A5
69184+:10DB80000000000000000000000000000000000095
69185+:10DB90000000000000000000000000000000000085
69186+:10DBA0000000000000000000000000000000000075
69187+:10DBB0000000000000000000000000000000000065
69188+:10DBC0000000000000000000000000000000000055
69189+:10DBD0000000000000000000000000000000000045
69190+:10DBE0000000000000000000000000000000000035
69191+:10DBF0000000000000000000000000000000000025
69192+:10DC00000000000000000000000000000000000014
69193+:10DC10000000000000000000000000000000000004
69194+:10DC200000000000000000000000000000000000F4
69195+:10DC300000000000000000000000000000000000E4
69196+:10DC400000000000000000000000000000000000D4
69197+:10DC500000000000000000000000000000000000C4
69198+:10DC600000000000000000000000000000000000B4
69199+:10DC700000000000000000000000000000000000A4
69200+:10DC80000000000000000000000000000000000094
69201+:10DC90000000000000000000000000000000000084
69202+:10DCA0000000000000000000000000000000000074
69203+:10DCB0000000000000000000000000000000000064
69204+:10DCC0000000000000000000000000000000000054
69205+:10DCD0000000000000000000000000000000000044
69206+:10DCE0000000000000000000000000000000000034
69207+:10DCF0000000000000000000000000000000000024
69208+:10DD00000000000000000000000000000000000013
69209+:10DD10000000000000000000000000000000000003
69210+:10DD200000000000000000000000000000000000F3
69211+:10DD300000000000000000000000000000000000E3
69212+:10DD400000000000000000000000000000000000D3
69213+:10DD500000000000000000000000000000000000C3
69214+:10DD600000000000000000000000000000000000B3
69215+:10DD700000000000000000000000000000000000A3
69216+:10DD80000000000000000000000000000000000093
69217+:10DD90000000000000000000000000000000000083
69218+:10DDA0000000000000000000000000000000000073
69219+:10DDB0000000000000000000000000000000000063
69220+:10DDC0000000000000000000000000000000000053
69221+:10DDD0000000000000000000000000000000000043
69222+:10DDE0000000000000000000000000000000000033
69223+:10DDF0000000000000000000000000000000000023
69224+:10DE00000000000000000000000000000000000012
69225+:10DE10000000000000000000000000000000000002
69226+:10DE200000000000000000000000000000000000F2
69227+:10DE300000000000000000000000000000000000E2
69228+:10DE400000000000000000000000000000000000D2
69229+:10DE500000000000000000000000000000000000C2
69230+:10DE600000000000000000000000000000000000B2
69231+:10DE700000000000000000000000000000000000A2
69232+:10DE80000000000000000000000000000000000092
69233+:10DE90000000000000000000000000000000000082
69234+:10DEA0000000000000000000000000000000000072
69235+:10DEB0000000000000000000000000000000000062
69236+:10DEC0000000000000000000000000000000000052
69237+:10DED0000000000000000000000000000000000042
69238+:10DEE0000000000000000000000000000000000032
69239+:10DEF0000000000000000000000000000000000022
69240+:10DF00000000000000000000000000000000000011
69241+:10DF10000000000000000000000000000000000001
69242+:10DF200000000000000000000000000000000000F1
69243+:10DF300000000000000000000000000000000000E1
69244+:10DF400000000000000000000000000000000000D1
69245+:10DF500000000000000000000000000000000000C1
69246+:10DF600000000000000000000000000000000000B1
69247+:10DF700000000000000000000000000000000000A1
69248+:10DF80000000000000000000000000000000000091
69249+:10DF90000000000000000000000000000000000081
69250+:10DFA0000000000000000000000000000000000071
69251+:10DFB0000000000000000000000000000000000061
69252+:10DFC0000000000000000000000000000000000051
69253+:10DFD0000000000000000000000000000000000041
69254+:10DFE0000000000000000000000000000000000031
69255+:10DFF0000000000000000000000000000000000021
69256+:10E000000000000000000000000000000000000010
69257+:10E010000000000000000000000000000000000000
69258+:10E0200000000000000000000000000000000000F0
69259+:10E0300000000000000000000000000000000000E0
69260+:10E0400000000000000000000000000000000000D0
69261+:10E0500000000000000000000000000000000000C0
69262+:10E0600000000000000000000000000000000000B0
69263+:10E0700000000000000000000000000000000000A0
69264+:10E080000000000000000000000000000000000090
69265+:10E090000000000000000000000000000000000080
69266+:10E0A0000000000000000000000000000000000070
69267+:10E0B0000000000000000000000000000000000060
69268+:10E0C0000000000000000000000000000000000050
69269+:10E0D0000000000000000000000000000000000040
69270+:10E0E0000000000000000000000000000000000030
69271+:10E0F0000000000000000000000000000000000020
69272+:10E10000000000000000000000000000000000000F
69273+:10E1100000000000000000000000000000000000FF
69274+:10E1200000000000000000000000000000000000EF
69275+:10E1300000000000000000000000000000000000DF
69276+:10E1400000000000000000000000000000000000CF
69277+:10E1500000000000000000000000000000000000BF
69278+:10E1600000000000000000000000000000000000AF
69279+:10E17000000000000000000000000000000000009F
69280+:10E18000000000000000000000000000000000008F
69281+:10E19000000000000000000000000000000000007F
69282+:10E1A000000000000000000000000000000000006F
69283+:10E1B000000000000000000000000000000000005F
69284+:10E1C000000000000000000000000000000000004F
69285+:10E1D000000000000000000000000000000000003F
69286+:10E1E000000000000000000000000000000000002F
69287+:10E1F000000000000000000000000000000000809F
69288+:10E20000000000000000000000000000000000000E
69289+:10E2100000000000000000000000000000000000FE
69290+:10E220000000000A000000000000000000000000E4
69291+:10E2300010000003000000000000000D0000000DB1
69292+:10E240003C020801244295C03C030801246397FC6A
69293+:10E25000AC4000000043202B1480FFFD244200044A
69294+:10E260003C1D080037BD9FFC03A0F0213C100800B6
69295+:10E27000261032103C1C0801279C95C00E0012BECF
69296+:10E28000000000000000000D3C02800030A5FFFFF0
69297+:10E2900030C600FF344301803C0880008D0901B87E
69298+:10E2A0000520FFFE00000000AC6400002404000212
69299+:10E2B000A4650008A066000AA064000BAC67001803
69300+:10E2C0003C03100003E00008AD0301B83C0560000A
69301+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
69302+:10E2E0003C0310003C040200ACA44FC403E000084F
69303+:10E2F000ACA34FF89486000C00A050212488001491
69304+:10E3000000062B0200051080004448210109182B4B
69305+:10E310001060001100000000910300002C6400094F
69306+:10E320005080000991190001000360803C0D080134
69307+:10E3300025AD9258018D58218D67000000E000083E
69308+:10E340000000000091190001011940210109302B42
69309+:10E3500054C0FFF29103000003E000080000102108
69310+:10E360000A000CCC25080001910F0001240E000AC0
69311+:10E3700015EE00400128C8232F38000A1700003D81
69312+:10E38000250D00028D580000250F0006370E0100F4
69313+:10E39000AD4E0000910C000291AB000191A400026F
69314+:10E3A00091A60003000C2E00000B3C0000A71025D6
69315+:10E3B00000041A000043C8250326C025AD580004F8
69316+:10E3C000910E000691ED000191E7000291E5000336
69317+:10E3D000000E5E00000D6400016C30250007220075
69318+:10E3E00000C41025004518252508000A0A000CCC99
69319+:10E3F000AD430008910F000125040002240800022B
69320+:10E4000055E80001012020210A000CCC00804021A9
69321+:10E41000910C0001240B0003158B00160000000076
69322+:10E420008D580000910E000225080003370D0008EA
69323+:10E43000A14E00100A000CCCAD4D00009119000156
69324+:10E44000240F0004172F000B0000000091070002AA
69325+:10E45000910400038D43000000072A0000A410254A
69326+:10E460003466000425080004AD42000C0A000CCC00
69327+:10E47000AD46000003E000082402000127BDFFE8CC
69328+:10E48000AFBF0014AFB000100E00164E0080802108
69329+:10E490003C0480083485008090A600052403FFFE1C
69330+:10E4A0000200202100C310248FBF00148FB0001081
69331+:10E4B000A0A200050A00165827BD001827BDFFE8D6
69332+:10E4C000AFB00010AFBF00140E000FD40080802149
69333+:10E4D0003C06800834C5008090A40000240200504F
69334+:10E4E000308300FF106200073C09800002002021F9
69335+:10E4F0008FBF00148FB00010AD2001800A00108F74
69336+:10E5000027BD0018240801003C07800002002021DC
69337+:10E510008FBF00148FB00010ACE801800A00108F8C
69338+:10E5200027BD001827BDFF783C058008AFBE0080DE
69339+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
69340+:10E54000AFB60078AFB50074AFB40070AFB200687A
69341+:10E55000AFB0006034A600803C0580008CB201287A
69342+:10E5600090C400098CA701043C020001309100FF17
69343+:10E5700000E218240000B8210000F021106000071C
69344+:10E58000000098213C0908008D2931F02413000176
69345+:10E59000252800013C010800AC2831F0ACA0008423
69346+:10E5A00090CC0005000C5827316A0001154000721C
69347+:10E5B000AFA0005090CD00002406002031A400FF41
69348+:10E5C00010860018240E0050108E009300000000EA
69349+:10E5D0003C1008008E1000DC260F00013C010800F2
69350+:10E5E000AC2F00DC0E0016C7000000000040182110
69351+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
69352+:10E600008FB500748FB400708FB3006C8FB2006848
69353+:10E610008FB100648FB000600060102103E000083B
69354+:10E6200027BD00880000000D3C1F8000AFA0003017
69355+:10E6300097E501168FE201043C04002030B9FFFF8A
69356+:10E64000004438240007182B00033140AFA60030E7
69357+:10E650008FF5010437F80C003C1600400338802188
69358+:10E6600002B6A02434C40040128000479215000D69
69359+:10E6700032A800201500000234860080008030217E
69360+:10E6800014C0009FAFA600303C0D800835A6008066
69361+:10E6900090CC0008318B0040516000063C06800899
69362+:10E6A000240E0004122E00A8240F0012122F003294
69363+:10E6B0003C06800834C401003C0280009447011AE3
69364+:10E6C0009619000E909F00088E18000830E3FFFF97
69365+:10E6D00003F9B00432B40004AFB6005CAFA3005835
69366+:10E6E0008E1600041280002EAFB8005434C3008090
69367+:10E6F000906800083105004014A0002500000000CB
69368+:10E700008C70005002D090230640000500000000ED
69369+:10E710008C71003402D1A82306A201678EE20008A2
69370+:10E72000126000063C1280003C1508008EB531F4E2
69371+:10E7300026B600013C010800AC3631F4AE4000447E
69372+:10E74000240300018FBF00848FBE00808FB7007C40
69373+:10E750008FB600788FB500748FB400708FB3006CE3
69374+:10E760008FB200688FB100648FB00060006010212C
69375+:10E7700003E0000827BD00880E000D2800002021BE
69376+:10E780000A000D75004018210A000D9500C02021D7
69377+:10E790000E00171702C020211440FFE10000000006
69378+:10E7A0003C0B8008356400808C8A003402CA482300
69379+:10E7B0000520001D000000003C1E08008FDE310017
69380+:10E7C00027D700013C010800AC3731001260000679
69381+:10E7D000024020213C1408008E9431F42690000160
69382+:10E7E0003C010800AC3031F40E00164E3C1E80088F
69383+:10E7F00037CD008091B700250240202136EE00047D
69384+:10E800000E001658A1AE00250E000CAC02402021CF
69385+:10E810000A000DCA240300013C17080126F796C020
69386+:10E820000A000D843C1F80008C86003002C66023E5
69387+:10E830001980000C2419000C908F004F3C14080024
69388+:10E840008E94310032B500FC35ED0001268E0001BA
69389+:10E850003C010800AC2E3100A08D004FAFA0005845
69390+:10E860002419000CAFB900308C9800300316A02397
69391+:10E870001A80010B8FA300580074F82A17E0FFD309
69392+:10E88000000000001074002A8FA5005802D4B021A7
69393+:10E8900000B410233044FFFFAFA4005832A8000298
69394+:10E8A0001100002E32AB00103C15800836B00080FD
69395+:10E8B0009216000832D30040526000FB8EE200083E
69396+:10E8C0000E00164E02402021240A0018A20A000958
69397+:10E8D000921100052409FFFE024020210229902404
69398+:10E8E0000E001658A2120005240400390000282149
69399+:10E8F0000E0016F2240600180A000DCA24030001B7
69400+:10E9000092FE000C3C0A800835490080001EBB00C6
69401+:10E910008D27003836F10081024020213225F08118
69402+:10E920000E000C9B30C600FF0A000DC10000000065
69403+:10E930003AA7000130E300011460FFA402D4B02123
69404+:10E940000A000E1D00000000024020210E001734B6
69405+:10E95000020028210A000D75004018211160FF7087
69406+:10E960003C0F80083C0D800835EE00808DC40038D7
69407+:10E970008FA300548DA60004006660231D80FF68ED
69408+:10E98000000000000064C02307020001AFA400548F
69409+:10E990003C1F08008FFF31E433F9000113200015FC
69410+:10E9A0008FAC00583C07800094E3011A10600012FD
69411+:10E9B0003C0680080E00216A024020213C03080129
69412+:10E9C000906396F13064000214800145000000005D
69413+:10E9D000306C0004118000078FAC0058306600FBDB
69414+:10E9E0003C010801A02696F132B500FCAFA000580A
69415+:10E9F0008FAC00583C06800834D30080AFB40018B8
69416+:10EA0000AFB60010AFAC00143C088000950B01209D
69417+:10EA10008E6F0030966A005C8FA3005C8FBF003061
69418+:10EA20003169FFFF3144FFFF8FAE005401341021E4
69419+:10EA3000350540000064382B0045C82103E7C02598
69420+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
69421+:10EA5000AFA0002CAFAE0034926D000831B40008B6
69422+:10EA6000168000BB020020218EE200040040F8095D
69423+:10EA700027A400108FAF003031F300025660000170
69424+:10EA800032B500FE3C048008349F008093F90008F2
69425+:10EA900033380040530000138FA400248C850004F9
69426+:10EAA0008FA7005410A700D52404001432B0000131
69427+:10EAB0001200000C8FA400242414000C1234011A3C
69428+:10EAC0002A2D000D11A001022413000E240E000AAD
69429+:10EAD000522E0001241E00088FAF002425E40001FF
69430+:10EAE000AFA400248FAA00143C0B80083565008079
69431+:10EAF000008A48218CB10030ACA9003090A4004EAF
69432+:10EB00008CA700303408FFFF0088180400E3F821C8
69433+:10EB1000ACBF00348FA600308FB900548FB8005CB2
69434+:10EB200030C200081040000B033898218CAC002044
69435+:10EB3000119300D330C600FF92EE000C8FA7003473
69436+:10EB400002402021000E6B0035B400800E000C9BAB
69437+:10EB50003285F0803C028008345000808E0F0030F7
69438+:10EB600001F1302318C00097264800803C070800B8
69439+:10EB70008CE731E42404FF80010418243118007F5D
69440+:10EB80003C1F80003C19800430F10001AFE300908D
69441+:10EB900012200006031928213C030801906396F116
69442+:10EBA00030690008152000C6306A00F73C10800864
69443+:10EBB00036040080908C004F318B000115600042BC
69444+:10EBC000000000003C0608008CC6319830CE0010D2
69445+:10EBD00051C0004230F9000190AF006B55E0003F9A
69446+:10EBE00030F9000124180001A0B8006B3C1180002E
69447+:10EBF0009622007A24470064A48700123C0D800806
69448+:10EC000035A5008090B40008329000401600000442
69449+:10EC10003C03800832AE000115C0008B00000000EC
69450+:10EC2000346400808C86002010D3000A3463010015
69451+:10EC30008C67000002C7782319E000978FBF00544B
69452+:10EC4000AC93002024130001AC760000AFB3005059
69453+:10EC5000AC7F000417C0004E000000008FA90050D8
69454+:10EC60001520000B000000003C030801906396F1A2
69455+:10EC7000306A00011140002E8FAB0058306400FE56
69456+:10EC80003C010801A02496F10A000D75000018212E
69457+:10EC90000E000CAC024020210A000F1300000000FF
69458+:10ECA0000A000E200000A0210040F80924040017EB
69459+:10ECB0000A000DCA240300010040F80924040016CC
69460+:10ECC0000A000DCA240300019094004F240DFFFE9A
69461+:10ECD000028D2824A085004F30F900011320000682
69462+:10ECE0003C0480083C030801906396F1307F0010DB
69463+:10ECF00017E00051306800EF34900080240A0001D2
69464+:10ED0000024020210E00164EA60A00129203002592
69465+:10ED100024090001AFA90050346200010240202103
69466+:10ED20000E001658A20200250A000EF93C0D8008BC
69467+:10ED30001160FE83000018218FA5003030AC000464
69468+:10ED40001180FE2C8FBF00840A000DCB240300012C
69469+:10ED500027A500380E000CB6AFA000385440FF4382
69470+:10ED60008EE200048FB40038329001005200FF3F61
69471+:10ED70008EE200048FA3003C8E6E0058006E682364
69472+:10ED800005A3FF39AE6300580A000E948EE200041A
69473+:10ED90000E00164E024020213C038008346800809B
69474+:10EDA000024020210E001658A11E000903C0302188
69475+:10EDB000240400370E0016F2000028210A000F116B
69476+:10EDC0008FA900508FAB00185960FF8D3C0D800853
69477+:10EDD0000E00164E02402021920C00252405000151
69478+:10EDE000AFA5005035820004024020210E001658C5
69479+:10EDF000A20200250A000EF93C0D800812240059D9
69480+:10EE00002A2300151060004D240900162408000C68
69481+:10EE10005628FF2732B000013C0A8008914C001BA5
69482+:10EE20002406FFBD241E000E01865824A14B001BA2
69483+:10EE30000A000EA532B000013C010801A02896F19D
69484+:10EE40000A000EF93C0D80088CB500308EFE0008DB
69485+:10EE50002404001826B6000103C0F809ACB600303F
69486+:10EE60003C030801906396F13077000116E0FF81C2
69487+:10EE7000306A00018FB200300A000D753243000481
69488+:10EE80003C1080009605011A50A0FF2B34C60010DC
69489+:10EE90000A000EC892EE000C8C6200001456FF6D42
69490+:10EEA000000000008C7800048FB9005403388823D8
69491+:10EEB0000621FF638FBF00540A000F0E0000000000
69492+:10EEC0003C010801A02A96F10A000F3030F9000138
69493+:10EED0001633FF028FAF00240A000EB0241E00106C
69494+:10EEE0000E00164E024020213C0B80083568008041
69495+:10EEF00091090025240A0001AFAA0050353300040F
69496+:10EF0000024020210E001658A11300253C050801DF
69497+:10EF100090A596F130A200FD3C010801A02296F1D7
69498+:10EF20000A000E6D004018212411000E53D1FEEA94
69499+:10EF3000241E00100A000EAF241E00165629FEDC07
69500+:10EF400032B000013C0A8008914C001B2406FFBD32
69501+:10EF5000241E001001865824A14B001B0A000EA598
69502+:10EF600032B000010A000EA4241E00123C038000EF
69503+:10EF70008C6201B80440FFFE24040800AC6401B8B0
69504+:10EF800003E000080000000030A5FFFF30C6FFFFCF
69505+:10EF90003C0780008CE201B80440FFFE34EA0180A7
69506+:10EFA000AD440000ACE400203C0480089483004899
69507+:10EFB0003068FFFF11000016AF88000824AB001274
69508+:10EFC000010B482B512000133C04800034EF01005A
69509+:10EFD00095EE00208F890000240D001A31CCFFFF30
69510+:10EFE00031274000A14D000B10E000362583FFFEC5
69511+:10EFF0000103C02B170000348F9900048F88000490
69512+:10F00000A5430014350700010A001003AF87000470
69513+:10F010003C04800024030003348201808F890000B7
69514+:10F020008F870004A043000B3C088000350C018052
69515+:10F03000A585000EA585001A8F85000C30EB800099
69516+:10F04000A5890010AD850028A58600081160000F75
69517+:10F050008F85001435190100972A00163158FFFCDE
69518+:10F06000270F000401E870218DCD400031A6FFFF7D
69519+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
69520+:10F0800000E83824AF8700048F8500142403BFFFF5
69521+:10F090003C04800000E3582434830180A46B0026E4
69522+:10F0A000AC69002C10A0000300054C02A465001000
69523+:10F0B000A46900263C071000AC8701B803E00008F3
69524+:10F0C000000000008F990004240AFFFE032A382460
69525+:10F0D0000A001003AF87000427BDFFE88FA20028B5
69526+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
69527+:10F0F000AF820014AF8000040E000FDBAF80000071
69528+:10F100008FBF001027BD001803E00008AF80001477
69529+:10F110003C06800034C4007034C701008C8A0000B3
69530+:10F1200090E500128F84000027BDFFF030A300FFA0
69531+:10F13000000318823082400010400037246500032D
69532+:10F140000005C8800326C0218F0E4000246F0004F4
69533+:10F15000000F6880AFAE000001A660218D8B4000DB
69534+:10F16000AFAB000494E900163128FFFC01063821FA
69535+:10F170008CE64000AFA600088FA9000800003021EF
69536+:10F18000000028213C07080024E701000A0010675E
69537+:10F19000240800089059000024A500012CAC000CA4
69538+:10F1A0000079C0210018788001E770218DCD000022
69539+:10F1B0001180000600CD302603A5102114A8FFF50C
69540+:10F1C00000051A005520FFF4905900003C0480000F
69541+:10F1D000348700703C0508008CA531048CE30000E6
69542+:10F1E0002CA2002010400009006A38230005488046
69543+:10F1F0003C0B0800256B3108012B402124AA00019B
69544+:10F20000AD0700003C010800AC2A310400C0102109
69545+:10F2100003E0000827BD0010308220001040000BE2
69546+:10F2200000055880016648218D24400024680004B0
69547+:10F2300000083880AFA4000000E618218C6540006B
69548+:10F24000AFA000080A001057AFA500040000000D91
69549+:10F250000A0010588FA9000827BDFFE03C07800076
69550+:10F2600034E60100AFBF001CAFB20018AFB100140C
69551+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
69552+:10F280002483000430E2400010400010AF830028C7
69553+:10F290003C09002000E940241100000D30EC800002
69554+:10F2A0008F8A0004240BBFFF00EB38243543100085
69555+:10F2B000AF87000030F220001640000B3C1900041C
69556+:10F2C000241FFFBF0A0010B7007F102430EC80001D
69557+:10F2D000158000423C0E002030F220001240FFF862
69558+:10F2E0008F8300043C19000400F9C0241300FFF5CB
69559+:10F2F000241FFFBF34620040AF82000430E20100EF
69560+:10F300001040001130F010008F83002C10600006B8
69561+:10F310003C0F80003C05002000E52024148000C044
69562+:10F320003C0800043C0F800035EE010095CD001E26
69563+:10F3300095CC001C31AAFFFF000C5C00014B482556
69564+:10F34000AF89000C30F010001200000824110001F9
69565+:10F3500030F100201620008B3C18100000F890249B
69566+:10F36000164000823C040C002411000130E801002A
69567+:10F370001500000B3C0900018F85000430A94000F6
69568+:10F38000152000073C0900013C0C1F0100EC58242B
69569+:10F390003C0A1000116A01183C1080003C09000171
69570+:10F3A00000E9302410C000173C0B10003C18080086
69571+:10F3B0008F1800243307000214E0014024030001E9
69572+:10F3C0008FBF001C8FB200188FB100148FB00010D7
69573+:10F3D0000060102103E0000827BD002000EE682433
69574+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
69575+:10F3F00036307FFF00F0382435E380000A0010A685
69576+:10F40000AF87000000EB102450400065AF8000245F
69577+:10F410008F8C002C3C0D0F0000ED18241580008807
69578+:10F42000AF83001030E8010011000086938F0010B8
69579+:10F430003C0A0200106A00833C1280003650010032
69580+:10F44000920500139789002A3626000230AF00FF8C
69581+:10F4500025EE0004000E19C03C0480008C9801B811
69582+:10F460000700FFFE34880180AD0300003C198008CE
69583+:10F47000AC830020973100483225FFFF10A0015CCB
69584+:10F48000AF8500082523001200A3F82B53E0015993
69585+:10F490008F850004348D010095AC00202402001AF1
69586+:10F4A00030E44000318BFFFFA102000B108001927D
69587+:10F4B0002563FFFE00A3502B154001908F8F0004A1
69588+:10F4C000A50300148F88000435050001AF850004F2
69589+:10F4D0003C08800035190180A729000EA729001AD1
69590+:10F4E0008F89000C30B18000A7270010AF290028B9
69591+:10F4F000A72600081220000E3C04800035020100FF
69592+:10F50000944C0016318BFFFC256400040088182100
69593+:10F510008C7F400033E6FFFF14C000053C048000F0
69594+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
69595+:10F53000240EBFFF00AE402434850180A4A800261D
69596+:10F54000ACA7002C3C071000AC8701B800001821C4
69597+:10F550008FBF001C8FB200188FB100148FB0001045
69598+:10F560000060102103E0000827BD00203C020BFFD3
69599+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
69600+:10F58000241100013C0608008CC6002C24C5000193
69601+:10F590003C010800AC25002C0A0010D42411000501
69602+:10F5A0008F85002410A0002FAF80001090A30000D2
69603+:10F5B000146000792419000310A0002A30E601002D
69604+:10F5C00010C000CC8F860010241F000210DF00C97D
69605+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
69606+:10F5E00014E0000201641824000018213C0D0800FA
69607+:10F5F00025AD0038006D1021904C00048F85002847
69608+:10F6000025830004000321C030A5FFFF3626000239
69609+:10F610000E000FDB000000000A00114D0000182151
69610+:10F6200000E8302414C0FF403C0F80000E00103D65
69611+:10F63000000000008F8700000A0010CAAF82000C93
69612+:10F64000938F00103C18080127189640000F90C0B7
69613+:10F6500002588021AF9000248F85002414A0FFD38E
69614+:10F66000AF8F00103C0480008C86400030C5010044
69615+:10F6700010A000BC322300043C0C08008D8C002438
69616+:10F6800024120004106000C23190000D3C04800080
69617+:10F690008C8D40003402FFFF11A201003231FFFBCC
69618+:10F6A0008C884000310A01005540000124110010EF
69619+:10F6B00030EE080011C000BE2419FFFB8F9800280F
69620+:10F6C0002F0F03EF51E000010219802430E90100FF
69621+:10F6D00011200014320800018F87002C14E000FB79
69622+:10F6E0008F8C000C3C05800034AB0100917F00132F
69623+:10F6F00033E300FF246A00042403FFFE0203802496
69624+:10F70000000A21C012000002023230253226FFFF1B
69625+:10F710000E000FDB9785002A1200FF290000182138
69626+:10F72000320800011100000D32180004240E0001FF
69627+:10F73000120E0002023230253226FFFF9785002A82
69628+:10F740000E000FDB00002021240FFFFE020F80249B
69629+:10F750001200FF1B00001821321800045300FF188C
69630+:10F760002403000102323025241200045612000145
69631+:10F770003226FFFF9785002A0E000FDB24040100CC
69632+:10F780002419FFFB021988241220FF0D0000182104
69633+:10F790000A0010E9240300011079009C00003021C8
69634+:10F7A00090AD00012402000211A200BE30EA004028
69635+:10F7B00090B90001241800011338007F30E900409F
69636+:10F7C0008CA600049785002A00C020210E000FDBC4
69637+:10F7D0003626000200004021010018218FBF001CC6
69638+:10F7E0008FB200188FB100148FB00010006010218C
69639+:10F7F00003E0000827BD0020360F010095EE000C45
69640+:10F8000031CD020015A0FEE63C0900013C1880083D
69641+:10F81000971200489789002A362600023248FFFFD7
69642+:10F82000AF8800083C0380008C7101B80620FFFE01
69643+:10F83000346A0180AD4000001100008E3C0F800052
69644+:10F84000253F0012011FC82B1320008B240E00033C
69645+:10F85000346C0100958B00202402001A30E4400033
69646+:10F860003163FFFFA142000B108000A72463FFFE5D
69647+:10F870000103682B15A000A52408FFFE34A5000194
69648+:10F88000A5430014AF8500043C0480002412BFFF90
69649+:10F8900000B2802434850180A4A9000EA4A9001A16
69650+:10F8A000A4A60008A4B00026A4A700103C071000DE
69651+:10F8B000AC8701B80A00114D000018213C038000FC
69652+:10F8C00034640100949F000E3C1908008F3900D861
69653+:10F8D0002404008033E5FFFF273100013C010800CC
69654+:10F8E000AC3100D80E000FDB240600030A00114DD6
69655+:10F8F00000001821240A000210CA00598F85002830
69656+:10F900003C0308008C6300D0240E0001106E005EE2
69657+:10F910002CCF000C24D2FFFC2E5000041600002136
69658+:10F9200000002021241800021078001B2CD9000CA4
69659+:10F9300024DFFFF82FE900041520FF330000202109
69660+:10F9400030EB020051600004000621C054C00022C8
69661+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
69662+:10F96000362600023C0908008D29002431300001B0
69663+:10F970005200FEF7000018219785002A3626000263
69664+:10F980000E000FDB000020210A00114D000018219D
69665+:10F990000A00119C241200021320FFE624DFFFF866
69666+:10F9A0000000202130A5FFFF0A00117D362600024D
69667+:10F9B0000A0011AC021980245120FF828CA6000499
69668+:10F9C0003C05080190A5964110A0FF7E2408000187
69669+:10F9D0000A0011F0010018210E000FDB3226000191
69670+:10F9E0008F8600108F8500280A00124F000621C064
69671+:10F9F0008F8500043C18800024120003371001801A
69672+:10FA0000A212000B0A00112E3C08800090A30001F6
69673+:10FA1000241100011071FF70240800012409000264
69674+:10FA20005069000430E60040240800010A0011F08B
69675+:10FA30000100182150C0FFFD240800013C0C80008B
69676+:10FA4000358B01009563001094A40002307FFFFF06
69677+:10FA5000509FFF62010018210A001284240800014F
69678+:10FA60002CA803EF1100FE56240300010A001239EE
69679+:10FA700000000000240E000335EA0180A14E000BB7
69680+:10FA80000A00121C3C04800011E0FFA2000621C005
69681+:10FA900030A5FFFF0A00117D362600020A0011A5DD
69682+:10FAA000241100201140FFC63C1280003650010096
69683+:10FAB000960F001094AE000231E80FFF15C8FFC08A
69684+:10FAC000000000000A0011E690B900013C060800A1
69685+:10FAD0008CC6003824C4FFFF14C00002018418241F
69686+:10FAE000000018213C0D080025AD0038006D1021E4
69687+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
69688+:10FB00000A00112C01EE28242408FFFE0A00121A14
69689+:10FB100000A8282427BDFFC8AFB00010AFBF003435
69690+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
69691+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
69692+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
69693+:10FB500001CF682435AC380C240B0003AE0C5000E8
69694+:10FB6000ACCB00083C010800AC2000200E001819A6
69695+:10FB7000000000003C0A0010354980513C06601628
69696+:10FB8000AE09537C8CC700003C0860148D0500A0B2
69697+:10FB90003C03FFFF00E320243C02535300051FC237
69698+:10FBA0001482000634C57C000003A08002869821E0
69699+:10FBB0008E7200043C116000025128218CBF007C31
69700+:10FBC0008CA200783C1E600037C420203C05080150
69701+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
69702+:10FBE0002406000A3C190001273996403C01080010
69703+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
69704+:10FC00002418FFF03C15570902F8B02412D502F56C
69705+:10FC100024040001AF80002C3C1480003697018042
69706+:10FC20003C1E080127DE9644369301008E900000AA
69707+:10FC30003205000310A0FFFD3207000110E000882C
69708+:10FC4000320600028E7100283C048000AE91002034
69709+:10FC50008E6500048E66000000A0382100C040219F
69710+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
69711+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
69712+:10FC80009675000E3C1208008E52002030AC4000E9
69713+:10FC900032AFFFFF264E000125ED00043C010800B5
69714+:10FCA000AC2E0020118000E8AF8D00283C18002009
69715+:10FCB00000B8B02412C000E530B980002408BFFFAE
69716+:10FCC00000A8382434C81000AF87000030E62000B8
69717+:10FCD00010C000E92409FFBF3C03000400E328240E
69718+:10FCE00010A00002010910243502004030EA010092
69719+:10FCF00011400010AF8200048F8B002C11600007B0
69720+:10FD00003C0D002000ED6024118000043C0F000435
69721+:10FD100000EF702411C00239000000009668001E38
69722+:10FD20009678001C3115FFFF0018B40002B690252C
69723+:10FD3000AF92000C30F910001320001324150001BD
69724+:10FD400030FF002017E0000A3C04100000E41024FB
69725+:10FD50001040000D3C0A0C003C090BFF00EA18247F
69726+:10FD60003525FFFF00A3302B10C0000830ED010047
69727+:10FD70003C0C08008D8C002C24150005258B0001FF
69728+:10FD80003C010800AC2B002C30ED010015A0000B4D
69729+:10FD90003C0500018F85000430AE400055C00007CF
69730+:10FDA0003C0500013C161F0100F690243C0F10009A
69731+:10FDB000124F01CE000000003C05000100E5302498
69732+:10FDC00010C000AF3C0C10003C1F08008FFF002447
69733+:10FDD00033E90002152000712403000100601021A6
69734+:10FDE000104000083C0680003C08800035180100E7
69735+:10FDF0008F0F00243C056020ACAF00140000000011
69736+:10FE00003C0680003C194000ACD9013800000000DD
69737+:10FE10005220001332060002262B0140262C0080BF
69738+:10FE2000240EFF80016E2024018E6824000D1940ED
69739+:10FE3000318A007F0004A9403172007F3C16200007
69740+:10FE400036C20002006A482502B2382500E2882541
69741+:10FE50000122F825ACDF0830ACD1083032060002B0
69742+:10FE600010C0FF723C188000370501408CA80000CC
69743+:10FE700024100040AF08002090AF000831E300706C
69744+:10FE8000107000D428790041532000082405006038
69745+:10FE9000241100201071000E3C0A40003C09800033
69746+:10FEA000AD2A01780A001304000000001465FFFB6E
69747+:10FEB0003C0A40000E001FFA000000003C0A40000F
69748+:10FEC0003C098000AD2A01780A00130400000000FC
69749+:10FED00090A90009241F00048CA70000312800FF0E
69750+:10FEE000111F01B22503FFFA2C7200061240001404
69751+:10FEF0003C0680008CA9000494A4000A310500FF90
69752+:10FF000000095E022D6A00083086FFFF15400002DE
69753+:10FF10002567000424070003240C000910AC01FA33
69754+:10FF200028AD000A11A001DE2410000A240E0008EA
69755+:10FF300010AE0028000731C000C038213C06800008
69756+:10FF40008CD501B806A0FFFE34D20180AE47000078
69757+:10FF500034CB0140916E0008240300023C0A4000AB
69758+:10FF600031C400FF00046A0001A86025A64C000807
69759+:10FF7000A243000B9562000A3C0810003C09800077
69760+:10FF8000A64200108D670004AE470024ACC801B83B
69761+:10FF9000AD2A01780A001304000000003C0A80002A
69762+:10FFA000354401009483000E3C0208008C4200D8C6
69763+:10FFB000240400803065FFFF245500013C01080047
69764+:10FFC000AC3500D80E000FDB240600030A001370C6
69765+:10FFD000000018210009320230D900FF2418000166
69766+:10FFE0001738FFD5000731C08F910020262200016D
69767+:10FFF000AF8200200A0013C800C0382100CB2024A3
69768+:020000021000EC
69769+:10000000AF85000010800008AF860004240D87FF34
69770+:1000100000CD6024158000083C0E006000AE302446
69771+:1000200010C00005000000000E000D42000000009E
69772+:100030000A001371000000000E0016050000000009
69773+:100040000A0013710000000030B980005320FF1F28
69774+:10005000AF8500003C02002000A2F82453E0FF1B03
69775+:10006000AF8500003C07FFFF34E47FFF00A4382485
69776+:100070000A00132B34C880000A001334010910242D
69777+:1000800000EC58245160005AAF8000248F8D002C62
69778+:100090003C0E0F0000EE182415A00075AF83001071
69779+:1000A00030EF010011E00073939800103C12020041
69780+:1000B000107200703C06800034D9010093280013B0
69781+:1000C0009789002A36A60002311800FF271600047F
69782+:1000D000001619C03C0480008C8501B804A0FFFE06
69783+:1000E00034880180AD0300003C158008AC830020FB
69784+:1000F00096BF004833E5FFFF10A001BCAF850008A4
69785+:100100002523001200A3102B504001B98F85000455
69786+:10011000348D010095AC0020240B001A30E440001F
69787+:10012000318AFFFFA10B000B108001BA2543FFFEAF
69788+:1001300000A3702B15C001B88F9600048F8F0004A8
69789+:10014000A503001435E50001AF8500043C088000DC
69790+:1001500035150180A6A9000EA6A9001A8F89000CEA
69791+:1001600030BF8000A6A70010AEA90028A6A60008F0
69792+:1001700013E0000F3C0F8000350C0100958B00163A
69793+:10018000316AFFFC25440004008818218C6240007D
69794+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
69795+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
69796+:1001B0002416BFFF00B6902435E50180A4B20026C6
69797+:1001C000ACA7002C3C071000ADE701B80A00137083
69798+:1001D000000018210E00165D000000003C0A4000DF
69799+:1001E0003C098000AD2A01780A00130400000000D9
69800+:1001F0008F85002410A00027AF80001090A300007E
69801+:10020000106000742409000310690101000030210E
69802+:1002100090AE0001240D000211CD014230EF0040EC
69803+:1002200090A90001241F0001113F000930E20040A5
69804+:100230008CA600049785002A00C020210E000FDB49
69805+:1002400036A60002000040210A00137001001821A8
69806+:100250005040FFF88CA600043C07080190E7964147
69807+:1002600010E0FFF4240800010A00137001001821B7
69808+:10027000939800103C1F080127FF96400018C8C043
69809+:10028000033F4021AF8800248F85002414A0FFDBAA
69810+:10029000AF9800103C0480008C86400030C50100FF
69811+:1002A00010A0008732AB00043C0C08008D8C0024A9
69812+:1002B00024160004156000033192000D241600027C
69813+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
69814+:1002D00032B5FFFB8C984000330F010055E0000160
69815+:1002E0002415001030E80800110000382409FFFB35
69816+:1002F0008F9F00282FF903EF53200001024990241B
69817+:1003000030E2010010400014325F00018F87002CA2
69818+:1003100014E0010E8F8C000C3C0480003486010038
69819+:1003200090C5001330AA00FF25430004000321C03C
69820+:100330002419FFFE025990241240000202B6302513
69821+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
69822+:1003500000001821325F000113E0000D3247000455
69823+:10036000240900011249000202B6302532A6FFFF1F
69824+:100370009785002A0E000FDB000020212402FFFEDB
69825+:10038000024290241240FE950000182132470004DA
69826+:1003900050E0FE922403000102B63025241600042A
69827+:1003A0005656000132A6FFFF9785002A0E000FDB8C
69828+:1003B000240401002403FFFB0243A82412A0FE87AB
69829+:1003C000000018210A001370240300010A0014B968
69830+:1003D0000249902410A0FFAF30E5010010A00017E3
69831+:1003E0008F8600102403000210C300148F84000CB9
69832+:1003F0003C0608008CC6003824CAFFFF14C0000267
69833+:10040000008A1024000010213C0E080025CE003880
69834+:10041000004E682191AC00048F850028258B0004D4
69835+:10042000000B21C030A5FFFF36A600020E000FDB37
69836+:10043000000000000A00137000001821240F0002C1
69837+:1004400010CF0088241600013C0308008C6300D004
69838+:100450001076008D8F85002824D9FFFC2F280004FA
69839+:100460001500006300002021241F0002107F005DA2
69840+:100470002CC9000C24C3FFF82C6200041440FFE9CF
69841+:100480000000202130EA020051400004000621C093
69842+:1004900054C0000530A5FFFF000621C030A5FFFFB6
69843+:1004A0000A00150436A600020E000FDB32A600017A
69844+:1004B0008F8600108F8500280A001520000621C0B5
69845+:1004C0003C0A08008D4A0024315200015240FE438C
69846+:1004D000000018219785002A36A600020E000FDBC7
69847+:1004E000000020210A001370000018219668000CFB
69848+:1004F000311802005700FE313C0500013C1F800806
69849+:1005000097F900489789002A36A600023328FFFF92
69850+:10051000AF8800083C0380008C7501B806A0FFFE80
69851+:100520003C04800034820180AC400000110000B621
69852+:1005300024180003252A0012010A182B106000B2AB
69853+:1005400000000000966F00203C0E8000240D001A71
69854+:1005500031ECFFFF35CA018030EB4000A14D000BAC
69855+:10056000116000B02583FFFE0103902B164000AE02
69856+:100570002416FFFE34A50001A5430014AF85000436
69857+:100580002419BFFF00B94024A6E9000EA6E9001A0D
69858+:10059000A6E60008A6E80026A6E700103C07100023
69859+:1005A000AE8701B80A001370000018213C048000D7
69860+:1005B0008C8201B80440FFFE349601802415001C93
69861+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
69862+:1005D0003C0A40003C098000AD2A01780A0013045F
69863+:1005E000000000005120FFA424C3FFF800002021D8
69864+:1005F00030A5FFFF0A00150436A600020E00103DCC
69865+:10060000000000008F8700000A001346AF82000C34
69866+:1006100090A30001241500011075FF0B24080001B0
69867+:10062000240600021066000430E2004024080001A5
69868+:100630000A001370010018215040FFFD240800013A
69869+:100640003C0C8000358B0100956A001094A40002D8
69870+:100650003143FFFF5083FDE1010018210A00158599
69871+:10066000240800018F8500282CB203EF1240FDDB27
69872+:10067000240300013C0308008C6300D02416000111
69873+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
69874+:10069000000621C030A5FFFF0A00150436A600029F
69875+:1006A00010B00037240F000B14AFFE23000731C039
69876+:1006B000312600FF00065600000A4E0305220047BF
69877+:1006C00030C6007F0006F8C03C16080126D69640CA
69878+:1006D00003F68021A2000001A20000003C0F600090
69879+:1006E0008DF918202405000100C588040011302769
69880+:1006F0000326C024000731C000C03821ADF81820FF
69881+:100700000A0013C8A60000028F850020000731C030
69882+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
69883+:100720002415002011E0FECC3C1980003728010080
69884+:100730009518001094B6000233120FFF16D2FEC6B1
69885+:10074000000000000A00148290A900013C0B080080
69886+:100750008D6B0038256DFFFF15600002018D1024A0
69887+:10076000000010213C080800250800380048C0217E
69888+:10077000930F000425EE00040A0014C5000E21C0EA
69889+:1007800000065202241F00FF115FFDEB000731C07D
69890+:10079000000A20C03C0E080125CE9640008EA821FC
69891+:1007A000009E602100095C02240D00013C076000EE
69892+:1007B000A2AD0000AD860000A2AB00018CF21820B3
69893+:1007C00024030001014310040242B025ACF61820B6
69894+:1007D00000C038210A0013C8A6A900020A0015AA01
69895+:1007E000AF8000200A0012FFAF84002C8F85000428
69896+:1007F0003C1980002408000337380180A308000B4F
69897+:100800000A00144D3C088000A2F8000B0A00155A9B
69898+:100810002419BFFF8F9600042412FFFE0A00144B18
69899+:1008200002D228242416FFFE0A00155800B62824F8
69900+:100830003C038000346401008C85000030A2003E3F
69901+:100840001440000800000000AC6000488C870000E5
69902+:1008500030E607C010C0000500000000AC60004C8E
69903+:10086000AC60005003E0000824020001AC600054BA
69904+:10087000AC6000408C880000310438001080FFF923
69905+:10088000000000002402000103E00008AC60004406
69906+:100890003C0380008C6201B80440FFFE3467018095
69907+:1008A000ACE4000024080001ACE00004A4E500086A
69908+:1008B00024050002A0E8000A34640140A0E5000B12
69909+:1008C0009483000A14C00008A4E30010ACE00024E4
69910+:1008D0003C07800034E901803C041000AD20002872
69911+:1008E00003E00008ACE401B88C8600043C0410006E
69912+:1008F000ACE600243C07800034E90180AD200028EC
69913+:1009000003E00008ACE401B83C0680008CC201B8EA
69914+:100910000440FFFE34C7018024090002ACE400005B
69915+:10092000ACE40004A4E50008A0E9000A34C50140D5
69916+:10093000A0E9000B94A8000A3C041000A4E80010F1
69917+:10094000ACE000248CA30004ACE3002803E0000822
69918+:10095000ACC401B83C039000346200010082202541
69919+:100960003C038000AC6400208C65002004A0FFFEE6
69920+:100970000000000003E00008000000003C028000CE
69921+:10098000344300010083202503E00008AC4400202C
69922+:1009900027BDFFE03C098000AFBF0018AFB10014D5
69923+:1009A000AFB00010352801408D10000091040009FF
69924+:1009B0009107000891050008308400FF30E600FF31
69925+:1009C00000061A002C820081008330251040002A86
69926+:1009D00030A50080000460803C0D080125AD92B078
69927+:1009E000018D58218D6A00000140000800000000C0
69928+:1009F0003C038000346201409445000A14A0001EAC
69929+:100A00008F91FCC09227000530E6000414C0001A44
69930+:100A1000000000000E00164E02002021922A000560
69931+:100A200002002021354900040E001658A2290005B5
69932+:100A30009228000531040004148000020000000028
69933+:100A40000000000D922D0000240B002031AC00FFAF
69934+:100A5000158B00093C0580008CAE01B805C0FFFE77
69935+:100A600034B10180AE3000003C0F100024100005AE
69936+:100A7000A230000BACAF01B80000000D8FBF001812
69937+:100A80008FB100148FB0001003E0000827BD0020D4
69938+:100A90000200202100C028218FBF00188FB1001450
69939+:100AA0008FB00010240600010A00161D27BD00208B
69940+:100AB0000000000D0200202100C028218FBF001877
69941+:100AC0008FB100148FB00010000030210A00161DF5
69942+:100AD00027BD002014A0FFE8000000000200202134
69943+:100AE0008FBF00188FB100148FB0001000C02821F4
69944+:100AF0000A00163B27BD00203C0780008CEE01B8A1
69945+:100B000005C0FFFE34F00180241F0002A21F000B6D
69946+:100B100034F80140A60600089719000A3C0F10009F
69947+:100B2000A61900108F110004A6110012ACEF01B835
69948+:100B30000A0016998FBF001827BDFFE8AFBF00104D
69949+:100B40000E000FD4000000003C0280008FBF001098
69950+:100B500000002021AC4001800A00108F27BD001842
69951+:100B60003084FFFF30A5FFFF108000070000182130
69952+:100B7000308200011040000200042042006518216C
69953+:100B80001480FFFB0005284003E0000800601021EE
69954+:100B900010C00007000000008CA2000024C6FFFF68
69955+:100BA00024A50004AC82000014C0FFFB24840004D0
69956+:100BB00003E000080000000010A0000824A3FFFFCD
69957+:100BC000AC86000000000000000000002402FFFFCF
69958+:100BD0002463FFFF1462FFFA2484000403E000088A
69959+:100BE000000000003C03800027BDFFF83462018054
69960+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
69961+:100C00003C0B80008D6401B80480FFFE00000000F2
69962+:100C10008FA900008D6801288FAA00008FA700000F
69963+:100C20008FA400002405000124020002A085000A10
69964+:100C30008FA30000359940003C051000A062000B16
69965+:100C40008FB800008FAC00008FA600008FAF0000AF
69966+:100C500027BD0008AD280000AD400004AD80002491
69967+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
69968+:100C700003E00008AD6501B83C06800827BDFFE829
69969+:100C800034C50080AFBF001090A7000924020012F5
69970+:100C900030E300FF1062000B008030218CA8005070
69971+:100CA00000882023048000088FBF00108CAA003425
69972+:100CB000240400390000282100CA4823052000052B
69973+:100CC000240600128FBF00102402000103E0000878
69974+:100CD00027BD00180E0016F2000000008FBF0010A4
69975+:100CE0002402000103E0000827BD001827BDFFC84B
69976+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
69977+:100D000000A0802190A5000D30A6001010C000109A
69978+:100D1000008090213C0280088C4400048E0300086F
69979+:100D20001064000C30A7000530A6000510C0009329
69980+:100D3000240400018FBF00348FB200308FB1002C2B
69981+:100D40008FB000280080102103E0000827BD003884
69982+:100D500030A7000510E0000F30AB001210C00006F5
69983+:100D6000240400013C0980088E0800088D25000439
69984+:100D70005105009C240400388FBF00348FB200302E
69985+:100D80008FB1002C8FB000280080102103E00008F4
69986+:100D900027BD0038240A0012156AFFE6240400016A
69987+:100DA0000200202127A500100E000CB6AFA00010F5
69988+:100DB0001440007C3C19800837240080909800087B
69989+:100DC000331100081220000A8FA7001030FF010025
69990+:100DD00013E000A48FA300148C8600580066102333
69991+:100DE000044000043C0A8008AC8300588FA7001020
69992+:100DF0003C0A800835480080910900083124000829
69993+:100E00001480000224080003000040213C1F8008D9
69994+:100E100093F1001193F9001237E600808CCC005456
69995+:100E2000333800FF03087821322D00FF000F708057
69996+:100E300001AE282100AC582B1160006F00000000AB
69997+:100E400094CA005C8CC900543144FFFF0125102373
69998+:100E50000082182B14600068000000008CCB005446
69999+:100E60000165182330EC00041180006C000830800C
70000+:100E70008FA8001C0068102B1040006230ED0004A9
70001+:100E8000006610232C46008010C00002004088211C
70002+:100E9000241100800E00164E024020213C0D8008D7
70003+:100EA00035A6008024070001ACC7000C90C80008DC
70004+:100EB0000011484035A70100310C007FA0CC00088C
70005+:100EC0008E05000424AB0001ACCB0030A4D1005C43
70006+:100ED0008CCA003C9602000E01422021ACC40020C6
70007+:100EE0008CC3003C0069F821ACDF001C8E190004A3
70008+:100EF000ACF900008E180008ACF800048FB10010A7
70009+:100F0000322F000855E0004793A60020A0C0004EF5
70010+:100F100090D8004E2411FFDFA0F8000890CF000801
70011+:100F200001F17024A0CE00088E0500083C0B80085B
70012+:100F300035690080AD2500388D6A00148D2200309F
70013+:100F40002419005001422021AD24003491230000D7
70014+:100F5000307F00FF13F90036264F01000E001658AF
70015+:100F60000240202124040038000028210E0016F23F
70016+:100F70002406000A0A001757240400010E000D2859
70017+:100F8000000020218FBF00348FB200308FB1002CC1
70018+:100F90008FB00028004020210080102103E00008CD
70019+:100FA00027BD00388E0E00083C0F800835F0008009
70020+:100FB000AE0E005402402021AE0000300E00164E4E
70021+:100FC00000000000920D00250240202135AC0020D9
70022+:100FD0000E001658A20C00250E000CAC0240202179
70023+:100FE000240400382405008D0E0016F22406001299
70024+:100FF0000A0017572404000194C5005C0A001792E8
70025+:1010000030A3FFFF2407021811A0FF9E00E6102363
70026+:101010008FAE001C0A00179A01C610230A0017970A
70027+:101020002C620218A0E600080A0017C48E0500080A
70028+:101030002406FF8001E6C0243C118000AE38002861
70029+:101040008E0D000831E7007F3C0E800C00EE602121
70030+:10105000AD8D00E08E080008AF8C00380A0017D074
70031+:10106000AD8800E4AC800058908500082403FFF7A9
70032+:1010700000A33824A08700080A0017758FA7001066
70033+:101080003C05080024A560A83C04080024846FF4F3
70034+:101090003C020800244260B0240300063C01080121
70035+:1010A000AC2596C03C010801AC2496C43C01080163
70036+:1010B000AC2296C83C010801A02396CC03E00008AE
70037+:1010C0000000000003E00008240200013C02800050
70038+:1010D000308800FF344701803C0680008CC301B893
70039+:1010E0000460FFFE000000008CC501282418FF806A
70040+:1010F0003C0D800A24AF010001F8702431EC007F20
70041+:10110000ACCE0024018D2021ACE50000948B00EAD8
70042+:101110003509600024080002316AFFFFACEA0004D0
70043+:1011200024020001A4E90008A0E8000BACE00024C0
70044+:101130003C071000ACC701B8AF84003803E00008DA
70045+:10114000AF85006C938800488F8900608F820038DB
70046+:1011500030C600FF0109382330E900FF01221821C1
70047+:1011600030A500FF2468008810C000020124382147
70048+:101170000080382130E400031480000330AA00030B
70049+:101180001140000D312B000310A0000900001021B8
70050+:1011900090ED0000244E000131C200FF0045602B9D
70051+:1011A000A10D000024E700011580FFF925080001CA
70052+:1011B00003E00008000000001560FFF300000000DD
70053+:1011C00010A0FFFB000010218CF80000245900043F
70054+:1011D000332200FF0045782BAD18000024E70004FF
70055+:1011E00015E0FFF92508000403E0000800000000F6
70056+:1011F00093850048938800588F8700600004320070
70057+:101200003103007F00E5102B30C47F001040000F39
70058+:10121000006428258F8400383C0980008C8A00EC0B
70059+:10122000AD2A00A43C03800000A35825AC6B00A0AD
70060+:101230008C6C00A00580FFFE000000008C6D00ACEF
70061+:10124000AC8D00EC03E000088C6200A80A00188254
70062+:101250008F840038938800593C0280000080502120
70063+:10126000310300FEA383005930ABFFFF30CC00FFF9
70064+:1012700030E7FFFF344801803C0980008D2401B82D
70065+:101280000480FFFE8F8D006C24180016AD0D000049
70066+:101290008D2201248F8D0038AD0200048D5900206D
70067+:1012A000A5070008240201C4A119000AA118000B17
70068+:1012B000952F01208D4E00088D4700049783005C18
70069+:1012C0008D59002401CF302100C7282100A32023FD
70070+:1012D0002418FFFFA504000CA50B000EA5020010AA
70071+:1012E000A50C0012AD190018AD18002495AF00E848
70072+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
70073+:101300008DAC0084AD0C002CAD2B01B88D460020B7
70074+:1013100000C7282403E00008AD4500208F8800386E
70075+:101320000080582130E7FFFF910900D63C02800081
70076+:1013300030A5FFFF312400FF00041A00006750258C
70077+:1013400030C600FF344701803C0980008D2C01B875
70078+:101350000580FFFE8F82006C240F0017ACE20000B6
70079+:101360008D390124ACF900048D780020A4EA00082E
70080+:10137000241901C4A0F8000AA0EF000B9523012056
70081+:101380008D6E00088D6D00049784005C01C35021B0
70082+:10139000014D602101841023A4E2000CA4E5000E9D
70083+:1013A000A4F90010A4E60012ACE000148D7800242B
70084+:1013B000240DFFFFACF800188D0F007CACEF001C73
70085+:1013C0008D0E00783C0F1000ACEE0020ACED002438
70086+:1013D000950A00BE240DFFF73146FFFFACE600285A
70087+:1013E000950C00809504008231837FFF0003CA00C2
70088+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
70089+:10140000950E00828D6A002000AE3021014D282407
70090+:10141000A506008203E00008AD6500203C028000C4
70091+:10142000344501803C0480008C8301B80460FFFED9
70092+:101430008F8A0044240600199549001C3128FFFFBB
70093+:10144000000839C0ACA70000A0A6000B3C051000A6
70094+:1014500003E00008AC8501B88F87004C0080402174
70095+:1014600030C400FF3C0680008CC201B80440FFFE7F
70096+:101470008F89006C9383006834996000ACA90000E8
70097+:10148000A0A300058CE20010240F00022403FFF744
70098+:10149000A4A20006A4B900088D180020A0B8000A74
70099+:1014A000A0AF000B8CEE0000ACAE00108CED000481
70100+:1014B000ACAD00148CEC001CACAC00248CEB002018
70101+:1014C000ACAB00288CEA002C3C071000ACAA002C26
70102+:1014D0008D090024ACA90018ACC701B88D05002007
70103+:1014E00000A3202403E00008AD0400208F8600380C
70104+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
70105+:1015000090C300D430A500FF3062002010400008D6
70106+:10151000008088218CCB00D02409FFDF256A0001E0
70107+:10152000ACCA00D090C800D401093824A0C700D4A8
70108+:1015300014A000403C0C80008F840038908700D4B9
70109+:101540002418FFBF2406FFEF30E3007FA08300D400
70110+:10155000979F005C8F8200608F8D003803E2C82364
70111+:10156000A799005CA5A000BC91AF00D401F870243D
70112+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
70113+:10158000A5400082AD4000EC914500D400A658244F
70114+:10159000A14B00D48F9000348F8400609786005C4C
70115+:1015A0000204282110C0000FAF850034A38000582A
70116+:1015B0003C0780008E2C000894ED01208E2B000447
70117+:1015C000018D5021014B8021020620233086FFFF30
70118+:1015D00030C8000F3909000131310001162000091F
70119+:1015E000A3880058938600488FBF00188FB100145D
70120+:1015F0008FB0001027BD0020AF85006403E0000815
70121+:10160000AF86006000C870238FBF00189386004823
70122+:101610008FB100148FB0001034EF0C00010F28219F
70123+:1016200027BD0020ACEE0084AF85006403E0000815
70124+:10163000AF86006035900180020028210E00190F4E
70125+:10164000240600828F840038908600D430C5004084
70126+:1016500050A0FFBAA38000688F85004C3C06800034
70127+:101660008CCD01B805A0FFFE8F89006C2408608234
70128+:1016700024070002AE090000A6080008A207000B1C
70129+:101680008CA300083C0E1000AE0300108CA2000CCE
70130+:10169000AE0200148CBF0014AE1F00188CB90018E5
70131+:1016A000AE1900248CB80024AE1800288CAF002896
70132+:1016B000AE0F002CACCE01B80A001948A380006818
70133+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
70134+:1016D0008F880060AFBF00189389003C954200BC22
70135+:1016E00030D100FF0109182B0080802130AC00FFB1
70136+:1016F0003047FFFF0000582114600003310600FF4F
70137+:1017000001203021010958239783005C0068202BB9
70138+:101710001480002700000000106800562419000102
70139+:101720001199006334E708803165FFFF0E0018C08F
70140+:10173000020020218F83006C3C07800034E601808A
70141+:101740003C0580008CAB01B80560FFFE240A001840
70142+:101750008F840038ACC30000A0CA000B948900BE7F
70143+:101760003C081000A4C90010ACC00030ACA801B8FF
70144+:101770009482008024430001A4830080949F008011
70145+:101780003C0608008CC6318833EC7FFF1186005E72
70146+:101790000000000002002021022028218FBF001835
70147+:1017A0008FB100148FB000100A00193427BD00203B
70148+:1017B000914400D42403FF8000838825A15100D4E4
70149+:1017C0009784005C3088FFFF51000023938C003C1D
70150+:1017D0008F8500382402EFFF008B782394AE00BC85
70151+:1017E0000168502B31E900FF01C26824A4AD00BCA0
70152+:1017F00051400039010058213C1F800037E60100AC
70153+:101800008CD800043C190001031940245500000144
70154+:1018100034E740008E0A00202403FFFB241100015E
70155+:1018200001432024AE0400201191002D34E78000F4
70156+:1018300002002021012030210E0018C03165FFFF79
70157+:101840009787005C8F890060A780005C0127802358
70158+:10185000AF900060938C003C8F8B00388FBF0018D6
70159+:101860008FB100148FB0001027BD002003E00008E6
70160+:10187000A16C00D73C0D800035AA01008D48000402
70161+:101880003C0900010109282454A0000134E740006C
70162+:101890008E0F00202418FFFB34E7800001F870242D
70163+:1018A00024190001AE0E00201599FF9F34E708802F
70164+:1018B000020020210E00188E3165FFFF020020215A
70165+:1018C000022028218FBF00188FB100148FB00010A4
70166+:1018D0000A00193427BD00200A0019F7000048212A
70167+:1018E00002002021012030210E00188E3165FFFFFB
70168+:1018F0009787005C8F890060A780005C01278023A8
70169+:101900000A001A0EAF900060948C0080241F8000A3
70170+:10191000019F3024A4860080908B0080908F0080EF
70171+:10192000316700FF0007C9C20019C027001871C045
70172+:1019300031ED007F01AE2825A08500800A0019DF67
70173+:1019400002002021938500682403000127BDFFE8E1
70174+:1019500000A330042CA20020AFB00010AFBF0014D1
70175+:1019600000C01821104000132410FFFE3C0708009F
70176+:101970008CE7319000E610243C088000350501809A
70177+:1019800014400005240600848F890038240A0004CE
70178+:101990002410FFFFA12A00FC0E00190F0000000018
70179+:1019A000020010218FBF00148FB0001003E0000868
70180+:1019B00027BD00183C0608008CC631940A001A574F
70181+:1019C00000C310248F87004427BDFFE0AFB200188A
70182+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
70183+:1019E00090E6000D00A088210080902130C5007F86
70184+:1019F000A0E5000D8F8500388E2300188CA200D042
70185+:101A00001062002E240A000E0E001A4AA38A0068F3
70186+:101A10002409FFFF104900222404FFFF5200002088
70187+:101A2000000020218E2600003C0C001000CC582421
70188+:101A3000156000393C0E000800CE682455A0003F18
70189+:101A4000024020213C18000200D880241200001F10
70190+:101A50003C0A00048F8700448CE200148CE30010E1
70191+:101A60008CE500140043F82303E5C82B1320000580
70192+:101A7000024020218E24002C8CF1001010910031A6
70193+:101A80000240202124020012A38200680E001A4A9C
70194+:101A90002412FFFF105200022404FFFF0000202147
70195+:101AA0008FBF001C8FB200188FB100148FB00010D0
70196+:101AB0000080102103E0000827BD002090A800D47A
70197+:101AC000350400200A001A80A0A400D400CA4824CB
70198+:101AD0001520000B8F8B00448F8D00448DAC0010BF
70199+:101AE0001580000B024020218E2E002C51C0FFECEF
70200+:101AF00000002021024020210A001A9B2402001726
70201+:101B00008D66001050C0FFE6000020210240202119
70202+:101B10000A001A9B24020011024020212402001511
70203+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
70204+:101B30002404FFFF0A001A8A8E2600000A001AC138
70205+:101B4000240200143C08000400C8382450E0FFD4EC
70206+:101B500000002021024020210A001A9B24020013C9
70207+:101B60008F85003827BDFFD8AFB3001CAFB2001877
70208+:101B7000AFB10014AFB00010AFBF002090A700D4E9
70209+:101B80008F90004C2412FFFF34E2004092060000C8
70210+:101B9000A0A200D48E0300100080982110720006CD
70211+:101BA00030D1003F2408000D0E001A4AA3880068B7
70212+:101BB000105200252404FFFF8F8A00388E09001878
70213+:101BC0008D4400D01124000702602021240C000E57
70214+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
70215+:101BE0002404FFFF24040020122400048F8D0038F9
70216+:101BF00091AF00D435EE0020A1AE00D48F85005403
70217+:101C000010A00019000000001224004A8F9800382C
70218+:101C10008F92FCC0971000809651000A5230004805
70219+:101C20008F9300403C1F08008FFF318C03E5C82BC9
70220+:101C30001720001E02602021000028210E0019A993
70221+:101C400024060001000020218FBF00208FB3001C5C
70222+:101C50008FB200188FB100148FB0001000801021D7
70223+:101C600003E0000827BD00285224002A8E05001436
70224+:101C70008F840038948A008025490001A48900805F
70225+:101C8000948800803C0208008C42318831077FFF35
70226+:101C900010E2000E00000000026020210E00193446
70227+:101CA000240500010A001B0B000020212402002D46
70228+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
70229+:101CC0002404FFFF0A001B0C8FBF002094990080A2
70230+:101CD000241F800024050001033FC024A498008035
70231+:101CE00090920080908E0080325100FF001181C2DE
70232+:101CF00000107827000F69C031CC007F018D582576
70233+:101D0000A08B00800E001934026020210A001B0BFA
70234+:101D1000000020212406FFFF54A6FFD68F84003840
70235+:101D2000026020210E001934240500010A001B0B5B
70236+:101D300000002021026020210A001B252402000A45
70237+:101D40002404FFFD0A001B0BAF9300608F8800384E
70238+:101D500027BDFFE8AFB00010AFBF0014910A00D458
70239+:101D60008F87004C00808021354900408CE60010B0
70240+:101D7000A10900D43C0208008C4231B030C53FFFBD
70241+:101D800000A2182B106000078F850050240DFF80E3
70242+:101D900090AE000D01AE6024318B00FF156000088D
70243+:101DA0000006C382020020212403000D8FBF00140F
70244+:101DB0008FB0001027BD00180A001A4AA3830068DC
70245+:101DC00033060003240F000254CFFFF70200202146
70246+:101DD00094A2001C8F85003824190023A4A200E8D7
70247+:101DE0008CE8000000081E02307F003F13F9003528
70248+:101DF0003C0A00838CE800188CA600D0110600086D
70249+:101E0000000000002405000E0E001A4AA385006899
70250+:101E10002407FFFF104700182404FFFF8F850038B8
70251+:101E200090A900D435240020A0A400D48F8C0044B5
70252+:101E3000918E000D31CD007FA18D000D8F83005458
70253+:101E40001060001C020020218F8400508C9800102C
70254+:101E50000303782B11E0000D241900180200202143
70255+:101E6000A39900680E001A4A2410FFFF10500002C8
70256+:101E70002404FFFF000020218FBF00148FB000104A
70257+:101E80000080102103E0000827BD00188C86001098
70258+:101E90008F9F00440200202100C31023AFE20010F6
70259+:101EA000240500010E0019A9240600010A001B9751
70260+:101EB000000020210E001934240500010A001B97A0
70261+:101EC00000002021010A5824156AFFD98F8C004494
70262+:101ED000A0A600FC0A001B84A386005A30A500FFC0
70263+:101EE0002406000124A9000100C9102B1040000C99
70264+:101EF00000004021240A000100A61823308B0001B5
70265+:101F000024C60001006A3804000420421160000267
70266+:101F100000C9182B010740251460FFF800A61823FC
70267+:101F200003E000080100102127BDFFD8AFB0001862
70268+:101F30008F90004CAFB1001CAFBF00202403FFFF07
70269+:101F40002411002FAFA30010920600002405000802
70270+:101F500026100001006620260E001BB0308400FF12
70271+:101F600000021E003C021EDC34466F410A001BD8F2
70272+:101F70000000102110A00009008018212445000154
70273+:101F800030A2FFFF2C4500080461FFFA0003204047
70274+:101F90000086202614A0FFF9008018210E001BB037
70275+:101FA000240500208FA300102629FFFF313100FFF8
70276+:101FB00000034202240700FF1627FFE20102182651
70277+:101FC00000035027AFAA0014AFAA00100000302170
70278+:101FD00027A8001027A7001400E6782391ED00033E
70279+:101FE00024CE000100C8602131C600FF2CCB0004C4
70280+:101FF0001560FFF9A18D00008FA200108FBF002097
70281+:102000008FB1001C8FB0001803E0000827BD002826
70282+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
70283+:10202000AFB50024AFB40020AFB20018AFB10014B8
70284+:102030003C0C80008D880128240FFF803C06800A1C
70285+:1020400025100100250B0080020F68243205007F57
70286+:10205000016F7024AD8E009000A62821AD8D002464
70287+:1020600090A600FC3169007F3C0A8004012A1821F7
70288+:10207000A386005A9067007C00809821AF830030CF
70289+:1020800030E20002AF88006CAF85003800A0182154
70290+:10209000144000022404003424040030A3840048C7
70291+:1020A0008C7200DC30D100FF24040004AF92006089
70292+:1020B00012240004A38000688E7400041680001EA1
70293+:1020C0003C0880009386005930C7000110E0000FE3
70294+:1020D0008F9300608CB000848CA800842404FF805F
70295+:1020E000020410240002F940310A007F03EA482567
70296+:1020F0003C0C2000012C902530CD00FE3C038000DC
70297+:10210000AC720830A38D00598F9300608FBF0028F8
70298+:102110008FB50024ACB300DC8FB400208FB3001C5B
70299+:102120008FB200188FB100148FB00010240200018C
70300+:1021300003E0000827BD00308E7F000895020120D3
70301+:102140008E67001003E2C8213326FFFF30D8000F4E
70302+:1021500033150001AF87003416A00058A39800582B
70303+:1021600035090C000309382100D81823AD03008479
70304+:10217000AF8700648E6A00043148FFFF1100007EC3
70305+:10218000A78A005C90AC00D42407FF8000EC3024C8
70306+:1021900030CB00FF1560004B9786005C938E005A91
70307+:1021A000240D000230D5FFFF11CD02A20000A021B6
70308+:1021B0008F85006002A5802B160000BC9388004824
70309+:1021C0003C11800096240120310400FF1485008812
70310+:1021D0008F8400648F9800343312000356400085CA
70311+:1021E00030A500FF8F900064310C00FF24060034FE
70312+:1021F00011860095AF90004C9204000414800118E1
70313+:102200008F8E0038A380003C8E0D00048DC800D84E
70314+:102210003C0600FF34CCFFFF01AC30240106182B34
70315+:1022200014600120AF8600548F8700609798005C8F
70316+:10223000AF8700400307402310C000C7A788005C99
70317+:102240008F91003030C3000300035823922A007C92
70318+:102250003171000302261021000A20823092000111
70319+:102260000012488000492821311FFFFF03E5C82BD9
70320+:10227000132001208F8800388F8500348F880064F8
70321+:102280001105025A3C0E3F018E0600003C0C250051
70322+:1022900000CE682411AC01638F84004C30E500FF50
70323+:1022A0000E00184A000030218F8800388F870060A8
70324+:1022B0008F8500340A001DB78F8600540A001C5613
70325+:1022C000AF87006490A400D400E48024320200FFB1
70326+:1022D000104000169386005990A6008890AE00D753
70327+:1022E00024A8008830D4003F2686FFE02CD10020AF
70328+:1022F000A38E003C1220000CAF88004C240B000180
70329+:1023000000CB20043095001916A0012B3C0680005C
70330+:1023100034CF0002008FC0241700022E3099002015
70331+:1023200017200234000000009386005930CB0001D2
70332+:102330001160000F9788005C8CBF00848CA900841A
70333+:10234000240AFF8003EA6024000C19403132007F28
70334+:10235000007238253C0D200000EDC82530D800FE65
70335+:102360003C0F8000ADF90830A39800599788005CB5
70336+:102370001500FF84000000008E630020306200041E
70337+:102380001040FF51938600592404FFFB0064802411
70338+:102390003C038000AE700020346601808C7301B86D
70339+:1023A0000660FFFE8F98006C347501003C1400013C
70340+:1023B000ACD800008C6B012424076085ACCB0004F2
70341+:1023C0008EAE000401D488245220000124076083CB
70342+:1023D00024190002A4C700083C0F1000A0D9000B6C
70343+:1023E0003C068000ACCF01B80A001C2B9386005934
70344+:1023F00030A500FF0E00184A240600018F88006CEB
70345+:102400003C05800034A90900250201889388004812
70346+:10241000304A0007304B00783C0340802407FF809F
70347+:102420000163C825014980210047F824310C00FFD1
70348+:1024300024060034ACBF0800AF90004CACB90810C3
70349+:102440005586FF6E920400048F8400388E11003090
70350+:10245000908E00D431CD001015A000108F83006045
70351+:102460002C6F000515E000E400000000909800D4F7
70352+:102470002465FFFC331200101640000830A400FF52
70353+:102480008F9F00648F99003413F90004388700018E
70354+:1024900030E20001144001C8000000000E001BC320
70355+:1024A000000000000A001DF8000000008F84006496
70356+:1024B00030C500FF0E00184A24060001939800481A
70357+:1024C000240B0034130B00A08F8500388F8600602A
70358+:1024D0009783005C306EFFFF00CE8823AF910060D1
70359+:1024E000A780005C1280FF90028018212414FFFD59
70360+:1024F0005474FFA28E6300208E6A00042403FFBF81
70361+:102500002408FFEF0155F823AE7F000490AC00D4FF
70362+:102510003189007FA0A900D48E7200208F8F0038EF
70363+:10252000A780005C364D0002AE6D0020A5E000BC27
70364+:1025300091E500D400A3C824A1F900D48F950038F8
70365+:10254000AEA000EC92B800D403085824A2AB00D48B
70366+:102550000A001CD78F8500388F910034AF8000604F
70367+:1025600002275821AF8B0034000020212403FFFFF5
70368+:10257000108301B48F8500388E0C00103C0D0800CC
70369+:102580008DAD31B09208000031843FFF008D802B6B
70370+:1025900012000023310D003F3C1908008F3931A88B
70371+:1025A0008F9F006C000479802408FF80033F202166
70372+:1025B000008FC821938500590328F8243C06008029
70373+:1025C0003C0F800034D80001001F91403331007F60
70374+:1025D0008F8600380251502535EE0940332B0078A4
70375+:1025E000333000073C0310003C02800C017890253A
70376+:1025F000020E48210143C0250222382134AE0001D9
70377+:10260000ADFF0804AF890050ADF20814AF87004455
70378+:10261000ADFF0028ACD90084ADF80830A38E005976
70379+:102620009383005A24070003106700272407000142
70380+:102630001467FFAC8F8500382411002311B1008589
70381+:1026400000000000240E000B026020210E001A4A38
70382+:10265000A38E00680040A0210A001D328F8500383B
70383+:1026600002602021240B000C0E001A4AA38B006884
70384+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
70385+:10268000A380003C8E0D00048DC800D83C0600FFDE
70386+:1026900034CCFFFF01AC30240106182B1060FEE2A1
70387+:1026A000AF86005402602021241200190E001A4A3D
70388+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
70389+:1026C0000A001C838F86005425A3FFE02C74002091
70390+:1026D0001280FFDD240E000B000328803C1108014E
70391+:1026E000263194B400B148218D2D000001A00008CE
70392+:1026F000000000008F85003400A710219385003C66
70393+:10270000AF82003402251821A383003C951F00BC32
70394+:102710000226282137F91000A51900BC5240FF926B
70395+:10272000AF850060246A0004A38A003C950900BCC0
70396+:1027300024A40004AF84006035322000A51200BC40
70397+:102740000A001D54000020218F8600602CC800055F
70398+:102750001500FF609783005C3065FFFF00C5C8234C
70399+:102760002F2F000511E00003306400FF24CDFFFC93
70400+:1027700031A400FF8F8900648F920034113200046D
70401+:10278000389F000133EC0001158001380000000083
70402+:102790008F840038908700D434E60010A08600D4DF
70403+:1027A0008F8500388F8600609783005CACA000ECBA
70404+:1027B0000A001D2F306EFFFF8CB500848CB400849E
70405+:1027C0003C04100002A7302400068940328E007FAE
70406+:1027D000022E8025020410253C08800024050001FB
70407+:1027E00002602021240600010E0019A9AD02083064
70408+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
70409+:102800000260202124090005A38900680E001A4AED
70410+:102810002411FFFF1451FE782404FFFF0A001D5508
70411+:102820002403FFFF8F8F004C8F8800388DF8000045
70412+:10283000AD1800888DE70010AD0700988F87006005
70413+:102840000A001DB78F8600542406FFFF118600057D
70414+:10285000000000000E001B4C026020210A001D8FAA
70415+:102860000040A0210E001AD1026020210A001D8F15
70416+:102870000040A0218F90004C3C0208008C4231B0F7
70417+:102880008E110010322C3FFF0182282B10A0000C6B
70418+:10289000240BFF808F85005090A3000D01637024EE
70419+:1028A00031CA00FF1140000702602021001143825D
70420+:1028B000310600032418000110D8010600000000B2
70421+:1028C000026020212403000D0E001A4AA383006831
70422+:1028D000004020218F8500380A001D320080A02191
70423+:1028E0008F90004C3C0A08008D4A31B08F85005013
70424+:1028F0008E0400100000A0218CB1001430823FFF34
70425+:10290000004A602B8CB200205180FFEE0260202133
70426+:1029100090B8000D240BFF800178702431C300FFB4
70427+:102920005060FFE80260202100044382310600036A
70428+:1029300014C0FFE40260202194BF001C8F9900386E
70429+:102940008E060028A73F00E88CAF0010022F20233E
70430+:1029500014C4013A026020218F83005400C368210F
70431+:10296000022D382B14E00136240200188F8A00440F
70432+:102970008F820030024390218D4B00100163702341
70433+:10298000AD4E0010AD5200208C4C00740192282BEB
70434+:1029900014A0015F026020218F8400508E08002463
70435+:1029A0008C86002411060007026020212419001CD7
70436+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
70437+:1029C0002404FFFF8F8400448C87002424FF00012F
70438+:1029D000AC9F00241251012F8F8D00308DB10074F7
70439+:1029E0001232012C3C0B00808E0E000001CB5024D3
70440+:1029F00015400075000000008E0300142411FFFF35
70441+:102A0000107100073C0808003C0608008CC6319095
70442+:102A100000C8C0241300015202602021A380006876
70443+:102A20008E0300003C19000100792024108000135F
70444+:102A30003C1F0080007FA02416800009020028218E
70445+:102A4000026020212411001A0E001A4AA391006886
70446+:102A50002407FFFF1047FF9F2404FFFF02002821E7
70447+:102A6000026020210E001A6A240600012410FFFFD4
70448+:102A70001050FF982404FFFF241400018F8D0044A0
70449+:102A8000026020210280302195A900342405000134
70450+:102A9000253200010E0019A9A5B200340000202142
70451+:102AA0008F8500380A001D320080A0218F90004CD5
70452+:102AB0003C1408008E9431B08E07001030E53FFFC3
70453+:102AC00000B4C82B132000618F8600502412FF80B1
70454+:102AD00090C9000D0249682431A400FF5080005CB9
70455+:102AE000026020218F8C00541180000700078B8228
70456+:102AF0008F8500388F82FCC094BF0080944A000A02
70457+:102B0000515F00F78F8600403227000314E0006415
70458+:102B100000000000920E000211C000D8000000006A
70459+:102B20008E0B0024156000D902602021920400035E
70460+:102B300024190002308500FF14B90005308900FF18
70461+:102B40008F940054128000EA240D002C308900FF7D
70462+:102B5000392C00102D8400012D3200010244302553
70463+:102B6000020028210E001A6A026020212410FFFFB3
70464+:102B7000105000BF8F8500388F830054106000D341
70465+:102B8000240500013C0A08008D4A318C0143F82BD2
70466+:102B900017E000B22402002D02602021000028214D
70467+:102BA0000E0019A9240600018F85003800001821A5
70468+:102BB0000A001D320060A0210E0018750000000000
70469+:102BC0000A001DF800000000AC8000200A001E78FA
70470+:102BD0008E03001400002821026020210E0019A994
70471+:102BE000240600010A001CC38F8500380A001DB7A7
70472+:102BF0008F8800388CAA00848CAC00843C031000C1
70473+:102C00000147F824001F91403189007F024968255F
70474+:102C100001A32825ACC50830910700012405000157
70475+:102C2000026020210E0019A930E600010A001CC331
70476+:102C30008F850038938F00482403FFFD0A001D3460
70477+:102C4000AF8F00600A001D342403FFFF02602021C3
70478+:102C50002410000D0E001A4AA390006800401821AD
70479+:102C60008F8500380A001D320060A0210E00187503
70480+:102C7000000000009783005C8F86006000402021E8
70481+:102C80003070FFFF00D010232C4A00051140FE11C8
70482+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
70483+:102CA00090CF000D31E300085460FFA192040003AF
70484+:102CB00002602021240200100E001A4AA38200683C
70485+:102CC0002403FFFF5443FF9A920400030A001F12DB
70486+:102CD0008F85003890A4000D308F000811E000951A
70487+:102CE0008F990054572000A6026020218E1F000CEF
70488+:102CF0008CB4002057F40005026020218E0D0008DE
70489+:102D00008CA7002411A7003A026020212402002091
70490+:102D1000A38200680E001A4A2412FFFF1052FEED33
70491+:102D20002404FFFF8F9F00442402FFF73C14800E11
70492+:102D300093EA000D2419FF803C03800001423824EF
70493+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
70494+:102D50008F8C006C97F200788F870044012C302113
70495+:102D6000324D7FFF000D204000C4782131E5007F07
70496+:102D700000B4C02101F94024AC68002CA711000068
70497+:102D80008CEB0028256E0001ACEE00288CEA002CAC
70498+:102D90008E02002C01426021ACEC002C8E09002C2C
70499+:102DA000ACE900308E120014ACF2003494ED003A1D
70500+:102DB00025A40001A4E4003A97E600783C1108003D
70501+:102DC0008E3131B024C3000130707FFF1211005CDE
70502+:102DD000006030218F8F0030026020212405000127
70503+:102DE0000E001934A5E600780A001EA1000020217B
70504+:102DF0008E0900142412FFFF1132006B8F8A0038F5
70505+:102E00008E0200188D4C00D0144C00650260202109
70506+:102E10008E0B00248CAE0028116E005B2402002172
70507+:102E20000E001A4AA38200681452FFBE2404FFFF5A
70508+:102E30008F8500380A001D320080A0212402001F67
70509+:102E40000E001A4AA38200682409FFFF1049FEA160
70510+:102E50002404FFFF0A001E548F83005402602021C7
70511+:102E60000E001A4AA38200681450FF508F85003864
70512+:102E70002403FFFF0A001D320060A0218CD800242B
70513+:102E80008E0800241118FF29026020210A001F2744
70514+:102E90002402000F8E0900003C05008001259024CB
70515+:102EA0001640FF492402001A026020210E001A4A2F
70516+:102EB000A3820068240CFFFF144CFECF2404FFFF04
70517+:102EC0008F8500380A001D320080A0210E001934C1
70518+:102ED000026020218F8500380A001EE500001821BD
70519+:102EE0002403FFFD0060A0210A001D32AF860060B0
70520+:102EF000026020210E001A4AA38D00682403FFFF00
70521+:102F00001043FF588F8500380A001ECC920400033E
70522+:102F10002418001D0E001A4AA39800682403FFFF1E
70523+:102F20001443FE9D2404FFFF8F8500380A001D32E4
70524+:102F30000080A021026020210A001F3D24020024FD
70525+:102F4000240880000068C024330BFFFF000B73C20D
70526+:102F500031D000FF001088270A001F6E001133C017
70527+:102F6000240F001B0E001A4AA38F00681451FEACF8
70528+:102F70002404FFFF8F8500380A001D320080A02145
70529+:102F80000A001F3D240200278E0600288CA3002C77
70530+:102F900010C30008026020210A001F812402001FC4
70531+:102FA0000A001F812402000E026020210A001F81F6
70532+:102FB000240200258E04002C1080000D8F8F00301D
70533+:102FC0008DE800740104C02B5700000C0260202122
70534+:102FD0008CB900140086A0210334282B10A0FF52C6
70535+:102FE0008F9F0044026020210A001F8124020022DA
70536+:102FF000026020210A001F81240200230A001F8191
70537+:103000002402002627BDFFD8AFB3001CAFB10014C7
70538+:10301000AFBF0020AFB20018AFB000103C0280007C
70539+:103020008C5201408C4B01483C048000000B8C0208
70540+:10303000322300FF317300FF8C8501B804A0FFFE2E
70541+:1030400034900180AE1200008C8701442464FFF0AC
70542+:10305000240600022C830013AE070004A61100080A
70543+:10306000A206000BAE1300241060004F8FBF00209B
70544+:10307000000448803C0A0801254A9534012A402171
70545+:103080008D04000000800008000000003C030800E0
70546+:103090008C6331A831693FFF00099980007280215B
70547+:1030A000021370212405FF80264D0100264C00806C
70548+:1030B0003C02800031B1007F3198007F31CA007F2F
70549+:1030C0003C1F800A3C1980043C0F800C01C5202461
70550+:1030D00001A5302401853824014F1821AC46002475
70551+:1030E000023F402103194821AC470090AC4400281E
70552+:1030F000AF830044AF880038AF8900300E0019005C
70553+:10310000016080213C0380008C6B01B80560FFFEEC
70554+:103110008F8700448F8600383465018090E8000D69
70555+:10312000ACB20000A4B0000600082600000416039C
70556+:1031300000029027001227C21080008124C200885C
70557+:10314000241F6082A4BF0008A0A000052402000282
70558+:10315000A0A2000B8F8B0030000424003C08270045
70559+:1031600000889025ACB20010ACA00014ACA00024E4
70560+:10317000ACA00028ACA0002C8D6900382413FF807F
70561+:10318000ACA9001890E3000D02638024320500FF13
70562+:1031900010A000058FBF002090ED000D31AC007F26
70563+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
70564+:1031B0008FB100148FB000103C0A10003C0E80004C
70565+:1031C00027BD002803E00008ADCA01B8265F010052
70566+:1031D0002405FF8033F8007F3C06800003E5782457
70567+:1031E0003C19800A03192021ACCF0024908E00D412
70568+:1031F00000AE682431AC00FF11800024AF84003899
70569+:10320000248E008895CD00123C0C08008D8C31A8CE
70570+:1032100031AB3FFF01924821000B5180012A402130
70571+:1032200001052024ACC400283107007F3C06800C37
70572+:1032300000E620219083000D00A31024304500FFFC
70573+:1032400010A0FFD8AF8400449098000D330F0010F9
70574+:1032500015E0FFD58FBF00200E0019000000000010
70575+:103260003C0380008C7901B80720FFFE00000000BD
70576+:10327000AE1200008C7F0144AE1F0004A6110008AE
70577+:1032800024110002A211000BAE1300243C1308010C
70578+:10329000927396F0327000015200FFC38FBF00207E
70579+:1032A0000E002146024020210A0020638FBF00202B
70580+:1032B0003C1260008E452C083C03F0033462FFFF93
70581+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
70582+:1032D00003199825AE532C080A0020638FBF0020E5
70583+:1032E000264D010031AF007F3C10800A240EFF8084
70584+:1032F00001F0282101AE60243C0B8000AD6C00245D
70585+:103300001660FFA8AF85003824110003A0B100FCAF
70586+:103310000A0020638FBF002026480100310A007F89
70587+:103320003C0B800A2409FF80014B30210109202435
70588+:103330003C078000ACE400240A002062AF8600381D
70589+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
70590+:10335000241F608290D900D42418FF800319782498
70591+:1033600031EA00FF1140FF7700000000240700044D
70592+:10337000A0C700FC8F870044241160842406000D40
70593+:10338000A4B10008A0A600050A00204D24020002F6
70594+:103390003C040001248496DC24030014240200FE73
70595+:1033A0003C010800AC2431EC3C010800AC2331E8BE
70596+:1033B0003C010801A42296F83C040801248496F8F4
70597+:1033C0000000182100643021A0C300042463000120
70598+:1033D0002C6500FF54A0FFFC006430213C0708006E
70599+:1033E00024E7010003E00008AF87007800A058211F
70600+:1033F000008048210000102114A00012000050217C
70601+:103400000A002142000000003C010801A42096F8B7
70602+:103410003C05080194A596F88F8200783C0C0801C1
70603+:10342000258C96F800E2182100AC2021014B302BAE
70604+:10343000A089000400001021A460000810C0003919
70605+:10344000010048218F8600780009384000E94021BA
70606+:103450000008388000E6282190A8000B90B9000AE7
70607+:103460000008204000881021000218800066C0215A
70608+:10347000A319000A8F85007800E5782191EE000AF3
70609+:1034800091E6000B000E684001AE6021000C208028
70610+:1034900000851021A046000B3C030801906396F2C2
70611+:1034A000106000222462FFFF8F8300383C01080176
70612+:1034B000A02296F2906C00FF118000040000000032
70613+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
70614+:1034D000973996F8272300013078FFFF2F0F00FF60
70615+:1034E00011E0FFC9254A00013C010801A42396F818
70616+:1034F0003C05080194A596F88F8200783C0C0801E1
70617+:10350000258C96F800E2182100AC2021014B302BCD
70618+:10351000A089000400001021A460000814C0FFC9A5
70619+:103520000100482103E000080000000003E000085B
70620+:103530002402000227BDFFE0248501002407FF804C
70621+:10354000AFB00010AFBF0018AFB1001400A718242F
70622+:103550003C10800030A4007F3C06800A00862821B1
70623+:103560008E110024AE03002490A200FF1440000836
70624+:10357000AF850038A0A000098FBF0018AE1100244D
70625+:103580008FB100148FB0001003E0000827BD0020A9
70626+:1035900090A900FD90A800FF312400FF0E0020F448
70627+:1035A000310500FF8F8500388FBF0018A0A00009EB
70628+:1035B000AE1100248FB100148FB0001003E000089A
70629+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
70630+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
70631+:1035E0003C0980009533011635320C00952F011AE5
70632+:1035F0003271FFFF023280218E08000431EEFFFF9E
70633+:10360000248B0100010E6821240CFF8025A5FFFFFB
70634+:10361000016C50243166007F3C07800AAD2A0024EB
70635+:1036200000C73021AF850074AF8800703C010801ED
70636+:10363000A02096F190C300090200D02100809821BB
70637+:10364000306300FF2862000510400048AF86003854
70638+:10365000286400021480008E24140001240D00054B
70639+:103660003C010801A02D96D590CC00FD3C0108013D
70640+:10367000A02096D63C010801A02096D790CB000A46
70641+:10368000240AFF80318500FF014B4824312700FFC9
70642+:1036900010E0000C000058213C12800836510080D8
70643+:1036A0008E2F00308CD0005C01F0702305C0018E9D
70644+:1036B0008F87007090D4000A3284007FA0C4000A73
70645+:1036C0008F8600383C118008363000808E0F003025
70646+:1036D0008F87007000EF702319C000EE000000001B
70647+:1036E00090D4000924120002328400FF1092024795
70648+:1036F000000000008CC2005800E2F82327F9FFFF09
70649+:103700001B2001300000000090C5000924080004BF
70650+:1037100030A300FF10680057240A00013C01080193
70651+:10372000A02A96D590C900FF252700013C01080179
70652+:10373000A02796D43C030801906396D52406000583
70653+:103740001066006A2C780005130000C40000902168
70654+:103750000003F8803C0408012484958003E4C82118
70655+:103760008F25000000A0000800000000241800FFC2
70656+:103770001078005C0000000090CC000A90CA00099C
70657+:103780003C080801910896F13187008000EA48253D
70658+:103790003C010801A02996DC90C500FD3C140801FD
70659+:1037A000929496F2311100013C010801A02596DDAA
70660+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
70661+:1037C0003C010801A03296DF8CD900543C0108016D
70662+:1037D000AC3996E08CD000583C010801AC3096E43E
70663+:1037E0008CC3005C3C010801AC3496EC3C01080140
70664+:1037F000AC2396E8162000088FBF002C8FB4002859
70665+:103800008FB300248FB200208FB1001C8FB000183E
70666+:1038100003E0000827BD00303C1180009624010E13
70667+:103820000E000FD43094FFFF3C0B08018D6B96F413
70668+:103830000260382102802821AE2B01803C13080150
70669+:103840008E7396D401602021240600830E00102F71
70670+:10385000AFB300108FBF002C8FB400288FB30024AB
70671+:103860008FB200208FB1001C8FB0001803E0000859
70672+:1038700027BD00303C1808008F1831FC270F0001CD
70673+:103880003C010800AC2F31FC0A0021D700000000E9
70674+:103890001474FFB900000000A0C000FF3C05080040
70675+:1038A0008CA531E43C0308008C6331E03C02080045
70676+:1038B0008C4232048F99003834A80001241F000282
70677+:1038C0003C010801AC2396F43C010801A02896F0C5
70678+:1038D0003C010801A02296F3A33F00090A002190B1
70679+:1038E0008F8600380E002146000000000A0021D714
70680+:1038F0008F8600383C1F080193FF96D424190001DD
70681+:1039000013F902298F8700703C100801921096D895
70682+:103910003C06080190C696D610C000050200A02102
70683+:103920003C040801908496D9109001E48F870078B8
70684+:10393000001088408F9F0078023048210009C8801D
70685+:10394000033F702195D80008270F0001A5CF00087C
70686+:103950003C040801908496D93C05080190A596D6B0
70687+:103960000E0020F4000000008F8700780230202134
70688+:103970000004308000C720218C8500048F820074F1
70689+:1039800000A2402305020006AC8200048C8A0000DD
70690+:103990008F830070014310235C400001AC83000062
70691+:1039A0008F86003890CB00FF2D6C00025580002DD3
70692+:1039B000241400010230F821001F40800107282153
70693+:1039C00090B9000B8CAE00040019C0400319782197
70694+:1039D000000F1880006710218C4D000001AE882375
70695+:1039E0002630FFFF5E00001F241400018C440004F9
70696+:1039F0008CAA0000008A482319200019240E000414
70697+:103A00003C010801A02E96D590AD000B8CAB0004B4
70698+:103A1000000D8840022D80210010108000471021E9
70699+:103A20008C44000401646023058202009443000872
70700+:103A300090DF00FE90B9000B33E500FF54B900049D
70701+:103A40000107A021A0D400FE8F8700780107A021E4
70702+:103A50009284000B0E0020F4240500018F860038AC
70703+:103A600024140001125400962E500001160000424A
70704+:103A70003C08FFFF241900021659FF3F0000000018
70705+:103A8000A0C000FF8F860038A0D200090A0021D70D
70706+:103A90008F86003890C700092404000230E300FF3D
70707+:103AA0001064016F24090004106901528F880074AA
70708+:103AB0008CCE0054010E682325B10001062001754B
70709+:103AC000241800043C010801A03896D53C010801E7
70710+:103AD000A02096D490D400FD90D200FF2E4F00027B
70711+:103AE00015E0FF14328400FF000438408F8900780D
70712+:103AF00090DF00FF00E41021000220800089C8212F
70713+:103B00002FE500029324000B14A0FF0A24070002F3
70714+:103B100000041840006480210010588001692821A9
70715+:103B20008CAC0004010C50230540FF020000000093
70716+:103B30003C030801906396D614600005246F0001D1
70717+:103B40003C010801A02496D93C010801A02796D782
70718+:103B50003C010801A02F96D690CE00FF24E700017B
70719+:103B600031CD00FF01A7882B1220FFE990A4000BA4
70720+:103B70000A0021C6000000003C0508018CA596D46F
70721+:103B80003C12000400A8F82413F2000624020005E9
70722+:103B90003C090801912996D5152000022402000352
70723+:103BA000240200053C010801A02296F190C700FF05
70724+:103BB00014E0012024020002A0C200090A0021D75B
70725+:103BC0008F86003890CC00FF1180FEDA240A0001B5
70726+:103BD0008F8C00748F890078240F00030180682186
70727+:103BE0001160001E240E0002000540400105A021C6
70728+:103BF00000142080008990218E51000401918023BF
70729+:103C00000600FECC000000003C020801904296D65F
70730+:103C100014400005245800013C010801A02A96D751
70731+:103C20003C010801A02596D93C010801A03896D690
70732+:103C300090DF00FF010510210002C88033E500FF7E
70733+:103C4000254A00010329202100AA402B1500FEB9B6
70734+:103C50009085000B1560FFE50005404000054040E1
70735+:103C600001051821000310803C010801A02A96D408
70736+:103C70003C010801A02596D8004918218C64000455
70737+:103C800000E4F82327F9FFFF1F20FFE900000000F0
70738+:103C90008C63000000E358230560013A01A38823E8
70739+:103CA00010E301170184C0231B00FEA200000000E6
70740+:103CB0003C010801A02E96D50A002305240B000123
70741+:103CC000240E0004A0CE00093C0D08008DAD31F893
70742+:103CD0008F86003825A200013C010800AC2231F893
70743+:103CE0000A0021D7000000008CD9005C00F9C02335
70744+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
70745+:103D00008F8400748CC3005C008340232502000173
70746+:103D10001C40FF60000000008CC9005C248700018B
70747+:103D200000E9282B10A0FE943C0D80008DAB01040F
70748+:103D30003C0C0001016C50241140FE8F2402001045
70749+:103D40003C010801A02296F10A0021D700000000E2
70750+:103D50008F9100748F86003826220001ACC2005C6F
70751+:103D60000A002292241400018F8700382404FF8067
70752+:103D70000000882190E9000A241400010124302564
70753+:103D8000A0E6000A3C05080190A596D63C0408016F
70754+:103D9000908496D90E0020F4000000008F86003831
70755+:103DA0008F85007890C800FD310700FF0007404074
70756+:103DB0000107F821001FC0800305C8219323000BD1
70757+:103DC000A0C300FD8F8500788F8600380305602131
70758+:103DD000918F000B000F704001CF6821000D808093
70759+:103DE000020510218C4B0000ACCB00548D840004E4
70760+:103DF0008F83007400645023194000022482000164
70761+:103E00002462000101074821ACC2005C0009308037
70762+:103E100000C5402100E02021240500010E0020F40F
70763+:103E20009110000B8F86003890C500FF10A0FF0C8A
70764+:103E3000001070408F85007801D06821000D10803F
70765+:103E4000004558218D6400008F8C0074018450233C
70766+:103E50002547000104E0FF02263100013C03080170
70767+:103E6000906396D62E2F0002247800013C010801B1
70768+:103E7000A03896D63C010801A03496D711E0FEF890
70769+:103E8000020038210A002365000740408F84003873
70770+:103E90008F8300748C85005800A340230502FE9A8E
70771+:103EA000AC8300580A00223B000000003C070801D8
70772+:103EB00090E796F2240200FF10E200BE8F860038E1
70773+:103EC0003C110801963196FA3C030801246396F8E8
70774+:103ED000262500013230FFFF30ABFFFF02036021D7
70775+:103EE0002D6A00FF1540008D918700043C010801F8
70776+:103EF000A42096FA8F88003800074840012728211F
70777+:103F0000911800FF000530802405000127140001EE
70778+:103F1000A11400FF3C120801925296F28F8800789B
70779+:103F20008F8E0070264F000100C820213C0108013F
70780+:103F3000A02F96F2AC8E00008F8D0074A48500082F
70781+:103F4000AC8D00043C030801906396D414600077A4
70782+:103F5000000090213C010801A02596D4A087000B09
70783+:103F60008F8C007800CC5021A147000A8F82003846
70784+:103F7000A04700FD8F840038A08700FE8F860038A0
70785+:103F80008F9F0070ACDF00548F990074ACD900583B
70786+:103F90008F8D00780127C02100185880016DA02165
70787+:103FA000928F000A000F704001CF18210003888013
70788+:103FB000022D8021A207000B8F8600780166602108
70789+:103FC000918A000B000A1040004A2021000428803A
70790+:103FD00000A64021A107000A3C07800834E90080C0
70791+:103FE0008D2200308F860038ACC2005C0A0022921D
70792+:103FF0002414000190CA00FF1540FEAD8F880074A4
70793+:10400000A0C400090A0021D78F860038A0C000FD97
70794+:104010008F98003824060001A30000FE3C0108012F
70795+:10402000A02696D53C010801A02096D40A0021C6FE
70796+:104030000000000090CB00FF3C040801908496F340
70797+:10404000316C00FF0184502B1540000F2402000347
70798+:1040500024020004A0C200090A0021D78F8600387C
70799+:1040600090C3000A2410FF8002035824316C00FF23
70800+:104070001180FDC1000000003C010801A02096D580
70801+:104080000A0021C600000000A0C200090A0021D7D2
70802+:104090008F86003890D4000A2412FF8002544824EE
70803+:1040A000312800FF1500FFF4240200083C0108013C
70804+:1040B000A02296F10A0021D70000000000108840DD
70805+:1040C0008F8B0070023018210003688001A7202127
70806+:1040D000AC8B00008F8A0074240C0001A48C0008B3
70807+:1040E000AC8A00043C05080190A596D62402000184
70808+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
70809+:104100000184A0231A80FD8B000000003C010801FF
70810+:10411000A02E96D50A002305240B00013C010801BE
70811+:10412000A42596FA0A0023B78F880038240B0001D3
70812+:10413000106B00228F9800388F85003890BF00FFE9
70813+:1041400033F900FF1079002B000000003C1F08012C
70814+:1041500093FF96D8001FC840033FC0210018A080DD
70815+:104160000288782191EE000AA08E000A8F8D0078D7
70816+:104170003C030801906396D800CD88210A0023DD16
70817+:10418000A223000B263000010600003101A4902379
70818+:104190000640002B240200033C010801A02F96D505
70819+:1041A0000A002305240B00018F8900380A00223BF6
70820+:1041B000AD2700540A00229124120001931400FD3F
70821+:1041C000A094000B8F8800388F8F0078910E00FE2E
70822+:1041D00000CF6821A1AE000A8F910038A22700FD10
70823+:1041E0008F8300708F900038AE0300540A0023DEE6
70824+:1041F0008F8D007890B000FEA090000A8F8B003861
70825+:104200008F8C0078916A00FD00CC1021A04A000B31
70826+:104210008F840038A08700FE8F8600748F85003859
70827+:10422000ACA600580A0023DE8F8D007894B80008F1
70828+:10423000ACA40004030378210A002285A4AF00087F
70829+:104240003C010801A02296D50A0021C6000000000A
70830+:1042500090CF0009240D000431EE00FF11CDFD8543
70831+:10426000240200013C010801A02296D50A0021C6C3
70832+:1042700000000000080033440800334408003420E4
70833+:10428000080033F4080033D8080033280800332826
70834+:10429000080033280800334C8008010080080080A3
70835+:1042A000800800005F865437E4AC62CC50103A4579
70836+:1042B00036621985BF14C0E81BC27A1E84F4B55655
70837+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
70838+:1042D00008005AB808005A5C08005A5C08005A5C8A
70839+:1042E00008005A5C08005A7408005A5C08005A5CBE
70840+:1042F00008005AC008005A5C080059D408005A5CEB
70841+:1043000008005A5C08005AC008005A5C08005A5C51
70842+:1043100008005A5C08005A5C08005A5C08005A5CA5
70843+:1043200008005A5C08005A5C08005A5C08005A5C95
70844+:1043300008005A9408005A5C08005A9408005A5C15
70845+:1043400008005A5C08005A5C08005A9808005A9401
70846+:1043500008005A5C08005A5C08005A5C08005A5C65
70847+:1043600008005A5C08005A5C08005A5C08005A5C55
70848+:1043700008005A5C08005A5C08005A5C08005A5C45
70849+:1043800008005A5C08005A5C08005A5C08005A5C35
70850+:1043900008005A5C08005A5C08005A5C08005A5C25
70851+:1043A00008005A9808005A9808005A5C08005A9861
70852+:1043B00008005A5C08005A5C08005A5C08005A5C05
70853+:1043C00008005A5C08005A5C08005A5C08005A5CF5
70854+:1043D00008005A5C08005A5C08005A5C08005A5CE5
70855+:1043E00008005A5C08005A5C08005A5C08005A5CD5
70856+:1043F00008005A5C08005A5C08005A5C08005A5CC5
70857+:1044000008005A5C08005A5C08005A5C08005A5CB4
70858+:1044100008005A5C08005A5C08005A5C08005A5CA4
70859+:1044200008005A5C08005A5C08005A5C08005A5C94
70860+:1044300008005A5C08005A5C08005A5C08005A5C84
70861+:1044400008005A5C08005A5C08005A5C08005A5C74
70862+:1044500008005A5C08005A5C08005A5C08005A5C64
70863+:1044600008005A5C08005A5C08005A5C08005A5C54
70864+:1044700008005A5C08005A5C08005A5C08005A5C44
70865+:1044800008005A5C08005A5C08005A5C08005A5C34
70866+:1044900008005A5C08005A5C08005A5C08005A5C24
70867+:1044A00008005A5C08005A5C08005A5C08005A5C14
70868+:1044B00008005A5C08005A5C08005A5C08005A5C04
70869+:1044C00008005A5C08005A5C08005A5C08005ADC74
70870+:1044D0000800782C08007A900800783808007628C0
70871+:1044E00008007838080078C4080078380800762872
70872+:1044F0000800762808007628080076280800762824
70873+:104500000800762808007628080076280800762813
70874+:1045100008007628080078580800784808007628AF
70875+:1045200008007628080076280800762808007628F3
70876+:1045300008007628080076280800762808007628E3
70877+:1045400008007628080076280800762808007848B1
70878+:10455000080082FC08008188080082C40800818865
70879+:104560000800829408008070080081880800818813
70880+:1045700008008188080081880800818808008188F7
70881+:1045800008008188080081880800818808008188E7
70882+:104590000800818808008188080081B008008D34F7
70883+:1045A00008008E9008008E70080088D808008D4C96
70884+:1045B0000A00012400000000000000000000000DBF
70885+:1045C000747061362E322E31620000000602010145
70886+:1045D00000000000000000000000000000000000DB
70887+:1045E00000000000000000000000000000000000CB
70888+:1045F00000000000000000000000000000000000BB
70889+:1046000000000000000000000000000000000000AA
70890+:10461000000000000000000000000000000000009A
70891+:10462000000000000000000000000000000000008A
70892+:10463000000000000000000000000000000000007A
70893+:104640000000000010000003000000000000000D4A
70894+:104650000000000D3C020800244217203C03080023
70895+:1046600024632A10AC4000000043202B1480FFFD7F
70896+:10467000244200043C1D080037BD2FFC03A0F0219C
70897+:104680003C100800261004903C1C0800279C1720B2
70898+:104690000E000262000000000000000D2402FF80F6
70899+:1046A00027BDFFE000821024AFB00010AF42002011
70900+:1046B000AFBF0018AFB10014936500043084007FD1
70901+:1046C000034418213C0200080062182130A5002094
70902+:1046D000036080213C080111277B000814A0000220
70903+:1046E0002466005C2466005892020004974301048B
70904+:1046F000920400043047000F3063FFFF3084004015
70905+:10470000006728231080000900004821920200055C
70906+:1047100030420004104000050000000010A000031B
70907+:104720000000000024A5FFFC2409000492020005FB
70908+:1047300030420004104000120000000010A00010E1
70909+:10474000000000009602000200A72021010440257D
70910+:104750002442FFFEA7421016920300042402FF80A9
70911+:1047600000431024304200FF104000033C020400CC
70912+:104770000A000174010240258CC20000AF421018EB
70913+:104780008F4201780440FFFE2402000AA742014044
70914+:1047900096020002240400093042000700021023A0
70915+:1047A00030420007A7420142960200022442FFFE67
70916+:1047B000A7420144A740014697420104A74201488D
70917+:1047C0008F420108304200205040000124040001C3
70918+:1047D00092020004304200101440000234830010A2
70919+:1047E00000801821A743014A0000000000000000DB
70920+:1047F0000000000000000000AF48100000000000B2
70921+:104800000000000000000000000000008F421000C7
70922+:104810000441FFFE3102FFFF1040000700000000CE
70923+:1048200092020004304200401440000300000000E7
70924+:104830008F421018ACC20000960200063042FFFF03
70925+:10484000244200020002104300021040036288214B
70926+:10485000962200001120000D3044FFFF00A7102118
70927+:104860008F8300388F45101C0002108200021080D8
70928+:1048700000431021AC45000030A6FFFF0E00058D5F
70929+:1048800000052C0200402021A62200009203000413
70930+:104890002402FF8000431024304200FF1040001F1C
70931+:1048A0000000000092020005304200021040001B90
70932+:1048B000000000009742100C2442FFFEA742101691
70933+:1048C000000000003C02040034420030AF421000FF
70934+:1048D00000000000000000000000000000000000D8
70935+:1048E0008F4210000441FFFE000000009742100CB0
70936+:1048F0008F45101C3042FFFF24420030000210821E
70937+:1049000000021080005B1021AC45000030A6FFFFC4
70938+:104910000E00058D00052C02A62200009604000260
70939+:10492000248400080E0001E93084FFFF974401044D
70940+:104930000E0001F73084FFFF8FBF00188FB1001405
70941+:104940008FB000103C02100027BD002003E00008DB
70942+:10495000AF4201783084FFFF308200078F8500244A
70943+:1049600010400002248300073064FFF800A41021E7
70944+:1049700030421FFF03421821247B4000AF850028EE
70945+:10498000AF82002403E00008AF4200843084FFFFC0
70946+:104990003082000F8F85002C8F860034104000027B
70947+:1049A0002483000F3064FFF000A410210046182B70
70948+:1049B000AF8500300046202314600002AF82002C37
70949+:1049C000AF84002C8F82002C340480000342182115
70950+:1049D00000641821AF83003803E00008AF42008074
70951+:1049E0008F820014104000088F8200048F82FFDC49
70952+:1049F000144000058F8200043C02FFBF3442FFFFD9
70953+:104A0000008220248F82000430430006240200022A
70954+:104A10001062000F3C0201012C62000350400005AF
70955+:104A2000240200041060000F3C0200010A00023062
70956+:104A30000000000010620005240200061462000C51
70957+:104A40003C0201110A000229008210253C020011DB
70958+:104A500000821025AF421000240200010A0002303B
70959+:104A6000AF82000C00821025AF421000AF80000C16
70960+:104A700000000000000000000000000003E000084B
70961+:104A8000000000008F82000C1040000400000000B5
70962+:104A90008F4210000441FFFE0000000003E0000808
70963+:104AA000000000008F8200102443F800000231C291
70964+:104AB00024C2FFF02C6303011060000300021042C7
70965+:104AC0000A000257AC8200008F85001800C5102B29
70966+:104AD0001440000B0000182100C5102324470001DA
70967+:104AE0008F82001C00A210212442FFFF0046102BE1
70968+:104AF000544000042402FFFF0A000257AC87000064
70969+:104B00002402FFFF0A000260AC8200008C820000D9
70970+:104B10000002194000621821000318800062182169
70971+:104B2000000318803C0208002442175C0062182130
70972+:104B300003E000080060102127BDFFD8AFBF0020B0
70973+:104B4000AFB1001CAFB000183C0460088C8250006C
70974+:104B50002403FF7F3C066000004310243442380CDD
70975+:104B6000AC8250008CC24C1C3C1A80000002160221
70976+:104B70003042000F10400007AF82001C8CC34C1C59
70977+:104B80003C02001F3442FC0000621824000319C2DA
70978+:104B9000AF8300188F420008275B400034420001B9
70979+:104BA000AF420008AF8000243C02601CAF40008090
70980+:104BB000AF4000848C4500088CC308083402800094
70981+:104BC000034220212402FFF0006218243C020080EE
70982+:104BD0003C010800AC2204203C025709AF84003895
70983+:104BE00014620004AF850034240200010A0002921E
70984+:104BF000AF820014AF8000148F42000038420001E1
70985+:104C0000304200011440FFFC8F8200141040001657
70986+:104C10000000000097420104104000058F8300004F
70987+:104C2000146000072462FFFF0A0002A72C62000A3A
70988+:104C30002C620010504000048F83000024620001A9
70989+:104C4000AF8200008F8300002C62000A1440000332
70990+:104C50002C6200070A0002AEAF80FFDC10400002A9
70991+:104C600024020001AF82FFDC8F4301088F44010062
70992+:104C700030622000AF83000410400008AF840010B1
70993+:104C80003C0208008C42042C244200013C01080034
70994+:104C9000AC22042C0A00058A3C0240003065020068
70995+:104CA00014A0000324020F001482026024020D00ED
70996+:104CB00097420104104002C83C02400030624000AC
70997+:104CC000144000AD8F8200388C4400088F42017878
70998+:104CD0000440FFFE24020800AF42017824020008CD
70999+:104CE000A7420140A7400142974201048F8400047B
71000+:104CF0003051FFFF30820001104000070220802168
71001+:104D00002623FFFE240200023070FFFFA742014667
71002+:104D10000A0002DBA7430148A74001463C02080005
71003+:104D20008C42043C1440000D8F8300103082002020
71004+:104D30001440000224030009240300010060202124
71005+:104D40008F830010240209005062000134840004A3
71006+:104D5000A744014A0A0002F60000000024020F00E6
71007+:104D60001462000530820020144000062403000D68
71008+:104D70000A0002F524030005144000022403000980
71009+:104D800024030001A743014A3C0208008C4204208E
71010+:104D90003C0400480E00020C004420250E000235A1
71011+:104DA000000000008F82000C1040003E0000000058
71012+:104DB0008F4210003C0300200043102410400039B3
71013+:104DC0008F820004304200021040003600000000D4
71014+:104DD000974210141440003300000000974210085E
71015+:104DE0008F8800383042FFFF2442000600021882FC
71016+:104DF0000003388000E83021304300018CC40000FB
71017+:104E000010600004304200030000000D0A00033768
71018+:104E100000E81021544000103084FFFF3C05FFFFE4
71019+:104E200000852024008518260003182B0004102B71
71020+:104E300000431024104000050000000000000000A6
71021+:104E40000000000D00000000240002228CC20000BF
71022+:104E50000A000336004520253883FFFF0003182B86
71023+:104E60000004102B00431024104000050000000037
71024+:104E7000000000000000000D000000002400022BD4
71025+:104E80008CC200003444FFFF00E81021AC44000055
71026+:104E90003C0208008C420430244200013C0108001E
71027+:104EA000AC2204308F6200008F840038AF8200088B
71028+:104EB0008C8300003402FFFF1462000F00001021F9
71029+:104EC0003C0508008CA504543C0408008C84045064
71030+:104ED00000B0282100B0302B008220210086202144
71031+:104EE0003C010800AC2504543C010800AC240450EB
71032+:104EF0000A000580240400088C8200003042010072
71033+:104F00001040000F000010213C0508008CA5044C47
71034+:104F10003C0408008C84044800B0282100B0302BE9
71035+:104F200000822021008620213C010800AC25044C91
71036+:104F30003C010800AC2404480A0005802404000851
71037+:104F40003C0508008CA504443C0408008C84044003
71038+:104F500000B0282100B0302B0082202100862021C3
71039+:104F60003C010800AC2504443C010800AC2404408A
71040+:104F70000A000580240400088F6200088F62000088
71041+:104F800000021602304300F02402003010620005D7
71042+:104F900024020040106200E08F8200200A00058891
71043+:104FA0002442000114A000050000000000000000E1
71044+:104FB0000000000D00000000240002568F4201781E
71045+:104FC0000440FFFE000000000E00023D27A4001078
71046+:104FD0001440000500408021000000000000000D8A
71047+:104FE000000000002400025D8E0200001040000559
71048+:104FF00000000000000000000000000D00000000A4
71049+:10500000240002608F62000C0443000324020001AC
71050+:105010000A00042EAE000000AE0200008F820038AD
71051+:105020008C480008A20000078F65000C8F64000404
71052+:1050300030A3FFFF0004240200852023308200FFFC
71053+:105040000043102124420005000230832CC200815D
71054+:10505000A605000A14400005A20400040000000098
71055+:105060000000000D00000000240002788F85003849
71056+:105070000E0005AB260400148F6200048F43010864
71057+:10508000A60200083C02100000621824106000080C
71058+:105090000000000097420104920300072442FFEC45
71059+:1050A000346300023045FFFF0A0003C3A203000778
71060+:1050B000974201042442FFF03045FFFF96060008A6
71061+:1050C0002CC200135440000592030007920200070F
71062+:1050D00034420001A20200079203000724020001EB
71063+:1050E00010620005240200031062000B8F8200385A
71064+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
71065+:105100008C43000C0064182400651825AC43000C87
71066+:105110000A0003E030C6FFFF3C04FFFF8C43001091
71067+:105120000064182400651825AC43001030C6FFFF4A
71068+:1051300024C2000200021083A20200058F830038FF
71069+:10514000304200FF00021080004328218CA800009C
71070+:105150008CA2000024030004000217021443001272
71071+:1051600000000000974201043C03FFFF01031824E4
71072+:105170003042FFFF004610232442FFFE006240251C
71073+:10518000ACA8000092030005306200FF000210800E
71074+:1051900000501021904200143042000F00431021B3
71075+:1051A0000A000415A20200068CA400049742010420
71076+:1051B0009603000A3088FFFF3042FFFF00461023AD
71077+:1051C0002442FFD60002140001024025ACA80004CE
71078+:1051D000920200079204000524630028000318834C
71079+:1051E0000064182134420004A2030006A202000752
71080+:1051F0008F8200042403FFFB34420002004310248A
71081+:10520000AF820004920300068F87003800031880E5
71082+:10521000007010218C4400203C02FFF63442FFFF56
71083+:105220000082402400671821AE04000CAC68000C1A
71084+:10523000920500063C03FF7F8E02000C00052880CB
71085+:1052400000B020213463FFFF01033024948800263E
71086+:1052500000A7282100431024AE02000CAC860020D9
71087+:10526000AC880024ACA8001024020010A742014022
71088+:1052700024020002A7400142A7400144A742014680
71089+:10528000974201043C0400082442FFFEA742014863
71090+:10529000240200010E00020CA742014A9603000AF4
71091+:1052A0009202000400431021244200023042000711
71092+:1052B00000021023304200070E000235AE0200103B
71093+:1052C0008F6200003C0308008C6304442404001037
71094+:1052D000AF820008974201043042FFFF2442FFFEE4
71095+:1052E00000403821000237C33C0208008C420440D1
71096+:1052F000006718210067282B004610210045102167
71097+:105300003C010800AC2304443C010800AC220440EA
71098+:105310000A0005150000000014A0000500000000B0
71099+:10532000000000000000000D000000002400030A3F
71100+:105330008F4201780440FFFE000000000E00023D95
71101+:1053400027A4001414400005004080210000000044
71102+:105350000000000D00000000240003118E02000078
71103+:105360005440000692020007000000000000000DFB
71104+:10537000000000002400031C9202000730420004D9
71105+:10538000104000058F8200042403FFFB344200021A
71106+:1053900000431024AF8200048F620004044300081D
71107+:1053A00092020007920200068E03000CAE0000007D
71108+:1053B0000002108000501021AC4300209202000730
71109+:1053C00030420004544000099602000A920200058F
71110+:1053D0003C03000100021080005010218C46001890
71111+:1053E00000C33021AC4600189602000A9206000461
71112+:1053F000277100080220202100C2302124C60005A8
71113+:10540000260500140E0005AB00063082920400064B
71114+:105410008F6500043C027FFF000420800091202162
71115+:105420008C8300043442FFFF00A228240065182169
71116+:10543000AC8300049202000792040005920300046A
71117+:10544000304200041040001496070008308400FF2A
71118+:1054500000042080009120218C86000497420104E2
71119+:105460009605000A306300FF3042FFFF0043102121
71120+:105470000045102130E3FFFF004310232442FFD8F2
71121+:1054800030C6FFFF0002140000C23025AC860004C5
71122+:105490000A0004C992030007308500FF0005288038
71123+:1054A00000B128218CA4000097420104306300FF62
71124+:1054B0003042FFFF00431021004710233C03FFFF51
71125+:1054C000008320243042FFFF00822025ACA400008E
71126+:1054D0009203000724020001106200060000000091
71127+:1054E0002402000310620011000000000A0004EC16
71128+:1054F0008E03001097420104920300049605000AEF
71129+:105500008E24000C00431021004510212442FFF29C
71130+:105510003C03FFFF008320243042FFFF0082202550
71131+:10552000AE24000C0A0004EC8E0300109742010424
71132+:10553000920300049605000A8E24001000431021F7
71133+:10554000004510212442FFEE3C03FFFF008320248E
71134+:105550003042FFFF00822025AE2400108E03001091
71135+:105560002402000AA7420140A74301429603000A11
71136+:10557000920200043C04004000431021A742014471
71137+:10558000A740014697420104A742014824020001B6
71138+:105590000E00020CA742014A0E0002350000000076
71139+:1055A0008F6200009203000400002021AF820008F7
71140+:1055B000974201049606000A3042FFFF006218215C
71141+:1055C000006028213C0308008C6304443C0208006E
71142+:1055D0008C42044000651821004410210065382BDE
71143+:1055E000004710213C010800AC2304443C010800A2
71144+:1055F000AC22044092040004008620212484000A86
71145+:105600003084FFFF0E0001E9000000009744010410
71146+:105610003084FFFF0E0001F7000000003C02100084
71147+:10562000AF4201780A0005878F820020148200278C
71148+:105630003062000697420104104000673C024000BF
71149+:105640003062400010400005000000000000000033
71150+:105650000000000D00000000240004208F420178AB
71151+:105660000440FFFE24020800AF4201782402000833
71152+:10567000A7420140A74001428F82000497430104E2
71153+:1056800030420001104000073070FFFF2603FFFE8C
71154+:1056900024020002A7420146A74301480A00053F31
71155+:1056A0002402000DA74001462402000DA742014A32
71156+:1056B0008F62000024040008AF8200080E0001E998
71157+:1056C000000000000A0005190200202110400042DD
71158+:1056D0003C02400093620000304300F024020010BE
71159+:1056E0001062000524020070106200358F820020D5
71160+:1056F0000A000588244200018F62000097430104DC
71161+:105700003050FFFF3071FFFF8F4201780440FFFEF1
71162+:105710003202000700021023304200072403000A6F
71163+:105720002604FFFEA7430140A7420142A7440144CB
71164+:10573000A7400146A75101488F420108304200208E
71165+:10574000144000022403000924030001A743014A76
71166+:105750000E00020C3C0400400E0002350000000068
71167+:105760003C0708008CE70444021110212442FFFE8C
71168+:105770003C0608008CC604400040182100E3382194
71169+:10578000000010218F65000000E3402B00C2302193
71170+:105790002604000800C830213084FFFFAF850008D0
71171+:1057A0003C010800AC2704443C010800AC2604403E
71172+:1057B0000E0001E9000000000A0005190220202166
71173+:1057C0000E00013B000000008F82002024420001F7
71174+:1057D000AF8200203C024000AF4201380A00029232
71175+:1057E000000000003084FFFF30C6FFFF00052C00E2
71176+:1057F00000A628253882FFFF004510210045282BF0
71177+:105800000045102100021C023042FFFF004310211E
71178+:1058100000021C023042FFFF004310213842FFFF0C
71179+:1058200003E000083042FFFF3084FFFF30A5FFFF98
71180+:1058300000001821108000070000000030820001E5
71181+:105840001040000200042042006518210A0005A152
71182+:105850000005284003E000080060102110C0000689
71183+:1058600024C6FFFF8CA2000024A50004AC82000027
71184+:105870000A0005AB2484000403E0000800000000D7
71185+:1058800010A0000824A3FFFFAC8600000000000069
71186+:10589000000000002402FFFF2463FFFF1462FFFAF0
71187+:1058A0002484000403E00008000000000000000160
71188+:1058B0000A00002A00000000000000000000000DA7
71189+:1058C000747870362E322E3162000000060201001C
71190+:1058D00000000000000001360000EA600000000047
71191+:1058E00000000000000000000000000000000000B8
71192+:1058F00000000000000000000000000000000000A8
71193+:105900000000000000000000000000000000000097
71194+:105910000000001600000000000000000000000071
71195+:105920000000000000000000000000000000000077
71196+:105930000000000000000000000000000000000067
71197+:1059400000000000000000000000138800000000BC
71198+:10595000000005DC00000000000000001000000353
71199+:10596000000000000000000D0000000D3C020800D7
71200+:1059700024423D683C0308002463401CAC40000006
71201+:105980000043202B1480FFFD244200043C1D08002E
71202+:1059900037BD7FFC03A0F0213C100800261000A8B2
71203+:1059A0003C1C0800279C3D680E00044E00000000CF
71204+:1059B0000000000D27BDFFB4AFA10000AFA200049E
71205+:1059C000AFA30008AFA4000CAFA50010AFA6001451
71206+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
71207+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
71208+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
71209+:105A0000AFBF00480E000591000000008FBF0048A6
71210+:105A10008FBC00448FB900408FB8003C8FAF003876
71211+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
71212+:105A30008FAA00248FA900208FA8001C8FA7001810
71213+:105A40008FA600148FA500108FA4000C8FA3000850
71214+:105A50008FA200048FA1000027BD004C3C1B6004F6
71215+:105A60008F7A5030377B502803400008AF7A00000F
71216+:105A70008F86003C3C0390003C0280000086282575
71217+:105A800000A32025AC4400203C0380008C6700204C
71218+:105A900004E0FFFE0000000003E00008000000003A
71219+:105AA0000A000070240400018F85003C3C04800043
71220+:105AB0003483000100A3102503E00008AC8200201D
71221+:105AC00003E00008000010213084FFFF30A5FFFF35
71222+:105AD00010800007000018213082000110400002F1
71223+:105AE00000042042006518211480FFFB00052840B7
71224+:105AF00003E000080060102110C000070000000053
71225+:105B00008CA2000024C6FFFF24A50004AC82000084
71226+:105B100014C0FFFB2484000403E000080000000020
71227+:105B200010A0000824A3FFFFAC86000000000000C6
71228+:105B3000000000002402FFFF2463FFFF1462FFFA4D
71229+:105B40002484000403E000080000000090AA003153
71230+:105B50008FAB00108CAC00403C0300FF8D6800044C
71231+:105B6000AD6C00208CAD004400E060213462FFFF8A
71232+:105B7000AD6D00248CA700483C09FF000109C0243A
71233+:105B8000AD6700288CAE004C0182C824031978252B
71234+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
71235+:105BA000AD6D001C94A900323128FFFFAD680010D4
71236+:105BB00090A70030A5600002A1600004A16700006A
71237+:105BC00090A30032306200FF0002198210600005CD
71238+:105BD000240500011065000E0000000003E000082D
71239+:105BE000A16A00018CD80028354A0080AD780018E1
71240+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
71241+:105C00008CC4002CA16A000103E00008AD64000C04
71242+:105C10008CCD001CAD6D00188CC90014AD6900144A
71243+:105C20008CC80024AD6800088CC70020AD67000C4C
71244+:105C30008CC200148C8300700043C82B1320000713
71245+:105C4000000000008CC20014144CFFE400000000AF
71246+:105C5000354A008003E00008A16A00018C820070D0
71247+:105C60000A0000E6000000009089003027BDFFF820
71248+:105C70008FA8001CA3A900008FA300003C0DFF808B
71249+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
71250+:105C9000A100000400C05821A7A000028D06000446
71251+:105CA00000A048210167C8218FA500000080502175
71252+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
71253+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
71254+:105CD00000EDC02400C27824000C1DC003236825F9
71255+:105CE00001F87025AD0D0000AD0E00048D240024D8
71256+:105CF000AFAD0000AD0400088D2C00202404FFFF90
71257+:105D0000AD0C000C9547003230E6FFFFAD060010E9
71258+:105D10009145004830A200FF000219C25060000106
71259+:105D20008D240034AD0400148D4700388FAA00186C
71260+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
71261+:105D4000AD00002CAD00001803E00008AD000020FD
71262+:105D500027BDFFE0AFB20018AFB10014AFB0001024
71263+:105D6000AFBF001C9098003000C088213C0D00FFA0
71264+:105D7000330F007FA0CF0000908E003135ACFFFFC5
71265+:105D80003C0AFF00A0CE000194A6001EA220000441
71266+:105D90008CAB00148E29000400A08021016C282403
71267+:105DA000012A40240080902101052025A62600021A
71268+:105DB000AE24000426050020262400080E000092D0
71269+:105DC00024060002924700302605002826240014ED
71270+:105DD00000071E000003160324060004044000030D
71271+:105DE0002403FFFF965900323323FFFF0E00009279
71272+:105DF000AE230010262400248FBF001C8FB2001891
71273+:105E00008FB100148FB00010240500030000302172
71274+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
71275+:105E2000AFB00018AFBF002090A9003024020001DD
71276+:105E300000E050213123003F00A040218FB00040FE
71277+:105E40000080882100C04821106200148FA700380C
71278+:105E5000240B000500A0202100C02821106B001396
71279+:105E6000020030210E000128000000009225007C75
71280+:105E700030A400021080000326030030AE00003082
71281+:105E8000260300348FBF00208FB1001C8FB0001894
71282+:105E90000060102103E0000827BD00280E0000A7C5
71283+:105EA000AFB000100A00016F000000008FA3003C9B
71284+:105EB000010020210120282101403021AFA3001042
71285+:105EC0000E0000EEAFB000140A00016F00000000E9
71286+:105ED0003C06800034C20E008C4400108F850044C4
71287+:105EE000ACA400208C43001803E00008ACA30024FD
71288+:105EF0003C06800034C20E008C4400148F850044A0
71289+:105F0000ACA400208C43001C03E00008ACA30024D8
71290+:105F10009382000C1040001B2483000F2404FFF028
71291+:105F20000064382410E00019978B00109784000E4D
71292+:105F30009389000D3C0A601C0A0001AC01644023F7
71293+:105F400001037021006428231126000231C2FFFFE3
71294+:105F500030A2FFFF0047302B50C0000E00E4482164
71295+:105F60008D4D000C31A3FFFF00036400000C2C03D7
71296+:105F700004A1FFF30000302130637FFF0A0001A479
71297+:105F80002406000103E00008000000009784000ED2
71298+:105F900000E448213123FFFF3168FFFF0068382B00
71299+:105FA00054E0FFF8A783000E938A000D114000050E
71300+:105FB000240F0001006BC023A380000D03E0000844
71301+:105FC000A798000E006BC023A38F000D03E000080C
71302+:105FD000A798000E03E000080000000027BDFFE8BE
71303+:105FE000AFB000103C10800036030140308BFFFF43
71304+:105FF00093AA002BAFBF0014A46B000436040E005C
71305+:106000009488001630C600FF8FA90030A4680006EF
71306+:10601000AC650008A0660012A46A001AAC670020F4
71307+:106020008FA5002CA4690018012020210E000198E2
71308+:10603000AC6500143C021000AE0201788FBF001462
71309+:106040008FB0001003E0000827BD00188F85000006
71310+:106050002484000727BDFFF83084FFF83C06800049
71311+:1060600094CB008A316AFFFFAFAA00008FA900001D
71312+:10607000012540232507FFFF30E31FFF0064102B9D
71313+:106080001440FFF700056882000D288034CC4000E2
71314+:1060900000AC102103E0000827BD00088F8200003B
71315+:1060A0002486000730C5FFF800A2182130641FFFC6
71316+:1060B00003E00008AF8400008F87003C8F84004419
71317+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
71318+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
71319+:1060E000AFB20030AFB000283C0B80008C8600249B
71320+:1060F000AD6700808C8A002035670E00356901008D
71321+:10610000ACEA00108C8800248D2500040000B82122
71322+:10611000ACE800188CE3001000A688230000A02142
71323+:10612000ACE300148CE20018ACE2001C122000FE6C
71324+:1061300000E0B021936C0008118000F40000000022
71325+:10614000976F001031EEFFFF022E682B15A000EFB5
71326+:1061500000000000977200103250FFFFAED0000028
71327+:106160003C0380008C740000329300081260FFFD35
71328+:106170000000000096D800088EC700043305FFFF1A
71329+:1061800030B5000112A000E4000000000000000D86
71330+:1061900030BFA0402419004013F9011B30B4A00007
71331+:1061A000128000DF000000009373000812600008F6
71332+:1061B00000000000976D001031ACFFFF00EC202BB9
71333+:1061C0001080000330AE004011C000D50000000078
71334+:1061D000A7850040AF87003893630008022028217C
71335+:1061E000AFB10020146000F527B40020AF60000CB0
71336+:1061F000978F004031F14000162000022403001662
71337+:106200002403000E24054007A363000AAF650014B1
71338+:10621000938A00428F70001431550001001512401E
71339+:1062200002024825AF690014979F00408F78001440
71340+:1062300033F9001003194025AF680014979200400D
71341+:106240003247000810E0016E000000008F67001464
71342+:106250003C1210003C11800000F27825AF6F001452
71343+:1062600036230E00946E000A3C0D81002406000EB9
71344+:1062700031CCFFFF018D2025AF640004A36600022E
71345+:106280009373000A3406FFFC266B0004A36B000A1C
71346+:1062900097980040330820001100015F00000000C3
71347+:1062A0003C05800034A90E00979900409538000CF9
71348+:1062B00097870040001940423312C00031030003A9
71349+:1062C00000127B0330F11000006F6825001172038B
71350+:1062D00001AE6025000C20C0A76400129793004017
71351+:1062E000936A000A001359823175003C02AA1021FA
71352+:1062F0002450003CA3700009953F000C33F93FFF88
71353+:10630000A779001097700012936900090130F821F5
71354+:1063100027E5000230B900070019C0233308000741
71355+:10632000A368000B9371000997720012976F001019
71356+:10633000322700FF8F910038978D004000F218211E
71357+:10634000006F702101C6602131A6004010C0000519
71358+:106350003185FFFF00B1102B3C1280001040001768
71359+:10636000000098210225A82B56A0013E8FA50020F1
71360+:106370003C048000348A0E008D5300143C068000DB
71361+:10638000AD5300108D4B001CAD4B0018AD45000007
71362+:106390008CCD000031AC00081180FFFD34CE0E0022
71363+:1063A00095C3000800A0882100009021A783004029
71364+:1063B0008DC6000424130001AF860038976F0010CB
71365+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
71366+:1063D000AE85000093620008144000DD000000005C
71367+:1063E0000E0001E7240400108F900048004028218F
71368+:1063F0003C023200320600FF000654000142F8253C
71369+:1064000026090001AF890048ACBF0000937900095C
71370+:1064100097780012936F000A332800FF3303FFFFC1
71371+:106420000103382100076C0031EE00FF01AE60254A
71372+:10643000ACAC00048F840048978B0040316A200088
71373+:106440001140010AACA4000897640012308BFFFFD2
71374+:1064500006400108ACAB000C978E004031C5000827
71375+:1064600014A0000226280006262800023C1F8000F7
71376+:1064700037E70E0094F900148CE5001C8F670004C8
71377+:10648000937800023324FFFF330300FFAFA3001013
71378+:106490008F6F0014AFA800180E0001CBAFAF00142F
71379+:1064A000240400100E0001FB000000008E9200008A
71380+:1064B00016400005000000008F7800142403FFBF81
71381+:1064C0000303A024AF7400148F67000C00F5C821EB
71382+:1064D000AF79000C9375000816A0000800000000BA
71383+:1064E00012600006000000008F6800143C0AEFFFF5
71384+:1064F0003549FFFE0109F824AF7F0014A37300089B
71385+:106500008FA500200A00034F02202021AED10000F9
71386+:106510000A00022D3C03800014E0FF1E30BFA040A3
71387+:106520000E0001900000A0212E9100010237B0253D
71388+:1065300012C000188FBF00488F87003C24170F003F
71389+:1065400010F700D43C0680008CD901780720FFFEAC
71390+:10655000241F0F0010FF00F634CA0E008D560014E1
71391+:1065600034C7014024080240ACF600048D49001CE9
71392+:106570003C141000ACE90008A0E00012A4E0001AEE
71393+:10658000ACE00020A4E00018ACE80014ACD4017822
71394+:106590008FBF00488FB700448FB600408FB5003CD6
71395+:1065A0008FB400388FB300348FB200308FB1002C1D
71396+:1065B0008FB0002803E0000827BD00508F910038FD
71397+:1065C000978800403C1280000220A821310700403B
71398+:1065D00014E0FF7C00009821977900108F9200381A
71399+:1065E0003338FFFF131200A8000020210080A021F3
71400+:1065F000108000F300A088211620FECE00000000CD
71401+:106600000A00031F2E9100013C0380008C62017878
71402+:106610000440FFFE240808008F860000AC68017863
71403+:106620003C038000946D008A31ACFFFF0186582343
71404+:10663000256AFFFF31441FFF2C8900081520FFF950
71405+:10664000000000008F8F0048347040008F83003CB2
71406+:1066500000E0A021240E0F0025E70001AF870048CD
71407+:1066600000D03021023488233C08800031F500FF3F
71408+:10667000106E0005240700019398004233130001B7
71409+:106680000013924036470001001524003C0A010027
71410+:10669000008A4825ACC900008F82004830BF003610
71411+:1066A00030B90008ACC200041320009900FF9825FF
71412+:1066B00035120E009650000A8F8700003C0F8100B3
71413+:1066C0003203FFFF24ED000835060140006F60250E
71414+:1066D0003C0E100031AB1FFF269200062405000E71
71415+:1066E000ACCC0020026E9825A4C5001AAF8B000028
71416+:1066F000A4D20018162000083C1080008F89003CAE
71417+:1067000024020F00512200022417000136730040BA
71418+:106710000E0001883C10800036060E008CCB001461
71419+:10672000360A014002402021AD4B00048CC5001CFC
71420+:10673000AD450008A1550012AD5300140E0001989C
71421+:106740003C151000AE1501780A000352000000004D
71422+:10675000936F0009976E0012936D000B31E500FFF7
71423+:1067600000AE202131AC00FF008C80212602000AFF
71424+:106770003050FFFF0E0001E7020020218F86004805
71425+:106780003C0341003C05800024CB0001AF8B004856
71426+:10679000936A00099769001230C600FF315F00FF5D
71427+:1067A0003128FFFF03E8382124F900020006C40065
71428+:1067B0000319782501E37025AC4E00008F6D000CA5
71429+:1067C00034A40E00948B001401B26025AC4C00047C
71430+:1067D0008C85001C8F670004936A00023164FFFF00
71431+:1067E000314900FFAFA900108F680014AFB1001845
71432+:1067F0000E0001CBAFA800140A0002FD0200202108
71433+:10680000AF600004A36000029798004033082000A6
71434+:106810001500FEA300003021A760001297840040FD
71435+:10682000936B000A3C10800030931F0000135183CB
71436+:10683000014BA82126A20028A362000936090E00F8
71437+:10684000953F000C0A000295A77F00108F7000147E
71438+:10685000360900400E000188AF6900140A0002C921
71439+:10686000000000000A00034F000020210641FEFA4C
71440+:10687000ACA0000C8CAC000C3C0D8000018D902570
71441+:106880000A0002EAACB2000C000090210A0002C526
71442+:1068900024130001128000073C028000344B0E00DC
71443+:1068A0009566000830D300401260004900000000E7
71444+:1068B0003C0680008CD001780600FFFE34C50E0037
71445+:1068C00094B500103C03050034CC014032B8FFFF02
71446+:1068D00003039025AD92000C8CAF0014240D200012
71447+:1068E0003C041000AD8F00048CAE001CAD8E00087F
71448+:1068F000A1800012A580001AAD800020A58000189C
71449+:10690000AD8D0014ACC401780A0003263C0680005B
71450+:106910008F9F0000351801402692000227F90008D9
71451+:1069200033281FFFA71200180A000391AF88000048
71452+:106930003C02800034450140ACA0000C1280001BDA
71453+:1069400034530E0034510E008E370010ACB70004E3
71454+:106950008E2400183C0B8000ACA400083570014068
71455+:1069600024040040A20000128FBF0048A600001AB5
71456+:106970008FB70044AE0000208FB60040A60000187C
71457+:106980008FB5003CAE0400148FB400388FB30034D0
71458+:106990008FB200308FB1002C8FB000283C02100065
71459+:1069A00027BD005003E00008AD6201788E66001438
71460+:1069B000ACA600048E64001C0A00042A3C0B800074
71461+:1069C0000E0001902E9100010A0003200237B0252D
71462+:1069D000000000000000000D00000000240003691A
71463+:1069E0000A0004013C06800027BDFFD8AFBF00208D
71464+:1069F0003C0980003C1F20FFAFB200183C0760003C
71465+:106A000035320E002402001037F9FFFDACE23008E9
71466+:106A1000AFB3001CAFB10014AFB00010AE5900000E
71467+:106A20000000000000000000000000000000000066
71468+:106A3000000000003C1800FF3713FFFDAE530000BC
71469+:106A40003C0B60048D7050002411FF7F3C0E00024F
71470+:106A50000211782435EC380C35CD0109ACED4C1819
71471+:106A6000240A0009AD6C50008CE80438AD2A0008F7
71472+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
71473+:106A800000051E023062000F2486C0B310400007CC
71474+:106A9000AF8200088CE54C1C3C09001F3528FC0027
71475+:106AA00000A81824000321C2AF8400048CF1080858
71476+:106AB0003C0F57092412F0000232702435F0001008
71477+:106AC00001D0602601CF68262DAA00012D8B000180
71478+:106AD000014B382550E00009A380000C3C1F601CCE
71479+:106AE0008FF8000824190001A399000C33137C00CF
71480+:106AF000A7930010A780000EA380000DAF80004870
71481+:106B000014C00003AF8000003C066000ACC0442C01
71482+:106B10000E0005B93C1080000E000F1A361101005E
71483+:106B20003C12080026523DD03C13080026733E500C
71484+:106B30008E03000038640001308200011440FFFC25
71485+:106B40003C0B800A8E2600002407FF8024C90240E7
71486+:106B5000312A007F014B402101272824AE06002066
71487+:106B6000AF880044AE0500243C048000AF86003CA2
71488+:106B70008C8C01780580FFFE24180800922F0008F5
71489+:106B8000AC980178A38F0042938E004231CD000172
71490+:106B900011A0000F24050D0024DFF8002FF90301D8
71491+:106BA0001320001C000629C224A4FFF00004104298
71492+:106BB000000231400E00020200D2D8213C02400007
71493+:106BC0003C068000ACC201380A0004A000000000AE
71494+:106BD00010C50023240D0F0010CD00273C1F800896
71495+:106BE00037F9008093380000240E0050330F00FF67
71496+:106BF00015EEFFF33C0240000E000A3600000000D4
71497+:106C00003C0240003C068000ACC201380A0004A0EF
71498+:106C1000000000008F83000400A3402B1500000B30
71499+:106C20008F8B0008006B50212547FFFF00E5482BA4
71500+:106C30001520000600A36023000C19400E0002027C
71501+:106C40000073D8210A0004C43C0240000000000D7B
71502+:106C50000E000202000000000A0004C43C024000D2
71503+:106C60003C1B0800277B3F500E0002020000000082
71504+:106C70000A0004C43C0240003C1B0800277B3F7014
71505+:106C80000E000202000000000A0004C43C024000A2
71506+:106C90003C0660043C09080025290104ACC9502CBD
71507+:106CA0008CC850003C0580003C0200023507008083
71508+:106CB000ACC750003C040800248415A43C03080021
71509+:106CC0002463155CACA50008ACA2000C3C010800D4
71510+:106CD000AC243D603C010800AC233D6403E00008A7
71511+:106CE0002402000100A030213C1C0800279C3D68C4
71512+:106CF0003C0C04003C0B0002008B3826008C402624
71513+:106D00002CE200010007502B2D050001000A4880ED
71514+:106D10003C03080024633D60004520250123182121
71515+:106D20001080000300001021AC6600002402000166
71516+:106D300003E00008000000003C1C0800279C3D68A0
71517+:106D40003C0B04003C0A0002008A3026008B3826E7
71518+:106D50002CC200010006482B2CE5000100094080F0
71519+:106D60003C03080024633D600045202501031821F1
71520+:106D700010800005000010213C0C0800258C155CDB
71521+:106D8000AC6C00002402000103E0000800000000D9
71522+:106D90003C0900023C08040000883026008938269F
71523+:106DA0002CC30001008028212CE400010083102561
71524+:106DB0001040000B000030213C1C0800279C3D685F
71525+:106DC0003C0A80008D4E00082406000101CA682597
71526+:106DD000AD4D00088D4C000C01855825AD4B000CC5
71527+:106DE00003E0000800C010213C1C0800279C3D68FF
71528+:106DF0003C0580008CA6000C000420272402000122
71529+:106E000000C4182403E00008ACA3000C3C020002FC
71530+:106E10001082000B3C0560003C0704001087000353
71531+:106E20000000000003E00008000000008CA908D06A
71532+:106E3000240AFFFD012A402403E00008ACA808D082
71533+:106E40008CA408D02406FFFE0086182403E0000866
71534+:106E5000ACA308D03C05601A34A600108CC3008097
71535+:106E600027BDFFF88CC50084AFA3000093A40000E9
71536+:106E70002402000110820003AFA5000403E0000813
71537+:106E800027BD000893A7000114E0001497AC00028E
71538+:106E900097B800023C0F8000330EFFFC01CF682141
71539+:106EA000ADA50000A3A000003C0660008CC708D080
71540+:106EB0002408FFFE3C04601A00E82824ACC508D072
71541+:106EC0008FA300048FA200003499001027BD000892
71542+:106ED000AF22008003E00008AF2300843C0B800059
71543+:106EE000318AFFFC014B48218D2800000A00057DF6
71544+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
71545+:106F0000279C3D683C0580008CA4000C8CA20004EA
71546+:106F10003C0300020044282410A0000A00A3182407
71547+:106F20003C0604003C0400021460000900A6102482
71548+:106F30001440000F3C0404000000000D3C1C08003D
71549+:106F4000279C3D688FBF001003E0000827BD001894
71550+:106F50003C0208008C423D600040F809000000003F
71551+:106F60003C1C0800279C3D680A0005A68FBF001046
71552+:106F70003C0208008C423D640040F809000000001B
71553+:106F80000A0005AC00000000000411C003E0000886
71554+:106F9000244202403C04080024843FB42405001A23
71555+:106FA0000A00009C0000302127BDFFE0AFB00010B8
71556+:106FB0003C108000AFBF0018AFB1001436110100C3
71557+:106FC000922200090E0005B63044007F8E3F00007B
71558+:106FD0008F89003C3C0F008003E26021258800403F
71559+:106FE0000049F821240DFF80310E00783198007897
71560+:106FF00035F9000135F100020319382501D1482582
71561+:10700000010D302403ED5824018D2824240A00406A
71562+:1070100024040080240300C0AE0B0024AE0008103E
71563+:10702000AE0A0814AE040818AE03081CAE05080426
71564+:10703000AE070820AE060808AE0908243609090084
71565+:107040009539000C3605098033ED007F3338FFFF9A
71566+:10705000001889C0AE110800AE0F0828952C000C4E
71567+:107060008FBF00188FB10014318BFFFF000B51C090
71568+:10707000AE0A002C8CA400508FB000108CA3003CF2
71569+:107080008D2700048CA8001C8CA600383C0E800ABA
71570+:1070900001AE102127BD0020AF820044AF84005014
71571+:1070A000AF830054AF87004CAF88005C03E000085A
71572+:1070B000AF8600603C09080091293FD924A800024E
71573+:1070C0003C05110000093C0000E8302500C51825EA
71574+:1070D00024820008AC83000003E00008AC800004B8
71575+:1070E0003C098000352309009128010B906A0011AA
71576+:1070F0002402002800804821314700FF00A07021B1
71577+:1071000000C068213108004010E20002340C86DD26
71578+:10711000240C08003C0A800035420A9A944700007B
71579+:10712000354B0A9C35460AA030F9FFFFAD39000007
71580+:107130008D780000354B0A8024040001AD3800042E
71581+:107140008CCF0000AD2F00089165001930A300031B
71582+:107150001064009028640002148000AF240500022F
71583+:107160001065009E240F0003106F00B435450AA47B
71584+:10717000240A0800118A0048000000005100003D68
71585+:107180003C0B80003C0480003483090090670012AF
71586+:1071900030E200FF004D7821000FC8802724000155
71587+:1071A0003C0A8000354F090091E50019354C0980F3
71588+:1071B0008D87002830A300FF0003150000475825E5
71589+:1071C0000004C4003C19600001793025370806FF2F
71590+:1071D000AD260000AD2800048DEA002C25280028EB
71591+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
71592+:1071F000AD2500108DE400383C05800034AC093C1E
71593+:10720000AD2400148DE3001CAD2300188DE7002091
71594+:10721000AD27001C8DE20024AD2200208DF900284E
71595+:1072200034A20100AD3900248D830000AD0E0004AE
71596+:1072300034B90900AD0300008C47000C250200148E
71597+:10724000AD070008932B00123C04080090843FD83F
71598+:10725000AD000010317800FF030D302100064F0013
71599+:1072600000047C00012F702535CDFFFC03E00008F1
71600+:10727000AD0D000C35780900930600123C0508009E
71601+:1072800094A53FC830C800FF010D5021000A60805E
71602+:107290000A00063C018520211500005B000000006B
71603+:1072A0003C08080095083FCE3C06080094C63FC83D
71604+:1072B000010610213C0B800035790900933800113C
71605+:1072C000932A001935660A80330800FF94CF002AFC
71606+:1072D00000086082314500FF978A0058000C1E00AC
71607+:1072E000000524003047FFFF006410250047C0253B
71608+:1072F00001EA30213C0B4000030B402500066400EE
71609+:10730000AD280000AD2C0004932500183C030006B6
71610+:107310002528001400053E0000E31025AD220008DA
71611+:107320008F24002C3C05800034AC093CAD24000CBB
71612+:107330008F38001C34A20100254F0001AD38001029
71613+:107340008D830000AD0E000431EB7FFFAD03000024
71614+:107350008C47000C34B90900A78B0058AD07000812
71615+:10736000932B00123C04080090843FD8250200149F
71616+:10737000317800FF030D302100064F0000047C002F
71617+:10738000012F702535CDFFFCAD00001003E0000893
71618+:10739000AD0D000C3C02080094423FD23C050800B1
71619+:1073A00094A53FC835440AA43C07080094E73FC4AD
71620+:1073B000948B00000045C8210327C023000B1C004C
71621+:1073C0002706FFF200665025AD2A000CAD20001004
71622+:1073D000AD2C00140A00063025290018354F0AA4E8
71623+:1073E00095E50000956400280005140000043C00A9
71624+:1073F0003459810000EC5825AD39000CAD2B00103C
71625+:107400000A000630252900143C0C0800958C3FCE5C
71626+:107410000A000681258200015460FF56240A0800F4
71627+:1074200035580AA49706000000061C00006C502581
71628+:10743000AD2A000C0A000630252900103C03080084
71629+:1074400094633FD23C07080094E73FC83C0F080014
71630+:1074500095EF3FC494A4000095790028006710219F
71631+:10746000004F582300041C00001934002578FFEE5B
71632+:1074700000D87825346A8100AD2A000CAD2F0010A9
71633+:10748000AD200014AD2C00180A0006302529001C80
71634+:1074900003E00008240207D027BDFFE0AFB20018C8
71635+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
71636+:1074B000008088218F8800548F87004C3C0580080D
71637+:1074C00034B20080011128213C1080002402008089
71638+:1074D000240300C000A72023AE0208183C06800841
71639+:1074E000AE03081C18800004AF850054ACC500042E
71640+:1074F0008CC90004AF89004C1220000936040980B1
71641+:107500000E0006F800000000924C00278E0B00745D
71642+:1075100001825004014B3021AE46000C3604098034
71643+:107520008C8E001C8F8F005C01CF682319A0000493
71644+:107530008FBF001C8C90001CAF90005C8FBF001CA4
71645+:107540008FB200188FB100148FB000100A00007EB7
71646+:1075500027BD00208F8600508F8300548F82004CFF
71647+:107560003C05800834A40080AC860050AC83003C0D
71648+:1075700003E00008ACA200043C0308008C63005444
71649+:1075800027BDFFF8308400FF2462000130A500FF12
71650+:107590003C010800AC22005430C600FF3C078000CC
71651+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
71652+:1075B0008FAA0000358BFFFF014B4824000627C02F
71653+:1075C00001244025AFA8000034E201009043000AE6
71654+:1075D000A3A000023C1980FFA3A300018FAF00000D
71655+:1075E00030AE007F3738FFFF01F86024000E6E00D8
71656+:1075F0003C0A002034E50140018D58253549200022
71657+:107600002406FF803C04100027BD0008ACAB000C32
71658+:10761000ACA90014A4A00018A0A6001203E0000862
71659+:10762000ACE40178308800FF30A700FF3C03800005
71660+:107630008C6201780440FFFE3C0C8000358A0A0011
71661+:107640008D4B00203584014035850980AC8B0004CA
71662+:107650008D4900240007302B00061540AC89000836
71663+:10766000A088001090A3004CA083002D03E0000828
71664+:10767000A480001827BDFFE8308400FFAFBF0010D2
71665+:107680000E00075D30A500FF8F8300548FBF0010F0
71666+:107690003C06800034C50140344700402404FF907C
71667+:1076A0003C02100027BD0018ACA3000CA0A40012DF
71668+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
71669+:1076C0003C088008AFBF001CAFB20018AFB1001477
71670+:1076D000AFB00010351000808E0600183C07800007
71671+:1076E000309200FF00C72025AE0400180E00007C79
71672+:1076F00030B100FF92030005346200080E00007EE6
71673+:10770000A2020005024020210E000771022028215C
71674+:10771000024020218FBF001C8FB200188FB10014CF
71675+:107720008FB0001024050005240600010A0007326E
71676+:1077300027BD00203C05800034A309809066000826
71677+:1077400030C200081040000F3C0A01013549080A08
71678+:10775000AC8900008CA80074AC8800043C070800C9
71679+:1077600090E73FD830E5001050A00008AC8000083A
71680+:107770003C0D800835AC00808D8B0058AC8B000828
71681+:107780002484000C03E00008008010210A0007B5E3
71682+:107790002484000C27BDFFE83C098000AFB0001036
71683+:1077A000AFBF00143526098090C8000924020006E6
71684+:1077B00000A05821310300FF3527090000808021F7
71685+:1077C000240500041062007B2408000294CF005CB2
71686+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
71687+:1077E00090CA00083144002010800008000000000A
71688+:1077F00090C2004E3C1F010337F90300305800FFD0
71689+:107800000319302524050008AE06000490F9001184
71690+:1078100090E6001290E40011333800FF00187082E7
71691+:1078200030CF00FF01CF5021014B6821308900FF8C
71692+:1078300031AAFFFF39230028000A60801460002C61
71693+:10784000020C482390E400123C198000372F0100FD
71694+:10785000308C00FF018B1821000310800045F821B7
71695+:10786000001F8400360706FFAD270004373F0900DC
71696+:1078700093EC001193EE0012372609800005C082B8
71697+:107880008DE4000C8CC5003431CD00FF01AB10211C
71698+:107890000058182100A4F8230008840000033F00CA
71699+:1078A00000F0302533F9FFFF318F00FC00D970253F
71700+:1078B0000158202101E9682100045080ADAE000C80
71701+:1078C0000E00007C012A80213C088008240B000463
71702+:1078D000350500800E00007EA0AB000902001021DB
71703+:1078E0008FBF00148FB0001003E0000827BD001800
71704+:1078F00090EC001190E300193C18080097183FCE57
71705+:10790000318200FF0002F882307000FF001FCE00BD
71706+:1079100000103C000327302500D870253C0F4000A4
71707+:1079200001CF68253C198000AD2D0000373F0900CC
71708+:1079300093EC001193EE0012372F010037260980D7
71709+:107940000005C0828DE4000C8CC5003431CD00FFF1
71710+:1079500001AB10210058182100A4F823000884006E
71711+:1079600000033F0000F0302533F9FFFF318F00FCAA
71712+:1079700000D970250158202101E9682100045080B8
71713+:10798000ADAE000C0E00007C012A80213C0880086E
71714+:10799000240B0004350500800E00007EA0AB00091A
71715+:1079A000020010218FBF00148FB0001003E0000808
71716+:1079B00027BD00180A0007C72408001227BDFFD002
71717+:1079C0003C038000AFB60028AFB50024AFB4002060
71718+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
71719+:1079E000AFB000103467010090E6000B309400FF48
71720+:1079F00030B500FF30C200300000B02110400099C7
71721+:107A000000008821346409809088000800082E0056
71722+:107A100000051E03046000C0240400048F86005487
71723+:107A20003C010800A0243FD83C0C8000AD800048F9
71724+:107A30003C048000348E010091CD000B31A5002064
71725+:107A400010A000073C078000349309809272000860
71726+:107A50000012860000107E0305E000C43C1F800871
71727+:107A600034EC0100918A000B34EB09809169000825
71728+:107A7000314400400004402B3123000800C8982303
71729+:107A80001460000224120003000090213C108000CA
71730+:107A900036180A8036040900970E002C90830011D6
71731+:107AA0009089001293050018307F00FF312800FFF5
71732+:107AB000024810210002C880930D0018033F78216E
71733+:107AC00001F1302130B100FF00D11821A78E0058FC
71734+:107AD0003C010800A4263FCE3C010800A4233FD06F
71735+:107AE00015A00002000000000000000D920B010B29
71736+:107AF0003065FFFF3C010800A4233FD2316A0040FB
71737+:107B00003C010800A4203FC83C010800A4203FC459
71738+:107B10001140000224A4000A24A4000B3091FFFFAE
71739+:107B20000E0001E7022020219206010B3C0C080008
71740+:107B3000958C3FD2004020210006698231A70001C8
71741+:107B40000E00060101872821004020210260282123
71742+:107B50000E00060C024030210E0007A1004020213B
71743+:107B600016C00069004020219212010B32560040DD
71744+:107B700012C000053C0500FF8C93000034AEFFFFEF
71745+:107B8000026E8024AC9000000E0001FB0220202138
71746+:107B90003C0F080091EF3FD831F10003122000168E
71747+:107BA0003C1380088F8200543C09800835280080EF
71748+:107BB000245F0001AD1F003C3C0580088CB9000427
71749+:107BC00003E02021033FC0231B000002AF9F0054AD
71750+:107BD0008CA400040E0006F8ACA400043C0780004E
71751+:107BE0008CEB00743C04800834830080004B5021EF
71752+:107BF000AC6A000C3C1380083670008002802021A3
71753+:107C000002A02821A200006B0E00075D3C1480003A
71754+:107C10008F920054368C0140AD92000C8F86004844
71755+:107C20003C151000344D000624D60001AF960048E4
71756+:107C30008FBF002CA18600128FB60028AD8D0014D6
71757+:107C40008FB3001CAE9501788FB200188FB5002459
71758+:107C50008FB400208FB100148FB0001003E0000833
71759+:107C600027BD003034640980908F0008000F760033
71760+:107C7000000E6E0305A00033347F090093F8001B4B
71761+:107C8000241900103C010800A0393FD8331300022A
71762+:107C90001260FF678F8600548F8200601446FF6574
71763+:107CA0003C0480000E00007C000000003C048008C2
71764+:107CB0003485008090A8000924060016310300FFD7
71765+:107CC0001066000D0000000090AB00093C070800A2
71766+:107CD00090E73FD824090008316400FF34EA00012E
71767+:107CE0003C010800A02A3FD81089002F240C000A6C
71768+:107CF000108C00282402000C0E00007E0000000002
71769+:107D00000A0008608F8600540E0007B9024028213F
71770+:107D10000A0008AE004020213C0B8008356A008034
71771+:107D20008D4600548CE9000C1120FF3DAF860054B5
71772+:107D3000240700143C010800A0273FD80A00085F70
71773+:107D40003C0C800090910008241200023C010800C5
71774+:107D5000A0323FD8323000201200000B2416000160
71775+:107D60008F8600540A0008602411000837F800804C
71776+:107D70008F020038AFE200048FF90004AF19003C15
71777+:107D80000A00086C3C0780008F8600540A000860D7
71778+:107D900024110004A0A200090E00007E00000000D3
71779+:107DA0000A0008608F860054240200140A00093A71
71780+:107DB000A0A2000927BDFFE8AFB000103C10800072
71781+:107DC000AFBF001436020100904400090E00075DA9
71782+:107DD000240500013C0480089099000E3483008043
71783+:107DE000909F000F906F00269089000A33F800FFE3
71784+:107DF00000196E000018740031EC00FF01AE502530
71785+:107E0000000C5A00014B3825312800FF3603014091
71786+:107E10003445600000E830252402FF813C04100056
71787+:107E2000AC66000C8FBF0014AC650014A062001299
71788+:107E3000AE0401788FB0001003E0000827BD0018E1
71789+:107E400027BDFFE8308400FFAFBF00100E00075DC4
71790+:107E500030A500FF3C05800034A4014034470040B9
71791+:107E60002406FF92AC870014A08600128F83005472
71792+:107E70008FBF00103C02100027BD0018AC83000C1F
71793+:107E800003E00008ACA2017827BDFFD8AFB0001016
71794+:107E9000308400FF30B000FF3C058000AFB100141B
71795+:107EA000AFBF0020AFB3001CAFB20018000410C277
71796+:107EB00034A60100320300023051000114600007B3
71797+:107EC00090D200093C098008353300809268000593
71798+:107ED0003107000810E0000C308A00100240202119
71799+:107EE0000E00078302202821240200018FBF0020FA
71800+:107EF0008FB3001C8FB200188FB100148FB0001028
71801+:107F000003E0000827BD00281540003434A50A000E
71802+:107F10008CB800248CAF0008130F004B00003821F0
71803+:107F20003C0D800835B30080926C00682406000286
71804+:107F3000318B00FF116600843C06800034C20100D2
71805+:107F40009263004C90590009307F00FF53F9000400
71806+:107F50003213007C10E00069000000003213007C46
71807+:107F60005660005C0240202116200009320D0001FD
71808+:107F70003C0C800035840100358B0A008D6500249F
71809+:107F80008C86000414A6FFD900001021320D0001D8
71810+:107F900011A0000E024020213C1880003710010083
71811+:107FA0008E0F000C8F8E005011EE000800000000B4
71812+:107FB0000E000843022028218E19000C3C1F800867
71813+:107FC00037F00080AE190050024020210E000771EA
71814+:107FD000022028210A00098F240200013C05080024
71815+:107FE0008CA5006424A400013C010800AC240064BA
71816+:107FF0001600000D00000000022028210E0007716D
71817+:1080000002402021926E0068240C000231CD00FF56
71818+:1080100011AC0022024020210E00094100000000A6
71819+:108020000A00098F240200010E00007024040001E0
71820+:10803000926B0025020B30250E00007EA266002503
71821+:108040000A0009D3022028218E6200188CDF000468
71822+:108050008CB9002400021E0217F9FFB13065007FC1
71823+:108060009268004C264400013093007F1265004066
71824+:10807000310300FF1464FFAB3C0D8008264700016C
71825+:1080800030F1007F30E200FF1225000B24070001D1
71826+:10809000004090210A00099C2411000124050004DD
71827+:1080A0000E000732240600010E0009410000000006
71828+:1080B0000A00098F240200012405FF8002452024C4
71829+:1080C00000859026324200FF004090210A00099C62
71830+:1080D000241100010E00084302202821320700303D
71831+:1080E00010E0FFA132100082024020210E00078321
71832+:1080F000022028210A00098F240200018E6900183D
71833+:108100000240202102202821012640250E0009647A
71834+:10811000AE6800189264004C240500032406000198
71835+:108120000E000732308400FF0E00007024040001AE
71836+:1081300092710025021150250E00007EA26A0025D2
71837+:108140000A00098F240200018E6F00183C1880007D
71838+:108150000240202101F87025022028210E0007711D
71839+:10816000AE6E00189264004C0A000A1B240500043D
71840+:10817000324A0080394900801469FF6A3C0D80084A
71841+:108180000A0009F42647000127BDFFC0AFB0001860
71842+:108190003C108000AFBF0038AFB70034AFB600303E
71843+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
71844+:1081B0000E0005BEAFB1001C360201009045000B59
71845+:1081C0000E00097690440008144000E78FBF003885
71846+:1081D0003C08800835070080A0E0006B3606098067
71847+:1081E00090C50000240300503C17080026F73F907C
71848+:1081F00030A400FF3C13080026733FA01083000347
71849+:108200003C1080000000B82100009821241F0010BD
71850+:108210003611010036120A00361509808E580024E6
71851+:108220008E3400048EAF00208F8C00543C01080077
71852+:10823000A03F3FD836190A80972B002C8EF60000FD
71853+:10824000932A00180298702301EC68233C0108006F
71854+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
71855+:10826000AC2C3FDCA78B005802C0F809315400FF4A
71856+:1082700030490002152000E930420001504000C49E
71857+:108280009227000992A90008312800081500000271
71858+:10829000241500030000A8213C0A80003543090092
71859+:1082A00035440A008C8D00249072001190700012E9
71860+:1082B000907F0011325900FF321100FF02B11021EE
71861+:1082C0000002C08033EF00FF0319B021028F70213C
71862+:1082D00002D4602125CB00103C010800A4363FCE1B
71863+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
71864+:1082F0003C010800A42B3FCC3556010035540980C1
71865+:1083000035510E008F8700548F89005C8E850020C8
71866+:1083100024080006012730233C010800AC283FD484
71867+:1083200000A7282304C000B50000902104A000B3DA
71868+:1083300000C5502B114000B5000000003C010800B2
71869+:10834000AC263FB88E6200000040F8090000000033
71870+:108350003046000214C0007400408021304B000100
71871+:10836000556000118E6200043C0D08008DAD3FBCCD
71872+:108370003C0EC0003C04800001AE6025AE2C000025
71873+:108380008C980000330F000811E0FFFD0000000092
71874+:10839000963F000824120001A79F00408E39000478
71875+:1083A000AF9900388E6200040040F8090000000018
71876+:1083B0000202802532030002146000B300000000B6
71877+:1083C0003C09080095293FC43C06080094C63FD0EC
71878+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
71879+:1083E000012670213C0308008C633FE03C08080034
71880+:1083F00095083FDA01CA20218ED9000C00E9282116
71881+:10840000249F000200A878210067C02133E4FFFF09
71882+:10841000AF9900503C010800AC383FE03C01080037
71883+:10842000A42F3FC83C010800A42E3FD20E0001E754
71884+:10843000000000008F8D0048004020213C01080012
71885+:10844000A02D3FD98E62000825AC0001AF8C0048FA
71886+:108450000040F809000000008F85005402A0302180
71887+:108460000E00060C004020210E0007A10040202134
71888+:108470008E6B000C0160F809004020213C0A0800C6
71889+:10848000954A3FD23C06080094C63FC601464821A3
71890+:10849000252800020E0001FB3104FFFF3C05080007
71891+:1084A0008CA53FB43C0708008CE73FBC00A7202305
71892+:1084B0003C010800AC243FB414800006000000001A
71893+:1084C0003C0208008C423FD4344B00403C01080081
71894+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
71895+:1084E0008F920044AE4D00208E2C0018AE4C00241C
71896+:1084F0003C04080094843FC80E0006FA0000000007
71897+:108500008F9F00548E6700103C010800AC3F3FDC99
71898+:1085100000E0F809000000003C1908008F393FB462
71899+:108520001720FF798F870054979300583C11800ED5
71900+:10853000321601000E000729A633002C16C0004594
71901+:10854000320300105460004C8EE5000432080040F5
71902+:108550005500001D8EF000088EE4000C0080F80924
71903+:10856000000000008FBF00388FB700348FB6003096
71904+:108570008FB5002C8FB400288FB300248FB2002059
71905+:108580008FB1001C8FB0001803E0000827BD004029
71906+:108590008F86003C36110E0000072E0000A6202515
71907+:1085A000AE0400808E4300208E500024AFA3001044
71908+:1085B000AE2300148FB20010AE320010AE30001C9B
71909+:1085C0000A000A75AE3000180200F8090000000029
71910+:1085D0008EE4000C0080F809000000000A000B2E59
71911+:1085E0008FBF003824180001240F0001A5C000200F
71912+:1085F000A5D800220A000B10ADCF00243C010800D2
71913+:10860000AC203FB80A000AA68E6200003C010800B8
71914+:10861000AC253FB80A000AA68E6200009224000929
71915+:108620000E000771000028218FBF00388FB700347B
71916+:108630008FB600308FB5002C8FB400288FB3002484
71917+:108640008FB200208FB1001C8FB0001803E000082B
71918+:1086500027BD00403C1480009295010900002821AC
71919+:108660000E00084332A400FF320300105060FFB830
71920+:10867000320800408EE5000400A0F8090000000068
71921+:108680000A000B28320800405240FFA89793005878
71922+:108690008E3400148F930044AE7400208E35001C7D
71923+:1086A000AE7500240A000B1F979300588F820014A8
71924+:1086B0000004218003E00008008210213C078008AC
71925+:1086C00034E200809043006900804021106000097E
71926+:1086D0003C0401003C0708008CE73FDC8F8300303E
71927+:1086E00000E32023048000089389001C14E30003A6
71928+:1086F0000100202103E00008008010213C0401005B
71929+:1087000003E00008008010211120000B00673823CF
71930+:108710003C0D800035AC0980918B007C316A0002F1
71931+:10872000114000202409003400E9702B15C0FFF12E
71932+:108730000100202100E938232403FFFC00A3C82402
71933+:1087400000E3C02400F9782B15E0FFEA030820219C
71934+:1087500030C400030004102314C000143049000387
71935+:108760000000302100A9782101E6702100EE682B7D
71936+:1087700011A0FFE03C0401002D3800010006C82BC9
71937+:10878000010548210319382414E0FFDA2524FFFCF1
71938+:108790002402FFFC00A218240068202103E0000846
71939+:1087A000008010210A000B9E240900303C0C800040
71940+:1087B0003586098090CB007C316A00041540FFE9C2
71941+:1087C000240600040A000BAD000030213C03080021
71942+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
71943+:1087E000AFB1001410620005AFB00010000329C043
71944+:1087F00024A40280AF840014AF8300183C108000D2
71945+:1088000036020A0094450032361101000E000B7F3B
71946+:1088100030A43FFF8E240000241FFF803C11008005
71947+:108820000082C021031F60243309007F000CC9406F
71948+:1088300003294025330E0078362F00033C0D10002D
71949+:10884000010D502501CF5825AE0C002836080980AF
71950+:10885000AE0C080CAE0B082CAE0A08309103006970
71951+:108860003C06800C0126382110600006AF870034DA
71952+:108870008D09003C8D03006C0123382318E0008231
71953+:10888000000000003C0B8008356A00803C1080002E
71954+:10889000A1400069360609808CC200383C06800081
71955+:1088A00034C50A0090A8003C310C00201180001A49
71956+:1088B000AF820030240D00013C0E800035D10A004B
71957+:1088C000A38D001CAF8000248E2400248F850024FB
71958+:1088D000240D0008AF800020AF8000283C01080074
71959+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
71960+:1088F000000030219228003C8FBF00188FB1001477
71961+:108900008FB0001000086142AF82002C27BD00200C
71962+:1089100003E000083182000190B80032240E00010B
71963+:10892000330F00FF000F2182108E00412419000236
71964+:108930001099006434C40AC03C03800034640A0007
71965+:108940008C8F002415E0001E34660900909F0030D3
71966+:108950002418000533F9003F1338004E24030001AA
71967+:108960008F860020A383001CAF860028AF860024DA
71968+:108970003C0E800035D10A008E2400248F8500240F
71969+:10898000240D00083C010800A42D3FC63C0108004E
71970+:10899000A4203FDA0E000B83000000009228003C68
71971+:1089A0008FBF00188FB100148FB000100008614213
71972+:1089B000AF82002C27BD002003E0000831820001B7
71973+:1089C0008C8A00088C8B00248CD000643C0E8000C4
71974+:1089D00035D10A00014B2823AF900024A380001C4E
71975+:1089E000AF8500288E2400248F8600208F850024E8
71976+:1089F000240D00083C010800A42D3FC63C010800DE
71977+:108A0000A4203FDA0E000B83000000009228003CF7
71978+:108A10008FBF00188FB100148FB0001000086142A2
71979+:108A2000AF82002C27BD002003E000083182000146
71980+:108A300090A200303051003F5224002834C50AC0B3
71981+:108A40008CB000241600002234CB09008CA600480C
71982+:108A50003C0A7FFF3545FFFF00C510243C0E800017
71983+:108A6000AF82002035C509008F8800208CAD0060E2
71984+:108A7000010D602B15800002010020218CA40060F4
71985+:108A80000A000C22AF8400208D02006C0A000BFC4F
71986+:108A90003C0680008C8200488F8600203C097FFFC6
71987+:108AA0003527FFFF004788243C0480082403000189
71988+:108AB000AF910028AC80006CA383001C0A000C302E
71989+:108AC000AF8600248C9F00140A000C22AF9F002068
71990+:108AD0008D6200680A000C6C3C0E800034C4098072
71991+:108AE0008C8900708CA300140123382B10E0000443
71992+:108AF000000000008C8200700A000C6C3C0E8000AC
71993+:108B00008CA200140A000C6C3C0E80008F8500249F
71994+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
71995+:108B2000AFB000103C04800034870A0090E60030AB
71996+:108B30002402000530C3003F106200B934840900EC
71997+:108B40008F91002000A080213C048000348E0A0018
71998+:108B50008DCD00043C0608008CC63FB831A73FFF0E
71999+:108B600000E6602B5580000100E03021938F001C4F
72000+:108B700011E0007800D0282B349F098093F9007C05
72001+:108B800033380002130000792403003400C3102B93
72002+:108B9000144000D90000000000C3302300D0282B6F
72003+:108BA0003C010800A4233FC414A0006E0200182159
72004+:108BB0003C0408008C843FB40064402B5500000145
72005+:108BC000006020213C05800034A90A00912A003C65
72006+:108BD0003C010800AC243FBC31430020146000037A
72007+:108BE0000000482134AB0E008D6900188F88002CDE
72008+:108BF0000128202B1080005F000000003C050800C9
72009+:108C00008CA53FBC00A96821010D602B1180005C80
72010+:108C100000B0702B0109382300E028213C01080036
72011+:108C2000AC273FBC12000003240AFFFC10B0008DEB
72012+:108C30003224000300AA18243C010800A4203FDAD3
72013+:108C40003C010800AC233FBC006028218F84002435
72014+:108C5000120400063C0B80088D6C006C0200202181
72015+:108C6000AF91002025900001AD70006C8F8D002821
72016+:108C700000858823AF91002401A52023AF8400281C
72017+:108C80001220000224070018240700103C18800856
72018+:108C90003706008090CF00683C010800A0273FD82D
72019+:108CA0002407000131EE00FF11C70047000000005B
72020+:108CB00014800018000028213C06800034D109806F
72021+:108CC00034CD010091A600098E2C001824C40001A7
72022+:108CD000000C86023205007F308B007F1165007F1B
72023+:108CE0002407FF803C19800837290080A124004C0C
72024+:108CF0003C0808008D083FD4241800023C010800FD
72025+:108D0000A0384019350F00083C010800AC2F3FD4B3
72026+:108D1000240500103C02800034440A009083003C8B
72027+:108D2000307F002013E0000500A02021240A00016C
72028+:108D30003C010800AC2A3FBC34A400018FBF0018DE
72029+:108D40008FB100148FB000100080102103E00008E4
72030+:108D500027BD00203C010800A4203FC410A0FF94C0
72031+:108D6000020018210A000CC000C018210A000CB72C
72032+:108D7000240300303C0508008CA53FBC00B0702BDC
72033+:108D800011C0FFA8000000003C19080097393FC43B
72034+:108D90000325C0210307782B11E000072CAA00044B
72035+:108DA0003C0360008C625404305F003F17E0FFE337
72036+:108DB000240400422CAA00041140FF9A240400421B
72037+:108DC0000A000D248FBF00181528FFB9000000000D
72038+:108DD0008CCA00183C1F800024020002015F182585
72039+:108DE000ACC3001837F90A00A0C200689329003C00
72040+:108DF0002404000400A01021312800203C010800B8
72041+:108E0000A0244019110000022405001024020001D2
72042+:108E10003C010800AC223FB40A000D1A3C0280005D
72043+:108E20008F8800288C8900600109282B14A000027B
72044+:108E3000010088218C9100603C048000348B0E007E
72045+:108E40008D640018240A000102202821022030210C
72046+:108E5000A38A001C0E000B83022080210A000CA6AE
72047+:108E6000AF82002C00045823122000073164000355
72048+:108E70003C0E800035C7098090ED007C31AC0004C9
72049+:108E800015800019248F00043C010800A4243FDA57
72050+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
72051+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
72052+:108EB0002404004230A200031440000200A2182340
72053+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
72054+:108ED000A4203FDA0A000CE70060282100C77024B4
72055+:108EE0000A000D0D01C720263C010800A42F3FDA1F
72056+:108EF0000A000D78000000003C010800AC203FBCD7
72057+:108F00000A000D23240400428F8300283C058000C2
72058+:108F100034AA0A00146000060000102191470030B6
72059+:108F20002406000530E400FF108600030000000066
72060+:108F300003E0000800000000914B0048316900FF89
72061+:108F4000000941C21500FFFA3C0680083C040800F5
72062+:108F500094843FC43C0308008C633FDC3C19080048
72063+:108F60008F393FBC3C0F080095EF3FDA0064C02109
72064+:108F70008CCD00040319702101CF602134AB0E00A9
72065+:108F8000018D282318A0001D00000000914F004C07
72066+:108F90008F8C0034956D001031EE00FF8D89000438
72067+:108FA00001AE30238D8A000030CEFFFF000E290075
72068+:108FB0000125C82100003821014720210325182B55
72069+:108FC0000083C021AD990004AD980000918F000A84
72070+:108FD00001CF6821A18D000A956500128F8A0034A7
72071+:108FE000A5450008954B003825690001A5490038C2
72072+:108FF0009148000D35070008A147000D03E0000867
72073+:109000000000000027BDFFD8AFB000189388001CF7
72074+:109010008FB000143C0A80003C197FFF8F8700242A
72075+:109020003738FFFFAFBF0020AFB1001C355F0A002B
72076+:109030000218182493EB003C00087FC03C02BFFFDD
72077+:10904000006F60252CF000013449FFFF3C1F080031
72078+:109050008FFF3FDC8F9900303C18080097183FD2F3
72079+:1090600001897824001047803C07EFFF3C05F0FFA2
72080+:1090700001E818253C1180003169002034E2FFFF2F
72081+:1090800034ADFFFF362E098027A50010240600020C
72082+:1090900003F96023270B0002354A0E0000621824F2
72083+:1090A0000080802115200002000040218D48001C16
72084+:1090B000A7AB0012058000392407000030E800FF4C
72085+:1090C00000083F00006758253C028008AFAB001441
72086+:1090D000344F008091EA00683C08080091083FD9AD
72087+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
72088+:1090F00094423FCCA3A80011016CC024001FCF40B4
72089+:10910000031918258FA70010AFA300143C0C08000A
72090+:10911000918C3FDBA7A200168FAB001400ED482412
72091+:109120003C0F01003C0A0FFF012FC82531980003B6
72092+:10913000355FFFFF016D40243C027000033F38247F
72093+:1091400000181E0000E2482501037825AFAF001487
72094+:10915000AFA9001091CC007C0E000092A3AC0015CA
72095+:10916000362D0A0091A6003C30C400201080000675
72096+:10917000260200083C11080096313FC8262EFFFF4A
72097+:109180003C010800A42E3FC88FBF00208FB1001CF7
72098+:109190008FB0001803E0000827BD00288F8B002C3B
72099+:1091A000010B502B5540FFC5240700010A000E0497
72100+:1091B00030E800FF9383001C3C02800027BDFFD8ED
72101+:1091C00034480A0000805021AFBF002034460AC056
72102+:1091D000010028211060000E3444098091070030FE
72103+:1091E000240B00058F89002030EC003F118B000B11
72104+:1091F00000003821AFA900103C0B80088D69006C7D
72105+:10920000AFAA00180E00015AAFA90014A380001CD9
72106+:109210008FBF002003E0000827BD00288D1F0048F5
72107+:109220003C1808008F183FBC8F9900283C027FFF34
72108+:109230008D0800443443FFFFAFA900103C0B8008A9
72109+:109240008D69006C03E370240319782101CF682332
72110+:1092500001A83821AFAA00180E00015AAFA90014C6
72111+:109260000A000E58A380001C3C05800034A60A00AA
72112+:1092700090C7003C3C06080094C63FDA3C02080058
72113+:109280008C423FD430E30020000624001060001E12
72114+:10929000004438253C0880083505008090A300680C
72115+:1092A00000004821240800010000282124040001B6
72116+:1092B0003C0680008CCD017805A0FFFE34CF014034
72117+:1092C000ADE800083C0208008C423FDCA5E5000444
72118+:1092D000A5E40006ADE2000C3C04080090843FD9F0
72119+:1092E0003C03800834790080A1E40012ADE700144B
72120+:1092F000A5E900189338004C3C0E1000A1F8002D91
72121+:1093000003E00008ACCE017834A90E008D28001CC3
72122+:109310003C0C08008D8C3FBC952B0016952A001440
72123+:10932000018648213164FFFF0A000E803145FFFFAE
72124+:109330003C04800034830A009065003C30A2002089
72125+:109340001040001934870E00000040210000382131
72126+:10935000000020213C0680008CC901780520FFFE1A
72127+:1093600034CA014034CF010091EB0009AD48000838
72128+:109370003C0E08008DCE3FDC240DFF91240C0040F4
72129+:109380003C081000A5440004A5470006AD4E000CA3
72130+:10939000A14D0012AD4C0014A5400018A14B002DAA
72131+:1093A00003E00008ACC801788CE8001894E60012CD
72132+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
72133+:1093C0003C04800034830A009065003C30A20020F9
72134+:1093D0001040002727BDFFF82409000100003821B4
72135+:1093E000240800013C0680008CCA01780540FFFE7D
72136+:1093F0003C0280FF34C40100908D00093C0C080041
72137+:10940000918C4019A3AD00038FAB00003185007F24
72138+:109410003459FFFF01665025AFAA00009083000A6F
72139+:10942000A3A0000200057E00A3A300018FB80000E6
72140+:1094300034CB0140240C30000319702401CF68257F
72141+:10944000AD6D000C27BD0008AD6C0014A5600018C0
72142+:10945000AD690008A56700042409FF80A56800061F
72143+:109460003C081000A169001203E00008ACC80178B4
72144+:1094700034870E008CE9001894E6001294E4001082
72145+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
72146+:10949000AFB100143C118000AFB00010AFBF001896
72147+:1094A00036380A00970F0032363001000E000B7F6D
72148+:1094B00031E43FFF8E0E0000240DFF803C042000AD
72149+:1094C00001C25821016D6024000C4940316A007FBF
72150+:1094D000012A4025010438253C048008AE270830C5
72151+:1094E0003486008090C500682403000230A200FF8B
72152+:1094F000104300048F9F00208F990024AC9F0068C8
72153+:10950000AC9900648FBF00188FB100148FB00010A9
72154+:1095100003E0000827BD00203C0A0800254A3A80E5
72155+:109520003C09080025293B103C08080025082F1C91
72156+:109530003C07080024E73BDC3C06080024C639044D
72157+:109540003C05080024A536583C0408002484325CFD
72158+:109550003C030800246339B83C0208002442375415
72159+:109560003C010800AC2A3F983C010800AC293F941C
72160+:109570003C010800AC283F903C010800AC273F9C10
72161+:109580003C010800AC263FAC3C010800AC253FA4E0
72162+:109590003C010800AC243FA03C010800AC233FB0D4
72163+:1095A0003C010800AC223FA803E0000800000000D6
72164+:1095B00080000940800009008008010080080080C8
72165+:1095C00080080000800E00008008008080080000F5
72166+:1095D00080000A8080000A00800009808000090065
72167+:00000001FF
72168diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
72169index 703342e..2b96b597 100644
72170--- a/fs/9p/vfs_inode.c
72171+++ b/fs/9p/vfs_inode.c
72172@@ -540,8 +540,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb,
72173 unlock_new_inode(inode);
72174 return inode;
72175 error:
72176- unlock_new_inode(inode);
72177- iput(inode);
72178+ iget_failed(inode);
72179 return ERR_PTR(retval);
72180
72181 }
72182@@ -1312,7 +1311,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
72183 void
72184 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
72185 {
72186- char *s = nd_get_link(nd);
72187+ const char *s = nd_get_link(nd);
72188
72189 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
72190 dentry, IS_ERR(s) ? "<error>" : s);
72191diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
72192index 9861c7c..4d3ecfb 100644
72193--- a/fs/9p/vfs_inode_dotl.c
72194+++ b/fs/9p/vfs_inode_dotl.c
72195@@ -149,8 +149,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
72196 unlock_new_inode(inode);
72197 return inode;
72198 error:
72199- unlock_new_inode(inode);
72200- iput(inode);
72201+ iget_failed(inode);
72202 return ERR_PTR(retval);
72203
72204 }
72205diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
72206index 2d0cbbd..a6d6149 100644
72207--- a/fs/Kconfig.binfmt
72208+++ b/fs/Kconfig.binfmt
72209@@ -103,7 +103,7 @@ config HAVE_AOUT
72210
72211 config BINFMT_AOUT
72212 tristate "Kernel support for a.out and ECOFF binaries"
72213- depends on HAVE_AOUT
72214+ depends on HAVE_AOUT && BROKEN
72215 ---help---
72216 A.out (Assembler.OUTput) is a set of formats for libraries and
72217 executables used in the earliest versions of UNIX. Linux used
72218diff --git a/fs/afs/inode.c b/fs/afs/inode.c
72219index e06f5a2..81d07ac 100644
72220--- a/fs/afs/inode.c
72221+++ b/fs/afs/inode.c
72222@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72223 struct afs_vnode *vnode;
72224 struct super_block *sb;
72225 struct inode *inode;
72226- static atomic_t afs_autocell_ino;
72227+ static atomic_unchecked_t afs_autocell_ino;
72228
72229 _enter("{%x:%u},%*.*s,",
72230 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
72231@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72232 data.fid.unique = 0;
72233 data.fid.vnode = 0;
72234
72235- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
72236+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
72237 afs_iget5_autocell_test, afs_iget5_set,
72238 &data);
72239 if (!inode) {
72240diff --git a/fs/aio.c b/fs/aio.c
72241index 480440f..623fd88 100644
72242--- a/fs/aio.c
72243+++ b/fs/aio.c
72244@@ -441,7 +441,7 @@ static int aio_setup_ring(struct kioctx *ctx)
72245 size += sizeof(struct io_event) * nr_events;
72246
72247 nr_pages = PFN_UP(size);
72248- if (nr_pages < 0)
72249+ if (nr_pages <= 0)
72250 return -EINVAL;
72251
72252 file = aio_private_file(ctx, nr_pages);
72253diff --git a/fs/attr.c b/fs/attr.c
72254index 6530ced..4a827e2 100644
72255--- a/fs/attr.c
72256+++ b/fs/attr.c
72257@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
72258 unsigned long limit;
72259
72260 limit = rlimit(RLIMIT_FSIZE);
72261+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
72262 if (limit != RLIM_INFINITY && offset > limit)
72263 goto out_sig;
72264 if (offset > inode->i_sb->s_maxbytes)
72265diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
72266index 35b755e..f4b9e0a 100644
72267--- a/fs/autofs4/waitq.c
72268+++ b/fs/autofs4/waitq.c
72269@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
72270 {
72271 unsigned long sigpipe, flags;
72272 mm_segment_t fs;
72273- const char *data = (const char *)addr;
72274+ const char __user *data = (const char __force_user *)addr;
72275 ssize_t wr = 0;
72276
72277 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
72278@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
72279 return 1;
72280 }
72281
72282+#ifdef CONFIG_GRKERNSEC_HIDESYM
72283+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
72284+#endif
72285+
72286 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72287 enum autofs_notify notify)
72288 {
72289@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72290
72291 /* If this is a direct mount request create a dummy name */
72292 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
72293+#ifdef CONFIG_GRKERNSEC_HIDESYM
72294+ /* this name does get written to userland via autofs4_write() */
72295+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
72296+#else
72297 qstr.len = sprintf(name, "%p", dentry);
72298+#endif
72299 else {
72300 qstr.len = autofs4_getpath(sbi, dentry, &name);
72301 if (!qstr.len) {
72302diff --git a/fs/befs/endian.h b/fs/befs/endian.h
72303index 2722387..56059b5 100644
72304--- a/fs/befs/endian.h
72305+++ b/fs/befs/endian.h
72306@@ -11,7 +11,7 @@
72307
72308 #include <asm/byteorder.h>
72309
72310-static inline u64
72311+static inline u64 __intentional_overflow(-1)
72312 fs64_to_cpu(const struct super_block *sb, fs64 n)
72313 {
72314 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72315@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
72316 return (__force fs64)cpu_to_be64(n);
72317 }
72318
72319-static inline u32
72320+static inline u32 __intentional_overflow(-1)
72321 fs32_to_cpu(const struct super_block *sb, fs32 n)
72322 {
72323 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72324@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
72325 return (__force fs32)cpu_to_be32(n);
72326 }
72327
72328-static inline u16
72329+static inline u16 __intentional_overflow(-1)
72330 fs16_to_cpu(const struct super_block *sb, fs16 n)
72331 {
72332 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72333diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
72334index 4c55668..eeae150 100644
72335--- a/fs/binfmt_aout.c
72336+++ b/fs/binfmt_aout.c
72337@@ -16,6 +16,7 @@
72338 #include <linux/string.h>
72339 #include <linux/fs.h>
72340 #include <linux/file.h>
72341+#include <linux/security.h>
72342 #include <linux/stat.h>
72343 #include <linux/fcntl.h>
72344 #include <linux/ptrace.h>
72345@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
72346 #endif
72347 # define START_STACK(u) ((void __user *)u.start_stack)
72348
72349+ memset(&dump, 0, sizeof(dump));
72350+
72351 fs = get_fs();
72352 set_fs(KERNEL_DS);
72353 has_dumped = 1;
72354@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
72355
72356 /* If the size of the dump file exceeds the rlimit, then see what would happen
72357 if we wrote the stack, but not the data area. */
72358+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
72359 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
72360 dump.u_dsize = 0;
72361
72362 /* Make sure we have enough room to write the stack and data areas. */
72363+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
72364 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
72365 dump.u_ssize = 0;
72366
72367@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
72368 rlim = rlimit(RLIMIT_DATA);
72369 if (rlim >= RLIM_INFINITY)
72370 rlim = ~0;
72371+
72372+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
72373 if (ex.a_data + ex.a_bss > rlim)
72374 return -ENOMEM;
72375
72376@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
72377
72378 install_exec_creds(bprm);
72379
72380+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72381+ current->mm->pax_flags = 0UL;
72382+#endif
72383+
72384+#ifdef CONFIG_PAX_PAGEEXEC
72385+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
72386+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
72387+
72388+#ifdef CONFIG_PAX_EMUTRAMP
72389+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
72390+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
72391+#endif
72392+
72393+#ifdef CONFIG_PAX_MPROTECT
72394+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
72395+ current->mm->pax_flags |= MF_PAX_MPROTECT;
72396+#endif
72397+
72398+ }
72399+#endif
72400+
72401 if (N_MAGIC(ex) == OMAGIC) {
72402 unsigned long text_addr, map_size;
72403 loff_t pos;
72404@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
72405 return error;
72406
72407 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
72408- PROT_READ | PROT_WRITE | PROT_EXEC,
72409+ PROT_READ | PROT_WRITE,
72410 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
72411 fd_offset + ex.a_text);
72412 if (error != N_DATADDR(ex))
72413diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
72414index cd46e41..244f778 100644
72415--- a/fs/binfmt_elf.c
72416+++ b/fs/binfmt_elf.c
72417@@ -35,6 +35,7 @@
72418 #include <linux/utsname.h>
72419 #include <linux/coredump.h>
72420 #include <linux/sched.h>
72421+#include <linux/xattr.h>
72422 #include <asm/uaccess.h>
72423 #include <asm/param.h>
72424 #include <asm/page.h>
72425@@ -48,7 +49,7 @@
72426
72427 static int load_elf_binary(struct linux_binprm *bprm);
72428 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
72429- int, int, unsigned long);
72430+ int, int, unsigned long) __intentional_overflow(-1);
72431
72432 #ifdef CONFIG_USELIB
72433 static int load_elf_library(struct file *);
72434@@ -66,6 +67,14 @@ static int elf_core_dump(struct coredump_params *cprm);
72435 #define elf_core_dump NULL
72436 #endif
72437
72438+#ifdef CONFIG_PAX_MPROTECT
72439+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
72440+#endif
72441+
72442+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72443+static void elf_handle_mmap(struct file *file);
72444+#endif
72445+
72446 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
72447 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
72448 #else
72449@@ -85,6 +94,15 @@ static struct linux_binfmt elf_format = {
72450 .load_binary = load_elf_binary,
72451 .load_shlib = load_elf_library,
72452 .core_dump = elf_core_dump,
72453+
72454+#ifdef CONFIG_PAX_MPROTECT
72455+ .handle_mprotect= elf_handle_mprotect,
72456+#endif
72457+
72458+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72459+ .handle_mmap = elf_handle_mmap,
72460+#endif
72461+
72462 .min_coredump = ELF_EXEC_PAGESIZE,
72463 };
72464
72465@@ -92,6 +110,8 @@ static struct linux_binfmt elf_format = {
72466
72467 static int set_brk(unsigned long start, unsigned long end)
72468 {
72469+ unsigned long e = end;
72470+
72471 start = ELF_PAGEALIGN(start);
72472 end = ELF_PAGEALIGN(end);
72473 if (end > start) {
72474@@ -100,7 +120,7 @@ static int set_brk(unsigned long start, unsigned long end)
72475 if (BAD_ADDR(addr))
72476 return addr;
72477 }
72478- current->mm->start_brk = current->mm->brk = end;
72479+ current->mm->start_brk = current->mm->brk = e;
72480 return 0;
72481 }
72482
72483@@ -161,12 +181,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72484 elf_addr_t __user *u_rand_bytes;
72485 const char *k_platform = ELF_PLATFORM;
72486 const char *k_base_platform = ELF_BASE_PLATFORM;
72487- unsigned char k_rand_bytes[16];
72488+ u32 k_rand_bytes[4];
72489 int items;
72490 elf_addr_t *elf_info;
72491 int ei_index = 0;
72492 const struct cred *cred = current_cred();
72493 struct vm_area_struct *vma;
72494+ unsigned long saved_auxv[AT_VECTOR_SIZE];
72495
72496 /*
72497 * In some cases (e.g. Hyper-Threading), we want to avoid L1
72498@@ -208,8 +229,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72499 * Generate 16 random bytes for userspace PRNG seeding.
72500 */
72501 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
72502- u_rand_bytes = (elf_addr_t __user *)
72503- STACK_ALLOC(p, sizeof(k_rand_bytes));
72504+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
72505+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
72506+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
72507+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
72508+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
72509+ u_rand_bytes = (elf_addr_t __user *) p;
72510 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
72511 return -EFAULT;
72512
72513@@ -324,9 +349,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72514 return -EFAULT;
72515 current->mm->env_end = p;
72516
72517+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
72518+
72519 /* Put the elf_info on the stack in the right place. */
72520 sp = (elf_addr_t __user *)envp + 1;
72521- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
72522+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
72523 return -EFAULT;
72524 return 0;
72525 }
72526@@ -515,14 +542,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
72527 an ELF header */
72528
72529 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72530- struct file *interpreter, unsigned long *interp_map_addr,
72531+ struct file *interpreter,
72532 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
72533 {
72534 struct elf_phdr *eppnt;
72535- unsigned long load_addr = 0;
72536+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
72537 int load_addr_set = 0;
72538 unsigned long last_bss = 0, elf_bss = 0;
72539- unsigned long error = ~0UL;
72540+ unsigned long error = -EINVAL;
72541 unsigned long total_size;
72542 int i;
72543
72544@@ -542,6 +569,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72545 goto out;
72546 }
72547
72548+#ifdef CONFIG_PAX_SEGMEXEC
72549+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
72550+ pax_task_size = SEGMEXEC_TASK_SIZE;
72551+#endif
72552+
72553 eppnt = interp_elf_phdata;
72554 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
72555 if (eppnt->p_type == PT_LOAD) {
72556@@ -565,8 +597,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72557 map_addr = elf_map(interpreter, load_addr + vaddr,
72558 eppnt, elf_prot, elf_type, total_size);
72559 total_size = 0;
72560- if (!*interp_map_addr)
72561- *interp_map_addr = map_addr;
72562 error = map_addr;
72563 if (BAD_ADDR(map_addr))
72564 goto out;
72565@@ -585,8 +615,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72566 k = load_addr + eppnt->p_vaddr;
72567 if (BAD_ADDR(k) ||
72568 eppnt->p_filesz > eppnt->p_memsz ||
72569- eppnt->p_memsz > TASK_SIZE ||
72570- TASK_SIZE - eppnt->p_memsz < k) {
72571+ eppnt->p_memsz > pax_task_size ||
72572+ pax_task_size - eppnt->p_memsz < k) {
72573 error = -ENOMEM;
72574 goto out;
72575 }
72576@@ -625,9 +655,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72577 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
72578
72579 /* Map the last of the bss segment */
72580- error = vm_brk(elf_bss, last_bss - elf_bss);
72581- if (BAD_ADDR(error))
72582- goto out;
72583+ if (last_bss > elf_bss) {
72584+ error = vm_brk(elf_bss, last_bss - elf_bss);
72585+ if (BAD_ADDR(error))
72586+ goto out;
72587+ }
72588 }
72589
72590 error = load_addr;
72591@@ -635,6 +667,336 @@ out:
72592 return error;
72593 }
72594
72595+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72596+#ifdef CONFIG_PAX_SOFTMODE
72597+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
72598+{
72599+ unsigned long pax_flags = 0UL;
72600+
72601+#ifdef CONFIG_PAX_PAGEEXEC
72602+ if (elf_phdata->p_flags & PF_PAGEEXEC)
72603+ pax_flags |= MF_PAX_PAGEEXEC;
72604+#endif
72605+
72606+#ifdef CONFIG_PAX_SEGMEXEC
72607+ if (elf_phdata->p_flags & PF_SEGMEXEC)
72608+ pax_flags |= MF_PAX_SEGMEXEC;
72609+#endif
72610+
72611+#ifdef CONFIG_PAX_EMUTRAMP
72612+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72613+ pax_flags |= MF_PAX_EMUTRAMP;
72614+#endif
72615+
72616+#ifdef CONFIG_PAX_MPROTECT
72617+ if (elf_phdata->p_flags & PF_MPROTECT)
72618+ pax_flags |= MF_PAX_MPROTECT;
72619+#endif
72620+
72621+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72622+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
72623+ pax_flags |= MF_PAX_RANDMMAP;
72624+#endif
72625+
72626+ return pax_flags;
72627+}
72628+#endif
72629+
72630+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
72631+{
72632+ unsigned long pax_flags = 0UL;
72633+
72634+#ifdef CONFIG_PAX_PAGEEXEC
72635+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
72636+ pax_flags |= MF_PAX_PAGEEXEC;
72637+#endif
72638+
72639+#ifdef CONFIG_PAX_SEGMEXEC
72640+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
72641+ pax_flags |= MF_PAX_SEGMEXEC;
72642+#endif
72643+
72644+#ifdef CONFIG_PAX_EMUTRAMP
72645+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
72646+ pax_flags |= MF_PAX_EMUTRAMP;
72647+#endif
72648+
72649+#ifdef CONFIG_PAX_MPROTECT
72650+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
72651+ pax_flags |= MF_PAX_MPROTECT;
72652+#endif
72653+
72654+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72655+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
72656+ pax_flags |= MF_PAX_RANDMMAP;
72657+#endif
72658+
72659+ return pax_flags;
72660+}
72661+#endif
72662+
72663+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72664+#ifdef CONFIG_PAX_SOFTMODE
72665+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
72666+{
72667+ unsigned long pax_flags = 0UL;
72668+
72669+#ifdef CONFIG_PAX_PAGEEXEC
72670+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
72671+ pax_flags |= MF_PAX_PAGEEXEC;
72672+#endif
72673+
72674+#ifdef CONFIG_PAX_SEGMEXEC
72675+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
72676+ pax_flags |= MF_PAX_SEGMEXEC;
72677+#endif
72678+
72679+#ifdef CONFIG_PAX_EMUTRAMP
72680+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72681+ pax_flags |= MF_PAX_EMUTRAMP;
72682+#endif
72683+
72684+#ifdef CONFIG_PAX_MPROTECT
72685+ if (pax_flags_softmode & MF_PAX_MPROTECT)
72686+ pax_flags |= MF_PAX_MPROTECT;
72687+#endif
72688+
72689+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72690+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
72691+ pax_flags |= MF_PAX_RANDMMAP;
72692+#endif
72693+
72694+ return pax_flags;
72695+}
72696+#endif
72697+
72698+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
72699+{
72700+ unsigned long pax_flags = 0UL;
72701+
72702+#ifdef CONFIG_PAX_PAGEEXEC
72703+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
72704+ pax_flags |= MF_PAX_PAGEEXEC;
72705+#endif
72706+
72707+#ifdef CONFIG_PAX_SEGMEXEC
72708+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
72709+ pax_flags |= MF_PAX_SEGMEXEC;
72710+#endif
72711+
72712+#ifdef CONFIG_PAX_EMUTRAMP
72713+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
72714+ pax_flags |= MF_PAX_EMUTRAMP;
72715+#endif
72716+
72717+#ifdef CONFIG_PAX_MPROTECT
72718+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
72719+ pax_flags |= MF_PAX_MPROTECT;
72720+#endif
72721+
72722+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72723+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
72724+ pax_flags |= MF_PAX_RANDMMAP;
72725+#endif
72726+
72727+ return pax_flags;
72728+}
72729+#endif
72730+
72731+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72732+static unsigned long pax_parse_defaults(void)
72733+{
72734+ unsigned long pax_flags = 0UL;
72735+
72736+#ifdef CONFIG_PAX_SOFTMODE
72737+ if (pax_softmode)
72738+ return pax_flags;
72739+#endif
72740+
72741+#ifdef CONFIG_PAX_PAGEEXEC
72742+ pax_flags |= MF_PAX_PAGEEXEC;
72743+#endif
72744+
72745+#ifdef CONFIG_PAX_SEGMEXEC
72746+ pax_flags |= MF_PAX_SEGMEXEC;
72747+#endif
72748+
72749+#ifdef CONFIG_PAX_MPROTECT
72750+ pax_flags |= MF_PAX_MPROTECT;
72751+#endif
72752+
72753+#ifdef CONFIG_PAX_RANDMMAP
72754+ if (randomize_va_space)
72755+ pax_flags |= MF_PAX_RANDMMAP;
72756+#endif
72757+
72758+ return pax_flags;
72759+}
72760+
72761+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
72762+{
72763+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
72764+
72765+#ifdef CONFIG_PAX_EI_PAX
72766+
72767+#ifdef CONFIG_PAX_SOFTMODE
72768+ if (pax_softmode)
72769+ return pax_flags;
72770+#endif
72771+
72772+ pax_flags = 0UL;
72773+
72774+#ifdef CONFIG_PAX_PAGEEXEC
72775+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
72776+ pax_flags |= MF_PAX_PAGEEXEC;
72777+#endif
72778+
72779+#ifdef CONFIG_PAX_SEGMEXEC
72780+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
72781+ pax_flags |= MF_PAX_SEGMEXEC;
72782+#endif
72783+
72784+#ifdef CONFIG_PAX_EMUTRAMP
72785+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
72786+ pax_flags |= MF_PAX_EMUTRAMP;
72787+#endif
72788+
72789+#ifdef CONFIG_PAX_MPROTECT
72790+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
72791+ pax_flags |= MF_PAX_MPROTECT;
72792+#endif
72793+
72794+#ifdef CONFIG_PAX_ASLR
72795+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
72796+ pax_flags |= MF_PAX_RANDMMAP;
72797+#endif
72798+
72799+#endif
72800+
72801+ return pax_flags;
72802+
72803+}
72804+
72805+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
72806+{
72807+
72808+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72809+ unsigned long i;
72810+
72811+ for (i = 0UL; i < elf_ex->e_phnum; i++)
72812+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
72813+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
72814+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
72815+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
72816+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
72817+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
72818+ return PAX_PARSE_FLAGS_FALLBACK;
72819+
72820+#ifdef CONFIG_PAX_SOFTMODE
72821+ if (pax_softmode)
72822+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
72823+ else
72824+#endif
72825+
72826+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
72827+ break;
72828+ }
72829+#endif
72830+
72831+ return PAX_PARSE_FLAGS_FALLBACK;
72832+}
72833+
72834+static unsigned long pax_parse_xattr_pax(struct file * const file)
72835+{
72836+
72837+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72838+ ssize_t xattr_size, i;
72839+ unsigned char xattr_value[sizeof("pemrs") - 1];
72840+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
72841+
72842+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
72843+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
72844+ return PAX_PARSE_FLAGS_FALLBACK;
72845+
72846+ for (i = 0; i < xattr_size; i++)
72847+ switch (xattr_value[i]) {
72848+ default:
72849+ return PAX_PARSE_FLAGS_FALLBACK;
72850+
72851+#define parse_flag(option1, option2, flag) \
72852+ case option1: \
72853+ if (pax_flags_hardmode & MF_PAX_##flag) \
72854+ return PAX_PARSE_FLAGS_FALLBACK;\
72855+ pax_flags_hardmode |= MF_PAX_##flag; \
72856+ break; \
72857+ case option2: \
72858+ if (pax_flags_softmode & MF_PAX_##flag) \
72859+ return PAX_PARSE_FLAGS_FALLBACK;\
72860+ pax_flags_softmode |= MF_PAX_##flag; \
72861+ break;
72862+
72863+ parse_flag('p', 'P', PAGEEXEC);
72864+ parse_flag('e', 'E', EMUTRAMP);
72865+ parse_flag('m', 'M', MPROTECT);
72866+ parse_flag('r', 'R', RANDMMAP);
72867+ parse_flag('s', 'S', SEGMEXEC);
72868+
72869+#undef parse_flag
72870+ }
72871+
72872+ if (pax_flags_hardmode & pax_flags_softmode)
72873+ return PAX_PARSE_FLAGS_FALLBACK;
72874+
72875+#ifdef CONFIG_PAX_SOFTMODE
72876+ if (pax_softmode)
72877+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
72878+ else
72879+#endif
72880+
72881+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
72882+#else
72883+ return PAX_PARSE_FLAGS_FALLBACK;
72884+#endif
72885+
72886+}
72887+
72888+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
72889+{
72890+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
72891+
72892+ pax_flags = pax_parse_defaults();
72893+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
72894+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
72895+ xattr_pax_flags = pax_parse_xattr_pax(file);
72896+
72897+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72898+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72899+ pt_pax_flags != xattr_pax_flags)
72900+ return -EINVAL;
72901+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72902+ pax_flags = xattr_pax_flags;
72903+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72904+ pax_flags = pt_pax_flags;
72905+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72906+ pax_flags = ei_pax_flags;
72907+
72908+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
72909+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72910+ if ((__supported_pte_mask & _PAGE_NX))
72911+ pax_flags &= ~MF_PAX_SEGMEXEC;
72912+ else
72913+ pax_flags &= ~MF_PAX_PAGEEXEC;
72914+ }
72915+#endif
72916+
72917+ if (0 > pax_check_flags(&pax_flags))
72918+ return -EINVAL;
72919+
72920+ current->mm->pax_flags = pax_flags;
72921+ return 0;
72922+}
72923+#endif
72924+
72925 /*
72926 * These are the functions used to load ELF style executables and shared
72927 * libraries. There is no binary dependent code anywhere else.
72928@@ -648,6 +1010,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
72929 {
72930 unsigned long random_variable = 0;
72931
72932+#ifdef CONFIG_PAX_RANDUSTACK
72933+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
72934+ return stack_top - current->mm->delta_stack;
72935+#endif
72936+
72937 if ((current->flags & PF_RANDOMIZE) &&
72938 !(current->personality & ADDR_NO_RANDOMIZE)) {
72939 random_variable = (unsigned long) get_random_int();
72940@@ -667,7 +1034,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72941 unsigned long load_addr = 0, load_bias = 0;
72942 int load_addr_set = 0;
72943 char * elf_interpreter = NULL;
72944- unsigned long error;
72945+ unsigned long error = 0;
72946 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
72947 unsigned long elf_bss, elf_brk;
72948 int retval, i;
72949@@ -682,6 +1049,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72950 struct elfhdr interp_elf_ex;
72951 } *loc;
72952 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
72953+ unsigned long pax_task_size;
72954
72955 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
72956 if (!loc) {
72957@@ -840,6 +1208,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
72958 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
72959 may depend on the personality. */
72960 SET_PERSONALITY2(loc->elf_ex, &arch_state);
72961+
72962+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72963+ current->mm->pax_flags = 0UL;
72964+#endif
72965+
72966+#ifdef CONFIG_PAX_DLRESOLVE
72967+ current->mm->call_dl_resolve = 0UL;
72968+#endif
72969+
72970+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
72971+ current->mm->call_syscall = 0UL;
72972+#endif
72973+
72974+#ifdef CONFIG_PAX_ASLR
72975+ current->mm->delta_mmap = 0UL;
72976+ current->mm->delta_stack = 0UL;
72977+#endif
72978+
72979+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72980+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
72981+ send_sig(SIGKILL, current, 0);
72982+ goto out_free_dentry;
72983+ }
72984+#endif
72985+
72986+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
72987+ pax_set_initial_flags(bprm);
72988+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
72989+ if (pax_set_initial_flags_func)
72990+ (pax_set_initial_flags_func)(bprm);
72991+#endif
72992+
72993+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72994+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
72995+ current->mm->context.user_cs_limit = PAGE_SIZE;
72996+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
72997+ }
72998+#endif
72999+
73000+#ifdef CONFIG_PAX_SEGMEXEC
73001+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73002+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
73003+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
73004+ pax_task_size = SEGMEXEC_TASK_SIZE;
73005+ current->mm->def_flags |= VM_NOHUGEPAGE;
73006+ } else
73007+#endif
73008+
73009+ pax_task_size = TASK_SIZE;
73010+
73011+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
73012+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73013+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
73014+ put_cpu();
73015+ }
73016+#endif
73017+
73018+#ifdef CONFIG_PAX_ASLR
73019+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
73020+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
73021+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
73022+ }
73023+#endif
73024+
73025+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
73026+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
73027+ executable_stack = EXSTACK_DISABLE_X;
73028+ current->personality &= ~READ_IMPLIES_EXEC;
73029+ } else
73030+#endif
73031+
73032 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
73033 current->personality |= READ_IMPLIES_EXEC;
73034
73035@@ -915,8 +1354,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
73036 if (current->flags & PF_RANDOMIZE)
73037 load_bias += arch_mmap_rnd();
73038 load_bias = ELF_PAGESTART(load_bias);
73039- total_size = total_mapping_size(elf_phdata,
73040- loc->elf_ex.e_phnum);
73041+
73042+#ifdef CONFIG_PAX_RANDMMAP
73043+ /* PaX: randomize base address at the default exe base if requested */
73044+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
73045+#ifdef CONFIG_SPARC64
73046+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
73047+#else
73048+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
73049+#endif
73050+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
73051+ elf_flags |= MAP_FIXED;
73052+ }
73053+#endif
73054+
73055+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
73056 if (!total_size) {
73057 retval = -EINVAL;
73058 goto out_free_dentry;
73059@@ -952,9 +1404,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
73060 * allowed task size. Note that p_filesz must always be
73061 * <= p_memsz so it is only necessary to check p_memsz.
73062 */
73063- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
73064- elf_ppnt->p_memsz > TASK_SIZE ||
73065- TASK_SIZE - elf_ppnt->p_memsz < k) {
73066+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
73067+ elf_ppnt->p_memsz > pax_task_size ||
73068+ pax_task_size - elf_ppnt->p_memsz < k) {
73069 /* set_brk can never work. Avoid overflows. */
73070 retval = -EINVAL;
73071 goto out_free_dentry;
73072@@ -990,16 +1442,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
73073 if (retval)
73074 goto out_free_dentry;
73075 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
73076- retval = -EFAULT; /* Nobody gets to see this, but.. */
73077- goto out_free_dentry;
73078+ /*
73079+ * This bss-zeroing can fail if the ELF
73080+ * file specifies odd protections. So
73081+ * we don't check the return value
73082+ */
73083 }
73084
73085+#ifdef CONFIG_PAX_RANDMMAP
73086+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
73087+ unsigned long start, size, flags;
73088+ vm_flags_t vm_flags;
73089+
73090+ start = ELF_PAGEALIGN(elf_brk);
73091+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
73092+ flags = MAP_FIXED | MAP_PRIVATE;
73093+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
73094+
73095+ down_write(&current->mm->mmap_sem);
73096+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
73097+ retval = -ENOMEM;
73098+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
73099+// if (current->personality & ADDR_NO_RANDOMIZE)
73100+// vm_flags |= VM_READ | VM_MAYREAD;
73101+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
73102+ retval = IS_ERR_VALUE(start) ? start : 0;
73103+ }
73104+ up_write(&current->mm->mmap_sem);
73105+ if (retval == 0)
73106+ retval = set_brk(start + size, start + size + PAGE_SIZE);
73107+ if (retval < 0)
73108+ goto out_free_dentry;
73109+ }
73110+#endif
73111+
73112 if (elf_interpreter) {
73113- unsigned long interp_map_addr = 0;
73114-
73115 elf_entry = load_elf_interp(&loc->interp_elf_ex,
73116 interpreter,
73117- &interp_map_addr,
73118 load_bias, interp_elf_phdata);
73119 if (!IS_ERR((void *)elf_entry)) {
73120 /*
73121@@ -1050,6 +1529,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73122 current->mm->end_data = end_data;
73123 current->mm->start_stack = bprm->p;
73124
73125+#ifndef CONFIG_PAX_RANDMMAP
73126 if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
73127 current->mm->brk = current->mm->start_brk =
73128 arch_randomize_brk(current->mm);
73129@@ -1057,6 +1537,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
73130 current->brk_randomized = 1;
73131 #endif
73132 }
73133+#endif
73134
73135 if (current->personality & MMAP_PAGE_ZERO) {
73136 /* Why this, you ask??? Well SVr4 maps page 0 as read-only,
73137@@ -1225,7 +1706,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
73138 * Decide what to dump of a segment, part, all or none.
73139 */
73140 static unsigned long vma_dump_size(struct vm_area_struct *vma,
73141- unsigned long mm_flags)
73142+ unsigned long mm_flags, long signr)
73143 {
73144 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
73145
73146@@ -1263,7 +1744,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
73147 if (vma->vm_file == NULL)
73148 return 0;
73149
73150- if (FILTER(MAPPED_PRIVATE))
73151+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
73152 goto whole;
73153
73154 /*
73155@@ -1470,9 +1951,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
73156 {
73157 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
73158 int i = 0;
73159- do
73160+ do {
73161 i += 2;
73162- while (auxv[i - 2] != AT_NULL);
73163+ } while (auxv[i - 2] != AT_NULL);
73164 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
73165 }
73166
73167@@ -1481,7 +1962,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
73168 {
73169 mm_segment_t old_fs = get_fs();
73170 set_fs(KERNEL_DS);
73171- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
73172+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
73173 set_fs(old_fs);
73174 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
73175 }
73176@@ -2201,7 +2682,7 @@ static int elf_core_dump(struct coredump_params *cprm)
73177 vma = next_vma(vma, gate_vma)) {
73178 unsigned long dump_size;
73179
73180- dump_size = vma_dump_size(vma, cprm->mm_flags);
73181+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
73182 vma_filesz[i++] = dump_size;
73183 vma_data_size += dump_size;
73184 }
73185@@ -2309,6 +2790,167 @@ out:
73186
73187 #endif /* CONFIG_ELF_CORE */
73188
73189+#ifdef CONFIG_PAX_MPROTECT
73190+/* PaX: non-PIC ELF libraries need relocations on their executable segments
73191+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
73192+ * we'll remove VM_MAYWRITE for good on RELRO segments.
73193+ *
73194+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
73195+ * basis because we want to allow the common case and not the special ones.
73196+ */
73197+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
73198+{
73199+ struct elfhdr elf_h;
73200+ struct elf_phdr elf_p;
73201+ unsigned long i;
73202+ unsigned long oldflags;
73203+ bool is_textrel_rw, is_textrel_rx, is_relro;
73204+
73205+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
73206+ return;
73207+
73208+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
73209+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
73210+
73211+#ifdef CONFIG_PAX_ELFRELOCS
73212+ /* possible TEXTREL */
73213+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
73214+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
73215+#else
73216+ is_textrel_rw = false;
73217+ is_textrel_rx = false;
73218+#endif
73219+
73220+ /* possible RELRO */
73221+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
73222+
73223+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
73224+ return;
73225+
73226+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73227+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73228+
73229+#ifdef CONFIG_PAX_ETEXECRELOCS
73230+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73231+#else
73232+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
73233+#endif
73234+
73235+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73236+ !elf_check_arch(&elf_h) ||
73237+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73238+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73239+ return;
73240+
73241+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73242+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73243+ return;
73244+ switch (elf_p.p_type) {
73245+ case PT_DYNAMIC:
73246+ if (!is_textrel_rw && !is_textrel_rx)
73247+ continue;
73248+ i = 0UL;
73249+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
73250+ elf_dyn dyn;
73251+
73252+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
73253+ break;
73254+ if (dyn.d_tag == DT_NULL)
73255+ break;
73256+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
73257+ gr_log_textrel(vma);
73258+ if (is_textrel_rw)
73259+ vma->vm_flags |= VM_MAYWRITE;
73260+ else
73261+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
73262+ vma->vm_flags &= ~VM_MAYWRITE;
73263+ break;
73264+ }
73265+ i++;
73266+ }
73267+ is_textrel_rw = false;
73268+ is_textrel_rx = false;
73269+ continue;
73270+
73271+ case PT_GNU_RELRO:
73272+ if (!is_relro)
73273+ continue;
73274+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
73275+ vma->vm_flags &= ~VM_MAYWRITE;
73276+ is_relro = false;
73277+ continue;
73278+
73279+#ifdef CONFIG_PAX_PT_PAX_FLAGS
73280+ case PT_PAX_FLAGS: {
73281+ const char *msg_mprotect = "", *msg_emutramp = "";
73282+ char *buffer_lib, *buffer_exe;
73283+
73284+ if (elf_p.p_flags & PF_NOMPROTECT)
73285+ msg_mprotect = "MPROTECT disabled";
73286+
73287+#ifdef CONFIG_PAX_EMUTRAMP
73288+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
73289+ msg_emutramp = "EMUTRAMP enabled";
73290+#endif
73291+
73292+ if (!msg_mprotect[0] && !msg_emutramp[0])
73293+ continue;
73294+
73295+ if (!printk_ratelimit())
73296+ continue;
73297+
73298+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
73299+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
73300+ if (buffer_lib && buffer_exe) {
73301+ char *path_lib, *path_exe;
73302+
73303+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
73304+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
73305+
73306+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
73307+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
73308+
73309+ }
73310+ free_page((unsigned long)buffer_exe);
73311+ free_page((unsigned long)buffer_lib);
73312+ continue;
73313+ }
73314+#endif
73315+
73316+ }
73317+ }
73318+}
73319+#endif
73320+
73321+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
73322+
73323+extern int grsec_enable_log_rwxmaps;
73324+
73325+static void elf_handle_mmap(struct file *file)
73326+{
73327+ struct elfhdr elf_h;
73328+ struct elf_phdr elf_p;
73329+ unsigned long i;
73330+
73331+ if (!grsec_enable_log_rwxmaps)
73332+ return;
73333+
73334+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73335+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73336+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
73337+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73338+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73339+ return;
73340+
73341+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73342+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73343+ return;
73344+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
73345+ gr_log_ptgnustack(file);
73346+ }
73347+}
73348+#endif
73349+
73350 static int __init init_elf_binfmt(void)
73351 {
73352 register_binfmt(&elf_format);
73353diff --git a/fs/block_dev.c b/fs/block_dev.c
73354index c7e4163..6939003 100644
73355--- a/fs/block_dev.c
73356+++ b/fs/block_dev.c
73357@@ -732,7 +732,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
73358 else if (bdev->bd_contains == bdev)
73359 return true; /* is a whole device which isn't held */
73360
73361- else if (whole->bd_holder == bd_may_claim)
73362+ else if (whole->bd_holder == (void *)bd_may_claim)
73363 return true; /* is a partition of a device that is being partitioned */
73364 else if (whole->bd_holder != NULL)
73365 return false; /* is a partition of a held device */
73366diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
73367index 0f11ebc..1bf3321 100644
73368--- a/fs/btrfs/ctree.c
73369+++ b/fs/btrfs/ctree.c
73370@@ -1180,9 +1180,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
73371 free_extent_buffer(buf);
73372 add_root_to_dirty_list(root);
73373 } else {
73374- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
73375- parent_start = parent->start;
73376- else
73377+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
73378+ if (parent)
73379+ parent_start = parent->start;
73380+ else
73381+ parent_start = 0;
73382+ } else
73383 parent_start = 0;
73384
73385 WARN_ON(trans->transid != btrfs_header_generation(parent));
73386diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
73387index a2ae427..53c2e98 100644
73388--- a/fs/btrfs/delayed-inode.c
73389+++ b/fs/btrfs/delayed-inode.c
73390@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
73391
73392 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
73393 {
73394- int seq = atomic_inc_return(&delayed_root->items_seq);
73395+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
73396 if ((atomic_dec_return(&delayed_root->items) <
73397 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
73398 waitqueue_active(&delayed_root->wait))
73399@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
73400
73401 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
73402 {
73403- int val = atomic_read(&delayed_root->items_seq);
73404+ int val = atomic_read_unchecked(&delayed_root->items_seq);
73405
73406 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
73407 return 1;
73408@@ -1437,7 +1437,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
73409 int seq;
73410 int ret;
73411
73412- seq = atomic_read(&delayed_root->items_seq);
73413+ seq = atomic_read_unchecked(&delayed_root->items_seq);
73414
73415 ret = btrfs_wq_run_delayed_node(delayed_root, fs_info, 0);
73416 if (ret)
73417diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
73418index f70119f..ab5894d 100644
73419--- a/fs/btrfs/delayed-inode.h
73420+++ b/fs/btrfs/delayed-inode.h
73421@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
73422 */
73423 struct list_head prepare_list;
73424 atomic_t items; /* for delayed items */
73425- atomic_t items_seq; /* for delayed items */
73426+ atomic_unchecked_t items_seq; /* for delayed items */
73427 int nodes; /* for delayed nodes */
73428 wait_queue_head_t wait;
73429 };
73430@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
73431 struct btrfs_delayed_root *delayed_root)
73432 {
73433 atomic_set(&delayed_root->items, 0);
73434- atomic_set(&delayed_root->items_seq, 0);
73435+ atomic_set_unchecked(&delayed_root->items_seq, 0);
73436 delayed_root->nodes = 0;
73437 spin_lock_init(&delayed_root->lock);
73438 init_waitqueue_head(&delayed_root->wait);
73439diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
73440index 9e66f5e..f7caaf0 100644
73441--- a/fs/btrfs/super.c
73442+++ b/fs/btrfs/super.c
73443@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
73444 function, line, errstr);
73445 return;
73446 }
73447- ACCESS_ONCE(trans->transaction->aborted) = errno;
73448+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
73449 /* Wake up anybody who may be waiting on this transaction */
73450 wake_up(&root->fs_info->transaction_wait);
73451 wake_up(&root->fs_info->transaction_blocked_wait);
73452diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
73453index e8a4c86..f8c22ae 100644
73454--- a/fs/btrfs/sysfs.c
73455+++ b/fs/btrfs/sysfs.c
73456@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
73457 for (set = 0; set < FEAT_MAX; set++) {
73458 int i;
73459 struct attribute *attrs[2];
73460- struct attribute_group agroup = {
73461+ attribute_group_no_const agroup = {
73462 .name = "features",
73463 .attrs = attrs,
73464 };
73465diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
73466index 2299bfd..4098e72 100644
73467--- a/fs/btrfs/tests/free-space-tests.c
73468+++ b/fs/btrfs/tests/free-space-tests.c
73469@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73470 * extent entry.
73471 */
73472 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
73473- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73474+ pax_open_kernel();
73475+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73476+ pax_close_kernel();
73477
73478 /*
73479 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
73480@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73481 if (ret)
73482 return ret;
73483
73484- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73485+ pax_open_kernel();
73486+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73487+ pax_close_kernel();
73488 __btrfs_remove_free_space_cache(cache->free_space_ctl);
73489
73490 return 0;
73491diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
73492index 6916a78..4598936 100644
73493--- a/fs/btrfs/tree-log.h
73494+++ b/fs/btrfs/tree-log.h
73495@@ -45,7 +45,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
73496 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
73497 struct btrfs_trans_handle *trans)
73498 {
73499- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
73500+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
73501 }
73502
73503 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
73504diff --git a/fs/buffer.c b/fs/buffer.c
73505index c7a5602..18eabd1 100644
73506--- a/fs/buffer.c
73507+++ b/fs/buffer.c
73508@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
73509 bh_cachep = kmem_cache_create("buffer_head",
73510 sizeof(struct buffer_head), 0,
73511 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
73512- SLAB_MEM_SPREAD),
73513+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
73514 NULL);
73515
73516 /*
73517diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
73518index 6af790f..ec4c1e6 100644
73519--- a/fs/cachefiles/bind.c
73520+++ b/fs/cachefiles/bind.c
73521@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
73522 args);
73523
73524 /* start by checking things over */
73525- ASSERT(cache->fstop_percent >= 0 &&
73526- cache->fstop_percent < cache->fcull_percent &&
73527+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
73528 cache->fcull_percent < cache->frun_percent &&
73529 cache->frun_percent < 100);
73530
73531- ASSERT(cache->bstop_percent >= 0 &&
73532- cache->bstop_percent < cache->bcull_percent &&
73533+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
73534 cache->bcull_percent < cache->brun_percent &&
73535 cache->brun_percent < 100);
73536
73537diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
73538index f601def..b2cf704 100644
73539--- a/fs/cachefiles/daemon.c
73540+++ b/fs/cachefiles/daemon.c
73541@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
73542 if (n > buflen)
73543 return -EMSGSIZE;
73544
73545- if (copy_to_user(_buffer, buffer, n) != 0)
73546+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
73547 return -EFAULT;
73548
73549 return n;
73550@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
73551 if (test_bit(CACHEFILES_DEAD, &cache->flags))
73552 return -EIO;
73553
73554- if (datalen < 0 || datalen > PAGE_SIZE - 1)
73555+ if (datalen > PAGE_SIZE - 1)
73556 return -EOPNOTSUPP;
73557
73558 /* drag the command string into the kernel so we can parse it */
73559@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
73560 if (args[0] != '%' || args[1] != '\0')
73561 return -EINVAL;
73562
73563- if (fstop < 0 || fstop >= cache->fcull_percent)
73564+ if (fstop >= cache->fcull_percent)
73565 return cachefiles_daemon_range_error(cache, args);
73566
73567 cache->fstop_percent = fstop;
73568@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
73569 if (args[0] != '%' || args[1] != '\0')
73570 return -EINVAL;
73571
73572- if (bstop < 0 || bstop >= cache->bcull_percent)
73573+ if (bstop >= cache->bcull_percent)
73574 return cachefiles_daemon_range_error(cache, args);
73575
73576 cache->bstop_percent = bstop;
73577diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
73578index 8c52472..c4e3a69 100644
73579--- a/fs/cachefiles/internal.h
73580+++ b/fs/cachefiles/internal.h
73581@@ -66,7 +66,7 @@ struct cachefiles_cache {
73582 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
73583 struct rb_root active_nodes; /* active nodes (can't be culled) */
73584 rwlock_t active_lock; /* lock for active_nodes */
73585- atomic_t gravecounter; /* graveyard uniquifier */
73586+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
73587 unsigned frun_percent; /* when to stop culling (% files) */
73588 unsigned fcull_percent; /* when to start culling (% files) */
73589 unsigned fstop_percent; /* when to stop allocating (% files) */
73590@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
73591 * proc.c
73592 */
73593 #ifdef CONFIG_CACHEFILES_HISTOGRAM
73594-extern atomic_t cachefiles_lookup_histogram[HZ];
73595-extern atomic_t cachefiles_mkdir_histogram[HZ];
73596-extern atomic_t cachefiles_create_histogram[HZ];
73597+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73598+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73599+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
73600
73601 extern int __init cachefiles_proc_init(void);
73602 extern void cachefiles_proc_cleanup(void);
73603 static inline
73604-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
73605+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
73606 {
73607 unsigned long jif = jiffies - start_jif;
73608 if (jif >= HZ)
73609 jif = HZ - 1;
73610- atomic_inc(&histogram[jif]);
73611+ atomic_inc_unchecked(&histogram[jif]);
73612 }
73613
73614 #else
73615diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
73616index ab857ab..ff8d593 100644
73617--- a/fs/cachefiles/namei.c
73618+++ b/fs/cachefiles/namei.c
73619@@ -309,7 +309,7 @@ try_again:
73620 /* first step is to make up a grave dentry in the graveyard */
73621 sprintf(nbuffer, "%08x%08x",
73622 (uint32_t) get_seconds(),
73623- (uint32_t) atomic_inc_return(&cache->gravecounter));
73624+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
73625
73626 /* do the multiway lock magic */
73627 trap = lock_rename(cache->graveyard, dir);
73628diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
73629index eccd339..4c1d995 100644
73630--- a/fs/cachefiles/proc.c
73631+++ b/fs/cachefiles/proc.c
73632@@ -14,9 +14,9 @@
73633 #include <linux/seq_file.h>
73634 #include "internal.h"
73635
73636-atomic_t cachefiles_lookup_histogram[HZ];
73637-atomic_t cachefiles_mkdir_histogram[HZ];
73638-atomic_t cachefiles_create_histogram[HZ];
73639+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73640+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73641+atomic_unchecked_t cachefiles_create_histogram[HZ];
73642
73643 /*
73644 * display the latency histogram
73645@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
73646 return 0;
73647 default:
73648 index = (unsigned long) v - 3;
73649- x = atomic_read(&cachefiles_lookup_histogram[index]);
73650- y = atomic_read(&cachefiles_mkdir_histogram[index]);
73651- z = atomic_read(&cachefiles_create_histogram[index]);
73652+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
73653+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
73654+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
73655 if (x == 0 && y == 0 && z == 0)
73656 return 0;
73657
73658diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
73659index 4248307..f41e44e 100644
73660--- a/fs/ceph/dir.c
73661+++ b/fs/ceph/dir.c
73662@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
73663 struct dentry *dentry, *last;
73664 struct ceph_dentry_info *di;
73665 int err = 0;
73666+ char d_name[DNAME_INLINE_LEN];
73667+ const unsigned char *name;
73668
73669 /* claim ref on last dentry we returned */
73670 last = fi->dentry;
73671@@ -190,7 +192,12 @@ more:
73672
73673 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
73674 dentry, dentry, d_inode(dentry));
73675- if (!dir_emit(ctx, dentry->d_name.name,
73676+ name = dentry->d_name.name;
73677+ if (name == dentry->d_iname) {
73678+ memcpy(d_name, name, dentry->d_name.len);
73679+ name = d_name;
73680+ }
73681+ if (!dir_emit(ctx, name,
73682 dentry->d_name.len,
73683 ceph_translate_ino(dentry->d_sb, d_inode(dentry)->i_ino),
73684 d_inode(dentry)->i_mode >> 12)) {
73685@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
73686 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
73687 struct ceph_mds_client *mdsc = fsc->mdsc;
73688 unsigned frag = fpos_frag(ctx->pos);
73689- int off = fpos_off(ctx->pos);
73690+ unsigned int off = fpos_off(ctx->pos);
73691 int err;
73692 u32 ftype;
73693 struct ceph_mds_reply_info_parsed *rinfo;
73694diff --git a/fs/ceph/super.c b/fs/ceph/super.c
73695index 4e99053..a7e2a5f 100644
73696--- a/fs/ceph/super.c
73697+++ b/fs/ceph/super.c
73698@@ -885,7 +885,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
73699 /*
73700 * construct our own bdi so we can control readahead, etc.
73701 */
73702-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
73703+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
73704
73705 static int ceph_register_bdi(struct super_block *sb,
73706 struct ceph_fs_client *fsc)
73707@@ -902,7 +902,7 @@ static int ceph_register_bdi(struct super_block *sb,
73708 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
73709
73710 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
73711- atomic_long_inc_return(&bdi_seq));
73712+ atomic_long_inc_return_unchecked(&bdi_seq));
73713 if (!err)
73714 sb->s_bdi = &fsc->backing_dev_info;
73715 return err;
73716diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
73717index 7febcf2..62a5721 100644
73718--- a/fs/cifs/cifs_debug.c
73719+++ b/fs/cifs/cifs_debug.c
73720@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73721
73722 if (strtobool(&c, &bv) == 0) {
73723 #ifdef CONFIG_CIFS_STATS2
73724- atomic_set(&totBufAllocCount, 0);
73725- atomic_set(&totSmBufAllocCount, 0);
73726+ atomic_set_unchecked(&totBufAllocCount, 0);
73727+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73728 #endif /* CONFIG_CIFS_STATS2 */
73729 spin_lock(&cifs_tcp_ses_lock);
73730 list_for_each(tmp1, &cifs_tcp_ses_list) {
73731@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73732 tcon = list_entry(tmp3,
73733 struct cifs_tcon,
73734 tcon_list);
73735- atomic_set(&tcon->num_smbs_sent, 0);
73736+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
73737 if (server->ops->clear_stats)
73738 server->ops->clear_stats(tcon);
73739 }
73740@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73741 smBufAllocCount.counter, cifs_min_small);
73742 #ifdef CONFIG_CIFS_STATS2
73743 seq_printf(m, "Total Large %d Small %d Allocations\n",
73744- atomic_read(&totBufAllocCount),
73745- atomic_read(&totSmBufAllocCount));
73746+ atomic_read_unchecked(&totBufAllocCount),
73747+ atomic_read_unchecked(&totSmBufAllocCount));
73748 #endif /* CONFIG_CIFS_STATS2 */
73749
73750 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
73751@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73752 if (tcon->need_reconnect)
73753 seq_puts(m, "\tDISCONNECTED ");
73754 seq_printf(m, "\nSMBs: %d",
73755- atomic_read(&tcon->num_smbs_sent));
73756+ atomic_read_unchecked(&tcon->num_smbs_sent));
73757 if (server->ops->print_stats)
73758 server->ops->print_stats(m, tcon);
73759 }
73760diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
73761index 0a9fb6b..9def7fa 100644
73762--- a/fs/cifs/cifsfs.c
73763+++ b/fs/cifs/cifsfs.c
73764@@ -1082,7 +1082,7 @@ cifs_init_request_bufs(void)
73765 */
73766 cifs_req_cachep = kmem_cache_create("cifs_request",
73767 CIFSMaxBufSize + max_hdr_size, 0,
73768- SLAB_HWCACHE_ALIGN, NULL);
73769+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
73770 if (cifs_req_cachep == NULL)
73771 return -ENOMEM;
73772
73773@@ -1109,7 +1109,7 @@ cifs_init_request_bufs(void)
73774 efficient to alloc 1 per page off the slab compared to 17K (5page)
73775 alloc of large cifs buffers even when page debugging is on */
73776 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
73777- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
73778+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
73779 NULL);
73780 if (cifs_sm_req_cachep == NULL) {
73781 mempool_destroy(cifs_req_poolp);
73782@@ -1194,8 +1194,8 @@ init_cifs(void)
73783 atomic_set(&bufAllocCount, 0);
73784 atomic_set(&smBufAllocCount, 0);
73785 #ifdef CONFIG_CIFS_STATS2
73786- atomic_set(&totBufAllocCount, 0);
73787- atomic_set(&totSmBufAllocCount, 0);
73788+ atomic_set_unchecked(&totBufAllocCount, 0);
73789+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73790 #endif /* CONFIG_CIFS_STATS2 */
73791
73792 atomic_set(&midCount, 0);
73793diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
73794index 22b289a..bbbba082 100644
73795--- a/fs/cifs/cifsglob.h
73796+++ b/fs/cifs/cifsglob.h
73797@@ -823,35 +823,35 @@ struct cifs_tcon {
73798 __u16 Flags; /* optional support bits */
73799 enum statusEnum tidStatus;
73800 #ifdef CONFIG_CIFS_STATS
73801- atomic_t num_smbs_sent;
73802+ atomic_unchecked_t num_smbs_sent;
73803 union {
73804 struct {
73805- atomic_t num_writes;
73806- atomic_t num_reads;
73807- atomic_t num_flushes;
73808- atomic_t num_oplock_brks;
73809- atomic_t num_opens;
73810- atomic_t num_closes;
73811- atomic_t num_deletes;
73812- atomic_t num_mkdirs;
73813- atomic_t num_posixopens;
73814- atomic_t num_posixmkdirs;
73815- atomic_t num_rmdirs;
73816- atomic_t num_renames;
73817- atomic_t num_t2renames;
73818- atomic_t num_ffirst;
73819- atomic_t num_fnext;
73820- atomic_t num_fclose;
73821- atomic_t num_hardlinks;
73822- atomic_t num_symlinks;
73823- atomic_t num_locks;
73824- atomic_t num_acl_get;
73825- atomic_t num_acl_set;
73826+ atomic_unchecked_t num_writes;
73827+ atomic_unchecked_t num_reads;
73828+ atomic_unchecked_t num_flushes;
73829+ atomic_unchecked_t num_oplock_brks;
73830+ atomic_unchecked_t num_opens;
73831+ atomic_unchecked_t num_closes;
73832+ atomic_unchecked_t num_deletes;
73833+ atomic_unchecked_t num_mkdirs;
73834+ atomic_unchecked_t num_posixopens;
73835+ atomic_unchecked_t num_posixmkdirs;
73836+ atomic_unchecked_t num_rmdirs;
73837+ atomic_unchecked_t num_renames;
73838+ atomic_unchecked_t num_t2renames;
73839+ atomic_unchecked_t num_ffirst;
73840+ atomic_unchecked_t num_fnext;
73841+ atomic_unchecked_t num_fclose;
73842+ atomic_unchecked_t num_hardlinks;
73843+ atomic_unchecked_t num_symlinks;
73844+ atomic_unchecked_t num_locks;
73845+ atomic_unchecked_t num_acl_get;
73846+ atomic_unchecked_t num_acl_set;
73847 } cifs_stats;
73848 #ifdef CONFIG_CIFS_SMB2
73849 struct {
73850- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73851- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73852+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73853+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73854 } smb2_stats;
73855 #endif /* CONFIG_CIFS_SMB2 */
73856 } stats;
73857@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
73858 }
73859
73860 #ifdef CONFIG_CIFS_STATS
73861-#define cifs_stats_inc atomic_inc
73862+#define cifs_stats_inc atomic_inc_unchecked
73863
73864 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
73865 unsigned int bytes)
73866@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
73867 /* Various Debug counters */
73868 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
73869 #ifdef CONFIG_CIFS_STATS2
73870-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
73871-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
73872+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
73873+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
73874 #endif
73875 GLOBAL_EXTERN atomic_t smBufAllocCount;
73876 GLOBAL_EXTERN atomic_t midCount;
73877diff --git a/fs/cifs/file.c b/fs/cifs/file.c
73878index 3f50cee..7741620 100644
73879--- a/fs/cifs/file.c
73880+++ b/fs/cifs/file.c
73881@@ -2054,10 +2054,14 @@ static int cifs_writepages(struct address_space *mapping,
73882 index = mapping->writeback_index; /* Start from prev offset */
73883 end = -1;
73884 } else {
73885- index = wbc->range_start >> PAGE_CACHE_SHIFT;
73886- end = wbc->range_end >> PAGE_CACHE_SHIFT;
73887- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
73888+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
73889 range_whole = true;
73890+ index = 0;
73891+ end = ULONG_MAX;
73892+ } else {
73893+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
73894+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
73895+ }
73896 scanned = true;
73897 }
73898 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
73899diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
73900index 8442b8b..ea6986f 100644
73901--- a/fs/cifs/misc.c
73902+++ b/fs/cifs/misc.c
73903@@ -170,7 +170,7 @@ cifs_buf_get(void)
73904 memset(ret_buf, 0, buf_size + 3);
73905 atomic_inc(&bufAllocCount);
73906 #ifdef CONFIG_CIFS_STATS2
73907- atomic_inc(&totBufAllocCount);
73908+ atomic_inc_unchecked(&totBufAllocCount);
73909 #endif /* CONFIG_CIFS_STATS2 */
73910 }
73911
73912@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
73913 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
73914 atomic_inc(&smBufAllocCount);
73915 #ifdef CONFIG_CIFS_STATS2
73916- atomic_inc(&totSmBufAllocCount);
73917+ atomic_inc_unchecked(&totSmBufAllocCount);
73918 #endif /* CONFIG_CIFS_STATS2 */
73919
73920 }
73921diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
73922index fc537c2..47d654c 100644
73923--- a/fs/cifs/smb1ops.c
73924+++ b/fs/cifs/smb1ops.c
73925@@ -622,27 +622,27 @@ static void
73926 cifs_clear_stats(struct cifs_tcon *tcon)
73927 {
73928 #ifdef CONFIG_CIFS_STATS
73929- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
73930- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
73931- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
73932- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73933- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
73934- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
73935- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73936- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
73937- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
73938- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
73939- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
73940- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
73941- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
73942- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
73943- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
73944- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
73945- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
73946- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
73947- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
73948- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
73949- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
73950+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
73951+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
73952+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
73953+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73954+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
73955+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
73956+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73957+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
73958+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
73959+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
73960+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
73961+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
73962+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
73963+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
73964+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
73965+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
73966+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
73967+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
73968+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
73969+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
73970+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
73971 #endif
73972 }
73973
73974@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73975 {
73976 #ifdef CONFIG_CIFS_STATS
73977 seq_printf(m, " Oplocks breaks: %d",
73978- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
73979+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
73980 seq_printf(m, "\nReads: %d Bytes: %llu",
73981- atomic_read(&tcon->stats.cifs_stats.num_reads),
73982+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
73983 (long long)(tcon->bytes_read));
73984 seq_printf(m, "\nWrites: %d Bytes: %llu",
73985- atomic_read(&tcon->stats.cifs_stats.num_writes),
73986+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
73987 (long long)(tcon->bytes_written));
73988 seq_printf(m, "\nFlushes: %d",
73989- atomic_read(&tcon->stats.cifs_stats.num_flushes));
73990+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
73991 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
73992- atomic_read(&tcon->stats.cifs_stats.num_locks),
73993- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
73994- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
73995+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
73996+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
73997+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
73998 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
73999- atomic_read(&tcon->stats.cifs_stats.num_opens),
74000- atomic_read(&tcon->stats.cifs_stats.num_closes),
74001- atomic_read(&tcon->stats.cifs_stats.num_deletes));
74002+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
74003+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
74004+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
74005 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
74006- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
74007- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
74008+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
74009+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
74010 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
74011- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
74012- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
74013+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
74014+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
74015 seq_printf(m, "\nRenames: %d T2 Renames %d",
74016- atomic_read(&tcon->stats.cifs_stats.num_renames),
74017- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
74018+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
74019+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
74020 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
74021- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
74022- atomic_read(&tcon->stats.cifs_stats.num_fnext),
74023- atomic_read(&tcon->stats.cifs_stats.num_fclose));
74024+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
74025+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
74026+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
74027 #endif
74028 }
74029
74030diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
74031index 54daee5..2669fcb 100644
74032--- a/fs/cifs/smb2ops.c
74033+++ b/fs/cifs/smb2ops.c
74034@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
74035 #ifdef CONFIG_CIFS_STATS
74036 int i;
74037 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
74038- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
74039- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
74040+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
74041+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
74042 }
74043 #endif
74044 }
74045@@ -459,65 +459,65 @@ static void
74046 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
74047 {
74048 #ifdef CONFIG_CIFS_STATS
74049- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
74050- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
74051+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
74052+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
74053 seq_printf(m, "\nNegotiates: %d sent %d failed",
74054- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
74055- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
74056+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
74057+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
74058 seq_printf(m, "\nSessionSetups: %d sent %d failed",
74059- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
74060- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
74061+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
74062+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
74063 seq_printf(m, "\nLogoffs: %d sent %d failed",
74064- atomic_read(&sent[SMB2_LOGOFF_HE]),
74065- atomic_read(&failed[SMB2_LOGOFF_HE]));
74066+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
74067+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
74068 seq_printf(m, "\nTreeConnects: %d sent %d failed",
74069- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
74070- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
74071+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
74072+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
74073 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
74074- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
74075- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
74076+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
74077+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
74078 seq_printf(m, "\nCreates: %d sent %d failed",
74079- atomic_read(&sent[SMB2_CREATE_HE]),
74080- atomic_read(&failed[SMB2_CREATE_HE]));
74081+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
74082+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
74083 seq_printf(m, "\nCloses: %d sent %d failed",
74084- atomic_read(&sent[SMB2_CLOSE_HE]),
74085- atomic_read(&failed[SMB2_CLOSE_HE]));
74086+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
74087+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
74088 seq_printf(m, "\nFlushes: %d sent %d failed",
74089- atomic_read(&sent[SMB2_FLUSH_HE]),
74090- atomic_read(&failed[SMB2_FLUSH_HE]));
74091+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
74092+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
74093 seq_printf(m, "\nReads: %d sent %d failed",
74094- atomic_read(&sent[SMB2_READ_HE]),
74095- atomic_read(&failed[SMB2_READ_HE]));
74096+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
74097+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
74098 seq_printf(m, "\nWrites: %d sent %d failed",
74099- atomic_read(&sent[SMB2_WRITE_HE]),
74100- atomic_read(&failed[SMB2_WRITE_HE]));
74101+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
74102+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
74103 seq_printf(m, "\nLocks: %d sent %d failed",
74104- atomic_read(&sent[SMB2_LOCK_HE]),
74105- atomic_read(&failed[SMB2_LOCK_HE]));
74106+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
74107+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
74108 seq_printf(m, "\nIOCTLs: %d sent %d failed",
74109- atomic_read(&sent[SMB2_IOCTL_HE]),
74110- atomic_read(&failed[SMB2_IOCTL_HE]));
74111+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
74112+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
74113 seq_printf(m, "\nCancels: %d sent %d failed",
74114- atomic_read(&sent[SMB2_CANCEL_HE]),
74115- atomic_read(&failed[SMB2_CANCEL_HE]));
74116+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
74117+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
74118 seq_printf(m, "\nEchos: %d sent %d failed",
74119- atomic_read(&sent[SMB2_ECHO_HE]),
74120- atomic_read(&failed[SMB2_ECHO_HE]));
74121+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
74122+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
74123 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
74124- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
74125- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
74126+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
74127+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
74128 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
74129- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
74130- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
74131+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
74132+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
74133 seq_printf(m, "\nQueryInfos: %d sent %d failed",
74134- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
74135- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
74136+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
74137+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
74138 seq_printf(m, "\nSetInfos: %d sent %d failed",
74139- atomic_read(&sent[SMB2_SET_INFO_HE]),
74140- atomic_read(&failed[SMB2_SET_INFO_HE]));
74141+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
74142+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
74143 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
74144- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
74145- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
74146+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
74147+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
74148 #endif
74149 }
74150
74151diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
74152index 54cbe19..fcd4a1b 100644
74153--- a/fs/cifs/smb2pdu.c
74154+++ b/fs/cifs/smb2pdu.c
74155@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
74156 default:
74157 cifs_dbg(VFS, "info level %u isn't supported\n",
74158 srch_inf->info_level);
74159- rc = -EINVAL;
74160- goto qdir_exit;
74161+ return -EINVAL;
74162 }
74163
74164 req->FileIndex = cpu_to_le32(index);
74165diff --git a/fs/coda/cache.c b/fs/coda/cache.c
74166index 5bb630a..043dc70 100644
74167--- a/fs/coda/cache.c
74168+++ b/fs/coda/cache.c
74169@@ -24,7 +24,7 @@
74170 #include "coda_linux.h"
74171 #include "coda_cache.h"
74172
74173-static atomic_t permission_epoch = ATOMIC_INIT(0);
74174+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
74175
74176 /* replace or extend an acl cache hit */
74177 void coda_cache_enter(struct inode *inode, int mask)
74178@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
74179 struct coda_inode_info *cii = ITOC(inode);
74180
74181 spin_lock(&cii->c_lock);
74182- cii->c_cached_epoch = atomic_read(&permission_epoch);
74183+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
74184 if (!uid_eq(cii->c_uid, current_fsuid())) {
74185 cii->c_uid = current_fsuid();
74186 cii->c_cached_perm = mask;
74187@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
74188 {
74189 struct coda_inode_info *cii = ITOC(inode);
74190 spin_lock(&cii->c_lock);
74191- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
74192+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
74193 spin_unlock(&cii->c_lock);
74194 }
74195
74196 /* remove all acl caches */
74197 void coda_cache_clear_all(struct super_block *sb)
74198 {
74199- atomic_inc(&permission_epoch);
74200+ atomic_inc_unchecked(&permission_epoch);
74201 }
74202
74203
74204@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
74205 spin_lock(&cii->c_lock);
74206 hit = (mask & cii->c_cached_perm) == mask &&
74207 uid_eq(cii->c_uid, current_fsuid()) &&
74208- cii->c_cached_epoch == atomic_read(&permission_epoch);
74209+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
74210 spin_unlock(&cii->c_lock);
74211
74212 return hit;
74213diff --git a/fs/compat.c b/fs/compat.c
74214index 6fd272d..dd34ba2 100644
74215--- a/fs/compat.c
74216+++ b/fs/compat.c
74217@@ -54,7 +54,7 @@
74218 #include <asm/ioctls.h>
74219 #include "internal.h"
74220
74221-int compat_log = 1;
74222+int compat_log = 0;
74223
74224 int compat_printk(const char *fmt, ...)
74225 {
74226@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
74227
74228 set_fs(KERNEL_DS);
74229 /* The __user pointer cast is valid because of the set_fs() */
74230- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
74231+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
74232 set_fs(oldfs);
74233 /* truncating is ok because it's a user address */
74234 if (!ret)
74235@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
74236 goto out;
74237
74238 ret = -EINVAL;
74239- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
74240+ if (nr_segs > UIO_MAXIOV)
74241 goto out;
74242 if (nr_segs > fast_segs) {
74243 ret = -ENOMEM;
74244@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
74245 struct compat_readdir_callback {
74246 struct dir_context ctx;
74247 struct compat_old_linux_dirent __user *dirent;
74248+ struct file * file;
74249 int result;
74250 };
74251
74252@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
74253 buf->result = -EOVERFLOW;
74254 return -EOVERFLOW;
74255 }
74256+
74257+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74258+ return 0;
74259+
74260 buf->result++;
74261 dirent = buf->dirent;
74262 if (!access_ok(VERIFY_WRITE, dirent,
74263@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
74264 if (!f.file)
74265 return -EBADF;
74266
74267+ buf.file = f.file;
74268 error = iterate_dir(f.file, &buf.ctx);
74269 if (buf.result)
74270 error = buf.result;
74271@@ -913,6 +919,7 @@ struct compat_getdents_callback {
74272 struct dir_context ctx;
74273 struct compat_linux_dirent __user *current_dir;
74274 struct compat_linux_dirent __user *previous;
74275+ struct file * file;
74276 int count;
74277 int error;
74278 };
74279@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
74280 buf->error = -EOVERFLOW;
74281 return -EOVERFLOW;
74282 }
74283+
74284+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74285+ return 0;
74286+
74287 dirent = buf->previous;
74288 if (dirent) {
74289 if (__put_user(offset, &dirent->d_off))
74290@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
74291 if (!f.file)
74292 return -EBADF;
74293
74294+ buf.file = f.file;
74295 error = iterate_dir(f.file, &buf.ctx);
74296 if (error >= 0)
74297 error = buf.error;
74298@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
74299 struct dir_context ctx;
74300 struct linux_dirent64 __user *current_dir;
74301 struct linux_dirent64 __user *previous;
74302+ struct file * file;
74303 int count;
74304 int error;
74305 };
74306@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
74307 buf->error = -EINVAL; /* only used if we fail.. */
74308 if (reclen > buf->count)
74309 return -EINVAL;
74310+
74311+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74312+ return 0;
74313+
74314 dirent = buf->previous;
74315
74316 if (dirent) {
74317@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
74318 if (!f.file)
74319 return -EBADF;
74320
74321+ buf.file = f.file;
74322 error = iterate_dir(f.file, &buf.ctx);
74323 if (error >= 0)
74324 error = buf.error;
74325diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
74326index 4d24d17..4f8c09e 100644
74327--- a/fs/compat_binfmt_elf.c
74328+++ b/fs/compat_binfmt_elf.c
74329@@ -30,11 +30,13 @@
74330 #undef elf_phdr
74331 #undef elf_shdr
74332 #undef elf_note
74333+#undef elf_dyn
74334 #undef elf_addr_t
74335 #define elfhdr elf32_hdr
74336 #define elf_phdr elf32_phdr
74337 #define elf_shdr elf32_shdr
74338 #define elf_note elf32_note
74339+#define elf_dyn Elf32_Dyn
74340 #define elf_addr_t Elf32_Addr
74341
74342 /*
74343diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
74344index 6b8e2f0..9b13a5e 100644
74345--- a/fs/compat_ioctl.c
74346+++ b/fs/compat_ioctl.c
74347@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
74348 return -EFAULT;
74349 if (__get_user(udata, &ss32->iomem_base))
74350 return -EFAULT;
74351- ss.iomem_base = compat_ptr(udata);
74352+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
74353 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
74354 __get_user(ss.port_high, &ss32->port_high))
74355 return -EFAULT;
74356@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
74357 for (i = 0; i < nmsgs; i++) {
74358 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
74359 return -EFAULT;
74360- if (get_user(datap, &umsgs[i].buf) ||
74361- put_user(compat_ptr(datap), &tmsgs[i].buf))
74362+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
74363+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
74364 return -EFAULT;
74365 }
74366 return sys_ioctl(fd, cmd, (unsigned long)tdata);
74367@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
74368 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
74369 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
74370 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
74371- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
74372+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
74373 return -EFAULT;
74374
74375 return ioctl_preallocate(file, p);
74376@@ -1620,8 +1620,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
74377 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
74378 {
74379 unsigned int a, b;
74380- a = *(unsigned int *)p;
74381- b = *(unsigned int *)q;
74382+ a = *(const unsigned int *)p;
74383+ b = *(const unsigned int *)q;
74384 if (a > b)
74385 return 1;
74386 if (a < b)
74387diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
74388index c81ce7f..f3de5fd 100644
74389--- a/fs/configfs/dir.c
74390+++ b/fs/configfs/dir.c
74391@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74392 }
74393 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
74394 struct configfs_dirent *next;
74395- const char *name;
74396+ const unsigned char * name;
74397+ char d_name[sizeof(next->s_dentry->d_iname)];
74398 int len;
74399 struct inode *inode = NULL;
74400
74401@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74402 continue;
74403
74404 name = configfs_get_name(next);
74405- len = strlen(name);
74406+ if (next->s_dentry && name == next->s_dentry->d_iname) {
74407+ len = next->s_dentry->d_name.len;
74408+ memcpy(d_name, name, len);
74409+ name = d_name;
74410+ } else
74411+ len = strlen(name);
74412
74413 /*
74414 * We'll have a dentry and an inode for
74415diff --git a/fs/configfs/item.c b/fs/configfs/item.c
74416index e65f9ff..3ed264d 100644
74417--- a/fs/configfs/item.c
74418+++ b/fs/configfs/item.c
74419@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
74420 const char *name,
74421 struct config_item_type *type)
74422 {
74423- config_item_set_name(item, name);
74424+ config_item_set_name(item, "%s", name);
74425 item->ci_type = type;
74426 config_item_init(item);
74427 }
74428@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
74429 void config_group_init_type_name(struct config_group *group, const char *name,
74430 struct config_item_type *type)
74431 {
74432- config_item_set_name(&group->cg_item, name);
74433+ config_item_set_name(&group->cg_item, "%s", name);
74434 group->cg_item.ci_type = type;
74435 config_group_init(group);
74436 }
74437diff --git a/fs/coredump.c b/fs/coredump.c
74438index bbbe139..b76fae5 100644
74439--- a/fs/coredump.c
74440+++ b/fs/coredump.c
74441@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
74442 struct pipe_inode_info *pipe = file->private_data;
74443
74444 pipe_lock(pipe);
74445- pipe->readers++;
74446- pipe->writers--;
74447+ atomic_inc(&pipe->readers);
74448+ atomic_dec(&pipe->writers);
74449 wake_up_interruptible_sync(&pipe->wait);
74450 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
74451 pipe_unlock(pipe);
74452@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
74453 * We actually want wait_event_freezable() but then we need
74454 * to clear TIF_SIGPENDING and improve dump_interrupted().
74455 */
74456- wait_event_interruptible(pipe->wait, pipe->readers == 1);
74457+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
74458
74459 pipe_lock(pipe);
74460- pipe->readers--;
74461- pipe->writers++;
74462+ atomic_dec(&pipe->readers);
74463+ atomic_inc(&pipe->writers);
74464 pipe_unlock(pipe);
74465 }
74466
74467@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
74468 struct files_struct *displaced;
74469 bool need_nonrelative = false;
74470 bool core_dumped = false;
74471- static atomic_t core_dump_count = ATOMIC_INIT(0);
74472+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
74473+ long signr = siginfo->si_signo;
74474+ int dumpable;
74475 struct coredump_params cprm = {
74476 .siginfo = siginfo,
74477 .regs = signal_pt_regs(),
74478@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
74479 .mm_flags = mm->flags,
74480 };
74481
74482- audit_core_dumps(siginfo->si_signo);
74483+ audit_core_dumps(signr);
74484+
74485+ dumpable = __get_dumpable(cprm.mm_flags);
74486+
74487+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
74488+ gr_handle_brute_attach(dumpable);
74489
74490 binfmt = mm->binfmt;
74491 if (!binfmt || !binfmt->core_dump)
74492 goto fail;
74493- if (!__get_dumpable(cprm.mm_flags))
74494+ if (!dumpable)
74495 goto fail;
74496
74497 cred = prepare_creds();
74498@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
74499 need_nonrelative = true;
74500 }
74501
74502- retval = coredump_wait(siginfo->si_signo, &core_state);
74503+ retval = coredump_wait(signr, &core_state);
74504 if (retval < 0)
74505 goto fail_creds;
74506
74507@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
74508 }
74509 cprm.limit = RLIM_INFINITY;
74510
74511- dump_count = atomic_inc_return(&core_dump_count);
74512+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
74513 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
74514 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
74515 task_tgid_vnr(current), current->comm);
74516@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
74517 } else {
74518 struct inode *inode;
74519
74520+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
74521+
74522 if (cprm.limit < binfmt->min_coredump)
74523 goto fail_unlock;
74524
74525@@ -681,7 +690,7 @@ close_fail:
74526 filp_close(cprm.file, NULL);
74527 fail_dropcount:
74528 if (ispipe)
74529- atomic_dec(&core_dump_count);
74530+ atomic_dec_unchecked(&core_dump_count);
74531 fail_unlock:
74532 kfree(cn.corename);
74533 coredump_finish(mm, core_dumped);
74534@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
74535 struct file *file = cprm->file;
74536 loff_t pos = file->f_pos;
74537 ssize_t n;
74538+
74539+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
74540 if (cprm->written + nr > cprm->limit)
74541 return 0;
74542 while (nr) {
74543diff --git a/fs/dcache.c b/fs/dcache.c
74544index 50bb3c2..d874b57 100644
74545--- a/fs/dcache.c
74546+++ b/fs/dcache.c
74547@@ -545,7 +545,7 @@ static void __dentry_kill(struct dentry *dentry)
74548 * dentry_iput drops the locks, at which point nobody (except
74549 * transient RCU lookups) can reach this dentry.
74550 */
74551- BUG_ON(dentry->d_lockref.count > 0);
74552+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
74553 this_cpu_dec(nr_dentry);
74554 if (dentry->d_op && dentry->d_op->d_release)
74555 dentry->d_op->d_release(dentry);
74556@@ -598,7 +598,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
74557 struct dentry *parent = dentry->d_parent;
74558 if (IS_ROOT(dentry))
74559 return NULL;
74560- if (unlikely(dentry->d_lockref.count < 0))
74561+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
74562 return NULL;
74563 if (likely(spin_trylock(&parent->d_lock)))
74564 return parent;
74565@@ -642,7 +642,7 @@ static inline bool fast_dput(struct dentry *dentry)
74566
74567 /*
74568 * If we have a d_op->d_delete() operation, we sould not
74569- * let the dentry count go to zero, so use "put__or_lock".
74570+ * let the dentry count go to zero, so use "put_or_lock".
74571 */
74572 if (unlikely(dentry->d_flags & DCACHE_OP_DELETE))
74573 return lockref_put_or_lock(&dentry->d_lockref);
74574@@ -660,8 +660,8 @@ static inline bool fast_dput(struct dentry *dentry)
74575 */
74576 if (unlikely(ret < 0)) {
74577 spin_lock(&dentry->d_lock);
74578- if (dentry->d_lockref.count > 1) {
74579- dentry->d_lockref.count--;
74580+ if (__lockref_read(&dentry->d_lockref) > 1) {
74581+ __lockref_dec(&dentry->d_lockref);
74582 spin_unlock(&dentry->d_lock);
74583 return 1;
74584 }
74585@@ -697,7 +697,7 @@ static inline bool fast_dput(struct dentry *dentry)
74586 */
74587 smp_rmb();
74588 d_flags = ACCESS_ONCE(dentry->d_flags);
74589- d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST;
74590+ d_flags &= DCACHE_REFERENCED | DCACHE_LRU_LIST | DCACHE_DISCONNECTED;
74591
74592 /* Nothing to do? Dropping the reference was all we needed? */
74593 if (d_flags == (DCACHE_REFERENCED | DCACHE_LRU_LIST) && !d_unhashed(dentry))
74594@@ -716,7 +716,7 @@ static inline bool fast_dput(struct dentry *dentry)
74595 * else could have killed it and marked it dead. Either way, we
74596 * don't need to do anything else.
74597 */
74598- if (dentry->d_lockref.count) {
74599+ if (__lockref_read(&dentry->d_lockref)) {
74600 spin_unlock(&dentry->d_lock);
74601 return 1;
74602 }
74603@@ -726,7 +726,7 @@ static inline bool fast_dput(struct dentry *dentry)
74604 * lock, and we just tested that it was zero, so we can just
74605 * set it to 1.
74606 */
74607- dentry->d_lockref.count = 1;
74608+ __lockref_set(&dentry->d_lockref, 1);
74609 return 0;
74610 }
74611
74612@@ -776,6 +776,9 @@ repeat:
74613 if (unlikely(d_unhashed(dentry)))
74614 goto kill_it;
74615
74616+ if (unlikely(dentry->d_flags & DCACHE_DISCONNECTED))
74617+ goto kill_it;
74618+
74619 if (unlikely(dentry->d_flags & DCACHE_OP_DELETE)) {
74620 if (dentry->d_op->d_delete(dentry))
74621 goto kill_it;
74622@@ -785,7 +788,7 @@ repeat:
74623 dentry->d_flags |= DCACHE_REFERENCED;
74624 dentry_lru_add(dentry);
74625
74626- dentry->d_lockref.count--;
74627+ __lockref_dec(&dentry->d_lockref);
74628 spin_unlock(&dentry->d_lock);
74629 return;
74630
74631@@ -800,7 +803,7 @@ EXPORT_SYMBOL(dput);
74632 /* This must be called with d_lock held */
74633 static inline void __dget_dlock(struct dentry *dentry)
74634 {
74635- dentry->d_lockref.count++;
74636+ __lockref_inc(&dentry->d_lockref);
74637 }
74638
74639 static inline void __dget(struct dentry *dentry)
74640@@ -841,8 +844,8 @@ repeat:
74641 goto repeat;
74642 }
74643 rcu_read_unlock();
74644- BUG_ON(!ret->d_lockref.count);
74645- ret->d_lockref.count++;
74646+ BUG_ON(!__lockref_read(&ret->d_lockref));
74647+ __lockref_inc(&ret->d_lockref);
74648 spin_unlock(&ret->d_lock);
74649 return ret;
74650 }
74651@@ -920,9 +923,9 @@ restart:
74652 spin_lock(&inode->i_lock);
74653 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
74654 spin_lock(&dentry->d_lock);
74655- if (!dentry->d_lockref.count) {
74656+ if (!__lockref_read(&dentry->d_lockref)) {
74657 struct dentry *parent = lock_parent(dentry);
74658- if (likely(!dentry->d_lockref.count)) {
74659+ if (likely(!__lockref_read(&dentry->d_lockref))) {
74660 __dentry_kill(dentry);
74661 dput(parent);
74662 goto restart;
74663@@ -957,7 +960,7 @@ static void shrink_dentry_list(struct list_head *list)
74664 * We found an inuse dentry which was not removed from
74665 * the LRU because of laziness during lookup. Do not free it.
74666 */
74667- if (dentry->d_lockref.count > 0) {
74668+ if (__lockref_read(&dentry->d_lockref) > 0) {
74669 spin_unlock(&dentry->d_lock);
74670 if (parent)
74671 spin_unlock(&parent->d_lock);
74672@@ -995,8 +998,8 @@ static void shrink_dentry_list(struct list_head *list)
74673 dentry = parent;
74674 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
74675 parent = lock_parent(dentry);
74676- if (dentry->d_lockref.count != 1) {
74677- dentry->d_lockref.count--;
74678+ if (__lockref_read(&dentry->d_lockref) != 1) {
74679+ __lockref_inc(&dentry->d_lockref);
74680 spin_unlock(&dentry->d_lock);
74681 if (parent)
74682 spin_unlock(&parent->d_lock);
74683@@ -1036,7 +1039,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
74684 * counts, just remove them from the LRU. Otherwise give them
74685 * another pass through the LRU.
74686 */
74687- if (dentry->d_lockref.count) {
74688+ if (__lockref_read(&dentry->d_lockref)) {
74689 d_lru_isolate(lru, dentry);
74690 spin_unlock(&dentry->d_lock);
74691 return LRU_REMOVED;
74692@@ -1370,7 +1373,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
74693 } else {
74694 if (dentry->d_flags & DCACHE_LRU_LIST)
74695 d_lru_del(dentry);
74696- if (!dentry->d_lockref.count) {
74697+ if (!__lockref_read(&dentry->d_lockref)) {
74698 d_shrink_add(dentry, &data->dispose);
74699 data->found++;
74700 }
74701@@ -1418,7 +1421,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74702 return D_WALK_CONTINUE;
74703
74704 /* root with refcount 1 is fine */
74705- if (dentry == _data && dentry->d_lockref.count == 1)
74706+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
74707 return D_WALK_CONTINUE;
74708
74709 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
74710@@ -1427,7 +1430,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74711 dentry->d_inode ?
74712 dentry->d_inode->i_ino : 0UL,
74713 dentry,
74714- dentry->d_lockref.count,
74715+ __lockref_read(&dentry->d_lockref),
74716 dentry->d_sb->s_type->name,
74717 dentry->d_sb->s_id);
74718 WARN_ON(1);
74719@@ -1568,7 +1571,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74720 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
74721 if (name->len > DNAME_INLINE_LEN-1) {
74722 size_t size = offsetof(struct external_name, name[1]);
74723- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
74724+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
74725 if (!p) {
74726 kmem_cache_free(dentry_cache, dentry);
74727 return NULL;
74728@@ -1591,7 +1594,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74729 smp_wmb();
74730 dentry->d_name.name = dname;
74731
74732- dentry->d_lockref.count = 1;
74733+ __lockref_set(&dentry->d_lockref, 1);
74734 dentry->d_flags = 0;
74735 spin_lock_init(&dentry->d_lock);
74736 seqcount_init(&dentry->d_seq);
74737@@ -1600,6 +1603,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74738 dentry->d_sb = sb;
74739 dentry->d_op = NULL;
74740 dentry->d_fsdata = NULL;
74741+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
74742+ atomic_set(&dentry->chroot_refcnt, 0);
74743+#endif
74744 INIT_HLIST_BL_NODE(&dentry->d_hash);
74745 INIT_LIST_HEAD(&dentry->d_lru);
74746 INIT_LIST_HEAD(&dentry->d_subdirs);
74747@@ -2321,7 +2327,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
74748 goto next;
74749 }
74750
74751- dentry->d_lockref.count++;
74752+ __lockref_inc(&dentry->d_lockref);
74753 found = dentry;
74754 spin_unlock(&dentry->d_lock);
74755 break;
74756@@ -2389,7 +2395,7 @@ again:
74757 spin_lock(&dentry->d_lock);
74758 inode = dentry->d_inode;
74759 isdir = S_ISDIR(inode->i_mode);
74760- if (dentry->d_lockref.count == 1) {
74761+ if (__lockref_read(&dentry->d_lockref) == 1) {
74762 if (!spin_trylock(&inode->i_lock)) {
74763 spin_unlock(&dentry->d_lock);
74764 cpu_relax();
74765@@ -3331,7 +3337,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
74766
74767 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
74768 dentry->d_flags |= DCACHE_GENOCIDE;
74769- dentry->d_lockref.count--;
74770+ __lockref_dec(&dentry->d_lockref);
74771 }
74772 }
74773 return D_WALK_CONTINUE;
74774@@ -3447,7 +3453,8 @@ void __init vfs_caches_init(unsigned long mempages)
74775 mempages -= reserve;
74776
74777 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
74778- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
74779+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
74780+ SLAB_NO_SANITIZE, NULL);
74781
74782 dcache_init();
74783 inode_init();
74784diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
74785index 1275604..d2ca85b 100644
74786--- a/fs/debugfs/inode.c
74787+++ b/fs/debugfs/inode.c
74788@@ -407,6 +407,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
74789 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
74790 * returned.
74791 */
74792+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74793+extern int grsec_enable_sysfs_restrict;
74794+#endif
74795+
74796 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74797 {
74798 struct dentry *dentry = start_creating(name, parent);
74799@@ -419,7 +423,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74800 if (unlikely(!inode))
74801 return failed_creating(dentry);
74802
74803- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74804+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74805+ if (grsec_enable_sysfs_restrict)
74806+ inode->i_mode = S_IFDIR | S_IRWXU;
74807+ else
74808+#endif
74809+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74810 inode->i_op = &simple_dir_inode_operations;
74811 inode->i_fop = &simple_dir_operations;
74812
74813diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
74814index fc850b5..1677a2a 100644
74815--- a/fs/ecryptfs/inode.c
74816+++ b/fs/ecryptfs/inode.c
74817@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
74818 old_fs = get_fs();
74819 set_fs(get_ds());
74820 rc = d_inode(lower_dentry)->i_op->readlink(lower_dentry,
74821- (char __user *)lower_buf,
74822+ (char __force_user *)lower_buf,
74823 PATH_MAX);
74824 set_fs(old_fs);
74825 if (rc < 0)
74826diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
74827index e4141f2..d8263e8 100644
74828--- a/fs/ecryptfs/miscdev.c
74829+++ b/fs/ecryptfs/miscdev.c
74830@@ -304,7 +304,7 @@ check_list:
74831 goto out_unlock_msg_ctx;
74832 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
74833 if (msg_ctx->msg) {
74834- if (copy_to_user(&buf[i], packet_length, packet_length_size))
74835+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
74836 goto out_unlock_msg_ctx;
74837 i += packet_length_size;
74838 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
74839diff --git a/fs/exec.c b/fs/exec.c
74840index 1977c2a..40e7f8f 100644
74841--- a/fs/exec.c
74842+++ b/fs/exec.c
74843@@ -56,8 +56,20 @@
74844 #include <linux/pipe_fs_i.h>
74845 #include <linux/oom.h>
74846 #include <linux/compat.h>
74847+#include <linux/random.h>
74848+#include <linux/seq_file.h>
74849+#include <linux/coredump.h>
74850+#include <linux/mman.h>
74851+
74852+#ifdef CONFIG_PAX_REFCOUNT
74853+#include <linux/kallsyms.h>
74854+#include <linux/kdebug.h>
74855+#endif
74856+
74857+#include <trace/events/fs.h>
74858
74859 #include <asm/uaccess.h>
74860+#include <asm/sections.h>
74861 #include <asm/mmu_context.h>
74862 #include <asm/tlb.h>
74863
74864@@ -66,19 +78,34 @@
74865
74866 #include <trace/events/sched.h>
74867
74868+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74869+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
74870+{
74871+ 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");
74872+}
74873+#endif
74874+
74875+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
74876+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74877+EXPORT_SYMBOL(pax_set_initial_flags_func);
74878+#endif
74879+
74880 int suid_dumpable = 0;
74881
74882 static LIST_HEAD(formats);
74883 static DEFINE_RWLOCK(binfmt_lock);
74884
74885+extern int gr_process_kernel_exec_ban(void);
74886+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
74887+
74888 void __register_binfmt(struct linux_binfmt * fmt, int insert)
74889 {
74890 BUG_ON(!fmt);
74891 if (WARN_ON(!fmt->load_binary))
74892 return;
74893 write_lock(&binfmt_lock);
74894- insert ? list_add(&fmt->lh, &formats) :
74895- list_add_tail(&fmt->lh, &formats);
74896+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
74897+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
74898 write_unlock(&binfmt_lock);
74899 }
74900
74901@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
74902 void unregister_binfmt(struct linux_binfmt * fmt)
74903 {
74904 write_lock(&binfmt_lock);
74905- list_del(&fmt->lh);
74906+ pax_list_del((struct list_head *)&fmt->lh);
74907 write_unlock(&binfmt_lock);
74908 }
74909
74910@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74911 int write)
74912 {
74913 struct page *page;
74914- int ret;
74915
74916-#ifdef CONFIG_STACK_GROWSUP
74917- if (write) {
74918- ret = expand_downwards(bprm->vma, pos);
74919- if (ret < 0)
74920- return NULL;
74921- }
74922-#endif
74923- ret = get_user_pages(current, bprm->mm, pos,
74924- 1, write, 1, &page, NULL);
74925- if (ret <= 0)
74926+ if (0 > expand_downwards(bprm->vma, pos))
74927+ return NULL;
74928+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
74929 return NULL;
74930
74931 if (write) {
74932@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74933 if (size <= ARG_MAX)
74934 return page;
74935
74936+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74937+ // only allow 512KB for argv+env on suid/sgid binaries
74938+ // to prevent easy ASLR exhaustion
74939+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
74940+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
74941+ (size > (512 * 1024))) {
74942+ put_page(page);
74943+ return NULL;
74944+ }
74945+#endif
74946+
74947 /*
74948 * Limit to 1/4-th the stack size for the argv+env strings.
74949 * This ensures that:
74950@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74951 vma->vm_end = STACK_TOP_MAX;
74952 vma->vm_start = vma->vm_end - PAGE_SIZE;
74953 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
74954+
74955+#ifdef CONFIG_PAX_SEGMEXEC
74956+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
74957+#endif
74958+
74959 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
74960 INIT_LIST_HEAD(&vma->anon_vma_chain);
74961
74962@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74963 arch_bprm_mm_init(mm, vma);
74964 up_write(&mm->mmap_sem);
74965 bprm->p = vma->vm_end - sizeof(void *);
74966+
74967+#ifdef CONFIG_PAX_RANDUSTACK
74968+ if (randomize_va_space)
74969+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
74970+#endif
74971+
74972 return 0;
74973 err:
74974 up_write(&mm->mmap_sem);
74975@@ -396,7 +437,7 @@ struct user_arg_ptr {
74976 } ptr;
74977 };
74978
74979-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74980+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74981 {
74982 const char __user *native;
74983
74984@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74985 compat_uptr_t compat;
74986
74987 if (get_user(compat, argv.ptr.compat + nr))
74988- return ERR_PTR(-EFAULT);
74989+ return (const char __force_user *)ERR_PTR(-EFAULT);
74990
74991 return compat_ptr(compat);
74992 }
74993 #endif
74994
74995 if (get_user(native, argv.ptr.native + nr))
74996- return ERR_PTR(-EFAULT);
74997+ return (const char __force_user *)ERR_PTR(-EFAULT);
74998
74999 return native;
75000 }
75001@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
75002 if (!p)
75003 break;
75004
75005- if (IS_ERR(p))
75006+ if (IS_ERR((const char __force_kernel *)p))
75007 return -EFAULT;
75008
75009 if (i >= max)
75010@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
75011
75012 ret = -EFAULT;
75013 str = get_user_arg_ptr(argv, argc);
75014- if (IS_ERR(str))
75015+ if (IS_ERR((const char __force_kernel *)str))
75016 goto out;
75017
75018 len = strnlen_user(str, MAX_ARG_STRLEN);
75019@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
75020 int r;
75021 mm_segment_t oldfs = get_fs();
75022 struct user_arg_ptr argv = {
75023- .ptr.native = (const char __user *const __user *)__argv,
75024+ .ptr.native = (const char __user * const __force_user *)__argv,
75025 };
75026
75027 set_fs(KERNEL_DS);
75028@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
75029 unsigned long new_end = old_end - shift;
75030 struct mmu_gather tlb;
75031
75032- BUG_ON(new_start > new_end);
75033+ if (new_start >= new_end || new_start < mmap_min_addr)
75034+ return -ENOMEM;
75035
75036 /*
75037 * ensure there are no vmas between where we want to go
75038@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
75039 if (vma != find_vma(mm, new_start))
75040 return -EFAULT;
75041
75042+#ifdef CONFIG_PAX_SEGMEXEC
75043+ BUG_ON(pax_find_mirror_vma(vma));
75044+#endif
75045+
75046 /*
75047 * cover the whole range: [new_start, old_end)
75048 */
75049@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
75050 stack_top = arch_align_stack(stack_top);
75051 stack_top = PAGE_ALIGN(stack_top);
75052
75053- if (unlikely(stack_top < mmap_min_addr) ||
75054- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
75055- return -ENOMEM;
75056-
75057 stack_shift = vma->vm_end - stack_top;
75058
75059 bprm->p -= stack_shift;
75060@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
75061 bprm->exec -= stack_shift;
75062
75063 down_write(&mm->mmap_sem);
75064+
75065+ /* Move stack pages down in memory. */
75066+ if (stack_shift) {
75067+ ret = shift_arg_pages(vma, stack_shift);
75068+ if (ret)
75069+ goto out_unlock;
75070+ }
75071+
75072 vm_flags = VM_STACK_FLAGS;
75073
75074+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75075+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
75076+ vm_flags &= ~VM_EXEC;
75077+
75078+#ifdef CONFIG_PAX_MPROTECT
75079+ if (mm->pax_flags & MF_PAX_MPROTECT)
75080+ vm_flags &= ~VM_MAYEXEC;
75081+#endif
75082+
75083+ }
75084+#endif
75085+
75086 /*
75087 * Adjust stack execute permissions; explicitly enable for
75088 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
75089@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
75090 goto out_unlock;
75091 BUG_ON(prev != vma);
75092
75093- /* Move stack pages down in memory. */
75094- if (stack_shift) {
75095- ret = shift_arg_pages(vma, stack_shift);
75096- if (ret)
75097- goto out_unlock;
75098- }
75099-
75100 /* mprotect_fixup is overkill to remove the temporary stack flags */
75101 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
75102
75103@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
75104 #endif
75105 current->mm->start_stack = bprm->p;
75106 ret = expand_stack(vma, stack_base);
75107+
75108+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
75109+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
75110+ unsigned long size;
75111+ vm_flags_t vm_flags;
75112+
75113+ size = STACK_TOP - vma->vm_end;
75114+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
75115+
75116+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
75117+
75118+#ifdef CONFIG_X86
75119+ if (!ret) {
75120+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
75121+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
75122+ }
75123+#endif
75124+
75125+ }
75126+#endif
75127+
75128 if (ret)
75129 ret = -EFAULT;
75130
75131@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
75132 if (err)
75133 goto exit;
75134
75135- if (name->name[0] != '\0')
75136+ if (name->name[0] != '\0') {
75137 fsnotify_open(file);
75138+ trace_open_exec(name->name);
75139+ }
75140
75141 out:
75142 return file;
75143@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
75144 old_fs = get_fs();
75145 set_fs(get_ds());
75146 /* The cast to a user pointer is valid due to the set_fs() */
75147- result = vfs_read(file, (void __user *)addr, count, &pos);
75148+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
75149 set_fs(old_fs);
75150 return result;
75151 }
75152@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
75153 tsk->mm = mm;
75154 tsk->active_mm = mm;
75155 activate_mm(active_mm, mm);
75156+ populate_stack();
75157 tsk->mm->vmacache_seqnum = 0;
75158 vmacache_flush(tsk);
75159 task_unlock(tsk);
75160@@ -1271,7 +1350,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
75161 }
75162 rcu_read_unlock();
75163
75164- if (p->fs->users > n_fs)
75165+ if (atomic_read(&p->fs->users) > n_fs)
75166 bprm->unsafe |= LSM_UNSAFE_SHARE;
75167 else
75168 p->fs->in_exec = 1;
75169@@ -1472,6 +1551,31 @@ static int exec_binprm(struct linux_binprm *bprm)
75170 return ret;
75171 }
75172
75173+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75174+static DEFINE_PER_CPU(u64, exec_counter);
75175+static int __init init_exec_counters(void)
75176+{
75177+ unsigned int cpu;
75178+
75179+ for_each_possible_cpu(cpu) {
75180+ per_cpu(exec_counter, cpu) = (u64)cpu;
75181+ }
75182+
75183+ return 0;
75184+}
75185+early_initcall(init_exec_counters);
75186+static inline void increment_exec_counter(void)
75187+{
75188+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
75189+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
75190+}
75191+#else
75192+static inline void increment_exec_counter(void) {}
75193+#endif
75194+
75195+extern void gr_handle_exec_args(struct linux_binprm *bprm,
75196+ struct user_arg_ptr argv);
75197+
75198 /*
75199 * sys_execve() executes a new program.
75200 */
75201@@ -1480,6 +1584,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75202 struct user_arg_ptr envp,
75203 int flags)
75204 {
75205+#ifdef CONFIG_GRKERNSEC
75206+ struct file *old_exec_file;
75207+ struct acl_subject_label *old_acl;
75208+ struct rlimit old_rlim[RLIM_NLIMITS];
75209+#endif
75210 char *pathbuf = NULL;
75211 struct linux_binprm *bprm;
75212 struct file *file;
75213@@ -1489,6 +1598,8 @@ static int do_execveat_common(int fd, struct filename *filename,
75214 if (IS_ERR(filename))
75215 return PTR_ERR(filename);
75216
75217+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
75218+
75219 /*
75220 * We move the actual failure in case of RLIMIT_NPROC excess from
75221 * set*uid() to execve() because too many poorly written programs
75222@@ -1526,6 +1637,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75223 if (IS_ERR(file))
75224 goto out_unmark;
75225
75226+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
75227+ retval = -EPERM;
75228+ goto out_unmark;
75229+ }
75230+
75231 sched_exec();
75232
75233 bprm->file = file;
75234@@ -1552,6 +1668,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75235 }
75236 bprm->interp = bprm->filename;
75237
75238+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
75239+ retval = -EACCES;
75240+ goto out_unmark;
75241+ }
75242+
75243 retval = bprm_mm_init(bprm);
75244 if (retval)
75245 goto out_unmark;
75246@@ -1568,24 +1689,70 @@ static int do_execveat_common(int fd, struct filename *filename,
75247 if (retval < 0)
75248 goto out;
75249
75250+#ifdef CONFIG_GRKERNSEC
75251+ old_acl = current->acl;
75252+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
75253+ old_exec_file = current->exec_file;
75254+ get_file(file);
75255+ current->exec_file = file;
75256+#endif
75257+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75258+ /* limit suid stack to 8MB
75259+ * we saved the old limits above and will restore them if this exec fails
75260+ */
75261+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
75262+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
75263+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
75264+#endif
75265+
75266+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
75267+ retval = -EPERM;
75268+ goto out_fail;
75269+ }
75270+
75271+ if (!gr_tpe_allow(file)) {
75272+ retval = -EACCES;
75273+ goto out_fail;
75274+ }
75275+
75276+ if (gr_check_crash_exec(file)) {
75277+ retval = -EACCES;
75278+ goto out_fail;
75279+ }
75280+
75281+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
75282+ bprm->unsafe);
75283+ if (retval < 0)
75284+ goto out_fail;
75285+
75286 retval = copy_strings_kernel(1, &bprm->filename, bprm);
75287 if (retval < 0)
75288- goto out;
75289+ goto out_fail;
75290
75291 bprm->exec = bprm->p;
75292 retval = copy_strings(bprm->envc, envp, bprm);
75293 if (retval < 0)
75294- goto out;
75295+ goto out_fail;
75296
75297 retval = copy_strings(bprm->argc, argv, bprm);
75298 if (retval < 0)
75299- goto out;
75300+ goto out_fail;
75301+
75302+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
75303+
75304+ gr_handle_exec_args(bprm, argv);
75305
75306 retval = exec_binprm(bprm);
75307 if (retval < 0)
75308- goto out;
75309+ goto out_fail;
75310+#ifdef CONFIG_GRKERNSEC
75311+ if (old_exec_file)
75312+ fput(old_exec_file);
75313+#endif
75314
75315 /* execve succeeded */
75316+
75317+ increment_exec_counter();
75318 current->fs->in_exec = 0;
75319 current->in_execve = 0;
75320 acct_update_integrals(current);
75321@@ -1597,6 +1764,14 @@ static int do_execveat_common(int fd, struct filename *filename,
75322 put_files_struct(displaced);
75323 return retval;
75324
75325+out_fail:
75326+#ifdef CONFIG_GRKERNSEC
75327+ current->acl = old_acl;
75328+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
75329+ fput(current->exec_file);
75330+ current->exec_file = old_exec_file;
75331+#endif
75332+
75333 out:
75334 if (bprm->mm) {
75335 acct_arg_size(bprm, 0);
75336@@ -1743,3 +1918,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
75337 argv, envp, flags);
75338 }
75339 #endif
75340+
75341+int pax_check_flags(unsigned long *flags)
75342+{
75343+ int retval = 0;
75344+
75345+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
75346+ if (*flags & MF_PAX_SEGMEXEC)
75347+ {
75348+ *flags &= ~MF_PAX_SEGMEXEC;
75349+ retval = -EINVAL;
75350+ }
75351+#endif
75352+
75353+ if ((*flags & MF_PAX_PAGEEXEC)
75354+
75355+#ifdef CONFIG_PAX_PAGEEXEC
75356+ && (*flags & MF_PAX_SEGMEXEC)
75357+#endif
75358+
75359+ )
75360+ {
75361+ *flags &= ~MF_PAX_PAGEEXEC;
75362+ retval = -EINVAL;
75363+ }
75364+
75365+ if ((*flags & MF_PAX_MPROTECT)
75366+
75367+#ifdef CONFIG_PAX_MPROTECT
75368+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75369+#endif
75370+
75371+ )
75372+ {
75373+ *flags &= ~MF_PAX_MPROTECT;
75374+ retval = -EINVAL;
75375+ }
75376+
75377+ if ((*flags & MF_PAX_EMUTRAMP)
75378+
75379+#ifdef CONFIG_PAX_EMUTRAMP
75380+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75381+#endif
75382+
75383+ )
75384+ {
75385+ *flags &= ~MF_PAX_EMUTRAMP;
75386+ retval = -EINVAL;
75387+ }
75388+
75389+ return retval;
75390+}
75391+
75392+EXPORT_SYMBOL(pax_check_flags);
75393+
75394+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75395+char *pax_get_path(const struct path *path, char *buf, int buflen)
75396+{
75397+ char *pathname = d_path(path, buf, buflen);
75398+
75399+ if (IS_ERR(pathname))
75400+ goto toolong;
75401+
75402+ pathname = mangle_path(buf, pathname, "\t\n\\");
75403+ if (!pathname)
75404+ goto toolong;
75405+
75406+ *pathname = 0;
75407+ return buf;
75408+
75409+toolong:
75410+ return "<path too long>";
75411+}
75412+EXPORT_SYMBOL(pax_get_path);
75413+
75414+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
75415+{
75416+ struct task_struct *tsk = current;
75417+ struct mm_struct *mm = current->mm;
75418+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
75419+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
75420+ char *path_exec = NULL;
75421+ char *path_fault = NULL;
75422+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
75423+ siginfo_t info = { };
75424+
75425+ if (buffer_exec && buffer_fault) {
75426+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
75427+
75428+ down_read(&mm->mmap_sem);
75429+ vma = mm->mmap;
75430+ while (vma && (!vma_exec || !vma_fault)) {
75431+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
75432+ vma_exec = vma;
75433+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
75434+ vma_fault = vma;
75435+ vma = vma->vm_next;
75436+ }
75437+ if (vma_exec)
75438+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
75439+ if (vma_fault) {
75440+ start = vma_fault->vm_start;
75441+ end = vma_fault->vm_end;
75442+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
75443+ if (vma_fault->vm_file)
75444+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
75445+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
75446+ path_fault = "<heap>";
75447+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75448+ path_fault = "<stack>";
75449+ else
75450+ path_fault = "<anonymous mapping>";
75451+ }
75452+ up_read(&mm->mmap_sem);
75453+ }
75454+ if (tsk->signal->curr_ip)
75455+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
75456+ else
75457+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
75458+ 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),
75459+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
75460+ free_page((unsigned long)buffer_exec);
75461+ free_page((unsigned long)buffer_fault);
75462+ pax_report_insns(regs, pc, sp);
75463+ info.si_signo = SIGKILL;
75464+ info.si_errno = 0;
75465+ info.si_code = SI_KERNEL;
75466+ info.si_pid = 0;
75467+ info.si_uid = 0;
75468+ do_coredump(&info);
75469+}
75470+#endif
75471+
75472+#ifdef CONFIG_PAX_REFCOUNT
75473+void pax_report_refcount_overflow(struct pt_regs *regs)
75474+{
75475+ if (current->signal->curr_ip)
75476+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
75477+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
75478+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75479+ else
75480+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
75481+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75482+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
75483+ preempt_disable();
75484+ show_regs(regs);
75485+ preempt_enable();
75486+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
75487+}
75488+#endif
75489+
75490+#ifdef CONFIG_PAX_USERCOPY
75491+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
75492+static noinline int check_stack_object(const void *obj, unsigned long len)
75493+{
75494+ const void * const stack = task_stack_page(current);
75495+ const void * const stackend = stack + THREAD_SIZE;
75496+
75497+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75498+ const void *frame = NULL;
75499+ const void *oldframe;
75500+#endif
75501+
75502+ if (obj + len < obj)
75503+ return -1;
75504+
75505+ if (obj + len <= stack || stackend <= obj)
75506+ return 0;
75507+
75508+ if (obj < stack || stackend < obj + len)
75509+ return -1;
75510+
75511+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75512+ oldframe = __builtin_frame_address(1);
75513+ if (oldframe)
75514+ frame = __builtin_frame_address(2);
75515+ /*
75516+ low ----------------------------------------------> high
75517+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
75518+ ^----------------^
75519+ allow copies only within here
75520+ */
75521+ while (stack <= frame && frame < stackend) {
75522+ /* if obj + len extends past the last frame, this
75523+ check won't pass and the next frame will be 0,
75524+ causing us to bail out and correctly report
75525+ the copy as invalid
75526+ */
75527+ if (obj + len <= frame)
75528+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
75529+ oldframe = frame;
75530+ frame = *(const void * const *)frame;
75531+ }
75532+ return -1;
75533+#else
75534+ return 1;
75535+#endif
75536+}
75537+
75538+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
75539+{
75540+ if (current->signal->curr_ip)
75541+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75542+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75543+ else
75544+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75545+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75546+ dump_stack();
75547+ gr_handle_kernel_exploit();
75548+ do_group_exit(SIGKILL);
75549+}
75550+#endif
75551+
75552+#ifdef CONFIG_PAX_USERCOPY
75553+
75554+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
75555+{
75556+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
75557+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
75558+#ifdef CONFIG_MODULES
75559+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
75560+#else
75561+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
75562+#endif
75563+
75564+#else
75565+ unsigned long textlow = (unsigned long)_stext;
75566+ unsigned long texthigh = (unsigned long)_etext;
75567+
75568+#ifdef CONFIG_X86_64
75569+ /* check against linear mapping as well */
75570+ if (high > (unsigned long)__va(__pa(textlow)) &&
75571+ low < (unsigned long)__va(__pa(texthigh)))
75572+ return true;
75573+#endif
75574+
75575+#endif
75576+
75577+ if (high <= textlow || low >= texthigh)
75578+ return false;
75579+ else
75580+ return true;
75581+}
75582+#endif
75583+
75584+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
75585+{
75586+#ifdef CONFIG_PAX_USERCOPY
75587+ const char *type;
75588+#endif
75589+
75590+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
75591+ unsigned long stackstart = (unsigned long)task_stack_page(current);
75592+ unsigned long currentsp = (unsigned long)&stackstart;
75593+ if (unlikely((currentsp < stackstart + 512 ||
75594+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
75595+ BUG();
75596+#endif
75597+
75598+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75599+ if (const_size)
75600+ return;
75601+#endif
75602+
75603+#ifdef CONFIG_PAX_USERCOPY
75604+ if (!n)
75605+ return;
75606+
75607+ type = check_heap_object(ptr, n);
75608+ if (!type) {
75609+ int ret = check_stack_object(ptr, n);
75610+ if (ret == 1 || ret == 2)
75611+ return;
75612+ if (ret == 0) {
75613+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
75614+ type = "<kernel text>";
75615+ else
75616+ return;
75617+ } else
75618+ type = "<process stack>";
75619+ }
75620+
75621+ pax_report_usercopy(ptr, n, to_user, type);
75622+#endif
75623+
75624+}
75625+EXPORT_SYMBOL(__check_object_size);
75626+
75627+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
75628+void __used pax_track_stack(void)
75629+{
75630+ unsigned long sp = (unsigned long)&sp;
75631+ if (sp < current_thread_info()->lowest_stack &&
75632+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
75633+ current_thread_info()->lowest_stack = sp;
75634+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
75635+ BUG();
75636+}
75637+EXPORT_SYMBOL(pax_track_stack);
75638+#endif
75639+
75640+#ifdef CONFIG_PAX_SIZE_OVERFLOW
75641+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
75642+{
75643+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
75644+ dump_stack();
75645+ do_group_exit(SIGKILL);
75646+}
75647+EXPORT_SYMBOL(report_size_overflow);
75648+#endif
75649diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
75650index 9f9992b..8b59411 100644
75651--- a/fs/ext2/balloc.c
75652+++ b/fs/ext2/balloc.c
75653@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
75654
75655 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75656 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75657- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75658+ if (free_blocks < root_blocks + 1 &&
75659 !uid_eq(sbi->s_resuid, current_fsuid()) &&
75660 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75661- !in_group_p (sbi->s_resgid))) {
75662+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75663 return 0;
75664 }
75665 return 1;
75666diff --git a/fs/ext2/super.c b/fs/ext2/super.c
75667index d0e746e..82e06f0 100644
75668--- a/fs/ext2/super.c
75669+++ b/fs/ext2/super.c
75670@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
75671 #ifdef CONFIG_EXT2_FS_XATTR
75672 if (test_opt(sb, XATTR_USER))
75673 seq_puts(seq, ",user_xattr");
75674- if (!test_opt(sb, XATTR_USER) &&
75675- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
75676+ if (!test_opt(sb, XATTR_USER))
75677 seq_puts(seq, ",nouser_xattr");
75678- }
75679 #endif
75680
75681 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75682@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
75683 if (def_mount_opts & EXT2_DEFM_UID16)
75684 set_opt(sbi->s_mount_opt, NO_UID32);
75685 #ifdef CONFIG_EXT2_FS_XATTR
75686- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
75687- set_opt(sbi->s_mount_opt, XATTR_USER);
75688+ /* always enable user xattrs */
75689+ set_opt(sbi->s_mount_opt, XATTR_USER);
75690 #endif
75691 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75692 if (def_mount_opts & EXT2_DEFM_ACL)
75693diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
75694index 0b6bfd3..93a2964 100644
75695--- a/fs/ext2/xattr.c
75696+++ b/fs/ext2/xattr.c
75697@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
75698 struct buffer_head *bh = NULL;
75699 struct ext2_xattr_entry *entry;
75700 char *end;
75701- size_t rest = buffer_size;
75702+ size_t rest = buffer_size, total_size = 0;
75703 int error;
75704
75705 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
75706@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
75707 buffer += size;
75708 }
75709 rest -= size;
75710+ total_size += size;
75711 }
75712 }
75713- error = buffer_size - rest; /* total size */
75714+ error = total_size;
75715
75716 cleanup:
75717 brelse(bh);
75718diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
75719index 158b5d4..2432610 100644
75720--- a/fs/ext3/balloc.c
75721+++ b/fs/ext3/balloc.c
75722@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
75723
75724 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75725 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75726- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75727+ if (free_blocks < root_blocks + 1 &&
75728 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
75729 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75730- !in_group_p (sbi->s_resgid))) {
75731+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75732 return 0;
75733 }
75734 return 1;
75735diff --git a/fs/ext3/super.c b/fs/ext3/super.c
75736index a9312f0..e3a11ec 100644
75737--- a/fs/ext3/super.c
75738+++ b/fs/ext3/super.c
75739@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
75740 #ifdef CONFIG_EXT3_FS_XATTR
75741 if (test_opt(sb, XATTR_USER))
75742 seq_puts(seq, ",user_xattr");
75743- if (!test_opt(sb, XATTR_USER) &&
75744- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
75745+ if (!test_opt(sb, XATTR_USER))
75746 seq_puts(seq, ",nouser_xattr");
75747- }
75748 #endif
75749 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75750 if (test_opt(sb, POSIX_ACL))
75751@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
75752 if (def_mount_opts & EXT3_DEFM_UID16)
75753 set_opt(sbi->s_mount_opt, NO_UID32);
75754 #ifdef CONFIG_EXT3_FS_XATTR
75755- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
75756- set_opt(sbi->s_mount_opt, XATTR_USER);
75757+ /* always enable user xattrs */
75758+ set_opt(sbi->s_mount_opt, XATTR_USER);
75759 #endif
75760 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75761 if (def_mount_opts & EXT3_DEFM_ACL)
75762diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
75763index 7cf3650..e3f4a51 100644
75764--- a/fs/ext3/xattr.c
75765+++ b/fs/ext3/xattr.c
75766@@ -330,7 +330,7 @@ static int
75767 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75768 char *buffer, size_t buffer_size)
75769 {
75770- size_t rest = buffer_size;
75771+ size_t rest = buffer_size, total_size = 0;
75772
75773 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
75774 const struct xattr_handler *handler =
75775@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75776 buffer += size;
75777 }
75778 rest -= size;
75779+ total_size += size;
75780 }
75781 }
75782- return buffer_size - rest;
75783+ return total_size;
75784 }
75785
75786 static int
75787diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
75788index 955bf49a..44ee359 100644
75789--- a/fs/ext4/balloc.c
75790+++ b/fs/ext4/balloc.c
75791@@ -556,8 +556,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
75792 /* Hm, nope. Are (enough) root reserved clusters available? */
75793 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
75794 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
75795- capable(CAP_SYS_RESOURCE) ||
75796- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
75797+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
75798+ capable_nolog(CAP_SYS_RESOURCE)) {
75799
75800 if (free_clusters >= (nclusters + dirty_clusters +
75801 resv_clusters))
75802diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
75803index 9a83f14..1dd1b38 100644
75804--- a/fs/ext4/ext4.h
75805+++ b/fs/ext4/ext4.h
75806@@ -1310,19 +1310,19 @@ struct ext4_sb_info {
75807 unsigned long s_mb_last_start;
75808
75809 /* stats for buddy allocator */
75810- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
75811- atomic_t s_bal_success; /* we found long enough chunks */
75812- atomic_t s_bal_allocated; /* in blocks */
75813- atomic_t s_bal_ex_scanned; /* total extents scanned */
75814- atomic_t s_bal_goals; /* goal hits */
75815- atomic_t s_bal_breaks; /* too long searches */
75816- atomic_t s_bal_2orders; /* 2^order hits */
75817+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
75818+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
75819+ atomic_unchecked_t s_bal_allocated; /* in blocks */
75820+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
75821+ atomic_unchecked_t s_bal_goals; /* goal hits */
75822+ atomic_unchecked_t s_bal_breaks; /* too long searches */
75823+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
75824 spinlock_t s_bal_lock;
75825 unsigned long s_mb_buddies_generated;
75826 unsigned long long s_mb_generation_time;
75827- atomic_t s_mb_lost_chunks;
75828- atomic_t s_mb_preallocated;
75829- atomic_t s_mb_discarded;
75830+ atomic_unchecked_t s_mb_lost_chunks;
75831+ atomic_unchecked_t s_mb_preallocated;
75832+ atomic_unchecked_t s_mb_discarded;
75833 atomic_t s_lock_busy;
75834
75835 /* locality groups */
75836diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
75837index 8d1e602..abf497b 100644
75838--- a/fs/ext4/mballoc.c
75839+++ b/fs/ext4/mballoc.c
75840@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
75841 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
75842
75843 if (EXT4_SB(sb)->s_mb_stats)
75844- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
75845+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
75846
75847 break;
75848 }
75849@@ -2211,7 +2211,7 @@ repeat:
75850 ac->ac_status = AC_STATUS_CONTINUE;
75851 ac->ac_flags |= EXT4_MB_HINT_FIRST;
75852 cr = 3;
75853- atomic_inc(&sbi->s_mb_lost_chunks);
75854+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
75855 goto repeat;
75856 }
75857 }
75858@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
75859 if (sbi->s_mb_stats) {
75860 ext4_msg(sb, KERN_INFO,
75861 "mballoc: %u blocks %u reqs (%u success)",
75862- atomic_read(&sbi->s_bal_allocated),
75863- atomic_read(&sbi->s_bal_reqs),
75864- atomic_read(&sbi->s_bal_success));
75865+ atomic_read_unchecked(&sbi->s_bal_allocated),
75866+ atomic_read_unchecked(&sbi->s_bal_reqs),
75867+ atomic_read_unchecked(&sbi->s_bal_success));
75868 ext4_msg(sb, KERN_INFO,
75869 "mballoc: %u extents scanned, %u goal hits, "
75870 "%u 2^N hits, %u breaks, %u lost",
75871- atomic_read(&sbi->s_bal_ex_scanned),
75872- atomic_read(&sbi->s_bal_goals),
75873- atomic_read(&sbi->s_bal_2orders),
75874- atomic_read(&sbi->s_bal_breaks),
75875- atomic_read(&sbi->s_mb_lost_chunks));
75876+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
75877+ atomic_read_unchecked(&sbi->s_bal_goals),
75878+ atomic_read_unchecked(&sbi->s_bal_2orders),
75879+ atomic_read_unchecked(&sbi->s_bal_breaks),
75880+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
75881 ext4_msg(sb, KERN_INFO,
75882 "mballoc: %lu generated and it took %Lu",
75883 sbi->s_mb_buddies_generated,
75884 sbi->s_mb_generation_time);
75885 ext4_msg(sb, KERN_INFO,
75886 "mballoc: %u preallocated, %u discarded",
75887- atomic_read(&sbi->s_mb_preallocated),
75888- atomic_read(&sbi->s_mb_discarded));
75889+ atomic_read_unchecked(&sbi->s_mb_preallocated),
75890+ atomic_read_unchecked(&sbi->s_mb_discarded));
75891 }
75892
75893 free_percpu(sbi->s_locality_groups);
75894@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
75895 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
75896
75897 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
75898- atomic_inc(&sbi->s_bal_reqs);
75899- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75900+ atomic_inc_unchecked(&sbi->s_bal_reqs);
75901+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75902 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
75903- atomic_inc(&sbi->s_bal_success);
75904- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
75905+ atomic_inc_unchecked(&sbi->s_bal_success);
75906+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
75907 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
75908 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
75909- atomic_inc(&sbi->s_bal_goals);
75910+ atomic_inc_unchecked(&sbi->s_bal_goals);
75911 if (ac->ac_found > sbi->s_mb_max_to_scan)
75912- atomic_inc(&sbi->s_bal_breaks);
75913+ atomic_inc_unchecked(&sbi->s_bal_breaks);
75914 }
75915
75916 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
75917@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
75918 trace_ext4_mb_new_inode_pa(ac, pa);
75919
75920 ext4_mb_use_inode_pa(ac, pa);
75921- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
75922+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
75923
75924 ei = EXT4_I(ac->ac_inode);
75925 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75926@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
75927 trace_ext4_mb_new_group_pa(ac, pa);
75928
75929 ext4_mb_use_group_pa(ac, pa);
75930- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75931+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75932
75933 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75934 lg = ac->ac_lg;
75935@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
75936 * from the bitmap and continue.
75937 */
75938 }
75939- atomic_add(free, &sbi->s_mb_discarded);
75940+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
75941
75942 return err;
75943 }
75944@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
75945 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
75946 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
75947 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
75948- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75949+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75950 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
75951
75952 return 0;
75953diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
75954index 8313ca3..8a37d08 100644
75955--- a/fs/ext4/mmp.c
75956+++ b/fs/ext4/mmp.c
75957@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
75958 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
75959 const char *function, unsigned int line, const char *msg)
75960 {
75961- __ext4_warning(sb, function, line, msg);
75962+ __ext4_warning(sb, function, line, "%s", msg);
75963 __ext4_warning(sb, function, line,
75964 "MMP failure info: last update time: %llu, last update "
75965 "node: %s, last update device: %s\n",
75966diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
75967index cf0c472..ddf284d 100644
75968--- a/fs/ext4/resize.c
75969+++ b/fs/ext4/resize.c
75970@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75971
75972 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
75973 for (count2 = count; count > 0; count -= count2, block += count2) {
75974- ext4_fsblk_t start;
75975+ ext4_fsblk_t start, diff;
75976 struct buffer_head *bh;
75977 ext4_group_t group;
75978 int err;
75979@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75980 start = ext4_group_first_block_no(sb, group);
75981 group -= flex_gd->groups[0].group;
75982
75983- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
75984- if (count2 > count)
75985- count2 = count;
75986-
75987 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
75988 BUG_ON(flex_gd->count > 1);
75989 continue;
75990@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75991 err = ext4_journal_get_write_access(handle, bh);
75992 if (err)
75993 return err;
75994+
75995+ diff = block - start;
75996+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
75997+ if (count2 > count)
75998+ count2 = count;
75999+
76000 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
76001- block - start, count2);
76002- ext4_set_bits(bh->b_data, block - start, count2);
76003+ diff, count2);
76004+ ext4_set_bits(bh->b_data, diff, count2);
76005
76006 err = ext4_handle_dirty_metadata(handle, NULL, bh);
76007 if (unlikely(err))
76008diff --git a/fs/ext4/super.c b/fs/ext4/super.c
76009index ca9d4a2..4c52f42 100644
76010--- a/fs/ext4/super.c
76011+++ b/fs/ext4/super.c
76012@@ -1232,7 +1232,7 @@ static ext4_fsblk_t get_sb_block(void **data)
76013 }
76014
76015 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
76016-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
76017+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
76018 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
76019
76020 #ifdef CONFIG_QUOTA
76021@@ -2442,7 +2442,7 @@ struct ext4_attr {
76022 int offset;
76023 int deprecated_val;
76024 } u;
76025-};
76026+} __do_const;
76027
76028 static int parse_strtoull(const char *buf,
76029 unsigned long long max, unsigned long long *value)
76030diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
76031index 16e28c0..728c282 100644
76032--- a/fs/ext4/xattr.c
76033+++ b/fs/ext4/xattr.c
76034@@ -398,7 +398,7 @@ static int
76035 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
76036 char *buffer, size_t buffer_size)
76037 {
76038- size_t rest = buffer_size;
76039+ size_t rest = buffer_size, total_size = 0;
76040
76041 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
76042 const struct xattr_handler *handler =
76043@@ -415,9 +415,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
76044 buffer += size;
76045 }
76046 rest -= size;
76047+ total_size += size;
76048 }
76049 }
76050- return buffer_size - rest;
76051+ return total_size;
76052 }
76053
76054 static int
76055diff --git a/fs/fcntl.c b/fs/fcntl.c
76056index ee85cd4..9dd0d20 100644
76057--- a/fs/fcntl.c
76058+++ b/fs/fcntl.c
76059@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
76060 int force)
76061 {
76062 security_file_set_fowner(filp);
76063+ if (gr_handle_chroot_fowner(pid, type))
76064+ return;
76065+ if (gr_check_protected_task_fowner(pid, type))
76066+ return;
76067 f_modown(filp, pid, type, force);
76068 }
76069 EXPORT_SYMBOL(__f_setown);
76070diff --git a/fs/fhandle.c b/fs/fhandle.c
76071index d59712d..2281df9 100644
76072--- a/fs/fhandle.c
76073+++ b/fs/fhandle.c
76074@@ -8,6 +8,7 @@
76075 #include <linux/fs_struct.h>
76076 #include <linux/fsnotify.h>
76077 #include <linux/personality.h>
76078+#include <linux/grsecurity.h>
76079 #include <asm/uaccess.h>
76080 #include "internal.h"
76081 #include "mount.h"
76082@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
76083 } else
76084 retval = 0;
76085 /* copy the mount id */
76086- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
76087- sizeof(*mnt_id)) ||
76088+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
76089 copy_to_user(ufh, handle,
76090 sizeof(struct file_handle) + handle_bytes))
76091 retval = -EFAULT;
76092@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
76093 * the directory. Ideally we would like CAP_DAC_SEARCH.
76094 * But we don't have that
76095 */
76096- if (!capable(CAP_DAC_READ_SEARCH)) {
76097+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
76098 retval = -EPERM;
76099 goto out_err;
76100 }
76101diff --git a/fs/file.c b/fs/file.c
76102index 93c5f89..ed75817 100644
76103--- a/fs/file.c
76104+++ b/fs/file.c
76105@@ -16,6 +16,7 @@
76106 #include <linux/slab.h>
76107 #include <linux/vmalloc.h>
76108 #include <linux/file.h>
76109+#include <linux/security.h>
76110 #include <linux/fdtable.h>
76111 #include <linux/bitops.h>
76112 #include <linux/interrupt.h>
76113@@ -139,7 +140,7 @@ out:
76114 * Return <0 error code on error; 1 on successful completion.
76115 * The files->file_lock should be held on entry, and will be held on exit.
76116 */
76117-static int expand_fdtable(struct files_struct *files, int nr)
76118+static int expand_fdtable(struct files_struct *files, unsigned int nr)
76119 __releases(files->file_lock)
76120 __acquires(files->file_lock)
76121 {
76122@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
76123 * expanded and execution may have blocked.
76124 * The files->file_lock should be held on entry, and will be held on exit.
76125 */
76126-static int expand_files(struct files_struct *files, int nr)
76127+static int expand_files(struct files_struct *files, unsigned int nr)
76128 {
76129 struct fdtable *fdt;
76130
76131@@ -799,6 +800,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
76132 if (!file)
76133 return __close_fd(files, fd);
76134
76135+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
76136 if (fd >= rlimit(RLIMIT_NOFILE))
76137 return -EBADF;
76138
76139@@ -825,6 +827,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
76140 if (unlikely(oldfd == newfd))
76141 return -EINVAL;
76142
76143+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
76144 if (newfd >= rlimit(RLIMIT_NOFILE))
76145 return -EBADF;
76146
76147@@ -880,6 +883,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
76148 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
76149 {
76150 int err;
76151+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
76152 if (from >= rlimit(RLIMIT_NOFILE))
76153 return -EINVAL;
76154 err = alloc_fd(from, flags);
76155diff --git a/fs/filesystems.c b/fs/filesystems.c
76156index 5797d45..7d7d79a 100644
76157--- a/fs/filesystems.c
76158+++ b/fs/filesystems.c
76159@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
76160 int len = dot ? dot - name : strlen(name);
76161
76162 fs = __get_fs_type(name, len);
76163+#ifdef CONFIG_GRKERNSEC_MODHARDEN
76164+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
76165+#else
76166 if (!fs && (request_module("fs-%.*s", len, name) == 0))
76167+#endif
76168 fs = __get_fs_type(name, len);
76169
76170 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
76171diff --git a/fs/fs_struct.c b/fs/fs_struct.c
76172index 7dca743..1ff87ae 100644
76173--- a/fs/fs_struct.c
76174+++ b/fs/fs_struct.c
76175@@ -4,6 +4,7 @@
76176 #include <linux/path.h>
76177 #include <linux/slab.h>
76178 #include <linux/fs_struct.h>
76179+#include <linux/grsecurity.h>
76180 #include "internal.h"
76181
76182 /*
76183@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
76184 struct path old_root;
76185
76186 path_get(path);
76187+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
76188 spin_lock(&fs->lock);
76189 write_seqcount_begin(&fs->seq);
76190 old_root = fs->root;
76191 fs->root = *path;
76192+ gr_set_chroot_entries(current, path);
76193 write_seqcount_end(&fs->seq);
76194 spin_unlock(&fs->lock);
76195- if (old_root.dentry)
76196+ if (old_root.dentry) {
76197+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
76198 path_put(&old_root);
76199+ }
76200 }
76201
76202 /*
76203@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76204 int hits = 0;
76205 spin_lock(&fs->lock);
76206 write_seqcount_begin(&fs->seq);
76207+ /* this root replacement is only done by pivot_root,
76208+ leave grsec's chroot tagging alone for this task
76209+ so that a pivoted root isn't treated as a chroot
76210+ */
76211 hits += replace_path(&fs->root, old_root, new_root);
76212 hits += replace_path(&fs->pwd, old_root, new_root);
76213 write_seqcount_end(&fs->seq);
76214@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76215
76216 void free_fs_struct(struct fs_struct *fs)
76217 {
76218+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76219 path_put(&fs->root);
76220 path_put(&fs->pwd);
76221 kmem_cache_free(fs_cachep, fs);
76222@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
76223 task_lock(tsk);
76224 spin_lock(&fs->lock);
76225 tsk->fs = NULL;
76226- kill = !--fs->users;
76227+ gr_clear_chroot_entries(tsk);
76228+ kill = !atomic_dec_return(&fs->users);
76229 spin_unlock(&fs->lock);
76230 task_unlock(tsk);
76231 if (kill)
76232@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76233 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
76234 /* We don't need to lock fs - think why ;-) */
76235 if (fs) {
76236- fs->users = 1;
76237+ atomic_set(&fs->users, 1);
76238 fs->in_exec = 0;
76239 spin_lock_init(&fs->lock);
76240 seqcount_init(&fs->seq);
76241@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76242 spin_lock(&old->lock);
76243 fs->root = old->root;
76244 path_get(&fs->root);
76245+ /* instead of calling gr_set_chroot_entries here,
76246+ we call it from every caller of this function
76247+ */
76248 fs->pwd = old->pwd;
76249 path_get(&fs->pwd);
76250 spin_unlock(&old->lock);
76251+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76252 }
76253 return fs;
76254 }
76255@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
76256
76257 task_lock(current);
76258 spin_lock(&fs->lock);
76259- kill = !--fs->users;
76260+ kill = !atomic_dec_return(&fs->users);
76261 current->fs = new_fs;
76262+ gr_set_chroot_entries(current, &new_fs->root);
76263 spin_unlock(&fs->lock);
76264 task_unlock(current);
76265
76266@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
76267
76268 int current_umask(void)
76269 {
76270- return current->fs->umask;
76271+ return current->fs->umask | gr_acl_umask();
76272 }
76273 EXPORT_SYMBOL(current_umask);
76274
76275 /* to be mentioned only in INIT_TASK */
76276 struct fs_struct init_fs = {
76277- .users = 1,
76278+ .users = ATOMIC_INIT(1),
76279 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
76280 .seq = SEQCNT_ZERO(init_fs.seq),
76281 .umask = 0022,
76282diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
76283index 89acec7..a575262 100644
76284--- a/fs/fscache/cookie.c
76285+++ b/fs/fscache/cookie.c
76286@@ -19,7 +19,7 @@
76287
76288 struct kmem_cache *fscache_cookie_jar;
76289
76290-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
76291+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
76292
76293 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
76294 static int fscache_alloc_object(struct fscache_cache *cache,
76295@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
76296 parent ? (char *) parent->def->name : "<no-parent>",
76297 def->name, netfs_data, enable);
76298
76299- fscache_stat(&fscache_n_acquires);
76300+ fscache_stat_unchecked(&fscache_n_acquires);
76301
76302 /* if there's no parent cookie, then we don't create one here either */
76303 if (!parent) {
76304- fscache_stat(&fscache_n_acquires_null);
76305+ fscache_stat_unchecked(&fscache_n_acquires_null);
76306 _leave(" [no parent]");
76307 return NULL;
76308 }
76309@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76310 /* allocate and initialise a cookie */
76311 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
76312 if (!cookie) {
76313- fscache_stat(&fscache_n_acquires_oom);
76314+ fscache_stat_unchecked(&fscache_n_acquires_oom);
76315 _leave(" [ENOMEM]");
76316 return NULL;
76317 }
76318@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
76319
76320 switch (cookie->def->type) {
76321 case FSCACHE_COOKIE_TYPE_INDEX:
76322- fscache_stat(&fscache_n_cookie_index);
76323+ fscache_stat_unchecked(&fscache_n_cookie_index);
76324 break;
76325 case FSCACHE_COOKIE_TYPE_DATAFILE:
76326- fscache_stat(&fscache_n_cookie_data);
76327+ fscache_stat_unchecked(&fscache_n_cookie_data);
76328 break;
76329 default:
76330- fscache_stat(&fscache_n_cookie_special);
76331+ fscache_stat_unchecked(&fscache_n_cookie_special);
76332 break;
76333 }
76334
76335@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76336 } else {
76337 atomic_dec(&parent->n_children);
76338 __fscache_cookie_put(cookie);
76339- fscache_stat(&fscache_n_acquires_nobufs);
76340+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
76341 _leave(" = NULL");
76342 return NULL;
76343 }
76344@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76345 }
76346 }
76347
76348- fscache_stat(&fscache_n_acquires_ok);
76349+ fscache_stat_unchecked(&fscache_n_acquires_ok);
76350 _leave(" = %p", cookie);
76351 return cookie;
76352 }
76353@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
76354 cache = fscache_select_cache_for_object(cookie->parent);
76355 if (!cache) {
76356 up_read(&fscache_addremove_sem);
76357- fscache_stat(&fscache_n_acquires_no_cache);
76358+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
76359 _leave(" = -ENOMEDIUM [no cache]");
76360 return -ENOMEDIUM;
76361 }
76362@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
76363 object = cache->ops->alloc_object(cache, cookie);
76364 fscache_stat_d(&fscache_n_cop_alloc_object);
76365 if (IS_ERR(object)) {
76366- fscache_stat(&fscache_n_object_no_alloc);
76367+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
76368 ret = PTR_ERR(object);
76369 goto error;
76370 }
76371
76372- fscache_stat(&fscache_n_object_alloc);
76373+ fscache_stat_unchecked(&fscache_n_object_alloc);
76374
76375- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
76376+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
76377
76378 _debug("ALLOC OBJ%x: %s {%lx}",
76379 object->debug_id, cookie->def->name, object->events);
76380@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
76381
76382 _enter("{%s}", cookie->def->name);
76383
76384- fscache_stat(&fscache_n_invalidates);
76385+ fscache_stat_unchecked(&fscache_n_invalidates);
76386
76387 /* Only permit invalidation of data files. Invalidating an index will
76388 * require the caller to release all its attachments to the tree rooted
76389@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
76390 {
76391 struct fscache_object *object;
76392
76393- fscache_stat(&fscache_n_updates);
76394+ fscache_stat_unchecked(&fscache_n_updates);
76395
76396 if (!cookie) {
76397- fscache_stat(&fscache_n_updates_null);
76398+ fscache_stat_unchecked(&fscache_n_updates_null);
76399 _leave(" [no cookie]");
76400 return;
76401 }
76402@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
76403 */
76404 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
76405 {
76406- fscache_stat(&fscache_n_relinquishes);
76407+ fscache_stat_unchecked(&fscache_n_relinquishes);
76408 if (retire)
76409- fscache_stat(&fscache_n_relinquishes_retire);
76410+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
76411
76412 if (!cookie) {
76413- fscache_stat(&fscache_n_relinquishes_null);
76414+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
76415 _leave(" [no cookie]");
76416 return;
76417 }
76418@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
76419 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
76420 goto inconsistent;
76421
76422- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
76423+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76424
76425 __fscache_use_cookie(cookie);
76426 if (fscache_submit_op(object, op) < 0)
76427diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
76428index 7872a62..d91b19f 100644
76429--- a/fs/fscache/internal.h
76430+++ b/fs/fscache/internal.h
76431@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
76432 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
76433 extern int fscache_wait_for_operation_activation(struct fscache_object *,
76434 struct fscache_operation *,
76435- atomic_t *,
76436- atomic_t *,
76437+ atomic_unchecked_t *,
76438+ atomic_unchecked_t *,
76439 void (*)(struct fscache_operation *));
76440 extern void fscache_invalidate_writes(struct fscache_cookie *);
76441
76442@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
76443 * stats.c
76444 */
76445 #ifdef CONFIG_FSCACHE_STATS
76446-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76447-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76448+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76449+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76450
76451-extern atomic_t fscache_n_op_pend;
76452-extern atomic_t fscache_n_op_run;
76453-extern atomic_t fscache_n_op_enqueue;
76454-extern atomic_t fscache_n_op_deferred_release;
76455-extern atomic_t fscache_n_op_release;
76456-extern atomic_t fscache_n_op_gc;
76457-extern atomic_t fscache_n_op_cancelled;
76458-extern atomic_t fscache_n_op_rejected;
76459+extern atomic_unchecked_t fscache_n_op_pend;
76460+extern atomic_unchecked_t fscache_n_op_run;
76461+extern atomic_unchecked_t fscache_n_op_enqueue;
76462+extern atomic_unchecked_t fscache_n_op_deferred_release;
76463+extern atomic_unchecked_t fscache_n_op_release;
76464+extern atomic_unchecked_t fscache_n_op_gc;
76465+extern atomic_unchecked_t fscache_n_op_cancelled;
76466+extern atomic_unchecked_t fscache_n_op_rejected;
76467
76468-extern atomic_t fscache_n_attr_changed;
76469-extern atomic_t fscache_n_attr_changed_ok;
76470-extern atomic_t fscache_n_attr_changed_nobufs;
76471-extern atomic_t fscache_n_attr_changed_nomem;
76472-extern atomic_t fscache_n_attr_changed_calls;
76473+extern atomic_unchecked_t fscache_n_attr_changed;
76474+extern atomic_unchecked_t fscache_n_attr_changed_ok;
76475+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
76476+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
76477+extern atomic_unchecked_t fscache_n_attr_changed_calls;
76478
76479-extern atomic_t fscache_n_allocs;
76480-extern atomic_t fscache_n_allocs_ok;
76481-extern atomic_t fscache_n_allocs_wait;
76482-extern atomic_t fscache_n_allocs_nobufs;
76483-extern atomic_t fscache_n_allocs_intr;
76484-extern atomic_t fscache_n_allocs_object_dead;
76485-extern atomic_t fscache_n_alloc_ops;
76486-extern atomic_t fscache_n_alloc_op_waits;
76487+extern atomic_unchecked_t fscache_n_allocs;
76488+extern atomic_unchecked_t fscache_n_allocs_ok;
76489+extern atomic_unchecked_t fscache_n_allocs_wait;
76490+extern atomic_unchecked_t fscache_n_allocs_nobufs;
76491+extern atomic_unchecked_t fscache_n_allocs_intr;
76492+extern atomic_unchecked_t fscache_n_allocs_object_dead;
76493+extern atomic_unchecked_t fscache_n_alloc_ops;
76494+extern atomic_unchecked_t fscache_n_alloc_op_waits;
76495
76496-extern atomic_t fscache_n_retrievals;
76497-extern atomic_t fscache_n_retrievals_ok;
76498-extern atomic_t fscache_n_retrievals_wait;
76499-extern atomic_t fscache_n_retrievals_nodata;
76500-extern atomic_t fscache_n_retrievals_nobufs;
76501-extern atomic_t fscache_n_retrievals_intr;
76502-extern atomic_t fscache_n_retrievals_nomem;
76503-extern atomic_t fscache_n_retrievals_object_dead;
76504-extern atomic_t fscache_n_retrieval_ops;
76505-extern atomic_t fscache_n_retrieval_op_waits;
76506+extern atomic_unchecked_t fscache_n_retrievals;
76507+extern atomic_unchecked_t fscache_n_retrievals_ok;
76508+extern atomic_unchecked_t fscache_n_retrievals_wait;
76509+extern atomic_unchecked_t fscache_n_retrievals_nodata;
76510+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
76511+extern atomic_unchecked_t fscache_n_retrievals_intr;
76512+extern atomic_unchecked_t fscache_n_retrievals_nomem;
76513+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
76514+extern atomic_unchecked_t fscache_n_retrieval_ops;
76515+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
76516
76517-extern atomic_t fscache_n_stores;
76518-extern atomic_t fscache_n_stores_ok;
76519-extern atomic_t fscache_n_stores_again;
76520-extern atomic_t fscache_n_stores_nobufs;
76521-extern atomic_t fscache_n_stores_oom;
76522-extern atomic_t fscache_n_store_ops;
76523-extern atomic_t fscache_n_store_calls;
76524-extern atomic_t fscache_n_store_pages;
76525-extern atomic_t fscache_n_store_radix_deletes;
76526-extern atomic_t fscache_n_store_pages_over_limit;
76527+extern atomic_unchecked_t fscache_n_stores;
76528+extern atomic_unchecked_t fscache_n_stores_ok;
76529+extern atomic_unchecked_t fscache_n_stores_again;
76530+extern atomic_unchecked_t fscache_n_stores_nobufs;
76531+extern atomic_unchecked_t fscache_n_stores_oom;
76532+extern atomic_unchecked_t fscache_n_store_ops;
76533+extern atomic_unchecked_t fscache_n_store_calls;
76534+extern atomic_unchecked_t fscache_n_store_pages;
76535+extern atomic_unchecked_t fscache_n_store_radix_deletes;
76536+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
76537
76538-extern atomic_t fscache_n_store_vmscan_not_storing;
76539-extern atomic_t fscache_n_store_vmscan_gone;
76540-extern atomic_t fscache_n_store_vmscan_busy;
76541-extern atomic_t fscache_n_store_vmscan_cancelled;
76542-extern atomic_t fscache_n_store_vmscan_wait;
76543+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
76544+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
76545+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
76546+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
76547+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
76548
76549-extern atomic_t fscache_n_marks;
76550-extern atomic_t fscache_n_uncaches;
76551+extern atomic_unchecked_t fscache_n_marks;
76552+extern atomic_unchecked_t fscache_n_uncaches;
76553
76554-extern atomic_t fscache_n_acquires;
76555-extern atomic_t fscache_n_acquires_null;
76556-extern atomic_t fscache_n_acquires_no_cache;
76557-extern atomic_t fscache_n_acquires_ok;
76558-extern atomic_t fscache_n_acquires_nobufs;
76559-extern atomic_t fscache_n_acquires_oom;
76560+extern atomic_unchecked_t fscache_n_acquires;
76561+extern atomic_unchecked_t fscache_n_acquires_null;
76562+extern atomic_unchecked_t fscache_n_acquires_no_cache;
76563+extern atomic_unchecked_t fscache_n_acquires_ok;
76564+extern atomic_unchecked_t fscache_n_acquires_nobufs;
76565+extern atomic_unchecked_t fscache_n_acquires_oom;
76566
76567-extern atomic_t fscache_n_invalidates;
76568-extern atomic_t fscache_n_invalidates_run;
76569+extern atomic_unchecked_t fscache_n_invalidates;
76570+extern atomic_unchecked_t fscache_n_invalidates_run;
76571
76572-extern atomic_t fscache_n_updates;
76573-extern atomic_t fscache_n_updates_null;
76574-extern atomic_t fscache_n_updates_run;
76575+extern atomic_unchecked_t fscache_n_updates;
76576+extern atomic_unchecked_t fscache_n_updates_null;
76577+extern atomic_unchecked_t fscache_n_updates_run;
76578
76579-extern atomic_t fscache_n_relinquishes;
76580-extern atomic_t fscache_n_relinquishes_null;
76581-extern atomic_t fscache_n_relinquishes_waitcrt;
76582-extern atomic_t fscache_n_relinquishes_retire;
76583+extern atomic_unchecked_t fscache_n_relinquishes;
76584+extern atomic_unchecked_t fscache_n_relinquishes_null;
76585+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
76586+extern atomic_unchecked_t fscache_n_relinquishes_retire;
76587
76588-extern atomic_t fscache_n_cookie_index;
76589-extern atomic_t fscache_n_cookie_data;
76590-extern atomic_t fscache_n_cookie_special;
76591+extern atomic_unchecked_t fscache_n_cookie_index;
76592+extern atomic_unchecked_t fscache_n_cookie_data;
76593+extern atomic_unchecked_t fscache_n_cookie_special;
76594
76595-extern atomic_t fscache_n_object_alloc;
76596-extern atomic_t fscache_n_object_no_alloc;
76597-extern atomic_t fscache_n_object_lookups;
76598-extern atomic_t fscache_n_object_lookups_negative;
76599-extern atomic_t fscache_n_object_lookups_positive;
76600-extern atomic_t fscache_n_object_lookups_timed_out;
76601-extern atomic_t fscache_n_object_created;
76602-extern atomic_t fscache_n_object_avail;
76603-extern atomic_t fscache_n_object_dead;
76604+extern atomic_unchecked_t fscache_n_object_alloc;
76605+extern atomic_unchecked_t fscache_n_object_no_alloc;
76606+extern atomic_unchecked_t fscache_n_object_lookups;
76607+extern atomic_unchecked_t fscache_n_object_lookups_negative;
76608+extern atomic_unchecked_t fscache_n_object_lookups_positive;
76609+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
76610+extern atomic_unchecked_t fscache_n_object_created;
76611+extern atomic_unchecked_t fscache_n_object_avail;
76612+extern atomic_unchecked_t fscache_n_object_dead;
76613
76614-extern atomic_t fscache_n_checkaux_none;
76615-extern atomic_t fscache_n_checkaux_okay;
76616-extern atomic_t fscache_n_checkaux_update;
76617-extern atomic_t fscache_n_checkaux_obsolete;
76618+extern atomic_unchecked_t fscache_n_checkaux_none;
76619+extern atomic_unchecked_t fscache_n_checkaux_okay;
76620+extern atomic_unchecked_t fscache_n_checkaux_update;
76621+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
76622
76623 extern atomic_t fscache_n_cop_alloc_object;
76624 extern atomic_t fscache_n_cop_lookup_object;
76625@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
76626 atomic_inc(stat);
76627 }
76628
76629+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
76630+{
76631+ atomic_inc_unchecked(stat);
76632+}
76633+
76634 static inline void fscache_stat_d(atomic_t *stat)
76635 {
76636 atomic_dec(stat);
76637@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
76638
76639 #define __fscache_stat(stat) (NULL)
76640 #define fscache_stat(stat) do {} while (0)
76641+#define fscache_stat_unchecked(stat) do {} while (0)
76642 #define fscache_stat_d(stat) do {} while (0)
76643 #endif
76644
76645diff --git a/fs/fscache/object.c b/fs/fscache/object.c
76646index da032da..0076ce7 100644
76647--- a/fs/fscache/object.c
76648+++ b/fs/fscache/object.c
76649@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76650 _debug("LOOKUP \"%s\" in \"%s\"",
76651 cookie->def->name, object->cache->tag->name);
76652
76653- fscache_stat(&fscache_n_object_lookups);
76654+ fscache_stat_unchecked(&fscache_n_object_lookups);
76655 fscache_stat(&fscache_n_cop_lookup_object);
76656 ret = object->cache->ops->lookup_object(object);
76657 fscache_stat_d(&fscache_n_cop_lookup_object);
76658@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76659 if (ret == -ETIMEDOUT) {
76660 /* probably stuck behind another object, so move this one to
76661 * the back of the queue */
76662- fscache_stat(&fscache_n_object_lookups_timed_out);
76663+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
76664 _leave(" [timeout]");
76665 return NO_TRANSIT;
76666 }
76667@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
76668 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
76669
76670 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76671- fscache_stat(&fscache_n_object_lookups_negative);
76672+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
76673
76674 /* Allow write requests to begin stacking up and read requests to begin
76675 * returning ENODATA.
76676@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
76677 /* if we were still looking up, then we must have a positive lookup
76678 * result, in which case there may be data available */
76679 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76680- fscache_stat(&fscache_n_object_lookups_positive);
76681+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
76682
76683 /* We do (presumably) have data */
76684 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
76685@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
76686 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
76687 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
76688 } else {
76689- fscache_stat(&fscache_n_object_created);
76690+ fscache_stat_unchecked(&fscache_n_object_created);
76691 }
76692
76693 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
76694@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
76695 fscache_stat_d(&fscache_n_cop_lookup_complete);
76696
76697 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
76698- fscache_stat(&fscache_n_object_avail);
76699+ fscache_stat_unchecked(&fscache_n_object_avail);
76700
76701 _leave("");
76702 return transit_to(JUMPSTART_DEPS);
76703@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
76704
76705 /* this just shifts the object release to the work processor */
76706 fscache_put_object(object);
76707- fscache_stat(&fscache_n_object_dead);
76708+ fscache_stat_unchecked(&fscache_n_object_dead);
76709
76710 _leave("");
76711 return transit_to(OBJECT_DEAD);
76712@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76713 enum fscache_checkaux result;
76714
76715 if (!object->cookie->def->check_aux) {
76716- fscache_stat(&fscache_n_checkaux_none);
76717+ fscache_stat_unchecked(&fscache_n_checkaux_none);
76718 return FSCACHE_CHECKAUX_OKAY;
76719 }
76720
76721@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76722 switch (result) {
76723 /* entry okay as is */
76724 case FSCACHE_CHECKAUX_OKAY:
76725- fscache_stat(&fscache_n_checkaux_okay);
76726+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
76727 break;
76728
76729 /* entry requires update */
76730 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
76731- fscache_stat(&fscache_n_checkaux_update);
76732+ fscache_stat_unchecked(&fscache_n_checkaux_update);
76733 break;
76734
76735 /* entry requires deletion */
76736 case FSCACHE_CHECKAUX_OBSOLETE:
76737- fscache_stat(&fscache_n_checkaux_obsolete);
76738+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
76739 break;
76740
76741 default:
76742@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
76743 {
76744 const struct fscache_state *s;
76745
76746- fscache_stat(&fscache_n_invalidates_run);
76747+ fscache_stat_unchecked(&fscache_n_invalidates_run);
76748 fscache_stat(&fscache_n_cop_invalidate_object);
76749 s = _fscache_invalidate_object(object, event);
76750 fscache_stat_d(&fscache_n_cop_invalidate_object);
76751@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
76752 {
76753 _enter("{OBJ%x},%d", object->debug_id, event);
76754
76755- fscache_stat(&fscache_n_updates_run);
76756+ fscache_stat_unchecked(&fscache_n_updates_run);
76757 fscache_stat(&fscache_n_cop_update_object);
76758 object->cache->ops->update_object(object);
76759 fscache_stat_d(&fscache_n_cop_update_object);
76760diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
76761index e7b87a0..a85d47a 100644
76762--- a/fs/fscache/operation.c
76763+++ b/fs/fscache/operation.c
76764@@ -17,7 +17,7 @@
76765 #include <linux/slab.h>
76766 #include "internal.h"
76767
76768-atomic_t fscache_op_debug_id;
76769+atomic_unchecked_t fscache_op_debug_id;
76770 EXPORT_SYMBOL(fscache_op_debug_id);
76771
76772 /**
76773@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
76774 ASSERTCMP(atomic_read(&op->usage), >, 0);
76775 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
76776
76777- fscache_stat(&fscache_n_op_enqueue);
76778+ fscache_stat_unchecked(&fscache_n_op_enqueue);
76779 switch (op->flags & FSCACHE_OP_TYPE) {
76780 case FSCACHE_OP_ASYNC:
76781 _debug("queue async");
76782@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
76783 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
76784 if (op->processor)
76785 fscache_enqueue_operation(op);
76786- fscache_stat(&fscache_n_op_run);
76787+ fscache_stat_unchecked(&fscache_n_op_run);
76788 }
76789
76790 /*
76791@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76792 if (object->n_in_progress > 0) {
76793 atomic_inc(&op->usage);
76794 list_add_tail(&op->pend_link, &object->pending_ops);
76795- fscache_stat(&fscache_n_op_pend);
76796+ fscache_stat_unchecked(&fscache_n_op_pend);
76797 } else if (!list_empty(&object->pending_ops)) {
76798 atomic_inc(&op->usage);
76799 list_add_tail(&op->pend_link, &object->pending_ops);
76800- fscache_stat(&fscache_n_op_pend);
76801+ fscache_stat_unchecked(&fscache_n_op_pend);
76802 fscache_start_operations(object);
76803 } else {
76804 ASSERTCMP(object->n_in_progress, ==, 0);
76805@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76806 object->n_exclusive++; /* reads and writes must wait */
76807 atomic_inc(&op->usage);
76808 list_add_tail(&op->pend_link, &object->pending_ops);
76809- fscache_stat(&fscache_n_op_pend);
76810+ fscache_stat_unchecked(&fscache_n_op_pend);
76811 ret = 0;
76812 } else {
76813 /* If we're in any other state, there must have been an I/O
76814@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
76815 if (object->n_exclusive > 0) {
76816 atomic_inc(&op->usage);
76817 list_add_tail(&op->pend_link, &object->pending_ops);
76818- fscache_stat(&fscache_n_op_pend);
76819+ fscache_stat_unchecked(&fscache_n_op_pend);
76820 } else if (!list_empty(&object->pending_ops)) {
76821 atomic_inc(&op->usage);
76822 list_add_tail(&op->pend_link, &object->pending_ops);
76823- fscache_stat(&fscache_n_op_pend);
76824+ fscache_stat_unchecked(&fscache_n_op_pend);
76825 fscache_start_operations(object);
76826 } else {
76827 ASSERTCMP(object->n_exclusive, ==, 0);
76828@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
76829 object->n_ops++;
76830 atomic_inc(&op->usage);
76831 list_add_tail(&op->pend_link, &object->pending_ops);
76832- fscache_stat(&fscache_n_op_pend);
76833+ fscache_stat_unchecked(&fscache_n_op_pend);
76834 ret = 0;
76835 } else if (fscache_object_is_dying(object)) {
76836- fscache_stat(&fscache_n_op_rejected);
76837+ fscache_stat_unchecked(&fscache_n_op_rejected);
76838 op->state = FSCACHE_OP_ST_CANCELLED;
76839 ret = -ENOBUFS;
76840 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
76841@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
76842 ret = -EBUSY;
76843 if (op->state == FSCACHE_OP_ST_PENDING) {
76844 ASSERT(!list_empty(&op->pend_link));
76845- fscache_stat(&fscache_n_op_cancelled);
76846+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76847 list_del_init(&op->pend_link);
76848 if (do_cancel)
76849 do_cancel(op);
76850@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
76851 while (!list_empty(&object->pending_ops)) {
76852 op = list_entry(object->pending_ops.next,
76853 struct fscache_operation, pend_link);
76854- fscache_stat(&fscache_n_op_cancelled);
76855+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76856 list_del_init(&op->pend_link);
76857
76858 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
76859@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
76860 op->state, ==, FSCACHE_OP_ST_CANCELLED);
76861 op->state = FSCACHE_OP_ST_DEAD;
76862
76863- fscache_stat(&fscache_n_op_release);
76864+ fscache_stat_unchecked(&fscache_n_op_release);
76865
76866 if (op->release) {
76867 op->release(op);
76868@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
76869 * lock, and defer it otherwise */
76870 if (!spin_trylock(&object->lock)) {
76871 _debug("defer put");
76872- fscache_stat(&fscache_n_op_deferred_release);
76873+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
76874
76875 cache = object->cache;
76876 spin_lock(&cache->op_gc_list_lock);
76877@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
76878
76879 _debug("GC DEFERRED REL OBJ%x OP%x",
76880 object->debug_id, op->debug_id);
76881- fscache_stat(&fscache_n_op_gc);
76882+ fscache_stat_unchecked(&fscache_n_op_gc);
76883
76884 ASSERTCMP(atomic_read(&op->usage), ==, 0);
76885 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
76886diff --git a/fs/fscache/page.c b/fs/fscache/page.c
76887index de33b3f..8be4d29 100644
76888--- a/fs/fscache/page.c
76889+++ b/fs/fscache/page.c
76890@@ -74,7 +74,7 @@ try_again:
76891 val = radix_tree_lookup(&cookie->stores, page->index);
76892 if (!val) {
76893 rcu_read_unlock();
76894- fscache_stat(&fscache_n_store_vmscan_not_storing);
76895+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
76896 __fscache_uncache_page(cookie, page);
76897 return true;
76898 }
76899@@ -104,11 +104,11 @@ try_again:
76900 spin_unlock(&cookie->stores_lock);
76901
76902 if (xpage) {
76903- fscache_stat(&fscache_n_store_vmscan_cancelled);
76904- fscache_stat(&fscache_n_store_radix_deletes);
76905+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
76906+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76907 ASSERTCMP(xpage, ==, page);
76908 } else {
76909- fscache_stat(&fscache_n_store_vmscan_gone);
76910+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
76911 }
76912
76913 wake_up_bit(&cookie->flags, 0);
76914@@ -123,11 +123,11 @@ page_busy:
76915 * sleeping on memory allocation, so we may need to impose a timeout
76916 * too. */
76917 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
76918- fscache_stat(&fscache_n_store_vmscan_busy);
76919+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
76920 return false;
76921 }
76922
76923- fscache_stat(&fscache_n_store_vmscan_wait);
76924+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
76925 if (!release_page_wait_timeout(cookie, page))
76926 _debug("fscache writeout timeout page: %p{%lx}",
76927 page, page->index);
76928@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
76929 FSCACHE_COOKIE_STORING_TAG);
76930 if (!radix_tree_tag_get(&cookie->stores, page->index,
76931 FSCACHE_COOKIE_PENDING_TAG)) {
76932- fscache_stat(&fscache_n_store_radix_deletes);
76933+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76934 xpage = radix_tree_delete(&cookie->stores, page->index);
76935 }
76936 spin_unlock(&cookie->stores_lock);
76937@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
76938
76939 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
76940
76941- fscache_stat(&fscache_n_attr_changed_calls);
76942+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
76943
76944 if (fscache_object_is_active(object)) {
76945 fscache_stat(&fscache_n_cop_attr_changed);
76946@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76947
76948 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76949
76950- fscache_stat(&fscache_n_attr_changed);
76951+ fscache_stat_unchecked(&fscache_n_attr_changed);
76952
76953 op = kzalloc(sizeof(*op), GFP_KERNEL);
76954 if (!op) {
76955- fscache_stat(&fscache_n_attr_changed_nomem);
76956+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
76957 _leave(" = -ENOMEM");
76958 return -ENOMEM;
76959 }
76960@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76961 if (fscache_submit_exclusive_op(object, op) < 0)
76962 goto nobufs_dec;
76963 spin_unlock(&cookie->lock);
76964- fscache_stat(&fscache_n_attr_changed_ok);
76965+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
76966 fscache_put_operation(op);
76967 _leave(" = 0");
76968 return 0;
76969@@ -242,7 +242,7 @@ nobufs:
76970 kfree(op);
76971 if (wake_cookie)
76972 __fscache_wake_unused_cookie(cookie);
76973- fscache_stat(&fscache_n_attr_changed_nobufs);
76974+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
76975 _leave(" = %d", -ENOBUFS);
76976 return -ENOBUFS;
76977 }
76978@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
76979 /* allocate a retrieval operation and attempt to submit it */
76980 op = kzalloc(sizeof(*op), GFP_NOIO);
76981 if (!op) {
76982- fscache_stat(&fscache_n_retrievals_nomem);
76983+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76984 return NULL;
76985 }
76986
76987@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
76988 return 0;
76989 }
76990
76991- fscache_stat(&fscache_n_retrievals_wait);
76992+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
76993
76994 jif = jiffies;
76995 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
76996 TASK_INTERRUPTIBLE) != 0) {
76997- fscache_stat(&fscache_n_retrievals_intr);
76998+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76999 _leave(" = -ERESTARTSYS");
77000 return -ERESTARTSYS;
77001 }
77002@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
77003 */
77004 int fscache_wait_for_operation_activation(struct fscache_object *object,
77005 struct fscache_operation *op,
77006- atomic_t *stat_op_waits,
77007- atomic_t *stat_object_dead,
77008+ atomic_unchecked_t *stat_op_waits,
77009+ atomic_unchecked_t *stat_object_dead,
77010 void (*do_cancel)(struct fscache_operation *))
77011 {
77012 int ret;
77013@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
77014
77015 _debug(">>> WT");
77016 if (stat_op_waits)
77017- fscache_stat(stat_op_waits);
77018+ fscache_stat_unchecked(stat_op_waits);
77019 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
77020 TASK_INTERRUPTIBLE) != 0) {
77021 ret = fscache_cancel_op(op, do_cancel);
77022@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
77023 check_if_dead:
77024 if (op->state == FSCACHE_OP_ST_CANCELLED) {
77025 if (stat_object_dead)
77026- fscache_stat(stat_object_dead);
77027+ fscache_stat_unchecked(stat_object_dead);
77028 _leave(" = -ENOBUFS [cancelled]");
77029 return -ENOBUFS;
77030 }
77031@@ -381,7 +381,7 @@ check_if_dead:
77032 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
77033 fscache_cancel_op(op, do_cancel);
77034 if (stat_object_dead)
77035- fscache_stat(stat_object_dead);
77036+ fscache_stat_unchecked(stat_object_dead);
77037 return -ENOBUFS;
77038 }
77039 return 0;
77040@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77041
77042 _enter("%p,%p,,,", cookie, page);
77043
77044- fscache_stat(&fscache_n_retrievals);
77045+ fscache_stat_unchecked(&fscache_n_retrievals);
77046
77047 if (hlist_empty(&cookie->backing_objects))
77048 goto nobufs;
77049@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77050 goto nobufs_unlock_dec;
77051 spin_unlock(&cookie->lock);
77052
77053- fscache_stat(&fscache_n_retrieval_ops);
77054+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
77055
77056 /* pin the netfs read context in case we need to do the actual netfs
77057 * read because we've encountered a cache read failure */
77058@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
77059
77060 error:
77061 if (ret == -ENOMEM)
77062- fscache_stat(&fscache_n_retrievals_nomem);
77063+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
77064 else if (ret == -ERESTARTSYS)
77065- fscache_stat(&fscache_n_retrievals_intr);
77066+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
77067 else if (ret == -ENODATA)
77068- fscache_stat(&fscache_n_retrievals_nodata);
77069+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
77070 else if (ret < 0)
77071- fscache_stat(&fscache_n_retrievals_nobufs);
77072+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77073 else
77074- fscache_stat(&fscache_n_retrievals_ok);
77075+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
77076
77077 fscache_put_retrieval(op);
77078 _leave(" = %d", ret);
77079@@ -505,7 +505,7 @@ nobufs_unlock:
77080 __fscache_wake_unused_cookie(cookie);
77081 kfree(op);
77082 nobufs:
77083- fscache_stat(&fscache_n_retrievals_nobufs);
77084+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77085 _leave(" = -ENOBUFS");
77086 return -ENOBUFS;
77087 }
77088@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77089
77090 _enter("%p,,%d,,,", cookie, *nr_pages);
77091
77092- fscache_stat(&fscache_n_retrievals);
77093+ fscache_stat_unchecked(&fscache_n_retrievals);
77094
77095 if (hlist_empty(&cookie->backing_objects))
77096 goto nobufs;
77097@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77098 goto nobufs_unlock_dec;
77099 spin_unlock(&cookie->lock);
77100
77101- fscache_stat(&fscache_n_retrieval_ops);
77102+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
77103
77104 /* pin the netfs read context in case we need to do the actual netfs
77105 * read because we've encountered a cache read failure */
77106@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
77107
77108 error:
77109 if (ret == -ENOMEM)
77110- fscache_stat(&fscache_n_retrievals_nomem);
77111+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
77112 else if (ret == -ERESTARTSYS)
77113- fscache_stat(&fscache_n_retrievals_intr);
77114+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
77115 else if (ret == -ENODATA)
77116- fscache_stat(&fscache_n_retrievals_nodata);
77117+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
77118 else if (ret < 0)
77119- fscache_stat(&fscache_n_retrievals_nobufs);
77120+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77121 else
77122- fscache_stat(&fscache_n_retrievals_ok);
77123+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
77124
77125 fscache_put_retrieval(op);
77126 _leave(" = %d", ret);
77127@@ -636,7 +636,7 @@ nobufs_unlock:
77128 if (wake_cookie)
77129 __fscache_wake_unused_cookie(cookie);
77130 nobufs:
77131- fscache_stat(&fscache_n_retrievals_nobufs);
77132+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
77133 _leave(" = -ENOBUFS");
77134 return -ENOBUFS;
77135 }
77136@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77137
77138 _enter("%p,%p,,,", cookie, page);
77139
77140- fscache_stat(&fscache_n_allocs);
77141+ fscache_stat_unchecked(&fscache_n_allocs);
77142
77143 if (hlist_empty(&cookie->backing_objects))
77144 goto nobufs;
77145@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77146 goto nobufs_unlock_dec;
77147 spin_unlock(&cookie->lock);
77148
77149- fscache_stat(&fscache_n_alloc_ops);
77150+ fscache_stat_unchecked(&fscache_n_alloc_ops);
77151
77152 ret = fscache_wait_for_operation_activation(
77153 object, &op->op,
77154@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
77155
77156 error:
77157 if (ret == -ERESTARTSYS)
77158- fscache_stat(&fscache_n_allocs_intr);
77159+ fscache_stat_unchecked(&fscache_n_allocs_intr);
77160 else if (ret < 0)
77161- fscache_stat(&fscache_n_allocs_nobufs);
77162+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77163 else
77164- fscache_stat(&fscache_n_allocs_ok);
77165+ fscache_stat_unchecked(&fscache_n_allocs_ok);
77166
77167 fscache_put_retrieval(op);
77168 _leave(" = %d", ret);
77169@@ -730,7 +730,7 @@ nobufs_unlock:
77170 if (wake_cookie)
77171 __fscache_wake_unused_cookie(cookie);
77172 nobufs:
77173- fscache_stat(&fscache_n_allocs_nobufs);
77174+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77175 _leave(" = -ENOBUFS");
77176 return -ENOBUFS;
77177 }
77178@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77179
77180 spin_lock(&cookie->stores_lock);
77181
77182- fscache_stat(&fscache_n_store_calls);
77183+ fscache_stat_unchecked(&fscache_n_store_calls);
77184
77185 /* find a page to store */
77186 page = NULL;
77187@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77188 page = results[0];
77189 _debug("gang %d [%lx]", n, page->index);
77190 if (page->index > op->store_limit) {
77191- fscache_stat(&fscache_n_store_pages_over_limit);
77192+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
77193 goto superseded;
77194 }
77195
77196@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77197 spin_unlock(&cookie->stores_lock);
77198 spin_unlock(&object->lock);
77199
77200- fscache_stat(&fscache_n_store_pages);
77201+ fscache_stat_unchecked(&fscache_n_store_pages);
77202 fscache_stat(&fscache_n_cop_write_page);
77203 ret = object->cache->ops->write_page(op, page);
77204 fscache_stat_d(&fscache_n_cop_write_page);
77205@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77206 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77207 ASSERT(PageFsCache(page));
77208
77209- fscache_stat(&fscache_n_stores);
77210+ fscache_stat_unchecked(&fscache_n_stores);
77211
77212 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
77213 _leave(" = -ENOBUFS [invalidating]");
77214@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77215 spin_unlock(&cookie->stores_lock);
77216 spin_unlock(&object->lock);
77217
77218- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
77219+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
77220 op->store_limit = object->store_limit;
77221
77222 __fscache_use_cookie(cookie);
77223@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77224
77225 spin_unlock(&cookie->lock);
77226 radix_tree_preload_end();
77227- fscache_stat(&fscache_n_store_ops);
77228- fscache_stat(&fscache_n_stores_ok);
77229+ fscache_stat_unchecked(&fscache_n_store_ops);
77230+ fscache_stat_unchecked(&fscache_n_stores_ok);
77231
77232 /* the work queue now carries its own ref on the object */
77233 fscache_put_operation(&op->op);
77234@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77235 return 0;
77236
77237 already_queued:
77238- fscache_stat(&fscache_n_stores_again);
77239+ fscache_stat_unchecked(&fscache_n_stores_again);
77240 already_pending:
77241 spin_unlock(&cookie->stores_lock);
77242 spin_unlock(&object->lock);
77243 spin_unlock(&cookie->lock);
77244 radix_tree_preload_end();
77245 kfree(op);
77246- fscache_stat(&fscache_n_stores_ok);
77247+ fscache_stat_unchecked(&fscache_n_stores_ok);
77248 _leave(" = 0");
77249 return 0;
77250
77251@@ -1039,14 +1039,14 @@ nobufs:
77252 kfree(op);
77253 if (wake_cookie)
77254 __fscache_wake_unused_cookie(cookie);
77255- fscache_stat(&fscache_n_stores_nobufs);
77256+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
77257 _leave(" = -ENOBUFS");
77258 return -ENOBUFS;
77259
77260 nomem_free:
77261 kfree(op);
77262 nomem:
77263- fscache_stat(&fscache_n_stores_oom);
77264+ fscache_stat_unchecked(&fscache_n_stores_oom);
77265 _leave(" = -ENOMEM");
77266 return -ENOMEM;
77267 }
77268@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
77269 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77270 ASSERTCMP(page, !=, NULL);
77271
77272- fscache_stat(&fscache_n_uncaches);
77273+ fscache_stat_unchecked(&fscache_n_uncaches);
77274
77275 /* cache withdrawal may beat us to it */
77276 if (!PageFsCache(page))
77277@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
77278 struct fscache_cookie *cookie = op->op.object->cookie;
77279
77280 #ifdef CONFIG_FSCACHE_STATS
77281- atomic_inc(&fscache_n_marks);
77282+ atomic_inc_unchecked(&fscache_n_marks);
77283 #endif
77284
77285 _debug("- mark %p{%lx}", page, page->index);
77286diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
77287index 40d13c7..ddf52b9 100644
77288--- a/fs/fscache/stats.c
77289+++ b/fs/fscache/stats.c
77290@@ -18,99 +18,99 @@
77291 /*
77292 * operation counters
77293 */
77294-atomic_t fscache_n_op_pend;
77295-atomic_t fscache_n_op_run;
77296-atomic_t fscache_n_op_enqueue;
77297-atomic_t fscache_n_op_requeue;
77298-atomic_t fscache_n_op_deferred_release;
77299-atomic_t fscache_n_op_release;
77300-atomic_t fscache_n_op_gc;
77301-atomic_t fscache_n_op_cancelled;
77302-atomic_t fscache_n_op_rejected;
77303+atomic_unchecked_t fscache_n_op_pend;
77304+atomic_unchecked_t fscache_n_op_run;
77305+atomic_unchecked_t fscache_n_op_enqueue;
77306+atomic_unchecked_t fscache_n_op_requeue;
77307+atomic_unchecked_t fscache_n_op_deferred_release;
77308+atomic_unchecked_t fscache_n_op_release;
77309+atomic_unchecked_t fscache_n_op_gc;
77310+atomic_unchecked_t fscache_n_op_cancelled;
77311+atomic_unchecked_t fscache_n_op_rejected;
77312
77313-atomic_t fscache_n_attr_changed;
77314-atomic_t fscache_n_attr_changed_ok;
77315-atomic_t fscache_n_attr_changed_nobufs;
77316-atomic_t fscache_n_attr_changed_nomem;
77317-atomic_t fscache_n_attr_changed_calls;
77318+atomic_unchecked_t fscache_n_attr_changed;
77319+atomic_unchecked_t fscache_n_attr_changed_ok;
77320+atomic_unchecked_t fscache_n_attr_changed_nobufs;
77321+atomic_unchecked_t fscache_n_attr_changed_nomem;
77322+atomic_unchecked_t fscache_n_attr_changed_calls;
77323
77324-atomic_t fscache_n_allocs;
77325-atomic_t fscache_n_allocs_ok;
77326-atomic_t fscache_n_allocs_wait;
77327-atomic_t fscache_n_allocs_nobufs;
77328-atomic_t fscache_n_allocs_intr;
77329-atomic_t fscache_n_allocs_object_dead;
77330-atomic_t fscache_n_alloc_ops;
77331-atomic_t fscache_n_alloc_op_waits;
77332+atomic_unchecked_t fscache_n_allocs;
77333+atomic_unchecked_t fscache_n_allocs_ok;
77334+atomic_unchecked_t fscache_n_allocs_wait;
77335+atomic_unchecked_t fscache_n_allocs_nobufs;
77336+atomic_unchecked_t fscache_n_allocs_intr;
77337+atomic_unchecked_t fscache_n_allocs_object_dead;
77338+atomic_unchecked_t fscache_n_alloc_ops;
77339+atomic_unchecked_t fscache_n_alloc_op_waits;
77340
77341-atomic_t fscache_n_retrievals;
77342-atomic_t fscache_n_retrievals_ok;
77343-atomic_t fscache_n_retrievals_wait;
77344-atomic_t fscache_n_retrievals_nodata;
77345-atomic_t fscache_n_retrievals_nobufs;
77346-atomic_t fscache_n_retrievals_intr;
77347-atomic_t fscache_n_retrievals_nomem;
77348-atomic_t fscache_n_retrievals_object_dead;
77349-atomic_t fscache_n_retrieval_ops;
77350-atomic_t fscache_n_retrieval_op_waits;
77351+atomic_unchecked_t fscache_n_retrievals;
77352+atomic_unchecked_t fscache_n_retrievals_ok;
77353+atomic_unchecked_t fscache_n_retrievals_wait;
77354+atomic_unchecked_t fscache_n_retrievals_nodata;
77355+atomic_unchecked_t fscache_n_retrievals_nobufs;
77356+atomic_unchecked_t fscache_n_retrievals_intr;
77357+atomic_unchecked_t fscache_n_retrievals_nomem;
77358+atomic_unchecked_t fscache_n_retrievals_object_dead;
77359+atomic_unchecked_t fscache_n_retrieval_ops;
77360+atomic_unchecked_t fscache_n_retrieval_op_waits;
77361
77362-atomic_t fscache_n_stores;
77363-atomic_t fscache_n_stores_ok;
77364-atomic_t fscache_n_stores_again;
77365-atomic_t fscache_n_stores_nobufs;
77366-atomic_t fscache_n_stores_oom;
77367-atomic_t fscache_n_store_ops;
77368-atomic_t fscache_n_store_calls;
77369-atomic_t fscache_n_store_pages;
77370-atomic_t fscache_n_store_radix_deletes;
77371-atomic_t fscache_n_store_pages_over_limit;
77372+atomic_unchecked_t fscache_n_stores;
77373+atomic_unchecked_t fscache_n_stores_ok;
77374+atomic_unchecked_t fscache_n_stores_again;
77375+atomic_unchecked_t fscache_n_stores_nobufs;
77376+atomic_unchecked_t fscache_n_stores_oom;
77377+atomic_unchecked_t fscache_n_store_ops;
77378+atomic_unchecked_t fscache_n_store_calls;
77379+atomic_unchecked_t fscache_n_store_pages;
77380+atomic_unchecked_t fscache_n_store_radix_deletes;
77381+atomic_unchecked_t fscache_n_store_pages_over_limit;
77382
77383-atomic_t fscache_n_store_vmscan_not_storing;
77384-atomic_t fscache_n_store_vmscan_gone;
77385-atomic_t fscache_n_store_vmscan_busy;
77386-atomic_t fscache_n_store_vmscan_cancelled;
77387-atomic_t fscache_n_store_vmscan_wait;
77388+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
77389+atomic_unchecked_t fscache_n_store_vmscan_gone;
77390+atomic_unchecked_t fscache_n_store_vmscan_busy;
77391+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
77392+atomic_unchecked_t fscache_n_store_vmscan_wait;
77393
77394-atomic_t fscache_n_marks;
77395-atomic_t fscache_n_uncaches;
77396+atomic_unchecked_t fscache_n_marks;
77397+atomic_unchecked_t fscache_n_uncaches;
77398
77399-atomic_t fscache_n_acquires;
77400-atomic_t fscache_n_acquires_null;
77401-atomic_t fscache_n_acquires_no_cache;
77402-atomic_t fscache_n_acquires_ok;
77403-atomic_t fscache_n_acquires_nobufs;
77404-atomic_t fscache_n_acquires_oom;
77405+atomic_unchecked_t fscache_n_acquires;
77406+atomic_unchecked_t fscache_n_acquires_null;
77407+atomic_unchecked_t fscache_n_acquires_no_cache;
77408+atomic_unchecked_t fscache_n_acquires_ok;
77409+atomic_unchecked_t fscache_n_acquires_nobufs;
77410+atomic_unchecked_t fscache_n_acquires_oom;
77411
77412-atomic_t fscache_n_invalidates;
77413-atomic_t fscache_n_invalidates_run;
77414+atomic_unchecked_t fscache_n_invalidates;
77415+atomic_unchecked_t fscache_n_invalidates_run;
77416
77417-atomic_t fscache_n_updates;
77418-atomic_t fscache_n_updates_null;
77419-atomic_t fscache_n_updates_run;
77420+atomic_unchecked_t fscache_n_updates;
77421+atomic_unchecked_t fscache_n_updates_null;
77422+atomic_unchecked_t fscache_n_updates_run;
77423
77424-atomic_t fscache_n_relinquishes;
77425-atomic_t fscache_n_relinquishes_null;
77426-atomic_t fscache_n_relinquishes_waitcrt;
77427-atomic_t fscache_n_relinquishes_retire;
77428+atomic_unchecked_t fscache_n_relinquishes;
77429+atomic_unchecked_t fscache_n_relinquishes_null;
77430+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
77431+atomic_unchecked_t fscache_n_relinquishes_retire;
77432
77433-atomic_t fscache_n_cookie_index;
77434-atomic_t fscache_n_cookie_data;
77435-atomic_t fscache_n_cookie_special;
77436+atomic_unchecked_t fscache_n_cookie_index;
77437+atomic_unchecked_t fscache_n_cookie_data;
77438+atomic_unchecked_t fscache_n_cookie_special;
77439
77440-atomic_t fscache_n_object_alloc;
77441-atomic_t fscache_n_object_no_alloc;
77442-atomic_t fscache_n_object_lookups;
77443-atomic_t fscache_n_object_lookups_negative;
77444-atomic_t fscache_n_object_lookups_positive;
77445-atomic_t fscache_n_object_lookups_timed_out;
77446-atomic_t fscache_n_object_created;
77447-atomic_t fscache_n_object_avail;
77448-atomic_t fscache_n_object_dead;
77449+atomic_unchecked_t fscache_n_object_alloc;
77450+atomic_unchecked_t fscache_n_object_no_alloc;
77451+atomic_unchecked_t fscache_n_object_lookups;
77452+atomic_unchecked_t fscache_n_object_lookups_negative;
77453+atomic_unchecked_t fscache_n_object_lookups_positive;
77454+atomic_unchecked_t fscache_n_object_lookups_timed_out;
77455+atomic_unchecked_t fscache_n_object_created;
77456+atomic_unchecked_t fscache_n_object_avail;
77457+atomic_unchecked_t fscache_n_object_dead;
77458
77459-atomic_t fscache_n_checkaux_none;
77460-atomic_t fscache_n_checkaux_okay;
77461-atomic_t fscache_n_checkaux_update;
77462-atomic_t fscache_n_checkaux_obsolete;
77463+atomic_unchecked_t fscache_n_checkaux_none;
77464+atomic_unchecked_t fscache_n_checkaux_okay;
77465+atomic_unchecked_t fscache_n_checkaux_update;
77466+atomic_unchecked_t fscache_n_checkaux_obsolete;
77467
77468 atomic_t fscache_n_cop_alloc_object;
77469 atomic_t fscache_n_cop_lookup_object;
77470@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
77471 seq_puts(m, "FS-Cache statistics\n");
77472
77473 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
77474- atomic_read(&fscache_n_cookie_index),
77475- atomic_read(&fscache_n_cookie_data),
77476- atomic_read(&fscache_n_cookie_special));
77477+ atomic_read_unchecked(&fscache_n_cookie_index),
77478+ atomic_read_unchecked(&fscache_n_cookie_data),
77479+ atomic_read_unchecked(&fscache_n_cookie_special));
77480
77481 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
77482- atomic_read(&fscache_n_object_alloc),
77483- atomic_read(&fscache_n_object_no_alloc),
77484- atomic_read(&fscache_n_object_avail),
77485- atomic_read(&fscache_n_object_dead));
77486+ atomic_read_unchecked(&fscache_n_object_alloc),
77487+ atomic_read_unchecked(&fscache_n_object_no_alloc),
77488+ atomic_read_unchecked(&fscache_n_object_avail),
77489+ atomic_read_unchecked(&fscache_n_object_dead));
77490 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
77491- atomic_read(&fscache_n_checkaux_none),
77492- atomic_read(&fscache_n_checkaux_okay),
77493- atomic_read(&fscache_n_checkaux_update),
77494- atomic_read(&fscache_n_checkaux_obsolete));
77495+ atomic_read_unchecked(&fscache_n_checkaux_none),
77496+ atomic_read_unchecked(&fscache_n_checkaux_okay),
77497+ atomic_read_unchecked(&fscache_n_checkaux_update),
77498+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
77499
77500 seq_printf(m, "Pages : mrk=%u unc=%u\n",
77501- atomic_read(&fscache_n_marks),
77502- atomic_read(&fscache_n_uncaches));
77503+ atomic_read_unchecked(&fscache_n_marks),
77504+ atomic_read_unchecked(&fscache_n_uncaches));
77505
77506 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
77507 " oom=%u\n",
77508- atomic_read(&fscache_n_acquires),
77509- atomic_read(&fscache_n_acquires_null),
77510- atomic_read(&fscache_n_acquires_no_cache),
77511- atomic_read(&fscache_n_acquires_ok),
77512- atomic_read(&fscache_n_acquires_nobufs),
77513- atomic_read(&fscache_n_acquires_oom));
77514+ atomic_read_unchecked(&fscache_n_acquires),
77515+ atomic_read_unchecked(&fscache_n_acquires_null),
77516+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
77517+ atomic_read_unchecked(&fscache_n_acquires_ok),
77518+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
77519+ atomic_read_unchecked(&fscache_n_acquires_oom));
77520
77521 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
77522- atomic_read(&fscache_n_object_lookups),
77523- atomic_read(&fscache_n_object_lookups_negative),
77524- atomic_read(&fscache_n_object_lookups_positive),
77525- atomic_read(&fscache_n_object_created),
77526- atomic_read(&fscache_n_object_lookups_timed_out));
77527+ atomic_read_unchecked(&fscache_n_object_lookups),
77528+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
77529+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
77530+ atomic_read_unchecked(&fscache_n_object_created),
77531+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
77532
77533 seq_printf(m, "Invals : n=%u run=%u\n",
77534- atomic_read(&fscache_n_invalidates),
77535- atomic_read(&fscache_n_invalidates_run));
77536+ atomic_read_unchecked(&fscache_n_invalidates),
77537+ atomic_read_unchecked(&fscache_n_invalidates_run));
77538
77539 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
77540- atomic_read(&fscache_n_updates),
77541- atomic_read(&fscache_n_updates_null),
77542- atomic_read(&fscache_n_updates_run));
77543+ atomic_read_unchecked(&fscache_n_updates),
77544+ atomic_read_unchecked(&fscache_n_updates_null),
77545+ atomic_read_unchecked(&fscache_n_updates_run));
77546
77547 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
77548- atomic_read(&fscache_n_relinquishes),
77549- atomic_read(&fscache_n_relinquishes_null),
77550- atomic_read(&fscache_n_relinquishes_waitcrt),
77551- atomic_read(&fscache_n_relinquishes_retire));
77552+ atomic_read_unchecked(&fscache_n_relinquishes),
77553+ atomic_read_unchecked(&fscache_n_relinquishes_null),
77554+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
77555+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
77556
77557 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
77558- atomic_read(&fscache_n_attr_changed),
77559- atomic_read(&fscache_n_attr_changed_ok),
77560- atomic_read(&fscache_n_attr_changed_nobufs),
77561- atomic_read(&fscache_n_attr_changed_nomem),
77562- atomic_read(&fscache_n_attr_changed_calls));
77563+ atomic_read_unchecked(&fscache_n_attr_changed),
77564+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
77565+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
77566+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
77567+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
77568
77569 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
77570- atomic_read(&fscache_n_allocs),
77571- atomic_read(&fscache_n_allocs_ok),
77572- atomic_read(&fscache_n_allocs_wait),
77573- atomic_read(&fscache_n_allocs_nobufs),
77574- atomic_read(&fscache_n_allocs_intr));
77575+ atomic_read_unchecked(&fscache_n_allocs),
77576+ atomic_read_unchecked(&fscache_n_allocs_ok),
77577+ atomic_read_unchecked(&fscache_n_allocs_wait),
77578+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
77579+ atomic_read_unchecked(&fscache_n_allocs_intr));
77580 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
77581- atomic_read(&fscache_n_alloc_ops),
77582- atomic_read(&fscache_n_alloc_op_waits),
77583- atomic_read(&fscache_n_allocs_object_dead));
77584+ atomic_read_unchecked(&fscache_n_alloc_ops),
77585+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
77586+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
77587
77588 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
77589 " int=%u oom=%u\n",
77590- atomic_read(&fscache_n_retrievals),
77591- atomic_read(&fscache_n_retrievals_ok),
77592- atomic_read(&fscache_n_retrievals_wait),
77593- atomic_read(&fscache_n_retrievals_nodata),
77594- atomic_read(&fscache_n_retrievals_nobufs),
77595- atomic_read(&fscache_n_retrievals_intr),
77596- atomic_read(&fscache_n_retrievals_nomem));
77597+ atomic_read_unchecked(&fscache_n_retrievals),
77598+ atomic_read_unchecked(&fscache_n_retrievals_ok),
77599+ atomic_read_unchecked(&fscache_n_retrievals_wait),
77600+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
77601+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
77602+ atomic_read_unchecked(&fscache_n_retrievals_intr),
77603+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
77604 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
77605- atomic_read(&fscache_n_retrieval_ops),
77606- atomic_read(&fscache_n_retrieval_op_waits),
77607- atomic_read(&fscache_n_retrievals_object_dead));
77608+ atomic_read_unchecked(&fscache_n_retrieval_ops),
77609+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
77610+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
77611
77612 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
77613- atomic_read(&fscache_n_stores),
77614- atomic_read(&fscache_n_stores_ok),
77615- atomic_read(&fscache_n_stores_again),
77616- atomic_read(&fscache_n_stores_nobufs),
77617- atomic_read(&fscache_n_stores_oom));
77618+ atomic_read_unchecked(&fscache_n_stores),
77619+ atomic_read_unchecked(&fscache_n_stores_ok),
77620+ atomic_read_unchecked(&fscache_n_stores_again),
77621+ atomic_read_unchecked(&fscache_n_stores_nobufs),
77622+ atomic_read_unchecked(&fscache_n_stores_oom));
77623 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
77624- atomic_read(&fscache_n_store_ops),
77625- atomic_read(&fscache_n_store_calls),
77626- atomic_read(&fscache_n_store_pages),
77627- atomic_read(&fscache_n_store_radix_deletes),
77628- atomic_read(&fscache_n_store_pages_over_limit));
77629+ atomic_read_unchecked(&fscache_n_store_ops),
77630+ atomic_read_unchecked(&fscache_n_store_calls),
77631+ atomic_read_unchecked(&fscache_n_store_pages),
77632+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
77633+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
77634
77635 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
77636- atomic_read(&fscache_n_store_vmscan_not_storing),
77637- atomic_read(&fscache_n_store_vmscan_gone),
77638- atomic_read(&fscache_n_store_vmscan_busy),
77639- atomic_read(&fscache_n_store_vmscan_cancelled),
77640- atomic_read(&fscache_n_store_vmscan_wait));
77641+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
77642+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
77643+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
77644+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
77645+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
77646
77647 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
77648- atomic_read(&fscache_n_op_pend),
77649- atomic_read(&fscache_n_op_run),
77650- atomic_read(&fscache_n_op_enqueue),
77651- atomic_read(&fscache_n_op_cancelled),
77652- atomic_read(&fscache_n_op_rejected));
77653+ atomic_read_unchecked(&fscache_n_op_pend),
77654+ atomic_read_unchecked(&fscache_n_op_run),
77655+ atomic_read_unchecked(&fscache_n_op_enqueue),
77656+ atomic_read_unchecked(&fscache_n_op_cancelled),
77657+ atomic_read_unchecked(&fscache_n_op_rejected));
77658 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
77659- atomic_read(&fscache_n_op_deferred_release),
77660- atomic_read(&fscache_n_op_release),
77661- atomic_read(&fscache_n_op_gc));
77662+ atomic_read_unchecked(&fscache_n_op_deferred_release),
77663+ atomic_read_unchecked(&fscache_n_op_release),
77664+ atomic_read_unchecked(&fscache_n_op_gc));
77665
77666 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
77667 atomic_read(&fscache_n_cop_alloc_object),
77668diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
77669index e5bbf74..9bfdaf3 100644
77670--- a/fs/fuse/cuse.c
77671+++ b/fs/fuse/cuse.c
77672@@ -602,10 +602,12 @@ static int __init cuse_init(void)
77673 INIT_LIST_HEAD(&cuse_conntbl[i]);
77674
77675 /* inherit and extend fuse_dev_operations */
77676- cuse_channel_fops = fuse_dev_operations;
77677- cuse_channel_fops.owner = THIS_MODULE;
77678- cuse_channel_fops.open = cuse_channel_open;
77679- cuse_channel_fops.release = cuse_channel_release;
77680+ pax_open_kernel();
77681+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
77682+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
77683+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
77684+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
77685+ pax_close_kernel();
77686
77687 cuse_class = class_create(THIS_MODULE, "cuse");
77688 if (IS_ERR(cuse_class))
77689diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
77690index c8b68ab..97190db 100644
77691--- a/fs/fuse/dev.c
77692+++ b/fs/fuse/dev.c
77693@@ -1398,7 +1398,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77694 ret = 0;
77695 pipe_lock(pipe);
77696
77697- if (!pipe->readers) {
77698+ if (!atomic_read(&pipe->readers)) {
77699 send_sig(SIGPIPE, current, 0);
77700 if (!ret)
77701 ret = -EPIPE;
77702@@ -1427,7 +1427,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77703 page_nr++;
77704 ret += buf->len;
77705
77706- if (pipe->files)
77707+ if (atomic_read(&pipe->files))
77708 do_wakeup = 1;
77709 }
77710
77711diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
77712index 0572bca..cb9c3fa 100644
77713--- a/fs/fuse/dir.c
77714+++ b/fs/fuse/dir.c
77715@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
77716 return link;
77717 }
77718
77719-static void free_link(char *link)
77720+static void free_link(const char *link)
77721 {
77722 if (!IS_ERR(link))
77723 free_page((unsigned long) link);
77724diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
77725index 0fa8062..755b198 100644
77726--- a/fs/gfs2/glock.c
77727+++ b/fs/gfs2/glock.c
77728@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
77729 if (held1 != held2) {
77730 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
77731 if (held2)
77732- gl->gl_lockref.count++;
77733+ __lockref_inc(&gl->gl_lockref);
77734 else
77735- gl->gl_lockref.count--;
77736+ __lockref_dec(&gl->gl_lockref);
77737 }
77738 if (held1 && held2 && list_empty(&gl->gl_holders))
77739 clear_bit(GLF_QUEUED, &gl->gl_flags);
77740@@ -614,9 +614,9 @@ out:
77741 out_sched:
77742 clear_bit(GLF_LOCK, &gl->gl_flags);
77743 smp_mb__after_atomic();
77744- gl->gl_lockref.count++;
77745+ __lockref_inc(&gl->gl_lockref);
77746 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77747- gl->gl_lockref.count--;
77748+ __lockref_dec(&gl->gl_lockref);
77749 return;
77750
77751 out_unlock:
77752@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
77753 gl->gl_sbd = sdp;
77754 gl->gl_flags = 0;
77755 gl->gl_name = name;
77756- gl->gl_lockref.count = 1;
77757+ __lockref_set(&gl->gl_lockref, 1);
77758 gl->gl_state = LM_ST_UNLOCKED;
77759 gl->gl_target = LM_ST_UNLOCKED;
77760 gl->gl_demote_state = LM_ST_EXCLUSIVE;
77761@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
77762 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
77763 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
77764 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77765- gl->gl_lockref.count++;
77766+ __lockref_inc(&gl->gl_lockref);
77767 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77768- gl->gl_lockref.count--;
77769+ __lockref_dec(&gl->gl_lockref);
77770 }
77771 run_queue(gl, 1);
77772 spin_unlock(&gl->gl_spin);
77773@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
77774 }
77775 }
77776
77777- gl->gl_lockref.count++;
77778+ __lockref_inc(&gl->gl_lockref);
77779 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77780 spin_unlock(&gl->gl_spin);
77781
77782@@ -1384,12 +1384,12 @@ add_back_to_lru:
77783 goto add_back_to_lru;
77784 }
77785 clear_bit(GLF_LRU, &gl->gl_flags);
77786- gl->gl_lockref.count++;
77787+ __lockref_inc(&gl->gl_lockref);
77788 if (demote_ok(gl))
77789 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
77790 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
77791 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77792- gl->gl_lockref.count--;
77793+ __lockref_dec(&gl->gl_lockref);
77794 spin_unlock(&gl->gl_spin);
77795 cond_resched_lock(&lru_lock);
77796 }
77797@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
77798 state2str(gl->gl_demote_state), dtime,
77799 atomic_read(&gl->gl_ail_count),
77800 atomic_read(&gl->gl_revokes),
77801- (int)gl->gl_lockref.count, gl->gl_hold_time);
77802+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
77803
77804 list_for_each_entry(gh, &gl->gl_holders, gh_list)
77805 dump_holder(seq, gh);
77806diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
77807index fe91951..ce38a6e 100644
77808--- a/fs/gfs2/glops.c
77809+++ b/fs/gfs2/glops.c
77810@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
77811
77812 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
77813 gl->gl_state == LM_ST_SHARED && ip) {
77814- gl->gl_lockref.count++;
77815+ __lockref_inc(&gl->gl_lockref);
77816 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
77817- gl->gl_lockref.count--;
77818+ __lockref_dec(&gl->gl_lockref);
77819 }
77820 }
77821
77822diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
77823index e3065cb..45e7117 100644
77824--- a/fs/gfs2/quota.c
77825+++ b/fs/gfs2/quota.c
77826@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
77827 if (!spin_trylock(&qd->qd_lockref.lock))
77828 return LRU_SKIP;
77829
77830- if (qd->qd_lockref.count == 0) {
77831+ if (__lockref_read(&qd->qd_lockref) == 0) {
77832 lockref_mark_dead(&qd->qd_lockref);
77833 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
77834 }
77835@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
77836 return NULL;
77837
77838 qd->qd_sbd = sdp;
77839- qd->qd_lockref.count = 1;
77840+ __lockref_set(&qd->qd_lockref, 1);
77841 spin_lock_init(&qd->qd_lockref.lock);
77842 qd->qd_id = qid;
77843 qd->qd_slot = -1;
77844@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
77845 if (lockref_put_or_lock(&qd->qd_lockref))
77846 return;
77847
77848- qd->qd_lockref.count = 0;
77849+ __lockref_set(&qd->qd_lockref, 0);
77850 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
77851 spin_unlock(&qd->qd_lockref.lock);
77852
77853diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
77854index 07d8d8f..2c2a4e7 100644
77855--- a/fs/hostfs/hostfs_kern.c
77856+++ b/fs/hostfs/hostfs_kern.c
77857@@ -918,7 +918,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
77858
77859 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
77860 {
77861- char *s = nd_get_link(nd);
77862+ const char *s = nd_get_link(nd);
77863 if (!IS_ERR(s))
77864 __putname(s);
77865 }
77866diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
77867index 87724c1..5a5e53f 100644
77868--- a/fs/hugetlbfs/inode.c
77869+++ b/fs/hugetlbfs/inode.c
77870@@ -151,6 +151,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77871 struct mm_struct *mm = current->mm;
77872 struct vm_area_struct *vma;
77873 struct hstate *h = hstate_file(file);
77874+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
77875 struct vm_unmapped_area_info info;
77876
77877 if (len & ~huge_page_mask(h))
77878@@ -164,17 +165,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77879 return addr;
77880 }
77881
77882+#ifdef CONFIG_PAX_RANDMMAP
77883+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77884+#endif
77885+
77886 if (addr) {
77887 addr = ALIGN(addr, huge_page_size(h));
77888 vma = find_vma(mm, addr);
77889- if (TASK_SIZE - len >= addr &&
77890- (!vma || addr + len <= vma->vm_start))
77891+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
77892 return addr;
77893 }
77894
77895 info.flags = 0;
77896 info.length = len;
77897 info.low_limit = TASK_UNMAPPED_BASE;
77898+
77899+#ifdef CONFIG_PAX_RANDMMAP
77900+ if (mm->pax_flags & MF_PAX_RANDMMAP)
77901+ info.low_limit += mm->delta_mmap;
77902+#endif
77903+
77904 info.high_limit = TASK_SIZE;
77905 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
77906 info.align_offset = 0;
77907@@ -939,7 +949,7 @@ static struct file_system_type hugetlbfs_fs_type = {
77908 };
77909 MODULE_ALIAS_FS("hugetlbfs");
77910
77911-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77912+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77913
77914 static int can_do_hugetlb_shm(void)
77915 {
77916diff --git a/fs/inode.c b/fs/inode.c
77917index 6e342ca..0538cb7 100644
77918--- a/fs/inode.c
77919+++ b/fs/inode.c
77920@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
77921 unsigned int *p = &get_cpu_var(last_ino);
77922 unsigned int res = *p;
77923
77924+start:
77925+
77926 #ifdef CONFIG_SMP
77927 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
77928- static atomic_t shared_last_ino;
77929- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
77930+ static atomic_unchecked_t shared_last_ino;
77931+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
77932
77933 res = next - LAST_INO_BATCH;
77934 }
77935 #endif
77936
77937- *p = ++res;
77938+ if (unlikely(!++res))
77939+ goto start; /* never zero */
77940+ *p = res;
77941 put_cpu_var(last_ino);
77942 return res;
77943 }
77944diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
77945index 4a6cf28..d3a29d3 100644
77946--- a/fs/jffs2/erase.c
77947+++ b/fs/jffs2/erase.c
77948@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
77949 struct jffs2_unknown_node marker = {
77950 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
77951 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77952- .totlen = cpu_to_je32(c->cleanmarker_size)
77953+ .totlen = cpu_to_je32(c->cleanmarker_size),
77954+ .hdr_crc = cpu_to_je32(0)
77955 };
77956
77957 jffs2_prealloc_raw_node_refs(c, jeb, 1);
77958diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
77959index 09ed551..45684f8 100644
77960--- a/fs/jffs2/wbuf.c
77961+++ b/fs/jffs2/wbuf.c
77962@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
77963 {
77964 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
77965 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77966- .totlen = constant_cpu_to_je32(8)
77967+ .totlen = constant_cpu_to_je32(8),
77968+ .hdr_crc = constant_cpu_to_je32(0)
77969 };
77970
77971 /*
77972diff --git a/fs/jfs/super.c b/fs/jfs/super.c
77973index 4cd9798..8dfe86a 100644
77974--- a/fs/jfs/super.c
77975+++ b/fs/jfs/super.c
77976@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
77977
77978 jfs_inode_cachep =
77979 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
77980- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
77981+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
77982 init_once);
77983 if (jfs_inode_cachep == NULL)
77984 return -ENOMEM;
77985diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
77986index 2d48d28..82eddad 100644
77987--- a/fs/kernfs/dir.c
77988+++ b/fs/kernfs/dir.c
77989@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
77990 *
77991 * Returns 31 bit hash of ns + name (so it fits in an off_t )
77992 */
77993-static unsigned int kernfs_name_hash(const char *name, const void *ns)
77994+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
77995 {
77996 unsigned long hash = init_name_hash();
77997 unsigned int len = strlen(name);
77998@@ -873,6 +873,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
77999 ret = scops->mkdir(parent, dentry->d_name.name, mode);
78000
78001 kernfs_put_active(parent);
78002+
78003+ if (!ret) {
78004+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
78005+ ret = PTR_ERR_OR_ZERO(dentry_ret);
78006+ }
78007+
78008 return ret;
78009 }
78010
78011diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
78012index 2bacb99..f745182 100644
78013--- a/fs/kernfs/file.c
78014+++ b/fs/kernfs/file.c
78015@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
78016
78017 struct kernfs_open_node {
78018 atomic_t refcnt;
78019- atomic_t event;
78020+ atomic_unchecked_t event;
78021 wait_queue_head_t poll;
78022 struct list_head files; /* goes through kernfs_open_file.list */
78023 };
78024@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
78025 {
78026 struct kernfs_open_file *of = sf->private;
78027
78028- of->event = atomic_read(&of->kn->attr.open->event);
78029+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
78030
78031 return of->kn->attr.ops->seq_show(sf, v);
78032 }
78033@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
78034 goto out_free;
78035 }
78036
78037- of->event = atomic_read(&of->kn->attr.open->event);
78038+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
78039 ops = kernfs_ops(of->kn);
78040 if (ops->read)
78041 len = ops->read(of, buf, len, *ppos);
78042@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
78043 {
78044 struct kernfs_open_file *of = kernfs_of(file);
78045 const struct kernfs_ops *ops;
78046- size_t len;
78047+ ssize_t len;
78048 char *buf;
78049
78050 if (of->atomic_write_len) {
78051@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
78052 return ret;
78053 }
78054
78055-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
78056- void *buf, int len, int write)
78057+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
78058+ void *buf, size_t len, int write)
78059 {
78060 struct file *file = vma->vm_file;
78061 struct kernfs_open_file *of = kernfs_of(file);
78062- int ret;
78063+ ssize_t ret;
78064
78065 if (!of->vm_ops)
78066 return -EINVAL;
78067@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
78068 return -ENOMEM;
78069
78070 atomic_set(&new_on->refcnt, 0);
78071- atomic_set(&new_on->event, 1);
78072+ atomic_set_unchecked(&new_on->event, 1);
78073 init_waitqueue_head(&new_on->poll);
78074 INIT_LIST_HEAD(&new_on->files);
78075 goto retry;
78076@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
78077
78078 kernfs_put_active(kn);
78079
78080- if (of->event != atomic_read(&on->event))
78081+ if (of->event != atomic_read_unchecked(&on->event))
78082 goto trigger;
78083
78084 return DEFAULT_POLLMASK;
78085@@ -824,7 +824,7 @@ repeat:
78086
78087 on = kn->attr.open;
78088 if (on) {
78089- atomic_inc(&on->event);
78090+ atomic_inc_unchecked(&on->event);
78091 wake_up_interruptible(&on->poll);
78092 }
78093
78094diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
78095index 8a19889..4c3069a 100644
78096--- a/fs/kernfs/symlink.c
78097+++ b/fs/kernfs/symlink.c
78098@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
78099 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
78100 void *cookie)
78101 {
78102- char *page = nd_get_link(nd);
78103+ const char *page = nd_get_link(nd);
78104 if (!IS_ERR(page))
78105 free_page((unsigned long)page);
78106 }
78107diff --git a/fs/libfs.c b/fs/libfs.c
78108index 0281359..24971ac 100644
78109--- a/fs/libfs.c
78110+++ b/fs/libfs.c
78111@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
78112
78113 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
78114 struct dentry *next = list_entry(p, struct dentry, d_child);
78115+ char d_name[sizeof(next->d_iname)];
78116+ const unsigned char *name;
78117+
78118 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
78119 if (!simple_positive(next)) {
78120 spin_unlock(&next->d_lock);
78121@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
78122
78123 spin_unlock(&next->d_lock);
78124 spin_unlock(&dentry->d_lock);
78125- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
78126+ name = next->d_name.name;
78127+ if (name == next->d_iname) {
78128+ memcpy(d_name, name, next->d_name.len);
78129+ name = d_name;
78130+ }
78131+ if (!dir_emit(ctx, name, next->d_name.len,
78132 d_inode(next)->i_ino, dt_type(d_inode(next))))
78133 return 0;
78134 spin_lock(&dentry->d_lock);
78135@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
78136 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
78137 void *cookie)
78138 {
78139- char *s = nd_get_link(nd);
78140+ const char *s = nd_get_link(nd);
78141 if (!IS_ERR(s))
78142 kfree(s);
78143 }
78144diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
78145index acd3947..1f896e2 100644
78146--- a/fs/lockd/clntproc.c
78147+++ b/fs/lockd/clntproc.c
78148@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
78149 /*
78150 * Cookie counter for NLM requests
78151 */
78152-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
78153+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
78154
78155 void nlmclnt_next_cookie(struct nlm_cookie *c)
78156 {
78157- u32 cookie = atomic_inc_return(&nlm_cookie);
78158+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
78159
78160 memcpy(c->data, &cookie, 4);
78161 c->len=4;
78162diff --git a/fs/mount.h b/fs/mount.h
78163index 6a61c2b..bd79179 100644
78164--- a/fs/mount.h
78165+++ b/fs/mount.h
78166@@ -13,7 +13,7 @@ struct mnt_namespace {
78167 u64 seq; /* Sequence number to prevent loops */
78168 wait_queue_head_t poll;
78169 u64 event;
78170-};
78171+} __randomize_layout;
78172
78173 struct mnt_pcp {
78174 int mnt_count;
78175@@ -65,7 +65,7 @@ struct mount {
78176 struct hlist_head mnt_pins;
78177 struct fs_pin mnt_umount;
78178 struct dentry *mnt_ex_mountpoint;
78179-};
78180+} __randomize_layout;
78181
78182 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
78183
78184diff --git a/fs/namei.c b/fs/namei.c
78185index fe30d3b..cf767ae 100644
78186--- a/fs/namei.c
78187+++ b/fs/namei.c
78188@@ -336,17 +336,32 @@ int generic_permission(struct inode *inode, int mask)
78189 if (ret != -EACCES)
78190 return ret;
78191
78192+#ifdef CONFIG_GRKERNSEC
78193+ /* we'll block if we have to log due to a denied capability use */
78194+ if (mask & MAY_NOT_BLOCK)
78195+ return -ECHILD;
78196+#endif
78197+
78198 if (S_ISDIR(inode->i_mode)) {
78199 /* DACs are overridable for directories */
78200- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78201- return 0;
78202 if (!(mask & MAY_WRITE))
78203- if (capable_wrt_inode_uidgid(inode,
78204- CAP_DAC_READ_SEARCH))
78205+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78206+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78207 return 0;
78208+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78209+ return 0;
78210 return -EACCES;
78211 }
78212 /*
78213+ * Searching includes executable on directories, else just read.
78214+ */
78215+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78216+ if (mask == MAY_READ)
78217+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78218+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78219+ return 0;
78220+
78221+ /*
78222 * Read/write DACs are always overridable.
78223 * Executable DACs are overridable when there is
78224 * at least one exec bit set.
78225@@ -355,14 +370,6 @@ int generic_permission(struct inode *inode, int mask)
78226 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78227 return 0;
78228
78229- /*
78230- * Searching includes executable on directories, else just read.
78231- */
78232- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78233- if (mask == MAY_READ)
78234- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78235- return 0;
78236-
78237 return -EACCES;
78238 }
78239 EXPORT_SYMBOL(generic_permission);
78240@@ -502,7 +509,7 @@ struct nameidata {
78241 int last_type;
78242 unsigned depth;
78243 struct file *base;
78244- char *saved_names[MAX_NESTED_LINKS + 1];
78245+ const char *saved_names[MAX_NESTED_LINKS + 1];
78246 };
78247
78248 /*
78249@@ -713,13 +720,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
78250 nd->flags |= LOOKUP_JUMPED;
78251 }
78252
78253-void nd_set_link(struct nameidata *nd, char *path)
78254+void nd_set_link(struct nameidata *nd, const char *path)
78255 {
78256 nd->saved_names[nd->depth] = path;
78257 }
78258 EXPORT_SYMBOL(nd_set_link);
78259
78260-char *nd_get_link(struct nameidata *nd)
78261+const char *nd_get_link(const struct nameidata *nd)
78262 {
78263 return nd->saved_names[nd->depth];
78264 }
78265@@ -854,7 +861,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78266 {
78267 struct dentry *dentry = link->dentry;
78268 int error;
78269- char *s;
78270+ const char *s;
78271
78272 BUG_ON(nd->flags & LOOKUP_RCU);
78273
78274@@ -875,6 +882,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78275 if (error)
78276 goto out_put_nd_path;
78277
78278+ if (gr_handle_follow_link(dentry, nd->path.mnt)) {
78279+ error = -EACCES;
78280+ goto out_put_nd_path;
78281+ }
78282+
78283 nd->last_type = LAST_BIND;
78284 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
78285 error = PTR_ERR(*p);
78286@@ -1647,6 +1659,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
78287 if (res)
78288 break;
78289 res = walk_component(nd, path, LOOKUP_FOLLOW);
78290+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
78291+ res = -EACCES;
78292 put_link(nd, &link, cookie);
78293 } while (res > 0);
78294
78295@@ -1719,7 +1733,7 @@ EXPORT_SYMBOL(full_name_hash);
78296 static inline u64 hash_name(const char *name)
78297 {
78298 unsigned long a, b, adata, bdata, mask, hash, len;
78299- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78300+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78301
78302 hash = a = 0;
78303 len = -sizeof(unsigned long);
78304@@ -2015,6 +2029,8 @@ static int path_lookupat(int dfd, const struct filename *name,
78305 if (err)
78306 break;
78307 err = lookup_last(nd, &path);
78308+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
78309+ err = -EACCES;
78310 put_link(nd, &link, cookie);
78311 }
78312 }
78313@@ -2022,6 +2038,13 @@ static int path_lookupat(int dfd, const struct filename *name,
78314 if (!err)
78315 err = complete_walk(nd);
78316
78317+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
78318+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78319+ path_put(&nd->path);
78320+ err = -ENOENT;
78321+ }
78322+ }
78323+
78324 if (!err && nd->flags & LOOKUP_DIRECTORY) {
78325 if (!d_can_lookup(nd->path.dentry)) {
78326 path_put(&nd->path);
78327@@ -2042,8 +2065,15 @@ static int filename_lookup(int dfd, struct filename *name,
78328 if (unlikely(retval == -ESTALE))
78329 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
78330
78331- if (likely(!retval))
78332+ if (likely(!retval)) {
78333 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
78334+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
78335+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
78336+ path_put(&nd->path);
78337+ return -ENOENT;
78338+ }
78339+ }
78340+ }
78341 return retval;
78342 }
78343
78344@@ -2621,6 +2651,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
78345 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
78346 return -EPERM;
78347
78348+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
78349+ return -EPERM;
78350+ if (gr_handle_rawio(inode))
78351+ return -EPERM;
78352+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
78353+ return -EACCES;
78354+
78355 return 0;
78356 }
78357
78358@@ -2852,7 +2889,7 @@ looked_up:
78359 * cleared otherwise prior to returning.
78360 */
78361 static int lookup_open(struct nameidata *nd, struct path *path,
78362- struct file *file,
78363+ struct path *link, struct file *file,
78364 const struct open_flags *op,
78365 bool got_write, int *opened)
78366 {
78367@@ -2887,6 +2924,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78368 /* Negative dentry, just create the file */
78369 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
78370 umode_t mode = op->mode;
78371+
78372+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
78373+ error = -EACCES;
78374+ goto out_dput;
78375+ }
78376+
78377+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
78378+ error = -EACCES;
78379+ goto out_dput;
78380+ }
78381+
78382 if (!IS_POSIXACL(dir->d_inode))
78383 mode &= ~current_umask();
78384 /*
78385@@ -2908,6 +2956,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78386 nd->flags & LOOKUP_EXCL);
78387 if (error)
78388 goto out_dput;
78389+ else
78390+ gr_handle_create(dentry, nd->path.mnt);
78391 }
78392 out_no_open:
78393 path->dentry = dentry;
78394@@ -2922,7 +2972,7 @@ out_dput:
78395 /*
78396 * Handle the last step of open()
78397 */
78398-static int do_last(struct nameidata *nd, struct path *path,
78399+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
78400 struct file *file, const struct open_flags *op,
78401 int *opened, struct filename *name)
78402 {
78403@@ -2972,6 +3022,15 @@ static int do_last(struct nameidata *nd, struct path *path,
78404 if (error)
78405 return error;
78406
78407+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
78408+ error = -ENOENT;
78409+ goto out;
78410+ }
78411+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78412+ error = -EACCES;
78413+ goto out;
78414+ }
78415+
78416 audit_inode(name, dir, LOOKUP_PARENT);
78417 error = -EISDIR;
78418 /* trailing slashes? */
78419@@ -2991,7 +3050,7 @@ retry_lookup:
78420 */
78421 }
78422 mutex_lock(&dir->d_inode->i_mutex);
78423- error = lookup_open(nd, path, file, op, got_write, opened);
78424+ error = lookup_open(nd, path, link, file, op, got_write, opened);
78425 mutex_unlock(&dir->d_inode->i_mutex);
78426
78427 if (error <= 0) {
78428@@ -3015,11 +3074,28 @@ retry_lookup:
78429 goto finish_open_created;
78430 }
78431
78432+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
78433+ error = -ENOENT;
78434+ goto exit_dput;
78435+ }
78436+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
78437+ error = -EACCES;
78438+ goto exit_dput;
78439+ }
78440+
78441 /*
78442 * create/update audit record if it already exists.
78443 */
78444- if (d_is_positive(path->dentry))
78445+ if (d_is_positive(path->dentry)) {
78446+ /* only check if O_CREAT is specified, all other checks need to go
78447+ into may_open */
78448+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
78449+ error = -EACCES;
78450+ goto exit_dput;
78451+ }
78452+
78453 audit_inode(name, path->dentry, 0);
78454+ }
78455
78456 /*
78457 * If atomic_open() acquired write access it is dropped now due to
78458@@ -3060,6 +3136,11 @@ finish_lookup:
78459 }
78460 }
78461 BUG_ON(inode != path->dentry->d_inode);
78462+ /* if we're resolving a symlink to another symlink */
78463+ if (link && gr_handle_symlink_owner(link, inode)) {
78464+ error = -EACCES;
78465+ goto out;
78466+ }
78467 return 1;
78468 }
78469
78470@@ -3079,7 +3160,18 @@ finish_open:
78471 path_put(&save_parent);
78472 return error;
78473 }
78474+
78475+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78476+ error = -ENOENT;
78477+ goto out;
78478+ }
78479+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78480+ error = -EACCES;
78481+ goto out;
78482+ }
78483+
78484 audit_inode(name, nd->path.dentry, 0);
78485+
78486 error = -EISDIR;
78487 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
78488 goto out;
78489@@ -3240,7 +3332,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78490 if (unlikely(error))
78491 goto out;
78492
78493- error = do_last(nd, &path, file, op, &opened, pathname);
78494+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
78495 while (unlikely(error > 0)) { /* trailing symlink */
78496 struct path link = path;
78497 void *cookie;
78498@@ -3258,7 +3350,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78499 error = follow_link(&link, nd, &cookie);
78500 if (unlikely(error))
78501 break;
78502- error = do_last(nd, &path, file, op, &opened, pathname);
78503+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
78504 put_link(nd, &link, cookie);
78505 }
78506 out:
78507@@ -3361,9 +3453,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
78508 goto unlock;
78509
78510 error = -EEXIST;
78511- if (d_is_positive(dentry))
78512+ if (d_is_positive(dentry)) {
78513+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
78514+ error = -ENOENT;
78515 goto fail;
78516-
78517+ }
78518 /*
78519 * Special case - lookup gave negative, but... we had foo/bar/
78520 * From the vfs_mknod() POV we just have a negative dentry -
78521@@ -3428,6 +3522,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
78522 }
78523 EXPORT_SYMBOL(user_path_create);
78524
78525+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
78526+{
78527+ struct filename *tmp = getname(pathname);
78528+ struct dentry *res;
78529+ if (IS_ERR(tmp))
78530+ return ERR_CAST(tmp);
78531+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
78532+ if (IS_ERR(res))
78533+ putname(tmp);
78534+ else
78535+ *to = tmp;
78536+ return res;
78537+}
78538+
78539 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
78540 {
78541 int error = may_create(dir, dentry);
78542@@ -3491,6 +3599,17 @@ retry:
78543
78544 if (!IS_POSIXACL(path.dentry->d_inode))
78545 mode &= ~current_umask();
78546+
78547+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
78548+ error = -EPERM;
78549+ goto out;
78550+ }
78551+
78552+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78553+ error = -EACCES;
78554+ goto out;
78555+ }
78556+
78557 error = security_path_mknod(&path, dentry, mode, dev);
78558 if (error)
78559 goto out;
78560@@ -3506,6 +3625,8 @@ retry:
78561 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
78562 break;
78563 }
78564+ if (!error)
78565+ gr_handle_create(dentry, path.mnt);
78566 out:
78567 done_path_create(&path, dentry);
78568 if (retry_estale(error, lookup_flags)) {
78569@@ -3560,9 +3681,16 @@ retry:
78570
78571 if (!IS_POSIXACL(path.dentry->d_inode))
78572 mode &= ~current_umask();
78573+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
78574+ error = -EACCES;
78575+ goto out;
78576+ }
78577 error = security_path_mkdir(&path, dentry, mode);
78578 if (!error)
78579 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
78580+ if (!error)
78581+ gr_handle_create(dentry, path.mnt);
78582+out:
78583 done_path_create(&path, dentry);
78584 if (retry_estale(error, lookup_flags)) {
78585 lookup_flags |= LOOKUP_REVAL;
78586@@ -3595,7 +3723,7 @@ void dentry_unhash(struct dentry *dentry)
78587 {
78588 shrink_dcache_parent(dentry);
78589 spin_lock(&dentry->d_lock);
78590- if (dentry->d_lockref.count == 1)
78591+ if (__lockref_read(&dentry->d_lockref) == 1)
78592 __d_drop(dentry);
78593 spin_unlock(&dentry->d_lock);
78594 }
78595@@ -3646,6 +3774,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
78596 struct filename *name;
78597 struct dentry *dentry;
78598 struct nameidata nd;
78599+ u64 saved_ino = 0;
78600+ dev_t saved_dev = 0;
78601 unsigned int lookup_flags = 0;
78602 retry:
78603 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78604@@ -3678,10 +3808,21 @@ retry:
78605 error = -ENOENT;
78606 goto exit3;
78607 }
78608+
78609+ saved_ino = gr_get_ino_from_dentry(dentry);
78610+ saved_dev = gr_get_dev_from_dentry(dentry);
78611+
78612+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
78613+ error = -EACCES;
78614+ goto exit3;
78615+ }
78616+
78617 error = security_path_rmdir(&nd.path, dentry);
78618 if (error)
78619 goto exit3;
78620 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
78621+ if (!error && (saved_dev || saved_ino))
78622+ gr_handle_delete(saved_ino, saved_dev);
78623 exit3:
78624 dput(dentry);
78625 exit2:
78626@@ -3774,6 +3915,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
78627 struct nameidata nd;
78628 struct inode *inode = NULL;
78629 struct inode *delegated_inode = NULL;
78630+ u64 saved_ino = 0;
78631+ dev_t saved_dev = 0;
78632 unsigned int lookup_flags = 0;
78633 retry:
78634 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78635@@ -3800,10 +3943,22 @@ retry_deleg:
78636 if (d_is_negative(dentry))
78637 goto slashes;
78638 ihold(inode);
78639+
78640+ if (inode->i_nlink <= 1) {
78641+ saved_ino = gr_get_ino_from_dentry(dentry);
78642+ saved_dev = gr_get_dev_from_dentry(dentry);
78643+ }
78644+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
78645+ error = -EACCES;
78646+ goto exit2;
78647+ }
78648+
78649 error = security_path_unlink(&nd.path, dentry);
78650 if (error)
78651 goto exit2;
78652 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
78653+ if (!error && (saved_ino || saved_dev))
78654+ gr_handle_delete(saved_ino, saved_dev);
78655 exit2:
78656 dput(dentry);
78657 }
78658@@ -3892,9 +4047,17 @@ retry:
78659 if (IS_ERR(dentry))
78660 goto out_putname;
78661
78662+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
78663+ error = -EACCES;
78664+ goto out;
78665+ }
78666+
78667 error = security_path_symlink(&path, dentry, from->name);
78668 if (!error)
78669 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
78670+ if (!error)
78671+ gr_handle_create(dentry, path.mnt);
78672+out:
78673 done_path_create(&path, dentry);
78674 if (retry_estale(error, lookup_flags)) {
78675 lookup_flags |= LOOKUP_REVAL;
78676@@ -3998,6 +4161,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
78677 struct dentry *new_dentry;
78678 struct path old_path, new_path;
78679 struct inode *delegated_inode = NULL;
78680+ struct filename *to = NULL;
78681 int how = 0;
78682 int error;
78683
78684@@ -4021,7 +4185,7 @@ retry:
78685 if (error)
78686 return error;
78687
78688- new_dentry = user_path_create(newdfd, newname, &new_path,
78689+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
78690 (how & LOOKUP_REVAL));
78691 error = PTR_ERR(new_dentry);
78692 if (IS_ERR(new_dentry))
78693@@ -4033,11 +4197,26 @@ retry:
78694 error = may_linkat(&old_path);
78695 if (unlikely(error))
78696 goto out_dput;
78697+
78698+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt, to)) {
78699+ error = -EACCES;
78700+ goto out_dput;
78701+ }
78702+
78703+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
78704+ old_path.dentry, old_path.mnt, to)) {
78705+ error = -EACCES;
78706+ goto out_dput;
78707+ }
78708+
78709 error = security_path_link(old_path.dentry, &new_path, new_dentry);
78710 if (error)
78711 goto out_dput;
78712 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
78713+ if (!error)
78714+ gr_handle_create(new_dentry, new_path.mnt);
78715 out_dput:
78716+ putname(to);
78717 done_path_create(&new_path, new_dentry);
78718 if (delegated_inode) {
78719 error = break_deleg_wait(&delegated_inode);
78720@@ -4353,6 +4532,20 @@ retry_deleg:
78721 if (new_dentry == trap)
78722 goto exit5;
78723
78724+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
78725+ /* use EXDEV error to cause 'mv' to switch to an alternative
78726+ * method for usability
78727+ */
78728+ error = -EXDEV;
78729+ goto exit5;
78730+ }
78731+
78732+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
78733+ old_dentry, d_backing_inode(old_dir), oldnd.path.mnt,
78734+ to, flags);
78735+ if (error)
78736+ goto exit5;
78737+
78738 error = security_path_rename(&oldnd.path, old_dentry,
78739 &newnd.path, new_dentry, flags);
78740 if (error)
78741@@ -4360,6 +4553,9 @@ retry_deleg:
78742 error = vfs_rename(old_dir->d_inode, old_dentry,
78743 new_dir->d_inode, new_dentry,
78744 &delegated_inode, flags);
78745+ if (!error)
78746+ gr_handle_rename(d_backing_inode(old_dir), d_backing_inode(new_dir), old_dentry,
78747+ new_dentry, oldnd.path.mnt, d_is_positive(new_dentry) ? 1 : 0, flags);
78748 exit5:
78749 dput(new_dentry);
78750 exit4:
78751@@ -4416,14 +4612,24 @@ EXPORT_SYMBOL(vfs_whiteout);
78752
78753 int readlink_copy(char __user *buffer, int buflen, const char *link)
78754 {
78755+ char tmpbuf[64];
78756+ const char *newlink;
78757 int len = PTR_ERR(link);
78758+
78759 if (IS_ERR(link))
78760 goto out;
78761
78762 len = strlen(link);
78763 if (len > (unsigned) buflen)
78764 len = buflen;
78765- if (copy_to_user(buffer, link, len))
78766+
78767+ if (len < sizeof(tmpbuf)) {
78768+ memcpy(tmpbuf, link, len);
78769+ newlink = tmpbuf;
78770+ } else
78771+ newlink = link;
78772+
78773+ if (copy_to_user(buffer, newlink, len))
78774 len = -EFAULT;
78775 out:
78776 return len;
78777diff --git a/fs/namespace.c b/fs/namespace.c
78778index 02c6875..ac3626c 100644
78779--- a/fs/namespace.c
78780+++ b/fs/namespace.c
78781@@ -1350,6 +1350,36 @@ enum umount_tree_flags {
78782 UMOUNT_PROPAGATE = 2,
78783 UMOUNT_CONNECTED = 4,
78784 };
78785+
78786+static bool disconnect_mount(struct mount *mnt, enum umount_tree_flags how)
78787+{
78788+ /* Leaving mounts connected is only valid for lazy umounts */
78789+ if (how & UMOUNT_SYNC)
78790+ return true;
78791+
78792+ /* A mount without a parent has nothing to be connected to */
78793+ if (!mnt_has_parent(mnt))
78794+ return true;
78795+
78796+ /* Because the reference counting rules change when mounts are
78797+ * unmounted and connected, umounted mounts may not be
78798+ * connected to mounted mounts.
78799+ */
78800+ if (!(mnt->mnt_parent->mnt.mnt_flags & MNT_UMOUNT))
78801+ return true;
78802+
78803+ /* Has it been requested that the mount remain connected? */
78804+ if (how & UMOUNT_CONNECTED)
78805+ return false;
78806+
78807+ /* Is the mount locked such that it needs to remain connected? */
78808+ if (IS_MNT_LOCKED(mnt))
78809+ return false;
78810+
78811+ /* By default disconnect the mount */
78812+ return true;
78813+}
78814+
78815 /*
78816 * mount_lock must be held
78817 * namespace_sem must be held for write
78818@@ -1387,10 +1417,7 @@ static void umount_tree(struct mount *mnt, enum umount_tree_flags how)
78819 if (how & UMOUNT_SYNC)
78820 p->mnt.mnt_flags |= MNT_SYNC_UMOUNT;
78821
78822- disconnect = !(((how & UMOUNT_CONNECTED) &&
78823- mnt_has_parent(p) &&
78824- (p->mnt_parent->mnt.mnt_flags & MNT_UMOUNT)) ||
78825- IS_MNT_LOCKED_AND_LAZY(p));
78826+ disconnect = disconnect_mount(p, how);
78827
78828 pin_insert_group(&p->mnt_umount, &p->mnt_parent->mnt,
78829 disconnect ? &unmounted : NULL);
78830@@ -1478,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
78831 if (!(sb->s_flags & MS_RDONLY))
78832 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
78833 up_write(&sb->s_umount);
78834+
78835+ gr_log_remount(mnt->mnt_devname, retval);
78836+
78837 return retval;
78838 }
78839
78840@@ -1500,6 +1530,9 @@ static int do_umount(struct mount *mnt, int flags)
78841 }
78842 unlock_mount_hash();
78843 namespace_unlock();
78844+
78845+ gr_log_unmount(mnt->mnt_devname, retval);
78846+
78847 return retval;
78848 }
78849
78850@@ -1527,11 +1560,8 @@ void __detach_mounts(struct dentry *dentry)
78851 while (!hlist_empty(&mp->m_list)) {
78852 mnt = hlist_entry(mp->m_list.first, struct mount, mnt_mp_list);
78853 if (mnt->mnt.mnt_flags & MNT_UMOUNT) {
78854- struct mount *p, *tmp;
78855- list_for_each_entry_safe(p, tmp, &mnt->mnt_mounts, mnt_child) {
78856- hlist_add_head(&p->mnt_umount.s_list, &unmounted);
78857- umount_mnt(p);
78858- }
78859+ hlist_add_head(&mnt->mnt_umount.s_list, &unmounted);
78860+ umount_mnt(mnt);
78861 }
78862 else umount_tree(mnt, UMOUNT_CONNECTED);
78863 }
78864@@ -1557,7 +1587,7 @@ static inline bool may_mount(void)
78865 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
78866 */
78867
78868-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
78869+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
78870 {
78871 struct path path;
78872 struct mount *mnt;
78873@@ -1602,7 +1632,7 @@ out:
78874 /*
78875 * The 2.0 compatible umount. No flags.
78876 */
78877-SYSCALL_DEFINE1(oldumount, char __user *, name)
78878+SYSCALL_DEFINE1(oldumount, const char __user *, name)
78879 {
78880 return sys_umount(name, 0);
78881 }
78882@@ -2677,6 +2707,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78883 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
78884 MS_STRICTATIME);
78885
78886+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
78887+ retval = -EPERM;
78888+ goto dput_out;
78889+ }
78890+
78891+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
78892+ retval = -EPERM;
78893+ goto dput_out;
78894+ }
78895+
78896 if (flags & MS_REMOUNT)
78897 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
78898 data_page);
78899@@ -2690,7 +2730,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78900 retval = do_new_mount(&path, type_page, flags, mnt_flags,
78901 dev_name, data_page);
78902 dput_out:
78903+ gr_log_mount(dev_name, &path, retval);
78904+
78905 path_put(&path);
78906+
78907 return retval;
78908 }
78909
78910@@ -2708,7 +2751,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
78911 * number incrementing at 10Ghz will take 12,427 years to wrap which
78912 * is effectively never, so we can ignore the possibility.
78913 */
78914-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
78915+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
78916
78917 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78918 {
78919@@ -2724,7 +2767,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78920 return ERR_PTR(ret);
78921 }
78922 new_ns->ns.ops = &mntns_operations;
78923- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
78924+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
78925 atomic_set(&new_ns->count, 1);
78926 new_ns->root = NULL;
78927 INIT_LIST_HEAD(&new_ns->list);
78928@@ -2734,7 +2777,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78929 return new_ns;
78930 }
78931
78932-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78933+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78934 struct user_namespace *user_ns, struct fs_struct *new_fs)
78935 {
78936 struct mnt_namespace *new_ns;
78937@@ -2855,8 +2898,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
78938 }
78939 EXPORT_SYMBOL(mount_subtree);
78940
78941-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
78942- char __user *, type, unsigned long, flags, void __user *, data)
78943+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
78944+ const char __user *, type, unsigned long, flags, void __user *, data)
78945 {
78946 int ret;
78947 char *kernel_type;
78948@@ -2962,6 +3005,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
78949 if (error)
78950 goto out2;
78951
78952+ if (gr_handle_chroot_pivot()) {
78953+ error = -EPERM;
78954+ goto out2;
78955+ }
78956+
78957 get_fs_root(current->fs, &root);
78958 old_mp = lock_mount(&old);
78959 error = PTR_ERR(old_mp);
78960@@ -3263,7 +3311,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
78961 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
78962 return -EPERM;
78963
78964- if (fs->users != 1)
78965+ if (atomic_read(&fs->users) != 1)
78966 return -EINVAL;
78967
78968 get_mnt_ns(mnt_ns);
78969diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
78970index 19ca95c..b28702c 100644
78971--- a/fs/nfs/callback_xdr.c
78972+++ b/fs/nfs/callback_xdr.c
78973@@ -51,7 +51,7 @@ struct callback_op {
78974 callback_decode_arg_t decode_args;
78975 callback_encode_res_t encode_res;
78976 long res_maxsize;
78977-};
78978+} __do_const;
78979
78980 static struct callback_op callback_ops[];
78981
78982diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
78983index f734562..3fd6c4e 100644
78984--- a/fs/nfs/inode.c
78985+++ b/fs/nfs/inode.c
78986@@ -1275,16 +1275,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
78987 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
78988 }
78989
78990-static atomic_long_t nfs_attr_generation_counter;
78991+static atomic_long_unchecked_t nfs_attr_generation_counter;
78992
78993 static unsigned long nfs_read_attr_generation_counter(void)
78994 {
78995- return atomic_long_read(&nfs_attr_generation_counter);
78996+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
78997 }
78998
78999 unsigned long nfs_inc_attr_generation_counter(void)
79000 {
79001- return atomic_long_inc_return(&nfs_attr_generation_counter);
79002+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
79003 }
79004 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
79005
79006diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
79007index 864e200..357c255 100644
79008--- a/fs/nfsd/nfs4proc.c
79009+++ b/fs/nfsd/nfs4proc.c
79010@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
79011 nfsd4op_rsize op_rsize_bop;
79012 stateid_getter op_get_currentstateid;
79013 stateid_setter op_set_currentstateid;
79014-};
79015+} __do_const;
79016
79017 static struct nfsd4_operation nfsd4_ops[];
79018
79019diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
79020index 158badf..f7132ea 100644
79021--- a/fs/nfsd/nfs4xdr.c
79022+++ b/fs/nfsd/nfs4xdr.c
79023@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
79024
79025 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
79026
79027-static nfsd4_dec nfsd4_dec_ops[] = {
79028+static const nfsd4_dec nfsd4_dec_ops[] = {
79029 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
79030 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
79031 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
79032diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
79033index 46ec934..f384e41 100644
79034--- a/fs/nfsd/nfscache.c
79035+++ b/fs/nfsd/nfscache.c
79036@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79037 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
79038 u32 hash;
79039 struct nfsd_drc_bucket *b;
79040- int len;
79041+ long len;
79042 size_t bufsize = 0;
79043
79044 if (!rp)
79045@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79046 hash = nfsd_cache_hash(rp->c_xid);
79047 b = &drc_hashtbl[hash];
79048
79049- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
79050- len >>= 2;
79051+ if (statp) {
79052+ len = (char*)statp - (char*)resv->iov_base;
79053+ len = resv->iov_len - len;
79054+ len >>= 2;
79055+ }
79056
79057 /* Don't cache excessive amounts of data and XDR failures */
79058- if (!statp || len > (256 >> 2)) {
79059+ if (!statp || len > (256 >> 2) || len < 0) {
79060 nfsd_reply_cache_free(b, rp);
79061 return;
79062 }
79063@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
79064 switch (cachetype) {
79065 case RC_REPLSTAT:
79066 if (len != 1)
79067- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
79068+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
79069 rp->c_replstat = *statp;
79070 break;
79071 case RC_REPLBUFF:
79072diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
79073index 84d770b..929bc5e 100644
79074--- a/fs/nfsd/vfs.c
79075+++ b/fs/nfsd/vfs.c
79076@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
79077
79078 oldfs = get_fs();
79079 set_fs(KERNEL_DS);
79080- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
79081+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
79082 set_fs(oldfs);
79083 return nfsd_finish_read(file, count, host_err);
79084 }
79085@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
79086
79087 /* Write the data. */
79088 oldfs = get_fs(); set_fs(KERNEL_DS);
79089- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
79090+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
79091 set_fs(oldfs);
79092 if (host_err < 0)
79093 goto out_nfserr;
79094@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
79095 */
79096
79097 oldfs = get_fs(); set_fs(KERNEL_DS);
79098- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
79099+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
79100 set_fs(oldfs);
79101
79102 if (host_err < 0)
79103diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
79104index 52ccd34..7a6b202 100644
79105--- a/fs/nls/nls_base.c
79106+++ b/fs/nls/nls_base.c
79107@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
79108
79109 int __register_nls(struct nls_table *nls, struct module *owner)
79110 {
79111- struct nls_table ** tmp = &tables;
79112+ struct nls_table *tmp = tables;
79113
79114 if (nls->next)
79115 return -EBUSY;
79116
79117- nls->owner = owner;
79118+ pax_open_kernel();
79119+ *(void **)&nls->owner = owner;
79120+ pax_close_kernel();
79121 spin_lock(&nls_lock);
79122- while (*tmp) {
79123- if (nls == *tmp) {
79124+ while (tmp) {
79125+ if (nls == tmp) {
79126 spin_unlock(&nls_lock);
79127 return -EBUSY;
79128 }
79129- tmp = &(*tmp)->next;
79130+ tmp = tmp->next;
79131 }
79132- nls->next = tables;
79133+ pax_open_kernel();
79134+ *(struct nls_table **)&nls->next = tables;
79135+ pax_close_kernel();
79136 tables = nls;
79137 spin_unlock(&nls_lock);
79138 return 0;
79139@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
79140
79141 int unregister_nls(struct nls_table * nls)
79142 {
79143- struct nls_table ** tmp = &tables;
79144+ struct nls_table * const * tmp = &tables;
79145
79146 spin_lock(&nls_lock);
79147 while (*tmp) {
79148 if (nls == *tmp) {
79149- *tmp = nls->next;
79150+ pax_open_kernel();
79151+ *(struct nls_table **)tmp = nls->next;
79152+ pax_close_kernel();
79153 spin_unlock(&nls_lock);
79154 return 0;
79155 }
79156@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
79157 return -EINVAL;
79158 }
79159
79160-static struct nls_table *find_nls(char *charset)
79161+static struct nls_table *find_nls(const char *charset)
79162 {
79163 struct nls_table *nls;
79164 spin_lock(&nls_lock);
79165@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
79166 return nls;
79167 }
79168
79169-struct nls_table *load_nls(char *charset)
79170+struct nls_table *load_nls(const char *charset)
79171 {
79172 return try_then_request_module(find_nls(charset), "nls_%s", charset);
79173 }
79174diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
79175index 162b3f1..6076a7c 100644
79176--- a/fs/nls/nls_euc-jp.c
79177+++ b/fs/nls/nls_euc-jp.c
79178@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
79179 p_nls = load_nls("cp932");
79180
79181 if (p_nls) {
79182- table.charset2upper = p_nls->charset2upper;
79183- table.charset2lower = p_nls->charset2lower;
79184+ pax_open_kernel();
79185+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79186+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79187+ pax_close_kernel();
79188 return register_nls(&table);
79189 }
79190
79191diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
79192index a80a741..7b96e1b 100644
79193--- a/fs/nls/nls_koi8-ru.c
79194+++ b/fs/nls/nls_koi8-ru.c
79195@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
79196 p_nls = load_nls("koi8-u");
79197
79198 if (p_nls) {
79199- table.charset2upper = p_nls->charset2upper;
79200- table.charset2lower = p_nls->charset2lower;
79201+ pax_open_kernel();
79202+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79203+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79204+ pax_close_kernel();
79205 return register_nls(&table);
79206 }
79207
79208diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
79209index cf27550..6c70f29d 100644
79210--- a/fs/notify/fanotify/fanotify_user.c
79211+++ b/fs/notify/fanotify/fanotify_user.c
79212@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
79213
79214 fd = fanotify_event_metadata.fd;
79215 ret = -EFAULT;
79216- if (copy_to_user(buf, &fanotify_event_metadata,
79217- fanotify_event_metadata.event_len))
79218+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
79219+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
79220 goto out_close_fd;
79221
79222 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
79223diff --git a/fs/notify/notification.c b/fs/notify/notification.c
79224index a95d8e0..a91a5fd 100644
79225--- a/fs/notify/notification.c
79226+++ b/fs/notify/notification.c
79227@@ -48,7 +48,7 @@
79228 #include <linux/fsnotify_backend.h>
79229 #include "fsnotify.h"
79230
79231-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79232+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79233
79234 /**
79235 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
79236@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79237 */
79238 u32 fsnotify_get_cookie(void)
79239 {
79240- return atomic_inc_return(&fsnotify_sync_cookie);
79241+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
79242 }
79243 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
79244
79245diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
79246index 9e38daf..5727cae 100644
79247--- a/fs/ntfs/dir.c
79248+++ b/fs/ntfs/dir.c
79249@@ -1310,7 +1310,7 @@ find_next_index_buffer:
79250 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
79251 ~(s64)(ndir->itype.index.block_size - 1)));
79252 /* Bounds checks. */
79253- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79254+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79255 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
79256 "inode 0x%lx or driver bug.", vdir->i_ino);
79257 goto err_out;
79258diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
79259index 9e1e112..241a52a 100644
79260--- a/fs/ntfs/super.c
79261+++ b/fs/ntfs/super.c
79262@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79263 if (!silent)
79264 ntfs_error(sb, "Primary boot sector is invalid.");
79265 } else if (!silent)
79266- ntfs_error(sb, read_err_str, "primary");
79267+ ntfs_error(sb, read_err_str, "%s", "primary");
79268 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
79269 if (bh_primary)
79270 brelse(bh_primary);
79271@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79272 goto hotfix_primary_boot_sector;
79273 brelse(bh_backup);
79274 } else if (!silent)
79275- ntfs_error(sb, read_err_str, "backup");
79276+ ntfs_error(sb, read_err_str, "%s", "backup");
79277 /* Try to read NT3.51- backup boot sector. */
79278 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
79279 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
79280@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79281 "sector.");
79282 brelse(bh_backup);
79283 } else if (!silent)
79284- ntfs_error(sb, read_err_str, "backup");
79285+ ntfs_error(sb, read_err_str, "%s", "backup");
79286 /* We failed. Cleanup and return. */
79287 if (bh_primary)
79288 brelse(bh_primary);
79289diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
79290index 857bbbc..3c47d15 100644
79291--- a/fs/ocfs2/localalloc.c
79292+++ b/fs/ocfs2/localalloc.c
79293@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
79294 goto bail;
79295 }
79296
79297- atomic_inc(&osb->alloc_stats.moves);
79298+ atomic_inc_unchecked(&osb->alloc_stats.moves);
79299
79300 bail:
79301 if (handle)
79302diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
79303index 460c6c3..b4ef513 100644
79304--- a/fs/ocfs2/ocfs2.h
79305+++ b/fs/ocfs2/ocfs2.h
79306@@ -247,11 +247,11 @@ enum ocfs2_vol_state
79307
79308 struct ocfs2_alloc_stats
79309 {
79310- atomic_t moves;
79311- atomic_t local_data;
79312- atomic_t bitmap_data;
79313- atomic_t bg_allocs;
79314- atomic_t bg_extends;
79315+ atomic_unchecked_t moves;
79316+ atomic_unchecked_t local_data;
79317+ atomic_unchecked_t bitmap_data;
79318+ atomic_unchecked_t bg_allocs;
79319+ atomic_unchecked_t bg_extends;
79320 };
79321
79322 enum ocfs2_local_alloc_state
79323diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
79324index 4479029..5de740b 100644
79325--- a/fs/ocfs2/suballoc.c
79326+++ b/fs/ocfs2/suballoc.c
79327@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
79328 mlog_errno(status);
79329 goto bail;
79330 }
79331- atomic_inc(&osb->alloc_stats.bg_extends);
79332+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
79333
79334 /* You should never ask for this much metadata */
79335 BUG_ON(bits_wanted >
79336@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
79337 mlog_errno(status);
79338 goto bail;
79339 }
79340- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79341+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79342
79343 *suballoc_loc = res.sr_bg_blkno;
79344 *suballoc_bit_start = res.sr_bit_offset;
79345@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
79346 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
79347 res->sr_bits);
79348
79349- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79350+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79351
79352 BUG_ON(res->sr_bits != 1);
79353
79354@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
79355 mlog_errno(status);
79356 goto bail;
79357 }
79358- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79359+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79360
79361 BUG_ON(res.sr_bits != 1);
79362
79363@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79364 cluster_start,
79365 num_clusters);
79366 if (!status)
79367- atomic_inc(&osb->alloc_stats.local_data);
79368+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
79369 } else {
79370 if (min_clusters > (osb->bitmap_cpg - 1)) {
79371 /* The only paths asking for contiguousness
79372@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79373 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
79374 res.sr_bg_blkno,
79375 res.sr_bit_offset);
79376- atomic_inc(&osb->alloc_stats.bitmap_data);
79377+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
79378 *num_clusters = res.sr_bits;
79379 }
79380 }
79381diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
79382index 403c566..6525b35 100644
79383--- a/fs/ocfs2/super.c
79384+++ b/fs/ocfs2/super.c
79385@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
79386 "%10s => GlobalAllocs: %d LocalAllocs: %d "
79387 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
79388 "Stats",
79389- atomic_read(&osb->alloc_stats.bitmap_data),
79390- atomic_read(&osb->alloc_stats.local_data),
79391- atomic_read(&osb->alloc_stats.bg_allocs),
79392- atomic_read(&osb->alloc_stats.moves),
79393- atomic_read(&osb->alloc_stats.bg_extends));
79394+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
79395+ atomic_read_unchecked(&osb->alloc_stats.local_data),
79396+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
79397+ atomic_read_unchecked(&osb->alloc_stats.moves),
79398+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
79399
79400 out += snprintf(buf + out, len - out,
79401 "%10s => State: %u Descriptor: %llu Size: %u bits "
79402@@ -2095,11 +2095,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
79403
79404 mutex_init(&osb->system_file_mutex);
79405
79406- atomic_set(&osb->alloc_stats.moves, 0);
79407- atomic_set(&osb->alloc_stats.local_data, 0);
79408- atomic_set(&osb->alloc_stats.bitmap_data, 0);
79409- atomic_set(&osb->alloc_stats.bg_allocs, 0);
79410- atomic_set(&osb->alloc_stats.bg_extends, 0);
79411+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
79412+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
79413+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
79414+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
79415+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
79416
79417 /* Copy the blockcheck stats from the superblock probe */
79418 osb->osb_ecc_stats = *stats;
79419diff --git a/fs/open.c b/fs/open.c
79420index 98e5a52..8e77e14 100644
79421--- a/fs/open.c
79422+++ b/fs/open.c
79423@@ -32,6 +32,8 @@
79424 #include <linux/dnotify.h>
79425 #include <linux/compat.h>
79426
79427+#define CREATE_TRACE_POINTS
79428+#include <trace/events/fs.h>
79429 #include "internal.h"
79430
79431 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
79432@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
79433 error = locks_verify_truncate(inode, NULL, length);
79434 if (!error)
79435 error = security_path_truncate(path);
79436+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
79437+ error = -EACCES;
79438 if (!error)
79439 error = do_truncate(path->dentry, length, 0, NULL);
79440
79441@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
79442 error = locks_verify_truncate(inode, f.file, length);
79443 if (!error)
79444 error = security_path_truncate(&f.file->f_path);
79445+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
79446+ error = -EACCES;
79447 if (!error)
79448 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
79449 sb_end_write(inode->i_sb);
79450@@ -396,6 +402,9 @@ retry:
79451 if (__mnt_is_readonly(path.mnt))
79452 res = -EROFS;
79453
79454+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
79455+ res = -EACCES;
79456+
79457 out_path_release:
79458 path_put(&path);
79459 if (retry_estale(res, lookup_flags)) {
79460@@ -427,6 +436,8 @@ retry:
79461 if (error)
79462 goto dput_and_out;
79463
79464+ gr_log_chdir(path.dentry, path.mnt);
79465+
79466 set_fs_pwd(current->fs, &path);
79467
79468 dput_and_out:
79469@@ -456,6 +467,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
79470 goto out_putf;
79471
79472 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
79473+
79474+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
79475+ error = -EPERM;
79476+
79477+ if (!error)
79478+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
79479+
79480 if (!error)
79481 set_fs_pwd(current->fs, &f.file->f_path);
79482 out_putf:
79483@@ -485,7 +503,13 @@ retry:
79484 if (error)
79485 goto dput_and_out;
79486
79487+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
79488+ goto dput_and_out;
79489+
79490 set_fs_root(current->fs, &path);
79491+
79492+ gr_handle_chroot_chdir(&path);
79493+
79494 error = 0;
79495 dput_and_out:
79496 path_put(&path);
79497@@ -509,6 +533,16 @@ static int chmod_common(struct path *path, umode_t mode)
79498 return error;
79499 retry_deleg:
79500 mutex_lock(&inode->i_mutex);
79501+
79502+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
79503+ error = -EACCES;
79504+ goto out_unlock;
79505+ }
79506+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
79507+ error = -EACCES;
79508+ goto out_unlock;
79509+ }
79510+
79511 error = security_path_chmod(path, mode);
79512 if (error)
79513 goto out_unlock;
79514@@ -574,6 +608,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
79515 uid = make_kuid(current_user_ns(), user);
79516 gid = make_kgid(current_user_ns(), group);
79517
79518+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
79519+ return -EACCES;
79520+
79521 retry_deleg:
79522 newattrs.ia_valid = ATTR_CTIME;
79523 if (user != (uid_t) -1) {
79524@@ -1018,6 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
79525 } else {
79526 fsnotify_open(f);
79527 fd_install(fd, f);
79528+ trace_do_sys_open(tmp->name, flags, mode);
79529 }
79530 }
79531 putname(tmp);
79532diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
79533index 04f1248..60b3be1 100644
79534--- a/fs/overlayfs/inode.c
79535+++ b/fs/overlayfs/inode.c
79536@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
79537 enum ovl_path_type type;
79538 bool want_write = false;
79539
79540+ if (d_is_dir(dentry))
79541+ return d_backing_inode(dentry);
79542+
79543 type = ovl_path_real(dentry, &realpath);
79544 if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
79545 want_write = true;
79546diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
79547index bf8537c..c16ef7d 100644
79548--- a/fs/overlayfs/super.c
79549+++ b/fs/overlayfs/super.c
79550@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
79551 {
79552 struct ovl_entry *oe = dentry->d_fsdata;
79553
79554- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
79555+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
79556 }
79557
79558 int ovl_want_write(struct dentry *dentry)
79559@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
79560
79561 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
79562 {
79563- struct path upperpath = { NULL, NULL };
79564- struct path workpath = { NULL, NULL };
79565+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
79566+ struct path workpath = { .dentry = NULL, .mnt = NULL };
79567 struct dentry *root_dentry;
79568 struct ovl_entry *oe;
79569 struct ovl_fs *ufs;
79570diff --git a/fs/pipe.c b/fs/pipe.c
79571index 8865f79..bd2c79b 100644
79572--- a/fs/pipe.c
79573+++ b/fs/pipe.c
79574@@ -36,7 +36,7 @@ unsigned int pipe_max_size = 1048576;
79575 /*
79576 * Minimum pipe size, as required by POSIX
79577 */
79578-unsigned int pipe_min_size = PAGE_SIZE;
79579+unsigned int pipe_min_size __read_only = PAGE_SIZE;
79580
79581 /*
79582 * We use a start+len construction, which provides full use of the
79583@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
79584
79585 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
79586 {
79587- if (pipe->files)
79588+ if (atomic_read(&pipe->files))
79589 mutex_lock_nested(&pipe->mutex, subclass);
79590 }
79591
79592@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock);
79593
79594 void pipe_unlock(struct pipe_inode_info *pipe)
79595 {
79596- if (pipe->files)
79597+ if (atomic_read(&pipe->files))
79598 mutex_unlock(&pipe->mutex);
79599 }
79600 EXPORT_SYMBOL(pipe_unlock);
79601@@ -291,9 +291,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
79602 }
79603 if (bufs) /* More to do? */
79604 continue;
79605- if (!pipe->writers)
79606+ if (!atomic_read(&pipe->writers))
79607 break;
79608- if (!pipe->waiting_writers) {
79609+ if (!atomic_read(&pipe->waiting_writers)) {
79610 /* syscall merging: Usually we must not sleep
79611 * if O_NONBLOCK is set, or if we got some data.
79612 * But if a writer sleeps in kernel space, then
79613@@ -350,7 +350,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79614
79615 __pipe_lock(pipe);
79616
79617- if (!pipe->readers) {
79618+ if (!atomic_read(&pipe->readers)) {
79619 send_sig(SIGPIPE, current, 0);
79620 ret = -EPIPE;
79621 goto out;
79622@@ -386,7 +386,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79623 for (;;) {
79624 int bufs;
79625
79626- if (!pipe->readers) {
79627+ if (!atomic_read(&pipe->readers)) {
79628 send_sig(SIGPIPE, current, 0);
79629 if (!ret)
79630 ret = -EPIPE;
79631@@ -454,9 +454,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79632 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79633 do_wakeup = 0;
79634 }
79635- pipe->waiting_writers++;
79636+ atomic_inc(&pipe->waiting_writers);
79637 pipe_wait(pipe);
79638- pipe->waiting_writers--;
79639+ atomic_dec(&pipe->waiting_writers);
79640 }
79641 out:
79642 __pipe_unlock(pipe);
79643@@ -511,7 +511,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79644 mask = 0;
79645 if (filp->f_mode & FMODE_READ) {
79646 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
79647- if (!pipe->writers && filp->f_version != pipe->w_counter)
79648+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
79649 mask |= POLLHUP;
79650 }
79651
79652@@ -521,7 +521,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79653 * Most Unices do not set POLLERR for FIFOs but on Linux they
79654 * behave exactly like pipes for poll().
79655 */
79656- if (!pipe->readers)
79657+ if (!atomic_read(&pipe->readers))
79658 mask |= POLLERR;
79659 }
79660
79661@@ -533,7 +533,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
79662 int kill = 0;
79663
79664 spin_lock(&inode->i_lock);
79665- if (!--pipe->files) {
79666+ if (atomic_dec_and_test(&pipe->files)) {
79667 inode->i_pipe = NULL;
79668 kill = 1;
79669 }
79670@@ -550,11 +550,11 @@ pipe_release(struct inode *inode, struct file *file)
79671
79672 __pipe_lock(pipe);
79673 if (file->f_mode & FMODE_READ)
79674- pipe->readers--;
79675+ atomic_dec(&pipe->readers);
79676 if (file->f_mode & FMODE_WRITE)
79677- pipe->writers--;
79678+ atomic_dec(&pipe->writers);
79679
79680- if (pipe->readers || pipe->writers) {
79681+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
79682 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
79683 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79684 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
79685@@ -619,7 +619,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
79686 kfree(pipe);
79687 }
79688
79689-static struct vfsmount *pipe_mnt __read_mostly;
79690+struct vfsmount *pipe_mnt __read_mostly;
79691
79692 /*
79693 * pipefs_dname() is called from d_path().
79694@@ -649,8 +649,9 @@ static struct inode * get_pipe_inode(void)
79695 goto fail_iput;
79696
79697 inode->i_pipe = pipe;
79698- pipe->files = 2;
79699- pipe->readers = pipe->writers = 1;
79700+ atomic_set(&pipe->files, 2);
79701+ atomic_set(&pipe->readers, 1);
79702+ atomic_set(&pipe->writers, 1);
79703 inode->i_fop = &pipefifo_fops;
79704
79705 /*
79706@@ -829,17 +830,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
79707 spin_lock(&inode->i_lock);
79708 if (inode->i_pipe) {
79709 pipe = inode->i_pipe;
79710- pipe->files++;
79711+ atomic_inc(&pipe->files);
79712 spin_unlock(&inode->i_lock);
79713 } else {
79714 spin_unlock(&inode->i_lock);
79715 pipe = alloc_pipe_info();
79716 if (!pipe)
79717 return -ENOMEM;
79718- pipe->files = 1;
79719+ atomic_set(&pipe->files, 1);
79720 spin_lock(&inode->i_lock);
79721 if (unlikely(inode->i_pipe)) {
79722- inode->i_pipe->files++;
79723+ atomic_inc(&inode->i_pipe->files);
79724 spin_unlock(&inode->i_lock);
79725 free_pipe_info(pipe);
79726 pipe = inode->i_pipe;
79727@@ -864,10 +865,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
79728 * opened, even when there is no process writing the FIFO.
79729 */
79730 pipe->r_counter++;
79731- if (pipe->readers++ == 0)
79732+ if (atomic_inc_return(&pipe->readers) == 1)
79733 wake_up_partner(pipe);
79734
79735- if (!is_pipe && !pipe->writers) {
79736+ if (!is_pipe && !atomic_read(&pipe->writers)) {
79737 if ((filp->f_flags & O_NONBLOCK)) {
79738 /* suppress POLLHUP until we have
79739 * seen a writer */
79740@@ -886,14 +887,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
79741 * errno=ENXIO when there is no process reading the FIFO.
79742 */
79743 ret = -ENXIO;
79744- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
79745+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
79746 goto err;
79747
79748 pipe->w_counter++;
79749- if (!pipe->writers++)
79750+ if (atomic_inc_return(&pipe->writers) == 1)
79751 wake_up_partner(pipe);
79752
79753- if (!is_pipe && !pipe->readers) {
79754+ if (!is_pipe && !atomic_read(&pipe->readers)) {
79755 if (wait_for_partner(pipe, &pipe->r_counter))
79756 goto err_wr;
79757 }
79758@@ -907,11 +908,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
79759 * the process can at least talk to itself.
79760 */
79761
79762- pipe->readers++;
79763- pipe->writers++;
79764+ atomic_inc(&pipe->readers);
79765+ atomic_inc(&pipe->writers);
79766 pipe->r_counter++;
79767 pipe->w_counter++;
79768- if (pipe->readers == 1 || pipe->writers == 1)
79769+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
79770 wake_up_partner(pipe);
79771 break;
79772
79773@@ -925,13 +926,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
79774 return 0;
79775
79776 err_rd:
79777- if (!--pipe->readers)
79778+ if (atomic_dec_and_test(&pipe->readers))
79779 wake_up_interruptible(&pipe->wait);
79780 ret = -ERESTARTSYS;
79781 goto err;
79782
79783 err_wr:
79784- if (!--pipe->writers)
79785+ if (atomic_dec_and_test(&pipe->writers))
79786 wake_up_interruptible(&pipe->wait);
79787 ret = -ERESTARTSYS;
79788 goto err;
79789@@ -1007,7 +1008,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
79790 * Currently we rely on the pipe array holding a power-of-2 number
79791 * of pages.
79792 */
79793-static inline unsigned int round_pipe_size(unsigned int size)
79794+static inline unsigned long round_pipe_size(unsigned long size)
79795 {
79796 unsigned long nr_pages;
79797
79798@@ -1055,13 +1056,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
79799
79800 switch (cmd) {
79801 case F_SETPIPE_SZ: {
79802- unsigned int size, nr_pages;
79803+ unsigned long size, nr_pages;
79804+
79805+ ret = -EINVAL;
79806+ if (arg < pipe_min_size)
79807+ goto out;
79808
79809 size = round_pipe_size(arg);
79810 nr_pages = size >> PAGE_SHIFT;
79811
79812- ret = -EINVAL;
79813- if (!nr_pages)
79814+ if (size < pipe_min_size)
79815 goto out;
79816
79817 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
79818diff --git a/fs/pnode.h b/fs/pnode.h
79819index 7114ce6..0fcdbe7 100644
79820--- a/fs/pnode.h
79821+++ b/fs/pnode.h
79822@@ -20,8 +20,6 @@
79823 #define SET_MNT_MARK(m) ((m)->mnt.mnt_flags |= MNT_MARKED)
79824 #define CLEAR_MNT_MARK(m) ((m)->mnt.mnt_flags &= ~MNT_MARKED)
79825 #define IS_MNT_LOCKED(m) ((m)->mnt.mnt_flags & MNT_LOCKED)
79826-#define IS_MNT_LOCKED_AND_LAZY(m) \
79827- (((m)->mnt.mnt_flags & (MNT_LOCKED|MNT_SYNC_UMOUNT)) == MNT_LOCKED)
79828
79829 #define CL_EXPIRE 0x01
79830 #define CL_SLAVE 0x02
79831diff --git a/fs/posix_acl.c b/fs/posix_acl.c
79832index 84bb65b8..4270e47 100644
79833--- a/fs/posix_acl.c
79834+++ b/fs/posix_acl.c
79835@@ -20,6 +20,7 @@
79836 #include <linux/xattr.h>
79837 #include <linux/export.h>
79838 #include <linux/user_namespace.h>
79839+#include <linux/grsecurity.h>
79840
79841 struct posix_acl **acl_by_type(struct inode *inode, int type)
79842 {
79843@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
79844 }
79845 }
79846 if (mode_p)
79847- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79848+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79849 return not_equiv;
79850 }
79851 EXPORT_SYMBOL(posix_acl_equiv_mode);
79852@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
79853 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
79854 }
79855
79856- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79857+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79858 return not_equiv;
79859 }
79860
79861@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
79862 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
79863 int err = -ENOMEM;
79864 if (clone) {
79865+ *mode_p &= ~gr_acl_umask();
79866+
79867 err = posix_acl_create_masq(clone, mode_p);
79868 if (err < 0) {
79869 posix_acl_release(clone);
79870@@ -663,11 +666,12 @@ struct posix_acl *
79871 posix_acl_from_xattr(struct user_namespace *user_ns,
79872 const void *value, size_t size)
79873 {
79874- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
79875- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
79876+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
79877+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
79878 int count;
79879 struct posix_acl *acl;
79880 struct posix_acl_entry *acl_e;
79881+ umode_t umask = gr_acl_umask();
79882
79883 if (!value)
79884 return NULL;
79885@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79886
79887 switch(acl_e->e_tag) {
79888 case ACL_USER_OBJ:
79889+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79890+ break;
79891 case ACL_GROUP_OBJ:
79892 case ACL_MASK:
79893+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79894+ break;
79895 case ACL_OTHER:
79896+ acl_e->e_perm &= ~(umask & S_IRWXO);
79897 break;
79898
79899 case ACL_USER:
79900+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79901 acl_e->e_uid =
79902 make_kuid(user_ns,
79903 le32_to_cpu(entry->e_id));
79904@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79905 goto fail;
79906 break;
79907 case ACL_GROUP:
79908+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79909 acl_e->e_gid =
79910 make_kgid(user_ns,
79911 le32_to_cpu(entry->e_id));
79912diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
79913index 2183fcf..3c32a98 100644
79914--- a/fs/proc/Kconfig
79915+++ b/fs/proc/Kconfig
79916@@ -30,7 +30,7 @@ config PROC_FS
79917
79918 config PROC_KCORE
79919 bool "/proc/kcore support" if !ARM
79920- depends on PROC_FS && MMU
79921+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
79922 help
79923 Provides a virtual ELF core file of the live kernel. This can
79924 be read with gdb and other ELF tools. No modifications can be
79925@@ -38,8 +38,8 @@ config PROC_KCORE
79926
79927 config PROC_VMCORE
79928 bool "/proc/vmcore support"
79929- depends on PROC_FS && CRASH_DUMP
79930- default y
79931+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
79932+ default n
79933 help
79934 Exports the dump image of crashed kernel in ELF format.
79935
79936@@ -63,8 +63,8 @@ config PROC_SYSCTL
79937 limited in memory.
79938
79939 config PROC_PAGE_MONITOR
79940- default y
79941- depends on PROC_FS && MMU
79942+ default n
79943+ depends on PROC_FS && MMU && !GRKERNSEC
79944 bool "Enable /proc page monitoring" if EXPERT
79945 help
79946 Various /proc files exist to monitor process memory utilization:
79947diff --git a/fs/proc/array.c b/fs/proc/array.c
79948index fd02a9e..7bc9dff 100644
79949--- a/fs/proc/array.c
79950+++ b/fs/proc/array.c
79951@@ -60,6 +60,7 @@
79952 #include <linux/tty.h>
79953 #include <linux/string.h>
79954 #include <linux/mman.h>
79955+#include <linux/grsecurity.h>
79956 #include <linux/proc_fs.h>
79957 #include <linux/ioport.h>
79958 #include <linux/uaccess.h>
79959@@ -340,6 +341,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
79960 cpumask_pr_args(&task->cpus_allowed));
79961 }
79962
79963+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79964+static inline void task_pax(struct seq_file *m, struct task_struct *p)
79965+{
79966+ if (p->mm)
79967+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
79968+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
79969+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
79970+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
79971+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
79972+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
79973+ else
79974+ seq_printf(m, "PaX:\t-----\n");
79975+}
79976+#endif
79977+
79978 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79979 struct pid *pid, struct task_struct *task)
79980 {
79981@@ -358,9 +374,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79982 task_cpus_allowed(m, task);
79983 cpuset_task_status_allowed(m, task);
79984 task_context_switch_counts(m, task);
79985+
79986+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79987+ task_pax(m, task);
79988+#endif
79989+
79990+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
79991+ task_grsec_rbac(m, task);
79992+#endif
79993+
79994 return 0;
79995 }
79996
79997+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79998+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79999+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
80000+ _mm->pax_flags & MF_PAX_SEGMEXEC))
80001+#endif
80002+
80003 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80004 struct pid *pid, struct task_struct *task, int whole)
80005 {
80006@@ -382,6 +413,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80007 char tcomm[sizeof(task->comm)];
80008 unsigned long flags;
80009
80010+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80011+ if (current->exec_id != m->exec_id) {
80012+ gr_log_badprocpid("stat");
80013+ return 0;
80014+ }
80015+#endif
80016+
80017 state = *get_task_state(task);
80018 vsize = eip = esp = 0;
80019 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
80020@@ -452,6 +490,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80021 gtime = task_gtime(task);
80022 }
80023
80024+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80025+ if (PAX_RAND_FLAGS(mm)) {
80026+ eip = 0;
80027+ esp = 0;
80028+ wchan = 0;
80029+ }
80030+#endif
80031+#ifdef CONFIG_GRKERNSEC_HIDESYM
80032+ wchan = 0;
80033+ eip =0;
80034+ esp =0;
80035+#endif
80036+
80037 /* scale priority and nice values from timeslices to -20..20 */
80038 /* to make it look like a "normal" Unix priority/nice value */
80039 priority = task_prio(task);
80040@@ -483,9 +534,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80041 seq_put_decimal_ull(m, ' ', vsize);
80042 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
80043 seq_put_decimal_ull(m, ' ', rsslim);
80044+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80045+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
80046+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
80047+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
80048+#else
80049 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
80050 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
80051 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
80052+#endif
80053 seq_put_decimal_ull(m, ' ', esp);
80054 seq_put_decimal_ull(m, ' ', eip);
80055 /* The signal information here is obsolete.
80056@@ -507,7 +564,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
80057 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
80058 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
80059
80060- if (mm && permitted) {
80061+ if (mm && permitted
80062+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80063+ && !PAX_RAND_FLAGS(mm)
80064+#endif
80065+ ) {
80066 seq_put_decimal_ull(m, ' ', mm->start_data);
80067 seq_put_decimal_ull(m, ' ', mm->end_data);
80068 seq_put_decimal_ull(m, ' ', mm->start_brk);
80069@@ -545,8 +606,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
80070 struct pid *pid, struct task_struct *task)
80071 {
80072 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
80073- struct mm_struct *mm = get_task_mm(task);
80074+ struct mm_struct *mm;
80075
80076+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80077+ if (current->exec_id != m->exec_id) {
80078+ gr_log_badprocpid("statm");
80079+ return 0;
80080+ }
80081+#endif
80082+ mm = get_task_mm(task);
80083 if (mm) {
80084 size = task_statm(mm, &shared, &text, &data, &resident);
80085 mmput(mm);
80086@@ -569,6 +637,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
80087 return 0;
80088 }
80089
80090+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80091+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
80092+{
80093+ unsigned long flags;
80094+ u32 curr_ip = 0;
80095+
80096+ if (lock_task_sighand(task, &flags)) {
80097+ curr_ip = task->signal->curr_ip;
80098+ unlock_task_sighand(task, &flags);
80099+ }
80100+ return seq_printf(m, "%pI4\n", &curr_ip);
80101+}
80102+#endif
80103+
80104 #ifdef CONFIG_CHECKPOINT_RESTORE
80105 static struct pid *
80106 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
80107diff --git a/fs/proc/base.c b/fs/proc/base.c
80108index 093ca14..322f097 100644
80109--- a/fs/proc/base.c
80110+++ b/fs/proc/base.c
80111@@ -113,6 +113,14 @@ struct pid_entry {
80112 union proc_op op;
80113 };
80114
80115+struct getdents_callback {
80116+ struct linux_dirent __user * current_dir;
80117+ struct linux_dirent __user * previous;
80118+ struct file * file;
80119+ int count;
80120+ int error;
80121+};
80122+
80123 #define NOD(NAME, MODE, IOP, FOP, OP) { \
80124 .name = (NAME), \
80125 .len = sizeof(NAME) - 1, \
80126@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
80127 return 0;
80128 }
80129
80130+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80131+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
80132+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
80133+ _mm->pax_flags & MF_PAX_SEGMEXEC))
80134+#endif
80135+
80136 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
80137 struct pid *pid, struct task_struct *task)
80138 {
80139 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
80140 if (mm && !IS_ERR(mm)) {
80141 unsigned int nwords = 0;
80142+
80143+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80144+ /* allow if we're currently ptracing this task */
80145+ if (PAX_RAND_FLAGS(mm) &&
80146+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
80147+ mmput(mm);
80148+ return 0;
80149+ }
80150+#endif
80151+
80152 do {
80153 nwords += 2;
80154 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
80155@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
80156 }
80157
80158
80159-#ifdef CONFIG_KALLSYMS
80160+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80161 /*
80162 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
80163 * Returns the resolved symbol. If that fails, simply return the address.
80164@@ -267,7 +291,7 @@ static void unlock_trace(struct task_struct *task)
80165 mutex_unlock(&task->signal->cred_guard_mutex);
80166 }
80167
80168-#ifdef CONFIG_STACKTRACE
80169+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80170
80171 #define MAX_STACK_TRACE_DEPTH 64
80172
80173@@ -462,7 +486,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
80174 return 0;
80175 }
80176
80177-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80178+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80179 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80180 struct pid *pid, struct task_struct *task)
80181 {
80182@@ -495,7 +519,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80183 /************************************************************************/
80184
80185 /* permission checks */
80186-static int proc_fd_access_allowed(struct inode *inode)
80187+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
80188 {
80189 struct task_struct *task;
80190 int allowed = 0;
80191@@ -505,7 +529,10 @@ static int proc_fd_access_allowed(struct inode *inode)
80192 */
80193 task = get_proc_task(inode);
80194 if (task) {
80195- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80196+ if (log)
80197+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80198+ else
80199+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
80200 put_task_struct(task);
80201 }
80202 return allowed;
80203@@ -536,10 +563,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
80204 struct task_struct *task,
80205 int hide_pid_min)
80206 {
80207+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80208+ return false;
80209+
80210+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80211+ rcu_read_lock();
80212+ {
80213+ const struct cred *tmpcred = current_cred();
80214+ const struct cred *cred = __task_cred(task);
80215+
80216+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
80217+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80218+ || in_group_p(grsec_proc_gid)
80219+#endif
80220+ ) {
80221+ rcu_read_unlock();
80222+ return true;
80223+ }
80224+ }
80225+ rcu_read_unlock();
80226+
80227+ if (!pid->hide_pid)
80228+ return false;
80229+#endif
80230+
80231 if (pid->hide_pid < hide_pid_min)
80232 return true;
80233 if (in_group_p(pid->pid_gid))
80234 return true;
80235+
80236 return ptrace_may_access(task, PTRACE_MODE_READ);
80237 }
80238
80239@@ -557,7 +609,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
80240 put_task_struct(task);
80241
80242 if (!has_perms) {
80243+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80244+ {
80245+#else
80246 if (pid->hide_pid == 2) {
80247+#endif
80248 /*
80249 * Let's make getdents(), stat(), and open()
80250 * consistent with each other. If a process
80251@@ -618,6 +674,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
80252
80253 if (task) {
80254 mm = mm_access(task, mode);
80255+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
80256+ mmput(mm);
80257+ mm = ERR_PTR(-EPERM);
80258+ }
80259 put_task_struct(task);
80260
80261 if (!IS_ERR_OR_NULL(mm)) {
80262@@ -639,6 +699,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
80263 return PTR_ERR(mm);
80264
80265 file->private_data = mm;
80266+
80267+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80268+ file->f_version = current->exec_id;
80269+#endif
80270+
80271 return 0;
80272 }
80273
80274@@ -660,6 +725,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80275 ssize_t copied;
80276 char *page;
80277
80278+#ifdef CONFIG_GRKERNSEC
80279+ if (write)
80280+ return -EPERM;
80281+#endif
80282+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80283+ if (file->f_version != current->exec_id) {
80284+ gr_log_badprocpid("mem");
80285+ return 0;
80286+ }
80287+#endif
80288+
80289 if (!mm)
80290 return 0;
80291
80292@@ -672,7 +748,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80293 goto free;
80294
80295 while (count > 0) {
80296- int this_len = min_t(int, count, PAGE_SIZE);
80297+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
80298
80299 if (write && copy_from_user(page, buf, this_len)) {
80300 copied = -EFAULT;
80301@@ -764,6 +840,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80302 if (!mm)
80303 return 0;
80304
80305+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80306+ if (file->f_version != current->exec_id) {
80307+ gr_log_badprocpid("environ");
80308+ return 0;
80309+ }
80310+#endif
80311+
80312 page = (char *)__get_free_page(GFP_TEMPORARY);
80313 if (!page)
80314 return -ENOMEM;
80315@@ -773,7 +856,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80316 goto free;
80317 while (count > 0) {
80318 size_t this_len, max_len;
80319- int retval;
80320+ ssize_t retval;
80321
80322 if (src >= (mm->env_end - mm->env_start))
80323 break;
80324@@ -1387,7 +1470,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
80325 int error = -EACCES;
80326
80327 /* Are we allowed to snoop on the tasks file descriptors? */
80328- if (!proc_fd_access_allowed(inode))
80329+ if (!proc_fd_access_allowed(inode, 0))
80330 goto out;
80331
80332 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80333@@ -1431,8 +1514,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
80334 struct path path;
80335
80336 /* Are we allowed to snoop on the tasks file descriptors? */
80337- if (!proc_fd_access_allowed(inode))
80338- goto out;
80339+ /* logging this is needed for learning on chromium to work properly,
80340+ but we don't want to flood the logs from 'ps' which does a readlink
80341+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
80342+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
80343+ */
80344+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
80345+ if (!proc_fd_access_allowed(inode,0))
80346+ goto out;
80347+ } else {
80348+ if (!proc_fd_access_allowed(inode,1))
80349+ goto out;
80350+ }
80351
80352 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80353 if (error)
80354@@ -1482,7 +1575,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
80355 rcu_read_lock();
80356 cred = __task_cred(task);
80357 inode->i_uid = cred->euid;
80358+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80359+ inode->i_gid = grsec_proc_gid;
80360+#else
80361 inode->i_gid = cred->egid;
80362+#endif
80363 rcu_read_unlock();
80364 }
80365 security_task_to_inode(task, inode);
80366@@ -1518,10 +1615,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
80367 return -ENOENT;
80368 }
80369 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80370+#ifdef CONFIG_GRKERNSEC_PROC_USER
80371+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80372+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80373+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80374+#endif
80375 task_dumpable(task)) {
80376 cred = __task_cred(task);
80377 stat->uid = cred->euid;
80378+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80379+ stat->gid = grsec_proc_gid;
80380+#else
80381 stat->gid = cred->egid;
80382+#endif
80383 }
80384 }
80385 rcu_read_unlock();
80386@@ -1559,11 +1665,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
80387
80388 if (task) {
80389 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80390+#ifdef CONFIG_GRKERNSEC_PROC_USER
80391+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80392+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80393+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80394+#endif
80395 task_dumpable(task)) {
80396 rcu_read_lock();
80397 cred = __task_cred(task);
80398 inode->i_uid = cred->euid;
80399+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80400+ inode->i_gid = grsec_proc_gid;
80401+#else
80402 inode->i_gid = cred->egid;
80403+#endif
80404 rcu_read_unlock();
80405 } else {
80406 inode->i_uid = GLOBAL_ROOT_UID;
80407@@ -2095,6 +2210,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
80408 if (!task)
80409 goto out_no_task;
80410
80411+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80412+ goto out;
80413+
80414 /*
80415 * Yes, it does not scale. And it should not. Don't add
80416 * new entries into /proc/<tgid>/ without very good reasons.
80417@@ -2125,6 +2243,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
80418 if (!task)
80419 return -ENOENT;
80420
80421+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80422+ goto out;
80423+
80424 if (!dir_emit_dots(file, ctx))
80425 goto out;
80426
80427@@ -2569,7 +2690,7 @@ static const struct pid_entry tgid_base_stuff[] = {
80428 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
80429 #endif
80430 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80431-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80432+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80433 ONE("syscall", S_IRUSR, proc_pid_syscall),
80434 #endif
80435 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80436@@ -2594,10 +2715,10 @@ static const struct pid_entry tgid_base_stuff[] = {
80437 #ifdef CONFIG_SECURITY
80438 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80439 #endif
80440-#ifdef CONFIG_KALLSYMS
80441+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80442 ONE("wchan", S_IRUGO, proc_pid_wchan),
80443 #endif
80444-#ifdef CONFIG_STACKTRACE
80445+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80446 ONE("stack", S_IRUSR, proc_pid_stack),
80447 #endif
80448 #ifdef CONFIG_SCHEDSTATS
80449@@ -2631,6 +2752,9 @@ static const struct pid_entry tgid_base_stuff[] = {
80450 #ifdef CONFIG_HARDWALL
80451 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
80452 #endif
80453+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80454+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
80455+#endif
80456 #ifdef CONFIG_USER_NS
80457 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
80458 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
80459@@ -2763,7 +2887,14 @@ static int proc_pid_instantiate(struct inode *dir,
80460 if (!inode)
80461 goto out;
80462
80463+#ifdef CONFIG_GRKERNSEC_PROC_USER
80464+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
80465+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80466+ inode->i_gid = grsec_proc_gid;
80467+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
80468+#else
80469 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
80470+#endif
80471 inode->i_op = &proc_tgid_base_inode_operations;
80472 inode->i_fop = &proc_tgid_base_operations;
80473 inode->i_flags|=S_IMMUTABLE;
80474@@ -2801,7 +2932,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
80475 if (!task)
80476 goto out;
80477
80478+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80479+ goto out_put_task;
80480+
80481 result = proc_pid_instantiate(dir, dentry, task, NULL);
80482+out_put_task:
80483 put_task_struct(task);
80484 out:
80485 return ERR_PTR(result);
80486@@ -2915,7 +3050,7 @@ static const struct pid_entry tid_base_stuff[] = {
80487 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
80488 #endif
80489 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80490-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80491+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80492 ONE("syscall", S_IRUSR, proc_pid_syscall),
80493 #endif
80494 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80495@@ -2942,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
80496 #ifdef CONFIG_SECURITY
80497 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80498 #endif
80499-#ifdef CONFIG_KALLSYMS
80500+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80501 ONE("wchan", S_IRUGO, proc_pid_wchan),
80502 #endif
80503-#ifdef CONFIG_STACKTRACE
80504+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80505 ONE("stack", S_IRUSR, proc_pid_stack),
80506 #endif
80507 #ifdef CONFIG_SCHEDSTATS
80508diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
80509index cbd82df..c0407d2 100644
80510--- a/fs/proc/cmdline.c
80511+++ b/fs/proc/cmdline.c
80512@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
80513
80514 static int __init proc_cmdline_init(void)
80515 {
80516+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80517+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
80518+#else
80519 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
80520+#endif
80521 return 0;
80522 }
80523 fs_initcall(proc_cmdline_init);
80524diff --git a/fs/proc/devices.c b/fs/proc/devices.c
80525index 50493ed..248166b 100644
80526--- a/fs/proc/devices.c
80527+++ b/fs/proc/devices.c
80528@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
80529
80530 static int __init proc_devices_init(void)
80531 {
80532+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80533+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
80534+#else
80535 proc_create("devices", 0, NULL, &proc_devinfo_operations);
80536+#endif
80537 return 0;
80538 }
80539 fs_initcall(proc_devices_init);
80540diff --git a/fs/proc/fd.c b/fs/proc/fd.c
80541index 6e5fcd0..06ea074 100644
80542--- a/fs/proc/fd.c
80543+++ b/fs/proc/fd.c
80544@@ -27,7 +27,8 @@ static int seq_show(struct seq_file *m, void *v)
80545 if (!task)
80546 return -ENOENT;
80547
80548- files = get_files_struct(task);
80549+ if (!gr_acl_handle_procpidmem(task))
80550+ files = get_files_struct(task);
80551 put_task_struct(task);
80552
80553 if (files) {
80554@@ -291,11 +292,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
80555 */
80556 int proc_fd_permission(struct inode *inode, int mask)
80557 {
80558+ struct task_struct *task;
80559 int rv = generic_permission(inode, mask);
80560- if (rv == 0)
80561- return 0;
80562+
80563 if (task_tgid(current) == proc_pid(inode))
80564 rv = 0;
80565+
80566+ task = get_proc_task(inode);
80567+ if (task == NULL)
80568+ return rv;
80569+
80570+ if (gr_acl_handle_procpidmem(task))
80571+ rv = -EACCES;
80572+
80573+ put_task_struct(task);
80574+
80575 return rv;
80576 }
80577
80578diff --git a/fs/proc/generic.c b/fs/proc/generic.c
80579index e5dee5c..dafe21b 100644
80580--- a/fs/proc/generic.c
80581+++ b/fs/proc/generic.c
80582@@ -22,6 +22,7 @@
80583 #include <linux/bitops.h>
80584 #include <linux/spinlock.h>
80585 #include <linux/completion.h>
80586+#include <linux/grsecurity.h>
80587 #include <asm/uaccess.h>
80588
80589 #include "internal.h"
80590@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
80591 return proc_lookup_de(PDE(dir), dir, dentry);
80592 }
80593
80594+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
80595+ unsigned int flags)
80596+{
80597+ if (gr_proc_is_restricted())
80598+ return ERR_PTR(-EACCES);
80599+
80600+ return proc_lookup_de(PDE(dir), dir, dentry);
80601+}
80602+
80603 /*
80604 * This returns non-zero if at EOF, so that the /proc
80605 * root directory can use this and check if it should
80606@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
80607 return proc_readdir_de(PDE(inode), file, ctx);
80608 }
80609
80610+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
80611+{
80612+ struct inode *inode = file_inode(file);
80613+
80614+ if (gr_proc_is_restricted())
80615+ return -EACCES;
80616+
80617+ return proc_readdir_de(PDE(inode), file, ctx);
80618+}
80619+
80620 /*
80621 * These are the generic /proc directory operations. They
80622 * use the in-memory "struct proc_dir_entry" tree to parse
80623@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
80624 .iterate = proc_readdir,
80625 };
80626
80627+static const struct file_operations proc_dir_restricted_operations = {
80628+ .llseek = generic_file_llseek,
80629+ .read = generic_read_dir,
80630+ .iterate = proc_readdir_restrict,
80631+};
80632+
80633 /*
80634 * proc directories can do almost nothing..
80635 */
80636@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
80637 .setattr = proc_notify_change,
80638 };
80639
80640+static const struct inode_operations proc_dir_restricted_inode_operations = {
80641+ .lookup = proc_lookup_restrict,
80642+ .getattr = proc_getattr,
80643+ .setattr = proc_notify_change,
80644+};
80645+
80646 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
80647 {
80648 int ret;
80649@@ -445,6 +477,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
80650 }
80651 EXPORT_SYMBOL_GPL(proc_mkdir_data);
80652
80653+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
80654+ struct proc_dir_entry *parent, void *data)
80655+{
80656+ struct proc_dir_entry *ent;
80657+
80658+ if (mode == 0)
80659+ mode = S_IRUGO | S_IXUGO;
80660+
80661+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
80662+ if (ent) {
80663+ ent->data = data;
80664+ ent->restricted = 1;
80665+ ent->proc_fops = &proc_dir_restricted_operations;
80666+ ent->proc_iops = &proc_dir_restricted_inode_operations;
80667+ parent->nlink++;
80668+ if (proc_register(parent, ent) < 0) {
80669+ kfree(ent);
80670+ parent->nlink--;
80671+ ent = NULL;
80672+ }
80673+ }
80674+ return ent;
80675+}
80676+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
80677+
80678 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
80679 struct proc_dir_entry *parent)
80680 {
80681@@ -459,6 +516,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
80682 }
80683 EXPORT_SYMBOL(proc_mkdir);
80684
80685+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
80686+ struct proc_dir_entry *parent)
80687+{
80688+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
80689+}
80690+EXPORT_SYMBOL(proc_mkdir_restrict);
80691+
80692 struct proc_dir_entry *proc_create_mount_point(const char *name)
80693 {
80694 umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
80695diff --git a/fs/proc/inode.c b/fs/proc/inode.c
80696index e3eb552..bcb0f25 100644
80697--- a/fs/proc/inode.c
80698+++ b/fs/proc/inode.c
80699@@ -24,11 +24,17 @@
80700 #include <linux/mount.h>
80701 #include <linux/magic.h>
80702 #include <linux/namei.h>
80703+#include <linux/grsecurity.h>
80704
80705 #include <asm/uaccess.h>
80706
80707 #include "internal.h"
80708
80709+#ifdef CONFIG_PROC_SYSCTL
80710+extern const struct inode_operations proc_sys_inode_operations;
80711+extern const struct inode_operations proc_sys_dir_operations;
80712+#endif
80713+
80714 static void proc_evict_inode(struct inode *inode)
80715 {
80716 struct proc_dir_entry *de;
80717@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
80718 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
80719 sysctl_head_put(head);
80720 }
80721+
80722+#ifdef CONFIG_PROC_SYSCTL
80723+ if (inode->i_op == &proc_sys_inode_operations ||
80724+ inode->i_op == &proc_sys_dir_operations)
80725+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
80726+#endif
80727+
80728 }
80729
80730 static struct kmem_cache * proc_inode_cachep;
80731@@ -430,7 +443,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
80732 if (de->mode) {
80733 inode->i_mode = de->mode;
80734 inode->i_uid = de->uid;
80735+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80736+ inode->i_gid = grsec_proc_gid;
80737+#else
80738 inode->i_gid = de->gid;
80739+#endif
80740 }
80741 if (de->size)
80742 inode->i_size = de->size;
80743diff --git a/fs/proc/internal.h b/fs/proc/internal.h
80744index aa27810..9f2d3b2 100644
80745--- a/fs/proc/internal.h
80746+++ b/fs/proc/internal.h
80747@@ -47,9 +47,10 @@ struct proc_dir_entry {
80748 struct completion *pde_unload_completion;
80749 struct list_head pde_openers; /* who did ->open, but not ->release */
80750 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
80751+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
80752 u8 namelen;
80753 char name[];
80754-};
80755+} __randomize_layout;
80756
80757 union proc_op {
80758 int (*proc_get_link)(struct dentry *, struct path *);
80759@@ -67,7 +68,7 @@ struct proc_inode {
80760 struct ctl_table *sysctl_entry;
80761 const struct proc_ns_operations *ns_ops;
80762 struct inode vfs_inode;
80763-};
80764+} __randomize_layout;
80765
80766 /*
80767 * General functions
80768@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
80769 struct pid *, struct task_struct *);
80770 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
80771 struct pid *, struct task_struct *);
80772+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80773+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
80774+ struct pid *, struct task_struct *);
80775+#endif
80776
80777 /*
80778 * base.c
80779@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
80780 * generic.c
80781 */
80782 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
80783+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
80784 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
80785 struct dentry *);
80786 extern int proc_readdir(struct file *, struct dir_context *);
80787+extern int proc_readdir_restrict(struct file *, struct dir_context *);
80788 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
80789
80790 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
80791diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
80792index a352d57..cb94a5c 100644
80793--- a/fs/proc/interrupts.c
80794+++ b/fs/proc/interrupts.c
80795@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
80796
80797 static int __init proc_interrupts_init(void)
80798 {
80799+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80800+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
80801+#else
80802 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
80803+#endif
80804 return 0;
80805 }
80806 fs_initcall(proc_interrupts_init);
80807diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
80808index 91a4e64..14bf8fa 100644
80809--- a/fs/proc/kcore.c
80810+++ b/fs/proc/kcore.c
80811@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80812 * the addresses in the elf_phdr on our list.
80813 */
80814 start = kc_offset_to_vaddr(*fpos - elf_buflen);
80815- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
80816+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
80817+ if (tsz > buflen)
80818 tsz = buflen;
80819-
80820+
80821 while (buflen) {
80822 struct kcore_list *m;
80823
80824@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80825 } else {
80826 if (kern_addr_valid(start)) {
80827 unsigned long n;
80828+ char *elf_buf;
80829+ mm_segment_t oldfs;
80830
80831- n = copy_to_user(buffer, (char *)start, tsz);
80832- /*
80833- * We cannot distinguish between fault on source
80834- * and fault on destination. When this happens
80835- * we clear too and hope it will trigger the
80836- * EFAULT again.
80837- */
80838- if (n) {
80839- if (clear_user(buffer + tsz - n,
80840- n))
80841- return -EFAULT;
80842- }
80843+ elf_buf = kzalloc(tsz, GFP_KERNEL);
80844+ if (!elf_buf)
80845+ return -ENOMEM;
80846+ oldfs = get_fs();
80847+ set_fs(KERNEL_DS);
80848+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
80849+ set_fs(oldfs);
80850+ n = copy_to_user(buffer, elf_buf, tsz);
80851+ kfree(elf_buf);
80852+ if (n)
80853+ return -EFAULT;
80854 } else {
80855 if (clear_user(buffer, tsz))
80856 return -EFAULT;
80857@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80858
80859 static int open_kcore(struct inode *inode, struct file *filp)
80860 {
80861+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
80862+ return -EPERM;
80863+#endif
80864 if (!capable(CAP_SYS_RAWIO))
80865 return -EPERM;
80866 if (kcore_need_update)
80867@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
80868 return NOTIFY_OK;
80869 }
80870
80871-static struct notifier_block kcore_callback_nb __meminitdata = {
80872+static struct notifier_block kcore_callback_nb __meminitconst = {
80873 .notifier_call = kcore_callback,
80874 .priority = 0,
80875 };
80876diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
80877index d3ebf2e..6ad42d1 100644
80878--- a/fs/proc/meminfo.c
80879+++ b/fs/proc/meminfo.c
80880@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
80881 vmi.used >> 10,
80882 vmi.largest_chunk >> 10
80883 #ifdef CONFIG_MEMORY_FAILURE
80884- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80885+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80886 #endif
80887 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
80888 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
80889diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
80890index d4a3574..b421ce9 100644
80891--- a/fs/proc/nommu.c
80892+++ b/fs/proc/nommu.c
80893@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
80894
80895 if (file) {
80896 seq_pad(m, ' ');
80897- seq_path(m, &file->f_path, "");
80898+ seq_path(m, &file->f_path, "\n\\");
80899 }
80900
80901 seq_putc(m, '\n');
80902diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
80903index 350984a..0fb02a9 100644
80904--- a/fs/proc/proc_net.c
80905+++ b/fs/proc/proc_net.c
80906@@ -23,9 +23,27 @@
80907 #include <linux/nsproxy.h>
80908 #include <net/net_namespace.h>
80909 #include <linux/seq_file.h>
80910+#include <linux/grsecurity.h>
80911
80912 #include "internal.h"
80913
80914+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80915+static struct seq_operations *ipv6_seq_ops_addr;
80916+
80917+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
80918+{
80919+ ipv6_seq_ops_addr = addr;
80920+}
80921+
80922+void unregister_ipv6_seq_ops_addr(void)
80923+{
80924+ ipv6_seq_ops_addr = NULL;
80925+}
80926+
80927+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
80928+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
80929+#endif
80930+
80931 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
80932 {
80933 return pde->parent->data;
80934@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
80935 return maybe_get_net(PDE_NET(PDE(inode)));
80936 }
80937
80938+extern const struct seq_operations dev_seq_ops;
80939+
80940 int seq_open_net(struct inode *ino, struct file *f,
80941 const struct seq_operations *ops, int size)
80942 {
80943@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
80944
80945 BUG_ON(size < sizeof(*p));
80946
80947+ /* only permit access to /proc/net/dev */
80948+ if (
80949+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80950+ ops != ipv6_seq_ops_addr &&
80951+#endif
80952+ ops != &dev_seq_ops && gr_proc_is_restricted())
80953+ return -EACCES;
80954+
80955 net = get_proc_net(ino);
80956 if (net == NULL)
80957 return -ENXIO;
80958@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
80959 int err;
80960 struct net *net;
80961
80962+ if (gr_proc_is_restricted())
80963+ return -EACCES;
80964+
80965 err = -ENXIO;
80966 net = get_proc_net(inode);
80967 if (net == NULL)
80968diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
80969index fdda62e..cd7c75f 100644
80970--- a/fs/proc/proc_sysctl.c
80971+++ b/fs/proc/proc_sysctl.c
80972@@ -11,13 +11,21 @@
80973 #include <linux/namei.h>
80974 #include <linux/mm.h>
80975 #include <linux/module.h>
80976+#include <linux/nsproxy.h>
80977+#ifdef CONFIG_GRKERNSEC
80978+#include <net/net_namespace.h>
80979+#endif
80980 #include "internal.h"
80981
80982+extern int gr_handle_chroot_sysctl(const int op);
80983+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
80984+ const int op);
80985+
80986 static const struct dentry_operations proc_sys_dentry_operations;
80987 static const struct file_operations proc_sys_file_operations;
80988-static const struct inode_operations proc_sys_inode_operations;
80989+const struct inode_operations proc_sys_inode_operations;
80990 static const struct file_operations proc_sys_dir_file_operations;
80991-static const struct inode_operations proc_sys_dir_operations;
80992+const struct inode_operations proc_sys_dir_operations;
80993
80994 /* Support for permanently empty directories */
80995
80996@@ -32,13 +40,17 @@ static bool is_empty_dir(struct ctl_table_header *head)
80997
80998 static void set_empty_dir(struct ctl_dir *dir)
80999 {
81000- dir->header.ctl_table[0].child = sysctl_mount_point;
81001+ pax_open_kernel();
81002+ *(const void **)&dir->header.ctl_table[0].child = sysctl_mount_point;
81003+ pax_close_kernel();
81004 }
81005
81006 static void clear_empty_dir(struct ctl_dir *dir)
81007
81008 {
81009- dir->header.ctl_table[0].child = NULL;
81010+ pax_open_kernel();
81011+ *(void **)&dir->header.ctl_table[0].child = NULL;
81012+ pax_close_kernel();
81013 }
81014
81015 void proc_sys_poll_notify(struct ctl_table_poll *poll)
81016@@ -504,6 +516,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
81017
81018 err = NULL;
81019 d_set_d_op(dentry, &proc_sys_dentry_operations);
81020+
81021+ gr_handle_proc_create(dentry, inode);
81022+
81023 d_add(dentry, inode);
81024
81025 out:
81026@@ -519,6 +534,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81027 struct inode *inode = file_inode(filp);
81028 struct ctl_table_header *head = grab_header(inode);
81029 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
81030+ int op = write ? MAY_WRITE : MAY_READ;
81031 ssize_t error;
81032 size_t res;
81033
81034@@ -530,7 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81035 * and won't be until we finish.
81036 */
81037 error = -EPERM;
81038- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
81039+ if (sysctl_perm(head, table, op))
81040 goto out;
81041
81042 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
81043@@ -538,6 +554,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
81044 if (!table->proc_handler)
81045 goto out;
81046
81047+#ifdef CONFIG_GRKERNSEC
81048+ error = -EPERM;
81049+ if (gr_handle_chroot_sysctl(op))
81050+ goto out;
81051+ dget(filp->f_path.dentry);
81052+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
81053+ dput(filp->f_path.dentry);
81054+ goto out;
81055+ }
81056+ dput(filp->f_path.dentry);
81057+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
81058+ goto out;
81059+ if (write) {
81060+ if (current->nsproxy->net_ns != table->extra2) {
81061+ if (!capable(CAP_SYS_ADMIN))
81062+ goto out;
81063+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
81064+ goto out;
81065+ }
81066+#endif
81067+
81068 /* careful: calling conventions are nasty here */
81069 res = count;
81070 error = table->proc_handler(table, write, buf, &res, ppos);
81071@@ -635,6 +672,9 @@ static bool proc_sys_fill_cache(struct file *file,
81072 return false;
81073 } else {
81074 d_set_d_op(child, &proc_sys_dentry_operations);
81075+
81076+ gr_handle_proc_create(child, inode);
81077+
81078 d_add(child, inode);
81079 }
81080 } else {
81081@@ -678,6 +718,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
81082 if ((*pos)++ < ctx->pos)
81083 return true;
81084
81085+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
81086+ return 0;
81087+
81088 if (unlikely(S_ISLNK(table->mode)))
81089 res = proc_sys_link_fill_cache(file, ctx, head, table);
81090 else
81091@@ -771,6 +814,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
81092 if (IS_ERR(head))
81093 return PTR_ERR(head);
81094
81095+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
81096+ return -ENOENT;
81097+
81098 generic_fillattr(inode, stat);
81099 if (table)
81100 stat->mode = (stat->mode & S_IFMT) | table->mode;
81101@@ -793,13 +839,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
81102 .llseek = generic_file_llseek,
81103 };
81104
81105-static const struct inode_operations proc_sys_inode_operations = {
81106+const struct inode_operations proc_sys_inode_operations = {
81107 .permission = proc_sys_permission,
81108 .setattr = proc_sys_setattr,
81109 .getattr = proc_sys_getattr,
81110 };
81111
81112-static const struct inode_operations proc_sys_dir_operations = {
81113+const struct inode_operations proc_sys_dir_operations = {
81114 .lookup = proc_sys_lookup,
81115 .permission = proc_sys_permission,
81116 .setattr = proc_sys_setattr,
81117@@ -876,7 +922,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
81118 static struct ctl_dir *new_dir(struct ctl_table_set *set,
81119 const char *name, int namelen)
81120 {
81121- struct ctl_table *table;
81122+ ctl_table_no_const *table;
81123 struct ctl_dir *new;
81124 struct ctl_node *node;
81125 char *new_name;
81126@@ -888,7 +934,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
81127 return NULL;
81128
81129 node = (struct ctl_node *)(new + 1);
81130- table = (struct ctl_table *)(node + 1);
81131+ table = (ctl_table_no_const *)(node + 1);
81132 new_name = (char *)(table + 2);
81133 memcpy(new_name, name, namelen);
81134 new_name[namelen] = '\0';
81135@@ -1057,7 +1103,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
81136 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
81137 struct ctl_table_root *link_root)
81138 {
81139- struct ctl_table *link_table, *entry, *link;
81140+ ctl_table_no_const *link_table, *link;
81141+ struct ctl_table *entry;
81142 struct ctl_table_header *links;
81143 struct ctl_node *node;
81144 char *link_name;
81145@@ -1080,7 +1127,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
81146 return NULL;
81147
81148 node = (struct ctl_node *)(links + 1);
81149- link_table = (struct ctl_table *)(node + nr_entries);
81150+ link_table = (ctl_table_no_const *)(node + nr_entries);
81151 link_name = (char *)&link_table[nr_entries + 1];
81152
81153 for (link = link_table, entry = table; entry->procname; link++, entry++) {
81154@@ -1328,8 +1375,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81155 struct ctl_table_header ***subheader, struct ctl_table_set *set,
81156 struct ctl_table *table)
81157 {
81158- struct ctl_table *ctl_table_arg = NULL;
81159- struct ctl_table *entry, *files;
81160+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
81161+ struct ctl_table *entry;
81162 int nr_files = 0;
81163 int nr_dirs = 0;
81164 int err = -ENOMEM;
81165@@ -1341,10 +1388,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81166 nr_files++;
81167 }
81168
81169- files = table;
81170 /* If there are mixed files and directories we need a new table */
81171 if (nr_dirs && nr_files) {
81172- struct ctl_table *new;
81173+ ctl_table_no_const *new;
81174 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
81175 GFP_KERNEL);
81176 if (!files)
81177@@ -1362,7 +1408,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81178 /* Register everything except a directory full of subdirectories */
81179 if (nr_files || !nr_dirs) {
81180 struct ctl_table_header *header;
81181- header = __register_sysctl_table(set, path, files);
81182+ header = __register_sysctl_table(set, path, files ? files : table);
81183 if (!header) {
81184 kfree(ctl_table_arg);
81185 goto out;
81186diff --git a/fs/proc/root.c b/fs/proc/root.c
81187index 68feb0f..2c04780 100644
81188--- a/fs/proc/root.c
81189+++ b/fs/proc/root.c
81190@@ -185,7 +185,15 @@ void __init proc_root_init(void)
81191 proc_create_mount_point("openprom");
81192 #endif
81193 proc_tty_init();
81194+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81195+#ifdef CONFIG_GRKERNSEC_PROC_USER
81196+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
81197+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81198+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
81199+#endif
81200+#else
81201 proc_mkdir("bus", NULL);
81202+#endif
81203 proc_sys_init();
81204 }
81205
81206diff --git a/fs/proc/stat.c b/fs/proc/stat.c
81207index 510413eb..34d9a8c 100644
81208--- a/fs/proc/stat.c
81209+++ b/fs/proc/stat.c
81210@@ -11,6 +11,7 @@
81211 #include <linux/irqnr.h>
81212 #include <linux/cputime.h>
81213 #include <linux/tick.h>
81214+#include <linux/grsecurity.h>
81215
81216 #ifndef arch_irq_stat_cpu
81217 #define arch_irq_stat_cpu(cpu) 0
81218@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
81219 u64 sum_softirq = 0;
81220 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
81221 struct timespec boottime;
81222+ int unrestricted = 1;
81223+
81224+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81225+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81226+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
81227+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81228+ && !in_group_p(grsec_proc_gid)
81229+#endif
81230+ )
81231+ unrestricted = 0;
81232+#endif
81233+#endif
81234
81235 user = nice = system = idle = iowait =
81236 irq = softirq = steal = 0;
81237@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
81238 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81239 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81240 idle += get_idle_time(i);
81241- iowait += get_iowait_time(i);
81242- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81243- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81244- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81245- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81246- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81247- sum += kstat_cpu_irqs_sum(i);
81248- sum += arch_irq_stat_cpu(i);
81249+ if (unrestricted) {
81250+ iowait += get_iowait_time(i);
81251+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81252+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81253+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81254+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81255+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81256+ sum += kstat_cpu_irqs_sum(i);
81257+ sum += arch_irq_stat_cpu(i);
81258+ for (j = 0; j < NR_SOFTIRQS; j++) {
81259+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81260
81261- for (j = 0; j < NR_SOFTIRQS; j++) {
81262- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81263-
81264- per_softirq_sums[j] += softirq_stat;
81265- sum_softirq += softirq_stat;
81266+ per_softirq_sums[j] += softirq_stat;
81267+ sum_softirq += softirq_stat;
81268+ }
81269 }
81270 }
81271- sum += arch_irq_stat();
81272+ if (unrestricted)
81273+ sum += arch_irq_stat();
81274
81275 seq_puts(p, "cpu ");
81276 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81277@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
81278 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81279 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81280 idle = get_idle_time(i);
81281- iowait = get_iowait_time(i);
81282- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81283- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81284- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81285- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81286- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81287+ if (unrestricted) {
81288+ iowait = get_iowait_time(i);
81289+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81290+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81291+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81292+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81293+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81294+ }
81295 seq_printf(p, "cpu%d", i);
81296 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81297 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
81298@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
81299
81300 /* sum again ? it could be updated? */
81301 for_each_irq_nr(j)
81302- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
81303+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
81304
81305 seq_printf(p,
81306 "\nctxt %llu\n"
81307@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
81308 "processes %lu\n"
81309 "procs_running %lu\n"
81310 "procs_blocked %lu\n",
81311- nr_context_switches(),
81312+ unrestricted ? nr_context_switches() : 0ULL,
81313 (unsigned long)jif,
81314- total_forks,
81315- nr_running(),
81316- nr_iowait());
81317+ unrestricted ? total_forks : 0UL,
81318+ unrestricted ? nr_running() : 0UL,
81319+ unrestricted ? nr_iowait() : 0UL);
81320
81321 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
81322
81323diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
81324index 6dee68d..1b4add0 100644
81325--- a/fs/proc/task_mmu.c
81326+++ b/fs/proc/task_mmu.c
81327@@ -13,12 +13,19 @@
81328 #include <linux/swap.h>
81329 #include <linux/swapops.h>
81330 #include <linux/mmu_notifier.h>
81331+#include <linux/grsecurity.h>
81332
81333 #include <asm/elf.h>
81334 #include <asm/uaccess.h>
81335 #include <asm/tlbflush.h>
81336 #include "internal.h"
81337
81338+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81339+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
81340+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
81341+ _mm->pax_flags & MF_PAX_SEGMEXEC))
81342+#endif
81343+
81344 void task_mem(struct seq_file *m, struct mm_struct *mm)
81345 {
81346 unsigned long data, text, lib, swap, ptes, pmds;
81347@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81348 "VmLib:\t%8lu kB\n"
81349 "VmPTE:\t%8lu kB\n"
81350 "VmPMD:\t%8lu kB\n"
81351- "VmSwap:\t%8lu kB\n",
81352- hiwater_vm << (PAGE_SHIFT-10),
81353+ "VmSwap:\t%8lu kB\n"
81354+
81355+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81356+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
81357+#endif
81358+
81359+ ,hiwater_vm << (PAGE_SHIFT-10),
81360 total_vm << (PAGE_SHIFT-10),
81361 mm->locked_vm << (PAGE_SHIFT-10),
81362 mm->pinned_vm << (PAGE_SHIFT-10),
81363@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81364 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
81365 ptes >> 10,
81366 pmds >> 10,
81367- swap << (PAGE_SHIFT-10));
81368+ swap << (PAGE_SHIFT-10)
81369+
81370+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81371+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81372+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
81373+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
81374+#else
81375+ , mm->context.user_cs_base
81376+ , mm->context.user_cs_limit
81377+#endif
81378+#endif
81379+
81380+ );
81381 }
81382
81383 unsigned long task_vsize(struct mm_struct *mm)
81384@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81385 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
81386 }
81387
81388- /* We don't show the stack guard page in /proc/maps */
81389+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81390+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
81391+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
81392+#else
81393 start = vma->vm_start;
81394- if (stack_guard_page_start(vma, start))
81395- start += PAGE_SIZE;
81396 end = vma->vm_end;
81397- if (stack_guard_page_end(vma, end))
81398- end -= PAGE_SIZE;
81399+#endif
81400
81401 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
81402 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
81403@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81404 flags & VM_WRITE ? 'w' : '-',
81405 flags & VM_EXEC ? 'x' : '-',
81406 flags & VM_MAYSHARE ? 's' : 'p',
81407+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81408+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
81409+#else
81410 pgoff,
81411+#endif
81412 MAJOR(dev), MINOR(dev), ino);
81413
81414 /*
81415@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81416 */
81417 if (file) {
81418 seq_pad(m, ' ');
81419- seq_path(m, &file->f_path, "\n");
81420+ seq_path(m, &file->f_path, "\n\\");
81421 goto done;
81422 }
81423
81424@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81425 * Thread stack in /proc/PID/task/TID/maps or
81426 * the main process stack.
81427 */
81428- if (!is_pid || (vma->vm_start <= mm->start_stack &&
81429- vma->vm_end >= mm->start_stack)) {
81430+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
81431+ (vma->vm_start <= mm->start_stack &&
81432+ vma->vm_end >= mm->start_stack)) {
81433 name = "[stack]";
81434 } else {
81435 /* Thread stack in /proc/PID/maps */
81436@@ -362,6 +391,12 @@ done:
81437
81438 static int show_map(struct seq_file *m, void *v, int is_pid)
81439 {
81440+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81441+ if (current->exec_id != m->exec_id) {
81442+ gr_log_badprocpid("maps");
81443+ return 0;
81444+ }
81445+#endif
81446 show_map_vma(m, v, is_pid);
81447 m_cache_vma(m, v);
81448 return 0;
81449@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81450 .private = &mss,
81451 };
81452
81453+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81454+ if (current->exec_id != m->exec_id) {
81455+ gr_log_badprocpid("smaps");
81456+ return 0;
81457+ }
81458+#endif
81459 memset(&mss, 0, sizeof mss);
81460- /* mmap_sem is held in m_start */
81461- walk_page_vma(vma, &smaps_walk);
81462+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81463+ if (!PAX_RAND_FLAGS(vma->vm_mm))
81464+#endif
81465+ /* mmap_sem is held in m_start */
81466+ walk_page_vma(vma, &smaps_walk);
81467
81468 show_map_vma(m, vma, is_pid);
81469
81470@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81471 "KernelPageSize: %8lu kB\n"
81472 "MMUPageSize: %8lu kB\n"
81473 "Locked: %8lu kB\n",
81474+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81475+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
81476+#else
81477 (vma->vm_end - vma->vm_start) >> 10,
81478+#endif
81479 mss.resident >> 10,
81480 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
81481 mss.shared_clean >> 10,
81482@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81483 char buffer[64];
81484 int nid;
81485
81486+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81487+ if (current->exec_id != m->exec_id) {
81488+ gr_log_badprocpid("numa_maps");
81489+ return 0;
81490+ }
81491+#endif
81492+
81493 if (!mm)
81494 return 0;
81495
81496@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81497 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
81498 }
81499
81500+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81501+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
81502+#else
81503 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
81504+#endif
81505
81506 if (file) {
81507 seq_puts(m, " file=");
81508- seq_path(m, &file->f_path, "\n\t= ");
81509+ seq_path(m, &file->f_path, "\n\t\\= ");
81510 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
81511 seq_puts(m, " heap");
81512 } else {
81513diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
81514index 599ec2e..f1413ae 100644
81515--- a/fs/proc/task_nommu.c
81516+++ b/fs/proc/task_nommu.c
81517@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81518 else
81519 bytes += kobjsize(mm);
81520
81521- if (current->fs && current->fs->users > 1)
81522+ if (current->fs && atomic_read(&current->fs->users) > 1)
81523 sbytes += kobjsize(current->fs);
81524 else
81525 bytes += kobjsize(current->fs);
81526@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
81527
81528 if (file) {
81529 seq_pad(m, ' ');
81530- seq_path(m, &file->f_path, "");
81531+ seq_path(m, &file->f_path, "\n\\");
81532 } else if (mm) {
81533 pid_t tid = pid_of_stack(priv, vma, is_pid);
81534
81535diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
81536index 4e61388..1a2523d 100644
81537--- a/fs/proc/vmcore.c
81538+++ b/fs/proc/vmcore.c
81539@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
81540 nr_bytes = count;
81541
81542 /* If pfn is not ram, return zeros for sparse dump files */
81543- if (pfn_is_ram(pfn) == 0)
81544- memset(buf, 0, nr_bytes);
81545- else {
81546+ if (pfn_is_ram(pfn) == 0) {
81547+ if (userbuf) {
81548+ if (clear_user((char __force_user *)buf, nr_bytes))
81549+ return -EFAULT;
81550+ } else
81551+ memset(buf, 0, nr_bytes);
81552+ } else {
81553 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
81554 offset, userbuf);
81555 if (tmp < 0)
81556@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
81557 static int copy_to(void *target, void *src, size_t size, int userbuf)
81558 {
81559 if (userbuf) {
81560- if (copy_to_user((char __user *) target, src, size))
81561+ if (copy_to_user((char __force_user *) target, src, size))
81562 return -EFAULT;
81563 } else {
81564 memcpy(target, src, size);
81565@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81566 if (*fpos < m->offset + m->size) {
81567 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
81568 start = m->paddr + *fpos - m->offset;
81569- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
81570+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
81571 if (tmp < 0)
81572 return tmp;
81573 buflen -= tsz;
81574@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81575 static ssize_t read_vmcore(struct file *file, char __user *buffer,
81576 size_t buflen, loff_t *fpos)
81577 {
81578- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
81579+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
81580 }
81581
81582 /*
81583diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
81584index d3fb2b6..43a8140 100644
81585--- a/fs/qnx6/qnx6.h
81586+++ b/fs/qnx6/qnx6.h
81587@@ -74,7 +74,7 @@ enum {
81588 BYTESEX_BE,
81589 };
81590
81591-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81592+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81593 {
81594 if (sbi->s_bytesex == BYTESEX_LE)
81595 return le64_to_cpu((__force __le64)n);
81596@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
81597 return (__force __fs64)cpu_to_be64(n);
81598 }
81599
81600-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81601+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81602 {
81603 if (sbi->s_bytesex == BYTESEX_LE)
81604 return le32_to_cpu((__force __le32)n);
81605diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
81606index bb2869f..d34ada8 100644
81607--- a/fs/quota/netlink.c
81608+++ b/fs/quota/netlink.c
81609@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
81610 void quota_send_warning(struct kqid qid, dev_t dev,
81611 const char warntype)
81612 {
81613- static atomic_t seq;
81614+ static atomic_unchecked_t seq;
81615 struct sk_buff *skb;
81616 void *msg_head;
81617 int ret;
81618@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
81619 "VFS: Not enough memory to send quota warning.\n");
81620 return;
81621 }
81622- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
81623+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
81624 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
81625 if (!msg_head) {
81626 printk(KERN_ERR
81627diff --git a/fs/read_write.c b/fs/read_write.c
81628index 819ef3f..f07222d 100644
81629--- a/fs/read_write.c
81630+++ b/fs/read_write.c
81631@@ -505,7 +505,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
81632
81633 old_fs = get_fs();
81634 set_fs(get_ds());
81635- p = (__force const char __user *)buf;
81636+ p = (const char __force_user *)buf;
81637 if (count > MAX_RW_COUNT)
81638 count = MAX_RW_COUNT;
81639 ret = __vfs_write(file, p, count, pos);
81640diff --git a/fs/readdir.c b/fs/readdir.c
81641index ced6791..936687b 100644
81642--- a/fs/readdir.c
81643+++ b/fs/readdir.c
81644@@ -18,6 +18,7 @@
81645 #include <linux/security.h>
81646 #include <linux/syscalls.h>
81647 #include <linux/unistd.h>
81648+#include <linux/namei.h>
81649
81650 #include <asm/uaccess.h>
81651
81652@@ -71,6 +72,7 @@ struct old_linux_dirent {
81653 struct readdir_callback {
81654 struct dir_context ctx;
81655 struct old_linux_dirent __user * dirent;
81656+ struct file * file;
81657 int result;
81658 };
81659
81660@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
81661 buf->result = -EOVERFLOW;
81662 return -EOVERFLOW;
81663 }
81664+
81665+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81666+ return 0;
81667+
81668 buf->result++;
81669 dirent = buf->dirent;
81670 if (!access_ok(VERIFY_WRITE, dirent,
81671@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
81672 if (!f.file)
81673 return -EBADF;
81674
81675+ buf.file = f.file;
81676 error = iterate_dir(f.file, &buf.ctx);
81677 if (buf.result)
81678 error = buf.result;
81679@@ -145,6 +152,7 @@ struct getdents_callback {
81680 struct dir_context ctx;
81681 struct linux_dirent __user * current_dir;
81682 struct linux_dirent __user * previous;
81683+ struct file * file;
81684 int count;
81685 int error;
81686 };
81687@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
81688 buf->error = -EOVERFLOW;
81689 return -EOVERFLOW;
81690 }
81691+
81692+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81693+ return 0;
81694+
81695 dirent = buf->previous;
81696 if (dirent) {
81697 if (__put_user(offset, &dirent->d_off))
81698@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
81699 if (!f.file)
81700 return -EBADF;
81701
81702+ buf.file = f.file;
81703 error = iterate_dir(f.file, &buf.ctx);
81704 if (error >= 0)
81705 error = buf.error;
81706@@ -230,6 +243,7 @@ struct getdents_callback64 {
81707 struct dir_context ctx;
81708 struct linux_dirent64 __user * current_dir;
81709 struct linux_dirent64 __user * previous;
81710+ struct file *file;
81711 int count;
81712 int error;
81713 };
81714@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
81715 buf->error = -EINVAL; /* only used if we fail.. */
81716 if (reclen > buf->count)
81717 return -EINVAL;
81718+
81719+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81720+ return 0;
81721+
81722 dirent = buf->previous;
81723 if (dirent) {
81724 if (__put_user(offset, &dirent->d_off))
81725@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
81726 if (!f.file)
81727 return -EBADF;
81728
81729+ buf.file = f.file;
81730 error = iterate_dir(f.file, &buf.ctx);
81731 if (error >= 0)
81732 error = buf.error;
81733diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
81734index 9c02d96..6562c10 100644
81735--- a/fs/reiserfs/do_balan.c
81736+++ b/fs/reiserfs/do_balan.c
81737@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
81738 return;
81739 }
81740
81741- atomic_inc(&fs_generation(tb->tb_sb));
81742+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
81743 do_balance_starts(tb);
81744
81745 /*
81746diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
81747index aca73dd..e3c558d 100644
81748--- a/fs/reiserfs/item_ops.c
81749+++ b/fs/reiserfs/item_ops.c
81750@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
81751 }
81752
81753 static struct item_operations errcatch_ops = {
81754- errcatch_bytes_number,
81755- errcatch_decrement_key,
81756- errcatch_is_left_mergeable,
81757- errcatch_print_item,
81758- errcatch_check_item,
81759+ .bytes_number = errcatch_bytes_number,
81760+ .decrement_key = errcatch_decrement_key,
81761+ .is_left_mergeable = errcatch_is_left_mergeable,
81762+ .print_item = errcatch_print_item,
81763+ .check_item = errcatch_check_item,
81764
81765- errcatch_create_vi,
81766- errcatch_check_left,
81767- errcatch_check_right,
81768- errcatch_part_size,
81769- errcatch_unit_num,
81770- errcatch_print_vi
81771+ .create_vi = errcatch_create_vi,
81772+ .check_left = errcatch_check_left,
81773+ .check_right = errcatch_check_right,
81774+ .part_size = errcatch_part_size,
81775+ .unit_num = errcatch_unit_num,
81776+ .print_vi = errcatch_print_vi
81777 };
81778
81779 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
81780diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
81781index 621b9f3..af527fd 100644
81782--- a/fs/reiserfs/procfs.c
81783+++ b/fs/reiserfs/procfs.c
81784@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
81785 "SMALL_TAILS " : "NO_TAILS ",
81786 replay_only(sb) ? "REPLAY_ONLY " : "",
81787 convert_reiserfs(sb) ? "CONV " : "",
81788- atomic_read(&r->s_generation_counter),
81789+ atomic_read_unchecked(&r->s_generation_counter),
81790 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
81791 SF(s_do_balance), SF(s_unneeded_left_neighbor),
81792 SF(s_good_search_by_key_reada), SF(s_bmaps),
81793diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
81794index 2adcde1..7d27bc8 100644
81795--- a/fs/reiserfs/reiserfs.h
81796+++ b/fs/reiserfs/reiserfs.h
81797@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
81798 /* Comment? -Hans */
81799 wait_queue_head_t s_wait;
81800 /* increased by one every time the tree gets re-balanced */
81801- atomic_t s_generation_counter;
81802+ atomic_unchecked_t s_generation_counter;
81803
81804 /* File system properties. Currently holds on-disk FS format */
81805 unsigned long s_properties;
81806@@ -2300,7 +2300,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
81807 #define REISERFS_USER_MEM 1 /* user memory mode */
81808
81809 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
81810-#define get_generation(s) atomic_read (&fs_generation(s))
81811+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
81812 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
81813 #define __fs_changed(gen,s) (gen != get_generation (s))
81814 #define fs_changed(gen,s) \
81815diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
81816index 0111ad0..00f4749 100644
81817--- a/fs/reiserfs/super.c
81818+++ b/fs/reiserfs/super.c
81819@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
81820 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
81821 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
81822 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
81823+#ifdef CONFIG_REISERFS_FS_XATTR
81824+ /* turn on user xattrs by default */
81825+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
81826+#endif
81827 /* no preallocation minimum, be smart in reiserfs_file_write instead */
81828 sbi->s_alloc_options.preallocmin = 0;
81829 /* Preallocate by 16 blocks (17-1) at once */
81830diff --git a/fs/select.c b/fs/select.c
81831index f684c75..4117611 100644
81832--- a/fs/select.c
81833+++ b/fs/select.c
81834@@ -20,6 +20,7 @@
81835 #include <linux/export.h>
81836 #include <linux/slab.h>
81837 #include <linux/poll.h>
81838+#include <linux/security.h>
81839 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
81840 #include <linux/file.h>
81841 #include <linux/fdtable.h>
81842@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
81843 struct poll_list *walk = head;
81844 unsigned long todo = nfds;
81845
81846+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
81847 if (nfds > rlimit(RLIMIT_NOFILE))
81848 return -EINVAL;
81849
81850diff --git a/fs/seq_file.c b/fs/seq_file.c
81851index 555f821..34684d7 100644
81852--- a/fs/seq_file.c
81853+++ b/fs/seq_file.c
81854@@ -12,6 +12,8 @@
81855 #include <linux/slab.h>
81856 #include <linux/cred.h>
81857 #include <linux/mm.h>
81858+#include <linux/sched.h>
81859+#include <linux/grsecurity.h>
81860
81861 #include <asm/uaccess.h>
81862 #include <asm/page.h>
81863@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
81864
81865 static void *seq_buf_alloc(unsigned long size)
81866 {
81867- void *buf;
81868-
81869- /*
81870- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
81871- * it's better to fall back to vmalloc() than to kill things.
81872- */
81873- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
81874- if (!buf && size > PAGE_SIZE)
81875- buf = vmalloc(size);
81876- return buf;
81877+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
81878 }
81879
81880 /**
81881@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
81882 #ifdef CONFIG_USER_NS
81883 p->user_ns = file->f_cred->user_ns;
81884 #endif
81885+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81886+ p->exec_id = current->exec_id;
81887+#endif
81888
81889 /*
81890 * Wrappers around seq_open(e.g. swaps_open) need to be
81891@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
81892 }
81893 EXPORT_SYMBOL(seq_open);
81894
81895+
81896+int seq_open_restrict(struct file *file, const struct seq_operations *op)
81897+{
81898+ if (gr_proc_is_restricted())
81899+ return -EACCES;
81900+
81901+ return seq_open(file, op);
81902+}
81903+EXPORT_SYMBOL(seq_open_restrict);
81904+
81905 static int traverse(struct seq_file *m, loff_t offset)
81906 {
81907 loff_t pos = 0, index;
81908@@ -158,7 +164,7 @@ Eoverflow:
81909 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
81910 {
81911 struct seq_file *m = file->private_data;
81912- size_t copied = 0;
81913+ ssize_t copied = 0;
81914 loff_t pos;
81915 size_t n;
81916 void *p;
81917@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
81918 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
81919 void *data)
81920 {
81921- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
81922+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
81923 int res = -ENOMEM;
81924
81925 if (op) {
81926@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
81927 }
81928 EXPORT_SYMBOL(single_open_size);
81929
81930+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
81931+ void *data)
81932+{
81933+ if (gr_proc_is_restricted())
81934+ return -EACCES;
81935+
81936+ return single_open(file, show, data);
81937+}
81938+EXPORT_SYMBOL(single_open_restrict);
81939+
81940+
81941 int single_release(struct inode *inode, struct file *file)
81942 {
81943 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
81944diff --git a/fs/splice.c b/fs/splice.c
81945index bfe62ae..a84920d 100644
81946--- a/fs/splice.c
81947+++ b/fs/splice.c
81948@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81949 pipe_lock(pipe);
81950
81951 for (;;) {
81952- if (!pipe->readers) {
81953+ if (!atomic_read(&pipe->readers)) {
81954 send_sig(SIGPIPE, current, 0);
81955 if (!ret)
81956 ret = -EPIPE;
81957@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81958 page_nr++;
81959 ret += buf->len;
81960
81961- if (pipe->files)
81962+ if (atomic_read(&pipe->files))
81963 do_wakeup = 1;
81964
81965 if (!--spd->nr_pages)
81966@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81967 do_wakeup = 0;
81968 }
81969
81970- pipe->waiting_writers++;
81971+ atomic_inc(&pipe->waiting_writers);
81972 pipe_wait(pipe);
81973- pipe->waiting_writers--;
81974+ atomic_dec(&pipe->waiting_writers);
81975 }
81976
81977 pipe_unlock(pipe);
81978@@ -578,7 +578,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
81979 old_fs = get_fs();
81980 set_fs(get_ds());
81981 /* The cast to a user pointer is valid due to the set_fs() */
81982- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
81983+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
81984 set_fs(old_fs);
81985
81986 return res;
81987@@ -593,7 +593,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
81988 old_fs = get_fs();
81989 set_fs(get_ds());
81990 /* The cast to a user pointer is valid due to the set_fs() */
81991- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
81992+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
81993 set_fs(old_fs);
81994
81995 return res;
81996@@ -646,7 +646,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
81997 goto err;
81998
81999 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
82000- vec[i].iov_base = (void __user *) page_address(page);
82001+ vec[i].iov_base = (void __force_user *) page_address(page);
82002 vec[i].iov_len = this_len;
82003 spd.pages[i] = page;
82004 spd.nr_pages++;
82005@@ -785,7 +785,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
82006 ops->release(pipe, buf);
82007 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
82008 pipe->nrbufs--;
82009- if (pipe->files)
82010+ if (atomic_read(&pipe->files))
82011 sd->need_wakeup = true;
82012 }
82013
82014@@ -809,10 +809,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
82015 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
82016 {
82017 while (!pipe->nrbufs) {
82018- if (!pipe->writers)
82019+ if (!atomic_read(&pipe->writers))
82020 return 0;
82021
82022- if (!pipe->waiting_writers && sd->num_spliced)
82023+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
82024 return 0;
82025
82026 if (sd->flags & SPLICE_F_NONBLOCK)
82027@@ -1027,7 +1027,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
82028 ops->release(pipe, buf);
82029 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
82030 pipe->nrbufs--;
82031- if (pipe->files)
82032+ if (atomic_read(&pipe->files))
82033 sd.need_wakeup = true;
82034 } else {
82035 buf->offset += ret;
82036@@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
82037 * out of the pipe right after the splice_to_pipe(). So set
82038 * PIPE_READERS appropriately.
82039 */
82040- pipe->readers = 1;
82041+ atomic_set(&pipe->readers, 1);
82042
82043 current->splice_pipe = pipe;
82044 }
82045@@ -1494,6 +1494,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
82046
82047 partial[buffers].offset = off;
82048 partial[buffers].len = plen;
82049+ partial[buffers].private = 0;
82050
82051 off = 0;
82052 len -= plen;
82053@@ -1725,9 +1726,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82054 ret = -ERESTARTSYS;
82055 break;
82056 }
82057- if (!pipe->writers)
82058+ if (!atomic_read(&pipe->writers))
82059 break;
82060- if (!pipe->waiting_writers) {
82061+ if (!atomic_read(&pipe->waiting_writers)) {
82062 if (flags & SPLICE_F_NONBLOCK) {
82063 ret = -EAGAIN;
82064 break;
82065@@ -1759,7 +1760,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82066 pipe_lock(pipe);
82067
82068 while (pipe->nrbufs >= pipe->buffers) {
82069- if (!pipe->readers) {
82070+ if (!atomic_read(&pipe->readers)) {
82071 send_sig(SIGPIPE, current, 0);
82072 ret = -EPIPE;
82073 break;
82074@@ -1772,9 +1773,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
82075 ret = -ERESTARTSYS;
82076 break;
82077 }
82078- pipe->waiting_writers++;
82079+ atomic_inc(&pipe->waiting_writers);
82080 pipe_wait(pipe);
82081- pipe->waiting_writers--;
82082+ atomic_dec(&pipe->waiting_writers);
82083 }
82084
82085 pipe_unlock(pipe);
82086@@ -1810,14 +1811,14 @@ retry:
82087 pipe_double_lock(ipipe, opipe);
82088
82089 do {
82090- if (!opipe->readers) {
82091+ if (!atomic_read(&opipe->readers)) {
82092 send_sig(SIGPIPE, current, 0);
82093 if (!ret)
82094 ret = -EPIPE;
82095 break;
82096 }
82097
82098- if (!ipipe->nrbufs && !ipipe->writers)
82099+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
82100 break;
82101
82102 /*
82103@@ -1914,7 +1915,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
82104 pipe_double_lock(ipipe, opipe);
82105
82106 do {
82107- if (!opipe->readers) {
82108+ if (!atomic_read(&opipe->readers)) {
82109 send_sig(SIGPIPE, current, 0);
82110 if (!ret)
82111 ret = -EPIPE;
82112@@ -1959,7 +1960,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
82113 * return EAGAIN if we have the potential of some data in the
82114 * future, otherwise just return 0
82115 */
82116- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
82117+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
82118 ret = -EAGAIN;
82119
82120 pipe_unlock(ipipe);
82121diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
82122index e5e0ddf..09598c4 100644
82123--- a/fs/squashfs/xattr.c
82124+++ b/fs/squashfs/xattr.c
82125@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82126 + msblk->xattr_table;
82127 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
82128 int count = squashfs_i(inode)->xattr_count;
82129- size_t rest = buffer_size;
82130- int err;
82131+ size_t used = 0;
82132+ ssize_t err;
82133
82134 /* check that the file system has xattrs */
82135 if (msblk->xattr_id_table == NULL)
82136@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82137 name_size = le16_to_cpu(entry.size);
82138 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
82139 if (handler)
82140- prefix_size = handler->list(d, buffer, rest, NULL,
82141+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
82142 name_size, handler->flags);
82143 if (prefix_size) {
82144 if (buffer) {
82145- if (prefix_size + name_size + 1 > rest) {
82146+ if (prefix_size + name_size + 1 > buffer_size - used) {
82147 err = -ERANGE;
82148 goto failed;
82149 }
82150@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82151 buffer[name_size] = '\0';
82152 buffer += name_size + 1;
82153 }
82154- rest -= prefix_size + name_size + 1;
82155+ used += prefix_size + name_size + 1;
82156 } else {
82157 /* no handler or insuffficient privileges, so skip */
82158 err = squashfs_read_metadata(sb, NULL, &start,
82159@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82160 if (err < 0)
82161 goto failed;
82162 }
82163- err = buffer_size - rest;
82164+ err = used;
82165
82166 failed:
82167 return err;
82168diff --git a/fs/stat.c b/fs/stat.c
82169index cccc1aa..7fe8951 100644
82170--- a/fs/stat.c
82171+++ b/fs/stat.c
82172@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
82173 stat->gid = inode->i_gid;
82174 stat->rdev = inode->i_rdev;
82175 stat->size = i_size_read(inode);
82176- stat->atime = inode->i_atime;
82177- stat->mtime = inode->i_mtime;
82178+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82179+ stat->atime = inode->i_ctime;
82180+ stat->mtime = inode->i_ctime;
82181+ } else {
82182+ stat->atime = inode->i_atime;
82183+ stat->mtime = inode->i_mtime;
82184+ }
82185 stat->ctime = inode->i_ctime;
82186 stat->blksize = (1 << inode->i_blkbits);
82187 stat->blocks = inode->i_blocks;
82188@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
82189 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
82190 {
82191 struct inode *inode = d_backing_inode(path->dentry);
82192+ int retval;
82193
82194- if (inode->i_op->getattr)
82195- return inode->i_op->getattr(path->mnt, path->dentry, stat);
82196+ if (inode->i_op->getattr) {
82197+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
82198+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82199+ stat->atime = stat->ctime;
82200+ stat->mtime = stat->ctime;
82201+ }
82202+ return retval;
82203+ }
82204
82205 generic_fillattr(inode, stat);
82206 return 0;
82207diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
82208index 94374e4..b5da3a1 100644
82209--- a/fs/sysfs/dir.c
82210+++ b/fs/sysfs/dir.c
82211@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82212 kfree(buf);
82213 }
82214
82215+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82216+extern int grsec_enable_sysfs_restrict;
82217+#endif
82218+
82219 /**
82220 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
82221 * @kobj: object we're creating directory for
82222@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82223 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82224 {
82225 struct kernfs_node *parent, *kn;
82226+ const char *name;
82227+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
82228+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82229+ const char *parent_name;
82230+#endif
82231
82232 BUG_ON(!kobj);
82233
82234+ name = kobject_name(kobj);
82235+
82236 if (kobj->parent)
82237 parent = kobj->parent->sd;
82238 else
82239@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82240 if (!parent)
82241 return -ENOENT;
82242
82243- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
82244- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
82245+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82246+ parent_name = parent->name;
82247+ mode = S_IRWXU;
82248+
82249+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
82250+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
82251+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
82252+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
82253+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82254+ if (!grsec_enable_sysfs_restrict)
82255+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82256+#endif
82257+
82258+ kn = kernfs_create_dir_ns(parent, name,
82259+ mode, kobj, ns);
82260 if (IS_ERR(kn)) {
82261 if (PTR_ERR(kn) == -EEXIST)
82262- sysfs_warn_dup(parent, kobject_name(kobj));
82263+ sysfs_warn_dup(parent, name);
82264 return PTR_ERR(kn);
82265 }
82266
82267diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
82268index 69d4889..a810bd4 100644
82269--- a/fs/sysv/sysv.h
82270+++ b/fs/sysv/sysv.h
82271@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
82272 #endif
82273 }
82274
82275-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82276+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82277 {
82278 if (sbi->s_bytesex == BYTESEX_PDP)
82279 return PDP_swab((__force __u32)n);
82280diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
82281index a43df11..c368e71 100644
82282--- a/fs/tracefs/inode.c
82283+++ b/fs/tracefs/inode.c
82284@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
82285 static struct tracefs_dir_ops {
82286 int (*mkdir)(const char *name);
82287 int (*rmdir)(const char *name);
82288-} tracefs_ops;
82289+} __no_const tracefs_ops __read_only;
82290
82291 static char *get_dname(struct dentry *dentry)
82292 {
82293@@ -490,8 +490,10 @@ struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *pare
82294 if (!dentry)
82295 return NULL;
82296
82297- tracefs_ops.mkdir = mkdir;
82298- tracefs_ops.rmdir = rmdir;
82299+ pax_open_kernel();
82300+ *(void **)&tracefs_ops.mkdir = mkdir;
82301+ *(void **)&tracefs_ops.rmdir = rmdir;
82302+ pax_close_kernel();
82303
82304 return dentry;
82305 }
82306diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
82307index 97be412..974b37f 100644
82308--- a/fs/ubifs/io.c
82309+++ b/fs/ubifs/io.c
82310@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
82311 return err;
82312 }
82313
82314-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82315+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82316 {
82317 int err;
82318
82319diff --git a/fs/udf/misc.c b/fs/udf/misc.c
82320index 71d1c25..084e2ad 100644
82321--- a/fs/udf/misc.c
82322+++ b/fs/udf/misc.c
82323@@ -288,7 +288,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
82324
82325 u8 udf_tag_checksum(const struct tag *t)
82326 {
82327- u8 *data = (u8 *)t;
82328+ const u8 *data = (const u8 *)t;
82329 u8 checksum = 0;
82330 int i;
82331 for (i = 0; i < sizeof(struct tag); ++i)
82332diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
82333index 8d974c4..b82f6ec 100644
82334--- a/fs/ufs/swab.h
82335+++ b/fs/ufs/swab.h
82336@@ -22,7 +22,7 @@ enum {
82337 BYTESEX_BE
82338 };
82339
82340-static inline u64
82341+static inline u64 __intentional_overflow(-1)
82342 fs64_to_cpu(struct super_block *sbp, __fs64 n)
82343 {
82344 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82345@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
82346 return (__force __fs64)cpu_to_be64(n);
82347 }
82348
82349-static inline u32
82350+static inline u32 __intentional_overflow(-1)
82351 fs32_to_cpu(struct super_block *sbp, __fs32 n)
82352 {
82353 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82354diff --git a/fs/utimes.c b/fs/utimes.c
82355index aa138d6..5f3a811 100644
82356--- a/fs/utimes.c
82357+++ b/fs/utimes.c
82358@@ -1,6 +1,7 @@
82359 #include <linux/compiler.h>
82360 #include <linux/file.h>
82361 #include <linux/fs.h>
82362+#include <linux/security.h>
82363 #include <linux/linkage.h>
82364 #include <linux/mount.h>
82365 #include <linux/namei.h>
82366@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
82367 }
82368 }
82369 retry_deleg:
82370+
82371+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
82372+ error = -EACCES;
82373+ goto mnt_drop_write_and_out;
82374+ }
82375+
82376 mutex_lock(&inode->i_mutex);
82377 error = notify_change(path->dentry, &newattrs, &delegated_inode);
82378 mutex_unlock(&inode->i_mutex);
82379diff --git a/fs/xattr.c b/fs/xattr.c
82380index 4ef6985..a6cd6567 100644
82381--- a/fs/xattr.c
82382+++ b/fs/xattr.c
82383@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
82384 return rc;
82385 }
82386
82387+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82388+ssize_t
82389+pax_getxattr(struct dentry *dentry, void *value, size_t size)
82390+{
82391+ struct inode *inode = dentry->d_inode;
82392+ ssize_t error;
82393+
82394+ error = inode_permission(inode, MAY_EXEC);
82395+ if (error)
82396+ return error;
82397+
82398+ if (inode->i_op->getxattr)
82399+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
82400+ else
82401+ error = -EOPNOTSUPP;
82402+
82403+ return error;
82404+}
82405+EXPORT_SYMBOL(pax_getxattr);
82406+#endif
82407+
82408 ssize_t
82409 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
82410 {
82411@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
82412 * Extended attribute SET operations
82413 */
82414 static long
82415-setxattr(struct dentry *d, const char __user *name, const void __user *value,
82416+setxattr(struct path *path, const char __user *name, const void __user *value,
82417 size_t size, int flags)
82418 {
82419 int error;
82420@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
82421 posix_acl_fix_xattr_from_user(kvalue, size);
82422 }
82423
82424- error = vfs_setxattr(d, kname, kvalue, size, flags);
82425+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
82426+ error = -EACCES;
82427+ goto out;
82428+ }
82429+
82430+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
82431 out:
82432 if (vvalue)
82433 vfree(vvalue);
82434@@ -376,7 +402,7 @@ retry:
82435 return error;
82436 error = mnt_want_write(path.mnt);
82437 if (!error) {
82438- error = setxattr(path.dentry, name, value, size, flags);
82439+ error = setxattr(&path, name, value, size, flags);
82440 mnt_drop_write(path.mnt);
82441 }
82442 path_put(&path);
82443@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
82444 audit_file(f.file);
82445 error = mnt_want_write_file(f.file);
82446 if (!error) {
82447- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
82448+ error = setxattr(&f.file->f_path, name, value, size, flags);
82449 mnt_drop_write_file(f.file);
82450 }
82451 fdput(f);
82452@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
82453 * Extended attribute REMOVE operations
82454 */
82455 static long
82456-removexattr(struct dentry *d, const char __user *name)
82457+removexattr(struct path *path, const char __user *name)
82458 {
82459 int error;
82460 char kname[XATTR_NAME_MAX + 1];
82461@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
82462 if (error < 0)
82463 return error;
82464
82465- return vfs_removexattr(d, kname);
82466+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
82467+ return -EACCES;
82468+
82469+ return vfs_removexattr(path->dentry, kname);
82470 }
82471
82472 static int path_removexattr(const char __user *pathname,
82473@@ -623,7 +652,7 @@ retry:
82474 return error;
82475 error = mnt_want_write(path.mnt);
82476 if (!error) {
82477- error = removexattr(path.dentry, name);
82478+ error = removexattr(&path, name);
82479 mnt_drop_write(path.mnt);
82480 }
82481 path_put(&path);
82482@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
82483 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
82484 {
82485 struct fd f = fdget(fd);
82486+ struct path *path;
82487 int error = -EBADF;
82488
82489 if (!f.file)
82490 return error;
82491+ path = &f.file->f_path;
82492 audit_file(f.file);
82493 error = mnt_want_write_file(f.file);
82494 if (!error) {
82495- error = removexattr(f.file->f_path.dentry, name);
82496+ error = removexattr(path, name);
82497 mnt_drop_write_file(f.file);
82498 }
82499 fdput(f);
82500diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
82501index f1026e8..a0fbe4f 100644
82502--- a/fs/xfs/libxfs/xfs_bmap.c
82503+++ b/fs/xfs/libxfs/xfs_bmap.c
82504@@ -554,7 +554,7 @@ xfs_bmap_validate_ret(
82505
82506 #else
82507 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
82508-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
82509+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
82510 #endif /* DEBUG */
82511
82512 /*
82513diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
82514index 098cd78..724d3f8 100644
82515--- a/fs/xfs/xfs_dir2_readdir.c
82516+++ b/fs/xfs/xfs_dir2_readdir.c
82517@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
82518 ino = dp->d_ops->sf_get_ino(sfp, sfep);
82519 filetype = dp->d_ops->sf_get_ftype(sfep);
82520 ctx->pos = off & 0x7fffffff;
82521- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82522+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
82523+ char name[sfep->namelen];
82524+ memcpy(name, sfep->name, sfep->namelen);
82525+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
82526+ return 0;
82527+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82528 xfs_dir3_get_dtype(dp->i_mount, filetype)))
82529 return 0;
82530 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
82531diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
82532index 87f67c6..7e335bf 100644
82533--- a/fs/xfs/xfs_ioctl.c
82534+++ b/fs/xfs/xfs_ioctl.c
82535@@ -120,7 +120,7 @@ xfs_find_handle(
82536 }
82537
82538 error = -EFAULT;
82539- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
82540+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
82541 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
82542 goto out_put;
82543
82544diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
82545index 7c7842c..ce15222 100644
82546--- a/fs/xfs/xfs_linux.h
82547+++ b/fs/xfs/xfs_linux.h
82548@@ -225,7 +225,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
82549 * of the compiler which do not like us using do_div in the middle
82550 * of large functions.
82551 */
82552-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82553+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82554 {
82555 __u32 mod;
82556
82557@@ -281,7 +281,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
82558 return 0;
82559 }
82560 #else
82561-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82562+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82563 {
82564 __u32 mod;
82565
82566diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
82567new file mode 100644
82568index 0000000..31f8fe4
82569--- /dev/null
82570+++ b/grsecurity/Kconfig
82571@@ -0,0 +1,1182 @@
82572+#
82573+# grecurity configuration
82574+#
82575+menu "Memory Protections"
82576+depends on GRKERNSEC
82577+
82578+config GRKERNSEC_KMEM
82579+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
82580+ default y if GRKERNSEC_CONFIG_AUTO
82581+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
82582+ help
82583+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
82584+ be written to or read from to modify or leak the contents of the running
82585+ kernel. /dev/port will also not be allowed to be opened, writing to
82586+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
82587+ If you have module support disabled, enabling this will close up several
82588+ ways that are currently used to insert malicious code into the running
82589+ kernel.
82590+
82591+ Even with this feature enabled, we still highly recommend that
82592+ you use the RBAC system, as it is still possible for an attacker to
82593+ modify the running kernel through other more obscure methods.
82594+
82595+ It is highly recommended that you say Y here if you meet all the
82596+ conditions above.
82597+
82598+config GRKERNSEC_VM86
82599+ bool "Restrict VM86 mode"
82600+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82601+ depends on X86_32
82602+
82603+ help
82604+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
82605+ make use of a special execution mode on 32bit x86 processors called
82606+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
82607+ video cards and will still work with this option enabled. The purpose
82608+ of the option is to prevent exploitation of emulation errors in
82609+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
82610+ Nearly all users should be able to enable this option.
82611+
82612+config GRKERNSEC_IO
82613+ bool "Disable privileged I/O"
82614+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82615+ depends on X86
82616+ select RTC_CLASS
82617+ select RTC_INTF_DEV
82618+ select RTC_DRV_CMOS
82619+
82620+ help
82621+ If you say Y here, all ioperm and iopl calls will return an error.
82622+ Ioperm and iopl can be used to modify the running kernel.
82623+ Unfortunately, some programs need this access to operate properly,
82624+ the most notable of which are XFree86 and hwclock. hwclock can be
82625+ remedied by having RTC support in the kernel, so real-time
82626+ clock support is enabled if this option is enabled, to ensure
82627+ that hwclock operates correctly. If hwclock still does not work,
82628+ either update udev or symlink /dev/rtc to /dev/rtc0.
82629+
82630+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
82631+ you may not be able to boot into a graphical environment with this
82632+ option enabled. In this case, you should use the RBAC system instead.
82633+
82634+config GRKERNSEC_BPF_HARDEN
82635+ bool "Harden BPF interpreter"
82636+ default y if GRKERNSEC_CONFIG_AUTO
82637+ help
82638+ Unlike previous versions of grsecurity that hardened both the BPF
82639+ interpreted code against corruption at rest as well as the JIT code
82640+ against JIT-spray attacks and attacker-controlled immediate values
82641+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
82642+ and will ensure the interpreted code is read-only at rest. This feature
82643+ may be removed at a later time when eBPF stabilizes to entirely revert
82644+ back to the more secure pre-3.16 BPF interpreter/JIT.
82645+
82646+ If you're using KERNEXEC, it's recommended that you enable this option
82647+ to supplement the hardening of the kernel.
82648+
82649+config GRKERNSEC_PERF_HARDEN
82650+ bool "Disable unprivileged PERF_EVENTS usage by default"
82651+ default y if GRKERNSEC_CONFIG_AUTO
82652+ depends on PERF_EVENTS
82653+ help
82654+ If you say Y here, the range of acceptable values for the
82655+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
82656+ default to a new value: 3. When the sysctl is set to this value, no
82657+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
82658+
82659+ Though PERF_EVENTS can be used legitimately for performance monitoring
82660+ and low-level application profiling, it is forced on regardless of
82661+ configuration, has been at fault for several vulnerabilities, and
82662+ creates new opportunities for side channels and other information leaks.
82663+
82664+ This feature puts PERF_EVENTS into a secure default state and permits
82665+ the administrator to change out of it temporarily if unprivileged
82666+ application profiling is needed.
82667+
82668+config GRKERNSEC_RAND_THREADSTACK
82669+ bool "Insert random gaps between thread stacks"
82670+ default y if GRKERNSEC_CONFIG_AUTO
82671+ depends on PAX_RANDMMAP && !PPC
82672+ help
82673+ If you say Y here, a random-sized gap will be enforced between allocated
82674+ thread stacks. Glibc's NPTL and other threading libraries that
82675+ pass MAP_STACK to the kernel for thread stack allocation are supported.
82676+ The implementation currently provides 8 bits of entropy for the gap.
82677+
82678+ Many distributions do not compile threaded remote services with the
82679+ -fstack-check argument to GCC, causing the variable-sized stack-based
82680+ allocator, alloca(), to not probe the stack on allocation. This
82681+ permits an unbounded alloca() to skip over any guard page and potentially
82682+ modify another thread's stack reliably. An enforced random gap
82683+ reduces the reliability of such an attack and increases the chance
82684+ that such a read/write to another thread's stack instead lands in
82685+ an unmapped area, causing a crash and triggering grsecurity's
82686+ anti-bruteforcing logic.
82687+
82688+config GRKERNSEC_PROC_MEMMAP
82689+ bool "Harden ASLR against information leaks and entropy reduction"
82690+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
82691+ depends on PAX_NOEXEC || PAX_ASLR
82692+ help
82693+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
82694+ give no information about the addresses of its mappings if
82695+ PaX features that rely on random addresses are enabled on the task.
82696+ In addition to sanitizing this information and disabling other
82697+ dangerous sources of information, this option causes reads of sensitive
82698+ /proc/<pid> entries where the file descriptor was opened in a different
82699+ task than the one performing the read. Such attempts are logged.
82700+ This option also limits argv/env strings for suid/sgid binaries
82701+ to 512KB to prevent a complete exhaustion of the stack entropy provided
82702+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
82703+ binaries to prevent alternative mmap layouts from being abused.
82704+
82705+ If you use PaX it is essential that you say Y here as it closes up
82706+ several holes that make full ASLR useless locally.
82707+
82708+
82709+config GRKERNSEC_KSTACKOVERFLOW
82710+ bool "Prevent kernel stack overflows"
82711+ default y if GRKERNSEC_CONFIG_AUTO
82712+ depends on !IA64 && 64BIT
82713+ help
82714+ If you say Y here, the kernel's process stacks will be allocated
82715+ with vmalloc instead of the kernel's default allocator. This
82716+ introduces guard pages that in combination with the alloca checking
82717+ of the STACKLEAK feature prevents all forms of kernel process stack
82718+ overflow abuse. Note that this is different from kernel stack
82719+ buffer overflows.
82720+
82721+config GRKERNSEC_BRUTE
82722+ bool "Deter exploit bruteforcing"
82723+ default y if GRKERNSEC_CONFIG_AUTO
82724+ help
82725+ If you say Y here, attempts to bruteforce exploits against forking
82726+ daemons such as apache or sshd, as well as against suid/sgid binaries
82727+ will be deterred. When a child of a forking daemon is killed by PaX
82728+ or crashes due to an illegal instruction or other suspicious signal,
82729+ the parent process will be delayed 30 seconds upon every subsequent
82730+ fork until the administrator is able to assess the situation and
82731+ restart the daemon.
82732+ In the suid/sgid case, the attempt is logged, the user has all their
82733+ existing instances of the suid/sgid binary terminated and will
82734+ be unable to execute any suid/sgid binaries for 15 minutes.
82735+
82736+ It is recommended that you also enable signal logging in the auditing
82737+ section so that logs are generated when a process triggers a suspicious
82738+ signal.
82739+ If the sysctl option is enabled, a sysctl option with name
82740+ "deter_bruteforce" is created.
82741+
82742+config GRKERNSEC_MODHARDEN
82743+ bool "Harden module auto-loading"
82744+ default y if GRKERNSEC_CONFIG_AUTO
82745+ depends on MODULES
82746+ help
82747+ If you say Y here, module auto-loading in response to use of some
82748+ feature implemented by an unloaded module will be restricted to
82749+ root users. Enabling this option helps defend against attacks
82750+ by unprivileged users who abuse the auto-loading behavior to
82751+ cause a vulnerable module to load that is then exploited.
82752+
82753+ If this option prevents a legitimate use of auto-loading for a
82754+ non-root user, the administrator can execute modprobe manually
82755+ with the exact name of the module mentioned in the alert log.
82756+ Alternatively, the administrator can add the module to the list
82757+ of modules loaded at boot by modifying init scripts.
82758+
82759+ Modification of init scripts will most likely be needed on
82760+ Ubuntu servers with encrypted home directory support enabled,
82761+ as the first non-root user logging in will cause the ecb(aes),
82762+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
82763+
82764+config GRKERNSEC_HIDESYM
82765+ bool "Hide kernel symbols"
82766+ default y if GRKERNSEC_CONFIG_AUTO
82767+ select PAX_USERCOPY_SLABS
82768+ help
82769+ If you say Y here, getting information on loaded modules, and
82770+ displaying all kernel symbols through a syscall will be restricted
82771+ to users with CAP_SYS_MODULE. For software compatibility reasons,
82772+ /proc/kallsyms will be restricted to the root user. The RBAC
82773+ system can hide that entry even from root.
82774+
82775+ This option also prevents leaking of kernel addresses through
82776+ several /proc entries.
82777+
82778+ Note that this option is only effective provided the following
82779+ conditions are met:
82780+ 1) The kernel using grsecurity is not precompiled by some distribution
82781+ 2) You have also enabled GRKERNSEC_DMESG
82782+ 3) You are using the RBAC system and hiding other files such as your
82783+ kernel image and System.map. Alternatively, enabling this option
82784+ causes the permissions on /boot, /lib/modules, and the kernel
82785+ source directory to change at compile time to prevent
82786+ reading by non-root users.
82787+ If the above conditions are met, this option will aid in providing a
82788+ useful protection against local kernel exploitation of overflows
82789+ and arbitrary read/write vulnerabilities.
82790+
82791+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
82792+ in addition to this feature.
82793+
82794+config GRKERNSEC_RANDSTRUCT
82795+ bool "Randomize layout of sensitive kernel structures"
82796+ default y if GRKERNSEC_CONFIG_AUTO
82797+ select GRKERNSEC_HIDESYM
82798+ select MODVERSIONS if MODULES
82799+ help
82800+ If you say Y here, the layouts of a number of sensitive kernel
82801+ structures (task, fs, cred, etc) and all structures composed entirely
82802+ of function pointers (aka "ops" structs) will be randomized at compile-time.
82803+ This can introduce the requirement of an additional infoleak
82804+ vulnerability for exploits targeting these structure types.
82805+
82806+ Enabling this feature will introduce some performance impact, slightly
82807+ increase memory usage, and prevent the use of forensic tools like
82808+ Volatility against the system (unless the kernel source tree isn't
82809+ cleaned after kernel installation).
82810+
82811+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
82812+ It remains after a make clean to allow for external modules to be compiled
82813+ with the existing seed and will be removed by a make mrproper or
82814+ make distclean.
82815+
82816+ Note that the implementation requires gcc 4.6.4. or newer. You may need
82817+ to install the supporting headers explicitly in addition to the normal
82818+ gcc package.
82819+
82820+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
82821+ bool "Use cacheline-aware structure randomization"
82822+ depends on GRKERNSEC_RANDSTRUCT
82823+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
82824+ help
82825+ If you say Y here, the RANDSTRUCT randomization will make a best effort
82826+ at restricting randomization to cacheline-sized groups of elements. It
82827+ will further not randomize bitfields in structures. This reduces the
82828+ performance hit of RANDSTRUCT at the cost of weakened randomization.
82829+
82830+config GRKERNSEC_KERN_LOCKOUT
82831+ bool "Active kernel exploit response"
82832+ default y if GRKERNSEC_CONFIG_AUTO
82833+ depends on X86 || ARM || PPC || SPARC
82834+ help
82835+ If you say Y here, when a PaX alert is triggered due to suspicious
82836+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
82837+ or an OOPS occurs due to bad memory accesses, instead of just
82838+ terminating the offending process (and potentially allowing
82839+ a subsequent exploit from the same user), we will take one of two
82840+ actions:
82841+ If the user was root, we will panic the system
82842+ If the user was non-root, we will log the attempt, terminate
82843+ all processes owned by the user, then prevent them from creating
82844+ any new processes until the system is restarted
82845+ This deters repeated kernel exploitation/bruteforcing attempts
82846+ and is useful for later forensics.
82847+
82848+config GRKERNSEC_OLD_ARM_USERLAND
82849+ bool "Old ARM userland compatibility"
82850+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
82851+ help
82852+ If you say Y here, stubs of executable code to perform such operations
82853+ as "compare-exchange" will be placed at fixed locations in the ARM vector
82854+ table. This is unfortunately needed for old ARM userland meant to run
82855+ across a wide range of processors. Without this option enabled,
82856+ the get_tls and data memory barrier stubs will be emulated by the kernel,
82857+ which is enough for Linaro userlands or other userlands designed for v6
82858+ and newer ARM CPUs. It's recommended that you try without this option enabled
82859+ first, and only enable it if your userland does not boot (it will likely fail
82860+ at init time).
82861+
82862+endmenu
82863+menu "Role Based Access Control Options"
82864+depends on GRKERNSEC
82865+
82866+config GRKERNSEC_RBAC_DEBUG
82867+ bool
82868+
82869+config GRKERNSEC_NO_RBAC
82870+ bool "Disable RBAC system"
82871+ help
82872+ If you say Y here, the /dev/grsec device will be removed from the kernel,
82873+ preventing the RBAC system from being enabled. You should only say Y
82874+ here if you have no intention of using the RBAC system, so as to prevent
82875+ an attacker with root access from misusing the RBAC system to hide files
82876+ and processes when loadable module support and /dev/[k]mem have been
82877+ locked down.
82878+
82879+config GRKERNSEC_ACL_HIDEKERN
82880+ bool "Hide kernel processes"
82881+ help
82882+ If you say Y here, all kernel threads will be hidden to all
82883+ processes but those whose subject has the "view hidden processes"
82884+ flag.
82885+
82886+config GRKERNSEC_ACL_MAXTRIES
82887+ int "Maximum tries before password lockout"
82888+ default 3
82889+ help
82890+ This option enforces the maximum number of times a user can attempt
82891+ to authorize themselves with the grsecurity RBAC system before being
82892+ denied the ability to attempt authorization again for a specified time.
82893+ The lower the number, the harder it will be to brute-force a password.
82894+
82895+config GRKERNSEC_ACL_TIMEOUT
82896+ int "Time to wait after max password tries, in seconds"
82897+ default 30
82898+ help
82899+ This option specifies the time the user must wait after attempting to
82900+ authorize to the RBAC system with the maximum number of invalid
82901+ passwords. The higher the number, the harder it will be to brute-force
82902+ a password.
82903+
82904+endmenu
82905+menu "Filesystem Protections"
82906+depends on GRKERNSEC
82907+
82908+config GRKERNSEC_PROC
82909+ bool "Proc restrictions"
82910+ default y if GRKERNSEC_CONFIG_AUTO
82911+ help
82912+ If you say Y here, the permissions of the /proc filesystem
82913+ will be altered to enhance system security and privacy. You MUST
82914+ choose either a user only restriction or a user and group restriction.
82915+ Depending upon the option you choose, you can either restrict users to
82916+ see only the processes they themselves run, or choose a group that can
82917+ view all processes and files normally restricted to root if you choose
82918+ the "restrict to user only" option. NOTE: If you're running identd or
82919+ ntpd as a non-root user, you will have to run it as the group you
82920+ specify here.
82921+
82922+config GRKERNSEC_PROC_USER
82923+ bool "Restrict /proc to user only"
82924+ depends on GRKERNSEC_PROC
82925+ help
82926+ If you say Y here, non-root users will only be able to view their own
82927+ processes, and restricts them from viewing network-related information,
82928+ and viewing kernel symbol and module information.
82929+
82930+config GRKERNSEC_PROC_USERGROUP
82931+ bool "Allow special group"
82932+ default y if GRKERNSEC_CONFIG_AUTO
82933+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
82934+ help
82935+ If you say Y here, you will be able to select a group that will be
82936+ able to view all processes and network-related information. If you've
82937+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
82938+ remain hidden. This option is useful if you want to run identd as
82939+ a non-root user. The group you select may also be chosen at boot time
82940+ via "grsec_proc_gid=" on the kernel commandline.
82941+
82942+config GRKERNSEC_PROC_GID
82943+ int "GID for special group"
82944+ depends on GRKERNSEC_PROC_USERGROUP
82945+ default 1001
82946+
82947+config GRKERNSEC_PROC_ADD
82948+ bool "Additional restrictions"
82949+ default y if GRKERNSEC_CONFIG_AUTO
82950+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
82951+ help
82952+ If you say Y here, additional restrictions will be placed on
82953+ /proc that keep normal users from viewing device information and
82954+ slabinfo information that could be useful for exploits.
82955+
82956+config GRKERNSEC_LINK
82957+ bool "Linking restrictions"
82958+ default y if GRKERNSEC_CONFIG_AUTO
82959+ help
82960+ If you say Y here, /tmp race exploits will be prevented, since users
82961+ will no longer be able to follow symlinks owned by other users in
82962+ world-writable +t directories (e.g. /tmp), unless the owner of the
82963+ symlink is the owner of the directory. users will also not be
82964+ able to hardlink to files they do not own. If the sysctl option is
82965+ enabled, a sysctl option with name "linking_restrictions" is created.
82966+
82967+config GRKERNSEC_SYMLINKOWN
82968+ bool "Kernel-enforced SymlinksIfOwnerMatch"
82969+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
82970+ help
82971+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
82972+ that prevents it from being used as a security feature. As Apache
82973+ verifies the symlink by performing a stat() against the target of
82974+ the symlink before it is followed, an attacker can setup a symlink
82975+ to point to a same-owned file, then replace the symlink with one
82976+ that targets another user's file just after Apache "validates" the
82977+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
82978+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
82979+ will be in place for the group you specify. If the sysctl option
82980+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
82981+ created.
82982+
82983+config GRKERNSEC_SYMLINKOWN_GID
82984+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
82985+ depends on GRKERNSEC_SYMLINKOWN
82986+ default 1006
82987+ help
82988+ Setting this GID determines what group kernel-enforced
82989+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
82990+ is enabled, a sysctl option with name "symlinkown_gid" is created.
82991+
82992+config GRKERNSEC_FIFO
82993+ bool "FIFO restrictions"
82994+ default y if GRKERNSEC_CONFIG_AUTO
82995+ help
82996+ If you say Y here, users will not be able to write to FIFOs they don't
82997+ own in world-writable +t directories (e.g. /tmp), unless the owner of
82998+ the FIFO is the same owner of the directory it's held in. If the sysctl
82999+ option is enabled, a sysctl option with name "fifo_restrictions" is
83000+ created.
83001+
83002+config GRKERNSEC_SYSFS_RESTRICT
83003+ bool "Sysfs/debugfs restriction"
83004+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
83005+ depends on SYSFS
83006+ help
83007+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
83008+ any filesystem normally mounted under it (e.g. debugfs) will be
83009+ mostly accessible only by root. These filesystems generally provide access
83010+ to hardware and debug information that isn't appropriate for unprivileged
83011+ users of the system. Sysfs and debugfs have also become a large source
83012+ of new vulnerabilities, ranging from infoleaks to local compromise.
83013+ There has been very little oversight with an eye toward security involved
83014+ in adding new exporters of information to these filesystems, so their
83015+ use is discouraged.
83016+ For reasons of compatibility, a few directories have been whitelisted
83017+ for access by non-root users:
83018+ /sys/fs/selinux
83019+ /sys/fs/fuse
83020+ /sys/devices/system/cpu
83021+
83022+config GRKERNSEC_ROFS
83023+ bool "Runtime read-only mount protection"
83024+ depends on SYSCTL
83025+ help
83026+ If you say Y here, a sysctl option with name "romount_protect" will
83027+ be created. By setting this option to 1 at runtime, filesystems
83028+ will be protected in the following ways:
83029+ * No new writable mounts will be allowed
83030+ * Existing read-only mounts won't be able to be remounted read/write
83031+ * Write operations will be denied on all block devices
83032+ This option acts independently of grsec_lock: once it is set to 1,
83033+ it cannot be turned off. Therefore, please be mindful of the resulting
83034+ behavior if this option is enabled in an init script on a read-only
83035+ filesystem.
83036+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
83037+ and GRKERNSEC_IO should be enabled and module loading disabled via
83038+ config or at runtime.
83039+ This feature is mainly intended for secure embedded systems.
83040+
83041+
83042+config GRKERNSEC_DEVICE_SIDECHANNEL
83043+ bool "Eliminate stat/notify-based device sidechannels"
83044+ default y if GRKERNSEC_CONFIG_AUTO
83045+ help
83046+ If you say Y here, timing analyses on block or character
83047+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
83048+ will be thwarted for unprivileged users. If a process without
83049+ CAP_MKNOD stats such a device, the last access and last modify times
83050+ will match the device's create time. No access or modify events
83051+ will be triggered through inotify/dnotify/fanotify for such devices.
83052+ This feature will prevent attacks that may at a minimum
83053+ allow an attacker to determine the administrator's password length.
83054+
83055+config GRKERNSEC_CHROOT
83056+ bool "Chroot jail restrictions"
83057+ default y if GRKERNSEC_CONFIG_AUTO
83058+ help
83059+ If you say Y here, you will be able to choose several options that will
83060+ make breaking out of a chrooted jail much more difficult. If you
83061+ encounter no software incompatibilities with the following options, it
83062+ is recommended that you enable each one.
83063+
83064+ Note that the chroot restrictions are not intended to apply to "chroots"
83065+ to directories that are simple bind mounts of the global root filesystem.
83066+ For several other reasons, a user shouldn't expect any significant
83067+ security by performing such a chroot.
83068+
83069+config GRKERNSEC_CHROOT_MOUNT
83070+ bool "Deny mounts"
83071+ default y if GRKERNSEC_CONFIG_AUTO
83072+ depends on GRKERNSEC_CHROOT
83073+ help
83074+ If you say Y here, processes inside a chroot will not be able to
83075+ mount or remount filesystems. If the sysctl option is enabled, a
83076+ sysctl option with name "chroot_deny_mount" is created.
83077+
83078+config GRKERNSEC_CHROOT_DOUBLE
83079+ bool "Deny double-chroots"
83080+ default y if GRKERNSEC_CONFIG_AUTO
83081+ depends on GRKERNSEC_CHROOT
83082+ help
83083+ If you say Y here, processes inside a chroot will not be able to chroot
83084+ again outside the chroot. This is a widely used method of breaking
83085+ out of a chroot jail and should not be allowed. If the sysctl
83086+ option is enabled, a sysctl option with name
83087+ "chroot_deny_chroot" is created.
83088+
83089+config GRKERNSEC_CHROOT_PIVOT
83090+ bool "Deny pivot_root in chroot"
83091+ default y if GRKERNSEC_CONFIG_AUTO
83092+ depends on GRKERNSEC_CHROOT
83093+ help
83094+ If you say Y here, processes inside a chroot will not be able to use
83095+ a function called pivot_root() that was introduced in Linux 2.3.41. It
83096+ works similar to chroot in that it changes the root filesystem. This
83097+ function could be misused in a chrooted process to attempt to break out
83098+ of the chroot, and therefore should not be allowed. If the sysctl
83099+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
83100+ created.
83101+
83102+config GRKERNSEC_CHROOT_CHDIR
83103+ bool "Enforce chdir(\"/\") on all chroots"
83104+ default y if GRKERNSEC_CONFIG_AUTO
83105+ depends on GRKERNSEC_CHROOT
83106+ help
83107+ If you say Y here, the current working directory of all newly-chrooted
83108+ applications will be set to the the root directory of the chroot.
83109+ The man page on chroot(2) states:
83110+ Note that this call does not change the current working
83111+ directory, so that `.' can be outside the tree rooted at
83112+ `/'. In particular, the super-user can escape from a
83113+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
83114+
83115+ It is recommended that you say Y here, since it's not known to break
83116+ any software. If the sysctl option is enabled, a sysctl option with
83117+ name "chroot_enforce_chdir" is created.
83118+
83119+config GRKERNSEC_CHROOT_CHMOD
83120+ bool "Deny (f)chmod +s"
83121+ default y if GRKERNSEC_CONFIG_AUTO
83122+ depends on GRKERNSEC_CHROOT
83123+ help
83124+ If you say Y here, processes inside a chroot will not be able to chmod
83125+ or fchmod files to make them have suid or sgid bits. This protects
83126+ against another published method of breaking a chroot. If the sysctl
83127+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
83128+ created.
83129+
83130+config GRKERNSEC_CHROOT_FCHDIR
83131+ bool "Deny fchdir and fhandle out of chroot"
83132+ default y if GRKERNSEC_CONFIG_AUTO
83133+ depends on GRKERNSEC_CHROOT
83134+ help
83135+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
83136+ to a file descriptor of the chrooting process that points to a directory
83137+ outside the filesystem will be stopped. Additionally, this option prevents
83138+ use of the recently-created syscall for opening files by a guessable "file
83139+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
83140+ with name "chroot_deny_fchdir" is created.
83141+
83142+config GRKERNSEC_CHROOT_MKNOD
83143+ bool "Deny mknod"
83144+ default y if GRKERNSEC_CONFIG_AUTO
83145+ depends on GRKERNSEC_CHROOT
83146+ help
83147+ If you say Y here, processes inside a chroot will not be allowed to
83148+ mknod. The problem with using mknod inside a chroot is that it
83149+ would allow an attacker to create a device entry that is the same
83150+ as one on the physical root of your system, which could range from
83151+ anything from the console device to a device for your harddrive (which
83152+ they could then use to wipe the drive or steal data). It is recommended
83153+ that you say Y here, unless you run into software incompatibilities.
83154+ If the sysctl option is enabled, a sysctl option with name
83155+ "chroot_deny_mknod" is created.
83156+
83157+config GRKERNSEC_CHROOT_SHMAT
83158+ bool "Deny shmat() out of chroot"
83159+ default y if GRKERNSEC_CONFIG_AUTO
83160+ depends on GRKERNSEC_CHROOT
83161+ help
83162+ If you say Y here, processes inside a chroot will not be able to attach
83163+ to shared memory segments that were created outside of the chroot jail.
83164+ It is recommended that you say Y here. If the sysctl option is enabled,
83165+ a sysctl option with name "chroot_deny_shmat" is created.
83166+
83167+config GRKERNSEC_CHROOT_UNIX
83168+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
83169+ default y if GRKERNSEC_CONFIG_AUTO
83170+ depends on GRKERNSEC_CHROOT
83171+ help
83172+ If you say Y here, processes inside a chroot will not be able to
83173+ connect to abstract (meaning not belonging to a filesystem) Unix
83174+ domain sockets that were bound outside of a chroot. It is recommended
83175+ that you say Y here. If the sysctl option is enabled, a sysctl option
83176+ with name "chroot_deny_unix" is created.
83177+
83178+config GRKERNSEC_CHROOT_FINDTASK
83179+ bool "Protect outside processes"
83180+ default y if GRKERNSEC_CONFIG_AUTO
83181+ depends on GRKERNSEC_CHROOT
83182+ help
83183+ If you say Y here, processes inside a chroot will not be able to
83184+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
83185+ getsid, or view any process outside of the chroot. If the sysctl
83186+ option is enabled, a sysctl option with name "chroot_findtask" is
83187+ created.
83188+
83189+config GRKERNSEC_CHROOT_NICE
83190+ bool "Restrict priority changes"
83191+ default y if GRKERNSEC_CONFIG_AUTO
83192+ depends on GRKERNSEC_CHROOT
83193+ help
83194+ If you say Y here, processes inside a chroot will not be able to raise
83195+ the priority of processes in the chroot, or alter the priority of
83196+ processes outside the chroot. This provides more security than simply
83197+ removing CAP_SYS_NICE from the process' capability set. If the
83198+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
83199+ is created.
83200+
83201+config GRKERNSEC_CHROOT_SYSCTL
83202+ bool "Deny sysctl writes"
83203+ default y if GRKERNSEC_CONFIG_AUTO
83204+ depends on GRKERNSEC_CHROOT
83205+ help
83206+ If you say Y here, an attacker in a chroot will not be able to
83207+ write to sysctl entries, either by sysctl(2) or through a /proc
83208+ interface. It is strongly recommended that you say Y here. If the
83209+ sysctl option is enabled, a sysctl option with name
83210+ "chroot_deny_sysctl" is created.
83211+
83212+config GRKERNSEC_CHROOT_RENAME
83213+ bool "Deny bad renames"
83214+ default y if GRKERNSEC_CONFIG_AUTO
83215+ depends on GRKERNSEC_CHROOT
83216+ help
83217+ If you say Y here, an attacker in a chroot will not be able to
83218+ abuse the ability to create double chroots to break out of the
83219+ chroot by exploiting a race condition between a rename of a directory
83220+ within a chroot against an open of a symlink with relative path
83221+ components. This feature will likewise prevent an accomplice outside
83222+ a chroot from enabling a user inside the chroot to break out and make
83223+ use of their credentials on the global filesystem. Enabling this
83224+ feature is essential to prevent root users from breaking out of a
83225+ chroot. If the sysctl option is enabled, a sysctl option with name
83226+ "chroot_deny_bad_rename" is created.
83227+
83228+config GRKERNSEC_CHROOT_CAPS
83229+ bool "Capability restrictions"
83230+ default y if GRKERNSEC_CONFIG_AUTO
83231+ depends on GRKERNSEC_CHROOT
83232+ help
83233+ If you say Y here, the capabilities on all processes within a
83234+ chroot jail will be lowered to stop module insertion, raw i/o,
83235+ system and net admin tasks, rebooting the system, modifying immutable
83236+ files, modifying IPC owned by another, and changing the system time.
83237+ This is left an option because it can break some apps. Disable this
83238+ if your chrooted apps are having problems performing those kinds of
83239+ tasks. If the sysctl option is enabled, a sysctl option with
83240+ name "chroot_caps" is created.
83241+
83242+config GRKERNSEC_CHROOT_INITRD
83243+ bool "Exempt initrd tasks from restrictions"
83244+ default y if GRKERNSEC_CONFIG_AUTO
83245+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
83246+ help
83247+ If you say Y here, tasks started prior to init will be exempted from
83248+ grsecurity's chroot restrictions. This option is mainly meant to
83249+ resolve Plymouth's performing privileged operations unnecessarily
83250+ in a chroot.
83251+
83252+endmenu
83253+menu "Kernel Auditing"
83254+depends on GRKERNSEC
83255+
83256+config GRKERNSEC_AUDIT_GROUP
83257+ bool "Single group for auditing"
83258+ help
83259+ If you say Y here, the exec and chdir logging features will only operate
83260+ on a group you specify. This option is recommended if you only want to
83261+ watch certain users instead of having a large amount of logs from the
83262+ entire system. If the sysctl option is enabled, a sysctl option with
83263+ name "audit_group" is created.
83264+
83265+config GRKERNSEC_AUDIT_GID
83266+ int "GID for auditing"
83267+ depends on GRKERNSEC_AUDIT_GROUP
83268+ default 1007
83269+
83270+config GRKERNSEC_EXECLOG
83271+ bool "Exec logging"
83272+ help
83273+ If you say Y here, all execve() calls will be logged (since the
83274+ other exec*() calls are frontends to execve(), all execution
83275+ will be logged). Useful for shell-servers that like to keep track
83276+ of their users. If the sysctl option is enabled, a sysctl option with
83277+ name "exec_logging" is created.
83278+ WARNING: This option when enabled will produce a LOT of logs, especially
83279+ on an active system.
83280+
83281+config GRKERNSEC_RESLOG
83282+ bool "Resource logging"
83283+ default y if GRKERNSEC_CONFIG_AUTO
83284+ help
83285+ If you say Y here, all attempts to overstep resource limits will
83286+ be logged with the resource name, the requested size, and the current
83287+ limit. It is highly recommended that you say Y here. If the sysctl
83288+ option is enabled, a sysctl option with name "resource_logging" is
83289+ created. If the RBAC system is enabled, the sysctl value is ignored.
83290+
83291+config GRKERNSEC_CHROOT_EXECLOG
83292+ bool "Log execs within chroot"
83293+ help
83294+ If you say Y here, all executions inside a chroot jail will be logged
83295+ to syslog. This can cause a large amount of logs if certain
83296+ applications (eg. djb's daemontools) are installed on the system, and
83297+ is therefore left as an option. If the sysctl option is enabled, a
83298+ sysctl option with name "chroot_execlog" is created.
83299+
83300+config GRKERNSEC_AUDIT_PTRACE
83301+ bool "Ptrace logging"
83302+ help
83303+ If you say Y here, all attempts to attach to a process via ptrace
83304+ will be logged. If the sysctl option is enabled, a sysctl option
83305+ with name "audit_ptrace" is created.
83306+
83307+config GRKERNSEC_AUDIT_CHDIR
83308+ bool "Chdir logging"
83309+ help
83310+ If you say Y here, all chdir() calls will be logged. If the sysctl
83311+ option is enabled, a sysctl option with name "audit_chdir" is created.
83312+
83313+config GRKERNSEC_AUDIT_MOUNT
83314+ bool "(Un)Mount logging"
83315+ help
83316+ If you say Y here, all mounts and unmounts will be logged. If the
83317+ sysctl option is enabled, a sysctl option with name "audit_mount" is
83318+ created.
83319+
83320+config GRKERNSEC_SIGNAL
83321+ bool "Signal logging"
83322+ default y if GRKERNSEC_CONFIG_AUTO
83323+ help
83324+ If you say Y here, certain important signals will be logged, such as
83325+ SIGSEGV, which will as a result inform you of when a error in a program
83326+ occurred, which in some cases could mean a possible exploit attempt.
83327+ If the sysctl option is enabled, a sysctl option with name
83328+ "signal_logging" is created.
83329+
83330+config GRKERNSEC_FORKFAIL
83331+ bool "Fork failure logging"
83332+ help
83333+ If you say Y here, all failed fork() attempts will be logged.
83334+ This could suggest a fork bomb, or someone attempting to overstep
83335+ their process limit. If the sysctl option is enabled, a sysctl option
83336+ with name "forkfail_logging" is created.
83337+
83338+config GRKERNSEC_TIME
83339+ bool "Time change logging"
83340+ default y if GRKERNSEC_CONFIG_AUTO
83341+ help
83342+ If you say Y here, any changes of the system clock will be logged.
83343+ If the sysctl option is enabled, a sysctl option with name
83344+ "timechange_logging" is created.
83345+
83346+config GRKERNSEC_PROC_IPADDR
83347+ bool "/proc/<pid>/ipaddr support"
83348+ default y if GRKERNSEC_CONFIG_AUTO
83349+ help
83350+ If you say Y here, a new entry will be added to each /proc/<pid>
83351+ directory that contains the IP address of the person using the task.
83352+ The IP is carried across local TCP and AF_UNIX stream sockets.
83353+ This information can be useful for IDS/IPSes to perform remote response
83354+ to a local attack. The entry is readable by only the owner of the
83355+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
83356+ the RBAC system), and thus does not create privacy concerns.
83357+
83358+config GRKERNSEC_RWXMAP_LOG
83359+ bool 'Denied RWX mmap/mprotect logging'
83360+ default y if GRKERNSEC_CONFIG_AUTO
83361+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
83362+ help
83363+ If you say Y here, calls to mmap() and mprotect() with explicit
83364+ usage of PROT_WRITE and PROT_EXEC together will be logged when
83365+ denied by the PAX_MPROTECT feature. This feature will also
83366+ log other problematic scenarios that can occur when PAX_MPROTECT
83367+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
83368+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
83369+ is created.
83370+
83371+endmenu
83372+
83373+menu "Executable Protections"
83374+depends on GRKERNSEC
83375+
83376+config GRKERNSEC_DMESG
83377+ bool "Dmesg(8) restriction"
83378+ default y if GRKERNSEC_CONFIG_AUTO
83379+ help
83380+ If you say Y here, non-root users will not be able to use dmesg(8)
83381+ to view the contents of the kernel's circular log buffer.
83382+ The kernel's log buffer often contains kernel addresses and other
83383+ identifying information useful to an attacker in fingerprinting a
83384+ system for a targeted exploit.
83385+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
83386+ created.
83387+
83388+config GRKERNSEC_HARDEN_PTRACE
83389+ bool "Deter ptrace-based process snooping"
83390+ default y if GRKERNSEC_CONFIG_AUTO
83391+ help
83392+ If you say Y here, TTY sniffers and other malicious monitoring
83393+ programs implemented through ptrace will be defeated. If you
83394+ have been using the RBAC system, this option has already been
83395+ enabled for several years for all users, with the ability to make
83396+ fine-grained exceptions.
83397+
83398+ This option only affects the ability of non-root users to ptrace
83399+ processes that are not a descendent of the ptracing process.
83400+ This means that strace ./binary and gdb ./binary will still work,
83401+ but attaching to arbitrary processes will not. If the sysctl
83402+ option is enabled, a sysctl option with name "harden_ptrace" is
83403+ created.
83404+
83405+config GRKERNSEC_PTRACE_READEXEC
83406+ bool "Require read access to ptrace sensitive binaries"
83407+ default y if GRKERNSEC_CONFIG_AUTO
83408+ help
83409+ If you say Y here, unprivileged users will not be able to ptrace unreadable
83410+ binaries. This option is useful in environments that
83411+ remove the read bits (e.g. file mode 4711) from suid binaries to
83412+ prevent infoleaking of their contents. This option adds
83413+ consistency to the use of that file mode, as the binary could normally
83414+ be read out when run without privileges while ptracing.
83415+
83416+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
83417+ is created.
83418+
83419+config GRKERNSEC_SETXID
83420+ bool "Enforce consistent multithreaded privileges"
83421+ default y if GRKERNSEC_CONFIG_AUTO
83422+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
83423+ help
83424+ If you say Y here, a change from a root uid to a non-root uid
83425+ in a multithreaded application will cause the resulting uids,
83426+ gids, supplementary groups, and capabilities in that thread
83427+ to be propagated to the other threads of the process. In most
83428+ cases this is unnecessary, as glibc will emulate this behavior
83429+ on behalf of the application. Other libcs do not act in the
83430+ same way, allowing the other threads of the process to continue
83431+ running with root privileges. If the sysctl option is enabled,
83432+ a sysctl option with name "consistent_setxid" is created.
83433+
83434+config GRKERNSEC_HARDEN_IPC
83435+ bool "Disallow access to overly-permissive IPC objects"
83436+ default y if GRKERNSEC_CONFIG_AUTO
83437+ depends on SYSVIPC
83438+ help
83439+ If you say Y here, access to overly-permissive IPC objects (shared
83440+ memory, message queues, and semaphores) will be denied for processes
83441+ given the following criteria beyond normal permission checks:
83442+ 1) If the IPC object is world-accessible and the euid doesn't match
83443+ that of the creator or current uid for the IPC object
83444+ 2) If the IPC object is group-accessible and the egid doesn't
83445+ match that of the creator or current gid for the IPC object
83446+ It's a common error to grant too much permission to these objects,
83447+ with impact ranging from denial of service and information leaking to
83448+ privilege escalation. This feature was developed in response to
83449+ research by Tim Brown:
83450+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
83451+ who found hundreds of such insecure usages. Processes with
83452+ CAP_IPC_OWNER are still permitted to access these IPC objects.
83453+ If the sysctl option is enabled, a sysctl option with name
83454+ "harden_ipc" is created.
83455+
83456+config GRKERNSEC_TPE
83457+ bool "Trusted Path Execution (TPE)"
83458+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83459+ help
83460+ If you say Y here, you will be able to choose a gid to add to the
83461+ supplementary groups of users you want to mark as "untrusted."
83462+ These users will not be able to execute any files that are not in
83463+ root-owned directories writable only by root. If the sysctl option
83464+ is enabled, a sysctl option with name "tpe" is created.
83465+
83466+config GRKERNSEC_TPE_ALL
83467+ bool "Partially restrict all non-root users"
83468+ depends on GRKERNSEC_TPE
83469+ help
83470+ If you say Y here, all non-root users will be covered under
83471+ a weaker TPE restriction. This is separate from, and in addition to,
83472+ the main TPE options that you have selected elsewhere. Thus, if a
83473+ "trusted" GID is chosen, this restriction applies to even that GID.
83474+ Under this restriction, all non-root users will only be allowed to
83475+ execute files in directories they own that are not group or
83476+ world-writable, or in directories owned by root and writable only by
83477+ root. If the sysctl option is enabled, a sysctl option with name
83478+ "tpe_restrict_all" is created.
83479+
83480+config GRKERNSEC_TPE_INVERT
83481+ bool "Invert GID option"
83482+ depends on GRKERNSEC_TPE
83483+ help
83484+ If you say Y here, the group you specify in the TPE configuration will
83485+ decide what group TPE restrictions will be *disabled* for. This
83486+ option is useful if you want TPE restrictions to be applied to most
83487+ users on the system. If the sysctl option is enabled, a sysctl option
83488+ with name "tpe_invert" is created. Unlike other sysctl options, this
83489+ entry will default to on for backward-compatibility.
83490+
83491+config GRKERNSEC_TPE_GID
83492+ int
83493+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
83494+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
83495+
83496+config GRKERNSEC_TPE_UNTRUSTED_GID
83497+ int "GID for TPE-untrusted users"
83498+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
83499+ default 1005
83500+ help
83501+ Setting this GID determines what group TPE restrictions will be
83502+ *enabled* for. If the sysctl option is enabled, a sysctl option
83503+ with name "tpe_gid" is created.
83504+
83505+config GRKERNSEC_TPE_TRUSTED_GID
83506+ int "GID for TPE-trusted users"
83507+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
83508+ default 1005
83509+ help
83510+ Setting this GID determines what group TPE restrictions will be
83511+ *disabled* for. If the sysctl option is enabled, a sysctl option
83512+ with name "tpe_gid" is created.
83513+
83514+endmenu
83515+menu "Network Protections"
83516+depends on GRKERNSEC
83517+
83518+config GRKERNSEC_BLACKHOLE
83519+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
83520+ default y if GRKERNSEC_CONFIG_AUTO
83521+ depends on NET
83522+ help
83523+ If you say Y here, neither TCP resets nor ICMP
83524+ destination-unreachable packets will be sent in response to packets
83525+ sent to ports for which no associated listening process exists.
83526+ It will also prevent the sending of ICMP protocol unreachable packets
83527+ in response to packets with unknown protocols.
83528+ This feature supports both IPV4 and IPV6 and exempts the
83529+ loopback interface from blackholing. Enabling this feature
83530+ makes a host more resilient to DoS attacks and reduces network
83531+ visibility against scanners.
83532+
83533+ The blackhole feature as-implemented is equivalent to the FreeBSD
83534+ blackhole feature, as it prevents RST responses to all packets, not
83535+ just SYNs. Under most application behavior this causes no
83536+ problems, but applications (like haproxy) may not close certain
83537+ connections in a way that cleanly terminates them on the remote
83538+ end, leaving the remote host in LAST_ACK state. Because of this
83539+ side-effect and to prevent intentional LAST_ACK DoSes, this
83540+ feature also adds automatic mitigation against such attacks.
83541+ The mitigation drastically reduces the amount of time a socket
83542+ can spend in LAST_ACK state. If you're using haproxy and not
83543+ all servers it connects to have this option enabled, consider
83544+ disabling this feature on the haproxy host.
83545+
83546+ If the sysctl option is enabled, two sysctl options with names
83547+ "ip_blackhole" and "lastack_retries" will be created.
83548+ While "ip_blackhole" takes the standard zero/non-zero on/off
83549+ toggle, "lastack_retries" uses the same kinds of values as
83550+ "tcp_retries1" and "tcp_retries2". The default value of 4
83551+ prevents a socket from lasting more than 45 seconds in LAST_ACK
83552+ state.
83553+
83554+config GRKERNSEC_NO_SIMULT_CONNECT
83555+ bool "Disable TCP Simultaneous Connect"
83556+ default y if GRKERNSEC_CONFIG_AUTO
83557+ depends on NET
83558+ help
83559+ If you say Y here, a feature by Willy Tarreau will be enabled that
83560+ removes a weakness in Linux's strict implementation of TCP that
83561+ allows two clients to connect to each other without either entering
83562+ a listening state. The weakness allows an attacker to easily prevent
83563+ a client from connecting to a known server provided the source port
83564+ for the connection is guessed correctly.
83565+
83566+ As the weakness could be used to prevent an antivirus or IPS from
83567+ fetching updates, or prevent an SSL gateway from fetching a CRL,
83568+ it should be eliminated by enabling this option. Though Linux is
83569+ one of few operating systems supporting simultaneous connect, it
83570+ has no legitimate use in practice and is rarely supported by firewalls.
83571+
83572+config GRKERNSEC_SOCKET
83573+ bool "Socket restrictions"
83574+ depends on NET
83575+ help
83576+ If you say Y here, you will be able to choose from several options.
83577+ If you assign a GID on your system and add it to the supplementary
83578+ groups of users you want to restrict socket access to, this patch
83579+ will perform up to three things, based on the option(s) you choose.
83580+
83581+config GRKERNSEC_SOCKET_ALL
83582+ bool "Deny any sockets to group"
83583+ depends on GRKERNSEC_SOCKET
83584+ help
83585+ If you say Y here, you will be able to choose a GID of whose users will
83586+ be unable to connect to other hosts from your machine or run server
83587+ applications from your machine. If the sysctl option is enabled, a
83588+ sysctl option with name "socket_all" is created.
83589+
83590+config GRKERNSEC_SOCKET_ALL_GID
83591+ int "GID to deny all sockets for"
83592+ depends on GRKERNSEC_SOCKET_ALL
83593+ default 1004
83594+ help
83595+ Here you can choose the GID to disable socket access for. Remember to
83596+ add the users you want socket access disabled for to the GID
83597+ specified here. If the sysctl option is enabled, a sysctl option
83598+ with name "socket_all_gid" is created.
83599+
83600+config GRKERNSEC_SOCKET_CLIENT
83601+ bool "Deny client sockets to group"
83602+ depends on GRKERNSEC_SOCKET
83603+ help
83604+ If you say Y here, you will be able to choose a GID of whose users will
83605+ be unable to connect to other hosts from your machine, but will be
83606+ able to run servers. If this option is enabled, all users in the group
83607+ you specify will have to use passive mode when initiating ftp transfers
83608+ from the shell on your machine. If the sysctl option is enabled, a
83609+ sysctl option with name "socket_client" is created.
83610+
83611+config GRKERNSEC_SOCKET_CLIENT_GID
83612+ int "GID to deny client sockets for"
83613+ depends on GRKERNSEC_SOCKET_CLIENT
83614+ default 1003
83615+ help
83616+ Here you can choose the GID to disable client socket access for.
83617+ Remember to add the users you want client socket access disabled for to
83618+ the GID specified here. If the sysctl option is enabled, a sysctl
83619+ option with name "socket_client_gid" is created.
83620+
83621+config GRKERNSEC_SOCKET_SERVER
83622+ bool "Deny server sockets to group"
83623+ depends on GRKERNSEC_SOCKET
83624+ help
83625+ If you say Y here, you will be able to choose a GID of whose users will
83626+ be unable to run server applications from your machine. If the sysctl
83627+ option is enabled, a sysctl option with name "socket_server" is created.
83628+
83629+config GRKERNSEC_SOCKET_SERVER_GID
83630+ int "GID to deny server sockets for"
83631+ depends on GRKERNSEC_SOCKET_SERVER
83632+ default 1002
83633+ help
83634+ Here you can choose the GID to disable server socket access for.
83635+ Remember to add the users you want server socket access disabled for to
83636+ the GID specified here. If the sysctl option is enabled, a sysctl
83637+ option with name "socket_server_gid" is created.
83638+
83639+endmenu
83640+
83641+menu "Physical Protections"
83642+depends on GRKERNSEC
83643+
83644+config GRKERNSEC_DENYUSB
83645+ bool "Deny new USB connections after toggle"
83646+ default y if GRKERNSEC_CONFIG_AUTO
83647+ depends on SYSCTL && USB_SUPPORT
83648+ help
83649+ If you say Y here, a new sysctl option with name "deny_new_usb"
83650+ will be created. Setting its value to 1 will prevent any new
83651+ USB devices from being recognized by the OS. Any attempted USB
83652+ device insertion will be logged. This option is intended to be
83653+ used against custom USB devices designed to exploit vulnerabilities
83654+ in various USB device drivers.
83655+
83656+ For greatest effectiveness, this sysctl should be set after any
83657+ relevant init scripts. This option is safe to enable in distros
83658+ as each user can choose whether or not to toggle the sysctl.
83659+
83660+config GRKERNSEC_DENYUSB_FORCE
83661+ bool "Reject all USB devices not connected at boot"
83662+ select USB
83663+ depends on GRKERNSEC_DENYUSB
83664+ help
83665+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
83666+ that doesn't involve a sysctl entry. This option should only be
83667+ enabled if you're sure you want to deny all new USB connections
83668+ at runtime and don't want to modify init scripts. This should not
83669+ be enabled by distros. It forces the core USB code to be built
83670+ into the kernel image so that all devices connected at boot time
83671+ can be recognized and new USB device connections can be prevented
83672+ prior to init running.
83673+
83674+endmenu
83675+
83676+menu "Sysctl Support"
83677+depends on GRKERNSEC && SYSCTL
83678+
83679+config GRKERNSEC_SYSCTL
83680+ bool "Sysctl support"
83681+ default y if GRKERNSEC_CONFIG_AUTO
83682+ help
83683+ If you say Y here, you will be able to change the options that
83684+ grsecurity runs with at bootup, without having to recompile your
83685+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
83686+ to enable (1) or disable (0) various features. All the sysctl entries
83687+ are mutable until the "grsec_lock" entry is set to a non-zero value.
83688+ All features enabled in the kernel configuration are disabled at boot
83689+ if you do not say Y to the "Turn on features by default" option.
83690+ All options should be set at startup, and the grsec_lock entry should
83691+ be set to a non-zero value after all the options are set.
83692+ *THIS IS EXTREMELY IMPORTANT*
83693+
83694+config GRKERNSEC_SYSCTL_DISTRO
83695+ bool "Extra sysctl support for distro makers (READ HELP)"
83696+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
83697+ help
83698+ If you say Y here, additional sysctl options will be created
83699+ for features that affect processes running as root. Therefore,
83700+ it is critical when using this option that the grsec_lock entry be
83701+ enabled after boot. Only distros with prebuilt kernel packages
83702+ with this option enabled that can ensure grsec_lock is enabled
83703+ after boot should use this option.
83704+ *Failure to set grsec_lock after boot makes all grsec features
83705+ this option covers useless*
83706+
83707+ Currently this option creates the following sysctl entries:
83708+ "Disable Privileged I/O": "disable_priv_io"
83709+
83710+config GRKERNSEC_SYSCTL_ON
83711+ bool "Turn on features by default"
83712+ default y if GRKERNSEC_CONFIG_AUTO
83713+ depends on GRKERNSEC_SYSCTL
83714+ help
83715+ If you say Y here, instead of having all features enabled in the
83716+ kernel configuration disabled at boot time, the features will be
83717+ enabled at boot time. It is recommended you say Y here unless
83718+ there is some reason you would want all sysctl-tunable features to
83719+ be disabled by default. As mentioned elsewhere, it is important
83720+ to enable the grsec_lock entry once you have finished modifying
83721+ the sysctl entries.
83722+
83723+endmenu
83724+menu "Logging Options"
83725+depends on GRKERNSEC
83726+
83727+config GRKERNSEC_FLOODTIME
83728+ int "Seconds in between log messages (minimum)"
83729+ default 10
83730+ help
83731+ This option allows you to enforce the number of seconds between
83732+ grsecurity log messages. The default should be suitable for most
83733+ people, however, if you choose to change it, choose a value small enough
83734+ to allow informative logs to be produced, but large enough to
83735+ prevent flooding.
83736+
83737+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
83738+ any rate limiting on grsecurity log messages.
83739+
83740+config GRKERNSEC_FLOODBURST
83741+ int "Number of messages in a burst (maximum)"
83742+ default 6
83743+ help
83744+ This option allows you to choose the maximum number of messages allowed
83745+ within the flood time interval you chose in a separate option. The
83746+ default should be suitable for most people, however if you find that
83747+ many of your logs are being interpreted as flooding, you may want to
83748+ raise this value.
83749+
83750+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
83751+ any rate limiting on grsecurity log messages.
83752+
83753+endmenu
83754diff --git a/grsecurity/Makefile b/grsecurity/Makefile
83755new file mode 100644
83756index 0000000..30ababb
83757--- /dev/null
83758+++ b/grsecurity/Makefile
83759@@ -0,0 +1,54 @@
83760+# grsecurity – access control and security hardening for Linux
83761+# All code in this directory and various hooks located throughout the Linux kernel are
83762+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
83763+# http://www.grsecurity.net spender@grsecurity.net
83764+#
83765+# This program is free software; you can redistribute it and/or
83766+# modify it under the terms of the GNU General Public License version 2
83767+# as published by the Free Software Foundation.
83768+#
83769+# This program is distributed in the hope that it will be useful,
83770+# but WITHOUT ANY WARRANTY; without even the implied warranty of
83771+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83772+# GNU General Public License for more details.
83773+#
83774+# You should have received a copy of the GNU General Public License
83775+# along with this program; if not, write to the Free Software
83776+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
83777+
83778+KBUILD_CFLAGS += -Werror
83779+
83780+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
83781+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
83782+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
83783+ grsec_usb.o grsec_ipc.o grsec_proc.o
83784+
83785+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
83786+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
83787+ gracl_learn.o grsec_log.o gracl_policy.o
83788+ifdef CONFIG_COMPAT
83789+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
83790+endif
83791+
83792+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
83793+
83794+ifdef CONFIG_NET
83795+obj-y += grsec_sock.o
83796+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
83797+endif
83798+
83799+ifndef CONFIG_GRKERNSEC
83800+obj-y += grsec_disabled.o
83801+endif
83802+
83803+ifdef CONFIG_GRKERNSEC_HIDESYM
83804+extra-y := grsec_hidesym.o
83805+$(obj)/grsec_hidesym.o:
83806+ @-chmod -f 500 /boot
83807+ @-chmod -f 500 /lib/modules
83808+ @-chmod -f 500 /lib64/modules
83809+ @-chmod -f 500 /lib32/modules
83810+ @-chmod -f 700 .
83811+ @-chmod -f 700 $(objtree)
83812+ @echo ' grsec: protected kernel image paths'
83813+endif
83814diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
83815new file mode 100644
83816index 0000000..7ad630a
83817--- /dev/null
83818+++ b/grsecurity/gracl.c
83819@@ -0,0 +1,2757 @@
83820+#include <linux/kernel.h>
83821+#include <linux/module.h>
83822+#include <linux/sched.h>
83823+#include <linux/mm.h>
83824+#include <linux/file.h>
83825+#include <linux/fs.h>
83826+#include <linux/namei.h>
83827+#include <linux/mount.h>
83828+#include <linux/tty.h>
83829+#include <linux/proc_fs.h>
83830+#include <linux/lglock.h>
83831+#include <linux/slab.h>
83832+#include <linux/vmalloc.h>
83833+#include <linux/types.h>
83834+#include <linux/sysctl.h>
83835+#include <linux/netdevice.h>
83836+#include <linux/ptrace.h>
83837+#include <linux/gracl.h>
83838+#include <linux/gralloc.h>
83839+#include <linux/security.h>
83840+#include <linux/grinternal.h>
83841+#include <linux/pid_namespace.h>
83842+#include <linux/stop_machine.h>
83843+#include <linux/fdtable.h>
83844+#include <linux/percpu.h>
83845+#include <linux/lglock.h>
83846+#include <linux/hugetlb.h>
83847+#include <linux/posix-timers.h>
83848+#include <linux/prefetch.h>
83849+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83850+#include <linux/magic.h>
83851+#include <linux/pagemap.h>
83852+#include "../fs/btrfs/async-thread.h"
83853+#include "../fs/btrfs/ctree.h"
83854+#include "../fs/btrfs/btrfs_inode.h"
83855+#endif
83856+#include "../fs/mount.h"
83857+
83858+#include <asm/uaccess.h>
83859+#include <asm/errno.h>
83860+#include <asm/mman.h>
83861+
83862+#define FOR_EACH_ROLE_START(role) \
83863+ role = running_polstate.role_list; \
83864+ while (role) {
83865+
83866+#define FOR_EACH_ROLE_END(role) \
83867+ role = role->prev; \
83868+ }
83869+
83870+extern struct path gr_real_root;
83871+
83872+static struct gr_policy_state running_polstate;
83873+struct gr_policy_state *polstate = &running_polstate;
83874+extern struct gr_alloc_state *current_alloc_state;
83875+
83876+extern char *gr_shared_page[4];
83877+DEFINE_RWLOCK(gr_inode_lock);
83878+
83879+static unsigned int gr_status __read_only = GR_STATUS_INIT;
83880+
83881+#ifdef CONFIG_NET
83882+extern struct vfsmount *sock_mnt;
83883+#endif
83884+
83885+extern struct vfsmount *pipe_mnt;
83886+extern struct vfsmount *shm_mnt;
83887+
83888+#ifdef CONFIG_HUGETLBFS
83889+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
83890+#endif
83891+
83892+extern u16 acl_sp_role_value;
83893+extern struct acl_object_label *fakefs_obj_rw;
83894+extern struct acl_object_label *fakefs_obj_rwx;
83895+
83896+int gr_acl_is_enabled(void)
83897+{
83898+ return (gr_status & GR_READY);
83899+}
83900+
83901+void gr_enable_rbac_system(void)
83902+{
83903+ pax_open_kernel();
83904+ gr_status |= GR_READY;
83905+ pax_close_kernel();
83906+}
83907+
83908+int gr_rbac_disable(void *unused)
83909+{
83910+ pax_open_kernel();
83911+ gr_status &= ~GR_READY;
83912+ pax_close_kernel();
83913+
83914+ return 0;
83915+}
83916+
83917+static inline dev_t __get_dev(const struct dentry *dentry)
83918+{
83919+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83920+
83921+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83922+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83923+ return BTRFS_I(d_inode(ldentry))->root->anon_dev;
83924+ else
83925+#endif
83926+ return d_inode(ldentry)->i_sb->s_dev;
83927+}
83928+
83929+static inline u64 __get_ino(const struct dentry *dentry)
83930+{
83931+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83932+
83933+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83934+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83935+ return btrfs_ino(d_inode(dentry));
83936+ else
83937+#endif
83938+ return d_inode(ldentry)->i_ino;
83939+}
83940+
83941+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
83942+{
83943+ return __get_dev(dentry);
83944+}
83945+
83946+u64 gr_get_ino_from_dentry(struct dentry *dentry)
83947+{
83948+ return __get_ino(dentry);
83949+}
83950+
83951+static char gr_task_roletype_to_char(struct task_struct *task)
83952+{
83953+ switch (task->role->roletype &
83954+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
83955+ GR_ROLE_SPECIAL)) {
83956+ case GR_ROLE_DEFAULT:
83957+ return 'D';
83958+ case GR_ROLE_USER:
83959+ return 'U';
83960+ case GR_ROLE_GROUP:
83961+ return 'G';
83962+ case GR_ROLE_SPECIAL:
83963+ return 'S';
83964+ }
83965+
83966+ return 'X';
83967+}
83968+
83969+char gr_roletype_to_char(void)
83970+{
83971+ return gr_task_roletype_to_char(current);
83972+}
83973+
83974+int
83975+gr_acl_tpe_check(void)
83976+{
83977+ if (unlikely(!(gr_status & GR_READY)))
83978+ return 0;
83979+ if (current->role->roletype & GR_ROLE_TPE)
83980+ return 1;
83981+ else
83982+ return 0;
83983+}
83984+
83985+int
83986+gr_handle_rawio(const struct inode *inode)
83987+{
83988+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
83989+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
83990+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
83991+ !capable(CAP_SYS_RAWIO))
83992+ return 1;
83993+#endif
83994+ return 0;
83995+}
83996+
83997+int
83998+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
83999+{
84000+ if (likely(lena != lenb))
84001+ return 0;
84002+
84003+ return !memcmp(a, b, lena);
84004+}
84005+
84006+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
84007+{
84008+ *buflen -= namelen;
84009+ if (*buflen < 0)
84010+ return -ENAMETOOLONG;
84011+ *buffer -= namelen;
84012+ memcpy(*buffer, str, namelen);
84013+ return 0;
84014+}
84015+
84016+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
84017+{
84018+ return prepend(buffer, buflen, name->name, name->len);
84019+}
84020+
84021+static int prepend_path(const struct path *path, struct path *root,
84022+ char **buffer, int *buflen)
84023+{
84024+ struct dentry *dentry = path->dentry;
84025+ struct vfsmount *vfsmnt = path->mnt;
84026+ struct mount *mnt = real_mount(vfsmnt);
84027+ bool slash = false;
84028+ int error = 0;
84029+
84030+ while (dentry != root->dentry || vfsmnt != root->mnt) {
84031+ struct dentry * parent;
84032+
84033+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
84034+ /* Global root? */
84035+ if (!mnt_has_parent(mnt)) {
84036+ goto out;
84037+ }
84038+ dentry = mnt->mnt_mountpoint;
84039+ mnt = mnt->mnt_parent;
84040+ vfsmnt = &mnt->mnt;
84041+ continue;
84042+ }
84043+ parent = dentry->d_parent;
84044+ prefetch(parent);
84045+ spin_lock(&dentry->d_lock);
84046+ error = prepend_name(buffer, buflen, &dentry->d_name);
84047+ spin_unlock(&dentry->d_lock);
84048+ if (!error)
84049+ error = prepend(buffer, buflen, "/", 1);
84050+ if (error)
84051+ break;
84052+
84053+ slash = true;
84054+ dentry = parent;
84055+ }
84056+
84057+out:
84058+ if (!error && !slash)
84059+ error = prepend(buffer, buflen, "/", 1);
84060+
84061+ return error;
84062+}
84063+
84064+/* this must be called with mount_lock and rename_lock held */
84065+
84066+static char *__our_d_path(const struct path *path, struct path *root,
84067+ char *buf, int buflen)
84068+{
84069+ char *res = buf + buflen;
84070+ int error;
84071+
84072+ prepend(&res, &buflen, "\0", 1);
84073+ error = prepend_path(path, root, &res, &buflen);
84074+ if (error)
84075+ return ERR_PTR(error);
84076+
84077+ return res;
84078+}
84079+
84080+static char *
84081+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
84082+{
84083+ char *retval;
84084+
84085+ retval = __our_d_path(path, root, buf, buflen);
84086+ if (unlikely(IS_ERR(retval)))
84087+ retval = strcpy(buf, "<path too long>");
84088+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
84089+ retval[1] = '\0';
84090+
84091+ return retval;
84092+}
84093+
84094+static char *
84095+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
84096+ char *buf, int buflen)
84097+{
84098+ struct path path;
84099+ char *res;
84100+
84101+ path.dentry = (struct dentry *)dentry;
84102+ path.mnt = (struct vfsmount *)vfsmnt;
84103+
84104+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
84105+ by the RBAC system */
84106+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
84107+
84108+ return res;
84109+}
84110+
84111+static char *
84112+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
84113+ char *buf, int buflen)
84114+{
84115+ char *res;
84116+ struct path path;
84117+ struct path root;
84118+ struct task_struct *reaper = init_pid_ns.child_reaper;
84119+
84120+ path.dentry = (struct dentry *)dentry;
84121+ path.mnt = (struct vfsmount *)vfsmnt;
84122+
84123+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
84124+ get_fs_root(reaper->fs, &root);
84125+
84126+ read_seqlock_excl(&mount_lock);
84127+ write_seqlock(&rename_lock);
84128+ res = gen_full_path(&path, &root, buf, buflen);
84129+ write_sequnlock(&rename_lock);
84130+ read_sequnlock_excl(&mount_lock);
84131+
84132+ path_put(&root);
84133+ return res;
84134+}
84135+
84136+char *
84137+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
84138+{
84139+ char *ret;
84140+ read_seqlock_excl(&mount_lock);
84141+ write_seqlock(&rename_lock);
84142+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
84143+ PAGE_SIZE);
84144+ write_sequnlock(&rename_lock);
84145+ read_sequnlock_excl(&mount_lock);
84146+ return ret;
84147+}
84148+
84149+static char *
84150+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
84151+{
84152+ char *ret;
84153+ char *buf;
84154+ int buflen;
84155+
84156+ read_seqlock_excl(&mount_lock);
84157+ write_seqlock(&rename_lock);
84158+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
84159+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
84160+ buflen = (int)(ret - buf);
84161+ if (buflen >= 5)
84162+ prepend(&ret, &buflen, "/proc", 5);
84163+ else
84164+ ret = strcpy(buf, "<path too long>");
84165+ write_sequnlock(&rename_lock);
84166+ read_sequnlock_excl(&mount_lock);
84167+ return ret;
84168+}
84169+
84170+char *
84171+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
84172+{
84173+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
84174+ PAGE_SIZE);
84175+}
84176+
84177+char *
84178+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
84179+{
84180+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
84181+ PAGE_SIZE);
84182+}
84183+
84184+char *
84185+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
84186+{
84187+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
84188+ PAGE_SIZE);
84189+}
84190+
84191+char *
84192+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
84193+{
84194+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
84195+ PAGE_SIZE);
84196+}
84197+
84198+char *
84199+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
84200+{
84201+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
84202+ PAGE_SIZE);
84203+}
84204+
84205+__u32
84206+to_gr_audit(const __u32 reqmode)
84207+{
84208+ /* masks off auditable permission flags, then shifts them to create
84209+ auditing flags, and adds the special case of append auditing if
84210+ we're requesting write */
84211+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
84212+}
84213+
84214+struct acl_role_label *
84215+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
84216+ const gid_t gid)
84217+{
84218+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
84219+ struct acl_role_label *match;
84220+ struct role_allowed_ip *ipp;
84221+ unsigned int x;
84222+ u32 curr_ip = task->signal->saved_ip;
84223+
84224+ match = state->acl_role_set.r_hash[index];
84225+
84226+ while (match) {
84227+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
84228+ for (x = 0; x < match->domain_child_num; x++) {
84229+ if (match->domain_children[x] == uid)
84230+ goto found;
84231+ }
84232+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
84233+ break;
84234+ match = match->next;
84235+ }
84236+found:
84237+ if (match == NULL) {
84238+ try_group:
84239+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
84240+ match = state->acl_role_set.r_hash[index];
84241+
84242+ while (match) {
84243+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
84244+ for (x = 0; x < match->domain_child_num; x++) {
84245+ if (match->domain_children[x] == gid)
84246+ goto found2;
84247+ }
84248+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
84249+ break;
84250+ match = match->next;
84251+ }
84252+found2:
84253+ if (match == NULL)
84254+ match = state->default_role;
84255+ if (match->allowed_ips == NULL)
84256+ return match;
84257+ else {
84258+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84259+ if (likely
84260+ ((ntohl(curr_ip) & ipp->netmask) ==
84261+ (ntohl(ipp->addr) & ipp->netmask)))
84262+ return match;
84263+ }
84264+ match = state->default_role;
84265+ }
84266+ } else if (match->allowed_ips == NULL) {
84267+ return match;
84268+ } else {
84269+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84270+ if (likely
84271+ ((ntohl(curr_ip) & ipp->netmask) ==
84272+ (ntohl(ipp->addr) & ipp->netmask)))
84273+ return match;
84274+ }
84275+ goto try_group;
84276+ }
84277+
84278+ return match;
84279+}
84280+
84281+static struct acl_role_label *
84282+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
84283+ const gid_t gid)
84284+{
84285+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
84286+}
84287+
84288+struct acl_subject_label *
84289+lookup_acl_subj_label(const u64 ino, const dev_t dev,
84290+ const struct acl_role_label *role)
84291+{
84292+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84293+ struct acl_subject_label *match;
84294+
84295+ match = role->subj_hash[index];
84296+
84297+ while (match && (match->inode != ino || match->device != dev ||
84298+ (match->mode & GR_DELETED))) {
84299+ match = match->next;
84300+ }
84301+
84302+ if (match && !(match->mode & GR_DELETED))
84303+ return match;
84304+ else
84305+ return NULL;
84306+}
84307+
84308+struct acl_subject_label *
84309+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
84310+ const struct acl_role_label *role)
84311+{
84312+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84313+ struct acl_subject_label *match;
84314+
84315+ match = role->subj_hash[index];
84316+
84317+ while (match && (match->inode != ino || match->device != dev ||
84318+ !(match->mode & GR_DELETED))) {
84319+ match = match->next;
84320+ }
84321+
84322+ if (match && (match->mode & GR_DELETED))
84323+ return match;
84324+ else
84325+ return NULL;
84326+}
84327+
84328+static struct acl_object_label *
84329+lookup_acl_obj_label(const u64 ino, const dev_t dev,
84330+ const struct acl_subject_label *subj)
84331+{
84332+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84333+ struct acl_object_label *match;
84334+
84335+ match = subj->obj_hash[index];
84336+
84337+ while (match && (match->inode != ino || match->device != dev ||
84338+ (match->mode & GR_DELETED))) {
84339+ match = match->next;
84340+ }
84341+
84342+ if (match && !(match->mode & GR_DELETED))
84343+ return match;
84344+ else
84345+ return NULL;
84346+}
84347+
84348+static struct acl_object_label *
84349+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
84350+ const struct acl_subject_label *subj)
84351+{
84352+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84353+ struct acl_object_label *match;
84354+
84355+ match = subj->obj_hash[index];
84356+
84357+ while (match && (match->inode != ino || match->device != dev ||
84358+ !(match->mode & GR_DELETED))) {
84359+ match = match->next;
84360+ }
84361+
84362+ if (match && (match->mode & GR_DELETED))
84363+ return match;
84364+
84365+ match = subj->obj_hash[index];
84366+
84367+ while (match && (match->inode != ino || match->device != dev ||
84368+ (match->mode & GR_DELETED))) {
84369+ match = match->next;
84370+ }
84371+
84372+ if (match && !(match->mode & GR_DELETED))
84373+ return match;
84374+ else
84375+ return NULL;
84376+}
84377+
84378+struct name_entry *
84379+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
84380+{
84381+ unsigned int len = strlen(name);
84382+ unsigned int key = full_name_hash(name, len);
84383+ unsigned int index = key % state->name_set.n_size;
84384+ struct name_entry *match;
84385+
84386+ match = state->name_set.n_hash[index];
84387+
84388+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
84389+ match = match->next;
84390+
84391+ return match;
84392+}
84393+
84394+static struct name_entry *
84395+lookup_name_entry(const char *name)
84396+{
84397+ return __lookup_name_entry(&running_polstate, name);
84398+}
84399+
84400+static struct name_entry *
84401+lookup_name_entry_create(const char *name)
84402+{
84403+ unsigned int len = strlen(name);
84404+ unsigned int key = full_name_hash(name, len);
84405+ unsigned int index = key % running_polstate.name_set.n_size;
84406+ struct name_entry *match;
84407+
84408+ match = running_polstate.name_set.n_hash[index];
84409+
84410+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84411+ !match->deleted))
84412+ match = match->next;
84413+
84414+ if (match && match->deleted)
84415+ return match;
84416+
84417+ match = running_polstate.name_set.n_hash[index];
84418+
84419+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84420+ match->deleted))
84421+ match = match->next;
84422+
84423+ if (match && !match->deleted)
84424+ return match;
84425+ else
84426+ return NULL;
84427+}
84428+
84429+static struct inodev_entry *
84430+lookup_inodev_entry(const u64 ino, const dev_t dev)
84431+{
84432+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
84433+ struct inodev_entry *match;
84434+
84435+ match = running_polstate.inodev_set.i_hash[index];
84436+
84437+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
84438+ match = match->next;
84439+
84440+ return match;
84441+}
84442+
84443+void
84444+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
84445+{
84446+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
84447+ state->inodev_set.i_size);
84448+ struct inodev_entry **curr;
84449+
84450+ entry->prev = NULL;
84451+
84452+ curr = &state->inodev_set.i_hash[index];
84453+ if (*curr != NULL)
84454+ (*curr)->prev = entry;
84455+
84456+ entry->next = *curr;
84457+ *curr = entry;
84458+
84459+ return;
84460+}
84461+
84462+static void
84463+insert_inodev_entry(struct inodev_entry *entry)
84464+{
84465+ __insert_inodev_entry(&running_polstate, entry);
84466+}
84467+
84468+void
84469+insert_acl_obj_label(struct acl_object_label *obj,
84470+ struct acl_subject_label *subj)
84471+{
84472+ unsigned int index =
84473+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
84474+ struct acl_object_label **curr;
84475+
84476+ obj->prev = NULL;
84477+
84478+ curr = &subj->obj_hash[index];
84479+ if (*curr != NULL)
84480+ (*curr)->prev = obj;
84481+
84482+ obj->next = *curr;
84483+ *curr = obj;
84484+
84485+ return;
84486+}
84487+
84488+void
84489+insert_acl_subj_label(struct acl_subject_label *obj,
84490+ struct acl_role_label *role)
84491+{
84492+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
84493+ struct acl_subject_label **curr;
84494+
84495+ obj->prev = NULL;
84496+
84497+ curr = &role->subj_hash[index];
84498+ if (*curr != NULL)
84499+ (*curr)->prev = obj;
84500+
84501+ obj->next = *curr;
84502+ *curr = obj;
84503+
84504+ return;
84505+}
84506+
84507+/* derived from glibc fnmatch() 0: match, 1: no match*/
84508+
84509+static int
84510+glob_match(const char *p, const char *n)
84511+{
84512+ char c;
84513+
84514+ while ((c = *p++) != '\0') {
84515+ switch (c) {
84516+ case '?':
84517+ if (*n == '\0')
84518+ return 1;
84519+ else if (*n == '/')
84520+ return 1;
84521+ break;
84522+ case '\\':
84523+ if (*n != c)
84524+ return 1;
84525+ break;
84526+ case '*':
84527+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
84528+ if (*n == '/')
84529+ return 1;
84530+ else if (c == '?') {
84531+ if (*n == '\0')
84532+ return 1;
84533+ else
84534+ ++n;
84535+ }
84536+ }
84537+ if (c == '\0') {
84538+ return 0;
84539+ } else {
84540+ const char *endp;
84541+
84542+ if ((endp = strchr(n, '/')) == NULL)
84543+ endp = n + strlen(n);
84544+
84545+ if (c == '[') {
84546+ for (--p; n < endp; ++n)
84547+ if (!glob_match(p, n))
84548+ return 0;
84549+ } else if (c == '/') {
84550+ while (*n != '\0' && *n != '/')
84551+ ++n;
84552+ if (*n == '/' && !glob_match(p, n + 1))
84553+ return 0;
84554+ } else {
84555+ for (--p; n < endp; ++n)
84556+ if (*n == c && !glob_match(p, n))
84557+ return 0;
84558+ }
84559+
84560+ return 1;
84561+ }
84562+ case '[':
84563+ {
84564+ int not;
84565+ char cold;
84566+
84567+ if (*n == '\0' || *n == '/')
84568+ return 1;
84569+
84570+ not = (*p == '!' || *p == '^');
84571+ if (not)
84572+ ++p;
84573+
84574+ c = *p++;
84575+ for (;;) {
84576+ unsigned char fn = (unsigned char)*n;
84577+
84578+ if (c == '\0')
84579+ return 1;
84580+ else {
84581+ if (c == fn)
84582+ goto matched;
84583+ cold = c;
84584+ c = *p++;
84585+
84586+ if (c == '-' && *p != ']') {
84587+ unsigned char cend = *p++;
84588+
84589+ if (cend == '\0')
84590+ return 1;
84591+
84592+ if (cold <= fn && fn <= cend)
84593+ goto matched;
84594+
84595+ c = *p++;
84596+ }
84597+ }
84598+
84599+ if (c == ']')
84600+ break;
84601+ }
84602+ if (!not)
84603+ return 1;
84604+ break;
84605+ matched:
84606+ while (c != ']') {
84607+ if (c == '\0')
84608+ return 1;
84609+
84610+ c = *p++;
84611+ }
84612+ if (not)
84613+ return 1;
84614+ }
84615+ break;
84616+ default:
84617+ if (c != *n)
84618+ return 1;
84619+ }
84620+
84621+ ++n;
84622+ }
84623+
84624+ if (*n == '\0')
84625+ return 0;
84626+
84627+ if (*n == '/')
84628+ return 0;
84629+
84630+ return 1;
84631+}
84632+
84633+static struct acl_object_label *
84634+chk_glob_label(struct acl_object_label *globbed,
84635+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
84636+{
84637+ struct acl_object_label *tmp;
84638+
84639+ if (*path == NULL)
84640+ *path = gr_to_filename_nolock(dentry, mnt);
84641+
84642+ tmp = globbed;
84643+
84644+ while (tmp) {
84645+ if (!glob_match(tmp->filename, *path))
84646+ return tmp;
84647+ tmp = tmp->next;
84648+ }
84649+
84650+ return NULL;
84651+}
84652+
84653+static struct acl_object_label *
84654+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84655+ const u64 curr_ino, const dev_t curr_dev,
84656+ const struct acl_subject_label *subj, char **path, const int checkglob)
84657+{
84658+ struct acl_subject_label *tmpsubj;
84659+ struct acl_object_label *retval;
84660+ struct acl_object_label *retval2;
84661+
84662+ tmpsubj = (struct acl_subject_label *) subj;
84663+ read_lock(&gr_inode_lock);
84664+ do {
84665+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
84666+ if (retval) {
84667+ if (checkglob && retval->globbed) {
84668+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
84669+ if (retval2)
84670+ retval = retval2;
84671+ }
84672+ break;
84673+ }
84674+ } while ((tmpsubj = tmpsubj->parent_subject));
84675+ read_unlock(&gr_inode_lock);
84676+
84677+ return retval;
84678+}
84679+
84680+static struct acl_object_label *
84681+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84682+ struct dentry *curr_dentry,
84683+ const struct acl_subject_label *subj, char **path, const int checkglob)
84684+{
84685+ int newglob = checkglob;
84686+ u64 inode;
84687+ dev_t device;
84688+
84689+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
84690+ as we don't want a / * rule to match instead of the / object
84691+ don't do this for create lookups that call this function though, since they're looking up
84692+ on the parent and thus need globbing checks on all paths
84693+ */
84694+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
84695+ newglob = GR_NO_GLOB;
84696+
84697+ spin_lock(&curr_dentry->d_lock);
84698+ inode = __get_ino(curr_dentry);
84699+ device = __get_dev(curr_dentry);
84700+ spin_unlock(&curr_dentry->d_lock);
84701+
84702+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
84703+}
84704+
84705+#ifdef CONFIG_HUGETLBFS
84706+static inline bool
84707+is_hugetlbfs_mnt(const struct vfsmount *mnt)
84708+{
84709+ int i;
84710+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
84711+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
84712+ return true;
84713+ }
84714+
84715+ return false;
84716+}
84717+#endif
84718+
84719+static struct acl_object_label *
84720+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84721+ const struct acl_subject_label *subj, char *path, const int checkglob)
84722+{
84723+ struct dentry *dentry = (struct dentry *) l_dentry;
84724+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84725+ struct inode * inode = d_backing_inode(dentry);
84726+ struct mount *real_mnt = real_mount(mnt);
84727+ struct acl_object_label *retval;
84728+ struct dentry *parent;
84729+
84730+ read_seqlock_excl(&mount_lock);
84731+ write_seqlock(&rename_lock);
84732+
84733+ if (unlikely((mnt == shm_mnt && inode->i_nlink == 0) || mnt == pipe_mnt ||
84734+#ifdef CONFIG_NET
84735+ mnt == sock_mnt ||
84736+#endif
84737+#ifdef CONFIG_HUGETLBFS
84738+ (is_hugetlbfs_mnt(mnt) && inode->i_nlink == 0) ||
84739+#endif
84740+ /* ignore Eric Biederman */
84741+ IS_PRIVATE(inode))) {
84742+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
84743+ goto out;
84744+ }
84745+
84746+ for (;;) {
84747+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84748+ break;
84749+
84750+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84751+ if (!mnt_has_parent(real_mnt))
84752+ break;
84753+
84754+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84755+ if (retval != NULL)
84756+ goto out;
84757+
84758+ dentry = real_mnt->mnt_mountpoint;
84759+ real_mnt = real_mnt->mnt_parent;
84760+ mnt = &real_mnt->mnt;
84761+ continue;
84762+ }
84763+
84764+ parent = dentry->d_parent;
84765+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84766+ if (retval != NULL)
84767+ goto out;
84768+
84769+ dentry = parent;
84770+ }
84771+
84772+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84773+
84774+ /* gr_real_root is pinned so we don't have to hold a reference */
84775+ if (retval == NULL)
84776+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
84777+out:
84778+ write_sequnlock(&rename_lock);
84779+ read_sequnlock_excl(&mount_lock);
84780+
84781+ BUG_ON(retval == NULL);
84782+
84783+ return retval;
84784+}
84785+
84786+static struct acl_object_label *
84787+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84788+ const struct acl_subject_label *subj)
84789+{
84790+ char *path = NULL;
84791+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
84792+}
84793+
84794+static struct acl_object_label *
84795+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84796+ const struct acl_subject_label *subj)
84797+{
84798+ char *path = NULL;
84799+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
84800+}
84801+
84802+static struct acl_object_label *
84803+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84804+ const struct acl_subject_label *subj, char *path)
84805+{
84806+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
84807+}
84808+
84809+struct acl_subject_label *
84810+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84811+ const struct acl_role_label *role)
84812+{
84813+ struct dentry *dentry = (struct dentry *) l_dentry;
84814+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84815+ struct mount *real_mnt = real_mount(mnt);
84816+ struct acl_subject_label *retval;
84817+ struct dentry *parent;
84818+
84819+ read_seqlock_excl(&mount_lock);
84820+ write_seqlock(&rename_lock);
84821+
84822+ for (;;) {
84823+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84824+ break;
84825+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84826+ if (!mnt_has_parent(real_mnt))
84827+ break;
84828+
84829+ spin_lock(&dentry->d_lock);
84830+ read_lock(&gr_inode_lock);
84831+ retval =
84832+ lookup_acl_subj_label(__get_ino(dentry),
84833+ __get_dev(dentry), role);
84834+ read_unlock(&gr_inode_lock);
84835+ spin_unlock(&dentry->d_lock);
84836+ if (retval != NULL)
84837+ goto out;
84838+
84839+ dentry = real_mnt->mnt_mountpoint;
84840+ real_mnt = real_mnt->mnt_parent;
84841+ mnt = &real_mnt->mnt;
84842+ continue;
84843+ }
84844+
84845+ spin_lock(&dentry->d_lock);
84846+ read_lock(&gr_inode_lock);
84847+ retval = lookup_acl_subj_label(__get_ino(dentry),
84848+ __get_dev(dentry), role);
84849+ read_unlock(&gr_inode_lock);
84850+ parent = dentry->d_parent;
84851+ spin_unlock(&dentry->d_lock);
84852+
84853+ if (retval != NULL)
84854+ goto out;
84855+
84856+ dentry = parent;
84857+ }
84858+
84859+ spin_lock(&dentry->d_lock);
84860+ read_lock(&gr_inode_lock);
84861+ retval = lookup_acl_subj_label(__get_ino(dentry),
84862+ __get_dev(dentry), role);
84863+ read_unlock(&gr_inode_lock);
84864+ spin_unlock(&dentry->d_lock);
84865+
84866+ if (unlikely(retval == NULL)) {
84867+ /* gr_real_root is pinned, we don't need to hold a reference */
84868+ read_lock(&gr_inode_lock);
84869+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
84870+ __get_dev(gr_real_root.dentry), role);
84871+ read_unlock(&gr_inode_lock);
84872+ }
84873+out:
84874+ write_sequnlock(&rename_lock);
84875+ read_sequnlock_excl(&mount_lock);
84876+
84877+ BUG_ON(retval == NULL);
84878+
84879+ return retval;
84880+}
84881+
84882+void
84883+assign_special_role(const char *rolename)
84884+{
84885+ struct acl_object_label *obj;
84886+ struct acl_role_label *r;
84887+ struct acl_role_label *assigned = NULL;
84888+ struct task_struct *tsk;
84889+ struct file *filp;
84890+
84891+ FOR_EACH_ROLE_START(r)
84892+ if (!strcmp(rolename, r->rolename) &&
84893+ (r->roletype & GR_ROLE_SPECIAL)) {
84894+ assigned = r;
84895+ break;
84896+ }
84897+ FOR_EACH_ROLE_END(r)
84898+
84899+ if (!assigned)
84900+ return;
84901+
84902+ read_lock(&tasklist_lock);
84903+ read_lock(&grsec_exec_file_lock);
84904+
84905+ tsk = current->real_parent;
84906+ if (tsk == NULL)
84907+ goto out_unlock;
84908+
84909+ filp = tsk->exec_file;
84910+ if (filp == NULL)
84911+ goto out_unlock;
84912+
84913+ tsk->is_writable = 0;
84914+ tsk->inherited = 0;
84915+
84916+ tsk->acl_sp_role = 1;
84917+ tsk->acl_role_id = ++acl_sp_role_value;
84918+ tsk->role = assigned;
84919+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
84920+
84921+ /* ignore additional mmap checks for processes that are writable
84922+ by the default ACL */
84923+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
84924+ if (unlikely(obj->mode & GR_WRITE))
84925+ tsk->is_writable = 1;
84926+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
84927+ if (unlikely(obj->mode & GR_WRITE))
84928+ tsk->is_writable = 1;
84929+
84930+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84931+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
84932+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
84933+#endif
84934+
84935+out_unlock:
84936+ read_unlock(&grsec_exec_file_lock);
84937+ read_unlock(&tasklist_lock);
84938+ return;
84939+}
84940+
84941+
84942+static void
84943+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
84944+{
84945+ struct task_struct *task = current;
84946+ const struct cred *cred = current_cred();
84947+
84948+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
84949+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84950+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84951+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
84952+
84953+ return;
84954+}
84955+
84956+static void
84957+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
84958+{
84959+ struct task_struct *task = current;
84960+ const struct cred *cred = current_cred();
84961+
84962+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84963+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84964+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84965+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
84966+
84967+ return;
84968+}
84969+
84970+static void
84971+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
84972+{
84973+ struct task_struct *task = current;
84974+ const struct cred *cred = current_cred();
84975+
84976+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84977+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84978+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84979+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
84980+
84981+ return;
84982+}
84983+
84984+static void
84985+gr_set_proc_res(struct task_struct *task)
84986+{
84987+ struct acl_subject_label *proc;
84988+ unsigned short i;
84989+
84990+ proc = task->acl;
84991+
84992+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
84993+ return;
84994+
84995+ for (i = 0; i < RLIM_NLIMITS; i++) {
84996+ unsigned long rlim_cur, rlim_max;
84997+
84998+ if (!(proc->resmask & (1U << i)))
84999+ continue;
85000+
85001+ rlim_cur = proc->res[i].rlim_cur;
85002+ rlim_max = proc->res[i].rlim_max;
85003+
85004+ if (i == RLIMIT_NOFILE) {
85005+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
85006+ if (rlim_cur > saved_sysctl_nr_open)
85007+ rlim_cur = saved_sysctl_nr_open;
85008+ if (rlim_max > saved_sysctl_nr_open)
85009+ rlim_max = saved_sysctl_nr_open;
85010+ }
85011+
85012+ task->signal->rlim[i].rlim_cur = rlim_cur;
85013+ task->signal->rlim[i].rlim_max = rlim_max;
85014+
85015+ if (i == RLIMIT_CPU)
85016+ update_rlimit_cpu(task, rlim_cur);
85017+ }
85018+
85019+ return;
85020+}
85021+
85022+/* both of the below must be called with
85023+ rcu_read_lock();
85024+ read_lock(&tasklist_lock);
85025+ read_lock(&grsec_exec_file_lock);
85026+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
85027+*/
85028+
85029+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
85030+{
85031+ char *tmpname;
85032+ struct acl_subject_label *tmpsubj;
85033+ struct file *filp;
85034+ struct name_entry *nmatch;
85035+
85036+ filp = task->exec_file;
85037+ if (filp == NULL)
85038+ return NULL;
85039+
85040+ /* the following is to apply the correct subject
85041+ on binaries running when the RBAC system
85042+ is enabled, when the binaries have been
85043+ replaced or deleted since their execution
85044+ -----
85045+ when the RBAC system starts, the inode/dev
85046+ from exec_file will be one the RBAC system
85047+ is unaware of. It only knows the inode/dev
85048+ of the present file on disk, or the absence
85049+ of it.
85050+ */
85051+
85052+ if (filename)
85053+ nmatch = __lookup_name_entry(state, filename);
85054+ else {
85055+ preempt_disable();
85056+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
85057+
85058+ nmatch = __lookup_name_entry(state, tmpname);
85059+ preempt_enable();
85060+ }
85061+ tmpsubj = NULL;
85062+ if (nmatch) {
85063+ if (nmatch->deleted)
85064+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
85065+ else
85066+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
85067+ }
85068+ /* this also works for the reload case -- if we don't match a potentially inherited subject
85069+ then we fall back to a normal lookup based on the binary's ino/dev
85070+ */
85071+ if (tmpsubj == NULL && fallback)
85072+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
85073+
85074+ return tmpsubj;
85075+}
85076+
85077+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
85078+{
85079+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
85080+}
85081+
85082+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
85083+{
85084+ struct acl_object_label *obj;
85085+ struct file *filp;
85086+
85087+ filp = task->exec_file;
85088+
85089+ task->acl = subj;
85090+ task->is_writable = 0;
85091+ /* ignore additional mmap checks for processes that are writable
85092+ by the default ACL */
85093+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
85094+ if (unlikely(obj->mode & GR_WRITE))
85095+ task->is_writable = 1;
85096+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85097+ if (unlikely(obj->mode & GR_WRITE))
85098+ task->is_writable = 1;
85099+
85100+ gr_set_proc_res(task);
85101+
85102+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85103+ 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);
85104+#endif
85105+}
85106+
85107+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
85108+{
85109+ __gr_apply_subject_to_task(&running_polstate, task, subj);
85110+}
85111+
85112+__u32
85113+gr_search_file(const struct dentry * dentry, const __u32 mode,
85114+ const struct vfsmount * mnt)
85115+{
85116+ __u32 retval = mode;
85117+ struct acl_subject_label *curracl;
85118+ struct acl_object_label *currobj;
85119+
85120+ if (unlikely(!(gr_status & GR_READY)))
85121+ return (mode & ~GR_AUDITS);
85122+
85123+ curracl = current->acl;
85124+
85125+ currobj = chk_obj_label(dentry, mnt, curracl);
85126+ retval = currobj->mode & mode;
85127+
85128+ /* if we're opening a specified transfer file for writing
85129+ (e.g. /dev/initctl), then transfer our role to init
85130+ */
85131+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
85132+ current->role->roletype & GR_ROLE_PERSIST)) {
85133+ struct task_struct *task = init_pid_ns.child_reaper;
85134+
85135+ if (task->role != current->role) {
85136+ struct acl_subject_label *subj;
85137+
85138+ task->acl_sp_role = 0;
85139+ task->acl_role_id = current->acl_role_id;
85140+ task->role = current->role;
85141+ rcu_read_lock();
85142+ read_lock(&grsec_exec_file_lock);
85143+ subj = gr_get_subject_for_task(task, NULL, 1);
85144+ gr_apply_subject_to_task(task, subj);
85145+ read_unlock(&grsec_exec_file_lock);
85146+ rcu_read_unlock();
85147+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
85148+ }
85149+ }
85150+
85151+ if (unlikely
85152+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
85153+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
85154+ __u32 new_mode = mode;
85155+
85156+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85157+
85158+ retval = new_mode;
85159+
85160+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
85161+ new_mode |= GR_INHERIT;
85162+
85163+ if (!(mode & GR_NOLEARN))
85164+ gr_log_learn(dentry, mnt, new_mode);
85165+ }
85166+
85167+ return retval;
85168+}
85169+
85170+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
85171+ const struct dentry *parent,
85172+ const struct vfsmount *mnt)
85173+{
85174+ struct name_entry *match;
85175+ struct acl_object_label *matchpo;
85176+ struct acl_subject_label *curracl;
85177+ char *path;
85178+
85179+ if (unlikely(!(gr_status & GR_READY)))
85180+ return NULL;
85181+
85182+ preempt_disable();
85183+ path = gr_to_filename_rbac(new_dentry, mnt);
85184+ match = lookup_name_entry_create(path);
85185+
85186+ curracl = current->acl;
85187+
85188+ if (match) {
85189+ read_lock(&gr_inode_lock);
85190+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
85191+ read_unlock(&gr_inode_lock);
85192+
85193+ if (matchpo) {
85194+ preempt_enable();
85195+ return matchpo;
85196+ }
85197+ }
85198+
85199+ // lookup parent
85200+
85201+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
85202+
85203+ preempt_enable();
85204+ return matchpo;
85205+}
85206+
85207+__u32
85208+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
85209+ const struct vfsmount * mnt, const __u32 mode)
85210+{
85211+ struct acl_object_label *matchpo;
85212+ __u32 retval;
85213+
85214+ if (unlikely(!(gr_status & GR_READY)))
85215+ return (mode & ~GR_AUDITS);
85216+
85217+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
85218+
85219+ retval = matchpo->mode & mode;
85220+
85221+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
85222+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85223+ __u32 new_mode = mode;
85224+
85225+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85226+
85227+ gr_log_learn(new_dentry, mnt, new_mode);
85228+ return new_mode;
85229+ }
85230+
85231+ return retval;
85232+}
85233+
85234+__u32
85235+gr_check_link(const struct dentry * new_dentry,
85236+ const struct dentry * parent_dentry,
85237+ const struct vfsmount * parent_mnt,
85238+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
85239+{
85240+ struct acl_object_label *obj;
85241+ __u32 oldmode, newmode;
85242+ __u32 needmode;
85243+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
85244+ GR_DELETE | GR_INHERIT;
85245+
85246+ if (unlikely(!(gr_status & GR_READY)))
85247+ return (GR_CREATE | GR_LINK);
85248+
85249+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
85250+ oldmode = obj->mode;
85251+
85252+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
85253+ newmode = obj->mode;
85254+
85255+ needmode = newmode & checkmodes;
85256+
85257+ // old name for hardlink must have at least the permissions of the new name
85258+ if ((oldmode & needmode) != needmode)
85259+ goto bad;
85260+
85261+ // if old name had restrictions/auditing, make sure the new name does as well
85262+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
85263+
85264+ // don't allow hardlinking of suid/sgid/fcapped files without permission
85265+ if (is_privileged_binary(old_dentry))
85266+ needmode |= GR_SETID;
85267+
85268+ if ((newmode & needmode) != needmode)
85269+ goto bad;
85270+
85271+ // enforce minimum permissions
85272+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
85273+ return newmode;
85274+bad:
85275+ needmode = oldmode;
85276+ if (is_privileged_binary(old_dentry))
85277+ needmode |= GR_SETID;
85278+
85279+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
85280+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
85281+ return (GR_CREATE | GR_LINK);
85282+ } else if (newmode & GR_SUPPRESS)
85283+ return GR_SUPPRESS;
85284+ else
85285+ return 0;
85286+}
85287+
85288+int
85289+gr_check_hidden_task(const struct task_struct *task)
85290+{
85291+ if (unlikely(!(gr_status & GR_READY)))
85292+ return 0;
85293+
85294+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
85295+ return 1;
85296+
85297+ return 0;
85298+}
85299+
85300+int
85301+gr_check_protected_task(const struct task_struct *task)
85302+{
85303+ if (unlikely(!(gr_status & GR_READY) || !task))
85304+ return 0;
85305+
85306+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85307+ task->acl != current->acl)
85308+ return 1;
85309+
85310+ return 0;
85311+}
85312+
85313+int
85314+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
85315+{
85316+ struct task_struct *p;
85317+ int ret = 0;
85318+
85319+ if (unlikely(!(gr_status & GR_READY) || !pid))
85320+ return ret;
85321+
85322+ read_lock(&tasklist_lock);
85323+ do_each_pid_task(pid, type, p) {
85324+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85325+ p->acl != current->acl) {
85326+ ret = 1;
85327+ goto out;
85328+ }
85329+ } while_each_pid_task(pid, type, p);
85330+out:
85331+ read_unlock(&tasklist_lock);
85332+
85333+ return ret;
85334+}
85335+
85336+void
85337+gr_copy_label(struct task_struct *tsk)
85338+{
85339+ struct task_struct *p = current;
85340+
85341+ tsk->inherited = p->inherited;
85342+ tsk->acl_sp_role = 0;
85343+ tsk->acl_role_id = p->acl_role_id;
85344+ tsk->acl = p->acl;
85345+ tsk->role = p->role;
85346+ tsk->signal->used_accept = 0;
85347+ tsk->signal->curr_ip = p->signal->curr_ip;
85348+ tsk->signal->saved_ip = p->signal->saved_ip;
85349+ if (p->exec_file)
85350+ get_file(p->exec_file);
85351+ tsk->exec_file = p->exec_file;
85352+ tsk->is_writable = p->is_writable;
85353+ if (unlikely(p->signal->used_accept)) {
85354+ p->signal->curr_ip = 0;
85355+ p->signal->saved_ip = 0;
85356+ }
85357+
85358+ return;
85359+}
85360+
85361+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
85362+
85363+int
85364+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85365+{
85366+ unsigned int i;
85367+ __u16 num;
85368+ uid_t *uidlist;
85369+ uid_t curuid;
85370+ int realok = 0;
85371+ int effectiveok = 0;
85372+ int fsok = 0;
85373+ uid_t globalreal, globaleffective, globalfs;
85374+
85375+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
85376+ struct user_struct *user;
85377+
85378+ if (!uid_valid(real))
85379+ goto skipit;
85380+
85381+ /* find user based on global namespace */
85382+
85383+ globalreal = GR_GLOBAL_UID(real);
85384+
85385+ user = find_user(make_kuid(&init_user_ns, globalreal));
85386+ if (user == NULL)
85387+ goto skipit;
85388+
85389+ if (gr_process_kernel_setuid_ban(user)) {
85390+ /* for find_user */
85391+ free_uid(user);
85392+ return 1;
85393+ }
85394+
85395+ /* for find_user */
85396+ free_uid(user);
85397+
85398+skipit:
85399+#endif
85400+
85401+ if (unlikely(!(gr_status & GR_READY)))
85402+ return 0;
85403+
85404+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85405+ gr_log_learn_uid_change(real, effective, fs);
85406+
85407+ num = current->acl->user_trans_num;
85408+ uidlist = current->acl->user_transitions;
85409+
85410+ if (uidlist == NULL)
85411+ return 0;
85412+
85413+ if (!uid_valid(real)) {
85414+ realok = 1;
85415+ globalreal = (uid_t)-1;
85416+ } else {
85417+ globalreal = GR_GLOBAL_UID(real);
85418+ }
85419+ if (!uid_valid(effective)) {
85420+ effectiveok = 1;
85421+ globaleffective = (uid_t)-1;
85422+ } else {
85423+ globaleffective = GR_GLOBAL_UID(effective);
85424+ }
85425+ if (!uid_valid(fs)) {
85426+ fsok = 1;
85427+ globalfs = (uid_t)-1;
85428+ } else {
85429+ globalfs = GR_GLOBAL_UID(fs);
85430+ }
85431+
85432+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
85433+ for (i = 0; i < num; i++) {
85434+ curuid = uidlist[i];
85435+ if (globalreal == curuid)
85436+ realok = 1;
85437+ if (globaleffective == curuid)
85438+ effectiveok = 1;
85439+ if (globalfs == curuid)
85440+ fsok = 1;
85441+ }
85442+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
85443+ for (i = 0; i < num; i++) {
85444+ curuid = uidlist[i];
85445+ if (globalreal == curuid)
85446+ break;
85447+ if (globaleffective == curuid)
85448+ break;
85449+ if (globalfs == curuid)
85450+ break;
85451+ }
85452+ /* not in deny list */
85453+ if (i == num) {
85454+ realok = 1;
85455+ effectiveok = 1;
85456+ fsok = 1;
85457+ }
85458+ }
85459+
85460+ if (realok && effectiveok && fsok)
85461+ return 0;
85462+ else {
85463+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85464+ return 1;
85465+ }
85466+}
85467+
85468+int
85469+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85470+{
85471+ unsigned int i;
85472+ __u16 num;
85473+ gid_t *gidlist;
85474+ gid_t curgid;
85475+ int realok = 0;
85476+ int effectiveok = 0;
85477+ int fsok = 0;
85478+ gid_t globalreal, globaleffective, globalfs;
85479+
85480+ if (unlikely(!(gr_status & GR_READY)))
85481+ return 0;
85482+
85483+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85484+ gr_log_learn_gid_change(real, effective, fs);
85485+
85486+ num = current->acl->group_trans_num;
85487+ gidlist = current->acl->group_transitions;
85488+
85489+ if (gidlist == NULL)
85490+ return 0;
85491+
85492+ if (!gid_valid(real)) {
85493+ realok = 1;
85494+ globalreal = (gid_t)-1;
85495+ } else {
85496+ globalreal = GR_GLOBAL_GID(real);
85497+ }
85498+ if (!gid_valid(effective)) {
85499+ effectiveok = 1;
85500+ globaleffective = (gid_t)-1;
85501+ } else {
85502+ globaleffective = GR_GLOBAL_GID(effective);
85503+ }
85504+ if (!gid_valid(fs)) {
85505+ fsok = 1;
85506+ globalfs = (gid_t)-1;
85507+ } else {
85508+ globalfs = GR_GLOBAL_GID(fs);
85509+ }
85510+
85511+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
85512+ for (i = 0; i < num; i++) {
85513+ curgid = gidlist[i];
85514+ if (globalreal == curgid)
85515+ realok = 1;
85516+ if (globaleffective == curgid)
85517+ effectiveok = 1;
85518+ if (globalfs == curgid)
85519+ fsok = 1;
85520+ }
85521+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
85522+ for (i = 0; i < num; i++) {
85523+ curgid = gidlist[i];
85524+ if (globalreal == curgid)
85525+ break;
85526+ if (globaleffective == curgid)
85527+ break;
85528+ if (globalfs == curgid)
85529+ break;
85530+ }
85531+ /* not in deny list */
85532+ if (i == num) {
85533+ realok = 1;
85534+ effectiveok = 1;
85535+ fsok = 1;
85536+ }
85537+ }
85538+
85539+ if (realok && effectiveok && fsok)
85540+ return 0;
85541+ else {
85542+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85543+ return 1;
85544+ }
85545+}
85546+
85547+extern int gr_acl_is_capable(const int cap);
85548+
85549+void
85550+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
85551+{
85552+ struct acl_role_label *role = task->role;
85553+ struct acl_role_label *origrole = role;
85554+ struct acl_subject_label *subj = NULL;
85555+ struct acl_object_label *obj;
85556+ struct file *filp;
85557+ uid_t uid;
85558+ gid_t gid;
85559+
85560+ if (unlikely(!(gr_status & GR_READY)))
85561+ return;
85562+
85563+ uid = GR_GLOBAL_UID(kuid);
85564+ gid = GR_GLOBAL_GID(kgid);
85565+
85566+ filp = task->exec_file;
85567+
85568+ /* kernel process, we'll give them the kernel role */
85569+ if (unlikely(!filp)) {
85570+ task->role = running_polstate.kernel_role;
85571+ task->acl = running_polstate.kernel_role->root_label;
85572+ return;
85573+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
85574+ /* save the current ip at time of role lookup so that the proper
85575+ IP will be learned for role_allowed_ip */
85576+ task->signal->saved_ip = task->signal->curr_ip;
85577+ role = lookup_acl_role_label(task, uid, gid);
85578+ }
85579+
85580+ /* don't change the role if we're not a privileged process */
85581+ if (role && task->role != role &&
85582+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
85583+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
85584+ return;
85585+
85586+ task->role = role;
85587+
85588+ if (task->inherited) {
85589+ /* if we reached our subject through inheritance, then first see
85590+ if there's a subject of the same name in the new role that has
85591+ an object that would result in the same inherited subject
85592+ */
85593+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
85594+ if (subj) {
85595+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
85596+ if (!(obj->mode & GR_INHERIT))
85597+ subj = NULL;
85598+ }
85599+
85600+ }
85601+ if (subj == NULL) {
85602+ /* otherwise:
85603+ perform subject lookup in possibly new role
85604+ we can use this result below in the case where role == task->role
85605+ */
85606+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
85607+ }
85608+
85609+ /* if we changed uid/gid, but result in the same role
85610+ and are using inheritance, don't lose the inherited subject
85611+ if current subject is other than what normal lookup
85612+ would result in, we arrived via inheritance, don't
85613+ lose subject
85614+ */
85615+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
85616+ (subj == task->acl)))
85617+ task->acl = subj;
85618+
85619+ /* leave task->inherited unaffected */
85620+
85621+ task->is_writable = 0;
85622+
85623+ /* ignore additional mmap checks for processes that are writable
85624+ by the default ACL */
85625+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85626+ if (unlikely(obj->mode & GR_WRITE))
85627+ task->is_writable = 1;
85628+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85629+ if (unlikely(obj->mode & GR_WRITE))
85630+ task->is_writable = 1;
85631+
85632+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85633+ 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);
85634+#endif
85635+
85636+ gr_set_proc_res(task);
85637+
85638+ return;
85639+}
85640+
85641+int
85642+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
85643+ const int unsafe_flags)
85644+{
85645+ struct task_struct *task = current;
85646+ struct acl_subject_label *newacl;
85647+ struct acl_object_label *obj;
85648+ __u32 retmode;
85649+
85650+ if (unlikely(!(gr_status & GR_READY)))
85651+ return 0;
85652+
85653+ newacl = chk_subj_label(dentry, mnt, task->role);
85654+
85655+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
85656+ did an exec
85657+ */
85658+ rcu_read_lock();
85659+ read_lock(&tasklist_lock);
85660+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
85661+ (task->parent->acl->mode & GR_POVERRIDE))) {
85662+ read_unlock(&tasklist_lock);
85663+ rcu_read_unlock();
85664+ goto skip_check;
85665+ }
85666+ read_unlock(&tasklist_lock);
85667+ rcu_read_unlock();
85668+
85669+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
85670+ !(task->role->roletype & GR_ROLE_GOD) &&
85671+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
85672+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85673+ if (unsafe_flags & LSM_UNSAFE_SHARE)
85674+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
85675+ else
85676+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
85677+ return -EACCES;
85678+ }
85679+
85680+skip_check:
85681+
85682+ obj = chk_obj_label(dentry, mnt, task->acl);
85683+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
85684+
85685+ if (!(task->acl->mode & GR_INHERITLEARN) &&
85686+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
85687+ if (obj->nested)
85688+ task->acl = obj->nested;
85689+ else
85690+ task->acl = newacl;
85691+ task->inherited = 0;
85692+ } else {
85693+ task->inherited = 1;
85694+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
85695+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
85696+ }
85697+
85698+ task->is_writable = 0;
85699+
85700+ /* ignore additional mmap checks for processes that are writable
85701+ by the default ACL */
85702+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
85703+ if (unlikely(obj->mode & GR_WRITE))
85704+ task->is_writable = 1;
85705+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
85706+ if (unlikely(obj->mode & GR_WRITE))
85707+ task->is_writable = 1;
85708+
85709+ gr_set_proc_res(task);
85710+
85711+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85712+ 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);
85713+#endif
85714+ return 0;
85715+}
85716+
85717+/* always called with valid inodev ptr */
85718+static void
85719+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
85720+{
85721+ struct acl_object_label *matchpo;
85722+ struct acl_subject_label *matchps;
85723+ struct acl_subject_label *subj;
85724+ struct acl_role_label *role;
85725+ unsigned int x;
85726+
85727+ FOR_EACH_ROLE_START(role)
85728+ FOR_EACH_SUBJECT_START(role, subj, x)
85729+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85730+ matchpo->mode |= GR_DELETED;
85731+ FOR_EACH_SUBJECT_END(subj,x)
85732+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85733+ /* nested subjects aren't in the role's subj_hash table */
85734+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85735+ matchpo->mode |= GR_DELETED;
85736+ FOR_EACH_NESTED_SUBJECT_END(subj)
85737+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
85738+ matchps->mode |= GR_DELETED;
85739+ FOR_EACH_ROLE_END(role)
85740+
85741+ inodev->nentry->deleted = 1;
85742+
85743+ return;
85744+}
85745+
85746+void
85747+gr_handle_delete(const u64 ino, const dev_t dev)
85748+{
85749+ struct inodev_entry *inodev;
85750+
85751+ if (unlikely(!(gr_status & GR_READY)))
85752+ return;
85753+
85754+ write_lock(&gr_inode_lock);
85755+ inodev = lookup_inodev_entry(ino, dev);
85756+ if (inodev != NULL)
85757+ do_handle_delete(inodev, ino, dev);
85758+ write_unlock(&gr_inode_lock);
85759+
85760+ return;
85761+}
85762+
85763+static void
85764+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
85765+ const u64 newinode, const dev_t newdevice,
85766+ struct acl_subject_label *subj)
85767+{
85768+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
85769+ struct acl_object_label *match;
85770+
85771+ match = subj->obj_hash[index];
85772+
85773+ while (match && (match->inode != oldinode ||
85774+ match->device != olddevice ||
85775+ !(match->mode & GR_DELETED)))
85776+ match = match->next;
85777+
85778+ if (match && (match->inode == oldinode)
85779+ && (match->device == olddevice)
85780+ && (match->mode & GR_DELETED)) {
85781+ if (match->prev == NULL) {
85782+ subj->obj_hash[index] = match->next;
85783+ if (match->next != NULL)
85784+ match->next->prev = NULL;
85785+ } else {
85786+ match->prev->next = match->next;
85787+ if (match->next != NULL)
85788+ match->next->prev = match->prev;
85789+ }
85790+ match->prev = NULL;
85791+ match->next = NULL;
85792+ match->inode = newinode;
85793+ match->device = newdevice;
85794+ match->mode &= ~GR_DELETED;
85795+
85796+ insert_acl_obj_label(match, subj);
85797+ }
85798+
85799+ return;
85800+}
85801+
85802+static void
85803+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
85804+ const u64 newinode, const dev_t newdevice,
85805+ struct acl_role_label *role)
85806+{
85807+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
85808+ struct acl_subject_label *match;
85809+
85810+ match = role->subj_hash[index];
85811+
85812+ while (match && (match->inode != oldinode ||
85813+ match->device != olddevice ||
85814+ !(match->mode & GR_DELETED)))
85815+ match = match->next;
85816+
85817+ if (match && (match->inode == oldinode)
85818+ && (match->device == olddevice)
85819+ && (match->mode & GR_DELETED)) {
85820+ if (match->prev == NULL) {
85821+ role->subj_hash[index] = match->next;
85822+ if (match->next != NULL)
85823+ match->next->prev = NULL;
85824+ } else {
85825+ match->prev->next = match->next;
85826+ if (match->next != NULL)
85827+ match->next->prev = match->prev;
85828+ }
85829+ match->prev = NULL;
85830+ match->next = NULL;
85831+ match->inode = newinode;
85832+ match->device = newdevice;
85833+ match->mode &= ~GR_DELETED;
85834+
85835+ insert_acl_subj_label(match, role);
85836+ }
85837+
85838+ return;
85839+}
85840+
85841+static void
85842+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
85843+ const u64 newinode, const dev_t newdevice)
85844+{
85845+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
85846+ struct inodev_entry *match;
85847+
85848+ match = running_polstate.inodev_set.i_hash[index];
85849+
85850+ while (match && (match->nentry->inode != oldinode ||
85851+ match->nentry->device != olddevice || !match->nentry->deleted))
85852+ match = match->next;
85853+
85854+ if (match && (match->nentry->inode == oldinode)
85855+ && (match->nentry->device == olddevice) &&
85856+ match->nentry->deleted) {
85857+ if (match->prev == NULL) {
85858+ running_polstate.inodev_set.i_hash[index] = match->next;
85859+ if (match->next != NULL)
85860+ match->next->prev = NULL;
85861+ } else {
85862+ match->prev->next = match->next;
85863+ if (match->next != NULL)
85864+ match->next->prev = match->prev;
85865+ }
85866+ match->prev = NULL;
85867+ match->next = NULL;
85868+ match->nentry->inode = newinode;
85869+ match->nentry->device = newdevice;
85870+ match->nentry->deleted = 0;
85871+
85872+ insert_inodev_entry(match);
85873+ }
85874+
85875+ return;
85876+}
85877+
85878+static void
85879+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
85880+{
85881+ struct acl_subject_label *subj;
85882+ struct acl_role_label *role;
85883+ unsigned int x;
85884+
85885+ FOR_EACH_ROLE_START(role)
85886+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
85887+
85888+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85889+ if ((subj->inode == ino) && (subj->device == dev)) {
85890+ subj->inode = ino;
85891+ subj->device = dev;
85892+ }
85893+ /* nested subjects aren't in the role's subj_hash table */
85894+ update_acl_obj_label(matchn->inode, matchn->device,
85895+ ino, dev, subj);
85896+ FOR_EACH_NESTED_SUBJECT_END(subj)
85897+ FOR_EACH_SUBJECT_START(role, subj, x)
85898+ update_acl_obj_label(matchn->inode, matchn->device,
85899+ ino, dev, subj);
85900+ FOR_EACH_SUBJECT_END(subj,x)
85901+ FOR_EACH_ROLE_END(role)
85902+
85903+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
85904+
85905+ return;
85906+}
85907+
85908+static void
85909+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
85910+ const struct vfsmount *mnt)
85911+{
85912+ u64 ino = __get_ino(dentry);
85913+ dev_t dev = __get_dev(dentry);
85914+
85915+ __do_handle_create(matchn, ino, dev);
85916+
85917+ return;
85918+}
85919+
85920+void
85921+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
85922+{
85923+ struct name_entry *matchn;
85924+
85925+ if (unlikely(!(gr_status & GR_READY)))
85926+ return;
85927+
85928+ preempt_disable();
85929+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
85930+
85931+ if (unlikely((unsigned long)matchn)) {
85932+ write_lock(&gr_inode_lock);
85933+ do_handle_create(matchn, dentry, mnt);
85934+ write_unlock(&gr_inode_lock);
85935+ }
85936+ preempt_enable();
85937+
85938+ return;
85939+}
85940+
85941+void
85942+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
85943+{
85944+ struct name_entry *matchn;
85945+
85946+ if (unlikely(!(gr_status & GR_READY)))
85947+ return;
85948+
85949+ preempt_disable();
85950+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
85951+
85952+ if (unlikely((unsigned long)matchn)) {
85953+ write_lock(&gr_inode_lock);
85954+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
85955+ write_unlock(&gr_inode_lock);
85956+ }
85957+ preempt_enable();
85958+
85959+ return;
85960+}
85961+
85962+void
85963+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
85964+ struct dentry *old_dentry,
85965+ struct dentry *new_dentry,
85966+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
85967+{
85968+ struct name_entry *matchn;
85969+ struct name_entry *matchn2 = NULL;
85970+ struct inodev_entry *inodev;
85971+ struct inode *inode = d_backing_inode(new_dentry);
85972+ struct inode *old_inode = d_backing_inode(old_dentry);
85973+ u64 old_ino = __get_ino(old_dentry);
85974+ dev_t old_dev = __get_dev(old_dentry);
85975+ unsigned int exchange = flags & RENAME_EXCHANGE;
85976+
85977+ /* vfs_rename swaps the name and parent link for old_dentry and
85978+ new_dentry
85979+ at this point, old_dentry has the new name, parent link, and inode
85980+ for the renamed file
85981+ if a file is being replaced by a rename, new_dentry has the inode
85982+ and name for the replaced file
85983+ */
85984+
85985+ if (unlikely(!(gr_status & GR_READY)))
85986+ return;
85987+
85988+ preempt_disable();
85989+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
85990+
85991+ /* exchange cases:
85992+ a filename exists for the source, but not dest
85993+ do a recreate on source
85994+ a filename exists for the dest, but not source
85995+ do a recreate on dest
85996+ a filename exists for both source and dest
85997+ delete source and dest, then create source and dest
85998+ a filename exists for neither source nor dest
85999+ no updates needed
86000+
86001+ the name entry lookups get us the old inode/dev associated with
86002+ each name, so do the deletes first (if possible) so that when
86003+ we do the create, we pick up on the right entries
86004+ */
86005+
86006+ if (exchange)
86007+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
86008+
86009+ /* we wouldn't have to check d_inode if it weren't for
86010+ NFS silly-renaming
86011+ */
86012+
86013+ write_lock(&gr_inode_lock);
86014+ if (unlikely((replace || exchange) && inode)) {
86015+ u64 new_ino = __get_ino(new_dentry);
86016+ dev_t new_dev = __get_dev(new_dentry);
86017+
86018+ inodev = lookup_inodev_entry(new_ino, new_dev);
86019+ if (inodev != NULL && ((inode->i_nlink <= 1) || d_is_dir(new_dentry)))
86020+ do_handle_delete(inodev, new_ino, new_dev);
86021+ }
86022+
86023+ inodev = lookup_inodev_entry(old_ino, old_dev);
86024+ if (inodev != NULL && ((old_inode->i_nlink <= 1) || d_is_dir(old_dentry)))
86025+ do_handle_delete(inodev, old_ino, old_dev);
86026+
86027+ if (unlikely(matchn != NULL))
86028+ do_handle_create(matchn, old_dentry, mnt);
86029+
86030+ if (unlikely(matchn2 != NULL))
86031+ do_handle_create(matchn2, new_dentry, mnt);
86032+
86033+ write_unlock(&gr_inode_lock);
86034+ preempt_enable();
86035+
86036+ return;
86037+}
86038+
86039+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
86040+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
86041+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
86042+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
86043+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
86044+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
86045+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
86046+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
86047+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
86048+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
86049+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
86050+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
86051+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
86052+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
86053+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
86054+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
86055+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
86056+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
86057+};
86058+
86059+void
86060+gr_learn_resource(const struct task_struct *task,
86061+ const int res, const unsigned long wanted, const int gt)
86062+{
86063+ struct acl_subject_label *acl;
86064+ const struct cred *cred;
86065+
86066+ if (unlikely((gr_status & GR_READY) &&
86067+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
86068+ goto skip_reslog;
86069+
86070+ gr_log_resource(task, res, wanted, gt);
86071+skip_reslog:
86072+
86073+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
86074+ return;
86075+
86076+ acl = task->acl;
86077+
86078+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
86079+ !(acl->resmask & (1U << (unsigned short) res))))
86080+ return;
86081+
86082+ if (wanted >= acl->res[res].rlim_cur) {
86083+ unsigned long res_add;
86084+
86085+ res_add = wanted + res_learn_bumps[res];
86086+
86087+ acl->res[res].rlim_cur = res_add;
86088+
86089+ if (wanted > acl->res[res].rlim_max)
86090+ acl->res[res].rlim_max = res_add;
86091+
86092+ /* only log the subject filename, since resource logging is supported for
86093+ single-subject learning only */
86094+ rcu_read_lock();
86095+ cred = __task_cred(task);
86096+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86097+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
86098+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
86099+ "", (unsigned long) res, &task->signal->saved_ip);
86100+ rcu_read_unlock();
86101+ }
86102+
86103+ return;
86104+}
86105+EXPORT_SYMBOL_GPL(gr_learn_resource);
86106+#endif
86107+
86108+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
86109+void
86110+pax_set_initial_flags(struct linux_binprm *bprm)
86111+{
86112+ struct task_struct *task = current;
86113+ struct acl_subject_label *proc;
86114+ unsigned long flags;
86115+
86116+ if (unlikely(!(gr_status & GR_READY)))
86117+ return;
86118+
86119+ flags = pax_get_flags(task);
86120+
86121+ proc = task->acl;
86122+
86123+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
86124+ flags &= ~MF_PAX_PAGEEXEC;
86125+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
86126+ flags &= ~MF_PAX_SEGMEXEC;
86127+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
86128+ flags &= ~MF_PAX_RANDMMAP;
86129+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
86130+ flags &= ~MF_PAX_EMUTRAMP;
86131+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
86132+ flags &= ~MF_PAX_MPROTECT;
86133+
86134+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
86135+ flags |= MF_PAX_PAGEEXEC;
86136+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
86137+ flags |= MF_PAX_SEGMEXEC;
86138+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
86139+ flags |= MF_PAX_RANDMMAP;
86140+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
86141+ flags |= MF_PAX_EMUTRAMP;
86142+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
86143+ flags |= MF_PAX_MPROTECT;
86144+
86145+ pax_set_flags(task, flags);
86146+
86147+ return;
86148+}
86149+#endif
86150+
86151+int
86152+gr_handle_proc_ptrace(struct task_struct *task)
86153+{
86154+ struct file *filp;
86155+ struct task_struct *tmp = task;
86156+ struct task_struct *curtemp = current;
86157+ __u32 retmode;
86158+
86159+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86160+ if (unlikely(!(gr_status & GR_READY)))
86161+ return 0;
86162+#endif
86163+
86164+ read_lock(&tasklist_lock);
86165+ read_lock(&grsec_exec_file_lock);
86166+ filp = task->exec_file;
86167+
86168+ while (task_pid_nr(tmp) > 0) {
86169+ if (tmp == curtemp)
86170+ break;
86171+ tmp = tmp->real_parent;
86172+ }
86173+
86174+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86175+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
86176+ read_unlock(&grsec_exec_file_lock);
86177+ read_unlock(&tasklist_lock);
86178+ return 1;
86179+ }
86180+
86181+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86182+ if (!(gr_status & GR_READY)) {
86183+ read_unlock(&grsec_exec_file_lock);
86184+ read_unlock(&tasklist_lock);
86185+ return 0;
86186+ }
86187+#endif
86188+
86189+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
86190+ read_unlock(&grsec_exec_file_lock);
86191+ read_unlock(&tasklist_lock);
86192+
86193+ if (retmode & GR_NOPTRACE)
86194+ return 1;
86195+
86196+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
86197+ && (current->acl != task->acl || (current->acl != current->role->root_label
86198+ && task_pid_nr(current) != task_pid_nr(task))))
86199+ return 1;
86200+
86201+ return 0;
86202+}
86203+
86204+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
86205+{
86206+ if (unlikely(!(gr_status & GR_READY)))
86207+ return;
86208+
86209+ if (!(current->role->roletype & GR_ROLE_GOD))
86210+ return;
86211+
86212+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
86213+ p->role->rolename, gr_task_roletype_to_char(p),
86214+ p->acl->filename);
86215+}
86216+
86217+int
86218+gr_handle_ptrace(struct task_struct *task, const long request)
86219+{
86220+ struct task_struct *tmp = task;
86221+ struct task_struct *curtemp = current;
86222+ __u32 retmode;
86223+
86224+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86225+ if (unlikely(!(gr_status & GR_READY)))
86226+ return 0;
86227+#endif
86228+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
86229+ read_lock(&tasklist_lock);
86230+ while (task_pid_nr(tmp) > 0) {
86231+ if (tmp == curtemp)
86232+ break;
86233+ tmp = tmp->real_parent;
86234+ }
86235+
86236+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86237+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
86238+ read_unlock(&tasklist_lock);
86239+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86240+ return 1;
86241+ }
86242+ read_unlock(&tasklist_lock);
86243+ }
86244+
86245+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86246+ if (!(gr_status & GR_READY))
86247+ return 0;
86248+#endif
86249+
86250+ read_lock(&grsec_exec_file_lock);
86251+ if (unlikely(!task->exec_file)) {
86252+ read_unlock(&grsec_exec_file_lock);
86253+ return 0;
86254+ }
86255+
86256+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
86257+ read_unlock(&grsec_exec_file_lock);
86258+
86259+ if (retmode & GR_NOPTRACE) {
86260+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86261+ return 1;
86262+ }
86263+
86264+ if (retmode & GR_PTRACERD) {
86265+ switch (request) {
86266+ case PTRACE_SEIZE:
86267+ case PTRACE_POKETEXT:
86268+ case PTRACE_POKEDATA:
86269+ case PTRACE_POKEUSR:
86270+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
86271+ case PTRACE_SETREGS:
86272+ case PTRACE_SETFPREGS:
86273+#endif
86274+#ifdef CONFIG_X86
86275+ case PTRACE_SETFPXREGS:
86276+#endif
86277+#ifdef CONFIG_ALTIVEC
86278+ case PTRACE_SETVRREGS:
86279+#endif
86280+ return 1;
86281+ default:
86282+ return 0;
86283+ }
86284+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
86285+ !(current->role->roletype & GR_ROLE_GOD) &&
86286+ (current->acl != task->acl)) {
86287+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86288+ return 1;
86289+ }
86290+
86291+ return 0;
86292+}
86293+
86294+static int is_writable_mmap(const struct file *filp)
86295+{
86296+ struct task_struct *task = current;
86297+ struct acl_object_label *obj, *obj2;
86298+ struct dentry *dentry = filp->f_path.dentry;
86299+ struct vfsmount *mnt = filp->f_path.mnt;
86300+ struct inode *inode = d_backing_inode(dentry);
86301+
86302+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
86303+ !task->is_writable && d_is_reg(dentry) && (mnt != shm_mnt || (inode->i_nlink > 0))) {
86304+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
86305+ obj2 = chk_obj_label(dentry, mnt, task->role->root_label);
86306+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
86307+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, dentry, mnt);
86308+ return 1;
86309+ }
86310+ }
86311+ return 0;
86312+}
86313+
86314+int
86315+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
86316+{
86317+ __u32 mode;
86318+
86319+ if (unlikely(!file || !(prot & PROT_EXEC)))
86320+ return 1;
86321+
86322+ if (is_writable_mmap(file))
86323+ return 0;
86324+
86325+ mode =
86326+ gr_search_file(file->f_path.dentry,
86327+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86328+ file->f_path.mnt);
86329+
86330+ if (!gr_tpe_allow(file))
86331+ return 0;
86332+
86333+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86334+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86335+ return 0;
86336+ } else if (unlikely(!(mode & GR_EXEC))) {
86337+ return 0;
86338+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86339+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86340+ return 1;
86341+ }
86342+
86343+ return 1;
86344+}
86345+
86346+int
86347+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
86348+{
86349+ __u32 mode;
86350+
86351+ if (unlikely(!file || !(prot & PROT_EXEC)))
86352+ return 1;
86353+
86354+ if (is_writable_mmap(file))
86355+ return 0;
86356+
86357+ mode =
86358+ gr_search_file(file->f_path.dentry,
86359+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86360+ file->f_path.mnt);
86361+
86362+ if (!gr_tpe_allow(file))
86363+ return 0;
86364+
86365+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86366+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86367+ return 0;
86368+ } else if (unlikely(!(mode & GR_EXEC))) {
86369+ return 0;
86370+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86371+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86372+ return 1;
86373+ }
86374+
86375+ return 1;
86376+}
86377+
86378+void
86379+gr_acl_handle_psacct(struct task_struct *task, const long code)
86380+{
86381+ unsigned long runtime, cputime;
86382+ cputime_t utime, stime;
86383+ unsigned int wday, cday;
86384+ __u8 whr, chr;
86385+ __u8 wmin, cmin;
86386+ __u8 wsec, csec;
86387+ struct timespec curtime, starttime;
86388+
86389+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
86390+ !(task->acl->mode & GR_PROCACCT)))
86391+ return;
86392+
86393+ curtime = ns_to_timespec(ktime_get_ns());
86394+ starttime = ns_to_timespec(task->start_time);
86395+ runtime = curtime.tv_sec - starttime.tv_sec;
86396+ wday = runtime / (60 * 60 * 24);
86397+ runtime -= wday * (60 * 60 * 24);
86398+ whr = runtime / (60 * 60);
86399+ runtime -= whr * (60 * 60);
86400+ wmin = runtime / 60;
86401+ runtime -= wmin * 60;
86402+ wsec = runtime;
86403+
86404+ task_cputime(task, &utime, &stime);
86405+ cputime = cputime_to_secs(utime + stime);
86406+ cday = cputime / (60 * 60 * 24);
86407+ cputime -= cday * (60 * 60 * 24);
86408+ chr = cputime / (60 * 60);
86409+ cputime -= chr * (60 * 60);
86410+ cmin = cputime / 60;
86411+ cputime -= cmin * 60;
86412+ csec = cputime;
86413+
86414+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
86415+
86416+ return;
86417+}
86418+
86419+#ifdef CONFIG_TASKSTATS
86420+int gr_is_taskstats_denied(int pid)
86421+{
86422+ struct task_struct *task;
86423+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86424+ const struct cred *cred;
86425+#endif
86426+ int ret = 0;
86427+
86428+ /* restrict taskstats viewing to un-chrooted root users
86429+ who have the 'view' subject flag if the RBAC system is enabled
86430+ */
86431+
86432+ rcu_read_lock();
86433+ read_lock(&tasklist_lock);
86434+ task = find_task_by_vpid(pid);
86435+ if (task) {
86436+#ifdef CONFIG_GRKERNSEC_CHROOT
86437+ if (proc_is_chrooted(task))
86438+ ret = -EACCES;
86439+#endif
86440+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86441+ cred = __task_cred(task);
86442+#ifdef CONFIG_GRKERNSEC_PROC_USER
86443+ if (gr_is_global_nonroot(cred->uid))
86444+ ret = -EACCES;
86445+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86446+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
86447+ ret = -EACCES;
86448+#endif
86449+#endif
86450+ if (gr_status & GR_READY) {
86451+ if (!(task->acl->mode & GR_VIEW))
86452+ ret = -EACCES;
86453+ }
86454+ } else
86455+ ret = -ENOENT;
86456+
86457+ read_unlock(&tasklist_lock);
86458+ rcu_read_unlock();
86459+
86460+ return ret;
86461+}
86462+#endif
86463+
86464+/* AUXV entries are filled via a descendant of search_binary_handler
86465+ after we've already applied the subject for the target
86466+*/
86467+int gr_acl_enable_at_secure(void)
86468+{
86469+ if (unlikely(!(gr_status & GR_READY)))
86470+ return 0;
86471+
86472+ if (current->acl->mode & GR_ATSECURE)
86473+ return 1;
86474+
86475+ return 0;
86476+}
86477+
86478+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
86479+{
86480+ struct task_struct *task = current;
86481+ struct dentry *dentry = file->f_path.dentry;
86482+ struct vfsmount *mnt = file->f_path.mnt;
86483+ struct acl_object_label *obj, *tmp;
86484+ struct acl_subject_label *subj;
86485+ unsigned int bufsize;
86486+ int is_not_root;
86487+ char *path;
86488+ dev_t dev = __get_dev(dentry);
86489+
86490+ if (unlikely(!(gr_status & GR_READY)))
86491+ return 1;
86492+
86493+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
86494+ return 1;
86495+
86496+ /* ignore Eric Biederman */
86497+ if (IS_PRIVATE(d_backing_inode(dentry)))
86498+ return 1;
86499+
86500+ subj = task->acl;
86501+ read_lock(&gr_inode_lock);
86502+ do {
86503+ obj = lookup_acl_obj_label(ino, dev, subj);
86504+ if (obj != NULL) {
86505+ read_unlock(&gr_inode_lock);
86506+ return (obj->mode & GR_FIND) ? 1 : 0;
86507+ }
86508+ } while ((subj = subj->parent_subject));
86509+ read_unlock(&gr_inode_lock);
86510+
86511+ /* this is purely an optimization since we're looking for an object
86512+ for the directory we're doing a readdir on
86513+ if it's possible for any globbed object to match the entry we're
86514+ filling into the directory, then the object we find here will be
86515+ an anchor point with attached globbed objects
86516+ */
86517+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
86518+ if (obj->globbed == NULL)
86519+ return (obj->mode & GR_FIND) ? 1 : 0;
86520+
86521+ is_not_root = ((obj->filename[0] == '/') &&
86522+ (obj->filename[1] == '\0')) ? 0 : 1;
86523+ bufsize = PAGE_SIZE - namelen - is_not_root;
86524+
86525+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
86526+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
86527+ return 1;
86528+
86529+ preempt_disable();
86530+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
86531+ bufsize);
86532+
86533+ bufsize = strlen(path);
86534+
86535+ /* if base is "/", don't append an additional slash */
86536+ if (is_not_root)
86537+ *(path + bufsize) = '/';
86538+ memcpy(path + bufsize + is_not_root, name, namelen);
86539+ *(path + bufsize + namelen + is_not_root) = '\0';
86540+
86541+ tmp = obj->globbed;
86542+ while (tmp) {
86543+ if (!glob_match(tmp->filename, path)) {
86544+ preempt_enable();
86545+ return (tmp->mode & GR_FIND) ? 1 : 0;
86546+ }
86547+ tmp = tmp->next;
86548+ }
86549+ preempt_enable();
86550+ return (obj->mode & GR_FIND) ? 1 : 0;
86551+}
86552+
86553+void gr_put_exec_file(struct task_struct *task)
86554+{
86555+ struct file *filp;
86556+
86557+ write_lock(&grsec_exec_file_lock);
86558+ filp = task->exec_file;
86559+ task->exec_file = NULL;
86560+ write_unlock(&grsec_exec_file_lock);
86561+
86562+ if (filp)
86563+ fput(filp);
86564+
86565+ return;
86566+}
86567+
86568+
86569+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
86570+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
86571+#endif
86572+#ifdef CONFIG_SECURITY
86573+EXPORT_SYMBOL_GPL(gr_check_user_change);
86574+EXPORT_SYMBOL_GPL(gr_check_group_change);
86575+#endif
86576+
86577diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
86578new file mode 100644
86579index 0000000..9adc75c
86580--- /dev/null
86581+++ b/grsecurity/gracl_alloc.c
86582@@ -0,0 +1,105 @@
86583+#include <linux/kernel.h>
86584+#include <linux/mm.h>
86585+#include <linux/slab.h>
86586+#include <linux/vmalloc.h>
86587+#include <linux/gracl.h>
86588+#include <linux/grsecurity.h>
86589+
86590+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
86591+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
86592+
86593+static int
86594+alloc_pop(void)
86595+{
86596+ if (current_alloc_state->alloc_stack_next == 1)
86597+ return 0;
86598+
86599+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
86600+
86601+ current_alloc_state->alloc_stack_next--;
86602+
86603+ return 1;
86604+}
86605+
86606+static int
86607+alloc_push(void *buf)
86608+{
86609+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
86610+ return 1;
86611+
86612+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
86613+
86614+ current_alloc_state->alloc_stack_next++;
86615+
86616+ return 0;
86617+}
86618+
86619+void *
86620+acl_alloc(unsigned long len)
86621+{
86622+ void *ret = NULL;
86623+
86624+ if (!len || len > PAGE_SIZE)
86625+ goto out;
86626+
86627+ ret = kmalloc(len, GFP_KERNEL);
86628+
86629+ if (ret) {
86630+ if (alloc_push(ret)) {
86631+ kfree(ret);
86632+ ret = NULL;
86633+ }
86634+ }
86635+
86636+out:
86637+ return ret;
86638+}
86639+
86640+void *
86641+acl_alloc_num(unsigned long num, unsigned long len)
86642+{
86643+ if (!len || (num > (PAGE_SIZE / len)))
86644+ return NULL;
86645+
86646+ return acl_alloc(num * len);
86647+}
86648+
86649+void
86650+acl_free_all(void)
86651+{
86652+ if (!current_alloc_state->alloc_stack)
86653+ return;
86654+
86655+ while (alloc_pop()) ;
86656+
86657+ if (current_alloc_state->alloc_stack) {
86658+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
86659+ kfree(current_alloc_state->alloc_stack);
86660+ else
86661+ vfree(current_alloc_state->alloc_stack);
86662+ }
86663+
86664+ current_alloc_state->alloc_stack = NULL;
86665+ current_alloc_state->alloc_stack_size = 1;
86666+ current_alloc_state->alloc_stack_next = 1;
86667+
86668+ return;
86669+}
86670+
86671+int
86672+acl_alloc_stack_init(unsigned long size)
86673+{
86674+ if ((size * sizeof (void *)) <= PAGE_SIZE)
86675+ current_alloc_state->alloc_stack =
86676+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
86677+ else
86678+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
86679+
86680+ current_alloc_state->alloc_stack_size = size;
86681+ current_alloc_state->alloc_stack_next = 1;
86682+
86683+ if (!current_alloc_state->alloc_stack)
86684+ return 0;
86685+ else
86686+ return 1;
86687+}
86688diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
86689new file mode 100644
86690index 0000000..1a94c11
86691--- /dev/null
86692+++ b/grsecurity/gracl_cap.c
86693@@ -0,0 +1,127 @@
86694+#include <linux/kernel.h>
86695+#include <linux/module.h>
86696+#include <linux/sched.h>
86697+#include <linux/gracl.h>
86698+#include <linux/grsecurity.h>
86699+#include <linux/grinternal.h>
86700+
86701+extern const char *captab_log[];
86702+extern int captab_log_entries;
86703+
86704+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
86705+{
86706+ struct acl_subject_label *curracl;
86707+
86708+ if (!gr_acl_is_enabled())
86709+ return 1;
86710+
86711+ curracl = task->acl;
86712+
86713+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
86714+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86715+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
86716+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
86717+ gr_to_filename(task->exec_file->f_path.dentry,
86718+ task->exec_file->f_path.mnt) : curracl->filename,
86719+ curracl->filename, 0UL,
86720+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
86721+ return 1;
86722+ }
86723+
86724+ return 0;
86725+}
86726+
86727+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
86728+{
86729+ struct acl_subject_label *curracl;
86730+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86731+ kernel_cap_t cap_audit = __cap_empty_set;
86732+
86733+ if (!gr_acl_is_enabled())
86734+ return 1;
86735+
86736+ curracl = task->acl;
86737+
86738+ cap_drop = curracl->cap_lower;
86739+ cap_mask = curracl->cap_mask;
86740+ cap_audit = curracl->cap_invert_audit;
86741+
86742+ while ((curracl = curracl->parent_subject)) {
86743+ /* if the cap isn't specified in the current computed mask but is specified in the
86744+ current level subject, and is lowered in the current level subject, then add
86745+ it to the set of dropped capabilities
86746+ otherwise, add the current level subject's mask to the current computed mask
86747+ */
86748+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86749+ cap_raise(cap_mask, cap);
86750+ if (cap_raised(curracl->cap_lower, cap))
86751+ cap_raise(cap_drop, cap);
86752+ if (cap_raised(curracl->cap_invert_audit, cap))
86753+ cap_raise(cap_audit, cap);
86754+ }
86755+ }
86756+
86757+ if (!cap_raised(cap_drop, cap)) {
86758+ if (cap_raised(cap_audit, cap))
86759+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
86760+ return 1;
86761+ }
86762+
86763+ /* only learn the capability use if the process has the capability in the
86764+ general case, the two uses in sys.c of gr_learn_cap are an exception
86765+ to this rule to ensure any role transition involves what the full-learned
86766+ policy believes in a privileged process
86767+ */
86768+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
86769+ return 1;
86770+
86771+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
86772+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
86773+
86774+ return 0;
86775+}
86776+
86777+int
86778+gr_acl_is_capable(const int cap)
86779+{
86780+ return gr_task_acl_is_capable(current, current_cred(), cap);
86781+}
86782+
86783+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
86784+{
86785+ struct acl_subject_label *curracl;
86786+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86787+
86788+ if (!gr_acl_is_enabled())
86789+ return 1;
86790+
86791+ curracl = task->acl;
86792+
86793+ cap_drop = curracl->cap_lower;
86794+ cap_mask = curracl->cap_mask;
86795+
86796+ while ((curracl = curracl->parent_subject)) {
86797+ /* if the cap isn't specified in the current computed mask but is specified in the
86798+ current level subject, and is lowered in the current level subject, then add
86799+ it to the set of dropped capabilities
86800+ otherwise, add the current level subject's mask to the current computed mask
86801+ */
86802+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86803+ cap_raise(cap_mask, cap);
86804+ if (cap_raised(curracl->cap_lower, cap))
86805+ cap_raise(cap_drop, cap);
86806+ }
86807+ }
86808+
86809+ if (!cap_raised(cap_drop, cap))
86810+ return 1;
86811+
86812+ return 0;
86813+}
86814+
86815+int
86816+gr_acl_is_capable_nolog(const int cap)
86817+{
86818+ return gr_task_acl_is_capable_nolog(current, cap);
86819+}
86820+
86821diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
86822new file mode 100644
86823index 0000000..a43dd06
86824--- /dev/null
86825+++ b/grsecurity/gracl_compat.c
86826@@ -0,0 +1,269 @@
86827+#include <linux/kernel.h>
86828+#include <linux/gracl.h>
86829+#include <linux/compat.h>
86830+#include <linux/gracl_compat.h>
86831+
86832+#include <asm/uaccess.h>
86833+
86834+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
86835+{
86836+ struct gr_arg_wrapper_compat uwrapcompat;
86837+
86838+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
86839+ return -EFAULT;
86840+
86841+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
86842+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
86843+ return -EINVAL;
86844+
86845+ uwrap->arg = compat_ptr(uwrapcompat.arg);
86846+ uwrap->version = uwrapcompat.version;
86847+ uwrap->size = sizeof(struct gr_arg);
86848+
86849+ return 0;
86850+}
86851+
86852+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
86853+{
86854+ struct gr_arg_compat argcompat;
86855+
86856+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
86857+ return -EFAULT;
86858+
86859+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
86860+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
86861+ arg->role_db.num_roles = argcompat.role_db.num_roles;
86862+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
86863+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
86864+ arg->role_db.num_objects = argcompat.role_db.num_objects;
86865+
86866+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
86867+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
86868+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
86869+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
86870+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
86871+ arg->segv_device = argcompat.segv_device;
86872+ arg->segv_inode = argcompat.segv_inode;
86873+ arg->segv_uid = argcompat.segv_uid;
86874+ arg->num_sprole_pws = argcompat.num_sprole_pws;
86875+ arg->mode = argcompat.mode;
86876+
86877+ return 0;
86878+}
86879+
86880+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
86881+{
86882+ struct acl_object_label_compat objcompat;
86883+
86884+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
86885+ return -EFAULT;
86886+
86887+ obj->filename = compat_ptr(objcompat.filename);
86888+ obj->inode = objcompat.inode;
86889+ obj->device = objcompat.device;
86890+ obj->mode = objcompat.mode;
86891+
86892+ obj->nested = compat_ptr(objcompat.nested);
86893+ obj->globbed = compat_ptr(objcompat.globbed);
86894+
86895+ obj->prev = compat_ptr(objcompat.prev);
86896+ obj->next = compat_ptr(objcompat.next);
86897+
86898+ return 0;
86899+}
86900+
86901+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
86902+{
86903+ unsigned int i;
86904+ struct acl_subject_label_compat subjcompat;
86905+
86906+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
86907+ return -EFAULT;
86908+
86909+ subj->filename = compat_ptr(subjcompat.filename);
86910+ subj->inode = subjcompat.inode;
86911+ subj->device = subjcompat.device;
86912+ subj->mode = subjcompat.mode;
86913+ subj->cap_mask = subjcompat.cap_mask;
86914+ subj->cap_lower = subjcompat.cap_lower;
86915+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
86916+
86917+ for (i = 0; i < GR_NLIMITS; i++) {
86918+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
86919+ subj->res[i].rlim_cur = RLIM_INFINITY;
86920+ else
86921+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
86922+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
86923+ subj->res[i].rlim_max = RLIM_INFINITY;
86924+ else
86925+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
86926+ }
86927+ subj->resmask = subjcompat.resmask;
86928+
86929+ subj->user_trans_type = subjcompat.user_trans_type;
86930+ subj->group_trans_type = subjcompat.group_trans_type;
86931+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
86932+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
86933+ subj->user_trans_num = subjcompat.user_trans_num;
86934+ subj->group_trans_num = subjcompat.group_trans_num;
86935+
86936+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
86937+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
86938+ subj->ip_type = subjcompat.ip_type;
86939+ subj->ips = compat_ptr(subjcompat.ips);
86940+ subj->ip_num = subjcompat.ip_num;
86941+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
86942+
86943+ subj->crashes = subjcompat.crashes;
86944+ subj->expires = subjcompat.expires;
86945+
86946+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
86947+ subj->hash = compat_ptr(subjcompat.hash);
86948+ subj->prev = compat_ptr(subjcompat.prev);
86949+ subj->next = compat_ptr(subjcompat.next);
86950+
86951+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
86952+ subj->obj_hash_size = subjcompat.obj_hash_size;
86953+ subj->pax_flags = subjcompat.pax_flags;
86954+
86955+ return 0;
86956+}
86957+
86958+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
86959+{
86960+ struct acl_role_label_compat rolecompat;
86961+
86962+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
86963+ return -EFAULT;
86964+
86965+ role->rolename = compat_ptr(rolecompat.rolename);
86966+ role->uidgid = rolecompat.uidgid;
86967+ role->roletype = rolecompat.roletype;
86968+
86969+ role->auth_attempts = rolecompat.auth_attempts;
86970+ role->expires = rolecompat.expires;
86971+
86972+ role->root_label = compat_ptr(rolecompat.root_label);
86973+ role->hash = compat_ptr(rolecompat.hash);
86974+
86975+ role->prev = compat_ptr(rolecompat.prev);
86976+ role->next = compat_ptr(rolecompat.next);
86977+
86978+ role->transitions = compat_ptr(rolecompat.transitions);
86979+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
86980+ role->domain_children = compat_ptr(rolecompat.domain_children);
86981+ role->domain_child_num = rolecompat.domain_child_num;
86982+
86983+ role->umask = rolecompat.umask;
86984+
86985+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
86986+ role->subj_hash_size = rolecompat.subj_hash_size;
86987+
86988+ return 0;
86989+}
86990+
86991+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
86992+{
86993+ struct role_allowed_ip_compat roleip_compat;
86994+
86995+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
86996+ return -EFAULT;
86997+
86998+ roleip->addr = roleip_compat.addr;
86999+ roleip->netmask = roleip_compat.netmask;
87000+
87001+ roleip->prev = compat_ptr(roleip_compat.prev);
87002+ roleip->next = compat_ptr(roleip_compat.next);
87003+
87004+ return 0;
87005+}
87006+
87007+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
87008+{
87009+ struct role_transition_compat trans_compat;
87010+
87011+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
87012+ return -EFAULT;
87013+
87014+ trans->rolename = compat_ptr(trans_compat.rolename);
87015+
87016+ trans->prev = compat_ptr(trans_compat.prev);
87017+ trans->next = compat_ptr(trans_compat.next);
87018+
87019+ return 0;
87020+
87021+}
87022+
87023+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
87024+{
87025+ struct gr_hash_struct_compat hash_compat;
87026+
87027+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
87028+ return -EFAULT;
87029+
87030+ hash->table = compat_ptr(hash_compat.table);
87031+ hash->nametable = compat_ptr(hash_compat.nametable);
87032+ hash->first = compat_ptr(hash_compat.first);
87033+
87034+ hash->table_size = hash_compat.table_size;
87035+ hash->used_size = hash_compat.used_size;
87036+
87037+ hash->type = hash_compat.type;
87038+
87039+ return 0;
87040+}
87041+
87042+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
87043+{
87044+ compat_uptr_t ptrcompat;
87045+
87046+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
87047+ return -EFAULT;
87048+
87049+ *(void **)ptr = compat_ptr(ptrcompat);
87050+
87051+ return 0;
87052+}
87053+
87054+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
87055+{
87056+ struct acl_ip_label_compat ip_compat;
87057+
87058+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
87059+ return -EFAULT;
87060+
87061+ ip->iface = compat_ptr(ip_compat.iface);
87062+ ip->addr = ip_compat.addr;
87063+ ip->netmask = ip_compat.netmask;
87064+ ip->low = ip_compat.low;
87065+ ip->high = ip_compat.high;
87066+ ip->mode = ip_compat.mode;
87067+ ip->type = ip_compat.type;
87068+
87069+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
87070+
87071+ ip->prev = compat_ptr(ip_compat.prev);
87072+ ip->next = compat_ptr(ip_compat.next);
87073+
87074+ return 0;
87075+}
87076+
87077+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
87078+{
87079+ struct sprole_pw_compat pw_compat;
87080+
87081+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
87082+ return -EFAULT;
87083+
87084+ pw->rolename = compat_ptr(pw_compat.rolename);
87085+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
87086+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
87087+
87088+ return 0;
87089+}
87090+
87091+size_t get_gr_arg_wrapper_size_compat(void)
87092+{
87093+ return sizeof(struct gr_arg_wrapper_compat);
87094+}
87095+
87096diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
87097new file mode 100644
87098index 0000000..fce7f71
87099--- /dev/null
87100+++ b/grsecurity/gracl_fs.c
87101@@ -0,0 +1,448 @@
87102+#include <linux/kernel.h>
87103+#include <linux/sched.h>
87104+#include <linux/types.h>
87105+#include <linux/fs.h>
87106+#include <linux/file.h>
87107+#include <linux/stat.h>
87108+#include <linux/grsecurity.h>
87109+#include <linux/grinternal.h>
87110+#include <linux/gracl.h>
87111+
87112+umode_t
87113+gr_acl_umask(void)
87114+{
87115+ if (unlikely(!gr_acl_is_enabled()))
87116+ return 0;
87117+
87118+ return current->role->umask;
87119+}
87120+
87121+__u32
87122+gr_acl_handle_hidden_file(const struct dentry * dentry,
87123+ const struct vfsmount * mnt)
87124+{
87125+ __u32 mode;
87126+
87127+ if (unlikely(d_is_negative(dentry)))
87128+ return GR_FIND;
87129+
87130+ mode =
87131+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
87132+
87133+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
87134+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
87135+ return mode;
87136+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
87137+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
87138+ return 0;
87139+ } else if (unlikely(!(mode & GR_FIND)))
87140+ return 0;
87141+
87142+ return GR_FIND;
87143+}
87144+
87145+__u32
87146+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
87147+ int acc_mode)
87148+{
87149+ __u32 reqmode = GR_FIND;
87150+ __u32 mode;
87151+
87152+ if (unlikely(d_is_negative(dentry)))
87153+ return reqmode;
87154+
87155+ if (acc_mode & MAY_APPEND)
87156+ reqmode |= GR_APPEND;
87157+ else if (acc_mode & MAY_WRITE)
87158+ reqmode |= GR_WRITE;
87159+ if ((acc_mode & MAY_READ) && !d_is_dir(dentry))
87160+ reqmode |= GR_READ;
87161+
87162+ mode =
87163+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87164+ mnt);
87165+
87166+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87167+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87168+ reqmode & GR_READ ? " reading" : "",
87169+ reqmode & GR_WRITE ? " writing" : reqmode &
87170+ GR_APPEND ? " appending" : "");
87171+ return reqmode;
87172+ } else
87173+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87174+ {
87175+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87176+ reqmode & GR_READ ? " reading" : "",
87177+ reqmode & GR_WRITE ? " writing" : reqmode &
87178+ GR_APPEND ? " appending" : "");
87179+ return 0;
87180+ } else if (unlikely((mode & reqmode) != reqmode))
87181+ return 0;
87182+
87183+ return reqmode;
87184+}
87185+
87186+__u32
87187+gr_acl_handle_creat(const struct dentry * dentry,
87188+ const struct dentry * p_dentry,
87189+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
87190+ const int imode)
87191+{
87192+ __u32 reqmode = GR_WRITE | GR_CREATE;
87193+ __u32 mode;
87194+
87195+ if (acc_mode & MAY_APPEND)
87196+ reqmode |= GR_APPEND;
87197+ // if a directory was required or the directory already exists, then
87198+ // don't count this open as a read
87199+ if ((acc_mode & MAY_READ) &&
87200+ !((open_flags & O_DIRECTORY) || d_is_dir(dentry)))
87201+ reqmode |= GR_READ;
87202+ if ((open_flags & O_CREAT) &&
87203+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87204+ reqmode |= GR_SETID;
87205+
87206+ mode =
87207+ gr_check_create(dentry, p_dentry, p_mnt,
87208+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87209+
87210+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87211+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87212+ reqmode & GR_READ ? " reading" : "",
87213+ reqmode & GR_WRITE ? " writing" : reqmode &
87214+ GR_APPEND ? " appending" : "");
87215+ return reqmode;
87216+ } else
87217+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87218+ {
87219+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87220+ reqmode & GR_READ ? " reading" : "",
87221+ reqmode & GR_WRITE ? " writing" : reqmode &
87222+ GR_APPEND ? " appending" : "");
87223+ return 0;
87224+ } else if (unlikely((mode & reqmode) != reqmode))
87225+ return 0;
87226+
87227+ return reqmode;
87228+}
87229+
87230+__u32
87231+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
87232+ const int fmode)
87233+{
87234+ __u32 mode, reqmode = GR_FIND;
87235+
87236+ if ((fmode & S_IXOTH) && !d_is_dir(dentry))
87237+ reqmode |= GR_EXEC;
87238+ if (fmode & S_IWOTH)
87239+ reqmode |= GR_WRITE;
87240+ if (fmode & S_IROTH)
87241+ reqmode |= GR_READ;
87242+
87243+ mode =
87244+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87245+ mnt);
87246+
87247+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87248+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87249+ reqmode & GR_READ ? " reading" : "",
87250+ reqmode & GR_WRITE ? " writing" : "",
87251+ reqmode & GR_EXEC ? " executing" : "");
87252+ return reqmode;
87253+ } else
87254+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87255+ {
87256+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87257+ reqmode & GR_READ ? " reading" : "",
87258+ reqmode & GR_WRITE ? " writing" : "",
87259+ reqmode & GR_EXEC ? " executing" : "");
87260+ return 0;
87261+ } else if (unlikely((mode & reqmode) != reqmode))
87262+ return 0;
87263+
87264+ return reqmode;
87265+}
87266+
87267+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
87268+{
87269+ __u32 mode;
87270+
87271+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
87272+
87273+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87274+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
87275+ return mode;
87276+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87277+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
87278+ return 0;
87279+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87280+ return 0;
87281+
87282+ return (reqmode);
87283+}
87284+
87285+__u32
87286+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
87287+{
87288+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
87289+}
87290+
87291+__u32
87292+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
87293+{
87294+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
87295+}
87296+
87297+__u32
87298+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
87299+{
87300+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
87301+}
87302+
87303+__u32
87304+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
87305+{
87306+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
87307+}
87308+
87309+__u32
87310+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
87311+ umode_t *modeptr)
87312+{
87313+ umode_t mode;
87314+ struct inode *inode = d_backing_inode(dentry);
87315+
87316+ *modeptr &= ~gr_acl_umask();
87317+ mode = *modeptr;
87318+
87319+ if (unlikely(inode && S_ISSOCK(inode->i_mode)))
87320+ return 1;
87321+
87322+ if (unlikely(!d_is_dir(dentry) &&
87323+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
87324+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
87325+ GR_CHMOD_ACL_MSG);
87326+ } else {
87327+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
87328+ }
87329+}
87330+
87331+__u32
87332+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
87333+{
87334+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
87335+}
87336+
87337+__u32
87338+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
87339+{
87340+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
87341+}
87342+
87343+__u32
87344+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
87345+{
87346+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
87347+}
87348+
87349+__u32
87350+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
87351+{
87352+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
87353+}
87354+
87355+__u32
87356+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
87357+{
87358+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
87359+ GR_UNIXCONNECT_ACL_MSG);
87360+}
87361+
87362+/* hardlinks require at minimum create and link permission,
87363+ any additional privilege required is based on the
87364+ privilege of the file being linked to
87365+*/
87366+__u32
87367+gr_acl_handle_link(const struct dentry * new_dentry,
87368+ const struct dentry * parent_dentry,
87369+ const struct vfsmount * parent_mnt,
87370+ const struct dentry * old_dentry,
87371+ const struct vfsmount * old_mnt, const struct filename *to)
87372+{
87373+ __u32 mode;
87374+ __u32 needmode = GR_CREATE | GR_LINK;
87375+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
87376+
87377+ mode =
87378+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
87379+ old_mnt);
87380+
87381+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
87382+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87383+ return mode;
87384+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87385+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87386+ return 0;
87387+ } else if (unlikely((mode & needmode) != needmode))
87388+ return 0;
87389+
87390+ return 1;
87391+}
87392+
87393+__u32
87394+gr_acl_handle_symlink(const struct dentry * new_dentry,
87395+ const struct dentry * parent_dentry,
87396+ const struct vfsmount * parent_mnt, const struct filename *from)
87397+{
87398+ __u32 needmode = GR_WRITE | GR_CREATE;
87399+ __u32 mode;
87400+
87401+ mode =
87402+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
87403+ GR_CREATE | GR_AUDIT_CREATE |
87404+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
87405+
87406+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
87407+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87408+ return mode;
87409+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87410+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87411+ return 0;
87412+ } else if (unlikely((mode & needmode) != needmode))
87413+ return 0;
87414+
87415+ return (GR_WRITE | GR_CREATE);
87416+}
87417+
87418+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)
87419+{
87420+ __u32 mode;
87421+
87422+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87423+
87424+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87425+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
87426+ return mode;
87427+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87428+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
87429+ return 0;
87430+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87431+ return 0;
87432+
87433+ return (reqmode);
87434+}
87435+
87436+__u32
87437+gr_acl_handle_mknod(const struct dentry * new_dentry,
87438+ const struct dentry * parent_dentry,
87439+ const struct vfsmount * parent_mnt,
87440+ const int mode)
87441+{
87442+ __u32 reqmode = GR_WRITE | GR_CREATE;
87443+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87444+ reqmode |= GR_SETID;
87445+
87446+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87447+ reqmode, GR_MKNOD_ACL_MSG);
87448+}
87449+
87450+__u32
87451+gr_acl_handle_mkdir(const struct dentry *new_dentry,
87452+ const struct dentry *parent_dentry,
87453+ const struct vfsmount *parent_mnt)
87454+{
87455+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87456+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
87457+}
87458+
87459+#define RENAME_CHECK_SUCCESS(old, new) \
87460+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
87461+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
87462+
87463+int
87464+gr_acl_handle_rename(struct dentry *new_dentry,
87465+ struct dentry *parent_dentry,
87466+ const struct vfsmount *parent_mnt,
87467+ struct dentry *old_dentry,
87468+ struct inode *old_parent_inode,
87469+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
87470+{
87471+ __u32 comp1, comp2;
87472+ int error = 0;
87473+
87474+ if (unlikely(!gr_acl_is_enabled()))
87475+ return 0;
87476+
87477+ if (flags & RENAME_EXCHANGE) {
87478+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87479+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87480+ GR_SUPPRESS, parent_mnt);
87481+ comp2 =
87482+ gr_search_file(old_dentry,
87483+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87484+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87485+ } else if (d_is_negative(new_dentry)) {
87486+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
87487+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
87488+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
87489+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
87490+ GR_DELETE | GR_AUDIT_DELETE |
87491+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87492+ GR_SUPPRESS, old_mnt);
87493+ } else {
87494+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87495+ GR_CREATE | GR_DELETE |
87496+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
87497+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87498+ GR_SUPPRESS, parent_mnt);
87499+ comp2 =
87500+ gr_search_file(old_dentry,
87501+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87502+ GR_DELETE | GR_AUDIT_DELETE |
87503+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87504+ }
87505+
87506+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
87507+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
87508+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87509+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
87510+ && !(comp2 & GR_SUPPRESS)) {
87511+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87512+ error = -EACCES;
87513+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
87514+ error = -EACCES;
87515+
87516+ return error;
87517+}
87518+
87519+void
87520+gr_acl_handle_exit(void)
87521+{
87522+ u16 id;
87523+ char *rolename;
87524+
87525+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
87526+ !(current->role->roletype & GR_ROLE_PERSIST))) {
87527+ id = current->acl_role_id;
87528+ rolename = current->role->rolename;
87529+ gr_set_acls(1);
87530+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
87531+ }
87532+
87533+ gr_put_exec_file(current);
87534+ return;
87535+}
87536+
87537+int
87538+gr_acl_handle_procpidmem(const struct task_struct *task)
87539+{
87540+ if (unlikely(!gr_acl_is_enabled()))
87541+ return 0;
87542+
87543+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
87544+ !(current->acl->mode & GR_POVERRIDE) &&
87545+ !(current->role->roletype & GR_ROLE_GOD))
87546+ return -EACCES;
87547+
87548+ return 0;
87549+}
87550diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
87551new file mode 100644
87552index 0000000..ed6ee43
87553--- /dev/null
87554+++ b/grsecurity/gracl_ip.c
87555@@ -0,0 +1,386 @@
87556+#include <linux/kernel.h>
87557+#include <asm/uaccess.h>
87558+#include <asm/errno.h>
87559+#include <net/sock.h>
87560+#include <linux/file.h>
87561+#include <linux/fs.h>
87562+#include <linux/net.h>
87563+#include <linux/in.h>
87564+#include <linux/skbuff.h>
87565+#include <linux/ip.h>
87566+#include <linux/udp.h>
87567+#include <linux/types.h>
87568+#include <linux/sched.h>
87569+#include <linux/netdevice.h>
87570+#include <linux/inetdevice.h>
87571+#include <linux/gracl.h>
87572+#include <linux/grsecurity.h>
87573+#include <linux/grinternal.h>
87574+
87575+#define GR_BIND 0x01
87576+#define GR_CONNECT 0x02
87577+#define GR_INVERT 0x04
87578+#define GR_BINDOVERRIDE 0x08
87579+#define GR_CONNECTOVERRIDE 0x10
87580+#define GR_SOCK_FAMILY 0x20
87581+
87582+static const char * gr_protocols[IPPROTO_MAX] = {
87583+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
87584+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
87585+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
87586+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
87587+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
87588+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
87589+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
87590+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
87591+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
87592+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
87593+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
87594+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
87595+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
87596+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
87597+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
87598+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
87599+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
87600+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
87601+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
87602+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
87603+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
87604+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
87605+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
87606+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
87607+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
87608+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
87609+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
87610+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
87611+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
87612+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
87613+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
87614+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
87615+ };
87616+
87617+static const char * gr_socktypes[SOCK_MAX] = {
87618+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
87619+ "unknown:7", "unknown:8", "unknown:9", "packet"
87620+ };
87621+
87622+static const char * gr_sockfamilies[AF_MAX+1] = {
87623+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
87624+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
87625+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
87626+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
87627+ };
87628+
87629+const char *
87630+gr_proto_to_name(unsigned char proto)
87631+{
87632+ return gr_protocols[proto];
87633+}
87634+
87635+const char *
87636+gr_socktype_to_name(unsigned char type)
87637+{
87638+ return gr_socktypes[type];
87639+}
87640+
87641+const char *
87642+gr_sockfamily_to_name(unsigned char family)
87643+{
87644+ return gr_sockfamilies[family];
87645+}
87646+
87647+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
87648+
87649+int
87650+gr_search_socket(const int domain, const int type, const int protocol)
87651+{
87652+ struct acl_subject_label *curr;
87653+ const struct cred *cred = current_cred();
87654+
87655+ if (unlikely(!gr_acl_is_enabled()))
87656+ goto exit;
87657+
87658+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
87659+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
87660+ goto exit; // let the kernel handle it
87661+
87662+ curr = current->acl;
87663+
87664+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
87665+ /* the family is allowed, if this is PF_INET allow it only if
87666+ the extra sock type/protocol checks pass */
87667+ if (domain == PF_INET)
87668+ goto inet_check;
87669+ goto exit;
87670+ } else {
87671+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87672+ __u32 fakeip = 0;
87673+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87674+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87675+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87676+ gr_to_filename(current->exec_file->f_path.dentry,
87677+ current->exec_file->f_path.mnt) :
87678+ curr->filename, curr->filename,
87679+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
87680+ &current->signal->saved_ip);
87681+ goto exit;
87682+ }
87683+ goto exit_fail;
87684+ }
87685+
87686+inet_check:
87687+ /* the rest of this checking is for IPv4 only */
87688+ if (!curr->ips)
87689+ goto exit;
87690+
87691+ if ((curr->ip_type & (1U << type)) &&
87692+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
87693+ goto exit;
87694+
87695+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87696+ /* we don't place acls on raw sockets , and sometimes
87697+ dgram/ip sockets are opened for ioctl and not
87698+ bind/connect, so we'll fake a bind learn log */
87699+ if (type == SOCK_RAW || type == SOCK_PACKET) {
87700+ __u32 fakeip = 0;
87701+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87702+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87703+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87704+ gr_to_filename(current->exec_file->f_path.dentry,
87705+ current->exec_file->f_path.mnt) :
87706+ curr->filename, curr->filename,
87707+ &fakeip, 0, type,
87708+ protocol, GR_CONNECT, &current->signal->saved_ip);
87709+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
87710+ __u32 fakeip = 0;
87711+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87712+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87713+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87714+ gr_to_filename(current->exec_file->f_path.dentry,
87715+ current->exec_file->f_path.mnt) :
87716+ curr->filename, curr->filename,
87717+ &fakeip, 0, type,
87718+ protocol, GR_BIND, &current->signal->saved_ip);
87719+ }
87720+ /* we'll log when they use connect or bind */
87721+ goto exit;
87722+ }
87723+
87724+exit_fail:
87725+ if (domain == PF_INET)
87726+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
87727+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
87728+ else if (rcu_access_pointer(net_families[domain]) != NULL)
87729+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
87730+ gr_socktype_to_name(type), protocol);
87731+
87732+ return 0;
87733+exit:
87734+ return 1;
87735+}
87736+
87737+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)
87738+{
87739+ if ((ip->mode & mode) &&
87740+ (ip_port >= ip->low) &&
87741+ (ip_port <= ip->high) &&
87742+ ((ntohl(ip_addr) & our_netmask) ==
87743+ (ntohl(our_addr) & our_netmask))
87744+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
87745+ && (ip->type & (1U << type))) {
87746+ if (ip->mode & GR_INVERT)
87747+ return 2; // specifically denied
87748+ else
87749+ return 1; // allowed
87750+ }
87751+
87752+ return 0; // not specifically allowed, may continue parsing
87753+}
87754+
87755+static int
87756+gr_search_connectbind(const int full_mode, struct sock *sk,
87757+ struct sockaddr_in *addr, const int type)
87758+{
87759+ char iface[IFNAMSIZ] = {0};
87760+ struct acl_subject_label *curr;
87761+ struct acl_ip_label *ip;
87762+ struct inet_sock *isk;
87763+ struct net_device *dev;
87764+ struct in_device *idev;
87765+ unsigned long i;
87766+ int ret;
87767+ int mode = full_mode & (GR_BIND | GR_CONNECT);
87768+ __u32 ip_addr = 0;
87769+ __u32 our_addr;
87770+ __u32 our_netmask;
87771+ char *p;
87772+ __u16 ip_port = 0;
87773+ const struct cred *cred = current_cred();
87774+
87775+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
87776+ return 0;
87777+
87778+ curr = current->acl;
87779+ isk = inet_sk(sk);
87780+
87781+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
87782+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
87783+ addr->sin_addr.s_addr = curr->inaddr_any_override;
87784+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
87785+ struct sockaddr_in saddr;
87786+ int err;
87787+
87788+ saddr.sin_family = AF_INET;
87789+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
87790+ saddr.sin_port = isk->inet_sport;
87791+
87792+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87793+ if (err)
87794+ return err;
87795+
87796+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87797+ if (err)
87798+ return err;
87799+ }
87800+
87801+ if (!curr->ips)
87802+ return 0;
87803+
87804+ ip_addr = addr->sin_addr.s_addr;
87805+ ip_port = ntohs(addr->sin_port);
87806+
87807+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87808+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87809+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87810+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87811+ gr_to_filename(current->exec_file->f_path.dentry,
87812+ current->exec_file->f_path.mnt) :
87813+ curr->filename, curr->filename,
87814+ &ip_addr, ip_port, type,
87815+ sk->sk_protocol, mode, &current->signal->saved_ip);
87816+ return 0;
87817+ }
87818+
87819+ for (i = 0; i < curr->ip_num; i++) {
87820+ ip = *(curr->ips + i);
87821+ if (ip->iface != NULL) {
87822+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
87823+ p = strchr(iface, ':');
87824+ if (p != NULL)
87825+ *p = '\0';
87826+ dev = dev_get_by_name(sock_net(sk), iface);
87827+ if (dev == NULL)
87828+ continue;
87829+ idev = in_dev_get(dev);
87830+ if (idev == NULL) {
87831+ dev_put(dev);
87832+ continue;
87833+ }
87834+ rcu_read_lock();
87835+ for_ifa(idev) {
87836+ if (!strcmp(ip->iface, ifa->ifa_label)) {
87837+ our_addr = ifa->ifa_address;
87838+ our_netmask = 0xffffffff;
87839+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87840+ if (ret == 1) {
87841+ rcu_read_unlock();
87842+ in_dev_put(idev);
87843+ dev_put(dev);
87844+ return 0;
87845+ } else if (ret == 2) {
87846+ rcu_read_unlock();
87847+ in_dev_put(idev);
87848+ dev_put(dev);
87849+ goto denied;
87850+ }
87851+ }
87852+ } endfor_ifa(idev);
87853+ rcu_read_unlock();
87854+ in_dev_put(idev);
87855+ dev_put(dev);
87856+ } else {
87857+ our_addr = ip->addr;
87858+ our_netmask = ip->netmask;
87859+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87860+ if (ret == 1)
87861+ return 0;
87862+ else if (ret == 2)
87863+ goto denied;
87864+ }
87865+ }
87866+
87867+denied:
87868+ if (mode == GR_BIND)
87869+ 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));
87870+ else if (mode == GR_CONNECT)
87871+ 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));
87872+
87873+ return -EACCES;
87874+}
87875+
87876+int
87877+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
87878+{
87879+ /* always allow disconnection of dgram sockets with connect */
87880+ if (addr->sin_family == AF_UNSPEC)
87881+ return 0;
87882+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
87883+}
87884+
87885+int
87886+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
87887+{
87888+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
87889+}
87890+
87891+int gr_search_listen(struct socket *sock)
87892+{
87893+ struct sock *sk = sock->sk;
87894+ struct sockaddr_in addr;
87895+
87896+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87897+ addr.sin_port = inet_sk(sk)->inet_sport;
87898+
87899+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87900+}
87901+
87902+int gr_search_accept(struct socket *sock)
87903+{
87904+ struct sock *sk = sock->sk;
87905+ struct sockaddr_in addr;
87906+
87907+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87908+ addr.sin_port = inet_sk(sk)->inet_sport;
87909+
87910+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87911+}
87912+
87913+int
87914+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
87915+{
87916+ if (addr)
87917+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
87918+ else {
87919+ struct sockaddr_in sin;
87920+ const struct inet_sock *inet = inet_sk(sk);
87921+
87922+ sin.sin_addr.s_addr = inet->inet_daddr;
87923+ sin.sin_port = inet->inet_dport;
87924+
87925+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87926+ }
87927+}
87928+
87929+int
87930+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
87931+{
87932+ struct sockaddr_in sin;
87933+
87934+ if (unlikely(skb->len < sizeof (struct udphdr)))
87935+ return 0; // skip this packet
87936+
87937+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
87938+ sin.sin_port = udp_hdr(skb)->source;
87939+
87940+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87941+}
87942diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
87943new file mode 100644
87944index 0000000..25f54ef
87945--- /dev/null
87946+++ b/grsecurity/gracl_learn.c
87947@@ -0,0 +1,207 @@
87948+#include <linux/kernel.h>
87949+#include <linux/mm.h>
87950+#include <linux/sched.h>
87951+#include <linux/poll.h>
87952+#include <linux/string.h>
87953+#include <linux/file.h>
87954+#include <linux/types.h>
87955+#include <linux/vmalloc.h>
87956+#include <linux/grinternal.h>
87957+
87958+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
87959+ size_t count, loff_t *ppos);
87960+extern int gr_acl_is_enabled(void);
87961+
87962+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
87963+static int gr_learn_attached;
87964+
87965+/* use a 512k buffer */
87966+#define LEARN_BUFFER_SIZE (512 * 1024)
87967+
87968+static DEFINE_SPINLOCK(gr_learn_lock);
87969+static DEFINE_MUTEX(gr_learn_user_mutex);
87970+
87971+/* we need to maintain two buffers, so that the kernel context of grlearn
87972+ uses a semaphore around the userspace copying, and the other kernel contexts
87973+ use a spinlock when copying into the buffer, since they cannot sleep
87974+*/
87975+static char *learn_buffer;
87976+static char *learn_buffer_user;
87977+static int learn_buffer_len;
87978+static int learn_buffer_user_len;
87979+
87980+static ssize_t
87981+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
87982+{
87983+ DECLARE_WAITQUEUE(wait, current);
87984+ ssize_t retval = 0;
87985+
87986+ add_wait_queue(&learn_wait, &wait);
87987+ set_current_state(TASK_INTERRUPTIBLE);
87988+ do {
87989+ mutex_lock(&gr_learn_user_mutex);
87990+ spin_lock(&gr_learn_lock);
87991+ if (learn_buffer_len)
87992+ break;
87993+ spin_unlock(&gr_learn_lock);
87994+ mutex_unlock(&gr_learn_user_mutex);
87995+ if (file->f_flags & O_NONBLOCK) {
87996+ retval = -EAGAIN;
87997+ goto out;
87998+ }
87999+ if (signal_pending(current)) {
88000+ retval = -ERESTARTSYS;
88001+ goto out;
88002+ }
88003+
88004+ schedule();
88005+ } while (1);
88006+
88007+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
88008+ learn_buffer_user_len = learn_buffer_len;
88009+ retval = learn_buffer_len;
88010+ learn_buffer_len = 0;
88011+
88012+ spin_unlock(&gr_learn_lock);
88013+
88014+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
88015+ retval = -EFAULT;
88016+
88017+ mutex_unlock(&gr_learn_user_mutex);
88018+out:
88019+ set_current_state(TASK_RUNNING);
88020+ remove_wait_queue(&learn_wait, &wait);
88021+ return retval;
88022+}
88023+
88024+static unsigned int
88025+poll_learn(struct file * file, poll_table * wait)
88026+{
88027+ poll_wait(file, &learn_wait, wait);
88028+
88029+ if (learn_buffer_len)
88030+ return (POLLIN | POLLRDNORM);
88031+
88032+ return 0;
88033+}
88034+
88035+void
88036+gr_clear_learn_entries(void)
88037+{
88038+ char *tmp;
88039+
88040+ mutex_lock(&gr_learn_user_mutex);
88041+ spin_lock(&gr_learn_lock);
88042+ tmp = learn_buffer;
88043+ learn_buffer = NULL;
88044+ spin_unlock(&gr_learn_lock);
88045+ if (tmp)
88046+ vfree(tmp);
88047+ if (learn_buffer_user != NULL) {
88048+ vfree(learn_buffer_user);
88049+ learn_buffer_user = NULL;
88050+ }
88051+ learn_buffer_len = 0;
88052+ mutex_unlock(&gr_learn_user_mutex);
88053+
88054+ return;
88055+}
88056+
88057+void
88058+gr_add_learn_entry(const char *fmt, ...)
88059+{
88060+ va_list args;
88061+ unsigned int len;
88062+
88063+ if (!gr_learn_attached)
88064+ return;
88065+
88066+ spin_lock(&gr_learn_lock);
88067+
88068+ /* leave a gap at the end so we know when it's "full" but don't have to
88069+ compute the exact length of the string we're trying to append
88070+ */
88071+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
88072+ spin_unlock(&gr_learn_lock);
88073+ wake_up_interruptible(&learn_wait);
88074+ return;
88075+ }
88076+ if (learn_buffer == NULL) {
88077+ spin_unlock(&gr_learn_lock);
88078+ return;
88079+ }
88080+
88081+ va_start(args, fmt);
88082+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
88083+ va_end(args);
88084+
88085+ learn_buffer_len += len + 1;
88086+
88087+ spin_unlock(&gr_learn_lock);
88088+ wake_up_interruptible(&learn_wait);
88089+
88090+ return;
88091+}
88092+
88093+static int
88094+open_learn(struct inode *inode, struct file *file)
88095+{
88096+ if (file->f_mode & FMODE_READ && gr_learn_attached)
88097+ return -EBUSY;
88098+ if (file->f_mode & FMODE_READ) {
88099+ int retval = 0;
88100+ mutex_lock(&gr_learn_user_mutex);
88101+ if (learn_buffer == NULL)
88102+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
88103+ if (learn_buffer_user == NULL)
88104+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
88105+ if (learn_buffer == NULL) {
88106+ retval = -ENOMEM;
88107+ goto out_error;
88108+ }
88109+ if (learn_buffer_user == NULL) {
88110+ retval = -ENOMEM;
88111+ goto out_error;
88112+ }
88113+ learn_buffer_len = 0;
88114+ learn_buffer_user_len = 0;
88115+ gr_learn_attached = 1;
88116+out_error:
88117+ mutex_unlock(&gr_learn_user_mutex);
88118+ return retval;
88119+ }
88120+ return 0;
88121+}
88122+
88123+static int
88124+close_learn(struct inode *inode, struct file *file)
88125+{
88126+ if (file->f_mode & FMODE_READ) {
88127+ char *tmp = NULL;
88128+ mutex_lock(&gr_learn_user_mutex);
88129+ spin_lock(&gr_learn_lock);
88130+ tmp = learn_buffer;
88131+ learn_buffer = NULL;
88132+ spin_unlock(&gr_learn_lock);
88133+ if (tmp)
88134+ vfree(tmp);
88135+ if (learn_buffer_user != NULL) {
88136+ vfree(learn_buffer_user);
88137+ learn_buffer_user = NULL;
88138+ }
88139+ learn_buffer_len = 0;
88140+ learn_buffer_user_len = 0;
88141+ gr_learn_attached = 0;
88142+ mutex_unlock(&gr_learn_user_mutex);
88143+ }
88144+
88145+ return 0;
88146+}
88147+
88148+const struct file_operations grsec_fops = {
88149+ .read = read_learn,
88150+ .write = write_grsec_handler,
88151+ .open = open_learn,
88152+ .release = close_learn,
88153+ .poll = poll_learn,
88154+};
88155diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
88156new file mode 100644
88157index 0000000..0773423
88158--- /dev/null
88159+++ b/grsecurity/gracl_policy.c
88160@@ -0,0 +1,1786 @@
88161+#include <linux/kernel.h>
88162+#include <linux/module.h>
88163+#include <linux/sched.h>
88164+#include <linux/mm.h>
88165+#include <linux/file.h>
88166+#include <linux/fs.h>
88167+#include <linux/namei.h>
88168+#include <linux/mount.h>
88169+#include <linux/tty.h>
88170+#include <linux/proc_fs.h>
88171+#include <linux/lglock.h>
88172+#include <linux/slab.h>
88173+#include <linux/vmalloc.h>
88174+#include <linux/types.h>
88175+#include <linux/sysctl.h>
88176+#include <linux/netdevice.h>
88177+#include <linux/ptrace.h>
88178+#include <linux/gracl.h>
88179+#include <linux/gralloc.h>
88180+#include <linux/security.h>
88181+#include <linux/grinternal.h>
88182+#include <linux/pid_namespace.h>
88183+#include <linux/stop_machine.h>
88184+#include <linux/fdtable.h>
88185+#include <linux/percpu.h>
88186+#include <linux/lglock.h>
88187+#include <linux/hugetlb.h>
88188+#include <linux/posix-timers.h>
88189+#include "../fs/mount.h"
88190+
88191+#include <asm/uaccess.h>
88192+#include <asm/errno.h>
88193+#include <asm/mman.h>
88194+
88195+extern struct gr_policy_state *polstate;
88196+
88197+#define FOR_EACH_ROLE_START(role) \
88198+ role = polstate->role_list; \
88199+ while (role) {
88200+
88201+#define FOR_EACH_ROLE_END(role) \
88202+ role = role->prev; \
88203+ }
88204+
88205+struct path gr_real_root;
88206+
88207+extern struct gr_alloc_state *current_alloc_state;
88208+
88209+u16 acl_sp_role_value;
88210+
88211+static DEFINE_MUTEX(gr_dev_mutex);
88212+
88213+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
88214+extern void gr_clear_learn_entries(void);
88215+
88216+struct gr_arg *gr_usermode __read_only;
88217+unsigned char *gr_system_salt __read_only;
88218+unsigned char *gr_system_sum __read_only;
88219+
88220+static unsigned int gr_auth_attempts = 0;
88221+static unsigned long gr_auth_expires = 0UL;
88222+
88223+struct acl_object_label *fakefs_obj_rw;
88224+struct acl_object_label *fakefs_obj_rwx;
88225+
88226+extern int gr_init_uidset(void);
88227+extern void gr_free_uidset(void);
88228+extern void gr_remove_uid(uid_t uid);
88229+extern int gr_find_uid(uid_t uid);
88230+
88231+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);
88232+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
88233+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
88234+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
88235+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);
88236+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
88237+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
88238+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
88239+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
88240+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88241+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88242+extern void assign_special_role(const char *rolename);
88243+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
88244+extern int gr_rbac_disable(void *unused);
88245+extern void gr_enable_rbac_system(void);
88246+
88247+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
88248+{
88249+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
88250+ return -EFAULT;
88251+
88252+ return 0;
88253+}
88254+
88255+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
88256+{
88257+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
88258+ return -EFAULT;
88259+
88260+ return 0;
88261+}
88262+
88263+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
88264+{
88265+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
88266+ return -EFAULT;
88267+
88268+ return 0;
88269+}
88270+
88271+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
88272+{
88273+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
88274+ return -EFAULT;
88275+
88276+ return 0;
88277+}
88278+
88279+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
88280+{
88281+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
88282+ return -EFAULT;
88283+
88284+ return 0;
88285+}
88286+
88287+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
88288+{
88289+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
88290+ return -EFAULT;
88291+
88292+ return 0;
88293+}
88294+
88295+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
88296+{
88297+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
88298+ return -EFAULT;
88299+
88300+ return 0;
88301+}
88302+
88303+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
88304+{
88305+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
88306+ return -EFAULT;
88307+
88308+ return 0;
88309+}
88310+
88311+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
88312+{
88313+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
88314+ return -EFAULT;
88315+
88316+ return 0;
88317+}
88318+
88319+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
88320+{
88321+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
88322+ return -EFAULT;
88323+
88324+ if ((uwrap->version != GRSECURITY_VERSION) ||
88325+ (uwrap->size != sizeof(struct gr_arg)))
88326+ return -EINVAL;
88327+
88328+ return 0;
88329+}
88330+
88331+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
88332+{
88333+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
88334+ return -EFAULT;
88335+
88336+ return 0;
88337+}
88338+
88339+static size_t get_gr_arg_wrapper_size_normal(void)
88340+{
88341+ return sizeof(struct gr_arg_wrapper);
88342+}
88343+
88344+#ifdef CONFIG_COMPAT
88345+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
88346+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
88347+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
88348+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
88349+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
88350+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
88351+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
88352+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
88353+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
88354+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
88355+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
88356+extern size_t get_gr_arg_wrapper_size_compat(void);
88357+
88358+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
88359+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
88360+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
88361+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
88362+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
88363+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
88364+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
88365+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
88366+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
88367+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
88368+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
88369+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
88370+
88371+#else
88372+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
88373+#define copy_gr_arg copy_gr_arg_normal
88374+#define copy_gr_hash_struct copy_gr_hash_struct_normal
88375+#define copy_acl_object_label copy_acl_object_label_normal
88376+#define copy_acl_subject_label copy_acl_subject_label_normal
88377+#define copy_acl_role_label copy_acl_role_label_normal
88378+#define copy_acl_ip_label copy_acl_ip_label_normal
88379+#define copy_pointer_from_array copy_pointer_from_array_normal
88380+#define copy_sprole_pw copy_sprole_pw_normal
88381+#define copy_role_transition copy_role_transition_normal
88382+#define copy_role_allowed_ip copy_role_allowed_ip_normal
88383+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
88384+#endif
88385+
88386+static struct acl_subject_label *
88387+lookup_subject_map(const struct acl_subject_label *userp)
88388+{
88389+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
88390+ struct subject_map *match;
88391+
88392+ match = polstate->subj_map_set.s_hash[index];
88393+
88394+ while (match && match->user != userp)
88395+ match = match->next;
88396+
88397+ if (match != NULL)
88398+ return match->kernel;
88399+ else
88400+ return NULL;
88401+}
88402+
88403+static void
88404+insert_subj_map_entry(struct subject_map *subjmap)
88405+{
88406+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
88407+ struct subject_map **curr;
88408+
88409+ subjmap->prev = NULL;
88410+
88411+ curr = &polstate->subj_map_set.s_hash[index];
88412+ if (*curr != NULL)
88413+ (*curr)->prev = subjmap;
88414+
88415+ subjmap->next = *curr;
88416+ *curr = subjmap;
88417+
88418+ return;
88419+}
88420+
88421+static void
88422+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
88423+{
88424+ unsigned int index =
88425+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
88426+ struct acl_role_label **curr;
88427+ struct acl_role_label *tmp, *tmp2;
88428+
88429+ curr = &polstate->acl_role_set.r_hash[index];
88430+
88431+ /* simple case, slot is empty, just set it to our role */
88432+ if (*curr == NULL) {
88433+ *curr = role;
88434+ } else {
88435+ /* example:
88436+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
88437+ 2 -> 3
88438+ */
88439+ /* first check to see if we can already be reached via this slot */
88440+ tmp = *curr;
88441+ while (tmp && tmp != role)
88442+ tmp = tmp->next;
88443+ if (tmp == role) {
88444+ /* we don't need to add ourselves to this slot's chain */
88445+ return;
88446+ }
88447+ /* we need to add ourselves to this chain, two cases */
88448+ if (role->next == NULL) {
88449+ /* simple case, append the current chain to our role */
88450+ role->next = *curr;
88451+ *curr = role;
88452+ } else {
88453+ /* 1 -> 2 -> 3 -> 4
88454+ 2 -> 3 -> 4
88455+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
88456+ */
88457+ /* trickier case: walk our role's chain until we find
88458+ the role for the start of the current slot's chain */
88459+ tmp = role;
88460+ tmp2 = *curr;
88461+ while (tmp->next && tmp->next != tmp2)
88462+ tmp = tmp->next;
88463+ if (tmp->next == tmp2) {
88464+ /* from example above, we found 3, so just
88465+ replace this slot's chain with ours */
88466+ *curr = role;
88467+ } else {
88468+ /* we didn't find a subset of our role's chain
88469+ in the current slot's chain, so append their
88470+ chain to ours, and set us as the first role in
88471+ the slot's chain
88472+
88473+ we could fold this case with the case above,
88474+ but making it explicit for clarity
88475+ */
88476+ tmp->next = tmp2;
88477+ *curr = role;
88478+ }
88479+ }
88480+ }
88481+
88482+ return;
88483+}
88484+
88485+static void
88486+insert_acl_role_label(struct acl_role_label *role)
88487+{
88488+ int i;
88489+
88490+ if (polstate->role_list == NULL) {
88491+ polstate->role_list = role;
88492+ role->prev = NULL;
88493+ } else {
88494+ role->prev = polstate->role_list;
88495+ polstate->role_list = role;
88496+ }
88497+
88498+ /* used for hash chains */
88499+ role->next = NULL;
88500+
88501+ if (role->roletype & GR_ROLE_DOMAIN) {
88502+ for (i = 0; i < role->domain_child_num; i++)
88503+ __insert_acl_role_label(role, role->domain_children[i]);
88504+ } else
88505+ __insert_acl_role_label(role, role->uidgid);
88506+}
88507+
88508+static int
88509+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
88510+{
88511+ struct name_entry **curr, *nentry;
88512+ struct inodev_entry *ientry;
88513+ unsigned int len = strlen(name);
88514+ unsigned int key = full_name_hash(name, len);
88515+ unsigned int index = key % polstate->name_set.n_size;
88516+
88517+ curr = &polstate->name_set.n_hash[index];
88518+
88519+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
88520+ curr = &((*curr)->next);
88521+
88522+ if (*curr != NULL)
88523+ return 1;
88524+
88525+ nentry = acl_alloc(sizeof (struct name_entry));
88526+ if (nentry == NULL)
88527+ return 0;
88528+ ientry = acl_alloc(sizeof (struct inodev_entry));
88529+ if (ientry == NULL)
88530+ return 0;
88531+ ientry->nentry = nentry;
88532+
88533+ nentry->key = key;
88534+ nentry->name = name;
88535+ nentry->inode = inode;
88536+ nentry->device = device;
88537+ nentry->len = len;
88538+ nentry->deleted = deleted;
88539+
88540+ nentry->prev = NULL;
88541+ curr = &polstate->name_set.n_hash[index];
88542+ if (*curr != NULL)
88543+ (*curr)->prev = nentry;
88544+ nentry->next = *curr;
88545+ *curr = nentry;
88546+
88547+ /* insert us into the table searchable by inode/dev */
88548+ __insert_inodev_entry(polstate, ientry);
88549+
88550+ return 1;
88551+}
88552+
88553+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
88554+
88555+static void *
88556+create_table(__u32 * len, int elementsize)
88557+{
88558+ unsigned int table_sizes[] = {
88559+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
88560+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
88561+ 4194301, 8388593, 16777213, 33554393, 67108859
88562+ };
88563+ void *newtable = NULL;
88564+ unsigned int pwr = 0;
88565+
88566+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
88567+ table_sizes[pwr] <= *len)
88568+ pwr++;
88569+
88570+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
88571+ return newtable;
88572+
88573+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
88574+ newtable =
88575+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
88576+ else
88577+ newtable = vmalloc(table_sizes[pwr] * elementsize);
88578+
88579+ *len = table_sizes[pwr];
88580+
88581+ return newtable;
88582+}
88583+
88584+static int
88585+init_variables(const struct gr_arg *arg, bool reload)
88586+{
88587+ struct task_struct *reaper = init_pid_ns.child_reaper;
88588+ unsigned int stacksize;
88589+
88590+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
88591+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
88592+ polstate->name_set.n_size = arg->role_db.num_objects;
88593+ polstate->inodev_set.i_size = arg->role_db.num_objects;
88594+
88595+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
88596+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
88597+ return 1;
88598+
88599+ if (!reload) {
88600+ if (!gr_init_uidset())
88601+ return 1;
88602+ }
88603+
88604+ /* set up the stack that holds allocation info */
88605+
88606+ stacksize = arg->role_db.num_pointers + 5;
88607+
88608+ if (!acl_alloc_stack_init(stacksize))
88609+ return 1;
88610+
88611+ if (!reload) {
88612+ /* grab reference for the real root dentry and vfsmount */
88613+ get_fs_root(reaper->fs, &gr_real_root);
88614+
88615+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88616+ 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));
88617+#endif
88618+
88619+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88620+ if (fakefs_obj_rw == NULL)
88621+ return 1;
88622+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
88623+
88624+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88625+ if (fakefs_obj_rwx == NULL)
88626+ return 1;
88627+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
88628+ }
88629+
88630+ polstate->subj_map_set.s_hash =
88631+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
88632+ polstate->acl_role_set.r_hash =
88633+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
88634+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
88635+ polstate->inodev_set.i_hash =
88636+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
88637+
88638+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
88639+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
88640+ return 1;
88641+
88642+ memset(polstate->subj_map_set.s_hash, 0,
88643+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
88644+ memset(polstate->acl_role_set.r_hash, 0,
88645+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
88646+ memset(polstate->name_set.n_hash, 0,
88647+ sizeof (struct name_entry *) * polstate->name_set.n_size);
88648+ memset(polstate->inodev_set.i_hash, 0,
88649+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
88650+
88651+ return 0;
88652+}
88653+
88654+/* free information not needed after startup
88655+ currently contains user->kernel pointer mappings for subjects
88656+*/
88657+
88658+static void
88659+free_init_variables(void)
88660+{
88661+ __u32 i;
88662+
88663+ if (polstate->subj_map_set.s_hash) {
88664+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
88665+ if (polstate->subj_map_set.s_hash[i]) {
88666+ kfree(polstate->subj_map_set.s_hash[i]);
88667+ polstate->subj_map_set.s_hash[i] = NULL;
88668+ }
88669+ }
88670+
88671+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
88672+ PAGE_SIZE)
88673+ kfree(polstate->subj_map_set.s_hash);
88674+ else
88675+ vfree(polstate->subj_map_set.s_hash);
88676+ }
88677+
88678+ return;
88679+}
88680+
88681+static void
88682+free_variables(bool reload)
88683+{
88684+ struct acl_subject_label *s;
88685+ struct acl_role_label *r;
88686+ struct task_struct *task, *task2;
88687+ unsigned int x;
88688+
88689+ if (!reload) {
88690+ gr_clear_learn_entries();
88691+
88692+ read_lock(&tasklist_lock);
88693+ do_each_thread(task2, task) {
88694+ task->acl_sp_role = 0;
88695+ task->acl_role_id = 0;
88696+ task->inherited = 0;
88697+ task->acl = NULL;
88698+ task->role = NULL;
88699+ } while_each_thread(task2, task);
88700+ read_unlock(&tasklist_lock);
88701+
88702+ kfree(fakefs_obj_rw);
88703+ fakefs_obj_rw = NULL;
88704+ kfree(fakefs_obj_rwx);
88705+ fakefs_obj_rwx = NULL;
88706+
88707+ /* release the reference to the real root dentry and vfsmount */
88708+ path_put(&gr_real_root);
88709+ memset(&gr_real_root, 0, sizeof(gr_real_root));
88710+ }
88711+
88712+ /* free all object hash tables */
88713+
88714+ FOR_EACH_ROLE_START(r)
88715+ if (r->subj_hash == NULL)
88716+ goto next_role;
88717+ FOR_EACH_SUBJECT_START(r, s, x)
88718+ if (s->obj_hash == NULL)
88719+ break;
88720+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88721+ kfree(s->obj_hash);
88722+ else
88723+ vfree(s->obj_hash);
88724+ FOR_EACH_SUBJECT_END(s, x)
88725+ FOR_EACH_NESTED_SUBJECT_START(r, s)
88726+ if (s->obj_hash == NULL)
88727+ break;
88728+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88729+ kfree(s->obj_hash);
88730+ else
88731+ vfree(s->obj_hash);
88732+ FOR_EACH_NESTED_SUBJECT_END(s)
88733+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
88734+ kfree(r->subj_hash);
88735+ else
88736+ vfree(r->subj_hash);
88737+ r->subj_hash = NULL;
88738+next_role:
88739+ FOR_EACH_ROLE_END(r)
88740+
88741+ acl_free_all();
88742+
88743+ if (polstate->acl_role_set.r_hash) {
88744+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
88745+ PAGE_SIZE)
88746+ kfree(polstate->acl_role_set.r_hash);
88747+ else
88748+ vfree(polstate->acl_role_set.r_hash);
88749+ }
88750+ if (polstate->name_set.n_hash) {
88751+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
88752+ PAGE_SIZE)
88753+ kfree(polstate->name_set.n_hash);
88754+ else
88755+ vfree(polstate->name_set.n_hash);
88756+ }
88757+
88758+ if (polstate->inodev_set.i_hash) {
88759+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
88760+ PAGE_SIZE)
88761+ kfree(polstate->inodev_set.i_hash);
88762+ else
88763+ vfree(polstate->inodev_set.i_hash);
88764+ }
88765+
88766+ if (!reload)
88767+ gr_free_uidset();
88768+
88769+ memset(&polstate->name_set, 0, sizeof (struct name_db));
88770+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
88771+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
88772+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
88773+
88774+ polstate->default_role = NULL;
88775+ polstate->kernel_role = NULL;
88776+ polstate->role_list = NULL;
88777+
88778+ return;
88779+}
88780+
88781+static struct acl_subject_label *
88782+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
88783+
88784+static int alloc_and_copy_string(char **name, unsigned int maxlen)
88785+{
88786+ unsigned int len = strnlen_user(*name, maxlen);
88787+ char *tmp;
88788+
88789+ if (!len || len >= maxlen)
88790+ return -EINVAL;
88791+
88792+ if ((tmp = (char *) acl_alloc(len)) == NULL)
88793+ return -ENOMEM;
88794+
88795+ if (copy_from_user(tmp, *name, len))
88796+ return -EFAULT;
88797+
88798+ tmp[len-1] = '\0';
88799+ *name = tmp;
88800+
88801+ return 0;
88802+}
88803+
88804+static int
88805+copy_user_glob(struct acl_object_label *obj)
88806+{
88807+ struct acl_object_label *g_tmp, **guser;
88808+ int error;
88809+
88810+ if (obj->globbed == NULL)
88811+ return 0;
88812+
88813+ guser = &obj->globbed;
88814+ while (*guser) {
88815+ g_tmp = (struct acl_object_label *)
88816+ acl_alloc(sizeof (struct acl_object_label));
88817+ if (g_tmp == NULL)
88818+ return -ENOMEM;
88819+
88820+ if (copy_acl_object_label(g_tmp, *guser))
88821+ return -EFAULT;
88822+
88823+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
88824+ if (error)
88825+ return error;
88826+
88827+ *guser = g_tmp;
88828+ guser = &(g_tmp->next);
88829+ }
88830+
88831+ return 0;
88832+}
88833+
88834+static int
88835+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
88836+ struct acl_role_label *role)
88837+{
88838+ struct acl_object_label *o_tmp;
88839+ int ret;
88840+
88841+ while (userp) {
88842+ if ((o_tmp = (struct acl_object_label *)
88843+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
88844+ return -ENOMEM;
88845+
88846+ if (copy_acl_object_label(o_tmp, userp))
88847+ return -EFAULT;
88848+
88849+ userp = o_tmp->prev;
88850+
88851+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
88852+ if (ret)
88853+ return ret;
88854+
88855+ insert_acl_obj_label(o_tmp, subj);
88856+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
88857+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
88858+ return -ENOMEM;
88859+
88860+ ret = copy_user_glob(o_tmp);
88861+ if (ret)
88862+ return ret;
88863+
88864+ if (o_tmp->nested) {
88865+ int already_copied;
88866+
88867+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
88868+ if (IS_ERR(o_tmp->nested))
88869+ return PTR_ERR(o_tmp->nested);
88870+
88871+ /* insert into nested subject list if we haven't copied this one yet
88872+ to prevent duplicate entries */
88873+ if (!already_copied) {
88874+ o_tmp->nested->next = role->hash->first;
88875+ role->hash->first = o_tmp->nested;
88876+ }
88877+ }
88878+ }
88879+
88880+ return 0;
88881+}
88882+
88883+static __u32
88884+count_user_subjs(struct acl_subject_label *userp)
88885+{
88886+ struct acl_subject_label s_tmp;
88887+ __u32 num = 0;
88888+
88889+ while (userp) {
88890+ if (copy_acl_subject_label(&s_tmp, userp))
88891+ break;
88892+
88893+ userp = s_tmp.prev;
88894+ }
88895+
88896+ return num;
88897+}
88898+
88899+static int
88900+copy_user_allowedips(struct acl_role_label *rolep)
88901+{
88902+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
88903+
88904+ ruserip = rolep->allowed_ips;
88905+
88906+ while (ruserip) {
88907+ rlast = rtmp;
88908+
88909+ if ((rtmp = (struct role_allowed_ip *)
88910+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
88911+ return -ENOMEM;
88912+
88913+ if (copy_role_allowed_ip(rtmp, ruserip))
88914+ return -EFAULT;
88915+
88916+ ruserip = rtmp->prev;
88917+
88918+ if (!rlast) {
88919+ rtmp->prev = NULL;
88920+ rolep->allowed_ips = rtmp;
88921+ } else {
88922+ rlast->next = rtmp;
88923+ rtmp->prev = rlast;
88924+ }
88925+
88926+ if (!ruserip)
88927+ rtmp->next = NULL;
88928+ }
88929+
88930+ return 0;
88931+}
88932+
88933+static int
88934+copy_user_transitions(struct acl_role_label *rolep)
88935+{
88936+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
88937+ int error;
88938+
88939+ rusertp = rolep->transitions;
88940+
88941+ while (rusertp) {
88942+ rlast = rtmp;
88943+
88944+ if ((rtmp = (struct role_transition *)
88945+ acl_alloc(sizeof (struct role_transition))) == NULL)
88946+ return -ENOMEM;
88947+
88948+ if (copy_role_transition(rtmp, rusertp))
88949+ return -EFAULT;
88950+
88951+ rusertp = rtmp->prev;
88952+
88953+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
88954+ if (error)
88955+ return error;
88956+
88957+ if (!rlast) {
88958+ rtmp->prev = NULL;
88959+ rolep->transitions = rtmp;
88960+ } else {
88961+ rlast->next = rtmp;
88962+ rtmp->prev = rlast;
88963+ }
88964+
88965+ if (!rusertp)
88966+ rtmp->next = NULL;
88967+ }
88968+
88969+ return 0;
88970+}
88971+
88972+static __u32 count_user_objs(const struct acl_object_label __user *userp)
88973+{
88974+ struct acl_object_label o_tmp;
88975+ __u32 num = 0;
88976+
88977+ while (userp) {
88978+ if (copy_acl_object_label(&o_tmp, userp))
88979+ break;
88980+
88981+ userp = o_tmp.prev;
88982+ num++;
88983+ }
88984+
88985+ return num;
88986+}
88987+
88988+static struct acl_subject_label *
88989+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
88990+{
88991+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
88992+ __u32 num_objs;
88993+ struct acl_ip_label **i_tmp, *i_utmp2;
88994+ struct gr_hash_struct ghash;
88995+ struct subject_map *subjmap;
88996+ unsigned int i_num;
88997+ int err;
88998+
88999+ if (already_copied != NULL)
89000+ *already_copied = 0;
89001+
89002+ s_tmp = lookup_subject_map(userp);
89003+
89004+ /* we've already copied this subject into the kernel, just return
89005+ the reference to it, and don't copy it over again
89006+ */
89007+ if (s_tmp) {
89008+ if (already_copied != NULL)
89009+ *already_copied = 1;
89010+ return(s_tmp);
89011+ }
89012+
89013+ if ((s_tmp = (struct acl_subject_label *)
89014+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
89015+ return ERR_PTR(-ENOMEM);
89016+
89017+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
89018+ if (subjmap == NULL)
89019+ return ERR_PTR(-ENOMEM);
89020+
89021+ subjmap->user = userp;
89022+ subjmap->kernel = s_tmp;
89023+ insert_subj_map_entry(subjmap);
89024+
89025+ if (copy_acl_subject_label(s_tmp, userp))
89026+ return ERR_PTR(-EFAULT);
89027+
89028+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
89029+ if (err)
89030+ return ERR_PTR(err);
89031+
89032+ if (!strcmp(s_tmp->filename, "/"))
89033+ role->root_label = s_tmp;
89034+
89035+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
89036+ return ERR_PTR(-EFAULT);
89037+
89038+ /* copy user and group transition tables */
89039+
89040+ if (s_tmp->user_trans_num) {
89041+ uid_t *uidlist;
89042+
89043+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
89044+ if (uidlist == NULL)
89045+ return ERR_PTR(-ENOMEM);
89046+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
89047+ return ERR_PTR(-EFAULT);
89048+
89049+ s_tmp->user_transitions = uidlist;
89050+ }
89051+
89052+ if (s_tmp->group_trans_num) {
89053+ gid_t *gidlist;
89054+
89055+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
89056+ if (gidlist == NULL)
89057+ return ERR_PTR(-ENOMEM);
89058+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
89059+ return ERR_PTR(-EFAULT);
89060+
89061+ s_tmp->group_transitions = gidlist;
89062+ }
89063+
89064+ /* set up object hash table */
89065+ num_objs = count_user_objs(ghash.first);
89066+
89067+ s_tmp->obj_hash_size = num_objs;
89068+ s_tmp->obj_hash =
89069+ (struct acl_object_label **)
89070+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
89071+
89072+ if (!s_tmp->obj_hash)
89073+ return ERR_PTR(-ENOMEM);
89074+
89075+ memset(s_tmp->obj_hash, 0,
89076+ s_tmp->obj_hash_size *
89077+ sizeof (struct acl_object_label *));
89078+
89079+ /* add in objects */
89080+ err = copy_user_objs(ghash.first, s_tmp, role);
89081+
89082+ if (err)
89083+ return ERR_PTR(err);
89084+
89085+ /* set pointer for parent subject */
89086+ if (s_tmp->parent_subject) {
89087+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
89088+
89089+ if (IS_ERR(s_tmp2))
89090+ return s_tmp2;
89091+
89092+ s_tmp->parent_subject = s_tmp2;
89093+ }
89094+
89095+ /* add in ip acls */
89096+
89097+ if (!s_tmp->ip_num) {
89098+ s_tmp->ips = NULL;
89099+ goto insert;
89100+ }
89101+
89102+ i_tmp =
89103+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
89104+ sizeof (struct acl_ip_label *));
89105+
89106+ if (!i_tmp)
89107+ return ERR_PTR(-ENOMEM);
89108+
89109+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
89110+ *(i_tmp + i_num) =
89111+ (struct acl_ip_label *)
89112+ acl_alloc(sizeof (struct acl_ip_label));
89113+ if (!*(i_tmp + i_num))
89114+ return ERR_PTR(-ENOMEM);
89115+
89116+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
89117+ return ERR_PTR(-EFAULT);
89118+
89119+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
89120+ return ERR_PTR(-EFAULT);
89121+
89122+ if ((*(i_tmp + i_num))->iface == NULL)
89123+ continue;
89124+
89125+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
89126+ if (err)
89127+ return ERR_PTR(err);
89128+ }
89129+
89130+ s_tmp->ips = i_tmp;
89131+
89132+insert:
89133+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
89134+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
89135+ return ERR_PTR(-ENOMEM);
89136+
89137+ return s_tmp;
89138+}
89139+
89140+static int
89141+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
89142+{
89143+ struct acl_subject_label s_pre;
89144+ struct acl_subject_label * ret;
89145+ int err;
89146+
89147+ while (userp) {
89148+ if (copy_acl_subject_label(&s_pre, userp))
89149+ return -EFAULT;
89150+
89151+ ret = do_copy_user_subj(userp, role, NULL);
89152+
89153+ err = PTR_ERR(ret);
89154+ if (IS_ERR(ret))
89155+ return err;
89156+
89157+ insert_acl_subj_label(ret, role);
89158+
89159+ userp = s_pre.prev;
89160+ }
89161+
89162+ return 0;
89163+}
89164+
89165+static int
89166+copy_user_acl(struct gr_arg *arg)
89167+{
89168+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
89169+ struct acl_subject_label *subj_list;
89170+ struct sprole_pw *sptmp;
89171+ struct gr_hash_struct *ghash;
89172+ uid_t *domainlist;
89173+ unsigned int r_num;
89174+ int err = 0;
89175+ __u16 i;
89176+ __u32 num_subjs;
89177+
89178+ /* we need a default and kernel role */
89179+ if (arg->role_db.num_roles < 2)
89180+ return -EINVAL;
89181+
89182+ /* copy special role authentication info from userspace */
89183+
89184+ polstate->num_sprole_pws = arg->num_sprole_pws;
89185+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
89186+
89187+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
89188+ return -ENOMEM;
89189+
89190+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89191+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
89192+ if (!sptmp)
89193+ return -ENOMEM;
89194+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
89195+ return -EFAULT;
89196+
89197+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
89198+ if (err)
89199+ return err;
89200+
89201+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
89202+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
89203+#endif
89204+
89205+ polstate->acl_special_roles[i] = sptmp;
89206+ }
89207+
89208+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
89209+
89210+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
89211+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
89212+
89213+ if (!r_tmp)
89214+ return -ENOMEM;
89215+
89216+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
89217+ return -EFAULT;
89218+
89219+ if (copy_acl_role_label(r_tmp, r_utmp2))
89220+ return -EFAULT;
89221+
89222+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
89223+ if (err)
89224+ return err;
89225+
89226+ if (!strcmp(r_tmp->rolename, "default")
89227+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
89228+ polstate->default_role = r_tmp;
89229+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
89230+ polstate->kernel_role = r_tmp;
89231+ }
89232+
89233+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
89234+ return -ENOMEM;
89235+
89236+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
89237+ return -EFAULT;
89238+
89239+ r_tmp->hash = ghash;
89240+
89241+ num_subjs = count_user_subjs(r_tmp->hash->first);
89242+
89243+ r_tmp->subj_hash_size = num_subjs;
89244+ r_tmp->subj_hash =
89245+ (struct acl_subject_label **)
89246+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
89247+
89248+ if (!r_tmp->subj_hash)
89249+ return -ENOMEM;
89250+
89251+ err = copy_user_allowedips(r_tmp);
89252+ if (err)
89253+ return err;
89254+
89255+ /* copy domain info */
89256+ if (r_tmp->domain_children != NULL) {
89257+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
89258+ if (domainlist == NULL)
89259+ return -ENOMEM;
89260+
89261+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
89262+ return -EFAULT;
89263+
89264+ r_tmp->domain_children = domainlist;
89265+ }
89266+
89267+ err = copy_user_transitions(r_tmp);
89268+ if (err)
89269+ return err;
89270+
89271+ memset(r_tmp->subj_hash, 0,
89272+ r_tmp->subj_hash_size *
89273+ sizeof (struct acl_subject_label *));
89274+
89275+ /* acquire the list of subjects, then NULL out
89276+ the list prior to parsing the subjects for this role,
89277+ as during this parsing the list is replaced with a list
89278+ of *nested* subjects for the role
89279+ */
89280+ subj_list = r_tmp->hash->first;
89281+
89282+ /* set nested subject list to null */
89283+ r_tmp->hash->first = NULL;
89284+
89285+ err = copy_user_subjs(subj_list, r_tmp);
89286+
89287+ if (err)
89288+ return err;
89289+
89290+ insert_acl_role_label(r_tmp);
89291+ }
89292+
89293+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
89294+ return -EINVAL;
89295+
89296+ return err;
89297+}
89298+
89299+static int gracl_reload_apply_policies(void *reload)
89300+{
89301+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
89302+ struct task_struct *task, *task2;
89303+ struct acl_role_label *role, *rtmp;
89304+ struct acl_subject_label *subj;
89305+ const struct cred *cred;
89306+ int role_applied;
89307+ int ret = 0;
89308+
89309+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
89310+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
89311+
89312+ /* first make sure we'll be able to apply the new policy cleanly */
89313+ do_each_thread(task2, task) {
89314+ if (task->exec_file == NULL)
89315+ continue;
89316+ role_applied = 0;
89317+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89318+ /* preserve special roles */
89319+ FOR_EACH_ROLE_START(role)
89320+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89321+ rtmp = task->role;
89322+ task->role = role;
89323+ role_applied = 1;
89324+ break;
89325+ }
89326+ FOR_EACH_ROLE_END(role)
89327+ }
89328+ if (!role_applied) {
89329+ cred = __task_cred(task);
89330+ rtmp = task->role;
89331+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89332+ }
89333+ /* this handles non-nested inherited subjects, nested subjects will still
89334+ be dropped currently */
89335+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89336+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
89337+ /* change the role back so that we've made no modifications to the policy */
89338+ task->role = rtmp;
89339+
89340+ if (subj == NULL || task->tmpacl == NULL) {
89341+ ret = -EINVAL;
89342+ goto out;
89343+ }
89344+ } while_each_thread(task2, task);
89345+
89346+ /* now actually apply the policy */
89347+
89348+ do_each_thread(task2, task) {
89349+ if (task->exec_file) {
89350+ role_applied = 0;
89351+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89352+ /* preserve special roles */
89353+ FOR_EACH_ROLE_START(role)
89354+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89355+ task->role = role;
89356+ role_applied = 1;
89357+ break;
89358+ }
89359+ FOR_EACH_ROLE_END(role)
89360+ }
89361+ if (!role_applied) {
89362+ cred = __task_cred(task);
89363+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89364+ }
89365+ /* this handles non-nested inherited subjects, nested subjects will still
89366+ be dropped currently */
89367+ if (!reload_state->oldmode && task->inherited)
89368+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89369+ else {
89370+ /* looked up and tagged to the task previously */
89371+ subj = task->tmpacl;
89372+ }
89373+ /* subj will be non-null */
89374+ __gr_apply_subject_to_task(polstate, task, subj);
89375+ if (reload_state->oldmode) {
89376+ task->acl_role_id = 0;
89377+ task->acl_sp_role = 0;
89378+ task->inherited = 0;
89379+ }
89380+ } else {
89381+ // it's a kernel process
89382+ task->role = polstate->kernel_role;
89383+ task->acl = polstate->kernel_role->root_label;
89384+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89385+ task->acl->mode &= ~GR_PROCFIND;
89386+#endif
89387+ }
89388+ } while_each_thread(task2, task);
89389+
89390+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
89391+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
89392+
89393+out:
89394+
89395+ return ret;
89396+}
89397+
89398+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
89399+{
89400+ struct gr_reload_state new_reload_state = { };
89401+ int err;
89402+
89403+ new_reload_state.oldpolicy_ptr = polstate;
89404+ new_reload_state.oldalloc_ptr = current_alloc_state;
89405+ new_reload_state.oldmode = oldmode;
89406+
89407+ current_alloc_state = &new_reload_state.newalloc;
89408+ polstate = &new_reload_state.newpolicy;
89409+
89410+ /* everything relevant is now saved off, copy in the new policy */
89411+ if (init_variables(args, true)) {
89412+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89413+ err = -ENOMEM;
89414+ goto error;
89415+ }
89416+
89417+ err = copy_user_acl(args);
89418+ free_init_variables();
89419+ if (err)
89420+ goto error;
89421+ /* the new policy is copied in, with the old policy available via saved_state
89422+ first go through applying roles, making sure to preserve special roles
89423+ then apply new subjects, making sure to preserve inherited and nested subjects,
89424+ though currently only inherited subjects will be preserved
89425+ */
89426+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
89427+ if (err)
89428+ goto error;
89429+
89430+ /* we've now applied the new policy, so restore the old policy state to free it */
89431+ polstate = &new_reload_state.oldpolicy;
89432+ current_alloc_state = &new_reload_state.oldalloc;
89433+ free_variables(true);
89434+
89435+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
89436+ to running_polstate/current_alloc_state inside stop_machine
89437+ */
89438+ err = 0;
89439+ goto out;
89440+error:
89441+ /* on error of loading the new policy, we'll just keep the previous
89442+ policy set around
89443+ */
89444+ free_variables(true);
89445+
89446+ /* doesn't affect runtime, but maintains consistent state */
89447+out:
89448+ polstate = new_reload_state.oldpolicy_ptr;
89449+ current_alloc_state = new_reload_state.oldalloc_ptr;
89450+
89451+ return err;
89452+}
89453+
89454+static int
89455+gracl_init(struct gr_arg *args)
89456+{
89457+ int error = 0;
89458+
89459+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
89460+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
89461+
89462+ if (init_variables(args, false)) {
89463+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89464+ error = -ENOMEM;
89465+ goto out;
89466+ }
89467+
89468+ error = copy_user_acl(args);
89469+ free_init_variables();
89470+ if (error)
89471+ goto out;
89472+
89473+ error = gr_set_acls(0);
89474+ if (error)
89475+ goto out;
89476+
89477+ gr_enable_rbac_system();
89478+
89479+ return 0;
89480+
89481+out:
89482+ free_variables(false);
89483+ return error;
89484+}
89485+
89486+static int
89487+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
89488+ unsigned char **sum)
89489+{
89490+ struct acl_role_label *r;
89491+ struct role_allowed_ip *ipp;
89492+ struct role_transition *trans;
89493+ unsigned int i;
89494+ int found = 0;
89495+ u32 curr_ip = current->signal->curr_ip;
89496+
89497+ current->signal->saved_ip = curr_ip;
89498+
89499+ /* check transition table */
89500+
89501+ for (trans = current->role->transitions; trans; trans = trans->next) {
89502+ if (!strcmp(rolename, trans->rolename)) {
89503+ found = 1;
89504+ break;
89505+ }
89506+ }
89507+
89508+ if (!found)
89509+ return 0;
89510+
89511+ /* handle special roles that do not require authentication
89512+ and check ip */
89513+
89514+ FOR_EACH_ROLE_START(r)
89515+ if (!strcmp(rolename, r->rolename) &&
89516+ (r->roletype & GR_ROLE_SPECIAL)) {
89517+ found = 0;
89518+ if (r->allowed_ips != NULL) {
89519+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
89520+ if ((ntohl(curr_ip) & ipp->netmask) ==
89521+ (ntohl(ipp->addr) & ipp->netmask))
89522+ found = 1;
89523+ }
89524+ } else
89525+ found = 2;
89526+ if (!found)
89527+ return 0;
89528+
89529+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
89530+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
89531+ *salt = NULL;
89532+ *sum = NULL;
89533+ return 1;
89534+ }
89535+ }
89536+ FOR_EACH_ROLE_END(r)
89537+
89538+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89539+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
89540+ *salt = polstate->acl_special_roles[i]->salt;
89541+ *sum = polstate->acl_special_roles[i]->sum;
89542+ return 1;
89543+ }
89544+ }
89545+
89546+ return 0;
89547+}
89548+
89549+int gr_check_secure_terminal(struct task_struct *task)
89550+{
89551+ struct task_struct *p, *p2, *p3;
89552+ struct files_struct *files;
89553+ struct fdtable *fdt;
89554+ struct file *our_file = NULL, *file;
89555+ struct inode *our_inode = NULL;
89556+ int i;
89557+
89558+ if (task->signal->tty == NULL)
89559+ return 1;
89560+
89561+ files = get_files_struct(task);
89562+ if (files != NULL) {
89563+ rcu_read_lock();
89564+ fdt = files_fdtable(files);
89565+ for (i=0; i < fdt->max_fds; i++) {
89566+ file = fcheck_files(files, i);
89567+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
89568+ get_file(file);
89569+ our_file = file;
89570+ }
89571+ }
89572+ rcu_read_unlock();
89573+ put_files_struct(files);
89574+ }
89575+
89576+ if (our_file == NULL)
89577+ return 1;
89578+
89579+ our_inode = d_backing_inode(our_file->f_path.dentry);
89580+
89581+ read_lock(&tasklist_lock);
89582+ do_each_thread(p2, p) {
89583+ files = get_files_struct(p);
89584+ if (files == NULL ||
89585+ (p->signal && p->signal->tty == task->signal->tty)) {
89586+ if (files != NULL)
89587+ put_files_struct(files);
89588+ continue;
89589+ }
89590+ rcu_read_lock();
89591+ fdt = files_fdtable(files);
89592+ for (i=0; i < fdt->max_fds; i++) {
89593+ struct inode *inode = NULL;
89594+ file = fcheck_files(files, i);
89595+ if (file)
89596+ inode = d_backing_inode(file->f_path.dentry);
89597+ if (inode && S_ISCHR(inode->i_mode) && inode->i_rdev == our_inode->i_rdev) {
89598+ p3 = task;
89599+ while (task_pid_nr(p3) > 0) {
89600+ if (p3 == p)
89601+ break;
89602+ p3 = p3->real_parent;
89603+ }
89604+ if (p3 == p)
89605+ break;
89606+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
89607+ gr_handle_alertkill(p);
89608+ rcu_read_unlock();
89609+ put_files_struct(files);
89610+ read_unlock(&tasklist_lock);
89611+ fput(our_file);
89612+ return 0;
89613+ }
89614+ }
89615+ rcu_read_unlock();
89616+ put_files_struct(files);
89617+ } while_each_thread(p2, p);
89618+ read_unlock(&tasklist_lock);
89619+
89620+ fput(our_file);
89621+ return 1;
89622+}
89623+
89624+ssize_t
89625+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
89626+{
89627+ struct gr_arg_wrapper uwrap;
89628+ unsigned char *sprole_salt = NULL;
89629+ unsigned char *sprole_sum = NULL;
89630+ int error = 0;
89631+ int error2 = 0;
89632+ size_t req_count = 0;
89633+ unsigned char oldmode = 0;
89634+
89635+ mutex_lock(&gr_dev_mutex);
89636+
89637+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
89638+ error = -EPERM;
89639+ goto out;
89640+ }
89641+
89642+#ifdef CONFIG_COMPAT
89643+ pax_open_kernel();
89644+ if (is_compat_task()) {
89645+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
89646+ copy_gr_arg = &copy_gr_arg_compat;
89647+ copy_acl_object_label = &copy_acl_object_label_compat;
89648+ copy_acl_subject_label = &copy_acl_subject_label_compat;
89649+ copy_acl_role_label = &copy_acl_role_label_compat;
89650+ copy_acl_ip_label = &copy_acl_ip_label_compat;
89651+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
89652+ copy_role_transition = &copy_role_transition_compat;
89653+ copy_sprole_pw = &copy_sprole_pw_compat;
89654+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
89655+ copy_pointer_from_array = &copy_pointer_from_array_compat;
89656+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
89657+ } else {
89658+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
89659+ copy_gr_arg = &copy_gr_arg_normal;
89660+ copy_acl_object_label = &copy_acl_object_label_normal;
89661+ copy_acl_subject_label = &copy_acl_subject_label_normal;
89662+ copy_acl_role_label = &copy_acl_role_label_normal;
89663+ copy_acl_ip_label = &copy_acl_ip_label_normal;
89664+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
89665+ copy_role_transition = &copy_role_transition_normal;
89666+ copy_sprole_pw = &copy_sprole_pw_normal;
89667+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
89668+ copy_pointer_from_array = &copy_pointer_from_array_normal;
89669+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
89670+ }
89671+ pax_close_kernel();
89672+#endif
89673+
89674+ req_count = get_gr_arg_wrapper_size();
89675+
89676+ if (count != req_count) {
89677+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
89678+ error = -EINVAL;
89679+ goto out;
89680+ }
89681+
89682+
89683+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
89684+ gr_auth_expires = 0;
89685+ gr_auth_attempts = 0;
89686+ }
89687+
89688+ error = copy_gr_arg_wrapper(buf, &uwrap);
89689+ if (error)
89690+ goto out;
89691+
89692+ error = copy_gr_arg(uwrap.arg, gr_usermode);
89693+ if (error)
89694+ goto out;
89695+
89696+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89697+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89698+ time_after(gr_auth_expires, get_seconds())) {
89699+ error = -EBUSY;
89700+ goto out;
89701+ }
89702+
89703+ /* if non-root trying to do anything other than use a special role,
89704+ do not attempt authentication, do not count towards authentication
89705+ locking
89706+ */
89707+
89708+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
89709+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89710+ gr_is_global_nonroot(current_uid())) {
89711+ error = -EPERM;
89712+ goto out;
89713+ }
89714+
89715+ /* ensure pw and special role name are null terminated */
89716+
89717+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
89718+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
89719+
89720+ /* Okay.
89721+ * We have our enough of the argument structure..(we have yet
89722+ * to copy_from_user the tables themselves) . Copy the tables
89723+ * only if we need them, i.e. for loading operations. */
89724+
89725+ switch (gr_usermode->mode) {
89726+ case GR_STATUS:
89727+ if (gr_acl_is_enabled()) {
89728+ error = 1;
89729+ if (!gr_check_secure_terminal(current))
89730+ error = 3;
89731+ } else
89732+ error = 2;
89733+ goto out;
89734+ case GR_SHUTDOWN:
89735+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89736+ stop_machine(gr_rbac_disable, NULL, NULL);
89737+ free_variables(false);
89738+ memset(gr_usermode, 0, sizeof(struct gr_arg));
89739+ memset(gr_system_salt, 0, GR_SALT_LEN);
89740+ memset(gr_system_sum, 0, GR_SHA_LEN);
89741+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
89742+ } else if (gr_acl_is_enabled()) {
89743+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
89744+ error = -EPERM;
89745+ } else {
89746+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
89747+ error = -EAGAIN;
89748+ }
89749+ break;
89750+ case GR_ENABLE:
89751+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
89752+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
89753+ else {
89754+ if (gr_acl_is_enabled())
89755+ error = -EAGAIN;
89756+ else
89757+ error = error2;
89758+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
89759+ }
89760+ break;
89761+ case GR_OLDRELOAD:
89762+ oldmode = 1;
89763+ case GR_RELOAD:
89764+ if (!gr_acl_is_enabled()) {
89765+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
89766+ error = -EAGAIN;
89767+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89768+ error2 = gracl_reload(gr_usermode, oldmode);
89769+ if (!error2)
89770+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
89771+ else {
89772+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89773+ error = error2;
89774+ }
89775+ } else {
89776+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89777+ error = -EPERM;
89778+ }
89779+ break;
89780+ case GR_SEGVMOD:
89781+ if (unlikely(!gr_acl_is_enabled())) {
89782+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
89783+ error = -EAGAIN;
89784+ break;
89785+ }
89786+
89787+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89788+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
89789+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
89790+ struct acl_subject_label *segvacl;
89791+ segvacl =
89792+ lookup_acl_subj_label(gr_usermode->segv_inode,
89793+ gr_usermode->segv_device,
89794+ current->role);
89795+ if (segvacl) {
89796+ segvacl->crashes = 0;
89797+ segvacl->expires = 0;
89798+ }
89799+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
89800+ gr_remove_uid(gr_usermode->segv_uid);
89801+ }
89802+ } else {
89803+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
89804+ error = -EPERM;
89805+ }
89806+ break;
89807+ case GR_SPROLE:
89808+ case GR_SPROLEPAM:
89809+ if (unlikely(!gr_acl_is_enabled())) {
89810+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
89811+ error = -EAGAIN;
89812+ break;
89813+ }
89814+
89815+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
89816+ current->role->expires = 0;
89817+ current->role->auth_attempts = 0;
89818+ }
89819+
89820+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89821+ time_after(current->role->expires, get_seconds())) {
89822+ error = -EBUSY;
89823+ goto out;
89824+ }
89825+
89826+ if (lookup_special_role_auth
89827+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
89828+ && ((!sprole_salt && !sprole_sum)
89829+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
89830+ char *p = "";
89831+ assign_special_role(gr_usermode->sp_role);
89832+ read_lock(&tasklist_lock);
89833+ if (current->real_parent)
89834+ p = current->real_parent->role->rolename;
89835+ read_unlock(&tasklist_lock);
89836+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
89837+ p, acl_sp_role_value);
89838+ } else {
89839+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
89840+ error = -EPERM;
89841+ if(!(current->role->auth_attempts++))
89842+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89843+
89844+ goto out;
89845+ }
89846+ break;
89847+ case GR_UNSPROLE:
89848+ if (unlikely(!gr_acl_is_enabled())) {
89849+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
89850+ error = -EAGAIN;
89851+ break;
89852+ }
89853+
89854+ if (current->role->roletype & GR_ROLE_SPECIAL) {
89855+ char *p = "";
89856+ int i = 0;
89857+
89858+ read_lock(&tasklist_lock);
89859+ if (current->real_parent) {
89860+ p = current->real_parent->role->rolename;
89861+ i = current->real_parent->acl_role_id;
89862+ }
89863+ read_unlock(&tasklist_lock);
89864+
89865+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
89866+ gr_set_acls(1);
89867+ } else {
89868+ error = -EPERM;
89869+ goto out;
89870+ }
89871+ break;
89872+ default:
89873+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
89874+ error = -EINVAL;
89875+ break;
89876+ }
89877+
89878+ if (error != -EPERM)
89879+ goto out;
89880+
89881+ if(!(gr_auth_attempts++))
89882+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89883+
89884+ out:
89885+ mutex_unlock(&gr_dev_mutex);
89886+
89887+ if (!error)
89888+ error = req_count;
89889+
89890+ return error;
89891+}
89892+
89893+int
89894+gr_set_acls(const int type)
89895+{
89896+ struct task_struct *task, *task2;
89897+ struct acl_role_label *role = current->role;
89898+ struct acl_subject_label *subj;
89899+ __u16 acl_role_id = current->acl_role_id;
89900+ const struct cred *cred;
89901+ int ret;
89902+
89903+ rcu_read_lock();
89904+ read_lock(&tasklist_lock);
89905+ read_lock(&grsec_exec_file_lock);
89906+ do_each_thread(task2, task) {
89907+ /* check to see if we're called from the exit handler,
89908+ if so, only replace ACLs that have inherited the admin
89909+ ACL */
89910+
89911+ if (type && (task->role != role ||
89912+ task->acl_role_id != acl_role_id))
89913+ continue;
89914+
89915+ task->acl_role_id = 0;
89916+ task->acl_sp_role = 0;
89917+ task->inherited = 0;
89918+
89919+ if (task->exec_file) {
89920+ cred = __task_cred(task);
89921+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89922+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
89923+ if (subj == NULL) {
89924+ ret = -EINVAL;
89925+ read_unlock(&grsec_exec_file_lock);
89926+ read_unlock(&tasklist_lock);
89927+ rcu_read_unlock();
89928+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
89929+ return ret;
89930+ }
89931+ __gr_apply_subject_to_task(polstate, task, subj);
89932+ } else {
89933+ // it's a kernel process
89934+ task->role = polstate->kernel_role;
89935+ task->acl = polstate->kernel_role->root_label;
89936+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89937+ task->acl->mode &= ~GR_PROCFIND;
89938+#endif
89939+ }
89940+ } while_each_thread(task2, task);
89941+ read_unlock(&grsec_exec_file_lock);
89942+ read_unlock(&tasklist_lock);
89943+ rcu_read_unlock();
89944+
89945+ return 0;
89946+}
89947diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
89948new file mode 100644
89949index 0000000..39645c9
89950--- /dev/null
89951+++ b/grsecurity/gracl_res.c
89952@@ -0,0 +1,68 @@
89953+#include <linux/kernel.h>
89954+#include <linux/sched.h>
89955+#include <linux/gracl.h>
89956+#include <linux/grinternal.h>
89957+
89958+static const char *restab_log[] = {
89959+ [RLIMIT_CPU] = "RLIMIT_CPU",
89960+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
89961+ [RLIMIT_DATA] = "RLIMIT_DATA",
89962+ [RLIMIT_STACK] = "RLIMIT_STACK",
89963+ [RLIMIT_CORE] = "RLIMIT_CORE",
89964+ [RLIMIT_RSS] = "RLIMIT_RSS",
89965+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
89966+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
89967+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
89968+ [RLIMIT_AS] = "RLIMIT_AS",
89969+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
89970+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
89971+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
89972+ [RLIMIT_NICE] = "RLIMIT_NICE",
89973+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
89974+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
89975+ [GR_CRASH_RES] = "RLIMIT_CRASH"
89976+};
89977+
89978+void
89979+gr_log_resource(const struct task_struct *task,
89980+ const int res, const unsigned long wanted, const int gt)
89981+{
89982+ const struct cred *cred;
89983+ unsigned long rlim;
89984+
89985+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
89986+ return;
89987+
89988+ // not yet supported resource
89989+ if (unlikely(!restab_log[res]))
89990+ return;
89991+
89992+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
89993+ rlim = task_rlimit_max(task, res);
89994+ else
89995+ rlim = task_rlimit(task, res);
89996+
89997+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
89998+ return;
89999+
90000+ rcu_read_lock();
90001+ cred = __task_cred(task);
90002+
90003+ if (res == RLIMIT_NPROC &&
90004+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
90005+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
90006+ goto out_rcu_unlock;
90007+ else if (res == RLIMIT_MEMLOCK &&
90008+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
90009+ goto out_rcu_unlock;
90010+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
90011+ goto out_rcu_unlock;
90012+ rcu_read_unlock();
90013+
90014+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
90015+
90016+ return;
90017+out_rcu_unlock:
90018+ rcu_read_unlock();
90019+ return;
90020+}
90021diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
90022new file mode 100644
90023index 0000000..21646aa
90024--- /dev/null
90025+++ b/grsecurity/gracl_segv.c
90026@@ -0,0 +1,304 @@
90027+#include <linux/kernel.h>
90028+#include <linux/mm.h>
90029+#include <asm/uaccess.h>
90030+#include <asm/errno.h>
90031+#include <asm/mman.h>
90032+#include <net/sock.h>
90033+#include <linux/file.h>
90034+#include <linux/fs.h>
90035+#include <linux/net.h>
90036+#include <linux/in.h>
90037+#include <linux/slab.h>
90038+#include <linux/types.h>
90039+#include <linux/sched.h>
90040+#include <linux/timer.h>
90041+#include <linux/gracl.h>
90042+#include <linux/grsecurity.h>
90043+#include <linux/grinternal.h>
90044+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
90045+#include <linux/magic.h>
90046+#include <linux/pagemap.h>
90047+#include "../fs/btrfs/async-thread.h"
90048+#include "../fs/btrfs/ctree.h"
90049+#include "../fs/btrfs/btrfs_inode.h"
90050+#endif
90051+
90052+static struct crash_uid *uid_set;
90053+static unsigned short uid_used;
90054+static DEFINE_SPINLOCK(gr_uid_lock);
90055+extern rwlock_t gr_inode_lock;
90056+extern struct acl_subject_label *
90057+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
90058+ struct acl_role_label *role);
90059+
90060+int
90061+gr_init_uidset(void)
90062+{
90063+ uid_set =
90064+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
90065+ uid_used = 0;
90066+
90067+ return uid_set ? 1 : 0;
90068+}
90069+
90070+void
90071+gr_free_uidset(void)
90072+{
90073+ if (uid_set) {
90074+ struct crash_uid *tmpset;
90075+ spin_lock(&gr_uid_lock);
90076+ tmpset = uid_set;
90077+ uid_set = NULL;
90078+ uid_used = 0;
90079+ spin_unlock(&gr_uid_lock);
90080+ if (tmpset)
90081+ kfree(tmpset);
90082+ }
90083+
90084+ return;
90085+}
90086+
90087+int
90088+gr_find_uid(const uid_t uid)
90089+{
90090+ struct crash_uid *tmp = uid_set;
90091+ uid_t buid;
90092+ int low = 0, high = uid_used - 1, mid;
90093+
90094+ while (high >= low) {
90095+ mid = (low + high) >> 1;
90096+ buid = tmp[mid].uid;
90097+ if (buid == uid)
90098+ return mid;
90099+ if (buid > uid)
90100+ high = mid - 1;
90101+ if (buid < uid)
90102+ low = mid + 1;
90103+ }
90104+
90105+ return -1;
90106+}
90107+
90108+static void
90109+gr_insertsort(void)
90110+{
90111+ unsigned short i, j;
90112+ struct crash_uid index;
90113+
90114+ for (i = 1; i < uid_used; i++) {
90115+ index = uid_set[i];
90116+ j = i;
90117+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
90118+ uid_set[j] = uid_set[j - 1];
90119+ j--;
90120+ }
90121+ uid_set[j] = index;
90122+ }
90123+
90124+ return;
90125+}
90126+
90127+static void
90128+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
90129+{
90130+ int loc;
90131+ uid_t uid = GR_GLOBAL_UID(kuid);
90132+
90133+ if (uid_used == GR_UIDTABLE_MAX)
90134+ return;
90135+
90136+ loc = gr_find_uid(uid);
90137+
90138+ if (loc >= 0) {
90139+ uid_set[loc].expires = expires;
90140+ return;
90141+ }
90142+
90143+ uid_set[uid_used].uid = uid;
90144+ uid_set[uid_used].expires = expires;
90145+ uid_used++;
90146+
90147+ gr_insertsort();
90148+
90149+ return;
90150+}
90151+
90152+void
90153+gr_remove_uid(const unsigned short loc)
90154+{
90155+ unsigned short i;
90156+
90157+ for (i = loc + 1; i < uid_used; i++)
90158+ uid_set[i - 1] = uid_set[i];
90159+
90160+ uid_used--;
90161+
90162+ return;
90163+}
90164+
90165+int
90166+gr_check_crash_uid(const kuid_t kuid)
90167+{
90168+ int loc;
90169+ int ret = 0;
90170+ uid_t uid;
90171+
90172+ if (unlikely(!gr_acl_is_enabled()))
90173+ return 0;
90174+
90175+ uid = GR_GLOBAL_UID(kuid);
90176+
90177+ spin_lock(&gr_uid_lock);
90178+ loc = gr_find_uid(uid);
90179+
90180+ if (loc < 0)
90181+ goto out_unlock;
90182+
90183+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
90184+ gr_remove_uid(loc);
90185+ else
90186+ ret = 1;
90187+
90188+out_unlock:
90189+ spin_unlock(&gr_uid_lock);
90190+ return ret;
90191+}
90192+
90193+static int
90194+proc_is_setxid(const struct cred *cred)
90195+{
90196+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
90197+ !uid_eq(cred->uid, cred->fsuid))
90198+ return 1;
90199+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
90200+ !gid_eq(cred->gid, cred->fsgid))
90201+ return 1;
90202+
90203+ return 0;
90204+}
90205+
90206+extern int gr_fake_force_sig(int sig, struct task_struct *t);
90207+
90208+void
90209+gr_handle_crash(struct task_struct *task, const int sig)
90210+{
90211+ struct acl_subject_label *curr;
90212+ struct task_struct *tsk, *tsk2;
90213+ const struct cred *cred;
90214+ const struct cred *cred2;
90215+
90216+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
90217+ return;
90218+
90219+ if (unlikely(!gr_acl_is_enabled()))
90220+ return;
90221+
90222+ curr = task->acl;
90223+
90224+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
90225+ return;
90226+
90227+ if (time_before_eq(curr->expires, get_seconds())) {
90228+ curr->expires = 0;
90229+ curr->crashes = 0;
90230+ }
90231+
90232+ curr->crashes++;
90233+
90234+ if (!curr->expires)
90235+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
90236+
90237+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90238+ time_after(curr->expires, get_seconds())) {
90239+ rcu_read_lock();
90240+ cred = __task_cred(task);
90241+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
90242+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90243+ spin_lock(&gr_uid_lock);
90244+ gr_insert_uid(cred->uid, curr->expires);
90245+ spin_unlock(&gr_uid_lock);
90246+ curr->expires = 0;
90247+ curr->crashes = 0;
90248+ read_lock(&tasklist_lock);
90249+ do_each_thread(tsk2, tsk) {
90250+ cred2 = __task_cred(tsk);
90251+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
90252+ gr_fake_force_sig(SIGKILL, tsk);
90253+ } while_each_thread(tsk2, tsk);
90254+ read_unlock(&tasklist_lock);
90255+ } else {
90256+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90257+ read_lock(&tasklist_lock);
90258+ read_lock(&grsec_exec_file_lock);
90259+ do_each_thread(tsk2, tsk) {
90260+ if (likely(tsk != task)) {
90261+ // if this thread has the same subject as the one that triggered
90262+ // RES_CRASH and it's the same binary, kill it
90263+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
90264+ gr_fake_force_sig(SIGKILL, tsk);
90265+ }
90266+ } while_each_thread(tsk2, tsk);
90267+ read_unlock(&grsec_exec_file_lock);
90268+ read_unlock(&tasklist_lock);
90269+ }
90270+ rcu_read_unlock();
90271+ }
90272+
90273+ return;
90274+}
90275+
90276+int
90277+gr_check_crash_exec(const struct file *filp)
90278+{
90279+ struct acl_subject_label *curr;
90280+ struct dentry *dentry;
90281+
90282+ if (unlikely(!gr_acl_is_enabled()))
90283+ return 0;
90284+
90285+ read_lock(&gr_inode_lock);
90286+ dentry = filp->f_path.dentry;
90287+ curr = lookup_acl_subj_label(gr_get_ino_from_dentry(dentry), gr_get_dev_from_dentry(dentry),
90288+ current->role);
90289+ read_unlock(&gr_inode_lock);
90290+
90291+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
90292+ (!curr->crashes && !curr->expires))
90293+ return 0;
90294+
90295+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90296+ time_after(curr->expires, get_seconds()))
90297+ return 1;
90298+ else if (time_before_eq(curr->expires, get_seconds())) {
90299+ curr->crashes = 0;
90300+ curr->expires = 0;
90301+ }
90302+
90303+ return 0;
90304+}
90305+
90306+void
90307+gr_handle_alertkill(struct task_struct *task)
90308+{
90309+ struct acl_subject_label *curracl;
90310+ __u32 curr_ip;
90311+ struct task_struct *p, *p2;
90312+
90313+ if (unlikely(!gr_acl_is_enabled()))
90314+ return;
90315+
90316+ curracl = task->acl;
90317+ curr_ip = task->signal->curr_ip;
90318+
90319+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
90320+ read_lock(&tasklist_lock);
90321+ do_each_thread(p2, p) {
90322+ if (p->signal->curr_ip == curr_ip)
90323+ gr_fake_force_sig(SIGKILL, p);
90324+ } while_each_thread(p2, p);
90325+ read_unlock(&tasklist_lock);
90326+ } else if (curracl->mode & GR_KILLPROC)
90327+ gr_fake_force_sig(SIGKILL, task);
90328+
90329+ return;
90330+}
90331diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
90332new file mode 100644
90333index 0000000..6b0c9cc
90334--- /dev/null
90335+++ b/grsecurity/gracl_shm.c
90336@@ -0,0 +1,40 @@
90337+#include <linux/kernel.h>
90338+#include <linux/mm.h>
90339+#include <linux/sched.h>
90340+#include <linux/file.h>
90341+#include <linux/ipc.h>
90342+#include <linux/gracl.h>
90343+#include <linux/grsecurity.h>
90344+#include <linux/grinternal.h>
90345+
90346+int
90347+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90348+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90349+{
90350+ struct task_struct *task;
90351+
90352+ if (!gr_acl_is_enabled())
90353+ return 1;
90354+
90355+ rcu_read_lock();
90356+ read_lock(&tasklist_lock);
90357+
90358+ task = find_task_by_vpid(shm_cprid);
90359+
90360+ if (unlikely(!task))
90361+ task = find_task_by_vpid(shm_lapid);
90362+
90363+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
90364+ (task_pid_nr(task) == shm_lapid)) &&
90365+ (task->acl->mode & GR_PROTSHM) &&
90366+ (task->acl != current->acl))) {
90367+ read_unlock(&tasklist_lock);
90368+ rcu_read_unlock();
90369+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
90370+ return 0;
90371+ }
90372+ read_unlock(&tasklist_lock);
90373+ rcu_read_unlock();
90374+
90375+ return 1;
90376+}
90377diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
90378new file mode 100644
90379index 0000000..bc0be01
90380--- /dev/null
90381+++ b/grsecurity/grsec_chdir.c
90382@@ -0,0 +1,19 @@
90383+#include <linux/kernel.h>
90384+#include <linux/sched.h>
90385+#include <linux/fs.h>
90386+#include <linux/file.h>
90387+#include <linux/grsecurity.h>
90388+#include <linux/grinternal.h>
90389+
90390+void
90391+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
90392+{
90393+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
90394+ if ((grsec_enable_chdir && grsec_enable_group &&
90395+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
90396+ !grsec_enable_group)) {
90397+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
90398+ }
90399+#endif
90400+ return;
90401+}
90402diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
90403new file mode 100644
90404index 0000000..652ab45
90405--- /dev/null
90406+++ b/grsecurity/grsec_chroot.c
90407@@ -0,0 +1,467 @@
90408+#include <linux/kernel.h>
90409+#include <linux/module.h>
90410+#include <linux/sched.h>
90411+#include <linux/file.h>
90412+#include <linux/fs.h>
90413+#include <linux/mount.h>
90414+#include <linux/types.h>
90415+#include "../fs/mount.h"
90416+#include <linux/grsecurity.h>
90417+#include <linux/grinternal.h>
90418+
90419+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90420+int gr_init_ran;
90421+#endif
90422+
90423+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90424+{
90425+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90426+ struct dentry *tmpd = dentry;
90427+
90428+ read_seqlock_excl(&mount_lock);
90429+ write_seqlock(&rename_lock);
90430+
90431+ while (tmpd != mnt->mnt_root) {
90432+ atomic_inc(&tmpd->chroot_refcnt);
90433+ tmpd = tmpd->d_parent;
90434+ }
90435+ atomic_inc(&tmpd->chroot_refcnt);
90436+
90437+ write_sequnlock(&rename_lock);
90438+ read_sequnlock_excl(&mount_lock);
90439+#endif
90440+}
90441+
90442+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90443+{
90444+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90445+ struct dentry *tmpd = dentry;
90446+
90447+ read_seqlock_excl(&mount_lock);
90448+ write_seqlock(&rename_lock);
90449+
90450+ while (tmpd != mnt->mnt_root) {
90451+ atomic_dec(&tmpd->chroot_refcnt);
90452+ tmpd = tmpd->d_parent;
90453+ }
90454+ atomic_dec(&tmpd->chroot_refcnt);
90455+
90456+ write_sequnlock(&rename_lock);
90457+ read_sequnlock_excl(&mount_lock);
90458+#endif
90459+}
90460+
90461+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90462+static struct dentry *get_closest_chroot(struct dentry *dentry)
90463+{
90464+ write_seqlock(&rename_lock);
90465+ do {
90466+ if (atomic_read(&dentry->chroot_refcnt)) {
90467+ write_sequnlock(&rename_lock);
90468+ return dentry;
90469+ }
90470+ dentry = dentry->d_parent;
90471+ } while (!IS_ROOT(dentry));
90472+ write_sequnlock(&rename_lock);
90473+ return NULL;
90474+}
90475+#endif
90476+
90477+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90478+ struct dentry *newdentry, struct vfsmount *newmnt)
90479+{
90480+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90481+ struct dentry *chroot;
90482+
90483+ if (unlikely(!grsec_enable_chroot_rename))
90484+ return 0;
90485+
90486+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
90487+ return 0;
90488+
90489+ chroot = get_closest_chroot(olddentry);
90490+
90491+ if (chroot == NULL)
90492+ return 0;
90493+
90494+ if (is_subdir(newdentry, chroot))
90495+ return 0;
90496+
90497+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
90498+
90499+ return 1;
90500+#else
90501+ return 0;
90502+#endif
90503+}
90504+
90505+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
90506+{
90507+#ifdef CONFIG_GRKERNSEC
90508+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
90509+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
90510+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90511+ && gr_init_ran
90512+#endif
90513+ )
90514+ task->gr_is_chrooted = 1;
90515+ else {
90516+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90517+ if (task_pid_nr(task) == 1 && !gr_init_ran)
90518+ gr_init_ran = 1;
90519+#endif
90520+ task->gr_is_chrooted = 0;
90521+ }
90522+
90523+ task->gr_chroot_dentry = path->dentry;
90524+#endif
90525+ return;
90526+}
90527+
90528+void gr_clear_chroot_entries(struct task_struct *task)
90529+{
90530+#ifdef CONFIG_GRKERNSEC
90531+ task->gr_is_chrooted = 0;
90532+ task->gr_chroot_dentry = NULL;
90533+#endif
90534+ return;
90535+}
90536+
90537+int
90538+gr_handle_chroot_unix(const pid_t pid)
90539+{
90540+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
90541+ struct task_struct *p;
90542+
90543+ if (unlikely(!grsec_enable_chroot_unix))
90544+ return 1;
90545+
90546+ if (likely(!proc_is_chrooted(current)))
90547+ return 1;
90548+
90549+ rcu_read_lock();
90550+ read_lock(&tasklist_lock);
90551+ p = find_task_by_vpid_unrestricted(pid);
90552+ if (unlikely(p && !have_same_root(current, p))) {
90553+ read_unlock(&tasklist_lock);
90554+ rcu_read_unlock();
90555+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
90556+ return 0;
90557+ }
90558+ read_unlock(&tasklist_lock);
90559+ rcu_read_unlock();
90560+#endif
90561+ return 1;
90562+}
90563+
90564+int
90565+gr_handle_chroot_nice(void)
90566+{
90567+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90568+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
90569+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
90570+ return -EPERM;
90571+ }
90572+#endif
90573+ return 0;
90574+}
90575+
90576+int
90577+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
90578+{
90579+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90580+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
90581+ && proc_is_chrooted(current)) {
90582+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
90583+ return -EACCES;
90584+ }
90585+#endif
90586+ return 0;
90587+}
90588+
90589+int
90590+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
90591+{
90592+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90593+ struct task_struct *p;
90594+ int ret = 0;
90595+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
90596+ return ret;
90597+
90598+ read_lock(&tasklist_lock);
90599+ do_each_pid_task(pid, type, p) {
90600+ if (!have_same_root(current, p)) {
90601+ ret = 1;
90602+ goto out;
90603+ }
90604+ } while_each_pid_task(pid, type, p);
90605+out:
90606+ read_unlock(&tasklist_lock);
90607+ return ret;
90608+#endif
90609+ return 0;
90610+}
90611+
90612+int
90613+gr_pid_is_chrooted(struct task_struct *p)
90614+{
90615+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90616+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
90617+ return 0;
90618+
90619+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
90620+ !have_same_root(current, p)) {
90621+ return 1;
90622+ }
90623+#endif
90624+ return 0;
90625+}
90626+
90627+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
90628+
90629+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
90630+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
90631+{
90632+ struct path path, currentroot;
90633+ int ret = 0;
90634+
90635+ path.dentry = (struct dentry *)u_dentry;
90636+ path.mnt = (struct vfsmount *)u_mnt;
90637+ get_fs_root(current->fs, &currentroot);
90638+ if (path_is_under(&path, &currentroot))
90639+ ret = 1;
90640+ path_put(&currentroot);
90641+
90642+ return ret;
90643+}
90644+#endif
90645+
90646+int
90647+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
90648+{
90649+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90650+ if (!grsec_enable_chroot_fchdir)
90651+ return 1;
90652+
90653+ if (!proc_is_chrooted(current))
90654+ return 1;
90655+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
90656+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
90657+ return 0;
90658+ }
90659+#endif
90660+ return 1;
90661+}
90662+
90663+int
90664+gr_chroot_fhandle(void)
90665+{
90666+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90667+ if (!grsec_enable_chroot_fchdir)
90668+ return 1;
90669+
90670+ if (!proc_is_chrooted(current))
90671+ return 1;
90672+ else {
90673+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
90674+ return 0;
90675+ }
90676+#endif
90677+ return 1;
90678+}
90679+
90680+int
90681+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90682+ const u64 shm_createtime)
90683+{
90684+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
90685+ struct task_struct *p;
90686+
90687+ if (unlikely(!grsec_enable_chroot_shmat))
90688+ return 1;
90689+
90690+ if (likely(!proc_is_chrooted(current)))
90691+ return 1;
90692+
90693+ rcu_read_lock();
90694+ read_lock(&tasklist_lock);
90695+
90696+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
90697+ if (time_before_eq64(p->start_time, shm_createtime)) {
90698+ if (have_same_root(current, p)) {
90699+ goto allow;
90700+ } else {
90701+ read_unlock(&tasklist_lock);
90702+ rcu_read_unlock();
90703+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90704+ return 0;
90705+ }
90706+ }
90707+ /* creator exited, pid reuse, fall through to next check */
90708+ }
90709+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
90710+ if (unlikely(!have_same_root(current, p))) {
90711+ read_unlock(&tasklist_lock);
90712+ rcu_read_unlock();
90713+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90714+ return 0;
90715+ }
90716+ }
90717+
90718+allow:
90719+ read_unlock(&tasklist_lock);
90720+ rcu_read_unlock();
90721+#endif
90722+ return 1;
90723+}
90724+
90725+void
90726+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
90727+{
90728+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
90729+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
90730+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
90731+#endif
90732+ return;
90733+}
90734+
90735+int
90736+gr_handle_chroot_mknod(const struct dentry *dentry,
90737+ const struct vfsmount *mnt, const int mode)
90738+{
90739+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
90740+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
90741+ proc_is_chrooted(current)) {
90742+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
90743+ return -EPERM;
90744+ }
90745+#endif
90746+ return 0;
90747+}
90748+
90749+int
90750+gr_handle_chroot_mount(const struct dentry *dentry,
90751+ const struct vfsmount *mnt, const char *dev_name)
90752+{
90753+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
90754+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
90755+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
90756+ return -EPERM;
90757+ }
90758+#endif
90759+ return 0;
90760+}
90761+
90762+int
90763+gr_handle_chroot_pivot(void)
90764+{
90765+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
90766+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
90767+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
90768+ return -EPERM;
90769+ }
90770+#endif
90771+ return 0;
90772+}
90773+
90774+int
90775+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
90776+{
90777+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
90778+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
90779+ !gr_is_outside_chroot(dentry, mnt)) {
90780+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
90781+ return -EPERM;
90782+ }
90783+#endif
90784+ return 0;
90785+}
90786+
90787+extern const char *captab_log[];
90788+extern int captab_log_entries;
90789+
90790+int
90791+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
90792+{
90793+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90794+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90795+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90796+ if (cap_raised(chroot_caps, cap)) {
90797+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
90798+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
90799+ }
90800+ return 0;
90801+ }
90802+ }
90803+#endif
90804+ return 1;
90805+}
90806+
90807+int
90808+gr_chroot_is_capable(const int cap)
90809+{
90810+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90811+ return gr_task_chroot_is_capable(current, current_cred(), cap);
90812+#endif
90813+ return 1;
90814+}
90815+
90816+int
90817+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
90818+{
90819+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90820+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90821+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90822+ if (cap_raised(chroot_caps, cap)) {
90823+ return 0;
90824+ }
90825+ }
90826+#endif
90827+ return 1;
90828+}
90829+
90830+int
90831+gr_chroot_is_capable_nolog(const int cap)
90832+{
90833+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90834+ return gr_task_chroot_is_capable_nolog(current, cap);
90835+#endif
90836+ return 1;
90837+}
90838+
90839+int
90840+gr_handle_chroot_sysctl(const int op)
90841+{
90842+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
90843+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
90844+ proc_is_chrooted(current))
90845+ return -EACCES;
90846+#endif
90847+ return 0;
90848+}
90849+
90850+void
90851+gr_handle_chroot_chdir(const struct path *path)
90852+{
90853+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
90854+ if (grsec_enable_chroot_chdir)
90855+ set_fs_pwd(current->fs, path);
90856+#endif
90857+ return;
90858+}
90859+
90860+int
90861+gr_handle_chroot_chmod(const struct dentry *dentry,
90862+ const struct vfsmount *mnt, const int mode)
90863+{
90864+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
90865+ /* allow chmod +s on directories, but not files */
90866+ if (grsec_enable_chroot_chmod && !d_is_dir(dentry) &&
90867+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
90868+ proc_is_chrooted(current)) {
90869+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
90870+ return -EPERM;
90871+ }
90872+#endif
90873+ return 0;
90874+}
90875diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
90876new file mode 100644
90877index 0000000..e723c08
90878--- /dev/null
90879+++ b/grsecurity/grsec_disabled.c
90880@@ -0,0 +1,445 @@
90881+#include <linux/kernel.h>
90882+#include <linux/module.h>
90883+#include <linux/sched.h>
90884+#include <linux/file.h>
90885+#include <linux/fs.h>
90886+#include <linux/kdev_t.h>
90887+#include <linux/net.h>
90888+#include <linux/in.h>
90889+#include <linux/ip.h>
90890+#include <linux/skbuff.h>
90891+#include <linux/sysctl.h>
90892+
90893+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
90894+void
90895+pax_set_initial_flags(struct linux_binprm *bprm)
90896+{
90897+ return;
90898+}
90899+#endif
90900+
90901+#ifdef CONFIG_SYSCTL
90902+__u32
90903+gr_handle_sysctl(const struct ctl_table * table, const int op)
90904+{
90905+ return 0;
90906+}
90907+#endif
90908+
90909+#ifdef CONFIG_TASKSTATS
90910+int gr_is_taskstats_denied(int pid)
90911+{
90912+ return 0;
90913+}
90914+#endif
90915+
90916+int
90917+gr_acl_is_enabled(void)
90918+{
90919+ return 0;
90920+}
90921+
90922+int
90923+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
90924+{
90925+ return 0;
90926+}
90927+
90928+void
90929+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
90930+{
90931+ return;
90932+}
90933+
90934+int
90935+gr_handle_rawio(const struct inode *inode)
90936+{
90937+ return 0;
90938+}
90939+
90940+void
90941+gr_acl_handle_psacct(struct task_struct *task, const long code)
90942+{
90943+ return;
90944+}
90945+
90946+int
90947+gr_handle_ptrace(struct task_struct *task, const long request)
90948+{
90949+ return 0;
90950+}
90951+
90952+int
90953+gr_handle_proc_ptrace(struct task_struct *task)
90954+{
90955+ return 0;
90956+}
90957+
90958+int
90959+gr_set_acls(const int type)
90960+{
90961+ return 0;
90962+}
90963+
90964+int
90965+gr_check_hidden_task(const struct task_struct *tsk)
90966+{
90967+ return 0;
90968+}
90969+
90970+int
90971+gr_check_protected_task(const struct task_struct *task)
90972+{
90973+ return 0;
90974+}
90975+
90976+int
90977+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
90978+{
90979+ return 0;
90980+}
90981+
90982+void
90983+gr_copy_label(struct task_struct *tsk)
90984+{
90985+ return;
90986+}
90987+
90988+void
90989+gr_set_pax_flags(struct task_struct *task)
90990+{
90991+ return;
90992+}
90993+
90994+int
90995+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
90996+ const int unsafe_share)
90997+{
90998+ return 0;
90999+}
91000+
91001+void
91002+gr_handle_delete(const u64 ino, const dev_t dev)
91003+{
91004+ return;
91005+}
91006+
91007+void
91008+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
91009+{
91010+ return;
91011+}
91012+
91013+void
91014+gr_handle_crash(struct task_struct *task, const int sig)
91015+{
91016+ return;
91017+}
91018+
91019+int
91020+gr_check_crash_exec(const struct file *filp)
91021+{
91022+ return 0;
91023+}
91024+
91025+int
91026+gr_check_crash_uid(const kuid_t uid)
91027+{
91028+ return 0;
91029+}
91030+
91031+void
91032+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
91033+ struct dentry *old_dentry,
91034+ struct dentry *new_dentry,
91035+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
91036+{
91037+ return;
91038+}
91039+
91040+int
91041+gr_search_socket(const int family, const int type, const int protocol)
91042+{
91043+ return 1;
91044+}
91045+
91046+int
91047+gr_search_connectbind(const int mode, const struct socket *sock,
91048+ const struct sockaddr_in *addr)
91049+{
91050+ return 0;
91051+}
91052+
91053+void
91054+gr_handle_alertkill(struct task_struct *task)
91055+{
91056+ return;
91057+}
91058+
91059+__u32
91060+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
91061+{
91062+ return 1;
91063+}
91064+
91065+__u32
91066+gr_acl_handle_hidden_file(const struct dentry * dentry,
91067+ const struct vfsmount * mnt)
91068+{
91069+ return 1;
91070+}
91071+
91072+__u32
91073+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
91074+ int acc_mode)
91075+{
91076+ return 1;
91077+}
91078+
91079+__u32
91080+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
91081+{
91082+ return 1;
91083+}
91084+
91085+__u32
91086+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
91087+{
91088+ return 1;
91089+}
91090+
91091+int
91092+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
91093+ unsigned int *vm_flags)
91094+{
91095+ return 1;
91096+}
91097+
91098+__u32
91099+gr_acl_handle_truncate(const struct dentry * dentry,
91100+ const struct vfsmount * mnt)
91101+{
91102+ return 1;
91103+}
91104+
91105+__u32
91106+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
91107+{
91108+ return 1;
91109+}
91110+
91111+__u32
91112+gr_acl_handle_access(const struct dentry * dentry,
91113+ const struct vfsmount * mnt, const int fmode)
91114+{
91115+ return 1;
91116+}
91117+
91118+__u32
91119+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
91120+ umode_t *mode)
91121+{
91122+ return 1;
91123+}
91124+
91125+__u32
91126+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
91127+{
91128+ return 1;
91129+}
91130+
91131+__u32
91132+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
91133+{
91134+ return 1;
91135+}
91136+
91137+__u32
91138+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
91139+{
91140+ return 1;
91141+}
91142+
91143+void
91144+grsecurity_init(void)
91145+{
91146+ return;
91147+}
91148+
91149+umode_t gr_acl_umask(void)
91150+{
91151+ return 0;
91152+}
91153+
91154+__u32
91155+gr_acl_handle_mknod(const struct dentry * new_dentry,
91156+ const struct dentry * parent_dentry,
91157+ const struct vfsmount * parent_mnt,
91158+ const int mode)
91159+{
91160+ return 1;
91161+}
91162+
91163+__u32
91164+gr_acl_handle_mkdir(const struct dentry * new_dentry,
91165+ const struct dentry * parent_dentry,
91166+ const struct vfsmount * parent_mnt)
91167+{
91168+ return 1;
91169+}
91170+
91171+__u32
91172+gr_acl_handle_symlink(const struct dentry * new_dentry,
91173+ const struct dentry * parent_dentry,
91174+ const struct vfsmount * parent_mnt, const struct filename *from)
91175+{
91176+ return 1;
91177+}
91178+
91179+__u32
91180+gr_acl_handle_link(const struct dentry * new_dentry,
91181+ const struct dentry * parent_dentry,
91182+ const struct vfsmount * parent_mnt,
91183+ const struct dentry * old_dentry,
91184+ const struct vfsmount * old_mnt, const struct filename *to)
91185+{
91186+ return 1;
91187+}
91188+
91189+int
91190+gr_acl_handle_rename(const struct dentry *new_dentry,
91191+ const struct dentry *parent_dentry,
91192+ const struct vfsmount *parent_mnt,
91193+ const struct dentry *old_dentry,
91194+ const struct inode *old_parent_inode,
91195+ const struct vfsmount *old_mnt, const struct filename *newname,
91196+ unsigned int flags)
91197+{
91198+ return 0;
91199+}
91200+
91201+int
91202+gr_acl_handle_filldir(const struct file *file, const char *name,
91203+ const int namelen, const u64 ino)
91204+{
91205+ return 1;
91206+}
91207+
91208+int
91209+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
91210+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
91211+{
91212+ return 1;
91213+}
91214+
91215+int
91216+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
91217+{
91218+ return 0;
91219+}
91220+
91221+int
91222+gr_search_accept(const struct socket *sock)
91223+{
91224+ return 0;
91225+}
91226+
91227+int
91228+gr_search_listen(const struct socket *sock)
91229+{
91230+ return 0;
91231+}
91232+
91233+int
91234+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
91235+{
91236+ return 0;
91237+}
91238+
91239+__u32
91240+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
91241+{
91242+ return 1;
91243+}
91244+
91245+__u32
91246+gr_acl_handle_creat(const struct dentry * dentry,
91247+ const struct dentry * p_dentry,
91248+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
91249+ const int imode)
91250+{
91251+ return 1;
91252+}
91253+
91254+void
91255+gr_acl_handle_exit(void)
91256+{
91257+ return;
91258+}
91259+
91260+int
91261+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
91262+{
91263+ return 1;
91264+}
91265+
91266+void
91267+gr_set_role_label(const kuid_t uid, const kgid_t gid)
91268+{
91269+ return;
91270+}
91271+
91272+int
91273+gr_acl_handle_procpidmem(const struct task_struct *task)
91274+{
91275+ return 0;
91276+}
91277+
91278+int
91279+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
91280+{
91281+ return 0;
91282+}
91283+
91284+int
91285+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
91286+{
91287+ return 0;
91288+}
91289+
91290+int
91291+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
91292+{
91293+ return 0;
91294+}
91295+
91296+int
91297+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
91298+{
91299+ return 0;
91300+}
91301+
91302+int gr_acl_enable_at_secure(void)
91303+{
91304+ return 0;
91305+}
91306+
91307+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
91308+{
91309+ return d_backing_inode(dentry)->i_sb->s_dev;
91310+}
91311+
91312+u64 gr_get_ino_from_dentry(struct dentry *dentry)
91313+{
91314+ return d_backing_inode(dentry)->i_ino;
91315+}
91316+
91317+void gr_put_exec_file(struct task_struct *task)
91318+{
91319+ return;
91320+}
91321+
91322+#ifdef CONFIG_SECURITY
91323+EXPORT_SYMBOL_GPL(gr_check_user_change);
91324+EXPORT_SYMBOL_GPL(gr_check_group_change);
91325+#endif
91326diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
91327new file mode 100644
91328index 0000000..fb7531e
91329--- /dev/null
91330+++ b/grsecurity/grsec_exec.c
91331@@ -0,0 +1,189 @@
91332+#include <linux/kernel.h>
91333+#include <linux/sched.h>
91334+#include <linux/file.h>
91335+#include <linux/binfmts.h>
91336+#include <linux/fs.h>
91337+#include <linux/types.h>
91338+#include <linux/grdefs.h>
91339+#include <linux/grsecurity.h>
91340+#include <linux/grinternal.h>
91341+#include <linux/capability.h>
91342+#include <linux/module.h>
91343+#include <linux/compat.h>
91344+
91345+#include <asm/uaccess.h>
91346+
91347+#ifdef CONFIG_GRKERNSEC_EXECLOG
91348+static char gr_exec_arg_buf[132];
91349+static DEFINE_MUTEX(gr_exec_arg_mutex);
91350+#endif
91351+
91352+struct user_arg_ptr {
91353+#ifdef CONFIG_COMPAT
91354+ bool is_compat;
91355+#endif
91356+ union {
91357+ const char __user *const __user *native;
91358+#ifdef CONFIG_COMPAT
91359+ const compat_uptr_t __user *compat;
91360+#endif
91361+ } ptr;
91362+};
91363+
91364+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
91365+
91366+void
91367+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
91368+{
91369+#ifdef CONFIG_GRKERNSEC_EXECLOG
91370+ char *grarg = gr_exec_arg_buf;
91371+ unsigned int i, x, execlen = 0;
91372+ char c;
91373+
91374+ if (!((grsec_enable_execlog && grsec_enable_group &&
91375+ in_group_p(grsec_audit_gid))
91376+ || (grsec_enable_execlog && !grsec_enable_group)))
91377+ return;
91378+
91379+ mutex_lock(&gr_exec_arg_mutex);
91380+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
91381+
91382+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
91383+ const char __user *p;
91384+ unsigned int len;
91385+
91386+ p = get_user_arg_ptr(argv, i);
91387+ if (IS_ERR(p))
91388+ goto log;
91389+
91390+ len = strnlen_user(p, 128 - execlen);
91391+ if (len > 128 - execlen)
91392+ len = 128 - execlen;
91393+ else if (len > 0)
91394+ len--;
91395+ if (copy_from_user(grarg + execlen, p, len))
91396+ goto log;
91397+
91398+ /* rewrite unprintable characters */
91399+ for (x = 0; x < len; x++) {
91400+ c = *(grarg + execlen + x);
91401+ if (c < 32 || c > 126)
91402+ *(grarg + execlen + x) = ' ';
91403+ }
91404+
91405+ execlen += len;
91406+ *(grarg + execlen) = ' ';
91407+ *(grarg + execlen + 1) = '\0';
91408+ execlen++;
91409+ }
91410+
91411+ log:
91412+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
91413+ bprm->file->f_path.mnt, grarg);
91414+ mutex_unlock(&gr_exec_arg_mutex);
91415+#endif
91416+ return;
91417+}
91418+
91419+#ifdef CONFIG_GRKERNSEC
91420+extern int gr_acl_is_capable(const int cap);
91421+extern int gr_acl_is_capable_nolog(const int cap);
91422+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91423+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
91424+extern int gr_chroot_is_capable(const int cap);
91425+extern int gr_chroot_is_capable_nolog(const int cap);
91426+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91427+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
91428+#endif
91429+
91430+const char *captab_log[] = {
91431+ "CAP_CHOWN",
91432+ "CAP_DAC_OVERRIDE",
91433+ "CAP_DAC_READ_SEARCH",
91434+ "CAP_FOWNER",
91435+ "CAP_FSETID",
91436+ "CAP_KILL",
91437+ "CAP_SETGID",
91438+ "CAP_SETUID",
91439+ "CAP_SETPCAP",
91440+ "CAP_LINUX_IMMUTABLE",
91441+ "CAP_NET_BIND_SERVICE",
91442+ "CAP_NET_BROADCAST",
91443+ "CAP_NET_ADMIN",
91444+ "CAP_NET_RAW",
91445+ "CAP_IPC_LOCK",
91446+ "CAP_IPC_OWNER",
91447+ "CAP_SYS_MODULE",
91448+ "CAP_SYS_RAWIO",
91449+ "CAP_SYS_CHROOT",
91450+ "CAP_SYS_PTRACE",
91451+ "CAP_SYS_PACCT",
91452+ "CAP_SYS_ADMIN",
91453+ "CAP_SYS_BOOT",
91454+ "CAP_SYS_NICE",
91455+ "CAP_SYS_RESOURCE",
91456+ "CAP_SYS_TIME",
91457+ "CAP_SYS_TTY_CONFIG",
91458+ "CAP_MKNOD",
91459+ "CAP_LEASE",
91460+ "CAP_AUDIT_WRITE",
91461+ "CAP_AUDIT_CONTROL",
91462+ "CAP_SETFCAP",
91463+ "CAP_MAC_OVERRIDE",
91464+ "CAP_MAC_ADMIN",
91465+ "CAP_SYSLOG",
91466+ "CAP_WAKE_ALARM",
91467+ "CAP_BLOCK_SUSPEND",
91468+ "CAP_AUDIT_READ"
91469+};
91470+
91471+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
91472+
91473+int gr_is_capable(const int cap)
91474+{
91475+#ifdef CONFIG_GRKERNSEC
91476+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
91477+ return 1;
91478+ return 0;
91479+#else
91480+ return 1;
91481+#endif
91482+}
91483+
91484+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
91485+{
91486+#ifdef CONFIG_GRKERNSEC
91487+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
91488+ return 1;
91489+ return 0;
91490+#else
91491+ return 1;
91492+#endif
91493+}
91494+
91495+int gr_is_capable_nolog(const int cap)
91496+{
91497+#ifdef CONFIG_GRKERNSEC
91498+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
91499+ return 1;
91500+ return 0;
91501+#else
91502+ return 1;
91503+#endif
91504+}
91505+
91506+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
91507+{
91508+#ifdef CONFIG_GRKERNSEC
91509+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
91510+ return 1;
91511+ return 0;
91512+#else
91513+ return 1;
91514+#endif
91515+}
91516+
91517+EXPORT_SYMBOL_GPL(gr_is_capable);
91518+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
91519+EXPORT_SYMBOL_GPL(gr_task_is_capable);
91520+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
91521diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
91522new file mode 100644
91523index 0000000..cdec49b
91524--- /dev/null
91525+++ b/grsecurity/grsec_fifo.c
91526@@ -0,0 +1,26 @@
91527+#include <linux/kernel.h>
91528+#include <linux/sched.h>
91529+#include <linux/fs.h>
91530+#include <linux/file.h>
91531+#include <linux/grinternal.h>
91532+
91533+int
91534+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
91535+ const struct dentry *dir, const int flag, const int acc_mode)
91536+{
91537+#ifdef CONFIG_GRKERNSEC_FIFO
91538+ const struct cred *cred = current_cred();
91539+ struct inode *inode = d_backing_inode(dentry);
91540+ struct inode *dir_inode = d_backing_inode(dir);
91541+
91542+ if (grsec_enable_fifo && S_ISFIFO(inode->i_mode) &&
91543+ !(flag & O_EXCL) && (dir_inode->i_mode & S_ISVTX) &&
91544+ !uid_eq(inode->i_uid, dir_inode->i_uid) &&
91545+ !uid_eq(cred->fsuid, inode->i_uid)) {
91546+ if (!inode_permission(inode, acc_mode))
91547+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(inode->i_uid), GR_GLOBAL_GID(inode->i_gid));
91548+ return -EACCES;
91549+ }
91550+#endif
91551+ return 0;
91552+}
91553diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
91554new file mode 100644
91555index 0000000..8ca18bf
91556--- /dev/null
91557+++ b/grsecurity/grsec_fork.c
91558@@ -0,0 +1,23 @@
91559+#include <linux/kernel.h>
91560+#include <linux/sched.h>
91561+#include <linux/grsecurity.h>
91562+#include <linux/grinternal.h>
91563+#include <linux/errno.h>
91564+
91565+void
91566+gr_log_forkfail(const int retval)
91567+{
91568+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91569+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
91570+ switch (retval) {
91571+ case -EAGAIN:
91572+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
91573+ break;
91574+ case -ENOMEM:
91575+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
91576+ break;
91577+ }
91578+ }
91579+#endif
91580+ return;
91581+}
91582diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
91583new file mode 100644
91584index 0000000..a364c58
91585--- /dev/null
91586+++ b/grsecurity/grsec_init.c
91587@@ -0,0 +1,290 @@
91588+#include <linux/kernel.h>
91589+#include <linux/sched.h>
91590+#include <linux/mm.h>
91591+#include <linux/gracl.h>
91592+#include <linux/slab.h>
91593+#include <linux/vmalloc.h>
91594+#include <linux/percpu.h>
91595+#include <linux/module.h>
91596+
91597+int grsec_enable_ptrace_readexec __read_only;
91598+int grsec_enable_setxid __read_only;
91599+int grsec_enable_symlinkown __read_only;
91600+kgid_t grsec_symlinkown_gid __read_only;
91601+int grsec_enable_brute __read_only;
91602+int grsec_enable_link __read_only;
91603+int grsec_enable_dmesg __read_only;
91604+int grsec_enable_harden_ptrace __read_only;
91605+int grsec_enable_harden_ipc __read_only;
91606+int grsec_enable_fifo __read_only;
91607+int grsec_enable_execlog __read_only;
91608+int grsec_enable_signal __read_only;
91609+int grsec_enable_forkfail __read_only;
91610+int grsec_enable_audit_ptrace __read_only;
91611+int grsec_enable_time __read_only;
91612+int grsec_enable_group __read_only;
91613+kgid_t grsec_audit_gid __read_only;
91614+int grsec_enable_chdir __read_only;
91615+int grsec_enable_mount __read_only;
91616+int grsec_enable_rofs __read_only;
91617+int grsec_deny_new_usb __read_only;
91618+int grsec_enable_chroot_findtask __read_only;
91619+int grsec_enable_chroot_mount __read_only;
91620+int grsec_enable_chroot_shmat __read_only;
91621+int grsec_enable_chroot_fchdir __read_only;
91622+int grsec_enable_chroot_double __read_only;
91623+int grsec_enable_chroot_pivot __read_only;
91624+int grsec_enable_chroot_chdir __read_only;
91625+int grsec_enable_chroot_chmod __read_only;
91626+int grsec_enable_chroot_mknod __read_only;
91627+int grsec_enable_chroot_nice __read_only;
91628+int grsec_enable_chroot_execlog __read_only;
91629+int grsec_enable_chroot_caps __read_only;
91630+int grsec_enable_chroot_rename __read_only;
91631+int grsec_enable_chroot_sysctl __read_only;
91632+int grsec_enable_chroot_unix __read_only;
91633+int grsec_enable_tpe __read_only;
91634+kgid_t grsec_tpe_gid __read_only;
91635+int grsec_enable_blackhole __read_only;
91636+#ifdef CONFIG_IPV6_MODULE
91637+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
91638+#endif
91639+int grsec_lastack_retries __read_only;
91640+int grsec_enable_tpe_all __read_only;
91641+int grsec_enable_tpe_invert __read_only;
91642+int grsec_enable_socket_all __read_only;
91643+kgid_t grsec_socket_all_gid __read_only;
91644+int grsec_enable_socket_client __read_only;
91645+kgid_t grsec_socket_client_gid __read_only;
91646+int grsec_enable_socket_server __read_only;
91647+kgid_t grsec_socket_server_gid __read_only;
91648+int grsec_resource_logging __read_only;
91649+int grsec_disable_privio __read_only;
91650+int grsec_enable_log_rwxmaps __read_only;
91651+int grsec_lock __read_only;
91652+
91653+DEFINE_SPINLOCK(grsec_alert_lock);
91654+unsigned long grsec_alert_wtime = 0;
91655+unsigned long grsec_alert_fyet = 0;
91656+
91657+DEFINE_SPINLOCK(grsec_audit_lock);
91658+
91659+DEFINE_RWLOCK(grsec_exec_file_lock);
91660+
91661+char *gr_shared_page[4];
91662+
91663+char *gr_alert_log_fmt;
91664+char *gr_audit_log_fmt;
91665+char *gr_alert_log_buf;
91666+char *gr_audit_log_buf;
91667+
91668+extern struct gr_arg *gr_usermode;
91669+extern unsigned char *gr_system_salt;
91670+extern unsigned char *gr_system_sum;
91671+
91672+void __init
91673+grsecurity_init(void)
91674+{
91675+ int j;
91676+ /* create the per-cpu shared pages */
91677+
91678+#ifdef CONFIG_X86
91679+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
91680+#endif
91681+
91682+ for (j = 0; j < 4; j++) {
91683+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
91684+ if (gr_shared_page[j] == NULL) {
91685+ panic("Unable to allocate grsecurity shared page");
91686+ return;
91687+ }
91688+ }
91689+
91690+ /* allocate log buffers */
91691+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
91692+ if (!gr_alert_log_fmt) {
91693+ panic("Unable to allocate grsecurity alert log format buffer");
91694+ return;
91695+ }
91696+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
91697+ if (!gr_audit_log_fmt) {
91698+ panic("Unable to allocate grsecurity audit log format buffer");
91699+ return;
91700+ }
91701+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91702+ if (!gr_alert_log_buf) {
91703+ panic("Unable to allocate grsecurity alert log buffer");
91704+ return;
91705+ }
91706+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91707+ if (!gr_audit_log_buf) {
91708+ panic("Unable to allocate grsecurity audit log buffer");
91709+ return;
91710+ }
91711+
91712+ /* allocate memory for authentication structure */
91713+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
91714+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
91715+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
91716+
91717+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
91718+ panic("Unable to allocate grsecurity authentication structure");
91719+ return;
91720+ }
91721+
91722+#ifdef CONFIG_GRKERNSEC_IO
91723+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
91724+ grsec_disable_privio = 1;
91725+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91726+ grsec_disable_privio = 1;
91727+#else
91728+ grsec_disable_privio = 0;
91729+#endif
91730+#endif
91731+
91732+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
91733+ /* for backward compatibility, tpe_invert always defaults to on if
91734+ enabled in the kernel
91735+ */
91736+ grsec_enable_tpe_invert = 1;
91737+#endif
91738+
91739+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91740+#ifndef CONFIG_GRKERNSEC_SYSCTL
91741+ grsec_lock = 1;
91742+#endif
91743+
91744+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
91745+ grsec_enable_log_rwxmaps = 1;
91746+#endif
91747+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
91748+ grsec_enable_group = 1;
91749+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
91750+#endif
91751+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
91752+ grsec_enable_ptrace_readexec = 1;
91753+#endif
91754+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
91755+ grsec_enable_chdir = 1;
91756+#endif
91757+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
91758+ grsec_enable_harden_ptrace = 1;
91759+#endif
91760+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91761+ grsec_enable_harden_ipc = 1;
91762+#endif
91763+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
91764+ grsec_enable_mount = 1;
91765+#endif
91766+#ifdef CONFIG_GRKERNSEC_LINK
91767+ grsec_enable_link = 1;
91768+#endif
91769+#ifdef CONFIG_GRKERNSEC_BRUTE
91770+ grsec_enable_brute = 1;
91771+#endif
91772+#ifdef CONFIG_GRKERNSEC_DMESG
91773+ grsec_enable_dmesg = 1;
91774+#endif
91775+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91776+ grsec_enable_blackhole = 1;
91777+ grsec_lastack_retries = 4;
91778+#endif
91779+#ifdef CONFIG_GRKERNSEC_FIFO
91780+ grsec_enable_fifo = 1;
91781+#endif
91782+#ifdef CONFIG_GRKERNSEC_EXECLOG
91783+ grsec_enable_execlog = 1;
91784+#endif
91785+#ifdef CONFIG_GRKERNSEC_SETXID
91786+ grsec_enable_setxid = 1;
91787+#endif
91788+#ifdef CONFIG_GRKERNSEC_SIGNAL
91789+ grsec_enable_signal = 1;
91790+#endif
91791+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91792+ grsec_enable_forkfail = 1;
91793+#endif
91794+#ifdef CONFIG_GRKERNSEC_TIME
91795+ grsec_enable_time = 1;
91796+#endif
91797+#ifdef CONFIG_GRKERNSEC_RESLOG
91798+ grsec_resource_logging = 1;
91799+#endif
91800+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91801+ grsec_enable_chroot_findtask = 1;
91802+#endif
91803+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
91804+ grsec_enable_chroot_unix = 1;
91805+#endif
91806+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
91807+ grsec_enable_chroot_mount = 1;
91808+#endif
91809+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
91810+ grsec_enable_chroot_fchdir = 1;
91811+#endif
91812+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
91813+ grsec_enable_chroot_shmat = 1;
91814+#endif
91815+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
91816+ grsec_enable_audit_ptrace = 1;
91817+#endif
91818+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
91819+ grsec_enable_chroot_double = 1;
91820+#endif
91821+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
91822+ grsec_enable_chroot_pivot = 1;
91823+#endif
91824+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
91825+ grsec_enable_chroot_chdir = 1;
91826+#endif
91827+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
91828+ grsec_enable_chroot_chmod = 1;
91829+#endif
91830+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
91831+ grsec_enable_chroot_mknod = 1;
91832+#endif
91833+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
91834+ grsec_enable_chroot_nice = 1;
91835+#endif
91836+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
91837+ grsec_enable_chroot_execlog = 1;
91838+#endif
91839+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
91840+ grsec_enable_chroot_caps = 1;
91841+#endif
91842+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
91843+ grsec_enable_chroot_rename = 1;
91844+#endif
91845+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
91846+ grsec_enable_chroot_sysctl = 1;
91847+#endif
91848+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91849+ grsec_enable_symlinkown = 1;
91850+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
91851+#endif
91852+#ifdef CONFIG_GRKERNSEC_TPE
91853+ grsec_enable_tpe = 1;
91854+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
91855+#ifdef CONFIG_GRKERNSEC_TPE_ALL
91856+ grsec_enable_tpe_all = 1;
91857+#endif
91858+#endif
91859+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
91860+ grsec_enable_socket_all = 1;
91861+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
91862+#endif
91863+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
91864+ grsec_enable_socket_client = 1;
91865+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
91866+#endif
91867+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
91868+ grsec_enable_socket_server = 1;
91869+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
91870+#endif
91871+#endif
91872+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
91873+ grsec_deny_new_usb = 1;
91874+#endif
91875+
91876+ return;
91877+}
91878diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
91879new file mode 100644
91880index 0000000..1773300
91881--- /dev/null
91882+++ b/grsecurity/grsec_ipc.c
91883@@ -0,0 +1,48 @@
91884+#include <linux/kernel.h>
91885+#include <linux/mm.h>
91886+#include <linux/sched.h>
91887+#include <linux/file.h>
91888+#include <linux/ipc.h>
91889+#include <linux/ipc_namespace.h>
91890+#include <linux/grsecurity.h>
91891+#include <linux/grinternal.h>
91892+
91893+int
91894+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
91895+{
91896+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91897+ int write;
91898+ int orig_granted_mode;
91899+ kuid_t euid;
91900+ kgid_t egid;
91901+
91902+ if (!grsec_enable_harden_ipc)
91903+ return 1;
91904+
91905+ euid = current_euid();
91906+ egid = current_egid();
91907+
91908+ write = requested_mode & 00002;
91909+ orig_granted_mode = ipcp->mode;
91910+
91911+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
91912+ orig_granted_mode >>= 6;
91913+ else {
91914+ /* if likely wrong permissions, lock to user */
91915+ if (orig_granted_mode & 0007)
91916+ orig_granted_mode = 0;
91917+ /* otherwise do a egid-only check */
91918+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
91919+ orig_granted_mode >>= 3;
91920+ /* otherwise, no access */
91921+ else
91922+ orig_granted_mode = 0;
91923+ }
91924+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
91925+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
91926+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
91927+ return 0;
91928+ }
91929+#endif
91930+ return 1;
91931+}
91932diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
91933new file mode 100644
91934index 0000000..8ef2b75
91935--- /dev/null
91936+++ b/grsecurity/grsec_link.c
91937@@ -0,0 +1,59 @@
91938+#include <linux/kernel.h>
91939+#include <linux/sched.h>
91940+#include <linux/fs.h>
91941+#include <linux/file.h>
91942+#include <linux/grinternal.h>
91943+
91944+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
91945+{
91946+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91947+ const struct inode *link_inode = d_backing_inode(link->dentry);
91948+
91949+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
91950+ /* ignore root-owned links, e.g. /proc/self */
91951+ gr_is_global_nonroot(link_inode->i_uid) && target &&
91952+ !uid_eq(link_inode->i_uid, target->i_uid)) {
91953+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
91954+ return 1;
91955+ }
91956+#endif
91957+ return 0;
91958+}
91959+
91960+int
91961+gr_handle_follow_link(const struct dentry *dentry, const struct vfsmount *mnt)
91962+{
91963+#ifdef CONFIG_GRKERNSEC_LINK
91964+ struct inode *inode = d_backing_inode(dentry);
91965+ struct inode *parent = d_backing_inode(dentry->d_parent);
91966+ const struct cred *cred = current_cred();
91967+
91968+ if (grsec_enable_link && d_is_symlink(dentry) &&
91969+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
91970+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
91971+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
91972+ return -EACCES;
91973+ }
91974+#endif
91975+ return 0;
91976+}
91977+
91978+int
91979+gr_handle_hardlink(const struct dentry *dentry,
91980+ const struct vfsmount *mnt,
91981+ const struct filename *to)
91982+{
91983+#ifdef CONFIG_GRKERNSEC_LINK
91984+ struct inode *inode = d_backing_inode(dentry);
91985+ const struct cred *cred = current_cred();
91986+
91987+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
91988+ (!d_is_reg(dentry) || is_privileged_binary(dentry) ||
91989+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
91990+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
91991+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
91992+ return -EPERM;
91993+ }
91994+#endif
91995+ return 0;
91996+}
91997diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
91998new file mode 100644
91999index 0000000..dbe0a6b
92000--- /dev/null
92001+++ b/grsecurity/grsec_log.c
92002@@ -0,0 +1,341 @@
92003+#include <linux/kernel.h>
92004+#include <linux/sched.h>
92005+#include <linux/file.h>
92006+#include <linux/tty.h>
92007+#include <linux/fs.h>
92008+#include <linux/mm.h>
92009+#include <linux/grinternal.h>
92010+
92011+#ifdef CONFIG_TREE_PREEMPT_RCU
92012+#define DISABLE_PREEMPT() preempt_disable()
92013+#define ENABLE_PREEMPT() preempt_enable()
92014+#else
92015+#define DISABLE_PREEMPT()
92016+#define ENABLE_PREEMPT()
92017+#endif
92018+
92019+#define BEGIN_LOCKS(x) \
92020+ DISABLE_PREEMPT(); \
92021+ rcu_read_lock(); \
92022+ read_lock(&tasklist_lock); \
92023+ read_lock(&grsec_exec_file_lock); \
92024+ if (x != GR_DO_AUDIT) \
92025+ spin_lock(&grsec_alert_lock); \
92026+ else \
92027+ spin_lock(&grsec_audit_lock)
92028+
92029+#define END_LOCKS(x) \
92030+ if (x != GR_DO_AUDIT) \
92031+ spin_unlock(&grsec_alert_lock); \
92032+ else \
92033+ spin_unlock(&grsec_audit_lock); \
92034+ read_unlock(&grsec_exec_file_lock); \
92035+ read_unlock(&tasklist_lock); \
92036+ rcu_read_unlock(); \
92037+ ENABLE_PREEMPT(); \
92038+ if (x == GR_DONT_AUDIT) \
92039+ gr_handle_alertkill(current)
92040+
92041+enum {
92042+ FLOODING,
92043+ NO_FLOODING
92044+};
92045+
92046+extern char *gr_alert_log_fmt;
92047+extern char *gr_audit_log_fmt;
92048+extern char *gr_alert_log_buf;
92049+extern char *gr_audit_log_buf;
92050+
92051+static int gr_log_start(int audit)
92052+{
92053+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
92054+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
92055+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92056+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
92057+ unsigned long curr_secs = get_seconds();
92058+
92059+ if (audit == GR_DO_AUDIT)
92060+ goto set_fmt;
92061+
92062+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
92063+ grsec_alert_wtime = curr_secs;
92064+ grsec_alert_fyet = 0;
92065+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
92066+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
92067+ grsec_alert_fyet++;
92068+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
92069+ grsec_alert_wtime = curr_secs;
92070+ grsec_alert_fyet++;
92071+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
92072+ return FLOODING;
92073+ }
92074+ else return FLOODING;
92075+
92076+set_fmt:
92077+#endif
92078+ memset(buf, 0, PAGE_SIZE);
92079+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
92080+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
92081+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
92082+ } else if (current->signal->curr_ip) {
92083+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
92084+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
92085+ } else if (gr_acl_is_enabled()) {
92086+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
92087+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
92088+ } else {
92089+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
92090+ strcpy(buf, fmt);
92091+ }
92092+
92093+ return NO_FLOODING;
92094+}
92095+
92096+static void gr_log_middle(int audit, const char *msg, va_list ap)
92097+ __attribute__ ((format (printf, 2, 0)));
92098+
92099+static void gr_log_middle(int audit, const char *msg, va_list ap)
92100+{
92101+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92102+ unsigned int len = strlen(buf);
92103+
92104+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
92105+
92106+ return;
92107+}
92108+
92109+static void gr_log_middle_varargs(int audit, const char *msg, ...)
92110+ __attribute__ ((format (printf, 2, 3)));
92111+
92112+static void gr_log_middle_varargs(int audit, const char *msg, ...)
92113+{
92114+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92115+ unsigned int len = strlen(buf);
92116+ va_list ap;
92117+
92118+ va_start(ap, msg);
92119+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
92120+ va_end(ap);
92121+
92122+ return;
92123+}
92124+
92125+static void gr_log_end(int audit, int append_default)
92126+{
92127+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
92128+ if (append_default) {
92129+ struct task_struct *task = current;
92130+ struct task_struct *parent = task->real_parent;
92131+ const struct cred *cred = __task_cred(task);
92132+ const struct cred *pcred = __task_cred(parent);
92133+ unsigned int len = strlen(buf);
92134+
92135+ 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));
92136+ }
92137+
92138+ printk("%s\n", buf);
92139+
92140+ return;
92141+}
92142+
92143+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
92144+{
92145+ int logtype;
92146+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
92147+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
92148+ void *voidptr = NULL;
92149+ int num1 = 0, num2 = 0;
92150+ unsigned long ulong1 = 0, ulong2 = 0;
92151+ struct dentry *dentry = NULL;
92152+ struct vfsmount *mnt = NULL;
92153+ struct file *file = NULL;
92154+ struct task_struct *task = NULL;
92155+ struct vm_area_struct *vma = NULL;
92156+ const struct cred *cred, *pcred;
92157+ va_list ap;
92158+
92159+ BEGIN_LOCKS(audit);
92160+ logtype = gr_log_start(audit);
92161+ if (logtype == FLOODING) {
92162+ END_LOCKS(audit);
92163+ return;
92164+ }
92165+ va_start(ap, argtypes);
92166+ switch (argtypes) {
92167+ case GR_TTYSNIFF:
92168+ task = va_arg(ap, struct task_struct *);
92169+ 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));
92170+ break;
92171+ case GR_SYSCTL_HIDDEN:
92172+ str1 = va_arg(ap, char *);
92173+ gr_log_middle_varargs(audit, msg, result, str1);
92174+ break;
92175+ case GR_RBAC:
92176+ dentry = va_arg(ap, struct dentry *);
92177+ mnt = va_arg(ap, struct vfsmount *);
92178+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
92179+ break;
92180+ case GR_RBAC_STR:
92181+ dentry = va_arg(ap, struct dentry *);
92182+ mnt = va_arg(ap, struct vfsmount *);
92183+ str1 = va_arg(ap, char *);
92184+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
92185+ break;
92186+ case GR_STR_RBAC:
92187+ str1 = va_arg(ap, char *);
92188+ dentry = va_arg(ap, struct dentry *);
92189+ mnt = va_arg(ap, struct vfsmount *);
92190+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
92191+ break;
92192+ case GR_RBAC_MODE2:
92193+ dentry = va_arg(ap, struct dentry *);
92194+ mnt = va_arg(ap, struct vfsmount *);
92195+ str1 = va_arg(ap, char *);
92196+ str2 = va_arg(ap, char *);
92197+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
92198+ break;
92199+ case GR_RBAC_MODE3:
92200+ dentry = va_arg(ap, struct dentry *);
92201+ mnt = va_arg(ap, struct vfsmount *);
92202+ str1 = va_arg(ap, char *);
92203+ str2 = va_arg(ap, char *);
92204+ str3 = va_arg(ap, char *);
92205+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
92206+ break;
92207+ case GR_FILENAME:
92208+ dentry = va_arg(ap, struct dentry *);
92209+ mnt = va_arg(ap, struct vfsmount *);
92210+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
92211+ break;
92212+ case GR_STR_FILENAME:
92213+ str1 = va_arg(ap, char *);
92214+ dentry = va_arg(ap, struct dentry *);
92215+ mnt = va_arg(ap, struct vfsmount *);
92216+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
92217+ break;
92218+ case GR_FILENAME_STR:
92219+ dentry = va_arg(ap, struct dentry *);
92220+ mnt = va_arg(ap, struct vfsmount *);
92221+ str1 = va_arg(ap, char *);
92222+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
92223+ break;
92224+ case GR_FILENAME_TWO_INT:
92225+ dentry = va_arg(ap, struct dentry *);
92226+ mnt = va_arg(ap, struct vfsmount *);
92227+ num1 = va_arg(ap, int);
92228+ num2 = va_arg(ap, int);
92229+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
92230+ break;
92231+ case GR_FILENAME_TWO_INT_STR:
92232+ dentry = va_arg(ap, struct dentry *);
92233+ mnt = va_arg(ap, struct vfsmount *);
92234+ num1 = va_arg(ap, int);
92235+ num2 = va_arg(ap, int);
92236+ str1 = va_arg(ap, char *);
92237+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
92238+ break;
92239+ case GR_TEXTREL:
92240+ file = va_arg(ap, struct file *);
92241+ ulong1 = va_arg(ap, unsigned long);
92242+ ulong2 = va_arg(ap, unsigned long);
92243+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
92244+ break;
92245+ case GR_PTRACE:
92246+ task = va_arg(ap, struct task_struct *);
92247+ 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));
92248+ break;
92249+ case GR_RESOURCE:
92250+ task = va_arg(ap, struct task_struct *);
92251+ cred = __task_cred(task);
92252+ pcred = __task_cred(task->real_parent);
92253+ ulong1 = va_arg(ap, unsigned long);
92254+ str1 = va_arg(ap, char *);
92255+ ulong2 = va_arg(ap, unsigned long);
92256+ 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));
92257+ break;
92258+ case GR_CAP:
92259+ task = va_arg(ap, struct task_struct *);
92260+ cred = __task_cred(task);
92261+ pcred = __task_cred(task->real_parent);
92262+ str1 = va_arg(ap, char *);
92263+ 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));
92264+ break;
92265+ case GR_SIG:
92266+ str1 = va_arg(ap, char *);
92267+ voidptr = va_arg(ap, void *);
92268+ gr_log_middle_varargs(audit, msg, str1, voidptr);
92269+ break;
92270+ case GR_SIG2:
92271+ task = va_arg(ap, struct task_struct *);
92272+ cred = __task_cred(task);
92273+ pcred = __task_cred(task->real_parent);
92274+ num1 = va_arg(ap, int);
92275+ 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));
92276+ break;
92277+ case GR_CRASH1:
92278+ task = va_arg(ap, struct task_struct *);
92279+ cred = __task_cred(task);
92280+ pcred = __task_cred(task->real_parent);
92281+ ulong1 = va_arg(ap, unsigned long);
92282+ 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);
92283+ break;
92284+ case GR_CRASH2:
92285+ task = va_arg(ap, struct task_struct *);
92286+ cred = __task_cred(task);
92287+ pcred = __task_cred(task->real_parent);
92288+ ulong1 = va_arg(ap, unsigned long);
92289+ 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);
92290+ break;
92291+ case GR_RWXMAP:
92292+ file = va_arg(ap, struct file *);
92293+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
92294+ break;
92295+ case GR_RWXMAPVMA:
92296+ vma = va_arg(ap, struct vm_area_struct *);
92297+ if (vma->vm_file)
92298+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
92299+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
92300+ str1 = "<stack>";
92301+ else if (vma->vm_start <= current->mm->brk &&
92302+ vma->vm_end >= current->mm->start_brk)
92303+ str1 = "<heap>";
92304+ else
92305+ str1 = "<anonymous mapping>";
92306+ gr_log_middle_varargs(audit, msg, str1);
92307+ break;
92308+ case GR_PSACCT:
92309+ {
92310+ unsigned int wday, cday;
92311+ __u8 whr, chr;
92312+ __u8 wmin, cmin;
92313+ __u8 wsec, csec;
92314+ char cur_tty[64] = { 0 };
92315+ char parent_tty[64] = { 0 };
92316+
92317+ task = va_arg(ap, struct task_struct *);
92318+ wday = va_arg(ap, unsigned int);
92319+ cday = va_arg(ap, unsigned int);
92320+ whr = va_arg(ap, int);
92321+ chr = va_arg(ap, int);
92322+ wmin = va_arg(ap, int);
92323+ cmin = va_arg(ap, int);
92324+ wsec = va_arg(ap, int);
92325+ csec = va_arg(ap, int);
92326+ ulong1 = va_arg(ap, unsigned long);
92327+ cred = __task_cred(task);
92328+ pcred = __task_cred(task->real_parent);
92329+
92330+ 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));
92331+ }
92332+ break;
92333+ default:
92334+ gr_log_middle(audit, msg, ap);
92335+ }
92336+ va_end(ap);
92337+ // these don't need DEFAULTSECARGS printed on the end
92338+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
92339+ gr_log_end(audit, 0);
92340+ else
92341+ gr_log_end(audit, 1);
92342+ END_LOCKS(audit);
92343+}
92344diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
92345new file mode 100644
92346index 0000000..0e39d8c
92347--- /dev/null
92348+++ b/grsecurity/grsec_mem.c
92349@@ -0,0 +1,48 @@
92350+#include <linux/kernel.h>
92351+#include <linux/sched.h>
92352+#include <linux/mm.h>
92353+#include <linux/mman.h>
92354+#include <linux/module.h>
92355+#include <linux/grinternal.h>
92356+
92357+void gr_handle_msr_write(void)
92358+{
92359+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
92360+ return;
92361+}
92362+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
92363+
92364+void
92365+gr_handle_ioperm(void)
92366+{
92367+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
92368+ return;
92369+}
92370+
92371+void
92372+gr_handle_iopl(void)
92373+{
92374+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
92375+ return;
92376+}
92377+
92378+void
92379+gr_handle_mem_readwrite(u64 from, u64 to)
92380+{
92381+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
92382+ return;
92383+}
92384+
92385+void
92386+gr_handle_vm86(void)
92387+{
92388+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
92389+ return;
92390+}
92391+
92392+void
92393+gr_log_badprocpid(const char *entry)
92394+{
92395+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
92396+ return;
92397+}
92398diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
92399new file mode 100644
92400index 0000000..fe02bf4
92401--- /dev/null
92402+++ b/grsecurity/grsec_mount.c
92403@@ -0,0 +1,65 @@
92404+#include <linux/kernel.h>
92405+#include <linux/sched.h>
92406+#include <linux/mount.h>
92407+#include <linux/major.h>
92408+#include <linux/grsecurity.h>
92409+#include <linux/grinternal.h>
92410+
92411+void
92412+gr_log_remount(const char *devname, const int retval)
92413+{
92414+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92415+ if (grsec_enable_mount && (retval >= 0))
92416+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
92417+#endif
92418+ return;
92419+}
92420+
92421+void
92422+gr_log_unmount(const char *devname, const int retval)
92423+{
92424+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92425+ if (grsec_enable_mount && (retval >= 0))
92426+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
92427+#endif
92428+ return;
92429+}
92430+
92431+void
92432+gr_log_mount(const char *from, struct path *to, const int retval)
92433+{
92434+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92435+ if (grsec_enable_mount && (retval >= 0))
92436+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
92437+#endif
92438+ return;
92439+}
92440+
92441+int
92442+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
92443+{
92444+#ifdef CONFIG_GRKERNSEC_ROFS
92445+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
92446+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
92447+ return -EPERM;
92448+ } else
92449+ return 0;
92450+#endif
92451+ return 0;
92452+}
92453+
92454+int
92455+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
92456+{
92457+#ifdef CONFIG_GRKERNSEC_ROFS
92458+ struct inode *inode = d_backing_inode(dentry);
92459+
92460+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
92461+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
92462+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
92463+ return -EPERM;
92464+ } else
92465+ return 0;
92466+#endif
92467+ return 0;
92468+}
92469diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
92470new file mode 100644
92471index 0000000..6ee9d50
92472--- /dev/null
92473+++ b/grsecurity/grsec_pax.c
92474@@ -0,0 +1,45 @@
92475+#include <linux/kernel.h>
92476+#include <linux/sched.h>
92477+#include <linux/mm.h>
92478+#include <linux/file.h>
92479+#include <linux/grinternal.h>
92480+#include <linux/grsecurity.h>
92481+
92482+void
92483+gr_log_textrel(struct vm_area_struct * vma)
92484+{
92485+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92486+ if (grsec_enable_log_rwxmaps)
92487+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
92488+#endif
92489+ return;
92490+}
92491+
92492+void gr_log_ptgnustack(struct file *file)
92493+{
92494+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92495+ if (grsec_enable_log_rwxmaps)
92496+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
92497+#endif
92498+ return;
92499+}
92500+
92501+void
92502+gr_log_rwxmmap(struct file *file)
92503+{
92504+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92505+ if (grsec_enable_log_rwxmaps)
92506+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
92507+#endif
92508+ return;
92509+}
92510+
92511+void
92512+gr_log_rwxmprotect(struct vm_area_struct *vma)
92513+{
92514+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92515+ if (grsec_enable_log_rwxmaps)
92516+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
92517+#endif
92518+ return;
92519+}
92520diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
92521new file mode 100644
92522index 0000000..2005a3a
92523--- /dev/null
92524+++ b/grsecurity/grsec_proc.c
92525@@ -0,0 +1,20 @@
92526+#include <linux/kernel.h>
92527+#include <linux/sched.h>
92528+#include <linux/grsecurity.h>
92529+#include <linux/grinternal.h>
92530+
92531+int gr_proc_is_restricted(void)
92532+{
92533+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92534+ const struct cred *cred = current_cred();
92535+#endif
92536+
92537+#ifdef CONFIG_GRKERNSEC_PROC_USER
92538+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
92539+ return -EACCES;
92540+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92541+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
92542+ return -EACCES;
92543+#endif
92544+ return 0;
92545+}
92546diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
92547new file mode 100644
92548index 0000000..304c518
92549--- /dev/null
92550+++ b/grsecurity/grsec_ptrace.c
92551@@ -0,0 +1,30 @@
92552+#include <linux/kernel.h>
92553+#include <linux/sched.h>
92554+#include <linux/grinternal.h>
92555+#include <linux/security.h>
92556+
92557+void
92558+gr_audit_ptrace(struct task_struct *task)
92559+{
92560+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
92561+ if (grsec_enable_audit_ptrace)
92562+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
92563+#endif
92564+ return;
92565+}
92566+
92567+int
92568+gr_ptrace_readexec(struct file *file, int unsafe_flags)
92569+{
92570+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92571+ const struct dentry *dentry = file->f_path.dentry;
92572+ const struct vfsmount *mnt = file->f_path.mnt;
92573+
92574+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
92575+ (inode_permission(d_backing_inode(dentry), MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
92576+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
92577+ return -EACCES;
92578+ }
92579+#endif
92580+ return 0;
92581+}
92582diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
92583new file mode 100644
92584index 0000000..3860c7e
92585--- /dev/null
92586+++ b/grsecurity/grsec_sig.c
92587@@ -0,0 +1,236 @@
92588+#include <linux/kernel.h>
92589+#include <linux/sched.h>
92590+#include <linux/fs.h>
92591+#include <linux/delay.h>
92592+#include <linux/grsecurity.h>
92593+#include <linux/grinternal.h>
92594+#include <linux/hardirq.h>
92595+
92596+char *signames[] = {
92597+ [SIGSEGV] = "Segmentation fault",
92598+ [SIGILL] = "Illegal instruction",
92599+ [SIGABRT] = "Abort",
92600+ [SIGBUS] = "Invalid alignment/Bus error"
92601+};
92602+
92603+void
92604+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
92605+{
92606+#ifdef CONFIG_GRKERNSEC_SIGNAL
92607+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
92608+ (sig == SIGABRT) || (sig == SIGBUS))) {
92609+ if (task_pid_nr(t) == task_pid_nr(current)) {
92610+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
92611+ } else {
92612+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
92613+ }
92614+ }
92615+#endif
92616+ return;
92617+}
92618+
92619+int
92620+gr_handle_signal(const struct task_struct *p, const int sig)
92621+{
92622+#ifdef CONFIG_GRKERNSEC
92623+ /* ignore the 0 signal for protected task checks */
92624+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
92625+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
92626+ return -EPERM;
92627+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
92628+ return -EPERM;
92629+ }
92630+#endif
92631+ return 0;
92632+}
92633+
92634+#ifdef CONFIG_GRKERNSEC
92635+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
92636+
92637+int gr_fake_force_sig(int sig, struct task_struct *t)
92638+{
92639+ unsigned long int flags;
92640+ int ret, blocked, ignored;
92641+ struct k_sigaction *action;
92642+
92643+ spin_lock_irqsave(&t->sighand->siglock, flags);
92644+ action = &t->sighand->action[sig-1];
92645+ ignored = action->sa.sa_handler == SIG_IGN;
92646+ blocked = sigismember(&t->blocked, sig);
92647+ if (blocked || ignored) {
92648+ action->sa.sa_handler = SIG_DFL;
92649+ if (blocked) {
92650+ sigdelset(&t->blocked, sig);
92651+ recalc_sigpending_and_wake(t);
92652+ }
92653+ }
92654+ if (action->sa.sa_handler == SIG_DFL)
92655+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
92656+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
92657+
92658+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
92659+
92660+ return ret;
92661+}
92662+#endif
92663+
92664+#define GR_USER_BAN_TIME (15 * 60)
92665+#define GR_DAEMON_BRUTE_TIME (30 * 60)
92666+
92667+void gr_handle_brute_attach(int dumpable)
92668+{
92669+#ifdef CONFIG_GRKERNSEC_BRUTE
92670+ struct task_struct *p = current;
92671+ kuid_t uid = GLOBAL_ROOT_UID;
92672+ int daemon = 0;
92673+
92674+ if (!grsec_enable_brute)
92675+ return;
92676+
92677+ rcu_read_lock();
92678+ read_lock(&tasklist_lock);
92679+ read_lock(&grsec_exec_file_lock);
92680+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
92681+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
92682+ p->real_parent->brute = 1;
92683+ daemon = 1;
92684+ } else {
92685+ const struct cred *cred = __task_cred(p), *cred2;
92686+ struct task_struct *tsk, *tsk2;
92687+
92688+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
92689+ struct user_struct *user;
92690+
92691+ uid = cred->uid;
92692+
92693+ /* this is put upon execution past expiration */
92694+ user = find_user(uid);
92695+ if (user == NULL)
92696+ goto unlock;
92697+ user->suid_banned = 1;
92698+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
92699+ if (user->suid_ban_expires == ~0UL)
92700+ user->suid_ban_expires--;
92701+
92702+ /* only kill other threads of the same binary, from the same user */
92703+ do_each_thread(tsk2, tsk) {
92704+ cred2 = __task_cred(tsk);
92705+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
92706+ gr_fake_force_sig(SIGKILL, tsk);
92707+ } while_each_thread(tsk2, tsk);
92708+ }
92709+ }
92710+unlock:
92711+ read_unlock(&grsec_exec_file_lock);
92712+ read_unlock(&tasklist_lock);
92713+ rcu_read_unlock();
92714+
92715+ if (gr_is_global_nonroot(uid))
92716+ 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);
92717+ else if (daemon)
92718+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
92719+
92720+#endif
92721+ return;
92722+}
92723+
92724+void gr_handle_brute_check(void)
92725+{
92726+#ifdef CONFIG_GRKERNSEC_BRUTE
92727+ struct task_struct *p = current;
92728+
92729+ if (unlikely(p->brute)) {
92730+ if (!grsec_enable_brute)
92731+ p->brute = 0;
92732+ else if (time_before(get_seconds(), p->brute_expires))
92733+ msleep(30 * 1000);
92734+ }
92735+#endif
92736+ return;
92737+}
92738+
92739+void gr_handle_kernel_exploit(void)
92740+{
92741+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92742+ const struct cred *cred;
92743+ struct task_struct *tsk, *tsk2;
92744+ struct user_struct *user;
92745+ kuid_t uid;
92746+
92747+ if (in_irq() || in_serving_softirq() || in_nmi())
92748+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
92749+
92750+ uid = current_uid();
92751+
92752+ if (gr_is_global_root(uid))
92753+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
92754+ else {
92755+ /* kill all the processes of this user, hold a reference
92756+ to their creds struct, and prevent them from creating
92757+ another process until system reset
92758+ */
92759+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
92760+ GR_GLOBAL_UID(uid));
92761+ /* we intentionally leak this ref */
92762+ user = get_uid(current->cred->user);
92763+ if (user)
92764+ user->kernel_banned = 1;
92765+
92766+ /* kill all processes of this user */
92767+ read_lock(&tasklist_lock);
92768+ do_each_thread(tsk2, tsk) {
92769+ cred = __task_cred(tsk);
92770+ if (uid_eq(cred->uid, uid))
92771+ gr_fake_force_sig(SIGKILL, tsk);
92772+ } while_each_thread(tsk2, tsk);
92773+ read_unlock(&tasklist_lock);
92774+ }
92775+#endif
92776+}
92777+
92778+#ifdef CONFIG_GRKERNSEC_BRUTE
92779+static bool suid_ban_expired(struct user_struct *user)
92780+{
92781+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
92782+ user->suid_banned = 0;
92783+ user->suid_ban_expires = 0;
92784+ free_uid(user);
92785+ return true;
92786+ }
92787+
92788+ return false;
92789+}
92790+#endif
92791+
92792+int gr_process_kernel_exec_ban(void)
92793+{
92794+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92795+ if (unlikely(current->cred->user->kernel_banned))
92796+ return -EPERM;
92797+#endif
92798+ return 0;
92799+}
92800+
92801+int gr_process_kernel_setuid_ban(struct user_struct *user)
92802+{
92803+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92804+ if (unlikely(user->kernel_banned))
92805+ gr_fake_force_sig(SIGKILL, current);
92806+#endif
92807+ return 0;
92808+}
92809+
92810+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
92811+{
92812+#ifdef CONFIG_GRKERNSEC_BRUTE
92813+ struct user_struct *user = current->cred->user;
92814+ if (unlikely(user->suid_banned)) {
92815+ if (suid_ban_expired(user))
92816+ return 0;
92817+ /* disallow execution of suid binaries only */
92818+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
92819+ return -EPERM;
92820+ }
92821+#endif
92822+ return 0;
92823+}
92824diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
92825new file mode 100644
92826index 0000000..a523bd2
92827--- /dev/null
92828+++ b/grsecurity/grsec_sock.c
92829@@ -0,0 +1,244 @@
92830+#include <linux/kernel.h>
92831+#include <linux/module.h>
92832+#include <linux/sched.h>
92833+#include <linux/file.h>
92834+#include <linux/net.h>
92835+#include <linux/in.h>
92836+#include <linux/ip.h>
92837+#include <net/sock.h>
92838+#include <net/inet_sock.h>
92839+#include <linux/grsecurity.h>
92840+#include <linux/grinternal.h>
92841+#include <linux/gracl.h>
92842+
92843+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
92844+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
92845+
92846+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
92847+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
92848+
92849+#ifdef CONFIG_UNIX_MODULE
92850+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
92851+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
92852+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
92853+EXPORT_SYMBOL_GPL(gr_handle_create);
92854+#endif
92855+
92856+#ifdef CONFIG_GRKERNSEC
92857+#define gr_conn_table_size 32749
92858+struct conn_table_entry {
92859+ struct conn_table_entry *next;
92860+ struct signal_struct *sig;
92861+};
92862+
92863+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
92864+DEFINE_SPINLOCK(gr_conn_table_lock);
92865+
92866+extern const char * gr_socktype_to_name(unsigned char type);
92867+extern const char * gr_proto_to_name(unsigned char proto);
92868+extern const char * gr_sockfamily_to_name(unsigned char family);
92869+
92870+static int
92871+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
92872+{
92873+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
92874+}
92875+
92876+static int
92877+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
92878+ __u16 sport, __u16 dport)
92879+{
92880+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
92881+ sig->gr_sport == sport && sig->gr_dport == dport))
92882+ return 1;
92883+ else
92884+ return 0;
92885+}
92886+
92887+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
92888+{
92889+ struct conn_table_entry **match;
92890+ unsigned int index;
92891+
92892+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92893+ sig->gr_sport, sig->gr_dport,
92894+ gr_conn_table_size);
92895+
92896+ newent->sig = sig;
92897+
92898+ match = &gr_conn_table[index];
92899+ newent->next = *match;
92900+ *match = newent;
92901+
92902+ return;
92903+}
92904+
92905+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
92906+{
92907+ struct conn_table_entry *match, *last = NULL;
92908+ unsigned int index;
92909+
92910+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92911+ sig->gr_sport, sig->gr_dport,
92912+ gr_conn_table_size);
92913+
92914+ match = gr_conn_table[index];
92915+ while (match && !conn_match(match->sig,
92916+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
92917+ sig->gr_dport)) {
92918+ last = match;
92919+ match = match->next;
92920+ }
92921+
92922+ if (match) {
92923+ if (last)
92924+ last->next = match->next;
92925+ else
92926+ gr_conn_table[index] = NULL;
92927+ kfree(match);
92928+ }
92929+
92930+ return;
92931+}
92932+
92933+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
92934+ __u16 sport, __u16 dport)
92935+{
92936+ struct conn_table_entry *match;
92937+ unsigned int index;
92938+
92939+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
92940+
92941+ match = gr_conn_table[index];
92942+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
92943+ match = match->next;
92944+
92945+ if (match)
92946+ return match->sig;
92947+ else
92948+ return NULL;
92949+}
92950+
92951+#endif
92952+
92953+void gr_update_task_in_ip_table(const struct inet_sock *inet)
92954+{
92955+#ifdef CONFIG_GRKERNSEC
92956+ struct signal_struct *sig = current->signal;
92957+ struct conn_table_entry *newent;
92958+
92959+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
92960+ if (newent == NULL)
92961+ return;
92962+ /* no bh lock needed since we are called with bh disabled */
92963+ spin_lock(&gr_conn_table_lock);
92964+ gr_del_task_from_ip_table_nolock(sig);
92965+ sig->gr_saddr = inet->inet_rcv_saddr;
92966+ sig->gr_daddr = inet->inet_daddr;
92967+ sig->gr_sport = inet->inet_sport;
92968+ sig->gr_dport = inet->inet_dport;
92969+ gr_add_to_task_ip_table_nolock(sig, newent);
92970+ spin_unlock(&gr_conn_table_lock);
92971+#endif
92972+ return;
92973+}
92974+
92975+void gr_del_task_from_ip_table(struct task_struct *task)
92976+{
92977+#ifdef CONFIG_GRKERNSEC
92978+ spin_lock_bh(&gr_conn_table_lock);
92979+ gr_del_task_from_ip_table_nolock(task->signal);
92980+ spin_unlock_bh(&gr_conn_table_lock);
92981+#endif
92982+ return;
92983+}
92984+
92985+void
92986+gr_attach_curr_ip(const struct sock *sk)
92987+{
92988+#ifdef CONFIG_GRKERNSEC
92989+ struct signal_struct *p, *set;
92990+ const struct inet_sock *inet = inet_sk(sk);
92991+
92992+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
92993+ return;
92994+
92995+ set = current->signal;
92996+
92997+ spin_lock_bh(&gr_conn_table_lock);
92998+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
92999+ inet->inet_dport, inet->inet_sport);
93000+ if (unlikely(p != NULL)) {
93001+ set->curr_ip = p->curr_ip;
93002+ set->used_accept = 1;
93003+ gr_del_task_from_ip_table_nolock(p);
93004+ spin_unlock_bh(&gr_conn_table_lock);
93005+ return;
93006+ }
93007+ spin_unlock_bh(&gr_conn_table_lock);
93008+
93009+ set->curr_ip = inet->inet_daddr;
93010+ set->used_accept = 1;
93011+#endif
93012+ return;
93013+}
93014+
93015+int
93016+gr_handle_sock_all(const int family, const int type, const int protocol)
93017+{
93018+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93019+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
93020+ (family != AF_UNIX)) {
93021+ if (family == AF_INET)
93022+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
93023+ else
93024+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
93025+ return -EACCES;
93026+ }
93027+#endif
93028+ return 0;
93029+}
93030+
93031+int
93032+gr_handle_sock_server(const struct sockaddr *sck)
93033+{
93034+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93035+ if (grsec_enable_socket_server &&
93036+ in_group_p(grsec_socket_server_gid) &&
93037+ sck && (sck->sa_family != AF_UNIX) &&
93038+ (sck->sa_family != AF_LOCAL)) {
93039+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
93040+ return -EACCES;
93041+ }
93042+#endif
93043+ return 0;
93044+}
93045+
93046+int
93047+gr_handle_sock_server_other(const struct sock *sck)
93048+{
93049+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93050+ if (grsec_enable_socket_server &&
93051+ in_group_p(grsec_socket_server_gid) &&
93052+ sck && (sck->sk_family != AF_UNIX) &&
93053+ (sck->sk_family != AF_LOCAL)) {
93054+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
93055+ return -EACCES;
93056+ }
93057+#endif
93058+ return 0;
93059+}
93060+
93061+int
93062+gr_handle_sock_client(const struct sockaddr *sck)
93063+{
93064+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93065+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
93066+ sck && (sck->sa_family != AF_UNIX) &&
93067+ (sck->sa_family != AF_LOCAL)) {
93068+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
93069+ return -EACCES;
93070+ }
93071+#endif
93072+ return 0;
93073+}
93074diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
93075new file mode 100644
93076index 0000000..aaec43c
93077--- /dev/null
93078+++ b/grsecurity/grsec_sysctl.c
93079@@ -0,0 +1,488 @@
93080+#include <linux/kernel.h>
93081+#include <linux/sched.h>
93082+#include <linux/sysctl.h>
93083+#include <linux/grsecurity.h>
93084+#include <linux/grinternal.h>
93085+
93086+int
93087+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
93088+{
93089+#ifdef CONFIG_GRKERNSEC_SYSCTL
93090+ if (dirname == NULL || name == NULL)
93091+ return 0;
93092+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
93093+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
93094+ return -EACCES;
93095+ }
93096+#endif
93097+ return 0;
93098+}
93099+
93100+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
93101+static int __maybe_unused __read_only one = 1;
93102+#endif
93103+
93104+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
93105+ defined(CONFIG_GRKERNSEC_DENYUSB)
93106+struct ctl_table grsecurity_table[] = {
93107+#ifdef CONFIG_GRKERNSEC_SYSCTL
93108+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
93109+#ifdef CONFIG_GRKERNSEC_IO
93110+ {
93111+ .procname = "disable_priv_io",
93112+ .data = &grsec_disable_privio,
93113+ .maxlen = sizeof(int),
93114+ .mode = 0600,
93115+ .proc_handler = &proc_dointvec_secure,
93116+ },
93117+#endif
93118+#endif
93119+#ifdef CONFIG_GRKERNSEC_LINK
93120+ {
93121+ .procname = "linking_restrictions",
93122+ .data = &grsec_enable_link,
93123+ .maxlen = sizeof(int),
93124+ .mode = 0600,
93125+ .proc_handler = &proc_dointvec_secure,
93126+ },
93127+#endif
93128+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
93129+ {
93130+ .procname = "enforce_symlinksifowner",
93131+ .data = &grsec_enable_symlinkown,
93132+ .maxlen = sizeof(int),
93133+ .mode = 0600,
93134+ .proc_handler = &proc_dointvec_secure,
93135+ },
93136+ {
93137+ .procname = "symlinkown_gid",
93138+ .data = &grsec_symlinkown_gid,
93139+ .maxlen = sizeof(int),
93140+ .mode = 0600,
93141+ .proc_handler = &proc_dointvec_secure,
93142+ },
93143+#endif
93144+#ifdef CONFIG_GRKERNSEC_BRUTE
93145+ {
93146+ .procname = "deter_bruteforce",
93147+ .data = &grsec_enable_brute,
93148+ .maxlen = sizeof(int),
93149+ .mode = 0600,
93150+ .proc_handler = &proc_dointvec_secure,
93151+ },
93152+#endif
93153+#ifdef CONFIG_GRKERNSEC_FIFO
93154+ {
93155+ .procname = "fifo_restrictions",
93156+ .data = &grsec_enable_fifo,
93157+ .maxlen = sizeof(int),
93158+ .mode = 0600,
93159+ .proc_handler = &proc_dointvec_secure,
93160+ },
93161+#endif
93162+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
93163+ {
93164+ .procname = "ptrace_readexec",
93165+ .data = &grsec_enable_ptrace_readexec,
93166+ .maxlen = sizeof(int),
93167+ .mode = 0600,
93168+ .proc_handler = &proc_dointvec_secure,
93169+ },
93170+#endif
93171+#ifdef CONFIG_GRKERNSEC_SETXID
93172+ {
93173+ .procname = "consistent_setxid",
93174+ .data = &grsec_enable_setxid,
93175+ .maxlen = sizeof(int),
93176+ .mode = 0600,
93177+ .proc_handler = &proc_dointvec_secure,
93178+ },
93179+#endif
93180+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
93181+ {
93182+ .procname = "ip_blackhole",
93183+ .data = &grsec_enable_blackhole,
93184+ .maxlen = sizeof(int),
93185+ .mode = 0600,
93186+ .proc_handler = &proc_dointvec_secure,
93187+ },
93188+ {
93189+ .procname = "lastack_retries",
93190+ .data = &grsec_lastack_retries,
93191+ .maxlen = sizeof(int),
93192+ .mode = 0600,
93193+ .proc_handler = &proc_dointvec_secure,
93194+ },
93195+#endif
93196+#ifdef CONFIG_GRKERNSEC_EXECLOG
93197+ {
93198+ .procname = "exec_logging",
93199+ .data = &grsec_enable_execlog,
93200+ .maxlen = sizeof(int),
93201+ .mode = 0600,
93202+ .proc_handler = &proc_dointvec_secure,
93203+ },
93204+#endif
93205+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
93206+ {
93207+ .procname = "rwxmap_logging",
93208+ .data = &grsec_enable_log_rwxmaps,
93209+ .maxlen = sizeof(int),
93210+ .mode = 0600,
93211+ .proc_handler = &proc_dointvec_secure,
93212+ },
93213+#endif
93214+#ifdef CONFIG_GRKERNSEC_SIGNAL
93215+ {
93216+ .procname = "signal_logging",
93217+ .data = &grsec_enable_signal,
93218+ .maxlen = sizeof(int),
93219+ .mode = 0600,
93220+ .proc_handler = &proc_dointvec_secure,
93221+ },
93222+#endif
93223+#ifdef CONFIG_GRKERNSEC_FORKFAIL
93224+ {
93225+ .procname = "forkfail_logging",
93226+ .data = &grsec_enable_forkfail,
93227+ .maxlen = sizeof(int),
93228+ .mode = 0600,
93229+ .proc_handler = &proc_dointvec_secure,
93230+ },
93231+#endif
93232+#ifdef CONFIG_GRKERNSEC_TIME
93233+ {
93234+ .procname = "timechange_logging",
93235+ .data = &grsec_enable_time,
93236+ .maxlen = sizeof(int),
93237+ .mode = 0600,
93238+ .proc_handler = &proc_dointvec_secure,
93239+ },
93240+#endif
93241+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
93242+ {
93243+ .procname = "chroot_deny_shmat",
93244+ .data = &grsec_enable_chroot_shmat,
93245+ .maxlen = sizeof(int),
93246+ .mode = 0600,
93247+ .proc_handler = &proc_dointvec_secure,
93248+ },
93249+#endif
93250+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
93251+ {
93252+ .procname = "chroot_deny_unix",
93253+ .data = &grsec_enable_chroot_unix,
93254+ .maxlen = sizeof(int),
93255+ .mode = 0600,
93256+ .proc_handler = &proc_dointvec_secure,
93257+ },
93258+#endif
93259+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
93260+ {
93261+ .procname = "chroot_deny_mount",
93262+ .data = &grsec_enable_chroot_mount,
93263+ .maxlen = sizeof(int),
93264+ .mode = 0600,
93265+ .proc_handler = &proc_dointvec_secure,
93266+ },
93267+#endif
93268+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
93269+ {
93270+ .procname = "chroot_deny_fchdir",
93271+ .data = &grsec_enable_chroot_fchdir,
93272+ .maxlen = sizeof(int),
93273+ .mode = 0600,
93274+ .proc_handler = &proc_dointvec_secure,
93275+ },
93276+#endif
93277+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
93278+ {
93279+ .procname = "chroot_deny_chroot",
93280+ .data = &grsec_enable_chroot_double,
93281+ .maxlen = sizeof(int),
93282+ .mode = 0600,
93283+ .proc_handler = &proc_dointvec_secure,
93284+ },
93285+#endif
93286+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
93287+ {
93288+ .procname = "chroot_deny_pivot",
93289+ .data = &grsec_enable_chroot_pivot,
93290+ .maxlen = sizeof(int),
93291+ .mode = 0600,
93292+ .proc_handler = &proc_dointvec_secure,
93293+ },
93294+#endif
93295+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
93296+ {
93297+ .procname = "chroot_enforce_chdir",
93298+ .data = &grsec_enable_chroot_chdir,
93299+ .maxlen = sizeof(int),
93300+ .mode = 0600,
93301+ .proc_handler = &proc_dointvec_secure,
93302+ },
93303+#endif
93304+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
93305+ {
93306+ .procname = "chroot_deny_chmod",
93307+ .data = &grsec_enable_chroot_chmod,
93308+ .maxlen = sizeof(int),
93309+ .mode = 0600,
93310+ .proc_handler = &proc_dointvec_secure,
93311+ },
93312+#endif
93313+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
93314+ {
93315+ .procname = "chroot_deny_mknod",
93316+ .data = &grsec_enable_chroot_mknod,
93317+ .maxlen = sizeof(int),
93318+ .mode = 0600,
93319+ .proc_handler = &proc_dointvec_secure,
93320+ },
93321+#endif
93322+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
93323+ {
93324+ .procname = "chroot_restrict_nice",
93325+ .data = &grsec_enable_chroot_nice,
93326+ .maxlen = sizeof(int),
93327+ .mode = 0600,
93328+ .proc_handler = &proc_dointvec_secure,
93329+ },
93330+#endif
93331+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
93332+ {
93333+ .procname = "chroot_execlog",
93334+ .data = &grsec_enable_chroot_execlog,
93335+ .maxlen = sizeof(int),
93336+ .mode = 0600,
93337+ .proc_handler = &proc_dointvec_secure,
93338+ },
93339+#endif
93340+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
93341+ {
93342+ .procname = "chroot_caps",
93343+ .data = &grsec_enable_chroot_caps,
93344+ .maxlen = sizeof(int),
93345+ .mode = 0600,
93346+ .proc_handler = &proc_dointvec_secure,
93347+ },
93348+#endif
93349+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
93350+ {
93351+ .procname = "chroot_deny_bad_rename",
93352+ .data = &grsec_enable_chroot_rename,
93353+ .maxlen = sizeof(int),
93354+ .mode = 0600,
93355+ .proc_handler = &proc_dointvec_secure,
93356+ },
93357+#endif
93358+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
93359+ {
93360+ .procname = "chroot_deny_sysctl",
93361+ .data = &grsec_enable_chroot_sysctl,
93362+ .maxlen = sizeof(int),
93363+ .mode = 0600,
93364+ .proc_handler = &proc_dointvec_secure,
93365+ },
93366+#endif
93367+#ifdef CONFIG_GRKERNSEC_TPE
93368+ {
93369+ .procname = "tpe",
93370+ .data = &grsec_enable_tpe,
93371+ .maxlen = sizeof(int),
93372+ .mode = 0600,
93373+ .proc_handler = &proc_dointvec_secure,
93374+ },
93375+ {
93376+ .procname = "tpe_gid",
93377+ .data = &grsec_tpe_gid,
93378+ .maxlen = sizeof(int),
93379+ .mode = 0600,
93380+ .proc_handler = &proc_dointvec_secure,
93381+ },
93382+#endif
93383+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93384+ {
93385+ .procname = "tpe_invert",
93386+ .data = &grsec_enable_tpe_invert,
93387+ .maxlen = sizeof(int),
93388+ .mode = 0600,
93389+ .proc_handler = &proc_dointvec_secure,
93390+ },
93391+#endif
93392+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93393+ {
93394+ .procname = "tpe_restrict_all",
93395+ .data = &grsec_enable_tpe_all,
93396+ .maxlen = sizeof(int),
93397+ .mode = 0600,
93398+ .proc_handler = &proc_dointvec_secure,
93399+ },
93400+#endif
93401+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93402+ {
93403+ .procname = "socket_all",
93404+ .data = &grsec_enable_socket_all,
93405+ .maxlen = sizeof(int),
93406+ .mode = 0600,
93407+ .proc_handler = &proc_dointvec_secure,
93408+ },
93409+ {
93410+ .procname = "socket_all_gid",
93411+ .data = &grsec_socket_all_gid,
93412+ .maxlen = sizeof(int),
93413+ .mode = 0600,
93414+ .proc_handler = &proc_dointvec_secure,
93415+ },
93416+#endif
93417+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93418+ {
93419+ .procname = "socket_client",
93420+ .data = &grsec_enable_socket_client,
93421+ .maxlen = sizeof(int),
93422+ .mode = 0600,
93423+ .proc_handler = &proc_dointvec_secure,
93424+ },
93425+ {
93426+ .procname = "socket_client_gid",
93427+ .data = &grsec_socket_client_gid,
93428+ .maxlen = sizeof(int),
93429+ .mode = 0600,
93430+ .proc_handler = &proc_dointvec_secure,
93431+ },
93432+#endif
93433+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93434+ {
93435+ .procname = "socket_server",
93436+ .data = &grsec_enable_socket_server,
93437+ .maxlen = sizeof(int),
93438+ .mode = 0600,
93439+ .proc_handler = &proc_dointvec_secure,
93440+ },
93441+ {
93442+ .procname = "socket_server_gid",
93443+ .data = &grsec_socket_server_gid,
93444+ .maxlen = sizeof(int),
93445+ .mode = 0600,
93446+ .proc_handler = &proc_dointvec_secure,
93447+ },
93448+#endif
93449+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
93450+ {
93451+ .procname = "audit_group",
93452+ .data = &grsec_enable_group,
93453+ .maxlen = sizeof(int),
93454+ .mode = 0600,
93455+ .proc_handler = &proc_dointvec_secure,
93456+ },
93457+ {
93458+ .procname = "audit_gid",
93459+ .data = &grsec_audit_gid,
93460+ .maxlen = sizeof(int),
93461+ .mode = 0600,
93462+ .proc_handler = &proc_dointvec_secure,
93463+ },
93464+#endif
93465+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
93466+ {
93467+ .procname = "audit_chdir",
93468+ .data = &grsec_enable_chdir,
93469+ .maxlen = sizeof(int),
93470+ .mode = 0600,
93471+ .proc_handler = &proc_dointvec_secure,
93472+ },
93473+#endif
93474+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
93475+ {
93476+ .procname = "audit_mount",
93477+ .data = &grsec_enable_mount,
93478+ .maxlen = sizeof(int),
93479+ .mode = 0600,
93480+ .proc_handler = &proc_dointvec_secure,
93481+ },
93482+#endif
93483+#ifdef CONFIG_GRKERNSEC_DMESG
93484+ {
93485+ .procname = "dmesg",
93486+ .data = &grsec_enable_dmesg,
93487+ .maxlen = sizeof(int),
93488+ .mode = 0600,
93489+ .proc_handler = &proc_dointvec_secure,
93490+ },
93491+#endif
93492+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93493+ {
93494+ .procname = "chroot_findtask",
93495+ .data = &grsec_enable_chroot_findtask,
93496+ .maxlen = sizeof(int),
93497+ .mode = 0600,
93498+ .proc_handler = &proc_dointvec_secure,
93499+ },
93500+#endif
93501+#ifdef CONFIG_GRKERNSEC_RESLOG
93502+ {
93503+ .procname = "resource_logging",
93504+ .data = &grsec_resource_logging,
93505+ .maxlen = sizeof(int),
93506+ .mode = 0600,
93507+ .proc_handler = &proc_dointvec_secure,
93508+ },
93509+#endif
93510+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
93511+ {
93512+ .procname = "audit_ptrace",
93513+ .data = &grsec_enable_audit_ptrace,
93514+ .maxlen = sizeof(int),
93515+ .mode = 0600,
93516+ .proc_handler = &proc_dointvec_secure,
93517+ },
93518+#endif
93519+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
93520+ {
93521+ .procname = "harden_ptrace",
93522+ .data = &grsec_enable_harden_ptrace,
93523+ .maxlen = sizeof(int),
93524+ .mode = 0600,
93525+ .proc_handler = &proc_dointvec_secure,
93526+ },
93527+#endif
93528+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
93529+ {
93530+ .procname = "harden_ipc",
93531+ .data = &grsec_enable_harden_ipc,
93532+ .maxlen = sizeof(int),
93533+ .mode = 0600,
93534+ .proc_handler = &proc_dointvec_secure,
93535+ },
93536+#endif
93537+ {
93538+ .procname = "grsec_lock",
93539+ .data = &grsec_lock,
93540+ .maxlen = sizeof(int),
93541+ .mode = 0600,
93542+ .proc_handler = &proc_dointvec_secure,
93543+ },
93544+#endif
93545+#ifdef CONFIG_GRKERNSEC_ROFS
93546+ {
93547+ .procname = "romount_protect",
93548+ .data = &grsec_enable_rofs,
93549+ .maxlen = sizeof(int),
93550+ .mode = 0600,
93551+ .proc_handler = &proc_dointvec_minmax_secure,
93552+ .extra1 = &one,
93553+ .extra2 = &one,
93554+ },
93555+#endif
93556+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
93557+ {
93558+ .procname = "deny_new_usb",
93559+ .data = &grsec_deny_new_usb,
93560+ .maxlen = sizeof(int),
93561+ .mode = 0600,
93562+ .proc_handler = &proc_dointvec_secure,
93563+ },
93564+#endif
93565+ { }
93566+};
93567+#endif
93568diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
93569new file mode 100644
93570index 0000000..61b514e
93571--- /dev/null
93572+++ b/grsecurity/grsec_time.c
93573@@ -0,0 +1,16 @@
93574+#include <linux/kernel.h>
93575+#include <linux/sched.h>
93576+#include <linux/grinternal.h>
93577+#include <linux/module.h>
93578+
93579+void
93580+gr_log_timechange(void)
93581+{
93582+#ifdef CONFIG_GRKERNSEC_TIME
93583+ if (grsec_enable_time)
93584+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
93585+#endif
93586+ return;
93587+}
93588+
93589+EXPORT_SYMBOL_GPL(gr_log_timechange);
93590diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
93591new file mode 100644
93592index 0000000..9786671
93593--- /dev/null
93594+++ b/grsecurity/grsec_tpe.c
93595@@ -0,0 +1,78 @@
93596+#include <linux/kernel.h>
93597+#include <linux/sched.h>
93598+#include <linux/file.h>
93599+#include <linux/fs.h>
93600+#include <linux/grinternal.h>
93601+
93602+extern int gr_acl_tpe_check(void);
93603+
93604+int
93605+gr_tpe_allow(const struct file *file)
93606+{
93607+#ifdef CONFIG_GRKERNSEC
93608+ struct inode *inode = d_backing_inode(file->f_path.dentry->d_parent);
93609+ struct inode *file_inode = d_backing_inode(file->f_path.dentry);
93610+ const struct cred *cred = current_cred();
93611+ char *msg = NULL;
93612+ char *msg2 = NULL;
93613+
93614+ // never restrict root
93615+ if (gr_is_global_root(cred->uid))
93616+ return 1;
93617+
93618+ if (grsec_enable_tpe) {
93619+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93620+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
93621+ msg = "not being in trusted group";
93622+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
93623+ msg = "being in untrusted group";
93624+#else
93625+ if (in_group_p(grsec_tpe_gid))
93626+ msg = "being in untrusted group";
93627+#endif
93628+ }
93629+ if (!msg && gr_acl_tpe_check())
93630+ msg = "being in untrusted role";
93631+
93632+ // not in any affected group/role
93633+ if (!msg)
93634+ goto next_check;
93635+
93636+ if (gr_is_global_nonroot(inode->i_uid))
93637+ msg2 = "file in non-root-owned directory";
93638+ else if (inode->i_mode & S_IWOTH)
93639+ msg2 = "file in world-writable directory";
93640+ else if (inode->i_mode & S_IWGRP)
93641+ msg2 = "file in group-writable directory";
93642+ else if (file_inode->i_mode & S_IWOTH)
93643+ msg2 = "file is world-writable";
93644+
93645+ if (msg && msg2) {
93646+ char fullmsg[70] = {0};
93647+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
93648+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
93649+ return 0;
93650+ }
93651+ msg = NULL;
93652+next_check:
93653+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93654+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
93655+ return 1;
93656+
93657+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
93658+ msg = "directory not owned by user";
93659+ else if (inode->i_mode & S_IWOTH)
93660+ msg = "file in world-writable directory";
93661+ else if (inode->i_mode & S_IWGRP)
93662+ msg = "file in group-writable directory";
93663+ else if (file_inode->i_mode & S_IWOTH)
93664+ msg = "file is world-writable";
93665+
93666+ if (msg) {
93667+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
93668+ return 0;
93669+ }
93670+#endif
93671+#endif
93672+ return 1;
93673+}
93674diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
93675new file mode 100644
93676index 0000000..ae02d8e
93677--- /dev/null
93678+++ b/grsecurity/grsec_usb.c
93679@@ -0,0 +1,15 @@
93680+#include <linux/kernel.h>
93681+#include <linux/grinternal.h>
93682+#include <linux/module.h>
93683+
93684+int gr_handle_new_usb(void)
93685+{
93686+#ifdef CONFIG_GRKERNSEC_DENYUSB
93687+ if (grsec_deny_new_usb) {
93688+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
93689+ return 1;
93690+ }
93691+#endif
93692+ return 0;
93693+}
93694+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
93695diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
93696new file mode 100644
93697index 0000000..158b330
93698--- /dev/null
93699+++ b/grsecurity/grsum.c
93700@@ -0,0 +1,64 @@
93701+#include <linux/err.h>
93702+#include <linux/kernel.h>
93703+#include <linux/sched.h>
93704+#include <linux/mm.h>
93705+#include <linux/scatterlist.h>
93706+#include <linux/crypto.h>
93707+#include <linux/gracl.h>
93708+
93709+
93710+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
93711+#error "crypto and sha256 must be built into the kernel"
93712+#endif
93713+
93714+int
93715+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
93716+{
93717+ struct crypto_hash *tfm;
93718+ struct hash_desc desc;
93719+ struct scatterlist sg[2];
93720+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
93721+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
93722+ unsigned long *sumptr = (unsigned long *)sum;
93723+ int cryptres;
93724+ int retval = 1;
93725+ volatile int mismatched = 0;
93726+ volatile int dummy = 0;
93727+ unsigned int i;
93728+
93729+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
93730+ if (IS_ERR(tfm)) {
93731+ /* should never happen, since sha256 should be built in */
93732+ memset(entry->pw, 0, GR_PW_LEN);
93733+ return 1;
93734+ }
93735+
93736+ sg_init_table(sg, 2);
93737+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
93738+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
93739+
93740+ desc.tfm = tfm;
93741+ desc.flags = 0;
93742+
93743+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
93744+ temp_sum);
93745+
93746+ memset(entry->pw, 0, GR_PW_LEN);
93747+
93748+ if (cryptres)
93749+ goto out;
93750+
93751+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
93752+ if (sumptr[i] != tmpsumptr[i])
93753+ mismatched = 1;
93754+ else
93755+ dummy = 1; // waste a cycle
93756+
93757+ if (!mismatched)
93758+ retval = dummy - 1;
93759+
93760+out:
93761+ crypto_free_hash(tfm);
93762+
93763+ return retval;
93764+}
93765diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
93766index 5bdab6b..9ae82fe 100644
93767--- a/include/asm-generic/4level-fixup.h
93768+++ b/include/asm-generic/4level-fixup.h
93769@@ -14,8 +14,10 @@
93770 #define pmd_alloc(mm, pud, address) \
93771 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
93772 NULL: pmd_offset(pud, address))
93773+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
93774
93775 #define pud_alloc(mm, pgd, address) (pgd)
93776+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
93777 #define pud_offset(pgd, start) (pgd)
93778 #define pud_none(pud) 0
93779 #define pud_bad(pud) 0
93780diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
93781index b7babf0..1e4b4f1 100644
93782--- a/include/asm-generic/atomic-long.h
93783+++ b/include/asm-generic/atomic-long.h
93784@@ -22,6 +22,12 @@
93785
93786 typedef atomic64_t atomic_long_t;
93787
93788+#ifdef CONFIG_PAX_REFCOUNT
93789+typedef atomic64_unchecked_t atomic_long_unchecked_t;
93790+#else
93791+typedef atomic64_t atomic_long_unchecked_t;
93792+#endif
93793+
93794 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
93795
93796 static inline long atomic_long_read(atomic_long_t *l)
93797@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93798 return (long)atomic64_read(v);
93799 }
93800
93801+#ifdef CONFIG_PAX_REFCOUNT
93802+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93803+{
93804+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93805+
93806+ return (long)atomic64_read_unchecked(v);
93807+}
93808+#endif
93809+
93810 static inline void atomic_long_set(atomic_long_t *l, long i)
93811 {
93812 atomic64_t *v = (atomic64_t *)l;
93813@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93814 atomic64_set(v, i);
93815 }
93816
93817+#ifdef CONFIG_PAX_REFCOUNT
93818+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93819+{
93820+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93821+
93822+ atomic64_set_unchecked(v, i);
93823+}
93824+#endif
93825+
93826 static inline void atomic_long_inc(atomic_long_t *l)
93827 {
93828 atomic64_t *v = (atomic64_t *)l;
93829@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93830 atomic64_inc(v);
93831 }
93832
93833+#ifdef CONFIG_PAX_REFCOUNT
93834+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93835+{
93836+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93837+
93838+ atomic64_inc_unchecked(v);
93839+}
93840+#endif
93841+
93842 static inline void atomic_long_dec(atomic_long_t *l)
93843 {
93844 atomic64_t *v = (atomic64_t *)l;
93845@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93846 atomic64_dec(v);
93847 }
93848
93849+#ifdef CONFIG_PAX_REFCOUNT
93850+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93851+{
93852+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93853+
93854+ atomic64_dec_unchecked(v);
93855+}
93856+#endif
93857+
93858 static inline void atomic_long_add(long i, atomic_long_t *l)
93859 {
93860 atomic64_t *v = (atomic64_t *)l;
93861@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93862 atomic64_add(i, v);
93863 }
93864
93865+#ifdef CONFIG_PAX_REFCOUNT
93866+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93867+{
93868+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93869+
93870+ atomic64_add_unchecked(i, v);
93871+}
93872+#endif
93873+
93874 static inline void atomic_long_sub(long i, atomic_long_t *l)
93875 {
93876 atomic64_t *v = (atomic64_t *)l;
93877@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93878 atomic64_sub(i, v);
93879 }
93880
93881+#ifdef CONFIG_PAX_REFCOUNT
93882+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93883+{
93884+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93885+
93886+ atomic64_sub_unchecked(i, v);
93887+}
93888+#endif
93889+
93890 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93891 {
93892 atomic64_t *v = (atomic64_t *)l;
93893@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93894 return atomic64_add_negative(i, v);
93895 }
93896
93897-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93898+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93899 {
93900 atomic64_t *v = (atomic64_t *)l;
93901
93902 return (long)atomic64_add_return(i, v);
93903 }
93904
93905+#ifdef CONFIG_PAX_REFCOUNT
93906+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93907+{
93908+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93909+
93910+ return (long)atomic64_add_return_unchecked(i, v);
93911+}
93912+#endif
93913+
93914 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93915 {
93916 atomic64_t *v = (atomic64_t *)l;
93917@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93918 return (long)atomic64_inc_return(v);
93919 }
93920
93921+#ifdef CONFIG_PAX_REFCOUNT
93922+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93923+{
93924+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93925+
93926+ return (long)atomic64_inc_return_unchecked(v);
93927+}
93928+#endif
93929+
93930 static inline long atomic_long_dec_return(atomic_long_t *l)
93931 {
93932 atomic64_t *v = (atomic64_t *)l;
93933@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93934
93935 typedef atomic_t atomic_long_t;
93936
93937+#ifdef CONFIG_PAX_REFCOUNT
93938+typedef atomic_unchecked_t atomic_long_unchecked_t;
93939+#else
93940+typedef atomic_t atomic_long_unchecked_t;
93941+#endif
93942+
93943 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
93944 static inline long atomic_long_read(atomic_long_t *l)
93945 {
93946@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93947 return (long)atomic_read(v);
93948 }
93949
93950+#ifdef CONFIG_PAX_REFCOUNT
93951+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93952+{
93953+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93954+
93955+ return (long)atomic_read_unchecked(v);
93956+}
93957+#endif
93958+
93959 static inline void atomic_long_set(atomic_long_t *l, long i)
93960 {
93961 atomic_t *v = (atomic_t *)l;
93962@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93963 atomic_set(v, i);
93964 }
93965
93966+#ifdef CONFIG_PAX_REFCOUNT
93967+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93968+{
93969+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93970+
93971+ atomic_set_unchecked(v, i);
93972+}
93973+#endif
93974+
93975 static inline void atomic_long_inc(atomic_long_t *l)
93976 {
93977 atomic_t *v = (atomic_t *)l;
93978@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93979 atomic_inc(v);
93980 }
93981
93982+#ifdef CONFIG_PAX_REFCOUNT
93983+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93984+{
93985+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93986+
93987+ atomic_inc_unchecked(v);
93988+}
93989+#endif
93990+
93991 static inline void atomic_long_dec(atomic_long_t *l)
93992 {
93993 atomic_t *v = (atomic_t *)l;
93994@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93995 atomic_dec(v);
93996 }
93997
93998+#ifdef CONFIG_PAX_REFCOUNT
93999+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
94000+{
94001+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94002+
94003+ atomic_dec_unchecked(v);
94004+}
94005+#endif
94006+
94007 static inline void atomic_long_add(long i, atomic_long_t *l)
94008 {
94009 atomic_t *v = (atomic_t *)l;
94010@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
94011 atomic_add(i, v);
94012 }
94013
94014+#ifdef CONFIG_PAX_REFCOUNT
94015+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
94016+{
94017+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94018+
94019+ atomic_add_unchecked(i, v);
94020+}
94021+#endif
94022+
94023 static inline void atomic_long_sub(long i, atomic_long_t *l)
94024 {
94025 atomic_t *v = (atomic_t *)l;
94026@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
94027 atomic_sub(i, v);
94028 }
94029
94030+#ifdef CONFIG_PAX_REFCOUNT
94031+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
94032+{
94033+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94034+
94035+ atomic_sub_unchecked(i, v);
94036+}
94037+#endif
94038+
94039 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
94040 {
94041 atomic_t *v = (atomic_t *)l;
94042@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
94043 return atomic_add_negative(i, v);
94044 }
94045
94046-static inline long atomic_long_add_return(long i, atomic_long_t *l)
94047+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
94048 {
94049 atomic_t *v = (atomic_t *)l;
94050
94051 return (long)atomic_add_return(i, v);
94052 }
94053
94054+#ifdef CONFIG_PAX_REFCOUNT
94055+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
94056+{
94057+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94058+
94059+ return (long)atomic_add_return_unchecked(i, v);
94060+}
94061+
94062+#endif
94063+
94064 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
94065 {
94066 atomic_t *v = (atomic_t *)l;
94067@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
94068 return (long)atomic_inc_return(v);
94069 }
94070
94071+#ifdef CONFIG_PAX_REFCOUNT
94072+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
94073+{
94074+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
94075+
94076+ return (long)atomic_inc_return_unchecked(v);
94077+}
94078+#endif
94079+
94080 static inline long atomic_long_dec_return(atomic_long_t *l)
94081 {
94082 atomic_t *v = (atomic_t *)l;
94083@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
94084
94085 #endif /* BITS_PER_LONG == 64 */
94086
94087+#ifdef CONFIG_PAX_REFCOUNT
94088+static inline void pax_refcount_needs_these_functions(void)
94089+{
94090+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
94091+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
94092+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
94093+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
94094+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
94095+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
94096+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
94097+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
94098+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
94099+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
94100+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
94101+#ifdef CONFIG_X86
94102+ atomic_clear_mask_unchecked(0, NULL);
94103+ atomic_set_mask_unchecked(0, NULL);
94104+#endif
94105+
94106+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
94107+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
94108+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
94109+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
94110+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
94111+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
94112+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
94113+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
94114+}
94115+#else
94116+#define atomic_read_unchecked(v) atomic_read(v)
94117+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
94118+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
94119+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
94120+#define atomic_inc_unchecked(v) atomic_inc(v)
94121+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
94122+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
94123+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
94124+#define atomic_dec_unchecked(v) atomic_dec(v)
94125+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
94126+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
94127+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
94128+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
94129+
94130+#define atomic_long_read_unchecked(v) atomic_long_read(v)
94131+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
94132+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
94133+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
94134+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
94135+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
94136+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
94137+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
94138+#endif
94139+
94140 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
94141diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
94142index 30ad9c8..c70c170 100644
94143--- a/include/asm-generic/atomic64.h
94144+++ b/include/asm-generic/atomic64.h
94145@@ -16,6 +16,8 @@ typedef struct {
94146 long long counter;
94147 } atomic64_t;
94148
94149+typedef atomic64_t atomic64_unchecked_t;
94150+
94151 #define ATOMIC64_INIT(i) { (i) }
94152
94153 extern long long atomic64_read(const atomic64_t *v);
94154@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
94155 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
94156 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
94157
94158+#define atomic64_read_unchecked(v) atomic64_read(v)
94159+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
94160+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
94161+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
94162+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
94163+#define atomic64_inc_unchecked(v) atomic64_inc(v)
94164+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
94165+#define atomic64_dec_unchecked(v) atomic64_dec(v)
94166+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
94167+
94168 #endif /* _ASM_GENERIC_ATOMIC64_H */
94169diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
94170index f5c40b0..e902f9d 100644
94171--- a/include/asm-generic/barrier.h
94172+++ b/include/asm-generic/barrier.h
94173@@ -82,7 +82,7 @@
94174 do { \
94175 compiletime_assert_atomic_type(*p); \
94176 smp_mb(); \
94177- ACCESS_ONCE(*p) = (v); \
94178+ ACCESS_ONCE_RW(*p) = (v); \
94179 } while (0)
94180
94181 #define smp_load_acquire(p) \
94182diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
94183index a60a7cc..0fe12f2 100644
94184--- a/include/asm-generic/bitops/__fls.h
94185+++ b/include/asm-generic/bitops/__fls.h
94186@@ -9,7 +9,7 @@
94187 *
94188 * Undefined if no set bit exists, so code should check against 0 first.
94189 */
94190-static __always_inline unsigned long __fls(unsigned long word)
94191+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
94192 {
94193 int num = BITS_PER_LONG - 1;
94194
94195diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
94196index 0576d1f..dad6c71 100644
94197--- a/include/asm-generic/bitops/fls.h
94198+++ b/include/asm-generic/bitops/fls.h
94199@@ -9,7 +9,7 @@
94200 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
94201 */
94202
94203-static __always_inline int fls(int x)
94204+static __always_inline int __intentional_overflow(-1) fls(int x)
94205 {
94206 int r = 32;
94207
94208diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
94209index b097cf8..3d40e14 100644
94210--- a/include/asm-generic/bitops/fls64.h
94211+++ b/include/asm-generic/bitops/fls64.h
94212@@ -15,7 +15,7 @@
94213 * at position 64.
94214 */
94215 #if BITS_PER_LONG == 32
94216-static __always_inline int fls64(__u64 x)
94217+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94218 {
94219 __u32 h = x >> 32;
94220 if (h)
94221@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
94222 return fls(x);
94223 }
94224 #elif BITS_PER_LONG == 64
94225-static __always_inline int fls64(__u64 x)
94226+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94227 {
94228 if (x == 0)
94229 return 0;
94230diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
94231index 630dd23..8c1dcb6b 100644
94232--- a/include/asm-generic/bug.h
94233+++ b/include/asm-generic/bug.h
94234@@ -62,13 +62,13 @@ struct bug_entry {
94235 * to provide better diagnostics.
94236 */
94237 #ifndef __WARN_TAINT
94238-extern __printf(3, 4)
94239+extern __printf(3, 4) __nocapture(1, 3, 4)
94240 void warn_slowpath_fmt(const char *file, const int line,
94241 const char *fmt, ...);
94242-extern __printf(4, 5)
94243+extern __printf(4, 5) __nocapture(1, 4, 5)
94244 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
94245 const char *fmt, ...);
94246-extern void warn_slowpath_null(const char *file, const int line);
94247+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
94248 #define WANT_WARN_ON_SLOWPATH
94249 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
94250 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
94251diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
94252index 1bfcfe5..e04c5c9 100644
94253--- a/include/asm-generic/cache.h
94254+++ b/include/asm-generic/cache.h
94255@@ -6,7 +6,7 @@
94256 * cache lines need to provide their own cache.h.
94257 */
94258
94259-#define L1_CACHE_SHIFT 5
94260-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
94261+#define L1_CACHE_SHIFT 5UL
94262+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
94263
94264 #endif /* __ASM_GENERIC_CACHE_H */
94265diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
94266index 0d68a1e..b74a761 100644
94267--- a/include/asm-generic/emergency-restart.h
94268+++ b/include/asm-generic/emergency-restart.h
94269@@ -1,7 +1,7 @@
94270 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
94271 #define _ASM_GENERIC_EMERGENCY_RESTART_H
94272
94273-static inline void machine_emergency_restart(void)
94274+static inline __noreturn void machine_emergency_restart(void)
94275 {
94276 machine_restart(NULL);
94277 }
94278diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
94279index 90f99c7..00ce236 100644
94280--- a/include/asm-generic/kmap_types.h
94281+++ b/include/asm-generic/kmap_types.h
94282@@ -2,9 +2,9 @@
94283 #define _ASM_GENERIC_KMAP_TYPES_H
94284
94285 #ifdef __WITH_KM_FENCE
94286-# define KM_TYPE_NR 41
94287+# define KM_TYPE_NR 42
94288 #else
94289-# define KM_TYPE_NR 20
94290+# define KM_TYPE_NR 21
94291 #endif
94292
94293 #endif
94294diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
94295index 9ceb03b..62b0b8f 100644
94296--- a/include/asm-generic/local.h
94297+++ b/include/asm-generic/local.h
94298@@ -23,24 +23,37 @@ typedef struct
94299 atomic_long_t a;
94300 } local_t;
94301
94302+typedef struct {
94303+ atomic_long_unchecked_t a;
94304+} local_unchecked_t;
94305+
94306 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
94307
94308 #define local_read(l) atomic_long_read(&(l)->a)
94309+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
94310 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
94311+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
94312 #define local_inc(l) atomic_long_inc(&(l)->a)
94313+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
94314 #define local_dec(l) atomic_long_dec(&(l)->a)
94315+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
94316 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
94317+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
94318 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
94319+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
94320
94321 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
94322 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
94323 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
94324 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
94325 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
94326+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
94327 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
94328 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
94329+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
94330
94331 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94332+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94333 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
94334 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
94335 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
94336diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
94337index 725612b..9cc513a 100644
94338--- a/include/asm-generic/pgtable-nopmd.h
94339+++ b/include/asm-generic/pgtable-nopmd.h
94340@@ -1,14 +1,19 @@
94341 #ifndef _PGTABLE_NOPMD_H
94342 #define _PGTABLE_NOPMD_H
94343
94344-#ifndef __ASSEMBLY__
94345-
94346 #include <asm-generic/pgtable-nopud.h>
94347
94348-struct mm_struct;
94349-
94350 #define __PAGETABLE_PMD_FOLDED
94351
94352+#define PMD_SHIFT PUD_SHIFT
94353+#define PTRS_PER_PMD 1
94354+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
94355+#define PMD_MASK (~(PMD_SIZE-1))
94356+
94357+#ifndef __ASSEMBLY__
94358+
94359+struct mm_struct;
94360+
94361 /*
94362 * Having the pmd type consist of a pud gets the size right, and allows
94363 * us to conceptually access the pud entry that this pmd is folded into
94364@@ -16,11 +21,6 @@ struct mm_struct;
94365 */
94366 typedef struct { pud_t pud; } pmd_t;
94367
94368-#define PMD_SHIFT PUD_SHIFT
94369-#define PTRS_PER_PMD 1
94370-#define PMD_SIZE (1UL << PMD_SHIFT)
94371-#define PMD_MASK (~(PMD_SIZE-1))
94372-
94373 /*
94374 * The "pud_xxx()" functions here are trivial for a folded two-level
94375 * setup: the pmd is never bad, and a pmd always exists (as it's folded
94376diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
94377index 810431d..0ec4804f 100644
94378--- a/include/asm-generic/pgtable-nopud.h
94379+++ b/include/asm-generic/pgtable-nopud.h
94380@@ -1,10 +1,15 @@
94381 #ifndef _PGTABLE_NOPUD_H
94382 #define _PGTABLE_NOPUD_H
94383
94384-#ifndef __ASSEMBLY__
94385-
94386 #define __PAGETABLE_PUD_FOLDED
94387
94388+#define PUD_SHIFT PGDIR_SHIFT
94389+#define PTRS_PER_PUD 1
94390+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
94391+#define PUD_MASK (~(PUD_SIZE-1))
94392+
94393+#ifndef __ASSEMBLY__
94394+
94395 /*
94396 * Having the pud type consist of a pgd gets the size right, and allows
94397 * us to conceptually access the pgd entry that this pud is folded into
94398@@ -12,11 +17,6 @@
94399 */
94400 typedef struct { pgd_t pgd; } pud_t;
94401
94402-#define PUD_SHIFT PGDIR_SHIFT
94403-#define PTRS_PER_PUD 1
94404-#define PUD_SIZE (1UL << PUD_SHIFT)
94405-#define PUD_MASK (~(PUD_SIZE-1))
94406-
94407 /*
94408 * The "pgd_xxx()" functions here are trivial for a folded two-level
94409 * setup: the pud is never bad, and a pud always exists (as it's folded
94410@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
94411 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
94412
94413 #define pgd_populate(mm, pgd, pud) do { } while (0)
94414+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
94415 /*
94416 * (puds are folded into pgds so this doesn't get actually called,
94417 * but the define is needed for a generic inline function.)
94418diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
94419index 39f1d6a..7dae6fb 100644
94420--- a/include/asm-generic/pgtable.h
94421+++ b/include/asm-generic/pgtable.h
94422@@ -695,6 +695,22 @@ static inline int pmd_protnone(pmd_t pmd)
94423 }
94424 #endif /* CONFIG_NUMA_BALANCING */
94425
94426+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
94427+#ifdef CONFIG_PAX_KERNEXEC
94428+#error KERNEXEC requires pax_open_kernel
94429+#else
94430+static inline unsigned long pax_open_kernel(void) { return 0; }
94431+#endif
94432+#endif
94433+
94434+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
94435+#ifdef CONFIG_PAX_KERNEXEC
94436+#error KERNEXEC requires pax_close_kernel
94437+#else
94438+static inline unsigned long pax_close_kernel(void) { return 0; }
94439+#endif
94440+#endif
94441+
94442 #endif /* CONFIG_MMU */
94443
94444 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
94445diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
94446index 72d8803..cb9749c 100644
94447--- a/include/asm-generic/uaccess.h
94448+++ b/include/asm-generic/uaccess.h
94449@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
94450 return __clear_user(to, n);
94451 }
94452
94453+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
94454+#ifdef CONFIG_PAX_MEMORY_UDEREF
94455+#error UDEREF requires pax_open_userland
94456+#else
94457+static inline unsigned long pax_open_userland(void) { return 0; }
94458+#endif
94459+#endif
94460+
94461+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
94462+#ifdef CONFIG_PAX_MEMORY_UDEREF
94463+#error UDEREF requires pax_close_userland
94464+#else
94465+static inline unsigned long pax_close_userland(void) { return 0; }
94466+#endif
94467+#endif
94468+
94469 #endif /* __ASM_GENERIC_UACCESS_H */
94470diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
94471index 8bd374d..9590e70 100644
94472--- a/include/asm-generic/vmlinux.lds.h
94473+++ b/include/asm-generic/vmlinux.lds.h
94474@@ -246,6 +246,7 @@
94475 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
94476 VMLINUX_SYMBOL(__start_rodata) = .; \
94477 *(.rodata) *(.rodata.*) \
94478+ *(.data..read_only) \
94479 *(__vermagic) /* Kernel version magic */ \
94480 . = ALIGN(8); \
94481 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
94482@@ -504,6 +505,7 @@
94483 KERNEL_CTORS() \
94484 MCOUNT_REC() \
94485 *(.init.rodata) \
94486+ *(.init.rodata.*) \
94487 FTRACE_EVENTS() \
94488 TRACE_SYSCALLS() \
94489 KPROBE_BLACKLIST() \
94490@@ -525,6 +527,8 @@
94491
94492 #define EXIT_DATA \
94493 *(.exit.data) \
94494+ *(.exit.rodata) \
94495+ *(.exit.rodata.*) \
94496 MEM_DISCARD(exit.data) \
94497 MEM_DISCARD(exit.rodata)
94498
94499@@ -741,17 +745,18 @@
94500 * section in the linker script will go there too. @phdr should have
94501 * a leading colon.
94502 *
94503- * Note that this macros defines __per_cpu_load as an absolute symbol.
94504+ * Note that this macros defines per_cpu_load as an absolute symbol.
94505 * If there is no need to put the percpu section at a predetermined
94506 * address, use PERCPU_SECTION.
94507 */
94508 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
94509- VMLINUX_SYMBOL(__per_cpu_load) = .; \
94510- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
94511+ per_cpu_load = .; \
94512+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
94513 - LOAD_OFFSET) { \
94514+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
94515 PERCPU_INPUT(cacheline) \
94516 } phdr \
94517- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
94518+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
94519
94520 /**
94521 * PERCPU_SECTION - define output section for percpu area, simple version
94522diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
94523index 0ecb768..f910132 100644
94524--- a/include/crypto/algapi.h
94525+++ b/include/crypto/algapi.h
94526@@ -34,7 +34,7 @@ struct crypto_type {
94527 unsigned int maskclear;
94528 unsigned int maskset;
94529 unsigned int tfmsize;
94530-};
94531+} __do_const;
94532
94533 struct crypto_instance {
94534 struct crypto_alg alg;
94535diff --git a/include/drm/drmP.h b/include/drm/drmP.h
94536index 62c40777..f980496 100644
94537--- a/include/drm/drmP.h
94538+++ b/include/drm/drmP.h
94539@@ -59,6 +59,7 @@
94540
94541 #include <asm/mman.h>
94542 #include <asm/pgalloc.h>
94543+#include <asm/local.h>
94544 #include <asm/uaccess.h>
94545
94546 #include <uapi/drm/drm.h>
94547@@ -137,17 +138,18 @@ void drm_err(const char *format, ...);
94548 /*@{*/
94549
94550 /* driver capabilities and requirements mask */
94551-#define DRIVER_USE_AGP 0x1
94552-#define DRIVER_PCI_DMA 0x8
94553-#define DRIVER_SG 0x10
94554-#define DRIVER_HAVE_DMA 0x20
94555-#define DRIVER_HAVE_IRQ 0x40
94556-#define DRIVER_IRQ_SHARED 0x80
94557-#define DRIVER_GEM 0x1000
94558-#define DRIVER_MODESET 0x2000
94559-#define DRIVER_PRIME 0x4000
94560-#define DRIVER_RENDER 0x8000
94561-#define DRIVER_ATOMIC 0x10000
94562+#define DRIVER_USE_AGP 0x1
94563+#define DRIVER_PCI_DMA 0x8
94564+#define DRIVER_SG 0x10
94565+#define DRIVER_HAVE_DMA 0x20
94566+#define DRIVER_HAVE_IRQ 0x40
94567+#define DRIVER_IRQ_SHARED 0x80
94568+#define DRIVER_GEM 0x1000
94569+#define DRIVER_MODESET 0x2000
94570+#define DRIVER_PRIME 0x4000
94571+#define DRIVER_RENDER 0x8000
94572+#define DRIVER_ATOMIC 0x10000
94573+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
94574
94575 /***********************************************************************/
94576 /** \name Macros to make printk easier */
94577@@ -233,10 +235,12 @@ void drm_err(const char *format, ...);
94578 * \param cmd command.
94579 * \param arg argument.
94580 */
94581-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
94582+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
94583+ struct drm_file *file_priv);
94584+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
94585 struct drm_file *file_priv);
94586
94587-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94588+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
94589 unsigned long arg);
94590
94591 #define DRM_IOCTL_NR(n) _IOC_NR(n)
94592@@ -252,9 +256,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94593 struct drm_ioctl_desc {
94594 unsigned int cmd;
94595 int flags;
94596- drm_ioctl_t *func;
94597+ drm_ioctl_t func;
94598 const char *name;
94599-};
94600+} __do_const;
94601
94602 /**
94603 * Creates a driver or general drm_ioctl_desc array entry for the given
94604@@ -645,7 +649,8 @@ struct drm_info_list {
94605 int (*show)(struct seq_file*, void*); /** show callback */
94606 u32 driver_features; /**< Required driver features for this entry */
94607 void *data;
94608-};
94609+} __do_const;
94610+typedef struct drm_info_list __no_const drm_info_list_no_const;
94611
94612 /**
94613 * debugfs node structure. This structure represents a debugfs file.
94614@@ -729,7 +734,7 @@ struct drm_device {
94615
94616 /** \name Usage Counters */
94617 /*@{ */
94618- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94619+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94620 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
94621 int buf_use; /**< Buffers in use -- cannot alloc */
94622 atomic_t buf_alloc; /**< Buffer allocation in progress */
94623diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
94624index c8fc187..079d4c2 100644
94625--- a/include/drm/drm_crtc_helper.h
94626+++ b/include/drm/drm_crtc_helper.h
94627@@ -161,7 +161,7 @@ struct drm_encoder_helper_funcs {
94628 int (*atomic_check)(struct drm_encoder *encoder,
94629 struct drm_crtc_state *crtc_state,
94630 struct drm_connector_state *conn_state);
94631-};
94632+} __no_const;
94633
94634 /**
94635 * struct drm_connector_helper_funcs - helper operations for connectors
94636diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
94637index 6133723..4c1fccb 100644
94638--- a/include/drm/i915_pciids.h
94639+++ b/include/drm/i915_pciids.h
94640@@ -37,7 +37,7 @@
94641 */
94642 #define INTEL_VGA_DEVICE(id, info) { \
94643 0x8086, id, \
94644- ~0, ~0, \
94645+ PCI_ANY_ID, PCI_ANY_ID, \
94646 0x030000, 0xff0000, \
94647 (unsigned long) info }
94648
94649diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
94650index 72dcbe8..8db58d7 100644
94651--- a/include/drm/ttm/ttm_memory.h
94652+++ b/include/drm/ttm/ttm_memory.h
94653@@ -48,7 +48,7 @@
94654
94655 struct ttm_mem_shrink {
94656 int (*do_shrink) (struct ttm_mem_shrink *);
94657-};
94658+} __no_const;
94659
94660 /**
94661 * struct ttm_mem_global - Global memory accounting structure.
94662diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
94663index 49a8284..9643967 100644
94664--- a/include/drm/ttm/ttm_page_alloc.h
94665+++ b/include/drm/ttm/ttm_page_alloc.h
94666@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
94667 */
94668 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
94669
94670+struct device;
94671 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94672 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94673
94674diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
94675index 4b840e8..155d235 100644
94676--- a/include/keys/asymmetric-subtype.h
94677+++ b/include/keys/asymmetric-subtype.h
94678@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
94679 /* Verify the signature on a key of this subtype (optional) */
94680 int (*verify_signature)(const struct key *key,
94681 const struct public_key_signature *sig);
94682-};
94683+} __do_const;
94684
94685 /**
94686 * asymmetric_key_subtype - Get the subtype from an asymmetric key
94687diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
94688index c1da539..1dcec55 100644
94689--- a/include/linux/atmdev.h
94690+++ b/include/linux/atmdev.h
94691@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
94692 #endif
94693
94694 struct k_atm_aal_stats {
94695-#define __HANDLE_ITEM(i) atomic_t i
94696+#define __HANDLE_ITEM(i) atomic_unchecked_t i
94697 __AAL_STAT_ITEMS
94698 #undef __HANDLE_ITEM
94699 };
94700@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
94701 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
94702 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
94703 struct module *owner;
94704-};
94705+} __do_const ;
94706
94707 struct atmphy_ops {
94708 int (*start)(struct atm_dev *dev);
94709diff --git a/include/linux/atomic.h b/include/linux/atomic.h
94710index 5b08a85..60922fb 100644
94711--- a/include/linux/atomic.h
94712+++ b/include/linux/atomic.h
94713@@ -12,7 +12,7 @@
94714 * Atomically adds @a to @v, so long as @v was not already @u.
94715 * Returns non-zero if @v was not @u, and zero otherwise.
94716 */
94717-static inline int atomic_add_unless(atomic_t *v, int a, int u)
94718+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
94719 {
94720 return __atomic_add_unless(v, a, u) != u;
94721 }
94722diff --git a/include/linux/audit.h b/include/linux/audit.h
94723index c2e7e3a..8bfc0e1 100644
94724--- a/include/linux/audit.h
94725+++ b/include/linux/audit.h
94726@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
94727 extern unsigned int audit_serial(void);
94728 extern int auditsc_get_stamp(struct audit_context *ctx,
94729 struct timespec *t, unsigned int *serial);
94730-extern int audit_set_loginuid(kuid_t loginuid);
94731+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
94732
94733 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
94734 {
94735diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
94736index 576e463..28fd926 100644
94737--- a/include/linux/binfmts.h
94738+++ b/include/linux/binfmts.h
94739@@ -44,7 +44,7 @@ struct linux_binprm {
94740 unsigned interp_flags;
94741 unsigned interp_data;
94742 unsigned long loader, exec;
94743-};
94744+} __randomize_layout;
94745
94746 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
94747 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
94748@@ -77,8 +77,10 @@ struct linux_binfmt {
94749 int (*load_binary)(struct linux_binprm *);
94750 int (*load_shlib)(struct file *);
94751 int (*core_dump)(struct coredump_params *cprm);
94752+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
94753+ void (*handle_mmap)(struct file *);
94754 unsigned long min_coredump; /* minimal dump size */
94755-};
94756+} __do_const __randomize_layout;
94757
94758 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
94759
94760diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
94761index ea17cca..dd56e56 100644
94762--- a/include/linux/bitmap.h
94763+++ b/include/linux/bitmap.h
94764@@ -295,7 +295,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
94765 return find_first_zero_bit(src, nbits) == nbits;
94766 }
94767
94768-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
94769+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
94770 {
94771 if (small_const_nbits(nbits))
94772 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
94773diff --git a/include/linux/bitops.h b/include/linux/bitops.h
94774index 297f5bd..0b6d1e8 100644
94775--- a/include/linux/bitops.h
94776+++ b/include/linux/bitops.h
94777@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
94778 * @word: value to rotate
94779 * @shift: bits to roll
94780 */
94781-static inline __u32 rol32(__u32 word, unsigned int shift)
94782+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
94783 {
94784 return (word << shift) | (word >> (32 - shift));
94785 }
94786@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
94787 * @word: value to rotate
94788 * @shift: bits to roll
94789 */
94790-static inline __u32 ror32(__u32 word, unsigned int shift)
94791+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
94792 {
94793 return (word >> shift) | (word << (32 - shift));
94794 }
94795@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
94796 return (__s32)(value << shift) >> shift;
94797 }
94798
94799-static inline unsigned fls_long(unsigned long l)
94800+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
94801 {
94802 if (sizeof(l) == 4)
94803 return fls(l);
94804diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
94805index 5d93a66..978c4a0 100644
94806--- a/include/linux/blkdev.h
94807+++ b/include/linux/blkdev.h
94808@@ -1614,7 +1614,7 @@ struct block_device_operations {
94809 /* this callback is with swap_lock and sometimes page table lock held */
94810 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
94811 struct module *owner;
94812-};
94813+} __do_const;
94814
94815 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
94816 unsigned long);
94817diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
94818index afc1343..9735539 100644
94819--- a/include/linux/blktrace_api.h
94820+++ b/include/linux/blktrace_api.h
94821@@ -25,7 +25,7 @@ struct blk_trace {
94822 struct dentry *dropped_file;
94823 struct dentry *msg_file;
94824 struct list_head running_list;
94825- atomic_t dropped;
94826+ atomic_unchecked_t dropped;
94827 };
94828
94829 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
94830diff --git a/include/linux/cache.h b/include/linux/cache.h
94831index 17e7e82..1d7da26 100644
94832--- a/include/linux/cache.h
94833+++ b/include/linux/cache.h
94834@@ -16,6 +16,14 @@
94835 #define __read_mostly
94836 #endif
94837
94838+#ifndef __read_only
94839+#ifdef CONFIG_PAX_KERNEXEC
94840+#error KERNEXEC requires __read_only
94841+#else
94842+#define __read_only __read_mostly
94843+#endif
94844+#endif
94845+
94846 #ifndef ____cacheline_aligned
94847 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
94848 #endif
94849diff --git a/include/linux/capability.h b/include/linux/capability.h
94850index af9f0b9..71a5e5c 100644
94851--- a/include/linux/capability.h
94852+++ b/include/linux/capability.h
94853@@ -237,15 +237,28 @@ static inline bool capable(int cap)
94854 {
94855 return true;
94856 }
94857+static inline bool capable_nolog(int cap)
94858+{
94859+ return true;
94860+}
94861 static inline bool ns_capable(struct user_namespace *ns, int cap)
94862 {
94863 return true;
94864 }
94865+static inline bool ns_capable_nolog(struct user_namespace *ns, int cap)
94866+{
94867+ return true;
94868+}
94869 #endif /* CONFIG_MULTIUSER */
94870 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
94871+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
94872 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
94873+extern bool capable_nolog(int cap);
94874+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
94875
94876 /* audit system wants to get cap info from files as well */
94877 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
94878
94879+extern int is_privileged_binary(const struct dentry *dentry);
94880+
94881 #endif /* !_LINUX_CAPABILITY_H */
94882diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
94883index 8609d57..86e4d79 100644
94884--- a/include/linux/cdrom.h
94885+++ b/include/linux/cdrom.h
94886@@ -87,7 +87,6 @@ struct cdrom_device_ops {
94887
94888 /* driver specifications */
94889 const int capability; /* capability flags */
94890- int n_minors; /* number of active minor devices */
94891 /* handle uniform packets for scsi type devices (scsi,atapi) */
94892 int (*generic_packet) (struct cdrom_device_info *,
94893 struct packet_command *);
94894diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
94895index bda5ec0b4..51d8ea1 100644
94896--- a/include/linux/cleancache.h
94897+++ b/include/linux/cleancache.h
94898@@ -35,7 +35,7 @@ struct cleancache_ops {
94899 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
94900 void (*invalidate_inode)(int, struct cleancache_filekey);
94901 void (*invalidate_fs)(int);
94902-};
94903+} __no_const;
94904
94905 extern int cleancache_register_ops(struct cleancache_ops *ops);
94906 extern void __cleancache_init_fs(struct super_block *);
94907diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
94908index df69531..c4459db 100644
94909--- a/include/linux/clk-provider.h
94910+++ b/include/linux/clk-provider.h
94911@@ -195,6 +195,7 @@ struct clk_ops {
94912 void (*init)(struct clk_hw *hw);
94913 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
94914 };
94915+typedef struct clk_ops __no_const clk_ops_no_const;
94916
94917 /**
94918 * struct clk_init_data - holds init data that's common to all clocks and is
94919diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
94920index 94bad77..a39e810 100644
94921--- a/include/linux/clkdev.h
94922+++ b/include/linux/clkdev.h
94923@@ -32,7 +32,7 @@ struct clk_lookup {
94924 }
94925
94926 struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
94927- const char *dev_fmt, ...);
94928+ const char *dev_fmt, ...) __printf(3, 4);
94929
94930 void clkdev_add(struct clk_lookup *cl);
94931 void clkdev_drop(struct clk_lookup *cl);
94932@@ -40,7 +40,8 @@ void clkdev_drop(struct clk_lookup *cl);
94933 void clkdev_add_table(struct clk_lookup *, size_t);
94934 int clk_add_alias(const char *, const char *, char *, struct device *);
94935
94936-int clk_register_clkdev(struct clk *, const char *, const char *, ...);
94937+int clk_register_clkdev(struct clk *, const char *, const char *, ...)
94938+ __printf(3, 4);
94939 int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
94940
94941 #ifdef CONFIG_COMMON_CLK
94942diff --git a/include/linux/compat.h b/include/linux/compat.h
94943index ab25814..63b52db 100644
94944--- a/include/linux/compat.h
94945+++ b/include/linux/compat.h
94946@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
94947 compat_size_t __user *len_ptr);
94948
94949 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
94950-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
94951+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
94952 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
94953 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
94954 compat_ssize_t msgsz, int msgflg);
94955@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
94956 long compat_sys_msgctl(int first, int second, void __user *uptr);
94957 long compat_sys_shmctl(int first, int second, void __user *uptr);
94958 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
94959- unsigned nsems, const struct compat_timespec __user *timeout);
94960+ compat_long_t nsems, const struct compat_timespec __user *timeout);
94961 asmlinkage long compat_sys_keyctl(u32 option,
94962 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
94963 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
94964@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
94965
94966 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
94967
94968-extern int compat_printk(const char *fmt, ...);
94969+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
94970 extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
94971 extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);
94972
94973@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
94974 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
94975 compat_ulong_t addr, compat_ulong_t data);
94976 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
94977- compat_long_t addr, compat_long_t data);
94978+ compat_ulong_t addr, compat_ulong_t data);
94979
94980 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
94981 /*
94982diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
94983index 371e560..e2e4e3e 100644
94984--- a/include/linux/compiler-gcc.h
94985+++ b/include/linux/compiler-gcc.h
94986@@ -108,8 +108,8 @@
94987 */
94988 #define __pure __attribute__((pure))
94989 #define __aligned(x) __attribute__((aligned(x)))
94990-#define __printf(a, b) __attribute__((format(printf, a, b)))
94991-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
94992+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
94993+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
94994 #define noinline __attribute__((noinline))
94995 #define __attribute_const__ __attribute__((__const__))
94996 #define __maybe_unused __attribute__((unused))
94997diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
94998index 769e198..7ee7cb5 100644
94999--- a/include/linux/compiler-gcc4.h
95000+++ b/include/linux/compiler-gcc4.h
95001@@ -39,9 +39,38 @@
95002 # define __compiletime_warning(message) __attribute__((warning(message)))
95003 # define __compiletime_error(message) __attribute__((error(message)))
95004 #endif /* __CHECKER__ */
95005+
95006+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
95007+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
95008+#define __bos0(ptr) __bos((ptr), 0)
95009+#define __bos1(ptr) __bos((ptr), 1)
95010 #endif /* GCC_VERSION >= 40300 */
95011
95012 #if GCC_VERSION >= 40500
95013+
95014+#ifdef RANDSTRUCT_PLUGIN
95015+#define __randomize_layout __attribute__((randomize_layout))
95016+#define __no_randomize_layout __attribute__((no_randomize_layout))
95017+#endif
95018+
95019+#ifdef CONSTIFY_PLUGIN
95020+#define __no_const __attribute__((no_const))
95021+#define __do_const __attribute__((do_const))
95022+#endif
95023+
95024+#ifdef SIZE_OVERFLOW_PLUGIN
95025+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
95026+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
95027+#endif
95028+
95029+#ifdef LATENT_ENTROPY_PLUGIN
95030+#define __latent_entropy __attribute__((latent_entropy))
95031+#endif
95032+
95033+#ifdef INITIFY_PLUGIN
95034+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
95035+#endif
95036+
95037 /*
95038 * Mark a position in code as unreachable. This can be used to
95039 * suppress control flow warnings after asm blocks that transfer
95040diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
95041index efee493..8aa8f6b 100644
95042--- a/include/linux/compiler-gcc5.h
95043+++ b/include/linux/compiler-gcc5.h
95044@@ -28,6 +28,34 @@
95045 # define __compiletime_error(message) __attribute__((error(message)))
95046 #endif /* __CHECKER__ */
95047
95048+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
95049+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
95050+#define __bos0(ptr) __bos((ptr), 0)
95051+#define __bos1(ptr) __bos((ptr), 1)
95052+
95053+#ifdef RANDSTRUCT_PLUGIN
95054+#define __randomize_layout __attribute__((randomize_layout))
95055+#define __no_randomize_layout __attribute__((no_randomize_layout))
95056+#endif
95057+
95058+#ifdef CONSTIFY_PLUGIN
95059+#define __no_const __attribute__((no_const))
95060+#define __do_const __attribute__((do_const))
95061+#endif
95062+
95063+#ifdef SIZE_OVERFLOW_PLUGIN
95064+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
95065+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
95066+#endif
95067+
95068+#ifdef LATENT_ENTROPY_PLUGIN
95069+#define __latent_entropy __attribute__((latent_entropy))
95070+#endif
95071+
95072+#ifdef INITIFY_PLUGIN
95073+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
95074+#endif
95075+
95076 /*
95077 * Mark a position in code as unreachable. This can be used to
95078 * suppress control flow warnings after asm blocks that transfer
95079diff --git a/include/linux/compiler.h b/include/linux/compiler.h
95080index 8677225..2d49df1 100644
95081--- a/include/linux/compiler.h
95082+++ b/include/linux/compiler.h
95083@@ -5,11 +5,14 @@
95084
95085 #ifdef __CHECKER__
95086 # define __user __attribute__((noderef, address_space(1)))
95087+# define __force_user __force __user
95088 # define __kernel __attribute__((address_space(0)))
95089+# define __force_kernel __force __kernel
95090 # define __safe __attribute__((safe))
95091 # define __force __attribute__((force))
95092 # define __nocast __attribute__((nocast))
95093 # define __iomem __attribute__((noderef, address_space(2)))
95094+# define __force_iomem __force __iomem
95095 # define __must_hold(x) __attribute__((context(x,1,1)))
95096 # define __acquires(x) __attribute__((context(x,0,1)))
95097 # define __releases(x) __attribute__((context(x,1,0)))
95098@@ -17,20 +20,37 @@
95099 # define __release(x) __context__(x,-1)
95100 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
95101 # define __percpu __attribute__((noderef, address_space(3)))
95102+# define __force_percpu __force __percpu
95103 #ifdef CONFIG_SPARSE_RCU_POINTER
95104 # define __rcu __attribute__((noderef, address_space(4)))
95105+# define __force_rcu __force __rcu
95106 #else
95107 # define __rcu
95108+# define __force_rcu
95109 #endif
95110 extern void __chk_user_ptr(const volatile void __user *);
95111 extern void __chk_io_ptr(const volatile void __iomem *);
95112 #else
95113-# define __user
95114-# define __kernel
95115+# ifdef CHECKER_PLUGIN
95116+//# define __user
95117+//# define __force_user
95118+//# define __kernel
95119+//# define __force_kernel
95120+# else
95121+# ifdef STRUCTLEAK_PLUGIN
95122+# define __user __attribute__((user))
95123+# else
95124+# define __user
95125+# endif
95126+# define __force_user
95127+# define __kernel
95128+# define __force_kernel
95129+# endif
95130 # define __safe
95131 # define __force
95132 # define __nocast
95133 # define __iomem
95134+# define __force_iomem
95135 # define __chk_user_ptr(x) (void)0
95136 # define __chk_io_ptr(x) (void)0
95137 # define __builtin_warning(x, y...) (1)
95138@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
95139 # define __release(x) (void)0
95140 # define __cond_lock(x,c) (c)
95141 # define __percpu
95142+# define __force_percpu
95143 # define __rcu
95144+# define __force_rcu
95145 #endif
95146
95147 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
95148@@ -199,27 +221,27 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
95149 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
95150 {
95151 switch (size) {
95152- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
95153- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
95154- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
95155- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
95156+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
95157+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
95158+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
95159+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
95160 default:
95161 barrier();
95162- __builtin_memcpy((void *)res, (const void *)p, size);
95163+ __builtin_memcpy(res, (const void *)p, size);
95164 barrier();
95165 }
95166 }
95167
95168-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
95169+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
95170 {
95171 switch (size) {
95172- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
95173- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
95174- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
95175- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
95176+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
95177+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
95178+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
95179+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
95180 default:
95181 barrier();
95182- __builtin_memcpy((void *)p, (const void *)res, size);
95183+ __builtin_memcpy((void *)p, res, size);
95184 barrier();
95185 }
95186 }
95187@@ -352,6 +374,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95188 # define __attribute_const__ /* unimplemented */
95189 #endif
95190
95191+#ifndef __randomize_layout
95192+# define __randomize_layout
95193+#endif
95194+
95195+#ifndef __no_randomize_layout
95196+# define __no_randomize_layout
95197+#endif
95198+
95199+#ifndef __no_const
95200+# define __no_const
95201+#endif
95202+
95203+#ifndef __do_const
95204+# define __do_const
95205+#endif
95206+
95207+#ifndef __size_overflow
95208+# define __size_overflow(...)
95209+#endif
95210+
95211+#ifndef __intentional_overflow
95212+# define __intentional_overflow(...)
95213+#endif
95214+
95215+#ifndef __latent_entropy
95216+# define __latent_entropy
95217+#endif
95218+
95219+#ifndef __nocapture
95220+# define __nocapture(...)
95221+#endif
95222+
95223 /*
95224 * Tell gcc if a function is cold. The compiler will assume any path
95225 * directly leading to the call is unlikely.
95226@@ -361,6 +415,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95227 #define __cold
95228 #endif
95229
95230+#ifndef __alloc_size
95231+#define __alloc_size(...)
95232+#endif
95233+
95234+#ifndef __bos
95235+#define __bos(ptr, arg)
95236+#endif
95237+
95238+#ifndef __bos0
95239+#define __bos0(ptr)
95240+#endif
95241+
95242+#ifndef __bos1
95243+#define __bos1(ptr)
95244+#endif
95245+
95246 /* Simple shorthand for a section definition */
95247 #ifndef __section
95248 # define __section(S) __attribute__ ((__section__(#S)))
95249@@ -375,6 +445,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95250 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
95251 #endif
95252
95253+#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))
95254+
95255 /* Is this type a native word size -- useful for atomic operations */
95256 #ifndef __native_word
95257 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
95258@@ -454,8 +526,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95259 */
95260 #define __ACCESS_ONCE(x) ({ \
95261 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
95262- (volatile typeof(x) *)&(x); })
95263+ (volatile const typeof(x) *)&(x); })
95264 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
95265+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
95266
95267 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
95268 #ifdef CONFIG_KPROBES
95269diff --git a/include/linux/completion.h b/include/linux/completion.h
95270index 5d5aaae..0ea9b84 100644
95271--- a/include/linux/completion.h
95272+++ b/include/linux/completion.h
95273@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
95274
95275 extern void wait_for_completion(struct completion *);
95276 extern void wait_for_completion_io(struct completion *);
95277-extern int wait_for_completion_interruptible(struct completion *x);
95278-extern int wait_for_completion_killable(struct completion *x);
95279+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
95280+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
95281 extern unsigned long wait_for_completion_timeout(struct completion *x,
95282- unsigned long timeout);
95283+ unsigned long timeout) __intentional_overflow(-1);
95284 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
95285- unsigned long timeout);
95286+ unsigned long timeout) __intentional_overflow(-1);
95287 extern long wait_for_completion_interruptible_timeout(
95288- struct completion *x, unsigned long timeout);
95289+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95290 extern long wait_for_completion_killable_timeout(
95291- struct completion *x, unsigned long timeout);
95292+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95293 extern bool try_wait_for_completion(struct completion *x);
95294 extern bool completion_done(struct completion *x);
95295
95296diff --git a/include/linux/configfs.h b/include/linux/configfs.h
95297index 34025df..9c263df 100644
95298--- a/include/linux/configfs.h
95299+++ b/include/linux/configfs.h
95300@@ -64,7 +64,8 @@ struct config_item {
95301 struct dentry *ci_dentry;
95302 };
95303
95304-extern int config_item_set_name(struct config_item *, const char *, ...);
95305+extern __printf(2, 3)
95306+int config_item_set_name(struct config_item *, const char *, ...);
95307
95308 static inline char *config_item_name(struct config_item * item)
95309 {
95310@@ -125,7 +126,7 @@ struct configfs_attribute {
95311 const char *ca_name;
95312 struct module *ca_owner;
95313 umode_t ca_mode;
95314-};
95315+} __do_const;
95316
95317 /*
95318 * Users often need to create attribute structures for their configurable
95319diff --git a/include/linux/cpu.h b/include/linux/cpu.h
95320index c0fb6b1..23c30bd 100644
95321--- a/include/linux/cpu.h
95322+++ b/include/linux/cpu.h
95323@@ -40,9 +40,10 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
95324 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
95325 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
95326
95327-extern struct device *cpu_device_create(struct device *parent, void *drvdata,
95328- const struct attribute_group **groups,
95329- const char *fmt, ...);
95330+extern __printf(4, 5)
95331+struct device *cpu_device_create(struct device *parent, void *drvdata,
95332+ const struct attribute_group **groups,
95333+ const char *fmt, ...);
95334 #ifdef CONFIG_HOTPLUG_CPU
95335 extern void unregister_cpu(struct cpu *cpu);
95336 extern ssize_t arch_cpu_probe(const char *, size_t);
95337diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
95338index 2ee4888..0451f5e 100644
95339--- a/include/linux/cpufreq.h
95340+++ b/include/linux/cpufreq.h
95341@@ -207,6 +207,7 @@ struct global_attr {
95342 ssize_t (*store)(struct kobject *a, struct attribute *b,
95343 const char *c, size_t count);
95344 };
95345+typedef struct global_attr __no_const global_attr_no_const;
95346
95347 #define define_one_global_ro(_name) \
95348 static struct global_attr _name = \
95349@@ -278,7 +279,7 @@ struct cpufreq_driver {
95350 bool boost_supported;
95351 bool boost_enabled;
95352 int (*set_boost)(int state);
95353-};
95354+} __do_const;
95355
95356 /* flags */
95357 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
95358diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
95359index 9c5e892..feb34e0 100644
95360--- a/include/linux/cpuidle.h
95361+++ b/include/linux/cpuidle.h
95362@@ -59,7 +59,8 @@ struct cpuidle_state {
95363 void (*enter_freeze) (struct cpuidle_device *dev,
95364 struct cpuidle_driver *drv,
95365 int index);
95366-};
95367+} __do_const;
95368+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
95369
95370 /* Idle State Flags */
95371 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
95372@@ -227,7 +228,7 @@ struct cpuidle_governor {
95373 void (*reflect) (struct cpuidle_device *dev, int index);
95374
95375 struct module *owner;
95376-};
95377+} __do_const;
95378
95379 #ifdef CONFIG_CPU_IDLE
95380 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
95381diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
95382index 59915ea..81ebec0 100644
95383--- a/include/linux/cpumask.h
95384+++ b/include/linux/cpumask.h
95385@@ -127,17 +127,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95386 }
95387
95388 /* Valid inputs for n are -1 and 0. */
95389-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95390+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95391 {
95392 return n+1;
95393 }
95394
95395-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95396+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95397 {
95398 return n+1;
95399 }
95400
95401-static inline unsigned int cpumask_next_and(int n,
95402+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
95403 const struct cpumask *srcp,
95404 const struct cpumask *andp)
95405 {
95406@@ -181,7 +181,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95407 *
95408 * Returns >= nr_cpu_ids if no further cpus set.
95409 */
95410-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95411+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95412 {
95413 /* -1 is a legal arg here. */
95414 if (n != -1)
95415@@ -196,7 +196,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95416 *
95417 * Returns >= nr_cpu_ids if no further cpus unset.
95418 */
95419-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95420+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95421 {
95422 /* -1 is a legal arg here. */
95423 if (n != -1)
95424@@ -204,7 +204,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95425 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
95426 }
95427
95428-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
95429+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
95430 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
95431 unsigned int cpumask_local_spread(unsigned int i, int node);
95432
95433@@ -471,7 +471,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
95434 * cpumask_weight - Count of bits in *srcp
95435 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
95436 */
95437-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
95438+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
95439 {
95440 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
95441 }
95442diff --git a/include/linux/cred.h b/include/linux/cred.h
95443index 8b6c083..51cb9f5 100644
95444--- a/include/linux/cred.h
95445+++ b/include/linux/cred.h
95446@@ -35,7 +35,7 @@ struct group_info {
95447 int nblocks;
95448 kgid_t small_block[NGROUPS_SMALL];
95449 kgid_t *blocks[0];
95450-};
95451+} __randomize_layout;
95452
95453 /**
95454 * get_group_info - Get a reference to a group info structure
95455@@ -152,7 +152,7 @@ struct cred {
95456 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
95457 struct group_info *group_info; /* supplementary groups for euid/fsgid */
95458 struct rcu_head rcu; /* RCU deletion hook */
95459-};
95460+} __randomize_layout;
95461
95462 extern void __put_cred(struct cred *);
95463 extern void exit_creds(struct task_struct *);
95464@@ -210,6 +210,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
95465 static inline void validate_process_creds(void)
95466 {
95467 }
95468+static inline void validate_task_creds(struct task_struct *task)
95469+{
95470+}
95471 #endif
95472
95473 /**
95474@@ -347,6 +350,7 @@ static inline void put_cred(const struct cred *_cred)
95475
95476 #define task_uid(task) (task_cred_xxx((task), uid))
95477 #define task_euid(task) (task_cred_xxx((task), euid))
95478+#define task_securebits(task) (task_cred_xxx((task), securebits))
95479
95480 #define current_cred_xxx(xxx) \
95481 ({ \
95482diff --git a/include/linux/crypto.h b/include/linux/crypto.h
95483index 10df5d2..503d678 100644
95484--- a/include/linux/crypto.h
95485+++ b/include/linux/crypto.h
95486@@ -632,7 +632,7 @@ struct cipher_tfm {
95487 const u8 *key, unsigned int keylen);
95488 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95489 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95490-};
95491+} __no_const;
95492
95493 struct hash_tfm {
95494 int (*init)(struct hash_desc *desc);
95495@@ -653,13 +653,13 @@ struct compress_tfm {
95496 int (*cot_decompress)(struct crypto_tfm *tfm,
95497 const u8 *src, unsigned int slen,
95498 u8 *dst, unsigned int *dlen);
95499-};
95500+} __no_const;
95501
95502 struct rng_tfm {
95503 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
95504 unsigned int dlen);
95505 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
95506-};
95507+} __no_const;
95508
95509 #define crt_ablkcipher crt_u.ablkcipher
95510 #define crt_aead crt_u.aead
95511diff --git a/include/linux/ctype.h b/include/linux/ctype.h
95512index 653589e..4ef254a 100644
95513--- a/include/linux/ctype.h
95514+++ b/include/linux/ctype.h
95515@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
95516 * Fast implementation of tolower() for internal usage. Do not use in your
95517 * code.
95518 */
95519-static inline char _tolower(const char c)
95520+static inline unsigned char _tolower(const unsigned char c)
95521 {
95522 return c | 0x20;
95523 }
95524diff --git a/include/linux/dcache.h b/include/linux/dcache.h
95525index df334cb..e730faa 100644
95526--- a/include/linux/dcache.h
95527+++ b/include/linux/dcache.h
95528@@ -123,6 +123,9 @@ struct dentry {
95529 unsigned long d_time; /* used by d_revalidate */
95530 void *d_fsdata; /* fs-specific data */
95531
95532+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
95533+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
95534+#endif
95535 struct list_head d_lru; /* LRU list */
95536 struct list_head d_child; /* child of parent list */
95537 struct list_head d_subdirs; /* our children */
95538@@ -133,7 +136,7 @@ struct dentry {
95539 struct hlist_node d_alias; /* inode alias list */
95540 struct rcu_head d_rcu;
95541 } d_u;
95542-};
95543+} __randomize_layout;
95544
95545 /*
95546 * dentry->d_lock spinlock nesting subclasses:
95547@@ -319,13 +322,14 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
95548
95549 static inline unsigned d_count(const struct dentry *dentry)
95550 {
95551- return dentry->d_lockref.count;
95552+ return __lockref_read(&dentry->d_lockref);
95553 }
95554
95555 /*
95556 * helper function for dentry_operations.d_dname() members
95557 */
95558-extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95559+extern __printf(4, 5)
95560+char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95561 extern char *simple_dname(struct dentry *, char *, int);
95562
95563 extern char *__d_path(const struct path *, const struct path *, char *, int);
95564@@ -347,7 +351,7 @@ extern char *dentry_path(struct dentry *, char *, int);
95565 static inline struct dentry *dget_dlock(struct dentry *dentry)
95566 {
95567 if (dentry)
95568- dentry->d_lockref.count++;
95569+ __lockref_inc(&dentry->d_lockref);
95570 return dentry;
95571 }
95572
95573diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
95574index 7925bf0..d5143d2 100644
95575--- a/include/linux/decompress/mm.h
95576+++ b/include/linux/decompress/mm.h
95577@@ -77,7 +77,7 @@ static void free(void *where)
95578 * warnings when not needed (indeed large_malloc / large_free are not
95579 * needed by inflate */
95580
95581-#define malloc(a) kmalloc(a, GFP_KERNEL)
95582+#define malloc(a) kmalloc((a), GFP_KERNEL)
95583 #define free(a) kfree(a)
95584
95585 #define large_malloc(a) vmalloc(a)
95586diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
95587index ce447f0..83c66bd 100644
95588--- a/include/linux/devfreq.h
95589+++ b/include/linux/devfreq.h
95590@@ -114,7 +114,7 @@ struct devfreq_governor {
95591 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
95592 int (*event_handler)(struct devfreq *devfreq,
95593 unsigned int event, void *data);
95594-};
95595+} __do_const;
95596
95597 /**
95598 * struct devfreq - Device devfreq structure
95599diff --git a/include/linux/device.h b/include/linux/device.h
95600index 6558af9..48bce1a 100644
95601--- a/include/linux/device.h
95602+++ b/include/linux/device.h
95603@@ -312,7 +312,7 @@ struct subsys_interface {
95604 struct list_head node;
95605 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
95606 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
95607-};
95608+} __do_const;
95609
95610 int subsys_interface_register(struct subsys_interface *sif);
95611 void subsys_interface_unregister(struct subsys_interface *sif);
95612@@ -508,7 +508,7 @@ struct device_type {
95613 void (*release)(struct device *dev);
95614
95615 const struct dev_pm_ops *pm;
95616-};
95617+} __do_const;
95618
95619 /* interface for exporting device attributes */
95620 struct device_attribute {
95621@@ -518,11 +518,12 @@ struct device_attribute {
95622 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
95623 const char *buf, size_t count);
95624 };
95625+typedef struct device_attribute __no_const device_attribute_no_const;
95626
95627 struct dev_ext_attribute {
95628 struct device_attribute attr;
95629 void *var;
95630-};
95631+} __do_const;
95632
95633 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
95634 char *buf);
95635@@ -607,8 +608,9 @@ extern int devres_release_group(struct device *dev, void *id);
95636
95637 /* managed devm_k.alloc/kfree for device drivers */
95638 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
95639-extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95640- va_list ap);
95641+extern __printf(3, 0)
95642+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95643+ va_list ap);
95644 extern __printf(3, 4)
95645 char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
95646 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
95647@@ -980,12 +982,10 @@ extern int __must_check device_reprobe(struct device *dev);
95648 /*
95649 * Easy functions for dynamically creating devices on the fly
95650 */
95651-extern struct device *device_create_vargs(struct class *cls,
95652- struct device *parent,
95653- dev_t devt,
95654- void *drvdata,
95655- const char *fmt,
95656- va_list vargs);
95657+extern __printf(5, 0)
95658+struct device *device_create_vargs(struct class *cls, struct device *parent,
95659+ dev_t devt, void *drvdata,
95660+ const char *fmt, va_list vargs);
95661 extern __printf(5, 6)
95662 struct device *device_create(struct class *cls, struct device *parent,
95663 dev_t devt, void *drvdata,
95664diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
95665index ac07ff0..edff186 100644
95666--- a/include/linux/dma-mapping.h
95667+++ b/include/linux/dma-mapping.h
95668@@ -64,7 +64,7 @@ struct dma_map_ops {
95669 u64 (*get_required_mask)(struct device *dev);
95670 #endif
95671 int is_phys;
95672-};
95673+} __do_const;
95674
95675 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
95676
95677diff --git a/include/linux/efi.h b/include/linux/efi.h
95678index af5be03..d8a6ae2 100644
95679--- a/include/linux/efi.h
95680+++ b/include/linux/efi.h
95681@@ -1057,6 +1057,7 @@ struct efivar_operations {
95682 efi_set_variable_nonblocking_t *set_variable_nonblocking;
95683 efi_query_variable_store_t *query_variable_store;
95684 };
95685+typedef struct efivar_operations __no_const efivar_operations_no_const;
95686
95687 struct efivars {
95688 /*
95689diff --git a/include/linux/elf.h b/include/linux/elf.h
95690index 20fa8d8..3d0dd18 100644
95691--- a/include/linux/elf.h
95692+++ b/include/linux/elf.h
95693@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
95694 #define elf_note elf32_note
95695 #define elf_addr_t Elf32_Off
95696 #define Elf_Half Elf32_Half
95697+#define elf_dyn Elf32_Dyn
95698
95699 #else
95700
95701@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
95702 #define elf_note elf64_note
95703 #define elf_addr_t Elf64_Off
95704 #define Elf_Half Elf64_Half
95705+#define elf_dyn Elf64_Dyn
95706
95707 #endif
95708
95709diff --git a/include/linux/err.h b/include/linux/err.h
95710index a729120..6ede2c9 100644
95711--- a/include/linux/err.h
95712+++ b/include/linux/err.h
95713@@ -20,12 +20,12 @@
95714
95715 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
95716
95717-static inline void * __must_check ERR_PTR(long error)
95718+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
95719 {
95720 return (void *) error;
95721 }
95722
95723-static inline long __must_check PTR_ERR(__force const void *ptr)
95724+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
95725 {
95726 return (long) ptr;
95727 }
95728diff --git a/include/linux/extcon.h b/include/linux/extcon.h
95729index 36f49c4..a2a1f4c 100644
95730--- a/include/linux/extcon.h
95731+++ b/include/linux/extcon.h
95732@@ -135,7 +135,7 @@ struct extcon_dev {
95733 /* /sys/class/extcon/.../mutually_exclusive/... */
95734 struct attribute_group attr_g_muex;
95735 struct attribute **attrs_muex;
95736- struct device_attribute *d_attrs_muex;
95737+ device_attribute_no_const *d_attrs_muex;
95738 };
95739
95740 /**
95741diff --git a/include/linux/fb.h b/include/linux/fb.h
95742index 043f328..180ccbf 100644
95743--- a/include/linux/fb.h
95744+++ b/include/linux/fb.h
95745@@ -305,7 +305,8 @@ struct fb_ops {
95746 /* called at KDB enter and leave time to prepare the console */
95747 int (*fb_debug_enter)(struct fb_info *info);
95748 int (*fb_debug_leave)(struct fb_info *info);
95749-};
95750+} __do_const;
95751+typedef struct fb_ops __no_const fb_ops_no_const;
95752
95753 #ifdef CONFIG_FB_TILEBLITTING
95754 #define FB_TILE_CURSOR_NONE 0
95755diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
95756index 230f87b..1fd0485 100644
95757--- a/include/linux/fdtable.h
95758+++ b/include/linux/fdtable.h
95759@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
95760 void put_files_struct(struct files_struct *fs);
95761 void reset_files_struct(struct files_struct *);
95762 int unshare_files(struct files_struct **);
95763-struct files_struct *dup_fd(struct files_struct *, int *);
95764+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
95765 void do_close_on_exec(struct files_struct *);
95766 int iterate_fd(struct files_struct *, unsigned,
95767 int (*)(const void *, struct file *, unsigned),
95768diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
95769index 8293262..2b3b8bd 100644
95770--- a/include/linux/frontswap.h
95771+++ b/include/linux/frontswap.h
95772@@ -11,7 +11,7 @@ struct frontswap_ops {
95773 int (*load)(unsigned, pgoff_t, struct page *);
95774 void (*invalidate_page)(unsigned, pgoff_t);
95775 void (*invalidate_area)(unsigned);
95776-};
95777+} __no_const;
95778
95779 extern bool frontswap_enabled;
95780 extern struct frontswap_ops *
95781diff --git a/include/linux/fs.h b/include/linux/fs.h
95782index 571aab9..03a5b06 100644
95783--- a/include/linux/fs.h
95784+++ b/include/linux/fs.h
95785@@ -437,7 +437,7 @@ struct address_space {
95786 spinlock_t private_lock; /* for use by the address_space */
95787 struct list_head private_list; /* ditto */
95788 void *private_data; /* ditto */
95789-} __attribute__((aligned(sizeof(long))));
95790+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
95791 /*
95792 * On most architectures that alignment is already the case; but
95793 * must be enforced here for CRIS, to let the least significant bit
95794@@ -480,7 +480,7 @@ struct block_device {
95795 int bd_fsfreeze_count;
95796 /* Mutex for freeze */
95797 struct mutex bd_fsfreeze_mutex;
95798-};
95799+} __randomize_layout;
95800
95801 /*
95802 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
95803@@ -666,7 +666,7 @@ struct inode {
95804 #endif
95805
95806 void *i_private; /* fs or device private pointer */
95807-};
95808+} __randomize_layout;
95809
95810 static inline int inode_unhashed(struct inode *inode)
95811 {
95812@@ -861,7 +861,7 @@ struct file {
95813 struct list_head f_tfile_llink;
95814 #endif /* #ifdef CONFIG_EPOLL */
95815 struct address_space *f_mapping;
95816-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
95817+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
95818
95819 struct file_handle {
95820 __u32 handle_bytes;
95821@@ -990,7 +990,7 @@ struct file_lock {
95822 int state; /* state of grant or error if -ve */
95823 } afs;
95824 } fl_u;
95825-};
95826+} __randomize_layout;
95827
95828 struct file_lock_context {
95829 spinlock_t flc_lock;
95830@@ -1351,7 +1351,7 @@ struct super_block {
95831 * Indicates how deep in a filesystem stack this SB is
95832 */
95833 int s_stack_depth;
95834-};
95835+} __randomize_layout;
95836
95837 extern struct timespec current_fs_time(struct super_block *sb);
95838
95839@@ -1603,7 +1603,8 @@ struct file_operations {
95840 #ifndef CONFIG_MMU
95841 unsigned (*mmap_capabilities)(struct file *);
95842 #endif
95843-};
95844+} __do_const __randomize_layout;
95845+typedef struct file_operations __no_const file_operations_no_const;
95846
95847 struct inode_operations {
95848 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
95849@@ -2303,7 +2304,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
95850 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
95851 unsigned int count, const char *name,
95852 const struct file_operations *fops);
95853-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95854+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95855 unsigned int count, const char *name);
95856 extern void unregister_chrdev_region(dev_t, unsigned);
95857 extern void chrdev_show(struct seq_file *,off_t);
95858@@ -2989,4 +2990,14 @@ static inline bool dir_relax(struct inode *inode)
95859 return !IS_DEADDIR(inode);
95860 }
95861
95862+static inline bool is_sidechannel_device(const struct inode *inode)
95863+{
95864+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
95865+ umode_t mode = inode->i_mode;
95866+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
95867+#else
95868+ return false;
95869+#endif
95870+}
95871+
95872 #endif /* _LINUX_FS_H */
95873diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
95874index 0efc3e6..fd23610 100644
95875--- a/include/linux/fs_struct.h
95876+++ b/include/linux/fs_struct.h
95877@@ -6,13 +6,13 @@
95878 #include <linux/seqlock.h>
95879
95880 struct fs_struct {
95881- int users;
95882+ atomic_t users;
95883 spinlock_t lock;
95884 seqcount_t seq;
95885 int umask;
95886 int in_exec;
95887 struct path root, pwd;
95888-};
95889+} __randomize_layout;
95890
95891 extern struct kmem_cache *fs_cachep;
95892
95893diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
95894index 7714849..a4a5c7a 100644
95895--- a/include/linux/fscache-cache.h
95896+++ b/include/linux/fscache-cache.h
95897@@ -113,7 +113,7 @@ struct fscache_operation {
95898 fscache_operation_release_t release;
95899 };
95900
95901-extern atomic_t fscache_op_debug_id;
95902+extern atomic_unchecked_t fscache_op_debug_id;
95903 extern void fscache_op_work_func(struct work_struct *work);
95904
95905 extern void fscache_enqueue_operation(struct fscache_operation *);
95906@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
95907 INIT_WORK(&op->work, fscache_op_work_func);
95908 atomic_set(&op->usage, 1);
95909 op->state = FSCACHE_OP_ST_INITIALISED;
95910- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
95911+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
95912 op->processor = processor;
95913 op->release = release;
95914 INIT_LIST_HEAD(&op->pend_link);
95915diff --git a/include/linux/fscache.h b/include/linux/fscache.h
95916index 115bb81..e7b812b 100644
95917--- a/include/linux/fscache.h
95918+++ b/include/linux/fscache.h
95919@@ -152,7 +152,7 @@ struct fscache_cookie_def {
95920 * - this is mandatory for any object that may have data
95921 */
95922 void (*now_uncached)(void *cookie_netfs_data);
95923-};
95924+} __do_const;
95925
95926 /*
95927 * fscache cached network filesystem type
95928diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
95929index 7ee1774..72505b8 100644
95930--- a/include/linux/fsnotify.h
95931+++ b/include/linux/fsnotify.h
95932@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
95933 struct inode *inode = file_inode(file);
95934 __u32 mask = FS_ACCESS;
95935
95936+ if (is_sidechannel_device(inode))
95937+ return;
95938+
95939 if (S_ISDIR(inode->i_mode))
95940 mask |= FS_ISDIR;
95941
95942@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
95943 struct inode *inode = file_inode(file);
95944 __u32 mask = FS_MODIFY;
95945
95946+ if (is_sidechannel_device(inode))
95947+ return;
95948+
95949 if (S_ISDIR(inode->i_mode))
95950 mask |= FS_ISDIR;
95951
95952@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
95953 */
95954 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
95955 {
95956- return kstrdup(name, GFP_KERNEL);
95957+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
95958 }
95959
95960 /*
95961diff --git a/include/linux/genhd.h b/include/linux/genhd.h
95962index ec274e0..e678159 100644
95963--- a/include/linux/genhd.h
95964+++ b/include/linux/genhd.h
95965@@ -194,7 +194,7 @@ struct gendisk {
95966 struct kobject *slave_dir;
95967
95968 struct timer_rand_state *random;
95969- atomic_t sync_io; /* RAID */
95970+ atomic_unchecked_t sync_io; /* RAID */
95971 struct disk_events *ev;
95972 #ifdef CONFIG_BLK_DEV_INTEGRITY
95973 struct blk_integrity *integrity;
95974@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
95975 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
95976
95977 /* drivers/char/random.c */
95978-extern void add_disk_randomness(struct gendisk *disk);
95979+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
95980 extern void rand_initialize_disk(struct gendisk *disk);
95981
95982 static inline sector_t get_start_sect(struct block_device *bdev)
95983diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
95984index 667c311..abac2a7 100644
95985--- a/include/linux/genl_magic_func.h
95986+++ b/include/linux/genl_magic_func.h
95987@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
95988 },
95989
95990 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
95991-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
95992+static struct genl_ops ZZZ_genl_ops[] = {
95993 #include GENL_MAGIC_INCLUDE_FILE
95994 };
95995
95996diff --git a/include/linux/gfp.h b/include/linux/gfp.h
95997index 15928f0..90b31d7 100644
95998--- a/include/linux/gfp.h
95999+++ b/include/linux/gfp.h
96000@@ -35,6 +35,13 @@ struct vm_area_struct;
96001 #define ___GFP_NO_KSWAPD 0x400000u
96002 #define ___GFP_OTHER_NODE 0x800000u
96003 #define ___GFP_WRITE 0x1000000u
96004+
96005+#ifdef CONFIG_PAX_USERCOPY_SLABS
96006+#define ___GFP_USERCOPY 0x2000000u
96007+#else
96008+#define ___GFP_USERCOPY 0
96009+#endif
96010+
96011 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
96012
96013 /*
96014@@ -94,6 +101,7 @@ struct vm_area_struct;
96015 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
96016 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
96017 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
96018+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
96019
96020 /*
96021 * This may seem redundant, but it's a way of annotating false positives vs.
96022@@ -101,7 +109,7 @@ struct vm_area_struct;
96023 */
96024 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
96025
96026-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
96027+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
96028 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
96029
96030 /* This equals 0, but use constants in case they ever change */
96031@@ -146,6 +154,8 @@ struct vm_area_struct;
96032 /* 4GB DMA on some platforms */
96033 #define GFP_DMA32 __GFP_DMA32
96034
96035+#define GFP_USERCOPY __GFP_USERCOPY
96036+
96037 /* Convert GFP flags to their corresponding migrate type */
96038 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
96039 {
96040diff --git a/include/linux/gracl.h b/include/linux/gracl.h
96041new file mode 100644
96042index 0000000..91858e4
96043--- /dev/null
96044+++ b/include/linux/gracl.h
96045@@ -0,0 +1,342 @@
96046+#ifndef GR_ACL_H
96047+#define GR_ACL_H
96048+
96049+#include <linux/grdefs.h>
96050+#include <linux/resource.h>
96051+#include <linux/capability.h>
96052+#include <linux/dcache.h>
96053+#include <asm/resource.h>
96054+
96055+/* Major status information */
96056+
96057+#define GR_VERSION "grsecurity 3.1"
96058+#define GRSECURITY_VERSION 0x3100
96059+
96060+enum {
96061+ GR_SHUTDOWN = 0,
96062+ GR_ENABLE = 1,
96063+ GR_SPROLE = 2,
96064+ GR_OLDRELOAD = 3,
96065+ GR_SEGVMOD = 4,
96066+ GR_STATUS = 5,
96067+ GR_UNSPROLE = 6,
96068+ GR_PASSSET = 7,
96069+ GR_SPROLEPAM = 8,
96070+ GR_RELOAD = 9,
96071+};
96072+
96073+/* Password setup definitions
96074+ * kernel/grhash.c */
96075+enum {
96076+ GR_PW_LEN = 128,
96077+ GR_SALT_LEN = 16,
96078+ GR_SHA_LEN = 32,
96079+};
96080+
96081+enum {
96082+ GR_SPROLE_LEN = 64,
96083+};
96084+
96085+enum {
96086+ GR_NO_GLOB = 0,
96087+ GR_REG_GLOB,
96088+ GR_CREATE_GLOB
96089+};
96090+
96091+#define GR_NLIMITS 32
96092+
96093+/* Begin Data Structures */
96094+
96095+struct sprole_pw {
96096+ unsigned char *rolename;
96097+ unsigned char salt[GR_SALT_LEN];
96098+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
96099+};
96100+
96101+struct name_entry {
96102+ __u32 key;
96103+ u64 inode;
96104+ dev_t device;
96105+ char *name;
96106+ __u16 len;
96107+ __u8 deleted;
96108+ struct name_entry *prev;
96109+ struct name_entry *next;
96110+};
96111+
96112+struct inodev_entry {
96113+ struct name_entry *nentry;
96114+ struct inodev_entry *prev;
96115+ struct inodev_entry *next;
96116+};
96117+
96118+struct acl_role_db {
96119+ struct acl_role_label **r_hash;
96120+ __u32 r_size;
96121+};
96122+
96123+struct inodev_db {
96124+ struct inodev_entry **i_hash;
96125+ __u32 i_size;
96126+};
96127+
96128+struct name_db {
96129+ struct name_entry **n_hash;
96130+ __u32 n_size;
96131+};
96132+
96133+struct crash_uid {
96134+ uid_t uid;
96135+ unsigned long expires;
96136+};
96137+
96138+struct gr_hash_struct {
96139+ void **table;
96140+ void **nametable;
96141+ void *first;
96142+ __u32 table_size;
96143+ __u32 used_size;
96144+ int type;
96145+};
96146+
96147+/* Userspace Grsecurity ACL data structures */
96148+
96149+struct acl_subject_label {
96150+ char *filename;
96151+ u64 inode;
96152+ dev_t device;
96153+ __u32 mode;
96154+ kernel_cap_t cap_mask;
96155+ kernel_cap_t cap_lower;
96156+ kernel_cap_t cap_invert_audit;
96157+
96158+ struct rlimit res[GR_NLIMITS];
96159+ __u32 resmask;
96160+
96161+ __u8 user_trans_type;
96162+ __u8 group_trans_type;
96163+ uid_t *user_transitions;
96164+ gid_t *group_transitions;
96165+ __u16 user_trans_num;
96166+ __u16 group_trans_num;
96167+
96168+ __u32 sock_families[2];
96169+ __u32 ip_proto[8];
96170+ __u32 ip_type;
96171+ struct acl_ip_label **ips;
96172+ __u32 ip_num;
96173+ __u32 inaddr_any_override;
96174+
96175+ __u32 crashes;
96176+ unsigned long expires;
96177+
96178+ struct acl_subject_label *parent_subject;
96179+ struct gr_hash_struct *hash;
96180+ struct acl_subject_label *prev;
96181+ struct acl_subject_label *next;
96182+
96183+ struct acl_object_label **obj_hash;
96184+ __u32 obj_hash_size;
96185+ __u16 pax_flags;
96186+};
96187+
96188+struct role_allowed_ip {
96189+ __u32 addr;
96190+ __u32 netmask;
96191+
96192+ struct role_allowed_ip *prev;
96193+ struct role_allowed_ip *next;
96194+};
96195+
96196+struct role_transition {
96197+ char *rolename;
96198+
96199+ struct role_transition *prev;
96200+ struct role_transition *next;
96201+};
96202+
96203+struct acl_role_label {
96204+ char *rolename;
96205+ uid_t uidgid;
96206+ __u16 roletype;
96207+
96208+ __u16 auth_attempts;
96209+ unsigned long expires;
96210+
96211+ struct acl_subject_label *root_label;
96212+ struct gr_hash_struct *hash;
96213+
96214+ struct acl_role_label *prev;
96215+ struct acl_role_label *next;
96216+
96217+ struct role_transition *transitions;
96218+ struct role_allowed_ip *allowed_ips;
96219+ uid_t *domain_children;
96220+ __u16 domain_child_num;
96221+
96222+ umode_t umask;
96223+
96224+ struct acl_subject_label **subj_hash;
96225+ __u32 subj_hash_size;
96226+};
96227+
96228+struct user_acl_role_db {
96229+ struct acl_role_label **r_table;
96230+ __u32 num_pointers; /* Number of allocations to track */
96231+ __u32 num_roles; /* Number of roles */
96232+ __u32 num_domain_children; /* Number of domain children */
96233+ __u32 num_subjects; /* Number of subjects */
96234+ __u32 num_objects; /* Number of objects */
96235+};
96236+
96237+struct acl_object_label {
96238+ char *filename;
96239+ u64 inode;
96240+ dev_t device;
96241+ __u32 mode;
96242+
96243+ struct acl_subject_label *nested;
96244+ struct acl_object_label *globbed;
96245+
96246+ /* next two structures not used */
96247+
96248+ struct acl_object_label *prev;
96249+ struct acl_object_label *next;
96250+};
96251+
96252+struct acl_ip_label {
96253+ char *iface;
96254+ __u32 addr;
96255+ __u32 netmask;
96256+ __u16 low, high;
96257+ __u8 mode;
96258+ __u32 type;
96259+ __u32 proto[8];
96260+
96261+ /* next two structures not used */
96262+
96263+ struct acl_ip_label *prev;
96264+ struct acl_ip_label *next;
96265+};
96266+
96267+struct gr_arg {
96268+ struct user_acl_role_db role_db;
96269+ unsigned char pw[GR_PW_LEN];
96270+ unsigned char salt[GR_SALT_LEN];
96271+ unsigned char sum[GR_SHA_LEN];
96272+ unsigned char sp_role[GR_SPROLE_LEN];
96273+ struct sprole_pw *sprole_pws;
96274+ dev_t segv_device;
96275+ u64 segv_inode;
96276+ uid_t segv_uid;
96277+ __u16 num_sprole_pws;
96278+ __u16 mode;
96279+};
96280+
96281+struct gr_arg_wrapper {
96282+ struct gr_arg *arg;
96283+ __u32 version;
96284+ __u32 size;
96285+};
96286+
96287+struct subject_map {
96288+ struct acl_subject_label *user;
96289+ struct acl_subject_label *kernel;
96290+ struct subject_map *prev;
96291+ struct subject_map *next;
96292+};
96293+
96294+struct acl_subj_map_db {
96295+ struct subject_map **s_hash;
96296+ __u32 s_size;
96297+};
96298+
96299+struct gr_policy_state {
96300+ struct sprole_pw **acl_special_roles;
96301+ __u16 num_sprole_pws;
96302+ struct acl_role_label *kernel_role;
96303+ struct acl_role_label *role_list;
96304+ struct acl_role_label *default_role;
96305+ struct acl_role_db acl_role_set;
96306+ struct acl_subj_map_db subj_map_set;
96307+ struct name_db name_set;
96308+ struct inodev_db inodev_set;
96309+};
96310+
96311+struct gr_alloc_state {
96312+ unsigned long alloc_stack_next;
96313+ unsigned long alloc_stack_size;
96314+ void **alloc_stack;
96315+};
96316+
96317+struct gr_reload_state {
96318+ struct gr_policy_state oldpolicy;
96319+ struct gr_alloc_state oldalloc;
96320+ struct gr_policy_state newpolicy;
96321+ struct gr_alloc_state newalloc;
96322+ struct gr_policy_state *oldpolicy_ptr;
96323+ struct gr_alloc_state *oldalloc_ptr;
96324+ unsigned char oldmode;
96325+};
96326+
96327+/* End Data Structures Section */
96328+
96329+/* Hash functions generated by empirical testing by Brad Spengler
96330+ Makes good use of the low bits of the inode. Generally 0-1 times
96331+ in loop for successful match. 0-3 for unsuccessful match.
96332+ Shift/add algorithm with modulus of table size and an XOR*/
96333+
96334+static __inline__ unsigned int
96335+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
96336+{
96337+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
96338+}
96339+
96340+ static __inline__ unsigned int
96341+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
96342+{
96343+ return ((const unsigned long)userp % sz);
96344+}
96345+
96346+static __inline__ unsigned int
96347+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
96348+{
96349+ unsigned int rem;
96350+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
96351+ return rem;
96352+}
96353+
96354+static __inline__ unsigned int
96355+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
96356+{
96357+ return full_name_hash((const unsigned char *)name, len) % sz;
96358+}
96359+
96360+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
96361+ subj = NULL; \
96362+ iter = 0; \
96363+ while (iter < role->subj_hash_size) { \
96364+ if (subj == NULL) \
96365+ subj = role->subj_hash[iter]; \
96366+ if (subj == NULL) { \
96367+ iter++; \
96368+ continue; \
96369+ }
96370+
96371+#define FOR_EACH_SUBJECT_END(subj,iter) \
96372+ subj = subj->next; \
96373+ if (subj == NULL) \
96374+ iter++; \
96375+ }
96376+
96377+
96378+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
96379+ subj = role->hash->first; \
96380+ while (subj != NULL) {
96381+
96382+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
96383+ subj = subj->next; \
96384+ }
96385+
96386+#endif
96387+
96388diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
96389new file mode 100644
96390index 0000000..af64092
96391--- /dev/null
96392+++ b/include/linux/gracl_compat.h
96393@@ -0,0 +1,156 @@
96394+#ifndef GR_ACL_COMPAT_H
96395+#define GR_ACL_COMPAT_H
96396+
96397+#include <linux/resource.h>
96398+#include <asm/resource.h>
96399+
96400+struct sprole_pw_compat {
96401+ compat_uptr_t rolename;
96402+ unsigned char salt[GR_SALT_LEN];
96403+ unsigned char sum[GR_SHA_LEN];
96404+};
96405+
96406+struct gr_hash_struct_compat {
96407+ compat_uptr_t table;
96408+ compat_uptr_t nametable;
96409+ compat_uptr_t first;
96410+ __u32 table_size;
96411+ __u32 used_size;
96412+ int type;
96413+};
96414+
96415+struct acl_subject_label_compat {
96416+ compat_uptr_t filename;
96417+ compat_u64 inode;
96418+ __u32 device;
96419+ __u32 mode;
96420+ kernel_cap_t cap_mask;
96421+ kernel_cap_t cap_lower;
96422+ kernel_cap_t cap_invert_audit;
96423+
96424+ struct compat_rlimit res[GR_NLIMITS];
96425+ __u32 resmask;
96426+
96427+ __u8 user_trans_type;
96428+ __u8 group_trans_type;
96429+ compat_uptr_t user_transitions;
96430+ compat_uptr_t group_transitions;
96431+ __u16 user_trans_num;
96432+ __u16 group_trans_num;
96433+
96434+ __u32 sock_families[2];
96435+ __u32 ip_proto[8];
96436+ __u32 ip_type;
96437+ compat_uptr_t ips;
96438+ __u32 ip_num;
96439+ __u32 inaddr_any_override;
96440+
96441+ __u32 crashes;
96442+ compat_ulong_t expires;
96443+
96444+ compat_uptr_t parent_subject;
96445+ compat_uptr_t hash;
96446+ compat_uptr_t prev;
96447+ compat_uptr_t next;
96448+
96449+ compat_uptr_t obj_hash;
96450+ __u32 obj_hash_size;
96451+ __u16 pax_flags;
96452+};
96453+
96454+struct role_allowed_ip_compat {
96455+ __u32 addr;
96456+ __u32 netmask;
96457+
96458+ compat_uptr_t prev;
96459+ compat_uptr_t next;
96460+};
96461+
96462+struct role_transition_compat {
96463+ compat_uptr_t rolename;
96464+
96465+ compat_uptr_t prev;
96466+ compat_uptr_t next;
96467+};
96468+
96469+struct acl_role_label_compat {
96470+ compat_uptr_t rolename;
96471+ uid_t uidgid;
96472+ __u16 roletype;
96473+
96474+ __u16 auth_attempts;
96475+ compat_ulong_t expires;
96476+
96477+ compat_uptr_t root_label;
96478+ compat_uptr_t hash;
96479+
96480+ compat_uptr_t prev;
96481+ compat_uptr_t next;
96482+
96483+ compat_uptr_t transitions;
96484+ compat_uptr_t allowed_ips;
96485+ compat_uptr_t domain_children;
96486+ __u16 domain_child_num;
96487+
96488+ umode_t umask;
96489+
96490+ compat_uptr_t subj_hash;
96491+ __u32 subj_hash_size;
96492+};
96493+
96494+struct user_acl_role_db_compat {
96495+ compat_uptr_t r_table;
96496+ __u32 num_pointers;
96497+ __u32 num_roles;
96498+ __u32 num_domain_children;
96499+ __u32 num_subjects;
96500+ __u32 num_objects;
96501+};
96502+
96503+struct acl_object_label_compat {
96504+ compat_uptr_t filename;
96505+ compat_u64 inode;
96506+ __u32 device;
96507+ __u32 mode;
96508+
96509+ compat_uptr_t nested;
96510+ compat_uptr_t globbed;
96511+
96512+ compat_uptr_t prev;
96513+ compat_uptr_t next;
96514+};
96515+
96516+struct acl_ip_label_compat {
96517+ compat_uptr_t iface;
96518+ __u32 addr;
96519+ __u32 netmask;
96520+ __u16 low, high;
96521+ __u8 mode;
96522+ __u32 type;
96523+ __u32 proto[8];
96524+
96525+ compat_uptr_t prev;
96526+ compat_uptr_t next;
96527+};
96528+
96529+struct gr_arg_compat {
96530+ struct user_acl_role_db_compat role_db;
96531+ unsigned char pw[GR_PW_LEN];
96532+ unsigned char salt[GR_SALT_LEN];
96533+ unsigned char sum[GR_SHA_LEN];
96534+ unsigned char sp_role[GR_SPROLE_LEN];
96535+ compat_uptr_t sprole_pws;
96536+ __u32 segv_device;
96537+ compat_u64 segv_inode;
96538+ uid_t segv_uid;
96539+ __u16 num_sprole_pws;
96540+ __u16 mode;
96541+};
96542+
96543+struct gr_arg_wrapper_compat {
96544+ compat_uptr_t arg;
96545+ __u32 version;
96546+ __u32 size;
96547+};
96548+
96549+#endif
96550diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
96551new file mode 100644
96552index 0000000..323ecf2
96553--- /dev/null
96554+++ b/include/linux/gralloc.h
96555@@ -0,0 +1,9 @@
96556+#ifndef __GRALLOC_H
96557+#define __GRALLOC_H
96558+
96559+void acl_free_all(void);
96560+int acl_alloc_stack_init(unsigned long size);
96561+void *acl_alloc(unsigned long len);
96562+void *acl_alloc_num(unsigned long num, unsigned long len);
96563+
96564+#endif
96565diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
96566new file mode 100644
96567index 0000000..be66033
96568--- /dev/null
96569+++ b/include/linux/grdefs.h
96570@@ -0,0 +1,140 @@
96571+#ifndef GRDEFS_H
96572+#define GRDEFS_H
96573+
96574+/* Begin grsecurity status declarations */
96575+
96576+enum {
96577+ GR_READY = 0x01,
96578+ GR_STATUS_INIT = 0x00 // disabled state
96579+};
96580+
96581+/* Begin ACL declarations */
96582+
96583+/* Role flags */
96584+
96585+enum {
96586+ GR_ROLE_USER = 0x0001,
96587+ GR_ROLE_GROUP = 0x0002,
96588+ GR_ROLE_DEFAULT = 0x0004,
96589+ GR_ROLE_SPECIAL = 0x0008,
96590+ GR_ROLE_AUTH = 0x0010,
96591+ GR_ROLE_NOPW = 0x0020,
96592+ GR_ROLE_GOD = 0x0040,
96593+ GR_ROLE_LEARN = 0x0080,
96594+ GR_ROLE_TPE = 0x0100,
96595+ GR_ROLE_DOMAIN = 0x0200,
96596+ GR_ROLE_PAM = 0x0400,
96597+ GR_ROLE_PERSIST = 0x0800
96598+};
96599+
96600+/* ACL Subject and Object mode flags */
96601+enum {
96602+ GR_DELETED = 0x80000000
96603+};
96604+
96605+/* ACL Object-only mode flags */
96606+enum {
96607+ GR_READ = 0x00000001,
96608+ GR_APPEND = 0x00000002,
96609+ GR_WRITE = 0x00000004,
96610+ GR_EXEC = 0x00000008,
96611+ GR_FIND = 0x00000010,
96612+ GR_INHERIT = 0x00000020,
96613+ GR_SETID = 0x00000040,
96614+ GR_CREATE = 0x00000080,
96615+ GR_DELETE = 0x00000100,
96616+ GR_LINK = 0x00000200,
96617+ GR_AUDIT_READ = 0x00000400,
96618+ GR_AUDIT_APPEND = 0x00000800,
96619+ GR_AUDIT_WRITE = 0x00001000,
96620+ GR_AUDIT_EXEC = 0x00002000,
96621+ GR_AUDIT_FIND = 0x00004000,
96622+ GR_AUDIT_INHERIT= 0x00008000,
96623+ GR_AUDIT_SETID = 0x00010000,
96624+ GR_AUDIT_CREATE = 0x00020000,
96625+ GR_AUDIT_DELETE = 0x00040000,
96626+ GR_AUDIT_LINK = 0x00080000,
96627+ GR_PTRACERD = 0x00100000,
96628+ GR_NOPTRACE = 0x00200000,
96629+ GR_SUPPRESS = 0x00400000,
96630+ GR_NOLEARN = 0x00800000,
96631+ GR_INIT_TRANSFER= 0x01000000
96632+};
96633+
96634+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
96635+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
96636+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
96637+
96638+/* ACL subject-only mode flags */
96639+enum {
96640+ GR_KILL = 0x00000001,
96641+ GR_VIEW = 0x00000002,
96642+ GR_PROTECTED = 0x00000004,
96643+ GR_LEARN = 0x00000008,
96644+ GR_OVERRIDE = 0x00000010,
96645+ /* just a placeholder, this mode is only used in userspace */
96646+ GR_DUMMY = 0x00000020,
96647+ GR_PROTSHM = 0x00000040,
96648+ GR_KILLPROC = 0x00000080,
96649+ GR_KILLIPPROC = 0x00000100,
96650+ /* just a placeholder, this mode is only used in userspace */
96651+ GR_NOTROJAN = 0x00000200,
96652+ GR_PROTPROCFD = 0x00000400,
96653+ GR_PROCACCT = 0x00000800,
96654+ GR_RELAXPTRACE = 0x00001000,
96655+ //GR_NESTED = 0x00002000,
96656+ GR_INHERITLEARN = 0x00004000,
96657+ GR_PROCFIND = 0x00008000,
96658+ GR_POVERRIDE = 0x00010000,
96659+ GR_KERNELAUTH = 0x00020000,
96660+ GR_ATSECURE = 0x00040000,
96661+ GR_SHMEXEC = 0x00080000
96662+};
96663+
96664+enum {
96665+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
96666+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
96667+ GR_PAX_ENABLE_MPROTECT = 0x0004,
96668+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
96669+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
96670+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
96671+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
96672+ GR_PAX_DISABLE_MPROTECT = 0x0400,
96673+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
96674+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
96675+};
96676+
96677+enum {
96678+ GR_ID_USER = 0x01,
96679+ GR_ID_GROUP = 0x02,
96680+};
96681+
96682+enum {
96683+ GR_ID_ALLOW = 0x01,
96684+ GR_ID_DENY = 0x02,
96685+};
96686+
96687+#define GR_CRASH_RES 31
96688+#define GR_UIDTABLE_MAX 500
96689+
96690+/* begin resource learning section */
96691+enum {
96692+ GR_RLIM_CPU_BUMP = 60,
96693+ GR_RLIM_FSIZE_BUMP = 50000,
96694+ GR_RLIM_DATA_BUMP = 10000,
96695+ GR_RLIM_STACK_BUMP = 1000,
96696+ GR_RLIM_CORE_BUMP = 10000,
96697+ GR_RLIM_RSS_BUMP = 500000,
96698+ GR_RLIM_NPROC_BUMP = 1,
96699+ GR_RLIM_NOFILE_BUMP = 5,
96700+ GR_RLIM_MEMLOCK_BUMP = 50000,
96701+ GR_RLIM_AS_BUMP = 500000,
96702+ GR_RLIM_LOCKS_BUMP = 2,
96703+ GR_RLIM_SIGPENDING_BUMP = 5,
96704+ GR_RLIM_MSGQUEUE_BUMP = 10000,
96705+ GR_RLIM_NICE_BUMP = 1,
96706+ GR_RLIM_RTPRIO_BUMP = 1,
96707+ GR_RLIM_RTTIME_BUMP = 1000000
96708+};
96709+
96710+#endif
96711diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
96712new file mode 100644
96713index 0000000..fb1de5d
96714--- /dev/null
96715+++ b/include/linux/grinternal.h
96716@@ -0,0 +1,230 @@
96717+#ifndef __GRINTERNAL_H
96718+#define __GRINTERNAL_H
96719+
96720+#ifdef CONFIG_GRKERNSEC
96721+
96722+#include <linux/fs.h>
96723+#include <linux/mnt_namespace.h>
96724+#include <linux/nsproxy.h>
96725+#include <linux/gracl.h>
96726+#include <linux/grdefs.h>
96727+#include <linux/grmsg.h>
96728+
96729+void gr_add_learn_entry(const char *fmt, ...)
96730+ __attribute__ ((format (printf, 1, 2)));
96731+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
96732+ const struct vfsmount *mnt);
96733+__u32 gr_check_create(const struct dentry *new_dentry,
96734+ const struct dentry *parent,
96735+ const struct vfsmount *mnt, const __u32 mode);
96736+int gr_check_protected_task(const struct task_struct *task);
96737+__u32 to_gr_audit(const __u32 reqmode);
96738+int gr_set_acls(const int type);
96739+int gr_acl_is_enabled(void);
96740+char gr_roletype_to_char(void);
96741+
96742+void gr_handle_alertkill(struct task_struct *task);
96743+char *gr_to_filename(const struct dentry *dentry,
96744+ const struct vfsmount *mnt);
96745+char *gr_to_filename1(const struct dentry *dentry,
96746+ const struct vfsmount *mnt);
96747+char *gr_to_filename2(const struct dentry *dentry,
96748+ const struct vfsmount *mnt);
96749+char *gr_to_filename3(const struct dentry *dentry,
96750+ const struct vfsmount *mnt);
96751+
96752+extern int grsec_enable_ptrace_readexec;
96753+extern int grsec_enable_harden_ptrace;
96754+extern int grsec_enable_link;
96755+extern int grsec_enable_fifo;
96756+extern int grsec_enable_execve;
96757+extern int grsec_enable_shm;
96758+extern int grsec_enable_execlog;
96759+extern int grsec_enable_signal;
96760+extern int grsec_enable_audit_ptrace;
96761+extern int grsec_enable_forkfail;
96762+extern int grsec_enable_time;
96763+extern int grsec_enable_rofs;
96764+extern int grsec_deny_new_usb;
96765+extern int grsec_enable_chroot_shmat;
96766+extern int grsec_enable_chroot_mount;
96767+extern int grsec_enable_chroot_double;
96768+extern int grsec_enable_chroot_pivot;
96769+extern int grsec_enable_chroot_chdir;
96770+extern int grsec_enable_chroot_chmod;
96771+extern int grsec_enable_chroot_mknod;
96772+extern int grsec_enable_chroot_fchdir;
96773+extern int grsec_enable_chroot_nice;
96774+extern int grsec_enable_chroot_execlog;
96775+extern int grsec_enable_chroot_caps;
96776+extern int grsec_enable_chroot_rename;
96777+extern int grsec_enable_chroot_sysctl;
96778+extern int grsec_enable_chroot_unix;
96779+extern int grsec_enable_symlinkown;
96780+extern kgid_t grsec_symlinkown_gid;
96781+extern int grsec_enable_tpe;
96782+extern kgid_t grsec_tpe_gid;
96783+extern int grsec_enable_tpe_all;
96784+extern int grsec_enable_tpe_invert;
96785+extern int grsec_enable_socket_all;
96786+extern kgid_t grsec_socket_all_gid;
96787+extern int grsec_enable_socket_client;
96788+extern kgid_t grsec_socket_client_gid;
96789+extern int grsec_enable_socket_server;
96790+extern kgid_t grsec_socket_server_gid;
96791+extern kgid_t grsec_audit_gid;
96792+extern int grsec_enable_group;
96793+extern int grsec_enable_log_rwxmaps;
96794+extern int grsec_enable_mount;
96795+extern int grsec_enable_chdir;
96796+extern int grsec_resource_logging;
96797+extern int grsec_enable_blackhole;
96798+extern int grsec_lastack_retries;
96799+extern int grsec_enable_brute;
96800+extern int grsec_enable_harden_ipc;
96801+extern int grsec_lock;
96802+
96803+extern spinlock_t grsec_alert_lock;
96804+extern unsigned long grsec_alert_wtime;
96805+extern unsigned long grsec_alert_fyet;
96806+
96807+extern spinlock_t grsec_audit_lock;
96808+
96809+extern rwlock_t grsec_exec_file_lock;
96810+
96811+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
96812+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
96813+ (tsk)->exec_file->f_path.mnt) : "/")
96814+
96815+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
96816+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
96817+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96818+
96819+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
96820+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
96821+ (tsk)->exec_file->f_path.mnt) : "/")
96822+
96823+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
96824+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
96825+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96826+
96827+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
96828+
96829+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
96830+
96831+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
96832+{
96833+ if (file1 && file2) {
96834+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
96835+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
96836+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
96837+ return true;
96838+ }
96839+
96840+ return false;
96841+}
96842+
96843+#define GR_CHROOT_CAPS {{ \
96844+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
96845+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
96846+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
96847+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
96848+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
96849+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
96850+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
96851+
96852+#define security_learn(normal_msg,args...) \
96853+({ \
96854+ read_lock(&grsec_exec_file_lock); \
96855+ gr_add_learn_entry(normal_msg "\n", ## args); \
96856+ read_unlock(&grsec_exec_file_lock); \
96857+})
96858+
96859+enum {
96860+ GR_DO_AUDIT,
96861+ GR_DONT_AUDIT,
96862+ /* used for non-audit messages that we shouldn't kill the task on */
96863+ GR_DONT_AUDIT_GOOD
96864+};
96865+
96866+enum {
96867+ GR_TTYSNIFF,
96868+ GR_RBAC,
96869+ GR_RBAC_STR,
96870+ GR_STR_RBAC,
96871+ GR_RBAC_MODE2,
96872+ GR_RBAC_MODE3,
96873+ GR_FILENAME,
96874+ GR_SYSCTL_HIDDEN,
96875+ GR_NOARGS,
96876+ GR_ONE_INT,
96877+ GR_ONE_INT_TWO_STR,
96878+ GR_ONE_STR,
96879+ GR_STR_INT,
96880+ GR_TWO_STR_INT,
96881+ GR_TWO_INT,
96882+ GR_TWO_U64,
96883+ GR_THREE_INT,
96884+ GR_FIVE_INT_TWO_STR,
96885+ GR_TWO_STR,
96886+ GR_THREE_STR,
96887+ GR_FOUR_STR,
96888+ GR_STR_FILENAME,
96889+ GR_FILENAME_STR,
96890+ GR_FILENAME_TWO_INT,
96891+ GR_FILENAME_TWO_INT_STR,
96892+ GR_TEXTREL,
96893+ GR_PTRACE,
96894+ GR_RESOURCE,
96895+ GR_CAP,
96896+ GR_SIG,
96897+ GR_SIG2,
96898+ GR_CRASH1,
96899+ GR_CRASH2,
96900+ GR_PSACCT,
96901+ GR_RWXMAP,
96902+ GR_RWXMAPVMA
96903+};
96904+
96905+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
96906+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
96907+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
96908+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
96909+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
96910+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
96911+#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)
96912+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
96913+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
96914+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
96915+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
96916+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
96917+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
96918+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
96919+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
96920+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
96921+#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)
96922+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
96923+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
96924+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
96925+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
96926+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
96927+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
96928+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
96929+#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)
96930+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
96931+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
96932+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
96933+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
96934+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
96935+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
96936+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
96937+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
96938+#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)
96939+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
96940+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
96941+
96942+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
96943+
96944+#endif
96945+
96946+#endif
96947diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
96948new file mode 100644
96949index 0000000..26ef560
96950--- /dev/null
96951+++ b/include/linux/grmsg.h
96952@@ -0,0 +1,118 @@
96953+#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"
96954+#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"
96955+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
96956+#define GR_STOPMOD_MSG "denied modification of module state by "
96957+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
96958+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
96959+#define GR_IOPERM_MSG "denied use of ioperm() by "
96960+#define GR_IOPL_MSG "denied use of iopl() by "
96961+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
96962+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
96963+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
96964+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
96965+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
96966+#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"
96967+#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"
96968+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
96969+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
96970+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
96971+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
96972+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
96973+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
96974+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
96975+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
96976+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
96977+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
96978+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
96979+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
96980+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
96981+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
96982+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
96983+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
96984+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
96985+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
96986+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
96987+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
96988+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
96989+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
96990+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
96991+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
96992+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
96993+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
96994+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
96995+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
96996+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
96997+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
96998+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
96999+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
97000+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
97001+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
97002+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
97003+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
97004+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
97005+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
97006+#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"
97007+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
97008+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
97009+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
97010+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
97011+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
97012+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
97013+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
97014+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
97015+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
97016+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
97017+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
97018+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
97019+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
97020+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
97021+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
97022+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
97023+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
97024+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
97025+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
97026+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
97027+#define GR_FAILFORK_MSG "failed fork with errno %s by "
97028+#define GR_NICE_CHROOT_MSG "denied priority change by "
97029+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
97030+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
97031+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
97032+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
97033+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
97034+#define GR_TIME_MSG "time set by "
97035+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
97036+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
97037+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
97038+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
97039+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
97040+#define GR_BIND_MSG "denied bind() by "
97041+#define GR_CONNECT_MSG "denied connect() by "
97042+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
97043+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
97044+#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"
97045+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
97046+#define GR_CAP_ACL_MSG "use of %s denied for "
97047+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
97048+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
97049+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
97050+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
97051+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
97052+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
97053+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
97054+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
97055+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
97056+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
97057+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
97058+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
97059+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
97060+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
97061+#define GR_VM86_MSG "denied use of vm86 by "
97062+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
97063+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
97064+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
97065+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
97066+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
97067+#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 "
97068+#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 "
97069+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
97070+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
97071diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
97072new file mode 100644
97073index 0000000..085a746
97074--- /dev/null
97075+++ b/include/linux/grsecurity.h
97076@@ -0,0 +1,247 @@
97077+#ifndef GR_SECURITY_H
97078+#define GR_SECURITY_H
97079+#include <linux/fs.h>
97080+#include <linux/fs_struct.h>
97081+#include <linux/binfmts.h>
97082+#include <linux/gracl.h>
97083+
97084+/* notify of brain-dead configs */
97085+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97086+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
97087+#endif
97088+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97089+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
97090+#endif
97091+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
97092+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
97093+#endif
97094+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
97095+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
97096+#endif
97097+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
97098+#error "CONFIG_PAX enabled, but no PaX options are enabled."
97099+#endif
97100+
97101+int gr_handle_new_usb(void);
97102+
97103+void gr_handle_brute_attach(int dumpable);
97104+void gr_handle_brute_check(void);
97105+void gr_handle_kernel_exploit(void);
97106+
97107+char gr_roletype_to_char(void);
97108+
97109+int gr_proc_is_restricted(void);
97110+
97111+int gr_acl_enable_at_secure(void);
97112+
97113+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
97114+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
97115+
97116+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
97117+
97118+void gr_del_task_from_ip_table(struct task_struct *p);
97119+
97120+int gr_pid_is_chrooted(struct task_struct *p);
97121+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
97122+int gr_handle_chroot_nice(void);
97123+int gr_handle_chroot_sysctl(const int op);
97124+int gr_handle_chroot_setpriority(struct task_struct *p,
97125+ const int niceval);
97126+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
97127+int gr_chroot_fhandle(void);
97128+int gr_handle_chroot_chroot(const struct dentry *dentry,
97129+ const struct vfsmount *mnt);
97130+void gr_handle_chroot_chdir(const struct path *path);
97131+int gr_handle_chroot_chmod(const struct dentry *dentry,
97132+ const struct vfsmount *mnt, const int mode);
97133+int gr_handle_chroot_mknod(const struct dentry *dentry,
97134+ const struct vfsmount *mnt, const int mode);
97135+int gr_handle_chroot_mount(const struct dentry *dentry,
97136+ const struct vfsmount *mnt,
97137+ const char *dev_name);
97138+int gr_handle_chroot_pivot(void);
97139+int gr_handle_chroot_unix(const pid_t pid);
97140+
97141+int gr_handle_rawio(const struct inode *inode);
97142+
97143+void gr_handle_ioperm(void);
97144+void gr_handle_iopl(void);
97145+void gr_handle_msr_write(void);
97146+
97147+umode_t gr_acl_umask(void);
97148+
97149+int gr_tpe_allow(const struct file *file);
97150+
97151+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
97152+void gr_clear_chroot_entries(struct task_struct *task);
97153+
97154+void gr_log_forkfail(const int retval);
97155+void gr_log_timechange(void);
97156+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
97157+void gr_log_chdir(const struct dentry *dentry,
97158+ const struct vfsmount *mnt);
97159+void gr_log_chroot_exec(const struct dentry *dentry,
97160+ const struct vfsmount *mnt);
97161+void gr_log_remount(const char *devname, const int retval);
97162+void gr_log_unmount(const char *devname, const int retval);
97163+void gr_log_mount(const char *from, struct path *to, const int retval);
97164+void gr_log_textrel(struct vm_area_struct *vma);
97165+void gr_log_ptgnustack(struct file *file);
97166+void gr_log_rwxmmap(struct file *file);
97167+void gr_log_rwxmprotect(struct vm_area_struct *vma);
97168+
97169+int gr_handle_follow_link(const struct dentry *dentry,
97170+ const struct vfsmount *mnt);
97171+int gr_handle_fifo(const struct dentry *dentry,
97172+ const struct vfsmount *mnt,
97173+ const struct dentry *dir, const int flag,
97174+ const int acc_mode);
97175+int gr_handle_hardlink(const struct dentry *dentry,
97176+ const struct vfsmount *mnt,
97177+ const struct filename *to);
97178+
97179+int gr_is_capable(const int cap);
97180+int gr_is_capable_nolog(const int cap);
97181+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
97182+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
97183+
97184+void gr_copy_label(struct task_struct *tsk);
97185+void gr_handle_crash(struct task_struct *task, const int sig);
97186+int gr_handle_signal(const struct task_struct *p, const int sig);
97187+int gr_check_crash_uid(const kuid_t uid);
97188+int gr_check_protected_task(const struct task_struct *task);
97189+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
97190+int gr_acl_handle_mmap(const struct file *file,
97191+ const unsigned long prot);
97192+int gr_acl_handle_mprotect(const struct file *file,
97193+ const unsigned long prot);
97194+int gr_check_hidden_task(const struct task_struct *tsk);
97195+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
97196+ const struct vfsmount *mnt);
97197+__u32 gr_acl_handle_utime(const struct dentry *dentry,
97198+ const struct vfsmount *mnt);
97199+__u32 gr_acl_handle_access(const struct dentry *dentry,
97200+ const struct vfsmount *mnt, const int fmode);
97201+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
97202+ const struct vfsmount *mnt, umode_t *mode);
97203+__u32 gr_acl_handle_chown(const struct dentry *dentry,
97204+ const struct vfsmount *mnt);
97205+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
97206+ const struct vfsmount *mnt);
97207+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
97208+ const struct vfsmount *mnt);
97209+int gr_handle_ptrace(struct task_struct *task, const long request);
97210+int gr_handle_proc_ptrace(struct task_struct *task);
97211+__u32 gr_acl_handle_execve(const struct dentry *dentry,
97212+ const struct vfsmount *mnt);
97213+int gr_check_crash_exec(const struct file *filp);
97214+int gr_acl_is_enabled(void);
97215+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
97216+ const kgid_t gid);
97217+int gr_set_proc_label(const struct dentry *dentry,
97218+ const struct vfsmount *mnt,
97219+ const int unsafe_flags);
97220+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
97221+ const struct vfsmount *mnt);
97222+__u32 gr_acl_handle_open(const struct dentry *dentry,
97223+ const struct vfsmount *mnt, int acc_mode);
97224+__u32 gr_acl_handle_creat(const struct dentry *dentry,
97225+ const struct dentry *p_dentry,
97226+ const struct vfsmount *p_mnt,
97227+ int open_flags, int acc_mode, const int imode);
97228+void gr_handle_create(const struct dentry *dentry,
97229+ const struct vfsmount *mnt);
97230+void gr_handle_proc_create(const struct dentry *dentry,
97231+ const struct inode *inode);
97232+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
97233+ const struct dentry *parent_dentry,
97234+ const struct vfsmount *parent_mnt,
97235+ const int mode);
97236+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
97237+ const struct dentry *parent_dentry,
97238+ const struct vfsmount *parent_mnt);
97239+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
97240+ const struct vfsmount *mnt);
97241+void gr_handle_delete(const u64 ino, const dev_t dev);
97242+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
97243+ const struct vfsmount *mnt);
97244+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
97245+ const struct dentry *parent_dentry,
97246+ const struct vfsmount *parent_mnt,
97247+ const struct filename *from);
97248+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
97249+ const struct dentry *parent_dentry,
97250+ const struct vfsmount *parent_mnt,
97251+ const struct dentry *old_dentry,
97252+ const struct vfsmount *old_mnt, const struct filename *to);
97253+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
97254+int gr_acl_handle_rename(struct dentry *new_dentry,
97255+ struct dentry *parent_dentry,
97256+ const struct vfsmount *parent_mnt,
97257+ struct dentry *old_dentry,
97258+ struct inode *old_parent_inode,
97259+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
97260+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
97261+ struct dentry *old_dentry,
97262+ struct dentry *new_dentry,
97263+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
97264+__u32 gr_check_link(const struct dentry *new_dentry,
97265+ const struct dentry *parent_dentry,
97266+ const struct vfsmount *parent_mnt,
97267+ const struct dentry *old_dentry,
97268+ const struct vfsmount *old_mnt);
97269+int gr_acl_handle_filldir(const struct file *file, const char *name,
97270+ const unsigned int namelen, const u64 ino);
97271+
97272+__u32 gr_acl_handle_unix(const struct dentry *dentry,
97273+ const struct vfsmount *mnt);
97274+void gr_acl_handle_exit(void);
97275+void gr_acl_handle_psacct(struct task_struct *task, const long code);
97276+int gr_acl_handle_procpidmem(const struct task_struct *task);
97277+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
97278+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
97279+void gr_audit_ptrace(struct task_struct *task);
97280+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
97281+u64 gr_get_ino_from_dentry(struct dentry *dentry);
97282+void gr_put_exec_file(struct task_struct *task);
97283+
97284+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
97285+
97286+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97287+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97288+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
97289+ struct dentry *newdentry, struct vfsmount *newmnt);
97290+
97291+#ifdef CONFIG_GRKERNSEC_RESLOG
97292+extern void gr_log_resource(const struct task_struct *task, const int res,
97293+ const unsigned long wanted, const int gt);
97294+#else
97295+static inline void gr_log_resource(const struct task_struct *task, const int res,
97296+ const unsigned long wanted, const int gt)
97297+{
97298+}
97299+#endif
97300+
97301+#ifdef CONFIG_GRKERNSEC
97302+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
97303+void gr_handle_vm86(void);
97304+void gr_handle_mem_readwrite(u64 from, u64 to);
97305+
97306+void gr_log_badprocpid(const char *entry);
97307+
97308+extern int grsec_enable_dmesg;
97309+extern int grsec_disable_privio;
97310+
97311+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97312+extern kgid_t grsec_proc_gid;
97313+#endif
97314+
97315+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
97316+extern int grsec_enable_chroot_findtask;
97317+#endif
97318+#ifdef CONFIG_GRKERNSEC_SETXID
97319+extern int grsec_enable_setxid;
97320+#endif
97321+#endif
97322+
97323+#endif
97324diff --git a/include/linux/grsock.h b/include/linux/grsock.h
97325new file mode 100644
97326index 0000000..e7ffaaf
97327--- /dev/null
97328+++ b/include/linux/grsock.h
97329@@ -0,0 +1,19 @@
97330+#ifndef __GRSOCK_H
97331+#define __GRSOCK_H
97332+
97333+extern void gr_attach_curr_ip(const struct sock *sk);
97334+extern int gr_handle_sock_all(const int family, const int type,
97335+ const int protocol);
97336+extern int gr_handle_sock_server(const struct sockaddr *sck);
97337+extern int gr_handle_sock_server_other(const struct sock *sck);
97338+extern int gr_handle_sock_client(const struct sockaddr *sck);
97339+extern int gr_search_connect(struct socket * sock,
97340+ struct sockaddr_in * addr);
97341+extern int gr_search_bind(struct socket * sock,
97342+ struct sockaddr_in * addr);
97343+extern int gr_search_listen(struct socket * sock);
97344+extern int gr_search_accept(struct socket * sock);
97345+extern int gr_search_socket(const int domain, const int type,
97346+ const int protocol);
97347+
97348+#endif
97349diff --git a/include/linux/highmem.h b/include/linux/highmem.h
97350index 9286a46..373f27f 100644
97351--- a/include/linux/highmem.h
97352+++ b/include/linux/highmem.h
97353@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
97354 kunmap_atomic(kaddr);
97355 }
97356
97357+static inline void sanitize_highpage(struct page *page)
97358+{
97359+ void *kaddr;
97360+ unsigned long flags;
97361+
97362+ local_irq_save(flags);
97363+ kaddr = kmap_atomic(page);
97364+ clear_page(kaddr);
97365+ kunmap_atomic(kaddr);
97366+ local_irq_restore(flags);
97367+}
97368+
97369 static inline void zero_user_segments(struct page *page,
97370 unsigned start1, unsigned end1,
97371 unsigned start2, unsigned end2)
97372diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
97373index 1c7b89a..7dda400 100644
97374--- a/include/linux/hwmon-sysfs.h
97375+++ b/include/linux/hwmon-sysfs.h
97376@@ -25,7 +25,8 @@
97377 struct sensor_device_attribute{
97378 struct device_attribute dev_attr;
97379 int index;
97380-};
97381+} __do_const;
97382+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
97383 #define to_sensor_dev_attr(_dev_attr) \
97384 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
97385
97386@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
97387 struct device_attribute dev_attr;
97388 u8 index;
97389 u8 nr;
97390-};
97391+} __do_const;
97392+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
97393 #define to_sensor_dev_attr_2(_dev_attr) \
97394 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
97395
97396diff --git a/include/linux/i2c.h b/include/linux/i2c.h
97397index e83a738..8b323fa 100644
97398--- a/include/linux/i2c.h
97399+++ b/include/linux/i2c.h
97400@@ -409,6 +409,7 @@ struct i2c_algorithm {
97401 int (*unreg_slave)(struct i2c_client *client);
97402 #endif
97403 };
97404+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
97405
97406 /**
97407 * struct i2c_bus_recovery_info - I2C bus recovery information
97408diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
97409index 66a7d76..5e68d20 100644
97410--- a/include/linux/if_pppox.h
97411+++ b/include/linux/if_pppox.h
97412@@ -78,7 +78,7 @@ struct pppox_proto {
97413 int (*ioctl)(struct socket *sock, unsigned int cmd,
97414 unsigned long arg);
97415 struct module *owner;
97416-};
97417+} __do_const;
97418
97419 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
97420 extern void unregister_pppox_proto(int proto_num);
97421diff --git a/include/linux/init.h b/include/linux/init.h
97422index 21b6d76..4a6775c 100644
97423--- a/include/linux/init.h
97424+++ b/include/linux/init.h
97425@@ -37,9 +37,17 @@
97426 * section.
97427 */
97428
97429+#define add_init_latent_entropy __latent_entropy
97430+
97431+#ifdef CONFIG_MEMORY_HOTPLUG
97432+#define add_meminit_latent_entropy
97433+#else
97434+#define add_meminit_latent_entropy __latent_entropy
97435+#endif
97436+
97437 /* These are for everybody (although not all archs will actually
97438 discard it in modules) */
97439-#define __init __section(.init.text) __cold notrace
97440+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
97441 #define __initdata __section(.init.data)
97442 #define __initconst __constsection(.init.rodata)
97443 #define __exitdata __section(.exit.data)
97444@@ -100,7 +108,7 @@
97445 #define __cpuexitconst
97446
97447 /* Used for MEMORY_HOTPLUG */
97448-#define __meminit __section(.meminit.text) __cold notrace
97449+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
97450 #define __meminitdata __section(.meminit.data)
97451 #define __meminitconst __constsection(.meminit.rodata)
97452 #define __memexit __section(.memexit.text) __exitused __cold notrace
97453diff --git a/include/linux/init_task.h b/include/linux/init_task.h
97454index 696d223..6d6b39f 100644
97455--- a/include/linux/init_task.h
97456+++ b/include/linux/init_task.h
97457@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
97458
97459 #define INIT_TASK_COMM "swapper"
97460
97461+#ifdef CONFIG_X86
97462+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
97463+#else
97464+#define INIT_TASK_THREAD_INFO
97465+#endif
97466+
97467 #ifdef CONFIG_RT_MUTEXES
97468 # define INIT_RT_MUTEXES(tsk) \
97469 .pi_waiters = RB_ROOT, \
97470@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
97471 RCU_POINTER_INITIALIZER(cred, &init_cred), \
97472 .comm = INIT_TASK_COMM, \
97473 .thread = INIT_THREAD, \
97474+ INIT_TASK_THREAD_INFO \
97475 .fs = &init_fs, \
97476 .files = &init_files, \
97477 .signal = &init_signals, \
97478diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
97479index 950ae45..df6ac60 100644
97480--- a/include/linux/interrupt.h
97481+++ b/include/linux/interrupt.h
97482@@ -432,8 +432,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
97483
97484 struct softirq_action
97485 {
97486- void (*action)(struct softirq_action *);
97487-};
97488+ void (*action)(void);
97489+} __no_const;
97490
97491 asmlinkage void do_softirq(void);
97492 asmlinkage void __do_softirq(void);
97493@@ -447,7 +447,7 @@ static inline void do_softirq_own_stack(void)
97494 }
97495 #endif
97496
97497-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
97498+extern void open_softirq(int nr, void (*action)(void));
97499 extern void softirq_init(void);
97500 extern void __raise_softirq_irqoff(unsigned int nr);
97501
97502diff --git a/include/linux/iommu.h b/include/linux/iommu.h
97503index 0546b87..46fd5b6 100644
97504--- a/include/linux/iommu.h
97505+++ b/include/linux/iommu.h
97506@@ -174,7 +174,7 @@ struct iommu_ops {
97507
97508 unsigned long pgsize_bitmap;
97509 void *priv;
97510-};
97511+} __do_const;
97512
97513 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
97514 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
97515@@ -234,7 +234,7 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
97516 void *data);
97517 struct device *iommu_device_create(struct device *parent, void *drvdata,
97518 const struct attribute_group **groups,
97519- const char *fmt, ...);
97520+ const char *fmt, ...) __printf(4, 5);
97521 void iommu_device_destroy(struct device *dev);
97522 int iommu_device_link(struct device *dev, struct device *link);
97523 void iommu_device_unlink(struct device *dev, struct device *link);
97524diff --git a/include/linux/ioport.h b/include/linux/ioport.h
97525index 388e3ae..d7e45a1 100644
97526--- a/include/linux/ioport.h
97527+++ b/include/linux/ioport.h
97528@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
97529 int adjust_resource(struct resource *res, resource_size_t start,
97530 resource_size_t size);
97531 resource_size_t resource_alignment(struct resource *res);
97532-static inline resource_size_t resource_size(const struct resource *res)
97533+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
97534 {
97535 return res->end - res->start + 1;
97536 }
97537diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
97538index 1eee6bc..9cf4912 100644
97539--- a/include/linux/ipc_namespace.h
97540+++ b/include/linux/ipc_namespace.h
97541@@ -60,7 +60,7 @@ struct ipc_namespace {
97542 struct user_namespace *user_ns;
97543
97544 struct ns_common ns;
97545-};
97546+} __randomize_layout;
97547
97548 extern struct ipc_namespace init_ipc_ns;
97549 extern atomic_t nr_ipc_ns;
97550diff --git a/include/linux/irq.h b/include/linux/irq.h
97551index 62c6901..827f8f6 100644
97552--- a/include/linux/irq.h
97553+++ b/include/linux/irq.h
97554@@ -370,7 +370,8 @@ struct irq_chip {
97555 int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
97556
97557 unsigned long flags;
97558-};
97559+} __do_const;
97560+typedef struct irq_chip __no_const irq_chip_no_const;
97561
97562 /*
97563 * irq_chip specific flags
97564diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
97565index dd1109f..4f4fdda 100644
97566--- a/include/linux/irqdesc.h
97567+++ b/include/linux/irqdesc.h
97568@@ -61,7 +61,7 @@ struct irq_desc {
97569 unsigned int irq_count; /* For detecting broken IRQs */
97570 unsigned long last_unhandled; /* Aging timer for unhandled count */
97571 unsigned int irqs_unhandled;
97572- atomic_t threads_handled;
97573+ atomic_unchecked_t threads_handled;
97574 int threads_handled_last;
97575 raw_spinlock_t lock;
97576 struct cpumask *percpu_enabled;
97577diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
97578index 676d730..8d3a1ad 100644
97579--- a/include/linux/irqdomain.h
97580+++ b/include/linux/irqdomain.h
97581@@ -40,6 +40,7 @@ struct device_node;
97582 struct irq_domain;
97583 struct of_device_id;
97584 struct irq_chip;
97585+typedef struct irq_chip __no_const irq_chip_no_const;
97586 struct irq_data;
97587
97588 /* Number of irqs reserved for a legacy isa controller */
97589diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
97590index c367cbd..c9b79e6 100644
97591--- a/include/linux/jiffies.h
97592+++ b/include/linux/jiffies.h
97593@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
97594 /*
97595 * Convert various time units to each other:
97596 */
97597-extern unsigned int jiffies_to_msecs(const unsigned long j);
97598-extern unsigned int jiffies_to_usecs(const unsigned long j);
97599+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
97600+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
97601
97602-static inline u64 jiffies_to_nsecs(const unsigned long j)
97603+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
97604 {
97605 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
97606 }
97607
97608-extern unsigned long msecs_to_jiffies(const unsigned int m);
97609-extern unsigned long usecs_to_jiffies(const unsigned int u);
97610+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
97611+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
97612 extern unsigned long timespec_to_jiffies(const struct timespec *value);
97613 extern void jiffies_to_timespec(const unsigned long jiffies,
97614- struct timespec *value);
97615-extern unsigned long timeval_to_jiffies(const struct timeval *value);
97616+ struct timespec *value) __intentional_overflow(-1);
97617+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
97618 extern void jiffies_to_timeval(const unsigned long jiffies,
97619 struct timeval *value);
97620
97621diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
97622index 6883e19..e854fcb 100644
97623--- a/include/linux/kallsyms.h
97624+++ b/include/linux/kallsyms.h
97625@@ -15,7 +15,8 @@
97626
97627 struct module;
97628
97629-#ifdef CONFIG_KALLSYMS
97630+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
97631+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
97632 /* Lookup the address for a symbol. Returns 0 if not found. */
97633 unsigned long kallsyms_lookup_name(const char *name);
97634
97635@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
97636 /* Stupid that this does nothing, but I didn't create this mess. */
97637 #define __print_symbol(fmt, addr)
97638 #endif /*CONFIG_KALLSYMS*/
97639+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
97640+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
97641+extern unsigned long kallsyms_lookup_name(const char *name);
97642+extern void __print_symbol(const char *fmt, unsigned long address);
97643+extern int sprint_backtrace(char *buffer, unsigned long address);
97644+extern int sprint_symbol(char *buffer, unsigned long address);
97645+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
97646+const char *kallsyms_lookup(unsigned long addr,
97647+ unsigned long *symbolsize,
97648+ unsigned long *offset,
97649+ char **modname, char *namebuf);
97650+extern int kallsyms_lookup_size_offset(unsigned long addr,
97651+ unsigned long *symbolsize,
97652+ unsigned long *offset);
97653+#endif
97654
97655 /* This macro allows us to keep printk typechecking */
97656 static __printf(1, 2)
97657diff --git a/include/linux/kernel.h b/include/linux/kernel.h
97658index 3a5b48e..240107b 100644
97659--- a/include/linux/kernel.h
97660+++ b/include/linux/kernel.h
97661@@ -390,7 +390,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
97662 /* Obsolete, do not use. Use kstrto<foo> instead */
97663
97664 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
97665-extern long simple_strtol(const char *,char **,unsigned int);
97666+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
97667 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
97668 extern long long simple_strtoll(const char *,char **,unsigned int);
97669
97670@@ -410,7 +410,8 @@ extern __printf(3, 0)
97671 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
97672 extern __printf(2, 3)
97673 char *kasprintf(gfp_t gfp, const char *fmt, ...);
97674-extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97675+extern __printf(2, 0)
97676+char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97677
97678 extern __scanf(2, 3)
97679 int sscanf(const char *, const char *, ...);
97680@@ -681,10 +682,10 @@ do { \
97681 __ftrace_vprintk(_THIS_IP_, fmt, vargs); \
97682 } while (0)
97683
97684-extern int
97685+extern __printf(2, 0) int
97686 __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
97687
97688-extern int
97689+extern __printf(2, 0) int
97690 __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
97691
97692 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
97693@@ -704,7 +705,7 @@ int trace_printk(const char *fmt, ...)
97694 {
97695 return 0;
97696 }
97697-static inline int
97698+static __printf(1, 0) inline int
97699 ftrace_vprintk(const char *fmt, va_list ap)
97700 {
97701 return 0;
97702diff --git a/include/linux/key-type.h b/include/linux/key-type.h
97703index ff9f1d3..6712be5 100644
97704--- a/include/linux/key-type.h
97705+++ b/include/linux/key-type.h
97706@@ -152,7 +152,7 @@ struct key_type {
97707 /* internal fields */
97708 struct list_head link; /* link in types list */
97709 struct lock_class_key lock_class; /* key->sem lock class */
97710-};
97711+} __do_const;
97712
97713 extern struct key_type key_type_keyring;
97714
97715diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
97716index e465bb1..19f605fd 100644
97717--- a/include/linux/kgdb.h
97718+++ b/include/linux/kgdb.h
97719@@ -52,7 +52,7 @@ extern int kgdb_connected;
97720 extern int kgdb_io_module_registered;
97721
97722 extern atomic_t kgdb_setting_breakpoint;
97723-extern atomic_t kgdb_cpu_doing_single_step;
97724+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
97725
97726 extern struct task_struct *kgdb_usethread;
97727 extern struct task_struct *kgdb_contthread;
97728@@ -254,7 +254,7 @@ struct kgdb_arch {
97729 void (*correct_hw_break)(void);
97730
97731 void (*enable_nmi)(bool on);
97732-};
97733+} __do_const;
97734
97735 /**
97736 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
97737@@ -279,7 +279,7 @@ struct kgdb_io {
97738 void (*pre_exception) (void);
97739 void (*post_exception) (void);
97740 int is_console;
97741-};
97742+} __do_const;
97743
97744 extern struct kgdb_arch arch_kgdb_ops;
97745
97746diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
97747index d0a1f99..0bd8b7c 100644
97748--- a/include/linux/kmemleak.h
97749+++ b/include/linux/kmemleak.h
97750@@ -27,7 +27,7 @@
97751
97752 extern void kmemleak_init(void) __ref;
97753 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97754- gfp_t gfp) __ref;
97755+ gfp_t gfp) __ref __size_overflow(2);
97756 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
97757 gfp_t gfp) __ref;
97758 extern void kmemleak_free(const void *ptr) __ref;
97759@@ -63,7 +63,7 @@ static inline void kmemleak_erase(void **ptr)
97760 static inline void kmemleak_init(void)
97761 {
97762 }
97763-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97764+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
97765 gfp_t gfp)
97766 {
97767 }
97768diff --git a/include/linux/kmod.h b/include/linux/kmod.h
97769index 0555cc6..40116ce 100644
97770--- a/include/linux/kmod.h
97771+++ b/include/linux/kmod.h
97772@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
97773 * usually useless though. */
97774 extern __printf(2, 3)
97775 int __request_module(bool wait, const char *name, ...);
97776+extern __printf(3, 4)
97777+int ___request_module(bool wait, char *param_name, const char *name, ...);
97778 #define request_module(mod...) __request_module(true, mod)
97779 #define request_module_nowait(mod...) __request_module(false, mod)
97780 #define try_then_request_module(x, mod...) \
97781@@ -57,6 +59,9 @@ struct subprocess_info {
97782 struct work_struct work;
97783 struct completion *complete;
97784 char *path;
97785+#ifdef CONFIG_GRKERNSEC
97786+ char *origpath;
97787+#endif
97788 char **argv;
97789 char **envp;
97790 int wait;
97791diff --git a/include/linux/kobject.h b/include/linux/kobject.h
97792index 2d61b90..3d69945 100644
97793--- a/include/linux/kobject.h
97794+++ b/include/linux/kobject.h
97795@@ -80,8 +80,9 @@ struct kobject {
97796
97797 extern __printf(2, 3)
97798 int kobject_set_name(struct kobject *kobj, const char *name, ...);
97799-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97800- va_list vargs);
97801+extern __printf(2, 0)
97802+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97803+ va_list vargs);
97804
97805 static inline const char *kobject_name(const struct kobject *kobj)
97806 {
97807@@ -118,7 +119,7 @@ struct kobj_type {
97808 struct attribute **default_attrs;
97809 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
97810 const void *(*namespace)(struct kobject *kobj);
97811-};
97812+} __do_const;
97813
97814 struct kobj_uevent_env {
97815 char *argv[3];
97816@@ -142,6 +143,7 @@ struct kobj_attribute {
97817 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
97818 const char *buf, size_t count);
97819 };
97820+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
97821
97822 extern const struct sysfs_ops kobj_sysfs_ops;
97823
97824@@ -169,7 +171,7 @@ struct kset {
97825 spinlock_t list_lock;
97826 struct kobject kobj;
97827 const struct kset_uevent_ops *uevent_ops;
97828-};
97829+} __randomize_layout;
97830
97831 extern void kset_init(struct kset *kset);
97832 extern int __must_check kset_register(struct kset *kset);
97833diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
97834index df32d25..fb52e27 100644
97835--- a/include/linux/kobject_ns.h
97836+++ b/include/linux/kobject_ns.h
97837@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
97838 const void *(*netlink_ns)(struct sock *sk);
97839 const void *(*initial_ns)(void);
97840 void (*drop_ns)(void *);
97841-};
97842+} __do_const;
97843
97844 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
97845 int kobj_ns_type_registered(enum kobj_ns_type type);
97846diff --git a/include/linux/kref.h b/include/linux/kref.h
97847index 484604d..0f6c5b6 100644
97848--- a/include/linux/kref.h
97849+++ b/include/linux/kref.h
97850@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
97851 static inline int kref_sub(struct kref *kref, unsigned int count,
97852 void (*release)(struct kref *kref))
97853 {
97854- WARN_ON(release == NULL);
97855+ BUG_ON(release == NULL);
97856
97857 if (atomic_sub_and_test((int) count, &kref->refcount)) {
97858 release(kref);
97859diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
97860index ad45054..7c54663 100644
97861--- a/include/linux/kvm_host.h
97862+++ b/include/linux/kvm_host.h
97863@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
97864 {
97865 }
97866 #endif
97867-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97868+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97869 struct module *module);
97870 void kvm_exit(void);
97871
97872@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
97873 struct kvm_guest_debug *dbg);
97874 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
97875
97876-int kvm_arch_init(void *opaque);
97877+int kvm_arch_init(const void *opaque);
97878 void kvm_arch_exit(void);
97879
97880 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
97881diff --git a/include/linux/libata.h b/include/linux/libata.h
97882index 28aeae4..320b3bf6 100644
97883--- a/include/linux/libata.h
97884+++ b/include/linux/libata.h
97885@@ -988,7 +988,7 @@ struct ata_port_operations {
97886 * fields must be pointers.
97887 */
97888 const struct ata_port_operations *inherits;
97889-};
97890+} __do_const;
97891
97892 struct ata_port_info {
97893 unsigned long flags;
97894diff --git a/include/linux/linkage.h b/include/linux/linkage.h
97895index a6a42dd..6c5ebce 100644
97896--- a/include/linux/linkage.h
97897+++ b/include/linux/linkage.h
97898@@ -36,6 +36,7 @@
97899 #endif
97900
97901 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
97902+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
97903 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
97904
97905 /*
97906diff --git a/include/linux/list.h b/include/linux/list.h
97907index feb773c..98f3075 100644
97908--- a/include/linux/list.h
97909+++ b/include/linux/list.h
97910@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
97911 extern void list_del(struct list_head *entry);
97912 #endif
97913
97914+extern void __pax_list_add(struct list_head *new,
97915+ struct list_head *prev,
97916+ struct list_head *next);
97917+static inline void pax_list_add(struct list_head *new, struct list_head *head)
97918+{
97919+ __pax_list_add(new, head, head->next);
97920+}
97921+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
97922+{
97923+ __pax_list_add(new, head->prev, head);
97924+}
97925+extern void pax_list_del(struct list_head *entry);
97926+
97927 /**
97928 * list_replace - replace old entry by new one
97929 * @old : the element to be replaced
97930@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
97931 INIT_LIST_HEAD(entry);
97932 }
97933
97934+extern void pax_list_del_init(struct list_head *entry);
97935+
97936 /**
97937 * list_move - delete from one list and add as another's head
97938 * @list: the entry to move
97939diff --git a/include/linux/lockref.h b/include/linux/lockref.h
97940index b10b122..d37b3de 100644
97941--- a/include/linux/lockref.h
97942+++ b/include/linux/lockref.h
97943@@ -28,7 +28,7 @@ struct lockref {
97944 #endif
97945 struct {
97946 spinlock_t lock;
97947- int count;
97948+ atomic_t count;
97949 };
97950 };
97951 };
97952@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
97953 extern int lockref_get_not_dead(struct lockref *);
97954
97955 /* Must be called under spinlock for reliable results */
97956-static inline int __lockref_is_dead(const struct lockref *l)
97957+static inline int __lockref_is_dead(const struct lockref *lockref)
97958 {
97959- return ((int)l->count < 0);
97960+ return atomic_read(&lockref->count) < 0;
97961+}
97962+
97963+static inline int __lockref_read(const struct lockref *lockref)
97964+{
97965+ return atomic_read(&lockref->count);
97966+}
97967+
97968+static inline void __lockref_set(struct lockref *lockref, int count)
97969+{
97970+ atomic_set(&lockref->count, count);
97971+}
97972+
97973+static inline void __lockref_inc(struct lockref *lockref)
97974+{
97975+ atomic_inc(&lockref->count);
97976+}
97977+
97978+static inline void __lockref_dec(struct lockref *lockref)
97979+{
97980+ atomic_dec(&lockref->count);
97981 }
97982
97983 #endif /* __LINUX_LOCKREF_H */
97984diff --git a/include/linux/math64.h b/include/linux/math64.h
97985index c45c089..298841c 100644
97986--- a/include/linux/math64.h
97987+++ b/include/linux/math64.h
97988@@ -15,7 +15,7 @@
97989 * This is commonly provided by 32bit archs to provide an optimized 64bit
97990 * divide.
97991 */
97992-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97993+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97994 {
97995 *remainder = dividend % divisor;
97996 return dividend / divisor;
97997@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
97998 /**
97999 * div64_u64 - unsigned 64bit divide with 64bit divisor
98000 */
98001-static inline u64 div64_u64(u64 dividend, u64 divisor)
98002+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
98003 {
98004 return dividend / divisor;
98005 }
98006@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
98007 #define div64_ul(x, y) div_u64((x), (y))
98008
98009 #ifndef div_u64_rem
98010-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98011+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
98012 {
98013 *remainder = do_div(dividend, divisor);
98014 return dividend;
98015@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
98016 #endif
98017
98018 #ifndef div64_u64
98019-extern u64 div64_u64(u64 dividend, u64 divisor);
98020+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
98021 #endif
98022
98023 #ifndef div64_s64
98024@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
98025 * divide.
98026 */
98027 #ifndef div_u64
98028-static inline u64 div_u64(u64 dividend, u32 divisor)
98029+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
98030 {
98031 u32 remainder;
98032 return div_u64_rem(dividend, divisor, &remainder);
98033diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
98034index 3d385c8..deacb6a 100644
98035--- a/include/linux/mempolicy.h
98036+++ b/include/linux/mempolicy.h
98037@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
98038 }
98039
98040 #define vma_policy(vma) ((vma)->vm_policy)
98041+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
98042+{
98043+ vma->vm_policy = pol;
98044+}
98045
98046 static inline void mpol_get(struct mempolicy *pol)
98047 {
98048@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
98049 }
98050
98051 #define vma_policy(vma) NULL
98052+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
98053+{
98054+}
98055
98056 static inline int
98057 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
98058diff --git a/include/linux/mm.h b/include/linux/mm.h
98059index 0755b9f..2960e96 100644
98060--- a/include/linux/mm.h
98061+++ b/include/linux/mm.h
98062@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
98063
98064 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
98065 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
98066+
98067+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
98068+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
98069+#endif
98070+
98071 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
98072 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
98073 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
98074@@ -257,8 +262,8 @@ struct vm_operations_struct {
98075 /* called by access_process_vm when get_user_pages() fails, typically
98076 * for use by special VMAs that can switch between memory and hardware
98077 */
98078- int (*access)(struct vm_area_struct *vma, unsigned long addr,
98079- void *buf, int len, int write);
98080+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
98081+ void *buf, size_t len, int write);
98082
98083 /* Called by the /proc/PID/maps code to ask the vma whether it
98084 * has a special name. Returning non-NULL will also cause this
98085@@ -296,6 +301,7 @@ struct vm_operations_struct {
98086 struct page *(*find_special_page)(struct vm_area_struct *vma,
98087 unsigned long addr);
98088 };
98089+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
98090
98091 struct mmu_gather;
98092 struct inode;
98093@@ -1131,8 +1137,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
98094 unsigned long *pfn);
98095 int follow_phys(struct vm_area_struct *vma, unsigned long address,
98096 unsigned int flags, unsigned long *prot, resource_size_t *phys);
98097-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98098- void *buf, int len, int write);
98099+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98100+ void *buf, size_t len, int write);
98101
98102 static inline void unmap_shared_mapping_range(struct address_space *mapping,
98103 loff_t const holebegin, loff_t const holelen)
98104@@ -1172,9 +1178,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
98105 }
98106 #endif
98107
98108-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
98109-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98110- void *buf, int len, int write);
98111+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
98112+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98113+ void *buf, size_t len, int write);
98114
98115 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
98116 unsigned long start, unsigned long nr_pages,
98117@@ -1219,34 +1225,6 @@ int clear_page_dirty_for_io(struct page *page);
98118
98119 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
98120
98121-/* Is the vma a continuation of the stack vma above it? */
98122-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
98123-{
98124- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
98125-}
98126-
98127-static inline int stack_guard_page_start(struct vm_area_struct *vma,
98128- unsigned long addr)
98129-{
98130- return (vma->vm_flags & VM_GROWSDOWN) &&
98131- (vma->vm_start == addr) &&
98132- !vma_growsdown(vma->vm_prev, addr);
98133-}
98134-
98135-/* Is the vma a continuation of the stack vma below it? */
98136-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
98137-{
98138- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
98139-}
98140-
98141-static inline int stack_guard_page_end(struct vm_area_struct *vma,
98142- unsigned long addr)
98143-{
98144- return (vma->vm_flags & VM_GROWSUP) &&
98145- (vma->vm_end == addr) &&
98146- !vma_growsup(vma->vm_next, addr);
98147-}
98148-
98149 extern struct task_struct *task_of_stack(struct task_struct *task,
98150 struct vm_area_struct *vma, bool in_group);
98151
98152@@ -1369,8 +1347,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
98153 {
98154 return 0;
98155 }
98156+
98157+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
98158+ unsigned long address)
98159+{
98160+ return 0;
98161+}
98162 #else
98163 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98164+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98165 #endif
98166
98167 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
98168@@ -1380,6 +1365,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
98169 return 0;
98170 }
98171
98172+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
98173+ unsigned long address)
98174+{
98175+ return 0;
98176+}
98177+
98178 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
98179
98180 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
98181@@ -1392,6 +1383,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
98182
98183 #else
98184 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
98185+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
98186
98187 static inline void mm_nr_pmds_init(struct mm_struct *mm)
98188 {
98189@@ -1429,11 +1421,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
98190 NULL: pud_offset(pgd, address);
98191 }
98192
98193+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
98194+{
98195+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
98196+ NULL: pud_offset(pgd, address);
98197+}
98198+
98199 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
98200 {
98201 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
98202 NULL: pmd_offset(pud, address);
98203 }
98204+
98205+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
98206+{
98207+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
98208+ NULL: pmd_offset(pud, address);
98209+}
98210 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
98211
98212 #if USE_SPLIT_PTE_PTLOCKS
98213@@ -1810,12 +1814,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
98214 bool *need_rmap_locks);
98215 extern void exit_mmap(struct mm_struct *);
98216
98217+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
98218+extern void gr_learn_resource(const struct task_struct *task, const int res,
98219+ const unsigned long wanted, const int gt);
98220+#else
98221+static inline void gr_learn_resource(const struct task_struct *task, const int res,
98222+ const unsigned long wanted, const int gt)
98223+{
98224+}
98225+#endif
98226+
98227 static inline int check_data_rlimit(unsigned long rlim,
98228 unsigned long new,
98229 unsigned long start,
98230 unsigned long end_data,
98231 unsigned long start_data)
98232 {
98233+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
98234 if (rlim < RLIM_INFINITY) {
98235 if (((new - start) + (end_data - start_data)) > rlim)
98236 return -ENOSPC;
98237@@ -1840,7 +1855,7 @@ extern int install_special_mapping(struct mm_struct *mm,
98238 unsigned long addr, unsigned long len,
98239 unsigned long flags, struct page **pages);
98240
98241-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
98242+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
98243
98244 extern unsigned long mmap_region(struct file *file, unsigned long addr,
98245 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
98246@@ -1848,6 +1863,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98247 unsigned long len, unsigned long prot, unsigned long flags,
98248 unsigned long pgoff, unsigned long *populate);
98249 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
98250+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
98251
98252 #ifdef CONFIG_MMU
98253 extern int __mm_populate(unsigned long addr, unsigned long len,
98254@@ -1876,10 +1892,11 @@ struct vm_unmapped_area_info {
98255 unsigned long high_limit;
98256 unsigned long align_mask;
98257 unsigned long align_offset;
98258+ unsigned long threadstack_offset;
98259 };
98260
98261-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
98262-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98263+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
98264+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
98265
98266 /*
98267 * Search for an unmapped address range.
98268@@ -1891,7 +1908,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98269 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
98270 */
98271 static inline unsigned long
98272-vm_unmapped_area(struct vm_unmapped_area_info *info)
98273+vm_unmapped_area(const struct vm_unmapped_area_info *info)
98274 {
98275 if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
98276 return unmapped_area_topdown(info);
98277@@ -1953,6 +1970,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
98278 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
98279 struct vm_area_struct **pprev);
98280
98281+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
98282+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
98283+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
98284+
98285 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
98286 NULL if none. Assume start_addr < end_addr. */
98287 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
98288@@ -1982,10 +2003,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
98289 }
98290
98291 #ifdef CONFIG_MMU
98292-pgprot_t vm_get_page_prot(unsigned long vm_flags);
98293+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
98294 void vma_set_page_prot(struct vm_area_struct *vma);
98295 #else
98296-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
98297+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98298 {
98299 return __pgprot(0);
98300 }
98301@@ -2047,6 +2068,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
98302 static inline void vm_stat_account(struct mm_struct *mm,
98303 unsigned long flags, struct file *file, long pages)
98304 {
98305+
98306+#ifdef CONFIG_PAX_RANDMMAP
98307+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98308+#endif
98309+
98310 mm->total_vm += pages;
98311 }
98312 #endif /* CONFIG_PROC_FS */
98313@@ -2149,7 +2175,7 @@ extern int unpoison_memory(unsigned long pfn);
98314 extern int sysctl_memory_failure_early_kill;
98315 extern int sysctl_memory_failure_recovery;
98316 extern void shake_page(struct page *p, int access);
98317-extern atomic_long_t num_poisoned_pages;
98318+extern atomic_long_unchecked_t num_poisoned_pages;
98319 extern int soft_offline_page(struct page *page, int flags);
98320
98321 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
98322@@ -2200,5 +2226,11 @@ void __init setup_nr_node_ids(void);
98323 static inline void setup_nr_node_ids(void) {}
98324 #endif
98325
98326+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98327+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
98328+#else
98329+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
98330+#endif
98331+
98332 #endif /* __KERNEL__ */
98333 #endif /* _LINUX_MM_H */
98334diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
98335index 8d37e26..6a6f55b 100644
98336--- a/include/linux/mm_types.h
98337+++ b/include/linux/mm_types.h
98338@@ -313,7 +313,9 @@ struct vm_area_struct {
98339 #ifdef CONFIG_NUMA
98340 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
98341 #endif
98342-};
98343+
98344+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
98345+} __randomize_layout;
98346
98347 struct core_thread {
98348 struct task_struct *task;
98349@@ -466,7 +468,25 @@ struct mm_struct {
98350 /* address of the bounds directory */
98351 void __user *bd_addr;
98352 #endif
98353-};
98354+
98355+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
98356+ unsigned long pax_flags;
98357+#endif
98358+
98359+#ifdef CONFIG_PAX_DLRESOLVE
98360+ unsigned long call_dl_resolve;
98361+#endif
98362+
98363+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
98364+ unsigned long call_syscall;
98365+#endif
98366+
98367+#ifdef CONFIG_PAX_ASLR
98368+ unsigned long delta_mmap; /* randomized offset */
98369+ unsigned long delta_stack; /* randomized offset */
98370+#endif
98371+
98372+} __randomize_layout;
98373
98374 static inline void mm_init_cpumask(struct mm_struct *mm)
98375 {
98376diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
98377index c5d5278..85cd5ce 100644
98378--- a/include/linux/mmiotrace.h
98379+++ b/include/linux/mmiotrace.h
98380@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
98381 /* Called from ioremap.c */
98382 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
98383 void __iomem *addr);
98384-extern void mmiotrace_iounmap(volatile void __iomem *addr);
98385+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
98386
98387 /* For anyone to insert markers. Remember trailing newline. */
98388 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
98389@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
98390 {
98391 }
98392
98393-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
98394+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
98395 {
98396 }
98397
98398@@ -106,6 +106,6 @@ extern void enable_mmiotrace(void);
98399 extern void disable_mmiotrace(void);
98400 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
98401 extern void mmio_trace_mapping(struct mmiotrace_map *map);
98402-extern int mmio_trace_printk(const char *fmt, va_list args);
98403+extern __printf(1, 0) int mmio_trace_printk(const char *fmt, va_list args);
98404
98405 #endif /* _LINUX_MMIOTRACE_H */
98406diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
98407index 54d74f6..0728424 100644
98408--- a/include/linux/mmzone.h
98409+++ b/include/linux/mmzone.h
98410@@ -526,7 +526,7 @@ struct zone {
98411
98412 ZONE_PADDING(_pad3_)
98413 /* Zone statistics */
98414- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98415+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98416 } ____cacheline_internodealigned_in_smp;
98417
98418 enum zone_flags {
98419diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
98420index 3bfd567..72e7d8f 100644
98421--- a/include/linux/mod_devicetable.h
98422+++ b/include/linux/mod_devicetable.h
98423@@ -139,7 +139,7 @@ struct usb_device_id {
98424 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
98425 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
98426
98427-#define HID_ANY_ID (~0)
98428+#define HID_ANY_ID (~0U)
98429 #define HID_BUS_ANY 0xffff
98430 #define HID_GROUP_ANY 0x0000
98431
98432@@ -470,7 +470,7 @@ struct dmi_system_id {
98433 const char *ident;
98434 struct dmi_strmatch matches[4];
98435 void *driver_data;
98436-};
98437+} __do_const;
98438 /*
98439 * struct dmi_device_id appears during expansion of
98440 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
98441diff --git a/include/linux/module.h b/include/linux/module.h
98442index c883b86..516812e 100644
98443--- a/include/linux/module.h
98444+++ b/include/linux/module.h
98445@@ -17,9 +17,11 @@
98446 #include <linux/moduleparam.h>
98447 #include <linux/jump_label.h>
98448 #include <linux/export.h>
98449+#include <linux/fs.h>
98450
98451 #include <linux/percpu.h>
98452 #include <asm/module.h>
98453+#include <asm/pgtable.h>
98454
98455 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
98456 #define MODULE_SIG_STRING "~Module signature appended~\n"
98457@@ -42,7 +44,7 @@ struct module_kobject {
98458 struct kobject *drivers_dir;
98459 struct module_param_attrs *mp;
98460 struct completion *kobj_completion;
98461-};
98462+} __randomize_layout;
98463
98464 struct module_attribute {
98465 struct attribute attr;
98466@@ -54,12 +56,13 @@ struct module_attribute {
98467 int (*test)(struct module *);
98468 void (*free)(struct module *);
98469 };
98470+typedef struct module_attribute __no_const module_attribute_no_const;
98471
98472 struct module_version_attribute {
98473 struct module_attribute mattr;
98474 const char *module_name;
98475 const char *version;
98476-} __attribute__ ((__aligned__(sizeof(void *))));
98477+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
98478
98479 extern ssize_t __modver_version_show(struct module_attribute *,
98480 struct module_kobject *, char *);
98481@@ -221,7 +224,7 @@ struct module {
98482
98483 /* Sysfs stuff. */
98484 struct module_kobject mkobj;
98485- struct module_attribute *modinfo_attrs;
98486+ module_attribute_no_const *modinfo_attrs;
98487 const char *version;
98488 const char *srcversion;
98489 struct kobject *holders_dir;
98490@@ -270,19 +273,16 @@ struct module {
98491 int (*init)(void);
98492
98493 /* If this is non-NULL, vfree after init() returns */
98494- void *module_init;
98495+ void *module_init_rx, *module_init_rw;
98496
98497 /* Here is the actual code + data, vfree'd on unload. */
98498- void *module_core;
98499+ void *module_core_rx, *module_core_rw;
98500
98501 /* Here are the sizes of the init and core sections */
98502- unsigned int init_size, core_size;
98503+ unsigned int init_size_rw, core_size_rw;
98504
98505 /* The size of the executable code in each section. */
98506- unsigned int init_text_size, core_text_size;
98507-
98508- /* Size of RO sections of the module (text+rodata) */
98509- unsigned int init_ro_size, core_ro_size;
98510+ unsigned int init_size_rx, core_size_rx;
98511
98512 /* Arch-specific module values */
98513 struct mod_arch_specific arch;
98514@@ -340,6 +340,10 @@ struct module {
98515 unsigned int num_trace_events;
98516 struct trace_enum_map **trace_enums;
98517 unsigned int num_trace_enums;
98518+ struct file_operations trace_id;
98519+ struct file_operations trace_enable;
98520+ struct file_operations trace_format;
98521+ struct file_operations trace_filter;
98522 #endif
98523 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
98524 unsigned int num_ftrace_callsites;
98525@@ -367,7 +371,7 @@ struct module {
98526 ctor_fn_t *ctors;
98527 unsigned int num_ctors;
98528 #endif
98529-};
98530+} __randomize_layout;
98531 #ifndef MODULE_ARCH_INIT
98532 #define MODULE_ARCH_INIT {}
98533 #endif
98534@@ -388,18 +392,48 @@ bool is_module_address(unsigned long addr);
98535 bool is_module_percpu_address(unsigned long addr);
98536 bool is_module_text_address(unsigned long addr);
98537
98538+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
98539+{
98540+
98541+#ifdef CONFIG_PAX_KERNEXEC
98542+ if (ktla_ktva(addr) >= (unsigned long)start &&
98543+ ktla_ktva(addr) < (unsigned long)start + size)
98544+ return 1;
98545+#endif
98546+
98547+ return ((void *)addr >= start && (void *)addr < start + size);
98548+}
98549+
98550+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
98551+{
98552+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
98553+}
98554+
98555+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
98556+{
98557+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
98558+}
98559+
98560+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
98561+{
98562+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
98563+}
98564+
98565+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
98566+{
98567+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
98568+}
98569+
98570 static inline bool within_module_core(unsigned long addr,
98571 const struct module *mod)
98572 {
98573- return (unsigned long)mod->module_core <= addr &&
98574- addr < (unsigned long)mod->module_core + mod->core_size;
98575+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
98576 }
98577
98578 static inline bool within_module_init(unsigned long addr,
98579 const struct module *mod)
98580 {
98581- return (unsigned long)mod->module_init <= addr &&
98582- addr < (unsigned long)mod->module_init + mod->init_size;
98583+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
98584 }
98585
98586 static inline bool within_module(unsigned long addr, const struct module *mod)
98587diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
98588index 4d0cb9b..3169ac7 100644
98589--- a/include/linux/moduleloader.h
98590+++ b/include/linux/moduleloader.h
98591@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
98592 sections. Returns NULL on failure. */
98593 void *module_alloc(unsigned long size);
98594
98595+#ifdef CONFIG_PAX_KERNEXEC
98596+void *module_alloc_exec(unsigned long size);
98597+#else
98598+#define module_alloc_exec(x) module_alloc(x)
98599+#endif
98600+
98601 /* Free memory returned from module_alloc. */
98602 void module_memfree(void *module_region);
98603
98604+#ifdef CONFIG_PAX_KERNEXEC
98605+void module_memfree_exec(void *module_region);
98606+#else
98607+#define module_memfree_exec(x) module_memfree((x))
98608+#endif
98609+
98610 /*
98611 * Apply the given relocation to the (simplified) ELF. Return -error
98612 * or 0.
98613@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
98614 unsigned int relsec,
98615 struct module *me)
98616 {
98617+#ifdef CONFIG_MODULES
98618 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98619 module_name(me));
98620+#endif
98621 return -ENOEXEC;
98622 }
98623 #endif
98624@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
98625 unsigned int relsec,
98626 struct module *me)
98627 {
98628+#ifdef CONFIG_MODULES
98629 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98630 module_name(me));
98631+#endif
98632 return -ENOEXEC;
98633 }
98634 #endif
98635diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
98636index 1c9effa..1160bdd 100644
98637--- a/include/linux/moduleparam.h
98638+++ b/include/linux/moduleparam.h
98639@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
98640 * @len is usually just sizeof(string).
98641 */
98642 #define module_param_string(name, string, len, perm) \
98643- static const struct kparam_string __param_string_##name \
98644+ static const struct kparam_string __param_string_##name __used \
98645 = { len, string }; \
98646 __module_param_call(MODULE_PARAM_PREFIX, name, \
98647 &param_ops_string, \
98648@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
98649 */
98650 #define module_param_array_named(name, array, type, nump, perm) \
98651 param_check_##type(name, &(array)[0]); \
98652- static const struct kparam_array __param_arr_##name \
98653+ static const struct kparam_array __param_arr_##name __used \
98654 = { .max = ARRAY_SIZE(array), .num = nump, \
98655 .ops = &param_ops_##type, \
98656 .elemsize = sizeof(array[0]), .elem = array }; \
98657diff --git a/include/linux/mount.h b/include/linux/mount.h
98658index f822c3c..958ca0a 100644
98659--- a/include/linux/mount.h
98660+++ b/include/linux/mount.h
98661@@ -67,7 +67,7 @@ struct vfsmount {
98662 struct dentry *mnt_root; /* root of the mounted tree */
98663 struct super_block *mnt_sb; /* pointer to superblock */
98664 int mnt_flags;
98665-};
98666+} __randomize_layout;
98667
98668 struct file; /* forward dec */
98669 struct path;
98670diff --git a/include/linux/namei.h b/include/linux/namei.h
98671index c899077..b9a2010 100644
98672--- a/include/linux/namei.h
98673+++ b/include/linux/namei.h
98674@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
98675 extern void unlock_rename(struct dentry *, struct dentry *);
98676
98677 extern void nd_jump_link(struct nameidata *nd, struct path *path);
98678-extern void nd_set_link(struct nameidata *nd, char *path);
98679-extern char *nd_get_link(struct nameidata *nd);
98680+extern void nd_set_link(struct nameidata *nd, const char *path);
98681+extern const char *nd_get_link(const struct nameidata *nd);
98682
98683 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
98684 {
98685diff --git a/include/linux/net.h b/include/linux/net.h
98686index 738ea48..409dc09 100644
98687--- a/include/linux/net.h
98688+++ b/include/linux/net.h
98689@@ -190,7 +190,7 @@ struct net_proto_family {
98690 int (*create)(struct net *net, struct socket *sock,
98691 int protocol, int kern);
98692 struct module *owner;
98693-};
98694+} __do_const;
98695
98696 struct iovec;
98697 struct kvec;
98698diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
98699index 05b9a69..4d7e300 100644
98700--- a/include/linux/netdevice.h
98701+++ b/include/linux/netdevice.h
98702@@ -1208,6 +1208,7 @@ struct net_device_ops {
98703 u32 maxrate);
98704 int (*ndo_get_iflink)(const struct net_device *dev);
98705 };
98706+typedef struct net_device_ops __no_const net_device_ops_no_const;
98707
98708 /**
98709 * enum net_device_priv_flags - &struct net_device priv_flags
98710@@ -1515,7 +1516,7 @@ struct net_device {
98711 unsigned long base_addr;
98712 int irq;
98713
98714- atomic_t carrier_changes;
98715+ atomic_unchecked_t carrier_changes;
98716
98717 /*
98718 * Some hardware also needs these fields (state,dev_list,
98719@@ -1554,8 +1555,8 @@ struct net_device {
98720
98721 struct net_device_stats stats;
98722
98723- atomic_long_t rx_dropped;
98724- atomic_long_t tx_dropped;
98725+ atomic_long_unchecked_t rx_dropped;
98726+ atomic_long_unchecked_t tx_dropped;
98727
98728 #ifdef CONFIG_WIRELESS_EXT
98729 const struct iw_handler_def * wireless_handlers;
98730diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
98731index 63560d0..64aba5c 100644
98732--- a/include/linux/netfilter.h
98733+++ b/include/linux/netfilter.h
98734@@ -113,7 +113,7 @@ struct nf_sockopt_ops {
98735 #endif
98736 /* Use the module struct to lock set/get code in place */
98737 struct module *owner;
98738-};
98739+} __do_const;
98740
98741 /* Function to register/unregister hook points. */
98742 int nf_register_hook(struct nf_hook_ops *reg);
98743diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
98744index e955d47..04a5338 100644
98745--- a/include/linux/netfilter/nfnetlink.h
98746+++ b/include/linux/netfilter/nfnetlink.h
98747@@ -19,7 +19,7 @@ struct nfnl_callback {
98748 const struct nlattr * const cda[]);
98749 const struct nla_policy *policy; /* netlink attribute policy */
98750 const u_int16_t attr_count; /* number of nlattr's */
98751-};
98752+} __do_const;
98753
98754 struct nfnetlink_subsystem {
98755 const char *name;
98756diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
98757new file mode 100644
98758index 0000000..33f4af8
98759--- /dev/null
98760+++ b/include/linux/netfilter/xt_gradm.h
98761@@ -0,0 +1,9 @@
98762+#ifndef _LINUX_NETFILTER_XT_GRADM_H
98763+#define _LINUX_NETFILTER_XT_GRADM_H 1
98764+
98765+struct xt_gradm_mtinfo {
98766+ __u16 flags;
98767+ __u16 invflags;
98768+};
98769+
98770+#endif
98771diff --git a/include/linux/nls.h b/include/linux/nls.h
98772index 520681b..2b7fabb 100644
98773--- a/include/linux/nls.h
98774+++ b/include/linux/nls.h
98775@@ -31,7 +31,7 @@ struct nls_table {
98776 const unsigned char *charset2upper;
98777 struct module *owner;
98778 struct nls_table *next;
98779-};
98780+} __do_const;
98781
98782 /* this value hold the maximum octet of charset */
98783 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
98784@@ -46,7 +46,7 @@ enum utf16_endian {
98785 /* nls_base.c */
98786 extern int __register_nls(struct nls_table *, struct module *);
98787 extern int unregister_nls(struct nls_table *);
98788-extern struct nls_table *load_nls(char *);
98789+extern struct nls_table *load_nls(const char *);
98790 extern void unload_nls(struct nls_table *);
98791 extern struct nls_table *load_nls_default(void);
98792 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
98793diff --git a/include/linux/notifier.h b/include/linux/notifier.h
98794index d14a4c3..a078786 100644
98795--- a/include/linux/notifier.h
98796+++ b/include/linux/notifier.h
98797@@ -54,7 +54,8 @@ struct notifier_block {
98798 notifier_fn_t notifier_call;
98799 struct notifier_block __rcu *next;
98800 int priority;
98801-};
98802+} __do_const;
98803+typedef struct notifier_block __no_const notifier_block_no_const;
98804
98805 struct atomic_notifier_head {
98806 spinlock_t lock;
98807diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
98808index b2a0f15..4d7da32 100644
98809--- a/include/linux/oprofile.h
98810+++ b/include/linux/oprofile.h
98811@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
98812 int oprofilefs_create_ro_ulong(struct dentry * root,
98813 char const * name, ulong * val);
98814
98815-/** Create a file for read-only access to an atomic_t. */
98816+/** Create a file for read-only access to an atomic_unchecked_t. */
98817 int oprofilefs_create_ro_atomic(struct dentry * root,
98818- char const * name, atomic_t * val);
98819+ char const * name, atomic_unchecked_t * val);
98820
98821 /** create a directory */
98822 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
98823diff --git a/include/linux/padata.h b/include/linux/padata.h
98824index 4386946..f50c615 100644
98825--- a/include/linux/padata.h
98826+++ b/include/linux/padata.h
98827@@ -129,7 +129,7 @@ struct parallel_data {
98828 struct padata_serial_queue __percpu *squeue;
98829 atomic_t reorder_objects;
98830 atomic_t refcnt;
98831- atomic_t seq_nr;
98832+ atomic_unchecked_t seq_nr;
98833 struct padata_cpumask cpumask;
98834 spinlock_t lock ____cacheline_aligned;
98835 unsigned int processed;
98836diff --git a/include/linux/path.h b/include/linux/path.h
98837index d137218..be0c176 100644
98838--- a/include/linux/path.h
98839+++ b/include/linux/path.h
98840@@ -1,13 +1,15 @@
98841 #ifndef _LINUX_PATH_H
98842 #define _LINUX_PATH_H
98843
98844+#include <linux/compiler.h>
98845+
98846 struct dentry;
98847 struct vfsmount;
98848
98849 struct path {
98850 struct vfsmount *mnt;
98851 struct dentry *dentry;
98852-};
98853+} __randomize_layout;
98854
98855 extern void path_get(const struct path *);
98856 extern void path_put(const struct path *);
98857diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
98858index 8c78950..0d74ed9 100644
98859--- a/include/linux/pci_hotplug.h
98860+++ b/include/linux/pci_hotplug.h
98861@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
98862 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
98863 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
98864 int (*reset_slot) (struct hotplug_slot *slot, int probe);
98865-};
98866+} __do_const;
98867+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
98868
98869 /**
98870 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
98871diff --git a/include/linux/percpu.h b/include/linux/percpu.h
98872index caebf2a..4c3ae9d 100644
98873--- a/include/linux/percpu.h
98874+++ b/include/linux/percpu.h
98875@@ -34,7 +34,7 @@
98876 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
98877 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
98878 */
98879-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
98880+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
98881 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
98882
98883 /*
98884diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
98885index d8a82a8..8b580f0 100644
98886--- a/include/linux/perf_event.h
98887+++ b/include/linux/perf_event.h
98888@@ -379,8 +379,8 @@ struct perf_event {
98889
98890 enum perf_event_active_state state;
98891 unsigned int attach_state;
98892- local64_t count;
98893- atomic64_t child_count;
98894+ local64_t count; /* PaX: fix it one day */
98895+ atomic64_unchecked_t child_count;
98896
98897 /*
98898 * These are the total time in nanoseconds that the event
98899@@ -431,8 +431,8 @@ struct perf_event {
98900 * These accumulate total time (in nanoseconds) that children
98901 * events have been enabled and running, respectively.
98902 */
98903- atomic64_t child_total_time_enabled;
98904- atomic64_t child_total_time_running;
98905+ atomic64_unchecked_t child_total_time_enabled;
98906+ atomic64_unchecked_t child_total_time_running;
98907
98908 /*
98909 * Protect attach/detach and child_list:
98910@@ -812,7 +812,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
98911
98912 static inline u64 __perf_event_count(struct perf_event *event)
98913 {
98914- return local64_read(&event->count) + atomic64_read(&event->child_count);
98915+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
98916 }
98917
98918 extern void perf_event_mmap(struct vm_area_struct *vma);
98919@@ -836,7 +836,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
98920 entry->ip[entry->nr++] = ip;
98921 }
98922
98923-extern int sysctl_perf_event_paranoid;
98924+extern int sysctl_perf_event_legitimately_concerned;
98925 extern int sysctl_perf_event_mlock;
98926 extern int sysctl_perf_event_sample_rate;
98927 extern int sysctl_perf_cpu_time_max_percent;
98928@@ -851,19 +851,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
98929 loff_t *ppos);
98930
98931
98932+static inline bool perf_paranoid_any(void)
98933+{
98934+ return sysctl_perf_event_legitimately_concerned > 2;
98935+}
98936+
98937 static inline bool perf_paranoid_tracepoint_raw(void)
98938 {
98939- return sysctl_perf_event_paranoid > -1;
98940+ return sysctl_perf_event_legitimately_concerned > -1;
98941 }
98942
98943 static inline bool perf_paranoid_cpu(void)
98944 {
98945- return sysctl_perf_event_paranoid > 0;
98946+ return sysctl_perf_event_legitimately_concerned > 0;
98947 }
98948
98949 static inline bool perf_paranoid_kernel(void)
98950 {
98951- return sysctl_perf_event_paranoid > 1;
98952+ return sysctl_perf_event_legitimately_concerned > 1;
98953 }
98954
98955 extern void perf_event_init(void);
98956@@ -1017,7 +1022,7 @@ struct perf_pmu_events_attr {
98957 struct device_attribute attr;
98958 u64 id;
98959 const char *event_str;
98960-};
98961+} __do_const;
98962
98963 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
98964 char *page);
98965diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
98966index 918b117..7af374b7 100644
98967--- a/include/linux/pid_namespace.h
98968+++ b/include/linux/pid_namespace.h
98969@@ -45,7 +45,7 @@ struct pid_namespace {
98970 int hide_pid;
98971 int reboot; /* group exit code if this pidns was rebooted */
98972 struct ns_common ns;
98973-};
98974+} __randomize_layout;
98975
98976 extern struct pid_namespace init_pid_ns;
98977
98978diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
98979index eb8b8ac..62649e1 100644
98980--- a/include/linux/pipe_fs_i.h
98981+++ b/include/linux/pipe_fs_i.h
98982@@ -47,10 +47,10 @@ struct pipe_inode_info {
98983 struct mutex mutex;
98984 wait_queue_head_t wait;
98985 unsigned int nrbufs, curbuf, buffers;
98986- unsigned int readers;
98987- unsigned int writers;
98988- unsigned int files;
98989- unsigned int waiting_writers;
98990+ atomic_t readers;
98991+ atomic_t writers;
98992+ atomic_t files;
98993+ atomic_t waiting_writers;
98994 unsigned int r_counter;
98995 unsigned int w_counter;
98996 struct page *tmp_page;
98997diff --git a/include/linux/pm.h b/include/linux/pm.h
98998index 2d29c64..1b25b2a 100644
98999--- a/include/linux/pm.h
99000+++ b/include/linux/pm.h
99001@@ -616,6 +616,7 @@ struct dev_pm_domain {
99002 void (*sync)(struct device *dev);
99003 void (*dismiss)(struct device *dev);
99004 };
99005+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
99006
99007 /*
99008 * The PM_EVENT_ messages are also used by drivers implementing the legacy
99009diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
99010index 681ccb0..a90e0b7 100644
99011--- a/include/linux/pm_domain.h
99012+++ b/include/linux/pm_domain.h
99013@@ -39,11 +39,11 @@ struct gpd_dev_ops {
99014 int (*save_state)(struct device *dev);
99015 int (*restore_state)(struct device *dev);
99016 bool (*active_wakeup)(struct device *dev);
99017-};
99018+} __no_const;
99019
99020 struct gpd_cpuidle_data {
99021 unsigned int saved_exit_latency;
99022- struct cpuidle_state *idle_state;
99023+ cpuidle_state_no_const *idle_state;
99024 };
99025
99026 struct generic_pm_domain {
99027diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
99028index 30e84d4..22278b4 100644
99029--- a/include/linux/pm_runtime.h
99030+++ b/include/linux/pm_runtime.h
99031@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
99032
99033 static inline void pm_runtime_mark_last_busy(struct device *dev)
99034 {
99035- ACCESS_ONCE(dev->power.last_busy) = jiffies;
99036+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
99037 }
99038
99039 static inline bool pm_runtime_is_irq_safe(struct device *dev)
99040diff --git a/include/linux/pnp.h b/include/linux/pnp.h
99041index 5df733b..d55f252 100644
99042--- a/include/linux/pnp.h
99043+++ b/include/linux/pnp.h
99044@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
99045 struct pnp_fixup {
99046 char id[7];
99047 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
99048-};
99049+} __do_const;
99050
99051 /* config parameters */
99052 #define PNP_CONFIG_NORMAL 0x0001
99053diff --git a/include/linux/poison.h b/include/linux/poison.h
99054index 2110a81..13a11bb 100644
99055--- a/include/linux/poison.h
99056+++ b/include/linux/poison.h
99057@@ -19,8 +19,8 @@
99058 * under normal circumstances, used to verify that nobody uses
99059 * non-initialized list entries.
99060 */
99061-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
99062-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
99063+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
99064+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
99065
99066 /********** include/linux/timer.h **********/
99067 /*
99068diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
99069index d8b187c3..9a9257a 100644
99070--- a/include/linux/power/smartreflex.h
99071+++ b/include/linux/power/smartreflex.h
99072@@ -238,7 +238,7 @@ struct omap_sr_class_data {
99073 int (*notify)(struct omap_sr *sr, u32 status);
99074 u8 notify_flags;
99075 u8 class_type;
99076-};
99077+} __do_const;
99078
99079 /**
99080 * struct omap_sr_nvalue_table - Smartreflex n-target value info
99081diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
99082index 4ea1d37..80f4b33 100644
99083--- a/include/linux/ppp-comp.h
99084+++ b/include/linux/ppp-comp.h
99085@@ -84,7 +84,7 @@ struct compressor {
99086 struct module *owner;
99087 /* Extra skb space needed by the compressor algorithm */
99088 unsigned int comp_extra;
99089-};
99090+} __do_const;
99091
99092 /*
99093 * The return value from decompress routine is the length of the
99094diff --git a/include/linux/preempt.h b/include/linux/preempt.h
99095index de83b4e..c4b997d 100644
99096--- a/include/linux/preempt.h
99097+++ b/include/linux/preempt.h
99098@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
99099 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
99100 #endif
99101
99102+#define raw_preempt_count_add(val) __preempt_count_add(val)
99103+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
99104+
99105 #define __preempt_count_inc() __preempt_count_add(1)
99106 #define __preempt_count_dec() __preempt_count_sub(1)
99107
99108 #define preempt_count_inc() preempt_count_add(1)
99109+#define raw_preempt_count_inc() raw_preempt_count_add(1)
99110 #define preempt_count_dec() preempt_count_sub(1)
99111+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
99112
99113 #ifdef CONFIG_PREEMPT_COUNT
99114
99115@@ -41,6 +46,12 @@ do { \
99116 barrier(); \
99117 } while (0)
99118
99119+#define raw_preempt_disable() \
99120+do { \
99121+ raw_preempt_count_inc(); \
99122+ barrier(); \
99123+} while (0)
99124+
99125 #define sched_preempt_enable_no_resched() \
99126 do { \
99127 barrier(); \
99128@@ -49,6 +60,12 @@ do { \
99129
99130 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
99131
99132+#define raw_preempt_enable_no_resched() \
99133+do { \
99134+ barrier(); \
99135+ raw_preempt_count_dec(); \
99136+} while (0)
99137+
99138 #ifdef CONFIG_PREEMPT
99139 #define preempt_enable() \
99140 do { \
99141@@ -113,8 +130,10 @@ do { \
99142 * region.
99143 */
99144 #define preempt_disable() barrier()
99145+#define raw_preempt_disable() barrier()
99146 #define sched_preempt_enable_no_resched() barrier()
99147 #define preempt_enable_no_resched() barrier()
99148+#define raw_preempt_enable_no_resched() barrier()
99149 #define preempt_enable() barrier()
99150 #define preempt_check_resched() do { } while (0)
99151
99152@@ -128,11 +147,13 @@ do { \
99153 /*
99154 * Modules have no business playing preemption tricks.
99155 */
99156+#ifndef CONFIG_PAX_KERNEXEC
99157 #undef sched_preempt_enable_no_resched
99158 #undef preempt_enable_no_resched
99159 #undef preempt_enable_no_resched_notrace
99160 #undef preempt_check_resched
99161 #endif
99162+#endif
99163
99164 #define preempt_set_need_resched() \
99165 do { \
99166diff --git a/include/linux/printk.h b/include/linux/printk.h
99167index 9b30871..1aebc2d 100644
99168--- a/include/linux/printk.h
99169+++ b/include/linux/printk.h
99170@@ -120,7 +120,8 @@ static inline __printf(1, 2) __cold
99171 void early_printk(const char *s, ...) { }
99172 #endif
99173
99174-typedef int(*printk_func_t)(const char *fmt, va_list args);
99175+typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
99176+extern int kptr_restrict;
99177
99178 #ifdef CONFIG_PRINTK
99179 asmlinkage __printf(5, 0)
99180@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
99181
99182 extern int printk_delay_msec;
99183 extern int dmesg_restrict;
99184-extern int kptr_restrict;
99185
99186 extern void wake_up_klogd(void);
99187
99188@@ -164,7 +164,7 @@ char *log_buf_addr_get(void);
99189 u32 log_buf_len_get(void);
99190 void log_buf_kexec_setup(void);
99191 void __init setup_log_buf(int early);
99192-void dump_stack_set_arch_desc(const char *fmt, ...);
99193+__printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
99194 void dump_stack_print_info(const char *log_lvl);
99195 void show_regs_print_info(const char *log_lvl);
99196 #else
99197@@ -215,7 +215,7 @@ static inline void setup_log_buf(int early)
99198 {
99199 }
99200
99201-static inline void dump_stack_set_arch_desc(const char *fmt, ...)
99202+static inline __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...)
99203 {
99204 }
99205
99206diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
99207index b97bf2e..f14c92d4 100644
99208--- a/include/linux/proc_fs.h
99209+++ b/include/linux/proc_fs.h
99210@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
99211 extern struct proc_dir_entry *proc_symlink(const char *,
99212 struct proc_dir_entry *, const char *);
99213 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
99214+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
99215 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
99216 struct proc_dir_entry *, void *);
99217+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
99218+ struct proc_dir_entry *, void *);
99219 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
99220 struct proc_dir_entry *);
99221
99222@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
99223 return proc_create_data(name, mode, parent, proc_fops, NULL);
99224 }
99225
99226+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
99227+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
99228+{
99229+#ifdef CONFIG_GRKERNSEC_PROC_USER
99230+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
99231+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99232+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
99233+#else
99234+ return proc_create_data(name, mode, parent, proc_fops, NULL);
99235+#endif
99236+}
99237+
99238+
99239 extern void proc_set_size(struct proc_dir_entry *, loff_t);
99240 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
99241 extern void *PDE_DATA(const struct inode *);
99242@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
99243 struct proc_dir_entry *parent,const char *dest) { return NULL;}
99244 static inline struct proc_dir_entry *proc_mkdir(const char *name,
99245 struct proc_dir_entry *parent) {return NULL;}
99246+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
99247+ struct proc_dir_entry *parent) { return NULL; }
99248 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
99249 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99250+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
99251+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99252 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
99253 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
99254 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
99255@@ -79,7 +99,7 @@ struct net;
99256 static inline struct proc_dir_entry *proc_net_mkdir(
99257 struct net *net, const char *name, struct proc_dir_entry *parent)
99258 {
99259- return proc_mkdir_data(name, 0, parent, net);
99260+ return proc_mkdir_data_restrict(name, 0, parent, net);
99261 }
99262
99263 #endif /* _LINUX_PROC_FS_H */
99264diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
99265index 42dfc61..8113a99 100644
99266--- a/include/linux/proc_ns.h
99267+++ b/include/linux/proc_ns.h
99268@@ -16,7 +16,7 @@ struct proc_ns_operations {
99269 struct ns_common *(*get)(struct task_struct *task);
99270 void (*put)(struct ns_common *ns);
99271 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
99272-};
99273+} __do_const __randomize_layout;
99274
99275 extern const struct proc_ns_operations netns_operations;
99276 extern const struct proc_ns_operations utsns_operations;
99277diff --git a/include/linux/quota.h b/include/linux/quota.h
99278index b2505ac..5f7ab55 100644
99279--- a/include/linux/quota.h
99280+++ b/include/linux/quota.h
99281@@ -76,7 +76,7 @@ struct kqid { /* Type in which we store the quota identifier */
99282
99283 extern bool qid_eq(struct kqid left, struct kqid right);
99284 extern bool qid_lt(struct kqid left, struct kqid right);
99285-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
99286+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
99287 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
99288 extern bool qid_valid(struct kqid qid);
99289
99290diff --git a/include/linux/random.h b/include/linux/random.h
99291index b05856e..0a9f14e 100644
99292--- a/include/linux/random.h
99293+++ b/include/linux/random.h
99294@@ -9,9 +9,19 @@
99295 #include <uapi/linux/random.h>
99296
99297 extern void add_device_randomness(const void *, unsigned int);
99298+
99299+static inline void add_latent_entropy(void)
99300+{
99301+
99302+#ifdef LATENT_ENTROPY_PLUGIN
99303+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99304+#endif
99305+
99306+}
99307+
99308 extern void add_input_randomness(unsigned int type, unsigned int code,
99309- unsigned int value);
99310-extern void add_interrupt_randomness(int irq, int irq_flags);
99311+ unsigned int value) __latent_entropy;
99312+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
99313
99314 extern void get_random_bytes(void *buf, int nbytes);
99315 extern void get_random_bytes_arch(void *buf, int nbytes);
99316@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
99317 extern const struct file_operations random_fops, urandom_fops;
99318 #endif
99319
99320-unsigned int get_random_int(void);
99321+unsigned int __intentional_overflow(-1) get_random_int(void);
99322 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
99323
99324-u32 prandom_u32(void);
99325+u32 prandom_u32(void) __intentional_overflow(-1);
99326 void prandom_bytes(void *buf, size_t nbytes);
99327 void prandom_seed(u32 seed);
99328 void prandom_reseed_late(void);
99329@@ -37,6 +47,11 @@ struct rnd_state {
99330 u32 prandom_u32_state(struct rnd_state *state);
99331 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99332
99333+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
99334+{
99335+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
99336+}
99337+
99338 /**
99339 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
99340 * @ep_ro: right open interval endpoint
99341@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99342 *
99343 * Returns: pseudo-random number in interval [0, ep_ro)
99344 */
99345-static inline u32 prandom_u32_max(u32 ep_ro)
99346+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
99347 {
99348 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
99349 }
99350diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
99351index 378c5ee..aa84a47 100644
99352--- a/include/linux/rbtree_augmented.h
99353+++ b/include/linux/rbtree_augmented.h
99354@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
99355 old->rbaugmented = rbcompute(old); \
99356 } \
99357 rbstatic const struct rb_augment_callbacks rbname = { \
99358- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
99359+ .propagate = rbname ## _propagate, \
99360+ .copy = rbname ## _copy, \
99361+ .rotate = rbname ## _rotate \
99362 };
99363
99364
99365diff --git a/include/linux/rculist.h b/include/linux/rculist.h
99366index a18b16f..2683096 100644
99367--- a/include/linux/rculist.h
99368+++ b/include/linux/rculist.h
99369@@ -29,8 +29,8 @@
99370 */
99371 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
99372 {
99373- ACCESS_ONCE(list->next) = list;
99374- ACCESS_ONCE(list->prev) = list;
99375+ ACCESS_ONCE_RW(list->next) = list;
99376+ ACCESS_ONCE_RW(list->prev) = list;
99377 }
99378
99379 /*
99380@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
99381 struct list_head *prev, struct list_head *next);
99382 #endif
99383
99384+void __pax_list_add_rcu(struct list_head *new,
99385+ struct list_head *prev, struct list_head *next);
99386+
99387 /**
99388 * list_add_rcu - add a new entry to rcu-protected list
99389 * @new: new entry to be added
99390@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
99391 __list_add_rcu(new, head, head->next);
99392 }
99393
99394+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
99395+{
99396+ __pax_list_add_rcu(new, head, head->next);
99397+}
99398+
99399 /**
99400 * list_add_tail_rcu - add a new entry to rcu-protected list
99401 * @new: new entry to be added
99402@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
99403 __list_add_rcu(new, head->prev, head);
99404 }
99405
99406+static inline void pax_list_add_tail_rcu(struct list_head *new,
99407+ struct list_head *head)
99408+{
99409+ __pax_list_add_rcu(new, head->prev, head);
99410+}
99411+
99412 /**
99413 * list_del_rcu - deletes entry from list without re-initialization
99414 * @entry: the element to delete from the list.
99415@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
99416 entry->prev = LIST_POISON2;
99417 }
99418
99419+extern void pax_list_del_rcu(struct list_head *entry);
99420+
99421 /**
99422 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
99423 * @n: the element to delete from the hash list.
99424diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
99425index 573a5af..de97a14 100644
99426--- a/include/linux/rcupdate.h
99427+++ b/include/linux/rcupdate.h
99428@@ -365,7 +365,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
99429 do { \
99430 rcu_all_qs(); \
99431 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
99432- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
99433+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
99434 } while (0)
99435 #else /* #ifdef CONFIG_TASKS_RCU */
99436 #define TASKS_RCU(x) do { } while (0)
99437diff --git a/include/linux/reboot.h b/include/linux/reboot.h
99438index a7ff409..03e2fa8 100644
99439--- a/include/linux/reboot.h
99440+++ b/include/linux/reboot.h
99441@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
99442 */
99443
99444 extern void migrate_to_reboot_cpu(void);
99445-extern void machine_restart(char *cmd);
99446-extern void machine_halt(void);
99447-extern void machine_power_off(void);
99448+extern void machine_restart(char *cmd) __noreturn;
99449+extern void machine_halt(void) __noreturn;
99450+extern void machine_power_off(void) __noreturn;
99451
99452 extern void machine_shutdown(void);
99453 struct pt_regs;
99454@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
99455 */
99456
99457 extern void kernel_restart_prepare(char *cmd);
99458-extern void kernel_restart(char *cmd);
99459-extern void kernel_halt(void);
99460-extern void kernel_power_off(void);
99461+extern void kernel_restart(char *cmd) __noreturn;
99462+extern void kernel_halt(void) __noreturn;
99463+extern void kernel_power_off(void) __noreturn;
99464
99465 extern int C_A_D; /* for sysctl */
99466 void ctrl_alt_del(void);
99467@@ -77,7 +77,7 @@ extern void orderly_reboot(void);
99468 * Emergency restart, callable from an interrupt handler.
99469 */
99470
99471-extern void emergency_restart(void);
99472+extern void emergency_restart(void) __noreturn;
99473 #include <asm/emergency-restart.h>
99474
99475 #endif /* _LINUX_REBOOT_H */
99476diff --git a/include/linux/regset.h b/include/linux/regset.h
99477index 8e0c9fe..ac4d221 100644
99478--- a/include/linux/regset.h
99479+++ b/include/linux/regset.h
99480@@ -161,7 +161,8 @@ struct user_regset {
99481 unsigned int align;
99482 unsigned int bias;
99483 unsigned int core_note_type;
99484-};
99485+} __do_const;
99486+typedef struct user_regset __no_const user_regset_no_const;
99487
99488 /**
99489 * struct user_regset_view - available regsets
99490diff --git a/include/linux/relay.h b/include/linux/relay.h
99491index d7c8359..818daf5 100644
99492--- a/include/linux/relay.h
99493+++ b/include/linux/relay.h
99494@@ -157,7 +157,7 @@ struct rchan_callbacks
99495 * The callback should return 0 if successful, negative if not.
99496 */
99497 int (*remove_buf_file)(struct dentry *dentry);
99498-};
99499+} __no_const;
99500
99501 /*
99502 * CONFIG_RELAY kernel API, kernel/relay.c
99503diff --git a/include/linux/rio.h b/include/linux/rio.h
99504index 6bda06f..bf39a9b 100644
99505--- a/include/linux/rio.h
99506+++ b/include/linux/rio.h
99507@@ -358,7 +358,7 @@ struct rio_ops {
99508 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
99509 u64 rstart, u32 size, u32 flags);
99510 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
99511-};
99512+} __no_const;
99513
99514 #define RIO_RESOURCE_MEM 0x00000100
99515 #define RIO_RESOURCE_DOORBELL 0x00000200
99516diff --git a/include/linux/rmap.h b/include/linux/rmap.h
99517index c89c53a..aa0a65a 100644
99518--- a/include/linux/rmap.h
99519+++ b/include/linux/rmap.h
99520@@ -146,8 +146,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
99521 void anon_vma_init(void); /* create anon_vma_cachep */
99522 int anon_vma_prepare(struct vm_area_struct *);
99523 void unlink_anon_vmas(struct vm_area_struct *);
99524-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
99525-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
99526+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
99527+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
99528
99529 static inline void anon_vma_merge(struct vm_area_struct *vma,
99530 struct vm_area_struct *next)
99531diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
99532index ed8f9e70..2e627f2 100644
99533--- a/include/linux/scatterlist.h
99534+++ b/include/linux/scatterlist.h
99535@@ -1,6 +1,7 @@
99536 #ifndef _LINUX_SCATTERLIST_H
99537 #define _LINUX_SCATTERLIST_H
99538
99539+#include <linux/sched.h>
99540 #include <linux/string.h>
99541 #include <linux/bug.h>
99542 #include <linux/mm.h>
99543@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
99544 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
99545 unsigned int buflen)
99546 {
99547+ const void *realbuf = buf;
99548+
99549+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99550+ if (object_starts_on_stack(buf))
99551+ realbuf = buf - current->stack + current->lowmem_stack;
99552+#endif
99553+
99554 #ifdef CONFIG_DEBUG_SG
99555- BUG_ON(!virt_addr_valid(buf));
99556+ BUG_ON(!virt_addr_valid(realbuf));
99557 #endif
99558- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
99559+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
99560 }
99561
99562 /*
99563diff --git a/include/linux/sched.h b/include/linux/sched.h
99564index 26a2e61..36bbf4b 100644
99565--- a/include/linux/sched.h
99566+++ b/include/linux/sched.h
99567@@ -132,6 +132,7 @@ struct fs_struct;
99568 struct perf_event_context;
99569 struct blk_plug;
99570 struct filename;
99571+struct linux_binprm;
99572
99573 #define VMACACHE_BITS 2
99574 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
99575@@ -413,7 +414,7 @@ extern char __sched_text_start[], __sched_text_end[];
99576 extern int in_sched_functions(unsigned long addr);
99577
99578 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
99579-extern signed long schedule_timeout(signed long timeout);
99580+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
99581 extern signed long schedule_timeout_interruptible(signed long timeout);
99582 extern signed long schedule_timeout_killable(signed long timeout);
99583 extern signed long schedule_timeout_uninterruptible(signed long timeout);
99584@@ -431,6 +432,19 @@ struct nsproxy;
99585 struct user_namespace;
99586
99587 #ifdef CONFIG_MMU
99588+
99589+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
99590+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
99591+#else
99592+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
99593+{
99594+ return 0;
99595+}
99596+#endif
99597+
99598+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
99599+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
99600+
99601 extern void arch_pick_mmap_layout(struct mm_struct *mm);
99602 extern unsigned long
99603 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
99604@@ -729,6 +743,17 @@ struct signal_struct {
99605 #ifdef CONFIG_TASKSTATS
99606 struct taskstats *stats;
99607 #endif
99608+
99609+#ifdef CONFIG_GRKERNSEC
99610+ u32 curr_ip;
99611+ u32 saved_ip;
99612+ u32 gr_saddr;
99613+ u32 gr_daddr;
99614+ u16 gr_sport;
99615+ u16 gr_dport;
99616+ u8 used_accept:1;
99617+#endif
99618+
99619 #ifdef CONFIG_AUDIT
99620 unsigned audit_tty;
99621 unsigned audit_tty_log_passwd;
99622@@ -755,7 +780,7 @@ struct signal_struct {
99623 struct mutex cred_guard_mutex; /* guard against foreign influences on
99624 * credential calculations
99625 * (notably. ptrace) */
99626-};
99627+} __randomize_layout;
99628
99629 /*
99630 * Bits in flags field of signal_struct.
99631@@ -808,6 +833,14 @@ struct user_struct {
99632 struct key *session_keyring; /* UID's default session keyring */
99633 #endif
99634
99635+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
99636+ unsigned char kernel_banned;
99637+#endif
99638+#ifdef CONFIG_GRKERNSEC_BRUTE
99639+ unsigned char suid_banned;
99640+ unsigned long suid_ban_expires;
99641+#endif
99642+
99643 /* Hash table maintenance information */
99644 struct hlist_node uidhash_node;
99645 kuid_t uid;
99646@@ -815,7 +848,7 @@ struct user_struct {
99647 #ifdef CONFIG_PERF_EVENTS
99648 atomic_long_t locked_vm;
99649 #endif
99650-};
99651+} __randomize_layout;
99652
99653 extern int uids_sysfs_init(void);
99654
99655@@ -1292,6 +1325,9 @@ enum perf_event_task_context {
99656 struct task_struct {
99657 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
99658 void *stack;
99659+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99660+ void *lowmem_stack;
99661+#endif
99662 atomic_t usage;
99663 unsigned int flags; /* per process flags, defined below */
99664 unsigned int ptrace;
99665@@ -1425,8 +1461,8 @@ struct task_struct {
99666 struct list_head thread_node;
99667
99668 struct completion *vfork_done; /* for vfork() */
99669- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
99670- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99671+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
99672+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99673
99674 cputime_t utime, stime, utimescaled, stimescaled;
99675 cputime_t gtime;
99676@@ -1451,11 +1487,6 @@ struct task_struct {
99677 struct task_cputime cputime_expires;
99678 struct list_head cpu_timers[3];
99679
99680-/* process credentials */
99681- const struct cred __rcu *real_cred; /* objective and real subjective task
99682- * credentials (COW) */
99683- const struct cred __rcu *cred; /* effective (overridable) subjective task
99684- * credentials (COW) */
99685 char comm[TASK_COMM_LEN]; /* executable name excluding path
99686 - access with [gs]et_task_comm (which lock
99687 it with task_lock())
99688@@ -1473,6 +1504,10 @@ struct task_struct {
99689 #endif
99690 /* CPU-specific state of this task */
99691 struct thread_struct thread;
99692+/* thread_info moved to task_struct */
99693+#ifdef CONFIG_X86
99694+ struct thread_info tinfo;
99695+#endif
99696 /* filesystem information */
99697 struct fs_struct *fs;
99698 /* open file information */
99699@@ -1547,6 +1582,10 @@ struct task_struct {
99700 gfp_t lockdep_reclaim_gfp;
99701 #endif
99702
99703+/* process credentials */
99704+ const struct cred __rcu *real_cred; /* objective and real subjective task
99705+ * credentials (COW) */
99706+
99707 /* journalling filesystem info */
99708 void *journal_info;
99709
99710@@ -1585,6 +1624,10 @@ struct task_struct {
99711 /* cg_list protected by css_set_lock and tsk->alloc_lock */
99712 struct list_head cg_list;
99713 #endif
99714+
99715+ const struct cred __rcu *cred; /* effective (overridable) subjective task
99716+ * credentials (COW) */
99717+
99718 #ifdef CONFIG_FUTEX
99719 struct robust_list_head __user *robust_list;
99720 #ifdef CONFIG_COMPAT
99721@@ -1696,7 +1739,7 @@ struct task_struct {
99722 * Number of functions that haven't been traced
99723 * because of depth overrun.
99724 */
99725- atomic_t trace_overrun;
99726+ atomic_unchecked_t trace_overrun;
99727 /* Pause for the tracing */
99728 atomic_t tracing_graph_pause;
99729 #endif
99730@@ -1724,7 +1767,78 @@ struct task_struct {
99731 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
99732 unsigned long task_state_change;
99733 #endif
99734-};
99735+
99736+#ifdef CONFIG_GRKERNSEC
99737+ /* grsecurity */
99738+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99739+ u64 exec_id;
99740+#endif
99741+#ifdef CONFIG_GRKERNSEC_SETXID
99742+ const struct cred *delayed_cred;
99743+#endif
99744+ struct dentry *gr_chroot_dentry;
99745+ struct acl_subject_label *acl;
99746+ struct acl_subject_label *tmpacl;
99747+ struct acl_role_label *role;
99748+ struct file *exec_file;
99749+ unsigned long brute_expires;
99750+ u16 acl_role_id;
99751+ u8 inherited;
99752+ /* is this the task that authenticated to the special role */
99753+ u8 acl_sp_role;
99754+ u8 is_writable;
99755+ u8 brute;
99756+ u8 gr_is_chrooted;
99757+#endif
99758+
99759+} __randomize_layout;
99760+
99761+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
99762+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
99763+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
99764+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
99765+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
99766+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
99767+
99768+#ifdef CONFIG_PAX_SOFTMODE
99769+extern int pax_softmode;
99770+#endif
99771+
99772+extern int pax_check_flags(unsigned long *);
99773+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
99774+
99775+/* if tsk != current then task_lock must be held on it */
99776+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
99777+static inline unsigned long pax_get_flags(struct task_struct *tsk)
99778+{
99779+ if (likely(tsk->mm))
99780+ return tsk->mm->pax_flags;
99781+ else
99782+ return 0UL;
99783+}
99784+
99785+/* if tsk != current then task_lock must be held on it */
99786+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
99787+{
99788+ if (likely(tsk->mm)) {
99789+ tsk->mm->pax_flags = flags;
99790+ return 0;
99791+ }
99792+ return -EINVAL;
99793+}
99794+#endif
99795+
99796+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
99797+extern void pax_set_initial_flags(struct linux_binprm *bprm);
99798+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
99799+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
99800+#endif
99801+
99802+struct path;
99803+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
99804+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
99805+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
99806+extern void pax_report_refcount_overflow(struct pt_regs *regs);
99807
99808 /* Future-safe accessor for struct task_struct's cpus_allowed. */
99809 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
99810@@ -1807,7 +1921,7 @@ struct pid_namespace;
99811 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
99812 struct pid_namespace *ns);
99813
99814-static inline pid_t task_pid_nr(struct task_struct *tsk)
99815+static inline pid_t task_pid_nr(const struct task_struct *tsk)
99816 {
99817 return tsk->pid;
99818 }
99819@@ -2175,6 +2289,25 @@ extern u64 sched_clock_cpu(int cpu);
99820
99821 extern void sched_clock_init(void);
99822
99823+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99824+static inline void populate_stack(void)
99825+{
99826+ struct task_struct *curtask = current;
99827+ int c;
99828+ int *ptr = curtask->stack;
99829+ int *end = curtask->stack + THREAD_SIZE;
99830+
99831+ while (ptr < end) {
99832+ c = *(volatile int *)ptr;
99833+ ptr += PAGE_SIZE/sizeof(int);
99834+ }
99835+}
99836+#else
99837+static inline void populate_stack(void)
99838+{
99839+}
99840+#endif
99841+
99842 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
99843 static inline void sched_clock_tick(void)
99844 {
99845@@ -2303,7 +2436,9 @@ extern void set_curr_task(int cpu, struct task_struct *p);
99846 void yield(void);
99847
99848 union thread_union {
99849+#ifndef CONFIG_X86
99850 struct thread_info thread_info;
99851+#endif
99852 unsigned long stack[THREAD_SIZE/sizeof(long)];
99853 };
99854
99855@@ -2336,6 +2471,7 @@ extern struct pid_namespace init_pid_ns;
99856 */
99857
99858 extern struct task_struct *find_task_by_vpid(pid_t nr);
99859+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
99860 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
99861 struct pid_namespace *ns);
99862
99863@@ -2500,7 +2636,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
99864 extern void exit_itimers(struct signal_struct *);
99865 extern void flush_itimer_signals(void);
99866
99867-extern void do_group_exit(int);
99868+extern __noreturn void do_group_exit(int);
99869
99870 extern int do_execve(struct filename *,
99871 const char __user * const __user *,
99872@@ -2721,9 +2857,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
99873 #define task_stack_end_corrupted(task) \
99874 (*(end_of_stack(task)) != STACK_END_MAGIC)
99875
99876-static inline int object_is_on_stack(void *obj)
99877+static inline int object_starts_on_stack(const void *obj)
99878 {
99879- void *stack = task_stack_page(current);
99880+ const void *stack = task_stack_page(current);
99881
99882 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
99883 }
99884diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
99885index 596a0e0..bea77ec 100644
99886--- a/include/linux/sched/sysctl.h
99887+++ b/include/linux/sched/sysctl.h
99888@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
99889 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
99890
99891 extern int sysctl_max_map_count;
99892+extern unsigned long sysctl_heap_stack_gap;
99893
99894 extern unsigned int sysctl_sched_latency;
99895 extern unsigned int sysctl_sched_min_granularity;
99896diff --git a/include/linux/security.h b/include/linux/security.h
99897index 18264ea..e0238e4 100644
99898--- a/include/linux/security.h
99899+++ b/include/linux/security.h
99900@@ -27,6 +27,7 @@
99901 #include <linux/slab.h>
99902 #include <linux/err.h>
99903 #include <linux/string.h>
99904+#include <linux/grsecurity.h>
99905
99906 struct linux_binprm;
99907 struct cred;
99908@@ -116,8 +117,6 @@ struct seq_file;
99909
99910 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
99911
99912-void reset_security_ops(void);
99913-
99914 #ifdef CONFIG_MMU
99915 extern unsigned long mmap_min_addr;
99916 extern unsigned long dac_mmap_min_addr;
99917@@ -1755,7 +1754,7 @@ struct security_operations {
99918 struct audit_context *actx);
99919 void (*audit_rule_free) (void *lsmrule);
99920 #endif /* CONFIG_AUDIT */
99921-};
99922+} __randomize_layout;
99923
99924 /* prototypes */
99925 extern int security_init(void);
99926diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
99927index dc368b8..e895209 100644
99928--- a/include/linux/semaphore.h
99929+++ b/include/linux/semaphore.h
99930@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
99931 }
99932
99933 extern void down(struct semaphore *sem);
99934-extern int __must_check down_interruptible(struct semaphore *sem);
99935+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
99936 extern int __must_check down_killable(struct semaphore *sem);
99937 extern int __must_check down_trylock(struct semaphore *sem);
99938 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
99939diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
99940index afbb1fd..e1d205d 100644
99941--- a/include/linux/seq_file.h
99942+++ b/include/linux/seq_file.h
99943@@ -27,6 +27,9 @@ struct seq_file {
99944 struct mutex lock;
99945 const struct seq_operations *op;
99946 int poll_event;
99947+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99948+ u64 exec_id;
99949+#endif
99950 #ifdef CONFIG_USER_NS
99951 struct user_namespace *user_ns;
99952 #endif
99953@@ -39,6 +42,7 @@ struct seq_operations {
99954 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
99955 int (*show) (struct seq_file *m, void *v);
99956 };
99957+typedef struct seq_operations __no_const seq_operations_no_const;
99958
99959 #define SEQ_SKIP 1
99960
99961@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
99962
99963 char *mangle_path(char *s, const char *p, const char *esc);
99964 int seq_open(struct file *, const struct seq_operations *);
99965+int seq_open_restrict(struct file *, const struct seq_operations *);
99966 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
99967 loff_t seq_lseek(struct file *, loff_t, int);
99968 int seq_release(struct inode *, struct file *);
99969@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
99970 const struct path *root, const char *esc);
99971
99972 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
99973+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
99974 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
99975 int single_release(struct inode *, struct file *);
99976 void *__seq_open_private(struct file *, const struct seq_operations *, int);
99977diff --git a/include/linux/shm.h b/include/linux/shm.h
99978index 6fb8016..ab4465e 100644
99979--- a/include/linux/shm.h
99980+++ b/include/linux/shm.h
99981@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
99982 /* The task created the shm object. NULL if the task is dead. */
99983 struct task_struct *shm_creator;
99984 struct list_head shm_clist; /* list by creator */
99985+#ifdef CONFIG_GRKERNSEC
99986+ u64 shm_createtime;
99987+ pid_t shm_lapid;
99988+#endif
99989 };
99990
99991 /* shm_mode upper byte flags */
99992diff --git a/include/linux/signal.h b/include/linux/signal.h
99993index ab1e039..ad4229e 100644
99994--- a/include/linux/signal.h
99995+++ b/include/linux/signal.h
99996@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
99997 * know it'll be handled, so that they don't get converted to
99998 * SIGKILL or just silently dropped.
99999 */
100000- kernel_sigaction(sig, (__force __sighandler_t)2);
100001+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
100002 }
100003
100004 static inline void disallow_signal(int sig)
100005diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
100006index f15154a..72cf02c 100644
100007--- a/include/linux/skbuff.h
100008+++ b/include/linux/skbuff.h
100009@@ -776,7 +776,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
100010 int node);
100011 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
100012 struct sk_buff *build_skb(void *data, unsigned int frag_size);
100013-static inline struct sk_buff *alloc_skb(unsigned int size,
100014+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
100015 gfp_t priority)
100016 {
100017 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
100018@@ -1971,7 +1971,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
100019 return skb->inner_transport_header - skb->inner_network_header;
100020 }
100021
100022-static inline int skb_network_offset(const struct sk_buff *skb)
100023+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
100024 {
100025 return skb_network_header(skb) - skb->data;
100026 }
100027@@ -2031,7 +2031,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
100028 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
100029 */
100030 #ifndef NET_SKB_PAD
100031-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
100032+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
100033 #endif
100034
100035 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
100036@@ -2673,9 +2673,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
100037 int *err);
100038 unsigned int datagram_poll(struct file *file, struct socket *sock,
100039 struct poll_table_struct *wait);
100040-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100041+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100042 struct iov_iter *to, int size);
100043-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100044+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100045 struct msghdr *msg, int size)
100046 {
100047 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
100048@@ -3197,6 +3197,9 @@ static inline void nf_reset(struct sk_buff *skb)
100049 nf_bridge_put(skb->nf_bridge);
100050 skb->nf_bridge = NULL;
100051 #endif
100052+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
100053+ skb->nf_trace = 0;
100054+#endif
100055 }
100056
100057 static inline void nf_reset_trace(struct sk_buff *skb)
100058diff --git a/include/linux/slab.h b/include/linux/slab.h
100059index ffd24c8..cbbe7de 100644
100060--- a/include/linux/slab.h
100061+++ b/include/linux/slab.h
100062@@ -15,14 +15,29 @@
100063 #include <linux/types.h>
100064 #include <linux/workqueue.h>
100065
100066+#include <linux/err.h>
100067
100068 /*
100069 * Flags to pass to kmem_cache_create().
100070 * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
100071 */
100072 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
100073+
100074+#ifdef CONFIG_PAX_USERCOPY_SLABS
100075+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
100076+#else
100077+#define SLAB_USERCOPY 0x00000000UL
100078+#endif
100079+
100080 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
100081 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
100082+
100083+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100084+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
100085+#else
100086+#define SLAB_NO_SANITIZE 0x00000000UL
100087+#endif
100088+
100089 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
100090 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
100091 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
100092@@ -98,10 +113,13 @@
100093 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
100094 * Both make kfree a no-op.
100095 */
100096-#define ZERO_SIZE_PTR ((void *)16)
100097+#define ZERO_SIZE_PTR \
100098+({ \
100099+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
100100+ (void *)(-MAX_ERRNO-1L); \
100101+})
100102
100103-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
100104- (unsigned long)ZERO_SIZE_PTR)
100105+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
100106
100107 #include <linux/kmemleak.h>
100108 #include <linux/kasan.h>
100109@@ -143,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
100110 void kfree(const void *);
100111 void kzfree(const void *);
100112 size_t ksize(const void *);
100113+const char *check_heap_object(const void *ptr, unsigned long n);
100114+bool is_usercopy_object(const void *ptr);
100115
100116 /*
100117 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
100118@@ -235,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
100119 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100120 #endif
100121
100122+#ifdef CONFIG_PAX_USERCOPY_SLABS
100123+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
100124+#endif
100125+
100126 /*
100127 * Figure out which kmalloc slab an allocation of a certain size
100128 * belongs to.
100129@@ -243,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100130 * 2 = 120 .. 192 bytes
100131 * n = 2^(n-1) .. 2^n -1
100132 */
100133-static __always_inline int kmalloc_index(size_t size)
100134+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
100135 {
100136 if (!size)
100137 return 0;
100138@@ -286,15 +310,15 @@ static __always_inline int kmalloc_index(size_t size)
100139 }
100140 #endif /* !CONFIG_SLOB */
100141
100142-void *__kmalloc(size_t size, gfp_t flags);
100143+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
100144 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
100145 void kmem_cache_free(struct kmem_cache *, void *);
100146
100147 #ifdef CONFIG_NUMA
100148-void *__kmalloc_node(size_t size, gfp_t flags, int node);
100149+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
100150 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
100151 #else
100152-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
100153+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100154 {
100155 return __kmalloc(size, flags);
100156 }
100157diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
100158index 33d0490..70a6313 100644
100159--- a/include/linux/slab_def.h
100160+++ b/include/linux/slab_def.h
100161@@ -40,7 +40,7 @@ struct kmem_cache {
100162 /* 4) cache creation/removal */
100163 const char *name;
100164 struct list_head list;
100165- int refcount;
100166+ atomic_t refcount;
100167 int object_size;
100168 int align;
100169
100170@@ -56,10 +56,14 @@ struct kmem_cache {
100171 unsigned long node_allocs;
100172 unsigned long node_frees;
100173 unsigned long node_overflow;
100174- atomic_t allochit;
100175- atomic_t allocmiss;
100176- atomic_t freehit;
100177- atomic_t freemiss;
100178+ atomic_unchecked_t allochit;
100179+ atomic_unchecked_t allocmiss;
100180+ atomic_unchecked_t freehit;
100181+ atomic_unchecked_t freemiss;
100182+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100183+ atomic_unchecked_t sanitized;
100184+ atomic_unchecked_t not_sanitized;
100185+#endif
100186
100187 /*
100188 * If debugging is enabled, then the allocator can add additional
100189diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
100190index 3388511..6252f90 100644
100191--- a/include/linux/slub_def.h
100192+++ b/include/linux/slub_def.h
100193@@ -74,7 +74,7 @@ struct kmem_cache {
100194 struct kmem_cache_order_objects max;
100195 struct kmem_cache_order_objects min;
100196 gfp_t allocflags; /* gfp flags to use on each alloc */
100197- int refcount; /* Refcount for slab cache destroy */
100198+ atomic_t refcount; /* Refcount for slab cache destroy */
100199 void (*ctor)(void *);
100200 int inuse; /* Offset to metadata */
100201 int align; /* Alignment */
100202diff --git a/include/linux/smp.h b/include/linux/smp.h
100203index c441407..f487b83 100644
100204--- a/include/linux/smp.h
100205+++ b/include/linux/smp.h
100206@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
100207 #endif
100208
100209 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
100210+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
100211 #define put_cpu() preempt_enable()
100212+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
100213
100214 /*
100215 * Callback to arch code if there's nosmp or maxcpus=0 on the
100216diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
100217index 083ac38..b23e3e8 100644
100218--- a/include/linux/sock_diag.h
100219+++ b/include/linux/sock_diag.h
100220@@ -11,7 +11,7 @@ struct sock;
100221 struct sock_diag_handler {
100222 __u8 family;
100223 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
100224-};
100225+} __do_const;
100226
100227 int sock_diag_register(const struct sock_diag_handler *h);
100228 void sock_diag_unregister(const struct sock_diag_handler *h);
100229diff --git a/include/linux/sonet.h b/include/linux/sonet.h
100230index 680f9a3..f13aeb0 100644
100231--- a/include/linux/sonet.h
100232+++ b/include/linux/sonet.h
100233@@ -7,7 +7,7 @@
100234 #include <uapi/linux/sonet.h>
100235
100236 struct k_sonet_stats {
100237-#define __HANDLE_ITEM(i) atomic_t i
100238+#define __HANDLE_ITEM(i) atomic_unchecked_t i
100239 __SONET_ITEMS
100240 #undef __HANDLE_ITEM
100241 };
100242diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
100243index 07d8e53..dc934c9 100644
100244--- a/include/linux/sunrpc/addr.h
100245+++ b/include/linux/sunrpc/addr.h
100246@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
100247 {
100248 switch (sap->sa_family) {
100249 case AF_INET:
100250- return ntohs(((struct sockaddr_in *)sap)->sin_port);
100251+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
100252 case AF_INET6:
100253- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
100254+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
100255 }
100256 return 0;
100257 }
100258@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
100259 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
100260 const struct sockaddr *src)
100261 {
100262- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
100263+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
100264 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
100265
100266 dsin->sin_family = ssin->sin_family;
100267@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
100268 if (sa->sa_family != AF_INET6)
100269 return 0;
100270
100271- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
100272+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
100273 }
100274
100275 #endif /* _LINUX_SUNRPC_ADDR_H */
100276diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
100277index 598ba80..d90cba6 100644
100278--- a/include/linux/sunrpc/clnt.h
100279+++ b/include/linux/sunrpc/clnt.h
100280@@ -100,7 +100,7 @@ struct rpc_procinfo {
100281 unsigned int p_timer; /* Which RTT timer to use */
100282 u32 p_statidx; /* Which procedure to account */
100283 const char * p_name; /* name of procedure */
100284-};
100285+} __do_const;
100286
100287 #ifdef __KERNEL__
100288
100289diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
100290index fae6fb9..023fbcd 100644
100291--- a/include/linux/sunrpc/svc.h
100292+++ b/include/linux/sunrpc/svc.h
100293@@ -420,7 +420,7 @@ struct svc_procedure {
100294 unsigned int pc_count; /* call count */
100295 unsigned int pc_cachetype; /* cache info (NFS) */
100296 unsigned int pc_xdrressize; /* maximum size of XDR reply */
100297-};
100298+} __do_const;
100299
100300 /*
100301 * Function prototypes.
100302diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
100303index df8edf8..d140fec 100644
100304--- a/include/linux/sunrpc/svc_rdma.h
100305+++ b/include/linux/sunrpc/svc_rdma.h
100306@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
100307 extern unsigned int svcrdma_max_requests;
100308 extern unsigned int svcrdma_max_req_size;
100309
100310-extern atomic_t rdma_stat_recv;
100311-extern atomic_t rdma_stat_read;
100312-extern atomic_t rdma_stat_write;
100313-extern atomic_t rdma_stat_sq_starve;
100314-extern atomic_t rdma_stat_rq_starve;
100315-extern atomic_t rdma_stat_rq_poll;
100316-extern atomic_t rdma_stat_rq_prod;
100317-extern atomic_t rdma_stat_sq_poll;
100318-extern atomic_t rdma_stat_sq_prod;
100319+extern atomic_unchecked_t rdma_stat_recv;
100320+extern atomic_unchecked_t rdma_stat_read;
100321+extern atomic_unchecked_t rdma_stat_write;
100322+extern atomic_unchecked_t rdma_stat_sq_starve;
100323+extern atomic_unchecked_t rdma_stat_rq_starve;
100324+extern atomic_unchecked_t rdma_stat_rq_poll;
100325+extern atomic_unchecked_t rdma_stat_rq_prod;
100326+extern atomic_unchecked_t rdma_stat_sq_poll;
100327+extern atomic_unchecked_t rdma_stat_sq_prod;
100328
100329 /*
100330 * Contexts are built when an RDMA request is created and are a
100331diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
100332index 8d71d65..f79586e 100644
100333--- a/include/linux/sunrpc/svcauth.h
100334+++ b/include/linux/sunrpc/svcauth.h
100335@@ -120,7 +120,7 @@ struct auth_ops {
100336 int (*release)(struct svc_rqst *rq);
100337 void (*domain_release)(struct auth_domain *);
100338 int (*set_client)(struct svc_rqst *rq);
100339-};
100340+} __do_const;
100341
100342 #define SVC_GARBAGE 1
100343 #define SVC_SYSERR 2
100344diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
100345index e7a018e..49f8b17 100644
100346--- a/include/linux/swiotlb.h
100347+++ b/include/linux/swiotlb.h
100348@@ -60,7 +60,8 @@ extern void
100349
100350 extern void
100351 swiotlb_free_coherent(struct device *hwdev, size_t size,
100352- void *vaddr, dma_addr_t dma_handle);
100353+ void *vaddr, dma_addr_t dma_handle,
100354+ struct dma_attrs *attrs);
100355
100356 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
100357 unsigned long offset, size_t size,
100358diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
100359index 76d1e38..200776e 100644
100360--- a/include/linux/syscalls.h
100361+++ b/include/linux/syscalls.h
100362@@ -102,7 +102,12 @@ union bpf_attr;
100363 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
100364 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
100365 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
100366-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
100367+#define __SC_LONG(t, a) __typeof__( \
100368+ __builtin_choose_expr( \
100369+ sizeof(t) > sizeof(int), \
100370+ (t) 0, \
100371+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
100372+ )) a
100373 #define __SC_CAST(t, a) (t) a
100374 #define __SC_ARGS(t, a) a
100375 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
100376@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
100377 asmlinkage long sys_fsync(unsigned int fd);
100378 asmlinkage long sys_fdatasync(unsigned int fd);
100379 asmlinkage long sys_bdflush(int func, long data);
100380-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
100381- char __user *type, unsigned long flags,
100382+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
100383+ const char __user *type, unsigned long flags,
100384 void __user *data);
100385-asmlinkage long sys_umount(char __user *name, int flags);
100386-asmlinkage long sys_oldumount(char __user *name);
100387+asmlinkage long sys_umount(const char __user *name, int flags);
100388+asmlinkage long sys_oldumount(const char __user *name);
100389 asmlinkage long sys_truncate(const char __user *path, long length);
100390 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
100391 asmlinkage long sys_stat(const char __user *filename,
100392@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
100393 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
100394 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
100395 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
100396- struct sockaddr __user *, int);
100397+ struct sockaddr __user *, int) __intentional_overflow(0);
100398 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
100399 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
100400 unsigned int vlen, unsigned flags);
100401@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
100402
100403 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
100404 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
100405- unsigned nsops);
100406+ long nsops);
100407 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
100408 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
100409- unsigned nsops,
100410+ long nsops,
100411 const struct timespec __user *timeout);
100412 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
100413 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
100414diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
100415index 27b3b0b..e093dd9 100644
100416--- a/include/linux/syscore_ops.h
100417+++ b/include/linux/syscore_ops.h
100418@@ -16,7 +16,7 @@ struct syscore_ops {
100419 int (*suspend)(void);
100420 void (*resume)(void);
100421 void (*shutdown)(void);
100422-};
100423+} __do_const;
100424
100425 extern void register_syscore_ops(struct syscore_ops *ops);
100426 extern void unregister_syscore_ops(struct syscore_ops *ops);
100427diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
100428index fa7bc29..0d96561 100644
100429--- a/include/linux/sysctl.h
100430+++ b/include/linux/sysctl.h
100431@@ -39,10 +39,16 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
100432
100433 extern int proc_dostring(struct ctl_table *, int,
100434 void __user *, size_t *, loff_t *);
100435+extern int proc_dostring_modpriv(struct ctl_table *, int,
100436+ void __user *, size_t *, loff_t *);
100437 extern int proc_dointvec(struct ctl_table *, int,
100438 void __user *, size_t *, loff_t *);
100439+extern int proc_dointvec_secure(struct ctl_table *, int,
100440+ void __user *, size_t *, loff_t *);
100441 extern int proc_dointvec_minmax(struct ctl_table *, int,
100442 void __user *, size_t *, loff_t *);
100443+extern int proc_dointvec_minmax_secure(struct ctl_table *, int,
100444+ void __user *, size_t *, loff_t *);
100445 extern int proc_dointvec_jiffies(struct ctl_table *, int,
100446 void __user *, size_t *, loff_t *);
100447 extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int,
100448@@ -113,7 +119,8 @@ struct ctl_table
100449 struct ctl_table_poll *poll;
100450 void *extra1;
100451 void *extra2;
100452-};
100453+} __do_const __randomize_layout;
100454+typedef struct ctl_table __no_const ctl_table_no_const;
100455
100456 struct ctl_node {
100457 struct rb_node node;
100458diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
100459index 9f65758..487a6f1 100644
100460--- a/include/linux/sysfs.h
100461+++ b/include/linux/sysfs.h
100462@@ -34,7 +34,8 @@ struct attribute {
100463 struct lock_class_key *key;
100464 struct lock_class_key skey;
100465 #endif
100466-};
100467+} __do_const;
100468+typedef struct attribute __no_const attribute_no_const;
100469
100470 /**
100471 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
100472@@ -78,7 +79,8 @@ struct attribute_group {
100473 struct attribute *, int);
100474 struct attribute **attrs;
100475 struct bin_attribute **bin_attrs;
100476-};
100477+} __do_const;
100478+typedef struct attribute_group __no_const attribute_group_no_const;
100479
100480 /**
100481 * Use these macros to make defining attributes easier. See include/linux/device.h
100482@@ -152,7 +154,8 @@ struct bin_attribute {
100483 char *, loff_t, size_t);
100484 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
100485 struct vm_area_struct *vma);
100486-};
100487+} __do_const;
100488+typedef struct bin_attribute __no_const bin_attribute_no_const;
100489
100490 /**
100491 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
100492diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
100493index 387fa7d..3fcde6b 100644
100494--- a/include/linux/sysrq.h
100495+++ b/include/linux/sysrq.h
100496@@ -16,6 +16,7 @@
100497
100498 #include <linux/errno.h>
100499 #include <linux/types.h>
100500+#include <linux/compiler.h>
100501
100502 /* Possible values of bitmask for enabling sysrq functions */
100503 /* 0x0001 is reserved for enable everything */
100504@@ -33,7 +34,7 @@ struct sysrq_key_op {
100505 char *help_msg;
100506 char *action_msg;
100507 int enable_mask;
100508-};
100509+} __do_const;
100510
100511 #ifdef CONFIG_MAGIC_SYSRQ
100512
100513diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
100514index ff307b5..f1a4468 100644
100515--- a/include/linux/thread_info.h
100516+++ b/include/linux/thread_info.h
100517@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
100518 #error "no set_restore_sigmask() provided and default one won't work"
100519 #endif
100520
100521+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
100522+
100523+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
100524+{
100525+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
100526+}
100527+
100528 #endif /* __KERNEL__ */
100529
100530 #endif /* _LINUX_THREAD_INFO_H */
100531diff --git a/include/linux/tty.h b/include/linux/tty.h
100532index d76631f..de91e82 100644
100533--- a/include/linux/tty.h
100534+++ b/include/linux/tty.h
100535@@ -225,7 +225,7 @@ struct tty_port {
100536 const struct tty_port_operations *ops; /* Port operations */
100537 spinlock_t lock; /* Lock protecting tty field */
100538 int blocked_open; /* Waiting to open */
100539- int count; /* Usage count */
100540+ atomic_t count; /* Usage count */
100541 wait_queue_head_t open_wait; /* Open waiters */
100542 wait_queue_head_t close_wait; /* Close waiters */
100543 wait_queue_head_t delta_msr_wait; /* Modem status change */
100544@@ -313,7 +313,7 @@ struct tty_struct {
100545 /* If the tty has a pending do_SAK, queue it here - akpm */
100546 struct work_struct SAK_work;
100547 struct tty_port *port;
100548-};
100549+} __randomize_layout;
100550
100551 /* Each of a tty's open files has private_data pointing to tty_file_private */
100552 struct tty_file_private {
100553@@ -573,7 +573,7 @@ extern int tty_port_open(struct tty_port *port,
100554 struct tty_struct *tty, struct file *filp);
100555 static inline int tty_port_users(struct tty_port *port)
100556 {
100557- return port->count + port->blocked_open;
100558+ return atomic_read(&port->count) + port->blocked_open;
100559 }
100560
100561 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
100562diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
100563index 92e337c..f46757b 100644
100564--- a/include/linux/tty_driver.h
100565+++ b/include/linux/tty_driver.h
100566@@ -291,7 +291,7 @@ struct tty_operations {
100567 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
100568 #endif
100569 const struct file_operations *proc_fops;
100570-};
100571+} __do_const __randomize_layout;
100572
100573 struct tty_driver {
100574 int magic; /* magic number for this structure */
100575@@ -325,7 +325,7 @@ struct tty_driver {
100576
100577 const struct tty_operations *ops;
100578 struct list_head tty_drivers;
100579-};
100580+} __randomize_layout;
100581
100582 extern struct list_head tty_drivers;
100583
100584diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
100585index 00c9d68..bc0188b 100644
100586--- a/include/linux/tty_ldisc.h
100587+++ b/include/linux/tty_ldisc.h
100588@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
100589
100590 struct module *owner;
100591
100592- int refcount;
100593+ atomic_t refcount;
100594 };
100595
100596 struct tty_ldisc {
100597diff --git a/include/linux/types.h b/include/linux/types.h
100598index 8715287..1be77ee 100644
100599--- a/include/linux/types.h
100600+++ b/include/linux/types.h
100601@@ -176,10 +176,26 @@ typedef struct {
100602 int counter;
100603 } atomic_t;
100604
100605+#ifdef CONFIG_PAX_REFCOUNT
100606+typedef struct {
100607+ int counter;
100608+} atomic_unchecked_t;
100609+#else
100610+typedef atomic_t atomic_unchecked_t;
100611+#endif
100612+
100613 #ifdef CONFIG_64BIT
100614 typedef struct {
100615 long counter;
100616 } atomic64_t;
100617+
100618+#ifdef CONFIG_PAX_REFCOUNT
100619+typedef struct {
100620+ long counter;
100621+} atomic64_unchecked_t;
100622+#else
100623+typedef atomic64_t atomic64_unchecked_t;
100624+#endif
100625 #endif
100626
100627 struct list_head {
100628diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
100629index ecd3319..8a36ded 100644
100630--- a/include/linux/uaccess.h
100631+++ b/include/linux/uaccess.h
100632@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
100633 long ret; \
100634 mm_segment_t old_fs = get_fs(); \
100635 \
100636- set_fs(KERNEL_DS); \
100637 pagefault_disable(); \
100638- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
100639- pagefault_enable(); \
100640+ set_fs(KERNEL_DS); \
100641+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
100642 set_fs(old_fs); \
100643+ pagefault_enable(); \
100644 ret; \
100645 })
100646
100647diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
100648index 0383552..a0125dd 100644
100649--- a/include/linux/uidgid.h
100650+++ b/include/linux/uidgid.h
100651@@ -187,4 +187,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
100652
100653 #endif /* CONFIG_USER_NS */
100654
100655+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
100656+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
100657+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
100658+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
100659+
100660 #endif /* _LINUX_UIDGID_H */
100661diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
100662index 32c0e83..671eb35 100644
100663--- a/include/linux/uio_driver.h
100664+++ b/include/linux/uio_driver.h
100665@@ -67,7 +67,7 @@ struct uio_device {
100666 struct module *owner;
100667 struct device *dev;
100668 int minor;
100669- atomic_t event;
100670+ atomic_unchecked_t event;
100671 struct fasync_struct *async_queue;
100672 wait_queue_head_t wait;
100673 struct uio_info *info;
100674diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
100675index 99c1b4d..562e6f3 100644
100676--- a/include/linux/unaligned/access_ok.h
100677+++ b/include/linux/unaligned/access_ok.h
100678@@ -4,34 +4,34 @@
100679 #include <linux/kernel.h>
100680 #include <asm/byteorder.h>
100681
100682-static inline u16 get_unaligned_le16(const void *p)
100683+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
100684 {
100685- return le16_to_cpup((__le16 *)p);
100686+ return le16_to_cpup((const __le16 *)p);
100687 }
100688
100689-static inline u32 get_unaligned_le32(const void *p)
100690+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
100691 {
100692- return le32_to_cpup((__le32 *)p);
100693+ return le32_to_cpup((const __le32 *)p);
100694 }
100695
100696-static inline u64 get_unaligned_le64(const void *p)
100697+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
100698 {
100699- return le64_to_cpup((__le64 *)p);
100700+ return le64_to_cpup((const __le64 *)p);
100701 }
100702
100703-static inline u16 get_unaligned_be16(const void *p)
100704+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
100705 {
100706- return be16_to_cpup((__be16 *)p);
100707+ return be16_to_cpup((const __be16 *)p);
100708 }
100709
100710-static inline u32 get_unaligned_be32(const void *p)
100711+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
100712 {
100713- return be32_to_cpup((__be32 *)p);
100714+ return be32_to_cpup((const __be32 *)p);
100715 }
100716
100717-static inline u64 get_unaligned_be64(const void *p)
100718+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
100719 {
100720- return be64_to_cpup((__be64 *)p);
100721+ return be64_to_cpup((const __be64 *)p);
100722 }
100723
100724 static inline void put_unaligned_le16(u16 val, void *p)
100725diff --git a/include/linux/usb.h b/include/linux/usb.h
100726index 447fe29..9fc875f 100644
100727--- a/include/linux/usb.h
100728+++ b/include/linux/usb.h
100729@@ -592,7 +592,7 @@ struct usb_device {
100730 int maxchild;
100731
100732 u32 quirks;
100733- atomic_t urbnum;
100734+ atomic_unchecked_t urbnum;
100735
100736 unsigned long active_duration;
100737
100738@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
100739
100740 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
100741 __u8 request, __u8 requesttype, __u16 value, __u16 index,
100742- void *data, __u16 size, int timeout);
100743+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
100744 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
100745 void *data, int len, int *actual_length, int timeout);
100746 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
100747diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
100748index f06529c..dfeabd8 100644
100749--- a/include/linux/usb/renesas_usbhs.h
100750+++ b/include/linux/usb/renesas_usbhs.h
100751@@ -39,7 +39,7 @@ enum {
100752 */
100753 struct renesas_usbhs_driver_callback {
100754 int (*notify_hotplug)(struct platform_device *pdev);
100755-};
100756+} __no_const;
100757
100758 /*
100759 * callback functions for platform
100760diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
100761index 8297e5b..0dfae27 100644
100762--- a/include/linux/user_namespace.h
100763+++ b/include/linux/user_namespace.h
100764@@ -39,7 +39,7 @@ struct user_namespace {
100765 struct key *persistent_keyring_register;
100766 struct rw_semaphore persistent_keyring_register_sem;
100767 #endif
100768-};
100769+} __randomize_layout;
100770
100771 extern struct user_namespace init_user_ns;
100772
100773diff --git a/include/linux/utsname.h b/include/linux/utsname.h
100774index 5093f58..c103e58 100644
100775--- a/include/linux/utsname.h
100776+++ b/include/linux/utsname.h
100777@@ -25,7 +25,7 @@ struct uts_namespace {
100778 struct new_utsname name;
100779 struct user_namespace *user_ns;
100780 struct ns_common ns;
100781-};
100782+} __randomize_layout;
100783 extern struct uts_namespace init_uts_ns;
100784
100785 #ifdef CONFIG_UTS_NS
100786diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
100787index 6f8fbcf..4efc177 100644
100788--- a/include/linux/vermagic.h
100789+++ b/include/linux/vermagic.h
100790@@ -25,9 +25,42 @@
100791 #define MODULE_ARCH_VERMAGIC ""
100792 #endif
100793
100794+#ifdef CONFIG_PAX_REFCOUNT
100795+#define MODULE_PAX_REFCOUNT "REFCOUNT "
100796+#else
100797+#define MODULE_PAX_REFCOUNT ""
100798+#endif
100799+
100800+#ifdef CONSTIFY_PLUGIN
100801+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
100802+#else
100803+#define MODULE_CONSTIFY_PLUGIN ""
100804+#endif
100805+
100806+#ifdef STACKLEAK_PLUGIN
100807+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
100808+#else
100809+#define MODULE_STACKLEAK_PLUGIN ""
100810+#endif
100811+
100812+#ifdef RANDSTRUCT_PLUGIN
100813+#include <generated/randomize_layout_hash.h>
100814+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
100815+#else
100816+#define MODULE_RANDSTRUCT_PLUGIN
100817+#endif
100818+
100819+#ifdef CONFIG_GRKERNSEC
100820+#define MODULE_GRSEC "GRSEC "
100821+#else
100822+#define MODULE_GRSEC ""
100823+#endif
100824+
100825 #define VERMAGIC_STRING \
100826 UTS_RELEASE " " \
100827 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
100828 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
100829- MODULE_ARCH_VERMAGIC
100830+ MODULE_ARCH_VERMAGIC \
100831+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
100832+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
100833
100834diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
100835index b483abd..af305ad 100644
100836--- a/include/linux/vga_switcheroo.h
100837+++ b/include/linux/vga_switcheroo.h
100838@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
100839
100840 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
100841
100842-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
100843+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
100844 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
100845-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
100846+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
100847 #else
100848
100849 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
100850@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
100851
100852 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
100853
100854-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100855+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100856 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
100857-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100858+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100859
100860 #endif
100861 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
100862diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
100863index 0ec5983..cc61051 100644
100864--- a/include/linux/vmalloc.h
100865+++ b/include/linux/vmalloc.h
100866@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
100867 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
100868 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
100869 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
100870+
100871+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100872+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
100873+#endif
100874+
100875 /* bits [20..32] reserved for arch specific ioremap internals */
100876
100877 /*
100878@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
100879 unsigned long flags, pgprot_t prot);
100880 extern void vunmap(const void *addr);
100881
100882+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100883+extern void unmap_process_stacks(struct task_struct *task);
100884+#endif
100885+
100886 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
100887 unsigned long uaddr, void *kaddr,
100888 unsigned long size);
100889@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
100890
100891 /* for /dev/kmem */
100892 extern long vread(char *buf, char *addr, unsigned long count);
100893-extern long vwrite(char *buf, char *addr, unsigned long count);
100894+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
100895
100896 /*
100897 * Internals. Dont't use..
100898diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
100899index 82e7db7..f8ce3d0 100644
100900--- a/include/linux/vmstat.h
100901+++ b/include/linux/vmstat.h
100902@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
100903 /*
100904 * Zone based page accounting with per cpu differentials.
100905 */
100906-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100907+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100908
100909 static inline void zone_page_state_add(long x, struct zone *zone,
100910 enum zone_stat_item item)
100911 {
100912- atomic_long_add(x, &zone->vm_stat[item]);
100913- atomic_long_add(x, &vm_stat[item]);
100914+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
100915+ atomic_long_add_unchecked(x, &vm_stat[item]);
100916 }
100917
100918-static inline unsigned long global_page_state(enum zone_stat_item item)
100919+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
100920 {
100921- long x = atomic_long_read(&vm_stat[item]);
100922+ long x = atomic_long_read_unchecked(&vm_stat[item]);
100923 #ifdef CONFIG_SMP
100924 if (x < 0)
100925 x = 0;
100926@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
100927 return x;
100928 }
100929
100930-static inline unsigned long zone_page_state(struct zone *zone,
100931+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
100932 enum zone_stat_item item)
100933 {
100934- long x = atomic_long_read(&zone->vm_stat[item]);
100935+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100936 #ifdef CONFIG_SMP
100937 if (x < 0)
100938 x = 0;
100939@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
100940 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
100941 enum zone_stat_item item)
100942 {
100943- long x = atomic_long_read(&zone->vm_stat[item]);
100944+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100945
100946 #ifdef CONFIG_SMP
100947 int cpu;
100948@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
100949
100950 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
100951 {
100952- atomic_long_inc(&zone->vm_stat[item]);
100953- atomic_long_inc(&vm_stat[item]);
100954+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
100955+ atomic_long_inc_unchecked(&vm_stat[item]);
100956 }
100957
100958 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
100959 {
100960- atomic_long_dec(&zone->vm_stat[item]);
100961- atomic_long_dec(&vm_stat[item]);
100962+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
100963+ atomic_long_dec_unchecked(&vm_stat[item]);
100964 }
100965
100966 static inline void __inc_zone_page_state(struct page *page,
100967diff --git a/include/linux/xattr.h b/include/linux/xattr.h
100968index 91b0a68..0e9adf6 100644
100969--- a/include/linux/xattr.h
100970+++ b/include/linux/xattr.h
100971@@ -28,7 +28,7 @@ struct xattr_handler {
100972 size_t size, int handler_flags);
100973 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
100974 size_t size, int flags, int handler_flags);
100975-};
100976+} __do_const;
100977
100978 struct xattr {
100979 const char *name;
100980@@ -37,6 +37,9 @@ struct xattr {
100981 };
100982
100983 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
100984+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100985+ssize_t pax_getxattr(struct dentry *, void *, size_t);
100986+#endif
100987 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
100988 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
100989 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
100990diff --git a/include/linux/zlib.h b/include/linux/zlib.h
100991index 92dbbd3..13ab0b3 100644
100992--- a/include/linux/zlib.h
100993+++ b/include/linux/zlib.h
100994@@ -31,6 +31,7 @@
100995 #define _ZLIB_H
100996
100997 #include <linux/zconf.h>
100998+#include <linux/compiler.h>
100999
101000 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
101001 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
101002@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
101003
101004 /* basic functions */
101005
101006-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
101007+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
101008 /*
101009 Returns the number of bytes that needs to be allocated for a per-
101010 stream workspace with the specified parameters. A pointer to this
101011diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
101012index acbcd2f..c3abe84 100644
101013--- a/include/media/v4l2-dev.h
101014+++ b/include/media/v4l2-dev.h
101015@@ -74,7 +74,7 @@ struct v4l2_file_operations {
101016 int (*mmap) (struct file *, struct vm_area_struct *);
101017 int (*open) (struct file *);
101018 int (*release) (struct file *);
101019-};
101020+} __do_const;
101021
101022 /*
101023 * Newer version of video_device, handled by videodev2.c
101024diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
101025index 9c58157..d86ebf5 100644
101026--- a/include/media/v4l2-device.h
101027+++ b/include/media/v4l2-device.h
101028@@ -93,7 +93,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
101029 this function returns 0. If the name ends with a digit (e.g. cx18),
101030 then the name will be set to cx18-0 since cx180 looks really odd. */
101031 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
101032- atomic_t *instance);
101033+ atomic_unchecked_t *instance);
101034
101035 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
101036 Since the parent disappears this ensures that v4l2_dev doesn't have an
101037diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
101038index 5122b5e..598b440 100644
101039--- a/include/net/9p/transport.h
101040+++ b/include/net/9p/transport.h
101041@@ -62,7 +62,7 @@ struct p9_trans_module {
101042 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
101043 int (*zc_request)(struct p9_client *, struct p9_req_t *,
101044 struct iov_iter *, struct iov_iter *, int , int, int);
101045-};
101046+} __do_const;
101047
101048 void v9fs_register_trans(struct p9_trans_module *m);
101049 void v9fs_unregister_trans(struct p9_trans_module *m);
101050diff --git a/include/net/af_unix.h b/include/net/af_unix.h
101051index a175ba4..196eb8242 100644
101052--- a/include/net/af_unix.h
101053+++ b/include/net/af_unix.h
101054@@ -36,7 +36,7 @@ struct unix_skb_parms {
101055 u32 secid; /* Security ID */
101056 #endif
101057 u32 consumed;
101058-};
101059+} __randomize_layout;
101060
101061 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
101062 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
101063diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
101064index 2239a37..a83461f 100644
101065--- a/include/net/bluetooth/l2cap.h
101066+++ b/include/net/bluetooth/l2cap.h
101067@@ -609,7 +609,7 @@ struct l2cap_ops {
101068 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
101069 unsigned long hdr_len,
101070 unsigned long len, int nb);
101071-};
101072+} __do_const;
101073
101074 struct l2cap_conn {
101075 struct hci_conn *hcon;
101076diff --git a/include/net/bonding.h b/include/net/bonding.h
101077index 78ed135..2f53667 100644
101078--- a/include/net/bonding.h
101079+++ b/include/net/bonding.h
101080@@ -658,7 +658,7 @@ extern struct rtnl_link_ops bond_link_ops;
101081
101082 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
101083 {
101084- atomic_long_inc(&dev->tx_dropped);
101085+ atomic_long_inc_unchecked(&dev->tx_dropped);
101086 dev_kfree_skb_any(skb);
101087 }
101088
101089diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
101090index f2ae33d..c457cf0 100644
101091--- a/include/net/caif/cfctrl.h
101092+++ b/include/net/caif/cfctrl.h
101093@@ -52,7 +52,7 @@ struct cfctrl_rsp {
101094 void (*radioset_rsp)(void);
101095 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
101096 struct cflayer *client_layer);
101097-};
101098+} __no_const;
101099
101100 /* Link Setup Parameters for CAIF-Links. */
101101 struct cfctrl_link_param {
101102@@ -101,8 +101,8 @@ struct cfctrl_request_info {
101103 struct cfctrl {
101104 struct cfsrvl serv;
101105 struct cfctrl_rsp res;
101106- atomic_t req_seq_no;
101107- atomic_t rsp_seq_no;
101108+ atomic_unchecked_t req_seq_no;
101109+ atomic_unchecked_t rsp_seq_no;
101110 struct list_head list;
101111 /* Protects from simultaneous access to first_req list */
101112 spinlock_t info_list_lock;
101113diff --git a/include/net/flow.h b/include/net/flow.h
101114index 8109a15..504466d 100644
101115--- a/include/net/flow.h
101116+++ b/include/net/flow.h
101117@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
101118
101119 void flow_cache_flush(struct net *net);
101120 void flow_cache_flush_deferred(struct net *net);
101121-extern atomic_t flow_cache_genid;
101122+extern atomic_unchecked_t flow_cache_genid;
101123
101124 #endif
101125diff --git a/include/net/genetlink.h b/include/net/genetlink.h
101126index a9af1cc..1f3fa7b 100644
101127--- a/include/net/genetlink.h
101128+++ b/include/net/genetlink.h
101129@@ -128,7 +128,7 @@ struct genl_ops {
101130 u8 cmd;
101131 u8 internal_flags;
101132 u8 flags;
101133-};
101134+} __do_const;
101135
101136 int __genl_register_family(struct genl_family *family);
101137
101138diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
101139index 0f712c0..cd762c4 100644
101140--- a/include/net/gro_cells.h
101141+++ b/include/net/gro_cells.h
101142@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
101143 cell = this_cpu_ptr(gcells->cells);
101144
101145 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
101146- atomic_long_inc(&dev->rx_dropped);
101147+ atomic_long_inc_unchecked(&dev->rx_dropped);
101148 kfree_skb(skb);
101149 return;
101150 }
101151diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
101152index 0320bbb..938789c 100644
101153--- a/include/net/inet_connection_sock.h
101154+++ b/include/net/inet_connection_sock.h
101155@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
101156 int (*bind_conflict)(const struct sock *sk,
101157 const struct inet_bind_bucket *tb, bool relax);
101158 void (*mtu_reduced)(struct sock *sk);
101159-};
101160+} __do_const;
101161
101162 /** inet_connection_sock - INET connection oriented sock
101163 *
101164diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
101165index d5332dd..10a5c3c 100644
101166--- a/include/net/inetpeer.h
101167+++ b/include/net/inetpeer.h
101168@@ -48,7 +48,7 @@ struct inet_peer {
101169 */
101170 union {
101171 struct {
101172- atomic_t rid; /* Frag reception counter */
101173+ atomic_unchecked_t rid; /* Frag reception counter */
101174 };
101175 struct rcu_head rcu;
101176 struct inet_peer *gc_next;
101177diff --git a/include/net/ip.h b/include/net/ip.h
101178index d14af7e..52816c2 100644
101179--- a/include/net/ip.h
101180+++ b/include/net/ip.h
101181@@ -318,7 +318,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
101182 }
101183 }
101184
101185-u32 ip_idents_reserve(u32 hash, int segs);
101186+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
101187 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
101188
101189 static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
101190diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
101191index 54271ed..eb7e0e6 100644
101192--- a/include/net/ip_fib.h
101193+++ b/include/net/ip_fib.h
101194@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
101195
101196 #define FIB_RES_SADDR(net, res) \
101197 ((FIB_RES_NH(res).nh_saddr_genid == \
101198- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
101199+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
101200 FIB_RES_NH(res).nh_saddr : \
101201 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
101202 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
101203diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
101204index 4e3731e..a242e28 100644
101205--- a/include/net/ip_vs.h
101206+++ b/include/net/ip_vs.h
101207@@ -551,7 +551,7 @@ struct ip_vs_conn {
101208 struct ip_vs_conn *control; /* Master control connection */
101209 atomic_t n_control; /* Number of controlled ones */
101210 struct ip_vs_dest *dest; /* real server */
101211- atomic_t in_pkts; /* incoming packet counter */
101212+ atomic_unchecked_t in_pkts; /* incoming packet counter */
101213
101214 /* Packet transmitter for different forwarding methods. If it
101215 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
101216@@ -699,7 +699,7 @@ struct ip_vs_dest {
101217 __be16 port; /* port number of the server */
101218 union nf_inet_addr addr; /* IP address of the server */
101219 volatile unsigned int flags; /* dest status flags */
101220- atomic_t conn_flags; /* flags to copy to conn */
101221+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
101222 atomic_t weight; /* server weight */
101223
101224 atomic_t refcnt; /* reference counter */
101225@@ -946,11 +946,11 @@ struct netns_ipvs {
101226 /* ip_vs_lblc */
101227 int sysctl_lblc_expiration;
101228 struct ctl_table_header *lblc_ctl_header;
101229- struct ctl_table *lblc_ctl_table;
101230+ ctl_table_no_const *lblc_ctl_table;
101231 /* ip_vs_lblcr */
101232 int sysctl_lblcr_expiration;
101233 struct ctl_table_header *lblcr_ctl_header;
101234- struct ctl_table *lblcr_ctl_table;
101235+ ctl_table_no_const *lblcr_ctl_table;
101236 /* ip_vs_est */
101237 struct list_head est_list; /* estimator list */
101238 spinlock_t est_lock;
101239diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
101240index 8d4f588..2e37ad2 100644
101241--- a/include/net/irda/ircomm_tty.h
101242+++ b/include/net/irda/ircomm_tty.h
101243@@ -33,6 +33,7 @@
101244 #include <linux/termios.h>
101245 #include <linux/timer.h>
101246 #include <linux/tty.h> /* struct tty_struct */
101247+#include <asm/local.h>
101248
101249 #include <net/irda/irias_object.h>
101250 #include <net/irda/ircomm_core.h>
101251diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
101252index 714cc9a..ea05f3e 100644
101253--- a/include/net/iucv/af_iucv.h
101254+++ b/include/net/iucv/af_iucv.h
101255@@ -149,7 +149,7 @@ struct iucv_skb_cb {
101256 struct iucv_sock_list {
101257 struct hlist_head head;
101258 rwlock_t lock;
101259- atomic_t autobind_name;
101260+ atomic_unchecked_t autobind_name;
101261 };
101262
101263 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
101264diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
101265index f3be818..bf46196 100644
101266--- a/include/net/llc_c_ac.h
101267+++ b/include/net/llc_c_ac.h
101268@@ -87,7 +87,7 @@
101269 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
101270 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
101271
101272-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101273+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101274
101275 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
101276 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
101277diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
101278index 3948cf1..83b28c4 100644
101279--- a/include/net/llc_c_ev.h
101280+++ b/include/net/llc_c_ev.h
101281@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
101282 return (struct llc_conn_state_ev *)skb->cb;
101283 }
101284
101285-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101286-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101287+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101288+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101289
101290 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
101291 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
101292diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
101293index 48f3f89..0e92c50 100644
101294--- a/include/net/llc_c_st.h
101295+++ b/include/net/llc_c_st.h
101296@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
101297 u8 next_state;
101298 const llc_conn_ev_qfyr_t *ev_qualifiers;
101299 const llc_conn_action_t *ev_actions;
101300-};
101301+} __do_const;
101302
101303 struct llc_conn_state {
101304 u8 current_state;
101305diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
101306index a61b98c..aade1eb 100644
101307--- a/include/net/llc_s_ac.h
101308+++ b/include/net/llc_s_ac.h
101309@@ -23,7 +23,7 @@
101310 #define SAP_ACT_TEST_IND 9
101311
101312 /* All action functions must look like this */
101313-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101314+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101315
101316 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
101317 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
101318diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
101319index c4359e2..76dbc4a 100644
101320--- a/include/net/llc_s_st.h
101321+++ b/include/net/llc_s_st.h
101322@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
101323 llc_sap_ev_t ev;
101324 u8 next_state;
101325 const llc_sap_action_t *ev_actions;
101326-};
101327+} __do_const;
101328
101329 struct llc_sap_state {
101330 u8 curr_state;
101331diff --git a/include/net/mac80211.h b/include/net/mac80211.h
101332index fc57f6b..9c1fdb2 100644
101333--- a/include/net/mac80211.h
101334+++ b/include/net/mac80211.h
101335@@ -5104,7 +5104,7 @@ struct rate_control_ops {
101336 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
101337
101338 u32 (*get_expected_throughput)(void *priv_sta);
101339-};
101340+} __do_const;
101341
101342 static inline int rate_supported(struct ieee80211_sta *sta,
101343 enum ieee80211_band band,
101344diff --git a/include/net/neighbour.h b/include/net/neighbour.h
101345index bd33e66..6508d00 100644
101346--- a/include/net/neighbour.h
101347+++ b/include/net/neighbour.h
101348@@ -162,7 +162,7 @@ struct neigh_ops {
101349 void (*error_report)(struct neighbour *, struct sk_buff *);
101350 int (*output)(struct neighbour *, struct sk_buff *);
101351 int (*connected_output)(struct neighbour *, struct sk_buff *);
101352-};
101353+} __do_const;
101354
101355 struct pneigh_entry {
101356 struct pneigh_entry *next;
101357@@ -216,7 +216,7 @@ struct neigh_table {
101358 struct neigh_statistics __percpu *stats;
101359 struct neigh_hash_table __rcu *nht;
101360 struct pneigh_entry **phash_buckets;
101361-};
101362+} __randomize_layout;
101363
101364 enum {
101365 NEIGH_ARP_TABLE = 0,
101366diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
101367index f733656..54053db 100644
101368--- a/include/net/net_namespace.h
101369+++ b/include/net/net_namespace.h
101370@@ -132,8 +132,8 @@ struct net {
101371 struct netns_mpls mpls;
101372 #endif
101373 struct sock *diag_nlsk;
101374- atomic_t fnhe_genid;
101375-};
101376+ atomic_unchecked_t fnhe_genid;
101377+} __randomize_layout;
101378
101379 #include <linux/seq_file_net.h>
101380
101381@@ -268,7 +268,11 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
101382 #define __net_init __init
101383 #define __net_exit __exit_refok
101384 #define __net_initdata __initdata
101385+#ifdef CONSTIFY_PLUGIN
101386 #define __net_initconst __initconst
101387+#else
101388+#define __net_initconst __initdata
101389+#endif
101390 #endif
101391
101392 int peernet2id(struct net *net, struct net *peer);
101393@@ -281,7 +285,7 @@ struct pernet_operations {
101394 void (*exit_batch)(struct list_head *net_exit_list);
101395 int *id;
101396 size_t size;
101397-};
101398+} __do_const;
101399
101400 /*
101401 * Use these carefully. If you implement a network device and it
101402@@ -329,12 +333,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
101403
101404 static inline int rt_genid_ipv4(struct net *net)
101405 {
101406- return atomic_read(&net->ipv4.rt_genid);
101407+ return atomic_read_unchecked(&net->ipv4.rt_genid);
101408 }
101409
101410 static inline void rt_genid_bump_ipv4(struct net *net)
101411 {
101412- atomic_inc(&net->ipv4.rt_genid);
101413+ atomic_inc_unchecked(&net->ipv4.rt_genid);
101414 }
101415
101416 extern void (*__fib6_flush_trees)(struct net *net);
101417@@ -361,12 +365,12 @@ static inline void rt_genid_bump_all(struct net *net)
101418
101419 static inline int fnhe_genid(struct net *net)
101420 {
101421- return atomic_read(&net->fnhe_genid);
101422+ return atomic_read_unchecked(&net->fnhe_genid);
101423 }
101424
101425 static inline void fnhe_genid_bump(struct net *net)
101426 {
101427- atomic_inc(&net->fnhe_genid);
101428+ atomic_inc_unchecked(&net->fnhe_genid);
101429 }
101430
101431 #endif /* __NET_NET_NAMESPACE_H */
101432diff --git a/include/net/netlink.h b/include/net/netlink.h
101433index 2a5dbcc..8243656 100644
101434--- a/include/net/netlink.h
101435+++ b/include/net/netlink.h
101436@@ -521,7 +521,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
101437 {
101438 if (mark) {
101439 WARN_ON((unsigned char *) mark < skb->data);
101440- skb_trim(skb, (unsigned char *) mark - skb->data);
101441+ skb_trim(skb, (const unsigned char *) mark - skb->data);
101442 }
101443 }
101444
101445diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
101446index 29d6a94..235d3d84 100644
101447--- a/include/net/netns/conntrack.h
101448+++ b/include/net/netns/conntrack.h
101449@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
101450 struct nf_proto_net {
101451 #ifdef CONFIG_SYSCTL
101452 struct ctl_table_header *ctl_table_header;
101453- struct ctl_table *ctl_table;
101454+ ctl_table_no_const *ctl_table;
101455 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
101456 struct ctl_table_header *ctl_compat_header;
101457- struct ctl_table *ctl_compat_table;
101458+ ctl_table_no_const *ctl_compat_table;
101459 #endif
101460 #endif
101461 unsigned int users;
101462@@ -60,7 +60,7 @@ struct nf_ip_net {
101463 struct nf_icmp_net icmpv6;
101464 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
101465 struct ctl_table_header *ctl_table_header;
101466- struct ctl_table *ctl_table;
101467+ ctl_table_no_const *ctl_table;
101468 #endif
101469 };
101470
101471diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
101472index 614a49b..0b94386 100644
101473--- a/include/net/netns/ipv4.h
101474+++ b/include/net/netns/ipv4.h
101475@@ -90,7 +90,7 @@ struct netns_ipv4 {
101476
101477 struct ping_group_range ping_group_range;
101478
101479- atomic_t dev_addr_genid;
101480+ atomic_unchecked_t dev_addr_genid;
101481
101482 #ifdef CONFIG_SYSCTL
101483 unsigned long *sysctl_local_reserved_ports;
101484@@ -104,6 +104,6 @@ struct netns_ipv4 {
101485 struct fib_rules_ops *mr_rules_ops;
101486 #endif
101487 #endif
101488- atomic_t rt_genid;
101489+ atomic_unchecked_t rt_genid;
101490 };
101491 #endif
101492diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
101493index d2527bf..2c802d5 100644
101494--- a/include/net/netns/ipv6.h
101495+++ b/include/net/netns/ipv6.h
101496@@ -78,8 +78,8 @@ struct netns_ipv6 {
101497 struct fib_rules_ops *mr6_rules_ops;
101498 #endif
101499 #endif
101500- atomic_t dev_addr_genid;
101501- atomic_t fib6_sernum;
101502+ atomic_unchecked_t dev_addr_genid;
101503+ atomic_unchecked_t fib6_sernum;
101504 };
101505
101506 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
101507diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
101508index 730d82a..045f2c4 100644
101509--- a/include/net/netns/xfrm.h
101510+++ b/include/net/netns/xfrm.h
101511@@ -78,7 +78,7 @@ struct netns_xfrm {
101512
101513 /* flow cache part */
101514 struct flow_cache flow_cache_global;
101515- atomic_t flow_cache_genid;
101516+ atomic_unchecked_t flow_cache_genid;
101517 struct list_head flow_cache_gc_list;
101518 spinlock_t flow_cache_gc_lock;
101519 struct work_struct flow_cache_gc_work;
101520diff --git a/include/net/ping.h b/include/net/ping.h
101521index ac80cb4..ec1ed09 100644
101522--- a/include/net/ping.h
101523+++ b/include/net/ping.h
101524@@ -54,7 +54,7 @@ struct ping_iter_state {
101525
101526 extern struct proto ping_prot;
101527 #if IS_ENABLED(CONFIG_IPV6)
101528-extern struct pingv6_ops pingv6_ops;
101529+extern struct pingv6_ops *pingv6_ops;
101530 #endif
101531
101532 struct pingfakehdr {
101533diff --git a/include/net/protocol.h b/include/net/protocol.h
101534index d6fcc1f..ca277058 100644
101535--- a/include/net/protocol.h
101536+++ b/include/net/protocol.h
101537@@ -49,7 +49,7 @@ struct net_protocol {
101538 * socket lookup?
101539 */
101540 icmp_strict_tag_validation:1;
101541-};
101542+} __do_const;
101543
101544 #if IS_ENABLED(CONFIG_IPV6)
101545 struct inet6_protocol {
101546@@ -62,7 +62,7 @@ struct inet6_protocol {
101547 u8 type, u8 code, int offset,
101548 __be32 info);
101549 unsigned int flags; /* INET6_PROTO_xxx */
101550-};
101551+} __do_const;
101552
101553 #define INET6_PROTO_NOPOLICY 0x1
101554 #define INET6_PROTO_FINAL 0x2
101555diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
101556index 343d922..7959cde 100644
101557--- a/include/net/rtnetlink.h
101558+++ b/include/net/rtnetlink.h
101559@@ -95,7 +95,7 @@ struct rtnl_link_ops {
101560 const struct net_device *dev,
101561 const struct net_device *slave_dev);
101562 struct net *(*get_link_net)(const struct net_device *dev);
101563-};
101564+} __do_const;
101565
101566 int __rtnl_link_register(struct rtnl_link_ops *ops);
101567 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
101568diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
101569index 4a5b9a3..ca27d73 100644
101570--- a/include/net/sctp/checksum.h
101571+++ b/include/net/sctp/checksum.h
101572@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
101573 unsigned int offset)
101574 {
101575 struct sctphdr *sh = sctp_hdr(skb);
101576- __le32 ret, old = sh->checksum;
101577- const struct skb_checksum_ops ops = {
101578+ __le32 ret, old = sh->checksum;
101579+ static const struct skb_checksum_ops ops = {
101580 .update = sctp_csum_update,
101581 .combine = sctp_csum_combine,
101582 };
101583diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
101584index 487ef34..d457f98 100644
101585--- a/include/net/sctp/sm.h
101586+++ b/include/net/sctp/sm.h
101587@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
101588 typedef struct {
101589 sctp_state_fn_t *fn;
101590 const char *name;
101591-} sctp_sm_table_entry_t;
101592+} __do_const sctp_sm_table_entry_t;
101593
101594 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
101595 * currently in use.
101596@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
101597 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
101598
101599 /* Extern declarations for major data structures. */
101600-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101601+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101602
101603
101604 /* Get the size of a DATA chunk payload. */
101605diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
101606index 495c87e..5b327ff 100644
101607--- a/include/net/sctp/structs.h
101608+++ b/include/net/sctp/structs.h
101609@@ -513,7 +513,7 @@ struct sctp_pf {
101610 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
101611 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
101612 struct sctp_af *af;
101613-};
101614+} __do_const;
101615
101616
101617 /* Structure to track chunk fragments that have been acked, but peer
101618diff --git a/include/net/sock.h b/include/net/sock.h
101619index 3a4898e..67456ac 100644
101620--- a/include/net/sock.h
101621+++ b/include/net/sock.h
101622@@ -363,7 +363,7 @@ struct sock {
101623 unsigned int sk_napi_id;
101624 unsigned int sk_ll_usec;
101625 #endif
101626- atomic_t sk_drops;
101627+ atomic_unchecked_t sk_drops;
101628 int sk_rcvbuf;
101629
101630 struct sk_filter __rcu *sk_filter;
101631@@ -1039,7 +1039,7 @@ struct proto {
101632 void (*destroy_cgroup)(struct mem_cgroup *memcg);
101633 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
101634 #endif
101635-};
101636+} __randomize_layout;
101637
101638 /*
101639 * Bits in struct cg_proto.flags
101640@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
101641 page_counter_uncharge(&prot->memory_allocated, amt);
101642 }
101643
101644-static inline long
101645+static inline long __intentional_overflow(-1)
101646 sk_memory_allocated(const struct sock *sk)
101647 {
101648 struct proto *prot = sk->sk_prot;
101649@@ -1777,7 +1777,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
101650 }
101651
101652 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
101653- struct iov_iter *from, char *to,
101654+ struct iov_iter *from, unsigned char *to,
101655 int copy, int offset)
101656 {
101657 if (skb->ip_summed == CHECKSUM_NONE) {
101658@@ -2024,7 +2024,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
101659 }
101660 }
101661
101662-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101663+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101664
101665 /**
101666 * sk_page_frag - return an appropriate page_frag
101667@@ -2099,7 +2099,7 @@ struct sock_skb_cb {
101668 static inline void
101669 sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
101670 {
101671- SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
101672+ SOCK_SKB_CB(skb)->dropcount = atomic_read_unchecked(&sk->sk_drops);
101673 }
101674
101675 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
101676diff --git a/include/net/tcp.h b/include/net/tcp.h
101677index 6d204f3..d5a8ff0 100644
101678--- a/include/net/tcp.h
101679+++ b/include/net/tcp.h
101680@@ -523,7 +523,7 @@ void tcp_retransmit_timer(struct sock *sk);
101681 void tcp_xmit_retransmit_queue(struct sock *);
101682 void tcp_simple_retransmit(struct sock *);
101683 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
101684-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101685+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101686
101687 void tcp_send_probe0(struct sock *);
101688 void tcp_send_partial(struct sock *);
101689@@ -699,8 +699,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
101690 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
101691 */
101692 struct tcp_skb_cb {
101693- __u32 seq; /* Starting sequence number */
101694- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
101695+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
101696+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
101697 union {
101698 /* Note : tcp_tw_isn is used in input path only
101699 * (isn chosen by tcp_timewait_state_process())
101700@@ -725,7 +725,7 @@ struct tcp_skb_cb {
101701
101702 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
101703 /* 1 byte hole */
101704- __u32 ack_seq; /* Sequence number ACK'd */
101705+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
101706 union {
101707 struct inet_skb_parm h4;
101708 #if IS_ENABLED(CONFIG_IPV6)
101709diff --git a/include/net/xfrm.h b/include/net/xfrm.h
101710index 36ac102..6e8b34b 100644
101711--- a/include/net/xfrm.h
101712+++ b/include/net/xfrm.h
101713@@ -283,7 +283,6 @@ struct xfrm_dst;
101714 struct xfrm_policy_afinfo {
101715 unsigned short family;
101716 struct dst_ops *dst_ops;
101717- void (*garbage_collect)(struct net *net);
101718 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
101719 const xfrm_address_t *saddr,
101720 const xfrm_address_t *daddr);
101721@@ -301,7 +300,7 @@ struct xfrm_policy_afinfo {
101722 struct net_device *dev,
101723 const struct flowi *fl);
101724 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
101725-};
101726+} __do_const;
101727
101728 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
101729 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
101730@@ -340,7 +339,7 @@ struct xfrm_state_afinfo {
101731 int (*transport_finish)(struct sk_buff *skb,
101732 int async);
101733 void (*local_error)(struct sk_buff *skb, u32 mtu);
101734-};
101735+} __do_const;
101736
101737 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
101738 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
101739@@ -435,7 +434,7 @@ struct xfrm_mode {
101740 struct module *owner;
101741 unsigned int encap;
101742 int flags;
101743-};
101744+} __do_const;
101745
101746 /* Flags for xfrm_mode. */
101747 enum {
101748@@ -530,7 +529,7 @@ struct xfrm_policy {
101749 struct timer_list timer;
101750
101751 struct flow_cache_object flo;
101752- atomic_t genid;
101753+ atomic_unchecked_t genid;
101754 u32 priority;
101755 u32 index;
101756 struct xfrm_mark mark;
101757@@ -1163,6 +1162,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
101758 }
101759
101760 void xfrm_garbage_collect(struct net *net);
101761+void xfrm_garbage_collect_deferred(struct net *net);
101762
101763 #else
101764
101765@@ -1201,6 +1201,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
101766 static inline void xfrm_garbage_collect(struct net *net)
101767 {
101768 }
101769+static inline void xfrm_garbage_collect_deferred(struct net *net)
101770+{
101771+}
101772 #endif
101773
101774 static __inline__
101775diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
101776index 1017e0b..227aa4d 100644
101777--- a/include/rdma/iw_cm.h
101778+++ b/include/rdma/iw_cm.h
101779@@ -122,7 +122,7 @@ struct iw_cm_verbs {
101780 int backlog);
101781
101782 int (*destroy_listen)(struct iw_cm_id *cm_id);
101783-};
101784+} __no_const;
101785
101786 /**
101787 * iw_create_cm_id - Create an IW CM identifier.
101788diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
101789index 93d14da..734b3d8 100644
101790--- a/include/scsi/libfc.h
101791+++ b/include/scsi/libfc.h
101792@@ -771,6 +771,7 @@ struct libfc_function_template {
101793 */
101794 void (*disc_stop_final) (struct fc_lport *);
101795 };
101796+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
101797
101798 /**
101799 * struct fc_disc - Discovery context
101800@@ -875,7 +876,7 @@ struct fc_lport {
101801 struct fc_vport *vport;
101802
101803 /* Operational Information */
101804- struct libfc_function_template tt;
101805+ libfc_function_template_no_const tt;
101806 u8 link_up;
101807 u8 qfull;
101808 enum fc_lport_state state;
101809diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
101810index a4c9336..d6f8f34 100644
101811--- a/include/scsi/scsi_device.h
101812+++ b/include/scsi/scsi_device.h
101813@@ -185,9 +185,9 @@ struct scsi_device {
101814 unsigned int max_device_blocked; /* what device_blocked counts down from */
101815 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
101816
101817- atomic_t iorequest_cnt;
101818- atomic_t iodone_cnt;
101819- atomic_t ioerr_cnt;
101820+ atomic_unchecked_t iorequest_cnt;
101821+ atomic_unchecked_t iodone_cnt;
101822+ atomic_unchecked_t ioerr_cnt;
101823
101824 struct device sdev_gendev,
101825 sdev_dev;
101826diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
101827index 891a658..fcd68df 100644
101828--- a/include/scsi/scsi_driver.h
101829+++ b/include/scsi/scsi_driver.h
101830@@ -14,7 +14,7 @@ struct scsi_driver {
101831 void (*rescan)(struct device *);
101832 int (*init_command)(struct scsi_cmnd *);
101833 void (*uninit_command)(struct scsi_cmnd *);
101834- int (*done)(struct scsi_cmnd *);
101835+ unsigned int (*done)(struct scsi_cmnd *);
101836 int (*eh_action)(struct scsi_cmnd *, int);
101837 };
101838 #define to_scsi_driver(drv) \
101839diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
101840index 784bc2c..855a04c 100644
101841--- a/include/scsi/scsi_transport_fc.h
101842+++ b/include/scsi/scsi_transport_fc.h
101843@@ -757,7 +757,8 @@ struct fc_function_template {
101844 unsigned long show_host_system_hostname:1;
101845
101846 unsigned long disable_target_scan:1;
101847-};
101848+} __do_const;
101849+typedef struct fc_function_template __no_const fc_function_template_no_const;
101850
101851
101852 /**
101853diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
101854index fa1d055..3647940 100644
101855--- a/include/sound/compress_driver.h
101856+++ b/include/sound/compress_driver.h
101857@@ -130,7 +130,7 @@ struct snd_compr_ops {
101858 struct snd_compr_caps *caps);
101859 int (*get_codec_caps) (struct snd_compr_stream *stream,
101860 struct snd_compr_codec_caps *codec);
101861-};
101862+} __no_const;
101863
101864 /**
101865 * struct snd_compr: Compressed device
101866diff --git a/include/sound/soc.h b/include/sound/soc.h
101867index f6226914..e919a2e 100644
101868--- a/include/sound/soc.h
101869+++ b/include/sound/soc.h
101870@@ -870,7 +870,7 @@ struct snd_soc_codec_driver {
101871 enum snd_soc_dapm_type, int);
101872
101873 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
101874-};
101875+} __do_const;
101876
101877 /* SoC platform interface */
101878 struct snd_soc_platform_driver {
101879@@ -897,7 +897,7 @@ struct snd_soc_platform_driver {
101880 const struct snd_compr_ops *compr_ops;
101881
101882 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
101883-};
101884+} __do_const;
101885
101886 struct snd_soc_dai_link_component {
101887 const char *name;
101888diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
101889index 480e9f8..2d59c93 100644
101890--- a/include/target/target_core_base.h
101891+++ b/include/target/target_core_base.h
101892@@ -767,7 +767,7 @@ struct se_device {
101893 atomic_long_t write_bytes;
101894 /* Active commands on this virtual SE device */
101895 atomic_t simple_cmds;
101896- atomic_t dev_ordered_id;
101897+ atomic_unchecked_t dev_ordered_id;
101898 atomic_t dev_ordered_sync;
101899 atomic_t dev_qf_count;
101900 int export_count;
101901diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
101902new file mode 100644
101903index 0000000..fb634b7
101904--- /dev/null
101905+++ b/include/trace/events/fs.h
101906@@ -0,0 +1,53 @@
101907+#undef TRACE_SYSTEM
101908+#define TRACE_SYSTEM fs
101909+
101910+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
101911+#define _TRACE_FS_H
101912+
101913+#include <linux/fs.h>
101914+#include <linux/tracepoint.h>
101915+
101916+TRACE_EVENT(do_sys_open,
101917+
101918+ TP_PROTO(const char *filename, int flags, int mode),
101919+
101920+ TP_ARGS(filename, flags, mode),
101921+
101922+ TP_STRUCT__entry(
101923+ __string( filename, filename )
101924+ __field( int, flags )
101925+ __field( int, mode )
101926+ ),
101927+
101928+ TP_fast_assign(
101929+ __assign_str(filename, filename);
101930+ __entry->flags = flags;
101931+ __entry->mode = mode;
101932+ ),
101933+
101934+ TP_printk("\"%s\" %x %o",
101935+ __get_str(filename), __entry->flags, __entry->mode)
101936+);
101937+
101938+TRACE_EVENT(open_exec,
101939+
101940+ TP_PROTO(const char *filename),
101941+
101942+ TP_ARGS(filename),
101943+
101944+ TP_STRUCT__entry(
101945+ __string( filename, filename )
101946+ ),
101947+
101948+ TP_fast_assign(
101949+ __assign_str(filename, filename);
101950+ ),
101951+
101952+ TP_printk("\"%s\"",
101953+ __get_str(filename))
101954+);
101955+
101956+#endif /* _TRACE_FS_H */
101957+
101958+/* This part must be outside protection */
101959+#include <trace/define_trace.h>
101960diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
101961index ff8f6c0..6b6bae3 100644
101962--- a/include/trace/events/irq.h
101963+++ b/include/trace/events/irq.h
101964@@ -51,7 +51,7 @@ SOFTIRQ_NAME_LIST
101965 */
101966 TRACE_EVENT(irq_handler_entry,
101967
101968- TP_PROTO(int irq, struct irqaction *action),
101969+ TP_PROTO(int irq, const struct irqaction *action),
101970
101971 TP_ARGS(irq, action),
101972
101973@@ -81,7 +81,7 @@ TRACE_EVENT(irq_handler_entry,
101974 */
101975 TRACE_EVENT(irq_handler_exit,
101976
101977- TP_PROTO(int irq, struct irqaction *action, int ret),
101978+ TP_PROTO(int irq, const struct irqaction *action, int ret),
101979
101980 TP_ARGS(irq, action, ret),
101981
101982diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
101983index 551b673..9c680df 100644
101984--- a/include/uapi/drm/i915_drm.h
101985+++ b/include/uapi/drm/i915_drm.h
101986@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {
101987 #define I915_PARAM_REVISION 32
101988 #define I915_PARAM_SUBSLICE_TOTAL 33
101989 #define I915_PARAM_EU_TOTAL 34
101990+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
101991
101992 typedef struct drm_i915_getparam {
101993 int param;
101994diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
101995index 7caf44c..23c6f27 100644
101996--- a/include/uapi/linux/a.out.h
101997+++ b/include/uapi/linux/a.out.h
101998@@ -39,6 +39,14 @@ enum machine_type {
101999 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
102000 };
102001
102002+/* Constants for the N_FLAGS field */
102003+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102004+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
102005+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
102006+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
102007+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102008+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102009+
102010 #if !defined (N_MAGIC)
102011 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
102012 #endif
102013diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
102014index 22b6ad3..aeba37e 100644
102015--- a/include/uapi/linux/bcache.h
102016+++ b/include/uapi/linux/bcache.h
102017@@ -5,6 +5,7 @@
102018 * Bcache on disk data structures
102019 */
102020
102021+#include <linux/compiler.h>
102022 #include <asm/types.h>
102023
102024 #define BITMASK(name, type, field, offset, size) \
102025@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
102026 /* Btree keys - all units are in sectors */
102027
102028 struct bkey {
102029- __u64 high;
102030- __u64 low;
102031+ __u64 high __intentional_overflow(-1);
102032+ __u64 low __intentional_overflow(-1);
102033 __u64 ptr[];
102034 };
102035
102036diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
102037index d876736..ccce5c0 100644
102038--- a/include/uapi/linux/byteorder/little_endian.h
102039+++ b/include/uapi/linux/byteorder/little_endian.h
102040@@ -42,51 +42,51 @@
102041
102042 static inline __le64 __cpu_to_le64p(const __u64 *p)
102043 {
102044- return (__force __le64)*p;
102045+ return (__force const __le64)*p;
102046 }
102047-static inline __u64 __le64_to_cpup(const __le64 *p)
102048+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
102049 {
102050- return (__force __u64)*p;
102051+ return (__force const __u64)*p;
102052 }
102053 static inline __le32 __cpu_to_le32p(const __u32 *p)
102054 {
102055- return (__force __le32)*p;
102056+ return (__force const __le32)*p;
102057 }
102058 static inline __u32 __le32_to_cpup(const __le32 *p)
102059 {
102060- return (__force __u32)*p;
102061+ return (__force const __u32)*p;
102062 }
102063 static inline __le16 __cpu_to_le16p(const __u16 *p)
102064 {
102065- return (__force __le16)*p;
102066+ return (__force const __le16)*p;
102067 }
102068 static inline __u16 __le16_to_cpup(const __le16 *p)
102069 {
102070- return (__force __u16)*p;
102071+ return (__force const __u16)*p;
102072 }
102073 static inline __be64 __cpu_to_be64p(const __u64 *p)
102074 {
102075- return (__force __be64)__swab64p(p);
102076+ return (__force const __be64)__swab64p(p);
102077 }
102078 static inline __u64 __be64_to_cpup(const __be64 *p)
102079 {
102080- return __swab64p((__u64 *)p);
102081+ return __swab64p((const __u64 *)p);
102082 }
102083 static inline __be32 __cpu_to_be32p(const __u32 *p)
102084 {
102085- return (__force __be32)__swab32p(p);
102086+ return (__force const __be32)__swab32p(p);
102087 }
102088-static inline __u32 __be32_to_cpup(const __be32 *p)
102089+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
102090 {
102091- return __swab32p((__u32 *)p);
102092+ return __swab32p((const __u32 *)p);
102093 }
102094 static inline __be16 __cpu_to_be16p(const __u16 *p)
102095 {
102096- return (__force __be16)__swab16p(p);
102097+ return (__force const __be16)__swab16p(p);
102098 }
102099 static inline __u16 __be16_to_cpup(const __be16 *p)
102100 {
102101- return __swab16p((__u16 *)p);
102102+ return __swab16p((const __u16 *)p);
102103 }
102104 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
102105 #define __le64_to_cpus(x) do { (void)(x); } while (0)
102106diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
102107index 71e1d0e..6cc9caf 100644
102108--- a/include/uapi/linux/elf.h
102109+++ b/include/uapi/linux/elf.h
102110@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
102111 #define PT_GNU_EH_FRAME 0x6474e550
102112
102113 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
102114+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
102115+
102116+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
102117+
102118+/* Constants for the e_flags field */
102119+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102120+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
102121+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
102122+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
102123+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102124+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102125
102126 /*
102127 * Extended Numbering
102128@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
102129 #define DT_DEBUG 21
102130 #define DT_TEXTREL 22
102131 #define DT_JMPREL 23
102132+#define DT_FLAGS 30
102133+ #define DF_TEXTREL 0x00000004
102134 #define DT_ENCODING 32
102135 #define OLD_DT_LOOS 0x60000000
102136 #define DT_LOOS 0x6000000d
102137@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
102138 #define PF_W 0x2
102139 #define PF_X 0x1
102140
102141+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
102142+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
102143+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
102144+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
102145+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
102146+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
102147+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
102148+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
102149+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
102150+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
102151+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
102152+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
102153+
102154 typedef struct elf32_phdr{
102155 Elf32_Word p_type;
102156 Elf32_Off p_offset;
102157@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
102158 #define EI_OSABI 7
102159 #define EI_PAD 8
102160
102161+#define EI_PAX 14
102162+
102163 #define ELFMAG0 0x7f /* EI_MAG */
102164 #define ELFMAG1 'E'
102165 #define ELFMAG2 'L'
102166diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
102167index aa169c4..6a2771d 100644
102168--- a/include/uapi/linux/personality.h
102169+++ b/include/uapi/linux/personality.h
102170@@ -30,6 +30,7 @@ enum {
102171 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
102172 ADDR_NO_RANDOMIZE | \
102173 ADDR_COMPAT_LAYOUT | \
102174+ ADDR_LIMIT_3GB | \
102175 MMAP_PAGE_ZERO)
102176
102177 /*
102178diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
102179index 7530e74..e714828 100644
102180--- a/include/uapi/linux/screen_info.h
102181+++ b/include/uapi/linux/screen_info.h
102182@@ -43,7 +43,8 @@ struct screen_info {
102183 __u16 pages; /* 0x32 */
102184 __u16 vesa_attributes; /* 0x34 */
102185 __u32 capabilities; /* 0x36 */
102186- __u8 _reserved[6]; /* 0x3a */
102187+ __u16 vesapm_size; /* 0x3a */
102188+ __u8 _reserved[4]; /* 0x3c */
102189 } __attribute__((packed));
102190
102191 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
102192diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
102193index 0e011eb..82681b1 100644
102194--- a/include/uapi/linux/swab.h
102195+++ b/include/uapi/linux/swab.h
102196@@ -43,7 +43,7 @@
102197 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
102198 */
102199
102200-static inline __attribute_const__ __u16 __fswab16(__u16 val)
102201+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
102202 {
102203 #ifdef __HAVE_BUILTIN_BSWAP16__
102204 return __builtin_bswap16(val);
102205@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
102206 #endif
102207 }
102208
102209-static inline __attribute_const__ __u32 __fswab32(__u32 val)
102210+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
102211 {
102212 #ifdef __HAVE_BUILTIN_BSWAP32__
102213 return __builtin_bswap32(val);
102214@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
102215 #endif
102216 }
102217
102218-static inline __attribute_const__ __u64 __fswab64(__u64 val)
102219+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
102220 {
102221 #ifdef __HAVE_BUILTIN_BSWAP64__
102222 return __builtin_bswap64(val);
102223diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
102224index 1590c49..5eab462 100644
102225--- a/include/uapi/linux/xattr.h
102226+++ b/include/uapi/linux/xattr.h
102227@@ -73,5 +73,9 @@
102228 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
102229 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
102230
102231+/* User namespace */
102232+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
102233+#define XATTR_PAX_FLAGS_SUFFIX "flags"
102234+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
102235
102236 #endif /* _UAPI_LINUX_XATTR_H */
102237diff --git a/include/video/udlfb.h b/include/video/udlfb.h
102238index f9466fa..f4e2b81 100644
102239--- a/include/video/udlfb.h
102240+++ b/include/video/udlfb.h
102241@@ -53,10 +53,10 @@ struct dlfb_data {
102242 u32 pseudo_palette[256];
102243 int blank_mode; /*one of FB_BLANK_ */
102244 /* blit-only rendering path metrics, exposed through sysfs */
102245- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102246- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
102247- atomic_t bytes_sent; /* to usb, after compression including overhead */
102248- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
102249+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102250+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
102251+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
102252+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
102253 };
102254
102255 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
102256diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
102257index 30f5362..8ed8ac9 100644
102258--- a/include/video/uvesafb.h
102259+++ b/include/video/uvesafb.h
102260@@ -122,6 +122,7 @@ struct uvesafb_par {
102261 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
102262 u8 pmi_setpal; /* PMI for palette changes */
102263 u16 *pmi_base; /* protected mode interface location */
102264+ u8 *pmi_code; /* protected mode code location */
102265 void *pmi_start;
102266 void *pmi_pal;
102267 u8 *vbe_state_orig; /*
102268diff --git a/init/Kconfig b/init/Kconfig
102269index dc24dec..b77638f 100644
102270--- a/init/Kconfig
102271+++ b/init/Kconfig
102272@@ -1145,6 +1145,7 @@ endif # CGROUPS
102273
102274 config CHECKPOINT_RESTORE
102275 bool "Checkpoint/restore support" if EXPERT
102276+ depends on !GRKERNSEC
102277 default n
102278 help
102279 Enables additional kernel features in a sake of checkpoint/restore.
102280@@ -1670,7 +1671,7 @@ config SLUB_DEBUG
102281
102282 config COMPAT_BRK
102283 bool "Disable heap randomization"
102284- default y
102285+ default n
102286 help
102287 Randomizing heap placement makes heap exploits harder, but it
102288 also breaks ancient binaries (including anything libc5 based).
102289@@ -2001,7 +2002,7 @@ config INIT_ALL_POSSIBLE
102290 config STOP_MACHINE
102291 bool
102292 default y
102293- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
102294+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
102295 help
102296 Need stop_machine() primitive.
102297
102298diff --git a/init/Makefile b/init/Makefile
102299index 7bc47ee..6da2dc7 100644
102300--- a/init/Makefile
102301+++ b/init/Makefile
102302@@ -2,6 +2,9 @@
102303 # Makefile for the linux kernel.
102304 #
102305
102306+ccflags-y := $(GCC_PLUGINS_CFLAGS)
102307+asflags-y := $(GCC_PLUGINS_AFLAGS)
102308+
102309 obj-y := main.o version.o mounts.o
102310 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
102311 obj-y += noinitramfs.o
102312diff --git a/init/do_mounts.c b/init/do_mounts.c
102313index a95bbdb..82c48fd 100644
102314--- a/init/do_mounts.c
102315+++ b/init/do_mounts.c
102316@@ -363,11 +363,11 @@ static void __init get_fs_names(char *page)
102317 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
102318 {
102319 struct super_block *s;
102320- int err = sys_mount(name, "/root", fs, flags, data);
102321+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
102322 if (err)
102323 return err;
102324
102325- sys_chdir("/root");
102326+ sys_chdir((const char __force_user *)"/root");
102327 s = current->fs->pwd.dentry->d_sb;
102328 ROOT_DEV = s->s_dev;
102329 printk(KERN_INFO
102330@@ -490,18 +490,18 @@ void __init change_floppy(char *fmt, ...)
102331 va_start(args, fmt);
102332 vsprintf(buf, fmt, args);
102333 va_end(args);
102334- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
102335+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
102336 if (fd >= 0) {
102337 sys_ioctl(fd, FDEJECT, 0);
102338 sys_close(fd);
102339 }
102340 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
102341- fd = sys_open("/dev/console", O_RDWR, 0);
102342+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
102343 if (fd >= 0) {
102344 sys_ioctl(fd, TCGETS, (long)&termios);
102345 termios.c_lflag &= ~ICANON;
102346 sys_ioctl(fd, TCSETSF, (long)&termios);
102347- sys_read(fd, &c, 1);
102348+ sys_read(fd, (char __user *)&c, 1);
102349 termios.c_lflag |= ICANON;
102350 sys_ioctl(fd, TCSETSF, (long)&termios);
102351 sys_close(fd);
102352@@ -595,8 +595,8 @@ void __init prepare_namespace(void)
102353 mount_root();
102354 out:
102355 devtmpfs_mount("dev");
102356- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102357- sys_chroot(".");
102358+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102359+ sys_chroot((const char __force_user *)".");
102360 }
102361
102362 static bool is_tmpfs;
102363diff --git a/init/do_mounts.h b/init/do_mounts.h
102364index f5b978a..69dbfe8 100644
102365--- a/init/do_mounts.h
102366+++ b/init/do_mounts.h
102367@@ -15,15 +15,15 @@ extern int root_mountflags;
102368
102369 static inline int create_dev(char *name, dev_t dev)
102370 {
102371- sys_unlink(name);
102372- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
102373+ sys_unlink((char __force_user *)name);
102374+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
102375 }
102376
102377 #if BITS_PER_LONG == 32
102378 static inline u32 bstat(char *name)
102379 {
102380 struct stat64 stat;
102381- if (sys_stat64(name, &stat) != 0)
102382+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
102383 return 0;
102384 if (!S_ISBLK(stat.st_mode))
102385 return 0;
102386@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
102387 static inline u32 bstat(char *name)
102388 {
102389 struct stat stat;
102390- if (sys_newstat(name, &stat) != 0)
102391+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
102392 return 0;
102393 if (!S_ISBLK(stat.st_mode))
102394 return 0;
102395diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
102396index 3e0878e..8a9d7a0 100644
102397--- a/init/do_mounts_initrd.c
102398+++ b/init/do_mounts_initrd.c
102399@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
102400 {
102401 sys_unshare(CLONE_FS | CLONE_FILES);
102402 /* stdin/stdout/stderr for /linuxrc */
102403- sys_open("/dev/console", O_RDWR, 0);
102404+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
102405 sys_dup(0);
102406 sys_dup(0);
102407 /* move initrd over / and chdir/chroot in initrd root */
102408- sys_chdir("/root");
102409- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102410- sys_chroot(".");
102411+ sys_chdir((const char __force_user *)"/root");
102412+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102413+ sys_chroot((const char __force_user *)".");
102414 sys_setsid();
102415 return 0;
102416 }
102417@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
102418 create_dev("/dev/root.old", Root_RAM0);
102419 /* mount initrd on rootfs' /root */
102420 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
102421- sys_mkdir("/old", 0700);
102422- sys_chdir("/old");
102423+ sys_mkdir((const char __force_user *)"/old", 0700);
102424+ sys_chdir((const char __force_user *)"/old");
102425
102426 /* try loading default modules from initrd */
102427 load_default_modules();
102428@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
102429 current->flags &= ~PF_FREEZER_SKIP;
102430
102431 /* move initrd to rootfs' /old */
102432- sys_mount("..", ".", NULL, MS_MOVE, NULL);
102433+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
102434 /* switch root and cwd back to / of rootfs */
102435- sys_chroot("..");
102436+ sys_chroot((const char __force_user *)"..");
102437
102438 if (new_decode_dev(real_root_dev) == Root_RAM0) {
102439- sys_chdir("/old");
102440+ sys_chdir((const char __force_user *)"/old");
102441 return;
102442 }
102443
102444- sys_chdir("/");
102445+ sys_chdir((const char __force_user *)"/");
102446 ROOT_DEV = new_decode_dev(real_root_dev);
102447 mount_root();
102448
102449 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
102450- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
102451+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
102452 if (!error)
102453 printk("okay\n");
102454 else {
102455- int fd = sys_open("/dev/root.old", O_RDWR, 0);
102456+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
102457 if (error == -ENOENT)
102458 printk("/initrd does not exist. Ignored.\n");
102459 else
102460 printk("failed\n");
102461 printk(KERN_NOTICE "Unmounting old root\n");
102462- sys_umount("/old", MNT_DETACH);
102463+ sys_umount((char __force_user *)"/old", MNT_DETACH);
102464 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
102465 if (fd < 0) {
102466 error = fd;
102467@@ -127,11 +127,11 @@ int __init initrd_load(void)
102468 * mounted in the normal path.
102469 */
102470 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
102471- sys_unlink("/initrd.image");
102472+ sys_unlink((const char __force_user *)"/initrd.image");
102473 handle_initrd();
102474 return 1;
102475 }
102476 }
102477- sys_unlink("/initrd.image");
102478+ sys_unlink((const char __force_user *)"/initrd.image");
102479 return 0;
102480 }
102481diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
102482index 8cb6db5..d729f50 100644
102483--- a/init/do_mounts_md.c
102484+++ b/init/do_mounts_md.c
102485@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
102486 partitioned ? "_d" : "", minor,
102487 md_setup_args[ent].device_names);
102488
102489- fd = sys_open(name, 0, 0);
102490+ fd = sys_open((char __force_user *)name, 0, 0);
102491 if (fd < 0) {
102492 printk(KERN_ERR "md: open failed - cannot start "
102493 "array %s\n", name);
102494@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
102495 * array without it
102496 */
102497 sys_close(fd);
102498- fd = sys_open(name, 0, 0);
102499+ fd = sys_open((char __force_user *)name, 0, 0);
102500 sys_ioctl(fd, BLKRRPART, 0);
102501 }
102502 sys_close(fd);
102503@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
102504
102505 wait_for_device_probe();
102506
102507- fd = sys_open("/dev/md0", 0, 0);
102508+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
102509 if (fd >= 0) {
102510 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
102511 sys_close(fd);
102512diff --git a/init/init_task.c b/init/init_task.c
102513index ba0a7f36..2bcf1d5 100644
102514--- a/init/init_task.c
102515+++ b/init/init_task.c
102516@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
102517 * Initial thread structure. Alignment of this is handled by a special
102518 * linker map entry.
102519 */
102520+#ifdef CONFIG_X86
102521+union thread_union init_thread_union __init_task_data;
102522+#else
102523 union thread_union init_thread_union __init_task_data =
102524 { INIT_THREAD_INFO(init_task) };
102525+#endif
102526diff --git a/init/initramfs.c b/init/initramfs.c
102527index ad1bd77..dca2c1b 100644
102528--- a/init/initramfs.c
102529+++ b/init/initramfs.c
102530@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
102531
102532 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
102533 while (count) {
102534- ssize_t rv = sys_write(fd, p, count);
102535+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
102536
102537 if (rv < 0) {
102538 if (rv == -EINTR || rv == -EAGAIN)
102539@@ -107,7 +107,7 @@ static void __init free_hash(void)
102540 }
102541 }
102542
102543-static long __init do_utime(char *filename, time_t mtime)
102544+static long __init do_utime(char __force_user *filename, time_t mtime)
102545 {
102546 struct timespec t[2];
102547
102548@@ -142,7 +142,7 @@ static void __init dir_utime(void)
102549 struct dir_entry *de, *tmp;
102550 list_for_each_entry_safe(de, tmp, &dir_list, list) {
102551 list_del(&de->list);
102552- do_utime(de->name, de->mtime);
102553+ do_utime((char __force_user *)de->name, de->mtime);
102554 kfree(de->name);
102555 kfree(de);
102556 }
102557@@ -304,7 +304,7 @@ static int __init maybe_link(void)
102558 if (nlink >= 2) {
102559 char *old = find_link(major, minor, ino, mode, collected);
102560 if (old)
102561- return (sys_link(old, collected) < 0) ? -1 : 1;
102562+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
102563 }
102564 return 0;
102565 }
102566@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
102567 {
102568 struct stat st;
102569
102570- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
102571+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
102572 if (S_ISDIR(st.st_mode))
102573- sys_rmdir(path);
102574+ sys_rmdir((char __force_user *)path);
102575 else
102576- sys_unlink(path);
102577+ sys_unlink((char __force_user *)path);
102578 }
102579 }
102580
102581@@ -338,7 +338,7 @@ static int __init do_name(void)
102582 int openflags = O_WRONLY|O_CREAT;
102583 if (ml != 1)
102584 openflags |= O_TRUNC;
102585- wfd = sys_open(collected, openflags, mode);
102586+ wfd = sys_open((char __force_user *)collected, openflags, mode);
102587
102588 if (wfd >= 0) {
102589 sys_fchown(wfd, uid, gid);
102590@@ -350,17 +350,17 @@ static int __init do_name(void)
102591 }
102592 }
102593 } else if (S_ISDIR(mode)) {
102594- sys_mkdir(collected, mode);
102595- sys_chown(collected, uid, gid);
102596- sys_chmod(collected, mode);
102597+ sys_mkdir((char __force_user *)collected, mode);
102598+ sys_chown((char __force_user *)collected, uid, gid);
102599+ sys_chmod((char __force_user *)collected, mode);
102600 dir_add(collected, mtime);
102601 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
102602 S_ISFIFO(mode) || S_ISSOCK(mode)) {
102603 if (maybe_link() == 0) {
102604- sys_mknod(collected, mode, rdev);
102605- sys_chown(collected, uid, gid);
102606- sys_chmod(collected, mode);
102607- do_utime(collected, mtime);
102608+ sys_mknod((char __force_user *)collected, mode, rdev);
102609+ sys_chown((char __force_user *)collected, uid, gid);
102610+ sys_chmod((char __force_user *)collected, mode);
102611+ do_utime((char __force_user *)collected, mtime);
102612 }
102613 }
102614 return 0;
102615@@ -372,7 +372,7 @@ static int __init do_copy(void)
102616 if (xwrite(wfd, victim, body_len) != body_len)
102617 error("write error");
102618 sys_close(wfd);
102619- do_utime(vcollected, mtime);
102620+ do_utime((char __force_user *)vcollected, mtime);
102621 kfree(vcollected);
102622 eat(body_len);
102623 state = SkipIt;
102624@@ -390,9 +390,9 @@ static int __init do_symlink(void)
102625 {
102626 collected[N_ALIGN(name_len) + body_len] = '\0';
102627 clean_path(collected, 0);
102628- sys_symlink(collected + N_ALIGN(name_len), collected);
102629- sys_lchown(collected, uid, gid);
102630- do_utime(collected, mtime);
102631+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
102632+ sys_lchown((char __force_user *)collected, uid, gid);
102633+ do_utime((char __force_user *)collected, mtime);
102634 state = SkipIt;
102635 next_state = Reset;
102636 return 0;
102637diff --git a/init/main.c b/init/main.c
102638index 2a89545..ec10ec3 100644
102639--- a/init/main.c
102640+++ b/init/main.c
102641@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
102642 static inline void mark_rodata_ro(void) { }
102643 #endif
102644
102645+extern void grsecurity_init(void);
102646+
102647 /*
102648 * Debug helper: via this flag we know that we are in 'early bootup code'
102649 * where only the boot processor is running with IRQ disabled. This means
102650@@ -158,6 +160,83 @@ static int __init set_reset_devices(char *str)
102651
102652 __setup("reset_devices", set_reset_devices);
102653
102654+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
102655+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
102656+static int __init setup_grsec_proc_gid(char *str)
102657+{
102658+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
102659+ return 1;
102660+}
102661+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
102662+#endif
102663+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
102664+int grsec_enable_sysfs_restrict = 1;
102665+static int __init setup_grsec_sysfs_restrict(char *str)
102666+{
102667+ if (!simple_strtol(str, NULL, 0))
102668+ grsec_enable_sysfs_restrict = 0;
102669+ return 1;
102670+}
102671+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
102672+#endif
102673+
102674+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
102675+unsigned long pax_user_shadow_base __read_only;
102676+EXPORT_SYMBOL(pax_user_shadow_base);
102677+extern char pax_enter_kernel_user[];
102678+extern char pax_exit_kernel_user[];
102679+#endif
102680+
102681+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
102682+static int __init setup_pax_nouderef(char *str)
102683+{
102684+#ifdef CONFIG_X86_32
102685+ unsigned int cpu;
102686+ struct desc_struct *gdt;
102687+
102688+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
102689+ gdt = get_cpu_gdt_table(cpu);
102690+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
102691+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
102692+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
102693+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
102694+ }
102695+ loadsegment(ds, __KERNEL_DS);
102696+ loadsegment(es, __KERNEL_DS);
102697+ loadsegment(ss, __KERNEL_DS);
102698+#else
102699+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
102700+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
102701+ clone_pgd_mask = ~(pgdval_t)0UL;
102702+ pax_user_shadow_base = 0UL;
102703+#endif
102704+
102705+ return 0;
102706+}
102707+early_param("pax_nouderef", setup_pax_nouderef);
102708+
102709+#ifdef CONFIG_X86_64
102710+static int __init setup_pax_weakuderef(char *str)
102711+{
102712+ if (clone_pgd_mask != ~(pgdval_t)0UL)
102713+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
102714+ return 1;
102715+}
102716+__setup("pax_weakuderef", setup_pax_weakuderef);
102717+#endif
102718+#endif
102719+
102720+#ifdef CONFIG_PAX_SOFTMODE
102721+int pax_softmode;
102722+
102723+static int __init setup_pax_softmode(char *str)
102724+{
102725+ get_option(&str, &pax_softmode);
102726+ return 1;
102727+}
102728+__setup("pax_softmode=", setup_pax_softmode);
102729+#endif
102730+
102731 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
102732 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
102733 static const char *panic_later, *panic_param;
102734@@ -726,7 +805,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
102735 struct blacklist_entry *entry;
102736 char *fn_name;
102737
102738- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
102739+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
102740 if (!fn_name)
102741 return false;
102742
102743@@ -778,7 +857,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
102744 {
102745 int count = preempt_count();
102746 int ret;
102747- char msgbuf[64];
102748+ const char *msg1 = "", *msg2 = "";
102749
102750 if (initcall_blacklisted(fn))
102751 return -EPERM;
102752@@ -788,18 +867,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
102753 else
102754 ret = fn();
102755
102756- msgbuf[0] = 0;
102757-
102758 if (preempt_count() != count) {
102759- sprintf(msgbuf, "preemption imbalance ");
102760+ msg1 = " preemption imbalance";
102761 preempt_count_set(count);
102762 }
102763 if (irqs_disabled()) {
102764- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
102765+ msg2 = " disabled interrupts";
102766 local_irq_enable();
102767 }
102768- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
102769+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
102770
102771+ add_latent_entropy();
102772 return ret;
102773 }
102774
102775@@ -905,8 +983,8 @@ static int run_init_process(const char *init_filename)
102776 {
102777 argv_init[0] = init_filename;
102778 return do_execve(getname_kernel(init_filename),
102779- (const char __user *const __user *)argv_init,
102780- (const char __user *const __user *)envp_init);
102781+ (const char __user *const __force_user *)argv_init,
102782+ (const char __user *const __force_user *)envp_init);
102783 }
102784
102785 static int try_to_run_init_process(const char *init_filename)
102786@@ -923,6 +1001,10 @@ static int try_to_run_init_process(const char *init_filename)
102787 return ret;
102788 }
102789
102790+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102791+extern int gr_init_ran;
102792+#endif
102793+
102794 static noinline void __init kernel_init_freeable(void);
102795
102796 static int __ref kernel_init(void *unused)
102797@@ -947,6 +1029,11 @@ static int __ref kernel_init(void *unused)
102798 ramdisk_execute_command, ret);
102799 }
102800
102801+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102802+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
102803+ gr_init_ran = 1;
102804+#endif
102805+
102806 /*
102807 * We try each of these until one succeeds.
102808 *
102809@@ -1002,7 +1089,7 @@ static noinline void __init kernel_init_freeable(void)
102810 do_basic_setup();
102811
102812 /* Open the /dev/console on the rootfs, this should never fail */
102813- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
102814+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
102815 pr_err("Warning: unable to open an initial console.\n");
102816
102817 (void) sys_dup(0);
102818@@ -1015,11 +1102,13 @@ static noinline void __init kernel_init_freeable(void)
102819 if (!ramdisk_execute_command)
102820 ramdisk_execute_command = "/init";
102821
102822- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
102823+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
102824 ramdisk_execute_command = NULL;
102825 prepare_namespace();
102826 }
102827
102828+ grsecurity_init();
102829+
102830 /*
102831 * Ok, we have completed the initial bootup, and
102832 * we're essentially up and running. Get rid of the
102833diff --git a/ipc/compat.c b/ipc/compat.c
102834index 9b3c85f..5266b0f 100644
102835--- a/ipc/compat.c
102836+++ b/ipc/compat.c
102837@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
102838 COMPAT_SHMLBA);
102839 if (err < 0)
102840 return err;
102841- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
102842+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
102843 }
102844 case SHMDT:
102845 return sys_shmdt(compat_ptr(ptr));
102846@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
102847 }
102848
102849 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
102850- unsigned, nsops,
102851+ compat_long_t, nsops,
102852 const struct compat_timespec __user *, timeout)
102853 {
102854 struct timespec __user *ts64;
102855diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
102856index 8ad93c2..efd80f8 100644
102857--- a/ipc/ipc_sysctl.c
102858+++ b/ipc/ipc_sysctl.c
102859@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
102860 static int proc_ipc_dointvec(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@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
102869 static int proc_ipc_dointvec_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
102875 memcpy(&ipc_table, table, sizeof(ipc_table));
102876 ipc_table.data = get_ipc(table);
102877@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
102878 static int proc_ipc_doulongvec_minmax(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 memcpy(&ipc_table, table, sizeof(ipc_table));
102884 ipc_table.data = get_ipc(table);
102885
102886@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102887 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
102888 void __user *buffer, size_t *lenp, loff_t *ppos)
102889 {
102890- struct ctl_table ipc_table;
102891+ ctl_table_no_const ipc_table;
102892 int dummy = 0;
102893
102894 memcpy(&ipc_table, table, sizeof(ipc_table));
102895diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
102896index 68d4e95..1477ded 100644
102897--- a/ipc/mq_sysctl.c
102898+++ b/ipc/mq_sysctl.c
102899@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
102900 static int proc_mq_dointvec(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
102908@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
102909 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
102910 void __user *buffer, size_t *lenp, loff_t *ppos)
102911 {
102912- struct ctl_table mq_table;
102913+ ctl_table_no_const mq_table;
102914 memcpy(&mq_table, table, sizeof(mq_table));
102915 mq_table.data = get_mq(table);
102916
102917diff --git a/ipc/mqueue.c b/ipc/mqueue.c
102918index 3aaea7f..e8a13d6 100644
102919--- a/ipc/mqueue.c
102920+++ b/ipc/mqueue.c
102921@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
102922 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
102923 info->attr.mq_msgsize);
102924
102925+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
102926 spin_lock(&mq_lock);
102927 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
102928 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
102929diff --git a/ipc/sem.c b/ipc/sem.c
102930index d1a6edd..ef08b40 100644
102931--- a/ipc/sem.c
102932+++ b/ipc/sem.c
102933@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
102934 }
102935
102936 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
102937- unsigned, nsops, const struct timespec __user *, timeout)
102938+ long, nsops, const struct timespec __user *, timeout)
102939 {
102940 int error = -EINVAL;
102941 struct sem_array *sma;
102942@@ -2015,7 +2015,7 @@ out_free:
102943 }
102944
102945 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
102946- unsigned, nsops)
102947+ long, nsops)
102948 {
102949 return sys_semtimedop(semid, tsops, nsops, NULL);
102950 }
102951diff --git a/ipc/shm.c b/ipc/shm.c
102952index 6d76707..b646bbe 100644
102953--- a/ipc/shm.c
102954+++ b/ipc/shm.c
102955@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
102956 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
102957 #endif
102958
102959+#ifdef CONFIG_GRKERNSEC
102960+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102961+ const u64 shm_createtime, const kuid_t cuid,
102962+ const int shmid);
102963+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102964+ const u64 shm_createtime);
102965+#endif
102966+
102967 void shm_init_ns(struct ipc_namespace *ns)
102968 {
102969 ns->shm_ctlmax = SHMMAX;
102970@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
102971 shp->shm_lprid = 0;
102972 shp->shm_atim = shp->shm_dtim = 0;
102973 shp->shm_ctim = get_seconds();
102974+#ifdef CONFIG_GRKERNSEC
102975+ shp->shm_createtime = ktime_get_ns();
102976+#endif
102977 shp->shm_segsz = size;
102978 shp->shm_nattch = 0;
102979 shp->shm_file = file;
102980@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102981 f_mode = FMODE_READ | FMODE_WRITE;
102982 }
102983 if (shmflg & SHM_EXEC) {
102984+
102985+#ifdef CONFIG_PAX_MPROTECT
102986+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
102987+ goto out;
102988+#endif
102989+
102990 prot |= PROT_EXEC;
102991 acc_mode |= S_IXUGO;
102992 }
102993@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
102994 if (err)
102995 goto out_unlock;
102996
102997+#ifdef CONFIG_GRKERNSEC
102998+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
102999+ shp->shm_perm.cuid, shmid) ||
103000+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
103001+ err = -EACCES;
103002+ goto out_unlock;
103003+ }
103004+#endif
103005+
103006 ipc_lock_object(&shp->shm_perm);
103007
103008 /* check if shm_destroy() is tearing down shp */
103009@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103010 path = shp->shm_file->f_path;
103011 path_get(&path);
103012 shp->shm_nattch++;
103013+#ifdef CONFIG_GRKERNSEC
103014+ shp->shm_lapid = current->pid;
103015+#endif
103016 size = i_size_read(d_inode(path.dentry));
103017 ipc_unlock_object(&shp->shm_perm);
103018 rcu_read_unlock();
103019diff --git a/ipc/util.c b/ipc/util.c
103020index ff3323e..d6d63d1 100644
103021--- a/ipc/util.c
103022+++ b/ipc/util.c
103023@@ -71,6 +71,8 @@ struct ipc_proc_iface {
103024 int (*show)(struct seq_file *, void *);
103025 };
103026
103027+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
103028+
103029 /**
103030 * ipc_init - initialise ipc subsystem
103031 *
103032@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
103033 granted_mode >>= 6;
103034 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
103035 granted_mode >>= 3;
103036+
103037+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
103038+ return -1;
103039+
103040 /* is there some bit set in requested_mode but not in granted_mode? */
103041 if ((requested_mode & ~granted_mode & 0007) &&
103042 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
103043diff --git a/kernel/audit.c b/kernel/audit.c
103044index 1c13e42..6c171ab 100644
103045--- a/kernel/audit.c
103046+++ b/kernel/audit.c
103047@@ -124,7 +124,7 @@ u32 audit_sig_sid = 0;
103048 3) suppressed due to audit_rate_limit
103049 4) suppressed due to audit_backlog_limit
103050 */
103051-static atomic_t audit_lost = ATOMIC_INIT(0);
103052+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
103053
103054 /* The netlink socket. */
103055 static struct sock *audit_sock;
103056@@ -258,7 +258,7 @@ void audit_log_lost(const char *message)
103057 unsigned long now;
103058 int print;
103059
103060- atomic_inc(&audit_lost);
103061+ atomic_inc_unchecked(&audit_lost);
103062
103063 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
103064
103065@@ -275,7 +275,7 @@ void audit_log_lost(const char *message)
103066 if (print) {
103067 if (printk_ratelimit())
103068 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
103069- atomic_read(&audit_lost),
103070+ atomic_read_unchecked(&audit_lost),
103071 audit_rate_limit,
103072 audit_backlog_limit);
103073 audit_panic(message);
103074@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
103075 s.pid = audit_pid;
103076 s.rate_limit = audit_rate_limit;
103077 s.backlog_limit = audit_backlog_limit;
103078- s.lost = atomic_read(&audit_lost);
103079+ s.lost = atomic_read_unchecked(&audit_lost);
103080 s.backlog = skb_queue_len(&audit_skb_queue);
103081 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
103082 s.backlog_wait_time = audit_backlog_wait_time_master;
103083diff --git a/kernel/auditsc.c b/kernel/auditsc.c
103084index 9fb9d1c..afb1610 100644
103085--- a/kernel/auditsc.c
103086+++ b/kernel/auditsc.c
103087@@ -1023,7 +1023,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
103088 * for strings that are too long, we should not have created
103089 * any.
103090 */
103091- if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) {
103092+ if (unlikely(len > MAX_ARG_STRLEN - 1)) {
103093 WARN_ON(1);
103094 send_sig(SIGKILL, current, 0);
103095 return -1;
103096@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
103097 }
103098
103099 /* global counter which is incremented every time something logs in */
103100-static atomic_t session_id = ATOMIC_INIT(0);
103101+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
103102
103103 static int audit_set_loginuid_perm(kuid_t loginuid)
103104 {
103105@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
103106
103107 /* are we setting or clearing? */
103108 if (uid_valid(loginuid))
103109- sessionid = (unsigned int)atomic_inc_return(&session_id);
103110+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
103111
103112 task->sessionid = sessionid;
103113 task->loginuid = loginuid;
103114diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
103115index 54f0e7f..fed997b 100644
103116--- a/kernel/bpf/core.c
103117+++ b/kernel/bpf/core.c
103118@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103119 * random section of illegal instructions.
103120 */
103121 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
103122- hdr = module_alloc(size);
103123+ hdr = module_alloc_exec(size);
103124 if (hdr == NULL)
103125 return NULL;
103126
103127 /* Fill space with illegal/arch-dep instructions. */
103128 bpf_fill_ill_insns(hdr, size);
103129
103130+ pax_open_kernel();
103131 hdr->pages = size / PAGE_SIZE;
103132+ pax_close_kernel();
103133+
103134 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
103135 PAGE_SIZE - sizeof(*hdr));
103136 start = (prandom_u32() % hole) & ~(alignment - 1);
103137@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103138
103139 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
103140 {
103141- module_memfree(hdr);
103142+ module_memfree_exec(hdr);
103143 }
103144 #endif /* CONFIG_BPF_JIT */
103145
103146diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
103147index 3bae6c5..59ea175 100644
103148--- a/kernel/bpf/syscall.c
103149+++ b/kernel/bpf/syscall.c
103150@@ -554,11 +554,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
103151 int err;
103152
103153 /* the syscall is limited to root temporarily. This restriction will be
103154- * lifted when security audit is clean. Note that eBPF+tracing must have
103155- * this restriction, since it may pass kernel data to user space
103156+ * lifted by upstream when a half-assed security audit is clean. Note
103157+ * that eBPF+tracing must have this restriction, since it may pass
103158+ * kernel data to user space
103159 */
103160 if (!capable(CAP_SYS_ADMIN))
103161 return -EPERM;
103162+#ifdef CONFIG_GRKERNSEC
103163+ return -EPERM;
103164+#endif
103165
103166 if (!access_ok(VERIFY_READ, uattr, 1))
103167 return -EFAULT;
103168diff --git a/kernel/capability.c b/kernel/capability.c
103169index 45432b5..988f1e4 100644
103170--- a/kernel/capability.c
103171+++ b/kernel/capability.c
103172@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
103173 * before modification is attempted and the application
103174 * fails.
103175 */
103176+ if (tocopy > ARRAY_SIZE(kdata))
103177+ return -EFAULT;
103178+
103179 if (copy_to_user(dataptr, kdata, tocopy
103180 * sizeof(struct __user_cap_data_struct))) {
103181 return -EFAULT;
103182@@ -298,10 +301,11 @@ bool has_ns_capability(struct task_struct *t,
103183 int ret;
103184
103185 rcu_read_lock();
103186- ret = security_capable(__task_cred(t), ns, cap);
103187+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
103188+ gr_task_is_capable(t, __task_cred(t), cap);
103189 rcu_read_unlock();
103190
103191- return (ret == 0);
103192+ return ret;
103193 }
103194
103195 /**
103196@@ -338,10 +342,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
103197 int ret;
103198
103199 rcu_read_lock();
103200- ret = security_capable_noaudit(__task_cred(t), ns, cap);
103201+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
103202 rcu_read_unlock();
103203
103204- return (ret == 0);
103205+ return ret;
103206 }
103207
103208 /**
103209@@ -379,7 +383,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
103210 BUG();
103211 }
103212
103213- if (security_capable(current_cred(), ns, cap) == 0) {
103214+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
103215 current->flags |= PF_SUPERPRIV;
103216 return true;
103217 }
103218@@ -387,6 +391,20 @@ bool ns_capable(struct user_namespace *ns, int cap)
103219 }
103220 EXPORT_SYMBOL(ns_capable);
103221
103222+bool ns_capable_nolog(struct user_namespace *ns, int cap)
103223+{
103224+ if (unlikely(!cap_valid(cap))) {
103225+ pr_crit("capable_nolog() called with invalid cap=%u\n", cap);
103226+ BUG();
103227+ }
103228+
103229+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
103230+ current->flags |= PF_SUPERPRIV;
103231+ return true;
103232+ }
103233+ return false;
103234+}
103235+EXPORT_SYMBOL(ns_capable_nolog);
103236
103237 /**
103238 * capable - Determine if the current task has a superior capability in effect
103239@@ -403,6 +421,13 @@ bool capable(int cap)
103240 return ns_capable(&init_user_ns, cap);
103241 }
103242 EXPORT_SYMBOL(capable);
103243+
103244+bool capable_nolog(int cap)
103245+{
103246+ return ns_capable_nolog(&init_user_ns, cap);
103247+}
103248+EXPORT_SYMBOL(capable_nolog);
103249+
103250 #endif /* CONFIG_MULTIUSER */
103251
103252 /**
103253@@ -447,3 +472,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
103254 kgid_has_mapping(ns, inode->i_gid);
103255 }
103256 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
103257+
103258+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
103259+{
103260+ struct user_namespace *ns = current_user_ns();
103261+
103262+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
103263+ kgid_has_mapping(ns, inode->i_gid);
103264+}
103265+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
103266diff --git a/kernel/cgroup.c b/kernel/cgroup.c
103267index e8a5491..ab4bfa3 100644
103268--- a/kernel/cgroup.c
103269+++ b/kernel/cgroup.c
103270@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
103271 if (!pathbuf || !agentbuf)
103272 goto out;
103273
103274+ if (agentbuf[0] == '\0')
103275+ goto out;
103276+
103277 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
103278 if (!path)
103279 goto out;
103280@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
103281 struct task_struct *task;
103282 int count = 0;
103283
103284- seq_printf(seq, "css_set %p\n", cset);
103285+ seq_printf(seq, "css_set %pK\n", cset);
103286
103287 list_for_each_entry(task, &cset->tasks, cg_list) {
103288 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
103289diff --git a/kernel/compat.c b/kernel/compat.c
103290index 333d364..762ec00 100644
103291--- a/kernel/compat.c
103292+++ b/kernel/compat.c
103293@@ -13,6 +13,7 @@
103294
103295 #include <linux/linkage.h>
103296 #include <linux/compat.h>
103297+#include <linux/module.h>
103298 #include <linux/errno.h>
103299 #include <linux/time.h>
103300 #include <linux/signal.h>
103301@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
103302 mm_segment_t oldfs;
103303 long ret;
103304
103305- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
103306+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
103307 oldfs = get_fs();
103308 set_fs(KERNEL_DS);
103309 ret = hrtimer_nanosleep_restart(restart);
103310@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
103311 oldfs = get_fs();
103312 set_fs(KERNEL_DS);
103313 ret = hrtimer_nanosleep(&tu,
103314- rmtp ? (struct timespec __user *)&rmt : NULL,
103315+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
103316 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
103317 set_fs(oldfs);
103318
103319@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
103320 mm_segment_t old_fs = get_fs();
103321
103322 set_fs(KERNEL_DS);
103323- ret = sys_sigpending((old_sigset_t __user *) &s);
103324+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
103325 set_fs(old_fs);
103326 if (ret == 0)
103327 ret = put_user(s, set);
103328@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
103329 mm_segment_t old_fs = get_fs();
103330
103331 set_fs(KERNEL_DS);
103332- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
103333+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
103334 set_fs(old_fs);
103335
103336 if (!ret) {
103337@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
103338 set_fs (KERNEL_DS);
103339 ret = sys_wait4(pid,
103340 (stat_addr ?
103341- (unsigned int __user *) &status : NULL),
103342- options, (struct rusage __user *) &r);
103343+ (unsigned int __force_user *) &status : NULL),
103344+ options, (struct rusage __force_user *) &r);
103345 set_fs (old_fs);
103346
103347 if (ret > 0) {
103348@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
103349 memset(&info, 0, sizeof(info));
103350
103351 set_fs(KERNEL_DS);
103352- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
103353- uru ? (struct rusage __user *)&ru : NULL);
103354+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
103355+ uru ? (struct rusage __force_user *)&ru : NULL);
103356 set_fs(old_fs);
103357
103358 if ((ret < 0) || (info.si_signo == 0))
103359@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
103360 oldfs = get_fs();
103361 set_fs(KERNEL_DS);
103362 err = sys_timer_settime(timer_id, flags,
103363- (struct itimerspec __user *) &newts,
103364- (struct itimerspec __user *) &oldts);
103365+ (struct itimerspec __force_user *) &newts,
103366+ (struct itimerspec __force_user *) &oldts);
103367 set_fs(oldfs);
103368 if (!err && old && put_compat_itimerspec(old, &oldts))
103369 return -EFAULT;
103370@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
103371 oldfs = get_fs();
103372 set_fs(KERNEL_DS);
103373 err = sys_timer_gettime(timer_id,
103374- (struct itimerspec __user *) &ts);
103375+ (struct itimerspec __force_user *) &ts);
103376 set_fs(oldfs);
103377 if (!err && put_compat_itimerspec(setting, &ts))
103378 return -EFAULT;
103379@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
103380 oldfs = get_fs();
103381 set_fs(KERNEL_DS);
103382 err = sys_clock_settime(which_clock,
103383- (struct timespec __user *) &ts);
103384+ (struct timespec __force_user *) &ts);
103385 set_fs(oldfs);
103386 return err;
103387 }
103388@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
103389 oldfs = get_fs();
103390 set_fs(KERNEL_DS);
103391 err = sys_clock_gettime(which_clock,
103392- (struct timespec __user *) &ts);
103393+ (struct timespec __force_user *) &ts);
103394 set_fs(oldfs);
103395 if (!err && compat_put_timespec(&ts, tp))
103396 return -EFAULT;
103397@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
103398
103399 oldfs = get_fs();
103400 set_fs(KERNEL_DS);
103401- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
103402+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
103403 set_fs(oldfs);
103404
103405 err = compat_put_timex(utp, &txc);
103406@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
103407 oldfs = get_fs();
103408 set_fs(KERNEL_DS);
103409 err = sys_clock_getres(which_clock,
103410- (struct timespec __user *) &ts);
103411+ (struct timespec __force_user *) &ts);
103412 set_fs(oldfs);
103413 if (!err && tp && compat_put_timespec(&ts, tp))
103414 return -EFAULT;
103415@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
103416 struct timespec tu;
103417 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
103418
103419- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
103420+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
103421 oldfs = get_fs();
103422 set_fs(KERNEL_DS);
103423 err = clock_nanosleep_restart(restart);
103424@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
103425 oldfs = get_fs();
103426 set_fs(KERNEL_DS);
103427 err = sys_clock_nanosleep(which_clock, flags,
103428- (struct timespec __user *) &in,
103429- (struct timespec __user *) &out);
103430+ (struct timespec __force_user *) &in,
103431+ (struct timespec __force_user *) &out);
103432 set_fs(oldfs);
103433
103434 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
103435@@ -1147,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
103436 mm_segment_t old_fs = get_fs();
103437
103438 set_fs(KERNEL_DS);
103439- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
103440+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
103441 set_fs(old_fs);
103442 if (compat_put_timespec(&t, interval))
103443 return -EFAULT;
103444diff --git a/kernel/configs.c b/kernel/configs.c
103445index c18b1f1..b9a0132 100644
103446--- a/kernel/configs.c
103447+++ b/kernel/configs.c
103448@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
103449 struct proc_dir_entry *entry;
103450
103451 /* create the current config file */
103452+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
103453+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
103454+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
103455+ &ikconfig_file_ops);
103456+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
103457+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
103458+ &ikconfig_file_ops);
103459+#endif
103460+#else
103461 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
103462 &ikconfig_file_ops);
103463+#endif
103464+
103465 if (!entry)
103466 return -ENOMEM;
103467
103468diff --git a/kernel/cred.c b/kernel/cred.c
103469index ec1c076..7da8a0e 100644
103470--- a/kernel/cred.c
103471+++ b/kernel/cred.c
103472@@ -167,6 +167,15 @@ void exit_creds(struct task_struct *tsk)
103473 validate_creds(cred);
103474 alter_cred_subscribers(cred, -1);
103475 put_cred(cred);
103476+
103477+#ifdef CONFIG_GRKERNSEC_SETXID
103478+ cred = (struct cred *) tsk->delayed_cred;
103479+ if (cred != NULL) {
103480+ tsk->delayed_cred = NULL;
103481+ validate_creds(cred);
103482+ put_cred(cred);
103483+ }
103484+#endif
103485 }
103486
103487 /**
103488@@ -414,7 +423,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
103489 * Always returns 0 thus allowing this function to be tail-called at the end
103490 * of, say, sys_setgid().
103491 */
103492-int commit_creds(struct cred *new)
103493+static int __commit_creds(struct cred *new)
103494 {
103495 struct task_struct *task = current;
103496 const struct cred *old = task->real_cred;
103497@@ -433,6 +442,8 @@ int commit_creds(struct cred *new)
103498
103499 get_cred(new); /* we will require a ref for the subj creds too */
103500
103501+ gr_set_role_label(task, new->uid, new->gid);
103502+
103503 /* dumpability changes */
103504 if (!uid_eq(old->euid, new->euid) ||
103505 !gid_eq(old->egid, new->egid) ||
103506@@ -482,6 +493,105 @@ int commit_creds(struct cred *new)
103507 put_cred(old);
103508 return 0;
103509 }
103510+#ifdef CONFIG_GRKERNSEC_SETXID
103511+extern int set_user(struct cred *new);
103512+
103513+void gr_delayed_cred_worker(void)
103514+{
103515+ const struct cred *new = current->delayed_cred;
103516+ struct cred *ncred;
103517+
103518+ current->delayed_cred = NULL;
103519+
103520+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
103521+ // from doing get_cred on it when queueing this
103522+ put_cred(new);
103523+ return;
103524+ } else if (new == NULL)
103525+ return;
103526+
103527+ ncred = prepare_creds();
103528+ if (!ncred)
103529+ goto die;
103530+ // uids
103531+ ncred->uid = new->uid;
103532+ ncred->euid = new->euid;
103533+ ncred->suid = new->suid;
103534+ ncred->fsuid = new->fsuid;
103535+ // gids
103536+ ncred->gid = new->gid;
103537+ ncred->egid = new->egid;
103538+ ncred->sgid = new->sgid;
103539+ ncred->fsgid = new->fsgid;
103540+ // groups
103541+ set_groups(ncred, new->group_info);
103542+ // caps
103543+ ncred->securebits = new->securebits;
103544+ ncred->cap_inheritable = new->cap_inheritable;
103545+ ncred->cap_permitted = new->cap_permitted;
103546+ ncred->cap_effective = new->cap_effective;
103547+ ncred->cap_bset = new->cap_bset;
103548+
103549+ if (set_user(ncred)) {
103550+ abort_creds(ncred);
103551+ goto die;
103552+ }
103553+
103554+ // from doing get_cred on it when queueing this
103555+ put_cred(new);
103556+
103557+ __commit_creds(ncred);
103558+ return;
103559+die:
103560+ // from doing get_cred on it when queueing this
103561+ put_cred(new);
103562+ do_group_exit(SIGKILL);
103563+}
103564+#endif
103565+
103566+int commit_creds(struct cred *new)
103567+{
103568+#ifdef CONFIG_GRKERNSEC_SETXID
103569+ int ret;
103570+ int schedule_it = 0;
103571+ struct task_struct *t;
103572+ unsigned oldsecurebits = current_cred()->securebits;
103573+
103574+ /* we won't get called with tasklist_lock held for writing
103575+ and interrupts disabled as the cred struct in that case is
103576+ init_cred
103577+ */
103578+ if (grsec_enable_setxid && !current_is_single_threaded() &&
103579+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
103580+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
103581+ schedule_it = 1;
103582+ }
103583+ ret = __commit_creds(new);
103584+ if (schedule_it) {
103585+ rcu_read_lock();
103586+ read_lock(&tasklist_lock);
103587+ for (t = next_thread(current); t != current;
103588+ t = next_thread(t)) {
103589+ /* we'll check if the thread has uid 0 in
103590+ * the delayed worker routine
103591+ */
103592+ if (task_securebits(t) == oldsecurebits &&
103593+ t->delayed_cred == NULL) {
103594+ t->delayed_cred = get_cred(new);
103595+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
103596+ set_tsk_need_resched(t);
103597+ }
103598+ }
103599+ read_unlock(&tasklist_lock);
103600+ rcu_read_unlock();
103601+ }
103602+
103603+ return ret;
103604+#else
103605+ return __commit_creds(new);
103606+#endif
103607+}
103608+
103609 EXPORT_SYMBOL(commit_creds);
103610
103611 /**
103612diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
103613index 0874e2e..5b32cc9 100644
103614--- a/kernel/debug/debug_core.c
103615+++ b/kernel/debug/debug_core.c
103616@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
103617 */
103618 static atomic_t masters_in_kgdb;
103619 static atomic_t slaves_in_kgdb;
103620-static atomic_t kgdb_break_tasklet_var;
103621+static atomic_unchecked_t kgdb_break_tasklet_var;
103622 atomic_t kgdb_setting_breakpoint;
103623
103624 struct task_struct *kgdb_usethread;
103625@@ -137,7 +137,7 @@ int kgdb_single_step;
103626 static pid_t kgdb_sstep_pid;
103627
103628 /* to keep track of the CPU which is doing the single stepping*/
103629-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103630+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103631
103632 /*
103633 * If you are debugging a problem where roundup (the collection of
103634@@ -552,7 +552,7 @@ return_normal:
103635 * kernel will only try for the value of sstep_tries before
103636 * giving up and continuing on.
103637 */
103638- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
103639+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
103640 (kgdb_info[cpu].task &&
103641 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
103642 atomic_set(&kgdb_active, -1);
103643@@ -654,8 +654,8 @@ cpu_master_loop:
103644 }
103645
103646 kgdb_restore:
103647- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
103648- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
103649+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
103650+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
103651 if (kgdb_info[sstep_cpu].task)
103652 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
103653 else
103654@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
103655 static void kgdb_tasklet_bpt(unsigned long ing)
103656 {
103657 kgdb_breakpoint();
103658- atomic_set(&kgdb_break_tasklet_var, 0);
103659+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
103660 }
103661
103662 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
103663
103664 void kgdb_schedule_breakpoint(void)
103665 {
103666- if (atomic_read(&kgdb_break_tasklet_var) ||
103667+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
103668 atomic_read(&kgdb_active) != -1 ||
103669 atomic_read(&kgdb_setting_breakpoint))
103670 return;
103671- atomic_inc(&kgdb_break_tasklet_var);
103672+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
103673 tasklet_schedule(&kgdb_tasklet_breakpoint);
103674 }
103675 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
103676diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
103677index 41213454..861e178 100644
103678--- a/kernel/debug/kdb/kdb_main.c
103679+++ b/kernel/debug/kdb/kdb_main.c
103680@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
103681 continue;
103682
103683 kdb_printf("%-20s%8u 0x%p ", mod->name,
103684- mod->core_size, (void *)mod);
103685+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
103686 #ifdef CONFIG_MODULE_UNLOAD
103687 kdb_printf("%4d ", module_refcount(mod));
103688 #endif
103689@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
103690 kdb_printf(" (Loading)");
103691 else
103692 kdb_printf(" (Live)");
103693- kdb_printf(" 0x%p", mod->module_core);
103694+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
103695
103696 #ifdef CONFIG_MODULE_UNLOAD
103697 {
103698diff --git a/kernel/events/core.c b/kernel/events/core.c
103699index 0ceb386..ddaf008 100644
103700--- a/kernel/events/core.c
103701+++ b/kernel/events/core.c
103702@@ -172,8 +172,15 @@ static struct srcu_struct pmus_srcu;
103703 * 0 - disallow raw tracepoint access for unpriv
103704 * 1 - disallow cpu events for unpriv
103705 * 2 - disallow kernel profiling for unpriv
103706+ * 3 - disallow all unpriv perf event use
103707 */
103708-int sysctl_perf_event_paranoid __read_mostly = 1;
103709+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103710+int sysctl_perf_event_legitimately_concerned __read_only = 3;
103711+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
103712+int sysctl_perf_event_legitimately_concerned __read_only = 2;
103713+#else
103714+int sysctl_perf_event_legitimately_concerned __read_only = 1;
103715+#endif
103716
103717 /* Minimum for 512 kiB + 1 user control page */
103718 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
103719@@ -199,7 +206,7 @@ void update_perf_cpu_limits(void)
103720
103721 tmp *= sysctl_perf_cpu_time_max_percent;
103722 do_div(tmp, 100);
103723- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
103724+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
103725 }
103726
103727 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
103728@@ -305,7 +312,7 @@ void perf_sample_event_took(u64 sample_len_ns)
103729 }
103730 }
103731
103732-static atomic64_t perf_event_id;
103733+static atomic64_unchecked_t perf_event_id;
103734
103735 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
103736 enum event_type_t event_type);
103737@@ -3771,9 +3778,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
103738 mutex_lock(&event->child_mutex);
103739 total += perf_event_read(event);
103740 *enabled += event->total_time_enabled +
103741- atomic64_read(&event->child_total_time_enabled);
103742+ atomic64_read_unchecked(&event->child_total_time_enabled);
103743 *running += event->total_time_running +
103744- atomic64_read(&event->child_total_time_running);
103745+ atomic64_read_unchecked(&event->child_total_time_running);
103746
103747 list_for_each_entry(child, &event->child_list, child_list) {
103748 total += perf_event_read(child);
103749@@ -4268,10 +4275,10 @@ void perf_event_update_userpage(struct perf_event *event)
103750 userpg->offset -= local64_read(&event->hw.prev_count);
103751
103752 userpg->time_enabled = enabled +
103753- atomic64_read(&event->child_total_time_enabled);
103754+ atomic64_read_unchecked(&event->child_total_time_enabled);
103755
103756 userpg->time_running = running +
103757- atomic64_read(&event->child_total_time_running);
103758+ atomic64_read_unchecked(&event->child_total_time_running);
103759
103760 arch_perf_update_userpage(event, userpg, now);
103761
103762@@ -4946,7 +4953,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
103763
103764 /* Data. */
103765 sp = perf_user_stack_pointer(regs);
103766- rem = __output_copy_user(handle, (void *) sp, dump_size);
103767+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
103768 dyn_size = dump_size - rem;
103769
103770 perf_output_skip(handle, rem);
103771@@ -5037,11 +5044,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
103772 values[n++] = perf_event_count(event);
103773 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
103774 values[n++] = enabled +
103775- atomic64_read(&event->child_total_time_enabled);
103776+ atomic64_read_unchecked(&event->child_total_time_enabled);
103777 }
103778 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
103779 values[n++] = running +
103780- atomic64_read(&event->child_total_time_running);
103781+ atomic64_read_unchecked(&event->child_total_time_running);
103782 }
103783 if (read_format & PERF_FORMAT_ID)
103784 values[n++] = primary_event_id(event);
103785@@ -7533,7 +7540,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
103786 event->parent = parent_event;
103787
103788 event->ns = get_pid_ns(task_active_pid_ns(current));
103789- event->id = atomic64_inc_return(&perf_event_id);
103790+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
103791
103792 event->state = PERF_EVENT_STATE_INACTIVE;
103793
103794@@ -7892,6 +7899,11 @@ SYSCALL_DEFINE5(perf_event_open,
103795 if (flags & ~PERF_FLAG_ALL)
103796 return -EINVAL;
103797
103798+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103799+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
103800+ return -EACCES;
103801+#endif
103802+
103803 err = perf_copy_attr(attr_uptr, &attr);
103804 if (err)
103805 return err;
103806@@ -8340,10 +8352,10 @@ static void sync_child_event(struct perf_event *child_event,
103807 /*
103808 * Add back the child's count to the parent's count:
103809 */
103810- atomic64_add(child_val, &parent_event->child_count);
103811- atomic64_add(child_event->total_time_enabled,
103812+ atomic64_add_unchecked(child_val, &parent_event->child_count);
103813+ atomic64_add_unchecked(child_event->total_time_enabled,
103814 &parent_event->child_total_time_enabled);
103815- atomic64_add(child_event->total_time_running,
103816+ atomic64_add_unchecked(child_event->total_time_running,
103817 &parent_event->child_total_time_running);
103818
103819 /*
103820diff --git a/kernel/events/internal.h b/kernel/events/internal.h
103821index 9f6ce9b..e4f2cbb 100644
103822--- a/kernel/events/internal.h
103823+++ b/kernel/events/internal.h
103824@@ -114,10 +114,10 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
103825 return rb->aux_nr_pages << PAGE_SHIFT;
103826 }
103827
103828-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
103829+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
103830 static inline unsigned long \
103831 func_name(struct perf_output_handle *handle, \
103832- const void *buf, unsigned long len) \
103833+ const void user *buf, unsigned long len) \
103834 { \
103835 unsigned long size, written; \
103836 \
103837@@ -150,7 +150,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
103838 return 0;
103839 }
103840
103841-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
103842+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
103843
103844 static inline unsigned long
103845 memcpy_skip(void *dst, const void *src, unsigned long n)
103846@@ -158,7 +158,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
103847 return 0;
103848 }
103849
103850-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
103851+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
103852
103853 #ifndef arch_perf_out_copy_user
103854 #define arch_perf_out_copy_user arch_perf_out_copy_user
103855@@ -176,7 +176,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
103856 }
103857 #endif
103858
103859-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
103860+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
103861
103862 /* Callchain handling */
103863 extern struct perf_callchain_entry *
103864diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
103865index cb346f2..e4dc317 100644
103866--- a/kernel/events/uprobes.c
103867+++ b/kernel/events/uprobes.c
103868@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
103869 {
103870 struct page *page;
103871 uprobe_opcode_t opcode;
103872- int result;
103873+ long result;
103874
103875 pagefault_disable();
103876 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
103877diff --git a/kernel/exit.c b/kernel/exit.c
103878index 22fcc05..5f07dbc 100644
103879--- a/kernel/exit.c
103880+++ b/kernel/exit.c
103881@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
103882 struct task_struct *leader;
103883 int zap_leader;
103884 repeat:
103885+#ifdef CONFIG_NET
103886+ gr_del_task_from_ip_table(p);
103887+#endif
103888+
103889 /* don't need to get the RCU readlock here - the process is dead and
103890 * can't be modifying its own credentials. But shut RCU-lockdep up */
103891 rcu_read_lock();
103892@@ -656,6 +660,8 @@ void do_exit(long code)
103893 int group_dead;
103894 TASKS_RCU(int tasks_rcu_i);
103895
103896+ set_fs(USER_DS);
103897+
103898 profile_task_exit(tsk);
103899
103900 WARN_ON(blk_needs_flush_plug(tsk));
103901@@ -672,7 +678,6 @@ void do_exit(long code)
103902 * mm_release()->clear_child_tid() from writing to a user-controlled
103903 * kernel address.
103904 */
103905- set_fs(USER_DS);
103906
103907 ptrace_event(PTRACE_EVENT_EXIT, code);
103908
103909@@ -730,6 +735,9 @@ void do_exit(long code)
103910 tsk->exit_code = code;
103911 taskstats_exit(tsk, group_dead);
103912
103913+ gr_acl_handle_psacct(tsk, code);
103914+ gr_acl_handle_exit();
103915+
103916 exit_mm(tsk);
103917
103918 if (group_dead)
103919@@ -847,7 +855,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
103920 * Take down every thread in the group. This is called by fatal signals
103921 * as well as by sys_exit_group (below).
103922 */
103923-void
103924+__noreturn void
103925 do_group_exit(int exit_code)
103926 {
103927 struct signal_struct *sig = current->signal;
103928diff --git a/kernel/fork.c b/kernel/fork.c
103929index 03c1eaa..461be4c 100644
103930--- a/kernel/fork.c
103931+++ b/kernel/fork.c
103932@@ -188,12 +188,54 @@ static void free_thread_info(struct thread_info *ti)
103933 void thread_info_cache_init(void)
103934 {
103935 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
103936- THREAD_SIZE, 0, NULL);
103937+ THREAD_SIZE, SLAB_USERCOPY, NULL);
103938 BUG_ON(thread_info_cache == NULL);
103939 }
103940 # endif
103941 #endif
103942
103943+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103944+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103945+ int node, void **lowmem_stack)
103946+{
103947+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
103948+ void *ret = NULL;
103949+ unsigned int i;
103950+
103951+ *lowmem_stack = alloc_thread_info_node(tsk, node);
103952+ if (*lowmem_stack == NULL)
103953+ goto out;
103954+
103955+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
103956+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
103957+
103958+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
103959+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
103960+ if (ret == NULL) {
103961+ free_thread_info(*lowmem_stack);
103962+ *lowmem_stack = NULL;
103963+ }
103964+
103965+out:
103966+ return ret;
103967+}
103968+
103969+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103970+{
103971+ unmap_process_stacks(tsk);
103972+}
103973+#else
103974+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103975+ int node, void **lowmem_stack)
103976+{
103977+ return alloc_thread_info_node(tsk, node);
103978+}
103979+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
103980+{
103981+ free_thread_info(ti);
103982+}
103983+#endif
103984+
103985 /* SLAB cache for signal_struct structures (tsk->signal) */
103986 static struct kmem_cache *signal_cachep;
103987
103988@@ -212,18 +254,22 @@ struct kmem_cache *vm_area_cachep;
103989 /* SLAB cache for mm_struct structures (tsk->mm) */
103990 static struct kmem_cache *mm_cachep;
103991
103992-static void account_kernel_stack(struct thread_info *ti, int account)
103993+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
103994 {
103995+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103996+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
103997+#else
103998 struct zone *zone = page_zone(virt_to_page(ti));
103999+#endif
104000
104001 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
104002 }
104003
104004 void free_task(struct task_struct *tsk)
104005 {
104006- account_kernel_stack(tsk->stack, -1);
104007+ account_kernel_stack(tsk, tsk->stack, -1);
104008 arch_release_thread_info(tsk->stack);
104009- free_thread_info(tsk->stack);
104010+ gr_free_thread_info(tsk, tsk->stack);
104011 rt_mutex_debug_task_free(tsk);
104012 ftrace_graph_exit_task(tsk);
104013 put_seccomp_filter(tsk);
104014@@ -329,6 +375,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104015 {
104016 struct task_struct *tsk;
104017 struct thread_info *ti;
104018+ void *lowmem_stack;
104019 int node = tsk_fork_get_node(orig);
104020 int err;
104021
104022@@ -336,7 +383,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104023 if (!tsk)
104024 return NULL;
104025
104026- ti = alloc_thread_info_node(tsk, node);
104027+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
104028 if (!ti)
104029 goto free_tsk;
104030
104031@@ -345,6 +392,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104032 goto free_ti;
104033
104034 tsk->stack = ti;
104035+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104036+ tsk->lowmem_stack = lowmem_stack;
104037+#endif
104038 #ifdef CONFIG_SECCOMP
104039 /*
104040 * We must handle setting up seccomp filters once we're under
104041@@ -361,7 +411,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104042 set_task_stack_end_magic(tsk);
104043
104044 #ifdef CONFIG_CC_STACKPROTECTOR
104045- tsk->stack_canary = get_random_int();
104046+ tsk->stack_canary = pax_get_random_long();
104047 #endif
104048
104049 /*
104050@@ -375,24 +425,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104051 tsk->splice_pipe = NULL;
104052 tsk->task_frag.page = NULL;
104053
104054- account_kernel_stack(ti, 1);
104055+ account_kernel_stack(tsk, ti, 1);
104056
104057 return tsk;
104058
104059 free_ti:
104060- free_thread_info(ti);
104061+ gr_free_thread_info(tsk, ti);
104062 free_tsk:
104063 free_task_struct(tsk);
104064 return NULL;
104065 }
104066
104067 #ifdef CONFIG_MMU
104068-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104069+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
104070+{
104071+ struct vm_area_struct *tmp;
104072+ unsigned long charge;
104073+ struct file *file;
104074+ int retval;
104075+
104076+ charge = 0;
104077+ if (mpnt->vm_flags & VM_ACCOUNT) {
104078+ unsigned long len = vma_pages(mpnt);
104079+
104080+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104081+ goto fail_nomem;
104082+ charge = len;
104083+ }
104084+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104085+ if (!tmp)
104086+ goto fail_nomem;
104087+ *tmp = *mpnt;
104088+ tmp->vm_mm = mm;
104089+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
104090+ retval = vma_dup_policy(mpnt, tmp);
104091+ if (retval)
104092+ goto fail_nomem_policy;
104093+ if (anon_vma_fork(tmp, mpnt))
104094+ goto fail_nomem_anon_vma_fork;
104095+ tmp->vm_flags &= ~VM_LOCKED;
104096+ tmp->vm_next = tmp->vm_prev = NULL;
104097+ tmp->vm_mirror = NULL;
104098+ file = tmp->vm_file;
104099+ if (file) {
104100+ struct inode *inode = file_inode(file);
104101+ struct address_space *mapping = file->f_mapping;
104102+
104103+ get_file(file);
104104+ if (tmp->vm_flags & VM_DENYWRITE)
104105+ atomic_dec(&inode->i_writecount);
104106+ i_mmap_lock_write(mapping);
104107+ if (tmp->vm_flags & VM_SHARED)
104108+ atomic_inc(&mapping->i_mmap_writable);
104109+ flush_dcache_mmap_lock(mapping);
104110+ /* insert tmp into the share list, just after mpnt */
104111+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
104112+ flush_dcache_mmap_unlock(mapping);
104113+ i_mmap_unlock_write(mapping);
104114+ }
104115+
104116+ /*
104117+ * Clear hugetlb-related page reserves for children. This only
104118+ * affects MAP_PRIVATE mappings. Faults generated by the child
104119+ * are not guaranteed to succeed, even if read-only
104120+ */
104121+ if (is_vm_hugetlb_page(tmp))
104122+ reset_vma_resv_huge_pages(tmp);
104123+
104124+ return tmp;
104125+
104126+fail_nomem_anon_vma_fork:
104127+ mpol_put(vma_policy(tmp));
104128+fail_nomem_policy:
104129+ kmem_cache_free(vm_area_cachep, tmp);
104130+fail_nomem:
104131+ vm_unacct_memory(charge);
104132+ return NULL;
104133+}
104134+
104135+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104136 {
104137 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
104138 struct rb_node **rb_link, *rb_parent;
104139 int retval;
104140- unsigned long charge;
104141
104142 uprobe_start_dup_mmap();
104143 down_write(&oldmm->mmap_sem);
104144@@ -423,51 +538,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104145
104146 prev = NULL;
104147 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
104148- struct file *file;
104149-
104150 if (mpnt->vm_flags & VM_DONTCOPY) {
104151 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
104152 -vma_pages(mpnt));
104153 continue;
104154 }
104155- charge = 0;
104156- if (mpnt->vm_flags & VM_ACCOUNT) {
104157- unsigned long len = vma_pages(mpnt);
104158-
104159- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104160- goto fail_nomem;
104161- charge = len;
104162- }
104163- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104164- if (!tmp)
104165- goto fail_nomem;
104166- *tmp = *mpnt;
104167- INIT_LIST_HEAD(&tmp->anon_vma_chain);
104168- retval = vma_dup_policy(mpnt, tmp);
104169- if (retval)
104170- goto fail_nomem_policy;
104171- tmp->vm_mm = mm;
104172- if (anon_vma_fork(tmp, mpnt))
104173- goto fail_nomem_anon_vma_fork;
104174- tmp->vm_flags &= ~VM_LOCKED;
104175- tmp->vm_next = tmp->vm_prev = NULL;
104176- file = tmp->vm_file;
104177- if (file) {
104178- struct inode *inode = file_inode(file);
104179- struct address_space *mapping = file->f_mapping;
104180-
104181- get_file(file);
104182- if (tmp->vm_flags & VM_DENYWRITE)
104183- atomic_dec(&inode->i_writecount);
104184- i_mmap_lock_write(mapping);
104185- if (tmp->vm_flags & VM_SHARED)
104186- atomic_inc(&mapping->i_mmap_writable);
104187- flush_dcache_mmap_lock(mapping);
104188- /* insert tmp into the share list, just after mpnt */
104189- vma_interval_tree_insert_after(tmp, mpnt,
104190- &mapping->i_mmap);
104191- flush_dcache_mmap_unlock(mapping);
104192- i_mmap_unlock_write(mapping);
104193+ tmp = dup_vma(mm, oldmm, mpnt);
104194+ if (!tmp) {
104195+ retval = -ENOMEM;
104196+ goto out;
104197 }
104198
104199 /*
104200@@ -499,6 +578,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104201 if (retval)
104202 goto out;
104203 }
104204+
104205+#ifdef CONFIG_PAX_SEGMEXEC
104206+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
104207+ struct vm_area_struct *mpnt_m;
104208+
104209+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
104210+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
104211+
104212+ if (!mpnt->vm_mirror)
104213+ continue;
104214+
104215+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
104216+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
104217+ mpnt->vm_mirror = mpnt_m;
104218+ } else {
104219+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
104220+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
104221+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
104222+ mpnt->vm_mirror->vm_mirror = mpnt;
104223+ }
104224+ }
104225+ BUG_ON(mpnt_m);
104226+ }
104227+#endif
104228+
104229 /* a new mm has just been created */
104230 arch_dup_mmap(oldmm, mm);
104231 retval = 0;
104232@@ -508,14 +612,6 @@ out:
104233 up_write(&oldmm->mmap_sem);
104234 uprobe_end_dup_mmap();
104235 return retval;
104236-fail_nomem_anon_vma_fork:
104237- mpol_put(vma_policy(tmp));
104238-fail_nomem_policy:
104239- kmem_cache_free(vm_area_cachep, tmp);
104240-fail_nomem:
104241- retval = -ENOMEM;
104242- vm_unacct_memory(charge);
104243- goto out;
104244 }
104245
104246 static inline int mm_alloc_pgd(struct mm_struct *mm)
104247@@ -790,8 +886,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
104248 return ERR_PTR(err);
104249
104250 mm = get_task_mm(task);
104251- if (mm && mm != current->mm &&
104252- !ptrace_may_access(task, mode)) {
104253+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
104254+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
104255 mmput(mm);
104256 mm = ERR_PTR(-EACCES);
104257 }
104258@@ -992,13 +1088,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
104259 spin_unlock(&fs->lock);
104260 return -EAGAIN;
104261 }
104262- fs->users++;
104263+ atomic_inc(&fs->users);
104264 spin_unlock(&fs->lock);
104265 return 0;
104266 }
104267 tsk->fs = copy_fs_struct(fs);
104268 if (!tsk->fs)
104269 return -ENOMEM;
104270+ /* Carry through gr_chroot_dentry and is_chrooted instead
104271+ of recomputing it here. Already copied when the task struct
104272+ is duplicated. This allows pivot_root to not be treated as
104273+ a chroot
104274+ */
104275+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
104276+
104277 return 0;
104278 }
104279
104280@@ -1236,7 +1339,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
104281 * parts of the process environment (as per the clone
104282 * flags). The actual kick-off is left to the caller.
104283 */
104284-static struct task_struct *copy_process(unsigned long clone_flags,
104285+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
104286 unsigned long stack_start,
104287 unsigned long stack_size,
104288 int __user *child_tidptr,
104289@@ -1307,6 +1410,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104290 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
104291 #endif
104292 retval = -EAGAIN;
104293+
104294+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
104295+
104296 if (atomic_read(&p->real_cred->user->processes) >=
104297 task_rlimit(p, RLIMIT_NPROC)) {
104298 if (p->real_cred->user != INIT_USER &&
104299@@ -1554,6 +1660,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104300 goto bad_fork_free_pid;
104301 }
104302
104303+ /* synchronizes with gr_set_acls()
104304+ we need to call this past the point of no return for fork()
104305+ */
104306+ gr_copy_label(p);
104307+
104308 if (likely(p->pid)) {
104309 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
104310
104311@@ -1643,6 +1754,8 @@ bad_fork_cleanup_count:
104312 bad_fork_free:
104313 free_task(p);
104314 fork_out:
104315+ gr_log_forkfail(retval);
104316+
104317 return ERR_PTR(retval);
104318 }
104319
104320@@ -1704,6 +1817,7 @@ long do_fork(unsigned long clone_flags,
104321
104322 p = copy_process(clone_flags, stack_start, stack_size,
104323 child_tidptr, NULL, trace);
104324+ add_latent_entropy();
104325 /*
104326 * Do this prior waking up the new thread - the thread pointer
104327 * might get invalid after that point, if the thread exits quickly.
104328@@ -1720,6 +1834,8 @@ long do_fork(unsigned long clone_flags,
104329 if (clone_flags & CLONE_PARENT_SETTID)
104330 put_user(nr, parent_tidptr);
104331
104332+ gr_handle_brute_check();
104333+
104334 if (clone_flags & CLONE_VFORK) {
104335 p->vfork_done = &vfork;
104336 init_completion(&vfork);
104337@@ -1838,7 +1954,7 @@ void __init proc_caches_init(void)
104338 mm_cachep = kmem_cache_create("mm_struct",
104339 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
104340 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
104341- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
104342+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
104343 mmap_init();
104344 nsproxy_cache_init();
104345 }
104346@@ -1878,7 +1994,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
104347 return 0;
104348
104349 /* don't need lock here; in the worst case we'll do useless copy */
104350- if (fs->users == 1)
104351+ if (atomic_read(&fs->users) == 1)
104352 return 0;
104353
104354 *new_fsp = copy_fs_struct(fs);
104355@@ -1990,7 +2106,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
104356 fs = current->fs;
104357 spin_lock(&fs->lock);
104358 current->fs = new_fs;
104359- if (--fs->users)
104360+ gr_set_chroot_entries(current, &current->fs->root);
104361+ if (atomic_dec_return(&fs->users))
104362 new_fs = NULL;
104363 else
104364 new_fs = fs;
104365@@ -2054,7 +2171,7 @@ int unshare_files(struct files_struct **displaced)
104366 int sysctl_max_threads(struct ctl_table *table, int write,
104367 void __user *buffer, size_t *lenp, loff_t *ppos)
104368 {
104369- struct ctl_table t;
104370+ ctl_table_no_const t;
104371 int ret;
104372 int threads = max_threads;
104373 int min = MIN_THREADS;
104374diff --git a/kernel/futex.c b/kernel/futex.c
104375index 2579e40..c33f33e 100644
104376--- a/kernel/futex.c
104377+++ b/kernel/futex.c
104378@@ -201,7 +201,7 @@ struct futex_pi_state {
104379 atomic_t refcount;
104380
104381 union futex_key key;
104382-};
104383+} __randomize_layout;
104384
104385 /**
104386 * struct futex_q - The hashed futex queue entry, one per waiting task
104387@@ -235,7 +235,7 @@ struct futex_q {
104388 struct rt_mutex_waiter *rt_waiter;
104389 union futex_key *requeue_pi_key;
104390 u32 bitset;
104391-};
104392+} __randomize_layout;
104393
104394 static const struct futex_q futex_q_init = {
104395 /* list gets initialized in queue_me()*/
104396@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
104397 struct page *page, *page_head;
104398 int err, ro = 0;
104399
104400+#ifdef CONFIG_PAX_SEGMEXEC
104401+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
104402+ return -EFAULT;
104403+#endif
104404+
104405 /*
104406 * The futex address must be "naturally" aligned.
104407 */
104408@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
104409
104410 static int get_futex_value_locked(u32 *dest, u32 __user *from)
104411 {
104412- int ret;
104413+ unsigned long ret;
104414
104415 pagefault_disable();
104416 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
104417@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
104418 {
104419 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
104420 u32 curval;
104421+ mm_segment_t oldfs;
104422
104423 /*
104424 * This will fail and we want it. Some arch implementations do
104425@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
104426 * implementation, the non-functional ones will return
104427 * -ENOSYS.
104428 */
104429+ oldfs = get_fs();
104430+ set_fs(USER_DS);
104431 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
104432 futex_cmpxchg_enabled = 1;
104433+ set_fs(oldfs);
104434 #endif
104435 }
104436
104437diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
104438index 55c8c93..9ba7ad6 100644
104439--- a/kernel/futex_compat.c
104440+++ b/kernel/futex_compat.c
104441@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
104442 return 0;
104443 }
104444
104445-static void __user *futex_uaddr(struct robust_list __user *entry,
104446+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
104447 compat_long_t futex_offset)
104448 {
104449 compat_uptr_t base = ptr_to_compat(entry);
104450diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
104451index a744098..539f7b6 100644
104452--- a/kernel/gcov/base.c
104453+++ b/kernel/gcov/base.c
104454@@ -117,11 +117,6 @@ void gcov_enable_events(void)
104455 }
104456
104457 #ifdef CONFIG_MODULES
104458-static inline int within(void *addr, void *start, unsigned long size)
104459-{
104460- return ((addr >= start) && (addr < start + size));
104461-}
104462-
104463 /* Update list and generate events when modules are unloaded. */
104464 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104465 void *data)
104466@@ -136,7 +131,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104467
104468 /* Remove entries located in module from linked list. */
104469 while ((info = gcov_info_next(info))) {
104470- if (within(info, mod->module_core, mod->core_size)) {
104471+ if (within_module_core_rw((unsigned long)info, mod)) {
104472 gcov_info_unlink(prev, info);
104473 if (gcov_events_enabled)
104474 gcov_event(GCOV_REMOVE, info);
104475diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
104476index e68932b..2247e06 100644
104477--- a/kernel/irq/manage.c
104478+++ b/kernel/irq/manage.c
104479@@ -906,7 +906,7 @@ static int irq_thread(void *data)
104480
104481 action_ret = handler_fn(desc, action);
104482 if (action_ret == IRQ_HANDLED)
104483- atomic_inc(&desc->threads_handled);
104484+ atomic_inc_unchecked(&desc->threads_handled);
104485
104486 wake_threads_waitq(desc);
104487 }
104488diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
104489index e2514b0..de3dfe0 100644
104490--- a/kernel/irq/spurious.c
104491+++ b/kernel/irq/spurious.c
104492@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
104493 * count. We just care about the count being
104494 * different than the one we saw before.
104495 */
104496- handled = atomic_read(&desc->threads_handled);
104497+ handled = atomic_read_unchecked(&desc->threads_handled);
104498 handled |= SPURIOUS_DEFERRED;
104499 if (handled != desc->threads_handled_last) {
104500 action_ret = IRQ_HANDLED;
104501diff --git a/kernel/jump_label.c b/kernel/jump_label.c
104502index 9019f15..9a3c42e 100644
104503--- a/kernel/jump_label.c
104504+++ b/kernel/jump_label.c
104505@@ -14,6 +14,7 @@
104506 #include <linux/err.h>
104507 #include <linux/static_key.h>
104508 #include <linux/jump_label_ratelimit.h>
104509+#include <linux/mm.h>
104510
104511 #ifdef HAVE_JUMP_LABEL
104512
104513@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
104514
104515 size = (((unsigned long)stop - (unsigned long)start)
104516 / sizeof(struct jump_entry));
104517+ pax_open_kernel();
104518 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
104519+ pax_close_kernel();
104520 }
104521
104522 static void jump_label_update(struct static_key *key, int enable);
104523@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
104524 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
104525 struct jump_entry *iter;
104526
104527+ pax_open_kernel();
104528 for (iter = iter_start; iter < iter_stop; iter++) {
104529 if (within_module_init(iter->code, mod))
104530 iter->code = 0;
104531 }
104532+ pax_close_kernel();
104533 }
104534
104535 static int
104536diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
104537index 5c5987f..bc502b0 100644
104538--- a/kernel/kallsyms.c
104539+++ b/kernel/kallsyms.c
104540@@ -11,6 +11,9 @@
104541 * Changed the compression method from stem compression to "table lookup"
104542 * compression (see scripts/kallsyms.c for a more complete description)
104543 */
104544+#ifdef CONFIG_GRKERNSEC_HIDESYM
104545+#define __INCLUDED_BY_HIDESYM 1
104546+#endif
104547 #include <linux/kallsyms.h>
104548 #include <linux/module.h>
104549 #include <linux/init.h>
104550@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
104551
104552 static inline int is_kernel_inittext(unsigned long addr)
104553 {
104554+ if (system_state != SYSTEM_BOOTING)
104555+ return 0;
104556+
104557 if (addr >= (unsigned long)_sinittext
104558 && addr <= (unsigned long)_einittext)
104559 return 1;
104560 return 0;
104561 }
104562
104563+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104564+#ifdef CONFIG_MODULES
104565+static inline int is_module_text(unsigned long addr)
104566+{
104567+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
104568+ return 1;
104569+
104570+ addr = ktla_ktva(addr);
104571+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
104572+}
104573+#else
104574+static inline int is_module_text(unsigned long addr)
104575+{
104576+ return 0;
104577+}
104578+#endif
104579+#endif
104580+
104581 static inline int is_kernel_text(unsigned long addr)
104582 {
104583 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
104584@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
104585
104586 static inline int is_kernel(unsigned long addr)
104587 {
104588+
104589+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104590+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
104591+ return 1;
104592+
104593+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
104594+#else
104595 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
104596+#endif
104597+
104598 return 1;
104599 return in_gate_area_no_mm(addr);
104600 }
104601
104602 static int is_ksym_addr(unsigned long addr)
104603 {
104604+
104605+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104606+ if (is_module_text(addr))
104607+ return 0;
104608+#endif
104609+
104610 if (all_var)
104611 return is_kernel(addr);
104612
104613@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
104614
104615 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
104616 {
104617- iter->name[0] = '\0';
104618 iter->nameoff = get_symbol_offset(new_pos);
104619 iter->pos = new_pos;
104620 }
104621@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
104622 {
104623 struct kallsym_iter *iter = m->private;
104624
104625+#ifdef CONFIG_GRKERNSEC_HIDESYM
104626+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
104627+ return 0;
104628+#endif
104629+
104630 /* Some debugging symbols have no name. Ignore them. */
104631 if (!iter->name[0])
104632 return 0;
104633@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
104634 */
104635 type = iter->exported ? toupper(iter->type) :
104636 tolower(iter->type);
104637+
104638 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
104639 type, iter->name, iter->module_name);
104640 } else
104641diff --git a/kernel/kcmp.c b/kernel/kcmp.c
104642index 0aa69ea..a7fcafb 100644
104643--- a/kernel/kcmp.c
104644+++ b/kernel/kcmp.c
104645@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
104646 struct task_struct *task1, *task2;
104647 int ret;
104648
104649+#ifdef CONFIG_GRKERNSEC
104650+ return -ENOSYS;
104651+#endif
104652+
104653 rcu_read_lock();
104654
104655 /*
104656diff --git a/kernel/kexec.c b/kernel/kexec.c
104657index 7a36fdc..de8c4ed 100644
104658--- a/kernel/kexec.c
104659+++ b/kernel/kexec.c
104660@@ -1232,7 +1232,7 @@ static int kimage_load_segment(struct kimage *image,
104661 */
104662 struct kimage *kexec_image;
104663 struct kimage *kexec_crash_image;
104664-int kexec_load_disabled;
104665+int kexec_load_disabled __read_only;
104666
104667 static DEFINE_MUTEX(kexec_mutex);
104668
104669@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
104670 compat_ulong_t, flags)
104671 {
104672 struct compat_kexec_segment in;
104673- struct kexec_segment out, __user *ksegments;
104674+ struct kexec_segment out;
104675+ struct kexec_segment __user *ksegments;
104676 unsigned long i, result;
104677
104678 /* Don't allow clients that don't understand the native
104679diff --git a/kernel/kmod.c b/kernel/kmod.c
104680index 2777f40..a689506 100644
104681--- a/kernel/kmod.c
104682+++ b/kernel/kmod.c
104683@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
104684 kfree(info->argv);
104685 }
104686
104687-static int call_modprobe(char *module_name, int wait)
104688+static int call_modprobe(char *module_name, char *module_param, int wait)
104689 {
104690 struct subprocess_info *info;
104691 static char *envp[] = {
104692@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
104693 NULL
104694 };
104695
104696- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
104697+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
104698 if (!argv)
104699 goto out;
104700
104701@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
104702 argv[1] = "-q";
104703 argv[2] = "--";
104704 argv[3] = module_name; /* check free_modprobe_argv() */
104705- argv[4] = NULL;
104706+ argv[4] = module_param;
104707+ argv[5] = NULL;
104708
104709 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
104710 NULL, free_modprobe_argv, NULL);
104711@@ -122,9 +123,8 @@ out:
104712 * If module auto-loading support is disabled then this function
104713 * becomes a no-operation.
104714 */
104715-int __request_module(bool wait, const char *fmt, ...)
104716+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
104717 {
104718- va_list args;
104719 char module_name[MODULE_NAME_LEN];
104720 unsigned int max_modprobes;
104721 int ret;
104722@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
104723 if (!modprobe_path[0])
104724 return 0;
104725
104726- va_start(args, fmt);
104727- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
104728- va_end(args);
104729+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
104730 if (ret >= MODULE_NAME_LEN)
104731 return -ENAMETOOLONG;
104732
104733@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
104734 if (ret)
104735 return ret;
104736
104737+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104738+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104739+ /* hack to workaround consolekit/udisks stupidity */
104740+ read_lock(&tasklist_lock);
104741+ if (!strcmp(current->comm, "mount") &&
104742+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
104743+ read_unlock(&tasklist_lock);
104744+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
104745+ return -EPERM;
104746+ }
104747+ read_unlock(&tasklist_lock);
104748+ }
104749+#endif
104750+
104751 /* If modprobe needs a service that is in a module, we get a recursive
104752 * loop. Limit the number of running kmod threads to max_threads/2 or
104753 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
104754@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
104755
104756 trace_module_request(module_name, wait, _RET_IP_);
104757
104758- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104759+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104760
104761 atomic_dec(&kmod_concurrent);
104762 return ret;
104763 }
104764+
104765+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
104766+{
104767+ va_list args;
104768+ int ret;
104769+
104770+ va_start(args, fmt);
104771+ ret = ____request_module(wait, module_param, fmt, args);
104772+ va_end(args);
104773+
104774+ return ret;
104775+}
104776+
104777+int __request_module(bool wait, const char *fmt, ...)
104778+{
104779+ va_list args;
104780+ int ret;
104781+
104782+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104783+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104784+ char module_param[MODULE_NAME_LEN];
104785+
104786+ memset(module_param, 0, sizeof(module_param));
104787+
104788+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
104789+
104790+ va_start(args, fmt);
104791+ ret = ____request_module(wait, module_param, fmt, args);
104792+ va_end(args);
104793+
104794+ return ret;
104795+ }
104796+#endif
104797+
104798+ va_start(args, fmt);
104799+ ret = ____request_module(wait, NULL, fmt, args);
104800+ va_end(args);
104801+
104802+ return ret;
104803+}
104804+
104805 EXPORT_SYMBOL(__request_module);
104806 #endif /* CONFIG_MODULES */
104807
104808 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
104809 {
104810+#ifdef CONFIG_GRKERNSEC
104811+ kfree(info->path);
104812+ info->path = info->origpath;
104813+#endif
104814 if (info->cleanup)
104815 (*info->cleanup)(info);
104816 kfree(info);
104817@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
104818 */
104819 set_user_nice(current, 0);
104820
104821+#ifdef CONFIG_GRKERNSEC
104822+ /* this is race-free as far as userland is concerned as we copied
104823+ out the path to be used prior to this point and are now operating
104824+ on that copy
104825+ */
104826+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
104827+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
104828+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
104829+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
104830+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
104831+ retval = -EPERM;
104832+ goto out;
104833+ }
104834+#endif
104835+
104836 retval = -ENOMEM;
104837 new = prepare_kernel_cred(current);
104838 if (!new)
104839@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
104840 commit_creds(new);
104841
104842 retval = do_execve(getname_kernel(sub_info->path),
104843- (const char __user *const __user *)sub_info->argv,
104844- (const char __user *const __user *)sub_info->envp);
104845+ (const char __user *const __force_user *)sub_info->argv,
104846+ (const char __user *const __force_user *)sub_info->envp);
104847 out:
104848 sub_info->retval = retval;
104849 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
104850@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
104851 *
104852 * Thus the __user pointer cast is valid here.
104853 */
104854- sys_wait4(pid, (int __user *)&ret, 0, NULL);
104855+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
104856
104857 /*
104858 * If ret is 0, either ____call_usermodehelper failed and the
104859@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
104860 goto out;
104861
104862 INIT_WORK(&sub_info->work, __call_usermodehelper);
104863+#ifdef CONFIG_GRKERNSEC
104864+ sub_info->origpath = path;
104865+ sub_info->path = kstrdup(path, gfp_mask);
104866+#else
104867 sub_info->path = path;
104868+#endif
104869 sub_info->argv = argv;
104870 sub_info->envp = envp;
104871
104872@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
104873 static int proc_cap_handler(struct ctl_table *table, int write,
104874 void __user *buffer, size_t *lenp, loff_t *ppos)
104875 {
104876- struct ctl_table t;
104877+ ctl_table_no_const t;
104878 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
104879 kernel_cap_t new_cap;
104880 int err, i;
104881diff --git a/kernel/kprobes.c b/kernel/kprobes.c
104882index c90e417..e6c515d 100644
104883--- a/kernel/kprobes.c
104884+++ b/kernel/kprobes.c
104885@@ -31,6 +31,9 @@
104886 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
104887 * <prasanna@in.ibm.com> added function-return probes.
104888 */
104889+#ifdef CONFIG_GRKERNSEC_HIDESYM
104890+#define __INCLUDED_BY_HIDESYM 1
104891+#endif
104892 #include <linux/kprobes.h>
104893 #include <linux/hash.h>
104894 #include <linux/init.h>
104895@@ -122,12 +125,12 @@ enum kprobe_slot_state {
104896
104897 static void *alloc_insn_page(void)
104898 {
104899- return module_alloc(PAGE_SIZE);
104900+ return module_alloc_exec(PAGE_SIZE);
104901 }
104902
104903 static void free_insn_page(void *page)
104904 {
104905- module_memfree(page);
104906+ module_memfree_exec(page);
104907 }
104908
104909 struct kprobe_insn_cache kprobe_insn_slots = {
104910@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
104911 kprobe_type = "k";
104912
104913 if (sym)
104914- seq_printf(pi, "%p %s %s+0x%x %s ",
104915+ seq_printf(pi, "%pK %s %s+0x%x %s ",
104916 p->addr, kprobe_type, sym, offset,
104917 (modname ? modname : " "));
104918 else
104919- seq_printf(pi, "%p %s %p ",
104920+ seq_printf(pi, "%pK %s %pK ",
104921 p->addr, kprobe_type, p->addr);
104922
104923 if (!pp)
104924diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
104925index 6683cce..daf8999 100644
104926--- a/kernel/ksysfs.c
104927+++ b/kernel/ksysfs.c
104928@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
104929 {
104930 if (count+1 > UEVENT_HELPER_PATH_LEN)
104931 return -ENOENT;
104932+ if (!capable(CAP_SYS_ADMIN))
104933+ return -EPERM;
104934 memcpy(uevent_helper, buf, count);
104935 uevent_helper[count] = '\0';
104936 if (count && uevent_helper[count-1] == '\n')
104937@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
104938 return count;
104939 }
104940
104941-static struct bin_attribute notes_attr = {
104942+static bin_attribute_no_const notes_attr __read_only = {
104943 .attr = {
104944 .name = "notes",
104945 .mode = S_IRUGO,
104946diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
104947index aaeae88..10f3663 100644
104948--- a/kernel/locking/lockdep.c
104949+++ b/kernel/locking/lockdep.c
104950@@ -613,6 +613,10 @@ static int static_obj(void *obj)
104951 end = (unsigned long) &_end,
104952 addr = (unsigned long) obj;
104953
104954+#ifdef CONFIG_PAX_KERNEXEC
104955+ start = ktla_ktva(start);
104956+#endif
104957+
104958 /*
104959 * static variable?
104960 */
104961@@ -757,6 +761,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
104962 if (!static_obj(lock->key)) {
104963 debug_locks_off();
104964 printk("INFO: trying to register non-static key.\n");
104965+ printk("lock:%pS key:%pS.\n", lock, lock->key);
104966 printk("the code is fine but needs lockdep annotation.\n");
104967 printk("turning off the locking correctness validator.\n");
104968 dump_stack();
104969@@ -3102,7 +3107,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
104970 if (!class)
104971 return 0;
104972 }
104973- atomic_inc((atomic_t *)&class->ops);
104974+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
104975 if (very_verbose(class)) {
104976 printk("\nacquire class [%p] %s", class->key, class->name);
104977 if (class->name_version > 1)
104978diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
104979index d83d798..ea3120d 100644
104980--- a/kernel/locking/lockdep_proc.c
104981+++ b/kernel/locking/lockdep_proc.c
104982@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
104983 return 0;
104984 }
104985
104986- seq_printf(m, "%p", class->key);
104987+ seq_printf(m, "%pK", class->key);
104988 #ifdef CONFIG_DEBUG_LOCKDEP
104989 seq_printf(m, " OPS:%8ld", class->ops);
104990 #endif
104991@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
104992
104993 list_for_each_entry(entry, &class->locks_after, entry) {
104994 if (entry->distance == 1) {
104995- seq_printf(m, " -> [%p] ", entry->class->key);
104996+ seq_printf(m, " -> [%pK] ", entry->class->key);
104997 print_name(m, entry->class);
104998 seq_puts(m, "\n");
104999 }
105000@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
105001 if (!class->key)
105002 continue;
105003
105004- seq_printf(m, "[%p] ", class->key);
105005+ seq_printf(m, "[%pK] ", class->key);
105006 print_name(m, class);
105007 seq_puts(m, "\n");
105008 }
105009@@ -508,7 +508,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105010 if (!i)
105011 seq_line(m, '-', 40-namelen, namelen);
105012
105013- snprintf(ip, sizeof(ip), "[<%p>]",
105014+ snprintf(ip, sizeof(ip), "[<%pK>]",
105015 (void *)class->contention_point[i]);
105016 seq_printf(m, "%40s %14lu %29s %pS\n",
105017 name, stats->contention_point[i],
105018@@ -523,7 +523,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105019 if (!i)
105020 seq_line(m, '-', 40-namelen, namelen);
105021
105022- snprintf(ip, sizeof(ip), "[<%p>]",
105023+ snprintf(ip, sizeof(ip), "[<%pK>]",
105024 (void *)class->contending_point[i]);
105025 seq_printf(m, "%40s %14lu %29s %pS\n",
105026 name, stats->contending_point[i],
105027diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
105028index 3ef3736..9c951fa 100644
105029--- a/kernel/locking/mutex-debug.c
105030+++ b/kernel/locking/mutex-debug.c
105031@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
105032 }
105033
105034 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105035- struct thread_info *ti)
105036+ struct task_struct *task)
105037 {
105038 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
105039
105040 /* Mark the current thread as blocked on the lock: */
105041- ti->task->blocked_on = waiter;
105042+ task->blocked_on = waiter;
105043 }
105044
105045 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105046- struct thread_info *ti)
105047+ struct task_struct *task)
105048 {
105049 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
105050- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
105051- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
105052- ti->task->blocked_on = NULL;
105053+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
105054+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
105055+ task->blocked_on = NULL;
105056
105057 list_del_init(&waiter->list);
105058 waiter->task = NULL;
105059diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
105060index 0799fd3..d06ae3b 100644
105061--- a/kernel/locking/mutex-debug.h
105062+++ b/kernel/locking/mutex-debug.h
105063@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
105064 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
105065 extern void debug_mutex_add_waiter(struct mutex *lock,
105066 struct mutex_waiter *waiter,
105067- struct thread_info *ti);
105068+ struct task_struct *task);
105069 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105070- struct thread_info *ti);
105071+ struct task_struct *task);
105072 extern void debug_mutex_unlock(struct mutex *lock);
105073 extern void debug_mutex_init(struct mutex *lock, const char *name,
105074 struct lock_class_key *key);
105075diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
105076index 4cccea6..4382db9 100644
105077--- a/kernel/locking/mutex.c
105078+++ b/kernel/locking/mutex.c
105079@@ -533,7 +533,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105080 goto skip_wait;
105081
105082 debug_mutex_lock_common(lock, &waiter);
105083- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
105084+ debug_mutex_add_waiter(lock, &waiter, task);
105085
105086 /* add waiting tasks to the end of the waitqueue (FIFO): */
105087 list_add_tail(&waiter.list, &lock->wait_list);
105088@@ -580,7 +580,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105089 }
105090 __set_task_state(task, TASK_RUNNING);
105091
105092- mutex_remove_waiter(lock, &waiter, current_thread_info());
105093+ mutex_remove_waiter(lock, &waiter, task);
105094 /* set it to 0 if there are no waiters left: */
105095 if (likely(list_empty(&lock->wait_list)))
105096 atomic_set(&lock->count, 0);
105097@@ -601,7 +601,7 @@ skip_wait:
105098 return 0;
105099
105100 err:
105101- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
105102+ mutex_remove_waiter(lock, &waiter, task);
105103 spin_unlock_mutex(&lock->wait_lock, flags);
105104 debug_mutex_free_waiter(&waiter);
105105 mutex_release(&lock->dep_map, 1, ip);
105106diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
105107index 1d96dd0..994ff19 100644
105108--- a/kernel/locking/rtmutex-tester.c
105109+++ b/kernel/locking/rtmutex-tester.c
105110@@ -22,7 +22,7 @@
105111 #define MAX_RT_TEST_MUTEXES 8
105112
105113 static spinlock_t rttest_lock;
105114-static atomic_t rttest_event;
105115+static atomic_unchecked_t rttest_event;
105116
105117 struct test_thread_data {
105118 int opcode;
105119@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105120
105121 case RTTEST_LOCKCONT:
105122 td->mutexes[td->opdata] = 1;
105123- td->event = atomic_add_return(1, &rttest_event);
105124+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105125 return 0;
105126
105127 case RTTEST_RESET:
105128@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105129 return 0;
105130
105131 case RTTEST_RESETEVENT:
105132- atomic_set(&rttest_event, 0);
105133+ atomic_set_unchecked(&rttest_event, 0);
105134 return 0;
105135
105136 default:
105137@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105138 return ret;
105139
105140 td->mutexes[id] = 1;
105141- td->event = atomic_add_return(1, &rttest_event);
105142+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105143 rt_mutex_lock(&mutexes[id]);
105144- td->event = atomic_add_return(1, &rttest_event);
105145+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105146 td->mutexes[id] = 4;
105147 return 0;
105148
105149@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105150 return ret;
105151
105152 td->mutexes[id] = 1;
105153- td->event = atomic_add_return(1, &rttest_event);
105154+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105155 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
105156- td->event = atomic_add_return(1, &rttest_event);
105157+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105158 td->mutexes[id] = ret ? 0 : 4;
105159 return ret ? -EINTR : 0;
105160
105161@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105162 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
105163 return ret;
105164
105165- td->event = atomic_add_return(1, &rttest_event);
105166+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105167 rt_mutex_unlock(&mutexes[id]);
105168- td->event = atomic_add_return(1, &rttest_event);
105169+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105170 td->mutexes[id] = 0;
105171 return 0;
105172
105173@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105174 break;
105175
105176 td->mutexes[dat] = 2;
105177- td->event = atomic_add_return(1, &rttest_event);
105178+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105179 break;
105180
105181 default:
105182@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105183 return;
105184
105185 td->mutexes[dat] = 3;
105186- td->event = atomic_add_return(1, &rttest_event);
105187+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105188 break;
105189
105190 case RTTEST_LOCKNOWAIT:
105191@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105192 return;
105193
105194 td->mutexes[dat] = 1;
105195- td->event = atomic_add_return(1, &rttest_event);
105196+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105197 return;
105198
105199 default:
105200diff --git a/kernel/module.c b/kernel/module.c
105201index cfc9e84..a058697 100644
105202--- a/kernel/module.c
105203+++ b/kernel/module.c
105204@@ -59,6 +59,7 @@
105205 #include <linux/jump_label.h>
105206 #include <linux/pfn.h>
105207 #include <linux/bsearch.h>
105208+#include <linux/grsecurity.h>
105209 #include <uapi/linux/module.h>
105210 #include "module-internal.h"
105211
105212@@ -145,7 +146,7 @@ module_param(sig_enforce, bool_enable_only, 0644);
105213 #endif /* CONFIG_MODULE_SIG */
105214
105215 /* Block module loading/unloading? */
105216-int modules_disabled = 0;
105217+int modules_disabled __read_only = 0;
105218 core_param(nomodule, modules_disabled, bint, 0);
105219
105220 /* Waiting for a module to finish initializing? */
105221@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
105222
105223 /* Bounds of module allocation, for speeding __module_address.
105224 * Protected by module_mutex. */
105225-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
105226+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
105227+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
105228
105229 int register_module_notifier(struct notifier_block *nb)
105230 {
105231@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105232 return true;
105233
105234 list_for_each_entry_rcu(mod, &modules, list) {
105235- struct symsearch arr[] = {
105236+ struct symsearch modarr[] = {
105237 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
105238 NOT_GPL_ONLY, false },
105239 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
105240@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105241 if (mod->state == MODULE_STATE_UNFORMED)
105242 continue;
105243
105244- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
105245+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
105246 return true;
105247 }
105248 return false;
105249@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
105250 if (!pcpusec->sh_size)
105251 return 0;
105252
105253- if (align > PAGE_SIZE) {
105254+ if (align-1 >= PAGE_SIZE) {
105255 pr_warn("%s: per-cpu alignment %li > %li\n",
105256 mod->name, align, PAGE_SIZE);
105257 align = PAGE_SIZE;
105258@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
105259 static ssize_t show_coresize(struct module_attribute *mattr,
105260 struct module_kobject *mk, char *buffer)
105261 {
105262- return sprintf(buffer, "%u\n", mk->mod->core_size);
105263+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
105264 }
105265
105266 static struct module_attribute modinfo_coresize =
105267@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
105268 static ssize_t show_initsize(struct module_attribute *mattr,
105269 struct module_kobject *mk, char *buffer)
105270 {
105271- return sprintf(buffer, "%u\n", mk->mod->init_size);
105272+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
105273 }
105274
105275 static struct module_attribute modinfo_initsize =
105276@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
105277 goto bad_version;
105278 }
105279
105280+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105281+ /*
105282+ * avoid potentially printing jibberish on attempted load
105283+ * of a module randomized with a different seed
105284+ */
105285+ pr_warn("no symbol version for %s\n", symname);
105286+#else
105287 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
105288+#endif
105289 return 0;
105290
105291 bad_version:
105292+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105293+ /*
105294+ * avoid potentially printing jibberish on attempted load
105295+ * of a module randomized with a different seed
105296+ */
105297+ pr_warn("attempted module disagrees about version of symbol %s\n",
105298+ symname);
105299+#else
105300 pr_warn("%s: disagrees about version of symbol %s\n",
105301 mod->name, symname);
105302+#endif
105303 return 0;
105304 }
105305
105306@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
105307 */
105308 #ifdef CONFIG_SYSFS
105309
105310-#ifdef CONFIG_KALLSYMS
105311+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
105312 static inline bool sect_empty(const Elf_Shdr *sect)
105313 {
105314 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
105315@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
105316 {
105317 unsigned int notes, loaded, i;
105318 struct module_notes_attrs *notes_attrs;
105319- struct bin_attribute *nattr;
105320+ bin_attribute_no_const *nattr;
105321
105322 /* failed to create section attributes, so can't create notes */
105323 if (!mod->sect_attrs)
105324@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
105325 static int module_add_modinfo_attrs(struct module *mod)
105326 {
105327 struct module_attribute *attr;
105328- struct module_attribute *temp_attr;
105329+ module_attribute_no_const *temp_attr;
105330 int error = 0;
105331 int i;
105332
105333@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
105334
105335 static void unset_module_core_ro_nx(struct module *mod)
105336 {
105337- set_page_attributes(mod->module_core + mod->core_text_size,
105338- mod->module_core + mod->core_size,
105339+ set_page_attributes(mod->module_core_rw,
105340+ mod->module_core_rw + mod->core_size_rw,
105341 set_memory_x);
105342- set_page_attributes(mod->module_core,
105343- mod->module_core + mod->core_ro_size,
105344+ set_page_attributes(mod->module_core_rx,
105345+ mod->module_core_rx + mod->core_size_rx,
105346 set_memory_rw);
105347 }
105348
105349 static void unset_module_init_ro_nx(struct module *mod)
105350 {
105351- set_page_attributes(mod->module_init + mod->init_text_size,
105352- mod->module_init + mod->init_size,
105353+ set_page_attributes(mod->module_init_rw,
105354+ mod->module_init_rw + mod->init_size_rw,
105355 set_memory_x);
105356- set_page_attributes(mod->module_init,
105357- mod->module_init + mod->init_ro_size,
105358+ set_page_attributes(mod->module_init_rx,
105359+ mod->module_init_rx + mod->init_size_rx,
105360 set_memory_rw);
105361 }
105362
105363@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
105364 list_for_each_entry_rcu(mod, &modules, list) {
105365 if (mod->state == MODULE_STATE_UNFORMED)
105366 continue;
105367- if ((mod->module_core) && (mod->core_text_size)) {
105368- set_page_attributes(mod->module_core,
105369- mod->module_core + mod->core_text_size,
105370+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105371+ set_page_attributes(mod->module_core_rx,
105372+ mod->module_core_rx + mod->core_size_rx,
105373 set_memory_rw);
105374 }
105375- if ((mod->module_init) && (mod->init_text_size)) {
105376- set_page_attributes(mod->module_init,
105377- mod->module_init + mod->init_text_size,
105378+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105379+ set_page_attributes(mod->module_init_rx,
105380+ mod->module_init_rx + mod->init_size_rx,
105381 set_memory_rw);
105382 }
105383 }
105384@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
105385 list_for_each_entry_rcu(mod, &modules, list) {
105386 if (mod->state == MODULE_STATE_UNFORMED)
105387 continue;
105388- if ((mod->module_core) && (mod->core_text_size)) {
105389- set_page_attributes(mod->module_core,
105390- mod->module_core + mod->core_text_size,
105391+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105392+ set_page_attributes(mod->module_core_rx,
105393+ mod->module_core_rx + mod->core_size_rx,
105394 set_memory_ro);
105395 }
105396- if ((mod->module_init) && (mod->init_text_size)) {
105397- set_page_attributes(mod->module_init,
105398- mod->module_init + mod->init_text_size,
105399+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105400+ set_page_attributes(mod->module_init_rx,
105401+ mod->module_init_rx + mod->init_size_rx,
105402 set_memory_ro);
105403 }
105404 }
105405@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
105406 #else
105407 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
105408 static void unset_module_core_ro_nx(struct module *mod) { }
105409-static void unset_module_init_ro_nx(struct module *mod) { }
105410+static void unset_module_init_ro_nx(struct module *mod)
105411+{
105412+
105413+#ifdef CONFIG_PAX_KERNEXEC
105414+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105415+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105416+#endif
105417+
105418+}
105419 #endif
105420
105421 void __weak module_memfree(void *module_region)
105422@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
105423 /* This may be NULL, but that's OK */
105424 unset_module_init_ro_nx(mod);
105425 module_arch_freeing_init(mod);
105426- module_memfree(mod->module_init);
105427+ module_memfree(mod->module_init_rw);
105428+ module_memfree_exec(mod->module_init_rx);
105429 kfree(mod->args);
105430 percpu_modfree(mod);
105431
105432 /* Free lock-classes; relies on the preceding sync_rcu(). */
105433- lockdep_free_key_range(mod->module_core, mod->core_size);
105434+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105435+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105436
105437 /* Finally, free the core (containing the module structure) */
105438 unset_module_core_ro_nx(mod);
105439- module_memfree(mod->module_core);
105440+ module_memfree_exec(mod->module_core_rx);
105441+ module_memfree(mod->module_core_rw);
105442
105443 #ifdef CONFIG_MPU
105444 update_protections(current->mm);
105445@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105446 int ret = 0;
105447 const struct kernel_symbol *ksym;
105448
105449+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105450+ int is_fs_load = 0;
105451+ int register_filesystem_found = 0;
105452+ char *p;
105453+
105454+ p = strstr(mod->args, "grsec_modharden_fs");
105455+ if (p) {
105456+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
105457+ /* copy \0 as well */
105458+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
105459+ is_fs_load = 1;
105460+ }
105461+#endif
105462+
105463 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
105464 const char *name = info->strtab + sym[i].st_name;
105465
105466+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105467+ /* it's a real shame this will never get ripped and copied
105468+ upstream! ;(
105469+ */
105470+ if (is_fs_load && !strcmp(name, "register_filesystem"))
105471+ register_filesystem_found = 1;
105472+#endif
105473+
105474 switch (sym[i].st_shndx) {
105475 case SHN_COMMON:
105476 /* Ignore common symbols */
105477@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105478 ksym = resolve_symbol_wait(mod, info, name);
105479 /* Ok if resolved. */
105480 if (ksym && !IS_ERR(ksym)) {
105481+ pax_open_kernel();
105482 sym[i].st_value = ksym->value;
105483+ pax_close_kernel();
105484 break;
105485 }
105486
105487@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105488 secbase = (unsigned long)mod_percpu(mod);
105489 else
105490 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
105491+ pax_open_kernel();
105492 sym[i].st_value += secbase;
105493+ pax_close_kernel();
105494 break;
105495 }
105496 }
105497
105498+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105499+ if (is_fs_load && !register_filesystem_found) {
105500+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
105501+ ret = -EPERM;
105502+ }
105503+#endif
105504+
105505 return ret;
105506 }
105507
105508@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
105509 || s->sh_entsize != ~0UL
105510 || strstarts(sname, ".init"))
105511 continue;
105512- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
105513+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105514+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
105515+ else
105516+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
105517 pr_debug("\t%s\n", sname);
105518 }
105519- switch (m) {
105520- case 0: /* executable */
105521- mod->core_size = debug_align(mod->core_size);
105522- mod->core_text_size = mod->core_size;
105523- break;
105524- case 1: /* RO: text and ro-data */
105525- mod->core_size = debug_align(mod->core_size);
105526- mod->core_ro_size = mod->core_size;
105527- break;
105528- case 3: /* whole core */
105529- mod->core_size = debug_align(mod->core_size);
105530- break;
105531- }
105532 }
105533
105534 pr_debug("Init section allocation order:\n");
105535@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
105536 || s->sh_entsize != ~0UL
105537 || !strstarts(sname, ".init"))
105538 continue;
105539- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
105540- | INIT_OFFSET_MASK);
105541+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105542+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
105543+ else
105544+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
105545+ s->sh_entsize |= INIT_OFFSET_MASK;
105546 pr_debug("\t%s\n", sname);
105547 }
105548- switch (m) {
105549- case 0: /* executable */
105550- mod->init_size = debug_align(mod->init_size);
105551- mod->init_text_size = mod->init_size;
105552- break;
105553- case 1: /* RO: text and ro-data */
105554- mod->init_size = debug_align(mod->init_size);
105555- mod->init_ro_size = mod->init_size;
105556- break;
105557- case 3: /* whole init */
105558- mod->init_size = debug_align(mod->init_size);
105559- break;
105560- }
105561 }
105562 }
105563
105564@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105565
105566 /* Put symbol section at end of init part of module. */
105567 symsect->sh_flags |= SHF_ALLOC;
105568- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
105569+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
105570 info->index.sym) | INIT_OFFSET_MASK;
105571 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
105572
105573@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105574 }
105575
105576 /* Append room for core symbols at end of core part. */
105577- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
105578- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
105579- mod->core_size += strtab_size;
105580- mod->core_size = debug_align(mod->core_size);
105581+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
105582+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
105583+ mod->core_size_rx += strtab_size;
105584+ mod->core_size_rx = debug_align(mod->core_size_rx);
105585
105586 /* Put string table section at end of init part of module. */
105587 strsect->sh_flags |= SHF_ALLOC;
105588- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
105589+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
105590 info->index.str) | INIT_OFFSET_MASK;
105591- mod->init_size = debug_align(mod->init_size);
105592+ mod->init_size_rx = debug_align(mod->init_size_rx);
105593 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
105594 }
105595
105596@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105597 /* Make sure we get permanent strtab: don't use info->strtab. */
105598 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
105599
105600+ pax_open_kernel();
105601+
105602 /* Set types up while we still have access to sections. */
105603 for (i = 0; i < mod->num_symtab; i++)
105604 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
105605
105606- mod->core_symtab = dst = mod->module_core + info->symoffs;
105607- mod->core_strtab = s = mod->module_core + info->stroffs;
105608+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
105609+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
105610 src = mod->symtab;
105611 for (ndst = i = 0; i < mod->num_symtab; i++) {
105612 if (i == 0 ||
105613@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105614 }
105615 }
105616 mod->core_num_syms = ndst;
105617+
105618+ pax_close_kernel();
105619 }
105620 #else
105621 static inline void layout_symtab(struct module *mod, struct load_info *info)
105622@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
105623 return vmalloc_exec(size);
105624 }
105625
105626-static void *module_alloc_update_bounds(unsigned long size)
105627+static void *module_alloc_update_bounds_rw(unsigned long size)
105628 {
105629 void *ret = module_alloc(size);
105630
105631 if (ret) {
105632 mutex_lock(&module_mutex);
105633 /* Update module bounds. */
105634- if ((unsigned long)ret < module_addr_min)
105635- module_addr_min = (unsigned long)ret;
105636- if ((unsigned long)ret + size > module_addr_max)
105637- module_addr_max = (unsigned long)ret + size;
105638+ if ((unsigned long)ret < module_addr_min_rw)
105639+ module_addr_min_rw = (unsigned long)ret;
105640+ if ((unsigned long)ret + size > module_addr_max_rw)
105641+ module_addr_max_rw = (unsigned long)ret + size;
105642+ mutex_unlock(&module_mutex);
105643+ }
105644+ return ret;
105645+}
105646+
105647+static void *module_alloc_update_bounds_rx(unsigned long size)
105648+{
105649+ void *ret = module_alloc_exec(size);
105650+
105651+ if (ret) {
105652+ mutex_lock(&module_mutex);
105653+ /* Update module bounds. */
105654+ if ((unsigned long)ret < module_addr_min_rx)
105655+ module_addr_min_rx = (unsigned long)ret;
105656+ if ((unsigned long)ret + size > module_addr_max_rx)
105657+ module_addr_max_rx = (unsigned long)ret + size;
105658 mutex_unlock(&module_mutex);
105659 }
105660 return ret;
105661@@ -2666,7 +2729,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105662 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
105663
105664 if (info->index.sym == 0) {
105665+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105666+ /*
105667+ * avoid potentially printing jibberish on attempted load
105668+ * of a module randomized with a different seed
105669+ */
105670+ pr_warn("module has no symbols (stripped?)\n");
105671+#else
105672 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
105673+#endif
105674 return ERR_PTR(-ENOEXEC);
105675 }
105676
105677@@ -2682,8 +2753,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105678 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105679 {
105680 const char *modmagic = get_modinfo(info, "vermagic");
105681+ const char *license = get_modinfo(info, "license");
105682 int err;
105683
105684+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
105685+ if (!license || !license_is_gpl_compatible(license))
105686+ return -ENOEXEC;
105687+#endif
105688+
105689 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
105690 modmagic = NULL;
105691
105692@@ -2708,7 +2785,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105693 }
105694
105695 /* Set up license info based on the info section */
105696- set_license(mod, get_modinfo(info, "license"));
105697+ set_license(mod, license);
105698
105699 return 0;
105700 }
105701@@ -2805,7 +2882,7 @@ static int move_module(struct module *mod, struct load_info *info)
105702 void *ptr;
105703
105704 /* Do the allocs. */
105705- ptr = module_alloc_update_bounds(mod->core_size);
105706+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
105707 /*
105708 * The pointer to this block is stored in the module structure
105709 * which is inside the block. Just mark it as not being a
105710@@ -2815,11 +2892,11 @@ static int move_module(struct module *mod, struct load_info *info)
105711 if (!ptr)
105712 return -ENOMEM;
105713
105714- memset(ptr, 0, mod->core_size);
105715- mod->module_core = ptr;
105716+ memset(ptr, 0, mod->core_size_rw);
105717+ mod->module_core_rw = ptr;
105718
105719- if (mod->init_size) {
105720- ptr = module_alloc_update_bounds(mod->init_size);
105721+ if (mod->init_size_rw) {
105722+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
105723 /*
105724 * The pointer to this block is stored in the module structure
105725 * which is inside the block. This block doesn't need to be
105726@@ -2828,13 +2905,45 @@ static int move_module(struct module *mod, struct load_info *info)
105727 */
105728 kmemleak_ignore(ptr);
105729 if (!ptr) {
105730- module_memfree(mod->module_core);
105731+ module_memfree(mod->module_core_rw);
105732 return -ENOMEM;
105733 }
105734- memset(ptr, 0, mod->init_size);
105735- mod->module_init = ptr;
105736+ memset(ptr, 0, mod->init_size_rw);
105737+ mod->module_init_rw = ptr;
105738 } else
105739- mod->module_init = NULL;
105740+ mod->module_init_rw = NULL;
105741+
105742+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
105743+ kmemleak_not_leak(ptr);
105744+ if (!ptr) {
105745+ if (mod->module_init_rw)
105746+ module_memfree(mod->module_init_rw);
105747+ module_memfree(mod->module_core_rw);
105748+ return -ENOMEM;
105749+ }
105750+
105751+ pax_open_kernel();
105752+ memset(ptr, 0, mod->core_size_rx);
105753+ pax_close_kernel();
105754+ mod->module_core_rx = ptr;
105755+
105756+ if (mod->init_size_rx) {
105757+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
105758+ kmemleak_ignore(ptr);
105759+ if (!ptr && mod->init_size_rx) {
105760+ module_memfree_exec(mod->module_core_rx);
105761+ if (mod->module_init_rw)
105762+ module_memfree(mod->module_init_rw);
105763+ module_memfree(mod->module_core_rw);
105764+ return -ENOMEM;
105765+ }
105766+
105767+ pax_open_kernel();
105768+ memset(ptr, 0, mod->init_size_rx);
105769+ pax_close_kernel();
105770+ mod->module_init_rx = ptr;
105771+ } else
105772+ mod->module_init_rx = NULL;
105773
105774 /* Transfer each section which specifies SHF_ALLOC */
105775 pr_debug("final section addresses:\n");
105776@@ -2845,16 +2954,45 @@ static int move_module(struct module *mod, struct load_info *info)
105777 if (!(shdr->sh_flags & SHF_ALLOC))
105778 continue;
105779
105780- if (shdr->sh_entsize & INIT_OFFSET_MASK)
105781- dest = mod->module_init
105782- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105783- else
105784- dest = mod->module_core + shdr->sh_entsize;
105785+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
105786+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105787+ dest = mod->module_init_rw
105788+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105789+ else
105790+ dest = mod->module_init_rx
105791+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105792+ } else {
105793+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105794+ dest = mod->module_core_rw + shdr->sh_entsize;
105795+ else
105796+ dest = mod->module_core_rx + shdr->sh_entsize;
105797+ }
105798+
105799+ if (shdr->sh_type != SHT_NOBITS) {
105800+
105801+#ifdef CONFIG_PAX_KERNEXEC
105802+#ifdef CONFIG_X86_64
105803+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
105804+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
105805+#endif
105806+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
105807+ pax_open_kernel();
105808+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105809+ pax_close_kernel();
105810+ } else
105811+#endif
105812
105813- if (shdr->sh_type != SHT_NOBITS)
105814 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105815+ }
105816 /* Update sh_addr to point to copy in image. */
105817- shdr->sh_addr = (unsigned long)dest;
105818+
105819+#ifdef CONFIG_PAX_KERNEXEC
105820+ if (shdr->sh_flags & SHF_EXECINSTR)
105821+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
105822+ else
105823+#endif
105824+
105825+ shdr->sh_addr = (unsigned long)dest;
105826 pr_debug("\t0x%lx %s\n",
105827 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
105828 }
105829@@ -2911,12 +3049,12 @@ static void flush_module_icache(const struct module *mod)
105830 * Do it before processing of module parameters, so the module
105831 * can provide parameter accessor functions of its own.
105832 */
105833- if (mod->module_init)
105834- flush_icache_range((unsigned long)mod->module_init,
105835- (unsigned long)mod->module_init
105836- + mod->init_size);
105837- flush_icache_range((unsigned long)mod->module_core,
105838- (unsigned long)mod->module_core + mod->core_size);
105839+ if (mod->module_init_rx)
105840+ flush_icache_range((unsigned long)mod->module_init_rx,
105841+ (unsigned long)mod->module_init_rx
105842+ + mod->init_size_rx);
105843+ flush_icache_range((unsigned long)mod->module_core_rx,
105844+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
105845
105846 set_fs(old_fs);
105847 }
105848@@ -2974,8 +3112,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
105849 {
105850 percpu_modfree(mod);
105851 module_arch_freeing_init(mod);
105852- module_memfree(mod->module_init);
105853- module_memfree(mod->module_core);
105854+ module_memfree_exec(mod->module_init_rx);
105855+ module_memfree_exec(mod->module_core_rx);
105856+ module_memfree(mod->module_init_rw);
105857+ module_memfree(mod->module_core_rw);
105858 }
105859
105860 int __weak module_finalize(const Elf_Ehdr *hdr,
105861@@ -2988,7 +3128,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
105862 static int post_relocation(struct module *mod, const struct load_info *info)
105863 {
105864 /* Sort exception table now relocations are done. */
105865+ pax_open_kernel();
105866 sort_extable(mod->extable, mod->extable + mod->num_exentries);
105867+ pax_close_kernel();
105868
105869 /* Copy relocated percpu area over. */
105870 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
105871@@ -3036,13 +3178,15 @@ static void do_mod_ctors(struct module *mod)
105872 /* For freeing module_init on success, in case kallsyms traversing */
105873 struct mod_initfree {
105874 struct rcu_head rcu;
105875- void *module_init;
105876+ void *module_init_rw;
105877+ void *module_init_rx;
105878 };
105879
105880 static void do_free_init(struct rcu_head *head)
105881 {
105882 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
105883- module_memfree(m->module_init);
105884+ module_memfree(m->module_init_rw);
105885+ module_memfree_exec(m->module_init_rx);
105886 kfree(m);
105887 }
105888
105889@@ -3062,7 +3206,8 @@ static noinline int do_init_module(struct module *mod)
105890 ret = -ENOMEM;
105891 goto fail;
105892 }
105893- freeinit->module_init = mod->module_init;
105894+ freeinit->module_init_rw = mod->module_init_rw;
105895+ freeinit->module_init_rx = mod->module_init_rx;
105896
105897 /*
105898 * We want to find out whether @mod uses async during init. Clear
105899@@ -3121,10 +3266,10 @@ static noinline int do_init_module(struct module *mod)
105900 #endif
105901 unset_module_init_ro_nx(mod);
105902 module_arch_freeing_init(mod);
105903- mod->module_init = NULL;
105904- mod->init_size = 0;
105905- mod->init_ro_size = 0;
105906- mod->init_text_size = 0;
105907+ mod->module_init_rw = NULL;
105908+ mod->module_init_rx = NULL;
105909+ mod->init_size_rw = 0;
105910+ mod->init_size_rx = 0;
105911 /*
105912 * We want to free module_init, but be aware that kallsyms may be
105913 * walking this with preempt disabled. In all the failure paths,
105914@@ -3212,16 +3357,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
105915 module_bug_finalize(info->hdr, info->sechdrs, mod);
105916
105917 /* Set RO and NX regions for core */
105918- set_section_ro_nx(mod->module_core,
105919- mod->core_text_size,
105920- mod->core_ro_size,
105921- mod->core_size);
105922+ set_section_ro_nx(mod->module_core_rx,
105923+ mod->core_size_rx,
105924+ mod->core_size_rx,
105925+ mod->core_size_rx);
105926
105927 /* Set RO and NX regions for init */
105928- set_section_ro_nx(mod->module_init,
105929- mod->init_text_size,
105930- mod->init_ro_size,
105931- mod->init_size);
105932+ set_section_ro_nx(mod->module_init_rx,
105933+ mod->init_size_rx,
105934+ mod->init_size_rx,
105935+ mod->init_size_rx);
105936
105937 /* Mark state as coming so strong_try_module_get() ignores us,
105938 * but kallsyms etc. can see us. */
105939@@ -3305,9 +3450,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
105940 if (err)
105941 goto free_unload;
105942
105943+ /* Now copy in args */
105944+ mod->args = strndup_user(uargs, ~0UL >> 1);
105945+ if (IS_ERR(mod->args)) {
105946+ err = PTR_ERR(mod->args);
105947+ goto free_unload;
105948+ }
105949+
105950 /* Set up MODINFO_ATTR fields */
105951 setup_modinfo(mod, info);
105952
105953+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105954+ {
105955+ char *p, *p2;
105956+
105957+ if (strstr(mod->args, "grsec_modharden_netdev")) {
105958+ 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);
105959+ err = -EPERM;
105960+ goto free_modinfo;
105961+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
105962+ p += sizeof("grsec_modharden_normal") - 1;
105963+ p2 = strstr(p, "_");
105964+ if (p2) {
105965+ *p2 = '\0';
105966+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
105967+ *p2 = '_';
105968+ }
105969+ err = -EPERM;
105970+ goto free_modinfo;
105971+ }
105972+ }
105973+#endif
105974+
105975 /* Fix up syms, so that st_value is a pointer to location. */
105976 err = simplify_symbols(mod, info);
105977 if (err < 0)
105978@@ -3323,13 +3497,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
105979
105980 flush_module_icache(mod);
105981
105982- /* Now copy in args */
105983- mod->args = strndup_user(uargs, ~0UL >> 1);
105984- if (IS_ERR(mod->args)) {
105985- err = PTR_ERR(mod->args);
105986- goto free_arch_cleanup;
105987- }
105988-
105989 dynamic_debug_setup(info->debug, info->num_debug);
105990
105991 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
105992@@ -3380,11 +3547,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
105993 ddebug_cleanup:
105994 dynamic_debug_remove(info->debug);
105995 synchronize_sched();
105996- kfree(mod->args);
105997- free_arch_cleanup:
105998 module_arch_cleanup(mod);
105999 free_modinfo:
106000 free_modinfo(mod);
106001+ kfree(mod->args);
106002 free_unload:
106003 module_unload_free(mod);
106004 unlink_mod:
106005@@ -3397,7 +3563,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
106006 mutex_unlock(&module_mutex);
106007 free_module:
106008 /* Free lock-classes; relies on the preceding sync_rcu() */
106009- lockdep_free_key_range(mod->module_core, mod->core_size);
106010+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
106011+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
106012
106013 module_deallocate(mod, info);
106014 free_copy:
106015@@ -3474,10 +3641,16 @@ static const char *get_ksymbol(struct module *mod,
106016 unsigned long nextval;
106017
106018 /* At worse, next value is at end of module */
106019- if (within_module_init(addr, mod))
106020- nextval = (unsigned long)mod->module_init+mod->init_text_size;
106021+ if (within_module_init_rx(addr, mod))
106022+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
106023+ else if (within_module_init_rw(addr, mod))
106024+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
106025+ else if (within_module_core_rx(addr, mod))
106026+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
106027+ else if (within_module_core_rw(addr, mod))
106028+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
106029 else
106030- nextval = (unsigned long)mod->module_core+mod->core_text_size;
106031+ return NULL;
106032
106033 /* Scan for closest preceding symbol, and next symbol. (ELF
106034 starts real symbols at 1). */
106035@@ -3725,7 +3898,7 @@ static int m_show(struct seq_file *m, void *p)
106036 return 0;
106037
106038 seq_printf(m, "%s %u",
106039- mod->name, mod->init_size + mod->core_size);
106040+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
106041 print_unload_info(m, mod);
106042
106043 /* Informative for users. */
106044@@ -3734,7 +3907,7 @@ static int m_show(struct seq_file *m, void *p)
106045 mod->state == MODULE_STATE_COMING ? "Loading" :
106046 "Live");
106047 /* Used by oprofile and other similar tools. */
106048- seq_printf(m, " 0x%pK", mod->module_core);
106049+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
106050
106051 /* Taints info */
106052 if (mod->taints)
106053@@ -3770,7 +3943,17 @@ static const struct file_operations proc_modules_operations = {
106054
106055 static int __init proc_modules_init(void)
106056 {
106057+#ifndef CONFIG_GRKERNSEC_HIDESYM
106058+#ifdef CONFIG_GRKERNSEC_PROC_USER
106059+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106060+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
106061+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
106062+#else
106063 proc_create("modules", 0, NULL, &proc_modules_operations);
106064+#endif
106065+#else
106066+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106067+#endif
106068 return 0;
106069 }
106070 module_init(proc_modules_init);
106071@@ -3831,7 +4014,8 @@ struct module *__module_address(unsigned long addr)
106072 {
106073 struct module *mod;
106074
106075- if (addr < module_addr_min || addr > module_addr_max)
106076+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
106077+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
106078 return NULL;
106079
106080 list_for_each_entry_rcu(mod, &modules, list) {
106081@@ -3872,11 +4056,20 @@ bool is_module_text_address(unsigned long addr)
106082 */
106083 struct module *__module_text_address(unsigned long addr)
106084 {
106085- struct module *mod = __module_address(addr);
106086+ struct module *mod;
106087+
106088+#ifdef CONFIG_X86_32
106089+ addr = ktla_ktva(addr);
106090+#endif
106091+
106092+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
106093+ return NULL;
106094+
106095+ mod = __module_address(addr);
106096+
106097 if (mod) {
106098 /* Make sure it's within the text section. */
106099- if (!within(addr, mod->module_init, mod->init_text_size)
106100- && !within(addr, mod->module_core, mod->core_text_size))
106101+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
106102 mod = NULL;
106103 }
106104 return mod;
106105diff --git a/kernel/notifier.c b/kernel/notifier.c
106106index ae9fc7c..5085fbf 100644
106107--- a/kernel/notifier.c
106108+++ b/kernel/notifier.c
106109@@ -5,6 +5,7 @@
106110 #include <linux/rcupdate.h>
106111 #include <linux/vmalloc.h>
106112 #include <linux/reboot.h>
106113+#include <linux/mm.h>
106114
106115 /*
106116 * Notifier list for kernel code which wants to be called
106117@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
106118 while ((*nl) != NULL) {
106119 if (n->priority > (*nl)->priority)
106120 break;
106121- nl = &((*nl)->next);
106122+ nl = (struct notifier_block **)&((*nl)->next);
106123 }
106124- n->next = *nl;
106125+ pax_open_kernel();
106126+ *(const void **)&n->next = *nl;
106127 rcu_assign_pointer(*nl, n);
106128+ pax_close_kernel();
106129 return 0;
106130 }
106131
106132@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
106133 return 0;
106134 if (n->priority > (*nl)->priority)
106135 break;
106136- nl = &((*nl)->next);
106137+ nl = (struct notifier_block **)&((*nl)->next);
106138 }
106139- n->next = *nl;
106140+ pax_open_kernel();
106141+ *(const void **)&n->next = *nl;
106142 rcu_assign_pointer(*nl, n);
106143+ pax_close_kernel();
106144 return 0;
106145 }
106146
106147@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
106148 {
106149 while ((*nl) != NULL) {
106150 if ((*nl) == n) {
106151+ pax_open_kernel();
106152 rcu_assign_pointer(*nl, n->next);
106153+ pax_close_kernel();
106154 return 0;
106155 }
106156- nl = &((*nl)->next);
106157+ nl = (struct notifier_block **)&((*nl)->next);
106158 }
106159 return -ENOENT;
106160 }
106161diff --git a/kernel/padata.c b/kernel/padata.c
106162index b38bea9..91acfbe 100644
106163--- a/kernel/padata.c
106164+++ b/kernel/padata.c
106165@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
106166 * seq_nr mod. number of cpus in use.
106167 */
106168
106169- seq_nr = atomic_inc_return(&pd->seq_nr);
106170+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
106171 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
106172
106173 return padata_index_to_cpu(pd, cpu_index);
106174@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
106175 padata_init_pqueues(pd);
106176 padata_init_squeues(pd);
106177 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
106178- atomic_set(&pd->seq_nr, -1);
106179+ atomic_set_unchecked(&pd->seq_nr, -1);
106180 atomic_set(&pd->reorder_objects, 0);
106181 atomic_set(&pd->refcnt, 0);
106182 pd->pinst = pinst;
106183diff --git a/kernel/panic.c b/kernel/panic.c
106184index 8136ad7..15c857b 100644
106185--- a/kernel/panic.c
106186+++ b/kernel/panic.c
106187@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
106188 /*
106189 * Stop ourself in panic -- architecture code may override this
106190 */
106191-void __weak panic_smp_self_stop(void)
106192+void __weak __noreturn panic_smp_self_stop(void)
106193 {
106194 while (1)
106195 cpu_relax();
106196@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
106197 disable_trace_on_warning();
106198
106199 pr_warn("------------[ cut here ]------------\n");
106200- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
106201+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
106202 raw_smp_processor_id(), current->pid, file, line, caller);
106203
106204 if (args)
106205@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
106206 */
106207 __visible void __stack_chk_fail(void)
106208 {
106209- panic("stack-protector: Kernel stack is corrupted in: %p\n",
106210+ dump_stack();
106211+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
106212 __builtin_return_address(0));
106213 }
106214 EXPORT_SYMBOL(__stack_chk_fail);
106215diff --git a/kernel/pid.c b/kernel/pid.c
106216index 4fd07d5..02bce4f 100644
106217--- a/kernel/pid.c
106218+++ b/kernel/pid.c
106219@@ -33,6 +33,7 @@
106220 #include <linux/rculist.h>
106221 #include <linux/bootmem.h>
106222 #include <linux/hash.h>
106223+#include <linux/security.h>
106224 #include <linux/pid_namespace.h>
106225 #include <linux/init_task.h>
106226 #include <linux/syscalls.h>
106227@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
106228
106229 int pid_max = PID_MAX_DEFAULT;
106230
106231-#define RESERVED_PIDS 300
106232+#define RESERVED_PIDS 500
106233
106234 int pid_max_min = RESERVED_PIDS + 1;
106235 int pid_max_max = PID_MAX_LIMIT;
106236@@ -451,10 +452,18 @@ EXPORT_SYMBOL(pid_task);
106237 */
106238 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
106239 {
106240+ struct task_struct *task;
106241+
106242 rcu_lockdep_assert(rcu_read_lock_held(),
106243 "find_task_by_pid_ns() needs rcu_read_lock()"
106244 " protection");
106245- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106246+
106247+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106248+
106249+ if (gr_pid_is_chrooted(task))
106250+ return NULL;
106251+
106252+ return task;
106253 }
106254
106255 struct task_struct *find_task_by_vpid(pid_t vnr)
106256@@ -462,6 +471,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
106257 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
106258 }
106259
106260+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
106261+{
106262+ rcu_lockdep_assert(rcu_read_lock_held(),
106263+ "find_task_by_pid_ns() needs rcu_read_lock()"
106264+ " protection");
106265+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
106266+}
106267+
106268 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
106269 {
106270 struct pid *pid;
106271diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
106272index a65ba13..f600dbb 100644
106273--- a/kernel/pid_namespace.c
106274+++ b/kernel/pid_namespace.c
106275@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
106276 void __user *buffer, size_t *lenp, loff_t *ppos)
106277 {
106278 struct pid_namespace *pid_ns = task_active_pid_ns(current);
106279- struct ctl_table tmp = *table;
106280+ ctl_table_no_const tmp = *table;
106281
106282 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
106283 return -EPERM;
106284diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
106285index 7e01f78..f5da19d 100644
106286--- a/kernel/power/Kconfig
106287+++ b/kernel/power/Kconfig
106288@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
106289 config HIBERNATION
106290 bool "Hibernation (aka 'suspend to disk')"
106291 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
106292+ depends on !GRKERNSEC_KMEM
106293+ depends on !PAX_MEMORY_SANITIZE
106294 select HIBERNATE_CALLBACKS
106295 select LZO_COMPRESS
106296 select LZO_DECOMPRESS
106297diff --git a/kernel/power/process.c b/kernel/power/process.c
106298index 564f786..361a18e 100644
106299--- a/kernel/power/process.c
106300+++ b/kernel/power/process.c
106301@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
106302 unsigned int elapsed_msecs;
106303 bool wakeup = false;
106304 int sleep_usecs = USEC_PER_MSEC;
106305+ bool timedout = false;
106306
106307 do_gettimeofday(&start);
106308
106309@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
106310
106311 while (true) {
106312 todo = 0;
106313+ if (time_after(jiffies, end_time))
106314+ timedout = true;
106315 read_lock(&tasklist_lock);
106316 for_each_process_thread(g, p) {
106317 if (p == current || !freeze_task(p))
106318 continue;
106319
106320- if (!freezer_should_skip(p))
106321+ if (!freezer_should_skip(p)) {
106322 todo++;
106323+ if (timedout) {
106324+ printk(KERN_ERR "Task refusing to freeze:\n");
106325+ sched_show_task(p);
106326+ }
106327+ }
106328 }
106329 read_unlock(&tasklist_lock);
106330
106331@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
106332 todo += wq_busy;
106333 }
106334
106335- if (!todo || time_after(jiffies, end_time))
106336+ if (!todo || timedout)
106337 break;
106338
106339 if (pm_wakeup_pending()) {
106340diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
106341index c099b08..54bcfe8 100644
106342--- a/kernel/printk/printk.c
106343+++ b/kernel/printk/printk.c
106344@@ -463,7 +463,7 @@ static int log_store(int facility, int level,
106345 return msg->text_len;
106346 }
106347
106348-int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106349+int dmesg_restrict __read_only = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106350
106351 static int syslog_action_restricted(int type)
106352 {
106353@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
106354 if (from_file && type != SYSLOG_ACTION_OPEN)
106355 return 0;
106356
106357+#ifdef CONFIG_GRKERNSEC_DMESG
106358+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
106359+ return -EPERM;
106360+#endif
106361+
106362 if (syslog_action_restricted(type)) {
106363 if (capable(CAP_SYSLOG))
106364 return 0;
106365diff --git a/kernel/profile.c b/kernel/profile.c
106366index a7bcd28..5b368fa 100644
106367--- a/kernel/profile.c
106368+++ b/kernel/profile.c
106369@@ -37,7 +37,7 @@ struct profile_hit {
106370 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
106371 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
106372
106373-static atomic_t *prof_buffer;
106374+static atomic_unchecked_t *prof_buffer;
106375 static unsigned long prof_len, prof_shift;
106376
106377 int prof_on __read_mostly;
106378@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
106379 hits[i].pc = 0;
106380 continue;
106381 }
106382- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106383+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106384 hits[i].hits = hits[i].pc = 0;
106385 }
106386 }
106387@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106388 * Add the current hit(s) and flush the write-queue out
106389 * to the global buffer:
106390 */
106391- atomic_add(nr_hits, &prof_buffer[pc]);
106392+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
106393 for (i = 0; i < NR_PROFILE_HIT; ++i) {
106394- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106395+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106396 hits[i].pc = hits[i].hits = 0;
106397 }
106398 out:
106399@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106400 {
106401 unsigned long pc;
106402 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
106403- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106404+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106405 }
106406 #endif /* !CONFIG_SMP */
106407
106408@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
106409 return -EFAULT;
106410 buf++; p++; count--; read++;
106411 }
106412- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
106413+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
106414 if (copy_to_user(buf, (void *)pnt, count))
106415 return -EFAULT;
106416 read += count;
106417@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
106418 }
106419 #endif
106420 profile_discard_flip_buffers();
106421- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
106422+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
106423 return count;
106424 }
106425
106426diff --git a/kernel/ptrace.c b/kernel/ptrace.c
106427index c8e0e05..2be5614 100644
106428--- a/kernel/ptrace.c
106429+++ b/kernel/ptrace.c
106430@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
106431 if (seize)
106432 flags |= PT_SEIZED;
106433 rcu_read_lock();
106434- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106435+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106436 flags |= PT_PTRACE_CAP;
106437 rcu_read_unlock();
106438 task->ptrace = flags;
106439@@ -514,7 +514,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
106440 break;
106441 return -EIO;
106442 }
106443- if (copy_to_user(dst, buf, retval))
106444+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
106445 return -EFAULT;
106446 copied += retval;
106447 src += retval;
106448@@ -802,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request,
106449 bool seized = child->ptrace & PT_SEIZED;
106450 int ret = -EIO;
106451 siginfo_t siginfo, *si;
106452- void __user *datavp = (void __user *) data;
106453+ void __user *datavp = (__force void __user *) data;
106454 unsigned long __user *datalp = datavp;
106455 unsigned long flags;
106456
106457@@ -1048,14 +1048,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
106458 goto out;
106459 }
106460
106461+ if (gr_handle_ptrace(child, request)) {
106462+ ret = -EPERM;
106463+ goto out_put_task_struct;
106464+ }
106465+
106466 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106467 ret = ptrace_attach(child, request, addr, data);
106468 /*
106469 * Some architectures need to do book-keeping after
106470 * a ptrace attach.
106471 */
106472- if (!ret)
106473+ if (!ret) {
106474 arch_ptrace_attach(child);
106475+ gr_audit_ptrace(child);
106476+ }
106477 goto out_put_task_struct;
106478 }
106479
106480@@ -1083,7 +1090,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
106481 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
106482 if (copied != sizeof(tmp))
106483 return -EIO;
106484- return put_user(tmp, (unsigned long __user *)data);
106485+ return put_user(tmp, (__force unsigned long __user *)data);
106486 }
106487
106488 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
106489@@ -1176,7 +1183,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
106490 }
106491
106492 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106493- compat_long_t, addr, compat_long_t, data)
106494+ compat_ulong_t, addr, compat_ulong_t, data)
106495 {
106496 struct task_struct *child;
106497 long ret;
106498@@ -1192,14 +1199,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106499 goto out;
106500 }
106501
106502+ if (gr_handle_ptrace(child, request)) {
106503+ ret = -EPERM;
106504+ goto out_put_task_struct;
106505+ }
106506+
106507 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106508 ret = ptrace_attach(child, request, addr, data);
106509 /*
106510 * Some architectures need to do book-keeping after
106511 * a ptrace attach.
106512 */
106513- if (!ret)
106514+ if (!ret) {
106515 arch_ptrace_attach(child);
106516+ gr_audit_ptrace(child);
106517+ }
106518 goto out_put_task_struct;
106519 }
106520
106521diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
106522index 8dbe276..8e87dbd 100644
106523--- a/kernel/rcu/rcutorture.c
106524+++ b/kernel/rcu/rcutorture.c
106525@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106526 rcu_torture_count) = { 0 };
106527 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106528 rcu_torture_batch) = { 0 };
106529-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106530-static atomic_t n_rcu_torture_alloc;
106531-static atomic_t n_rcu_torture_alloc_fail;
106532-static atomic_t n_rcu_torture_free;
106533-static atomic_t n_rcu_torture_mberror;
106534-static atomic_t n_rcu_torture_error;
106535+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106536+static atomic_unchecked_t n_rcu_torture_alloc;
106537+static atomic_unchecked_t n_rcu_torture_alloc_fail;
106538+static atomic_unchecked_t n_rcu_torture_free;
106539+static atomic_unchecked_t n_rcu_torture_mberror;
106540+static atomic_unchecked_t n_rcu_torture_error;
106541 static long n_rcu_torture_barrier_error;
106542 static long n_rcu_torture_boost_ktrerror;
106543 static long n_rcu_torture_boost_rterror;
106544@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
106545 static long n_rcu_torture_timers;
106546 static long n_barrier_attempts;
106547 static long n_barrier_successes;
106548-static atomic_long_t n_cbfloods;
106549+static atomic_long_unchecked_t n_cbfloods;
106550 static struct list_head rcu_torture_removed;
106551
106552 static int rcu_torture_writer_state;
106553@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
106554
106555 spin_lock_bh(&rcu_torture_lock);
106556 if (list_empty(&rcu_torture_freelist)) {
106557- atomic_inc(&n_rcu_torture_alloc_fail);
106558+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
106559 spin_unlock_bh(&rcu_torture_lock);
106560 return NULL;
106561 }
106562- atomic_inc(&n_rcu_torture_alloc);
106563+ atomic_inc_unchecked(&n_rcu_torture_alloc);
106564 p = rcu_torture_freelist.next;
106565 list_del_init(p);
106566 spin_unlock_bh(&rcu_torture_lock);
106567@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
106568 static void
106569 rcu_torture_free(struct rcu_torture *p)
106570 {
106571- atomic_inc(&n_rcu_torture_free);
106572+ atomic_inc_unchecked(&n_rcu_torture_free);
106573 spin_lock_bh(&rcu_torture_lock);
106574 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
106575 spin_unlock_bh(&rcu_torture_lock);
106576@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
106577 i = rp->rtort_pipe_count;
106578 if (i > RCU_TORTURE_PIPE_LEN)
106579 i = RCU_TORTURE_PIPE_LEN;
106580- atomic_inc(&rcu_torture_wcount[i]);
106581+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106582 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
106583 rp->rtort_mbtest = 0;
106584 return true;
106585@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
106586 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
106587 do {
106588 schedule_timeout_interruptible(cbflood_inter_holdoff);
106589- atomic_long_inc(&n_cbfloods);
106590+ atomic_long_inc_unchecked(&n_cbfloods);
106591 WARN_ON(signal_pending(current));
106592 for (i = 0; i < cbflood_n_burst; i++) {
106593 for (j = 0; j < cbflood_n_per_burst; j++) {
106594@@ -923,7 +923,7 @@ rcu_torture_writer(void *arg)
106595 i = old_rp->rtort_pipe_count;
106596 if (i > RCU_TORTURE_PIPE_LEN)
106597 i = RCU_TORTURE_PIPE_LEN;
106598- atomic_inc(&rcu_torture_wcount[i]);
106599+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106600 old_rp->rtort_pipe_count++;
106601 switch (synctype[torture_random(&rand) % nsynctypes]) {
106602 case RTWS_DEF_FREE:
106603@@ -1061,7 +1061,7 @@ static void rcu_torture_timer(unsigned long unused)
106604 return;
106605 }
106606 if (p->rtort_mbtest == 0)
106607- atomic_inc(&n_rcu_torture_mberror);
106608+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106609 spin_lock(&rand_lock);
106610 cur_ops->read_delay(&rand);
106611 n_rcu_torture_timers++;
106612@@ -1136,7 +1136,7 @@ rcu_torture_reader(void *arg)
106613 continue;
106614 }
106615 if (p->rtort_mbtest == 0)
106616- atomic_inc(&n_rcu_torture_mberror);
106617+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106618 cur_ops->read_delay(&rand);
106619 preempt_disable();
106620 pipe_count = p->rtort_pipe_count;
106621@@ -1205,11 +1205,11 @@ rcu_torture_stats_print(void)
106622 rcu_torture_current,
106623 rcu_torture_current_version,
106624 list_empty(&rcu_torture_freelist),
106625- atomic_read(&n_rcu_torture_alloc),
106626- atomic_read(&n_rcu_torture_alloc_fail),
106627- atomic_read(&n_rcu_torture_free));
106628+ atomic_read_unchecked(&n_rcu_torture_alloc),
106629+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
106630+ atomic_read_unchecked(&n_rcu_torture_free));
106631 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
106632- atomic_read(&n_rcu_torture_mberror),
106633+ atomic_read_unchecked(&n_rcu_torture_mberror),
106634 n_rcu_torture_boost_ktrerror,
106635 n_rcu_torture_boost_rterror);
106636 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
106637@@ -1221,17 +1221,17 @@ rcu_torture_stats_print(void)
106638 n_barrier_successes,
106639 n_barrier_attempts,
106640 n_rcu_torture_barrier_error);
106641- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
106642+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
106643
106644 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106645- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
106646+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
106647 n_rcu_torture_barrier_error != 0 ||
106648 n_rcu_torture_boost_ktrerror != 0 ||
106649 n_rcu_torture_boost_rterror != 0 ||
106650 n_rcu_torture_boost_failure != 0 ||
106651 i > 1) {
106652 pr_cont("%s", "!!! ");
106653- atomic_inc(&n_rcu_torture_error);
106654+ atomic_inc_unchecked(&n_rcu_torture_error);
106655 WARN_ON_ONCE(1);
106656 }
106657 pr_cont("Reader Pipe: ");
106658@@ -1248,7 +1248,7 @@ rcu_torture_stats_print(void)
106659 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106660 pr_cont("Free-Block Circulation: ");
106661 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106662- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
106663+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
106664 }
106665 pr_cont("\n");
106666
106667@@ -1595,7 +1595,7 @@ rcu_torture_cleanup(void)
106668
106669 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
106670
106671- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106672+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106673 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
106674 else if (torture_onoff_failures())
106675 rcu_torture_print_module_parms(cur_ops,
106676@@ -1720,18 +1720,18 @@ rcu_torture_init(void)
106677
106678 rcu_torture_current = NULL;
106679 rcu_torture_current_version = 0;
106680- atomic_set(&n_rcu_torture_alloc, 0);
106681- atomic_set(&n_rcu_torture_alloc_fail, 0);
106682- atomic_set(&n_rcu_torture_free, 0);
106683- atomic_set(&n_rcu_torture_mberror, 0);
106684- atomic_set(&n_rcu_torture_error, 0);
106685+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
106686+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
106687+ atomic_set_unchecked(&n_rcu_torture_free, 0);
106688+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
106689+ atomic_set_unchecked(&n_rcu_torture_error, 0);
106690 n_rcu_torture_barrier_error = 0;
106691 n_rcu_torture_boost_ktrerror = 0;
106692 n_rcu_torture_boost_rterror = 0;
106693 n_rcu_torture_boost_failure = 0;
106694 n_rcu_torture_boosts = 0;
106695 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
106696- atomic_set(&rcu_torture_wcount[i], 0);
106697+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
106698 for_each_possible_cpu(cpu) {
106699 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106700 per_cpu(rcu_torture_count, cpu)[i] = 0;
106701diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
106702index ec30868..89752ff 100644
106703--- a/kernel/rcu/tiny.c
106704+++ b/kernel/rcu/tiny.c
106705@@ -42,7 +42,7 @@
106706 /* Forward declarations for tiny_plugin.h. */
106707 struct rcu_ctrlblk;
106708 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
106709-static void rcu_process_callbacks(struct softirq_action *unused);
106710+static void rcu_process_callbacks(void);
106711 static void __call_rcu(struct rcu_head *head,
106712 void (*func)(struct rcu_head *rcu),
106713 struct rcu_ctrlblk *rcp);
106714@@ -203,7 +203,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
106715 false));
106716 }
106717
106718-static void rcu_process_callbacks(struct softirq_action *unused)
106719+static __latent_entropy void rcu_process_callbacks(void)
106720 {
106721 __rcu_process_callbacks(&rcu_sched_ctrlblk);
106722 __rcu_process_callbacks(&rcu_bh_ctrlblk);
106723diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
106724index f94e209..d2985bd 100644
106725--- a/kernel/rcu/tiny_plugin.h
106726+++ b/kernel/rcu/tiny_plugin.h
106727@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
106728 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
106729 jiffies - rcp->gp_start, rcp->qlen);
106730 dump_stack();
106731- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
106732+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
106733 3 * rcu_jiffies_till_stall_check() + 3;
106734 } else if (ULONG_CMP_GE(j, js)) {
106735- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106736+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106737 }
106738 }
106739
106740@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
106741 {
106742 rcp->ticks_this_gp = 0;
106743 rcp->gp_start = jiffies;
106744- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106745+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106746 }
106747
106748 static void check_cpu_stalls(void)
106749diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
106750index 8cf7304..953f8ad 100644
106751--- a/kernel/rcu/tree.c
106752+++ b/kernel/rcu/tree.c
106753@@ -290,7 +290,7 @@ static void rcu_momentary_dyntick_idle(void)
106754 */
106755 rdtp = this_cpu_ptr(&rcu_dynticks);
106756 smp_mb__before_atomic(); /* Earlier stuff before QS. */
106757- atomic_add(2, &rdtp->dynticks); /* QS. */
106758+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
106759 smp_mb__after_atomic(); /* Later stuff after QS. */
106760 break;
106761 }
106762@@ -602,9 +602,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
106763 rcu_prepare_for_idle();
106764 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106765 smp_mb__before_atomic(); /* See above. */
106766- atomic_inc(&rdtp->dynticks);
106767+ atomic_inc_unchecked(&rdtp->dynticks);
106768 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
106769- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106770+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106771 rcu_dynticks_task_enter();
106772
106773 /*
106774@@ -725,10 +725,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
106775
106776 rcu_dynticks_task_exit();
106777 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
106778- atomic_inc(&rdtp->dynticks);
106779+ atomic_inc_unchecked(&rdtp->dynticks);
106780 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
106781 smp_mb__after_atomic(); /* See above. */
106782- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106783+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106784 rcu_cleanup_after_idle();
106785 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
106786 if (!user && !is_idle_task(current)) {
106787@@ -862,12 +862,12 @@ void rcu_nmi_enter(void)
106788 * to be in the outermost NMI handler that interrupted an RCU-idle
106789 * period (observation due to Andy Lutomirski).
106790 */
106791- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
106792+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
106793 smp_mb__before_atomic(); /* Force delay from prior write. */
106794- atomic_inc(&rdtp->dynticks);
106795+ atomic_inc_unchecked(&rdtp->dynticks);
106796 /* atomic_inc() before later RCU read-side crit sects */
106797 smp_mb__after_atomic(); /* See above. */
106798- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106799+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106800 incby = 1;
106801 }
106802 rdtp->dynticks_nmi_nesting += incby;
106803@@ -892,7 +892,7 @@ void rcu_nmi_exit(void)
106804 * to us!)
106805 */
106806 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
106807- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106808+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106809
106810 /*
106811 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
106812@@ -907,9 +907,9 @@ void rcu_nmi_exit(void)
106813 rdtp->dynticks_nmi_nesting = 0;
106814 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106815 smp_mb__before_atomic(); /* See above. */
106816- atomic_inc(&rdtp->dynticks);
106817+ atomic_inc_unchecked(&rdtp->dynticks);
106818 smp_mb__after_atomic(); /* Force delay to next write. */
106819- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106820+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106821 }
106822
106823 /**
106824@@ -922,7 +922,7 @@ void rcu_nmi_exit(void)
106825 */
106826 bool notrace __rcu_is_watching(void)
106827 {
106828- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106829+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106830 }
106831
106832 /**
106833@@ -1005,7 +1005,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
106834 static int dyntick_save_progress_counter(struct rcu_data *rdp,
106835 bool *isidle, unsigned long *maxj)
106836 {
106837- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
106838+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106839 rcu_sysidle_check_cpu(rdp, isidle, maxj);
106840 if ((rdp->dynticks_snap & 0x1) == 0) {
106841 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
106842@@ -1013,7 +1013,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
106843 } else {
106844 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
106845 rdp->mynode->gpnum))
106846- ACCESS_ONCE(rdp->gpwrap) = true;
106847+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
106848 return 0;
106849 }
106850 }
106851@@ -1031,7 +1031,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106852 int *rcrmp;
106853 unsigned int snap;
106854
106855- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
106856+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106857 snap = (unsigned int)rdp->dynticks_snap;
106858
106859 /*
106860@@ -1094,10 +1094,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106861 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
106862 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
106863 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
106864- ACCESS_ONCE(rdp->cond_resched_completed) =
106865+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
106866 ACCESS_ONCE(rdp->mynode->completed);
106867 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
106868- ACCESS_ONCE(*rcrmp) =
106869+ ACCESS_ONCE_RW(*rcrmp) =
106870 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
106871 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
106872 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
106873@@ -1119,7 +1119,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
106874 rsp->gp_start = j;
106875 smp_wmb(); /* Record start time before stall time. */
106876 j1 = rcu_jiffies_till_stall_check();
106877- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
106878+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
106879 rsp->jiffies_resched = j + j1 / 2;
106880 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
106881 }
106882@@ -1178,7 +1178,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
106883 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106884 return;
106885 }
106886- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106887+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106888 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106889
106890 /*
106891@@ -1263,7 +1263,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
106892
106893 raw_spin_lock_irqsave(&rnp->lock, flags);
106894 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
106895- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
106896+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
106897 3 * rcu_jiffies_till_stall_check() + 3;
106898 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106899
106900@@ -1347,7 +1347,7 @@ void rcu_cpu_stall_reset(void)
106901 struct rcu_state *rsp;
106902
106903 for_each_rcu_flavor(rsp)
106904- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106905+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106906 }
106907
106908 /*
106909@@ -1704,7 +1704,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
106910 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
106911 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
106912 zero_cpu_stall_ticks(rdp);
106913- ACCESS_ONCE(rdp->gpwrap) = false;
106914+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
106915 }
106916 return ret;
106917 }
106918@@ -1740,7 +1740,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106919 struct rcu_data *rdp;
106920 struct rcu_node *rnp = rcu_get_root(rsp);
106921
106922- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106923+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106924 raw_spin_lock_irq(&rnp->lock);
106925 smp_mb__after_unlock_lock();
106926 if (!ACCESS_ONCE(rsp->gp_flags)) {
106927@@ -1748,7 +1748,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106928 raw_spin_unlock_irq(&rnp->lock);
106929 return 0;
106930 }
106931- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106932+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106933
106934 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
106935 /*
106936@@ -1834,9 +1834,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
106937 rdp = this_cpu_ptr(rsp->rda);
106938 rcu_preempt_check_blocked_tasks(rnp);
106939 rnp->qsmask = rnp->qsmaskinit;
106940- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
106941+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
106942 if (WARN_ON_ONCE(rnp->completed != rsp->completed))
106943- ACCESS_ONCE(rnp->completed) = rsp->completed;
106944+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
106945 if (rnp == rdp->mynode)
106946 (void)__note_gp_changes(rsp, rnp, rdp);
106947 rcu_preempt_boost_start_gp(rnp);
106948@@ -1845,7 +1845,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106949 rnp->grphi, rnp->qsmask);
106950 raw_spin_unlock_irq(&rnp->lock);
106951 cond_resched_rcu_qs();
106952- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106953+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106954 if (gp_init_delay > 0 &&
106955 !(rsp->gpnum % (rcu_num_nodes * PER_RCU_NODE_PERIOD)))
106956 schedule_timeout_uninterruptible(gp_init_delay);
106957@@ -1864,7 +1864,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106958 unsigned long maxj;
106959 struct rcu_node *rnp = rcu_get_root(rsp);
106960
106961- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106962+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106963 rsp->n_force_qs++;
106964 if (fqs_state == RCU_SAVE_DYNTICK) {
106965 /* Collect dyntick-idle snapshots. */
106966@@ -1885,7 +1885,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106967 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
106968 raw_spin_lock_irq(&rnp->lock);
106969 smp_mb__after_unlock_lock();
106970- ACCESS_ONCE(rsp->gp_flags) =
106971+ ACCESS_ONCE_RW(rsp->gp_flags) =
106972 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
106973 raw_spin_unlock_irq(&rnp->lock);
106974 }
106975@@ -1903,7 +1903,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106976 struct rcu_data *rdp;
106977 struct rcu_node *rnp = rcu_get_root(rsp);
106978
106979- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106980+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106981 raw_spin_lock_irq(&rnp->lock);
106982 smp_mb__after_unlock_lock();
106983 gp_duration = jiffies - rsp->gp_start;
106984@@ -1934,7 +1934,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106985 smp_mb__after_unlock_lock();
106986 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
106987 WARN_ON_ONCE(rnp->qsmask);
106988- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
106989+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
106990 rdp = this_cpu_ptr(rsp->rda);
106991 if (rnp == rdp->mynode)
106992 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
106993@@ -1942,7 +1942,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
106994 nocb += rcu_future_gp_cleanup(rsp, rnp);
106995 raw_spin_unlock_irq(&rnp->lock);
106996 cond_resched_rcu_qs();
106997- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106998+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106999 }
107000 rnp = rcu_get_root(rsp);
107001 raw_spin_lock_irq(&rnp->lock);
107002@@ -1950,14 +1950,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107003 rcu_nocb_gp_set(rnp, nocb);
107004
107005 /* Declare grace period done. */
107006- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
107007+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
107008 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
107009 rsp->fqs_state = RCU_GP_IDLE;
107010 rdp = this_cpu_ptr(rsp->rda);
107011 /* Advance CBs to reduce false positives below. */
107012 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
107013 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
107014- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107015+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107016 trace_rcu_grace_period(rsp->name,
107017 ACCESS_ONCE(rsp->gpnum),
107018 TPS("newreq"));
107019@@ -1993,7 +1993,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
107020 if (rcu_gp_init(rsp))
107021 break;
107022 cond_resched_rcu_qs();
107023- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107024+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107025 WARN_ON(signal_pending(current));
107026 trace_rcu_grace_period(rsp->name,
107027 ACCESS_ONCE(rsp->gpnum),
107028@@ -2037,11 +2037,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
107029 ACCESS_ONCE(rsp->gpnum),
107030 TPS("fqsend"));
107031 cond_resched_rcu_qs();
107032- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107033+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107034 } else {
107035 /* Deal with stray signal. */
107036 cond_resched_rcu_qs();
107037- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107038+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107039 WARN_ON(signal_pending(current));
107040 trace_rcu_grace_period(rsp->name,
107041 ACCESS_ONCE(rsp->gpnum),
107042@@ -2086,7 +2086,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
107043 */
107044 return false;
107045 }
107046- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107047+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107048 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
107049 TPS("newreq"));
107050
107051@@ -2359,7 +2359,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
107052 rsp->qlen += rdp->qlen;
107053 rdp->n_cbs_orphaned += rdp->qlen;
107054 rdp->qlen_lazy = 0;
107055- ACCESS_ONCE(rdp->qlen) = 0;
107056+ ACCESS_ONCE_RW(rdp->qlen) = 0;
107057 }
107058
107059 /*
107060@@ -2636,7 +2636,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
107061 }
107062 smp_mb(); /* List handling before counting for rcu_barrier(). */
107063 rdp->qlen_lazy -= count_lazy;
107064- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
107065+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
107066 rdp->n_cbs_invoked += count;
107067
107068 /* Reinstate batch limit if we have worked down the excess. */
107069@@ -2814,7 +2814,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
107070 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107071 return; /* Someone beat us to it. */
107072 }
107073- ACCESS_ONCE(rsp->gp_flags) =
107074+ ACCESS_ONCE_RW(rsp->gp_flags) =
107075 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
107076 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107077 rcu_gp_kthread_wake(rsp);
107078@@ -2860,7 +2860,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
107079 /*
107080 * Do RCU core processing for the current CPU.
107081 */
107082-static void rcu_process_callbacks(struct softirq_action *unused)
107083+static void rcu_process_callbacks(void)
107084 {
107085 struct rcu_state *rsp;
107086
107087@@ -2972,7 +2972,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107088 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
107089 if (debug_rcu_head_queue(head)) {
107090 /* Probable double call_rcu(), so leak the callback. */
107091- ACCESS_ONCE(head->func) = rcu_leak_callback;
107092+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
107093 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
107094 return;
107095 }
107096@@ -3011,7 +3011,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107097 if (!likely(rdp->nxtlist))
107098 init_default_callback_list(rdp);
107099 }
107100- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
107101+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
107102 if (lazy)
107103 rdp->qlen_lazy++;
107104 else
107105@@ -3284,11 +3284,11 @@ void synchronize_sched_expedited(void)
107106 * counter wrap on a 32-bit system. Quite a few more CPUs would of
107107 * course be required on a 64-bit system.
107108 */
107109- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
107110+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
107111 (ulong)atomic_long_read(&rsp->expedited_done) +
107112 ULONG_MAX / 8)) {
107113 synchronize_sched();
107114- atomic_long_inc(&rsp->expedited_wrap);
107115+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
107116 return;
107117 }
107118
107119@@ -3296,12 +3296,12 @@ void synchronize_sched_expedited(void)
107120 * Take a ticket. Note that atomic_inc_return() implies a
107121 * full memory barrier.
107122 */
107123- snap = atomic_long_inc_return(&rsp->expedited_start);
107124+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
107125 firstsnap = snap;
107126 if (!try_get_online_cpus()) {
107127 /* CPU hotplug operation in flight, fall back to normal GP. */
107128 wait_rcu_gp(call_rcu_sched);
107129- atomic_long_inc(&rsp->expedited_normal);
107130+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107131 return;
107132 }
107133 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
107134@@ -3314,7 +3314,7 @@ void synchronize_sched_expedited(void)
107135 for_each_cpu(cpu, cm) {
107136 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
107137
107138- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
107139+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
107140 cpumask_clear_cpu(cpu, cm);
107141 }
107142 if (cpumask_weight(cm) == 0)
107143@@ -3329,14 +3329,14 @@ void synchronize_sched_expedited(void)
107144 synchronize_sched_expedited_cpu_stop,
107145 NULL) == -EAGAIN) {
107146 put_online_cpus();
107147- atomic_long_inc(&rsp->expedited_tryfail);
107148+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
107149
107150 /* Check to see if someone else did our work for us. */
107151 s = atomic_long_read(&rsp->expedited_done);
107152 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107153 /* ensure test happens before caller kfree */
107154 smp_mb__before_atomic(); /* ^^^ */
107155- atomic_long_inc(&rsp->expedited_workdone1);
107156+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
107157 free_cpumask_var(cm);
107158 return;
107159 }
107160@@ -3346,7 +3346,7 @@ void synchronize_sched_expedited(void)
107161 udelay(trycount * num_online_cpus());
107162 } else {
107163 wait_rcu_gp(call_rcu_sched);
107164- atomic_long_inc(&rsp->expedited_normal);
107165+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107166 free_cpumask_var(cm);
107167 return;
107168 }
107169@@ -3356,7 +3356,7 @@ void synchronize_sched_expedited(void)
107170 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107171 /* ensure test happens before caller kfree */
107172 smp_mb__before_atomic(); /* ^^^ */
107173- atomic_long_inc(&rsp->expedited_workdone2);
107174+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
107175 free_cpumask_var(cm);
107176 return;
107177 }
107178@@ -3371,14 +3371,14 @@ void synchronize_sched_expedited(void)
107179 if (!try_get_online_cpus()) {
107180 /* CPU hotplug operation in flight, use normal GP. */
107181 wait_rcu_gp(call_rcu_sched);
107182- atomic_long_inc(&rsp->expedited_normal);
107183+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107184 free_cpumask_var(cm);
107185 return;
107186 }
107187- snap = atomic_long_read(&rsp->expedited_start);
107188+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
107189 smp_mb(); /* ensure read is before try_stop_cpus(). */
107190 }
107191- atomic_long_inc(&rsp->expedited_stoppedcpus);
107192+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
107193
107194 all_cpus_idle:
107195 free_cpumask_var(cm);
107196@@ -3390,16 +3390,16 @@ all_cpus_idle:
107197 * than we did already did their update.
107198 */
107199 do {
107200- atomic_long_inc(&rsp->expedited_done_tries);
107201+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
107202 s = atomic_long_read(&rsp->expedited_done);
107203 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
107204 /* ensure test happens before caller kfree */
107205 smp_mb__before_atomic(); /* ^^^ */
107206- atomic_long_inc(&rsp->expedited_done_lost);
107207+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
107208 break;
107209 }
107210 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
107211- atomic_long_inc(&rsp->expedited_done_exit);
107212+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
107213
107214 put_online_cpus();
107215 }
107216@@ -3609,7 +3609,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107217 * ACCESS_ONCE() to prevent the compiler from speculating
107218 * the increment to precede the early-exit check.
107219 */
107220- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107221+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107222 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
107223 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
107224 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
107225@@ -3665,7 +3665,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107226
107227 /* Increment ->n_barrier_done to prevent duplicate work. */
107228 smp_mb(); /* Keep increment after above mechanism. */
107229- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107230+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107231 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
107232 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
107233 smp_mb(); /* Keep increment before caller's subsequent code. */
107234@@ -3732,7 +3732,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
107235 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
107236 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
107237 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
107238- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
107239+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
107240 rdp->cpu = cpu;
107241 rdp->rsp = rsp;
107242 rcu_boot_init_nocb_percpu_data(rdp);
107243@@ -3763,8 +3763,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
107244 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
107245 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
107246 rcu_sysidle_init_percpu_data(rdp->dynticks);
107247- atomic_set(&rdp->dynticks->dynticks,
107248- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
107249+ atomic_set_unchecked(&rdp->dynticks->dynticks,
107250+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
107251 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
107252
107253 /*
107254diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
107255index a69d3da..51993c4 100644
107256--- a/kernel/rcu/tree.h
107257+++ b/kernel/rcu/tree.h
107258@@ -86,11 +86,11 @@ struct rcu_dynticks {
107259 long long dynticks_nesting; /* Track irq/process nesting level. */
107260 /* Process level is worth LLONG_MAX/2. */
107261 int dynticks_nmi_nesting; /* Track NMI nesting level. */
107262- atomic_t dynticks; /* Even value for idle, else odd. */
107263+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
107264 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
107265 long long dynticks_idle_nesting;
107266 /* irq/process nesting level from idle. */
107267- atomic_t dynticks_idle; /* Even value for idle, else odd. */
107268+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
107269 /* "Idle" excludes userspace execution. */
107270 unsigned long dynticks_idle_jiffies;
107271 /* End of last non-NMI non-idle period. */
107272@@ -463,17 +463,17 @@ struct rcu_state {
107273 /* _rcu_barrier(). */
107274 /* End of fields guarded by barrier_mutex. */
107275
107276- atomic_long_t expedited_start; /* Starting ticket. */
107277- atomic_long_t expedited_done; /* Done ticket. */
107278- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
107279- atomic_long_t expedited_tryfail; /* # acquisition failures. */
107280- atomic_long_t expedited_workdone1; /* # done by others #1. */
107281- atomic_long_t expedited_workdone2; /* # done by others #2. */
107282- atomic_long_t expedited_normal; /* # fallbacks to normal. */
107283- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
107284- atomic_long_t expedited_done_tries; /* # tries to update _done. */
107285- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
107286- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
107287+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
107288+ atomic_long_t expedited_done; /* Done ticket. */
107289+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
107290+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
107291+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
107292+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
107293+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
107294+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
107295+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
107296+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
107297+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
107298
107299 unsigned long jiffies_force_qs; /* Time at which to invoke */
107300 /* force_quiescent_state(). */
107301diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
107302index 8c0ec0f..99d52c5 100644
107303--- a/kernel/rcu/tree_plugin.h
107304+++ b/kernel/rcu/tree_plugin.h
107305@@ -570,7 +570,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
107306 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
107307 {
107308 return !rcu_preempted_readers_exp(rnp) &&
107309- ACCESS_ONCE(rnp->expmask) == 0;
107310+ ACCESS_ONCE_RW(rnp->expmask) == 0;
107311 }
107312
107313 /*
107314@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
107315
107316 /* Clean up and exit. */
107317 smp_mb(); /* ensure expedited GP seen before counter increment. */
107318- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
107319+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
107320 sync_rcu_preempt_exp_count + 1;
107321 unlock_mb_ret:
107322 mutex_unlock(&sync_rcu_preempt_exp_mutex);
107323@@ -1286,7 +1286,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
107324 free_cpumask_var(cm);
107325 }
107326
107327-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
107328+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
107329 .store = &rcu_cpu_kthread_task,
107330 .thread_should_run = rcu_cpu_kthread_should_run,
107331 .thread_fn = rcu_cpu_kthread,
107332@@ -1757,7 +1757,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
107333 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
107334 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
107335 cpu, ticks_value, ticks_title,
107336- atomic_read(&rdtp->dynticks) & 0xfff,
107337+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
107338 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
107339 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
107340 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
107341@@ -1902,7 +1902,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
107342 return;
107343 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
107344 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
107345- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
107346+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
107347 wake_up(&rdp_leader->nocb_wq);
107348 }
107349 }
107350@@ -1975,7 +1975,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
107351 atomic_long_add(rhcount, &rdp->nocb_q_count);
107352 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
107353 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
107354- ACCESS_ONCE(*old_rhpp) = rhp;
107355+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
107356 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
107357 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
107358
107359@@ -2164,7 +2164,7 @@ wait_again:
107360 continue; /* No CBs here, try next follower. */
107361
107362 /* Move callbacks to wait-for-GP list, which is empty. */
107363- ACCESS_ONCE(rdp->nocb_head) = NULL;
107364+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
107365 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
107366 gotcbs = true;
107367 }
107368@@ -2285,7 +2285,7 @@ static int rcu_nocb_kthread(void *arg)
107369 list = ACCESS_ONCE(rdp->nocb_follower_head);
107370 BUG_ON(!list);
107371 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
107372- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
107373+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
107374 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
107375
107376 /* Each pass through the following loop invokes a callback. */
107377@@ -2335,7 +2335,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
107378 if (!rcu_nocb_need_deferred_wakeup(rdp))
107379 return;
107380 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
107381- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107382+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107383 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
107384 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
107385 }
107386@@ -2448,7 +2448,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
107387 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
107388 "rcuo%c/%d", rsp->abbr, cpu);
107389 BUG_ON(IS_ERR(t));
107390- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
107391+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
107392 }
107393
107394 /*
107395@@ -2663,11 +2663,11 @@ static void rcu_sysidle_enter(int irq)
107396
107397 /* Record start of fully idle period. */
107398 j = jiffies;
107399- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
107400+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
107401 smp_mb__before_atomic();
107402- atomic_inc(&rdtp->dynticks_idle);
107403+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107404 smp_mb__after_atomic();
107405- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
107406+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
107407 }
107408
107409 /*
107410@@ -2738,9 +2738,9 @@ static void rcu_sysidle_exit(int irq)
107411
107412 /* Record end of idle period. */
107413 smp_mb__before_atomic();
107414- atomic_inc(&rdtp->dynticks_idle);
107415+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107416 smp_mb__after_atomic();
107417- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
107418+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
107419
107420 /*
107421 * If we are the timekeeping CPU, we are permitted to be non-idle
107422@@ -2786,7 +2786,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
107423 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
107424
107425 /* Pick up current idle and NMI-nesting counter and check. */
107426- cur = atomic_read(&rdtp->dynticks_idle);
107427+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
107428 if (cur & 0x1) {
107429 *isidle = false; /* We are not idle! */
107430 return;
107431@@ -2835,7 +2835,7 @@ static void rcu_sysidle(unsigned long j)
107432 case RCU_SYSIDLE_NOT:
107433
107434 /* First time all are idle, so note a short idle period. */
107435- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107436+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107437 break;
107438
107439 case RCU_SYSIDLE_SHORT:
107440@@ -2873,7 +2873,7 @@ static void rcu_sysidle_cancel(void)
107441 {
107442 smp_mb();
107443 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
107444- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
107445+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
107446 }
107447
107448 /*
107449@@ -2925,7 +2925,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
107450 smp_mb(); /* grace period precedes setting inuse. */
107451
107452 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
107453- ACCESS_ONCE(rshp->inuse) = 0;
107454+ ACCESS_ONCE_RW(rshp->inuse) = 0;
107455 }
107456
107457 /*
107458@@ -3077,7 +3077,7 @@ static void rcu_bind_gp_kthread(void)
107459 static void rcu_dynticks_task_enter(void)
107460 {
107461 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107462- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
107463+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
107464 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107465 }
107466
107467@@ -3085,6 +3085,6 @@ static void rcu_dynticks_task_enter(void)
107468 static void rcu_dynticks_task_exit(void)
107469 {
107470 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107471- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
107472+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
107473 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107474 }
107475diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
107476index f92361e..0052f88 100644
107477--- a/kernel/rcu/tree_trace.c
107478+++ b/kernel/rcu/tree_trace.c
107479@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
107480 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
107481 rdp->qs_pending);
107482 seq_printf(m, " dt=%d/%llx/%d df=%lu",
107483- atomic_read(&rdp->dynticks->dynticks),
107484+ atomic_read_unchecked(&rdp->dynticks->dynticks),
107485 rdp->dynticks->dynticks_nesting,
107486 rdp->dynticks->dynticks_nmi_nesting,
107487 rdp->dynticks_fqs);
107488@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
107489 struct rcu_state *rsp = (struct rcu_state *)m->private;
107490
107491 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",
107492- atomic_long_read(&rsp->expedited_start),
107493+ atomic_long_read_unchecked(&rsp->expedited_start),
107494 atomic_long_read(&rsp->expedited_done),
107495- atomic_long_read(&rsp->expedited_wrap),
107496- atomic_long_read(&rsp->expedited_tryfail),
107497- atomic_long_read(&rsp->expedited_workdone1),
107498- atomic_long_read(&rsp->expedited_workdone2),
107499- atomic_long_read(&rsp->expedited_normal),
107500- atomic_long_read(&rsp->expedited_stoppedcpus),
107501- atomic_long_read(&rsp->expedited_done_tries),
107502- atomic_long_read(&rsp->expedited_done_lost),
107503- atomic_long_read(&rsp->expedited_done_exit));
107504+ atomic_long_read_unchecked(&rsp->expedited_wrap),
107505+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
107506+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
107507+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
107508+ atomic_long_read_unchecked(&rsp->expedited_normal),
107509+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
107510+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
107511+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
107512+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
107513 return 0;
107514 }
107515
107516diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
107517index 1f13335..77ebb7f 100644
107518--- a/kernel/rcu/update.c
107519+++ b/kernel/rcu/update.c
107520@@ -396,10 +396,10 @@ int rcu_jiffies_till_stall_check(void)
107521 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
107522 */
107523 if (till_stall_check < 3) {
107524- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
107525+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
107526 till_stall_check = 3;
107527 } else if (till_stall_check > 300) {
107528- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
107529+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
107530 till_stall_check = 300;
107531 }
107532 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
107533@@ -555,7 +555,7 @@ static void check_holdout_task(struct task_struct *t,
107534 !ACCESS_ONCE(t->on_rq) ||
107535 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
107536 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
107537- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
107538+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
107539 list_del_init(&t->rcu_tasks_holdout_list);
107540 put_task_struct(t);
107541 return;
107542@@ -643,7 +643,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
107543 !is_idle_task(t)) {
107544 get_task_struct(t);
107545 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
107546- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
107547+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
107548 list_add(&t->rcu_tasks_holdout_list,
107549 &rcu_tasks_holdouts);
107550 }
107551@@ -740,7 +740,7 @@ static void rcu_spawn_tasks_kthread(void)
107552 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
107553 BUG_ON(IS_ERR(t));
107554 smp_mb(); /* Ensure others see full kthread. */
107555- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
107556+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
107557 mutex_unlock(&rcu_tasks_kthread_mutex);
107558 }
107559
107560diff --git a/kernel/resource.c b/kernel/resource.c
107561index 90552aa..8c02098 100644
107562--- a/kernel/resource.c
107563+++ b/kernel/resource.c
107564@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
107565
107566 static int __init ioresources_init(void)
107567 {
107568+#ifdef CONFIG_GRKERNSEC_PROC_ADD
107569+#ifdef CONFIG_GRKERNSEC_PROC_USER
107570+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
107571+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
107572+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
107573+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
107574+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
107575+#endif
107576+#else
107577 proc_create("ioports", 0, NULL, &proc_ioports_operations);
107578 proc_create("iomem", 0, NULL, &proc_iomem_operations);
107579+#endif
107580 return 0;
107581 }
107582 __initcall(ioresources_init);
107583diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
107584index eae160d..c9aa22e 100644
107585--- a/kernel/sched/auto_group.c
107586+++ b/kernel/sched/auto_group.c
107587@@ -11,7 +11,7 @@
107588
107589 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
107590 static struct autogroup autogroup_default;
107591-static atomic_t autogroup_seq_nr;
107592+static atomic_unchecked_t autogroup_seq_nr;
107593
107594 void __init autogroup_init(struct task_struct *init_task)
107595 {
107596@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
107597
107598 kref_init(&ag->kref);
107599 init_rwsem(&ag->lock);
107600- ag->id = atomic_inc_return(&autogroup_seq_nr);
107601+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
107602 ag->tg = tg;
107603 #ifdef CONFIG_RT_GROUP_SCHED
107604 /*
107605diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
107606index 8d0f35d..c16360d 100644
107607--- a/kernel/sched/completion.c
107608+++ b/kernel/sched/completion.c
107609@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
107610 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107611 * or number of jiffies left till timeout) if completed.
107612 */
107613-long __sched
107614+long __sched __intentional_overflow(-1)
107615 wait_for_completion_interruptible_timeout(struct completion *x,
107616 unsigned long timeout)
107617 {
107618@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
107619 *
107620 * Return: -ERESTARTSYS if interrupted, 0 if completed.
107621 */
107622-int __sched wait_for_completion_killable(struct completion *x)
107623+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
107624 {
107625 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
107626 if (t == -ERESTARTSYS)
107627@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
107628 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107629 * or number of jiffies left till timeout) if completed.
107630 */
107631-long __sched
107632+long __sched __intentional_overflow(-1)
107633 wait_for_completion_killable_timeout(struct completion *x,
107634 unsigned long timeout)
107635 {
107636diff --git a/kernel/sched/core.c b/kernel/sched/core.c
107637index 1236732..df281d6 100644
107638--- a/kernel/sched/core.c
107639+++ b/kernel/sched/core.c
107640@@ -1867,7 +1867,7 @@ void set_numabalancing_state(bool enabled)
107641 int sysctl_numa_balancing(struct ctl_table *table, int write,
107642 void __user *buffer, size_t *lenp, loff_t *ppos)
107643 {
107644- struct ctl_table t;
107645+ ctl_table_no_const t;
107646 int err;
107647 int state = numabalancing_enabled;
107648
107649@@ -2317,8 +2317,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
107650 next->active_mm = oldmm;
107651 atomic_inc(&oldmm->mm_count);
107652 enter_lazy_tlb(oldmm, next);
107653- } else
107654+ } else {
107655 switch_mm(oldmm, mm, next);
107656+ populate_stack();
107657+ }
107658
107659 if (!prev->mm) {
107660 prev->active_mm = NULL;
107661@@ -3129,6 +3131,8 @@ int can_nice(const struct task_struct *p, const int nice)
107662 /* convert nice value [19,-20] to rlimit style value [1,40] */
107663 int nice_rlim = nice_to_rlimit(nice);
107664
107665+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
107666+
107667 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
107668 capable(CAP_SYS_NICE));
107669 }
107670@@ -3155,7 +3159,8 @@ SYSCALL_DEFINE1(nice, int, increment)
107671 nice = task_nice(current) + increment;
107672
107673 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
107674- if (increment < 0 && !can_nice(current, nice))
107675+ if (increment < 0 && (!can_nice(current, nice) ||
107676+ gr_handle_chroot_nice()))
107677 return -EPERM;
107678
107679 retval = security_task_setnice(current, nice);
107680@@ -3467,6 +3472,7 @@ recheck:
107681 if (policy != p->policy && !rlim_rtprio)
107682 return -EPERM;
107683
107684+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
107685 /* can't increase priority */
107686 if (attr->sched_priority > p->rt_priority &&
107687 attr->sched_priority > rlim_rtprio)
107688@@ -4950,6 +4956,7 @@ void idle_task_exit(void)
107689
107690 if (mm != &init_mm) {
107691 switch_mm(mm, &init_mm, current);
107692+ populate_stack();
107693 finish_arch_post_lock_switch();
107694 }
107695 mmdrop(mm);
107696@@ -5045,7 +5052,7 @@ static void migrate_tasks(unsigned int dead_cpu)
107697
107698 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
107699
107700-static struct ctl_table sd_ctl_dir[] = {
107701+static ctl_table_no_const sd_ctl_dir[] __read_only = {
107702 {
107703 .procname = "sched_domain",
107704 .mode = 0555,
107705@@ -5062,17 +5069,17 @@ static struct ctl_table sd_ctl_root[] = {
107706 {}
107707 };
107708
107709-static struct ctl_table *sd_alloc_ctl_entry(int n)
107710+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
107711 {
107712- struct ctl_table *entry =
107713+ ctl_table_no_const *entry =
107714 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
107715
107716 return entry;
107717 }
107718
107719-static void sd_free_ctl_entry(struct ctl_table **tablep)
107720+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
107721 {
107722- struct ctl_table *entry;
107723+ ctl_table_no_const *entry;
107724
107725 /*
107726 * In the intermediate directories, both the child directory and
107727@@ -5080,22 +5087,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
107728 * will always be set. In the lowest directory the names are
107729 * static strings and all have proc handlers.
107730 */
107731- for (entry = *tablep; entry->mode; entry++) {
107732- if (entry->child)
107733- sd_free_ctl_entry(&entry->child);
107734+ for (entry = tablep; entry->mode; entry++) {
107735+ if (entry->child) {
107736+ sd_free_ctl_entry(entry->child);
107737+ pax_open_kernel();
107738+ entry->child = NULL;
107739+ pax_close_kernel();
107740+ }
107741 if (entry->proc_handler == NULL)
107742 kfree(entry->procname);
107743 }
107744
107745- kfree(*tablep);
107746- *tablep = NULL;
107747+ kfree(tablep);
107748 }
107749
107750 static int min_load_idx = 0;
107751 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
107752
107753 static void
107754-set_table_entry(struct ctl_table *entry,
107755+set_table_entry(ctl_table_no_const *entry,
107756 const char *procname, void *data, int maxlen,
107757 umode_t mode, proc_handler *proc_handler,
107758 bool load_idx)
107759@@ -5115,7 +5125,7 @@ set_table_entry(struct ctl_table *entry,
107760 static struct ctl_table *
107761 sd_alloc_ctl_domain_table(struct sched_domain *sd)
107762 {
107763- struct ctl_table *table = sd_alloc_ctl_entry(14);
107764+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
107765
107766 if (table == NULL)
107767 return NULL;
107768@@ -5153,9 +5163,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
107769 return table;
107770 }
107771
107772-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
107773+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
107774 {
107775- struct ctl_table *entry, *table;
107776+ ctl_table_no_const *entry, *table;
107777 struct sched_domain *sd;
107778 int domain_num = 0, i;
107779 char buf[32];
107780@@ -5182,11 +5192,13 @@ static struct ctl_table_header *sd_sysctl_header;
107781 static void register_sched_domain_sysctl(void)
107782 {
107783 int i, cpu_num = num_possible_cpus();
107784- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
107785+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
107786 char buf[32];
107787
107788 WARN_ON(sd_ctl_dir[0].child);
107789+ pax_open_kernel();
107790 sd_ctl_dir[0].child = entry;
107791+ pax_close_kernel();
107792
107793 if (entry == NULL)
107794 return;
107795@@ -5209,8 +5221,12 @@ static void unregister_sched_domain_sysctl(void)
107796 if (sd_sysctl_header)
107797 unregister_sysctl_table(sd_sysctl_header);
107798 sd_sysctl_header = NULL;
107799- if (sd_ctl_dir[0].child)
107800- sd_free_ctl_entry(&sd_ctl_dir[0].child);
107801+ if (sd_ctl_dir[0].child) {
107802+ sd_free_ctl_entry(sd_ctl_dir[0].child);
107803+ pax_open_kernel();
107804+ sd_ctl_dir[0].child = NULL;
107805+ pax_close_kernel();
107806+ }
107807 }
107808 #else
107809 static void register_sched_domain_sysctl(void)
107810diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
107811index c2980e8..4737a6d 100644
107812--- a/kernel/sched/fair.c
107813+++ b/kernel/sched/fair.c
107814@@ -2107,7 +2107,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
107815
107816 static void reset_ptenuma_scan(struct task_struct *p)
107817 {
107818- ACCESS_ONCE(p->mm->numa_scan_seq)++;
107819+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
107820 p->mm->numa_scan_offset = 0;
107821 }
107822
107823@@ -7753,7 +7753,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
107824 * run_rebalance_domains is triggered when needed from the scheduler tick.
107825 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
107826 */
107827-static void run_rebalance_domains(struct softirq_action *h)
107828+static __latent_entropy void run_rebalance_domains(void)
107829 {
107830 struct rq *this_rq = this_rq();
107831 enum cpu_idle_type idle = this_rq->idle_balance ?
107832diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
107833index e0e1299..e1e896b 100644
107834--- a/kernel/sched/sched.h
107835+++ b/kernel/sched/sched.h
107836@@ -1219,7 +1219,7 @@ struct sched_class {
107837 #ifdef CONFIG_FAIR_GROUP_SCHED
107838 void (*task_move_group) (struct task_struct *p, int on_rq);
107839 #endif
107840-};
107841+} __do_const;
107842
107843 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
107844 {
107845diff --git a/kernel/signal.c b/kernel/signal.c
107846index d51c5dd..065c4c8 100644
107847--- a/kernel/signal.c
107848+++ b/kernel/signal.c
107849@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
107850
107851 int print_fatal_signals __read_mostly;
107852
107853-static void __user *sig_handler(struct task_struct *t, int sig)
107854+static __sighandler_t sig_handler(struct task_struct *t, int sig)
107855 {
107856 return t->sighand->action[sig - 1].sa.sa_handler;
107857 }
107858
107859-static int sig_handler_ignored(void __user *handler, int sig)
107860+static int sig_handler_ignored(__sighandler_t handler, int sig)
107861 {
107862 /* Is it explicitly or implicitly ignored? */
107863 return handler == SIG_IGN ||
107864@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
107865
107866 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
107867 {
107868- void __user *handler;
107869+ __sighandler_t handler;
107870
107871 handler = sig_handler(t, sig);
107872
107873@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
107874 atomic_inc(&user->sigpending);
107875 rcu_read_unlock();
107876
107877+ if (!override_rlimit)
107878+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
107879+
107880 if (override_rlimit ||
107881 atomic_read(&user->sigpending) <=
107882 task_rlimit(t, RLIMIT_SIGPENDING)) {
107883@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
107884
107885 int unhandled_signal(struct task_struct *tsk, int sig)
107886 {
107887- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
107888+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
107889 if (is_global_init(tsk))
107890 return 1;
107891 if (handler != SIG_IGN && handler != SIG_DFL)
107892@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
107893 }
107894 }
107895
107896+ /* allow glibc communication via tgkill to other threads in our
107897+ thread group */
107898+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
107899+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
107900+ && gr_handle_signal(t, sig))
107901+ return -EPERM;
107902+
107903 return security_task_kill(t, info, sig, 0);
107904 }
107905
107906@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107907 return send_signal(sig, info, p, 1);
107908 }
107909
107910-static int
107911+int
107912 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107913 {
107914 return send_signal(sig, info, t, 0);
107915@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107916 unsigned long int flags;
107917 int ret, blocked, ignored;
107918 struct k_sigaction *action;
107919+ int is_unhandled = 0;
107920
107921 spin_lock_irqsave(&t->sighand->siglock, flags);
107922 action = &t->sighand->action[sig-1];
107923@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107924 }
107925 if (action->sa.sa_handler == SIG_DFL)
107926 t->signal->flags &= ~SIGNAL_UNKILLABLE;
107927+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
107928+ is_unhandled = 1;
107929 ret = specific_send_sig_info(sig, info, t);
107930 spin_unlock_irqrestore(&t->sighand->siglock, flags);
107931
107932+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
107933+ normal operation */
107934+ if (is_unhandled) {
107935+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
107936+ gr_handle_crash(t, sig);
107937+ }
107938+
107939 return ret;
107940 }
107941
107942@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107943 ret = check_kill_permission(sig, info, p);
107944 rcu_read_unlock();
107945
107946- if (!ret && sig)
107947+ if (!ret && sig) {
107948 ret = do_send_sig_info(sig, info, p, true);
107949+ if (!ret)
107950+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
107951+ }
107952
107953 return ret;
107954 }
107955@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
107956 int error = -ESRCH;
107957
107958 rcu_read_lock();
107959- p = find_task_by_vpid(pid);
107960+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
107961+ /* allow glibc communication via tgkill to other threads in our
107962+ thread group */
107963+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
107964+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
107965+ p = find_task_by_vpid_unrestricted(pid);
107966+ else
107967+#endif
107968+ p = find_task_by_vpid(pid);
107969 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
107970 error = check_kill_permission(sig, info, p);
107971 /*
107972@@ -3244,8 +3275,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
107973 }
107974 seg = get_fs();
107975 set_fs(KERNEL_DS);
107976- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
107977- (stack_t __force __user *) &uoss,
107978+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
107979+ (stack_t __force_user *) &uoss,
107980 compat_user_stack_pointer());
107981 set_fs(seg);
107982 if (ret >= 0 && uoss_ptr) {
107983diff --git a/kernel/smpboot.c b/kernel/smpboot.c
107984index c697f73..4ef1c25 100644
107985--- a/kernel/smpboot.c
107986+++ b/kernel/smpboot.c
107987@@ -291,7 +291,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
107988 }
107989 smpboot_unpark_thread(plug_thread, cpu);
107990 }
107991- list_add(&plug_thread->list, &hotplug_threads);
107992+ pax_list_add(&plug_thread->list, &hotplug_threads);
107993 out:
107994 mutex_unlock(&smpboot_threads_lock);
107995 put_online_cpus();
107996@@ -309,7 +309,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
107997 {
107998 get_online_cpus();
107999 mutex_lock(&smpboot_threads_lock);
108000- list_del(&plug_thread->list);
108001+ pax_list_del(&plug_thread->list);
108002 smpboot_destroy_threads(plug_thread);
108003 mutex_unlock(&smpboot_threads_lock);
108004 put_online_cpus();
108005diff --git a/kernel/softirq.c b/kernel/softirq.c
108006index 479e443..66d845e1 100644
108007--- a/kernel/softirq.c
108008+++ b/kernel/softirq.c
108009@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
108010 EXPORT_SYMBOL(irq_stat);
108011 #endif
108012
108013-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
108014+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
108015
108016 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
108017
108018@@ -270,7 +270,7 @@ restart:
108019 kstat_incr_softirqs_this_cpu(vec_nr);
108020
108021 trace_softirq_entry(vec_nr);
108022- h->action(h);
108023+ h->action();
108024 trace_softirq_exit(vec_nr);
108025 if (unlikely(prev_count != preempt_count())) {
108026 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
108027@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
108028 or_softirq_pending(1UL << nr);
108029 }
108030
108031-void open_softirq(int nr, void (*action)(struct softirq_action *))
108032+void __init open_softirq(int nr, void (*action)(void))
108033 {
108034 softirq_vec[nr].action = action;
108035 }
108036@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
108037 }
108038 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
108039
108040-static void tasklet_action(struct softirq_action *a)
108041+static void tasklet_action(void)
108042 {
108043 struct tasklet_struct *list;
108044
108045@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
108046 }
108047 }
108048
108049-static void tasklet_hi_action(struct softirq_action *a)
108050+static __latent_entropy void tasklet_hi_action(void)
108051 {
108052 struct tasklet_struct *list;
108053
108054@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
108055 .notifier_call = cpu_callback
108056 };
108057
108058-static struct smp_hotplug_thread softirq_threads = {
108059+static struct smp_hotplug_thread softirq_threads __read_only = {
108060 .store = &ksoftirqd,
108061 .thread_should_run = ksoftirqd_should_run,
108062 .thread_fn = run_ksoftirqd,
108063diff --git a/kernel/sys.c b/kernel/sys.c
108064index a4e372b..766810e 100644
108065--- a/kernel/sys.c
108066+++ b/kernel/sys.c
108067@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
108068 error = -EACCES;
108069 goto out;
108070 }
108071+
108072+ if (gr_handle_chroot_setpriority(p, niceval)) {
108073+ error = -EACCES;
108074+ goto out;
108075+ }
108076+
108077 no_nice = security_task_setnice(p, niceval);
108078 if (no_nice) {
108079 error = no_nice;
108080@@ -366,6 +372,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
108081 goto error;
108082 }
108083
108084+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
108085+ goto error;
108086+
108087+ if (!gid_eq(new->gid, old->gid)) {
108088+ /* make sure we generate a learn log for what will
108089+ end up being a role transition after a full-learning
108090+ policy is generated
108091+ CAP_SETGID is required to perform a transition
108092+ we may not log a CAP_SETGID check above, e.g.
108093+ in the case where new rgid = old egid
108094+ */
108095+ gr_learn_cap(current, new, CAP_SETGID);
108096+ }
108097+
108098 if (rgid != (gid_t) -1 ||
108099 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
108100 new->sgid = new->egid;
108101@@ -401,6 +421,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
108102 old = current_cred();
108103
108104 retval = -EPERM;
108105+
108106+ if (gr_check_group_change(kgid, kgid, kgid))
108107+ goto error;
108108+
108109 if (ns_capable(old->user_ns, CAP_SETGID))
108110 new->gid = new->egid = new->sgid = new->fsgid = kgid;
108111 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
108112@@ -418,7 +442,7 @@ error:
108113 /*
108114 * change the user struct in a credentials set to match the new UID
108115 */
108116-static int set_user(struct cred *new)
108117+int set_user(struct cred *new)
108118 {
108119 struct user_struct *new_user;
108120
108121@@ -498,7 +522,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
108122 goto error;
108123 }
108124
108125+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
108126+ goto error;
108127+
108128 if (!uid_eq(new->uid, old->uid)) {
108129+ /* make sure we generate a learn log for what will
108130+ end up being a role transition after a full-learning
108131+ policy is generated
108132+ CAP_SETUID is required to perform a transition
108133+ we may not log a CAP_SETUID check above, e.g.
108134+ in the case where new ruid = old euid
108135+ */
108136+ gr_learn_cap(current, new, CAP_SETUID);
108137 retval = set_user(new);
108138 if (retval < 0)
108139 goto error;
108140@@ -548,6 +583,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
108141 old = current_cred();
108142
108143 retval = -EPERM;
108144+
108145+ if (gr_check_crash_uid(kuid))
108146+ goto error;
108147+ if (gr_check_user_change(kuid, kuid, kuid))
108148+ goto error;
108149+
108150 if (ns_capable(old->user_ns, CAP_SETUID)) {
108151 new->suid = new->uid = kuid;
108152 if (!uid_eq(kuid, old->uid)) {
108153@@ -617,6 +658,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
108154 goto error;
108155 }
108156
108157+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
108158+ goto error;
108159+
108160 if (ruid != (uid_t) -1) {
108161 new->uid = kruid;
108162 if (!uid_eq(kruid, old->uid)) {
108163@@ -701,6 +745,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
108164 goto error;
108165 }
108166
108167+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
108168+ goto error;
108169+
108170 if (rgid != (gid_t) -1)
108171 new->gid = krgid;
108172 if (egid != (gid_t) -1)
108173@@ -765,12 +812,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
108174 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
108175 ns_capable(old->user_ns, CAP_SETUID)) {
108176 if (!uid_eq(kuid, old->fsuid)) {
108177+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
108178+ goto error;
108179+
108180 new->fsuid = kuid;
108181 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
108182 goto change_okay;
108183 }
108184 }
108185
108186+error:
108187 abort_creds(new);
108188 return old_fsuid;
108189
108190@@ -803,12 +854,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
108191 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
108192 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
108193 ns_capable(old->user_ns, CAP_SETGID)) {
108194+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
108195+ goto error;
108196+
108197 if (!gid_eq(kgid, old->fsgid)) {
108198 new->fsgid = kgid;
108199 goto change_okay;
108200 }
108201 }
108202
108203+error:
108204 abort_creds(new);
108205 return old_fsgid;
108206
108207@@ -1187,19 +1242,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
108208 return -EFAULT;
108209
108210 down_read(&uts_sem);
108211- error = __copy_to_user(&name->sysname, &utsname()->sysname,
108212+ error = __copy_to_user(name->sysname, &utsname()->sysname,
108213 __OLD_UTS_LEN);
108214 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
108215- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
108216+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
108217 __OLD_UTS_LEN);
108218 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
108219- error |= __copy_to_user(&name->release, &utsname()->release,
108220+ error |= __copy_to_user(name->release, &utsname()->release,
108221 __OLD_UTS_LEN);
108222 error |= __put_user(0, name->release + __OLD_UTS_LEN);
108223- error |= __copy_to_user(&name->version, &utsname()->version,
108224+ error |= __copy_to_user(name->version, &utsname()->version,
108225 __OLD_UTS_LEN);
108226 error |= __put_user(0, name->version + __OLD_UTS_LEN);
108227- error |= __copy_to_user(&name->machine, &utsname()->machine,
108228+ error |= __copy_to_user(name->machine, &utsname()->machine,
108229 __OLD_UTS_LEN);
108230 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
108231 up_read(&uts_sem);
108232@@ -1400,6 +1455,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
108233 */
108234 new_rlim->rlim_cur = 1;
108235 }
108236+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
108237+ is changed to a lower value. Since tasks can be created by the same
108238+ user in between this limit change and an execve by this task, force
108239+ a recheck only for this task by setting PF_NPROC_EXCEEDED
108240+ */
108241+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
108242+ tsk->flags |= PF_NPROC_EXCEEDED;
108243 }
108244 if (!retval) {
108245 if (old_rlim)
108246diff --git a/kernel/sysctl.c b/kernel/sysctl.c
108247index c3eee4c..586e4a0 100644
108248--- a/kernel/sysctl.c
108249+++ b/kernel/sysctl.c
108250@@ -94,7 +94,6 @@
108251 #endif
108252
108253 #if defined(CONFIG_SYSCTL)
108254-
108255 /* External variables not in a header file. */
108256 extern int suid_dumpable;
108257 #ifdef CONFIG_COREDUMP
108258@@ -111,22 +110,24 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
108259 #ifndef CONFIG_MMU
108260 extern int sysctl_nr_trim_pages;
108261 #endif
108262+extern int sysctl_modify_ldt;
108263
108264 /* Constants used for minimum and maximum */
108265 #ifdef CONFIG_LOCKUP_DETECTOR
108266-static int sixty = 60;
108267+static int sixty __read_only = 60;
108268 #endif
108269
108270-static int __maybe_unused neg_one = -1;
108271+static int __maybe_unused neg_one __read_only = -1;
108272
108273-static int zero;
108274-static int __maybe_unused one = 1;
108275-static int __maybe_unused two = 2;
108276-static int __maybe_unused four = 4;
108277-static unsigned long one_ul = 1;
108278-static int one_hundred = 100;
108279+static int zero __read_only = 0;
108280+static int __maybe_unused one __read_only = 1;
108281+static int __maybe_unused two __read_only = 2;
108282+static int __maybe_unused three __read_only = 3;
108283+static int __maybe_unused four __read_only = 4;
108284+static unsigned long one_ul __read_only = 1;
108285+static int one_hundred __read_only = 100;
108286 #ifdef CONFIG_PRINTK
108287-static int ten_thousand = 10000;
108288+static int ten_thousand __read_only = 10000;
108289 #endif
108290
108291 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
108292@@ -180,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
108293 void __user *buffer, size_t *lenp, loff_t *ppos);
108294 #endif
108295
108296-#ifdef CONFIG_PRINTK
108297-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108298+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108299 void __user *buffer, size_t *lenp, loff_t *ppos);
108300-#endif
108301
108302 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
108303 void __user *buffer, size_t *lenp, loff_t *ppos);
108304@@ -214,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
108305
108306 #endif
108307
108308+extern struct ctl_table grsecurity_table[];
108309+
108310 static struct ctl_table kern_table[];
108311 static struct ctl_table vm_table[];
108312 static struct ctl_table fs_table[];
108313@@ -228,6 +229,20 @@ extern struct ctl_table epoll_table[];
108314 int sysctl_legacy_va_layout;
108315 #endif
108316
108317+#ifdef CONFIG_PAX_SOFTMODE
108318+static struct ctl_table pax_table[] = {
108319+ {
108320+ .procname = "softmode",
108321+ .data = &pax_softmode,
108322+ .maxlen = sizeof(unsigned int),
108323+ .mode = 0600,
108324+ .proc_handler = &proc_dointvec,
108325+ },
108326+
108327+ { }
108328+};
108329+#endif
108330+
108331 /* The default sysctl tables: */
108332
108333 static struct ctl_table sysctl_base_table[] = {
108334@@ -276,6 +291,22 @@ static int max_extfrag_threshold = 1000;
108335 #endif
108336
108337 static struct ctl_table kern_table[] = {
108338+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
108339+ {
108340+ .procname = "grsecurity",
108341+ .mode = 0500,
108342+ .child = grsecurity_table,
108343+ },
108344+#endif
108345+
108346+#ifdef CONFIG_PAX_SOFTMODE
108347+ {
108348+ .procname = "pax",
108349+ .mode = 0500,
108350+ .child = pax_table,
108351+ },
108352+#endif
108353+
108354 {
108355 .procname = "sched_child_runs_first",
108356 .data = &sysctl_sched_child_runs_first,
108357@@ -637,7 +668,7 @@ static struct ctl_table kern_table[] = {
108358 .maxlen = sizeof(int),
108359 .mode = 0644,
108360 /* only handle a transition from default "0" to "1" */
108361- .proc_handler = proc_dointvec_minmax,
108362+ .proc_handler = proc_dointvec_minmax_secure,
108363 .extra1 = &one,
108364 .extra2 = &one,
108365 },
108366@@ -648,7 +679,7 @@ static struct ctl_table kern_table[] = {
108367 .data = &modprobe_path,
108368 .maxlen = KMOD_PATH_LEN,
108369 .mode = 0644,
108370- .proc_handler = proc_dostring,
108371+ .proc_handler = proc_dostring_modpriv,
108372 },
108373 {
108374 .procname = "modules_disabled",
108375@@ -656,7 +687,7 @@ static struct ctl_table kern_table[] = {
108376 .maxlen = sizeof(int),
108377 .mode = 0644,
108378 /* only handle a transition from default "0" to "1" */
108379- .proc_handler = proc_dointvec_minmax,
108380+ .proc_handler = proc_dointvec_minmax_secure,
108381 .extra1 = &one,
108382 .extra2 = &one,
108383 },
108384@@ -811,20 +842,24 @@ static struct ctl_table kern_table[] = {
108385 .data = &dmesg_restrict,
108386 .maxlen = sizeof(int),
108387 .mode = 0644,
108388- .proc_handler = proc_dointvec_minmax_sysadmin,
108389+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108390 .extra1 = &zero,
108391 .extra2 = &one,
108392 },
108393+#endif
108394 {
108395 .procname = "kptr_restrict",
108396 .data = &kptr_restrict,
108397 .maxlen = sizeof(int),
108398 .mode = 0644,
108399- .proc_handler = proc_dointvec_minmax_sysadmin,
108400+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108401+#ifdef CONFIG_GRKERNSEC_HIDESYM
108402+ .extra1 = &two,
108403+#else
108404 .extra1 = &zero,
108405+#endif
108406 .extra2 = &two,
108407 },
108408-#endif
108409 {
108410 .procname = "ngroups_max",
108411 .data = &ngroups_max,
108412@@ -962,6 +997,15 @@ static struct ctl_table kern_table[] = {
108413 .mode = 0644,
108414 .proc_handler = proc_dointvec,
108415 },
108416+ {
108417+ .procname = "modify_ldt",
108418+ .data = &sysctl_modify_ldt,
108419+ .maxlen = sizeof(int),
108420+ .mode = 0644,
108421+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108422+ .extra1 = &zero,
108423+ .extra2 = &one,
108424+ },
108425 #endif
108426 #if defined(CONFIG_MMU)
108427 {
108428@@ -1084,10 +1128,17 @@ static struct ctl_table kern_table[] = {
108429 */
108430 {
108431 .procname = "perf_event_paranoid",
108432- .data = &sysctl_perf_event_paranoid,
108433- .maxlen = sizeof(sysctl_perf_event_paranoid),
108434+ .data = &sysctl_perf_event_legitimately_concerned,
108435+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
108436 .mode = 0644,
108437- .proc_handler = proc_dointvec,
108438+ /* go ahead, be a hero */
108439+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108440+ .extra1 = &neg_one,
108441+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
108442+ .extra2 = &three,
108443+#else
108444+ .extra2 = &two,
108445+#endif
108446 },
108447 {
108448 .procname = "perf_event_mlock_kb",
108449@@ -1369,6 +1420,13 @@ static struct ctl_table vm_table[] = {
108450 .proc_handler = proc_dointvec_minmax,
108451 .extra1 = &zero,
108452 },
108453+ {
108454+ .procname = "heap_stack_gap",
108455+ .data = &sysctl_heap_stack_gap,
108456+ .maxlen = sizeof(sysctl_heap_stack_gap),
108457+ .mode = 0644,
108458+ .proc_handler = proc_doulongvec_minmax,
108459+ },
108460 #else
108461 {
108462 .procname = "nr_trim_pages",
108463@@ -1845,6 +1903,16 @@ int proc_dostring(struct ctl_table *table, int write,
108464 (char __user *)buffer, lenp, ppos);
108465 }
108466
108467+int proc_dostring_modpriv(struct ctl_table *table, int write,
108468+ void __user *buffer, size_t *lenp, loff_t *ppos)
108469+{
108470+ if (write && !capable(CAP_SYS_MODULE))
108471+ return -EPERM;
108472+
108473+ return _proc_do_string(table->data, table->maxlen, write,
108474+ buffer, lenp, ppos);
108475+}
108476+
108477 static size_t proc_skip_spaces(char **buf)
108478 {
108479 size_t ret;
108480@@ -1950,6 +2018,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
108481 len = strlen(tmp);
108482 if (len > *size)
108483 len = *size;
108484+ if (len > sizeof(tmp))
108485+ len = sizeof(tmp);
108486 if (copy_to_user(*buf, tmp, len))
108487 return -EFAULT;
108488 *size -= len;
108489@@ -2128,6 +2198,44 @@ int proc_dointvec(struct ctl_table *table, int write,
108490 NULL,NULL);
108491 }
108492
108493+static int do_proc_dointvec_conv_secure(bool *negp, unsigned long *lvalp,
108494+ int *valp,
108495+ int write, void *data)
108496+{
108497+ if (write) {
108498+ if (*negp) {
108499+ if (*lvalp > (unsigned long) INT_MAX + 1)
108500+ return -EINVAL;
108501+ pax_open_kernel();
108502+ *valp = -*lvalp;
108503+ pax_close_kernel();
108504+ } else {
108505+ if (*lvalp > (unsigned long) INT_MAX)
108506+ return -EINVAL;
108507+ pax_open_kernel();
108508+ *valp = *lvalp;
108509+ pax_close_kernel();
108510+ }
108511+ } else {
108512+ int val = *valp;
108513+ if (val < 0) {
108514+ *negp = true;
108515+ *lvalp = (unsigned long)-val;
108516+ } else {
108517+ *negp = false;
108518+ *lvalp = (unsigned long)val;
108519+ }
108520+ }
108521+ return 0;
108522+}
108523+
108524+int proc_dointvec_secure(struct ctl_table *table, int write,
108525+ void __user *buffer, size_t *lenp, loff_t *ppos)
108526+{
108527+ return do_proc_dointvec(table,write,buffer,lenp,ppos,
108528+ do_proc_dointvec_conv_secure,NULL);
108529+}
108530+
108531 /*
108532 * Taint values can only be increased
108533 * This means we can safely use a temporary.
108534@@ -2135,7 +2243,7 @@ int proc_dointvec(struct ctl_table *table, int write,
108535 static int proc_taint(struct ctl_table *table, int write,
108536 void __user *buffer, size_t *lenp, loff_t *ppos)
108537 {
108538- struct ctl_table t;
108539+ ctl_table_no_const t;
108540 unsigned long tmptaint = get_taint();
108541 int err;
108542
108543@@ -2163,16 +2271,14 @@ static int proc_taint(struct ctl_table *table, int write,
108544 return err;
108545 }
108546
108547-#ifdef CONFIG_PRINTK
108548-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108549+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108550 void __user *buffer, size_t *lenp, loff_t *ppos)
108551 {
108552 if (write && !capable(CAP_SYS_ADMIN))
108553 return -EPERM;
108554
108555- return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108556+ return proc_dointvec_minmax_secure(table, write, buffer, lenp, ppos);
108557 }
108558-#endif
108559
108560 struct do_proc_dointvec_minmax_conv_param {
108561 int *min;
108562@@ -2203,6 +2309,32 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
108563 return 0;
108564 }
108565
108566+static int do_proc_dointvec_minmax_conv_secure(bool *negp, unsigned long *lvalp,
108567+ int *valp,
108568+ int write, void *data)
108569+{
108570+ struct do_proc_dointvec_minmax_conv_param *param = data;
108571+ if (write) {
108572+ int val = *negp ? -*lvalp : *lvalp;
108573+ if ((param->min && *param->min > val) ||
108574+ (param->max && *param->max < val))
108575+ return -EINVAL;
108576+ pax_open_kernel();
108577+ *valp = val;
108578+ pax_close_kernel();
108579+ } else {
108580+ int val = *valp;
108581+ if (val < 0) {
108582+ *negp = true;
108583+ *lvalp = (unsigned long)-val;
108584+ } else {
108585+ *negp = false;
108586+ *lvalp = (unsigned long)val;
108587+ }
108588+ }
108589+ return 0;
108590+}
108591+
108592 /**
108593 * proc_dointvec_minmax - read a vector of integers with min/max values
108594 * @table: the sysctl table
108595@@ -2230,6 +2362,17 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
108596 do_proc_dointvec_minmax_conv, &param);
108597 }
108598
108599+int proc_dointvec_minmax_secure(struct ctl_table *table, int write,
108600+ void __user *buffer, size_t *lenp, loff_t *ppos)
108601+{
108602+ struct do_proc_dointvec_minmax_conv_param param = {
108603+ .min = (int *) table->extra1,
108604+ .max = (int *) table->extra2,
108605+ };
108606+ return do_proc_dointvec(table, write, buffer, lenp, ppos,
108607+ do_proc_dointvec_minmax_conv_secure, &param);
108608+}
108609+
108610 static void validate_coredump_safety(void)
108611 {
108612 #ifdef CONFIG_COREDUMP
108613@@ -2732,6 +2875,12 @@ int proc_dostring(struct ctl_table *table, int write,
108614 return -ENOSYS;
108615 }
108616
108617+int proc_dostring_modpriv(struct ctl_table *table, int write,
108618+ void __user *buffer, size_t *lenp, loff_t *ppos)
108619+{
108620+ return -ENOSYS;
108621+}
108622+
108623 int proc_dointvec(struct ctl_table *table, int write,
108624 void __user *buffer, size_t *lenp, loff_t *ppos)
108625 {
108626@@ -2788,5 +2937,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
108627 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
108628 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
108629 EXPORT_SYMBOL(proc_dostring);
108630+EXPORT_SYMBOL(proc_dostring_modpriv);
108631 EXPORT_SYMBOL(proc_doulongvec_minmax);
108632 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
108633diff --git a/kernel/taskstats.c b/kernel/taskstats.c
108634index 21f82c2..c1984e5 100644
108635--- a/kernel/taskstats.c
108636+++ b/kernel/taskstats.c
108637@@ -28,9 +28,12 @@
108638 #include <linux/fs.h>
108639 #include <linux/file.h>
108640 #include <linux/pid_namespace.h>
108641+#include <linux/grsecurity.h>
108642 #include <net/genetlink.h>
108643 #include <linux/atomic.h>
108644
108645+extern int gr_is_taskstats_denied(int pid);
108646+
108647 /*
108648 * Maximum length of a cpumask that can be specified in
108649 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
108650@@ -567,6 +570,9 @@ err:
108651
108652 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
108653 {
108654+ if (gr_is_taskstats_denied(current->pid))
108655+ return -EACCES;
108656+
108657 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
108658 return cmd_attr_register_cpumask(info);
108659 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
108660diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
108661index 1b001ed..55ef9e4 100644
108662--- a/kernel/time/alarmtimer.c
108663+++ b/kernel/time/alarmtimer.c
108664@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
108665 struct platform_device *pdev;
108666 int error = 0;
108667 int i;
108668- struct k_clock alarm_clock = {
108669+ static struct k_clock alarm_clock = {
108670 .clock_getres = alarm_clock_getres,
108671 .clock_get = alarm_clock_get,
108672 .timer_create = alarm_timer_create,
108673diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
108674index 93ef7190..7c85701 100644
108675--- a/kernel/time/hrtimer.c
108676+++ b/kernel/time/hrtimer.c
108677@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
108678 local_irq_restore(flags);
108679 }
108680
108681-static void run_hrtimer_softirq(struct softirq_action *h)
108682+static __latent_entropy void run_hrtimer_softirq(void)
108683 {
108684 hrtimer_peek_ahead_timers();
108685 }
108686diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
108687index 0075da7..63cc872 100644
108688--- a/kernel/time/posix-cpu-timers.c
108689+++ b/kernel/time/posix-cpu-timers.c
108690@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
108691
108692 static __init int init_posix_cpu_timers(void)
108693 {
108694- struct k_clock process = {
108695+ static struct k_clock process = {
108696 .clock_getres = process_cpu_clock_getres,
108697 .clock_get = process_cpu_clock_get,
108698 .timer_create = process_cpu_timer_create,
108699 .nsleep = process_cpu_nsleep,
108700 .nsleep_restart = process_cpu_nsleep_restart,
108701 };
108702- struct k_clock thread = {
108703+ static struct k_clock thread = {
108704 .clock_getres = thread_cpu_clock_getres,
108705 .clock_get = thread_cpu_clock_get,
108706 .timer_create = thread_cpu_timer_create,
108707diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
108708index 31ea01f..7fc61ef 100644
108709--- a/kernel/time/posix-timers.c
108710+++ b/kernel/time/posix-timers.c
108711@@ -43,6 +43,7 @@
108712 #include <linux/hash.h>
108713 #include <linux/posix-clock.h>
108714 #include <linux/posix-timers.h>
108715+#include <linux/grsecurity.h>
108716 #include <linux/syscalls.h>
108717 #include <linux/wait.h>
108718 #include <linux/workqueue.h>
108719@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
108720 * which we beg off on and pass to do_sys_settimeofday().
108721 */
108722
108723-static struct k_clock posix_clocks[MAX_CLOCKS];
108724+static struct k_clock *posix_clocks[MAX_CLOCKS];
108725
108726 /*
108727 * These ones are defined below.
108728@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
108729 */
108730 static __init int init_posix_timers(void)
108731 {
108732- struct k_clock clock_realtime = {
108733+ static struct k_clock clock_realtime = {
108734 .clock_getres = hrtimer_get_res,
108735 .clock_get = posix_clock_realtime_get,
108736 .clock_set = posix_clock_realtime_set,
108737@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
108738 .timer_get = common_timer_get,
108739 .timer_del = common_timer_del,
108740 };
108741- struct k_clock clock_monotonic = {
108742+ static struct k_clock clock_monotonic = {
108743 .clock_getres = hrtimer_get_res,
108744 .clock_get = posix_ktime_get_ts,
108745 .nsleep = common_nsleep,
108746@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
108747 .timer_get = common_timer_get,
108748 .timer_del = common_timer_del,
108749 };
108750- struct k_clock clock_monotonic_raw = {
108751+ static struct k_clock clock_monotonic_raw = {
108752 .clock_getres = hrtimer_get_res,
108753 .clock_get = posix_get_monotonic_raw,
108754 };
108755- struct k_clock clock_realtime_coarse = {
108756+ static struct k_clock clock_realtime_coarse = {
108757 .clock_getres = posix_get_coarse_res,
108758 .clock_get = posix_get_realtime_coarse,
108759 };
108760- struct k_clock clock_monotonic_coarse = {
108761+ static struct k_clock clock_monotonic_coarse = {
108762 .clock_getres = posix_get_coarse_res,
108763 .clock_get = posix_get_monotonic_coarse,
108764 };
108765- struct k_clock clock_tai = {
108766+ static struct k_clock clock_tai = {
108767 .clock_getres = hrtimer_get_res,
108768 .clock_get = posix_get_tai,
108769 .nsleep = common_nsleep,
108770@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
108771 .timer_get = common_timer_get,
108772 .timer_del = common_timer_del,
108773 };
108774- struct k_clock clock_boottime = {
108775+ static struct k_clock clock_boottime = {
108776 .clock_getres = hrtimer_get_res,
108777 .clock_get = posix_get_boottime,
108778 .nsleep = common_nsleep,
108779@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
108780 return;
108781 }
108782
108783- posix_clocks[clock_id] = *new_clock;
108784+ posix_clocks[clock_id] = new_clock;
108785 }
108786 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
108787
108788@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
108789 return (id & CLOCKFD_MASK) == CLOCKFD ?
108790 &clock_posix_dynamic : &clock_posix_cpu;
108791
108792- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
108793+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
108794 return NULL;
108795- return &posix_clocks[id];
108796+ return posix_clocks[id];
108797 }
108798
108799 static int common_timer_create(struct k_itimer *new_timer)
108800@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
108801 struct k_clock *kc = clockid_to_kclock(which_clock);
108802 struct k_itimer *new_timer;
108803 int error, new_timer_id;
108804- sigevent_t event;
108805+ sigevent_t event = { };
108806 int it_id_set = IT_ID_NOT_SET;
108807
108808 if (!kc)
108809@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
108810 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
108811 return -EFAULT;
108812
108813+ /* only the CLOCK_REALTIME clock can be set, all other clocks
108814+ have their clock_set fptr set to a nosettime dummy function
108815+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
108816+ call common_clock_set, which calls do_sys_settimeofday, which
108817+ we hook
108818+ */
108819+
108820 return kc->clock_set(which_clock, &new_tp);
108821 }
108822
108823diff --git a/kernel/time/time.c b/kernel/time/time.c
108824index 2c85b77..6530536 100644
108825--- a/kernel/time/time.c
108826+++ b/kernel/time/time.c
108827@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
108828 return error;
108829
108830 if (tz) {
108831+ /* we log in do_settimeofday called below, so don't log twice
108832+ */
108833+ if (!tv)
108834+ gr_log_timechange();
108835+
108836 sys_tz = *tz;
108837 update_vsyscall_tz();
108838 if (firsttime) {
108839diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
108840index 946acb7..1e13c0f 100644
108841--- a/kernel/time/timekeeping.c
108842+++ b/kernel/time/timekeeping.c
108843@@ -15,6 +15,7 @@
108844 #include <linux/init.h>
108845 #include <linux/mm.h>
108846 #include <linux/sched.h>
108847+#include <linux/grsecurity.h>
108848 #include <linux/syscore_ops.h>
108849 #include <linux/clocksource.h>
108850 #include <linux/jiffies.h>
108851@@ -915,6 +916,8 @@ int do_settimeofday64(const struct timespec64 *ts)
108852 if (!timespec64_valid_strict(ts))
108853 return -EINVAL;
108854
108855+ gr_log_timechange();
108856+
108857 raw_spin_lock_irqsave(&timekeeper_lock, flags);
108858 write_seqcount_begin(&tk_core.seq);
108859
108860diff --git a/kernel/time/timer.c b/kernel/time/timer.c
108861index 2ece3aa..055a295 100644
108862--- a/kernel/time/timer.c
108863+++ b/kernel/time/timer.c
108864@@ -1405,7 +1405,7 @@ void update_process_times(int user_tick)
108865 /*
108866 * This function runs timers and the timer-tq in bottom half context.
108867 */
108868-static void run_timer_softirq(struct softirq_action *h)
108869+static __latent_entropy void run_timer_softirq(void)
108870 {
108871 struct tvec_base *base = __this_cpu_read(tvec_bases);
108872
108873@@ -1468,7 +1468,7 @@ static void process_timeout(unsigned long __data)
108874 *
108875 * In all cases the return value is guaranteed to be non-negative.
108876 */
108877-signed long __sched schedule_timeout(signed long timeout)
108878+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
108879 {
108880 struct timer_list timer;
108881 unsigned long expire;
108882diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
108883index e878c2e..cf1546bb 100644
108884--- a/kernel/time/timer_list.c
108885+++ b/kernel/time/timer_list.c
108886@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
108887
108888 static void print_name_offset(struct seq_file *m, void *sym)
108889 {
108890+#ifdef CONFIG_GRKERNSEC_HIDESYM
108891+ SEQ_printf(m, "<%p>", NULL);
108892+#else
108893 char symname[KSYM_NAME_LEN];
108894
108895 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
108896 SEQ_printf(m, "<%pK>", sym);
108897 else
108898 SEQ_printf(m, "%s", symname);
108899+#endif
108900 }
108901
108902 static void
108903@@ -119,7 +123,11 @@ next_one:
108904 static void
108905 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
108906 {
108907+#ifdef CONFIG_GRKERNSEC_HIDESYM
108908+ SEQ_printf(m, " .base: %p\n", NULL);
108909+#else
108910 SEQ_printf(m, " .base: %pK\n", base);
108911+#endif
108912 SEQ_printf(m, " .index: %d\n",
108913 base->index);
108914 SEQ_printf(m, " .resolution: %Lu nsecs\n",
108915@@ -388,7 +396,11 @@ static int __init init_timer_list_procfs(void)
108916 {
108917 struct proc_dir_entry *pe;
108918
108919+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108920+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
108921+#else
108922 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
108923+#endif
108924 if (!pe)
108925 return -ENOMEM;
108926 return 0;
108927diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
108928index 1fb08f2..ca4bb1e 100644
108929--- a/kernel/time/timer_stats.c
108930+++ b/kernel/time/timer_stats.c
108931@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
108932 static unsigned long nr_entries;
108933 static struct entry entries[MAX_ENTRIES];
108934
108935-static atomic_t overflow_count;
108936+static atomic_unchecked_t overflow_count;
108937
108938 /*
108939 * The entries are in a hash-table, for fast lookup:
108940@@ -140,7 +140,7 @@ static void reset_entries(void)
108941 nr_entries = 0;
108942 memset(entries, 0, sizeof(entries));
108943 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
108944- atomic_set(&overflow_count, 0);
108945+ atomic_set_unchecked(&overflow_count, 0);
108946 }
108947
108948 static struct entry *alloc_entry(void)
108949@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108950 if (likely(entry))
108951 entry->count++;
108952 else
108953- atomic_inc(&overflow_count);
108954+ atomic_inc_unchecked(&overflow_count);
108955
108956 out_unlock:
108957 raw_spin_unlock_irqrestore(lock, flags);
108958@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
108959
108960 static void print_name_offset(struct seq_file *m, unsigned long addr)
108961 {
108962+#ifdef CONFIG_GRKERNSEC_HIDESYM
108963+ seq_printf(m, "<%p>", NULL);
108964+#else
108965 char symname[KSYM_NAME_LEN];
108966
108967 if (lookup_symbol_name(addr, symname) < 0)
108968- seq_printf(m, "<%p>", (void *)addr);
108969+ seq_printf(m, "<%pK>", (void *)addr);
108970 else
108971 seq_printf(m, "%s", symname);
108972+#endif
108973 }
108974
108975 static int tstats_show(struct seq_file *m, void *v)
108976@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
108977
108978 seq_puts(m, "Timer Stats Version: v0.3\n");
108979 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
108980- if (atomic_read(&overflow_count))
108981- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
108982+ if (atomic_read_unchecked(&overflow_count))
108983+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
108984 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
108985
108986 for (i = 0; i < nr_entries; i++) {
108987@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
108988 {
108989 struct proc_dir_entry *pe;
108990
108991+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108992+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
108993+#else
108994 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
108995+#endif
108996 if (!pe)
108997 return -ENOMEM;
108998 return 0;
108999diff --git a/kernel/torture.c b/kernel/torture.c
109000index dd70993..0bf694b 100644
109001--- a/kernel/torture.c
109002+++ b/kernel/torture.c
109003@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
109004 mutex_lock(&fullstop_mutex);
109005 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
109006 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
109007- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
109008+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
109009 } else {
109010 pr_warn("Concurrent rmmod and shutdown illegal!\n");
109011 }
109012@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
109013 if (!torture_must_stop()) {
109014 if (stutter > 1) {
109015 schedule_timeout_interruptible(stutter - 1);
109016- ACCESS_ONCE(stutter_pause_test) = 2;
109017+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
109018 }
109019 schedule_timeout_interruptible(1);
109020- ACCESS_ONCE(stutter_pause_test) = 1;
109021+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
109022 }
109023 if (!torture_must_stop())
109024 schedule_timeout_interruptible(stutter);
109025- ACCESS_ONCE(stutter_pause_test) = 0;
109026+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
109027 torture_shutdown_absorb("torture_stutter");
109028 } while (!torture_must_stop());
109029 torture_kthread_stopping("torture_stutter");
109030@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
109031 schedule_timeout_uninterruptible(10);
109032 return true;
109033 }
109034- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
109035+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
109036 mutex_unlock(&fullstop_mutex);
109037 torture_shutdown_cleanup();
109038 torture_shuffle_cleanup();
109039diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
109040index 483cecf..ac46091 100644
109041--- a/kernel/trace/blktrace.c
109042+++ b/kernel/trace/blktrace.c
109043@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
109044 struct blk_trace *bt = filp->private_data;
109045 char buf[16];
109046
109047- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
109048+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
109049
109050 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
109051 }
109052@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
109053 return 1;
109054
109055 bt = buf->chan->private_data;
109056- atomic_inc(&bt->dropped);
109057+ atomic_inc_unchecked(&bt->dropped);
109058 return 0;
109059 }
109060
109061@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
109062
109063 bt->dir = dir;
109064 bt->dev = dev;
109065- atomic_set(&bt->dropped, 0);
109066+ atomic_set_unchecked(&bt->dropped, 0);
109067 INIT_LIST_HEAD(&bt->running_list);
109068
109069 ret = -EIO;
109070diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
109071index 02bece4..f9b05af 100644
109072--- a/kernel/trace/ftrace.c
109073+++ b/kernel/trace/ftrace.c
109074@@ -2395,12 +2395,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
109075 if (unlikely(ftrace_disabled))
109076 return 0;
109077
109078+ ret = ftrace_arch_code_modify_prepare();
109079+ FTRACE_WARN_ON(ret);
109080+ if (ret)
109081+ return 0;
109082+
109083 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
109084+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
109085 if (ret) {
109086 ftrace_bug(ret, rec);
109087- return 0;
109088 }
109089- return 1;
109090+ return ret ? 0 : 1;
109091 }
109092
109093 /*
109094@@ -4789,8 +4794,10 @@ static int ftrace_process_locs(struct module *mod,
109095 if (!count)
109096 return 0;
109097
109098+ pax_open_kernel();
109099 sort(start, count, sizeof(*start),
109100 ftrace_cmp_ips, ftrace_swap_ips);
109101+ pax_close_kernel();
109102
109103 start_pg = ftrace_allocate_pages(count);
109104 if (!start_pg)
109105@@ -5659,7 +5666,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
109106
109107 if (t->ret_stack == NULL) {
109108 atomic_set(&t->tracing_graph_pause, 0);
109109- atomic_set(&t->trace_overrun, 0);
109110+ atomic_set_unchecked(&t->trace_overrun, 0);
109111 t->curr_ret_stack = -1;
109112 /* Make sure the tasks see the -1 first: */
109113 smp_wmb();
109114@@ -5882,7 +5889,7 @@ static void
109115 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
109116 {
109117 atomic_set(&t->tracing_graph_pause, 0);
109118- atomic_set(&t->trace_overrun, 0);
109119+ atomic_set_unchecked(&t->trace_overrun, 0);
109120 t->ftrace_timestamp = 0;
109121 /* make curr_ret_stack visible before we add the ret_stack */
109122 smp_wmb();
109123diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
109124index 0315d43..2e5e9a2 100644
109125--- a/kernel/trace/ring_buffer.c
109126+++ b/kernel/trace/ring_buffer.c
109127@@ -348,9 +348,9 @@ struct buffer_data_page {
109128 */
109129 struct buffer_page {
109130 struct list_head list; /* list of buffer pages */
109131- local_t write; /* index for next write */
109132+ local_unchecked_t write; /* index for next write */
109133 unsigned read; /* index for next read */
109134- local_t entries; /* entries on this page */
109135+ local_unchecked_t entries; /* entries on this page */
109136 unsigned long real_end; /* real end of data */
109137 struct buffer_data_page *page; /* Actual data page */
109138 };
109139@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
109140 unsigned long last_overrun;
109141 local_t entries_bytes;
109142 local_t entries;
109143- local_t overrun;
109144- local_t commit_overrun;
109145- local_t dropped_events;
109146+ local_unchecked_t overrun;
109147+ local_unchecked_t commit_overrun;
109148+ local_unchecked_t dropped_events;
109149 local_t committing;
109150- local_t commits;
109151+ local_unchecked_t commits;
109152 unsigned long read;
109153 unsigned long read_bytes;
109154 u64 write_stamp;
109155@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109156 *
109157 * We add a counter to the write field to denote this.
109158 */
109159- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
109160- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
109161+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
109162+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
109163
109164 /*
109165 * Just make sure we have seen our old_write and synchronize
109166@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109167 * cmpxchg to only update if an interrupt did not already
109168 * do it for us. If the cmpxchg fails, we don't care.
109169 */
109170- (void)local_cmpxchg(&next_page->write, old_write, val);
109171- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
109172+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
109173+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
109174
109175 /*
109176 * No need to worry about races with clearing out the commit.
109177@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
109178
109179 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
109180 {
109181- return local_read(&bpage->entries) & RB_WRITE_MASK;
109182+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
109183 }
109184
109185 static inline unsigned long rb_page_write(struct buffer_page *bpage)
109186 {
109187- return local_read(&bpage->write) & RB_WRITE_MASK;
109188+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
109189 }
109190
109191 static int
109192@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
109193 * bytes consumed in ring buffer from here.
109194 * Increment overrun to account for the lost events.
109195 */
109196- local_add(page_entries, &cpu_buffer->overrun);
109197+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
109198 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109199 }
109200
109201@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
109202 * it is our responsibility to update
109203 * the counters.
109204 */
109205- local_add(entries, &cpu_buffer->overrun);
109206+ local_add_unchecked(entries, &cpu_buffer->overrun);
109207 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109208
109209 /*
109210@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109211 if (tail == BUF_PAGE_SIZE)
109212 tail_page->real_end = 0;
109213
109214- local_sub(length, &tail_page->write);
109215+ local_sub_unchecked(length, &tail_page->write);
109216 return;
109217 }
109218
109219@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109220 rb_event_set_padding(event);
109221
109222 /* Set the write back to the previous setting */
109223- local_sub(length, &tail_page->write);
109224+ local_sub_unchecked(length, &tail_page->write);
109225 return;
109226 }
109227
109228@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109229
109230 /* Set write to end of buffer */
109231 length = (tail + length) - BUF_PAGE_SIZE;
109232- local_sub(length, &tail_page->write);
109233+ local_sub_unchecked(length, &tail_page->write);
109234 }
109235
109236 /*
109237@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109238 * about it.
109239 */
109240 if (unlikely(next_page == commit_page)) {
109241- local_inc(&cpu_buffer->commit_overrun);
109242+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109243 goto out_reset;
109244 }
109245
109246@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109247 * this is easy, just stop here.
109248 */
109249 if (!(buffer->flags & RB_FL_OVERWRITE)) {
109250- local_inc(&cpu_buffer->dropped_events);
109251+ local_inc_unchecked(&cpu_buffer->dropped_events);
109252 goto out_reset;
109253 }
109254
109255@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109256 cpu_buffer->tail_page) &&
109257 (cpu_buffer->commit_page ==
109258 cpu_buffer->reader_page))) {
109259- local_inc(&cpu_buffer->commit_overrun);
109260+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109261 goto out_reset;
109262 }
109263 }
109264@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109265 length += RB_LEN_TIME_EXTEND;
109266
109267 tail_page = cpu_buffer->tail_page;
109268- write = local_add_return(length, &tail_page->write);
109269+ write = local_add_return_unchecked(length, &tail_page->write);
109270
109271 /* set write to only the index of the write */
109272 write &= RB_WRITE_MASK;
109273@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109274 kmemcheck_annotate_bitfield(event, bitfield);
109275 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
109276
109277- local_inc(&tail_page->entries);
109278+ local_inc_unchecked(&tail_page->entries);
109279
109280 /*
109281 * If this is the first commit on the page, then update
109282@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109283
109284 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
109285 unsigned long write_mask =
109286- local_read(&bpage->write) & ~RB_WRITE_MASK;
109287+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
109288 unsigned long event_length = rb_event_length(event);
109289 /*
109290 * This is on the tail page. It is possible that
109291@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109292 */
109293 old_index += write_mask;
109294 new_index += write_mask;
109295- index = local_cmpxchg(&bpage->write, old_index, new_index);
109296+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
109297 if (index == old_index) {
109298 /* update counters */
109299 local_sub(event_length, &cpu_buffer->entries_bytes);
109300@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109301 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
109302 {
109303 local_inc(&cpu_buffer->committing);
109304- local_inc(&cpu_buffer->commits);
109305+ local_inc_unchecked(&cpu_buffer->commits);
109306 }
109307
109308 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109309@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109310 return;
109311
109312 again:
109313- commits = local_read(&cpu_buffer->commits);
109314+ commits = local_read_unchecked(&cpu_buffer->commits);
109315 /* synchronize with interrupts */
109316 barrier();
109317 if (local_read(&cpu_buffer->committing) == 1)
109318@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109319 * updating of the commit page and the clearing of the
109320 * committing counter.
109321 */
109322- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
109323+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
109324 !local_read(&cpu_buffer->committing)) {
109325 local_inc(&cpu_buffer->committing);
109326 goto again;
109327@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
109328 barrier();
109329 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
109330 local_dec(&cpu_buffer->committing);
109331- local_dec(&cpu_buffer->commits);
109332+ local_dec_unchecked(&cpu_buffer->commits);
109333 return NULL;
109334 }
109335 #endif
109336@@ -2898,7 +2898,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109337
109338 /* Do the likely case first */
109339 if (likely(bpage->page == (void *)addr)) {
109340- local_dec(&bpage->entries);
109341+ local_dec_unchecked(&bpage->entries);
109342 return;
109343 }
109344
109345@@ -2910,7 +2910,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109346 start = bpage;
109347 do {
109348 if (bpage->page == (void *)addr) {
109349- local_dec(&bpage->entries);
109350+ local_dec_unchecked(&bpage->entries);
109351 return;
109352 }
109353 rb_inc_page(cpu_buffer, &bpage);
109354@@ -3194,7 +3194,7 @@ static inline unsigned long
109355 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
109356 {
109357 return local_read(&cpu_buffer->entries) -
109358- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
109359+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
109360 }
109361
109362 /**
109363@@ -3283,7 +3283,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
109364 return 0;
109365
109366 cpu_buffer = buffer->buffers[cpu];
109367- ret = local_read(&cpu_buffer->overrun);
109368+ ret = local_read_unchecked(&cpu_buffer->overrun);
109369
109370 return ret;
109371 }
109372@@ -3306,7 +3306,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
109373 return 0;
109374
109375 cpu_buffer = buffer->buffers[cpu];
109376- ret = local_read(&cpu_buffer->commit_overrun);
109377+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
109378
109379 return ret;
109380 }
109381@@ -3328,7 +3328,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
109382 return 0;
109383
109384 cpu_buffer = buffer->buffers[cpu];
109385- ret = local_read(&cpu_buffer->dropped_events);
109386+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
109387
109388 return ret;
109389 }
109390@@ -3391,7 +3391,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
109391 /* if you care about this being correct, lock the buffer */
109392 for_each_buffer_cpu(buffer, cpu) {
109393 cpu_buffer = buffer->buffers[cpu];
109394- overruns += local_read(&cpu_buffer->overrun);
109395+ overruns += local_read_unchecked(&cpu_buffer->overrun);
109396 }
109397
109398 return overruns;
109399@@ -3562,8 +3562,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109400 /*
109401 * Reset the reader page to size zero.
109402 */
109403- local_set(&cpu_buffer->reader_page->write, 0);
109404- local_set(&cpu_buffer->reader_page->entries, 0);
109405+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109406+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109407 local_set(&cpu_buffer->reader_page->page->commit, 0);
109408 cpu_buffer->reader_page->real_end = 0;
109409
109410@@ -3597,7 +3597,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109411 * want to compare with the last_overrun.
109412 */
109413 smp_mb();
109414- overwrite = local_read(&(cpu_buffer->overrun));
109415+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
109416
109417 /*
109418 * Here's the tricky part.
109419@@ -4169,8 +4169,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109420
109421 cpu_buffer->head_page
109422 = list_entry(cpu_buffer->pages, struct buffer_page, list);
109423- local_set(&cpu_buffer->head_page->write, 0);
109424- local_set(&cpu_buffer->head_page->entries, 0);
109425+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
109426+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
109427 local_set(&cpu_buffer->head_page->page->commit, 0);
109428
109429 cpu_buffer->head_page->read = 0;
109430@@ -4180,18 +4180,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109431
109432 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
109433 INIT_LIST_HEAD(&cpu_buffer->new_pages);
109434- local_set(&cpu_buffer->reader_page->write, 0);
109435- local_set(&cpu_buffer->reader_page->entries, 0);
109436+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109437+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109438 local_set(&cpu_buffer->reader_page->page->commit, 0);
109439 cpu_buffer->reader_page->read = 0;
109440
109441 local_set(&cpu_buffer->entries_bytes, 0);
109442- local_set(&cpu_buffer->overrun, 0);
109443- local_set(&cpu_buffer->commit_overrun, 0);
109444- local_set(&cpu_buffer->dropped_events, 0);
109445+ local_set_unchecked(&cpu_buffer->overrun, 0);
109446+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
109447+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
109448 local_set(&cpu_buffer->entries, 0);
109449 local_set(&cpu_buffer->committing, 0);
109450- local_set(&cpu_buffer->commits, 0);
109451+ local_set_unchecked(&cpu_buffer->commits, 0);
109452 cpu_buffer->read = 0;
109453 cpu_buffer->read_bytes = 0;
109454
109455@@ -4592,8 +4592,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
109456 rb_init_page(bpage);
109457 bpage = reader->page;
109458 reader->page = *data_page;
109459- local_set(&reader->write, 0);
109460- local_set(&reader->entries, 0);
109461+ local_set_unchecked(&reader->write, 0);
109462+ local_set_unchecked(&reader->entries, 0);
109463 reader->read = 0;
109464 *data_page = bpage;
109465
109466diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
109467index 0533049..85e27f0 100644
109468--- a/kernel/trace/trace.c
109469+++ b/kernel/trace/trace.c
109470@@ -3538,7 +3538,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
109471 return 0;
109472 }
109473
109474-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
109475+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
109476 {
109477 /* do nothing if flag is already set */
109478 if (!!(trace_flags & mask) == !!enabled)
109479diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
109480index d261201..da10429 100644
109481--- a/kernel/trace/trace.h
109482+++ b/kernel/trace/trace.h
109483@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
109484 void trace_printk_init_buffers(void);
109485 void trace_printk_start_comm(void);
109486 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
109487-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
109488+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
109489
109490 /*
109491 * Normal trace_printk() and friends allocates special buffers
109492diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
109493index 57b67b1..66082a9 100644
109494--- a/kernel/trace/trace_clock.c
109495+++ b/kernel/trace/trace_clock.c
109496@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
109497 return now;
109498 }
109499
109500-static atomic64_t trace_counter;
109501+static atomic64_unchecked_t trace_counter;
109502
109503 /*
109504 * trace_clock_counter(): simply an atomic counter.
109505@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
109506 */
109507 u64 notrace trace_clock_counter(void)
109508 {
109509- return atomic64_add_return(1, &trace_counter);
109510+ return atomic64_inc_return_unchecked(&trace_counter);
109511 }
109512diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
109513index c4de47f..5f134b8 100644
109514--- a/kernel/trace/trace_events.c
109515+++ b/kernel/trace/trace_events.c
109516@@ -1887,7 +1887,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
109517 return 0;
109518 }
109519
109520-struct ftrace_module_file_ops;
109521 static void __add_event_to_tracers(struct ftrace_event_call *call);
109522
109523 /* Add an additional event_call dynamically */
109524diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
109525index 7f2e97c..085a257 100644
109526--- a/kernel/trace/trace_events_filter.c
109527+++ b/kernel/trace/trace_events_filter.c
109528@@ -1056,6 +1056,9 @@ static void parse_init(struct filter_parse_state *ps,
109529
109530 static char infix_next(struct filter_parse_state *ps)
109531 {
109532+ if (!ps->infix.cnt)
109533+ return 0;
109534+
109535 ps->infix.cnt--;
109536
109537 return ps->infix.string[ps->infix.tail++];
109538@@ -1071,6 +1074,9 @@ static char infix_peek(struct filter_parse_state *ps)
109539
109540 static void infix_advance(struct filter_parse_state *ps)
109541 {
109542+ if (!ps->infix.cnt)
109543+ return;
109544+
109545 ps->infix.cnt--;
109546 ps->infix.tail++;
109547 }
109548diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
109549index a51e796..1f32ebd 100644
109550--- a/kernel/trace/trace_functions_graph.c
109551+++ b/kernel/trace/trace_functions_graph.c
109552@@ -132,7 +132,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
109553
109554 /* The return trace stack is full */
109555 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
109556- atomic_inc(&current->trace_overrun);
109557+ atomic_inc_unchecked(&current->trace_overrun);
109558 return -EBUSY;
109559 }
109560
109561@@ -229,7 +229,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
109562 *ret = current->ret_stack[index].ret;
109563 trace->func = current->ret_stack[index].func;
109564 trace->calltime = current->ret_stack[index].calltime;
109565- trace->overrun = atomic_read(&current->trace_overrun);
109566+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
109567 trace->depth = index;
109568 }
109569
109570diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
109571index 7a9ba62..2e0e4a1 100644
109572--- a/kernel/trace/trace_mmiotrace.c
109573+++ b/kernel/trace/trace_mmiotrace.c
109574@@ -24,7 +24,7 @@ struct header_iter {
109575 static struct trace_array *mmio_trace_array;
109576 static bool overrun_detected;
109577 static unsigned long prev_overruns;
109578-static atomic_t dropped_count;
109579+static atomic_unchecked_t dropped_count;
109580
109581 static void mmio_reset_data(struct trace_array *tr)
109582 {
109583@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
109584
109585 static unsigned long count_overruns(struct trace_iterator *iter)
109586 {
109587- unsigned long cnt = atomic_xchg(&dropped_count, 0);
109588+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
109589 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
109590
109591 if (over > prev_overruns)
109592@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
109593 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
109594 sizeof(*entry), 0, pc);
109595 if (!event) {
109596- atomic_inc(&dropped_count);
109597+ atomic_inc_unchecked(&dropped_count);
109598 return;
109599 }
109600 entry = ring_buffer_event_data(event);
109601@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
109602 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
109603 sizeof(*entry), 0, pc);
109604 if (!event) {
109605- atomic_inc(&dropped_count);
109606+ atomic_inc_unchecked(&dropped_count);
109607 return;
109608 }
109609 entry = ring_buffer_event_data(event);
109610diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
109611index 25a086b..a918131 100644
109612--- a/kernel/trace/trace_output.c
109613+++ b/kernel/trace/trace_output.c
109614@@ -752,14 +752,16 @@ int register_ftrace_event(struct trace_event *event)
109615 goto out;
109616 }
109617
109618+ pax_open_kernel();
109619 if (event->funcs->trace == NULL)
109620- event->funcs->trace = trace_nop_print;
109621+ *(void **)&event->funcs->trace = trace_nop_print;
109622 if (event->funcs->raw == NULL)
109623- event->funcs->raw = trace_nop_print;
109624+ *(void **)&event->funcs->raw = trace_nop_print;
109625 if (event->funcs->hex == NULL)
109626- event->funcs->hex = trace_nop_print;
109627+ *(void **)&event->funcs->hex = trace_nop_print;
109628 if (event->funcs->binary == NULL)
109629- event->funcs->binary = trace_nop_print;
109630+ *(void **)&event->funcs->binary = trace_nop_print;
109631+ pax_close_kernel();
109632
109633 key = event->type & (EVENT_HASHSIZE - 1);
109634
109635diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
109636index e694c9f..6775a38 100644
109637--- a/kernel/trace/trace_seq.c
109638+++ b/kernel/trace/trace_seq.c
109639@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
109640 return 0;
109641 }
109642
109643- seq_buf_path(&s->seq, path, "\n");
109644+ seq_buf_path(&s->seq, path, "\n\\");
109645
109646 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
109647 s->seq.len = save_len;
109648diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
109649index 3f34496..0492d95 100644
109650--- a/kernel/trace/trace_stack.c
109651+++ b/kernel/trace/trace_stack.c
109652@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
109653 return;
109654
109655 /* we do not handle interrupt stacks yet */
109656- if (!object_is_on_stack(stack))
109657+ if (!object_starts_on_stack(stack))
109658 return;
109659
109660 local_irq_save(flags);
109661diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
109662index f97f6e3..d367b48 100644
109663--- a/kernel/trace/trace_syscalls.c
109664+++ b/kernel/trace/trace_syscalls.c
109665@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
109666 int num;
109667
109668 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109669+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109670+ return -EINVAL;
109671
109672 mutex_lock(&syscall_trace_lock);
109673 if (!sys_perf_refcount_enter)
109674@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
109675 int num;
109676
109677 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109678+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109679+ return;
109680
109681 mutex_lock(&syscall_trace_lock);
109682 sys_perf_refcount_enter--;
109683@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
109684 int num;
109685
109686 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109687+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109688+ return -EINVAL;
109689
109690 mutex_lock(&syscall_trace_lock);
109691 if (!sys_perf_refcount_exit)
109692@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
109693 int num;
109694
109695 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109696+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109697+ return;
109698
109699 mutex_lock(&syscall_trace_lock);
109700 sys_perf_refcount_exit--;
109701diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
109702index 4109f83..fe1f830 100644
109703--- a/kernel/user_namespace.c
109704+++ b/kernel/user_namespace.c
109705@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
109706 !kgid_has_mapping(parent_ns, group))
109707 return -EPERM;
109708
109709+#ifdef CONFIG_GRKERNSEC
109710+ /*
109711+ * This doesn't really inspire confidence:
109712+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
109713+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
109714+ * Increases kernel attack surface in areas developers
109715+ * previously cared little about ("low importance due
109716+ * to requiring "root" capability")
109717+ * To be removed when this code receives *proper* review
109718+ */
109719+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
109720+ !capable(CAP_SETGID))
109721+ return -EPERM;
109722+#endif
109723+
109724 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
109725 if (!ns)
109726 return -ENOMEM;
109727@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
109728 if (atomic_read(&current->mm->mm_users) > 1)
109729 return -EINVAL;
109730
109731- if (current->fs->users != 1)
109732+ if (atomic_read(&current->fs->users) != 1)
109733 return -EINVAL;
109734
109735 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
109736diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
109737index c8eac43..4b5f08f 100644
109738--- a/kernel/utsname_sysctl.c
109739+++ b/kernel/utsname_sysctl.c
109740@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
109741 static int proc_do_uts_string(struct ctl_table *table, int write,
109742 void __user *buffer, size_t *lenp, loff_t *ppos)
109743 {
109744- struct ctl_table uts_table;
109745+ ctl_table_no_const uts_table;
109746 int r;
109747 memcpy(&uts_table, table, sizeof(uts_table));
109748 uts_table.data = get_uts(table, write);
109749diff --git a/kernel/watchdog.c b/kernel/watchdog.c
109750index 581a68a..7ff6a89 100644
109751--- a/kernel/watchdog.c
109752+++ b/kernel/watchdog.c
109753@@ -648,7 +648,7 @@ void watchdog_nmi_enable_all(void) {}
109754 void watchdog_nmi_disable_all(void) {}
109755 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
109756
109757-static struct smp_hotplug_thread watchdog_threads = {
109758+static struct smp_hotplug_thread watchdog_threads __read_only = {
109759 .store = &softlockup_watchdog,
109760 .thread_should_run = watchdog_should_run,
109761 .thread_fn = watchdog,
109762diff --git a/kernel/workqueue.c b/kernel/workqueue.c
109763index 586ad91..5f8844a 100644
109764--- a/kernel/workqueue.c
109765+++ b/kernel/workqueue.c
109766@@ -4428,7 +4428,7 @@ static void rebind_workers(struct worker_pool *pool)
109767 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
109768 worker_flags |= WORKER_REBOUND;
109769 worker_flags &= ~WORKER_UNBOUND;
109770- ACCESS_ONCE(worker->flags) = worker_flags;
109771+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
109772 }
109773
109774 spin_unlock_irq(&pool->lock);
109775diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
109776index ba2b0c8..a571efc 100644
109777--- a/lib/Kconfig.debug
109778+++ b/lib/Kconfig.debug
109779@@ -936,7 +936,7 @@ config DEBUG_MUTEXES
109780
109781 config DEBUG_WW_MUTEX_SLOWPATH
109782 bool "Wait/wound mutex debugging: Slowpath testing"
109783- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109784+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109785 select DEBUG_LOCK_ALLOC
109786 select DEBUG_SPINLOCK
109787 select DEBUG_MUTEXES
109788@@ -953,7 +953,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
109789
109790 config DEBUG_LOCK_ALLOC
109791 bool "Lock debugging: detect incorrect freeing of live locks"
109792- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109793+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109794 select DEBUG_SPINLOCK
109795 select DEBUG_MUTEXES
109796 select LOCKDEP
109797@@ -967,7 +967,7 @@ config DEBUG_LOCK_ALLOC
109798
109799 config PROVE_LOCKING
109800 bool "Lock debugging: prove locking correctness"
109801- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109802+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109803 select LOCKDEP
109804 select DEBUG_SPINLOCK
109805 select DEBUG_MUTEXES
109806@@ -1018,7 +1018,7 @@ config LOCKDEP
109807
109808 config LOCK_STAT
109809 bool "Lock usage statistics"
109810- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109811+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109812 select LOCKDEP
109813 select DEBUG_SPINLOCK
109814 select DEBUG_MUTEXES
109815@@ -1496,6 +1496,7 @@ config LATENCYTOP
109816 depends on DEBUG_KERNEL
109817 depends on STACKTRACE_SUPPORT
109818 depends on PROC_FS
109819+ depends on !GRKERNSEC_HIDESYM
109820 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
109821 select KALLSYMS
109822 select KALLSYMS_ALL
109823@@ -1512,7 +1513,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109824 config DEBUG_STRICT_USER_COPY_CHECKS
109825 bool "Strict user copy size checks"
109826 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109827- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
109828+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
109829 help
109830 Enabling this option turns a certain set of sanity checks for user
109831 copy operations into compile time failures.
109832@@ -1643,7 +1644,7 @@ endmenu # runtime tests
109833
109834 config PROVIDE_OHCI1394_DMA_INIT
109835 bool "Remote debugging over FireWire early on boot"
109836- depends on PCI && X86
109837+ depends on PCI && X86 && !GRKERNSEC
109838 help
109839 If you want to debug problems which hang or crash the kernel early
109840 on boot and the crashing machine has a FireWire port, you can use
109841diff --git a/lib/Makefile b/lib/Makefile
109842index 6c37933..d48e7ca 100644
109843--- a/lib/Makefile
109844+++ b/lib/Makefile
109845@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
109846 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
109847 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
109848 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
109849-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
109850+obj-y += list_debug.o
109851 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
109852
109853 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
109854diff --git a/lib/average.c b/lib/average.c
109855index 114d1be..ab0350c 100644
109856--- a/lib/average.c
109857+++ b/lib/average.c
109858@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
109859 {
109860 unsigned long internal = ACCESS_ONCE(avg->internal);
109861
109862- ACCESS_ONCE(avg->internal) = internal ?
109863+ ACCESS_ONCE_RW(avg->internal) = internal ?
109864 (((internal << avg->weight) - internal) +
109865 (val << avg->factor)) >> avg->weight :
109866 (val << avg->factor);
109867diff --git a/lib/bitmap.c b/lib/bitmap.c
109868index 64c0926f..9de1a1f 100644
109869--- a/lib/bitmap.c
109870+++ b/lib/bitmap.c
109871@@ -234,7 +234,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
109872 }
109873 EXPORT_SYMBOL(__bitmap_subset);
109874
109875-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109876+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109877 {
109878 unsigned int k, lim = bits/BITS_PER_LONG;
109879 int w = 0;
109880@@ -361,7 +361,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
109881 {
109882 int c, old_c, totaldigits, ndigits, nchunks, nbits;
109883 u32 chunk;
109884- const char __user __force *ubuf = (const char __user __force *)buf;
109885+ const char __user *ubuf = (const char __force_user *)buf;
109886
109887 bitmap_zero(maskp, nmaskbits);
109888
109889@@ -446,7 +446,7 @@ int bitmap_parse_user(const char __user *ubuf,
109890 {
109891 if (!access_ok(VERIFY_READ, ubuf, ulen))
109892 return -EFAULT;
109893- return __bitmap_parse((const char __force *)ubuf,
109894+ return __bitmap_parse((const char __force_kernel *)ubuf,
109895 ulen, 1, maskp, nmaskbits);
109896
109897 }
109898@@ -505,7 +505,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
109899 {
109900 unsigned a, b;
109901 int c, old_c, totaldigits;
109902- const char __user __force *ubuf = (const char __user __force *)buf;
109903+ const char __user *ubuf = (const char __force_user *)buf;
109904 int exp_digit, in_range;
109905
109906 totaldigits = c = 0;
109907@@ -600,7 +600,7 @@ int bitmap_parselist_user(const char __user *ubuf,
109908 {
109909 if (!access_ok(VERIFY_READ, ubuf, ulen))
109910 return -EFAULT;
109911- return __bitmap_parselist((const char __force *)ubuf,
109912+ return __bitmap_parselist((const char __force_kernel *)ubuf,
109913 ulen, 1, maskp, nmaskbits);
109914 }
109915 EXPORT_SYMBOL(bitmap_parselist_user);
109916diff --git a/lib/bug.c b/lib/bug.c
109917index 0c3bd95..5a615a1 100644
109918--- a/lib/bug.c
109919+++ b/lib/bug.c
109920@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
109921 return BUG_TRAP_TYPE_NONE;
109922
109923 bug = find_bug(bugaddr);
109924+ if (!bug)
109925+ return BUG_TRAP_TYPE_NONE;
109926
109927 file = NULL;
109928 line = 0;
109929diff --git a/lib/debugobjects.c b/lib/debugobjects.c
109930index 547f7f9..a6d4ba0 100644
109931--- a/lib/debugobjects.c
109932+++ b/lib/debugobjects.c
109933@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
109934 if (limit > 4)
109935 return;
109936
109937- is_on_stack = object_is_on_stack(addr);
109938+ is_on_stack = object_starts_on_stack(addr);
109939 if (is_on_stack == onstack)
109940 return;
109941
109942diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
109943index 6dd0335..1e9c239 100644
109944--- a/lib/decompress_bunzip2.c
109945+++ b/lib/decompress_bunzip2.c
109946@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
109947
109948 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
109949 uncompressed data. Allocate intermediate buffer for block. */
109950- bd->dbufSize = 100000*(i-BZh0);
109951+ i -= BZh0;
109952+ bd->dbufSize = 100000 * i;
109953
109954 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
109955 if (!bd->dbuf)
109956diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
109957index 0be83af..4605e93 100644
109958--- a/lib/decompress_unlzma.c
109959+++ b/lib/decompress_unlzma.c
109960@@ -39,10 +39,10 @@
109961
109962 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
109963
109964-static long long INIT read_int(unsigned char *ptr, int size)
109965+static unsigned long long INIT read_int(unsigned char *ptr, int size)
109966 {
109967 int i;
109968- long long ret = 0;
109969+ unsigned long long ret = 0;
109970
109971 for (i = 0; i < size; i++)
109972 ret = (ret << 8) | ptr[size-i-1];
109973diff --git a/lib/div64.c b/lib/div64.c
109974index 19ea7ed..20cac21 100644
109975--- a/lib/div64.c
109976+++ b/lib/div64.c
109977@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
109978 EXPORT_SYMBOL(__div64_32);
109979
109980 #ifndef div_s64_rem
109981-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109982+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
109983 {
109984 u64 quotient;
109985
109986@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
109987 * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
109988 */
109989 #ifndef div64_u64
109990-u64 div64_u64(u64 dividend, u64 divisor)
109991+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
109992 {
109993 u32 high = divisor >> 32;
109994 u64 quot;
109995diff --git a/lib/dma-debug.c b/lib/dma-debug.c
109996index ae4b65e..daf0230 100644
109997--- a/lib/dma-debug.c
109998+++ b/lib/dma-debug.c
109999@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
110000
110001 void dma_debug_add_bus(struct bus_type *bus)
110002 {
110003- struct notifier_block *nb;
110004+ notifier_block_no_const *nb;
110005
110006 if (dma_debug_disabled())
110007 return;
110008@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
110009
110010 static void check_for_stack(struct device *dev, void *addr)
110011 {
110012- if (object_is_on_stack(addr))
110013+ if (object_starts_on_stack(addr))
110014 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
110015 "stack [addr=%p]\n", addr);
110016 }
110017diff --git a/lib/inflate.c b/lib/inflate.c
110018index 013a761..c28f3fc 100644
110019--- a/lib/inflate.c
110020+++ b/lib/inflate.c
110021@@ -269,7 +269,7 @@ static void free(void *where)
110022 malloc_ptr = free_mem_ptr;
110023 }
110024 #else
110025-#define malloc(a) kmalloc(a, GFP_KERNEL)
110026+#define malloc(a) kmalloc((a), GFP_KERNEL)
110027 #define free(a) kfree(a)
110028 #endif
110029
110030diff --git a/lib/ioremap.c b/lib/ioremap.c
110031index 86c8911..f5bfc34 100644
110032--- a/lib/ioremap.c
110033+++ b/lib/ioremap.c
110034@@ -75,7 +75,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
110035 unsigned long next;
110036
110037 phys_addr -= addr;
110038- pmd = pmd_alloc(&init_mm, pud, addr);
110039+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
110040 if (!pmd)
110041 return -ENOMEM;
110042 do {
110043@@ -101,7 +101,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
110044 unsigned long next;
110045
110046 phys_addr -= addr;
110047- pud = pud_alloc(&init_mm, pgd, addr);
110048+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
110049 if (!pud)
110050 return -ENOMEM;
110051 do {
110052diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
110053index bd2bea9..6b3c95e 100644
110054--- a/lib/is_single_threaded.c
110055+++ b/lib/is_single_threaded.c
110056@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
110057 struct task_struct *p, *t;
110058 bool ret;
110059
110060+ if (!mm)
110061+ return true;
110062+
110063 if (atomic_read(&task->signal->live) != 1)
110064 return false;
110065
110066diff --git a/lib/kobject.c b/lib/kobject.c
110067index 3b841b9..7c215aa 100644
110068--- a/lib/kobject.c
110069+++ b/lib/kobject.c
110070@@ -340,8 +340,9 @@ error:
110071 }
110072 EXPORT_SYMBOL(kobject_init);
110073
110074-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
110075- const char *fmt, va_list vargs)
110076+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
110077+ struct kobject *parent,
110078+ const char *fmt, va_list vargs)
110079 {
110080 int retval;
110081
110082@@ -936,9 +937,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
110083
110084
110085 static DEFINE_SPINLOCK(kobj_ns_type_lock);
110086-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
110087+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
110088
110089-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110090+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110091 {
110092 enum kobj_ns_type type = ops->type;
110093 int error;
110094diff --git a/lib/list_debug.c b/lib/list_debug.c
110095index c24c2f7..f0296f4 100644
110096--- a/lib/list_debug.c
110097+++ b/lib/list_debug.c
110098@@ -11,7 +11,9 @@
110099 #include <linux/bug.h>
110100 #include <linux/kernel.h>
110101 #include <linux/rculist.h>
110102+#include <linux/mm.h>
110103
110104+#ifdef CONFIG_DEBUG_LIST
110105 /*
110106 * Insert a new entry between two known consecutive entries.
110107 *
110108@@ -19,21 +21,40 @@
110109 * the prev/next entries already!
110110 */
110111
110112+static bool __list_add_debug(struct list_head *new,
110113+ struct list_head *prev,
110114+ struct list_head *next)
110115+{
110116+ if (unlikely(next->prev != prev)) {
110117+ printk(KERN_ERR "list_add corruption. next->prev should be "
110118+ "prev (%p), but was %p. (next=%p).\n",
110119+ prev, next->prev, next);
110120+ BUG();
110121+ return false;
110122+ }
110123+ if (unlikely(prev->next != next)) {
110124+ printk(KERN_ERR "list_add corruption. prev->next should be "
110125+ "next (%p), but was %p. (prev=%p).\n",
110126+ next, prev->next, prev);
110127+ BUG();
110128+ return false;
110129+ }
110130+ if (unlikely(new == prev || new == next)) {
110131+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
110132+ new, prev, next);
110133+ BUG();
110134+ return false;
110135+ }
110136+ return true;
110137+}
110138+
110139 void __list_add(struct list_head *new,
110140- struct list_head *prev,
110141- struct list_head *next)
110142+ struct list_head *prev,
110143+ struct list_head *next)
110144 {
110145- WARN(next->prev != prev,
110146- "list_add corruption. next->prev should be "
110147- "prev (%p), but was %p. (next=%p).\n",
110148- prev, next->prev, next);
110149- WARN(prev->next != next,
110150- "list_add corruption. prev->next should be "
110151- "next (%p), but was %p. (prev=%p).\n",
110152- next, prev->next, prev);
110153- WARN(new == prev || new == next,
110154- "list_add double add: new=%p, prev=%p, next=%p.\n",
110155- new, prev, next);
110156+ if (!__list_add_debug(new, prev, next))
110157+ return;
110158+
110159 next->prev = new;
110160 new->next = next;
110161 new->prev = prev;
110162@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
110163 }
110164 EXPORT_SYMBOL(__list_add);
110165
110166-void __list_del_entry(struct list_head *entry)
110167+static bool __list_del_entry_debug(struct list_head *entry)
110168 {
110169 struct list_head *prev, *next;
110170
110171 prev = entry->prev;
110172 next = entry->next;
110173
110174- if (WARN(next == LIST_POISON1,
110175- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110176- entry, LIST_POISON1) ||
110177- WARN(prev == LIST_POISON2,
110178- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110179- entry, LIST_POISON2) ||
110180- WARN(prev->next != entry,
110181- "list_del corruption. prev->next should be %p, "
110182- "but was %p\n", entry, prev->next) ||
110183- WARN(next->prev != entry,
110184- "list_del corruption. next->prev should be %p, "
110185- "but was %p\n", entry, next->prev))
110186+ if (unlikely(next == LIST_POISON1)) {
110187+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110188+ entry, LIST_POISON1);
110189+ BUG();
110190+ return false;
110191+ }
110192+ if (unlikely(prev == LIST_POISON2)) {
110193+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110194+ entry, LIST_POISON2);
110195+ BUG();
110196+ return false;
110197+ }
110198+ if (unlikely(entry->prev->next != entry)) {
110199+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
110200+ "but was %p\n", entry, prev->next);
110201+ BUG();
110202+ return false;
110203+ }
110204+ if (unlikely(entry->next->prev != entry)) {
110205+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
110206+ "but was %p\n", entry, next->prev);
110207+ BUG();
110208+ return false;
110209+ }
110210+ return true;
110211+}
110212+
110213+void __list_del_entry(struct list_head *entry)
110214+{
110215+ if (!__list_del_entry_debug(entry))
110216 return;
110217
110218- __list_del(prev, next);
110219+ __list_del(entry->prev, entry->next);
110220 }
110221 EXPORT_SYMBOL(__list_del_entry);
110222
110223@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
110224 void __list_add_rcu(struct list_head *new,
110225 struct list_head *prev, struct list_head *next)
110226 {
110227- WARN(next->prev != prev,
110228- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
110229- prev, next->prev, next);
110230- WARN(prev->next != next,
110231- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
110232- next, prev->next, prev);
110233+ if (!__list_add_debug(new, prev, next))
110234+ return;
110235+
110236 new->next = next;
110237 new->prev = prev;
110238 rcu_assign_pointer(list_next_rcu(prev), new);
110239 next->prev = new;
110240 }
110241 EXPORT_SYMBOL(__list_add_rcu);
110242+#endif
110243+
110244+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
110245+{
110246+#ifdef CONFIG_DEBUG_LIST
110247+ if (!__list_add_debug(new, prev, next))
110248+ return;
110249+#endif
110250+
110251+ pax_open_kernel();
110252+ next->prev = new;
110253+ new->next = next;
110254+ new->prev = prev;
110255+ prev->next = new;
110256+ pax_close_kernel();
110257+}
110258+EXPORT_SYMBOL(__pax_list_add);
110259+
110260+void pax_list_del(struct list_head *entry)
110261+{
110262+#ifdef CONFIG_DEBUG_LIST
110263+ if (!__list_del_entry_debug(entry))
110264+ return;
110265+#endif
110266+
110267+ pax_open_kernel();
110268+ __list_del(entry->prev, entry->next);
110269+ entry->next = LIST_POISON1;
110270+ entry->prev = LIST_POISON2;
110271+ pax_close_kernel();
110272+}
110273+EXPORT_SYMBOL(pax_list_del);
110274+
110275+void pax_list_del_init(struct list_head *entry)
110276+{
110277+ pax_open_kernel();
110278+ __list_del(entry->prev, entry->next);
110279+ INIT_LIST_HEAD(entry);
110280+ pax_close_kernel();
110281+}
110282+EXPORT_SYMBOL(pax_list_del_init);
110283+
110284+void __pax_list_add_rcu(struct list_head *new,
110285+ struct list_head *prev, struct list_head *next)
110286+{
110287+#ifdef CONFIG_DEBUG_LIST
110288+ if (!__list_add_debug(new, prev, next))
110289+ return;
110290+#endif
110291+
110292+ pax_open_kernel();
110293+ new->next = next;
110294+ new->prev = prev;
110295+ rcu_assign_pointer(list_next_rcu(prev), new);
110296+ next->prev = new;
110297+ pax_close_kernel();
110298+}
110299+EXPORT_SYMBOL(__pax_list_add_rcu);
110300+
110301+void pax_list_del_rcu(struct list_head *entry)
110302+{
110303+#ifdef CONFIG_DEBUG_LIST
110304+ if (!__list_del_entry_debug(entry))
110305+ return;
110306+#endif
110307+
110308+ pax_open_kernel();
110309+ __list_del(entry->prev, entry->next);
110310+ entry->next = LIST_POISON1;
110311+ entry->prev = LIST_POISON2;
110312+ pax_close_kernel();
110313+}
110314+EXPORT_SYMBOL(pax_list_del_rcu);
110315diff --git a/lib/lockref.c b/lib/lockref.c
110316index 494994b..65caf94 100644
110317--- a/lib/lockref.c
110318+++ b/lib/lockref.c
110319@@ -48,13 +48,13 @@
110320 void lockref_get(struct lockref *lockref)
110321 {
110322 CMPXCHG_LOOP(
110323- new.count++;
110324+ __lockref_inc(&new);
110325 ,
110326 return;
110327 );
110328
110329 spin_lock(&lockref->lock);
110330- lockref->count++;
110331+ __lockref_inc(lockref);
110332 spin_unlock(&lockref->lock);
110333 }
110334 EXPORT_SYMBOL(lockref_get);
110335@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110336 int retval;
110337
110338 CMPXCHG_LOOP(
110339- new.count++;
110340- if (old.count <= 0)
110341+ __lockref_inc(&new);
110342+ if (__lockref_read(&old) <= 0)
110343 return 0;
110344 ,
110345 return 1;
110346@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110347
110348 spin_lock(&lockref->lock);
110349 retval = 0;
110350- if (lockref->count > 0) {
110351- lockref->count++;
110352+ if (__lockref_read(lockref) > 0) {
110353+ __lockref_inc(lockref);
110354 retval = 1;
110355 }
110356 spin_unlock(&lockref->lock);
110357@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
110358 int lockref_get_or_lock(struct lockref *lockref)
110359 {
110360 CMPXCHG_LOOP(
110361- new.count++;
110362- if (old.count <= 0)
110363+ __lockref_inc(&new);
110364+ if (__lockref_read(&old) <= 0)
110365 break;
110366 ,
110367 return 1;
110368 );
110369
110370 spin_lock(&lockref->lock);
110371- if (lockref->count <= 0)
110372+ if (__lockref_read(lockref) <= 0)
110373 return 0;
110374- lockref->count++;
110375+ __lockref_inc(lockref);
110376 spin_unlock(&lockref->lock);
110377 return 1;
110378 }
110379@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
110380 int lockref_put_return(struct lockref *lockref)
110381 {
110382 CMPXCHG_LOOP(
110383- new.count--;
110384- if (old.count <= 0)
110385+ __lockref_dec(&new);
110386+ if (__lockref_read(&old) <= 0)
110387 return -1;
110388 ,
110389- return new.count;
110390+ return __lockref_read(&new);
110391 );
110392 return -1;
110393 }
110394@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
110395 int lockref_put_or_lock(struct lockref *lockref)
110396 {
110397 CMPXCHG_LOOP(
110398- new.count--;
110399- if (old.count <= 1)
110400+ __lockref_dec(&new);
110401+ if (__lockref_read(&old) <= 1)
110402 break;
110403 ,
110404 return 1;
110405 );
110406
110407 spin_lock(&lockref->lock);
110408- if (lockref->count <= 1)
110409+ if (__lockref_read(lockref) <= 1)
110410 return 0;
110411- lockref->count--;
110412+ __lockref_dec(lockref);
110413 spin_unlock(&lockref->lock);
110414 return 1;
110415 }
110416@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
110417 void lockref_mark_dead(struct lockref *lockref)
110418 {
110419 assert_spin_locked(&lockref->lock);
110420- lockref->count = -128;
110421+ __lockref_set(lockref, -128);
110422 }
110423 EXPORT_SYMBOL(lockref_mark_dead);
110424
110425@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110426 int retval;
110427
110428 CMPXCHG_LOOP(
110429- new.count++;
110430- if (old.count < 0)
110431+ __lockref_inc(&new);
110432+ if (__lockref_read(&old) < 0)
110433 return 0;
110434 ,
110435 return 1;
110436@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110437
110438 spin_lock(&lockref->lock);
110439 retval = 0;
110440- if (lockref->count >= 0) {
110441- lockref->count++;
110442+ if (__lockref_read(lockref) >= 0) {
110443+ __lockref_inc(lockref);
110444 retval = 1;
110445 }
110446 spin_unlock(&lockref->lock);
110447diff --git a/lib/nlattr.c b/lib/nlattr.c
110448index f5907d2..36072be 100644
110449--- a/lib/nlattr.c
110450+++ b/lib/nlattr.c
110451@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
110452 {
110453 int minlen = min_t(int, count, nla_len(src));
110454
110455+ BUG_ON(minlen < 0);
110456+
110457 memcpy(dest, nla_data(src), minlen);
110458 if (count > minlen)
110459 memset(dest + minlen, 0, count - minlen);
110460diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
110461index 6111bcb..02e816b 100644
110462--- a/lib/percpu-refcount.c
110463+++ b/lib/percpu-refcount.c
110464@@ -31,7 +31,7 @@
110465 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
110466 */
110467
110468-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
110469+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
110470
110471 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
110472
110473diff --git a/lib/radix-tree.c b/lib/radix-tree.c
110474index 3d2aa27..a472f20 100644
110475--- a/lib/radix-tree.c
110476+++ b/lib/radix-tree.c
110477@@ -67,7 +67,7 @@ struct radix_tree_preload {
110478 int nr;
110479 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
110480 };
110481-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
110482+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
110483
110484 static inline void *ptr_to_indirect(void *ptr)
110485 {
110486diff --git a/lib/random32.c b/lib/random32.c
110487index 0bee183..526f12f 100644
110488--- a/lib/random32.c
110489+++ b/lib/random32.c
110490@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
110491 }
110492 #endif
110493
110494-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
110495+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
110496
110497 /**
110498 * prandom_u32_state - seeded pseudo-random number generator.
110499diff --git a/lib/rbtree.c b/lib/rbtree.c
110500index c16c81a..4dcbda1 100644
110501--- a/lib/rbtree.c
110502+++ b/lib/rbtree.c
110503@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
110504 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
110505
110506 static const struct rb_augment_callbacks dummy_callbacks = {
110507- dummy_propagate, dummy_copy, dummy_rotate
110508+ .propagate = dummy_propagate,
110509+ .copy = dummy_copy,
110510+ .rotate = dummy_rotate
110511 };
110512
110513 void rb_insert_color(struct rb_node *node, struct rb_root *root)
110514diff --git a/lib/show_mem.c b/lib/show_mem.c
110515index adc98e18..0ce83c2 100644
110516--- a/lib/show_mem.c
110517+++ b/lib/show_mem.c
110518@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
110519 quicklist_total_size());
110520 #endif
110521 #ifdef CONFIG_MEMORY_FAILURE
110522- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
110523+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
110524 #endif
110525 }
110526diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
110527index e0af6ff..fcc9f15 100644
110528--- a/lib/strncpy_from_user.c
110529+++ b/lib/strncpy_from_user.c
110530@@ -22,7 +22,7 @@
110531 */
110532 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
110533 {
110534- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110535+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110536 long res = 0;
110537
110538 /*
110539diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
110540index fe9a325..85cd8aa 100644
110541--- a/lib/strnlen_user.c
110542+++ b/lib/strnlen_user.c
110543@@ -26,7 +26,7 @@
110544 */
110545 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
110546 {
110547- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110548+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110549 long align, res = 0;
110550 unsigned long c;
110551
110552diff --git a/lib/swiotlb.c b/lib/swiotlb.c
110553index 3c365ab..75b43df 100644
110554--- a/lib/swiotlb.c
110555+++ b/lib/swiotlb.c
110556@@ -683,7 +683,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
110557
110558 void
110559 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
110560- dma_addr_t dev_addr)
110561+ dma_addr_t dev_addr, struct dma_attrs *attrs)
110562 {
110563 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
110564
110565diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
110566index c227cc4..5241df3 100644
110567--- a/lib/test-hexdump.c
110568+++ b/lib/test-hexdump.c
110569@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
110570 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
110571 };
110572
110573-static const char *test_data_2_le[] __initdata = {
110574+static const char * const test_data_2_le[] __initconst = {
110575 "32be", "7bdb", "180a", "b293",
110576 "ba70", "24c4", "837d", "9b34",
110577 "9ca6", "ad31", "0f9c", "e9ac",
110578 "d14c", "9919", "b143", "0caf",
110579 };
110580
110581-static const char *test_data_4_le[] __initdata = {
110582+static const char * const test_data_4_le[] __initconst = {
110583 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
110584 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
110585 };
110586
110587-static const char *test_data_8_le[] __initdata = {
110588+static const char * const test_data_8_le[] __initconst = {
110589 "b293180a7bdb32be", "9b34837d24c4ba70",
110590 "e9ac0f9cad319ca6", "0cafb1439919d14c",
110591 };
110592diff --git a/lib/usercopy.c b/lib/usercopy.c
110593index 4f5b1dd..7cab418 100644
110594--- a/lib/usercopy.c
110595+++ b/lib/usercopy.c
110596@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
110597 WARN(1, "Buffer overflow detected!\n");
110598 }
110599 EXPORT_SYMBOL(copy_from_user_overflow);
110600+
110601+void copy_to_user_overflow(void)
110602+{
110603+ WARN(1, "Buffer overflow detected!\n");
110604+}
110605+EXPORT_SYMBOL(copy_to_user_overflow);
110606diff --git a/lib/vsprintf.c b/lib/vsprintf.c
110607index da39c60..ac91239 100644
110608--- a/lib/vsprintf.c
110609+++ b/lib/vsprintf.c
110610@@ -16,6 +16,9 @@
110611 * - scnprintf and vscnprintf
110612 */
110613
110614+#ifdef CONFIG_GRKERNSEC_HIDESYM
110615+#define __INCLUDED_BY_HIDESYM 1
110616+#endif
110617 #include <stdarg.h>
110618 #include <linux/clk-provider.h>
110619 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
110620@@ -628,7 +631,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
110621 #ifdef CONFIG_KALLSYMS
110622 if (*fmt == 'B')
110623 sprint_backtrace(sym, value);
110624- else if (*fmt != 'f' && *fmt != 's')
110625+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
110626 sprint_symbol(sym, value);
110627 else
110628 sprint_symbol_no_offset(sym, value);
110629@@ -1360,7 +1363,11 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
110630 }
110631 }
110632
110633-int kptr_restrict __read_mostly;
110634+#ifdef CONFIG_GRKERNSEC_HIDESYM
110635+int kptr_restrict __read_only = 2;
110636+#else
110637+int kptr_restrict __read_only;
110638+#endif
110639
110640 /*
110641 * Show a '%p' thing. A kernel extension is that the '%p' is followed
110642@@ -1371,8 +1378,10 @@ int kptr_restrict __read_mostly;
110643 *
110644 * - 'F' For symbolic function descriptor pointers with offset
110645 * - 'f' For simple symbolic function names without offset
110646+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
110647 * - 'S' For symbolic direct pointers with offset
110648 * - 's' For symbolic direct pointers without offset
110649+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
110650 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
110651 * - 'B' For backtraced symbolic direct pointers with offset
110652 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
110653@@ -1460,12 +1469,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110654
110655 if (!ptr && *fmt != 'K') {
110656 /*
110657- * Print (null) with the same width as a pointer so it makes
110658+ * Print (nil) with the same width as a pointer so it makes
110659 * tabular output look nice.
110660 */
110661 if (spec.field_width == -1)
110662 spec.field_width = default_width;
110663- return string(buf, end, "(null)", spec);
110664+ return string(buf, end, "(nil)", spec);
110665 }
110666
110667 switch (*fmt) {
110668@@ -1475,6 +1484,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110669 /* Fallthrough */
110670 case 'S':
110671 case 's':
110672+#ifdef CONFIG_GRKERNSEC_HIDESYM
110673+ break;
110674+#else
110675+ return symbol_string(buf, end, ptr, spec, fmt);
110676+#endif
110677+ case 'X':
110678+ ptr = dereference_function_descriptor(ptr);
110679+ case 'A':
110680 case 'B':
110681 return symbol_string(buf, end, ptr, spec, fmt);
110682 case 'R':
110683@@ -1539,6 +1556,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110684 va_end(va);
110685 return buf;
110686 }
110687+ case 'P':
110688+ break;
110689 case 'K':
110690 /*
110691 * %pK cannot be used in IRQ context because its test
110692@@ -1598,6 +1617,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110693 ((const struct file *)ptr)->f_path.dentry,
110694 spec, fmt);
110695 }
110696+
110697+#ifdef CONFIG_GRKERNSEC_HIDESYM
110698+ /* 'P' = approved pointers to copy to userland,
110699+ as in the /proc/kallsyms case, as we make it display nothing
110700+ for non-root users, and the real contents for root users
110701+ 'X' = approved simple symbols
110702+ Also ignore 'K' pointers, since we force their NULLing for non-root users
110703+ above
110704+ */
110705+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
110706+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
110707+ dump_stack();
110708+ ptr = NULL;
110709+ }
110710+#endif
110711+
110712 spec.flags |= SMALL;
110713 if (spec.field_width == -1) {
110714 spec.field_width = default_width;
110715@@ -2296,11 +2331,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110716 typeof(type) value; \
110717 if (sizeof(type) == 8) { \
110718 args = PTR_ALIGN(args, sizeof(u32)); \
110719- *(u32 *)&value = *(u32 *)args; \
110720- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
110721+ *(u32 *)&value = *(const u32 *)args; \
110722+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
110723 } else { \
110724 args = PTR_ALIGN(args, sizeof(type)); \
110725- value = *(typeof(type) *)args; \
110726+ value = *(const typeof(type) *)args; \
110727 } \
110728 args += sizeof(type); \
110729 value; \
110730@@ -2363,7 +2398,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110731 case FORMAT_TYPE_STR: {
110732 const char *str_arg = args;
110733 args += strlen(str_arg) + 1;
110734- str = string(str, end, (char *)str_arg, spec);
110735+ str = string(str, end, str_arg, spec);
110736 break;
110737 }
110738
110739diff --git a/localversion-grsec b/localversion-grsec
110740new file mode 100644
110741index 0000000..7cd6065
110742--- /dev/null
110743+++ b/localversion-grsec
110744@@ -0,0 +1 @@
110745+-grsec
110746diff --git a/mm/Kconfig b/mm/Kconfig
110747index 390214d..f96e3b8 100644
110748--- a/mm/Kconfig
110749+++ b/mm/Kconfig
110750@@ -342,10 +342,11 @@ config KSM
110751 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
110752
110753 config DEFAULT_MMAP_MIN_ADDR
110754- int "Low address space to protect from user allocation"
110755+ int "Low address space to protect from user allocation"
110756 depends on MMU
110757- default 4096
110758- help
110759+ default 32768 if ALPHA || ARM || PARISC || SPARC32
110760+ default 65536
110761+ help
110762 This is the portion of low virtual memory which should be protected
110763 from userspace allocation. Keeping a user from writing to low pages
110764 can help reduce the impact of kernel NULL pointer bugs.
110765@@ -376,7 +377,7 @@ config MEMORY_FAILURE
110766
110767 config HWPOISON_INJECT
110768 tristate "HWPoison pages injector"
110769- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
110770+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
110771 select PROC_PAGE_MONITOR
110772
110773 config NOMMU_INITIAL_TRIM_EXCESS
110774diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
110775index 957d3da..1d34e20 100644
110776--- a/mm/Kconfig.debug
110777+++ b/mm/Kconfig.debug
110778@@ -10,6 +10,7 @@ config PAGE_EXTENSION
110779 config DEBUG_PAGEALLOC
110780 bool "Debug page memory allocations"
110781 depends on DEBUG_KERNEL
110782+ depends on !PAX_MEMORY_SANITIZE
110783 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
110784 depends on !KMEMCHECK
110785 select PAGE_EXTENSION
110786diff --git a/mm/backing-dev.c b/mm/backing-dev.c
110787index 000e7b3..aad2605 100644
110788--- a/mm/backing-dev.c
110789+++ b/mm/backing-dev.c
110790@@ -12,7 +12,7 @@
110791 #include <linux/device.h>
110792 #include <trace/events/writeback.h>
110793
110794-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
110795+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
110796
110797 struct backing_dev_info noop_backing_dev_info = {
110798 .name = "noop",
110799@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
110800 return err;
110801
110802 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
110803- atomic_long_inc_return(&bdi_seq));
110804+ atomic_long_inc_return_unchecked(&bdi_seq));
110805 if (err) {
110806 bdi_destroy(bdi);
110807 return err;
110808diff --git a/mm/cma_debug.c b/mm/cma_debug.c
110809index 7621ee3..f8e4b60 100644
110810--- a/mm/cma_debug.c
110811+++ b/mm/cma_debug.c
110812@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
110813
110814 mutex_lock(&cma->lock);
110815 /* pages counter is smaller than sizeof(int) */
110816- used = bitmap_weight(cma->bitmap, (int)cma->count);
110817+ used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
110818 mutex_unlock(&cma->lock);
110819 *val = (u64)used << cma->order_per_bit;
110820
110821@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
110822 struct cma *cma = data;
110823 unsigned long maxchunk = 0;
110824 unsigned long start, end = 0;
110825+ unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
110826
110827 mutex_lock(&cma->lock);
110828 for (;;) {
110829- start = find_next_zero_bit(cma->bitmap, cma->count, end);
110830+ start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
110831 if (start >= cma->count)
110832 break;
110833- end = find_next_bit(cma->bitmap, cma->count, start);
110834+ end = find_next_bit(cma->bitmap, bitmap_maxno, start);
110835 maxchunk = max(end - start, maxchunk);
110836 }
110837 mutex_unlock(&cma->lock);
110838@@ -170,10 +171,10 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
110839
110840 tmp = debugfs_create_dir(name, cma_debugfs_root);
110841
110842- debugfs_create_file("alloc", S_IWUSR, cma_debugfs_root, cma,
110843+ debugfs_create_file("alloc", S_IWUSR, tmp, cma,
110844 &cma_alloc_fops);
110845
110846- debugfs_create_file("free", S_IWUSR, cma_debugfs_root, cma,
110847+ debugfs_create_file("free", S_IWUSR, tmp, cma,
110848 &cma_free_fops);
110849
110850 debugfs_create_file("base_pfn", S_IRUGO, tmp,
110851diff --git a/mm/filemap.c b/mm/filemap.c
110852index 6bf5e42..1e631ee 100644
110853--- a/mm/filemap.c
110854+++ b/mm/filemap.c
110855@@ -2095,7 +2095,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
110856 struct address_space *mapping = file->f_mapping;
110857
110858 if (!mapping->a_ops->readpage)
110859- return -ENOEXEC;
110860+ return -ENODEV;
110861 file_accessed(file);
110862 vma->vm_ops = &generic_file_vm_ops;
110863 return 0;
110864@@ -2276,6 +2276,7 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
110865 pos = iocb->ki_pos;
110866
110867 if (limit != RLIM_INFINITY) {
110868+ gr_learn_resource(current, RLIMIT_FSIZE, iocb->ki_pos, 0);
110869 if (iocb->ki_pos >= limit) {
110870 send_sig(SIGXFSZ, current, 0);
110871 return -EFBIG;
110872diff --git a/mm/gup.c b/mm/gup.c
110873index 6297f6b..7652403 100644
110874--- a/mm/gup.c
110875+++ b/mm/gup.c
110876@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
110877 unsigned int fault_flags = 0;
110878 int ret;
110879
110880- /* For mm_populate(), just skip the stack guard page. */
110881- if ((*flags & FOLL_POPULATE) &&
110882- (stack_guard_page_start(vma, address) ||
110883- stack_guard_page_end(vma, address + PAGE_SIZE)))
110884- return -ENOENT;
110885 if (*flags & FOLL_WRITE)
110886 fault_flags |= FAULT_FLAG_WRITE;
110887 if (nonblocking)
110888@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110889 if (!(gup_flags & FOLL_FORCE))
110890 gup_flags |= FOLL_NUMA;
110891
110892- do {
110893+ while (nr_pages) {
110894 struct page *page;
110895 unsigned int foll_flags = gup_flags;
110896 unsigned int page_increm;
110897
110898 /* first iteration or cross vma bound */
110899 if (!vma || start >= vma->vm_end) {
110900- vma = find_extend_vma(mm, start);
110901+ vma = find_vma(mm, start);
110902 if (!vma && in_gate_area(mm, start)) {
110903 int ret;
110904 ret = get_gate_page(mm, start & PAGE_MASK,
110905@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110906 goto next_page;
110907 }
110908
110909- if (!vma || check_vma_flags(vma, gup_flags))
110910+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
110911 return i ? : -EFAULT;
110912 if (is_vm_hugetlb_page(vma)) {
110913 i = follow_hugetlb_page(mm, vma, pages, vmas,
110914@@ -509,7 +504,7 @@ next_page:
110915 i += page_increm;
110916 start += page_increm * PAGE_SIZE;
110917 nr_pages -= page_increm;
110918- } while (nr_pages);
110919+ }
110920 return i;
110921 }
110922 EXPORT_SYMBOL(__get_user_pages);
110923diff --git a/mm/highmem.c b/mm/highmem.c
110924index 123bcd3..0de52ba 100644
110925--- a/mm/highmem.c
110926+++ b/mm/highmem.c
110927@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
110928 * So no dangers, even with speculative execution.
110929 */
110930 page = pte_page(pkmap_page_table[i]);
110931+ pax_open_kernel();
110932 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
110933-
110934+ pax_close_kernel();
110935 set_page_address(page, NULL);
110936 need_flush = 1;
110937 }
110938@@ -259,9 +260,11 @@ start:
110939 }
110940 }
110941 vaddr = PKMAP_ADDR(last_pkmap_nr);
110942+
110943+ pax_open_kernel();
110944 set_pte_at(&init_mm, vaddr,
110945 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
110946-
110947+ pax_close_kernel();
110948 pkmap_count[last_pkmap_nr] = 1;
110949 set_page_address(page, (void *)vaddr);
110950
110951diff --git a/mm/hugetlb.c b/mm/hugetlb.c
110952index 271e443..c582971 100644
110953--- a/mm/hugetlb.c
110954+++ b/mm/hugetlb.c
110955@@ -2362,6 +2362,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110956 struct ctl_table *table, int write,
110957 void __user *buffer, size_t *length, loff_t *ppos)
110958 {
110959+ ctl_table_no_const t;
110960 struct hstate *h = &default_hstate;
110961 unsigned long tmp = h->max_huge_pages;
110962 int ret;
110963@@ -2369,9 +2370,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110964 if (!hugepages_supported())
110965 return -ENOTSUPP;
110966
110967- table->data = &tmp;
110968- table->maxlen = sizeof(unsigned long);
110969- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110970+ t = *table;
110971+ t.data = &tmp;
110972+ t.maxlen = sizeof(unsigned long);
110973+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
110974 if (ret)
110975 goto out;
110976
110977@@ -2406,6 +2408,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110978 struct hstate *h = &default_hstate;
110979 unsigned long tmp;
110980 int ret;
110981+ ctl_table_no_const hugetlb_table;
110982
110983 if (!hugepages_supported())
110984 return -ENOTSUPP;
110985@@ -2415,9 +2418,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
110986 if (write && hstate_is_gigantic(h))
110987 return -EINVAL;
110988
110989- table->data = &tmp;
110990- table->maxlen = sizeof(unsigned long);
110991- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
110992+ hugetlb_table = *table;
110993+ hugetlb_table.data = &tmp;
110994+ hugetlb_table.maxlen = sizeof(unsigned long);
110995+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
110996 if (ret)
110997 goto out;
110998
110999@@ -2907,6 +2911,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
111000 i_mmap_unlock_write(mapping);
111001 }
111002
111003+#ifdef CONFIG_PAX_SEGMEXEC
111004+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
111005+{
111006+ struct mm_struct *mm = vma->vm_mm;
111007+ struct vm_area_struct *vma_m;
111008+ unsigned long address_m;
111009+ pte_t *ptep_m;
111010+
111011+ vma_m = pax_find_mirror_vma(vma);
111012+ if (!vma_m)
111013+ return;
111014+
111015+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111016+ address_m = address + SEGMEXEC_TASK_SIZE;
111017+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
111018+ get_page(page_m);
111019+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
111020+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
111021+}
111022+#endif
111023+
111024 /*
111025 * Hugetlb_cow() should be called with page lock of the original hugepage held.
111026 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
111027@@ -3020,6 +3045,11 @@ retry_avoidcopy:
111028 make_huge_pte(vma, new_page, 1));
111029 page_remove_rmap(old_page);
111030 hugepage_add_new_anon_rmap(new_page, vma, address);
111031+
111032+#ifdef CONFIG_PAX_SEGMEXEC
111033+ pax_mirror_huge_pte(vma, address, new_page);
111034+#endif
111035+
111036 /* Make the old page be freed below */
111037 new_page = old_page;
111038 }
111039@@ -3181,6 +3211,10 @@ retry:
111040 && (vma->vm_flags & VM_SHARED)));
111041 set_huge_pte_at(mm, address, ptep, new_pte);
111042
111043+#ifdef CONFIG_PAX_SEGMEXEC
111044+ pax_mirror_huge_pte(vma, address, page);
111045+#endif
111046+
111047 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
111048 /* Optimization, do the COW without a second fault */
111049 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
111050@@ -3248,6 +3282,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111051 struct address_space *mapping;
111052 int need_wait_lock = 0;
111053
111054+#ifdef CONFIG_PAX_SEGMEXEC
111055+ struct vm_area_struct *vma_m;
111056+#endif
111057+
111058 address &= huge_page_mask(h);
111059
111060 ptep = huge_pte_offset(mm, address);
111061@@ -3261,6 +3299,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111062 VM_FAULT_SET_HINDEX(hstate_index(h));
111063 }
111064
111065+#ifdef CONFIG_PAX_SEGMEXEC
111066+ vma_m = pax_find_mirror_vma(vma);
111067+ if (vma_m) {
111068+ unsigned long address_m;
111069+
111070+ if (vma->vm_start > vma_m->vm_start) {
111071+ address_m = address;
111072+ address -= SEGMEXEC_TASK_SIZE;
111073+ vma = vma_m;
111074+ h = hstate_vma(vma);
111075+ } else
111076+ address_m = address + SEGMEXEC_TASK_SIZE;
111077+
111078+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
111079+ return VM_FAULT_OOM;
111080+ address_m &= HPAGE_MASK;
111081+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
111082+ }
111083+#endif
111084+
111085 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
111086 if (!ptep)
111087 return VM_FAULT_OOM;
111088diff --git a/mm/internal.h b/mm/internal.h
111089index a25e359..e2c96e9 100644
111090--- a/mm/internal.h
111091+++ b/mm/internal.h
111092@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
111093
111094 extern int __isolate_free_page(struct page *page, unsigned int order);
111095 extern void __free_pages_bootmem(struct page *page, unsigned int order);
111096+extern void free_compound_page(struct page *page);
111097 extern void prep_compound_page(struct page *page, unsigned long order);
111098 #ifdef CONFIG_MEMORY_FAILURE
111099 extern bool is_free_buddy_page(struct page *page);
111100@@ -413,7 +414,7 @@ extern u32 hwpoison_filter_enable;
111101
111102 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
111103 unsigned long, unsigned long,
111104- unsigned long, unsigned long);
111105+ unsigned long, unsigned long) __intentional_overflow(-1);
111106
111107 extern void set_pageblock_order(void);
111108 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
111109diff --git a/mm/kmemleak.c b/mm/kmemleak.c
111110index 3716cdb..25b97dc 100644
111111--- a/mm/kmemleak.c
111112+++ b/mm/kmemleak.c
111113@@ -368,7 +368,7 @@ static void print_unreferenced(struct seq_file *seq,
111114
111115 for (i = 0; i < object->trace_len; i++) {
111116 void *ptr = (void *)object->trace[i];
111117- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
111118+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
111119 }
111120 }
111121
111122@@ -1926,7 +1926,7 @@ static int __init kmemleak_late_init(void)
111123 return -ENOMEM;
111124 }
111125
111126- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
111127+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
111128 &kmemleak_fops);
111129 if (!dentry)
111130 pr_warning("Failed to create the debugfs kmemleak file\n");
111131diff --git a/mm/maccess.c b/mm/maccess.c
111132index d53adf9..03a24bf 100644
111133--- a/mm/maccess.c
111134+++ b/mm/maccess.c
111135@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
111136 set_fs(KERNEL_DS);
111137 pagefault_disable();
111138 ret = __copy_from_user_inatomic(dst,
111139- (__force const void __user *)src, size);
111140+ (const void __force_user *)src, size);
111141 pagefault_enable();
111142 set_fs(old_fs);
111143
111144@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
111145
111146 set_fs(KERNEL_DS);
111147 pagefault_disable();
111148- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
111149+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
111150 pagefault_enable();
111151 set_fs(old_fs);
111152
111153diff --git a/mm/madvise.c b/mm/madvise.c
111154index d551475..8fdd7f3 100644
111155--- a/mm/madvise.c
111156+++ b/mm/madvise.c
111157@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
111158 pgoff_t pgoff;
111159 unsigned long new_flags = vma->vm_flags;
111160
111161+#ifdef CONFIG_PAX_SEGMEXEC
111162+ struct vm_area_struct *vma_m;
111163+#endif
111164+
111165 switch (behavior) {
111166 case MADV_NORMAL:
111167 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
111168@@ -126,6 +130,13 @@ success:
111169 /*
111170 * vm_flags is protected by the mmap_sem held in write mode.
111171 */
111172+
111173+#ifdef CONFIG_PAX_SEGMEXEC
111174+ vma_m = pax_find_mirror_vma(vma);
111175+ if (vma_m)
111176+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
111177+#endif
111178+
111179 vma->vm_flags = new_flags;
111180
111181 out:
111182@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
111183 struct vm_area_struct **prev,
111184 unsigned long start, unsigned long end)
111185 {
111186+
111187+#ifdef CONFIG_PAX_SEGMEXEC
111188+ struct vm_area_struct *vma_m;
111189+#endif
111190+
111191 *prev = vma;
111192 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111193 return -EINVAL;
111194
111195 zap_page_range(vma, start, end - start, NULL);
111196+
111197+#ifdef CONFIG_PAX_SEGMEXEC
111198+ vma_m = pax_find_mirror_vma(vma);
111199+ if (vma_m) {
111200+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111201+ return -EINVAL;
111202+
111203+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
111204+ }
111205+#endif
111206+
111207 return 0;
111208 }
111209
111210@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
111211 if (end < start)
111212 return error;
111213
111214+#ifdef CONFIG_PAX_SEGMEXEC
111215+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
111216+ if (end > SEGMEXEC_TASK_SIZE)
111217+ return error;
111218+ } else
111219+#endif
111220+
111221+ if (end > TASK_SIZE)
111222+ return error;
111223+
111224 error = 0;
111225 if (end == start)
111226 return error;
111227diff --git a/mm/memory-failure.c b/mm/memory-failure.c
111228index 501820c..9612bcf 100644
111229--- a/mm/memory-failure.c
111230+++ b/mm/memory-failure.c
111231@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
111232
111233 int sysctl_memory_failure_recovery __read_mostly = 1;
111234
111235-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111236+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111237
111238 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
111239
111240@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
111241 pfn, t->comm, t->pid);
111242 si.si_signo = SIGBUS;
111243 si.si_errno = 0;
111244- si.si_addr = (void *)addr;
111245+ si.si_addr = (void __user *)addr;
111246 #ifdef __ARCH_SI_TRAPNO
111247 si.si_trapno = trapno;
111248 #endif
111249@@ -825,7 +825,7 @@ static struct page_state {
111250 unsigned long res;
111251 enum action_page_type type;
111252 int (*action)(struct page *p, unsigned long pfn);
111253-} error_states[] = {
111254+} __do_const error_states[] = {
111255 { reserved, reserved, MSG_KERNEL, me_kernel },
111256 /*
111257 * free pages are specially detected outside this table:
111258@@ -1133,7 +1133,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111259 nr_pages = 1 << compound_order(hpage);
111260 else /* normal page or thp */
111261 nr_pages = 1;
111262- atomic_long_add(nr_pages, &num_poisoned_pages);
111263+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
111264
111265 /*
111266 * We need/can do nothing about count=0 pages.
111267@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111268 if (PageHWPoison(hpage)) {
111269 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
111270 || (p != hpage && TestSetPageHWPoison(hpage))) {
111271- atomic_long_sub(nr_pages, &num_poisoned_pages);
111272+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111273 unlock_page(hpage);
111274 return 0;
111275 }
111276@@ -1231,14 +1231,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111277 */
111278 if (!PageHWPoison(p)) {
111279 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
111280- atomic_long_sub(nr_pages, &num_poisoned_pages);
111281+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111282 put_page(hpage);
111283 res = 0;
111284 goto out;
111285 }
111286 if (hwpoison_filter(p)) {
111287 if (TestClearPageHWPoison(p))
111288- atomic_long_sub(nr_pages, &num_poisoned_pages);
111289+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111290 unlock_page(hpage);
111291 put_page(hpage);
111292 return 0;
111293@@ -1467,7 +1467,7 @@ int unpoison_memory(unsigned long pfn)
111294 return 0;
111295 }
111296 if (TestClearPageHWPoison(p))
111297- atomic_long_dec(&num_poisoned_pages);
111298+ atomic_long_dec_unchecked(&num_poisoned_pages);
111299 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
111300 return 0;
111301 }
111302@@ -1481,7 +1481,7 @@ int unpoison_memory(unsigned long pfn)
111303 */
111304 if (TestClearPageHWPoison(page)) {
111305 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
111306- atomic_long_sub(nr_pages, &num_poisoned_pages);
111307+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111308 freeit = 1;
111309 if (PageHuge(page))
111310 clear_page_hwpoison_huge_page(page);
111311@@ -1616,11 +1616,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
111312 if (PageHuge(page)) {
111313 set_page_hwpoison_huge_page(hpage);
111314 dequeue_hwpoisoned_huge_page(hpage);
111315- atomic_long_add(1 << compound_order(hpage),
111316+ atomic_long_add_unchecked(1 << compound_order(hpage),
111317 &num_poisoned_pages);
111318 } else {
111319 SetPageHWPoison(page);
111320- atomic_long_inc(&num_poisoned_pages);
111321+ atomic_long_inc_unchecked(&num_poisoned_pages);
111322 }
111323 }
111324 return ret;
111325@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
111326 put_page(page);
111327 pr_info("soft_offline: %#lx: invalidated\n", pfn);
111328 SetPageHWPoison(page);
111329- atomic_long_inc(&num_poisoned_pages);
111330+ atomic_long_inc_unchecked(&num_poisoned_pages);
111331 return 0;
111332 }
111333
111334@@ -1708,7 +1708,7 @@ static int __soft_offline_page(struct page *page, int flags)
111335 if (!is_free_buddy_page(page))
111336 pr_info("soft offline: %#lx: page leaked\n",
111337 pfn);
111338- atomic_long_inc(&num_poisoned_pages);
111339+ atomic_long_inc_unchecked(&num_poisoned_pages);
111340 }
111341 } else {
111342 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
111343@@ -1778,11 +1778,11 @@ int soft_offline_page(struct page *page, int flags)
111344 if (PageHuge(page)) {
111345 set_page_hwpoison_huge_page(hpage);
111346 if (!dequeue_hwpoisoned_huge_page(hpage))
111347- atomic_long_add(1 << compound_order(hpage),
111348+ atomic_long_add_unchecked(1 << compound_order(hpage),
111349 &num_poisoned_pages);
111350 } else {
111351 if (!TestSetPageHWPoison(page))
111352- atomic_long_inc(&num_poisoned_pages);
111353+ atomic_long_inc_unchecked(&num_poisoned_pages);
111354 }
111355 }
111356 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
111357diff --git a/mm/memory.c b/mm/memory.c
111358index 22e037e..347d230 100644
111359--- a/mm/memory.c
111360+++ b/mm/memory.c
111361@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111362 free_pte_range(tlb, pmd, addr);
111363 } while (pmd++, addr = next, addr != end);
111364
111365+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
111366 start &= PUD_MASK;
111367 if (start < floor)
111368 return;
111369@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111370 pud_clear(pud);
111371 pmd_free_tlb(tlb, pmd, start);
111372 mm_dec_nr_pmds(tlb->mm);
111373+#endif
111374 }
111375
111376 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111377@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111378 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
111379 } while (pud++, addr = next, addr != end);
111380
111381+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
111382 start &= PGDIR_MASK;
111383 if (start < floor)
111384 return;
111385@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111386 pud = pud_offset(pgd, start);
111387 pgd_clear(pgd);
111388 pud_free_tlb(tlb, pud, start);
111389+#endif
111390+
111391 }
111392
111393 /*
111394@@ -690,7 +695,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
111395 /*
111396 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
111397 */
111398- pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n",
111399+ pr_alert("file:%pD fault:%pX mmap:%pX readpage:%pX\n",
111400 vma->vm_file,
111401 vma->vm_ops ? vma->vm_ops->fault : NULL,
111402 vma->vm_file ? vma->vm_file->f_op->mmap : NULL,
111403@@ -1463,6 +1468,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
111404 page_add_file_rmap(page);
111405 set_pte_at(mm, addr, pte, mk_pte(page, prot));
111406
111407+#ifdef CONFIG_PAX_SEGMEXEC
111408+ pax_mirror_file_pte(vma, addr, page, ptl);
111409+#endif
111410+
111411 retval = 0;
111412 pte_unmap_unlock(pte, ptl);
111413 return retval;
111414@@ -1507,9 +1516,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
111415 if (!page_count(page))
111416 return -EINVAL;
111417 if (!(vma->vm_flags & VM_MIXEDMAP)) {
111418+
111419+#ifdef CONFIG_PAX_SEGMEXEC
111420+ struct vm_area_struct *vma_m;
111421+#endif
111422+
111423 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
111424 BUG_ON(vma->vm_flags & VM_PFNMAP);
111425 vma->vm_flags |= VM_MIXEDMAP;
111426+
111427+#ifdef CONFIG_PAX_SEGMEXEC
111428+ vma_m = pax_find_mirror_vma(vma);
111429+ if (vma_m)
111430+ vma_m->vm_flags |= VM_MIXEDMAP;
111431+#endif
111432+
111433 }
111434 return insert_page(vma, addr, page, vma->vm_page_prot);
111435 }
111436@@ -1592,6 +1613,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
111437 unsigned long pfn)
111438 {
111439 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
111440+ BUG_ON(vma->vm_mirror);
111441
111442 if (addr < vma->vm_start || addr >= vma->vm_end)
111443 return -EFAULT;
111444@@ -1839,7 +1861,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
111445
111446 BUG_ON(pud_huge(*pud));
111447
111448- pmd = pmd_alloc(mm, pud, addr);
111449+ pmd = (mm == &init_mm) ?
111450+ pmd_alloc_kernel(mm, pud, addr) :
111451+ pmd_alloc(mm, pud, addr);
111452 if (!pmd)
111453 return -ENOMEM;
111454 do {
111455@@ -1859,7 +1883,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
111456 unsigned long next;
111457 int err;
111458
111459- pud = pud_alloc(mm, pgd, addr);
111460+ pud = (mm == &init_mm) ?
111461+ pud_alloc_kernel(mm, pgd, addr) :
111462+ pud_alloc(mm, pgd, addr);
111463 if (!pud)
111464 return -ENOMEM;
111465 do {
111466@@ -2040,6 +2066,185 @@ static inline int wp_page_reuse(struct mm_struct *mm,
111467 return VM_FAULT_WRITE;
111468 }
111469
111470+#ifdef CONFIG_PAX_SEGMEXEC
111471+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
111472+{
111473+ struct mm_struct *mm = vma->vm_mm;
111474+ spinlock_t *ptl;
111475+ pte_t *pte, entry;
111476+
111477+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
111478+ entry = *pte;
111479+ if (!pte_present(entry)) {
111480+ if (!pte_none(entry)) {
111481+ free_swap_and_cache(pte_to_swp_entry(entry));
111482+ pte_clear_not_present_full(mm, address, pte, 0);
111483+ }
111484+ } else {
111485+ struct page *page;
111486+
111487+ flush_cache_page(vma, address, pte_pfn(entry));
111488+ entry = ptep_clear_flush(vma, address, pte);
111489+ BUG_ON(pte_dirty(entry));
111490+ page = vm_normal_page(vma, address, entry);
111491+ if (page) {
111492+ update_hiwater_rss(mm);
111493+ if (PageAnon(page))
111494+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111495+ else
111496+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111497+ page_remove_rmap(page);
111498+ page_cache_release(page);
111499+ }
111500+ }
111501+ pte_unmap_unlock(pte, ptl);
111502+}
111503+
111504+/* PaX: if vma is mirrored, synchronize the mirror's PTE
111505+ *
111506+ * the ptl of the lower mapped page is held on entry and is not released on exit
111507+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
111508+ */
111509+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111510+{
111511+ struct mm_struct *mm = vma->vm_mm;
111512+ unsigned long address_m;
111513+ spinlock_t *ptl_m;
111514+ struct vm_area_struct *vma_m;
111515+ pmd_t *pmd_m;
111516+ pte_t *pte_m, entry_m;
111517+
111518+ BUG_ON(!page_m || !PageAnon(page_m));
111519+
111520+ vma_m = pax_find_mirror_vma(vma);
111521+ if (!vma_m)
111522+ return;
111523+
111524+ BUG_ON(!PageLocked(page_m));
111525+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111526+ address_m = address + SEGMEXEC_TASK_SIZE;
111527+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111528+ pte_m = pte_offset_map(pmd_m, address_m);
111529+ ptl_m = pte_lockptr(mm, pmd_m);
111530+ if (ptl != ptl_m) {
111531+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111532+ if (!pte_none(*pte_m))
111533+ goto out;
111534+ }
111535+
111536+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111537+ page_cache_get(page_m);
111538+ page_add_anon_rmap(page_m, vma_m, address_m);
111539+ inc_mm_counter_fast(mm, MM_ANONPAGES);
111540+ set_pte_at(mm, address_m, pte_m, entry_m);
111541+ update_mmu_cache(vma_m, address_m, pte_m);
111542+out:
111543+ if (ptl != ptl_m)
111544+ spin_unlock(ptl_m);
111545+ pte_unmap(pte_m);
111546+ unlock_page(page_m);
111547+}
111548+
111549+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111550+{
111551+ struct mm_struct *mm = vma->vm_mm;
111552+ unsigned long address_m;
111553+ spinlock_t *ptl_m;
111554+ struct vm_area_struct *vma_m;
111555+ pmd_t *pmd_m;
111556+ pte_t *pte_m, entry_m;
111557+
111558+ BUG_ON(!page_m || PageAnon(page_m));
111559+
111560+ vma_m = pax_find_mirror_vma(vma);
111561+ if (!vma_m)
111562+ return;
111563+
111564+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111565+ address_m = address + SEGMEXEC_TASK_SIZE;
111566+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111567+ pte_m = pte_offset_map(pmd_m, address_m);
111568+ ptl_m = pte_lockptr(mm, pmd_m);
111569+ if (ptl != ptl_m) {
111570+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111571+ if (!pte_none(*pte_m))
111572+ goto out;
111573+ }
111574+
111575+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111576+ page_cache_get(page_m);
111577+ page_add_file_rmap(page_m);
111578+ inc_mm_counter_fast(mm, MM_FILEPAGES);
111579+ set_pte_at(mm, address_m, pte_m, entry_m);
111580+ update_mmu_cache(vma_m, address_m, pte_m);
111581+out:
111582+ if (ptl != ptl_m)
111583+ spin_unlock(ptl_m);
111584+ pte_unmap(pte_m);
111585+}
111586+
111587+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
111588+{
111589+ struct mm_struct *mm = vma->vm_mm;
111590+ unsigned long address_m;
111591+ spinlock_t *ptl_m;
111592+ struct vm_area_struct *vma_m;
111593+ pmd_t *pmd_m;
111594+ pte_t *pte_m, entry_m;
111595+
111596+ vma_m = pax_find_mirror_vma(vma);
111597+ if (!vma_m)
111598+ return;
111599+
111600+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111601+ address_m = address + SEGMEXEC_TASK_SIZE;
111602+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111603+ pte_m = pte_offset_map(pmd_m, address_m);
111604+ ptl_m = pte_lockptr(mm, pmd_m);
111605+ if (ptl != ptl_m) {
111606+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111607+ if (!pte_none(*pte_m))
111608+ goto out;
111609+ }
111610+
111611+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
111612+ set_pte_at(mm, address_m, pte_m, entry_m);
111613+out:
111614+ if (ptl != ptl_m)
111615+ spin_unlock(ptl_m);
111616+ pte_unmap(pte_m);
111617+}
111618+
111619+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
111620+{
111621+ struct page *page_m;
111622+ pte_t entry;
111623+
111624+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
111625+ goto out;
111626+
111627+ entry = *pte;
111628+ page_m = vm_normal_page(vma, address, entry);
111629+ if (!page_m)
111630+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
111631+ else if (PageAnon(page_m)) {
111632+ if (pax_find_mirror_vma(vma)) {
111633+ pte_unmap_unlock(pte, ptl);
111634+ lock_page(page_m);
111635+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
111636+ if (pte_same(entry, *pte))
111637+ pax_mirror_anon_pte(vma, address, page_m, ptl);
111638+ else
111639+ unlock_page(page_m);
111640+ }
111641+ } else
111642+ pax_mirror_file_pte(vma, address, page_m, ptl);
111643+
111644+out:
111645+ pte_unmap_unlock(pte, ptl);
111646+}
111647+#endif
111648+
111649 /*
111650 * Handle the case of a page which we actually need to copy to a new page.
111651 *
111652@@ -2093,6 +2298,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111653 */
111654 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111655 if (likely(pte_same(*page_table, orig_pte))) {
111656+
111657+#ifdef CONFIG_PAX_SEGMEXEC
111658+ if (pax_find_mirror_vma(vma))
111659+ BUG_ON(!trylock_page(new_page));
111660+#endif
111661+
111662 if (old_page) {
111663 if (!PageAnon(old_page)) {
111664 dec_mm_counter_fast(mm, MM_FILEPAGES);
111665@@ -2147,6 +2358,10 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111666 page_remove_rmap(old_page);
111667 }
111668
111669+#ifdef CONFIG_PAX_SEGMEXEC
111670+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111671+#endif
111672+
111673 /* Free the old page.. */
111674 new_page = old_page;
111675 page_copied = 1;
111676@@ -2578,6 +2793,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111677 swap_free(entry);
111678 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
111679 try_to_free_swap(page);
111680+
111681+#ifdef CONFIG_PAX_SEGMEXEC
111682+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
111683+#endif
111684+
111685 unlock_page(page);
111686 if (page != swapcache) {
111687 /*
111688@@ -2601,6 +2821,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111689
111690 /* No need to invalidate - it was non-present before */
111691 update_mmu_cache(vma, address, page_table);
111692+
111693+#ifdef CONFIG_PAX_SEGMEXEC
111694+ pax_mirror_anon_pte(vma, address, page, ptl);
111695+#endif
111696+
111697 unlock:
111698 pte_unmap_unlock(page_table, ptl);
111699 out:
111700@@ -2620,40 +2845,6 @@ out_release:
111701 }
111702
111703 /*
111704- * This is like a special single-page "expand_{down|up}wards()",
111705- * except we must first make sure that 'address{-|+}PAGE_SIZE'
111706- * doesn't hit another vma.
111707- */
111708-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
111709-{
111710- address &= PAGE_MASK;
111711- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
111712- struct vm_area_struct *prev = vma->vm_prev;
111713-
111714- /*
111715- * Is there a mapping abutting this one below?
111716- *
111717- * That's only ok if it's the same stack mapping
111718- * that has gotten split..
111719- */
111720- if (prev && prev->vm_end == address)
111721- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
111722-
111723- return expand_downwards(vma, address - PAGE_SIZE);
111724- }
111725- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
111726- struct vm_area_struct *next = vma->vm_next;
111727-
111728- /* As VM_GROWSDOWN but s/below/above/ */
111729- if (next && next->vm_start == address + PAGE_SIZE)
111730- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
111731-
111732- return expand_upwards(vma, address + PAGE_SIZE);
111733- }
111734- return 0;
111735-}
111736-
111737-/*
111738 * We enter with non-exclusive mmap_sem (to exclude vma changes,
111739 * but allow concurrent faults), and pte mapped but not yet locked.
111740 * We return with mmap_sem still held, but pte unmapped and unlocked.
111741@@ -2663,27 +2854,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111742 unsigned int flags)
111743 {
111744 struct mem_cgroup *memcg;
111745- struct page *page;
111746+ struct page *page = NULL;
111747 spinlock_t *ptl;
111748 pte_t entry;
111749
111750- pte_unmap(page_table);
111751-
111752- /* Check if we need to add a guard page to the stack */
111753- if (check_stack_guard_page(vma, address) < 0)
111754- return VM_FAULT_SIGSEGV;
111755-
111756- /* Use the zero-page for reads */
111757 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
111758 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
111759 vma->vm_page_prot));
111760- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111761+ ptl = pte_lockptr(mm, pmd);
111762+ spin_lock(ptl);
111763 if (!pte_none(*page_table))
111764 goto unlock;
111765 goto setpte;
111766 }
111767
111768 /* Allocate our own private page. */
111769+ pte_unmap(page_table);
111770+
111771 if (unlikely(anon_vma_prepare(vma)))
111772 goto oom;
111773 page = alloc_zeroed_user_highpage_movable(vma, address);
111774@@ -2707,6 +2894,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111775 if (!pte_none(*page_table))
111776 goto release;
111777
111778+#ifdef CONFIG_PAX_SEGMEXEC
111779+ if (pax_find_mirror_vma(vma))
111780+ BUG_ON(!trylock_page(page));
111781+#endif
111782+
111783 inc_mm_counter_fast(mm, MM_ANONPAGES);
111784 page_add_new_anon_rmap(page, vma, address);
111785 mem_cgroup_commit_charge(page, memcg, false);
111786@@ -2716,6 +2908,12 @@ setpte:
111787
111788 /* No need to invalidate - it was non-present before */
111789 update_mmu_cache(vma, address, page_table);
111790+
111791+#ifdef CONFIG_PAX_SEGMEXEC
111792+ if (page)
111793+ pax_mirror_anon_pte(vma, address, page, ptl);
111794+#endif
111795+
111796 unlock:
111797 pte_unmap_unlock(page_table, ptl);
111798 return 0;
111799@@ -2948,6 +3146,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111800 return ret;
111801 }
111802 do_set_pte(vma, address, fault_page, pte, false, false);
111803+
111804+#ifdef CONFIG_PAX_SEGMEXEC
111805+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111806+#endif
111807+
111808 unlock_page(fault_page);
111809 unlock_out:
111810 pte_unmap_unlock(pte, ptl);
111811@@ -2999,7 +3202,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111812 }
111813 goto uncharge_out;
111814 }
111815+
111816+#ifdef CONFIG_PAX_SEGMEXEC
111817+ if (pax_find_mirror_vma(vma))
111818+ BUG_ON(!trylock_page(new_page));
111819+#endif
111820+
111821 do_set_pte(vma, address, new_page, pte, true, true);
111822+
111823+#ifdef CONFIG_PAX_SEGMEXEC
111824+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111825+#endif
111826+
111827 mem_cgroup_commit_charge(new_page, memcg, false);
111828 lru_cache_add_active_or_unevictable(new_page, vma);
111829 pte_unmap_unlock(pte, ptl);
111830@@ -3057,6 +3271,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111831 return ret;
111832 }
111833 do_set_pte(vma, address, fault_page, pte, true, false);
111834+
111835+#ifdef CONFIG_PAX_SEGMEXEC
111836+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111837+#endif
111838+
111839 pte_unmap_unlock(pte, ptl);
111840
111841 if (set_page_dirty(fault_page))
111842@@ -3280,6 +3499,12 @@ static int handle_pte_fault(struct mm_struct *mm,
111843 if (flags & FAULT_FLAG_WRITE)
111844 flush_tlb_fix_spurious_fault(vma, address);
111845 }
111846+
111847+#ifdef CONFIG_PAX_SEGMEXEC
111848+ pax_mirror_pte(vma, address, pte, pmd, ptl);
111849+ return 0;
111850+#endif
111851+
111852 unlock:
111853 pte_unmap_unlock(pte, ptl);
111854 return 0;
111855@@ -3299,9 +3524,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111856 pmd_t *pmd;
111857 pte_t *pte;
111858
111859+#ifdef CONFIG_PAX_SEGMEXEC
111860+ struct vm_area_struct *vma_m;
111861+#endif
111862+
111863 if (unlikely(is_vm_hugetlb_page(vma)))
111864 return hugetlb_fault(mm, vma, address, flags);
111865
111866+#ifdef CONFIG_PAX_SEGMEXEC
111867+ vma_m = pax_find_mirror_vma(vma);
111868+ if (vma_m) {
111869+ unsigned long address_m;
111870+ pgd_t *pgd_m;
111871+ pud_t *pud_m;
111872+ pmd_t *pmd_m;
111873+
111874+ if (vma->vm_start > vma_m->vm_start) {
111875+ address_m = address;
111876+ address -= SEGMEXEC_TASK_SIZE;
111877+ vma = vma_m;
111878+ } else
111879+ address_m = address + SEGMEXEC_TASK_SIZE;
111880+
111881+ pgd_m = pgd_offset(mm, address_m);
111882+ pud_m = pud_alloc(mm, pgd_m, address_m);
111883+ if (!pud_m)
111884+ return VM_FAULT_OOM;
111885+ pmd_m = pmd_alloc(mm, pud_m, address_m);
111886+ if (!pmd_m)
111887+ return VM_FAULT_OOM;
111888+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
111889+ return VM_FAULT_OOM;
111890+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
111891+ }
111892+#endif
111893+
111894 pgd = pgd_offset(mm, address);
111895 pud = pud_alloc(mm, pgd, address);
111896 if (!pud)
111897@@ -3436,6 +3693,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111898 spin_unlock(&mm->page_table_lock);
111899 return 0;
111900 }
111901+
111902+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111903+{
111904+ pud_t *new = pud_alloc_one(mm, address);
111905+ if (!new)
111906+ return -ENOMEM;
111907+
111908+ smp_wmb(); /* See comment in __pte_alloc */
111909+
111910+ spin_lock(&mm->page_table_lock);
111911+ if (pgd_present(*pgd)) /* Another has populated it */
111912+ pud_free(mm, new);
111913+ else
111914+ pgd_populate_kernel(mm, pgd, new);
111915+ spin_unlock(&mm->page_table_lock);
111916+ return 0;
111917+}
111918 #endif /* __PAGETABLE_PUD_FOLDED */
111919
111920 #ifndef __PAGETABLE_PMD_FOLDED
111921@@ -3468,6 +3742,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
111922 spin_unlock(&mm->page_table_lock);
111923 return 0;
111924 }
111925+
111926+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
111927+{
111928+ pmd_t *new = pmd_alloc_one(mm, address);
111929+ if (!new)
111930+ return -ENOMEM;
111931+
111932+ smp_wmb(); /* See comment in __pte_alloc */
111933+
111934+ spin_lock(&mm->page_table_lock);
111935+#ifndef __ARCH_HAS_4LEVEL_HACK
111936+ if (!pud_present(*pud)) {
111937+ mm_inc_nr_pmds(mm);
111938+ pud_populate_kernel(mm, pud, new);
111939+ } else /* Another has populated it */
111940+ pmd_free(mm, new);
111941+#else
111942+ if (!pgd_present(*pud)) {
111943+ mm_inc_nr_pmds(mm);
111944+ pgd_populate_kernel(mm, pud, new);
111945+ } else /* Another has populated it */
111946+ pmd_free(mm, new);
111947+#endif /* __ARCH_HAS_4LEVEL_HACK */
111948+ spin_unlock(&mm->page_table_lock);
111949+ return 0;
111950+}
111951 #endif /* __PAGETABLE_PMD_FOLDED */
111952
111953 static int __follow_pte(struct mm_struct *mm, unsigned long address,
111954@@ -3577,8 +3877,8 @@ out:
111955 return ret;
111956 }
111957
111958-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111959- void *buf, int len, int write)
111960+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
111961+ void *buf, size_t len, int write)
111962 {
111963 resource_size_t phys_addr;
111964 unsigned long prot = 0;
111965@@ -3604,8 +3904,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
111966 * Access another process' address space as given in mm. If non-NULL, use the
111967 * given task for page fault accounting.
111968 */
111969-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111970- unsigned long addr, void *buf, int len, int write)
111971+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111972+ unsigned long addr, void *buf, size_t len, int write)
111973 {
111974 struct vm_area_struct *vma;
111975 void *old_buf = buf;
111976@@ -3613,7 +3913,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111977 down_read(&mm->mmap_sem);
111978 /* ignore errors, just check how much was successfully transferred */
111979 while (len) {
111980- int bytes, ret, offset;
111981+ ssize_t bytes, ret, offset;
111982 void *maddr;
111983 struct page *page = NULL;
111984
111985@@ -3674,8 +3974,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
111986 *
111987 * The caller must hold a reference on @mm.
111988 */
111989-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111990- void *buf, int len, int write)
111991+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
111992+ void *buf, size_t len, int write)
111993 {
111994 return __access_remote_vm(NULL, mm, addr, buf, len, write);
111995 }
111996@@ -3685,11 +3985,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
111997 * Source/target buffer must be kernel space,
111998 * Do not walk the page table directly, use get_user_pages
111999 */
112000-int access_process_vm(struct task_struct *tsk, unsigned long addr,
112001- void *buf, int len, int write)
112002+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
112003+ void *buf, size_t len, int write)
112004 {
112005 struct mm_struct *mm;
112006- int ret;
112007+ ssize_t ret;
112008
112009 mm = get_task_mm(tsk);
112010 if (!mm)
112011diff --git a/mm/mempolicy.c b/mm/mempolicy.c
112012index 99d4c1d..a577817 100644
112013--- a/mm/mempolicy.c
112014+++ b/mm/mempolicy.c
112015@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112016 unsigned long vmstart;
112017 unsigned long vmend;
112018
112019+#ifdef CONFIG_PAX_SEGMEXEC
112020+ struct vm_area_struct *vma_m;
112021+#endif
112022+
112023 vma = find_vma(mm, start);
112024 if (!vma || vma->vm_start > start)
112025 return -EFAULT;
112026@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112027 err = vma_replace_policy(vma, new_pol);
112028 if (err)
112029 goto out;
112030+
112031+#ifdef CONFIG_PAX_SEGMEXEC
112032+ vma_m = pax_find_mirror_vma(vma);
112033+ if (vma_m) {
112034+ err = vma_replace_policy(vma_m, new_pol);
112035+ if (err)
112036+ goto out;
112037+ }
112038+#endif
112039+
112040 }
112041
112042 out:
112043@@ -1161,6 +1175,17 @@ static long do_mbind(unsigned long start, unsigned long len,
112044
112045 if (end < start)
112046 return -EINVAL;
112047+
112048+#ifdef CONFIG_PAX_SEGMEXEC
112049+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
112050+ if (end > SEGMEXEC_TASK_SIZE)
112051+ return -EINVAL;
112052+ } else
112053+#endif
112054+
112055+ if (end > TASK_SIZE)
112056+ return -EINVAL;
112057+
112058 if (end == start)
112059 return 0;
112060
112061@@ -1386,8 +1411,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112062 */
112063 tcred = __task_cred(task);
112064 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112065- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112066- !capable(CAP_SYS_NICE)) {
112067+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112068 rcu_read_unlock();
112069 err = -EPERM;
112070 goto out_put;
112071@@ -1418,6 +1442,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112072 goto out;
112073 }
112074
112075+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112076+ if (mm != current->mm &&
112077+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
112078+ mmput(mm);
112079+ err = -EPERM;
112080+ goto out;
112081+ }
112082+#endif
112083+
112084 err = do_migrate_pages(mm, old, new,
112085 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
112086
112087diff --git a/mm/migrate.c b/mm/migrate.c
112088index f53838f..a26fa94 100644
112089--- a/mm/migrate.c
112090+++ b/mm/migrate.c
112091@@ -1484,8 +1484,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
112092 */
112093 tcred = __task_cred(task);
112094 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112095- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112096- !capable(CAP_SYS_NICE)) {
112097+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112098 rcu_read_unlock();
112099 err = -EPERM;
112100 goto out;
112101diff --git a/mm/mlock.c b/mm/mlock.c
112102index 6fd2cf1..cbae765 100644
112103--- a/mm/mlock.c
112104+++ b/mm/mlock.c
112105@@ -14,6 +14,7 @@
112106 #include <linux/pagevec.h>
112107 #include <linux/mempolicy.h>
112108 #include <linux/syscalls.h>
112109+#include <linux/security.h>
112110 #include <linux/sched.h>
112111 #include <linux/export.h>
112112 #include <linux/rmap.h>
112113@@ -557,7 +558,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
112114 {
112115 unsigned long nstart, end, tmp;
112116 struct vm_area_struct * vma, * prev;
112117- int error;
112118+ int error = 0;
112119
112120 VM_BUG_ON(start & ~PAGE_MASK);
112121 VM_BUG_ON(len != PAGE_ALIGN(len));
112122@@ -566,6 +567,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
112123 return -EINVAL;
112124 if (end == start)
112125 return 0;
112126+ if (end > TASK_SIZE)
112127+ return -EINVAL;
112128+
112129 vma = find_vma(current->mm, start);
112130 if (!vma || vma->vm_start > start)
112131 return -ENOMEM;
112132@@ -577,6 +581,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
112133 for (nstart = start ; ; ) {
112134 vm_flags_t newflags;
112135
112136+#ifdef CONFIG_PAX_SEGMEXEC
112137+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112138+ break;
112139+#endif
112140+
112141 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
112142
112143 newflags = vma->vm_flags & ~VM_LOCKED;
112144@@ -627,6 +636,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
112145 locked += current->mm->locked_vm;
112146
112147 /* check against resource limits */
112148+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
112149 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
112150 error = do_mlock(start, len, 1);
112151
112152@@ -668,6 +678,11 @@ static int do_mlockall(int flags)
112153 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
112154 vm_flags_t newflags;
112155
112156+#ifdef CONFIG_PAX_SEGMEXEC
112157+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112158+ break;
112159+#endif
112160+
112161 newflags = vma->vm_flags & ~VM_LOCKED;
112162 if (flags & MCL_CURRENT)
112163 newflags |= VM_LOCKED;
112164@@ -699,8 +714,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
112165 lock_limit >>= PAGE_SHIFT;
112166
112167 ret = -ENOMEM;
112168+
112169+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
112170+
112171 down_write(&current->mm->mmap_sem);
112172-
112173 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
112174 capable(CAP_IPC_LOCK))
112175 ret = do_mlockall(flags);
112176diff --git a/mm/mm_init.c b/mm/mm_init.c
112177index 5f420f7..dd42fb1b 100644
112178--- a/mm/mm_init.c
112179+++ b/mm/mm_init.c
112180@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
112181 return NOTIFY_OK;
112182 }
112183
112184-static struct notifier_block compute_batch_nb __meminitdata = {
112185+static struct notifier_block compute_batch_nb __meminitconst = {
112186 .notifier_call = mm_compute_batch_notifier,
112187 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
112188 };
112189diff --git a/mm/mmap.c b/mm/mmap.c
112190index bb50cac..6d50a9f 100644
112191--- a/mm/mmap.c
112192+++ b/mm/mmap.c
112193@@ -41,6 +41,7 @@
112194 #include <linux/notifier.h>
112195 #include <linux/memory.h>
112196 #include <linux/printk.h>
112197+#include <linux/random.h>
112198
112199 #include <asm/uaccess.h>
112200 #include <asm/cacheflush.h>
112201@@ -57,6 +58,16 @@
112202 #define arch_rebalance_pgtables(addr, len) (addr)
112203 #endif
112204
112205+static inline void verify_mm_writelocked(struct mm_struct *mm)
112206+{
112207+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
112208+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
112209+ up_read(&mm->mmap_sem);
112210+ BUG();
112211+ }
112212+#endif
112213+}
112214+
112215 static void unmap_region(struct mm_struct *mm,
112216 struct vm_area_struct *vma, struct vm_area_struct *prev,
112217 unsigned long start, unsigned long end);
112218@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
112219 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
112220 *
112221 */
112222-pgprot_t protection_map[16] = {
112223+pgprot_t protection_map[16] __read_only = {
112224 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
112225 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
112226 };
112227
112228-pgprot_t vm_get_page_prot(unsigned long vm_flags)
112229+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
112230 {
112231- return __pgprot(pgprot_val(protection_map[vm_flags &
112232+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
112233 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
112234 pgprot_val(arch_vm_get_page_prot(vm_flags)));
112235+
112236+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112237+ if (!(__supported_pte_mask & _PAGE_NX) &&
112238+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
112239+ (vm_flags & (VM_READ | VM_WRITE)))
112240+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
112241+#endif
112242+
112243+ return prot;
112244 }
112245 EXPORT_SYMBOL(vm_get_page_prot);
112246
112247@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
112248 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
112249 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
112250 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
112251+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
112252 /*
112253 * Make sure vm_committed_as in one cacheline and not cacheline shared with
112254 * other variables. It can be updated by several CPUs frequently.
112255@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
112256 struct vm_area_struct *next = vma->vm_next;
112257
112258 might_sleep();
112259+ BUG_ON(vma->vm_mirror);
112260 if (vma->vm_ops && vma->vm_ops->close)
112261 vma->vm_ops->close(vma);
112262 if (vma->vm_file)
112263@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
112264
112265 SYSCALL_DEFINE1(brk, unsigned long, brk)
112266 {
112267+ unsigned long rlim;
112268 unsigned long retval;
112269 unsigned long newbrk, oldbrk;
112270 struct mm_struct *mm = current->mm;
112271@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
112272 * segment grow beyond its set limit the in case where the limit is
112273 * not page aligned -Ram Gupta
112274 */
112275- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
112276+ rlim = rlimit(RLIMIT_DATA);
112277+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112278+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
112279+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
112280+ rlim = 4096 * PAGE_SIZE;
112281+#endif
112282+ if (check_data_rlimit(rlim, brk, mm->start_brk,
112283 mm->end_data, mm->start_data))
112284 goto out;
112285
112286@@ -967,6 +996,12 @@ static int
112287 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
112288 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112289 {
112290+
112291+#ifdef CONFIG_PAX_SEGMEXEC
112292+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
112293+ return 0;
112294+#endif
112295+
112296 if (is_mergeable_vma(vma, file, vm_flags) &&
112297 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112298 if (vma->vm_pgoff == vm_pgoff)
112299@@ -986,6 +1021,12 @@ static int
112300 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
112301 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112302 {
112303+
112304+#ifdef CONFIG_PAX_SEGMEXEC
112305+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
112306+ return 0;
112307+#endif
112308+
112309 if (is_mergeable_vma(vma, file, vm_flags) &&
112310 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112311 pgoff_t vm_pglen;
112312@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112313 struct vm_area_struct *area, *next;
112314 int err;
112315
112316+#ifdef CONFIG_PAX_SEGMEXEC
112317+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
112318+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
112319+
112320+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
112321+#endif
112322+
112323 /*
112324 * We later require that vma->vm_flags == vm_flags,
112325 * so this tests vma->vm_flags & VM_SPECIAL, too.
112326@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112327 if (next && next->vm_end == end) /* cases 6, 7, 8 */
112328 next = next->vm_next;
112329
112330+#ifdef CONFIG_PAX_SEGMEXEC
112331+ if (prev)
112332+ prev_m = pax_find_mirror_vma(prev);
112333+ if (area)
112334+ area_m = pax_find_mirror_vma(area);
112335+ if (next)
112336+ next_m = pax_find_mirror_vma(next);
112337+#endif
112338+
112339 /*
112340 * Can it merge with the predecessor?
112341 */
112342@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112343 /* cases 1, 6 */
112344 err = vma_adjust(prev, prev->vm_start,
112345 next->vm_end, prev->vm_pgoff, NULL);
112346- } else /* cases 2, 5, 7 */
112347+
112348+#ifdef CONFIG_PAX_SEGMEXEC
112349+ if (!err && prev_m)
112350+ err = vma_adjust(prev_m, prev_m->vm_start,
112351+ next_m->vm_end, prev_m->vm_pgoff, NULL);
112352+#endif
112353+
112354+ } else { /* cases 2, 5, 7 */
112355 err = vma_adjust(prev, prev->vm_start,
112356 end, prev->vm_pgoff, NULL);
112357+
112358+#ifdef CONFIG_PAX_SEGMEXEC
112359+ if (!err && prev_m)
112360+ err = vma_adjust(prev_m, prev_m->vm_start,
112361+ end_m, prev_m->vm_pgoff, NULL);
112362+#endif
112363+
112364+ }
112365 if (err)
112366 return NULL;
112367 khugepaged_enter_vma_merge(prev, vm_flags);
112368@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112369 mpol_equal(policy, vma_policy(next)) &&
112370 can_vma_merge_before(next, vm_flags,
112371 anon_vma, file, pgoff+pglen)) {
112372- if (prev && addr < prev->vm_end) /* case 4 */
112373+ if (prev && addr < prev->vm_end) { /* case 4 */
112374 err = vma_adjust(prev, prev->vm_start,
112375 addr, prev->vm_pgoff, NULL);
112376- else /* cases 3, 8 */
112377+
112378+#ifdef CONFIG_PAX_SEGMEXEC
112379+ if (!err && prev_m)
112380+ err = vma_adjust(prev_m, prev_m->vm_start,
112381+ addr_m, prev_m->vm_pgoff, NULL);
112382+#endif
112383+
112384+ } else { /* cases 3, 8 */
112385 err = vma_adjust(area, addr, next->vm_end,
112386 next->vm_pgoff - pglen, NULL);
112387+
112388+#ifdef CONFIG_PAX_SEGMEXEC
112389+ if (!err && area_m)
112390+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
112391+ next_m->vm_pgoff - pglen, NULL);
112392+#endif
112393+
112394+ }
112395 if (err)
112396 return NULL;
112397 khugepaged_enter_vma_merge(area, vm_flags);
112398@@ -1199,8 +1286,10 @@ none:
112399 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112400 struct file *file, long pages)
112401 {
112402- const unsigned long stack_flags
112403- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
112404+
112405+#ifdef CONFIG_PAX_RANDMMAP
112406+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112407+#endif
112408
112409 mm->total_vm += pages;
112410
112411@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112412 mm->shared_vm += pages;
112413 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
112414 mm->exec_vm += pages;
112415- } else if (flags & stack_flags)
112416+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
112417 mm->stack_vm += pages;
112418 }
112419 #endif /* CONFIG_PROC_FS */
112420@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
112421 locked += mm->locked_vm;
112422 lock_limit = rlimit(RLIMIT_MEMLOCK);
112423 lock_limit >>= PAGE_SHIFT;
112424+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112425 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
112426 return -EAGAIN;
112427 }
112428@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112429 * (the exception is when the underlying filesystem is noexec
112430 * mounted, in which case we dont add PROT_EXEC.)
112431 */
112432- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
112433+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
112434 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
112435 prot |= PROT_EXEC;
112436
112437@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112438 /* Obtain the address to map to. we verify (or select) it and ensure
112439 * that it represents a valid section of the address space.
112440 */
112441- addr = get_unmapped_area(file, addr, len, pgoff, flags);
112442+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
112443 if (addr & ~PAGE_MASK)
112444 return addr;
112445
112446@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112447 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
112448 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
112449
112450+#ifdef CONFIG_PAX_MPROTECT
112451+ if (mm->pax_flags & MF_PAX_MPROTECT) {
112452+
112453+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
112454+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
112455+ mm->binfmt->handle_mmap)
112456+ mm->binfmt->handle_mmap(file);
112457+#endif
112458+
112459+#ifndef CONFIG_PAX_MPROTECT_COMPAT
112460+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
112461+ gr_log_rwxmmap(file);
112462+
112463+#ifdef CONFIG_PAX_EMUPLT
112464+ vm_flags &= ~VM_EXEC;
112465+#else
112466+ return -EPERM;
112467+#endif
112468+
112469+ }
112470+
112471+ if (!(vm_flags & VM_EXEC))
112472+ vm_flags &= ~VM_MAYEXEC;
112473+#else
112474+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
112475+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
112476+#endif
112477+ else
112478+ vm_flags &= ~VM_MAYWRITE;
112479+ }
112480+#endif
112481+
112482+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112483+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
112484+ vm_flags &= ~VM_PAGEEXEC;
112485+#endif
112486+
112487 if (flags & MAP_LOCKED)
112488 if (!can_do_mlock())
112489 return -EPERM;
112490@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112491 vm_flags |= VM_NORESERVE;
112492 }
112493
112494+ if (!gr_acl_handle_mmap(file, prot))
112495+ return -EACCES;
112496+
112497 addr = mmap_region(file, addr, len, vm_flags, pgoff);
112498 if (!IS_ERR_VALUE(addr) &&
112499 ((vm_flags & VM_LOCKED) ||
112500@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
112501 vm_flags_t vm_flags = vma->vm_flags;
112502
112503 /* If it was private or non-writable, the write bit is already clear */
112504- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
112505+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
112506 return 0;
112507
112508 /* The backer wishes to know when pages are first written to? */
112509@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112510 struct rb_node **rb_link, *rb_parent;
112511 unsigned long charged = 0;
112512
112513+#ifdef CONFIG_PAX_SEGMEXEC
112514+ struct vm_area_struct *vma_m = NULL;
112515+#endif
112516+
112517+ /*
112518+ * mm->mmap_sem is required to protect against another thread
112519+ * changing the mappings in case we sleep.
112520+ */
112521+ verify_mm_writelocked(mm);
112522+
112523 /* Check against address space limit. */
112524+
112525+#ifdef CONFIG_PAX_RANDMMAP
112526+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112527+#endif
112528+
112529 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
112530 unsigned long nr_pages;
112531
112532@@ -1555,6 +1700,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112533 &rb_parent)) {
112534 if (do_munmap(mm, addr, len))
112535 return -ENOMEM;
112536+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
112537 }
112538
112539 /*
112540@@ -1586,6 +1732,16 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112541 goto unacct_error;
112542 }
112543
112544+#ifdef CONFIG_PAX_SEGMEXEC
112545+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
112546+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
112547+ if (!vma_m) {
112548+ error = -ENOMEM;
112549+ goto free_vma;
112550+ }
112551+ }
112552+#endif
112553+
112554 vma->vm_mm = mm;
112555 vma->vm_start = addr;
112556 vma->vm_end = addr + len;
112557@@ -1616,6 +1772,13 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112558 if (error)
112559 goto unmap_and_free_vma;
112560
112561+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112562+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
112563+ vma->vm_flags |= VM_PAGEEXEC;
112564+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
112565+ }
112566+#endif
112567+
112568 /* Can addr have changed??
112569 *
112570 * Answer: Yes, several device drivers can do it in their
112571@@ -1634,6 +1797,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112572 }
112573
112574 vma_link(mm, vma, prev, rb_link, rb_parent);
112575+
112576+#ifdef CONFIG_PAX_SEGMEXEC
112577+ if (vma_m)
112578+ BUG_ON(pax_mirror_vma(vma_m, vma));
112579+#endif
112580+
112581 /* Once vma denies write, undo our temporary denial count */
112582 if (file) {
112583 if (vm_flags & VM_SHARED)
112584@@ -1646,6 +1815,7 @@ out:
112585 perf_event_mmap(vma);
112586
112587 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
112588+ track_exec_limit(mm, addr, addr + len, vm_flags);
112589 if (vm_flags & VM_LOCKED) {
112590 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
112591 vma == get_gate_vma(current->mm)))
112592@@ -1683,6 +1853,12 @@ allow_write_and_free_vma:
112593 if (vm_flags & VM_DENYWRITE)
112594 allow_write_access(file);
112595 free_vma:
112596+
112597+#ifdef CONFIG_PAX_SEGMEXEC
112598+ if (vma_m)
112599+ kmem_cache_free(vm_area_cachep, vma_m);
112600+#endif
112601+
112602 kmem_cache_free(vm_area_cachep, vma);
112603 unacct_error:
112604 if (charged)
112605@@ -1690,7 +1866,63 @@ unacct_error:
112606 return error;
112607 }
112608
112609-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112610+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
112611+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
112612+{
112613+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
112614+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
112615+
112616+ return 0;
112617+}
112618+#endif
112619+
112620+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
112621+{
112622+ if (!vma) {
112623+#ifdef CONFIG_STACK_GROWSUP
112624+ if (addr > sysctl_heap_stack_gap)
112625+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
112626+ else
112627+ vma = find_vma(current->mm, 0);
112628+ if (vma && (vma->vm_flags & VM_GROWSUP))
112629+ return false;
112630+#endif
112631+ return true;
112632+ }
112633+
112634+ if (addr + len > vma->vm_start)
112635+ return false;
112636+
112637+ if (vma->vm_flags & VM_GROWSDOWN)
112638+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
112639+#ifdef CONFIG_STACK_GROWSUP
112640+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
112641+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
112642+#endif
112643+ else if (offset)
112644+ return offset <= vma->vm_start - addr - len;
112645+
112646+ return true;
112647+}
112648+
112649+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
112650+{
112651+ if (vma->vm_start < len)
112652+ return -ENOMEM;
112653+
112654+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
112655+ if (offset <= vma->vm_start - len)
112656+ return vma->vm_start - len - offset;
112657+ else
112658+ return -ENOMEM;
112659+ }
112660+
112661+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
112662+ return vma->vm_start - len - sysctl_heap_stack_gap;
112663+ return -ENOMEM;
112664+}
112665+
112666+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
112667 {
112668 /*
112669 * We implement the search by looking for an rbtree node that
112670@@ -1738,11 +1970,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112671 }
112672 }
112673
112674- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
112675+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
112676 check_current:
112677 /* Check if current node has a suitable gap */
112678 if (gap_start > high_limit)
112679 return -ENOMEM;
112680+
112681+ if (gap_end - gap_start > info->threadstack_offset)
112682+ gap_start += info->threadstack_offset;
112683+ else
112684+ gap_start = gap_end;
112685+
112686+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112687+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112688+ gap_start += sysctl_heap_stack_gap;
112689+ else
112690+ gap_start = gap_end;
112691+ }
112692+ if (vma->vm_flags & VM_GROWSDOWN) {
112693+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112694+ gap_end -= sysctl_heap_stack_gap;
112695+ else
112696+ gap_end = gap_start;
112697+ }
112698 if (gap_end >= low_limit && gap_end - gap_start >= length)
112699 goto found;
112700
112701@@ -1792,7 +2042,7 @@ found:
112702 return gap_start;
112703 }
112704
112705-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
112706+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
112707 {
112708 struct mm_struct *mm = current->mm;
112709 struct vm_area_struct *vma;
112710@@ -1846,6 +2096,24 @@ check_current:
112711 gap_end = vma->vm_start;
112712 if (gap_end < low_limit)
112713 return -ENOMEM;
112714+
112715+ if (gap_end - gap_start > info->threadstack_offset)
112716+ gap_end -= info->threadstack_offset;
112717+ else
112718+ gap_end = gap_start;
112719+
112720+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112721+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112722+ gap_start += sysctl_heap_stack_gap;
112723+ else
112724+ gap_start = gap_end;
112725+ }
112726+ if (vma->vm_flags & VM_GROWSDOWN) {
112727+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112728+ gap_end -= sysctl_heap_stack_gap;
112729+ else
112730+ gap_end = gap_start;
112731+ }
112732 if (gap_start <= high_limit && gap_end - gap_start >= length)
112733 goto found;
112734
112735@@ -1909,6 +2177,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112736 struct mm_struct *mm = current->mm;
112737 struct vm_area_struct *vma;
112738 struct vm_unmapped_area_info info;
112739+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112740
112741 if (len > TASK_SIZE - mmap_min_addr)
112742 return -ENOMEM;
112743@@ -1916,11 +2185,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112744 if (flags & MAP_FIXED)
112745 return addr;
112746
112747+#ifdef CONFIG_PAX_RANDMMAP
112748+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112749+#endif
112750+
112751 if (addr) {
112752 addr = PAGE_ALIGN(addr);
112753 vma = find_vma(mm, addr);
112754 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112755- (!vma || addr + len <= vma->vm_start))
112756+ check_heap_stack_gap(vma, addr, len, offset))
112757 return addr;
112758 }
112759
112760@@ -1929,6 +2202,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112761 info.low_limit = mm->mmap_base;
112762 info.high_limit = TASK_SIZE;
112763 info.align_mask = 0;
112764+ info.threadstack_offset = offset;
112765 return vm_unmapped_area(&info);
112766 }
112767 #endif
112768@@ -1947,6 +2221,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112769 struct mm_struct *mm = current->mm;
112770 unsigned long addr = addr0;
112771 struct vm_unmapped_area_info info;
112772+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112773
112774 /* requested length too big for entire address space */
112775 if (len > TASK_SIZE - mmap_min_addr)
112776@@ -1955,12 +2230,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112777 if (flags & MAP_FIXED)
112778 return addr;
112779
112780+#ifdef CONFIG_PAX_RANDMMAP
112781+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112782+#endif
112783+
112784 /* requesting a specific address */
112785 if (addr) {
112786 addr = PAGE_ALIGN(addr);
112787 vma = find_vma(mm, addr);
112788 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112789- (!vma || addr + len <= vma->vm_start))
112790+ check_heap_stack_gap(vma, addr, len, offset))
112791 return addr;
112792 }
112793
112794@@ -1969,6 +2248,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112795 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
112796 info.high_limit = mm->mmap_base;
112797 info.align_mask = 0;
112798+ info.threadstack_offset = offset;
112799 addr = vm_unmapped_area(&info);
112800
112801 /*
112802@@ -1981,6 +2261,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112803 VM_BUG_ON(addr != -ENOMEM);
112804 info.flags = 0;
112805 info.low_limit = TASK_UNMAPPED_BASE;
112806+
112807+#ifdef CONFIG_PAX_RANDMMAP
112808+ if (mm->pax_flags & MF_PAX_RANDMMAP)
112809+ info.low_limit += mm->delta_mmap;
112810+#endif
112811+
112812 info.high_limit = TASK_SIZE;
112813 addr = vm_unmapped_area(&info);
112814 }
112815@@ -2081,6 +2367,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
112816 return vma;
112817 }
112818
112819+#ifdef CONFIG_PAX_SEGMEXEC
112820+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
112821+{
112822+ struct vm_area_struct *vma_m;
112823+
112824+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
112825+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
112826+ BUG_ON(vma->vm_mirror);
112827+ return NULL;
112828+ }
112829+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
112830+ vma_m = vma->vm_mirror;
112831+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
112832+ BUG_ON(vma->vm_file != vma_m->vm_file);
112833+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
112834+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
112835+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
112836+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
112837+ return vma_m;
112838+}
112839+#endif
112840+
112841 /*
112842 * Verify that the stack growth is acceptable and
112843 * update accounting. This is shared with both the
112844@@ -2098,8 +2406,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112845
112846 /* Stack limit test */
112847 actual_size = size;
112848- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
112849- actual_size -= PAGE_SIZE;
112850+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
112851 if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
112852 return -ENOMEM;
112853
112854@@ -2110,6 +2417,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112855 locked = mm->locked_vm + grow;
112856 limit = READ_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
112857 limit >>= PAGE_SHIFT;
112858+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112859 if (locked > limit && !capable(CAP_IPC_LOCK))
112860 return -ENOMEM;
112861 }
112862@@ -2139,37 +2447,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112863 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
112864 * vma is the last one with address > vma->vm_end. Have to extend vma.
112865 */
112866+#ifndef CONFIG_IA64
112867+static
112868+#endif
112869 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112870 {
112871 int error;
112872+ bool locknext;
112873
112874 if (!(vma->vm_flags & VM_GROWSUP))
112875 return -EFAULT;
112876
112877+ /* Also guard against wrapping around to address 0. */
112878+ if (address < PAGE_ALIGN(address+1))
112879+ address = PAGE_ALIGN(address+1);
112880+ else
112881+ return -ENOMEM;
112882+
112883 /*
112884 * We must make sure the anon_vma is allocated
112885 * so that the anon_vma locking is not a noop.
112886 */
112887 if (unlikely(anon_vma_prepare(vma)))
112888 return -ENOMEM;
112889+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
112890+ if (locknext && anon_vma_prepare(vma->vm_next))
112891+ return -ENOMEM;
112892 vma_lock_anon_vma(vma);
112893+ if (locknext)
112894+ vma_lock_anon_vma(vma->vm_next);
112895
112896 /*
112897 * vma->vm_start/vm_end cannot change under us because the caller
112898 * is required to hold the mmap_sem in read mode. We need the
112899- * anon_vma lock to serialize against concurrent expand_stacks.
112900- * Also guard against wrapping around to address 0.
112901+ * anon_vma locks to serialize against concurrent expand_stacks
112902+ * and expand_upwards.
112903 */
112904- if (address < PAGE_ALIGN(address+4))
112905- address = PAGE_ALIGN(address+4);
112906- else {
112907- vma_unlock_anon_vma(vma);
112908- return -ENOMEM;
112909- }
112910 error = 0;
112911
112912 /* Somebody else might have raced and expanded it already */
112913- if (address > vma->vm_end) {
112914+ 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)
112915+ error = -ENOMEM;
112916+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
112917 unsigned long size, grow;
112918
112919 size = address - vma->vm_start;
112920@@ -2204,6 +2523,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112921 }
112922 }
112923 }
112924+ if (locknext)
112925+ vma_unlock_anon_vma(vma->vm_next);
112926 vma_unlock_anon_vma(vma);
112927 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112928 validate_mm(vma->vm_mm);
112929@@ -2218,6 +2539,8 @@ int expand_downwards(struct vm_area_struct *vma,
112930 unsigned long address)
112931 {
112932 int error;
112933+ bool lockprev = false;
112934+ struct vm_area_struct *prev;
112935
112936 /*
112937 * We must make sure the anon_vma is allocated
112938@@ -2231,6 +2554,15 @@ int expand_downwards(struct vm_area_struct *vma,
112939 if (error)
112940 return error;
112941
112942+ prev = vma->vm_prev;
112943+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
112944+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
112945+#endif
112946+ if (lockprev && anon_vma_prepare(prev))
112947+ return -ENOMEM;
112948+ if (lockprev)
112949+ vma_lock_anon_vma(prev);
112950+
112951 vma_lock_anon_vma(vma);
112952
112953 /*
112954@@ -2240,9 +2572,17 @@ int expand_downwards(struct vm_area_struct *vma,
112955 */
112956
112957 /* Somebody else might have raced and expanded it already */
112958- if (address < vma->vm_start) {
112959+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
112960+ error = -ENOMEM;
112961+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
112962 unsigned long size, grow;
112963
112964+#ifdef CONFIG_PAX_SEGMEXEC
112965+ struct vm_area_struct *vma_m;
112966+
112967+ vma_m = pax_find_mirror_vma(vma);
112968+#endif
112969+
112970 size = vma->vm_end - address;
112971 grow = (vma->vm_start - address) >> PAGE_SHIFT;
112972
112973@@ -2267,13 +2607,27 @@ int expand_downwards(struct vm_area_struct *vma,
112974 vma->vm_pgoff -= grow;
112975 anon_vma_interval_tree_post_update_vma(vma);
112976 vma_gap_update(vma);
112977+
112978+#ifdef CONFIG_PAX_SEGMEXEC
112979+ if (vma_m) {
112980+ anon_vma_interval_tree_pre_update_vma(vma_m);
112981+ vma_m->vm_start -= grow << PAGE_SHIFT;
112982+ vma_m->vm_pgoff -= grow;
112983+ anon_vma_interval_tree_post_update_vma(vma_m);
112984+ vma_gap_update(vma_m);
112985+ }
112986+#endif
112987+
112988 spin_unlock(&vma->vm_mm->page_table_lock);
112989
112990+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
112991 perf_event_mmap(vma);
112992 }
112993 }
112994 }
112995 vma_unlock_anon_vma(vma);
112996+ if (lockprev)
112997+ vma_unlock_anon_vma(prev);
112998 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112999 validate_mm(vma->vm_mm);
113000 return error;
113001@@ -2373,6 +2727,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
113002 do {
113003 long nrpages = vma_pages(vma);
113004
113005+#ifdef CONFIG_PAX_SEGMEXEC
113006+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
113007+ vma = remove_vma(vma);
113008+ continue;
113009+ }
113010+#endif
113011+
113012 if (vma->vm_flags & VM_ACCOUNT)
113013 nr_accounted += nrpages;
113014 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
113015@@ -2417,6 +2778,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
113016 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
113017 vma->vm_prev = NULL;
113018 do {
113019+
113020+#ifdef CONFIG_PAX_SEGMEXEC
113021+ if (vma->vm_mirror) {
113022+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
113023+ vma->vm_mirror->vm_mirror = NULL;
113024+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
113025+ vma->vm_mirror = NULL;
113026+ }
113027+#endif
113028+
113029 vma_rb_erase(vma, &mm->mm_rb);
113030 mm->map_count--;
113031 tail_vma = vma;
113032@@ -2444,14 +2815,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113033 struct vm_area_struct *new;
113034 int err = -ENOMEM;
113035
113036+#ifdef CONFIG_PAX_SEGMEXEC
113037+ struct vm_area_struct *vma_m, *new_m = NULL;
113038+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
113039+#endif
113040+
113041 if (is_vm_hugetlb_page(vma) && (addr &
113042 ~(huge_page_mask(hstate_vma(vma)))))
113043 return -EINVAL;
113044
113045+#ifdef CONFIG_PAX_SEGMEXEC
113046+ vma_m = pax_find_mirror_vma(vma);
113047+#endif
113048+
113049 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113050 if (!new)
113051 goto out_err;
113052
113053+#ifdef CONFIG_PAX_SEGMEXEC
113054+ if (vma_m) {
113055+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113056+ if (!new_m) {
113057+ kmem_cache_free(vm_area_cachep, new);
113058+ goto out_err;
113059+ }
113060+ }
113061+#endif
113062+
113063 /* most fields are the same, copy all, and then fixup */
113064 *new = *vma;
113065
113066@@ -2464,6 +2854,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113067 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
113068 }
113069
113070+#ifdef CONFIG_PAX_SEGMEXEC
113071+ if (vma_m) {
113072+ *new_m = *vma_m;
113073+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
113074+ new_m->vm_mirror = new;
113075+ new->vm_mirror = new_m;
113076+
113077+ if (new_below)
113078+ new_m->vm_end = addr_m;
113079+ else {
113080+ new_m->vm_start = addr_m;
113081+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
113082+ }
113083+ }
113084+#endif
113085+
113086 err = vma_dup_policy(vma, new);
113087 if (err)
113088 goto out_free_vma;
113089@@ -2484,6 +2890,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113090 else
113091 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
113092
113093+#ifdef CONFIG_PAX_SEGMEXEC
113094+ if (!err && vma_m) {
113095+ struct mempolicy *pol = vma_policy(new);
113096+
113097+ if (anon_vma_clone(new_m, vma_m))
113098+ goto out_free_mpol;
113099+
113100+ mpol_get(pol);
113101+ set_vma_policy(new_m, pol);
113102+
113103+ if (new_m->vm_file)
113104+ get_file(new_m->vm_file);
113105+
113106+ if (new_m->vm_ops && new_m->vm_ops->open)
113107+ new_m->vm_ops->open(new_m);
113108+
113109+ if (new_below)
113110+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
113111+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
113112+ else
113113+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
113114+
113115+ if (err) {
113116+ if (new_m->vm_ops && new_m->vm_ops->close)
113117+ new_m->vm_ops->close(new_m);
113118+ if (new_m->vm_file)
113119+ fput(new_m->vm_file);
113120+ mpol_put(pol);
113121+ }
113122+ }
113123+#endif
113124+
113125 /* Success. */
113126 if (!err)
113127 return 0;
113128@@ -2493,10 +2931,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113129 new->vm_ops->close(new);
113130 if (new->vm_file)
113131 fput(new->vm_file);
113132- unlink_anon_vmas(new);
113133 out_free_mpol:
113134 mpol_put(vma_policy(new));
113135 out_free_vma:
113136+
113137+#ifdef CONFIG_PAX_SEGMEXEC
113138+ if (new_m) {
113139+ unlink_anon_vmas(new_m);
113140+ kmem_cache_free(vm_area_cachep, new_m);
113141+ }
113142+#endif
113143+
113144+ unlink_anon_vmas(new);
113145 kmem_cache_free(vm_area_cachep, new);
113146 out_err:
113147 return err;
113148@@ -2509,6 +2955,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113149 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113150 unsigned long addr, int new_below)
113151 {
113152+
113153+#ifdef CONFIG_PAX_SEGMEXEC
113154+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
113155+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
113156+ if (mm->map_count >= sysctl_max_map_count-1)
113157+ return -ENOMEM;
113158+ } else
113159+#endif
113160+
113161 if (mm->map_count >= sysctl_max_map_count)
113162 return -ENOMEM;
113163
113164@@ -2520,11 +2975,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113165 * work. This now handles partial unmappings.
113166 * Jeremy Fitzhardinge <jeremy@goop.org>
113167 */
113168+#ifdef CONFIG_PAX_SEGMEXEC
113169 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113170 {
113171+ int ret = __do_munmap(mm, start, len);
113172+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
113173+ return ret;
113174+
113175+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
113176+}
113177+
113178+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113179+#else
113180+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113181+#endif
113182+{
113183 unsigned long end;
113184 struct vm_area_struct *vma, *prev, *last;
113185
113186+ /*
113187+ * mm->mmap_sem is required to protect against another thread
113188+ * changing the mappings in case we sleep.
113189+ */
113190+ verify_mm_writelocked(mm);
113191+
113192 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
113193 return -EINVAL;
113194
113195@@ -2602,6 +3076,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113196 /* Fix up all other VM information */
113197 remove_vma_list(mm, vma);
113198
113199+ track_exec_limit(mm, start, end, 0UL);
113200+
113201 return 0;
113202 }
113203
113204@@ -2610,6 +3086,13 @@ int vm_munmap(unsigned long start, size_t len)
113205 int ret;
113206 struct mm_struct *mm = current->mm;
113207
113208+
113209+#ifdef CONFIG_PAX_SEGMEXEC
113210+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
113211+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
113212+ return -EINVAL;
113213+#endif
113214+
113215 down_write(&mm->mmap_sem);
113216 ret = do_munmap(mm, start, len);
113217 up_write(&mm->mmap_sem);
113218@@ -2656,6 +3139,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
113219 down_write(&mm->mmap_sem);
113220 vma = find_vma(mm, start);
113221
113222+#ifdef CONFIG_PAX_SEGMEXEC
113223+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
113224+ goto out;
113225+#endif
113226+
113227 if (!vma || !(vma->vm_flags & VM_SHARED))
113228 goto out;
113229
113230@@ -2692,16 +3180,6 @@ out:
113231 return ret;
113232 }
113233
113234-static inline void verify_mm_writelocked(struct mm_struct *mm)
113235-{
113236-#ifdef CONFIG_DEBUG_VM
113237- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
113238- WARN_ON(1);
113239- up_read(&mm->mmap_sem);
113240- }
113241-#endif
113242-}
113243-
113244 /*
113245 * this is really a simplified "do_mmap". it only handles
113246 * anonymous maps. eventually we may be able to do some
113247@@ -2715,6 +3193,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113248 struct rb_node **rb_link, *rb_parent;
113249 pgoff_t pgoff = addr >> PAGE_SHIFT;
113250 int error;
113251+ unsigned long charged;
113252
113253 len = PAGE_ALIGN(len);
113254 if (!len)
113255@@ -2722,10 +3201,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113256
113257 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
113258
113259+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
113260+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
113261+ flags &= ~VM_EXEC;
113262+
113263+#ifdef CONFIG_PAX_MPROTECT
113264+ if (mm->pax_flags & MF_PAX_MPROTECT)
113265+ flags &= ~VM_MAYEXEC;
113266+#endif
113267+
113268+ }
113269+#endif
113270+
113271 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
113272 if (error & ~PAGE_MASK)
113273 return error;
113274
113275+ charged = len >> PAGE_SHIFT;
113276+
113277 error = mlock_future_check(mm, mm->def_flags, len);
113278 if (error)
113279 return error;
113280@@ -2743,16 +3236,17 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113281 &rb_parent)) {
113282 if (do_munmap(mm, addr, len))
113283 return -ENOMEM;
113284+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
113285 }
113286
113287 /* Check against address space limits *after* clearing old maps... */
113288- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
113289+ if (!may_expand_vm(mm, charged))
113290 return -ENOMEM;
113291
113292 if (mm->map_count > sysctl_max_map_count)
113293 return -ENOMEM;
113294
113295- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
113296+ if (security_vm_enough_memory_mm(mm, charged))
113297 return -ENOMEM;
113298
113299 /* Can we just expand an old private anonymous mapping? */
113300@@ -2766,7 +3260,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113301 */
113302 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113303 if (!vma) {
113304- vm_unacct_memory(len >> PAGE_SHIFT);
113305+ vm_unacct_memory(charged);
113306 return -ENOMEM;
113307 }
113308
113309@@ -2780,10 +3274,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113310 vma_link(mm, vma, prev, rb_link, rb_parent);
113311 out:
113312 perf_event_mmap(vma);
113313- mm->total_vm += len >> PAGE_SHIFT;
113314+ mm->total_vm += charged;
113315 if (flags & VM_LOCKED)
113316- mm->locked_vm += (len >> PAGE_SHIFT);
113317+ mm->locked_vm += charged;
113318 vma->vm_flags |= VM_SOFTDIRTY;
113319+ track_exec_limit(mm, addr, addr + len, flags);
113320 return addr;
113321 }
113322
113323@@ -2845,6 +3340,7 @@ void exit_mmap(struct mm_struct *mm)
113324 while (vma) {
113325 if (vma->vm_flags & VM_ACCOUNT)
113326 nr_accounted += vma_pages(vma);
113327+ vma->vm_mirror = NULL;
113328 vma = remove_vma(vma);
113329 }
113330 vm_unacct_memory(nr_accounted);
113331@@ -2859,6 +3355,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113332 struct vm_area_struct *prev;
113333 struct rb_node **rb_link, *rb_parent;
113334
113335+#ifdef CONFIG_PAX_SEGMEXEC
113336+ struct vm_area_struct *vma_m = NULL;
113337+#endif
113338+
113339+ if (security_mmap_addr(vma->vm_start))
113340+ return -EPERM;
113341+
113342 /*
113343 * The vm_pgoff of a purely anonymous vma should be irrelevant
113344 * until its first write fault, when page's anon_vma and index
113345@@ -2882,7 +3385,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113346 security_vm_enough_memory_mm(mm, vma_pages(vma)))
113347 return -ENOMEM;
113348
113349+#ifdef CONFIG_PAX_SEGMEXEC
113350+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
113351+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113352+ if (!vma_m)
113353+ return -ENOMEM;
113354+ }
113355+#endif
113356+
113357 vma_link(mm, vma, prev, rb_link, rb_parent);
113358+
113359+#ifdef CONFIG_PAX_SEGMEXEC
113360+ if (vma_m)
113361+ BUG_ON(pax_mirror_vma(vma_m, vma));
113362+#endif
113363+
113364 return 0;
113365 }
113366
113367@@ -2901,6 +3418,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113368 struct rb_node **rb_link, *rb_parent;
113369 bool faulted_in_anon_vma = true;
113370
113371+ BUG_ON(vma->vm_mirror);
113372+
113373 /*
113374 * If anonymous vma has not yet been faulted, update new pgoff
113375 * to match new location, to increase its chance of merging.
113376@@ -2965,6 +3484,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113377 return NULL;
113378 }
113379
113380+#ifdef CONFIG_PAX_SEGMEXEC
113381+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
113382+{
113383+ struct vm_area_struct *prev_m;
113384+ struct rb_node **rb_link_m, *rb_parent_m;
113385+ struct mempolicy *pol_m;
113386+
113387+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
113388+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
113389+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
113390+ *vma_m = *vma;
113391+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
113392+ if (anon_vma_clone(vma_m, vma))
113393+ return -ENOMEM;
113394+ pol_m = vma_policy(vma_m);
113395+ mpol_get(pol_m);
113396+ set_vma_policy(vma_m, pol_m);
113397+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
113398+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
113399+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
113400+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
113401+ if (vma_m->vm_file)
113402+ get_file(vma_m->vm_file);
113403+ if (vma_m->vm_ops && vma_m->vm_ops->open)
113404+ vma_m->vm_ops->open(vma_m);
113405+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
113406+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
113407+ vma_m->vm_mirror = vma;
113408+ vma->vm_mirror = vma_m;
113409+ return 0;
113410+}
113411+#endif
113412+
113413 /*
113414 * Return true if the calling process may expand its vm space by the passed
113415 * number of pages
113416@@ -2976,6 +3528,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
113417
113418 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
113419
113420+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
113421 if (cur + npages > lim)
113422 return 0;
113423 return 1;
113424@@ -3058,6 +3611,22 @@ static struct vm_area_struct *__install_special_mapping(
113425 vma->vm_start = addr;
113426 vma->vm_end = addr + len;
113427
113428+#ifdef CONFIG_PAX_MPROTECT
113429+ if (mm->pax_flags & MF_PAX_MPROTECT) {
113430+#ifndef CONFIG_PAX_MPROTECT_COMPAT
113431+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
113432+ return ERR_PTR(-EPERM);
113433+ if (!(vm_flags & VM_EXEC))
113434+ vm_flags &= ~VM_MAYEXEC;
113435+#else
113436+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
113437+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
113438+#endif
113439+ else
113440+ vm_flags &= ~VM_MAYWRITE;
113441+ }
113442+#endif
113443+
113444 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
113445 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
113446
113447diff --git a/mm/mprotect.c b/mm/mprotect.c
113448index 8858483..72f2464 100644
113449--- a/mm/mprotect.c
113450+++ b/mm/mprotect.c
113451@@ -24,10 +24,18 @@
113452 #include <linux/migrate.h>
113453 #include <linux/perf_event.h>
113454 #include <linux/ksm.h>
113455+#include <linux/sched/sysctl.h>
113456+
113457+#ifdef CONFIG_PAX_MPROTECT
113458+#include <linux/elf.h>
113459+#include <linux/binfmts.h>
113460+#endif
113461+
113462 #include <asm/uaccess.h>
113463 #include <asm/pgtable.h>
113464 #include <asm/cacheflush.h>
113465 #include <asm/tlbflush.h>
113466+#include <asm/mmu_context.h>
113467
113468 /*
113469 * For a prot_numa update we only hold mmap_sem for read so there is a
113470@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
113471 return pages;
113472 }
113473
113474+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113475+/* called while holding the mmap semaphor for writing except stack expansion */
113476+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
113477+{
113478+ unsigned long oldlimit, newlimit = 0UL;
113479+
113480+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
113481+ return;
113482+
113483+ spin_lock(&mm->page_table_lock);
113484+ oldlimit = mm->context.user_cs_limit;
113485+ if ((prot & VM_EXEC) && oldlimit < end)
113486+ /* USER_CS limit moved up */
113487+ newlimit = end;
113488+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
113489+ /* USER_CS limit moved down */
113490+ newlimit = start;
113491+
113492+ if (newlimit) {
113493+ mm->context.user_cs_limit = newlimit;
113494+
113495+#ifdef CONFIG_SMP
113496+ wmb();
113497+ cpumask_clear(&mm->context.cpu_user_cs_mask);
113498+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
113499+#endif
113500+
113501+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
113502+ }
113503+ spin_unlock(&mm->page_table_lock);
113504+ if (newlimit == end) {
113505+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
113506+
113507+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
113508+ if (is_vm_hugetlb_page(vma))
113509+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
113510+ else
113511+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
113512+ }
113513+}
113514+#endif
113515+
113516 int
113517 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113518 unsigned long start, unsigned long end, unsigned long newflags)
113519@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113520 int error;
113521 int dirty_accountable = 0;
113522
113523+#ifdef CONFIG_PAX_SEGMEXEC
113524+ struct vm_area_struct *vma_m = NULL;
113525+ unsigned long start_m, end_m;
113526+
113527+ start_m = start + SEGMEXEC_TASK_SIZE;
113528+ end_m = end + SEGMEXEC_TASK_SIZE;
113529+#endif
113530+
113531 if (newflags == oldflags) {
113532 *pprev = vma;
113533 return 0;
113534 }
113535
113536+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
113537+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
113538+
113539+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
113540+ return -ENOMEM;
113541+
113542+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
113543+ return -ENOMEM;
113544+ }
113545+
113546 /*
113547 * If we make a private mapping writable we increase our commit;
113548 * but (without finer accounting) cannot reduce our commit if we
113549@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113550 }
113551 }
113552
113553+#ifdef CONFIG_PAX_SEGMEXEC
113554+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
113555+ if (start != vma->vm_start) {
113556+ error = split_vma(mm, vma, start, 1);
113557+ if (error)
113558+ goto fail;
113559+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
113560+ *pprev = (*pprev)->vm_next;
113561+ }
113562+
113563+ if (end != vma->vm_end) {
113564+ error = split_vma(mm, vma, end, 0);
113565+ if (error)
113566+ goto fail;
113567+ }
113568+
113569+ if (pax_find_mirror_vma(vma)) {
113570+ error = __do_munmap(mm, start_m, end_m - start_m);
113571+ if (error)
113572+ goto fail;
113573+ } else {
113574+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113575+ if (!vma_m) {
113576+ error = -ENOMEM;
113577+ goto fail;
113578+ }
113579+ vma->vm_flags = newflags;
113580+ error = pax_mirror_vma(vma_m, vma);
113581+ if (error) {
113582+ vma->vm_flags = oldflags;
113583+ goto fail;
113584+ }
113585+ }
113586+ }
113587+#endif
113588+
113589 /*
113590 * First try to merge with previous and/or next vma.
113591 */
113592@@ -315,7 +419,19 @@ success:
113593 * vm_flags and vm_page_prot are protected by the mmap_sem
113594 * held in write mode.
113595 */
113596+
113597+#ifdef CONFIG_PAX_SEGMEXEC
113598+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
113599+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
113600+#endif
113601+
113602 vma->vm_flags = newflags;
113603+
113604+#ifdef CONFIG_PAX_MPROTECT
113605+ if (mm->binfmt && mm->binfmt->handle_mprotect)
113606+ mm->binfmt->handle_mprotect(vma, newflags);
113607+#endif
113608+
113609 dirty_accountable = vma_wants_writenotify(vma);
113610 vma_set_page_prot(vma);
113611
113612@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113613 end = start + len;
113614 if (end <= start)
113615 return -ENOMEM;
113616+
113617+#ifdef CONFIG_PAX_SEGMEXEC
113618+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
113619+ if (end > SEGMEXEC_TASK_SIZE)
113620+ return -EINVAL;
113621+ } else
113622+#endif
113623+
113624+ if (end > TASK_SIZE)
113625+ return -EINVAL;
113626+
113627 if (!arch_validate_prot(prot))
113628 return -EINVAL;
113629
113630@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113631 /*
113632 * Does the application expect PROT_READ to imply PROT_EXEC:
113633 */
113634- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
113635+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
113636 prot |= PROT_EXEC;
113637
113638 vm_flags = calc_vm_prot_bits(prot);
113639@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113640 if (start > vma->vm_start)
113641 prev = vma;
113642
113643+#ifdef CONFIG_PAX_MPROTECT
113644+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
113645+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
113646+#endif
113647+
113648 for (nstart = start ; ; ) {
113649 unsigned long newflags;
113650
113651@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113652
113653 /* newflags >> 4 shift VM_MAY% in place of VM_% */
113654 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
113655+ if (prot & (PROT_WRITE | PROT_EXEC))
113656+ gr_log_rwxmprotect(vma);
113657+
113658+ error = -EACCES;
113659+ goto out;
113660+ }
113661+
113662+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
113663 error = -EACCES;
113664 goto out;
113665 }
113666@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113667 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
113668 if (error)
113669 goto out;
113670+
113671+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
113672+
113673 nstart = tmp;
113674
113675 if (nstart < prev->vm_end)
113676diff --git a/mm/mremap.c b/mm/mremap.c
113677index 034e2d3..81deca5 100644
113678--- a/mm/mremap.c
113679+++ b/mm/mremap.c
113680@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
113681 continue;
113682 pte = ptep_get_and_clear(mm, old_addr, old_pte);
113683 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
113684+
113685+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113686+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
113687+ pte = pte_exprotect(pte);
113688+#endif
113689+
113690 pte = move_soft_dirty_pte(pte);
113691 set_pte_at(mm, new_addr, new_pte, pte);
113692 }
113693@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
113694 if (is_vm_hugetlb_page(vma))
113695 return ERR_PTR(-EINVAL);
113696
113697+#ifdef CONFIG_PAX_SEGMEXEC
113698+ if (pax_find_mirror_vma(vma))
113699+ return ERR_PTR(-EINVAL);
113700+#endif
113701+
113702 /* We can't remap across vm area boundaries */
113703 if (old_len > vma->vm_end - addr)
113704 return ERR_PTR(-EFAULT);
113705@@ -396,20 +407,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
113706 unsigned long ret = -EINVAL;
113707 unsigned long charged = 0;
113708 unsigned long map_flags;
113709+ unsigned long pax_task_size = TASK_SIZE;
113710
113711 if (new_addr & ~PAGE_MASK)
113712 goto out;
113713
113714- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
113715+#ifdef CONFIG_PAX_SEGMEXEC
113716+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113717+ pax_task_size = SEGMEXEC_TASK_SIZE;
113718+#endif
113719+
113720+ pax_task_size -= PAGE_SIZE;
113721+
113722+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
113723 goto out;
113724
113725 /* Check if the location we're moving into overlaps the
113726 * old location at all, and fail if it does.
113727 */
113728- if ((new_addr <= addr) && (new_addr+new_len) > addr)
113729- goto out;
113730-
113731- if ((addr <= new_addr) && (addr+old_len) > new_addr)
113732+ if (addr + old_len > new_addr && new_addr + new_len > addr)
113733 goto out;
113734
113735 ret = do_munmap(mm, new_addr, new_len);
113736@@ -478,6 +494,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113737 unsigned long ret = -EINVAL;
113738 unsigned long charged = 0;
113739 bool locked = false;
113740+ unsigned long pax_task_size = TASK_SIZE;
113741
113742 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
113743 return ret;
113744@@ -499,6 +516,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113745 if (!new_len)
113746 return ret;
113747
113748+#ifdef CONFIG_PAX_SEGMEXEC
113749+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113750+ pax_task_size = SEGMEXEC_TASK_SIZE;
113751+#endif
113752+
113753+ pax_task_size -= PAGE_SIZE;
113754+
113755+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
113756+ old_len > pax_task_size || addr > pax_task_size-old_len)
113757+ return ret;
113758+
113759 down_write(&current->mm->mmap_sem);
113760
113761 if (flags & MREMAP_FIXED) {
113762@@ -549,6 +577,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113763 new_addr = addr;
113764 }
113765 ret = addr;
113766+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
113767 goto out;
113768 }
113769 }
113770@@ -572,7 +601,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113771 goto out;
113772 }
113773
113774+ map_flags = vma->vm_flags;
113775 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
113776+ if (!(ret & ~PAGE_MASK)) {
113777+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
113778+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
113779+ }
113780 }
113781 out:
113782 if (ret & ~PAGE_MASK)
113783diff --git a/mm/nommu.c b/mm/nommu.c
113784index e544508..b56ce7a 100644
113785--- a/mm/nommu.c
113786+++ b/mm/nommu.c
113787@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
113788 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
113789 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
113790 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
113791-int heap_stack_gap = 0;
113792
113793 atomic_long_t mmap_pages_allocated;
113794
113795@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
113796 EXPORT_SYMBOL(find_vma);
113797
113798 /*
113799- * find a VMA
113800- * - we don't extend stack VMAs under NOMMU conditions
113801- */
113802-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
113803-{
113804- return find_vma(mm, addr);
113805-}
113806-
113807-/*
113808 * expand a stack to a given address
113809 * - not supported under NOMMU conditions
113810 */
113811@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113812
113813 /* most fields are the same, copy all, and then fixup */
113814 *new = *vma;
113815+ INIT_LIST_HEAD(&new->anon_vma_chain);
113816 *region = *vma->vm_region;
113817 new->vm_region = region;
113818
113819@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
113820 }
113821 EXPORT_SYMBOL(filemap_map_pages);
113822
113823-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113824- unsigned long addr, void *buf, int len, int write)
113825+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113826+ unsigned long addr, void *buf, size_t len, int write)
113827 {
113828 struct vm_area_struct *vma;
113829
113830@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113831 *
113832 * The caller must hold a reference on @mm.
113833 */
113834-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113835- void *buf, int len, int write)
113836+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
113837+ void *buf, size_t len, int write)
113838 {
113839 return __access_remote_vm(NULL, mm, addr, buf, len, write);
113840 }
113841@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113842 * Access another process' address space.
113843 * - source/target buffer must be kernel space
113844 */
113845-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
113846+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
113847 {
113848 struct mm_struct *mm;
113849
113850diff --git a/mm/page-writeback.c b/mm/page-writeback.c
113851index eb59f7e..b23a2a8 100644
113852--- a/mm/page-writeback.c
113853+++ b/mm/page-writeback.c
113854@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
113855 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
113856 * - the bdi dirty thresh drops quickly due to change of JBOD workload
113857 */
113858-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
113859+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
113860 unsigned long thresh,
113861 unsigned long bg_thresh,
113862 unsigned long dirty,
113863diff --git a/mm/page_alloc.c b/mm/page_alloc.c
113864index ebffa0e..c61160a 100644
113865--- a/mm/page_alloc.c
113866+++ b/mm/page_alloc.c
113867@@ -61,6 +61,7 @@
113868 #include <linux/hugetlb.h>
113869 #include <linux/sched/rt.h>
113870 #include <linux/page_owner.h>
113871+#include <linux/random.h>
113872
113873 #include <asm/sections.h>
113874 #include <asm/tlbflush.h>
113875@@ -357,7 +358,7 @@ out:
113876 * This usage means that zero-order pages may not be compound.
113877 */
113878
113879-static void free_compound_page(struct page *page)
113880+void free_compound_page(struct page *page)
113881 {
113882 __free_pages_ok(page, compound_order(page));
113883 }
113884@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
113885 __mod_zone_freepage_state(zone, (1 << order), migratetype);
113886 }
113887 #else
113888-struct page_ext_operations debug_guardpage_ops = { NULL, };
113889+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
113890 static inline void set_page_guard(struct zone *zone, struct page *page,
113891 unsigned int order, int migratetype) {}
113892 static inline void clear_page_guard(struct zone *zone, struct page *page,
113893@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113894 bool compound = PageCompound(page);
113895 int i, bad = 0;
113896
113897+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113898+ unsigned long index = 1UL << order;
113899+#endif
113900+
113901 VM_BUG_ON_PAGE(PageTail(page), page);
113902 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
113903
113904@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113905 debug_check_no_obj_freed(page_address(page),
113906 PAGE_SIZE << order);
113907 }
113908+
113909+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113910+ for (; index; --index)
113911+ sanitize_highpage(page + index - 1);
113912+#endif
113913+
113914 arch_free_page(page, order);
113915 kernel_map_pages(page, 1 << order, 0);
113916
113917@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
113918 local_irq_restore(flags);
113919 }
113920
113921+#ifdef CONFIG_PAX_LATENT_ENTROPY
113922+bool __meminitdata extra_latent_entropy;
113923+
113924+static int __init setup_pax_extra_latent_entropy(char *str)
113925+{
113926+ extra_latent_entropy = true;
113927+ return 0;
113928+}
113929+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
113930+
113931+volatile u64 latent_entropy __latent_entropy;
113932+EXPORT_SYMBOL(latent_entropy);
113933+#endif
113934+
113935 void __init __free_pages_bootmem(struct page *page, unsigned int order)
113936 {
113937 unsigned int nr_pages = 1 << order;
113938@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
113939 __ClearPageReserved(p);
113940 set_page_count(p, 0);
113941
113942+#ifdef CONFIG_PAX_LATENT_ENTROPY
113943+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
113944+ u64 hash = 0;
113945+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
113946+ const u64 *data = lowmem_page_address(page);
113947+
113948+ for (index = 0; index < end; index++)
113949+ hash ^= hash + data[index];
113950+ latent_entropy ^= hash;
113951+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
113952+ }
113953+#endif
113954+
113955 page_zone(page)->managed_pages += nr_pages;
113956 set_page_refcounted(page);
113957 __free_pages(page, order);
113958@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
113959 kernel_map_pages(page, 1 << order, 1);
113960 kasan_alloc_pages(page, order);
113961
113962+#ifndef CONFIG_PAX_MEMORY_SANITIZE
113963 if (gfp_flags & __GFP_ZERO)
113964 prep_zero_page(page, order, gfp_flags);
113965+#endif
113966
113967 if (order && (gfp_flags & __GFP_COMP))
113968 prep_compound_page(page, order);
113969@@ -1649,6 +1689,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
113970 zone->free_area[order].nr_free--;
113971 rmv_page_order(page);
113972
113973+ set_page_owner(page, order, 0);
113974+
113975 /* Set the pageblock if the isolated page is at least a pageblock */
113976 if (order >= pageblock_order - 1) {
113977 struct page *endpage = page + (1 << order) - 1;
113978@@ -1660,7 +1702,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
113979 }
113980 }
113981
113982- set_page_owner(page, order, 0);
113983+
113984 return 1UL << order;
113985 }
113986
113987@@ -1749,7 +1791,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
113988 }
113989
113990 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
113991- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113992+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
113993 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
113994 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
113995
113996@@ -2068,7 +2110,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
113997 do {
113998 mod_zone_page_state(zone, NR_ALLOC_BATCH,
113999 high_wmark_pages(zone) - low_wmark_pages(zone) -
114000- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114001+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114002 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
114003 } while (zone++ != preferred_zone);
114004 }
114005@@ -5781,7 +5823,7 @@ static void __setup_per_zone_wmarks(void)
114006
114007 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
114008 high_wmark_pages(zone) - low_wmark_pages(zone) -
114009- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114010+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114011
114012 setup_zone_migrate_reserve(zone);
114013 spin_unlock_irqrestore(&zone->lock, flags);
114014diff --git a/mm/percpu.c b/mm/percpu.c
114015index 2dd7448..9bb6305 100644
114016--- a/mm/percpu.c
114017+++ b/mm/percpu.c
114018@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
114019 static unsigned int pcpu_high_unit_cpu __read_mostly;
114020
114021 /* the address of the first chunk which starts with the kernel static area */
114022-void *pcpu_base_addr __read_mostly;
114023+void *pcpu_base_addr __read_only;
114024 EXPORT_SYMBOL_GPL(pcpu_base_addr);
114025
114026 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
114027diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
114028index e88d071..d80e01a 100644
114029--- a/mm/process_vm_access.c
114030+++ b/mm/process_vm_access.c
114031@@ -13,6 +13,7 @@
114032 #include <linux/uio.h>
114033 #include <linux/sched.h>
114034 #include <linux/highmem.h>
114035+#include <linux/security.h>
114036 #include <linux/ptrace.h>
114037 #include <linux/slab.h>
114038 #include <linux/syscalls.h>
114039@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114040 ssize_t iov_len;
114041 size_t total_len = iov_iter_count(iter);
114042
114043+ return -ENOSYS; // PaX: until properly audited
114044+
114045 /*
114046 * Work out how many pages of struct pages we're going to need
114047 * when eventually calling get_user_pages
114048 */
114049 for (i = 0; i < riovcnt; i++) {
114050 iov_len = rvec[i].iov_len;
114051- if (iov_len > 0) {
114052- nr_pages_iov = ((unsigned long)rvec[i].iov_base
114053- + iov_len)
114054- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
114055- / PAGE_SIZE + 1;
114056- nr_pages = max(nr_pages, nr_pages_iov);
114057- }
114058+ if (iov_len <= 0)
114059+ continue;
114060+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
114061+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
114062+ nr_pages = max(nr_pages, nr_pages_iov);
114063 }
114064
114065 if (nr_pages == 0)
114066@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114067 goto free_proc_pages;
114068 }
114069
114070+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
114071+ rc = -EPERM;
114072+ goto put_task_struct;
114073+ }
114074+
114075 mm = mm_access(task, PTRACE_MODE_ATTACH);
114076 if (!mm || IS_ERR(mm)) {
114077 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
114078diff --git a/mm/rmap.c b/mm/rmap.c
114079index 24dd3f9..4eb43f4 100644
114080--- a/mm/rmap.c
114081+++ b/mm/rmap.c
114082@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114083 struct anon_vma *anon_vma = vma->anon_vma;
114084 struct anon_vma_chain *avc;
114085
114086+#ifdef CONFIG_PAX_SEGMEXEC
114087+ struct anon_vma_chain *avc_m = NULL;
114088+#endif
114089+
114090 might_sleep();
114091 if (unlikely(!anon_vma)) {
114092 struct mm_struct *mm = vma->vm_mm;
114093@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114094 if (!avc)
114095 goto out_enomem;
114096
114097+#ifdef CONFIG_PAX_SEGMEXEC
114098+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
114099+ if (!avc_m)
114100+ goto out_enomem_free_avc;
114101+#endif
114102+
114103 anon_vma = find_mergeable_anon_vma(vma);
114104 allocated = NULL;
114105 if (!anon_vma) {
114106@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114107 /* page_table_lock to protect against threads */
114108 spin_lock(&mm->page_table_lock);
114109 if (likely(!vma->anon_vma)) {
114110+
114111+#ifdef CONFIG_PAX_SEGMEXEC
114112+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
114113+
114114+ if (vma_m) {
114115+ BUG_ON(vma_m->anon_vma);
114116+ vma_m->anon_vma = anon_vma;
114117+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
114118+ anon_vma->degree++;
114119+ avc_m = NULL;
114120+ }
114121+#endif
114122+
114123 vma->anon_vma = anon_vma;
114124 anon_vma_chain_link(vma, avc, anon_vma);
114125 /* vma reference or self-parent link for new root */
114126@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114127
114128 if (unlikely(allocated))
114129 put_anon_vma(allocated);
114130+
114131+#ifdef CONFIG_PAX_SEGMEXEC
114132+ if (unlikely(avc_m))
114133+ anon_vma_chain_free(avc_m);
114134+#endif
114135+
114136 if (unlikely(avc))
114137 anon_vma_chain_free(avc);
114138 }
114139 return 0;
114140
114141 out_enomem_free_avc:
114142+
114143+#ifdef CONFIG_PAX_SEGMEXEC
114144+ if (avc_m)
114145+ anon_vma_chain_free(avc_m);
114146+#endif
114147+
114148 anon_vma_chain_free(avc);
114149 out_enomem:
114150 return -ENOMEM;
114151@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
114152 * good chance of avoiding scanning the whole hierarchy when it searches where
114153 * page is mapped.
114154 */
114155-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114156+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
114157 {
114158 struct anon_vma_chain *avc, *pavc;
114159 struct anon_vma *root = NULL;
114160@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114161 * the corresponding VMA in the parent process is attached to.
114162 * Returns 0 on success, non-zero on failure.
114163 */
114164-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
114165+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
114166 {
114167 struct anon_vma_chain *avc;
114168 struct anon_vma *anon_vma;
114169@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
114170 void __init anon_vma_init(void)
114171 {
114172 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
114173- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
114174- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
114175+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
114176+ anon_vma_ctor);
114177+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
114178+ SLAB_PANIC|SLAB_NO_SANITIZE);
114179 }
114180
114181 /*
114182diff --git a/mm/shmem.c b/mm/shmem.c
114183index 47d536e..8321b4e 100644
114184--- a/mm/shmem.c
114185+++ b/mm/shmem.c
114186@@ -33,7 +33,7 @@
114187 #include <linux/swap.h>
114188 #include <linux/uio.h>
114189
114190-static struct vfsmount *shm_mnt;
114191+struct vfsmount *shm_mnt;
114192
114193 #ifdef CONFIG_SHMEM
114194 /*
114195@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
114196 #define BOGO_DIRENT_SIZE 20
114197
114198 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
114199-#define SHORT_SYMLINK_LEN 128
114200+#define SHORT_SYMLINK_LEN 64
114201
114202 /*
114203 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
114204@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
114205 static int shmem_xattr_validate(const char *name)
114206 {
114207 struct { const char *prefix; size_t len; } arr[] = {
114208+
114209+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114210+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
114211+#endif
114212+
114213 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
114214 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
114215 };
114216@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
114217 if (err)
114218 return err;
114219
114220+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114221+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
114222+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
114223+ return -EOPNOTSUPP;
114224+ if (size > 8)
114225+ return -EINVAL;
114226+ }
114227+#endif
114228+
114229 return simple_xattr_set(&info->xattrs, name, value, size, flags);
114230 }
114231
114232@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
114233 int err = -ENOMEM;
114234
114235 /* Round up to L1_CACHE_BYTES to resist false sharing */
114236- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
114237- L1_CACHE_BYTES), GFP_KERNEL);
114238+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
114239 if (!sbinfo)
114240 return -ENOMEM;
114241
114242diff --git a/mm/slab.c b/mm/slab.c
114243index 7eb38dd..a5172b1 100644
114244--- a/mm/slab.c
114245+++ b/mm/slab.c
114246@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114247 if ((x)->max_freeable < i) \
114248 (x)->max_freeable = i; \
114249 } while (0)
114250-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
114251-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
114252-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
114253-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
114254+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
114255+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
114256+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
114257+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
114258+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
114259+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
114260 #else
114261 #define STATS_INC_ACTIVE(x) do { } while (0)
114262 #define STATS_DEC_ACTIVE(x) do { } while (0)
114263@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114264 #define STATS_INC_ALLOCMISS(x) do { } while (0)
114265 #define STATS_INC_FREEHIT(x) do { } while (0)
114266 #define STATS_INC_FREEMISS(x) do { } while (0)
114267+#define STATS_INC_SANITIZED(x) do { } while (0)
114268+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
114269 #endif
114270
114271 #if DEBUG
114272@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
114273 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
114274 */
114275 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
114276- const struct page *page, void *obj)
114277+ const struct page *page, const void *obj)
114278 {
114279 u32 offset = (obj - page->s_mem);
114280 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
114281@@ -1452,7 +1456,7 @@ void __init kmem_cache_init(void)
114282 * structures first. Without this, further allocations will bug.
114283 */
114284 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
114285- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
114286+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
114287 slab_state = PARTIAL_NODE;
114288
114289 slab_early_init = 0;
114290@@ -2073,7 +2077,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
114291
114292 cachep = find_mergeable(size, align, flags, name, ctor);
114293 if (cachep) {
114294- cachep->refcount++;
114295+ atomic_inc(&cachep->refcount);
114296
114297 /*
114298 * Adjust the object sizes so that we clear
114299@@ -3371,6 +3375,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
114300 struct array_cache *ac = cpu_cache_get(cachep);
114301
114302 check_irq_off();
114303+
114304+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114305+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
114306+ STATS_INC_NOT_SANITIZED(cachep);
114307+ else {
114308+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
114309+
114310+ if (cachep->ctor)
114311+ cachep->ctor(objp);
114312+
114313+ STATS_INC_SANITIZED(cachep);
114314+ }
114315+#endif
114316+
114317 kmemleak_free_recursive(objp, cachep->flags);
114318 objp = cache_free_debugcheck(cachep, objp, caller);
114319
114320@@ -3483,7 +3501,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
114321 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
114322 }
114323
114324-void *__kmalloc_node(size_t size, gfp_t flags, int node)
114325+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
114326 {
114327 return __do_kmalloc_node(size, flags, node, _RET_IP_);
114328 }
114329@@ -3503,7 +3521,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
114330 * @flags: the type of memory to allocate (see kmalloc).
114331 * @caller: function caller for debug tracking of the caller
114332 */
114333-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
114334+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
114335 unsigned long caller)
114336 {
114337 struct kmem_cache *cachep;
114338@@ -3576,6 +3594,7 @@ void kfree(const void *objp)
114339
114340 if (unlikely(ZERO_OR_NULL_PTR(objp)))
114341 return;
114342+ VM_BUG_ON(!virt_addr_valid(objp));
114343 local_irq_save(flags);
114344 kfree_debugcheck(objp);
114345 c = virt_to_cache(objp);
114346@@ -3995,14 +4014,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
114347 }
114348 /* cpu stats */
114349 {
114350- unsigned long allochit = atomic_read(&cachep->allochit);
114351- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
114352- unsigned long freehit = atomic_read(&cachep->freehit);
114353- unsigned long freemiss = atomic_read(&cachep->freemiss);
114354+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
114355+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
114356+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
114357+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
114358
114359 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
114360 allochit, allocmiss, freehit, freemiss);
114361 }
114362+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114363+ {
114364+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
114365+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
114366+
114367+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
114368+ }
114369+#endif
114370 #endif
114371 }
114372
114373@@ -4210,13 +4237,69 @@ static const struct file_operations proc_slabstats_operations = {
114374 static int __init slab_proc_init(void)
114375 {
114376 #ifdef CONFIG_DEBUG_SLAB_LEAK
114377- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
114378+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
114379 #endif
114380 return 0;
114381 }
114382 module_init(slab_proc_init);
114383 #endif
114384
114385+bool is_usercopy_object(const void *ptr)
114386+{
114387+ struct page *page;
114388+ struct kmem_cache *cachep;
114389+
114390+ if (ZERO_OR_NULL_PTR(ptr))
114391+ return false;
114392+
114393+ if (!slab_is_available())
114394+ return false;
114395+
114396+ if (!virt_addr_valid(ptr))
114397+ return false;
114398+
114399+ page = virt_to_head_page(ptr);
114400+
114401+ if (!PageSlab(page))
114402+ return false;
114403+
114404+ cachep = page->slab_cache;
114405+ return cachep->flags & SLAB_USERCOPY;
114406+}
114407+
114408+#ifdef CONFIG_PAX_USERCOPY
114409+const char *check_heap_object(const void *ptr, unsigned long n)
114410+{
114411+ struct page *page;
114412+ struct kmem_cache *cachep;
114413+ unsigned int objnr;
114414+ unsigned long offset;
114415+
114416+ if (ZERO_OR_NULL_PTR(ptr))
114417+ return "<null>";
114418+
114419+ if (!virt_addr_valid(ptr))
114420+ return NULL;
114421+
114422+ page = virt_to_head_page(ptr);
114423+
114424+ if (!PageSlab(page))
114425+ return NULL;
114426+
114427+ cachep = page->slab_cache;
114428+ if (!(cachep->flags & SLAB_USERCOPY))
114429+ return cachep->name;
114430+
114431+ objnr = obj_to_index(cachep, page, ptr);
114432+ BUG_ON(objnr >= cachep->num);
114433+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
114434+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
114435+ return NULL;
114436+
114437+ return cachep->name;
114438+}
114439+#endif
114440+
114441 /**
114442 * ksize - get the actual amount of memory allocated for a given object
114443 * @objp: Pointer to the object
114444diff --git a/mm/slab.h b/mm/slab.h
114445index 4c3ac12..7b2e470 100644
114446--- a/mm/slab.h
114447+++ b/mm/slab.h
114448@@ -22,7 +22,7 @@ struct kmem_cache {
114449 unsigned int align; /* Alignment as calculated */
114450 unsigned long flags; /* Active flags on the slab */
114451 const char *name; /* Slab name for sysfs */
114452- int refcount; /* Use counter */
114453+ atomic_t refcount; /* Use counter */
114454 void (*ctor)(void *); /* Called on object slot creation */
114455 struct list_head list; /* List of all slab caches on the system */
114456 };
114457@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
114458 /* The slab cache that manages slab cache information */
114459 extern struct kmem_cache *kmem_cache;
114460
114461+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114462+#ifdef CONFIG_X86_64
114463+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
114464+#else
114465+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
114466+#endif
114467+enum pax_sanitize_mode {
114468+ PAX_SANITIZE_SLAB_OFF = 0,
114469+ PAX_SANITIZE_SLAB_FAST,
114470+ PAX_SANITIZE_SLAB_FULL,
114471+};
114472+extern enum pax_sanitize_mode pax_sanitize_slab;
114473+#endif
114474+
114475 unsigned long calculate_alignment(unsigned long flags,
114476 unsigned long align, unsigned long size);
114477
114478@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
114479
114480 /* Legal flag mask for kmem_cache_create(), for various configurations */
114481 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
114482- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
114483+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
114484+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
114485
114486 #if defined(CONFIG_DEBUG_SLAB)
114487 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
114488@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
114489 return s;
114490
114491 page = virt_to_head_page(x);
114492+
114493+ BUG_ON(!PageSlab(page));
114494+
114495 cachep = page->slab_cache;
114496 if (slab_equal_or_root(cachep, s))
114497 return cachep;
114498diff --git a/mm/slab_common.c b/mm/slab_common.c
114499index 999bb34..9843aea 100644
114500--- a/mm/slab_common.c
114501+++ b/mm/slab_common.c
114502@@ -25,11 +25,35 @@
114503
114504 #include "slab.h"
114505
114506-enum slab_state slab_state;
114507+enum slab_state slab_state __read_only;
114508 LIST_HEAD(slab_caches);
114509 DEFINE_MUTEX(slab_mutex);
114510 struct kmem_cache *kmem_cache;
114511
114512+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114513+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
114514+static int __init pax_sanitize_slab_setup(char *str)
114515+{
114516+ if (!str)
114517+ return 0;
114518+
114519+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
114520+ pr_info("PaX slab sanitization: %s\n", "disabled");
114521+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
114522+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
114523+ pr_info("PaX slab sanitization: %s\n", "fast");
114524+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
114525+ } else if (!strcmp(str, "full")) {
114526+ pr_info("PaX slab sanitization: %s\n", "full");
114527+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
114528+ } else
114529+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
114530+
114531+ return 0;
114532+}
114533+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
114534+#endif
114535+
114536 /*
114537 * Set of flags that will prevent slab merging
114538 */
114539@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
114540 * Merge control. If this is set then no merging of slab caches will occur.
114541 * (Could be removed. This was introduced to pacify the merge skeptics.)
114542 */
114543-static int slab_nomerge;
114544+static int slab_nomerge = 1;
114545
114546 static int __init setup_slab_nomerge(char *str)
114547 {
114548@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
114549 /*
114550 * We may have set a slab to be unmergeable during bootstrap.
114551 */
114552- if (s->refcount < 0)
114553+ if (atomic_read(&s->refcount) < 0)
114554 return 1;
114555
114556 return 0;
114557@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
114558 if (err)
114559 goto out_free_cache;
114560
114561- s->refcount = 1;
114562+ atomic_set(&s->refcount, 1);
114563 list_add(&s->list, &slab_caches);
114564 out:
114565 if (err)
114566@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
114567 */
114568 flags &= CACHE_CREATE_MASK;
114569
114570+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114571+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
114572+ flags |= SLAB_NO_SANITIZE;
114573+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
114574+ flags &= ~SLAB_NO_SANITIZE;
114575+#endif
114576+
114577 s = __kmem_cache_alias(name, size, align, flags, ctor);
114578 if (s)
114579 goto out_unlock;
114580@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
114581 rcu_barrier();
114582
114583 list_for_each_entry_safe(s, s2, release, list) {
114584-#ifdef SLAB_SUPPORTS_SYSFS
114585+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
114586 sysfs_slab_remove(s);
114587 #else
114588 slab_kmem_cache_release(s);
114589@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
114590
114591 mutex_lock(&slab_mutex);
114592
114593- s->refcount--;
114594- if (s->refcount)
114595+ if (!atomic_dec_and_test(&s->refcount))
114596 goto out_unlock;
114597
114598 for_each_memcg_cache_safe(c, c2, s) {
114599@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
114600 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
114601 name, size, err);
114602
114603- s->refcount = -1; /* Exempt from merging for now */
114604+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
114605 }
114606
114607 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114608@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114609
114610 create_boot_cache(s, name, size, flags);
114611 list_add(&s->list, &slab_caches);
114612- s->refcount = 1;
114613+ atomic_set(&s->refcount, 1);
114614 return s;
114615 }
114616
114617@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
114618 EXPORT_SYMBOL(kmalloc_dma_caches);
114619 #endif
114620
114621+#ifdef CONFIG_PAX_USERCOPY_SLABS
114622+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
114623+EXPORT_SYMBOL(kmalloc_usercopy_caches);
114624+#endif
114625+
114626 /*
114627 * Conversion table for small slabs sizes / 8 to the index in the
114628 * kmalloc array. This is necessary for slabs < 192 since we have non power
114629@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
114630 return kmalloc_dma_caches[index];
114631
114632 #endif
114633+
114634+#ifdef CONFIG_PAX_USERCOPY_SLABS
114635+ if (unlikely((flags & GFP_USERCOPY)))
114636+ return kmalloc_usercopy_caches[index];
114637+
114638+#endif
114639+
114640 return kmalloc_caches[index];
114641 }
114642
114643@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
114644 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
114645 if (!kmalloc_caches[i]) {
114646 kmalloc_caches[i] = create_kmalloc_cache(NULL,
114647- 1 << i, flags);
114648+ 1 << i, SLAB_USERCOPY | flags);
114649 }
114650
114651 /*
114652@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
114653 * earlier power of two caches
114654 */
114655 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
114656- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
114657+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
114658
114659 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
114660- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
114661+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
114662 }
114663
114664 /* Kmalloc array is now usable */
114665@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
114666 }
114667 }
114668 #endif
114669+
114670+#ifdef CONFIG_PAX_USERCOPY_SLABS
114671+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
114672+ struct kmem_cache *s = kmalloc_caches[i];
114673+
114674+ if (s) {
114675+ int size = kmalloc_size(i);
114676+ char *n = kasprintf(GFP_NOWAIT,
114677+ "usercopy-kmalloc-%d", size);
114678+
114679+ BUG_ON(!n);
114680+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
114681+ size, SLAB_USERCOPY | flags);
114682+ }
114683+ }
114684+#endif
114685+
114686 }
114687 #endif /* !CONFIG_SLOB */
114688
114689@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
114690 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
114691 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
114692 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
114693+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114694+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
114695+#endif
114696 #endif
114697 seq_putc(m, '\n');
114698 }
114699@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
114700 module_init(slab_proc_init);
114701 #endif /* CONFIG_SLABINFO */
114702
114703-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
114704+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
114705 gfp_t flags)
114706 {
114707 void *ret;
114708diff --git a/mm/slob.c b/mm/slob.c
114709index 4765f65..fafa9d5 100644
114710--- a/mm/slob.c
114711+++ b/mm/slob.c
114712@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
114713 /*
114714 * Return the size of a slob block.
114715 */
114716-static slobidx_t slob_units(slob_t *s)
114717+static slobidx_t slob_units(const slob_t *s)
114718 {
114719 if (s->units > 0)
114720 return s->units;
114721@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
114722 /*
114723 * Return the next free slob block pointer after this one.
114724 */
114725-static slob_t *slob_next(slob_t *s)
114726+static slob_t *slob_next(const slob_t *s)
114727 {
114728 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
114729 slobidx_t next;
114730@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
114731 /*
114732 * Returns true if s is the last free block in its page.
114733 */
114734-static int slob_last(slob_t *s)
114735+static int slob_last(const slob_t *s)
114736 {
114737 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
114738 }
114739
114740-static void *slob_new_pages(gfp_t gfp, int order, int node)
114741+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
114742 {
114743- void *page;
114744+ struct page *page;
114745
114746 #ifdef CONFIG_NUMA
114747 if (node != NUMA_NO_NODE)
114748@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
114749 if (!page)
114750 return NULL;
114751
114752- return page_address(page);
114753+ __SetPageSlab(page);
114754+ return page;
114755 }
114756
114757-static void slob_free_pages(void *b, int order)
114758+static void slob_free_pages(struct page *sp, int order)
114759 {
114760 if (current->reclaim_state)
114761 current->reclaim_state->reclaimed_slab += 1 << order;
114762- free_pages((unsigned long)b, order);
114763+ __ClearPageSlab(sp);
114764+ page_mapcount_reset(sp);
114765+ sp->private = 0;
114766+ __free_pages(sp, order);
114767 }
114768
114769 /*
114770@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114771
114772 /* Not enough space: must allocate a new page */
114773 if (!b) {
114774- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114775- if (!b)
114776+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114777+ if (!sp)
114778 return NULL;
114779- sp = virt_to_page(b);
114780- __SetPageSlab(sp);
114781+ b = page_address(sp);
114782
114783 spin_lock_irqsave(&slob_lock, flags);
114784 sp->units = SLOB_UNITS(PAGE_SIZE);
114785 sp->freelist = b;
114786+ sp->private = 0;
114787 INIT_LIST_HEAD(&sp->lru);
114788 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
114789 set_slob_page_free(sp, slob_list);
114790@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114791 /*
114792 * slob_free: entry point into the slob allocator.
114793 */
114794-static void slob_free(void *block, int size)
114795+static void slob_free(struct kmem_cache *c, void *block, int size)
114796 {
114797 struct page *sp;
114798 slob_t *prev, *next, *b = (slob_t *)block;
114799@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
114800 if (slob_page_free(sp))
114801 clear_slob_page_free(sp);
114802 spin_unlock_irqrestore(&slob_lock, flags);
114803- __ClearPageSlab(sp);
114804- page_mapcount_reset(sp);
114805- slob_free_pages(b, 0);
114806+ slob_free_pages(sp, 0);
114807 return;
114808 }
114809
114810+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114811+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
114812+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
114813+#endif
114814+
114815 if (!slob_page_free(sp)) {
114816 /* This slob page is about to become partially free. Easy! */
114817 sp->units = units;
114818@@ -424,11 +431,10 @@ out:
114819 */
114820
114821 static __always_inline void *
114822-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114823+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
114824 {
114825- unsigned int *m;
114826- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114827- void *ret;
114828+ slob_t *m;
114829+ void *ret = NULL;
114830
114831 gfp &= gfp_allowed_mask;
114832
114833@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114834
114835 if (!m)
114836 return NULL;
114837- *m = size;
114838+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
114839+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
114840+ m[0].units = size;
114841+ m[1].units = align;
114842 ret = (void *)m + align;
114843
114844 trace_kmalloc_node(caller, ret,
114845 size, size + align, gfp, node);
114846 } else {
114847 unsigned int order = get_order(size);
114848+ struct page *page;
114849
114850 if (likely(order))
114851 gfp |= __GFP_COMP;
114852- ret = slob_new_pages(gfp, order, node);
114853+ page = slob_new_pages(gfp, order, node);
114854+ if (page) {
114855+ ret = page_address(page);
114856+ page->private = size;
114857+ }
114858
114859 trace_kmalloc_node(caller, ret,
114860 size, PAGE_SIZE << order, gfp, node);
114861 }
114862
114863- kmemleak_alloc(ret, size, 1, gfp);
114864 return ret;
114865 }
114866
114867-void *__kmalloc(size_t size, gfp_t gfp)
114868+static __always_inline void *
114869+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114870+{
114871+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114872+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
114873+
114874+ if (!ZERO_OR_NULL_PTR(ret))
114875+ kmemleak_alloc(ret, size, 1, gfp);
114876+ return ret;
114877+}
114878+
114879+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
114880 {
114881 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
114882 }
114883@@ -491,34 +515,112 @@ void kfree(const void *block)
114884 return;
114885 kmemleak_free(block);
114886
114887+ VM_BUG_ON(!virt_addr_valid(block));
114888 sp = virt_to_page(block);
114889- if (PageSlab(sp)) {
114890+ VM_BUG_ON(!PageSlab(sp));
114891+ if (!sp->private) {
114892 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114893- unsigned int *m = (unsigned int *)(block - align);
114894- slob_free(m, *m + align);
114895- } else
114896+ slob_t *m = (slob_t *)(block - align);
114897+ slob_free(NULL, m, m[0].units + align);
114898+ } else {
114899+ __ClearPageSlab(sp);
114900+ page_mapcount_reset(sp);
114901+ sp->private = 0;
114902 __free_pages(sp, compound_order(sp));
114903+ }
114904 }
114905 EXPORT_SYMBOL(kfree);
114906
114907+bool is_usercopy_object(const void *ptr)
114908+{
114909+ if (!slab_is_available())
114910+ return false;
114911+
114912+ // PAX: TODO
114913+
114914+ return false;
114915+}
114916+
114917+#ifdef CONFIG_PAX_USERCOPY
114918+const char *check_heap_object(const void *ptr, unsigned long n)
114919+{
114920+ struct page *page;
114921+ const slob_t *free;
114922+ const void *base;
114923+ unsigned long flags;
114924+
114925+ if (ZERO_OR_NULL_PTR(ptr))
114926+ return "<null>";
114927+
114928+ if (!virt_addr_valid(ptr))
114929+ return NULL;
114930+
114931+ page = virt_to_head_page(ptr);
114932+ if (!PageSlab(page))
114933+ return NULL;
114934+
114935+ if (page->private) {
114936+ base = page;
114937+ if (base <= ptr && n <= page->private - (ptr - base))
114938+ return NULL;
114939+ return "<slob>";
114940+ }
114941+
114942+ /* some tricky double walking to find the chunk */
114943+ spin_lock_irqsave(&slob_lock, flags);
114944+ base = (void *)((unsigned long)ptr & PAGE_MASK);
114945+ free = page->freelist;
114946+
114947+ while (!slob_last(free) && (void *)free <= ptr) {
114948+ base = free + slob_units(free);
114949+ free = slob_next(free);
114950+ }
114951+
114952+ while (base < (void *)free) {
114953+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
114954+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
114955+ int offset;
114956+
114957+ if (ptr < base + align)
114958+ break;
114959+
114960+ offset = ptr - base - align;
114961+ if (offset >= m) {
114962+ base += size;
114963+ continue;
114964+ }
114965+
114966+ if (n > m - offset)
114967+ break;
114968+
114969+ spin_unlock_irqrestore(&slob_lock, flags);
114970+ return NULL;
114971+ }
114972+
114973+ spin_unlock_irqrestore(&slob_lock, flags);
114974+ return "<slob>";
114975+}
114976+#endif
114977+
114978 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
114979 size_t ksize(const void *block)
114980 {
114981 struct page *sp;
114982 int align;
114983- unsigned int *m;
114984+ slob_t *m;
114985
114986 BUG_ON(!block);
114987 if (unlikely(block == ZERO_SIZE_PTR))
114988 return 0;
114989
114990 sp = virt_to_page(block);
114991- if (unlikely(!PageSlab(sp)))
114992- return PAGE_SIZE << compound_order(sp);
114993+ VM_BUG_ON(!PageSlab(sp));
114994+ if (sp->private)
114995+ return sp->private;
114996
114997 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114998- m = (unsigned int *)(block - align);
114999- return SLOB_UNITS(*m) * SLOB_UNIT;
115000+ m = (slob_t *)(block - align);
115001+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
115002 }
115003 EXPORT_SYMBOL(ksize);
115004
115005@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
115006
115007 static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
115008 {
115009- void *b;
115010+ void *b = NULL;
115011
115012 flags &= gfp_allowed_mask;
115013
115014 lockdep_trace_alloc(flags);
115015
115016+#ifdef CONFIG_PAX_USERCOPY_SLABS
115017+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
115018+#else
115019 if (c->size < PAGE_SIZE) {
115020 b = slob_alloc(c->size, flags, c->align, node);
115021 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115022 SLOB_UNITS(c->size) * SLOB_UNIT,
115023 flags, node);
115024 } else {
115025- b = slob_new_pages(flags, get_order(c->size), node);
115026+ struct page *sp;
115027+
115028+ sp = slob_new_pages(flags, get_order(c->size), node);
115029+ if (sp) {
115030+ b = page_address(sp);
115031+ sp->private = c->size;
115032+ }
115033 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115034 PAGE_SIZE << get_order(c->size),
115035 flags, node);
115036 }
115037+#endif
115038
115039 if (b && c->ctor)
115040 c->ctor(b);
115041@@ -566,7 +678,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
115042 EXPORT_SYMBOL(kmem_cache_alloc);
115043
115044 #ifdef CONFIG_NUMA
115045-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
115046+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
115047 {
115048 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
115049 }
115050@@ -579,12 +691,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
115051 EXPORT_SYMBOL(kmem_cache_alloc_node);
115052 #endif
115053
115054-static void __kmem_cache_free(void *b, int size)
115055+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
115056 {
115057- if (size < PAGE_SIZE)
115058- slob_free(b, size);
115059+ struct page *sp;
115060+
115061+ sp = virt_to_page(b);
115062+ BUG_ON(!PageSlab(sp));
115063+ if (!sp->private)
115064+ slob_free(c, b, size);
115065 else
115066- slob_free_pages(b, get_order(size));
115067+ slob_free_pages(sp, get_order(size));
115068 }
115069
115070 static void kmem_rcu_free(struct rcu_head *head)
115071@@ -592,22 +708,36 @@ static void kmem_rcu_free(struct rcu_head *head)
115072 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
115073 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
115074
115075- __kmem_cache_free(b, slob_rcu->size);
115076+ __kmem_cache_free(NULL, b, slob_rcu->size);
115077 }
115078
115079 void kmem_cache_free(struct kmem_cache *c, void *b)
115080 {
115081+ int size = c->size;
115082+
115083+#ifdef CONFIG_PAX_USERCOPY_SLABS
115084+ if (size + c->align < PAGE_SIZE) {
115085+ size += c->align;
115086+ b -= c->align;
115087+ }
115088+#endif
115089+
115090 kmemleak_free_recursive(b, c->flags);
115091 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
115092 struct slob_rcu *slob_rcu;
115093- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
115094- slob_rcu->size = c->size;
115095+ slob_rcu = b + (size - sizeof(struct slob_rcu));
115096+ slob_rcu->size = size;
115097 call_rcu(&slob_rcu->head, kmem_rcu_free);
115098 } else {
115099- __kmem_cache_free(b, c->size);
115100+ __kmem_cache_free(c, b, size);
115101 }
115102
115103+#ifdef CONFIG_PAX_USERCOPY_SLABS
115104+ trace_kfree(_RET_IP_, b);
115105+#else
115106 trace_kmem_cache_free(_RET_IP_, b);
115107+#endif
115108+
115109 }
115110 EXPORT_SYMBOL(kmem_cache_free);
115111
115112diff --git a/mm/slub.c b/mm/slub.c
115113index 54c0876..31383a1 100644
115114--- a/mm/slub.c
115115+++ b/mm/slub.c
115116@@ -198,7 +198,7 @@ struct track {
115117
115118 enum track_item { TRACK_ALLOC, TRACK_FREE };
115119
115120-#ifdef CONFIG_SYSFS
115121+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115122 static int sysfs_slab_add(struct kmem_cache *);
115123 static int sysfs_slab_alias(struct kmem_cache *, const char *);
115124 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
115125@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
115126 if (!t->addr)
115127 return;
115128
115129- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
115130+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
115131 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
115132 #ifdef CONFIG_STACKTRACE
115133 {
115134@@ -2707,6 +2707,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
115135
115136 slab_free_hook(s, x);
115137
115138+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115139+ if (!(s->flags & SLAB_NO_SANITIZE)) {
115140+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
115141+ if (s->ctor)
115142+ s->ctor(x);
115143+ }
115144+#endif
115145+
115146 redo:
115147 /*
115148 * Determine the currently cpus per cpu slab.
115149@@ -3048,6 +3056,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
115150 s->inuse = size;
115151
115152 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
115153+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115154+ (!(flags & SLAB_NO_SANITIZE)) ||
115155+#endif
115156 s->ctor)) {
115157 /*
115158 * Relocate free pointer after the object if it is not
115159@@ -3302,7 +3313,7 @@ static int __init setup_slub_min_objects(char *str)
115160
115161 __setup("slub_min_objects=", setup_slub_min_objects);
115162
115163-void *__kmalloc(size_t size, gfp_t flags)
115164+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
115165 {
115166 struct kmem_cache *s;
115167 void *ret;
115168@@ -3340,7 +3351,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
115169 return ptr;
115170 }
115171
115172-void *__kmalloc_node(size_t size, gfp_t flags, int node)
115173+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
115174 {
115175 struct kmem_cache *s;
115176 void *ret;
115177@@ -3388,6 +3399,59 @@ static size_t __ksize(const void *object)
115178 return slab_ksize(page->slab_cache);
115179 }
115180
115181+bool is_usercopy_object(const void *ptr)
115182+{
115183+ struct page *page;
115184+ struct kmem_cache *s;
115185+
115186+ if (ZERO_OR_NULL_PTR(ptr))
115187+ return false;
115188+
115189+ if (!slab_is_available())
115190+ return false;
115191+
115192+ if (!virt_addr_valid(ptr))
115193+ return false;
115194+
115195+ page = virt_to_head_page(ptr);
115196+
115197+ if (!PageSlab(page))
115198+ return false;
115199+
115200+ s = page->slab_cache;
115201+ return s->flags & SLAB_USERCOPY;
115202+}
115203+
115204+#ifdef CONFIG_PAX_USERCOPY
115205+const char *check_heap_object(const void *ptr, unsigned long n)
115206+{
115207+ struct page *page;
115208+ struct kmem_cache *s;
115209+ unsigned long offset;
115210+
115211+ if (ZERO_OR_NULL_PTR(ptr))
115212+ return "<null>";
115213+
115214+ if (!virt_addr_valid(ptr))
115215+ return NULL;
115216+
115217+ page = virt_to_head_page(ptr);
115218+
115219+ if (!PageSlab(page))
115220+ return NULL;
115221+
115222+ s = page->slab_cache;
115223+ if (!(s->flags & SLAB_USERCOPY))
115224+ return s->name;
115225+
115226+ offset = (ptr - page_address(page)) % s->size;
115227+ if (offset <= s->object_size && n <= s->object_size - offset)
115228+ return NULL;
115229+
115230+ return s->name;
115231+}
115232+#endif
115233+
115234 size_t ksize(const void *object)
115235 {
115236 size_t size = __ksize(object);
115237@@ -3408,6 +3472,7 @@ void kfree(const void *x)
115238 if (unlikely(ZERO_OR_NULL_PTR(x)))
115239 return;
115240
115241+ VM_BUG_ON(!virt_addr_valid(x));
115242 page = virt_to_head_page(x);
115243 if (unlikely(!PageSlab(page))) {
115244 BUG_ON(!PageCompound(page));
115245@@ -3724,7 +3789,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115246
115247 s = find_mergeable(size, align, flags, name, ctor);
115248 if (s) {
115249- s->refcount++;
115250+ atomic_inc(&s->refcount);
115251
115252 /*
115253 * Adjust the object sizes so that we clear
115254@@ -3740,7 +3805,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115255 }
115256
115257 if (sysfs_slab_alias(s, name)) {
115258- s->refcount--;
115259+ atomic_dec(&s->refcount);
115260 s = NULL;
115261 }
115262 }
115263@@ -3857,7 +3922,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
115264 }
115265 #endif
115266
115267-#ifdef CONFIG_SYSFS
115268+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115269 static int count_inuse(struct page *page)
115270 {
115271 return page->inuse;
115272@@ -4138,7 +4203,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
115273 len += sprintf(buf + len, "%7ld ", l->count);
115274
115275 if (l->addr)
115276+#ifdef CONFIG_GRKERNSEC_HIDESYM
115277+ len += sprintf(buf + len, "%pS", NULL);
115278+#else
115279 len += sprintf(buf + len, "%pS", (void *)l->addr);
115280+#endif
115281 else
115282 len += sprintf(buf + len, "<not-available>");
115283
115284@@ -4236,12 +4305,12 @@ static void __init resiliency_test(void)
115285 validate_slab_cache(kmalloc_caches[9]);
115286 }
115287 #else
115288-#ifdef CONFIG_SYSFS
115289+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115290 static void resiliency_test(void) {};
115291 #endif
115292 #endif
115293
115294-#ifdef CONFIG_SYSFS
115295+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115296 enum slab_stat_type {
115297 SL_ALL, /* All slabs */
115298 SL_PARTIAL, /* Only partially allocated slabs */
115299@@ -4478,13 +4547,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
115300 {
115301 if (!s->ctor)
115302 return 0;
115303+#ifdef CONFIG_GRKERNSEC_HIDESYM
115304+ return sprintf(buf, "%pS\n", NULL);
115305+#else
115306 return sprintf(buf, "%pS\n", s->ctor);
115307+#endif
115308 }
115309 SLAB_ATTR_RO(ctor);
115310
115311 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
115312 {
115313- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
115314+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
115315 }
115316 SLAB_ATTR_RO(aliases);
115317
115318@@ -4572,6 +4645,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
115319 SLAB_ATTR_RO(cache_dma);
115320 #endif
115321
115322+#ifdef CONFIG_PAX_USERCOPY_SLABS
115323+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
115324+{
115325+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
115326+}
115327+SLAB_ATTR_RO(usercopy);
115328+#endif
115329+
115330+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115331+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
115332+{
115333+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
115334+}
115335+SLAB_ATTR_RO(sanitize);
115336+#endif
115337+
115338 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
115339 {
115340 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
115341@@ -4627,7 +4716,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
115342 * as well as cause other issues like converting a mergeable
115343 * cache into an umergeable one.
115344 */
115345- if (s->refcount > 1)
115346+ if (atomic_read(&s->refcount) > 1)
115347 return -EINVAL;
115348
115349 s->flags &= ~SLAB_TRACE;
115350@@ -4747,7 +4836,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
115351 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
115352 size_t length)
115353 {
115354- if (s->refcount > 1)
115355+ if (atomic_read(&s->refcount) > 1)
115356 return -EINVAL;
115357
115358 s->flags &= ~SLAB_FAILSLAB;
115359@@ -4914,6 +5003,12 @@ static struct attribute *slab_attrs[] = {
115360 #ifdef CONFIG_ZONE_DMA
115361 &cache_dma_attr.attr,
115362 #endif
115363+#ifdef CONFIG_PAX_USERCOPY_SLABS
115364+ &usercopy_attr.attr,
115365+#endif
115366+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115367+ &sanitize_attr.attr,
115368+#endif
115369 #ifdef CONFIG_NUMA
115370 &remote_node_defrag_ratio_attr.attr,
115371 #endif
115372@@ -5155,6 +5250,7 @@ static char *create_unique_id(struct kmem_cache *s)
115373 return name;
115374 }
115375
115376+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115377 static int sysfs_slab_add(struct kmem_cache *s)
115378 {
115379 int err;
115380@@ -5228,6 +5324,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
115381 kobject_del(&s->kobj);
115382 kobject_put(&s->kobj);
115383 }
115384+#endif
115385
115386 /*
115387 * Need to buffer aliases during bootup until sysfs becomes
115388@@ -5241,6 +5338,7 @@ struct saved_alias {
115389
115390 static struct saved_alias *alias_list;
115391
115392+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115393 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115394 {
115395 struct saved_alias *al;
115396@@ -5263,6 +5361,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115397 alias_list = al;
115398 return 0;
115399 }
115400+#endif
115401
115402 static int __init slab_sysfs_init(void)
115403 {
115404diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
115405index 4cba9c2..b4f9fcc 100644
115406--- a/mm/sparse-vmemmap.c
115407+++ b/mm/sparse-vmemmap.c
115408@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
115409 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115410 if (!p)
115411 return NULL;
115412- pud_populate(&init_mm, pud, p);
115413+ pud_populate_kernel(&init_mm, pud, p);
115414 }
115415 return pud;
115416 }
115417@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
115418 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115419 if (!p)
115420 return NULL;
115421- pgd_populate(&init_mm, pgd, p);
115422+ pgd_populate_kernel(&init_mm, pgd, p);
115423 }
115424 return pgd;
115425 }
115426diff --git a/mm/sparse.c b/mm/sparse.c
115427index d1b48b6..6e8590e 100644
115428--- a/mm/sparse.c
115429+++ b/mm/sparse.c
115430@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
115431
115432 for (i = 0; i < PAGES_PER_SECTION; i++) {
115433 if (PageHWPoison(&memmap[i])) {
115434- atomic_long_sub(1, &num_poisoned_pages);
115435+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
115436 ClearPageHWPoison(&memmap[i]);
115437 }
115438 }
115439diff --git a/mm/swap.c b/mm/swap.c
115440index a7251a8..ac754a9 100644
115441--- a/mm/swap.c
115442+++ b/mm/swap.c
115443@@ -85,6 +85,8 @@ static void __put_compound_page(struct page *page)
115444 if (!PageHuge(page))
115445 __page_cache_release(page);
115446 dtor = get_compound_page_dtor(page);
115447+ if (!PageHuge(page))
115448+ BUG_ON(dtor != free_compound_page);
115449 (*dtor)(page);
115450 }
115451
115452diff --git a/mm/swapfile.c b/mm/swapfile.c
115453index a7e7210..b286e7d 100644
115454--- a/mm/swapfile.c
115455+++ b/mm/swapfile.c
115456@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
115457
115458 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
115459 /* Activity counter to indicate that a swapon or swapoff has occurred */
115460-static atomic_t proc_poll_event = ATOMIC_INIT(0);
115461+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
115462
115463 static inline unsigned char swap_count(unsigned char ent)
115464 {
115465@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
115466 spin_unlock(&swap_lock);
115467
115468 err = 0;
115469- atomic_inc(&proc_poll_event);
115470+ atomic_inc_unchecked(&proc_poll_event);
115471 wake_up_interruptible(&proc_poll_wait);
115472
115473 out_dput:
115474@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
115475
115476 poll_wait(file, &proc_poll_wait, wait);
115477
115478- if (seq->poll_event != atomic_read(&proc_poll_event)) {
115479- seq->poll_event = atomic_read(&proc_poll_event);
115480+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
115481+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115482 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
115483 }
115484
115485@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
115486 return ret;
115487
115488 seq = file->private_data;
115489- seq->poll_event = atomic_read(&proc_poll_event);
115490+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115491 return 0;
115492 }
115493
115494@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
115495 (frontswap_map) ? "FS" : "");
115496
115497 mutex_unlock(&swapon_mutex);
115498- atomic_inc(&proc_poll_event);
115499+ atomic_inc_unchecked(&proc_poll_event);
115500 wake_up_interruptible(&proc_poll_wait);
115501
115502 if (S_ISREG(inode->i_mode))
115503diff --git a/mm/util.c b/mm/util.c
115504index 68ff8a5..40c7a70 100644
115505--- a/mm/util.c
115506+++ b/mm/util.c
115507@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
115508 void arch_pick_mmap_layout(struct mm_struct *mm)
115509 {
115510 mm->mmap_base = TASK_UNMAPPED_BASE;
115511+
115512+#ifdef CONFIG_PAX_RANDMMAP
115513+ if (mm->pax_flags & MF_PAX_RANDMMAP)
115514+ mm->mmap_base += mm->delta_mmap;
115515+#endif
115516+
115517 mm->get_unmapped_area = arch_get_unmapped_area;
115518 }
115519 #endif
115520@@ -434,6 +440,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
115521 if (!mm->arg_end)
115522 goto out_mm; /* Shh! No looking before we're done */
115523
115524+ if (gr_acl_handle_procpidmem(task))
115525+ goto out_mm;
115526+
115527 len = mm->arg_end - mm->arg_start;
115528
115529 if (len > buflen)
115530diff --git a/mm/vmalloc.c b/mm/vmalloc.c
115531index 2faaa29..9744185 100644
115532--- a/mm/vmalloc.c
115533+++ b/mm/vmalloc.c
115534@@ -40,20 +40,65 @@ struct vfree_deferred {
115535 struct work_struct wq;
115536 };
115537 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
115538+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
115539+
115540+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115541+struct stack_deferred_llist {
115542+ struct llist_head list;
115543+ void *stack;
115544+ void *lowmem_stack;
115545+};
115546+
115547+struct stack_deferred {
115548+ struct stack_deferred_llist list;
115549+ struct work_struct wq;
115550+};
115551+
115552+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
115553+#endif
115554
115555 static void __vunmap(const void *, int);
115556
115557-static void free_work(struct work_struct *w)
115558+static void vfree_work(struct work_struct *w)
115559 {
115560 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115561 struct llist_node *llnode = llist_del_all(&p->list);
115562 while (llnode) {
115563- void *p = llnode;
115564+ void *x = llnode;
115565 llnode = llist_next(llnode);
115566- __vunmap(p, 1);
115567+ __vunmap(x, 1);
115568 }
115569 }
115570
115571+static void vunmap_work(struct work_struct *w)
115572+{
115573+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115574+ struct llist_node *llnode = llist_del_all(&p->list);
115575+ while (llnode) {
115576+ void *x = llnode;
115577+ llnode = llist_next(llnode);
115578+ __vunmap(x, 0);
115579+ }
115580+}
115581+
115582+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115583+static void unmap_work(struct work_struct *w)
115584+{
115585+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
115586+ struct llist_node *llnode = llist_del_all(&p->list.list);
115587+ while (llnode) {
115588+ struct stack_deferred_llist *x =
115589+ llist_entry((struct llist_head *)llnode,
115590+ struct stack_deferred_llist, list);
115591+ void *stack = ACCESS_ONCE(x->stack);
115592+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
115593+ llnode = llist_next(llnode);
115594+ __vunmap(stack, 0);
115595+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
115596+ }
115597+}
115598+#endif
115599+
115600 /*** Page table manipulation functions ***/
115601
115602 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115603@@ -62,8 +107,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115604
115605 pte = pte_offset_kernel(pmd, addr);
115606 do {
115607- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115608- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115609+
115610+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115611+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
115612+ BUG_ON(!pte_exec(*pte));
115613+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
115614+ continue;
115615+ }
115616+#endif
115617+
115618+ {
115619+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115620+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115621+ }
115622 } while (pte++, addr += PAGE_SIZE, addr != end);
115623 }
115624
115625@@ -127,16 +183,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
115626 pte = pte_alloc_kernel(pmd, addr);
115627 if (!pte)
115628 return -ENOMEM;
115629+
115630+ pax_open_kernel();
115631 do {
115632 struct page *page = pages[*nr];
115633
115634- if (WARN_ON(!pte_none(*pte)))
115635+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115636+ if (pgprot_val(prot) & _PAGE_NX)
115637+#endif
115638+
115639+ if (!pte_none(*pte)) {
115640+ pax_close_kernel();
115641+ WARN_ON(1);
115642 return -EBUSY;
115643- if (WARN_ON(!page))
115644+ }
115645+ if (!page) {
115646+ pax_close_kernel();
115647+ WARN_ON(1);
115648 return -ENOMEM;
115649+ }
115650 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
115651 (*nr)++;
115652 } while (pte++, addr += PAGE_SIZE, addr != end);
115653+ pax_close_kernel();
115654 return 0;
115655 }
115656
115657@@ -146,7 +215,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
115658 pmd_t *pmd;
115659 unsigned long next;
115660
115661- pmd = pmd_alloc(&init_mm, pud, addr);
115662+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
115663 if (!pmd)
115664 return -ENOMEM;
115665 do {
115666@@ -163,7 +232,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
115667 pud_t *pud;
115668 unsigned long next;
115669
115670- pud = pud_alloc(&init_mm, pgd, addr);
115671+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
115672 if (!pud)
115673 return -ENOMEM;
115674 do {
115675@@ -223,6 +292,12 @@ int is_vmalloc_or_module_addr(const void *x)
115676 if (addr >= MODULES_VADDR && addr < MODULES_END)
115677 return 1;
115678 #endif
115679+
115680+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115681+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
115682+ return 1;
115683+#endif
115684+
115685 return is_vmalloc_addr(x);
115686 }
115687
115688@@ -243,8 +318,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
115689
115690 if (!pgd_none(*pgd)) {
115691 pud_t *pud = pud_offset(pgd, addr);
115692+#ifdef CONFIG_X86
115693+ if (!pud_large(*pud))
115694+#endif
115695 if (!pud_none(*pud)) {
115696 pmd_t *pmd = pmd_offset(pud, addr);
115697+#ifdef CONFIG_X86
115698+ if (!pmd_large(*pmd))
115699+#endif
115700 if (!pmd_none(*pmd)) {
115701 pte_t *ptep, pte;
115702
115703@@ -346,7 +427,7 @@ static void purge_vmap_area_lazy(void);
115704 * Allocate a region of KVA of the specified size and alignment, within the
115705 * vstart and vend.
115706 */
115707-static struct vmap_area *alloc_vmap_area(unsigned long size,
115708+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
115709 unsigned long align,
115710 unsigned long vstart, unsigned long vend,
115711 int node, gfp_t gfp_mask)
115712@@ -1202,13 +1283,27 @@ void __init vmalloc_init(void)
115713 for_each_possible_cpu(i) {
115714 struct vmap_block_queue *vbq;
115715 struct vfree_deferred *p;
115716+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115717+ struct stack_deferred *p2;
115718+#endif
115719
115720 vbq = &per_cpu(vmap_block_queue, i);
115721 spin_lock_init(&vbq->lock);
115722 INIT_LIST_HEAD(&vbq->free);
115723+
115724 p = &per_cpu(vfree_deferred, i);
115725 init_llist_head(&p->list);
115726- INIT_WORK(&p->wq, free_work);
115727+ INIT_WORK(&p->wq, vfree_work);
115728+
115729+ p = &per_cpu(vunmap_deferred, i);
115730+ init_llist_head(&p->list);
115731+ INIT_WORK(&p->wq, vunmap_work);
115732+
115733+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115734+ p2 = &per_cpu(stack_deferred, i);
115735+ init_llist_head(&p2->list.list);
115736+ INIT_WORK(&p2->wq, unmap_work);
115737+#endif
115738 }
115739
115740 /* Import existing vmlist entries. */
115741@@ -1333,6 +1428,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
115742 struct vm_struct *area;
115743
115744 BUG_ON(in_interrupt());
115745+
115746+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115747+ if (flags & VM_KERNEXEC) {
115748+ if (start != VMALLOC_START || end != VMALLOC_END)
115749+ return NULL;
115750+ start = (unsigned long)MODULES_EXEC_VADDR;
115751+ end = (unsigned long)MODULES_EXEC_END;
115752+ }
115753+#endif
115754+
115755 if (flags & VM_IOREMAP)
115756 align = 1ul << clamp_t(int, fls_long(size),
115757 PAGE_SHIFT, IOREMAP_MAX_ORDER);
115758@@ -1531,13 +1636,36 @@ EXPORT_SYMBOL(vfree);
115759 */
115760 void vunmap(const void *addr)
115761 {
115762- BUG_ON(in_interrupt());
115763- might_sleep();
115764- if (addr)
115765+ if (!addr)
115766+ return;
115767+ if (unlikely(in_interrupt())) {
115768+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
115769+ if (llist_add((struct llist_node *)addr, &p->list))
115770+ schedule_work(&p->wq);
115771+ } else {
115772+ might_sleep();
115773 __vunmap(addr, 0);
115774+ }
115775 }
115776 EXPORT_SYMBOL(vunmap);
115777
115778+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115779+void unmap_process_stacks(struct task_struct *task)
115780+{
115781+ if (unlikely(in_interrupt())) {
115782+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
115783+ struct stack_deferred_llist *list = task->stack;
115784+ list->stack = task->stack;
115785+ list->lowmem_stack = task->lowmem_stack;
115786+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
115787+ schedule_work(&p->wq);
115788+ } else {
115789+ __vunmap(task->stack, 0);
115790+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
115791+ }
115792+}
115793+#endif
115794+
115795 /**
115796 * vmap - map an array of pages into virtually contiguous space
115797 * @pages: array of page pointers
115798@@ -1558,6 +1686,11 @@ void *vmap(struct page **pages, unsigned int count,
115799 if (count > totalram_pages)
115800 return NULL;
115801
115802+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115803+ if (!(pgprot_val(prot) & _PAGE_NX))
115804+ flags |= VM_KERNEXEC;
115805+#endif
115806+
115807 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
115808 __builtin_return_address(0));
115809 if (!area)
115810@@ -1662,6 +1795,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
115811 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
115812 goto fail;
115813
115814+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115815+ if (!(pgprot_val(prot) & _PAGE_NX)) {
115816+ vm_flags |= VM_KERNEXEC;
115817+ start = VMALLOC_START;
115818+ end = VMALLOC_END;
115819+ }
115820+#endif
115821+
115822 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
115823 vm_flags, start, end, node, gfp_mask, caller);
115824 if (!area)
115825@@ -1838,10 +1979,9 @@ EXPORT_SYMBOL(vzalloc_node);
115826 * For tight control over page level allocator and protection flags
115827 * use __vmalloc() instead.
115828 */
115829-
115830 void *vmalloc_exec(unsigned long size)
115831 {
115832- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
115833+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
115834 NUMA_NO_NODE, __builtin_return_address(0));
115835 }
115836
115837@@ -2148,6 +2288,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
115838 {
115839 struct vm_struct *area;
115840
115841+ BUG_ON(vma->vm_mirror);
115842+
115843 size = PAGE_ALIGN(size);
115844
115845 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
115846@@ -2630,7 +2772,11 @@ static int s_show(struct seq_file *m, void *p)
115847 v->addr, v->addr + v->size, v->size);
115848
115849 if (v->caller)
115850+#ifdef CONFIG_GRKERNSEC_HIDESYM
115851+ seq_printf(m, " %pK", v->caller);
115852+#else
115853 seq_printf(m, " %pS", v->caller);
115854+#endif
115855
115856 if (v->nr_pages)
115857 seq_printf(m, " pages=%d", v->nr_pages);
115858diff --git a/mm/vmstat.c b/mm/vmstat.c
115859index 4f5cd97..9fb715a 100644
115860--- a/mm/vmstat.c
115861+++ b/mm/vmstat.c
115862@@ -27,6 +27,7 @@
115863 #include <linux/mm_inline.h>
115864 #include <linux/page_ext.h>
115865 #include <linux/page_owner.h>
115866+#include <linux/grsecurity.h>
115867
115868 #include "internal.h"
115869
115870@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
115871 *
115872 * vm_stat contains the global counters
115873 */
115874-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115875+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
115876 EXPORT_SYMBOL(vm_stat);
115877
115878 #ifdef CONFIG_SMP
115879@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
115880
115881 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115882 if (diff[i]) {
115883- atomic_long_add(diff[i], &vm_stat[i]);
115884+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
115885 changes++;
115886 }
115887 return changes;
115888@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
115889 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
115890 if (v) {
115891
115892- atomic_long_add(v, &zone->vm_stat[i]);
115893+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115894 global_diff[i] += v;
115895 #ifdef CONFIG_NUMA
115896 /* 3 seconds idle till flush */
115897@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
115898
115899 v = p->vm_stat_diff[i];
115900 p->vm_stat_diff[i] = 0;
115901- atomic_long_add(v, &zone->vm_stat[i]);
115902+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115903 global_diff[i] += v;
115904 }
115905 }
115906@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
115907 if (pset->vm_stat_diff[i]) {
115908 int v = pset->vm_stat_diff[i];
115909 pset->vm_stat_diff[i] = 0;
115910- atomic_long_add(v, &zone->vm_stat[i]);
115911- atomic_long_add(v, &vm_stat[i]);
115912+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
115913+ atomic_long_add_unchecked(v, &vm_stat[i]);
115914 }
115915 }
115916 #endif
115917@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
115918 stat_items_size += sizeof(struct vm_event_state);
115919 #endif
115920
115921- v = kmalloc(stat_items_size, GFP_KERNEL);
115922+ v = kzalloc(stat_items_size, GFP_KERNEL);
115923 m->private = v;
115924 if (!v)
115925 return ERR_PTR(-ENOMEM);
115926+
115927+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115928+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
115929+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
115930+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
115931+ && !in_group_p(grsec_proc_gid)
115932+#endif
115933+ )
115934+ return (unsigned long *)m->private + *pos;
115935+#endif
115936+#endif
115937+
115938 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
115939 v[i] = global_page_state(i);
115940 v += NR_VM_ZONE_STAT_ITEMS;
115941@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
115942 cpu_notifier_register_done();
115943 #endif
115944 #ifdef CONFIG_PROC_FS
115945- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
115946- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
115947- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115948- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
115949+ {
115950+ mode_t gr_mode = S_IRUGO;
115951+#ifdef CONFIG_GRKERNSEC_PROC_ADD
115952+ gr_mode = S_IRUSR;
115953+#endif
115954+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
115955+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
115956+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
115957+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
115958+ }
115959 #endif
115960 return 0;
115961 }
115962diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
115963index 59555f0..fd7ade9 100644
115964--- a/net/8021q/vlan.c
115965+++ b/net/8021q/vlan.c
115966@@ -491,7 +491,7 @@ out:
115967 return NOTIFY_DONE;
115968 }
115969
115970-static struct notifier_block vlan_notifier_block __read_mostly = {
115971+static struct notifier_block vlan_notifier_block = {
115972 .notifier_call = vlan_device_event,
115973 };
115974
115975@@ -566,8 +566,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
115976 err = -EPERM;
115977 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
115978 break;
115979- if ((args.u.name_type >= 0) &&
115980- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
115981+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
115982 struct vlan_net *vn;
115983
115984 vn = net_generic(net, vlan_net_id);
115985diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
115986index c92b52f..006c052 100644
115987--- a/net/8021q/vlan_netlink.c
115988+++ b/net/8021q/vlan_netlink.c
115989@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
115990 return dev_net(real_dev);
115991 }
115992
115993-struct rtnl_link_ops vlan_link_ops __read_mostly = {
115994+struct rtnl_link_ops vlan_link_ops = {
115995 .kind = "vlan",
115996 .maxtype = IFLA_VLAN_MAX,
115997 .policy = vlan_policy,
115998diff --git a/net/9p/mod.c b/net/9p/mod.c
115999index 6ab36ae..6f1841b 100644
116000--- a/net/9p/mod.c
116001+++ b/net/9p/mod.c
116002@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
116003 void v9fs_register_trans(struct p9_trans_module *m)
116004 {
116005 spin_lock(&v9fs_trans_lock);
116006- list_add_tail(&m->list, &v9fs_trans_list);
116007+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
116008 spin_unlock(&v9fs_trans_lock);
116009 }
116010 EXPORT_SYMBOL(v9fs_register_trans);
116011@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
116012 void v9fs_unregister_trans(struct p9_trans_module *m)
116013 {
116014 spin_lock(&v9fs_trans_lock);
116015- list_del_init(&m->list);
116016+ pax_list_del_init((struct list_head *)&m->list);
116017 spin_unlock(&v9fs_trans_lock);
116018 }
116019 EXPORT_SYMBOL(v9fs_unregister_trans);
116020diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
116021index bced8c0..ef253b7 100644
116022--- a/net/9p/trans_fd.c
116023+++ b/net/9p/trans_fd.c
116024@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
116025 oldfs = get_fs();
116026 set_fs(get_ds());
116027 /* The cast to a user pointer is valid due to the set_fs() */
116028- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
116029+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
116030 set_fs(oldfs);
116031
116032 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
116033diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
116034index af46bc4..f9adfcd 100644
116035--- a/net/appletalk/atalk_proc.c
116036+++ b/net/appletalk/atalk_proc.c
116037@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
116038 struct proc_dir_entry *p;
116039 int rc = -ENOMEM;
116040
116041- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
116042+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
116043 if (!atalk_proc_dir)
116044 goto out;
116045
116046diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
116047index 876fbe8..8bbea9f 100644
116048--- a/net/atm/atm_misc.c
116049+++ b/net/atm/atm_misc.c
116050@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
116051 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
116052 return 1;
116053 atm_return(vcc, truesize);
116054- atomic_inc(&vcc->stats->rx_drop);
116055+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116056 return 0;
116057 }
116058 EXPORT_SYMBOL(atm_charge);
116059@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
116060 }
116061 }
116062 atm_return(vcc, guess);
116063- atomic_inc(&vcc->stats->rx_drop);
116064+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116065 return NULL;
116066 }
116067 EXPORT_SYMBOL(atm_alloc_charge);
116068@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
116069
116070 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116071 {
116072-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116073+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116074 __SONET_ITEMS
116075 #undef __HANDLE_ITEM
116076 }
116077@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
116078
116079 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116080 {
116081-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116082+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
116083 __SONET_ITEMS
116084 #undef __HANDLE_ITEM
116085 }
116086diff --git a/net/atm/lec.c b/net/atm/lec.c
116087index cd3b379..977a3c9 100644
116088--- a/net/atm/lec.c
116089+++ b/net/atm/lec.c
116090@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
116091 }
116092
116093 static struct lane2_ops lane2_ops = {
116094- lane2_resolve, /* resolve, spec 3.1.3 */
116095- lane2_associate_req, /* associate_req, spec 3.1.4 */
116096- NULL /* associate indicator, spec 3.1.5 */
116097+ .resolve = lane2_resolve,
116098+ .associate_req = lane2_associate_req,
116099+ .associate_indicator = NULL
116100 };
116101
116102 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
116103diff --git a/net/atm/lec.h b/net/atm/lec.h
116104index 4149db1..f2ab682 100644
116105--- a/net/atm/lec.h
116106+++ b/net/atm/lec.h
116107@@ -48,7 +48,7 @@ struct lane2_ops {
116108 const u8 *tlvs, u32 sizeoftlvs);
116109 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
116110 const u8 *tlvs, u32 sizeoftlvs);
116111-};
116112+} __no_const;
116113
116114 /*
116115 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
116116diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
116117index d1b2d9a..d549f7f 100644
116118--- a/net/atm/mpoa_caches.c
116119+++ b/net/atm/mpoa_caches.c
116120@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
116121
116122
116123 static struct in_cache_ops ingress_ops = {
116124- in_cache_add_entry, /* add_entry */
116125- in_cache_get, /* get */
116126- in_cache_get_with_mask, /* get_with_mask */
116127- in_cache_get_by_vcc, /* get_by_vcc */
116128- in_cache_put, /* put */
116129- in_cache_remove_entry, /* remove_entry */
116130- cache_hit, /* cache_hit */
116131- clear_count_and_expired, /* clear_count */
116132- check_resolving_entries, /* check_resolving */
116133- refresh_entries, /* refresh */
116134- in_destroy_cache /* destroy_cache */
116135+ .add_entry = in_cache_add_entry,
116136+ .get = in_cache_get,
116137+ .get_with_mask = in_cache_get_with_mask,
116138+ .get_by_vcc = in_cache_get_by_vcc,
116139+ .put = in_cache_put,
116140+ .remove_entry = in_cache_remove_entry,
116141+ .cache_hit = cache_hit,
116142+ .clear_count = clear_count_and_expired,
116143+ .check_resolving = check_resolving_entries,
116144+ .refresh = refresh_entries,
116145+ .destroy_cache = in_destroy_cache
116146 };
116147
116148 static struct eg_cache_ops egress_ops = {
116149- eg_cache_add_entry, /* add_entry */
116150- eg_cache_get_by_cache_id, /* get_by_cache_id */
116151- eg_cache_get_by_tag, /* get_by_tag */
116152- eg_cache_get_by_vcc, /* get_by_vcc */
116153- eg_cache_get_by_src_ip, /* get_by_src_ip */
116154- eg_cache_put, /* put */
116155- eg_cache_remove_entry, /* remove_entry */
116156- update_eg_cache_entry, /* update */
116157- clear_expired, /* clear_expired */
116158- eg_destroy_cache /* destroy_cache */
116159+ .add_entry = eg_cache_add_entry,
116160+ .get_by_cache_id = eg_cache_get_by_cache_id,
116161+ .get_by_tag = eg_cache_get_by_tag,
116162+ .get_by_vcc = eg_cache_get_by_vcc,
116163+ .get_by_src_ip = eg_cache_get_by_src_ip,
116164+ .put = eg_cache_put,
116165+ .remove_entry = eg_cache_remove_entry,
116166+ .update = update_eg_cache_entry,
116167+ .clear_expired = clear_expired,
116168+ .destroy_cache = eg_destroy_cache
116169 };
116170
116171
116172diff --git a/net/atm/proc.c b/net/atm/proc.c
116173index bbb6461..cf04016 100644
116174--- a/net/atm/proc.c
116175+++ b/net/atm/proc.c
116176@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
116177 const struct k_atm_aal_stats *stats)
116178 {
116179 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
116180- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
116181- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
116182- atomic_read(&stats->rx_drop));
116183+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
116184+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
116185+ atomic_read_unchecked(&stats->rx_drop));
116186 }
116187
116188 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
116189diff --git a/net/atm/resources.c b/net/atm/resources.c
116190index 0447d5d..3cf4728 100644
116191--- a/net/atm/resources.c
116192+++ b/net/atm/resources.c
116193@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
116194 static void copy_aal_stats(struct k_atm_aal_stats *from,
116195 struct atm_aal_stats *to)
116196 {
116197-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116198+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116199 __AAL_STAT_ITEMS
116200 #undef __HANDLE_ITEM
116201 }
116202@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
116203 static void subtract_aal_stats(struct k_atm_aal_stats *from,
116204 struct atm_aal_stats *to)
116205 {
116206-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116207+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
116208 __AAL_STAT_ITEMS
116209 #undef __HANDLE_ITEM
116210 }
116211diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
116212index 1997538..3b78e84 100644
116213--- a/net/ax25/ax25_subr.c
116214+++ b/net/ax25/ax25_subr.c
116215@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
116216 {
116217 ax25_clear_queues(ax25);
116218
116219+ ax25_stop_heartbeat(ax25);
116220 ax25_stop_t1timer(ax25);
116221 ax25_stop_t2timer(ax25);
116222 ax25_stop_t3timer(ax25);
116223diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
116224index 919a5ce..cc6b444 100644
116225--- a/net/ax25/sysctl_net_ax25.c
116226+++ b/net/ax25/sysctl_net_ax25.c
116227@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
116228 {
116229 char path[sizeof("net/ax25/") + IFNAMSIZ];
116230 int k;
116231- struct ctl_table *table;
116232+ ctl_table_no_const *table;
116233
116234 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
116235 if (!table)
116236diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
116237index 00e00e0..710fcd2 100644
116238--- a/net/batman-adv/bat_iv_ogm.c
116239+++ b/net/batman-adv/bat_iv_ogm.c
116240@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
116241
116242 /* randomize initial seqno to avoid collision */
116243 get_random_bytes(&random_seqno, sizeof(random_seqno));
116244- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116245+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116246
116247 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
116248 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
116249@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
116250 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
116251
116252 /* change sequence number to network order */
116253- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
116254+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
116255 batadv_ogm_packet->seqno = htonl(seqno);
116256- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
116257+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
116258
116259 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
116260
116261@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
116262 return;
116263
116264 /* could be changed by schedule_own_packet() */
116265- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
116266+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
116267
116268 if (ogm_packet->flags & BATADV_DIRECTLINK)
116269 has_directlink_flag = true;
116270diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
116271index 3d1dcaa..4699f4e 100644
116272--- a/net/batman-adv/fragmentation.c
116273+++ b/net/batman-adv/fragmentation.c
116274@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
116275 frag_header.packet_type = BATADV_UNICAST_FRAG;
116276 frag_header.version = BATADV_COMPAT_VERSION;
116277 frag_header.ttl = BATADV_TTL;
116278- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
116279+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
116280 frag_header.reserved = 0;
116281 frag_header.no = 0;
116282 frag_header.total_size = htons(skb->len);
116283diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
116284index 5ec31d7..e371631 100644
116285--- a/net/batman-adv/soft-interface.c
116286+++ b/net/batman-adv/soft-interface.c
116287@@ -295,7 +295,7 @@ send:
116288 primary_if->net_dev->dev_addr);
116289
116290 /* set broadcast sequence number */
116291- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
116292+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
116293 bcast_packet->seqno = htonl(seqno);
116294
116295 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
116296@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116297 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
116298
116299 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
116300- atomic_set(&bat_priv->bcast_seqno, 1);
116301+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
116302 atomic_set(&bat_priv->tt.vn, 0);
116303 atomic_set(&bat_priv->tt.local_changes, 0);
116304 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
116305@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116306
116307 /* randomize initial seqno to avoid collision */
116308 get_random_bytes(&random_seqno, sizeof(random_seqno));
116309- atomic_set(&bat_priv->frag_seqno, random_seqno);
116310+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
116311
116312 bat_priv->primary_if = NULL;
116313 bat_priv->num_ifaces = 0;
116314@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
116315 return 0;
116316 }
116317
116318-struct rtnl_link_ops batadv_link_ops __read_mostly = {
116319+struct rtnl_link_ops batadv_link_ops = {
116320 .kind = "batadv",
116321 .priv_size = sizeof(struct batadv_priv),
116322 .setup = batadv_softif_init_early,
116323diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
116324index 9398c3f..0e79657 100644
116325--- a/net/batman-adv/types.h
116326+++ b/net/batman-adv/types.h
116327@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
116328 struct batadv_hard_iface_bat_iv {
116329 unsigned char *ogm_buff;
116330 int ogm_buff_len;
116331- atomic_t ogm_seqno;
116332+ atomic_unchecked_t ogm_seqno;
116333 };
116334
116335 /**
116336@@ -766,7 +766,7 @@ struct batadv_priv {
116337 atomic_t bonding;
116338 atomic_t fragmentation;
116339 atomic_t packet_size_max;
116340- atomic_t frag_seqno;
116341+ atomic_unchecked_t frag_seqno;
116342 #ifdef CONFIG_BATMAN_ADV_BLA
116343 atomic_t bridge_loop_avoidance;
116344 #endif
116345@@ -785,7 +785,7 @@ struct batadv_priv {
116346 #endif
116347 uint32_t isolation_mark;
116348 uint32_t isolation_mark_mask;
116349- atomic_t bcast_seqno;
116350+ atomic_unchecked_t bcast_seqno;
116351 atomic_t bcast_queue_left;
116352 atomic_t batman_queue_left;
116353 char num_ifaces;
116354diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
116355index 56f9edb..0a13cd1 100644
116356--- a/net/bluetooth/hci_sock.c
116357+++ b/net/bluetooth/hci_sock.c
116358@@ -1241,7 +1241,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
116359 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
116360 }
116361
116362- len = min_t(unsigned int, len, sizeof(uf));
116363+ len = min((size_t)len, sizeof(uf));
116364 if (copy_from_user(&uf, optval, len)) {
116365 err = -EFAULT;
116366 break;
116367diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
116368index dad4197..253bbdf 100644
116369--- a/net/bluetooth/l2cap_core.c
116370+++ b/net/bluetooth/l2cap_core.c
116371@@ -3541,8 +3541,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
116372 break;
116373
116374 case L2CAP_CONF_RFC:
116375- if (olen == sizeof(rfc))
116376- memcpy(&rfc, (void *)val, olen);
116377+ if (olen != sizeof(rfc))
116378+ break;
116379+
116380+ memcpy(&rfc, (void *)val, olen);
116381
116382 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
116383 rfc.mode != chan->mode)
116384diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
116385index a7278f0..3443626 100644
116386--- a/net/bluetooth/l2cap_sock.c
116387+++ b/net/bluetooth/l2cap_sock.c
116388@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116389 struct sock *sk = sock->sk;
116390 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
116391 struct l2cap_options opts;
116392- int len, err = 0;
116393+ int err = 0;
116394+ size_t len = optlen;
116395 u32 opt;
116396
116397 BT_DBG("sk %p", sk);
116398@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116399 opts.max_tx = chan->max_tx;
116400 opts.txwin_size = chan->tx_win;
116401
116402- len = min_t(unsigned int, sizeof(opts), optlen);
116403+ len = min(sizeof(opts), len);
116404 if (copy_from_user((char *) &opts, optval, len)) {
116405 err = -EFAULT;
116406 break;
116407@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116408 struct bt_security sec;
116409 struct bt_power pwr;
116410 struct l2cap_conn *conn;
116411- int len, err = 0;
116412+ int err = 0;
116413+ size_t len = optlen;
116414 u32 opt;
116415
116416 BT_DBG("sk %p", sk);
116417@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116418
116419 sec.level = BT_SECURITY_LOW;
116420
116421- len = min_t(unsigned int, sizeof(sec), optlen);
116422+ len = min(sizeof(sec), len);
116423 if (copy_from_user((char *) &sec, optval, len)) {
116424 err = -EFAULT;
116425 break;
116426@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116427
116428 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
116429
116430- len = min_t(unsigned int, sizeof(pwr), optlen);
116431+ len = min(sizeof(pwr), len);
116432 if (copy_from_user((char *) &pwr, optval, len)) {
116433 err = -EFAULT;
116434 break;
116435diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
116436index 825e8fb..efc24a4 100644
116437--- a/net/bluetooth/rfcomm/sock.c
116438+++ b/net/bluetooth/rfcomm/sock.c
116439@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116440 struct sock *sk = sock->sk;
116441 struct bt_security sec;
116442 int err = 0;
116443- size_t len;
116444+ size_t len = optlen;
116445 u32 opt;
116446
116447 BT_DBG("sk %p", sk);
116448@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116449
116450 sec.level = BT_SECURITY_LOW;
116451
116452- len = min_t(unsigned int, sizeof(sec), optlen);
116453+ len = min(sizeof(sec), len);
116454 if (copy_from_user((char *) &sec, optval, len)) {
116455 err = -EFAULT;
116456 break;
116457diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
116458index 8e385a0..a5bdd8e 100644
116459--- a/net/bluetooth/rfcomm/tty.c
116460+++ b/net/bluetooth/rfcomm/tty.c
116461@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
116462 BT_DBG("tty %p id %d", tty, tty->index);
116463
116464 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
116465- dev->channel, dev->port.count);
116466+ dev->channel, atomic_read(&dev->port.count));
116467
116468 err = tty_port_open(&dev->port, tty, filp);
116469 if (err)
116470@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
116471 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
116472
116473 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
116474- dev->port.count);
116475+ atomic_read(&dev->port.count));
116476
116477 tty_port_close(&dev->port, tty, filp);
116478 }
116479diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
116480index e29ad70b..cc00066 100644
116481--- a/net/bridge/br_mdb.c
116482+++ b/net/bridge/br_mdb.c
116483@@ -371,6 +371,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
116484 if (!p || p->br != br || p->state == BR_STATE_DISABLED)
116485 return -EINVAL;
116486
116487+ memset(&ip, 0, sizeof(ip));
116488 ip.proto = entry->addr.proto;
116489 if (ip.proto == htons(ETH_P_IP))
116490 ip.u.ip4 = entry->addr.u.ip4;
116491@@ -417,6 +418,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
116492 if (!netif_running(br->dev) || br->multicast_disabled)
116493 return -EINVAL;
116494
116495+ memset(&ip, 0, sizeof(ip));
116496 ip.proto = entry->addr.proto;
116497 if (ip.proto == htons(ETH_P_IP)) {
116498 if (timer_pending(&br->ip4_other_query.timer))
116499diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
116500index 4b5c236..0627070 100644
116501--- a/net/bridge/br_netlink.c
116502+++ b/net/bridge/br_netlink.c
116503@@ -841,7 +841,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
116504 .get_link_af_size = br_get_link_af_size,
116505 };
116506
116507-struct rtnl_link_ops br_link_ops __read_mostly = {
116508+struct rtnl_link_ops br_link_ops = {
116509 .kind = "bridge",
116510 .priv_size = sizeof(struct net_bridge),
116511 .setup = br_dev_setup,
116512diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
116513index 91180a7..1301daa 100644
116514--- a/net/bridge/netfilter/ebtables.c
116515+++ b/net/bridge/netfilter/ebtables.c
116516@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
116517 tmp.valid_hooks = t->table->valid_hooks;
116518 }
116519 mutex_unlock(&ebt_mutex);
116520- if (copy_to_user(user, &tmp, *len) != 0) {
116521+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116522 BUGPRINT("c2u Didn't work\n");
116523 ret = -EFAULT;
116524 break;
116525@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116526 goto out;
116527 tmp.valid_hooks = t->valid_hooks;
116528
116529- if (copy_to_user(user, &tmp, *len) != 0) {
116530+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116531 ret = -EFAULT;
116532 break;
116533 }
116534@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116535 tmp.entries_size = t->table->entries_size;
116536 tmp.valid_hooks = t->table->valid_hooks;
116537
116538- if (copy_to_user(user, &tmp, *len) != 0) {
116539+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116540 ret = -EFAULT;
116541 break;
116542 }
116543diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
116544index f5afda1..dcf770a 100644
116545--- a/net/caif/cfctrl.c
116546+++ b/net/caif/cfctrl.c
116547@@ -10,6 +10,7 @@
116548 #include <linux/spinlock.h>
116549 #include <linux/slab.h>
116550 #include <linux/pkt_sched.h>
116551+#include <linux/sched.h>
116552 #include <net/caif/caif_layer.h>
116553 #include <net/caif/cfpkt.h>
116554 #include <net/caif/cfctrl.h>
116555@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
116556 memset(&dev_info, 0, sizeof(dev_info));
116557 dev_info.id = 0xff;
116558 cfsrvl_init(&this->serv, 0, &dev_info, false);
116559- atomic_set(&this->req_seq_no, 1);
116560- atomic_set(&this->rsp_seq_no, 1);
116561+ atomic_set_unchecked(&this->req_seq_no, 1);
116562+ atomic_set_unchecked(&this->rsp_seq_no, 1);
116563 this->serv.layer.receive = cfctrl_recv;
116564 sprintf(this->serv.layer.name, "ctrl");
116565 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
116566@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
116567 struct cfctrl_request_info *req)
116568 {
116569 spin_lock_bh(&ctrl->info_list_lock);
116570- atomic_inc(&ctrl->req_seq_no);
116571- req->sequence_no = atomic_read(&ctrl->req_seq_no);
116572+ atomic_inc_unchecked(&ctrl->req_seq_no);
116573+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
116574 list_add_tail(&req->list, &ctrl->list);
116575 spin_unlock_bh(&ctrl->info_list_lock);
116576 }
116577@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
116578 if (p != first)
116579 pr_warn("Requests are not received in order\n");
116580
116581- atomic_set(&ctrl->rsp_seq_no,
116582+ atomic_set_unchecked(&ctrl->rsp_seq_no,
116583 p->sequence_no);
116584 list_del(&p->list);
116585 goto out;
116586diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
116587index 67a4a36..8d28068 100644
116588--- a/net/caif/chnl_net.c
116589+++ b/net/caif/chnl_net.c
116590@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
116591 };
116592
116593
116594-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
116595+static struct rtnl_link_ops ipcaif_link_ops = {
116596 .kind = "caif",
116597 .priv_size = sizeof(struct chnl_net),
116598 .setup = ipcaif_net_setup,
116599diff --git a/net/can/af_can.c b/net/can/af_can.c
116600index 689c818..6323851 100644
116601--- a/net/can/af_can.c
116602+++ b/net/can/af_can.c
116603@@ -888,7 +888,7 @@ static const struct net_proto_family can_family_ops = {
116604 };
116605
116606 /* notifier block for netdevice event */
116607-static struct notifier_block can_netdev_notifier __read_mostly = {
116608+static struct notifier_block can_netdev_notifier = {
116609 .notifier_call = can_notifier,
116610 };
116611
116612diff --git a/net/can/bcm.c b/net/can/bcm.c
116613index b523453..f96e639 100644
116614--- a/net/can/bcm.c
116615+++ b/net/can/bcm.c
116616@@ -1618,7 +1618,7 @@ static int __init bcm_module_init(void)
116617 }
116618
116619 /* create /proc/net/can-bcm directory */
116620- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
116621+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
116622 return 0;
116623 }
116624
116625diff --git a/net/can/gw.c b/net/can/gw.c
116626index a6f448e..5902171 100644
116627--- a/net/can/gw.c
116628+++ b/net/can/gw.c
116629@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
116630 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
116631
116632 static HLIST_HEAD(cgw_list);
116633-static struct notifier_block notifier;
116634
116635 static struct kmem_cache *cgw_cache __read_mostly;
116636
116637@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
116638 return err;
116639 }
116640
116641+static struct notifier_block notifier = {
116642+ .notifier_call = cgw_notifier
116643+};
116644+
116645 static __init int cgw_module_init(void)
116646 {
116647 /* sanitize given module parameter */
116648@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
116649 return -ENOMEM;
116650
116651 /* set notifier */
116652- notifier.notifier_call = cgw_notifier;
116653 register_netdevice_notifier(&notifier);
116654
116655 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
116656diff --git a/net/can/proc.c b/net/can/proc.c
116657index 1a19b98..df2b4ec 100644
116658--- a/net/can/proc.c
116659+++ b/net/can/proc.c
116660@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
116661 void can_init_proc(void)
116662 {
116663 /* create /proc/net/can directory */
116664- can_dir = proc_mkdir("can", init_net.proc_net);
116665+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
116666
116667 if (!can_dir) {
116668 printk(KERN_INFO "can: failed to create /proc/net/can . "
116669diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
116670index 967080a..5e75f04 100644
116671--- a/net/ceph/messenger.c
116672+++ b/net/ceph/messenger.c
116673@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
116674 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
116675
116676 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
116677-static atomic_t addr_str_seq = ATOMIC_INIT(0);
116678+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
116679
116680 static struct page *zero_page; /* used in certain error cases */
116681
116682@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
116683 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
116684 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
116685
116686- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116687+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116688 s = addr_str[i];
116689
116690 switch (ss->ss_family) {
116691diff --git a/net/compat.c b/net/compat.c
116692index 5cfd26a..7e43828 100644
116693--- a/net/compat.c
116694+++ b/net/compat.c
116695@@ -98,20 +98,20 @@ int get_compat_msghdr(struct msghdr *kmsg,
116696
116697 #define CMSG_COMPAT_FIRSTHDR(msg) \
116698 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
116699- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
116700+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
116701 (struct compat_cmsghdr __user *)NULL)
116702
116703 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
116704 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
116705 (ucmlen) <= (unsigned long) \
116706 ((mhdr)->msg_controllen - \
116707- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
116708+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
116709
116710 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
116711 struct compat_cmsghdr __user *cmsg, int cmsg_len)
116712 {
116713 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
116714- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
116715+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
116716 msg->msg_controllen)
116717 return NULL;
116718 return (struct compat_cmsghdr __user *)ptr;
116719@@ -201,7 +201,7 @@ Efault:
116720
116721 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
116722 {
116723- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116724+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116725 struct compat_cmsghdr cmhdr;
116726 struct compat_timeval ctv;
116727 struct compat_timespec cts[3];
116728@@ -257,7 +257,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
116729
116730 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
116731 {
116732- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116733+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116734 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
116735 int fdnum = scm->fp->count;
116736 struct file **fp = scm->fp->fp;
116737@@ -345,7 +345,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
116738 return -EFAULT;
116739 old_fs = get_fs();
116740 set_fs(KERNEL_DS);
116741- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
116742+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
116743 set_fs(old_fs);
116744
116745 return err;
116746@@ -406,7 +406,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
116747 len = sizeof(ktime);
116748 old_fs = get_fs();
116749 set_fs(KERNEL_DS);
116750- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
116751+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
116752 set_fs(old_fs);
116753
116754 if (!err) {
116755@@ -549,7 +549,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116756 case MCAST_JOIN_GROUP:
116757 case MCAST_LEAVE_GROUP:
116758 {
116759- struct compat_group_req __user *gr32 = (void *)optval;
116760+ struct compat_group_req __user *gr32 = (void __user *)optval;
116761 struct group_req __user *kgr =
116762 compat_alloc_user_space(sizeof(struct group_req));
116763 u32 interface;
116764@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116765 case MCAST_BLOCK_SOURCE:
116766 case MCAST_UNBLOCK_SOURCE:
116767 {
116768- struct compat_group_source_req __user *gsr32 = (void *)optval;
116769+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
116770 struct group_source_req __user *kgsr = compat_alloc_user_space(
116771 sizeof(struct group_source_req));
116772 u32 interface;
116773@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116774 }
116775 case MCAST_MSFILTER:
116776 {
116777- struct compat_group_filter __user *gf32 = (void *)optval;
116778+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116779 struct group_filter __user *kgf;
116780 u32 interface, fmode, numsrc;
116781
116782@@ -629,7 +629,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
116783 char __user *optval, int __user *optlen,
116784 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
116785 {
116786- struct compat_group_filter __user *gf32 = (void *)optval;
116787+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116788 struct group_filter __user *kgf;
116789 int __user *koptlen;
116790 u32 interface, fmode, numsrc;
116791@@ -773,7 +773,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
116792
116793 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
116794 return -EINVAL;
116795- if (copy_from_user(a, args, nas[call]))
116796+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
116797 return -EFAULT;
116798 a0 = a[0];
116799 a1 = a[1];
116800diff --git a/net/core/datagram.c b/net/core/datagram.c
116801index b80fb91..d9f4ea5 100644
116802--- a/net/core/datagram.c
116803+++ b/net/core/datagram.c
116804@@ -131,6 +131,35 @@ out_noerr:
116805 goto out;
116806 }
116807
116808+static int skb_set_peeked(struct sk_buff *skb)
116809+{
116810+ struct sk_buff *nskb;
116811+
116812+ if (skb->peeked)
116813+ return 0;
116814+
116815+ /* We have to unshare an skb before modifying it. */
116816+ if (!skb_shared(skb))
116817+ goto done;
116818+
116819+ nskb = skb_clone(skb, GFP_ATOMIC);
116820+ if (!nskb)
116821+ return -ENOMEM;
116822+
116823+ skb->prev->next = nskb;
116824+ skb->next->prev = nskb;
116825+ nskb->prev = skb->prev;
116826+ nskb->next = skb->next;
116827+
116828+ consume_skb(skb);
116829+ skb = nskb;
116830+
116831+done:
116832+ skb->peeked = 1;
116833+
116834+ return 0;
116835+}
116836+
116837 /**
116838 * __skb_recv_datagram - Receive a datagram skbuff
116839 * @sk: socket
116840@@ -165,7 +194,9 @@ out_noerr:
116841 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116842 int *peeked, int *off, int *err)
116843 {
116844+ struct sk_buff_head *queue = &sk->sk_receive_queue;
116845 struct sk_buff *skb, *last;
116846+ unsigned long cpu_flags;
116847 long timeo;
116848 /*
116849 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
116850@@ -184,8 +215,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116851 * Look at current nfs client by the way...
116852 * However, this function was correct in any case. 8)
116853 */
116854- unsigned long cpu_flags;
116855- struct sk_buff_head *queue = &sk->sk_receive_queue;
116856 int _off = *off;
116857
116858 last = (struct sk_buff *)queue;
116859@@ -199,7 +228,11 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116860 _off -= skb->len;
116861 continue;
116862 }
116863- skb->peeked = 1;
116864+
116865+ error = skb_set_peeked(skb);
116866+ if (error)
116867+ goto unlock_err;
116868+
116869 atomic_inc(&skb->users);
116870 } else
116871 __skb_unlink(skb, queue);
116872@@ -223,6 +256,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
116873
116874 return NULL;
116875
116876+unlock_err:
116877+ spin_unlock_irqrestore(&queue->lock, cpu_flags);
116878 no_packet:
116879 *err = error;
116880 return NULL;
116881@@ -302,7 +337,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
116882 }
116883
116884 kfree_skb(skb);
116885- atomic_inc(&sk->sk_drops);
116886+ atomic_inc_unchecked(&sk->sk_drops);
116887 sk_mem_reclaim_partial(sk);
116888
116889 return err;
116890@@ -622,7 +657,8 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
116891 !skb->csum_complete_sw)
116892 netdev_rx_csum_fault(skb->dev);
116893 }
116894- skb->csum_valid = !sum;
116895+ if (!skb_shared(skb))
116896+ skb->csum_valid = !sum;
116897 return sum;
116898 }
116899 EXPORT_SYMBOL(__skb_checksum_complete_head);
116900@@ -642,11 +678,13 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
116901 netdev_rx_csum_fault(skb->dev);
116902 }
116903
116904- /* Save full packet checksum */
116905- skb->csum = csum;
116906- skb->ip_summed = CHECKSUM_COMPLETE;
116907- skb->csum_complete_sw = 1;
116908- skb->csum_valid = !sum;
116909+ if (!skb_shared(skb)) {
116910+ /* Save full packet checksum */
116911+ skb->csum = csum;
116912+ skb->ip_summed = CHECKSUM_COMPLETE;
116913+ skb->csum_complete_sw = 1;
116914+ skb->csum_valid = !sum;
116915+ }
116916
116917 return sum;
116918 }
116919diff --git a/net/core/dev.c b/net/core/dev.c
116920index aa82f9a..f28b00e 100644
116921--- a/net/core/dev.c
116922+++ b/net/core/dev.c
116923@@ -1720,7 +1720,7 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
116924 {
116925 if (skb_orphan_frags(skb, GFP_ATOMIC) ||
116926 unlikely(!is_skb_forwardable(dev, skb))) {
116927- atomic_long_inc(&dev->rx_dropped);
116928+ atomic_long_inc_unchecked(&dev->rx_dropped);
116929 kfree_skb(skb);
116930 return NET_RX_DROP;
116931 }
116932@@ -3018,7 +3018,7 @@ recursion_alert:
116933 drop:
116934 rcu_read_unlock_bh();
116935
116936- atomic_long_inc(&dev->tx_dropped);
116937+ atomic_long_inc_unchecked(&dev->tx_dropped);
116938 kfree_skb_list(skb);
116939 return rc;
116940 out:
116941@@ -3367,7 +3367,7 @@ enqueue:
116942
116943 local_irq_restore(flags);
116944
116945- atomic_long_inc(&skb->dev->rx_dropped);
116946+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
116947 kfree_skb(skb);
116948 return NET_RX_DROP;
116949 }
116950@@ -3444,7 +3444,7 @@ int netif_rx_ni(struct sk_buff *skb)
116951 }
116952 EXPORT_SYMBOL(netif_rx_ni);
116953
116954-static void net_tx_action(struct softirq_action *h)
116955+static __latent_entropy void net_tx_action(void)
116956 {
116957 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
116958
116959@@ -3783,7 +3783,7 @@ ncls:
116960 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
116961 } else {
116962 drop:
116963- atomic_long_inc(&skb->dev->rx_dropped);
116964+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
116965 kfree_skb(skb);
116966 /* Jamal, now you will not able to escape explaining
116967 * me how you were going to use this. :-)
116968@@ -4672,7 +4672,7 @@ out_unlock:
116969 return work;
116970 }
116971
116972-static void net_rx_action(struct softirq_action *h)
116973+static __latent_entropy void net_rx_action(void)
116974 {
116975 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
116976 unsigned long time_limit = jiffies + 2;
116977@@ -6721,8 +6721,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
116978 } else {
116979 netdev_stats_to_stats64(storage, &dev->stats);
116980 }
116981- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
116982- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
116983+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
116984+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
116985 return storage;
116986 }
116987 EXPORT_SYMBOL(dev_get_stats);
116988diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
116989index b94b1d2..da3ed7c 100644
116990--- a/net/core/dev_ioctl.c
116991+++ b/net/core/dev_ioctl.c
116992@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
116993 no_module = !dev;
116994 if (no_module && capable(CAP_NET_ADMIN))
116995 no_module = request_module("netdev-%s", name);
116996- if (no_module && capable(CAP_SYS_MODULE))
116997+ if (no_module && capable(CAP_SYS_MODULE)) {
116998+#ifdef CONFIG_GRKERNSEC_MODHARDEN
116999+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
117000+#else
117001 request_module("%s", name);
117002+#endif
117003+ }
117004 }
117005 EXPORT_SYMBOL(dev_load);
117006
117007diff --git a/net/core/dst.c b/net/core/dst.c
117008index e956ce6..002144be 100644
117009--- a/net/core/dst.c
117010+++ b/net/core/dst.c
117011@@ -284,7 +284,9 @@ void dst_release(struct dst_entry *dst)
117012 int newrefcnt;
117013
117014 newrefcnt = atomic_dec_return(&dst->__refcnt);
117015- WARN_ON(newrefcnt < 0);
117016+ if (unlikely(newrefcnt < 0))
117017+ net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
117018+ __func__, dst, newrefcnt);
117019 if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
117020 call_rcu(&dst->rcu_head, dst_destroy_rcu);
117021 }
117022diff --git a/net/core/filter.c b/net/core/filter.c
117023index bf831a8..8d2c4c2 100644
117024--- a/net/core/filter.c
117025+++ b/net/core/filter.c
117026@@ -579,7 +579,11 @@ do_pass:
117027
117028 /* Unknown instruction. */
117029 default:
117030- goto err;
117031+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
117032+ fp->code, fp->jt, fp->jf, fp->k);
117033+ kfree(addrs);
117034+ BUG();
117035+ return -EINVAL;
117036 }
117037
117038 insn++;
117039@@ -623,7 +627,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
117040 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
117041 int pc, ret = 0;
117042
117043- BUILD_BUG_ON(BPF_MEMWORDS > 16);
117044+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
117045
117046 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
117047 if (!masks)
117048@@ -1038,7 +1042,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
117049 if (!fp)
117050 return -ENOMEM;
117051
117052- memcpy(fp->insns, fprog->filter, fsize);
117053+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
117054
117055 fp->len = fprog->len;
117056 /* Since unattached filters are not copied back to user
117057diff --git a/net/core/flow.c b/net/core/flow.c
117058index 1033725..340f65d 100644
117059--- a/net/core/flow.c
117060+++ b/net/core/flow.c
117061@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
117062 static int flow_entry_valid(struct flow_cache_entry *fle,
117063 struct netns_xfrm *xfrm)
117064 {
117065- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
117066+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
117067 return 0;
117068 if (fle->object && !fle->object->ops->check(fle->object))
117069 return 0;
117070@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
117071 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
117072 fcp->hash_count++;
117073 }
117074- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
117075+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
117076 flo = fle->object;
117077 if (!flo)
117078 goto ret_object;
117079@@ -263,7 +263,7 @@ nocache:
117080 }
117081 flo = resolver(net, key, family, dir, flo, ctx);
117082 if (fle) {
117083- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
117084+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
117085 if (!IS_ERR(flo))
117086 fle->object = flo;
117087 else
117088diff --git a/net/core/neighbour.c b/net/core/neighbour.c
117089index 2237c1b..c0c80ab 100644
117090--- a/net/core/neighbour.c
117091+++ b/net/core/neighbour.c
117092@@ -2818,7 +2818,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
117093 void __user *buffer, size_t *lenp, loff_t *ppos)
117094 {
117095 int size, ret;
117096- struct ctl_table tmp = *ctl;
117097+ ctl_table_no_const tmp = *ctl;
117098
117099 tmp.extra1 = &zero;
117100 tmp.extra2 = &unres_qlen_max;
117101@@ -2880,7 +2880,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
117102 void __user *buffer,
117103 size_t *lenp, loff_t *ppos)
117104 {
117105- struct ctl_table tmp = *ctl;
117106+ ctl_table_no_const tmp = *ctl;
117107 int ret;
117108
117109 tmp.extra1 = &zero;
117110diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
117111index 2bf8329..2eb1423 100644
117112--- a/net/core/net-procfs.c
117113+++ b/net/core/net-procfs.c
117114@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
117115 struct rtnl_link_stats64 temp;
117116 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
117117
117118- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117119+ if (gr_proc_is_restricted())
117120+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117121+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117122+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
117123+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
117124+ else
117125+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117126 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117127 dev->name, stats->rx_bytes, stats->rx_packets,
117128 stats->rx_errors,
117129@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
117130 return 0;
117131 }
117132
117133-static const struct seq_operations dev_seq_ops = {
117134+const struct seq_operations dev_seq_ops = {
117135 .start = dev_seq_start,
117136 .next = dev_seq_next,
117137 .stop = dev_seq_stop,
117138@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
117139
117140 static int softnet_seq_open(struct inode *inode, struct file *file)
117141 {
117142- return seq_open(file, &softnet_seq_ops);
117143+ return seq_open_restrict(file, &softnet_seq_ops);
117144 }
117145
117146 static const struct file_operations softnet_seq_fops = {
117147@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
117148 else
117149 seq_printf(seq, "%04x", ntohs(pt->type));
117150
117151+#ifdef CONFIG_GRKERNSEC_HIDESYM
117152+ seq_printf(seq, " %-8s %pf\n",
117153+ pt->dev ? pt->dev->name : "", NULL);
117154+#else
117155 seq_printf(seq, " %-8s %pf\n",
117156 pt->dev ? pt->dev->name : "", pt->func);
117157+#endif
117158 }
117159
117160 return 0;
117161diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
117162index 4238d6d..e6b605c 100644
117163--- a/net/core/net-sysfs.c
117164+++ b/net/core/net-sysfs.c
117165@@ -288,7 +288,7 @@ static ssize_t carrier_changes_show(struct device *dev,
117166 {
117167 struct net_device *netdev = to_net_dev(dev);
117168 return sprintf(buf, fmt_dec,
117169- atomic_read(&netdev->carrier_changes));
117170+ atomic_read_unchecked(&netdev->carrier_changes));
117171 }
117172 static DEVICE_ATTR_RO(carrier_changes);
117173
117174diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
117175index 572af00..5acf072 100644
117176--- a/net/core/net_namespace.c
117177+++ b/net/core/net_namespace.c
117178@@ -734,7 +734,7 @@ static int __register_pernet_operations(struct list_head *list,
117179 int error;
117180 LIST_HEAD(net_exit_list);
117181
117182- list_add_tail(&ops->list, list);
117183+ pax_list_add_tail((struct list_head *)&ops->list, list);
117184 if (ops->init || (ops->id && ops->size)) {
117185 for_each_net(net) {
117186 error = ops_init(ops, net);
117187@@ -747,7 +747,7 @@ static int __register_pernet_operations(struct list_head *list,
117188
117189 out_undo:
117190 /* If I have an error cleanup all namespaces I initialized */
117191- list_del(&ops->list);
117192+ pax_list_del((struct list_head *)&ops->list);
117193 ops_exit_list(ops, &net_exit_list);
117194 ops_free_list(ops, &net_exit_list);
117195 return error;
117196@@ -758,7 +758,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
117197 struct net *net;
117198 LIST_HEAD(net_exit_list);
117199
117200- list_del(&ops->list);
117201+ pax_list_del((struct list_head *)&ops->list);
117202 for_each_net(net)
117203 list_add_tail(&net->exit_list, &net_exit_list);
117204 ops_exit_list(ops, &net_exit_list);
117205@@ -892,7 +892,7 @@ int register_pernet_device(struct pernet_operations *ops)
117206 mutex_lock(&net_mutex);
117207 error = register_pernet_operations(&pernet_list, ops);
117208 if (!error && (first_device == &pernet_list))
117209- first_device = &ops->list;
117210+ first_device = (struct list_head *)&ops->list;
117211 mutex_unlock(&net_mutex);
117212 return error;
117213 }
117214diff --git a/net/core/netpoll.c b/net/core/netpoll.c
117215index c126a87..10ad89d 100644
117216--- a/net/core/netpoll.c
117217+++ b/net/core/netpoll.c
117218@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117219 struct udphdr *udph;
117220 struct iphdr *iph;
117221 struct ethhdr *eth;
117222- static atomic_t ip_ident;
117223+ static atomic_unchecked_t ip_ident;
117224 struct ipv6hdr *ip6h;
117225
117226 udp_len = len + sizeof(*udph);
117227@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117228 put_unaligned(0x45, (unsigned char *)iph);
117229 iph->tos = 0;
117230 put_unaligned(htons(ip_len), &(iph->tot_len));
117231- iph->id = htons(atomic_inc_return(&ip_ident));
117232+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
117233 iph->frag_off = 0;
117234 iph->ttl = 64;
117235 iph->protocol = IPPROTO_UDP;
117236diff --git a/net/core/pktgen.c b/net/core/pktgen.c
117237index 508155b..fad080f 100644
117238--- a/net/core/pktgen.c
117239+++ b/net/core/pktgen.c
117240@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
117241 pn->net = net;
117242 INIT_LIST_HEAD(&pn->pktgen_threads);
117243 pn->pktgen_exiting = false;
117244- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
117245+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
117246 if (!pn->proc_dir) {
117247 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
117248 return -ENODEV;
117249diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
117250index 8de3682..fcb8a5e 100644
117251--- a/net/core/rtnetlink.c
117252+++ b/net/core/rtnetlink.c
117253@@ -61,7 +61,7 @@ struct rtnl_link {
117254 rtnl_doit_func doit;
117255 rtnl_dumpit_func dumpit;
117256 rtnl_calcit_func calcit;
117257-};
117258+} __no_const;
117259
117260 static DEFINE_MUTEX(rtnl_mutex);
117261
117262@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
117263 * to use the ops for creating device. So do not
117264 * fill up dellink as well. That disables rtnl_dellink.
117265 */
117266- if (ops->setup && !ops->dellink)
117267- ops->dellink = unregister_netdevice_queue;
117268+ if (ops->setup && !ops->dellink) {
117269+ pax_open_kernel();
117270+ *(void **)&ops->dellink = unregister_netdevice_queue;
117271+ pax_close_kernel();
117272+ }
117273
117274- list_add_tail(&ops->list, &link_ops);
117275+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
117276 return 0;
117277 }
117278 EXPORT_SYMBOL_GPL(__rtnl_link_register);
117279@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
117280 for_each_net(net) {
117281 __rtnl_kill_links(net, ops);
117282 }
117283- list_del(&ops->list);
117284+ pax_list_del((struct list_head *)&ops->list);
117285 }
117286 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
117287
117288@@ -1066,7 +1069,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
117289 (dev->ifalias &&
117290 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
117291 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
117292- atomic_read(&dev->carrier_changes)))
117293+ atomic_read_unchecked(&dev->carrier_changes)))
117294 goto nla_put_failure;
117295
117296 if (1) {
117297@@ -1748,10 +1751,13 @@ static int do_setlink(const struct sk_buff *skb,
117298 goto errout;
117299
117300 nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
117301- if (nla_type(attr) != IFLA_VF_PORT)
117302- continue;
117303- err = nla_parse_nested(port, IFLA_PORT_MAX,
117304- attr, ifla_port_policy);
117305+ if (nla_type(attr) != IFLA_VF_PORT ||
117306+ nla_len(attr) < NLA_HDRLEN) {
117307+ err = -EINVAL;
117308+ goto errout;
117309+ }
117310+ err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
117311+ ifla_port_policy);
117312 if (err < 0)
117313 goto errout;
117314 if (!port[IFLA_PORT_VF]) {
117315diff --git a/net/core/scm.c b/net/core/scm.c
117316index 3b6899b..cf36238 100644
117317--- a/net/core/scm.c
117318+++ b/net/core/scm.c
117319@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
117320 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117321 {
117322 struct cmsghdr __user *cm
117323- = (__force struct cmsghdr __user *)msg->msg_control;
117324+ = (struct cmsghdr __force_user *)msg->msg_control;
117325 struct cmsghdr cmhdr;
117326 int cmlen = CMSG_LEN(len);
117327 int err;
117328@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117329 err = -EFAULT;
117330 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
117331 goto out;
117332- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
117333+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
117334 goto out;
117335 cmlen = CMSG_SPACE(len);
117336 if (msg->msg_controllen < cmlen)
117337@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
117338 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117339 {
117340 struct cmsghdr __user *cm
117341- = (__force struct cmsghdr __user*)msg->msg_control;
117342+ = (struct cmsghdr __force_user *)msg->msg_control;
117343
117344 int fdmax = 0;
117345 int fdnum = scm->fp->count;
117346@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117347 if (fdnum < fdmax)
117348 fdmax = fdnum;
117349
117350- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
117351+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
117352 i++, cmfptr++)
117353 {
117354 struct socket *sock;
117355diff --git a/net/core/skbuff.c b/net/core/skbuff.c
117356index 41ec022..3cc0a1c 100644
117357--- a/net/core/skbuff.c
117358+++ b/net/core/skbuff.c
117359@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
117360 __wsum skb_checksum(const struct sk_buff *skb, int offset,
117361 int len, __wsum csum)
117362 {
117363- const struct skb_checksum_ops ops = {
117364+ static const struct skb_checksum_ops ops = {
117365 .update = csum_partial_ext,
117366 .combine = csum_block_add_ext,
117367 };
117368@@ -3335,12 +3335,14 @@ void __init skb_init(void)
117369 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
117370 sizeof(struct sk_buff),
117371 0,
117372- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117373+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117374+ SLAB_NO_SANITIZE,
117375 NULL);
117376 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
117377 sizeof(struct sk_buff_fclones),
117378 0,
117379- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117380+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117381+ SLAB_NO_SANITIZE,
117382 NULL);
117383 }
117384
117385diff --git a/net/core/sock.c b/net/core/sock.c
117386index dc30dc5..8bb3ef3 100644
117387--- a/net/core/sock.c
117388+++ b/net/core/sock.c
117389@@ -440,7 +440,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117390 struct sk_buff_head *list = &sk->sk_receive_queue;
117391
117392 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
117393- atomic_inc(&sk->sk_drops);
117394+ atomic_inc_unchecked(&sk->sk_drops);
117395 trace_sock_rcvqueue_full(sk, skb);
117396 return -ENOMEM;
117397 }
117398@@ -450,7 +450,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117399 return err;
117400
117401 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
117402- atomic_inc(&sk->sk_drops);
117403+ atomic_inc_unchecked(&sk->sk_drops);
117404 return -ENOBUFS;
117405 }
117406
117407@@ -483,7 +483,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117408 skb->dev = NULL;
117409
117410 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
117411- atomic_inc(&sk->sk_drops);
117412+ atomic_inc_unchecked(&sk->sk_drops);
117413 goto discard_and_relse;
117414 }
117415 if (nested)
117416@@ -501,7 +501,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117417 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
117418 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
117419 bh_unlock_sock(sk);
117420- atomic_inc(&sk->sk_drops);
117421+ atomic_inc_unchecked(&sk->sk_drops);
117422 goto discard_and_relse;
117423 }
117424
117425@@ -907,6 +907,7 @@ set_rcvbuf:
117426 }
117427 break;
117428
117429+#ifndef GRKERNSEC_BPF_HARDEN
117430 case SO_ATTACH_BPF:
117431 ret = -EINVAL;
117432 if (optlen == sizeof(u32)) {
117433@@ -919,7 +920,7 @@ set_rcvbuf:
117434 ret = sk_attach_bpf(ufd, sk);
117435 }
117436 break;
117437-
117438+#endif
117439 case SO_DETACH_FILTER:
117440 ret = sk_detach_filter(sk);
117441 break;
117442@@ -1021,12 +1022,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117443 struct timeval tm;
117444 } v;
117445
117446- int lv = sizeof(int);
117447- int len;
117448+ unsigned int lv = sizeof(int);
117449+ unsigned int len;
117450
117451 if (get_user(len, optlen))
117452 return -EFAULT;
117453- if (len < 0)
117454+ if (len > INT_MAX)
117455 return -EINVAL;
117456
117457 memset(&v, 0, sizeof(v));
117458@@ -1164,11 +1165,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117459
117460 case SO_PEERNAME:
117461 {
117462- char address[128];
117463+ char address[_K_SS_MAXSIZE];
117464
117465 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
117466 return -ENOTCONN;
117467- if (lv < len)
117468+ if (lv < len || sizeof address < len)
117469 return -EINVAL;
117470 if (copy_to_user(optval, address, len))
117471 return -EFAULT;
117472@@ -1256,7 +1257,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117473
117474 if (len > lv)
117475 len = lv;
117476- if (copy_to_user(optval, &v, len))
117477+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
117478 return -EFAULT;
117479 lenout:
117480 if (put_user(len, optlen))
117481@@ -2359,7 +2360,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
117482 */
117483 smp_wmb();
117484 atomic_set(&sk->sk_refcnt, 1);
117485- atomic_set(&sk->sk_drops, 0);
117486+ atomic_set_unchecked(&sk->sk_drops, 0);
117487 }
117488 EXPORT_SYMBOL(sock_init_data);
117489
117490@@ -2487,6 +2488,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
117491 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117492 int level, int type)
117493 {
117494+ struct sock_extended_err ee;
117495 struct sock_exterr_skb *serr;
117496 struct sk_buff *skb;
117497 int copied, err;
117498@@ -2508,7 +2510,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117499 sock_recv_timestamp(msg, sk, skb);
117500
117501 serr = SKB_EXT_ERR(skb);
117502- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
117503+ ee = serr->ee;
117504+ put_cmsg(msg, level, type, sizeof ee, &ee);
117505
117506 msg->msg_flags |= MSG_ERRQUEUE;
117507 err = copied;
117508diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
117509index 74dddf8..7f4e77e 100644
117510--- a/net/core/sock_diag.c
117511+++ b/net/core/sock_diag.c
117512@@ -9,7 +9,7 @@
117513 #include <linux/inet_diag.h>
117514 #include <linux/sock_diag.h>
117515
117516-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
117517+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
117518 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
117519 static DEFINE_MUTEX(sock_diag_table_mutex);
117520
117521@@ -127,8 +127,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
117522 mutex_lock(&sock_diag_table_mutex);
117523 if (sock_diag_handlers[hndl->family])
117524 err = -EBUSY;
117525- else
117526+ else {
117527+ pax_open_kernel();
117528 sock_diag_handlers[hndl->family] = hndl;
117529+ pax_close_kernel();
117530+ }
117531 mutex_unlock(&sock_diag_table_mutex);
117532
117533 return err;
117534@@ -144,7 +147,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
117535
117536 mutex_lock(&sock_diag_table_mutex);
117537 BUG_ON(sock_diag_handlers[family] != hnld);
117538+ pax_open_kernel();
117539 sock_diag_handlers[family] = NULL;
117540+ pax_close_kernel();
117541 mutex_unlock(&sock_diag_table_mutex);
117542 }
117543 EXPORT_SYMBOL_GPL(sock_diag_unregister);
117544diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
117545index 95b6139..3048623 100644
117546--- a/net/core/sysctl_net_core.c
117547+++ b/net/core/sysctl_net_core.c
117548@@ -35,7 +35,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
117549 {
117550 unsigned int orig_size, size;
117551 int ret, i;
117552- struct ctl_table tmp = {
117553+ ctl_table_no_const tmp = {
117554 .data = &size,
117555 .maxlen = sizeof(size),
117556 .mode = table->mode
117557@@ -203,7 +203,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117558 void __user *buffer, size_t *lenp, loff_t *ppos)
117559 {
117560 char id[IFNAMSIZ];
117561- struct ctl_table tbl = {
117562+ ctl_table_no_const tbl = {
117563 .data = id,
117564 .maxlen = IFNAMSIZ,
117565 };
117566@@ -221,7 +221,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117567 static int proc_do_rss_key(struct ctl_table *table, int write,
117568 void __user *buffer, size_t *lenp, loff_t *ppos)
117569 {
117570- struct ctl_table fake_table;
117571+ ctl_table_no_const fake_table;
117572 char buf[NETDEV_RSS_KEY_LEN * 3];
117573
117574 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
117575@@ -285,7 +285,7 @@ static struct ctl_table net_core_table[] = {
117576 .mode = 0444,
117577 .proc_handler = proc_do_rss_key,
117578 },
117579-#ifdef CONFIG_BPF_JIT
117580+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
117581 {
117582 .procname = "bpf_jit_enable",
117583 .data = &bpf_jit_enable,
117584@@ -409,13 +409,12 @@ static struct ctl_table netns_core_table[] = {
117585
117586 static __net_init int sysctl_core_net_init(struct net *net)
117587 {
117588- struct ctl_table *tbl;
117589+ ctl_table_no_const *tbl = NULL;
117590
117591 net->core.sysctl_somaxconn = SOMAXCONN;
117592
117593- tbl = netns_core_table;
117594 if (!net_eq(net, &init_net)) {
117595- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
117596+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
117597 if (tbl == NULL)
117598 goto err_dup;
117599
117600@@ -425,17 +424,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
117601 if (net->user_ns != &init_user_ns) {
117602 tbl[0].procname = NULL;
117603 }
117604- }
117605-
117606- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117607+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117608+ } else
117609+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
117610 if (net->core.sysctl_hdr == NULL)
117611 goto err_reg;
117612
117613 return 0;
117614
117615 err_reg:
117616- if (tbl != netns_core_table)
117617- kfree(tbl);
117618+ kfree(tbl);
117619 err_dup:
117620 return -ENOMEM;
117621 }
117622@@ -450,7 +448,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
117623 kfree(tbl);
117624 }
117625
117626-static __net_initdata struct pernet_operations sysctl_core_ops = {
117627+static __net_initconst struct pernet_operations sysctl_core_ops = {
117628 .init = sysctl_core_net_init,
117629 .exit = sysctl_core_net_exit,
117630 };
117631diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
117632index 754484b..4f4b894 100644
117633--- a/net/decnet/af_decnet.c
117634+++ b/net/decnet/af_decnet.c
117635@@ -466,6 +466,7 @@ static struct proto dn_proto = {
117636 .sysctl_rmem = sysctl_decnet_rmem,
117637 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
117638 .obj_size = sizeof(struct dn_sock),
117639+ .slab_flags = SLAB_USERCOPY,
117640 };
117641
117642 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
117643diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
117644index b2c26b0..41f803e 100644
117645--- a/net/decnet/dn_dev.c
117646+++ b/net/decnet/dn_dev.c
117647@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
117648 .extra1 = &min_t3,
117649 .extra2 = &max_t3
117650 },
117651- {0}
117652+ { }
117653 },
117654 };
117655
117656diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
117657index 5325b54..a0d4d69 100644
117658--- a/net/decnet/sysctl_net_decnet.c
117659+++ b/net/decnet/sysctl_net_decnet.c
117660@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
117661
117662 if (len > *lenp) len = *lenp;
117663
117664- if (copy_to_user(buffer, addr, len))
117665+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
117666 return -EFAULT;
117667
117668 *lenp = len;
117669@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
117670
117671 if (len > *lenp) len = *lenp;
117672
117673- if (copy_to_user(buffer, devname, len))
117674+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
117675 return -EFAULT;
117676
117677 *lenp = len;
117678diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
117679index 392e29a..da953a2 100644
117680--- a/net/dsa/dsa.c
117681+++ b/net/dsa/dsa.c
117682@@ -851,7 +851,7 @@ static struct packet_type dsa_pack_type __read_mostly = {
117683 .func = dsa_switch_rcv,
117684 };
117685
117686-static struct notifier_block dsa_netdevice_nb __read_mostly = {
117687+static struct notifier_block dsa_netdevice_nb = {
117688 .notifier_call = dsa_slave_netdevice_event,
117689 };
117690
117691diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
117692index a2c7e4c..3dc9f67 100644
117693--- a/net/hsr/hsr_netlink.c
117694+++ b/net/hsr/hsr_netlink.c
117695@@ -102,7 +102,7 @@ nla_put_failure:
117696 return -EMSGSIZE;
117697 }
117698
117699-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
117700+static struct rtnl_link_ops hsr_link_ops = {
117701 .kind = "hsr",
117702 .maxtype = IFLA_HSR_MAX,
117703 .policy = hsr_policy,
117704diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
117705index 0ae5822..3fe3627 100644
117706--- a/net/ieee802154/6lowpan/core.c
117707+++ b/net/ieee802154/6lowpan/core.c
117708@@ -219,7 +219,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
117709 dev_put(real_dev);
117710 }
117711
117712-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
117713+static struct rtnl_link_ops lowpan_link_ops = {
117714 .kind = "lowpan",
117715 .priv_size = sizeof(struct lowpan_dev_info),
117716 .setup = lowpan_setup,
117717diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
117718index f46e4d1..30231f1 100644
117719--- a/net/ieee802154/6lowpan/reassembly.c
117720+++ b/net/ieee802154/6lowpan/reassembly.c
117721@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
117722
117723 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117724 {
117725- struct ctl_table *table;
117726+ ctl_table_no_const *table = NULL;
117727 struct ctl_table_header *hdr;
117728 struct netns_ieee802154_lowpan *ieee802154_lowpan =
117729 net_ieee802154_lowpan(net);
117730
117731- table = lowpan_frags_ns_ctl_table;
117732 if (!net_eq(net, &init_net)) {
117733- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
117734+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
117735 GFP_KERNEL);
117736 if (table == NULL)
117737 goto err_alloc;
117738@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117739 /* Don't export sysctls to unprivileged users */
117740 if (net->user_ns != &init_user_ns)
117741 table[0].procname = NULL;
117742- }
117743-
117744- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117745+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117746+ } else
117747+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
117748 if (hdr == NULL)
117749 goto err_reg;
117750
117751@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117752 return 0;
117753
117754 err_reg:
117755- if (!net_eq(net, &init_net))
117756- kfree(table);
117757+ kfree(table);
117758 err_alloc:
117759 return -ENOMEM;
117760 }
117761diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
117762index a5aa54e..3bd5f9f 100644
117763--- a/net/ipv4/af_inet.c
117764+++ b/net/ipv4/af_inet.c
117765@@ -1391,7 +1391,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
117766 return ip_recv_error(sk, msg, len, addr_len);
117767 #if IS_ENABLED(CONFIG_IPV6)
117768 if (sk->sk_family == AF_INET6)
117769- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
117770+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
117771 #endif
117772 return -EINVAL;
117773 }
117774diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
117775index 419d23c..2084616 100644
117776--- a/net/ipv4/devinet.c
117777+++ b/net/ipv4/devinet.c
117778@@ -69,7 +69,8 @@
117779
117780 static struct ipv4_devconf ipv4_devconf = {
117781 .data = {
117782- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117783+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117784+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117785 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117786 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117787 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117788@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
117789
117790 static struct ipv4_devconf ipv4_devconf_dflt = {
117791 .data = {
117792- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
117793+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
117794+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
117795 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
117796 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
117797 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
117798@@ -1580,7 +1582,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
117799 idx = 0;
117800 head = &net->dev_index_head[h];
117801 rcu_read_lock();
117802- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117803+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117804 net->dev_base_seq;
117805 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117806 if (idx < s_idx)
117807@@ -1899,7 +1901,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
117808 idx = 0;
117809 head = &net->dev_index_head[h];
117810 rcu_read_lock();
117811- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
117812+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
117813 net->dev_base_seq;
117814 hlist_for_each_entry_rcu(dev, head, index_hlist) {
117815 if (idx < s_idx)
117816@@ -2134,7 +2136,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
117817 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
117818 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
117819
117820-static struct devinet_sysctl_table {
117821+static const struct devinet_sysctl_table {
117822 struct ctl_table_header *sysctl_header;
117823 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
117824 } devinet_sysctl = {
117825@@ -2266,7 +2268,7 @@ static __net_init int devinet_init_net(struct net *net)
117826 int err;
117827 struct ipv4_devconf *all, *dflt;
117828 #ifdef CONFIG_SYSCTL
117829- struct ctl_table *tbl = ctl_forward_entry;
117830+ ctl_table_no_const *tbl = NULL;
117831 struct ctl_table_header *forw_hdr;
117832 #endif
117833
117834@@ -2284,7 +2286,7 @@ static __net_init int devinet_init_net(struct net *net)
117835 goto err_alloc_dflt;
117836
117837 #ifdef CONFIG_SYSCTL
117838- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
117839+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
117840 if (!tbl)
117841 goto err_alloc_ctl;
117842
117843@@ -2304,7 +2306,10 @@ static __net_init int devinet_init_net(struct net *net)
117844 goto err_reg_dflt;
117845
117846 err = -ENOMEM;
117847- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117848+ if (!net_eq(net, &init_net))
117849+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
117850+ else
117851+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
117852 if (!forw_hdr)
117853 goto err_reg_ctl;
117854 net->ipv4.forw_hdr = forw_hdr;
117855@@ -2320,8 +2325,7 @@ err_reg_ctl:
117856 err_reg_dflt:
117857 __devinet_sysctl_unregister(all);
117858 err_reg_all:
117859- if (tbl != ctl_forward_entry)
117860- kfree(tbl);
117861+ kfree(tbl);
117862 err_alloc_ctl:
117863 #endif
117864 if (dflt != &ipv4_devconf_dflt)
117865diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
117866index 872494e..8e0b4d1 100644
117867--- a/net/ipv4/fib_frontend.c
117868+++ b/net/ipv4/fib_frontend.c
117869@@ -1083,12 +1083,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
117870 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117871 fib_sync_up(dev);
117872 #endif
117873- atomic_inc(&net->ipv4.dev_addr_genid);
117874+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117875 rt_cache_flush(dev_net(dev));
117876 break;
117877 case NETDEV_DOWN:
117878 fib_del_ifaddr(ifa, NULL);
117879- atomic_inc(&net->ipv4.dev_addr_genid);
117880+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117881 if (!ifa->ifa_dev->ifa_list) {
117882 /* Last address was deleted from this interface.
117883 * Disable IP.
117884@@ -1126,7 +1126,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
117885 #ifdef CONFIG_IP_ROUTE_MULTIPATH
117886 fib_sync_up(dev);
117887 #endif
117888- atomic_inc(&net->ipv4.dev_addr_genid);
117889+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
117890 rt_cache_flush(net);
117891 break;
117892 case NETDEV_DOWN:
117893diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
117894index 8d695b6..752d427a 100644
117895--- a/net/ipv4/fib_semantics.c
117896+++ b/net/ipv4/fib_semantics.c
117897@@ -752,7 +752,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
117898 nh->nh_saddr = inet_select_addr(nh->nh_dev,
117899 nh->nh_gw,
117900 nh->nh_parent->fib_scope);
117901- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
117902+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
117903
117904 return nh->nh_saddr;
117905 }
117906diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
117907index c6fb80b..8705495 100644
117908--- a/net/ipv4/inet_hashtables.c
117909+++ b/net/ipv4/inet_hashtables.c
117910@@ -18,6 +18,7 @@
117911 #include <linux/sched.h>
117912 #include <linux/slab.h>
117913 #include <linux/wait.h>
117914+#include <linux/security.h>
117915
117916 #include <net/inet_connection_sock.h>
117917 #include <net/inet_hashtables.h>
117918@@ -53,6 +54,8 @@ u32 sk_ehashfn(const struct sock *sk)
117919 sk->sk_daddr, sk->sk_dport);
117920 }
117921
117922+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
117923+
117924 /*
117925 * Allocate and initialize a new local port bind bucket.
117926 * The bindhash mutex for snum's hash chain must be held here.
117927@@ -564,6 +567,8 @@ ok:
117928 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
117929 spin_unlock(&head->lock);
117930
117931+ gr_update_task_in_ip_table(inet_sk(sk));
117932+
117933 if (tw) {
117934 inet_twsk_deschedule(tw);
117935 while (twrefcnt) {
117936diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
117937index 241afd7..31b95d5 100644
117938--- a/net/ipv4/inetpeer.c
117939+++ b/net/ipv4/inetpeer.c
117940@@ -461,7 +461,7 @@ relookup:
117941 if (p) {
117942 p->daddr = *daddr;
117943 atomic_set(&p->refcnt, 1);
117944- atomic_set(&p->rid, 0);
117945+ atomic_set_unchecked(&p->rid, 0);
117946 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
117947 p->rate_tokens = 0;
117948 /* 60*HZ is arbitrary, but chosen enough high so that the first
117949diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
117950index cc1da6d..64b1534 100644
117951--- a/net/ipv4/ip_fragment.c
117952+++ b/net/ipv4/ip_fragment.c
117953@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
117954 return 0;
117955
117956 start = qp->rid;
117957- end = atomic_inc_return(&peer->rid);
117958+ end = atomic_inc_return_unchecked(&peer->rid);
117959 qp->rid = end;
117960
117961 rc = qp->q.fragments && (end - start) > max;
117962@@ -750,12 +750,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
117963
117964 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
117965 {
117966- struct ctl_table *table;
117967+ ctl_table_no_const *table = NULL;
117968 struct ctl_table_header *hdr;
117969
117970- table = ip4_frags_ns_ctl_table;
117971 if (!net_eq(net, &init_net)) {
117972- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
117973+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
117974 if (!table)
117975 goto err_alloc;
117976
117977@@ -769,9 +768,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
117978 /* Don't export sysctls to unprivileged users */
117979 if (net->user_ns != &init_user_ns)
117980 table[0].procname = NULL;
117981- }
117982+ hdr = register_net_sysctl(net, "net/ipv4", table);
117983+ } else
117984+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
117985
117986- hdr = register_net_sysctl(net, "net/ipv4", table);
117987 if (!hdr)
117988 goto err_reg;
117989
117990@@ -779,8 +779,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
117991 return 0;
117992
117993 err_reg:
117994- if (!net_eq(net, &init_net))
117995- kfree(table);
117996+ kfree(table);
117997 err_alloc:
117998 return -ENOMEM;
117999 }
118000diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
118001index 5fd7064..d13d75f 100644
118002--- a/net/ipv4/ip_gre.c
118003+++ b/net/ipv4/ip_gre.c
118004@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
118005 module_param(log_ecn_error, bool, 0644);
118006 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118007
118008-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
118009+static struct rtnl_link_ops ipgre_link_ops;
118010 static int ipgre_tunnel_init(struct net_device *dev);
118011
118012 static int ipgre_net_id __read_mostly;
118013@@ -819,7 +819,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
118014 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
118015 };
118016
118017-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118018+static struct rtnl_link_ops ipgre_link_ops = {
118019 .kind = "gre",
118020 .maxtype = IFLA_GRE_MAX,
118021 .policy = ipgre_policy,
118022@@ -834,7 +834,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118023 .get_link_net = ip_tunnel_get_link_net,
118024 };
118025
118026-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
118027+static struct rtnl_link_ops ipgre_tap_ops = {
118028 .kind = "gretap",
118029 .maxtype = IFLA_GRE_MAX,
118030 .policy = ipgre_policy,
118031diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
118032index 2db4c87..4db9282 100644
118033--- a/net/ipv4/ip_input.c
118034+++ b/net/ipv4/ip_input.c
118035@@ -147,6 +147,10 @@
118036 #include <linux/mroute.h>
118037 #include <linux/netlink.h>
118038
118039+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118040+extern int grsec_enable_blackhole;
118041+#endif
118042+
118043 /*
118044 * Process Router Attention IP option (RFC 2113)
118045 */
118046@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
118047 if (!raw) {
118048 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
118049 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
118050+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118051+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118052+#endif
118053 icmp_send(skb, ICMP_DEST_UNREACH,
118054 ICMP_PROT_UNREACH, 0);
118055 }
118056diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
118057index 6ddde89..653e224 100644
118058--- a/net/ipv4/ip_sockglue.c
118059+++ b/net/ipv4/ip_sockglue.c
118060@@ -1291,7 +1291,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118061 len = min_t(unsigned int, len, opt->optlen);
118062 if (put_user(len, optlen))
118063 return -EFAULT;
118064- if (copy_to_user(optval, opt->__data, len))
118065+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
118066+ copy_to_user(optval, opt->__data, len))
118067 return -EFAULT;
118068 return 0;
118069 }
118070@@ -1425,7 +1426,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118071 if (sk->sk_type != SOCK_STREAM)
118072 return -ENOPROTOOPT;
118073
118074- msg.msg_control = (__force void *) optval;
118075+ msg.msg_control = (__force_kernel void *) optval;
118076 msg.msg_controllen = len;
118077 msg.msg_flags = flags;
118078
118079diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
118080index 0c15208..a3a76c5 100644
118081--- a/net/ipv4/ip_vti.c
118082+++ b/net/ipv4/ip_vti.c
118083@@ -45,7 +45,7 @@
118084 #include <net/net_namespace.h>
118085 #include <net/netns/generic.h>
118086
118087-static struct rtnl_link_ops vti_link_ops __read_mostly;
118088+static struct rtnl_link_ops vti_link_ops;
118089
118090 static int vti_net_id __read_mostly;
118091 static int vti_tunnel_init(struct net_device *dev);
118092@@ -525,7 +525,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
118093 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
118094 };
118095
118096-static struct rtnl_link_ops vti_link_ops __read_mostly = {
118097+static struct rtnl_link_ops vti_link_ops = {
118098 .kind = "vti",
118099 .maxtype = IFLA_VTI_MAX,
118100 .policy = vti_policy,
118101diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
118102index 8e7328c..9bd7ed3 100644
118103--- a/net/ipv4/ipconfig.c
118104+++ b/net/ipv4/ipconfig.c
118105@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
118106
118107 mm_segment_t oldfs = get_fs();
118108 set_fs(get_ds());
118109- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118110+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118111 set_fs(oldfs);
118112 return res;
118113 }
118114@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
118115
118116 mm_segment_t oldfs = get_fs();
118117 set_fs(get_ds());
118118- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118119+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118120 set_fs(oldfs);
118121 return res;
118122 }
118123@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
118124
118125 mm_segment_t oldfs = get_fs();
118126 set_fs(get_ds());
118127- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
118128+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
118129 set_fs(oldfs);
118130 return res;
118131 }
118132diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
118133index ff96396..2e928ba 100644
118134--- a/net/ipv4/ipip.c
118135+++ b/net/ipv4/ipip.c
118136@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118137 static int ipip_net_id __read_mostly;
118138
118139 static int ipip_tunnel_init(struct net_device *dev);
118140-static struct rtnl_link_ops ipip_link_ops __read_mostly;
118141+static struct rtnl_link_ops ipip_link_ops;
118142
118143 static int ipip_err(struct sk_buff *skb, u32 info)
118144 {
118145@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
118146 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
118147 };
118148
118149-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
118150+static struct rtnl_link_ops ipip_link_ops = {
118151 .kind = "ipip",
118152 .maxtype = IFLA_IPTUN_MAX,
118153 .policy = ipip_policy,
118154diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
118155index a612007..99ac4bc5 100644
118156--- a/net/ipv4/netfilter/arp_tables.c
118157+++ b/net/ipv4/netfilter/arp_tables.c
118158@@ -884,14 +884,14 @@ static int compat_table_info(const struct xt_table_info *info,
118159 #endif
118160
118161 static int get_info(struct net *net, void __user *user,
118162- const int *len, int compat)
118163+ int len, int compat)
118164 {
118165 char name[XT_TABLE_MAXNAMELEN];
118166 struct xt_table *t;
118167 int ret;
118168
118169- if (*len != sizeof(struct arpt_getinfo)) {
118170- duprintf("length %u != %Zu\n", *len,
118171+ if (len != sizeof(struct arpt_getinfo)) {
118172+ duprintf("length %u != %Zu\n", len,
118173 sizeof(struct arpt_getinfo));
118174 return -EINVAL;
118175 }
118176@@ -928,7 +928,7 @@ static int get_info(struct net *net, void __user *user,
118177 info.size = private->size;
118178 strcpy(info.name, name);
118179
118180- if (copy_to_user(user, &info, *len) != 0)
118181+ if (copy_to_user(user, &info, len) != 0)
118182 ret = -EFAULT;
118183 else
118184 ret = 0;
118185@@ -1695,7 +1695,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
118186
118187 switch (cmd) {
118188 case ARPT_SO_GET_INFO:
118189- ret = get_info(sock_net(sk), user, len, 1);
118190+ ret = get_info(sock_net(sk), user, *len, 1);
118191 break;
118192 case ARPT_SO_GET_ENTRIES:
118193 ret = compat_get_entries(sock_net(sk), user, len);
118194@@ -1740,7 +1740,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
118195
118196 switch (cmd) {
118197 case ARPT_SO_GET_INFO:
118198- ret = get_info(sock_net(sk), user, len, 0);
118199+ ret = get_info(sock_net(sk), user, *len, 0);
118200 break;
118201
118202 case ARPT_SO_GET_ENTRIES:
118203diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
118204index 2d0e265..67e5b8d 100644
118205--- a/net/ipv4/netfilter/ip_tables.c
118206+++ b/net/ipv4/netfilter/ip_tables.c
118207@@ -1072,14 +1072,14 @@ static int compat_table_info(const struct xt_table_info *info,
118208 #endif
118209
118210 static int get_info(struct net *net, void __user *user,
118211- const int *len, int compat)
118212+ int len, int compat)
118213 {
118214 char name[XT_TABLE_MAXNAMELEN];
118215 struct xt_table *t;
118216 int ret;
118217
118218- if (*len != sizeof(struct ipt_getinfo)) {
118219- duprintf("length %u != %zu\n", *len,
118220+ if (len != sizeof(struct ipt_getinfo)) {
118221+ duprintf("length %u != %zu\n", len,
118222 sizeof(struct ipt_getinfo));
118223 return -EINVAL;
118224 }
118225@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user,
118226 info.size = private->size;
118227 strcpy(info.name, name);
118228
118229- if (copy_to_user(user, &info, *len) != 0)
118230+ if (copy_to_user(user, &info, len) != 0)
118231 ret = -EFAULT;
118232 else
118233 ret = 0;
118234@@ -1978,7 +1978,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118235
118236 switch (cmd) {
118237 case IPT_SO_GET_INFO:
118238- ret = get_info(sock_net(sk), user, len, 1);
118239+ ret = get_info(sock_net(sk), user, *len, 1);
118240 break;
118241 case IPT_SO_GET_ENTRIES:
118242 ret = compat_get_entries(sock_net(sk), user, len);
118243@@ -2025,7 +2025,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118244
118245 switch (cmd) {
118246 case IPT_SO_GET_INFO:
118247- ret = get_info(sock_net(sk), user, len, 0);
118248+ ret = get_info(sock_net(sk), user, *len, 0);
118249 break;
118250
118251 case IPT_SO_GET_ENTRIES:
118252diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118253index 771ab3d..5b99b18 100644
118254--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
118255+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118256@@ -725,7 +725,7 @@ static int clusterip_net_init(struct net *net)
118257 spin_lock_init(&cn->lock);
118258
118259 #ifdef CONFIG_PROC_FS
118260- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
118261+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
118262 if (!cn->procdir) {
118263 pr_err("Unable to proc dir entry\n");
118264 return -ENOMEM;
118265diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
118266index 05ff44b..da00000 100644
118267--- a/net/ipv4/ping.c
118268+++ b/net/ipv4/ping.c
118269@@ -59,7 +59,7 @@ struct ping_table {
118270 };
118271
118272 static struct ping_table ping_table;
118273-struct pingv6_ops pingv6_ops;
118274+struct pingv6_ops *pingv6_ops;
118275 EXPORT_SYMBOL_GPL(pingv6_ops);
118276
118277 static u16 ping_port_rover;
118278@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
118279 return -ENODEV;
118280 }
118281 }
118282- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
118283+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
118284 scoped);
118285 rcu_read_unlock();
118286
118287@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118288 }
118289 #if IS_ENABLED(CONFIG_IPV6)
118290 } else if (skb->protocol == htons(ETH_P_IPV6)) {
118291- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
118292+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
118293 #endif
118294 }
118295
118296@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118297 info, (u8 *)icmph);
118298 #if IS_ENABLED(CONFIG_IPV6)
118299 } else if (family == AF_INET6) {
118300- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
118301+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
118302 info, (u8 *)icmph);
118303 #endif
118304 }
118305@@ -918,10 +918,10 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
118306 }
118307
118308 if (inet6_sk(sk)->rxopt.all)
118309- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
118310+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
118311 if (skb->protocol == htons(ETH_P_IPV6) &&
118312 inet6_sk(sk)->rxopt.all)
118313- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
118314+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
118315 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
118316 ip_cmsg_recv(msg, skb);
118317 #endif
118318@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
118319 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118320 0, sock_i_ino(sp),
118321 atomic_read(&sp->sk_refcnt), sp,
118322- atomic_read(&sp->sk_drops));
118323+ atomic_read_unchecked(&sp->sk_drops));
118324 }
118325
118326 static int ping_v4_seq_show(struct seq_file *seq, void *v)
118327diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
118328index 561cd4b..a32a155 100644
118329--- a/net/ipv4/raw.c
118330+++ b/net/ipv4/raw.c
118331@@ -323,7 +323,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
118332 int raw_rcv(struct sock *sk, struct sk_buff *skb)
118333 {
118334 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
118335- atomic_inc(&sk->sk_drops);
118336+ atomic_inc_unchecked(&sk->sk_drops);
118337 kfree_skb(skb);
118338 return NET_RX_DROP;
118339 }
118340@@ -771,16 +771,20 @@ static int raw_init(struct sock *sk)
118341
118342 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
118343 {
118344+ struct icmp_filter filter;
118345+
118346 if (optlen > sizeof(struct icmp_filter))
118347 optlen = sizeof(struct icmp_filter);
118348- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
118349+ if (copy_from_user(&filter, optval, optlen))
118350 return -EFAULT;
118351+ raw_sk(sk)->filter = filter;
118352 return 0;
118353 }
118354
118355 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
118356 {
118357 int len, ret = -EFAULT;
118358+ struct icmp_filter filter;
118359
118360 if (get_user(len, optlen))
118361 goto out;
118362@@ -790,8 +794,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
118363 if (len > sizeof(struct icmp_filter))
118364 len = sizeof(struct icmp_filter);
118365 ret = -EFAULT;
118366- if (put_user(len, optlen) ||
118367- copy_to_user(optval, &raw_sk(sk)->filter, len))
118368+ filter = raw_sk(sk)->filter;
118369+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
118370 goto out;
118371 ret = 0;
118372 out: return ret;
118373@@ -1020,7 +1024,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
118374 0, 0L, 0,
118375 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
118376 0, sock_i_ino(sp),
118377- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
118378+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
118379 }
118380
118381 static int raw_seq_show(struct seq_file *seq, void *v)
118382diff --git a/net/ipv4/route.c b/net/ipv4/route.c
118383index f45f2a1..e7d47a3 100644
118384--- a/net/ipv4/route.c
118385+++ b/net/ipv4/route.c
118386@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
118387
118388 static int rt_cache_seq_open(struct inode *inode, struct file *file)
118389 {
118390- return seq_open(file, &rt_cache_seq_ops);
118391+ return seq_open_restrict(file, &rt_cache_seq_ops);
118392 }
118393
118394 static const struct file_operations rt_cache_seq_fops = {
118395@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
118396
118397 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
118398 {
118399- return seq_open(file, &rt_cpu_seq_ops);
118400+ return seq_open_restrict(file, &rt_cpu_seq_ops);
118401 }
118402
118403 static const struct file_operations rt_cpu_seq_fops = {
118404@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
118405
118406 static int rt_acct_proc_open(struct inode *inode, struct file *file)
118407 {
118408- return single_open(file, rt_acct_proc_show, NULL);
118409+ return single_open_restrict(file, rt_acct_proc_show, NULL);
118410 }
118411
118412 static const struct file_operations rt_acct_proc_fops = {
118413@@ -458,11 +458,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
118414
118415 #define IP_IDENTS_SZ 2048u
118416 struct ip_ident_bucket {
118417- atomic_t id;
118418+ atomic_unchecked_t id;
118419 u32 stamp32;
118420 };
118421
118422-static struct ip_ident_bucket *ip_idents __read_mostly;
118423+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
118424
118425 /* In order to protect privacy, we add a perturbation to identifiers
118426 * if one generator is seldom used. This makes hard for an attacker
118427@@ -478,7 +478,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
118428 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
118429 delta = prandom_u32_max(now - old);
118430
118431- return atomic_add_return(segs + delta, &bucket->id) - segs;
118432+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
118433 }
118434 EXPORT_SYMBOL(ip_idents_reserve);
118435
118436@@ -2641,34 +2641,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
118437 .maxlen = sizeof(int),
118438 .mode = 0200,
118439 .proc_handler = ipv4_sysctl_rtcache_flush,
118440+ .extra1 = &init_net,
118441 },
118442 { },
118443 };
118444
118445 static __net_init int sysctl_route_net_init(struct net *net)
118446 {
118447- struct ctl_table *tbl;
118448+ ctl_table_no_const *tbl = NULL;
118449
118450- tbl = ipv4_route_flush_table;
118451 if (!net_eq(net, &init_net)) {
118452- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118453+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118454 if (!tbl)
118455 goto err_dup;
118456
118457 /* Don't export sysctls to unprivileged users */
118458 if (net->user_ns != &init_user_ns)
118459 tbl[0].procname = NULL;
118460- }
118461- tbl[0].extra1 = net;
118462+ tbl[0].extra1 = net;
118463+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118464+ } else
118465+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
118466
118467- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118468 if (!net->ipv4.route_hdr)
118469 goto err_reg;
118470 return 0;
118471
118472 err_reg:
118473- if (tbl != ipv4_route_flush_table)
118474- kfree(tbl);
118475+ kfree(tbl);
118476 err_dup:
118477 return -ENOMEM;
118478 }
118479@@ -2691,8 +2691,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
118480
118481 static __net_init int rt_genid_init(struct net *net)
118482 {
118483- atomic_set(&net->ipv4.rt_genid, 0);
118484- atomic_set(&net->fnhe_genid, 0);
118485+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
118486+ atomic_set_unchecked(&net->fnhe_genid, 0);
118487 get_random_bytes(&net->ipv4.dev_addr_genid,
118488 sizeof(net->ipv4.dev_addr_genid));
118489 return 0;
118490@@ -2736,11 +2736,7 @@ int __init ip_rt_init(void)
118491 int rc = 0;
118492 int cpu;
118493
118494- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
118495- if (!ip_idents)
118496- panic("IP: failed to allocate ip_idents\n");
118497-
118498- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
118499+ prandom_bytes(ip_idents, sizeof(ip_idents));
118500
118501 for_each_possible_cpu(cpu) {
118502 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
118503diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
118504index c3852a7..7bdbde7 100644
118505--- a/net/ipv4/sysctl_net_ipv4.c
118506+++ b/net/ipv4/sysctl_net_ipv4.c
118507@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
118508 container_of(table->data, struct net, ipv4.ip_local_ports.range);
118509 int ret;
118510 int range[2];
118511- struct ctl_table tmp = {
118512+ ctl_table_no_const tmp = {
118513 .data = &range,
118514 .maxlen = sizeof(range),
118515 .mode = table->mode,
118516@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
118517 int ret;
118518 gid_t urange[2];
118519 kgid_t low, high;
118520- struct ctl_table tmp = {
118521+ ctl_table_no_const tmp = {
118522 .data = &urange,
118523 .maxlen = sizeof(urange),
118524 .mode = table->mode,
118525@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
118526 void __user *buffer, size_t *lenp, loff_t *ppos)
118527 {
118528 char val[TCP_CA_NAME_MAX];
118529- struct ctl_table tbl = {
118530+ ctl_table_no_const tbl = {
118531 .data = val,
118532 .maxlen = TCP_CA_NAME_MAX,
118533 };
118534@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
118535 void __user *buffer, size_t *lenp,
118536 loff_t *ppos)
118537 {
118538- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
118539+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
118540 int ret;
118541
118542 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118543@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
118544 void __user *buffer, size_t *lenp,
118545 loff_t *ppos)
118546 {
118547- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
118548+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
118549 int ret;
118550
118551 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118552@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
118553 void __user *buffer, size_t *lenp,
118554 loff_t *ppos)
118555 {
118556- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118557+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118558 struct tcp_fastopen_context *ctxt;
118559 int ret;
118560 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
118561@@ -902,13 +902,12 @@ static struct ctl_table ipv4_net_table[] = {
118562
118563 static __net_init int ipv4_sysctl_init_net(struct net *net)
118564 {
118565- struct ctl_table *table;
118566+ ctl_table_no_const *table = NULL;
118567
118568- table = ipv4_net_table;
118569 if (!net_eq(net, &init_net)) {
118570 int i;
118571
118572- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
118573+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
118574 if (!table)
118575 goto err_alloc;
118576
118577@@ -917,7 +916,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
118578 table[i].data += (void *)net - (void *)&init_net;
118579 }
118580
118581- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118582+ if (!net_eq(net, &init_net))
118583+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118584+ else
118585+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
118586 if (!net->ipv4.ipv4_hdr)
118587 goto err_reg;
118588
118589diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
118590index c9ab964..607d9f7 100644
118591--- a/net/ipv4/tcp_input.c
118592+++ b/net/ipv4/tcp_input.c
118593@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
118594 * without any lock. We want to make sure compiler wont store
118595 * intermediate values in this location.
118596 */
118597- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
118598+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
118599 sk->sk_max_pacing_rate);
118600 }
118601
118602@@ -4610,7 +4610,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
118603 * simplifies code)
118604 */
118605 static void
118606-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118607+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
118608 struct sk_buff *head, struct sk_buff *tail,
118609 u32 start, u32 end)
118610 {
118611@@ -5605,6 +5605,7 @@ discard:
118612 tcp_paws_reject(&tp->rx_opt, 0))
118613 goto discard_and_undo;
118614
118615+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
118616 if (th->syn) {
118617 /* We see SYN without ACK. It is attempt of
118618 * simultaneous connect with crossed SYNs.
118619@@ -5655,6 +5656,7 @@ discard:
118620 goto discard;
118621 #endif
118622 }
118623+#endif
118624 /* "fifth, if neither of the SYN or RST bits is set then
118625 * drop the segment and return."
118626 */
118627@@ -5701,7 +5703,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
118628 goto discard;
118629
118630 if (th->syn) {
118631- if (th->fin)
118632+ if (th->fin || th->urg || th->psh)
118633 goto discard;
118634 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
118635 return 1;
118636diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
118637index fc1c658..42a8d34 100644
118638--- a/net/ipv4/tcp_ipv4.c
118639+++ b/net/ipv4/tcp_ipv4.c
118640@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
118641 int sysctl_tcp_low_latency __read_mostly;
118642 EXPORT_SYMBOL(sysctl_tcp_low_latency);
118643
118644+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118645+extern int grsec_enable_blackhole;
118646+#endif
118647+
118648 #ifdef CONFIG_TCP_MD5SIG
118649 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
118650 __be32 daddr, __be32 saddr, const struct tcphdr *th);
118651@@ -1427,6 +1431,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
118652 return 0;
118653
118654 reset:
118655+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118656+ if (!grsec_enable_blackhole)
118657+#endif
118658 tcp_v4_send_reset(rsk, skb);
118659 discard:
118660 kfree_skb(skb);
118661@@ -1591,12 +1598,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
118662 TCP_SKB_CB(skb)->sacked = 0;
118663
118664 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
118665- if (!sk)
118666+ if (!sk) {
118667+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118668+ ret = 1;
118669+#endif
118670 goto no_tcp_socket;
118671-
118672+ }
118673 process:
118674- if (sk->sk_state == TCP_TIME_WAIT)
118675+ if (sk->sk_state == TCP_TIME_WAIT) {
118676+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118677+ ret = 2;
118678+#endif
118679 goto do_time_wait;
118680+ }
118681
118682 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
118683 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
118684@@ -1652,6 +1666,10 @@ csum_error:
118685 bad_packet:
118686 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
118687 } else {
118688+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118689+ if (!grsec_enable_blackhole || (ret == 1 &&
118690+ (skb->dev->flags & IFF_LOOPBACK)))
118691+#endif
118692 tcp_v4_send_reset(NULL, skb);
118693 }
118694
118695diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
118696index 17e7339..c72ff6c 100644
118697--- a/net/ipv4/tcp_minisocks.c
118698+++ b/net/ipv4/tcp_minisocks.c
118699@@ -27,6 +27,10 @@
118700 #include <net/inet_common.h>
118701 #include <net/xfrm.h>
118702
118703+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118704+extern int grsec_enable_blackhole;
118705+#endif
118706+
118707 int sysctl_tcp_syncookies __read_mostly = 1;
118708 EXPORT_SYMBOL(sysctl_tcp_syncookies);
118709
118710@@ -778,7 +782,10 @@ embryonic_reset:
118711 * avoid becoming vulnerable to outside attack aiming at
118712 * resetting legit local connections.
118713 */
118714- req->rsk_ops->send_reset(sk, skb);
118715+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118716+ if (!grsec_enable_blackhole)
118717+#endif
118718+ req->rsk_ops->send_reset(sk, skb);
118719 } else if (fastopen) { /* received a valid RST pkt */
118720 reqsk_fastopen_remove(sk, req, true);
118721 tcp_reset(sk);
118722diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
118723index ebf5ff5..4d1ff32 100644
118724--- a/net/ipv4/tcp_probe.c
118725+++ b/net/ipv4/tcp_probe.c
118726@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
118727 if (cnt + width >= len)
118728 break;
118729
118730- if (copy_to_user(buf + cnt, tbuf, width))
118731+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
118732 return -EFAULT;
118733 cnt += width;
118734 }
118735diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
118736index 8c65dc1..55fd1ba 100644
118737--- a/net/ipv4/tcp_timer.c
118738+++ b/net/ipv4/tcp_timer.c
118739@@ -22,6 +22,10 @@
118740 #include <linux/gfp.h>
118741 #include <net/tcp.h>
118742
118743+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118744+extern int grsec_lastack_retries;
118745+#endif
118746+
118747 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
118748 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
118749 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
118750@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock *sk)
118751 }
118752 }
118753
118754+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118755+ if ((sk->sk_state == TCP_LAST_ACK) &&
118756+ (grsec_lastack_retries > 0) &&
118757+ (grsec_lastack_retries < retry_until))
118758+ retry_until = grsec_lastack_retries;
118759+#endif
118760+
118761 if (retransmits_timed_out(sk, retry_until,
118762 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
118763 /* Has it gone just too far? */
118764diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
118765index 83aa604..dbfddf5 100644
118766--- a/net/ipv4/udp.c
118767+++ b/net/ipv4/udp.c
118768@@ -87,6 +87,7 @@
118769 #include <linux/types.h>
118770 #include <linux/fcntl.h>
118771 #include <linux/module.h>
118772+#include <linux/security.h>
118773 #include <linux/socket.h>
118774 #include <linux/sockios.h>
118775 #include <linux/igmp.h>
118776@@ -115,6 +116,10 @@
118777 #include <net/busy_poll.h>
118778 #include "udp_impl.h"
118779
118780+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118781+extern int grsec_enable_blackhole;
118782+#endif
118783+
118784 struct udp_table udp_table __read_mostly;
118785 EXPORT_SYMBOL(udp_table);
118786
118787@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
118788 return true;
118789 }
118790
118791+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
118792+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
118793+
118794 /*
118795 * This routine is called by the ICMP module when it gets some
118796 * sort of error condition. If err < 0 then the socket should
118797@@ -944,9 +952,18 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
118798 dport = usin->sin_port;
118799 if (dport == 0)
118800 return -EINVAL;
118801+
118802+ err = gr_search_udp_sendmsg(sk, usin);
118803+ if (err)
118804+ return err;
118805 } else {
118806 if (sk->sk_state != TCP_ESTABLISHED)
118807 return -EDESTADDRREQ;
118808+
118809+ err = gr_search_udp_sendmsg(sk, NULL);
118810+ if (err)
118811+ return err;
118812+
118813 daddr = inet->inet_daddr;
118814 dport = inet->inet_dport;
118815 /* Open fast path for connected socket.
118816@@ -1193,7 +1210,7 @@ static unsigned int first_packet_length(struct sock *sk)
118817 IS_UDPLITE(sk));
118818 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
118819 IS_UDPLITE(sk));
118820- atomic_inc(&sk->sk_drops);
118821+ atomic_inc_unchecked(&sk->sk_drops);
118822 __skb_unlink(skb, rcvq);
118823 __skb_queue_tail(&list_kill, skb);
118824 }
118825@@ -1273,6 +1290,10 @@ try_again:
118826 if (!skb)
118827 goto out;
118828
118829+ err = gr_search_udp_recvmsg(sk, skb);
118830+ if (err)
118831+ goto out_free;
118832+
118833 ulen = skb->len - sizeof(struct udphdr);
118834 copied = len;
118835 if (copied > ulen)
118836@@ -1305,7 +1326,7 @@ try_again:
118837 if (unlikely(err)) {
118838 trace_kfree_skb(skb, udp_recvmsg);
118839 if (!peeked) {
118840- atomic_inc(&sk->sk_drops);
118841+ atomic_inc_unchecked(&sk->sk_drops);
118842 UDP_INC_STATS_USER(sock_net(sk),
118843 UDP_MIB_INERRORS, is_udplite);
118844 }
118845@@ -1599,7 +1620,7 @@ csum_error:
118846 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
118847 drop:
118848 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
118849- atomic_inc(&sk->sk_drops);
118850+ atomic_inc_unchecked(&sk->sk_drops);
118851 kfree_skb(skb);
118852 return -1;
118853 }
118854@@ -1617,7 +1638,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
118855 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
118856
118857 if (!skb1) {
118858- atomic_inc(&sk->sk_drops);
118859+ atomic_inc_unchecked(&sk->sk_drops);
118860 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
118861 IS_UDPLITE(sk));
118862 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
118863@@ -1823,6 +1844,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
118864 goto csum_error;
118865
118866 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
118867+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118868+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118869+#endif
118870 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
118871
118872 /*
118873@@ -2420,7 +2444,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
118874 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118875 0, sock_i_ino(sp),
118876 atomic_read(&sp->sk_refcnt), sp,
118877- atomic_read(&sp->sk_drops));
118878+ atomic_read_unchecked(&sp->sk_drops));
118879 }
118880
118881 int udp4_seq_show(struct seq_file *seq, void *v)
118882diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
118883index bff6974..c63736c 100644
118884--- a/net/ipv4/xfrm4_policy.c
118885+++ b/net/ipv4/xfrm4_policy.c
118886@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
118887 fl4->flowi4_tos = iph->tos;
118888 }
118889
118890-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
118891+static int xfrm4_garbage_collect(struct dst_ops *ops)
118892 {
118893 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
118894
118895- xfrm4_policy_afinfo.garbage_collect(net);
118896+ xfrm_garbage_collect_deferred(net);
118897 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
118898 }
118899
118900@@ -268,19 +268,18 @@ static struct ctl_table xfrm4_policy_table[] = {
118901
118902 static int __net_init xfrm4_net_init(struct net *net)
118903 {
118904- struct ctl_table *table;
118905+ ctl_table_no_const *table = NULL;
118906 struct ctl_table_header *hdr;
118907
118908- table = xfrm4_policy_table;
118909 if (!net_eq(net, &init_net)) {
118910- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
118911+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
118912 if (!table)
118913 goto err_alloc;
118914
118915 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
118916- }
118917-
118918- hdr = register_net_sysctl(net, "net/ipv4", table);
118919+ hdr = register_net_sysctl(net, "net/ipv4", table);
118920+ } else
118921+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
118922 if (!hdr)
118923 goto err_reg;
118924
118925@@ -288,8 +287,7 @@ static int __net_init xfrm4_net_init(struct net *net)
118926 return 0;
118927
118928 err_reg:
118929- if (!net_eq(net, &init_net))
118930- kfree(table);
118931+ kfree(table);
118932 err_alloc:
118933 return -ENOMEM;
118934 }
118935diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
118936index 37b70e8..1475ab7 100644
118937--- a/net/ipv6/addrconf.c
118938+++ b/net/ipv6/addrconf.c
118939@@ -178,7 +178,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
118940 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
118941 .mtu6 = IPV6_MIN_MTU,
118942 .accept_ra = 1,
118943- .accept_redirects = 1,
118944+ .accept_redirects = 0,
118945 .autoconf = 1,
118946 .force_mld_version = 0,
118947 .mldv1_unsolicited_report_interval = 10 * HZ,
118948@@ -219,7 +219,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
118949 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
118950 .mtu6 = IPV6_MIN_MTU,
118951 .accept_ra = 1,
118952- .accept_redirects = 1,
118953+ .accept_redirects = 0,
118954 .autoconf = 1,
118955 .force_mld_version = 0,
118956 .mldv1_unsolicited_report_interval = 10 * HZ,
118957@@ -620,7 +620,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
118958 idx = 0;
118959 head = &net->dev_index_head[h];
118960 rcu_read_lock();
118961- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
118962+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
118963 net->dev_base_seq;
118964 hlist_for_each_entry_rcu(dev, head, index_hlist) {
118965 if (idx < s_idx)
118966@@ -2506,7 +2506,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
118967 p.iph.ihl = 5;
118968 p.iph.protocol = IPPROTO_IPV6;
118969 p.iph.ttl = 64;
118970- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
118971+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
118972
118973 if (ops->ndo_do_ioctl) {
118974 mm_segment_t oldfs = get_fs();
118975@@ -3772,16 +3772,23 @@ static const struct file_operations if6_fops = {
118976 .release = seq_release_net,
118977 };
118978
118979+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
118980+extern void unregister_ipv6_seq_ops_addr(void);
118981+
118982 static int __net_init if6_proc_net_init(struct net *net)
118983 {
118984- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
118985+ register_ipv6_seq_ops_addr(&if6_seq_ops);
118986+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
118987+ unregister_ipv6_seq_ops_addr();
118988 return -ENOMEM;
118989+ }
118990 return 0;
118991 }
118992
118993 static void __net_exit if6_proc_net_exit(struct net *net)
118994 {
118995 remove_proc_entry("if_inet6", net->proc_net);
118996+ unregister_ipv6_seq_ops_addr();
118997 }
118998
118999 static struct pernet_operations if6_proc_net_ops = {
119000@@ -4400,7 +4407,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
119001 s_ip_idx = ip_idx = cb->args[2];
119002
119003 rcu_read_lock();
119004- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119005+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119006 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
119007 idx = 0;
119008 head = &net->dev_index_head[h];
119009@@ -5057,7 +5064,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119010 rt_genid_bump_ipv6(net);
119011 break;
119012 }
119013- atomic_inc(&net->ipv6.dev_addr_genid);
119014+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
119015 }
119016
119017 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119018@@ -5077,7 +5084,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
119019 int *valp = ctl->data;
119020 int val = *valp;
119021 loff_t pos = *ppos;
119022- struct ctl_table lctl;
119023+ ctl_table_no_const lctl;
119024 int ret;
119025
119026 /*
119027@@ -5102,7 +5109,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
119028 {
119029 struct inet6_dev *idev = ctl->extra1;
119030 int min_mtu = IPV6_MIN_MTU;
119031- struct ctl_table lctl;
119032+ ctl_table_no_const lctl;
119033
119034 lctl = *ctl;
119035 lctl.extra1 = &min_mtu;
119036@@ -5177,7 +5184,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
119037 int *valp = ctl->data;
119038 int val = *valp;
119039 loff_t pos = *ppos;
119040- struct ctl_table lctl;
119041+ ctl_table_no_const lctl;
119042 int ret;
119043
119044 /*
119045@@ -5242,7 +5249,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
119046 int err;
119047 struct in6_addr addr;
119048 char str[IPV6_MAX_STRLEN];
119049- struct ctl_table lctl = *ctl;
119050+ ctl_table_no_const lctl = *ctl;
119051 struct net *net = ctl->extra2;
119052 struct ipv6_stable_secret *secret = ctl->data;
119053
119054diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
119055index eef63b3..d68f5da 100644
119056--- a/net/ipv6/af_inet6.c
119057+++ b/net/ipv6/af_inet6.c
119058@@ -768,7 +768,7 @@ static int __net_init inet6_net_init(struct net *net)
119059 net->ipv6.sysctl.auto_flowlabels = 0;
119060 net->ipv6.sysctl.idgen_retries = 3;
119061 net->ipv6.sysctl.idgen_delay = 1 * HZ;
119062- atomic_set(&net->ipv6.fib6_sernum, 1);
119063+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
119064
119065 err = ipv6_init_mibs(net);
119066 if (err)
119067diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
119068index 62d908e..bac79a9 100644
119069--- a/net/ipv6/datagram.c
119070+++ b/net/ipv6/datagram.c
119071@@ -967,5 +967,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
119072 0,
119073 sock_i_ino(sp),
119074 atomic_read(&sp->sk_refcnt), sp,
119075- atomic_read(&sp->sk_drops));
119076+ atomic_read_unchecked(&sp->sk_drops));
119077 }
119078diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
119079index 2c2b5d5..cc01abd 100644
119080--- a/net/ipv6/icmp.c
119081+++ b/net/ipv6/icmp.c
119082@@ -1004,7 +1004,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
119083
119084 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
119085 {
119086- struct ctl_table *table;
119087+ ctl_table_no_const *table;
119088
119089 table = kmemdup(ipv6_icmp_table_template,
119090 sizeof(ipv6_icmp_table_template),
119091diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
119092index bde57b1..5b45dbb 100644
119093--- a/net/ipv6/ip6_fib.c
119094+++ b/net/ipv6/ip6_fib.c
119095@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
119096 int new, old;
119097
119098 do {
119099- old = atomic_read(&net->ipv6.fib6_sernum);
119100+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
119101 new = old < INT_MAX ? old + 1 : 1;
119102- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
119103+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
119104 old, new) != old);
119105 return new;
119106 }
119107diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
119108index a38d3ac..d02e37d 100644
119109--- a/net/ipv6/ip6_gre.c
119110+++ b/net/ipv6/ip6_gre.c
119111@@ -71,8 +71,8 @@ struct ip6gre_net {
119112 struct net_device *fb_tunnel_dev;
119113 };
119114
119115-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
119116-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
119117+static struct rtnl_link_ops ip6gre_link_ops;
119118+static struct rtnl_link_ops ip6gre_tap_ops;
119119 static int ip6gre_tunnel_init(struct net_device *dev);
119120 static void ip6gre_tunnel_setup(struct net_device *dev);
119121 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
119122@@ -1280,7 +1280,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
119123 }
119124
119125
119126-static struct inet6_protocol ip6gre_protocol __read_mostly = {
119127+static struct inet6_protocol ip6gre_protocol = {
119128 .handler = ip6gre_rcv,
119129 .err_handler = ip6gre_err,
119130 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
119131@@ -1639,7 +1639,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
119132 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
119133 };
119134
119135-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119136+static struct rtnl_link_ops ip6gre_link_ops = {
119137 .kind = "ip6gre",
119138 .maxtype = IFLA_GRE_MAX,
119139 .policy = ip6gre_policy,
119140@@ -1654,7 +1654,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119141 .get_link_net = ip6_tnl_get_link_net,
119142 };
119143
119144-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
119145+static struct rtnl_link_ops ip6gre_tap_ops = {
119146 .kind = "ip6gretap",
119147 .maxtype = IFLA_GRE_MAX,
119148 .policy = ip6gre_policy,
119149diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
119150index 5cafd92..d5aead4 100644
119151--- a/net/ipv6/ip6_tunnel.c
119152+++ b/net/ipv6/ip6_tunnel.c
119153@@ -80,7 +80,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119154
119155 static int ip6_tnl_dev_init(struct net_device *dev);
119156 static void ip6_tnl_dev_setup(struct net_device *dev);
119157-static struct rtnl_link_ops ip6_link_ops __read_mostly;
119158+static struct rtnl_link_ops ip6_link_ops;
119159
119160 static int ip6_tnl_net_id __read_mostly;
119161 struct ip6_tnl_net {
119162@@ -1776,7 +1776,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
119163 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
119164 };
119165
119166-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
119167+static struct rtnl_link_ops ip6_link_ops = {
119168 .kind = "ip6tnl",
119169 .maxtype = IFLA_IPTUN_MAX,
119170 .policy = ip6_tnl_policy,
119171diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
119172index 0224c03..c5ec3d9 100644
119173--- a/net/ipv6/ip6_vti.c
119174+++ b/net/ipv6/ip6_vti.c
119175@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119176
119177 static int vti6_dev_init(struct net_device *dev);
119178 static void vti6_dev_setup(struct net_device *dev);
119179-static struct rtnl_link_ops vti6_link_ops __read_mostly;
119180+static struct rtnl_link_ops vti6_link_ops;
119181
119182 static int vti6_net_id __read_mostly;
119183 struct vti6_net {
119184@@ -1019,7 +1019,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
119185 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
119186 };
119187
119188-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
119189+static struct rtnl_link_ops vti6_link_ops = {
119190 .kind = "vti6",
119191 .maxtype = IFLA_VTI_MAX,
119192 .policy = vti6_policy,
119193diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
119194index 63e6956..ebbbcf6 100644
119195--- a/net/ipv6/ipv6_sockglue.c
119196+++ b/net/ipv6/ipv6_sockglue.c
119197@@ -1015,7 +1015,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
119198 if (sk->sk_type != SOCK_STREAM)
119199 return -ENOPROTOOPT;
119200
119201- msg.msg_control = optval;
119202+ msg.msg_control = (void __force_kernel *)optval;
119203 msg.msg_controllen = len;
119204 msg.msg_flags = flags;
119205
119206diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
119207index 62f5b0d..331fdb1 100644
119208--- a/net/ipv6/netfilter/ip6_tables.c
119209+++ b/net/ipv6/netfilter/ip6_tables.c
119210@@ -1085,14 +1085,14 @@ static int compat_table_info(const struct xt_table_info *info,
119211 #endif
119212
119213 static int get_info(struct net *net, void __user *user,
119214- const int *len, int compat)
119215+ int len, int compat)
119216 {
119217 char name[XT_TABLE_MAXNAMELEN];
119218 struct xt_table *t;
119219 int ret;
119220
119221- if (*len != sizeof(struct ip6t_getinfo)) {
119222- duprintf("length %u != %zu\n", *len,
119223+ if (len != sizeof(struct ip6t_getinfo)) {
119224+ duprintf("length %u != %zu\n", len,
119225 sizeof(struct ip6t_getinfo));
119226 return -EINVAL;
119227 }
119228@@ -1129,7 +1129,7 @@ static int get_info(struct net *net, void __user *user,
119229 info.size = private->size;
119230 strcpy(info.name, name);
119231
119232- if (copy_to_user(user, &info, *len) != 0)
119233+ if (copy_to_user(user, &info, len) != 0)
119234 ret = -EFAULT;
119235 else
119236 ret = 0;
119237@@ -1991,7 +1991,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119238
119239 switch (cmd) {
119240 case IP6T_SO_GET_INFO:
119241- ret = get_info(sock_net(sk), user, len, 1);
119242+ ret = get_info(sock_net(sk), user, *len, 1);
119243 break;
119244 case IP6T_SO_GET_ENTRIES:
119245 ret = compat_get_entries(sock_net(sk), user, len);
119246@@ -2038,7 +2038,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119247
119248 switch (cmd) {
119249 case IP6T_SO_GET_INFO:
119250- ret = get_info(sock_net(sk), user, len, 0);
119251+ ret = get_info(sock_net(sk), user, *len, 0);
119252 break;
119253
119254 case IP6T_SO_GET_ENTRIES:
119255diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
119256index 6f187c8..34b367f 100644
119257--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
119258+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
119259@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
119260
119261 static int nf_ct_frag6_sysctl_register(struct net *net)
119262 {
119263- struct ctl_table *table;
119264+ ctl_table_no_const *table = NULL;
119265 struct ctl_table_header *hdr;
119266
119267- table = nf_ct_frag6_sysctl_table;
119268 if (!net_eq(net, &init_net)) {
119269- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
119270+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
119271 GFP_KERNEL);
119272 if (table == NULL)
119273 goto err_alloc;
119274@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119275 table[2].data = &net->nf_frag.frags.high_thresh;
119276 table[2].extra1 = &net->nf_frag.frags.low_thresh;
119277 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
119278- }
119279-
119280- hdr = register_net_sysctl(net, "net/netfilter", table);
119281+ hdr = register_net_sysctl(net, "net/netfilter", table);
119282+ } else
119283+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
119284 if (hdr == NULL)
119285 goto err_reg;
119286
119287@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119288 return 0;
119289
119290 err_reg:
119291- if (!net_eq(net, &init_net))
119292- kfree(table);
119293+ kfree(table);
119294 err_alloc:
119295 return -ENOMEM;
119296 }
119297diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
119298index 263a516..692f738 100644
119299--- a/net/ipv6/ping.c
119300+++ b/net/ipv6/ping.c
119301@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
119302 };
119303 #endif
119304
119305+static struct pingv6_ops real_pingv6_ops = {
119306+ .ipv6_recv_error = ipv6_recv_error,
119307+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
119308+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
119309+ .icmpv6_err_convert = icmpv6_err_convert,
119310+ .ipv6_icmp_error = ipv6_icmp_error,
119311+ .ipv6_chk_addr = ipv6_chk_addr,
119312+};
119313+
119314+static struct pingv6_ops dummy_pingv6_ops = {
119315+ .ipv6_recv_error = dummy_ipv6_recv_error,
119316+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
119317+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
119318+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
119319+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
119320+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
119321+};
119322+
119323 int __init pingv6_init(void)
119324 {
119325 #ifdef CONFIG_PROC_FS
119326@@ -247,13 +265,7 @@ int __init pingv6_init(void)
119327 if (ret)
119328 return ret;
119329 #endif
119330- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
119331- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
119332- pingv6_ops.ip6_datagram_recv_specific_ctl =
119333- ip6_datagram_recv_specific_ctl;
119334- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
119335- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
119336- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
119337+ pingv6_ops = &real_pingv6_ops;
119338 return inet6_register_protosw(&pingv6_protosw);
119339 }
119340
119341@@ -262,14 +274,9 @@ int __init pingv6_init(void)
119342 */
119343 void pingv6_exit(void)
119344 {
119345- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
119346- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
119347- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
119348- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
119349- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
119350- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
119351 #ifdef CONFIG_PROC_FS
119352 unregister_pernet_subsys(&ping_v6_net_ops);
119353 #endif
119354+ pingv6_ops = &dummy_pingv6_ops;
119355 inet6_unregister_protosw(&pingv6_protosw);
119356 }
119357diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
119358index 679253d0..70b653c 100644
119359--- a/net/ipv6/proc.c
119360+++ b/net/ipv6/proc.c
119361@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
119362 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
119363 goto proc_snmp6_fail;
119364
119365- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
119366+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
119367 if (!net->mib.proc_net_devsnmp6)
119368 goto proc_dev_snmp6_fail;
119369 return 0;
119370diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
119371index 8072bd4..1629245 100644
119372--- a/net/ipv6/raw.c
119373+++ b/net/ipv6/raw.c
119374@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
119375 {
119376 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
119377 skb_checksum_complete(skb)) {
119378- atomic_inc(&sk->sk_drops);
119379+ atomic_inc_unchecked(&sk->sk_drops);
119380 kfree_skb(skb);
119381 return NET_RX_DROP;
119382 }
119383@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119384 struct raw6_sock *rp = raw6_sk(sk);
119385
119386 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
119387- atomic_inc(&sk->sk_drops);
119388+ atomic_inc_unchecked(&sk->sk_drops);
119389 kfree_skb(skb);
119390 return NET_RX_DROP;
119391 }
119392@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119393
119394 if (inet->hdrincl) {
119395 if (skb_checksum_complete(skb)) {
119396- atomic_inc(&sk->sk_drops);
119397+ atomic_inc_unchecked(&sk->sk_drops);
119398 kfree_skb(skb);
119399 return NET_RX_DROP;
119400 }
119401@@ -608,7 +608,7 @@ out:
119402 return err;
119403 }
119404
119405-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
119406+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
119407 struct flowi6 *fl6, struct dst_entry **dstp,
119408 unsigned int flags)
119409 {
119410@@ -913,12 +913,15 @@ do_confirm:
119411 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
119412 char __user *optval, int optlen)
119413 {
119414+ struct icmp6_filter filter;
119415+
119416 switch (optname) {
119417 case ICMPV6_FILTER:
119418 if (optlen > sizeof(struct icmp6_filter))
119419 optlen = sizeof(struct icmp6_filter);
119420- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
119421+ if (copy_from_user(&filter, optval, optlen))
119422 return -EFAULT;
119423+ raw6_sk(sk)->filter = filter;
119424 return 0;
119425 default:
119426 return -ENOPROTOOPT;
119427@@ -931,6 +934,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119428 char __user *optval, int __user *optlen)
119429 {
119430 int len;
119431+ struct icmp6_filter filter;
119432
119433 switch (optname) {
119434 case ICMPV6_FILTER:
119435@@ -942,7 +946,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119436 len = sizeof(struct icmp6_filter);
119437 if (put_user(len, optlen))
119438 return -EFAULT;
119439- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
119440+ filter = raw6_sk(sk)->filter;
119441+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
119442 return -EFAULT;
119443 return 0;
119444 default:
119445diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
119446index 8ffa2c8..5968612 100644
119447--- a/net/ipv6/reassembly.c
119448+++ b/net/ipv6/reassembly.c
119449@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
119450
119451 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119452 {
119453- struct ctl_table *table;
119454+ ctl_table_no_const *table = NULL;
119455 struct ctl_table_header *hdr;
119456
119457- table = ip6_frags_ns_ctl_table;
119458 if (!net_eq(net, &init_net)) {
119459- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119460+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119461 if (!table)
119462 goto err_alloc;
119463
119464@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119465 /* Don't export sysctls to unprivileged users */
119466 if (net->user_ns != &init_user_ns)
119467 table[0].procname = NULL;
119468- }
119469+ hdr = register_net_sysctl(net, "net/ipv6", table);
119470+ } else
119471+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
119472
119473- hdr = register_net_sysctl(net, "net/ipv6", table);
119474 if (!hdr)
119475 goto err_reg;
119476
119477@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119478 return 0;
119479
119480 err_reg:
119481- if (!net_eq(net, &init_net))
119482- kfree(table);
119483+ kfree(table);
119484 err_alloc:
119485 return -ENOMEM;
119486 }
119487diff --git a/net/ipv6/route.c b/net/ipv6/route.c
119488index c73ae50..aa55e00 100644
119489--- a/net/ipv6/route.c
119490+++ b/net/ipv6/route.c
119491@@ -3046,7 +3046,7 @@ struct ctl_table ipv6_route_table_template[] = {
119492
119493 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
119494 {
119495- struct ctl_table *table;
119496+ ctl_table_no_const *table;
119497
119498 table = kmemdup(ipv6_route_table_template,
119499 sizeof(ipv6_route_table_template),
119500diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
119501index ac35a28..070cc8c 100644
119502--- a/net/ipv6/sit.c
119503+++ b/net/ipv6/sit.c
119504@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
119505 static void ipip6_dev_free(struct net_device *dev);
119506 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
119507 __be32 *v4dst);
119508-static struct rtnl_link_ops sit_link_ops __read_mostly;
119509+static struct rtnl_link_ops sit_link_ops;
119510
119511 static int sit_net_id __read_mostly;
119512 struct sit_net {
119513@@ -1749,7 +1749,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
119514 unregister_netdevice_queue(dev, head);
119515 }
119516
119517-static struct rtnl_link_ops sit_link_ops __read_mostly = {
119518+static struct rtnl_link_ops sit_link_ops = {
119519 .kind = "sit",
119520 .maxtype = IFLA_IPTUN_MAX,
119521 .policy = ipip6_policy,
119522diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
119523index abcc79f..3b2d2d5 100644
119524--- a/net/ipv6/sysctl_net_ipv6.c
119525+++ b/net/ipv6/sysctl_net_ipv6.c
119526@@ -92,7 +92,7 @@ static struct ctl_table ipv6_rotable[] = {
119527
119528 static int __net_init ipv6_sysctl_net_init(struct net *net)
119529 {
119530- struct ctl_table *ipv6_table;
119531+ ctl_table_no_const *ipv6_table;
119532 struct ctl_table *ipv6_route_table;
119533 struct ctl_table *ipv6_icmp_table;
119534 int err;
119535diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
119536index 3adffb3..a67e4d1 100644
119537--- a/net/ipv6/tcp_ipv6.c
119538+++ b/net/ipv6/tcp_ipv6.c
119539@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
119540 }
119541 }
119542
119543+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119544+extern int grsec_enable_blackhole;
119545+#endif
119546+
119547 static __u32 tcp_v6_init_sequence(const struct sk_buff *skb)
119548 {
119549 return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
119550@@ -1283,6 +1287,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
119551 return 0;
119552
119553 reset:
119554+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119555+ if (!grsec_enable_blackhole)
119556+#endif
119557 tcp_v6_send_reset(sk, skb);
119558 discard:
119559 if (opt_skb)
119560@@ -1392,12 +1399,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
119561
119562 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
119563 inet6_iif(skb));
119564- if (!sk)
119565+ if (!sk) {
119566+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119567+ ret = 1;
119568+#endif
119569 goto no_tcp_socket;
119570+ }
119571
119572 process:
119573- if (sk->sk_state == TCP_TIME_WAIT)
119574+ if (sk->sk_state == TCP_TIME_WAIT) {
119575+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119576+ ret = 2;
119577+#endif
119578 goto do_time_wait;
119579+ }
119580
119581 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
119582 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
119583@@ -1448,6 +1463,10 @@ csum_error:
119584 bad_packet:
119585 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
119586 } else {
119587+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119588+ if (!grsec_enable_blackhole || (ret == 1 &&
119589+ (skb->dev->flags & IFF_LOOPBACK)))
119590+#endif
119591 tcp_v6_send_reset(NULL, skb);
119592 }
119593
119594diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
119595index e51fc3e..8f04229 100644
119596--- a/net/ipv6/udp.c
119597+++ b/net/ipv6/udp.c
119598@@ -76,6 +76,10 @@ static u32 udp6_ehashfn(const struct net *net,
119599 udp_ipv6_hash_secret + net_hash_mix(net));
119600 }
119601
119602+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119603+extern int grsec_enable_blackhole;
119604+#endif
119605+
119606 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
119607 {
119608 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
119609@@ -445,7 +449,7 @@ try_again:
119610 if (unlikely(err)) {
119611 trace_kfree_skb(skb, udpv6_recvmsg);
119612 if (!peeked) {
119613- atomic_inc(&sk->sk_drops);
119614+ atomic_inc_unchecked(&sk->sk_drops);
119615 if (is_udp4)
119616 UDP_INC_STATS_USER(sock_net(sk),
119617 UDP_MIB_INERRORS,
119618@@ -709,7 +713,7 @@ csum_error:
119619 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119620 drop:
119621 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119622- atomic_inc(&sk->sk_drops);
119623+ atomic_inc_unchecked(&sk->sk_drops);
119624 kfree_skb(skb);
119625 return -1;
119626 }
119627@@ -750,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119628 if (likely(!skb1))
119629 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119630 if (!skb1) {
119631- atomic_inc(&sk->sk_drops);
119632+ atomic_inc_unchecked(&sk->sk_drops);
119633 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119634 IS_UDPLITE(sk));
119635 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119636@@ -934,6 +938,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119637 goto csum_error;
119638
119639 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119640+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119641+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119642+#endif
119643 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
119644
119645 kfree_skb(skb);
119646diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
119647index f337a90..2a9a9db 100644
119648--- a/net/ipv6/xfrm6_policy.c
119649+++ b/net/ipv6/xfrm6_policy.c
119650@@ -222,11 +222,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
119651 }
119652 }
119653
119654-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
119655+static int xfrm6_garbage_collect(struct dst_ops *ops)
119656 {
119657 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
119658
119659- xfrm6_policy_afinfo.garbage_collect(net);
119660+ xfrm_garbage_collect_deferred(net);
119661 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
119662 }
119663
119664@@ -338,19 +338,19 @@ static struct ctl_table xfrm6_policy_table[] = {
119665
119666 static int __net_init xfrm6_net_init(struct net *net)
119667 {
119668- struct ctl_table *table;
119669+ ctl_table_no_const *table = NULL;
119670 struct ctl_table_header *hdr;
119671
119672- table = xfrm6_policy_table;
119673 if (!net_eq(net, &init_net)) {
119674- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119675+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
119676 if (!table)
119677 goto err_alloc;
119678
119679 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
119680- }
119681+ hdr = register_net_sysctl(net, "net/ipv6", table);
119682+ } else
119683+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
119684
119685- hdr = register_net_sysctl(net, "net/ipv6", table);
119686 if (!hdr)
119687 goto err_reg;
119688
119689@@ -358,8 +358,7 @@ static int __net_init xfrm6_net_init(struct net *net)
119690 return 0;
119691
119692 err_reg:
119693- if (!net_eq(net, &init_net))
119694- kfree(table);
119695+ kfree(table);
119696 err_alloc:
119697 return -ENOMEM;
119698 }
119699diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
119700index c1d247e..9e5949d 100644
119701--- a/net/ipx/ipx_proc.c
119702+++ b/net/ipx/ipx_proc.c
119703@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
119704 struct proc_dir_entry *p;
119705 int rc = -ENOMEM;
119706
119707- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
119708+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
119709
119710 if (!ipx_proc_dir)
119711 goto out;
119712diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
119713index 683346d..cb0e12d 100644
119714--- a/net/irda/ircomm/ircomm_tty.c
119715+++ b/net/irda/ircomm/ircomm_tty.c
119716@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119717 add_wait_queue(&port->open_wait, &wait);
119718
119719 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
119720- __FILE__, __LINE__, tty->driver->name, port->count);
119721+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119722
119723 spin_lock_irqsave(&port->lock, flags);
119724- port->count--;
119725+ atomic_dec(&port->count);
119726 port->blocked_open++;
119727 spin_unlock_irqrestore(&port->lock, flags);
119728
119729@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119730 }
119731
119732 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
119733- __FILE__, __LINE__, tty->driver->name, port->count);
119734+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119735
119736 schedule();
119737 }
119738@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
119739
119740 spin_lock_irqsave(&port->lock, flags);
119741 if (!tty_hung_up_p(filp))
119742- port->count++;
119743+ atomic_inc(&port->count);
119744 port->blocked_open--;
119745 spin_unlock_irqrestore(&port->lock, flags);
119746
119747 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
119748- __FILE__, __LINE__, tty->driver->name, port->count);
119749+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
119750
119751 if (!retval)
119752 port->flags |= ASYNC_NORMAL_ACTIVE;
119753@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
119754
119755 /* ++ is not atomic, so this should be protected - Jean II */
119756 spin_lock_irqsave(&self->port.lock, flags);
119757- self->port.count++;
119758+ atomic_inc(&self->port.count);
119759 spin_unlock_irqrestore(&self->port.lock, flags);
119760 tty_port_tty_set(&self->port, tty);
119761
119762 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
119763- self->line, self->port.count);
119764+ self->line, atomic_read(&self->port.count));
119765
119766 /* Not really used by us, but lets do it anyway */
119767 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
119768@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
119769 tty_kref_put(port->tty);
119770 }
119771 port->tty = NULL;
119772- port->count = 0;
119773+ atomic_set(&port->count, 0);
119774 spin_unlock_irqrestore(&port->lock, flags);
119775
119776 wake_up_interruptible(&port->open_wait);
119777@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
119778 seq_putc(m, '\n');
119779
119780 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
119781- seq_printf(m, "Open count: %d\n", self->port.count);
119782+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
119783 seq_printf(m, "Max data size: %d\n", self->max_data_size);
119784 seq_printf(m, "Max header size: %d\n", self->max_header_size);
119785
119786diff --git a/net/irda/irproc.c b/net/irda/irproc.c
119787index b9ac598..f88cc56 100644
119788--- a/net/irda/irproc.c
119789+++ b/net/irda/irproc.c
119790@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
119791 {
119792 int i;
119793
119794- proc_irda = proc_mkdir("irda", init_net.proc_net);
119795+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
119796 if (proc_irda == NULL)
119797 return;
119798
119799diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
119800index 6daa52a..786aa2b 100644
119801--- a/net/iucv/af_iucv.c
119802+++ b/net/iucv/af_iucv.c
119803@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
119804 {
119805 char name[12];
119806
119807- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
119808+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
119809 while (__iucv_get_sock_by_name(name)) {
119810 sprintf(name, "%08x",
119811- atomic_inc_return(&iucv_sk_list.autobind_name));
119812+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
119813 }
119814 memcpy(iucv->src_name, name, 8);
119815 }
119816diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
119817index 2a6a1fd..6c112b0 100644
119818--- a/net/iucv/iucv.c
119819+++ b/net/iucv/iucv.c
119820@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
119821 return NOTIFY_OK;
119822 }
119823
119824-static struct notifier_block __refdata iucv_cpu_notifier = {
119825+static struct notifier_block iucv_cpu_notifier = {
119826 .notifier_call = iucv_cpu_notify,
119827 };
119828
119829diff --git a/net/key/af_key.c b/net/key/af_key.c
119830index f0d52d7..9c9af38 100644
119831--- a/net/key/af_key.c
119832+++ b/net/key/af_key.c
119833@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
119834 static u32 get_acqseq(void)
119835 {
119836 u32 res;
119837- static atomic_t acqseq;
119838+ static atomic_unchecked_t acqseq;
119839
119840 do {
119841- res = atomic_inc_return(&acqseq);
119842+ res = atomic_inc_return_unchecked(&acqseq);
119843 } while (!res);
119844 return res;
119845 }
119846diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
119847index 4b55287..bd247f7 100644
119848--- a/net/l2tp/l2tp_eth.c
119849+++ b/net/l2tp/l2tp_eth.c
119850@@ -42,12 +42,12 @@ struct l2tp_eth {
119851 struct sock *tunnel_sock;
119852 struct l2tp_session *session;
119853 struct list_head list;
119854- atomic_long_t tx_bytes;
119855- atomic_long_t tx_packets;
119856- atomic_long_t tx_dropped;
119857- atomic_long_t rx_bytes;
119858- atomic_long_t rx_packets;
119859- atomic_long_t rx_errors;
119860+ atomic_long_unchecked_t tx_bytes;
119861+ atomic_long_unchecked_t tx_packets;
119862+ atomic_long_unchecked_t tx_dropped;
119863+ atomic_long_unchecked_t rx_bytes;
119864+ atomic_long_unchecked_t rx_packets;
119865+ atomic_long_unchecked_t rx_errors;
119866 };
119867
119868 /* via l2tp_session_priv() */
119869@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
119870 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
119871
119872 if (likely(ret == NET_XMIT_SUCCESS)) {
119873- atomic_long_add(len, &priv->tx_bytes);
119874- atomic_long_inc(&priv->tx_packets);
119875+ atomic_long_add_unchecked(len, &priv->tx_bytes);
119876+ atomic_long_inc_unchecked(&priv->tx_packets);
119877 } else {
119878- atomic_long_inc(&priv->tx_dropped);
119879+ atomic_long_inc_unchecked(&priv->tx_dropped);
119880 }
119881 return NETDEV_TX_OK;
119882 }
119883@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
119884 {
119885 struct l2tp_eth *priv = netdev_priv(dev);
119886
119887- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
119888- stats->tx_packets = atomic_long_read(&priv->tx_packets);
119889- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
119890- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
119891- stats->rx_packets = atomic_long_read(&priv->rx_packets);
119892- stats->rx_errors = atomic_long_read(&priv->rx_errors);
119893+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
119894+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
119895+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
119896+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
119897+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
119898+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
119899 return stats;
119900 }
119901
119902@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
119903 nf_reset(skb);
119904
119905 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
119906- atomic_long_inc(&priv->rx_packets);
119907- atomic_long_add(data_len, &priv->rx_bytes);
119908+ atomic_long_inc_unchecked(&priv->rx_packets);
119909+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
119910 } else {
119911- atomic_long_inc(&priv->rx_errors);
119912+ atomic_long_inc_unchecked(&priv->rx_errors);
119913 }
119914 return;
119915
119916 error:
119917- atomic_long_inc(&priv->rx_errors);
119918+ atomic_long_inc_unchecked(&priv->rx_errors);
119919 kfree_skb(skb);
119920 }
119921
119922diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
119923index 7964993..2c48a3a 100644
119924--- a/net/l2tp/l2tp_ip.c
119925+++ b/net/l2tp/l2tp_ip.c
119926@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
119927 .ops = &l2tp_ip_ops,
119928 };
119929
119930-static struct net_protocol l2tp_ip_protocol __read_mostly = {
119931+static const struct net_protocol l2tp_ip_protocol = {
119932 .handler = l2tp_ip_recv,
119933 .netns_ok = 1,
119934 };
119935diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
119936index d1ded37..c0d1e49 100644
119937--- a/net/l2tp/l2tp_ip6.c
119938+++ b/net/l2tp/l2tp_ip6.c
119939@@ -755,7 +755,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
119940 .ops = &l2tp_ip6_ops,
119941 };
119942
119943-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
119944+static const struct inet6_protocol l2tp_ip6_protocol = {
119945 .handler = l2tp_ip6_recv,
119946 };
119947
119948diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
119949index 1a3c7e0..80f8b0c 100644
119950--- a/net/llc/llc_proc.c
119951+++ b/net/llc/llc_proc.c
119952@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
119953 int rc = -ENOMEM;
119954 struct proc_dir_entry *p;
119955
119956- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
119957+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
119958 if (!llc_proc_dir)
119959 goto out;
119960
119961diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
119962index ff347a0..6ea4923 100644
119963--- a/net/mac80211/cfg.c
119964+++ b/net/mac80211/cfg.c
119965@@ -582,7 +582,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
119966 ret = ieee80211_vif_use_channel(sdata, chandef,
119967 IEEE80211_CHANCTX_EXCLUSIVE);
119968 }
119969- } else if (local->open_count == local->monitors) {
119970+ } else if (local_read(&local->open_count) == local->monitors) {
119971 local->_oper_chandef = *chandef;
119972 ieee80211_hw_config(local, 0);
119973 }
119974@@ -3428,7 +3428,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
119975 else
119976 local->probe_req_reg--;
119977
119978- if (!local->open_count)
119979+ if (!local_read(&local->open_count))
119980 break;
119981
119982 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
119983@@ -3563,8 +3563,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
119984 if (chanctx_conf) {
119985 *chandef = sdata->vif.bss_conf.chandef;
119986 ret = 0;
119987- } else if (local->open_count > 0 &&
119988- local->open_count == local->monitors &&
119989+ } else if (local_read(&local->open_count) > 0 &&
119990+ local_read(&local->open_count) == local->monitors &&
119991 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
119992 if (local->use_chanctx)
119993 *chandef = local->monitor_chandef;
119994diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
119995index c0a9187..2a13300 100644
119996--- a/net/mac80211/ieee80211_i.h
119997+++ b/net/mac80211/ieee80211_i.h
119998@@ -30,6 +30,7 @@
119999 #include <net/ieee80211_radiotap.h>
120000 #include <net/cfg80211.h>
120001 #include <net/mac80211.h>
120002+#include <asm/local.h>
120003 #include "key.h"
120004 #include "sta_info.h"
120005 #include "debug.h"
120006@@ -1118,7 +1119,7 @@ struct ieee80211_local {
120007 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
120008 spinlock_t queue_stop_reason_lock;
120009
120010- int open_count;
120011+ local_t open_count;
120012 int monitors, cooked_mntrs;
120013 /* number of interfaces with corresponding FIF_ flags */
120014 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
120015diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
120016index 84cef60..53ec813 100644
120017--- a/net/mac80211/iface.c
120018+++ b/net/mac80211/iface.c
120019@@ -550,7 +550,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120020 break;
120021 }
120022
120023- if (local->open_count == 0) {
120024+ if (local_read(&local->open_count) == 0) {
120025 res = drv_start(local);
120026 if (res)
120027 goto err_del_bss;
120028@@ -597,7 +597,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120029 res = drv_add_interface(local, sdata);
120030 if (res)
120031 goto err_stop;
120032- } else if (local->monitors == 0 && local->open_count == 0) {
120033+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
120034 res = ieee80211_add_virtual_monitor(local);
120035 if (res)
120036 goto err_stop;
120037@@ -707,7 +707,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120038 atomic_inc(&local->iff_promiscs);
120039
120040 if (coming_up)
120041- local->open_count++;
120042+ local_inc(&local->open_count);
120043
120044 if (hw_reconf_flags)
120045 ieee80211_hw_config(local, hw_reconf_flags);
120046@@ -745,7 +745,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120047 err_del_interface:
120048 drv_remove_interface(local, sdata);
120049 err_stop:
120050- if (!local->open_count)
120051+ if (!local_read(&local->open_count))
120052 drv_stop(local);
120053 err_del_bss:
120054 sdata->bss = NULL;
120055@@ -915,7 +915,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120056 }
120057
120058 if (going_down)
120059- local->open_count--;
120060+ local_dec(&local->open_count);
120061
120062 switch (sdata->vif.type) {
120063 case NL80211_IFTYPE_AP_VLAN:
120064@@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120065 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
120066 }
120067
120068- if (local->open_count == 0)
120069+ if (local_read(&local->open_count) == 0)
120070 ieee80211_clear_tx_pending(local);
120071
120072 /*
120073@@ -1027,7 +1027,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120074 if (cancel_scan)
120075 flush_delayed_work(&local->scan_work);
120076
120077- if (local->open_count == 0) {
120078+ if (local_read(&local->open_count) == 0) {
120079 ieee80211_stop_device(local);
120080
120081 /* no reconfiguring after stop! */
120082@@ -1038,7 +1038,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120083 ieee80211_configure_filter(local);
120084 ieee80211_hw_config(local, hw_reconf_flags);
120085
120086- if (local->monitors == local->open_count)
120087+ if (local->monitors == local_read(&local->open_count))
120088 ieee80211_add_virtual_monitor(local);
120089 }
120090
120091diff --git a/net/mac80211/main.c b/net/mac80211/main.c
120092index df3051d..359d2f4 100644
120093--- a/net/mac80211/main.c
120094+++ b/net/mac80211/main.c
120095@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
120096 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
120097 IEEE80211_CONF_CHANGE_POWER);
120098
120099- if (changed && local->open_count) {
120100+ if (changed && local_read(&local->open_count)) {
120101 ret = drv_config(local, changed);
120102 /*
120103 * Goal:
120104diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
120105index ac6ad62..77dbac5 100644
120106--- a/net/mac80211/pm.c
120107+++ b/net/mac80211/pm.c
120108@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120109 struct ieee80211_sub_if_data *sdata;
120110 struct sta_info *sta;
120111
120112- if (!local->open_count)
120113+ if (!local_read(&local->open_count))
120114 goto suspend;
120115
120116 ieee80211_scan_cancel(local);
120117@@ -150,7 +150,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120118 WARN_ON(!list_empty(&local->chanctx_list));
120119
120120 /* stop hardware - this must stop RX */
120121- if (local->open_count)
120122+ if (local_read(&local->open_count))
120123 ieee80211_stop_device(local);
120124
120125 suspend:
120126diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
120127index d53355b..21f583a 100644
120128--- a/net/mac80211/rate.c
120129+++ b/net/mac80211/rate.c
120130@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
120131
120132 ASSERT_RTNL();
120133
120134- if (local->open_count)
120135+ if (local_read(&local->open_count))
120136 return -EBUSY;
120137
120138 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
120139diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
120140index 2880f2a..3085cec 100644
120141--- a/net/mac80211/sta_info.c
120142+++ b/net/mac80211/sta_info.c
120143@@ -339,7 +339,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
120144 int size = sizeof(struct txq_info) +
120145 ALIGN(hw->txq_data_size, sizeof(void *));
120146
120147- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
120148+ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
120149 if (!txq_data)
120150 goto free;
120151
120152diff --git a/net/mac80211/util.c b/net/mac80211/util.c
120153index b864ebc..17326ff 100644
120154--- a/net/mac80211/util.c
120155+++ b/net/mac80211/util.c
120156@@ -1761,7 +1761,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120157 bool sched_scan_stopped = false;
120158
120159 /* nothing to do if HW shouldn't run */
120160- if (!local->open_count)
120161+ if (!local_read(&local->open_count))
120162 goto wake_up;
120163
120164 #ifdef CONFIG_PM
120165@@ -2033,7 +2033,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120166 local->in_reconfig = false;
120167 barrier();
120168
120169- if (local->monitors == local->open_count && local->monitors > 0)
120170+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
120171 ieee80211_add_virtual_monitor(local);
120172
120173 /*
120174@@ -2088,7 +2088,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120175 * If this is for hw restart things are still running.
120176 * We may want to change that later, however.
120177 */
120178- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
120179+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
120180 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
120181
120182 if (!local->suspended)
120183@@ -2112,7 +2112,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120184 flush_delayed_work(&local->scan_work);
120185 }
120186
120187- if (local->open_count && !reconfig_due_to_wowlan)
120188+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
120189 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
120190
120191 list_for_each_entry(sdata, &local->interfaces, list) {
120192diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
120193index 1f93a59..96faa29 100644
120194--- a/net/mpls/af_mpls.c
120195+++ b/net/mpls/af_mpls.c
120196@@ -456,7 +456,7 @@ static int mpls_dev_sysctl_register(struct net_device *dev,
120197 struct mpls_dev *mdev)
120198 {
120199 char path[sizeof("net/mpls/conf/") + IFNAMSIZ];
120200- struct ctl_table *table;
120201+ ctl_table_no_const *table;
120202 int i;
120203
120204 table = kmemdup(&mpls_dev_table, sizeof(mpls_dev_table), GFP_KERNEL);
120205@@ -1025,7 +1025,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
120206 struct net *net = table->data;
120207 int platform_labels = net->mpls.platform_labels;
120208 int ret;
120209- struct ctl_table tmp = {
120210+ ctl_table_no_const tmp = {
120211 .procname = table->procname,
120212 .data = &platform_labels,
120213 .maxlen = sizeof(int),
120214@@ -1055,7 +1055,7 @@ static const struct ctl_table mpls_table[] = {
120215
120216 static int mpls_net_init(struct net *net)
120217 {
120218- struct ctl_table *table;
120219+ ctl_table_no_const *table;
120220
120221 net->mpls.platform_labels = 0;
120222 net->mpls.platform_label = NULL;
120223diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
120224index a0f3e6a3..b026fe2 100644
120225--- a/net/netfilter/Kconfig
120226+++ b/net/netfilter/Kconfig
120227@@ -1112,6 +1112,16 @@ config NETFILTER_XT_MATCH_ESP
120228
120229 To compile it as a module, choose M here. If unsure, say N.
120230
120231+config NETFILTER_XT_MATCH_GRADM
120232+ tristate '"gradm" match support'
120233+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
120234+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
120235+ ---help---
120236+ The gradm match allows to match on grsecurity RBAC being enabled.
120237+ It is useful when iptables rules are applied early on bootup to
120238+ prevent connections to the machine (except from a trusted host)
120239+ while the RBAC system is disabled.
120240+
120241 config NETFILTER_XT_MATCH_HASHLIMIT
120242 tristate '"hashlimit" match support'
120243 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
120244diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
120245index a87d8b8..d43183c 100644
120246--- a/net/netfilter/Makefile
120247+++ b/net/netfilter/Makefile
120248@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
120249 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
120250 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
120251 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
120252+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
120253 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
120254 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
120255 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
120256diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
120257index d259da3..6a32b2c 100644
120258--- a/net/netfilter/ipset/ip_set_core.c
120259+++ b/net/netfilter/ipset/ip_set_core.c
120260@@ -1952,7 +1952,7 @@ done:
120261 return ret;
120262 }
120263
120264-static struct nf_sockopt_ops so_set __read_mostly = {
120265+static struct nf_sockopt_ops so_set = {
120266 .pf = PF_INET,
120267 .get_optmin = SO_IP_SET,
120268 .get_optmax = SO_IP_SET + 1,
120269diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
120270index b0f7b62..0541842 100644
120271--- a/net/netfilter/ipvs/ip_vs_conn.c
120272+++ b/net/netfilter/ipvs/ip_vs_conn.c
120273@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
120274 /* Increase the refcnt counter of the dest */
120275 ip_vs_dest_hold(dest);
120276
120277- conn_flags = atomic_read(&dest->conn_flags);
120278+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
120279 if (cp->protocol != IPPROTO_UDP)
120280 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
120281 flags = cp->flags;
120282@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
120283
120284 cp->control = NULL;
120285 atomic_set(&cp->n_control, 0);
120286- atomic_set(&cp->in_pkts, 0);
120287+ atomic_set_unchecked(&cp->in_pkts, 0);
120288
120289 cp->packet_xmit = NULL;
120290 cp->app = NULL;
120291@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
120292
120293 /* Don't drop the entry if its number of incoming packets is not
120294 located in [0, 8] */
120295- i = atomic_read(&cp->in_pkts);
120296+ i = atomic_read_unchecked(&cp->in_pkts);
120297 if (i > 8 || i < 0) return 0;
120298
120299 if (!todrop_rate[i]) return 0;
120300diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
120301index 5d2b806..9005b29 100644
120302--- a/net/netfilter/ipvs/ip_vs_core.c
120303+++ b/net/netfilter/ipvs/ip_vs_core.c
120304@@ -574,7 +574,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
120305 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
120306 /* do not touch skb anymore */
120307
120308- atomic_inc(&cp->in_pkts);
120309+ atomic_inc_unchecked(&cp->in_pkts);
120310 ip_vs_conn_put(cp);
120311 return ret;
120312 }
120313@@ -1750,7 +1750,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
120314 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
120315 pkts = sysctl_sync_threshold(ipvs);
120316 else
120317- pkts = atomic_add_return(1, &cp->in_pkts);
120318+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120319
120320 if (ipvs->sync_state & IP_VS_STATE_MASTER)
120321 ip_vs_sync_conn(net, cp, pkts);
120322diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
120323index 285eae3..226f4a7 100644
120324--- a/net/netfilter/ipvs/ip_vs_ctl.c
120325+++ b/net/netfilter/ipvs/ip_vs_ctl.c
120326@@ -814,7 +814,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
120327 */
120328 ip_vs_rs_hash(ipvs, dest);
120329 }
120330- atomic_set(&dest->conn_flags, conn_flags);
120331+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
120332
120333 /* bind the service */
120334 old_svc = rcu_dereference_protected(dest->svc, 1);
120335@@ -1679,7 +1679,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
120336 * align with netns init in ip_vs_control_net_init()
120337 */
120338
120339-static struct ctl_table vs_vars[] = {
120340+static ctl_table_no_const vs_vars[] __read_only = {
120341 {
120342 .procname = "amemthresh",
120343 .maxlen = sizeof(int),
120344@@ -2020,7 +2020,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120345 " %-7s %-6d %-10d %-10d\n",
120346 &dest->addr.in6,
120347 ntohs(dest->port),
120348- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120349+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120350 atomic_read(&dest->weight),
120351 atomic_read(&dest->activeconns),
120352 atomic_read(&dest->inactconns));
120353@@ -2031,7 +2031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120354 "%-7s %-6d %-10d %-10d\n",
120355 ntohl(dest->addr.ip),
120356 ntohs(dest->port),
120357- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120358+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120359 atomic_read(&dest->weight),
120360 atomic_read(&dest->activeconns),
120361 atomic_read(&dest->inactconns));
120362@@ -2528,7 +2528,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
120363
120364 entry.addr = dest->addr.ip;
120365 entry.port = dest->port;
120366- entry.conn_flags = atomic_read(&dest->conn_flags);
120367+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
120368 entry.weight = atomic_read(&dest->weight);
120369 entry.u_threshold = dest->u_threshold;
120370 entry.l_threshold = dest->l_threshold;
120371@@ -3101,7 +3101,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
120372 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
120373 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
120374 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
120375- (atomic_read(&dest->conn_flags) &
120376+ (atomic_read_unchecked(&dest->conn_flags) &
120377 IP_VS_CONN_F_FWD_MASK)) ||
120378 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
120379 atomic_read(&dest->weight)) ||
120380@@ -3739,7 +3739,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
120381 {
120382 int idx;
120383 struct netns_ipvs *ipvs = net_ipvs(net);
120384- struct ctl_table *tbl;
120385+ ctl_table_no_const *tbl;
120386
120387 atomic_set(&ipvs->dropentry, 0);
120388 spin_lock_init(&ipvs->dropentry_lock);
120389diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
120390index 127f140..553d652 100644
120391--- a/net/netfilter/ipvs/ip_vs_lblc.c
120392+++ b/net/netfilter/ipvs/ip_vs_lblc.c
120393@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
120394 * IPVS LBLC sysctl table
120395 */
120396 #ifdef CONFIG_SYSCTL
120397-static struct ctl_table vs_vars_table[] = {
120398+static ctl_table_no_const vs_vars_table[] __read_only = {
120399 {
120400 .procname = "lblc_expiration",
120401 .data = NULL,
120402diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
120403index 2229d2d..b32b785 100644
120404--- a/net/netfilter/ipvs/ip_vs_lblcr.c
120405+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
120406@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
120407 * IPVS LBLCR sysctl table
120408 */
120409
120410-static struct ctl_table vs_vars_table[] = {
120411+static ctl_table_no_const vs_vars_table[] __read_only = {
120412 {
120413 .procname = "lblcr_expiration",
120414 .data = NULL,
120415diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
120416index 19b9cce..e4f3112 100644
120417--- a/net/netfilter/ipvs/ip_vs_sync.c
120418+++ b/net/netfilter/ipvs/ip_vs_sync.c
120419@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
120420 cp = cp->control;
120421 if (cp) {
120422 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120423- pkts = atomic_add_return(1, &cp->in_pkts);
120424+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120425 else
120426 pkts = sysctl_sync_threshold(ipvs);
120427 ip_vs_sync_conn(net, cp->control, pkts);
120428@@ -771,7 +771,7 @@ control:
120429 if (!cp)
120430 return;
120431 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120432- pkts = atomic_add_return(1, &cp->in_pkts);
120433+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120434 else
120435 pkts = sysctl_sync_threshold(ipvs);
120436 goto sloop;
120437@@ -919,7 +919,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
120438
120439 if (opt)
120440 memcpy(&cp->in_seq, opt, sizeof(*opt));
120441- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120442+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120443 cp->state = state;
120444 cp->old_state = cp->state;
120445 /*
120446diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
120447index 19986ec..416dbc5 100644
120448--- a/net/netfilter/ipvs/ip_vs_xmit.c
120449+++ b/net/netfilter/ipvs/ip_vs_xmit.c
120450@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
120451 else
120452 rc = NF_ACCEPT;
120453 /* do not touch skb anymore */
120454- atomic_inc(&cp->in_pkts);
120455+ atomic_inc_unchecked(&cp->in_pkts);
120456 goto out;
120457 }
120458
120459@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
120460 else
120461 rc = NF_ACCEPT;
120462 /* do not touch skb anymore */
120463- atomic_inc(&cp->in_pkts);
120464+ atomic_inc_unchecked(&cp->in_pkts);
120465 goto out;
120466 }
120467
120468diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
120469index 45da11a..ef3e5dc 100644
120470--- a/net/netfilter/nf_conntrack_acct.c
120471+++ b/net/netfilter/nf_conntrack_acct.c
120472@@ -64,7 +64,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
120473 #ifdef CONFIG_SYSCTL
120474 static int nf_conntrack_acct_init_sysctl(struct net *net)
120475 {
120476- struct ctl_table *table;
120477+ ctl_table_no_const *table;
120478
120479 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
120480 GFP_KERNEL);
120481diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
120482index 13fad86..18c984c 100644
120483--- a/net/netfilter/nf_conntrack_core.c
120484+++ b/net/netfilter/nf_conntrack_core.c
120485@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
120486 #define DYING_NULLS_VAL ((1<<30)+1)
120487 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
120488
120489+#ifdef CONFIG_GRKERNSEC_HIDESYM
120490+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
120491+#endif
120492+
120493 int nf_conntrack_init_net(struct net *net)
120494 {
120495 int ret = -ENOMEM;
120496@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
120497 if (!net->ct.stat)
120498 goto err_pcpu_lists;
120499
120500+#ifdef CONFIG_GRKERNSEC_HIDESYM
120501+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
120502+#else
120503 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
120504+#endif
120505 if (!net->ct.slabname)
120506 goto err_slabname;
120507
120508diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
120509index 4e78c57..ec8fb74 100644
120510--- a/net/netfilter/nf_conntrack_ecache.c
120511+++ b/net/netfilter/nf_conntrack_ecache.c
120512@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
120513 #ifdef CONFIG_SYSCTL
120514 static int nf_conntrack_event_init_sysctl(struct net *net)
120515 {
120516- struct ctl_table *table;
120517+ ctl_table_no_const *table;
120518
120519 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
120520 GFP_KERNEL);
120521diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
120522index bd9d315..989947e 100644
120523--- a/net/netfilter/nf_conntrack_helper.c
120524+++ b/net/netfilter/nf_conntrack_helper.c
120525@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
120526
120527 static int nf_conntrack_helper_init_sysctl(struct net *net)
120528 {
120529- struct ctl_table *table;
120530+ ctl_table_no_const *table;
120531
120532 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
120533 GFP_KERNEL);
120534diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
120535index b65d586..beec902 100644
120536--- a/net/netfilter/nf_conntrack_proto.c
120537+++ b/net/netfilter/nf_conntrack_proto.c
120538@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
120539
120540 static void
120541 nf_ct_unregister_sysctl(struct ctl_table_header **header,
120542- struct ctl_table **table,
120543+ ctl_table_no_const **table,
120544 unsigned int users)
120545 {
120546 if (users > 0)
120547diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
120548index fc823fa..8311af3 100644
120549--- a/net/netfilter/nf_conntrack_standalone.c
120550+++ b/net/netfilter/nf_conntrack_standalone.c
120551@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
120552
120553 static int nf_conntrack_standalone_init_sysctl(struct net *net)
120554 {
120555- struct ctl_table *table;
120556+ ctl_table_no_const *table;
120557
120558 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
120559 GFP_KERNEL);
120560diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
120561index 7a394df..bd91a8a 100644
120562--- a/net/netfilter/nf_conntrack_timestamp.c
120563+++ b/net/netfilter/nf_conntrack_timestamp.c
120564@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
120565 #ifdef CONFIG_SYSCTL
120566 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
120567 {
120568- struct ctl_table *table;
120569+ ctl_table_no_const *table;
120570
120571 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
120572 GFP_KERNEL);
120573diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
120574index 675d12c..b36e825 100644
120575--- a/net/netfilter/nf_log.c
120576+++ b/net/netfilter/nf_log.c
120577@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
120578
120579 #ifdef CONFIG_SYSCTL
120580 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
120581-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
120582+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
120583
120584 static int nf_log_proc_dostring(struct ctl_table *table, int write,
120585 void __user *buffer, size_t *lenp, loff_t *ppos)
120586@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
120587 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
120588 mutex_unlock(&nf_log_mutex);
120589 } else {
120590+ ctl_table_no_const nf_log_table = *table;
120591+
120592 mutex_lock(&nf_log_mutex);
120593 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
120594 if (!logger)
120595- table->data = "NONE";
120596+ nf_log_table.data = "NONE";
120597 else
120598- table->data = logger->name;
120599- r = proc_dostring(table, write, buffer, lenp, ppos);
120600+ nf_log_table.data = logger->name;
120601+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
120602 mutex_unlock(&nf_log_mutex);
120603 }
120604
120605diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
120606index c68c1e5..8b5d670 100644
120607--- a/net/netfilter/nf_sockopt.c
120608+++ b/net/netfilter/nf_sockopt.c
120609@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
120610 }
120611 }
120612
120613- list_add(&reg->list, &nf_sockopts);
120614+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
120615 out:
120616 mutex_unlock(&nf_sockopt_mutex);
120617 return ret;
120618@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
120619 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
120620 {
120621 mutex_lock(&nf_sockopt_mutex);
120622- list_del(&reg->list);
120623+ pax_list_del((struct list_head *)&reg->list);
120624 mutex_unlock(&nf_sockopt_mutex);
120625 }
120626 EXPORT_SYMBOL(nf_unregister_sockopt);
120627diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
120628index 4ef1fae..f72f08b 100644
120629--- a/net/netfilter/nfnetlink_log.c
120630+++ b/net/netfilter/nfnetlink_log.c
120631@@ -84,7 +84,7 @@ static int nfnl_log_net_id __read_mostly;
120632 struct nfnl_log_net {
120633 spinlock_t instances_lock;
120634 struct hlist_head instance_table[INSTANCE_BUCKETS];
120635- atomic_t global_seq;
120636+ atomic_unchecked_t global_seq;
120637 };
120638
120639 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
120640@@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log,
120641 /* global sequence number */
120642 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
120643 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
120644- htonl(atomic_inc_return(&log->global_seq))))
120645+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
120646 goto nla_put_failure;
120647
120648 if (data_len) {
120649diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
120650index 7f29cfc..917ef5f 100644
120651--- a/net/netfilter/nft_compat.c
120652+++ b/net/netfilter/nft_compat.c
120653@@ -321,14 +321,7 @@ static void nft_match_eval(const struct nft_expr *expr,
120654 return;
120655 }
120656
120657- switch (ret ? 1 : 0) {
120658- case 1:
120659- regs->verdict.code = NFT_CONTINUE;
120660- break;
120661- case 0:
120662- regs->verdict.code = NFT_BREAK;
120663- break;
120664- }
120665+ regs->verdict.code = ret ? NFT_CONTINUE : NFT_BREAK;
120666 }
120667
120668 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
120669diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
120670new file mode 100644
120671index 0000000..c566332
120672--- /dev/null
120673+++ b/net/netfilter/xt_gradm.c
120674@@ -0,0 +1,51 @@
120675+/*
120676+ * gradm match for netfilter
120677