]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.6-201506232104.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.0.6-201506232104.patch
CommitLineData
ee1b9a5f
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 4d68ec8..9546b75 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1203,6 +1203,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@@ -2300,6 +2307,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@@ -2601,6 +2612,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/Makefile b/Makefile
376index af6da04..22820aa 100644
377--- a/Makefile
378+++ b/Makefile
379@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
380 HOSTCC = gcc
381 HOSTCXX = g++
382 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
383-HOSTCXXFLAGS = -O2
384+HOSTCFLAGS = -W -Wno-unused-parameter -Wno-missing-field-initializers -fno-delete-null-pointer-checks
385+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
386+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
387
388 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
389 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
390@@ -446,8 +448,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
391 # Rules shared between *config targets and build targets
392
393 # Basic helpers built in scripts/
394-PHONY += scripts_basic
395-scripts_basic:
396+PHONY += scripts_basic gcc-plugins
397+scripts_basic: gcc-plugins
398 $(Q)$(MAKE) $(build)=scripts/basic
399 $(Q)rm -f .tmp_quiet_recordmcount
400
401@@ -622,6 +624,74 @@ endif
402 # Tell gcc to never replace conditional load with a non-conditional one
403 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
404
405+ifndef DISABLE_PAX_PLUGINS
406+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
407+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
408+else
409+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
410+endif
411+ifneq ($(PLUGINCC),)
412+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
413+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
414+endif
415+ifdef CONFIG_PAX_MEMORY_STACKLEAK
416+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
417+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
418+endif
419+ifdef CONFIG_KALLOCSTAT_PLUGIN
420+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
421+endif
422+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
423+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
424+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
425+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
426+endif
427+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
428+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
429+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
430+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
431+endif
432+endif
433+ifdef CONFIG_CHECKER_PLUGIN
434+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
435+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
436+endif
437+endif
438+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
439+ifdef CONFIG_PAX_SIZE_OVERFLOW
440+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
441+endif
442+ifdef CONFIG_PAX_LATENT_ENTROPY
443+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
444+endif
445+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
446+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
447+endif
448+INITIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/initify_plugin.so -DINITIFY_PLUGIN
449+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
450+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
451+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
452+GCC_PLUGINS_CFLAGS += $(INITIFY_PLUGIN_CFLAGS)
453+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
454+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
455+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
456+ifeq ($(KBUILD_EXTMOD),)
457+gcc-plugins:
458+ $(Q)$(MAKE) $(build)=tools/gcc
459+else
460+gcc-plugins: ;
461+endif
462+else
463+gcc-plugins:
464+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
465+ $(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.))
466+else
467+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
468+endif
469+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
470+endif
471+endif
472+
473 ifdef CONFIG_READABLE_ASM
474 # Disable optimizations that make assembler listings hard to read.
475 # reorder blocks reorders the control in the function
476@@ -714,7 +784,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
477 else
478 KBUILD_CFLAGS += -g
479 endif
480-KBUILD_AFLAGS += -Wa,-gdwarf-2
481+KBUILD_AFLAGS += -Wa,--gdwarf-2
482 endif
483 ifdef CONFIG_DEBUG_INFO_DWARF4
484 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
485@@ -884,7 +954,7 @@ export mod_sign_cmd
486
487
488 ifeq ($(KBUILD_EXTMOD),)
489-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
490+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
491
492 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
493 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
494@@ -934,6 +1004,8 @@ endif
495
496 # The actual objects are generated when descending,
497 # make sure no implicit rule kicks in
498+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
499+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
500 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
501
502 # Handle descending into subdirectories listed in $(vmlinux-dirs)
503@@ -943,7 +1015,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
504 # Error messages still appears in the original language
505
506 PHONY += $(vmlinux-dirs)
507-$(vmlinux-dirs): prepare scripts
508+$(vmlinux-dirs): gcc-plugins prepare scripts
509 $(Q)$(MAKE) $(build)=$@
510
511 define filechk_kernel.release
512@@ -986,10 +1058,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
513
514 archprepare: archheaders archscripts prepare1 scripts_basic
515
516+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
517+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
518 prepare0: archprepare FORCE
519 $(Q)$(MAKE) $(build)=.
520
521 # All the preparing..
522+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
523 prepare: prepare0
524
525 # Generate some files
526@@ -1103,6 +1178,8 @@ all: modules
527 # using awk while concatenating to the final file.
528
529 PHONY += modules
530+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
531+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
532 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
533 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
534 @$(kecho) ' Building modules, stage 2.';
535@@ -1118,7 +1195,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
536
537 # Target to prepare building external modules
538 PHONY += modules_prepare
539-modules_prepare: prepare scripts
540+modules_prepare: gcc-plugins prepare scripts
541
542 # Target to install modules
543 PHONY += modules_install
544@@ -1184,7 +1261,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
545 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
546 signing_key.priv signing_key.x509 x509.genkey \
547 extra_certificates signing_key.x509.keyid \
548- signing_key.x509.signer vmlinux-gdb.py
549+ signing_key.x509.signer vmlinux-gdb.py \
550+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
551+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
552+ tools/gcc/randomize_layout_seed.h
553
554 # clean - Delete most, but leave enough to build external modules
555 #
556@@ -1223,7 +1303,7 @@ distclean: mrproper
557 @find $(srctree) $(RCS_FIND_IGNORE) \
558 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
559 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
560- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
561+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
562 -type f -print | xargs rm -f
563
564
565@@ -1389,6 +1469,8 @@ PHONY += $(module-dirs) modules
566 $(module-dirs): crmodverdir $(objtree)/Module.symvers
567 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
568
569+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
570+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
571 modules: $(module-dirs)
572 @$(kecho) ' Building modules, stage 2.';
573 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
574@@ -1529,17 +1611,21 @@ else
575 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
576 endif
577
578-%.s: %.c prepare scripts FORCE
579+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
580+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
581+%.s: %.c gcc-plugins prepare scripts FORCE
582 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
583 %.i: %.c prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585-%.o: %.c prepare scripts FORCE
586+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
587+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
588+%.o: %.c gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590 %.lst: %.c prepare scripts FORCE
591 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
592-%.s: %.S prepare scripts FORCE
593+%.s: %.S gcc-plugins prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595-%.o: %.S prepare scripts FORCE
596+%.o: %.S gcc-plugins prepare scripts FORCE
597 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
598 %.symtypes: %.c prepare scripts FORCE
599 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
600@@ -1551,11 +1637,15 @@ endif
601 $(build)=$(build-dir)
602 # Make sure the latest headers are built for Documentation
603 Documentation/: headers_install
604-%/: prepare scripts FORCE
605+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
606+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
607+%/: gcc-plugins prepare scripts FORCE
608 $(cmd_crmodverdir)
609 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
610 $(build)=$(build-dir)
611-%.ko: prepare scripts FORCE
612+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
613+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
614+%.ko: gcc-plugins prepare scripts FORCE
615 $(cmd_crmodverdir)
616 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
617 $(build)=$(build-dir) $(@:.ko=.o)
618diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
619index 8f8eafb..3405f46 100644
620--- a/arch/alpha/include/asm/atomic.h
621+++ b/arch/alpha/include/asm/atomic.h
622@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
623 #define atomic_dec(v) atomic_sub(1,(v))
624 #define atomic64_dec(v) atomic64_sub(1,(v))
625
626+#define atomic64_read_unchecked(v) atomic64_read(v)
627+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
628+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
629+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
630+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
631+#define atomic64_inc_unchecked(v) atomic64_inc(v)
632+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
633+#define atomic64_dec_unchecked(v) atomic64_dec(v)
634+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
635+
636 #endif /* _ALPHA_ATOMIC_H */
637diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
638index ad368a9..fbe0f25 100644
639--- a/arch/alpha/include/asm/cache.h
640+++ b/arch/alpha/include/asm/cache.h
641@@ -4,19 +4,19 @@
642 #ifndef __ARCH_ALPHA_CACHE_H
643 #define __ARCH_ALPHA_CACHE_H
644
645+#include <linux/const.h>
646
647 /* Bytes per L1 (data) cache line. */
648 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
649-# define L1_CACHE_BYTES 64
650 # define L1_CACHE_SHIFT 6
651 #else
652 /* Both EV4 and EV5 are write-through, read-allocate,
653 direct-mapped, physical.
654 */
655-# define L1_CACHE_BYTES 32
656 # define L1_CACHE_SHIFT 5
657 #endif
658
659+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
660 #define SMP_CACHE_BYTES L1_CACHE_BYTES
661
662 #endif
663diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
664index 968d999..d36b2df 100644
665--- a/arch/alpha/include/asm/elf.h
666+++ b/arch/alpha/include/asm/elf.h
667@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
668
669 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
670
671+#ifdef CONFIG_PAX_ASLR
672+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
673+
674+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
675+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
676+#endif
677+
678 /* $0 is set by ld.so to a pointer to a function which might be
679 registered using atexit. This provides a mean for the dynamic
680 linker to call DT_FINI functions for shared libraries that have
681diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
682index aab14a0..b4fa3e7 100644
683--- a/arch/alpha/include/asm/pgalloc.h
684+++ b/arch/alpha/include/asm/pgalloc.h
685@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686 pgd_set(pgd, pmd);
687 }
688
689+static inline void
690+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
691+{
692+ pgd_populate(mm, pgd, pmd);
693+}
694+
695 extern pgd_t *pgd_alloc(struct mm_struct *mm);
696
697 static inline void
698diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
699index a9a1195..e9b8417 100644
700--- a/arch/alpha/include/asm/pgtable.h
701+++ b/arch/alpha/include/asm/pgtable.h
702@@ -101,6 +101,17 @@ struct vm_area_struct;
703 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
704 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
705 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
706+
707+#ifdef CONFIG_PAX_PAGEEXEC
708+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
709+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
710+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
711+#else
712+# define PAGE_SHARED_NOEXEC PAGE_SHARED
713+# define PAGE_COPY_NOEXEC PAGE_COPY
714+# define PAGE_READONLY_NOEXEC PAGE_READONLY
715+#endif
716+
717 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
718
719 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
720diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
721index 2fd00b7..cfd5069 100644
722--- a/arch/alpha/kernel/module.c
723+++ b/arch/alpha/kernel/module.c
724@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
725
726 /* The small sections were sorted to the end of the segment.
727 The following should definitely cover them. */
728- gp = (u64)me->module_core + me->core_size - 0x8000;
729+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
730 got = sechdrs[me->arch.gotsecindex].sh_addr;
731
732 for (i = 0; i < n; i++) {
733diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
734index e51f578..16c64a3 100644
735--- a/arch/alpha/kernel/osf_sys.c
736+++ b/arch/alpha/kernel/osf_sys.c
737@@ -1296,10 +1296,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
738 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
739
740 static unsigned long
741-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
742- unsigned long limit)
743+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
744+ unsigned long limit, unsigned long flags)
745 {
746 struct vm_unmapped_area_info info;
747+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
748
749 info.flags = 0;
750 info.length = len;
751@@ -1307,6 +1308,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
752 info.high_limit = limit;
753 info.align_mask = 0;
754 info.align_offset = 0;
755+ info.threadstack_offset = offset;
756 return vm_unmapped_area(&info);
757 }
758
759@@ -1339,20 +1341,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
760 merely specific addresses, but regions of memory -- perhaps
761 this feature should be incorporated into all ports? */
762
763+#ifdef CONFIG_PAX_RANDMMAP
764+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
765+#endif
766+
767 if (addr) {
768- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
769+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
770 if (addr != (unsigned long) -ENOMEM)
771 return addr;
772 }
773
774 /* Next, try allocating at TASK_UNMAPPED_BASE. */
775- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
776- len, limit);
777+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
778+
779 if (addr != (unsigned long) -ENOMEM)
780 return addr;
781
782 /* Finally, try allocating in low memory. */
783- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
784+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
785
786 return addr;
787 }
788diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
789index 9d0ac09..479a962 100644
790--- a/arch/alpha/mm/fault.c
791+++ b/arch/alpha/mm/fault.c
792@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
793 __reload_thread(pcb);
794 }
795
796+#ifdef CONFIG_PAX_PAGEEXEC
797+/*
798+ * PaX: decide what to do with offenders (regs->pc = fault address)
799+ *
800+ * returns 1 when task should be killed
801+ * 2 when patched PLT trampoline was detected
802+ * 3 when unpatched PLT trampoline was detected
803+ */
804+static int pax_handle_fetch_fault(struct pt_regs *regs)
805+{
806+
807+#ifdef CONFIG_PAX_EMUPLT
808+ int err;
809+
810+ do { /* PaX: patched PLT emulation #1 */
811+ unsigned int ldah, ldq, jmp;
812+
813+ err = get_user(ldah, (unsigned int *)regs->pc);
814+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
815+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
816+
817+ if (err)
818+ break;
819+
820+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
821+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
822+ jmp == 0x6BFB0000U)
823+ {
824+ unsigned long r27, addr;
825+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
826+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
827+
828+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
829+ err = get_user(r27, (unsigned long *)addr);
830+ if (err)
831+ break;
832+
833+ regs->r27 = r27;
834+ regs->pc = r27;
835+ return 2;
836+ }
837+ } while (0);
838+
839+ do { /* PaX: patched PLT emulation #2 */
840+ unsigned int ldah, lda, br;
841+
842+ err = get_user(ldah, (unsigned int *)regs->pc);
843+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
844+ err |= get_user(br, (unsigned int *)(regs->pc+8));
845+
846+ if (err)
847+ break;
848+
849+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
850+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
851+ (br & 0xFFE00000U) == 0xC3E00000U)
852+ {
853+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
854+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
855+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
856+
857+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
858+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
859+ return 2;
860+ }
861+ } while (0);
862+
863+ do { /* PaX: unpatched PLT emulation */
864+ unsigned int br;
865+
866+ err = get_user(br, (unsigned int *)regs->pc);
867+
868+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
869+ unsigned int br2, ldq, nop, jmp;
870+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
871+
872+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
873+ err = get_user(br2, (unsigned int *)addr);
874+ err |= get_user(ldq, (unsigned int *)(addr+4));
875+ err |= get_user(nop, (unsigned int *)(addr+8));
876+ err |= get_user(jmp, (unsigned int *)(addr+12));
877+ err |= get_user(resolver, (unsigned long *)(addr+16));
878+
879+ if (err)
880+ break;
881+
882+ if (br2 == 0xC3600000U &&
883+ ldq == 0xA77B000CU &&
884+ nop == 0x47FF041FU &&
885+ jmp == 0x6B7B0000U)
886+ {
887+ regs->r28 = regs->pc+4;
888+ regs->r27 = addr+16;
889+ regs->pc = resolver;
890+ return 3;
891+ }
892+ }
893+ } while (0);
894+#endif
895+
896+ return 1;
897+}
898+
899+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
900+{
901+ unsigned long i;
902+
903+ printk(KERN_ERR "PAX: bytes at PC: ");
904+ for (i = 0; i < 5; i++) {
905+ unsigned int c;
906+ if (get_user(c, (unsigned int *)pc+i))
907+ printk(KERN_CONT "???????? ");
908+ else
909+ printk(KERN_CONT "%08x ", c);
910+ }
911+ printk("\n");
912+}
913+#endif
914
915 /*
916 * This routine handles page faults. It determines the address,
917@@ -133,8 +251,29 @@ retry:
918 good_area:
919 si_code = SEGV_ACCERR;
920 if (cause < 0) {
921- if (!(vma->vm_flags & VM_EXEC))
922+ if (!(vma->vm_flags & VM_EXEC)) {
923+
924+#ifdef CONFIG_PAX_PAGEEXEC
925+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
926+ goto bad_area;
927+
928+ up_read(&mm->mmap_sem);
929+ switch (pax_handle_fetch_fault(regs)) {
930+
931+#ifdef CONFIG_PAX_EMUPLT
932+ case 2:
933+ case 3:
934+ return;
935+#endif
936+
937+ }
938+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
939+ do_group_exit(SIGKILL);
940+#else
941 goto bad_area;
942+#endif
943+
944+ }
945 } else if (!cause) {
946 /* Allow reads even for write-only mappings */
947 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
948diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
949index cf4c0c9..a87ecf5 100644
950--- a/arch/arm/Kconfig
951+++ b/arch/arm/Kconfig
952@@ -1735,7 +1735,7 @@ config ALIGNMENT_TRAP
953
954 config UACCESS_WITH_MEMCPY
955 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
956- depends on MMU
957+ depends on MMU && !PAX_MEMORY_UDEREF
958 default y if CPU_FEROCEON
959 help
960 Implement faster copy_to_user and clear_user methods for CPU
961@@ -1999,6 +1999,7 @@ config XIP_PHYS_ADDR
962 config KEXEC
963 bool "Kexec system call (EXPERIMENTAL)"
964 depends on (!SMP || PM_SLEEP_SMP)
965+ depends on !GRKERNSEC_KMEM
966 help
967 kexec is a system call that implements the ability to shutdown your
968 current kernel, and to start another kernel. It is like a reboot
969diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
970index e22c119..abe7041 100644
971--- a/arch/arm/include/asm/atomic.h
972+++ b/arch/arm/include/asm/atomic.h
973@@ -18,17 +18,41 @@
974 #include <asm/barrier.h>
975 #include <asm/cmpxchg.h>
976
977+#ifdef CONFIG_GENERIC_ATOMIC64
978+#include <asm-generic/atomic64.h>
979+#endif
980+
981 #define ATOMIC_INIT(i) { (i) }
982
983 #ifdef __KERNEL__
984
985+#ifdef CONFIG_THUMB2_KERNEL
986+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
987+#else
988+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
989+#endif
990+
991+#define _ASM_EXTABLE(from, to) \
992+" .pushsection __ex_table,\"a\"\n"\
993+" .align 3\n" \
994+" .long " #from ", " #to"\n" \
995+" .popsection"
996+
997 /*
998 * On ARM, ordinary assignment (str instruction) doesn't clear the local
999 * strex/ldrex monitor on some implementations. The reason we can use it for
1000 * atomic_set() is the clrex or dummy strex done on every exception return.
1001 */
1002 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1003+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1004+{
1005+ return ACCESS_ONCE(v->counter);
1006+}
1007 #define atomic_set(v,i) (((v)->counter) = (i))
1008+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1009+{
1010+ v->counter = i;
1011+}
1012
1013 #if __LINUX_ARM_ARCH__ >= 6
1014
1015@@ -38,26 +62,50 @@
1016 * to ensure that the update happens.
1017 */
1018
1019-#define ATOMIC_OP(op, c_op, asm_op) \
1020-static inline void atomic_##op(int i, atomic_t *v) \
1021+#ifdef CONFIG_PAX_REFCOUNT
1022+#define __OVERFLOW_POST \
1023+ " bvc 3f\n" \
1024+ "2: " REFCOUNT_TRAP_INSN "\n"\
1025+ "3:\n"
1026+#define __OVERFLOW_POST_RETURN \
1027+ " bvc 3f\n" \
1028+" mov %0, %1\n" \
1029+ "2: " REFCOUNT_TRAP_INSN "\n"\
1030+ "3:\n"
1031+#define __OVERFLOW_EXTABLE \
1032+ "4:\n" \
1033+ _ASM_EXTABLE(2b, 4b)
1034+#else
1035+#define __OVERFLOW_POST
1036+#define __OVERFLOW_POST_RETURN
1037+#define __OVERFLOW_EXTABLE
1038+#endif
1039+
1040+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1041+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1042 { \
1043 unsigned long tmp; \
1044 int result; \
1045 \
1046 prefetchw(&v->counter); \
1047- __asm__ __volatile__("@ atomic_" #op "\n" \
1048+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1049 "1: ldrex %0, [%3]\n" \
1050 " " #asm_op " %0, %0, %4\n" \
1051+ post_op \
1052 " strex %1, %0, [%3]\n" \
1053 " teq %1, #0\n" \
1054-" bne 1b" \
1055+" bne 1b\n" \
1056+ extable \
1057 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1058 : "r" (&v->counter), "Ir" (i) \
1059 : "cc"); \
1060 } \
1061
1062-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1063-static inline int atomic_##op##_return(int i, atomic_t *v) \
1064+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1065+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1066+
1067+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1068+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1069 { \
1070 unsigned long tmp; \
1071 int result; \
1072@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1073 smp_mb(); \
1074 prefetchw(&v->counter); \
1075 \
1076- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1077+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1078 "1: ldrex %0, [%3]\n" \
1079 " " #asm_op " %0, %0, %4\n" \
1080+ post_op \
1081 " strex %1, %0, [%3]\n" \
1082 " teq %1, #0\n" \
1083-" bne 1b" \
1084+" bne 1b\n" \
1085+ extable \
1086 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1087 : "r" (&v->counter), "Ir" (i) \
1088 : "cc"); \
1089@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1090 return result; \
1091 }
1092
1093+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1094+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1095+
1096 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1097 {
1098 int oldval;
1099@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1100 __asm__ __volatile__ ("@ atomic_add_unless\n"
1101 "1: ldrex %0, [%4]\n"
1102 " teq %0, %5\n"
1103-" beq 2f\n"
1104-" add %1, %0, %6\n"
1105+" beq 4f\n"
1106+" adds %1, %0, %6\n"
1107+
1108+#ifdef CONFIG_PAX_REFCOUNT
1109+" bvc 3f\n"
1110+"2: " REFCOUNT_TRAP_INSN "\n"
1111+"3:\n"
1112+#endif
1113+
1114 " strex %2, %1, [%4]\n"
1115 " teq %2, #0\n"
1116 " bne 1b\n"
1117-"2:"
1118+"4:"
1119+
1120+#ifdef CONFIG_PAX_REFCOUNT
1121+ _ASM_EXTABLE(2b, 4b)
1122+#endif
1123+
1124 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1125 : "r" (&v->counter), "r" (u), "r" (a)
1126 : "cc");
1127@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1128 return oldval;
1129 }
1130
1131+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1132+{
1133+ unsigned long oldval, res;
1134+
1135+ smp_mb();
1136+
1137+ do {
1138+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1139+ "ldrex %1, [%3]\n"
1140+ "mov %0, #0\n"
1141+ "teq %1, %4\n"
1142+ "strexeq %0, %5, [%3]\n"
1143+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1144+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1145+ : "cc");
1146+ } while (res);
1147+
1148+ smp_mb();
1149+
1150+ return oldval;
1151+}
1152+
1153 #else /* ARM_ARCH_6 */
1154
1155 #ifdef CONFIG_SMP
1156 #error SMP not supported on pre-ARMv6 CPUs
1157 #endif
1158
1159-#define ATOMIC_OP(op, c_op, asm_op) \
1160-static inline void atomic_##op(int i, atomic_t *v) \
1161+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1162+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1163 { \
1164 unsigned long flags; \
1165 \
1166@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1167 raw_local_irq_restore(flags); \
1168 } \
1169
1170-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1171-static inline int atomic_##op##_return(int i, atomic_t *v) \
1172+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1173+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1174+
1175+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1176+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1177 { \
1178 unsigned long flags; \
1179 int val; \
1180@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1181 return val; \
1182 }
1183
1184+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1185+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1186+
1187 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1188 {
1189 int ret;
1190@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1191 return ret;
1192 }
1193
1194+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1195+{
1196+ return atomic_cmpxchg((atomic_t *)v, old, new);
1197+}
1198+
1199 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1200 {
1201 int c, old;
1202@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1203
1204 #undef ATOMIC_OPS
1205 #undef ATOMIC_OP_RETURN
1206+#undef __ATOMIC_OP_RETURN
1207 #undef ATOMIC_OP
1208+#undef __ATOMIC_OP
1209
1210 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1211+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1212+{
1213+ return xchg(&v->counter, new);
1214+}
1215
1216 #define atomic_inc(v) atomic_add(1, v)
1217+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1218+{
1219+ atomic_add_unchecked(1, v);
1220+}
1221 #define atomic_dec(v) atomic_sub(1, v)
1222+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1223+{
1224+ atomic_sub_unchecked(1, v);
1225+}
1226
1227 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1228+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1229+{
1230+ return atomic_add_return_unchecked(1, v) == 0;
1231+}
1232 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1233 #define atomic_inc_return(v) (atomic_add_return(1, v))
1234+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1235+{
1236+ return atomic_add_return_unchecked(1, v);
1237+}
1238 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1239 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1240
1241@@ -216,6 +336,14 @@ typedef struct {
1242 long long counter;
1243 } atomic64_t;
1244
1245+#ifdef CONFIG_PAX_REFCOUNT
1246+typedef struct {
1247+ long long counter;
1248+} atomic64_unchecked_t;
1249+#else
1250+typedef atomic64_t atomic64_unchecked_t;
1251+#endif
1252+
1253 #define ATOMIC64_INIT(i) { (i) }
1254
1255 #ifdef CONFIG_ARM_LPAE
1256@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1257 return result;
1258 }
1259
1260+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1261+{
1262+ long long result;
1263+
1264+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1265+" ldrd %0, %H0, [%1]"
1266+ : "=&r" (result)
1267+ : "r" (&v->counter), "Qo" (v->counter)
1268+ );
1269+
1270+ return result;
1271+}
1272+
1273 static inline void atomic64_set(atomic64_t *v, long long i)
1274 {
1275 __asm__ __volatile__("@ atomic64_set\n"
1276@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1277 : "r" (&v->counter), "r" (i)
1278 );
1279 }
1280+
1281+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1282+{
1283+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1284+" strd %2, %H2, [%1]"
1285+ : "=Qo" (v->counter)
1286+ : "r" (&v->counter), "r" (i)
1287+ );
1288+}
1289 #else
1290 static inline long long atomic64_read(const atomic64_t *v)
1291 {
1292@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1293 return result;
1294 }
1295
1296+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1297+{
1298+ long long result;
1299+
1300+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1301+" ldrexd %0, %H0, [%1]"
1302+ : "=&r" (result)
1303+ : "r" (&v->counter), "Qo" (v->counter)
1304+ );
1305+
1306+ return result;
1307+}
1308+
1309 static inline void atomic64_set(atomic64_t *v, long long i)
1310 {
1311 long long tmp;
1312@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1313 : "r" (&v->counter), "r" (i)
1314 : "cc");
1315 }
1316+
1317+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1318+{
1319+ long long tmp;
1320+
1321+ prefetchw(&v->counter);
1322+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1323+"1: ldrexd %0, %H0, [%2]\n"
1324+" strexd %0, %3, %H3, [%2]\n"
1325+" teq %0, #0\n"
1326+" bne 1b"
1327+ : "=&r" (tmp), "=Qo" (v->counter)
1328+ : "r" (&v->counter), "r" (i)
1329+ : "cc");
1330+}
1331 #endif
1332
1333-#define ATOMIC64_OP(op, op1, op2) \
1334-static inline void atomic64_##op(long long i, atomic64_t *v) \
1335+#undef __OVERFLOW_POST_RETURN
1336+#define __OVERFLOW_POST_RETURN \
1337+ " bvc 3f\n" \
1338+" mov %0, %1\n" \
1339+" mov %H0, %H1\n" \
1340+ "2: " REFCOUNT_TRAP_INSN "\n"\
1341+ "3:\n"
1342+
1343+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1344+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1345 { \
1346 long long result; \
1347 unsigned long tmp; \
1348 \
1349 prefetchw(&v->counter); \
1350- __asm__ __volatile__("@ atomic64_" #op "\n" \
1351+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1352 "1: ldrexd %0, %H0, [%3]\n" \
1353 " " #op1 " %Q0, %Q0, %Q4\n" \
1354 " " #op2 " %R0, %R0, %R4\n" \
1355+ post_op \
1356 " strexd %1, %0, %H0, [%3]\n" \
1357 " teq %1, #0\n" \
1358-" bne 1b" \
1359+" bne 1b\n" \
1360+ extable \
1361 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1362 : "r" (&v->counter), "r" (i) \
1363 : "cc"); \
1364 } \
1365
1366-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1367-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1368+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1369+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1370+
1371+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1372+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1373 { \
1374 long long result; \
1375 unsigned long tmp; \
1376@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1377 smp_mb(); \
1378 prefetchw(&v->counter); \
1379 \
1380- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1381+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1382 "1: ldrexd %0, %H0, [%3]\n" \
1383 " " #op1 " %Q0, %Q0, %Q4\n" \
1384 " " #op2 " %R0, %R0, %R4\n" \
1385+ post_op \
1386 " strexd %1, %0, %H0, [%3]\n" \
1387 " teq %1, #0\n" \
1388-" bne 1b" \
1389+" bne 1b\n" \
1390+ extable \
1391 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1392 : "r" (&v->counter), "r" (i) \
1393 : "cc"); \
1394@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1395 return result; \
1396 }
1397
1398+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1399+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1400+
1401 #define ATOMIC64_OPS(op, op1, op2) \
1402 ATOMIC64_OP(op, op1, op2) \
1403 ATOMIC64_OP_RETURN(op, op1, op2)
1404@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1405
1406 #undef ATOMIC64_OPS
1407 #undef ATOMIC64_OP_RETURN
1408+#undef __ATOMIC64_OP_RETURN
1409 #undef ATOMIC64_OP
1410+#undef __ATOMIC64_OP
1411+#undef __OVERFLOW_EXTABLE
1412+#undef __OVERFLOW_POST_RETURN
1413+#undef __OVERFLOW_POST
1414
1415 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1416 long long new)
1417@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1418 return oldval;
1419 }
1420
1421+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1422+ long long new)
1423+{
1424+ long long oldval;
1425+ unsigned long res;
1426+
1427+ smp_mb();
1428+
1429+ do {
1430+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1431+ "ldrexd %1, %H1, [%3]\n"
1432+ "mov %0, #0\n"
1433+ "teq %1, %4\n"
1434+ "teqeq %H1, %H4\n"
1435+ "strexdeq %0, %5, %H5, [%3]"
1436+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1437+ : "r" (&ptr->counter), "r" (old), "r" (new)
1438+ : "cc");
1439+ } while (res);
1440+
1441+ smp_mb();
1442+
1443+ return oldval;
1444+}
1445+
1446 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1447 {
1448 long long result;
1449@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1450 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1451 {
1452 long long result;
1453- unsigned long tmp;
1454+ u64 tmp;
1455
1456 smp_mb();
1457 prefetchw(&v->counter);
1458
1459 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1460-"1: ldrexd %0, %H0, [%3]\n"
1461-" subs %Q0, %Q0, #1\n"
1462-" sbc %R0, %R0, #0\n"
1463+"1: ldrexd %1, %H1, [%3]\n"
1464+" subs %Q0, %Q1, #1\n"
1465+" sbcs %R0, %R1, #0\n"
1466+
1467+#ifdef CONFIG_PAX_REFCOUNT
1468+" bvc 3f\n"
1469+" mov %Q0, %Q1\n"
1470+" mov %R0, %R1\n"
1471+"2: " REFCOUNT_TRAP_INSN "\n"
1472+"3:\n"
1473+#endif
1474+
1475 " teq %R0, #0\n"
1476-" bmi 2f\n"
1477+" bmi 4f\n"
1478 " strexd %1, %0, %H0, [%3]\n"
1479 " teq %1, #0\n"
1480 " bne 1b\n"
1481-"2:"
1482+"4:\n"
1483+
1484+#ifdef CONFIG_PAX_REFCOUNT
1485+ _ASM_EXTABLE(2b, 4b)
1486+#endif
1487+
1488 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1489 : "r" (&v->counter)
1490 : "cc");
1491@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1492 " teq %0, %5\n"
1493 " teqeq %H0, %H5\n"
1494 " moveq %1, #0\n"
1495-" beq 2f\n"
1496+" beq 4f\n"
1497 " adds %Q0, %Q0, %Q6\n"
1498-" adc %R0, %R0, %R6\n"
1499+" adcs %R0, %R0, %R6\n"
1500+
1501+#ifdef CONFIG_PAX_REFCOUNT
1502+" bvc 3f\n"
1503+"2: " REFCOUNT_TRAP_INSN "\n"
1504+"3:\n"
1505+#endif
1506+
1507 " strexd %2, %0, %H0, [%4]\n"
1508 " teq %2, #0\n"
1509 " bne 1b\n"
1510-"2:"
1511+"4:\n"
1512+
1513+#ifdef CONFIG_PAX_REFCOUNT
1514+ _ASM_EXTABLE(2b, 4b)
1515+#endif
1516+
1517 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1518 : "r" (&v->counter), "r" (u), "r" (a)
1519 : "cc");
1520@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1521
1522 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1523 #define atomic64_inc(v) atomic64_add(1LL, (v))
1524+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1525 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1526+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1527 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1528 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1529 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1530+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1531 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1532 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1533 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1534diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1535index d2f81e6..3c4dba5 100644
1536--- a/arch/arm/include/asm/barrier.h
1537+++ b/arch/arm/include/asm/barrier.h
1538@@ -67,7 +67,7 @@
1539 do { \
1540 compiletime_assert_atomic_type(*p); \
1541 smp_mb(); \
1542- ACCESS_ONCE(*p) = (v); \
1543+ ACCESS_ONCE_RW(*p) = (v); \
1544 } while (0)
1545
1546 #define smp_load_acquire(p) \
1547diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1548index 75fe66b..ba3dee4 100644
1549--- a/arch/arm/include/asm/cache.h
1550+++ b/arch/arm/include/asm/cache.h
1551@@ -4,8 +4,10 @@
1552 #ifndef __ASMARM_CACHE_H
1553 #define __ASMARM_CACHE_H
1554
1555+#include <linux/const.h>
1556+
1557 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1558-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1559+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1560
1561 /*
1562 * Memory returned by kmalloc() may be used for DMA, so we must make
1563@@ -24,5 +26,6 @@
1564 #endif
1565
1566 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1567+#define __read_only __attribute__ ((__section__(".data..read_only")))
1568
1569 #endif
1570diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1571index 2d46862..a35415b 100644
1572--- a/arch/arm/include/asm/cacheflush.h
1573+++ b/arch/arm/include/asm/cacheflush.h
1574@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1575 void (*dma_unmap_area)(const void *, size_t, int);
1576
1577 void (*dma_flush_range)(const void *, const void *);
1578-};
1579+} __no_const;
1580
1581 /*
1582 * Select the calling method
1583diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1584index 5233151..87a71fa 100644
1585--- a/arch/arm/include/asm/checksum.h
1586+++ b/arch/arm/include/asm/checksum.h
1587@@ -37,7 +37,19 @@ __wsum
1588 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1589
1590 __wsum
1591-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1592+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1593+
1594+static inline __wsum
1595+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1596+{
1597+ __wsum ret;
1598+ pax_open_userland();
1599+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1600+ pax_close_userland();
1601+ return ret;
1602+}
1603+
1604+
1605
1606 /*
1607 * Fold a partial checksum without adding pseudo headers
1608diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1609index abb2c37..96db950 100644
1610--- a/arch/arm/include/asm/cmpxchg.h
1611+++ b/arch/arm/include/asm/cmpxchg.h
1612@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1613
1614 #define xchg(ptr,x) \
1615 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1616+#define xchg_unchecked(ptr,x) \
1617+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1618
1619 #include <asm-generic/cmpxchg-local.h>
1620
1621diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1622index 6ddbe44..b5e38b1a 100644
1623--- a/arch/arm/include/asm/domain.h
1624+++ b/arch/arm/include/asm/domain.h
1625@@ -48,18 +48,37 @@
1626 * Domain types
1627 */
1628 #define DOMAIN_NOACCESS 0
1629-#define DOMAIN_CLIENT 1
1630 #ifdef CONFIG_CPU_USE_DOMAINS
1631+#define DOMAIN_USERCLIENT 1
1632+#define DOMAIN_KERNELCLIENT 1
1633 #define DOMAIN_MANAGER 3
1634+#define DOMAIN_VECTORS DOMAIN_USER
1635 #else
1636+
1637+#ifdef CONFIG_PAX_KERNEXEC
1638 #define DOMAIN_MANAGER 1
1639+#define DOMAIN_KERNEXEC 3
1640+#else
1641+#define DOMAIN_MANAGER 1
1642+#endif
1643+
1644+#ifdef CONFIG_PAX_MEMORY_UDEREF
1645+#define DOMAIN_USERCLIENT 0
1646+#define DOMAIN_UDEREF 1
1647+#define DOMAIN_VECTORS DOMAIN_KERNEL
1648+#else
1649+#define DOMAIN_USERCLIENT 1
1650+#define DOMAIN_VECTORS DOMAIN_USER
1651+#endif
1652+#define DOMAIN_KERNELCLIENT 1
1653+
1654 #endif
1655
1656 #define domain_val(dom,type) ((type) << (2*(dom)))
1657
1658 #ifndef __ASSEMBLY__
1659
1660-#ifdef CONFIG_CPU_USE_DOMAINS
1661+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1662 static inline void set_domain(unsigned val)
1663 {
1664 asm volatile(
1665@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1666 isb();
1667 }
1668
1669-#define modify_domain(dom,type) \
1670- do { \
1671- struct thread_info *thread = current_thread_info(); \
1672- unsigned int domain = thread->cpu_domain; \
1673- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1674- thread->cpu_domain = domain | domain_val(dom, type); \
1675- set_domain(thread->cpu_domain); \
1676- } while (0)
1677-
1678+extern void modify_domain(unsigned int dom, unsigned int type);
1679 #else
1680 static inline void set_domain(unsigned val) { }
1681 static inline void modify_domain(unsigned dom, unsigned type) { }
1682diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1683index 674d03f..9a0bac0 100644
1684--- a/arch/arm/include/asm/elf.h
1685+++ b/arch/arm/include/asm/elf.h
1686@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1687 the loader. We need to make sure that it is out of the way of the program
1688 that it will "exec", and that there is sufficient room for the brk. */
1689
1690-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1691+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1692+
1693+#ifdef CONFIG_PAX_ASLR
1694+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1695+
1696+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1697+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1698+#endif
1699
1700 /* When the program starts, a1 contains a pointer to a function to be
1701 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1702@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1703 extern void elf_set_personality(const struct elf32_hdr *);
1704 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1705
1706-struct mm_struct;
1707-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1708-#define arch_randomize_brk arch_randomize_brk
1709-
1710 #ifdef CONFIG_MMU
1711 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1712 struct linux_binprm;
1713diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1714index de53547..52b9a28 100644
1715--- a/arch/arm/include/asm/fncpy.h
1716+++ b/arch/arm/include/asm/fncpy.h
1717@@ -81,7 +81,9 @@
1718 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1719 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1720 \
1721+ pax_open_kernel(); \
1722 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1723+ pax_close_kernel(); \
1724 flush_icache_range((unsigned long)(dest_buf), \
1725 (unsigned long)(dest_buf) + (size)); \
1726 \
1727diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1728index 53e69da..3fdc896 100644
1729--- a/arch/arm/include/asm/futex.h
1730+++ b/arch/arm/include/asm/futex.h
1731@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1732 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1733 return -EFAULT;
1734
1735+ pax_open_userland();
1736+
1737 smp_mb();
1738 /* Prefetching cannot fault */
1739 prefetchw(uaddr);
1740@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1741 : "cc", "memory");
1742 smp_mb();
1743
1744+ pax_close_userland();
1745+
1746 *uval = val;
1747 return ret;
1748 }
1749@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1750 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1751 return -EFAULT;
1752
1753+ pax_open_userland();
1754+
1755 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1756 "1: " TUSER(ldr) " %1, [%4]\n"
1757 " teq %1, %2\n"
1758@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1759 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1760 : "cc", "memory");
1761
1762+ pax_close_userland();
1763+
1764 *uval = val;
1765 return ret;
1766 }
1767@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1768 return -EFAULT;
1769
1770 pagefault_disable(); /* implies preempt_disable() */
1771+ pax_open_userland();
1772
1773 switch (op) {
1774 case FUTEX_OP_SET:
1775@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1776 ret = -ENOSYS;
1777 }
1778
1779+ pax_close_userland();
1780 pagefault_enable(); /* subsumes preempt_enable() */
1781
1782 if (!ret) {
1783diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1784index 83eb2f7..ed77159 100644
1785--- a/arch/arm/include/asm/kmap_types.h
1786+++ b/arch/arm/include/asm/kmap_types.h
1787@@ -4,6 +4,6 @@
1788 /*
1789 * This is the "bare minimum". AIO seems to require this.
1790 */
1791-#define KM_TYPE_NR 16
1792+#define KM_TYPE_NR 17
1793
1794 #endif
1795diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1796index 9e614a1..3302cca 100644
1797--- a/arch/arm/include/asm/mach/dma.h
1798+++ b/arch/arm/include/asm/mach/dma.h
1799@@ -22,7 +22,7 @@ struct dma_ops {
1800 int (*residue)(unsigned int, dma_t *); /* optional */
1801 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1802 const char *type;
1803-};
1804+} __do_const;
1805
1806 struct dma_struct {
1807 void *addr; /* single DMA address */
1808diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1809index f98c7f3..e5c626d 100644
1810--- a/arch/arm/include/asm/mach/map.h
1811+++ b/arch/arm/include/asm/mach/map.h
1812@@ -23,17 +23,19 @@ struct map_desc {
1813
1814 /* types 0-3 are defined in asm/io.h */
1815 enum {
1816- MT_UNCACHED = 4,
1817- MT_CACHECLEAN,
1818- MT_MINICLEAN,
1819+ MT_UNCACHED_RW = 4,
1820+ MT_CACHECLEAN_RO,
1821+ MT_MINICLEAN_RO,
1822 MT_LOW_VECTORS,
1823 MT_HIGH_VECTORS,
1824- MT_MEMORY_RWX,
1825+ __MT_MEMORY_RWX,
1826 MT_MEMORY_RW,
1827- MT_ROM,
1828- MT_MEMORY_RWX_NONCACHED,
1829+ MT_MEMORY_RX,
1830+ MT_ROM_RX,
1831+ MT_MEMORY_RW_NONCACHED,
1832+ MT_MEMORY_RX_NONCACHED,
1833 MT_MEMORY_RW_DTCM,
1834- MT_MEMORY_RWX_ITCM,
1835+ MT_MEMORY_RX_ITCM,
1836 MT_MEMORY_RW_SO,
1837 MT_MEMORY_DMA_READY,
1838 };
1839diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1840index 563b92f..689d58e 100644
1841--- a/arch/arm/include/asm/outercache.h
1842+++ b/arch/arm/include/asm/outercache.h
1843@@ -39,7 +39,7 @@ struct outer_cache_fns {
1844 /* This is an ARM L2C thing */
1845 void (*write_sec)(unsigned long, unsigned);
1846 void (*configure)(const struct l2x0_regs *);
1847-};
1848+} __no_const;
1849
1850 extern struct outer_cache_fns outer_cache;
1851
1852diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1853index 4355f0e..cd9168e 100644
1854--- a/arch/arm/include/asm/page.h
1855+++ b/arch/arm/include/asm/page.h
1856@@ -23,6 +23,7 @@
1857
1858 #else
1859
1860+#include <linux/compiler.h>
1861 #include <asm/glue.h>
1862
1863 /*
1864@@ -114,7 +115,7 @@ struct cpu_user_fns {
1865 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1866 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1867 unsigned long vaddr, struct vm_area_struct *vma);
1868-};
1869+} __no_const;
1870
1871 #ifdef MULTI_USER
1872 extern struct cpu_user_fns cpu_user;
1873diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1874index 19cfab5..3f5c7e9 100644
1875--- a/arch/arm/include/asm/pgalloc.h
1876+++ b/arch/arm/include/asm/pgalloc.h
1877@@ -17,6 +17,7 @@
1878 #include <asm/processor.h>
1879 #include <asm/cacheflush.h>
1880 #include <asm/tlbflush.h>
1881+#include <asm/system_info.h>
1882
1883 #define check_pgt_cache() do { } while (0)
1884
1885@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1886 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1887 }
1888
1889+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1890+{
1891+ pud_populate(mm, pud, pmd);
1892+}
1893+
1894 #else /* !CONFIG_ARM_LPAE */
1895
1896 /*
1897@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1898 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1899 #define pmd_free(mm, pmd) do { } while (0)
1900 #define pud_populate(mm,pmd,pte) BUG()
1901+#define pud_populate_kernel(mm,pmd,pte) BUG()
1902
1903 #endif /* CONFIG_ARM_LPAE */
1904
1905@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1906 __free_page(pte);
1907 }
1908
1909+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1910+{
1911+#ifdef CONFIG_ARM_LPAE
1912+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913+#else
1914+ if (addr & SECTION_SIZE)
1915+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1916+ else
1917+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1918+#endif
1919+ flush_pmd_entry(pmdp);
1920+}
1921+
1922 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1923 pmdval_t prot)
1924 {
1925diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1926index 5e68278..1869bae 100644
1927--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1928+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1929@@ -27,7 +27,7 @@
1930 /*
1931 * - section
1932 */
1933-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1934+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1935 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1936 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1937 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1938@@ -39,6 +39,7 @@
1939 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1940 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1941 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1942+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1943
1944 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1945 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1946@@ -68,6 +69,7 @@
1947 * - extended small page/tiny page
1948 */
1949 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1950+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1951 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1952 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1953 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1954diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1955index bfd662e..f6cbb02 100644
1956--- a/arch/arm/include/asm/pgtable-2level.h
1957+++ b/arch/arm/include/asm/pgtable-2level.h
1958@@ -127,6 +127,9 @@
1959 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1960 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1961
1962+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1963+#define L_PTE_PXN (_AT(pteval_t, 0))
1964+
1965 /*
1966 * These are the memory types, defined to be compatible with
1967 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1968diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1969index a745a2a..481350a 100644
1970--- a/arch/arm/include/asm/pgtable-3level.h
1971+++ b/arch/arm/include/asm/pgtable-3level.h
1972@@ -80,6 +80,7 @@
1973 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1974 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1975 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1976+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1977 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1978 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1979 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1980@@ -91,10 +92,12 @@
1981 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1982 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1983 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1984+#define PMD_SECT_RDONLY PMD_SECT_AP2
1985
1986 /*
1987 * To be used in assembly code with the upper page attributes.
1988 */
1989+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1990 #define L_PTE_XN_HIGH (1 << (54 - 32))
1991 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1992
1993diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1994index f403541..b10df68 100644
1995--- a/arch/arm/include/asm/pgtable.h
1996+++ b/arch/arm/include/asm/pgtable.h
1997@@ -33,6 +33,9 @@
1998 #include <asm/pgtable-2level.h>
1999 #endif
2000
2001+#define ktla_ktva(addr) (addr)
2002+#define ktva_ktla(addr) (addr)
2003+
2004 /*
2005 * Just any arbitrary offset to the start of the vmalloc VM area: the
2006 * current 8MB value just means that there will be a 8MB "hole" after the
2007@@ -48,6 +51,9 @@
2008 #define LIBRARY_TEXT_START 0x0c000000
2009
2010 #ifndef __ASSEMBLY__
2011+extern pteval_t __supported_pte_mask;
2012+extern pmdval_t __supported_pmd_mask;
2013+
2014 extern void __pte_error(const char *file, int line, pte_t);
2015 extern void __pmd_error(const char *file, int line, pmd_t);
2016 extern void __pgd_error(const char *file, int line, pgd_t);
2017@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2018 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2019 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2020
2021+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2022+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2023+
2024+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2025+#include <asm/domain.h>
2026+#include <linux/thread_info.h>
2027+#include <linux/preempt.h>
2028+
2029+static inline int test_domain(int domain, int domaintype)
2030+{
2031+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2032+}
2033+#endif
2034+
2035+#ifdef CONFIG_PAX_KERNEXEC
2036+static inline unsigned long pax_open_kernel(void) {
2037+#ifdef CONFIG_ARM_LPAE
2038+ /* TODO */
2039+#else
2040+ preempt_disable();
2041+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2042+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2043+#endif
2044+ return 0;
2045+}
2046+
2047+static inline unsigned long pax_close_kernel(void) {
2048+#ifdef CONFIG_ARM_LPAE
2049+ /* TODO */
2050+#else
2051+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2052+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2053+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2054+ preempt_enable_no_resched();
2055+#endif
2056+ return 0;
2057+}
2058+#else
2059+static inline unsigned long pax_open_kernel(void) { return 0; }
2060+static inline unsigned long pax_close_kernel(void) { return 0; }
2061+#endif
2062+
2063 /*
2064 * This is the lowest virtual address we can permit any user space
2065 * mapping to be mapped at. This is particularly important for
2066@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2067 /*
2068 * The pgprot_* and protection_map entries will be fixed up in runtime
2069 * to include the cachable and bufferable bits based on memory policy,
2070- * as well as any architecture dependent bits like global/ASID and SMP
2071- * shared mapping bits.
2072+ * as well as any architecture dependent bits like global/ASID, PXN,
2073+ * and SMP shared mapping bits.
2074 */
2075 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2076
2077@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2078 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2079 {
2080 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2081- L_PTE_NONE | L_PTE_VALID;
2082+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2083 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2084 return pte;
2085 }
2086diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2087index c25ef3e..735f14b 100644
2088--- a/arch/arm/include/asm/psci.h
2089+++ b/arch/arm/include/asm/psci.h
2090@@ -32,7 +32,7 @@ struct psci_operations {
2091 int (*affinity_info)(unsigned long target_affinity,
2092 unsigned long lowest_affinity_level);
2093 int (*migrate_info_type)(void);
2094-};
2095+} __no_const;
2096
2097 extern struct psci_operations psci_ops;
2098 extern struct smp_operations psci_smp_ops;
2099diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2100index 18f5a55..5072a40 100644
2101--- a/arch/arm/include/asm/smp.h
2102+++ b/arch/arm/include/asm/smp.h
2103@@ -107,7 +107,7 @@ struct smp_operations {
2104 int (*cpu_disable)(unsigned int cpu);
2105 #endif
2106 #endif
2107-};
2108+} __no_const;
2109
2110 struct of_cpu_method {
2111 const char *method;
2112diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2113index 72812a1..335f4f3 100644
2114--- a/arch/arm/include/asm/thread_info.h
2115+++ b/arch/arm/include/asm/thread_info.h
2116@@ -77,9 +77,9 @@ struct thread_info {
2117 .flags = 0, \
2118 .preempt_count = INIT_PREEMPT_COUNT, \
2119 .addr_limit = KERNEL_DS, \
2120- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2121- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2122- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2123+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2124+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2125+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2126 }
2127
2128 #define init_thread_info (init_thread_union.thread_info)
2129@@ -155,7 +155,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2130 #define TIF_SYSCALL_AUDIT 9
2131 #define TIF_SYSCALL_TRACEPOINT 10
2132 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2133-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2134+/* within 8 bits of TIF_SYSCALL_TRACE
2135+ * to meet flexible second operand requirements
2136+ */
2137+#define TIF_GRSEC_SETXID 12
2138+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2139 #define TIF_USING_IWMMXT 17
2140 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2141 #define TIF_RESTORE_SIGMASK 20
2142@@ -169,10 +173,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2143 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2144 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2145 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2146+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2147
2148 /* Checks for any syscall work in entry-common.S */
2149 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2150- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2151+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2152
2153 /*
2154 * Change these and you break ASM code in entry-common.S
2155diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2156index 5f833f7..76e6644 100644
2157--- a/arch/arm/include/asm/tls.h
2158+++ b/arch/arm/include/asm/tls.h
2159@@ -3,6 +3,7 @@
2160
2161 #include <linux/compiler.h>
2162 #include <asm/thread_info.h>
2163+#include <asm/pgtable.h>
2164
2165 #ifdef __ASSEMBLY__
2166 #include <asm/asm-offsets.h>
2167@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2168 * at 0xffff0fe0 must be used instead. (see
2169 * entry-armv.S for details)
2170 */
2171+ pax_open_kernel();
2172 *((unsigned int *)0xffff0ff0) = val;
2173+ pax_close_kernel();
2174 #endif
2175 }
2176
2177diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2178index ce0786e..a80c264 100644
2179--- a/arch/arm/include/asm/uaccess.h
2180+++ b/arch/arm/include/asm/uaccess.h
2181@@ -18,6 +18,7 @@
2182 #include <asm/domain.h>
2183 #include <asm/unified.h>
2184 #include <asm/compiler.h>
2185+#include <asm/pgtable.h>
2186
2187 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2188 #include <asm-generic/uaccess-unaligned.h>
2189@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2190 static inline void set_fs(mm_segment_t fs)
2191 {
2192 current_thread_info()->addr_limit = fs;
2193- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2194+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2195 }
2196
2197 #define segment_eq(a, b) ((a) == (b))
2198
2199+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2200+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2201+
2202+static inline void pax_open_userland(void)
2203+{
2204+
2205+#ifdef CONFIG_PAX_MEMORY_UDEREF
2206+ if (segment_eq(get_fs(), USER_DS)) {
2207+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2208+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2209+ }
2210+#endif
2211+
2212+}
2213+
2214+static inline void pax_close_userland(void)
2215+{
2216+
2217+#ifdef CONFIG_PAX_MEMORY_UDEREF
2218+ if (segment_eq(get_fs(), USER_DS)) {
2219+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2220+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2221+ }
2222+#endif
2223+
2224+}
2225+
2226 #define __addr_ok(addr) ({ \
2227 unsigned long flag; \
2228 __asm__("cmp %2, %0; movlo %0, #0" \
2229@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2230
2231 #define get_user(x, p) \
2232 ({ \
2233+ int __e; \
2234 might_fault(); \
2235- __get_user_check(x, p); \
2236+ pax_open_userland(); \
2237+ __e = __get_user_check((x), (p)); \
2238+ pax_close_userland(); \
2239+ __e; \
2240 })
2241
2242 extern int __put_user_1(void *, unsigned int);
2243@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2244
2245 #define put_user(x, p) \
2246 ({ \
2247+ int __e; \
2248 might_fault(); \
2249- __put_user_check(x, p); \
2250+ pax_open_userland(); \
2251+ __e = __put_user_check((x), (p)); \
2252+ pax_close_userland(); \
2253+ __e; \
2254 })
2255
2256 #else /* CONFIG_MMU */
2257@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2258
2259 #endif /* CONFIG_MMU */
2260
2261+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2262 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2263
2264 #define user_addr_max() \
2265@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2266 #define __get_user(x, ptr) \
2267 ({ \
2268 long __gu_err = 0; \
2269+ pax_open_userland(); \
2270 __get_user_err((x), (ptr), __gu_err); \
2271+ pax_close_userland(); \
2272 __gu_err; \
2273 })
2274
2275 #define __get_user_error(x, ptr, err) \
2276 ({ \
2277+ pax_open_userland(); \
2278 __get_user_err((x), (ptr), err); \
2279+ pax_close_userland(); \
2280 (void) 0; \
2281 })
2282
2283@@ -368,13 +409,17 @@ do { \
2284 #define __put_user(x, ptr) \
2285 ({ \
2286 long __pu_err = 0; \
2287+ pax_open_userland(); \
2288 __put_user_err((x), (ptr), __pu_err); \
2289+ pax_close_userland(); \
2290 __pu_err; \
2291 })
2292
2293 #define __put_user_error(x, ptr, err) \
2294 ({ \
2295+ pax_open_userland(); \
2296 __put_user_err((x), (ptr), err); \
2297+ pax_close_userland(); \
2298 (void) 0; \
2299 })
2300
2301@@ -474,11 +519,44 @@ do { \
2302
2303
2304 #ifdef CONFIG_MMU
2305-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2306-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2307+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2308+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2309+
2310+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2311+{
2312+ unsigned long ret;
2313+
2314+ check_object_size(to, n, false);
2315+ pax_open_userland();
2316+ ret = ___copy_from_user(to, from, n);
2317+ pax_close_userland();
2318+ return ret;
2319+}
2320+
2321+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2322+{
2323+ unsigned long ret;
2324+
2325+ check_object_size(from, n, true);
2326+ pax_open_userland();
2327+ ret = ___copy_to_user(to, from, n);
2328+ pax_close_userland();
2329+ return ret;
2330+}
2331+
2332 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2333-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2334+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2335 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2336+
2337+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2338+{
2339+ unsigned long ret;
2340+ pax_open_userland();
2341+ ret = ___clear_user(addr, n);
2342+ pax_close_userland();
2343+ return ret;
2344+}
2345+
2346 #else
2347 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2348 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2349@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2350
2351 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2352 {
2353+ if ((long)n < 0)
2354+ return n;
2355+
2356 if (access_ok(VERIFY_READ, from, n))
2357 n = __copy_from_user(to, from, n);
2358 else /* security hole - plug it */
2359@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2360
2361 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2362 {
2363+ if ((long)n < 0)
2364+ return n;
2365+
2366 if (access_ok(VERIFY_WRITE, to, n))
2367 n = __copy_to_user(to, from, n);
2368 return n;
2369diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2370index 5af0ed1..cea83883 100644
2371--- a/arch/arm/include/uapi/asm/ptrace.h
2372+++ b/arch/arm/include/uapi/asm/ptrace.h
2373@@ -92,7 +92,7 @@
2374 * ARMv7 groups of PSR bits
2375 */
2376 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2377-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2378+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2379 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2380 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2381
2382diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2383index a88671c..1cc895e 100644
2384--- a/arch/arm/kernel/armksyms.c
2385+++ b/arch/arm/kernel/armksyms.c
2386@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2387
2388 /* networking */
2389 EXPORT_SYMBOL(csum_partial);
2390-EXPORT_SYMBOL(csum_partial_copy_from_user);
2391+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2392 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2393 EXPORT_SYMBOL(__csum_ipv6_magic);
2394
2395@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2396 #ifdef CONFIG_MMU
2397 EXPORT_SYMBOL(copy_page);
2398
2399-EXPORT_SYMBOL(__copy_from_user);
2400-EXPORT_SYMBOL(__copy_to_user);
2401-EXPORT_SYMBOL(__clear_user);
2402+EXPORT_SYMBOL(___copy_from_user);
2403+EXPORT_SYMBOL(___copy_to_user);
2404+EXPORT_SYMBOL(___clear_user);
2405
2406 EXPORT_SYMBOL(__get_user_1);
2407 EXPORT_SYMBOL(__get_user_2);
2408diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2409index 672b219..4aa120a 100644
2410--- a/arch/arm/kernel/entry-armv.S
2411+++ b/arch/arm/kernel/entry-armv.S
2412@@ -48,6 +48,87 @@
2413 9997:
2414 .endm
2415
2416+ .macro pax_enter_kernel
2417+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2418+ @ make aligned space for saved DACR
2419+ sub sp, sp, #8
2420+ @ save regs
2421+ stmdb sp!, {r1, r2}
2422+ @ read DACR from cpu_domain into r1
2423+ mov r2, sp
2424+ @ assume 8K pages, since we have to split the immediate in two
2425+ bic r2, r2, #(0x1fc0)
2426+ bic r2, r2, #(0x3f)
2427+ ldr r1, [r2, #TI_CPU_DOMAIN]
2428+ @ store old DACR on stack
2429+ str r1, [sp, #8]
2430+#ifdef CONFIG_PAX_KERNEXEC
2431+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2432+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2433+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2434+#endif
2435+#ifdef CONFIG_PAX_MEMORY_UDEREF
2436+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2437+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2438+#endif
2439+ @ write r1 to current_thread_info()->cpu_domain
2440+ str r1, [r2, #TI_CPU_DOMAIN]
2441+ @ write r1 to DACR
2442+ mcr p15, 0, r1, c3, c0, 0
2443+ @ instruction sync
2444+ instr_sync
2445+ @ restore regs
2446+ ldmia sp!, {r1, r2}
2447+#endif
2448+ .endm
2449+
2450+ .macro pax_open_userland
2451+#ifdef CONFIG_PAX_MEMORY_UDEREF
2452+ @ save regs
2453+ stmdb sp!, {r0, r1}
2454+ @ read DACR from cpu_domain into r1
2455+ mov r0, sp
2456+ @ assume 8K pages, since we have to split the immediate in two
2457+ bic r0, r0, #(0x1fc0)
2458+ bic r0, r0, #(0x3f)
2459+ ldr r1, [r0, #TI_CPU_DOMAIN]
2460+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2461+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2462+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2463+ @ write r1 to current_thread_info()->cpu_domain
2464+ str r1, [r0, #TI_CPU_DOMAIN]
2465+ @ write r1 to DACR
2466+ mcr p15, 0, r1, c3, c0, 0
2467+ @ instruction sync
2468+ instr_sync
2469+ @ restore regs
2470+ ldmia sp!, {r0, r1}
2471+#endif
2472+ .endm
2473+
2474+ .macro pax_close_userland
2475+#ifdef CONFIG_PAX_MEMORY_UDEREF
2476+ @ save regs
2477+ stmdb sp!, {r0, r1}
2478+ @ read DACR from cpu_domain into r1
2479+ mov r0, sp
2480+ @ assume 8K pages, since we have to split the immediate in two
2481+ bic r0, r0, #(0x1fc0)
2482+ bic r0, r0, #(0x3f)
2483+ ldr r1, [r0, #TI_CPU_DOMAIN]
2484+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2485+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2486+ @ write r1 to current_thread_info()->cpu_domain
2487+ str r1, [r0, #TI_CPU_DOMAIN]
2488+ @ write r1 to DACR
2489+ mcr p15, 0, r1, c3, c0, 0
2490+ @ instruction sync
2491+ instr_sync
2492+ @ restore regs
2493+ ldmia sp!, {r0, r1}
2494+#endif
2495+ .endm
2496+
2497 .macro pabt_helper
2498 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2499 #ifdef MULTI_PABORT
2500@@ -90,11 +171,15 @@
2501 * Invalid mode handlers
2502 */
2503 .macro inv_entry, reason
2504+
2505+ pax_enter_kernel
2506+
2507 sub sp, sp, #S_FRAME_SIZE
2508 ARM( stmib sp, {r1 - lr} )
2509 THUMB( stmia sp, {r0 - r12} )
2510 THUMB( str sp, [sp, #S_SP] )
2511 THUMB( str lr, [sp, #S_LR] )
2512+
2513 mov r1, #\reason
2514 .endm
2515
2516@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2517 .macro svc_entry, stack_hole=0, trace=1
2518 UNWIND(.fnstart )
2519 UNWIND(.save {r0 - pc} )
2520+
2521+ pax_enter_kernel
2522+
2523 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2524+
2525 #ifdef CONFIG_THUMB2_KERNEL
2526 SPFIX( str r0, [sp] ) @ temporarily saved
2527 SPFIX( mov r0, sp )
2528@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2529 ldmia r0, {r3 - r5}
2530 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2531 mov r6, #-1 @ "" "" "" ""
2532+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2533+ @ offset sp by 8 as done in pax_enter_kernel
2534+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2535+#else
2536 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2537+#endif
2538 SPFIX( addeq r2, r2, #4 )
2539 str r3, [sp, #-4]! @ save the "real" r0 copied
2540 @ from the exception stack
2541@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2542 .macro usr_entry, trace=1
2543 UNWIND(.fnstart )
2544 UNWIND(.cantunwind ) @ don't unwind the user space
2545+
2546+ pax_enter_kernel_user
2547+
2548 sub sp, sp, #S_FRAME_SIZE
2549 ARM( stmib sp, {r1 - r12} )
2550 THUMB( stmia sp, {r0 - r12} )
2551@@ -479,7 +576,9 @@ __und_usr:
2552 tst r3, #PSR_T_BIT @ Thumb mode?
2553 bne __und_usr_thumb
2554 sub r4, r2, #4 @ ARM instr at LR - 4
2555+ pax_open_userland
2556 1: ldrt r0, [r4]
2557+ pax_close_userland
2558 ARM_BE8(rev r0, r0) @ little endian instruction
2559
2560 @ r0 = 32-bit ARM instruction which caused the exception
2561@@ -513,11 +612,15 @@ __und_usr_thumb:
2562 */
2563 .arch armv6t2
2564 #endif
2565+ pax_open_userland
2566 2: ldrht r5, [r4]
2567+ pax_close_userland
2568 ARM_BE8(rev16 r5, r5) @ little endian instruction
2569 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2570 blo __und_usr_fault_16 @ 16bit undefined instruction
2571+ pax_open_userland
2572 3: ldrht r0, [r2]
2573+ pax_close_userland
2574 ARM_BE8(rev16 r0, r0) @ little endian instruction
2575 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2576 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2577@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2578 */
2579 .pushsection .fixup, "ax"
2580 .align 2
2581-4: str r4, [sp, #S_PC] @ retry current instruction
2582+4: pax_close_userland
2583+ str r4, [sp, #S_PC] @ retry current instruction
2584 ret r9
2585 .popsection
2586 .pushsection __ex_table,"a"
2587@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2588 THUMB( str lr, [ip], #4 )
2589 ldr r4, [r2, #TI_TP_VALUE]
2590 ldr r5, [r2, #TI_TP_VALUE + 4]
2591-#ifdef CONFIG_CPU_USE_DOMAINS
2592+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2593 ldr r6, [r2, #TI_CPU_DOMAIN]
2594 #endif
2595 switch_tls r1, r4, r5, r3, r7
2596@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2597 ldr r8, =__stack_chk_guard
2598 ldr r7, [r7, #TSK_STACK_CANARY]
2599 #endif
2600-#ifdef CONFIG_CPU_USE_DOMAINS
2601+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2602 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2603 #endif
2604 mov r5, r0
2605diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2606index 4e7f40c..0f9ee2c 100644
2607--- a/arch/arm/kernel/entry-common.S
2608+++ b/arch/arm/kernel/entry-common.S
2609@@ -11,18 +11,46 @@
2610 #include <asm/assembler.h>
2611 #include <asm/unistd.h>
2612 #include <asm/ftrace.h>
2613+#include <asm/domain.h>
2614 #include <asm/unwind.h>
2615
2616+#include "entry-header.S"
2617+
2618 #ifdef CONFIG_NEED_RET_TO_USER
2619 #include <mach/entry-macro.S>
2620 #else
2621 .macro arch_ret_to_user, tmp1, tmp2
2622+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2623+ @ save regs
2624+ stmdb sp!, {r1, r2}
2625+ @ read DACR from cpu_domain into r1
2626+ mov r2, sp
2627+ @ assume 8K pages, since we have to split the immediate in two
2628+ bic r2, r2, #(0x1fc0)
2629+ bic r2, r2, #(0x3f)
2630+ ldr r1, [r2, #TI_CPU_DOMAIN]
2631+#ifdef CONFIG_PAX_KERNEXEC
2632+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2633+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2634+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2635+#endif
2636+#ifdef CONFIG_PAX_MEMORY_UDEREF
2637+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2638+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2639+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2640+#endif
2641+ @ write r1 to current_thread_info()->cpu_domain
2642+ str r1, [r2, #TI_CPU_DOMAIN]
2643+ @ write r1 to DACR
2644+ mcr p15, 0, r1, c3, c0, 0
2645+ @ instruction sync
2646+ instr_sync
2647+ @ restore regs
2648+ ldmia sp!, {r1, r2}
2649+#endif
2650 .endm
2651 #endif
2652
2653-#include "entry-header.S"
2654-
2655-
2656 .align 5
2657 /*
2658 * This is the fast syscall return path. We do as little as
2659@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2660 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2661 #endif
2662
2663+ /*
2664+ * do this here to avoid a performance hit of wrapping the code above
2665+ * that directly dereferences userland to parse the SWI instruction
2666+ */
2667+ pax_enter_kernel_user
2668+
2669 adr tbl, sys_call_table @ load syscall table pointer
2670
2671 #if defined(CONFIG_OABI_COMPAT)
2672diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2673index 1a0045a..9b4f34d 100644
2674--- a/arch/arm/kernel/entry-header.S
2675+++ b/arch/arm/kernel/entry-header.S
2676@@ -196,6 +196,60 @@
2677 msr cpsr_c, \rtemp @ switch back to the SVC mode
2678 .endm
2679
2680+ .macro pax_enter_kernel_user
2681+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2682+ @ save regs
2683+ stmdb sp!, {r0, r1}
2684+ @ read DACR from cpu_domain into r1
2685+ mov r0, sp
2686+ @ assume 8K pages, since we have to split the immediate in two
2687+ bic r0, r0, #(0x1fc0)
2688+ bic r0, r0, #(0x3f)
2689+ ldr r1, [r0, #TI_CPU_DOMAIN]
2690+#ifdef CONFIG_PAX_MEMORY_UDEREF
2691+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2692+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2693+#endif
2694+#ifdef CONFIG_PAX_KERNEXEC
2695+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2696+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2697+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2698+#endif
2699+ @ write r1 to current_thread_info()->cpu_domain
2700+ str r1, [r0, #TI_CPU_DOMAIN]
2701+ @ write r1 to DACR
2702+ mcr p15, 0, r1, c3, c0, 0
2703+ @ instruction sync
2704+ instr_sync
2705+ @ restore regs
2706+ ldmia sp!, {r0, r1}
2707+#endif
2708+ .endm
2709+
2710+ .macro pax_exit_kernel
2711+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2712+ @ save regs
2713+ stmdb sp!, {r0, r1}
2714+ @ read old DACR from stack into r1
2715+ ldr r1, [sp, #(8 + S_SP)]
2716+ sub r1, r1, #8
2717+ ldr r1, [r1]
2718+
2719+ @ write r1 to current_thread_info()->cpu_domain
2720+ mov r0, sp
2721+ @ assume 8K pages, since we have to split the immediate in two
2722+ bic r0, r0, #(0x1fc0)
2723+ bic r0, r0, #(0x3f)
2724+ str r1, [r0, #TI_CPU_DOMAIN]
2725+ @ write r1 to DACR
2726+ mcr p15, 0, r1, c3, c0, 0
2727+ @ instruction sync
2728+ instr_sync
2729+ @ restore regs
2730+ ldmia sp!, {r0, r1}
2731+#endif
2732+ .endm
2733+
2734 #ifndef CONFIG_THUMB2_KERNEL
2735 .macro svc_exit, rpsr, irq = 0
2736 .if \irq != 0
2737@@ -215,6 +269,9 @@
2738 blne trace_hardirqs_off
2739 #endif
2740 .endif
2741+
2742+ pax_exit_kernel
2743+
2744 msr spsr_cxsf, \rpsr
2745 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2746 @ We must avoid clrex due to Cortex-A15 erratum #830321
2747@@ -291,6 +348,9 @@
2748 blne trace_hardirqs_off
2749 #endif
2750 .endif
2751+
2752+ pax_exit_kernel
2753+
2754 ldr lr, [sp, #S_SP] @ top of the stack
2755 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2756
2757diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2758index 059c3da..8e45cfc 100644
2759--- a/arch/arm/kernel/fiq.c
2760+++ b/arch/arm/kernel/fiq.c
2761@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2762 void *base = vectors_page;
2763 unsigned offset = FIQ_OFFSET;
2764
2765+ pax_open_kernel();
2766 memcpy(base + offset, start, length);
2767+ pax_close_kernel();
2768+
2769 if (!cache_is_vipt_nonaliasing())
2770 flush_icache_range((unsigned long)base + offset, offset +
2771 length);
2772diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2773index 0196327..50ac8895 100644
2774--- a/arch/arm/kernel/head.S
2775+++ b/arch/arm/kernel/head.S
2776@@ -444,7 +444,7 @@ __enable_mmu:
2777 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2778 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2779 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2780- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2781+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2782 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2783 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2784 #endif
2785diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2786index 2e11961..07f0704 100644
2787--- a/arch/arm/kernel/module.c
2788+++ b/arch/arm/kernel/module.c
2789@@ -38,12 +38,39 @@
2790 #endif
2791
2792 #ifdef CONFIG_MMU
2793-void *module_alloc(unsigned long size)
2794+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2795 {
2796+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2797+ return NULL;
2798 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2799- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2800+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2801 __builtin_return_address(0));
2802 }
2803+
2804+void *module_alloc(unsigned long size)
2805+{
2806+
2807+#ifdef CONFIG_PAX_KERNEXEC
2808+ return __module_alloc(size, PAGE_KERNEL);
2809+#else
2810+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2811+#endif
2812+
2813+}
2814+
2815+#ifdef CONFIG_PAX_KERNEXEC
2816+void module_memfree_exec(void *module_region)
2817+{
2818+ module_memfree(module_region);
2819+}
2820+EXPORT_SYMBOL(module_memfree_exec);
2821+
2822+void *module_alloc_exec(unsigned long size)
2823+{
2824+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2825+}
2826+EXPORT_SYMBOL(module_alloc_exec);
2827+#endif
2828 #endif
2829
2830 int
2831diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2832index 69bda1a..755113a 100644
2833--- a/arch/arm/kernel/patch.c
2834+++ b/arch/arm/kernel/patch.c
2835@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2836 else
2837 __acquire(&patch_lock);
2838
2839+ pax_open_kernel();
2840 if (thumb2 && __opcode_is_thumb16(insn)) {
2841 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2842 size = sizeof(u16);
2843@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2844 *(u32 *)waddr = insn;
2845 size = sizeof(u32);
2846 }
2847+ pax_close_kernel();
2848
2849 if (waddr != addr) {
2850 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2851diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2852index 2bf1a16..d959d40 100644
2853--- a/arch/arm/kernel/process.c
2854+++ b/arch/arm/kernel/process.c
2855@@ -213,6 +213,7 @@ void machine_power_off(void)
2856
2857 if (pm_power_off)
2858 pm_power_off();
2859+ BUG();
2860 }
2861
2862 /*
2863@@ -226,7 +227,7 @@ void machine_power_off(void)
2864 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2865 * to use. Implementing such co-ordination would be essentially impossible.
2866 */
2867-void machine_restart(char *cmd)
2868+__noreturn void machine_restart(char *cmd)
2869 {
2870 local_irq_disable();
2871 smp_send_stop();
2872@@ -252,8 +253,8 @@ void __show_regs(struct pt_regs *regs)
2873
2874 show_regs_print_info(KERN_DEFAULT);
2875
2876- print_symbol("PC is at %s\n", instruction_pointer(regs));
2877- print_symbol("LR is at %s\n", regs->ARM_lr);
2878+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2879+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2880 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2881 "sp : %08lx ip : %08lx fp : %08lx\n",
2882 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2883@@ -430,12 +431,6 @@ unsigned long get_wchan(struct task_struct *p)
2884 return 0;
2885 }
2886
2887-unsigned long arch_randomize_brk(struct mm_struct *mm)
2888-{
2889- unsigned long range_end = mm->brk + 0x02000000;
2890- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2891-}
2892-
2893 #ifdef CONFIG_MMU
2894 #ifdef CONFIG_KUSER_HELPERS
2895 /*
2896@@ -451,7 +446,7 @@ static struct vm_area_struct gate_vma = {
2897
2898 static int __init gate_vma_init(void)
2899 {
2900- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2901+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2902 return 0;
2903 }
2904 arch_initcall(gate_vma_init);
2905@@ -480,81 +475,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2906 return is_gate_vma(vma) ? "[vectors]" : NULL;
2907 }
2908
2909-/* If possible, provide a placement hint at a random offset from the
2910- * stack for the signal page.
2911- */
2912-static unsigned long sigpage_addr(const struct mm_struct *mm,
2913- unsigned int npages)
2914-{
2915- unsigned long offset;
2916- unsigned long first;
2917- unsigned long last;
2918- unsigned long addr;
2919- unsigned int slots;
2920-
2921- first = PAGE_ALIGN(mm->start_stack);
2922-
2923- last = TASK_SIZE - (npages << PAGE_SHIFT);
2924-
2925- /* No room after stack? */
2926- if (first > last)
2927- return 0;
2928-
2929- /* Just enough room? */
2930- if (first == last)
2931- return first;
2932-
2933- slots = ((last - first) >> PAGE_SHIFT) + 1;
2934-
2935- offset = get_random_int() % slots;
2936-
2937- addr = first + (offset << PAGE_SHIFT);
2938-
2939- return addr;
2940-}
2941-
2942-static struct page *signal_page;
2943-extern struct page *get_signal_page(void);
2944-
2945-static const struct vm_special_mapping sigpage_mapping = {
2946- .name = "[sigpage]",
2947- .pages = &signal_page,
2948-};
2949-
2950 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2951 {
2952 struct mm_struct *mm = current->mm;
2953- struct vm_area_struct *vma;
2954- unsigned long addr;
2955- unsigned long hint;
2956- int ret = 0;
2957-
2958- if (!signal_page)
2959- signal_page = get_signal_page();
2960- if (!signal_page)
2961- return -ENOMEM;
2962
2963 down_write(&mm->mmap_sem);
2964- hint = sigpage_addr(mm, 1);
2965- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2966- if (IS_ERR_VALUE(addr)) {
2967- ret = addr;
2968- goto up_fail;
2969- }
2970-
2971- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2972- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2973- &sigpage_mapping);
2974-
2975- if (IS_ERR(vma)) {
2976- ret = PTR_ERR(vma);
2977- goto up_fail;
2978- }
2979-
2980- mm->context.sigpage = addr;
2981-
2982- up_fail:
2983+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2984 up_write(&mm->mmap_sem);
2985- return ret;
2986+ return 0;
2987 }
2988 #endif
2989diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2990index f90fdf4..24e8c84 100644
2991--- a/arch/arm/kernel/psci.c
2992+++ b/arch/arm/kernel/psci.c
2993@@ -26,7 +26,7 @@
2994 #include <asm/psci.h>
2995 #include <asm/system_misc.h>
2996
2997-struct psci_operations psci_ops;
2998+struct psci_operations psci_ops __read_only;
2999
3000 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3001 typedef int (*psci_initcall_t)(const struct device_node *);
3002diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3003index ef9119f..31995a3 100644
3004--- a/arch/arm/kernel/ptrace.c
3005+++ b/arch/arm/kernel/ptrace.c
3006@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3007 regs->ARM_ip = ip;
3008 }
3009
3010+#ifdef CONFIG_GRKERNSEC_SETXID
3011+extern void gr_delayed_cred_worker(void);
3012+#endif
3013+
3014 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3015 {
3016 current_thread_info()->syscall = scno;
3017
3018+#ifdef CONFIG_GRKERNSEC_SETXID
3019+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3020+ gr_delayed_cred_worker();
3021+#endif
3022+
3023 /* Do the secure computing check first; failures should be fast. */
3024 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3025 if (secure_computing() == -1)
3026diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3027index 1d60beb..4aa25d5 100644
3028--- a/arch/arm/kernel/setup.c
3029+++ b/arch/arm/kernel/setup.c
3030@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3031 unsigned int elf_hwcap2 __read_mostly;
3032 EXPORT_SYMBOL(elf_hwcap2);
3033
3034+pteval_t __supported_pte_mask __read_only;
3035+pmdval_t __supported_pmd_mask __read_only;
3036
3037 #ifdef MULTI_CPU
3038-struct processor processor __read_mostly;
3039+struct processor processor __read_only;
3040 #endif
3041 #ifdef MULTI_TLB
3042-struct cpu_tlb_fns cpu_tlb __read_mostly;
3043+struct cpu_tlb_fns cpu_tlb __read_only;
3044 #endif
3045 #ifdef MULTI_USER
3046-struct cpu_user_fns cpu_user __read_mostly;
3047+struct cpu_user_fns cpu_user __read_only;
3048 #endif
3049 #ifdef MULTI_CACHE
3050-struct cpu_cache_fns cpu_cache __read_mostly;
3051+struct cpu_cache_fns cpu_cache __read_only;
3052 #endif
3053 #ifdef CONFIG_OUTER_CACHE
3054-struct outer_cache_fns outer_cache __read_mostly;
3055+struct outer_cache_fns outer_cache __read_only;
3056 EXPORT_SYMBOL(outer_cache);
3057 #endif
3058
3059@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3060 * Register 0 and check for VMSAv7 or PMSAv7 */
3061 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3062 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3063- (mmfr0 & 0x000000f0) >= 0x00000030)
3064+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3065 cpu_arch = CPU_ARCH_ARMv7;
3066- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3067+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3068+ __supported_pte_mask |= L_PTE_PXN;
3069+ __supported_pmd_mask |= PMD_PXNTABLE;
3070+ }
3071+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3072 (mmfr0 & 0x000000f0) == 0x00000020)
3073 cpu_arch = CPU_ARCH_ARMv6;
3074 else
3075diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3076index 023ac90..0a69950 100644
3077--- a/arch/arm/kernel/signal.c
3078+++ b/arch/arm/kernel/signal.c
3079@@ -24,8 +24,6 @@
3080
3081 extern const unsigned long sigreturn_codes[7];
3082
3083-static unsigned long signal_return_offset;
3084-
3085 #ifdef CONFIG_CRUNCH
3086 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3087 {
3088@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3089 * except when the MPU has protected the vectors
3090 * page from PL0
3091 */
3092- retcode = mm->context.sigpage + signal_return_offset +
3093- (idx << 2) + thumb;
3094+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3095 } else
3096 #endif
3097 {
3098@@ -603,33 +600,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3099 } while (thread_flags & _TIF_WORK_MASK);
3100 return 0;
3101 }
3102-
3103-struct page *get_signal_page(void)
3104-{
3105- unsigned long ptr;
3106- unsigned offset;
3107- struct page *page;
3108- void *addr;
3109-
3110- page = alloc_pages(GFP_KERNEL, 0);
3111-
3112- if (!page)
3113- return NULL;
3114-
3115- addr = page_address(page);
3116-
3117- /* Give the signal return code some randomness */
3118- offset = 0x200 + (get_random_int() & 0x7fc);
3119- signal_return_offset = offset;
3120-
3121- /*
3122- * Copy signal return handlers into the vector page, and
3123- * set sigreturn to be a pointer to these.
3124- */
3125- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3126-
3127- ptr = (unsigned long)addr + offset;
3128- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3129-
3130- return page;
3131-}
3132diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3133index 86ef244..c518451 100644
3134--- a/arch/arm/kernel/smp.c
3135+++ b/arch/arm/kernel/smp.c
3136@@ -76,7 +76,7 @@ enum ipi_msg_type {
3137
3138 static DECLARE_COMPLETION(cpu_running);
3139
3140-static struct smp_operations smp_ops;
3141+static struct smp_operations smp_ops __read_only;
3142
3143 void __init smp_set_ops(struct smp_operations *ops)
3144 {
3145diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3146index 7a3be1d..b00c7de 100644
3147--- a/arch/arm/kernel/tcm.c
3148+++ b/arch/arm/kernel/tcm.c
3149@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3150 .virtual = ITCM_OFFSET,
3151 .pfn = __phys_to_pfn(ITCM_OFFSET),
3152 .length = 0,
3153- .type = MT_MEMORY_RWX_ITCM,
3154+ .type = MT_MEMORY_RX_ITCM,
3155 }
3156 };
3157
3158@@ -267,7 +267,9 @@ no_dtcm:
3159 start = &__sitcm_text;
3160 end = &__eitcm_text;
3161 ram = &__itcm_start;
3162+ pax_open_kernel();
3163 memcpy(start, ram, itcm_code_sz);
3164+ pax_close_kernel();
3165 pr_debug("CPU ITCM: copied code from %p - %p\n",
3166 start, end);
3167 itcm_present = true;
3168diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3169index 788e23f..6fa06a1 100644
3170--- a/arch/arm/kernel/traps.c
3171+++ b/arch/arm/kernel/traps.c
3172@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3173 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3174 {
3175 #ifdef CONFIG_KALLSYMS
3176- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3177+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3178 #else
3179 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3180 #endif
3181@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3182 static int die_owner = -1;
3183 static unsigned int die_nest_count;
3184
3185+extern void gr_handle_kernel_exploit(void);
3186+
3187 static unsigned long oops_begin(void)
3188 {
3189 int cpu;
3190@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3191 panic("Fatal exception in interrupt");
3192 if (panic_on_oops)
3193 panic("Fatal exception");
3194+
3195+ gr_handle_kernel_exploit();
3196+
3197 if (signr)
3198 do_exit(signr);
3199 }
3200@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3201 kuser_init(vectors_base);
3202
3203 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3204- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3205+
3206+#ifndef CONFIG_PAX_MEMORY_UDEREF
3207+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3208+#endif
3209+
3210 #else /* ifndef CONFIG_CPU_V7M */
3211 /*
3212 * on V7-M there is no need to copy the vector table to a dedicated
3213diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3214index b31aa73..cc4b7a1 100644
3215--- a/arch/arm/kernel/vmlinux.lds.S
3216+++ b/arch/arm/kernel/vmlinux.lds.S
3217@@ -37,7 +37,7 @@
3218 #endif
3219
3220 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3221- defined(CONFIG_GENERIC_BUG)
3222+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3223 #define ARM_EXIT_KEEP(x) x
3224 #define ARM_EXIT_DISCARD(x)
3225 #else
3226@@ -123,6 +123,8 @@ SECTIONS
3227 #ifdef CONFIG_DEBUG_RODATA
3228 . = ALIGN(1<<SECTION_SHIFT);
3229 #endif
3230+ _etext = .; /* End of text section */
3231+
3232 RO_DATA(PAGE_SIZE)
3233
3234 . = ALIGN(4);
3235@@ -153,8 +155,6 @@ SECTIONS
3236
3237 NOTES
3238
3239- _etext = .; /* End of text and rodata section */
3240-
3241 #ifndef CONFIG_XIP_KERNEL
3242 # ifdef CONFIG_ARM_KERNMEM_PERMS
3243 . = ALIGN(1<<SECTION_SHIFT);
3244diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3245index b652af5..60231ab 100644
3246--- a/arch/arm/kvm/arm.c
3247+++ b/arch/arm/kvm/arm.c
3248@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3249 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3250
3251 /* The VMID used in the VTTBR */
3252-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3253+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3254 static u8 kvm_next_vmid;
3255 static DEFINE_SPINLOCK(kvm_vmid_lock);
3256
3257@@ -358,7 +358,7 @@ void force_vm_exit(const cpumask_t *mask)
3258 */
3259 static bool need_new_vmid_gen(struct kvm *kvm)
3260 {
3261- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3262+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3263 }
3264
3265 /**
3266@@ -391,7 +391,7 @@ static void update_vttbr(struct kvm *kvm)
3267
3268 /* First user of a new VMID generation? */
3269 if (unlikely(kvm_next_vmid == 0)) {
3270- atomic64_inc(&kvm_vmid_gen);
3271+ atomic64_inc_unchecked(&kvm_vmid_gen);
3272 kvm_next_vmid = 1;
3273
3274 /*
3275@@ -408,7 +408,7 @@ static void update_vttbr(struct kvm *kvm)
3276 kvm_call_hyp(__kvm_flush_vm_context);
3277 }
3278
3279- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3280+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3281 kvm->arch.vmid = kvm_next_vmid;
3282 kvm_next_vmid++;
3283
3284@@ -1087,7 +1087,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3285 /**
3286 * Initialize Hyp-mode and memory mappings on all CPUs.
3287 */
3288-int kvm_arch_init(void *opaque)
3289+int kvm_arch_init(const void *opaque)
3290 {
3291 int err;
3292 int ret, cpu;
3293diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3294index 14a0d98..7771a7d 100644
3295--- a/arch/arm/lib/clear_user.S
3296+++ b/arch/arm/lib/clear_user.S
3297@@ -12,14 +12,14 @@
3298
3299 .text
3300
3301-/* Prototype: int __clear_user(void *addr, size_t sz)
3302+/* Prototype: int ___clear_user(void *addr, size_t sz)
3303 * Purpose : clear some user memory
3304 * Params : addr - user memory address to clear
3305 * : sz - number of bytes to clear
3306 * Returns : number of bytes NOT cleared
3307 */
3308 ENTRY(__clear_user_std)
3309-WEAK(__clear_user)
3310+WEAK(___clear_user)
3311 stmfd sp!, {r1, lr}
3312 mov r2, #0
3313 cmp r1, #4
3314@@ -44,7 +44,7 @@ WEAK(__clear_user)
3315 USER( strnebt r2, [r0])
3316 mov r0, #0
3317 ldmfd sp!, {r1, pc}
3318-ENDPROC(__clear_user)
3319+ENDPROC(___clear_user)
3320 ENDPROC(__clear_user_std)
3321
3322 .pushsection .fixup,"ax"
3323diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3324index 7a235b9..73a0556 100644
3325--- a/arch/arm/lib/copy_from_user.S
3326+++ b/arch/arm/lib/copy_from_user.S
3327@@ -17,7 +17,7 @@
3328 /*
3329 * Prototype:
3330 *
3331- * size_t __copy_from_user(void *to, const void *from, size_t n)
3332+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3333 *
3334 * Purpose:
3335 *
3336@@ -89,11 +89,11 @@
3337
3338 .text
3339
3340-ENTRY(__copy_from_user)
3341+ENTRY(___copy_from_user)
3342
3343 #include "copy_template.S"
3344
3345-ENDPROC(__copy_from_user)
3346+ENDPROC(___copy_from_user)
3347
3348 .pushsection .fixup,"ax"
3349 .align 0
3350diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3351index 6ee2f67..d1cce76 100644
3352--- a/arch/arm/lib/copy_page.S
3353+++ b/arch/arm/lib/copy_page.S
3354@@ -10,6 +10,7 @@
3355 * ASM optimised string functions
3356 */
3357 #include <linux/linkage.h>
3358+#include <linux/const.h>
3359 #include <asm/assembler.h>
3360 #include <asm/asm-offsets.h>
3361 #include <asm/cache.h>
3362diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3363index a9d3db1..164b089 100644
3364--- a/arch/arm/lib/copy_to_user.S
3365+++ b/arch/arm/lib/copy_to_user.S
3366@@ -17,7 +17,7 @@
3367 /*
3368 * Prototype:
3369 *
3370- * size_t __copy_to_user(void *to, const void *from, size_t n)
3371+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3372 *
3373 * Purpose:
3374 *
3375@@ -93,11 +93,11 @@
3376 .text
3377
3378 ENTRY(__copy_to_user_std)
3379-WEAK(__copy_to_user)
3380+WEAK(___copy_to_user)
3381
3382 #include "copy_template.S"
3383
3384-ENDPROC(__copy_to_user)
3385+ENDPROC(___copy_to_user)
3386 ENDPROC(__copy_to_user_std)
3387
3388 .pushsection .fixup,"ax"
3389diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3390index 7d08b43..f7ca7ea 100644
3391--- a/arch/arm/lib/csumpartialcopyuser.S
3392+++ b/arch/arm/lib/csumpartialcopyuser.S
3393@@ -57,8 +57,8 @@
3394 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3395 */
3396
3397-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3398-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3399+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3400+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3401
3402 #include "csumpartialcopygeneric.S"
3403
3404diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3405index 312d43e..21d2322 100644
3406--- a/arch/arm/lib/delay.c
3407+++ b/arch/arm/lib/delay.c
3408@@ -29,7 +29,7 @@
3409 /*
3410 * Default to the loop-based delay implementation.
3411 */
3412-struct arm_delay_ops arm_delay_ops = {
3413+struct arm_delay_ops arm_delay_ops __read_only = {
3414 .delay = __loop_delay,
3415 .const_udelay = __loop_const_udelay,
3416 .udelay = __loop_udelay,
3417diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3418index 3e58d71..029817c 100644
3419--- a/arch/arm/lib/uaccess_with_memcpy.c
3420+++ b/arch/arm/lib/uaccess_with_memcpy.c
3421@@ -136,7 +136,7 @@ out:
3422 }
3423
3424 unsigned long
3425-__copy_to_user(void __user *to, const void *from, unsigned long n)
3426+___copy_to_user(void __user *to, const void *from, unsigned long n)
3427 {
3428 /*
3429 * This test is stubbed out of the main function above to keep
3430@@ -190,7 +190,7 @@ out:
3431 return n;
3432 }
3433
3434-unsigned long __clear_user(void __user *addr, unsigned long n)
3435+unsigned long ___clear_user(void __user *addr, unsigned long n)
3436 {
3437 /* See rational for this in __copy_to_user() above. */
3438 if (n < 64)
3439diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3440index 318d127..9aab0d1 100644
3441--- a/arch/arm/mach-exynos/suspend.c
3442+++ b/arch/arm/mach-exynos/suspend.c
3443@@ -18,6 +18,7 @@
3444 #include <linux/syscore_ops.h>
3445 #include <linux/cpu_pm.h>
3446 #include <linux/io.h>
3447+#include <linux/irq.h>
3448 #include <linux/irqchip/arm-gic.h>
3449 #include <linux/err.h>
3450 #include <linux/regulator/machine.h>
3451@@ -632,8 +633,10 @@ void __init exynos_pm_init(void)
3452 tmp |= pm_data->wake_disable_mask;
3453 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3454
3455- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3456- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3457+ pax_open_kernel();
3458+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3459+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3460+ pax_close_kernel();
3461
3462 register_syscore_ops(&exynos_pm_syscore_ops);
3463 suspend_set_ops(&exynos_suspend_ops);
3464diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3465index 0662087..004d163 100644
3466--- a/arch/arm/mach-keystone/keystone.c
3467+++ b/arch/arm/mach-keystone/keystone.c
3468@@ -27,7 +27,7 @@
3469
3470 #include "keystone.h"
3471
3472-static struct notifier_block platform_nb;
3473+static notifier_block_no_const platform_nb;
3474 static unsigned long keystone_dma_pfn_offset __read_mostly;
3475
3476 static int keystone_platform_notifier(struct notifier_block *nb,
3477diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3478index e46e9ea..9141c83 100644
3479--- a/arch/arm/mach-mvebu/coherency.c
3480+++ b/arch/arm/mach-mvebu/coherency.c
3481@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3482
3483 /*
3484 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3485- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3486+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3487 * is needed as a workaround for a deadlock issue between the PCIe
3488 * interface and the cache controller.
3489 */
3490@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3491 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3492
3493 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3494- mtype = MT_UNCACHED;
3495+ mtype = MT_UNCACHED_RW;
3496
3497 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3498 }
3499diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3500index b6443a4..20a0b74 100644
3501--- a/arch/arm/mach-omap2/board-n8x0.c
3502+++ b/arch/arm/mach-omap2/board-n8x0.c
3503@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3504 }
3505 #endif
3506
3507-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3508+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3509 .late_init = n8x0_menelaus_late_init,
3510 };
3511
3512diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3513index 79f49d9..70bf184 100644
3514--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3515+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3516@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3517 void (*resume)(void);
3518 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3519 void (*hotplug_restart)(void);
3520-};
3521+} __no_const;
3522
3523 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3524 static struct powerdomain *mpuss_pd;
3525@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3526 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3527 {}
3528
3529-struct cpu_pm_ops omap_pm_ops = {
3530+static struct cpu_pm_ops omap_pm_ops __read_only = {
3531 .finish_suspend = default_finish_suspend,
3532 .resume = dummy_cpu_resume,
3533 .scu_prepare = dummy_scu_prepare,
3534diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3535index 5305ec7..6d74045 100644
3536--- a/arch/arm/mach-omap2/omap-smp.c
3537+++ b/arch/arm/mach-omap2/omap-smp.c
3538@@ -19,6 +19,7 @@
3539 #include <linux/device.h>
3540 #include <linux/smp.h>
3541 #include <linux/io.h>
3542+#include <linux/irq.h>
3543 #include <linux/irqchip/arm-gic.h>
3544
3545 #include <asm/smp_scu.h>
3546diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3547index f961c46..4a453dc 100644
3548--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3549+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3550@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3551 return NOTIFY_OK;
3552 }
3553
3554-static struct notifier_block __refdata irq_hotplug_notifier = {
3555+static struct notifier_block irq_hotplug_notifier = {
3556 .notifier_call = irq_cpu_hotplug_notify,
3557 };
3558
3559diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3560index be9541e..821805f 100644
3561--- a/arch/arm/mach-omap2/omap_device.c
3562+++ b/arch/arm/mach-omap2/omap_device.c
3563@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3564 struct platform_device __init *omap_device_build(const char *pdev_name,
3565 int pdev_id,
3566 struct omap_hwmod *oh,
3567- void *pdata, int pdata_len)
3568+ const void *pdata, int pdata_len)
3569 {
3570 struct omap_hwmod *ohs[] = { oh };
3571
3572@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3573 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3574 int pdev_id,
3575 struct omap_hwmod **ohs,
3576- int oh_cnt, void *pdata,
3577+ int oh_cnt, const void *pdata,
3578 int pdata_len)
3579 {
3580 int ret = -ENOMEM;
3581diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3582index 78c02b3..c94109a 100644
3583--- a/arch/arm/mach-omap2/omap_device.h
3584+++ b/arch/arm/mach-omap2/omap_device.h
3585@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3586 /* Core code interface */
3587
3588 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3589- struct omap_hwmod *oh, void *pdata,
3590+ struct omap_hwmod *oh, const void *pdata,
3591 int pdata_len);
3592
3593 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3594 struct omap_hwmod **oh, int oh_cnt,
3595- void *pdata, int pdata_len);
3596+ const void *pdata, int pdata_len);
3597
3598 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3599 struct omap_hwmod **ohs, int oh_cnt);
3600diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3601index 355b089..2c9d7c3 100644
3602--- a/arch/arm/mach-omap2/omap_hwmod.c
3603+++ b/arch/arm/mach-omap2/omap_hwmod.c
3604@@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
3605 int (*init_clkdm)(struct omap_hwmod *oh);
3606 void (*update_context_lost)(struct omap_hwmod *oh);
3607 int (*get_context_lost)(struct omap_hwmod *oh);
3608-};
3609+} __no_const;
3610
3611 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3612-static struct omap_hwmod_soc_ops soc_ops;
3613+static struct omap_hwmod_soc_ops soc_ops __read_only;
3614
3615 /* omap_hwmod_list contains all registered struct omap_hwmods */
3616 static LIST_HEAD(omap_hwmod_list);
3617diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3618index 95fee54..cfa9cf1 100644
3619--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3620+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3621@@ -10,6 +10,7 @@
3622
3623 #include <linux/kernel.h>
3624 #include <linux/init.h>
3625+#include <asm/pgtable.h>
3626
3627 #include "powerdomain.h"
3628
3629@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3630
3631 void __init am43xx_powerdomains_init(void)
3632 {
3633- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3634+ pax_open_kernel();
3635+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3636+ pax_close_kernel();
3637 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3638 pwrdm_register_pwrdms(powerdomains_am43xx);
3639 pwrdm_complete_init();
3640diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3641index ff0a68c..b312aa0 100644
3642--- a/arch/arm/mach-omap2/wd_timer.c
3643+++ b/arch/arm/mach-omap2/wd_timer.c
3644@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3645 struct omap_hwmod *oh;
3646 char *oh_name = "wd_timer2";
3647 char *dev_name = "omap_wdt";
3648- struct omap_wd_timer_platform_data pdata;
3649+ static struct omap_wd_timer_platform_data pdata = {
3650+ .read_reset_sources = prm_read_reset_sources
3651+ };
3652
3653 if (!cpu_class_is_omap2() || of_have_populated_dt())
3654 return 0;
3655@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3656 return -EINVAL;
3657 }
3658
3659- pdata.read_reset_sources = prm_read_reset_sources;
3660-
3661 pdev = omap_device_build(dev_name, id, oh, &pdata,
3662 sizeof(struct omap_wd_timer_platform_data));
3663 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3664diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3665index 4f25a7c..a81be85 100644
3666--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3667+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3668@@ -179,7 +179,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3669 bool entered_lp2 = false;
3670
3671 if (tegra_pending_sgi())
3672- ACCESS_ONCE(abort_flag) = true;
3673+ ACCESS_ONCE_RW(abort_flag) = true;
3674
3675 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3676
3677diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3678index ab95f53..4b977a7 100644
3679--- a/arch/arm/mach-tegra/irq.c
3680+++ b/arch/arm/mach-tegra/irq.c
3681@@ -20,6 +20,7 @@
3682 #include <linux/cpu_pm.h>
3683 #include <linux/interrupt.h>
3684 #include <linux/io.h>
3685+#include <linux/irq.h>
3686 #include <linux/irqchip/arm-gic.h>
3687 #include <linux/irq.h>
3688 #include <linux/kernel.h>
3689diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3690index 2cb587b..6ddfebf 100644
3691--- a/arch/arm/mach-ux500/pm.c
3692+++ b/arch/arm/mach-ux500/pm.c
3693@@ -10,6 +10,7 @@
3694 */
3695
3696 #include <linux/kernel.h>
3697+#include <linux/irq.h>
3698 #include <linux/irqchip/arm-gic.h>
3699 #include <linux/delay.h>
3700 #include <linux/io.h>
3701diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3702index 2dea8b5..6499da2 100644
3703--- a/arch/arm/mach-ux500/setup.h
3704+++ b/arch/arm/mach-ux500/setup.h
3705@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3706 .type = MT_DEVICE, \
3707 }
3708
3709-#define __MEM_DEV_DESC(x, sz) { \
3710- .virtual = IO_ADDRESS(x), \
3711- .pfn = __phys_to_pfn(x), \
3712- .length = sz, \
3713- .type = MT_MEMORY_RWX, \
3714-}
3715-
3716 extern struct smp_operations ux500_smp_ops;
3717 extern void ux500_cpu_die(unsigned int cpu);
3718
3719diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3720index 52d768f..5f93180 100644
3721--- a/arch/arm/mach-zynq/platsmp.c
3722+++ b/arch/arm/mach-zynq/platsmp.c
3723@@ -24,6 +24,7 @@
3724 #include <linux/io.h>
3725 #include <asm/cacheflush.h>
3726 #include <asm/smp_scu.h>
3727+#include <linux/irq.h>
3728 #include <linux/irqchip/arm-gic.h>
3729 #include "common.h"
3730
3731diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3732index 9b4f29e..bbf3bfa 100644
3733--- a/arch/arm/mm/Kconfig
3734+++ b/arch/arm/mm/Kconfig
3735@@ -446,6 +446,7 @@ config CPU_32v5
3736
3737 config CPU_32v6
3738 bool
3739+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3740 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3741
3742 config CPU_32v6K
3743@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3744
3745 config CPU_USE_DOMAINS
3746 bool
3747+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3748 help
3749 This option enables or disables the use of domain switching
3750 via the set_fs() function.
3751@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3752
3753 config KUSER_HELPERS
3754 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3755- depends on MMU
3756+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3757 default y
3758 help
3759 Warning: disabling this option may break user programs.
3760@@ -812,7 +814,7 @@ config KUSER_HELPERS
3761 See Documentation/arm/kernel_user_helpers.txt for details.
3762
3763 However, the fixed address nature of these helpers can be used
3764- by ROP (return orientated programming) authors when creating
3765+ by ROP (Return Oriented Programming) authors when creating
3766 exploits.
3767
3768 If all of the binaries and libraries which run on your platform
3769diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3770index 2c0c541..4585df9 100644
3771--- a/arch/arm/mm/alignment.c
3772+++ b/arch/arm/mm/alignment.c
3773@@ -216,10 +216,12 @@ union offset_union {
3774 #define __get16_unaligned_check(ins,val,addr) \
3775 do { \
3776 unsigned int err = 0, v, a = addr; \
3777+ pax_open_userland(); \
3778 __get8_unaligned_check(ins,v,a,err); \
3779 val = v << ((BE) ? 8 : 0); \
3780 __get8_unaligned_check(ins,v,a,err); \
3781 val |= v << ((BE) ? 0 : 8); \
3782+ pax_close_userland(); \
3783 if (err) \
3784 goto fault; \
3785 } while (0)
3786@@ -233,6 +235,7 @@ union offset_union {
3787 #define __get32_unaligned_check(ins,val,addr) \
3788 do { \
3789 unsigned int err = 0, v, a = addr; \
3790+ pax_open_userland(); \
3791 __get8_unaligned_check(ins,v,a,err); \
3792 val = v << ((BE) ? 24 : 0); \
3793 __get8_unaligned_check(ins,v,a,err); \
3794@@ -241,6 +244,7 @@ union offset_union {
3795 val |= v << ((BE) ? 8 : 16); \
3796 __get8_unaligned_check(ins,v,a,err); \
3797 val |= v << ((BE) ? 0 : 24); \
3798+ pax_close_userland(); \
3799 if (err) \
3800 goto fault; \
3801 } while (0)
3802@@ -254,6 +258,7 @@ union offset_union {
3803 #define __put16_unaligned_check(ins,val,addr) \
3804 do { \
3805 unsigned int err = 0, v = val, a = addr; \
3806+ pax_open_userland(); \
3807 __asm__( FIRST_BYTE_16 \
3808 ARM( "1: "ins" %1, [%2], #1\n" ) \
3809 THUMB( "1: "ins" %1, [%2]\n" ) \
3810@@ -273,6 +278,7 @@ union offset_union {
3811 " .popsection\n" \
3812 : "=r" (err), "=&r" (v), "=&r" (a) \
3813 : "0" (err), "1" (v), "2" (a)); \
3814+ pax_close_userland(); \
3815 if (err) \
3816 goto fault; \
3817 } while (0)
3818@@ -286,6 +292,7 @@ union offset_union {
3819 #define __put32_unaligned_check(ins,val,addr) \
3820 do { \
3821 unsigned int err = 0, v = val, a = addr; \
3822+ pax_open_userland(); \
3823 __asm__( FIRST_BYTE_32 \
3824 ARM( "1: "ins" %1, [%2], #1\n" ) \
3825 THUMB( "1: "ins" %1, [%2]\n" ) \
3826@@ -315,6 +322,7 @@ union offset_union {
3827 " .popsection\n" \
3828 : "=r" (err), "=&r" (v), "=&r" (a) \
3829 : "0" (err), "1" (v), "2" (a)); \
3830+ pax_close_userland(); \
3831 if (err) \
3832 goto fault; \
3833 } while (0)
3834diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3835index 8f15f70..d599a2b 100644
3836--- a/arch/arm/mm/cache-l2x0.c
3837+++ b/arch/arm/mm/cache-l2x0.c
3838@@ -43,7 +43,7 @@ struct l2c_init_data {
3839 void (*save)(void __iomem *);
3840 void (*configure)(void __iomem *);
3841 struct outer_cache_fns outer_cache;
3842-};
3843+} __do_const;
3844
3845 #define CACHE_LINE_SIZE 32
3846
3847diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3848index 845769e..4278fd7 100644
3849--- a/arch/arm/mm/context.c
3850+++ b/arch/arm/mm/context.c
3851@@ -43,7 +43,7 @@
3852 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3853
3854 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3855-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3856+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3857 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3858
3859 static DEFINE_PER_CPU(atomic64_t, active_asids);
3860@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3861 {
3862 static u32 cur_idx = 1;
3863 u64 asid = atomic64_read(&mm->context.id);
3864- u64 generation = atomic64_read(&asid_generation);
3865+ u64 generation = atomic64_read_unchecked(&asid_generation);
3866
3867 if (asid != 0) {
3868 /*
3869@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3870 */
3871 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3872 if (asid == NUM_USER_ASIDS) {
3873- generation = atomic64_add_return(ASID_FIRST_VERSION,
3874+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3875 &asid_generation);
3876 flush_context(cpu);
3877 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3878@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3879 cpu_set_reserved_ttbr0();
3880
3881 asid = atomic64_read(&mm->context.id);
3882- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3883+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3884 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3885 goto switch_mm_fastpath;
3886
3887 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3888 /* Check that our ASID belongs to the current generation. */
3889 asid = atomic64_read(&mm->context.id);
3890- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3891+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3892 asid = new_context(mm, cpu);
3893 atomic64_set(&mm->context.id, asid);
3894 }
3895diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3896index 6333d9c..3bb19f2 100644
3897--- a/arch/arm/mm/fault.c
3898+++ b/arch/arm/mm/fault.c
3899@@ -25,6 +25,7 @@
3900 #include <asm/system_misc.h>
3901 #include <asm/system_info.h>
3902 #include <asm/tlbflush.h>
3903+#include <asm/sections.h>
3904
3905 #include "fault.h"
3906
3907@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3908 if (fixup_exception(regs))
3909 return;
3910
3911+#ifdef CONFIG_PAX_MEMORY_UDEREF
3912+ if (addr < TASK_SIZE) {
3913+ if (current->signal->curr_ip)
3914+ 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),
3915+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3916+ else
3917+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3918+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3919+ }
3920+#endif
3921+
3922+#ifdef CONFIG_PAX_KERNEXEC
3923+ if ((fsr & FSR_WRITE) &&
3924+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3925+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3926+ {
3927+ if (current->signal->curr_ip)
3928+ 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),
3929+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3930+ else
3931+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3932+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3933+ }
3934+#endif
3935+
3936 /*
3937 * No handler, we'll have to terminate things with extreme prejudice.
3938 */
3939@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3940 }
3941 #endif
3942
3943+#ifdef CONFIG_PAX_PAGEEXEC
3944+ if (fsr & FSR_LNX_PF) {
3945+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3946+ do_group_exit(SIGKILL);
3947+ }
3948+#endif
3949+
3950 tsk->thread.address = addr;
3951 tsk->thread.error_code = fsr;
3952 tsk->thread.trap_no = 14;
3953@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3954 }
3955 #endif /* CONFIG_MMU */
3956
3957+#ifdef CONFIG_PAX_PAGEEXEC
3958+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3959+{
3960+ long i;
3961+
3962+ printk(KERN_ERR "PAX: bytes at PC: ");
3963+ for (i = 0; i < 20; i++) {
3964+ unsigned char c;
3965+ if (get_user(c, (__force unsigned char __user *)pc+i))
3966+ printk(KERN_CONT "?? ");
3967+ else
3968+ printk(KERN_CONT "%02x ", c);
3969+ }
3970+ printk("\n");
3971+
3972+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3973+ for (i = -1; i < 20; i++) {
3974+ unsigned long c;
3975+ if (get_user(c, (__force unsigned long __user *)sp+i))
3976+ printk(KERN_CONT "???????? ");
3977+ else
3978+ printk(KERN_CONT "%08lx ", c);
3979+ }
3980+ printk("\n");
3981+}
3982+#endif
3983+
3984 /*
3985 * First Level Translation Fault Handler
3986 *
3987@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3988 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3989 struct siginfo info;
3990
3991+#ifdef CONFIG_PAX_MEMORY_UDEREF
3992+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3993+ if (current->signal->curr_ip)
3994+ 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),
3995+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3996+ else
3997+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3998+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3999+ goto die;
4000+ }
4001+#endif
4002+
4003 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4004 return;
4005
4006+die:
4007 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4008 inf->name, fsr, addr);
4009 show_pte(current->mm, addr);
4010@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4011 ifsr_info[nr].name = name;
4012 }
4013
4014+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4015+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4016+
4017 asmlinkage void __exception
4018 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4019 {
4020 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4021 struct siginfo info;
4022+ unsigned long pc = instruction_pointer(regs);
4023+
4024+ if (user_mode(regs)) {
4025+ unsigned long sigpage = current->mm->context.sigpage;
4026+
4027+ if (sigpage <= pc && pc < sigpage + 7*4) {
4028+ if (pc < sigpage + 3*4)
4029+ sys_sigreturn(regs);
4030+ else
4031+ sys_rt_sigreturn(regs);
4032+ return;
4033+ }
4034+ if (pc == 0xffff0f60UL) {
4035+ /*
4036+ * PaX: __kuser_cmpxchg64 emulation
4037+ */
4038+ // TODO
4039+ //regs->ARM_pc = regs->ARM_lr;
4040+ //return;
4041+ }
4042+ if (pc == 0xffff0fa0UL) {
4043+ /*
4044+ * PaX: __kuser_memory_barrier emulation
4045+ */
4046+ // dmb(); implied by the exception
4047+ regs->ARM_pc = regs->ARM_lr;
4048+ return;
4049+ }
4050+ if (pc == 0xffff0fc0UL) {
4051+ /*
4052+ * PaX: __kuser_cmpxchg emulation
4053+ */
4054+ // TODO
4055+ //long new;
4056+ //int op;
4057+
4058+ //op = FUTEX_OP_SET << 28;
4059+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4060+ //regs->ARM_r0 = old != new;
4061+ //regs->ARM_pc = regs->ARM_lr;
4062+ //return;
4063+ }
4064+ if (pc == 0xffff0fe0UL) {
4065+ /*
4066+ * PaX: __kuser_get_tls emulation
4067+ */
4068+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4069+ regs->ARM_pc = regs->ARM_lr;
4070+ return;
4071+ }
4072+ }
4073+
4074+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4075+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4076+ if (current->signal->curr_ip)
4077+ 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),
4078+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4079+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4080+ else
4081+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4082+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4083+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4084+ goto die;
4085+ }
4086+#endif
4087+
4088+#ifdef CONFIG_PAX_REFCOUNT
4089+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4090+#ifdef CONFIG_THUMB2_KERNEL
4091+ unsigned short bkpt;
4092+
4093+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4094+#else
4095+ unsigned int bkpt;
4096+
4097+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4098+#endif
4099+ current->thread.error_code = ifsr;
4100+ current->thread.trap_no = 0;
4101+ pax_report_refcount_overflow(regs);
4102+ fixup_exception(regs);
4103+ return;
4104+ }
4105+ }
4106+#endif
4107
4108 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4109 return;
4110
4111+die:
4112 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4113 inf->name, ifsr, addr);
4114
4115diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4116index cf08bdf..772656c 100644
4117--- a/arch/arm/mm/fault.h
4118+++ b/arch/arm/mm/fault.h
4119@@ -3,6 +3,7 @@
4120
4121 /*
4122 * Fault status register encodings. We steal bit 31 for our own purposes.
4123+ * Set when the FSR value is from an instruction fault.
4124 */
4125 #define FSR_LNX_PF (1 << 31)
4126 #define FSR_WRITE (1 << 11)
4127@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4128 }
4129 #endif
4130
4131+/* valid for LPAE and !LPAE */
4132+static inline int is_xn_fault(unsigned int fsr)
4133+{
4134+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4135+}
4136+
4137+static inline int is_domain_fault(unsigned int fsr)
4138+{
4139+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4140+}
4141+
4142 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4143 unsigned long search_exception_table(unsigned long addr);
4144
4145diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4146index 1609b02..def0785 100644
4147--- a/arch/arm/mm/init.c
4148+++ b/arch/arm/mm/init.c
4149@@ -755,7 +755,46 @@ void free_tcmmem(void)
4150 {
4151 #ifdef CONFIG_HAVE_TCM
4152 extern char __tcm_start, __tcm_end;
4153+#endif
4154
4155+#ifdef CONFIG_PAX_KERNEXEC
4156+ unsigned long addr;
4157+ pgd_t *pgd;
4158+ pud_t *pud;
4159+ pmd_t *pmd;
4160+ int cpu_arch = cpu_architecture();
4161+ unsigned int cr = get_cr();
4162+
4163+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4164+ /* make pages tables, etc before .text NX */
4165+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4166+ pgd = pgd_offset_k(addr);
4167+ pud = pud_offset(pgd, addr);
4168+ pmd = pmd_offset(pud, addr);
4169+ __section_update(pmd, addr, PMD_SECT_XN);
4170+ }
4171+ /* make init NX */
4172+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4173+ pgd = pgd_offset_k(addr);
4174+ pud = pud_offset(pgd, addr);
4175+ pmd = pmd_offset(pud, addr);
4176+ __section_update(pmd, addr, PMD_SECT_XN);
4177+ }
4178+ /* make kernel code/rodata RX */
4179+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4180+ pgd = pgd_offset_k(addr);
4181+ pud = pud_offset(pgd, addr);
4182+ pmd = pmd_offset(pud, addr);
4183+#ifdef CONFIG_ARM_LPAE
4184+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4185+#else
4186+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4187+#endif
4188+ }
4189+ }
4190+#endif
4191+
4192+#ifdef CONFIG_HAVE_TCM
4193 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4194 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4195 #endif
4196diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4197index d1e5ad7..84dcbf2 100644
4198--- a/arch/arm/mm/ioremap.c
4199+++ b/arch/arm/mm/ioremap.c
4200@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4201 unsigned int mtype;
4202
4203 if (cached)
4204- mtype = MT_MEMORY_RWX;
4205+ mtype = MT_MEMORY_RX;
4206 else
4207- mtype = MT_MEMORY_RWX_NONCACHED;
4208+ mtype = MT_MEMORY_RX_NONCACHED;
4209
4210 return __arm_ioremap_caller(phys_addr, size, mtype,
4211 __builtin_return_address(0));
4212diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4213index 5e85ed3..b10a7ed 100644
4214--- a/arch/arm/mm/mmap.c
4215+++ b/arch/arm/mm/mmap.c
4216@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4217 struct vm_area_struct *vma;
4218 int do_align = 0;
4219 int aliasing = cache_is_vipt_aliasing();
4220+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4221 struct vm_unmapped_area_info info;
4222
4223 /*
4224@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4225 if (len > TASK_SIZE)
4226 return -ENOMEM;
4227
4228+#ifdef CONFIG_PAX_RANDMMAP
4229+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4230+#endif
4231+
4232 if (addr) {
4233 if (do_align)
4234 addr = COLOUR_ALIGN(addr, pgoff);
4235@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4236 addr = PAGE_ALIGN(addr);
4237
4238 vma = find_vma(mm, addr);
4239- if (TASK_SIZE - len >= addr &&
4240- (!vma || addr + len <= vma->vm_start))
4241+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4242 return addr;
4243 }
4244
4245@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4246 info.high_limit = TASK_SIZE;
4247 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4248 info.align_offset = pgoff << PAGE_SHIFT;
4249+ info.threadstack_offset = offset;
4250 return vm_unmapped_area(&info);
4251 }
4252
4253@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4254 unsigned long addr = addr0;
4255 int do_align = 0;
4256 int aliasing = cache_is_vipt_aliasing();
4257+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4258 struct vm_unmapped_area_info info;
4259
4260 /*
4261@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4262 return addr;
4263 }
4264
4265+#ifdef CONFIG_PAX_RANDMMAP
4266+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4267+#endif
4268+
4269 /* requesting a specific address */
4270 if (addr) {
4271 if (do_align)
4272@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4273 else
4274 addr = PAGE_ALIGN(addr);
4275 vma = find_vma(mm, addr);
4276- if (TASK_SIZE - len >= addr &&
4277- (!vma || addr + len <= vma->vm_start))
4278+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4279 return addr;
4280 }
4281
4282@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4283 info.high_limit = mm->mmap_base;
4284 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4285 info.align_offset = pgoff << PAGE_SHIFT;
4286+ info.threadstack_offset = offset;
4287 addr = vm_unmapped_area(&info);
4288
4289 /*
4290@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4291 {
4292 unsigned long random_factor = 0UL;
4293
4294+#ifdef CONFIG_PAX_RANDMMAP
4295+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4296+#endif
4297+
4298 /* 8 bits of randomness in 20 address space bits */
4299 if ((current->flags & PF_RANDOMIZE) &&
4300 !(current->personality & ADDR_NO_RANDOMIZE))
4301@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4302
4303 if (mmap_is_legacy()) {
4304 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4305+
4306+#ifdef CONFIG_PAX_RANDMMAP
4307+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4308+ mm->mmap_base += mm->delta_mmap;
4309+#endif
4310+
4311 mm->get_unmapped_area = arch_get_unmapped_area;
4312 } else {
4313 mm->mmap_base = mmap_base(random_factor);
4314+
4315+#ifdef CONFIG_PAX_RANDMMAP
4316+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4317+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4318+#endif
4319+
4320 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4321 }
4322 }
4323diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4324index 7186382..0c145cf 100644
4325--- a/arch/arm/mm/mmu.c
4326+++ b/arch/arm/mm/mmu.c
4327@@ -41,6 +41,22 @@
4328 #include "mm.h"
4329 #include "tcm.h"
4330
4331+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4332+void modify_domain(unsigned int dom, unsigned int type)
4333+{
4334+ struct thread_info *thread = current_thread_info();
4335+ unsigned int domain = thread->cpu_domain;
4336+ /*
4337+ * DOMAIN_MANAGER might be defined to some other value,
4338+ * use the arch-defined constant
4339+ */
4340+ domain &= ~domain_val(dom, 3);
4341+ thread->cpu_domain = domain | domain_val(dom, type);
4342+ set_domain(thread->cpu_domain);
4343+}
4344+EXPORT_SYMBOL(modify_domain);
4345+#endif
4346+
4347 /*
4348 * empty_zero_page is a special page that is used for
4349 * zero-initialized data and COW.
4350@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4351 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4352 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4353
4354-static struct mem_type mem_types[] = {
4355+#ifdef CONFIG_PAX_KERNEXEC
4356+#define L_PTE_KERNEXEC L_PTE_RDONLY
4357+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4358+#else
4359+#define L_PTE_KERNEXEC L_PTE_DIRTY
4360+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4361+#endif
4362+
4363+static struct mem_type mem_types[] __read_only = {
4364 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4365 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4366 L_PTE_SHARED,
4367@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4368 .prot_sect = PROT_SECT_DEVICE,
4369 .domain = DOMAIN_IO,
4370 },
4371- [MT_UNCACHED] = {
4372+ [MT_UNCACHED_RW] = {
4373 .prot_pte = PROT_PTE_DEVICE,
4374 .prot_l1 = PMD_TYPE_TABLE,
4375 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4376 .domain = DOMAIN_IO,
4377 },
4378- [MT_CACHECLEAN] = {
4379- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4380+ [MT_CACHECLEAN_RO] = {
4381+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4382 .domain = DOMAIN_KERNEL,
4383 },
4384 #ifndef CONFIG_ARM_LPAE
4385- [MT_MINICLEAN] = {
4386- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4387+ [MT_MINICLEAN_RO] = {
4388+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4389 .domain = DOMAIN_KERNEL,
4390 },
4391 #endif
4392@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4393 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4394 L_PTE_RDONLY,
4395 .prot_l1 = PMD_TYPE_TABLE,
4396- .domain = DOMAIN_USER,
4397+ .domain = DOMAIN_VECTORS,
4398 },
4399 [MT_HIGH_VECTORS] = {
4400 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4401 L_PTE_USER | L_PTE_RDONLY,
4402 .prot_l1 = PMD_TYPE_TABLE,
4403- .domain = DOMAIN_USER,
4404+ .domain = DOMAIN_VECTORS,
4405 },
4406- [MT_MEMORY_RWX] = {
4407+ [__MT_MEMORY_RWX] = {
4408 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4409 .prot_l1 = PMD_TYPE_TABLE,
4410 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4411@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4412 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4413 .domain = DOMAIN_KERNEL,
4414 },
4415- [MT_ROM] = {
4416- .prot_sect = PMD_TYPE_SECT,
4417+ [MT_MEMORY_RX] = {
4418+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4419+ .prot_l1 = PMD_TYPE_TABLE,
4420+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4421+ .domain = DOMAIN_KERNEL,
4422+ },
4423+ [MT_ROM_RX] = {
4424+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4425 .domain = DOMAIN_KERNEL,
4426 },
4427- [MT_MEMORY_RWX_NONCACHED] = {
4428+ [MT_MEMORY_RW_NONCACHED] = {
4429 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4430 L_PTE_MT_BUFFERABLE,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4433 .domain = DOMAIN_KERNEL,
4434 },
4435+ [MT_MEMORY_RX_NONCACHED] = {
4436+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4437+ L_PTE_MT_BUFFERABLE,
4438+ .prot_l1 = PMD_TYPE_TABLE,
4439+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4440+ .domain = DOMAIN_KERNEL,
4441+ },
4442 [MT_MEMORY_RW_DTCM] = {
4443 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4444 L_PTE_XN,
4445@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4446 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449- [MT_MEMORY_RWX_ITCM] = {
4450- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4451+ [MT_MEMORY_RX_ITCM] = {
4452+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4455 .domain = DOMAIN_KERNEL,
4456 },
4457 [MT_MEMORY_RW_SO] = {
4458@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4459 * Mark cache clean areas and XIP ROM read only
4460 * from SVC mode and no access from userspace.
4461 */
4462- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4463- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4464- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4465+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4466+#ifdef CONFIG_PAX_KERNEXEC
4467+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4468+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4469+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4470+#endif
4471+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4472+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4473 #endif
4474
4475 /*
4476@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4477 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4478 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4479 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4480- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4481- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4482+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4483+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4484 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4485 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4486+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4487+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4488 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4489- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4490- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4491+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4492+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4493+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4494+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4495 }
4496 }
4497
4498@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4499 if (cpu_arch >= CPU_ARCH_ARMv6) {
4500 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4501 /* Non-cacheable Normal is XCB = 001 */
4502- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4503+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4504+ PMD_SECT_BUFFERED;
4505+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4506 PMD_SECT_BUFFERED;
4507 } else {
4508 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4509- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4510+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4511+ PMD_SECT_TEX(1);
4512+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4513 PMD_SECT_TEX(1);
4514 }
4515 } else {
4516- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4517+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4518+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4519 }
4520
4521 #ifdef CONFIG_ARM_LPAE
4522@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4523 user_pgprot |= PTE_EXT_PXN;
4524 #endif
4525
4526+ user_pgprot |= __supported_pte_mask;
4527+
4528 for (i = 0; i < 16; i++) {
4529 pteval_t v = pgprot_val(protection_map[i]);
4530 protection_map[i] = __pgprot(v | user_pgprot);
4531@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4532
4533 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4534 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4535- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4536- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4537+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4538+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4539 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4540 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4541+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4542+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4543 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4544- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4545- mem_types[MT_ROM].prot_sect |= cp->pmd;
4546+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4547+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4548+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4549
4550 switch (cp->pmd) {
4551 case PMD_SECT_WT:
4552- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4553+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4554 break;
4555 case PMD_SECT_WB:
4556 case PMD_SECT_WBWA:
4557- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4558+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4559 break;
4560 }
4561 pr_info("Memory policy: %sData cache %s\n",
4562@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4563 return;
4564 }
4565
4566- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4567+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4568 md->virtual >= PAGE_OFFSET &&
4569 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4570 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4571@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4572 * called function. This means you can't use any function or debugging
4573 * method which may touch any device, otherwise the kernel _will_ crash.
4574 */
4575+
4576+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4577+
4578 static void __init devicemaps_init(const struct machine_desc *mdesc)
4579 {
4580 struct map_desc map;
4581 unsigned long addr;
4582- void *vectors;
4583
4584- /*
4585- * Allocate the vector page early.
4586- */
4587- vectors = early_alloc(PAGE_SIZE * 2);
4588-
4589- early_trap_init(vectors);
4590+ early_trap_init(&vectors);
4591
4592 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4593 pmd_clear(pmd_off_k(addr));
4594@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4595 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4596 map.virtual = MODULES_VADDR;
4597 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4598- map.type = MT_ROM;
4599+ map.type = MT_ROM_RX;
4600 create_mapping(&map);
4601 #endif
4602
4603@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4604 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4605 map.virtual = FLUSH_BASE;
4606 map.length = SZ_1M;
4607- map.type = MT_CACHECLEAN;
4608+ map.type = MT_CACHECLEAN_RO;
4609 create_mapping(&map);
4610 #endif
4611 #ifdef FLUSH_BASE_MINICACHE
4612 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4613 map.virtual = FLUSH_BASE_MINICACHE;
4614 map.length = SZ_1M;
4615- map.type = MT_MINICLEAN;
4616+ map.type = MT_MINICLEAN_RO;
4617 create_mapping(&map);
4618 #endif
4619
4620@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4621 * location (0xffff0000). If we aren't using high-vectors, also
4622 * create a mapping at the low-vectors virtual address.
4623 */
4624- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4625+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4626 map.virtual = 0xffff0000;
4627 map.length = PAGE_SIZE;
4628 #ifdef CONFIG_KUSER_HELPERS
4629@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4630 static void __init map_lowmem(void)
4631 {
4632 struct memblock_region *reg;
4633+#ifndef CONFIG_PAX_KERNEXEC
4634 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4635 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4636+#endif
4637
4638 /* Map all the lowmem memory banks. */
4639 for_each_memblock(memory, reg) {
4640@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4641 if (start >= end)
4642 break;
4643
4644+#ifdef CONFIG_PAX_KERNEXEC
4645+ map.pfn = __phys_to_pfn(start);
4646+ map.virtual = __phys_to_virt(start);
4647+ map.length = end - start;
4648+
4649+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4650+ struct map_desc kernel;
4651+ struct map_desc initmap;
4652+
4653+ /* when freeing initmem we will make this RW */
4654+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4655+ initmap.virtual = (unsigned long)__init_begin;
4656+ initmap.length = _sdata - __init_begin;
4657+ initmap.type = __MT_MEMORY_RWX;
4658+ create_mapping(&initmap);
4659+
4660+ /* when freeing initmem we will make this RX */
4661+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4662+ kernel.virtual = (unsigned long)_stext;
4663+ kernel.length = __init_begin - _stext;
4664+ kernel.type = __MT_MEMORY_RWX;
4665+ create_mapping(&kernel);
4666+
4667+ if (map.virtual < (unsigned long)_stext) {
4668+ map.length = (unsigned long)_stext - map.virtual;
4669+ map.type = __MT_MEMORY_RWX;
4670+ create_mapping(&map);
4671+ }
4672+
4673+ map.pfn = __phys_to_pfn(__pa(_sdata));
4674+ map.virtual = (unsigned long)_sdata;
4675+ map.length = end - __pa(_sdata);
4676+ }
4677+
4678+ map.type = MT_MEMORY_RW;
4679+ create_mapping(&map);
4680+#else
4681 if (end < kernel_x_start) {
4682 map.pfn = __phys_to_pfn(start);
4683 map.virtual = __phys_to_virt(start);
4684 map.length = end - start;
4685- map.type = MT_MEMORY_RWX;
4686+ map.type = __MT_MEMORY_RWX;
4687
4688 create_mapping(&map);
4689 } else if (start >= kernel_x_end) {
4690@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4691 map.pfn = __phys_to_pfn(kernel_x_start);
4692 map.virtual = __phys_to_virt(kernel_x_start);
4693 map.length = kernel_x_end - kernel_x_start;
4694- map.type = MT_MEMORY_RWX;
4695+ map.type = __MT_MEMORY_RWX;
4696
4697 create_mapping(&map);
4698
4699@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4700 create_mapping(&map);
4701 }
4702 }
4703+#endif
4704 }
4705 }
4706
4707diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4708index f412b53..fc89433 100644
4709--- a/arch/arm/net/bpf_jit_32.c
4710+++ b/arch/arm/net/bpf_jit_32.c
4711@@ -20,6 +20,7 @@
4712 #include <asm/cacheflush.h>
4713 #include <asm/hwcap.h>
4714 #include <asm/opcodes.h>
4715+#include <asm/pgtable.h>
4716
4717 #include "bpf_jit_32.h"
4718
4719@@ -71,7 +72,11 @@ struct jit_ctx {
4720 #endif
4721 };
4722
4723+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4724+int bpf_jit_enable __read_only;
4725+#else
4726 int bpf_jit_enable __read_mostly;
4727+#endif
4728
4729 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4730 {
4731@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4732 {
4733 u32 *ptr;
4734 /* We are guaranteed to have aligned memory. */
4735+ pax_open_kernel();
4736 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4737 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4738+ pax_close_kernel();
4739 }
4740
4741 static void build_prologue(struct jit_ctx *ctx)
4742diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4743index 5b217f4..c23f40e 100644
4744--- a/arch/arm/plat-iop/setup.c
4745+++ b/arch/arm/plat-iop/setup.c
4746@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4747 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4748 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4749 .length = IOP3XX_PERIPHERAL_SIZE,
4750- .type = MT_UNCACHED,
4751+ .type = MT_UNCACHED_RW,
4752 },
4753 };
4754
4755diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4756index a5bc92d..0bb4730 100644
4757--- a/arch/arm/plat-omap/sram.c
4758+++ b/arch/arm/plat-omap/sram.c
4759@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4760 * Looks like we need to preserve some bootloader code at the
4761 * beginning of SRAM for jumping to flash for reboot to work...
4762 */
4763+ pax_open_kernel();
4764 memset_io(omap_sram_base + omap_sram_skip, 0,
4765 omap_sram_size - omap_sram_skip);
4766+ pax_close_kernel();
4767 }
4768diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4769index 7047051..44e8675 100644
4770--- a/arch/arm64/include/asm/atomic.h
4771+++ b/arch/arm64/include/asm/atomic.h
4772@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4773 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4774 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4775
4776+#define atomic64_read_unchecked(v) atomic64_read(v)
4777+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4778+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4779+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4780+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4781+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4782+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4783+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4784+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4785+
4786 #endif
4787 #endif
4788diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4789index a5abb00..9cbca9a 100644
4790--- a/arch/arm64/include/asm/barrier.h
4791+++ b/arch/arm64/include/asm/barrier.h
4792@@ -44,7 +44,7 @@
4793 do { \
4794 compiletime_assert_atomic_type(*p); \
4795 barrier(); \
4796- ACCESS_ONCE(*p) = (v); \
4797+ ACCESS_ONCE_RW(*p) = (v); \
4798 } while (0)
4799
4800 #define smp_load_acquire(p) \
4801diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4802index 4fde8c1..441f84f 100644
4803--- a/arch/arm64/include/asm/percpu.h
4804+++ b/arch/arm64/include/asm/percpu.h
4805@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4806 {
4807 switch (size) {
4808 case 1:
4809- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4810+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4811 break;
4812 case 2:
4813- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4814+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4815 break;
4816 case 4:
4817- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4818+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4819 break;
4820 case 8:
4821- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4822+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4823 break;
4824 default:
4825 BUILD_BUG();
4826diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4827index e20df38..027ede3 100644
4828--- a/arch/arm64/include/asm/pgalloc.h
4829+++ b/arch/arm64/include/asm/pgalloc.h
4830@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4831 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4832 }
4833
4834+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4835+{
4836+ pud_populate(mm, pud, pmd);
4837+}
4838+
4839 #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
4840
4841 #if CONFIG_ARM64_PGTABLE_LEVELS > 3
4842diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4843index 07e1ba44..ec8cbbb 100644
4844--- a/arch/arm64/include/asm/uaccess.h
4845+++ b/arch/arm64/include/asm/uaccess.h
4846@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4847 flag; \
4848 })
4849
4850+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4851 #define access_ok(type, addr, size) __range_ok(addr, size)
4852 #define user_addr_max get_fs
4853
4854diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4855index b0bd4e5..54e82f6 100644
4856--- a/arch/arm64/mm/dma-mapping.c
4857+++ b/arch/arm64/mm/dma-mapping.c
4858@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4859 phys_to_page(paddr),
4860 size >> PAGE_SHIFT);
4861 if (!freed)
4862- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4863+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4864 }
4865
4866 static void *__dma_alloc(struct device *dev, size_t size,
4867diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4868index c3a58a1..78fbf54 100644
4869--- a/arch/avr32/include/asm/cache.h
4870+++ b/arch/avr32/include/asm/cache.h
4871@@ -1,8 +1,10 @@
4872 #ifndef __ASM_AVR32_CACHE_H
4873 #define __ASM_AVR32_CACHE_H
4874
4875+#include <linux/const.h>
4876+
4877 #define L1_CACHE_SHIFT 5
4878-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4879+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4880
4881 /*
4882 * Memory returned by kmalloc() may be used for DMA, so we must make
4883diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4884index d232888..87c8df1 100644
4885--- a/arch/avr32/include/asm/elf.h
4886+++ b/arch/avr32/include/asm/elf.h
4887@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4888 the loader. We need to make sure that it is out of the way of the program
4889 that it will "exec", and that there is sufficient room for the brk. */
4890
4891-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4892+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4893
4894+#ifdef CONFIG_PAX_ASLR
4895+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4896+
4897+#define PAX_DELTA_MMAP_LEN 15
4898+#define PAX_DELTA_STACK_LEN 15
4899+#endif
4900
4901 /* This yields a mask that user programs can use to figure out what
4902 instruction set this CPU supports. This could be done in user space,
4903diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4904index 479330b..53717a8 100644
4905--- a/arch/avr32/include/asm/kmap_types.h
4906+++ b/arch/avr32/include/asm/kmap_types.h
4907@@ -2,9 +2,9 @@
4908 #define __ASM_AVR32_KMAP_TYPES_H
4909
4910 #ifdef CONFIG_DEBUG_HIGHMEM
4911-# define KM_TYPE_NR 29
4912+# define KM_TYPE_NR 30
4913 #else
4914-# define KM_TYPE_NR 14
4915+# define KM_TYPE_NR 15
4916 #endif
4917
4918 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4919diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4920index d223a8b..69c5210 100644
4921--- a/arch/avr32/mm/fault.c
4922+++ b/arch/avr32/mm/fault.c
4923@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4924
4925 int exception_trace = 1;
4926
4927+#ifdef CONFIG_PAX_PAGEEXEC
4928+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4929+{
4930+ unsigned long i;
4931+
4932+ printk(KERN_ERR "PAX: bytes at PC: ");
4933+ for (i = 0; i < 20; i++) {
4934+ unsigned char c;
4935+ if (get_user(c, (unsigned char *)pc+i))
4936+ printk(KERN_CONT "???????? ");
4937+ else
4938+ printk(KERN_CONT "%02x ", c);
4939+ }
4940+ printk("\n");
4941+}
4942+#endif
4943+
4944 /*
4945 * This routine handles page faults. It determines the address and the
4946 * problem, and then passes it off to one of the appropriate routines.
4947@@ -178,6 +195,16 @@ bad_area:
4948 up_read(&mm->mmap_sem);
4949
4950 if (user_mode(regs)) {
4951+
4952+#ifdef CONFIG_PAX_PAGEEXEC
4953+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4954+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4955+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4956+ do_group_exit(SIGKILL);
4957+ }
4958+ }
4959+#endif
4960+
4961 if (exception_trace && printk_ratelimit())
4962 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4963 "sp %08lx ecr %lu\n",
4964diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4965index 568885a..f8008df 100644
4966--- a/arch/blackfin/include/asm/cache.h
4967+++ b/arch/blackfin/include/asm/cache.h
4968@@ -7,6 +7,7 @@
4969 #ifndef __ARCH_BLACKFIN_CACHE_H
4970 #define __ARCH_BLACKFIN_CACHE_H
4971
4972+#include <linux/const.h>
4973 #include <linux/linkage.h> /* for asmlinkage */
4974
4975 /*
4976@@ -14,7 +15,7 @@
4977 * Blackfin loads 32 bytes for cache
4978 */
4979 #define L1_CACHE_SHIFT 5
4980-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4981+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4982 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4983
4984 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4985diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4986index aea2718..3639a60 100644
4987--- a/arch/cris/include/arch-v10/arch/cache.h
4988+++ b/arch/cris/include/arch-v10/arch/cache.h
4989@@ -1,8 +1,9 @@
4990 #ifndef _ASM_ARCH_CACHE_H
4991 #define _ASM_ARCH_CACHE_H
4992
4993+#include <linux/const.h>
4994 /* Etrax 100LX have 32-byte cache-lines. */
4995-#define L1_CACHE_BYTES 32
4996 #define L1_CACHE_SHIFT 5
4997+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4998
4999 #endif /* _ASM_ARCH_CACHE_H */
5000diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5001index 7caf25d..ee65ac5 100644
5002--- a/arch/cris/include/arch-v32/arch/cache.h
5003+++ b/arch/cris/include/arch-v32/arch/cache.h
5004@@ -1,11 +1,12 @@
5005 #ifndef _ASM_CRIS_ARCH_CACHE_H
5006 #define _ASM_CRIS_ARCH_CACHE_H
5007
5008+#include <linux/const.h>
5009 #include <arch/hwregs/dma.h>
5010
5011 /* A cache-line is 32 bytes. */
5012-#define L1_CACHE_BYTES 32
5013 #define L1_CACHE_SHIFT 5
5014+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5015
5016 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5017
5018diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5019index 102190a..5334cea 100644
5020--- a/arch/frv/include/asm/atomic.h
5021+++ b/arch/frv/include/asm/atomic.h
5022@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5023 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5024 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5025
5026+#define atomic64_read_unchecked(v) atomic64_read(v)
5027+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5028+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5029+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5030+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5031+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5032+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5033+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5034+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5035+
5036 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5037 {
5038 int c, old;
5039diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5040index 2797163..c2a401df9 100644
5041--- a/arch/frv/include/asm/cache.h
5042+++ b/arch/frv/include/asm/cache.h
5043@@ -12,10 +12,11 @@
5044 #ifndef __ASM_CACHE_H
5045 #define __ASM_CACHE_H
5046
5047+#include <linux/const.h>
5048
5049 /* bytes per L1 cache line */
5050 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5051-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5052+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5053
5054 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5055 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5056diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5057index 43901f2..0d8b865 100644
5058--- a/arch/frv/include/asm/kmap_types.h
5059+++ b/arch/frv/include/asm/kmap_types.h
5060@@ -2,6 +2,6 @@
5061 #ifndef _ASM_KMAP_TYPES_H
5062 #define _ASM_KMAP_TYPES_H
5063
5064-#define KM_TYPE_NR 17
5065+#define KM_TYPE_NR 18
5066
5067 #endif
5068diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5069index 836f147..4cf23f5 100644
5070--- a/arch/frv/mm/elf-fdpic.c
5071+++ b/arch/frv/mm/elf-fdpic.c
5072@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5073 {
5074 struct vm_area_struct *vma;
5075 struct vm_unmapped_area_info info;
5076+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5077
5078 if (len > TASK_SIZE)
5079 return -ENOMEM;
5080@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5081 if (addr) {
5082 addr = PAGE_ALIGN(addr);
5083 vma = find_vma(current->mm, addr);
5084- if (TASK_SIZE - len >= addr &&
5085- (!vma || addr + len <= vma->vm_start))
5086+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5087 goto success;
5088 }
5089
5090@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5091 info.high_limit = (current->mm->start_stack - 0x00200000);
5092 info.align_mask = 0;
5093 info.align_offset = 0;
5094+ info.threadstack_offset = offset;
5095 addr = vm_unmapped_area(&info);
5096 if (!(addr & ~PAGE_MASK))
5097 goto success;
5098diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5099index 69952c18..4fa2908 100644
5100--- a/arch/hexagon/include/asm/cache.h
5101+++ b/arch/hexagon/include/asm/cache.h
5102@@ -21,9 +21,11 @@
5103 #ifndef __ASM_CACHE_H
5104 #define __ASM_CACHE_H
5105
5106+#include <linux/const.h>
5107+
5108 /* Bytes per L1 cache line */
5109-#define L1_CACHE_SHIFT (5)
5110-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5111+#define L1_CACHE_SHIFT 5
5112+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5113
5114 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5115
5116diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5117index 074e52b..76afdac 100644
5118--- a/arch/ia64/Kconfig
5119+++ b/arch/ia64/Kconfig
5120@@ -548,6 +548,7 @@ source "drivers/sn/Kconfig"
5121 config KEXEC
5122 bool "kexec system call"
5123 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5124+ depends on !GRKERNSEC_KMEM
5125 help
5126 kexec is a system call that implements the ability to shutdown your
5127 current kernel, and to start another kernel. It is like a reboot
5128diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5129index 970d0bd..e750b9b 100644
5130--- a/arch/ia64/Makefile
5131+++ b/arch/ia64/Makefile
5132@@ -98,5 +98,6 @@ endef
5133 archprepare: make_nr_irqs_h FORCE
5134 PHONY += make_nr_irqs_h FORCE
5135
5136+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5137 make_nr_irqs_h: FORCE
5138 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5139diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5140index 0bf0350..2ad1957 100644
5141--- a/arch/ia64/include/asm/atomic.h
5142+++ b/arch/ia64/include/asm/atomic.h
5143@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5144 #define atomic64_inc(v) atomic64_add(1, (v))
5145 #define atomic64_dec(v) atomic64_sub(1, (v))
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 #endif /* _ASM_IA64_ATOMIC_H */
5158diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5159index f6769eb..1cdb590 100644
5160--- a/arch/ia64/include/asm/barrier.h
5161+++ b/arch/ia64/include/asm/barrier.h
5162@@ -66,7 +66,7 @@
5163 do { \
5164 compiletime_assert_atomic_type(*p); \
5165 barrier(); \
5166- ACCESS_ONCE(*p) = (v); \
5167+ ACCESS_ONCE_RW(*p) = (v); \
5168 } while (0)
5169
5170 #define smp_load_acquire(p) \
5171diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5172index 988254a..e1ee885 100644
5173--- a/arch/ia64/include/asm/cache.h
5174+++ b/arch/ia64/include/asm/cache.h
5175@@ -1,6 +1,7 @@
5176 #ifndef _ASM_IA64_CACHE_H
5177 #define _ASM_IA64_CACHE_H
5178
5179+#include <linux/const.h>
5180
5181 /*
5182 * Copyright (C) 1998-2000 Hewlett-Packard Co
5183@@ -9,7 +10,7 @@
5184
5185 /* Bytes per L1 (data) cache line. */
5186 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5187-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5188+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5189
5190 #ifdef CONFIG_SMP
5191 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5192diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5193index 5a83c5c..4d7f553 100644
5194--- a/arch/ia64/include/asm/elf.h
5195+++ b/arch/ia64/include/asm/elf.h
5196@@ -42,6 +42,13 @@
5197 */
5198 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5199
5200+#ifdef CONFIG_PAX_ASLR
5201+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5202+
5203+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5204+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5205+#endif
5206+
5207 #define PT_IA_64_UNWIND 0x70000001
5208
5209 /* IA-64 relocations: */
5210diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5211index 5767cdf..7462574 100644
5212--- a/arch/ia64/include/asm/pgalloc.h
5213+++ b/arch/ia64/include/asm/pgalloc.h
5214@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5215 pgd_val(*pgd_entry) = __pa(pud);
5216 }
5217
5218+static inline void
5219+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5220+{
5221+ pgd_populate(mm, pgd_entry, pud);
5222+}
5223+
5224 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5225 {
5226 return quicklist_alloc(0, GFP_KERNEL, NULL);
5227@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5228 pud_val(*pud_entry) = __pa(pmd);
5229 }
5230
5231+static inline void
5232+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5233+{
5234+ pud_populate(mm, pud_entry, pmd);
5235+}
5236+
5237 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5238 {
5239 return quicklist_alloc(0, GFP_KERNEL, NULL);
5240diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5241index 7b6f880..ac8e008 100644
5242--- a/arch/ia64/include/asm/pgtable.h
5243+++ b/arch/ia64/include/asm/pgtable.h
5244@@ -12,7 +12,7 @@
5245 * David Mosberger-Tang <davidm@hpl.hp.com>
5246 */
5247
5248-
5249+#include <linux/const.h>
5250 #include <asm/mman.h>
5251 #include <asm/page.h>
5252 #include <asm/processor.h>
5253@@ -139,6 +139,17 @@
5254 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5255 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5256 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5257+
5258+#ifdef CONFIG_PAX_PAGEEXEC
5259+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5260+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5261+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5262+#else
5263+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5264+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5265+# define PAGE_COPY_NOEXEC PAGE_COPY
5266+#endif
5267+
5268 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5269 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5270 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5271diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5272index 45698cd..e8e2dbc 100644
5273--- a/arch/ia64/include/asm/spinlock.h
5274+++ b/arch/ia64/include/asm/spinlock.h
5275@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5276 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5277
5278 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5279- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5280+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5281 }
5282
5283 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5284diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5285index 4f3fb6cc..254055e 100644
5286--- a/arch/ia64/include/asm/uaccess.h
5287+++ b/arch/ia64/include/asm/uaccess.h
5288@@ -70,6 +70,7 @@
5289 && ((segment).seg == KERNEL_DS.seg \
5290 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5291 })
5292+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5293 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5294
5295 /*
5296@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5297 static inline unsigned long
5298 __copy_to_user (void __user *to, const void *from, unsigned long count)
5299 {
5300+ if (count > INT_MAX)
5301+ return count;
5302+
5303+ if (!__builtin_constant_p(count))
5304+ check_object_size(from, count, true);
5305+
5306 return __copy_user(to, (__force void __user *) from, count);
5307 }
5308
5309 static inline unsigned long
5310 __copy_from_user (void *to, const void __user *from, unsigned long count)
5311 {
5312+ if (count > INT_MAX)
5313+ return count;
5314+
5315+ if (!__builtin_constant_p(count))
5316+ check_object_size(to, count, false);
5317+
5318 return __copy_user((__force void __user *) to, from, count);
5319 }
5320
5321@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5322 ({ \
5323 void __user *__cu_to = (to); \
5324 const void *__cu_from = (from); \
5325- long __cu_len = (n); \
5326+ unsigned long __cu_len = (n); \
5327 \
5328- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5329+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5330+ if (!__builtin_constant_p(n)) \
5331+ check_object_size(__cu_from, __cu_len, true); \
5332 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5333+ } \
5334 __cu_len; \
5335 })
5336
5337@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5338 ({ \
5339 void *__cu_to = (to); \
5340 const void __user *__cu_from = (from); \
5341- long __cu_len = (n); \
5342+ unsigned long __cu_len = (n); \
5343 \
5344 __chk_user_ptr(__cu_from); \
5345- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5346+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5347+ if (!__builtin_constant_p(n)) \
5348+ check_object_size(__cu_to, __cu_len, false); \
5349 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5350+ } \
5351 __cu_len; \
5352 })
5353
5354diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5355index 29754aa..06d2838 100644
5356--- a/arch/ia64/kernel/module.c
5357+++ b/arch/ia64/kernel/module.c
5358@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5359 }
5360
5361 static inline int
5362+in_init_rx (const struct module *mod, uint64_t addr)
5363+{
5364+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5365+}
5366+
5367+static inline int
5368+in_init_rw (const struct module *mod, uint64_t addr)
5369+{
5370+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5371+}
5372+
5373+static inline int
5374 in_init (const struct module *mod, uint64_t addr)
5375 {
5376- return addr - (uint64_t) mod->module_init < mod->init_size;
5377+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5378+}
5379+
5380+static inline int
5381+in_core_rx (const struct module *mod, uint64_t addr)
5382+{
5383+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5384+}
5385+
5386+static inline int
5387+in_core_rw (const struct module *mod, uint64_t addr)
5388+{
5389+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5390 }
5391
5392 static inline int
5393 in_core (const struct module *mod, uint64_t addr)
5394 {
5395- return addr - (uint64_t) mod->module_core < mod->core_size;
5396+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5397 }
5398
5399 static inline int
5400@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5401 break;
5402
5403 case RV_BDREL:
5404- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5405+ if (in_init_rx(mod, val))
5406+ val -= (uint64_t) mod->module_init_rx;
5407+ else if (in_init_rw(mod, val))
5408+ val -= (uint64_t) mod->module_init_rw;
5409+ else if (in_core_rx(mod, val))
5410+ val -= (uint64_t) mod->module_core_rx;
5411+ else if (in_core_rw(mod, val))
5412+ val -= (uint64_t) mod->module_core_rw;
5413 break;
5414
5415 case RV_LTV:
5416@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5417 * addresses have been selected...
5418 */
5419 uint64_t gp;
5420- if (mod->core_size > MAX_LTOFF)
5421+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5422 /*
5423 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5424 * at the end of the module.
5425 */
5426- gp = mod->core_size - MAX_LTOFF / 2;
5427+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5428 else
5429- gp = mod->core_size / 2;
5430- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5431+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5432+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5433 mod->arch.gp = gp;
5434 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5435 }
5436diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5437index c39c3cd..3c77738 100644
5438--- a/arch/ia64/kernel/palinfo.c
5439+++ b/arch/ia64/kernel/palinfo.c
5440@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5441 return NOTIFY_OK;
5442 }
5443
5444-static struct notifier_block __refdata palinfo_cpu_notifier =
5445+static struct notifier_block palinfo_cpu_notifier =
5446 {
5447 .notifier_call = palinfo_cpu_callback,
5448 .priority = 0,
5449diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5450index 41e33f8..65180b2a 100644
5451--- a/arch/ia64/kernel/sys_ia64.c
5452+++ b/arch/ia64/kernel/sys_ia64.c
5453@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5454 unsigned long align_mask = 0;
5455 struct mm_struct *mm = current->mm;
5456 struct vm_unmapped_area_info info;
5457+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5458
5459 if (len > RGN_MAP_LIMIT)
5460 return -ENOMEM;
5461@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5462 if (REGION_NUMBER(addr) == RGN_HPAGE)
5463 addr = 0;
5464 #endif
5465+
5466+#ifdef CONFIG_PAX_RANDMMAP
5467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5468+ addr = mm->free_area_cache;
5469+ else
5470+#endif
5471+
5472 if (!addr)
5473 addr = TASK_UNMAPPED_BASE;
5474
5475@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5476 info.high_limit = TASK_SIZE;
5477 info.align_mask = align_mask;
5478 info.align_offset = 0;
5479+ info.threadstack_offset = offset;
5480 return vm_unmapped_area(&info);
5481 }
5482
5483diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5484index 84f8a52..7c76178 100644
5485--- a/arch/ia64/kernel/vmlinux.lds.S
5486+++ b/arch/ia64/kernel/vmlinux.lds.S
5487@@ -192,7 +192,7 @@ SECTIONS {
5488 /* Per-cpu data: */
5489 . = ALIGN(PERCPU_PAGE_SIZE);
5490 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5491- __phys_per_cpu_start = __per_cpu_load;
5492+ __phys_per_cpu_start = per_cpu_load;
5493 /*
5494 * ensure percpu data fits
5495 * into percpu page size
5496diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5497index ba5ba7a..36e9d3a 100644
5498--- a/arch/ia64/mm/fault.c
5499+++ b/arch/ia64/mm/fault.c
5500@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5501 return pte_present(pte);
5502 }
5503
5504+#ifdef CONFIG_PAX_PAGEEXEC
5505+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5506+{
5507+ unsigned long i;
5508+
5509+ printk(KERN_ERR "PAX: bytes at PC: ");
5510+ for (i = 0; i < 8; i++) {
5511+ unsigned int c;
5512+ if (get_user(c, (unsigned int *)pc+i))
5513+ printk(KERN_CONT "???????? ");
5514+ else
5515+ printk(KERN_CONT "%08x ", c);
5516+ }
5517+ printk("\n");
5518+}
5519+#endif
5520+
5521 # define VM_READ_BIT 0
5522 # define VM_WRITE_BIT 1
5523 # define VM_EXEC_BIT 2
5524@@ -151,8 +168,21 @@ retry:
5525 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5526 goto bad_area;
5527
5528- if ((vma->vm_flags & mask) != mask)
5529+ if ((vma->vm_flags & mask) != mask) {
5530+
5531+#ifdef CONFIG_PAX_PAGEEXEC
5532+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5533+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5534+ goto bad_area;
5535+
5536+ up_read(&mm->mmap_sem);
5537+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5538+ do_group_exit(SIGKILL);
5539+ }
5540+#endif
5541+
5542 goto bad_area;
5543+ }
5544
5545 /*
5546 * If for any reason at all we couldn't handle the fault, make
5547diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5548index 52b7604b..455cb85 100644
5549--- a/arch/ia64/mm/hugetlbpage.c
5550+++ b/arch/ia64/mm/hugetlbpage.c
5551@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5552 unsigned long pgoff, unsigned long flags)
5553 {
5554 struct vm_unmapped_area_info info;
5555+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5556
5557 if (len > RGN_MAP_LIMIT)
5558 return -ENOMEM;
5559@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5560 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5561 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5562 info.align_offset = 0;
5563+ info.threadstack_offset = offset;
5564 return vm_unmapped_area(&info);
5565 }
5566
5567diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5568index 6b33457..88b5124 100644
5569--- a/arch/ia64/mm/init.c
5570+++ b/arch/ia64/mm/init.c
5571@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5572 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5573 vma->vm_end = vma->vm_start + PAGE_SIZE;
5574 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5575+
5576+#ifdef CONFIG_PAX_PAGEEXEC
5577+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5578+ vma->vm_flags &= ~VM_EXEC;
5579+
5580+#ifdef CONFIG_PAX_MPROTECT
5581+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5582+ vma->vm_flags &= ~VM_MAYEXEC;
5583+#endif
5584+
5585+ }
5586+#endif
5587+
5588 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5589 down_write(&current->mm->mmap_sem);
5590 if (insert_vm_struct(current->mm, vma)) {
5591@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5592 gate_vma.vm_start = FIXADDR_USER_START;
5593 gate_vma.vm_end = FIXADDR_USER_END;
5594 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5595- gate_vma.vm_page_prot = __P101;
5596+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5597
5598 return 0;
5599 }
5600diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5601index 40b3ee98..8c2c112 100644
5602--- a/arch/m32r/include/asm/cache.h
5603+++ b/arch/m32r/include/asm/cache.h
5604@@ -1,8 +1,10 @@
5605 #ifndef _ASM_M32R_CACHE_H
5606 #define _ASM_M32R_CACHE_H
5607
5608+#include <linux/const.h>
5609+
5610 /* L1 cache line size */
5611 #define L1_CACHE_SHIFT 4
5612-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5613+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5614
5615 #endif /* _ASM_M32R_CACHE_H */
5616diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5617index 82abd15..d95ae5d 100644
5618--- a/arch/m32r/lib/usercopy.c
5619+++ b/arch/m32r/lib/usercopy.c
5620@@ -14,6 +14,9 @@
5621 unsigned long
5622 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5623 {
5624+ if ((long)n < 0)
5625+ return n;
5626+
5627 prefetch(from);
5628 if (access_ok(VERIFY_WRITE, to, n))
5629 __copy_user(to,from,n);
5630@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5631 unsigned long
5632 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5633 {
5634+ if ((long)n < 0)
5635+ return n;
5636+
5637 prefetchw(to);
5638 if (access_ok(VERIFY_READ, from, n))
5639 __copy_user_zeroing(to,from,n);
5640diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5641index 0395c51..5f26031 100644
5642--- a/arch/m68k/include/asm/cache.h
5643+++ b/arch/m68k/include/asm/cache.h
5644@@ -4,9 +4,11 @@
5645 #ifndef __ARCH_M68K_CACHE_H
5646 #define __ARCH_M68K_CACHE_H
5647
5648+#include <linux/const.h>
5649+
5650 /* bytes per L1 cache line */
5651 #define L1_CACHE_SHIFT 4
5652-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5653+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5654
5655 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5656
5657diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5658index d703d8e..a8e2d70 100644
5659--- a/arch/metag/include/asm/barrier.h
5660+++ b/arch/metag/include/asm/barrier.h
5661@@ -90,7 +90,7 @@ static inline void fence(void)
5662 do { \
5663 compiletime_assert_atomic_type(*p); \
5664 smp_mb(); \
5665- ACCESS_ONCE(*p) = (v); \
5666+ ACCESS_ONCE_RW(*p) = (v); \
5667 } while (0)
5668
5669 #define smp_load_acquire(p) \
5670diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5671index 7ca80ac..794ba72 100644
5672--- a/arch/metag/mm/hugetlbpage.c
5673+++ b/arch/metag/mm/hugetlbpage.c
5674@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5675 info.high_limit = TASK_SIZE;
5676 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5677 info.align_offset = 0;
5678+ info.threadstack_offset = 0;
5679 return vm_unmapped_area(&info);
5680 }
5681
5682diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5683index 4efe96a..60e8699 100644
5684--- a/arch/microblaze/include/asm/cache.h
5685+++ b/arch/microblaze/include/asm/cache.h
5686@@ -13,11 +13,12 @@
5687 #ifndef _ASM_MICROBLAZE_CACHE_H
5688 #define _ASM_MICROBLAZE_CACHE_H
5689
5690+#include <linux/const.h>
5691 #include <asm/registers.h>
5692
5693 #define L1_CACHE_SHIFT 5
5694 /* word-granular cache in microblaze */
5695-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5696+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5697
5698 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5699
5700diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5701index 1a313c4..f27b613 100644
5702--- a/arch/mips/Kconfig
5703+++ b/arch/mips/Kconfig
5704@@ -2504,6 +2504,7 @@ source "kernel/Kconfig.preempt"
5705
5706 config KEXEC
5707 bool "Kexec system call"
5708+ depends on !GRKERNSEC_KMEM
5709 help
5710 kexec is a system call that implements the ability to shutdown your
5711 current kernel, and to start another kernel. It is like a reboot
5712diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5713index d8960d4..77dbd31 100644
5714--- a/arch/mips/cavium-octeon/dma-octeon.c
5715+++ b/arch/mips/cavium-octeon/dma-octeon.c
5716@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5717 if (dma_release_from_coherent(dev, order, vaddr))
5718 return;
5719
5720- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5721+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5722 }
5723
5724 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5725diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5726index 26d4363..3c9a82e 100644
5727--- a/arch/mips/include/asm/atomic.h
5728+++ b/arch/mips/include/asm/atomic.h
5729@@ -22,15 +22,39 @@
5730 #include <asm/cmpxchg.h>
5731 #include <asm/war.h>
5732
5733+#ifdef CONFIG_GENERIC_ATOMIC64
5734+#include <asm-generic/atomic64.h>
5735+#endif
5736+
5737 #define ATOMIC_INIT(i) { (i) }
5738
5739+#ifdef CONFIG_64BIT
5740+#define _ASM_EXTABLE(from, to) \
5741+" .section __ex_table,\"a\"\n" \
5742+" .dword " #from ", " #to"\n" \
5743+" .previous\n"
5744+#else
5745+#define _ASM_EXTABLE(from, to) \
5746+" .section __ex_table,\"a\"\n" \
5747+" .word " #from ", " #to"\n" \
5748+" .previous\n"
5749+#endif
5750+
5751 /*
5752 * atomic_read - read atomic variable
5753 * @v: pointer of type atomic_t
5754 *
5755 * Atomically reads the value of @v.
5756 */
5757-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5758+static inline int atomic_read(const atomic_t *v)
5759+{
5760+ return ACCESS_ONCE(v->counter);
5761+}
5762+
5763+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5764+{
5765+ return ACCESS_ONCE(v->counter);
5766+}
5767
5768 /*
5769 * atomic_set - set atomic variable
5770@@ -39,47 +63,77 @@
5771 *
5772 * Atomically sets the value of @v to @i.
5773 */
5774-#define atomic_set(v, i) ((v)->counter = (i))
5775+static inline void atomic_set(atomic_t *v, int i)
5776+{
5777+ v->counter = i;
5778+}
5779
5780-#define ATOMIC_OP(op, c_op, asm_op) \
5781-static __inline__ void atomic_##op(int i, atomic_t * v) \
5782+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5783+{
5784+ v->counter = i;
5785+}
5786+
5787+#ifdef CONFIG_PAX_REFCOUNT
5788+#define __OVERFLOW_POST \
5789+ " b 4f \n" \
5790+ " .set noreorder \n" \
5791+ "3: b 5f \n" \
5792+ " move %0, %1 \n" \
5793+ " .set reorder \n"
5794+#define __OVERFLOW_EXTABLE \
5795+ "3:\n" \
5796+ _ASM_EXTABLE(2b, 3b)
5797+#else
5798+#define __OVERFLOW_POST
5799+#define __OVERFLOW_EXTABLE
5800+#endif
5801+
5802+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5803+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5804 { \
5805 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5806 int temp; \
5807 \
5808 __asm__ __volatile__( \
5809- " .set arch=r4000 \n" \
5810- "1: ll %0, %1 # atomic_" #op " \n" \
5811- " " #asm_op " %0, %2 \n" \
5812+ " .set mips3 \n" \
5813+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5814+ "2: " #asm_op " %0, %2 \n" \
5815 " sc %0, %1 \n" \
5816 " beqzl %0, 1b \n" \
5817+ extable \
5818 " .set mips0 \n" \
5819 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5820 : "Ir" (i)); \
5821 } else if (kernel_uses_llsc) { \
5822 int temp; \
5823 \
5824- do { \
5825- __asm__ __volatile__( \
5826- " .set "MIPS_ISA_LEVEL" \n" \
5827- " ll %0, %1 # atomic_" #op "\n" \
5828- " " #asm_op " %0, %2 \n" \
5829- " sc %0, %1 \n" \
5830- " .set mips0 \n" \
5831- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5832- : "Ir" (i)); \
5833- } while (unlikely(!temp)); \
5834+ __asm__ __volatile__( \
5835+ " .set "MIPS_ISA_LEVEL" \n" \
5836+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5837+ "2: " #asm_op " %0, %2 \n" \
5838+ " sc %0, %1 \n" \
5839+ " beqz %0, 1b \n" \
5840+ extable \
5841+ " .set mips0 \n" \
5842+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5843+ : "Ir" (i)); \
5844 } else { \
5845 unsigned long flags; \
5846 \
5847 raw_local_irq_save(flags); \
5848- v->counter c_op i; \
5849+ __asm__ __volatile__( \
5850+ "2: " #asm_op " %0, %1 \n" \
5851+ extable \
5852+ : "+r" (v->counter) : "Ir" (i)); \
5853 raw_local_irq_restore(flags); \
5854 } \
5855 }
5856
5857-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5858-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5859+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5860+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5861+
5862+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5863+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5864 { \
5865 int result; \
5866 \
5867@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5868 int temp; \
5869 \
5870 __asm__ __volatile__( \
5871- " .set arch=r4000 \n" \
5872- "1: ll %1, %2 # atomic_" #op "_return \n" \
5873- " " #asm_op " %0, %1, %3 \n" \
5874+ " .set mips3 \n" \
5875+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5876+ "2: " #asm_op " %0, %1, %3 \n" \
5877 " sc %0, %2 \n" \
5878 " beqzl %0, 1b \n" \
5879- " " #asm_op " %0, %1, %3 \n" \
5880+ post_op \
5881+ extable \
5882+ "4: " #asm_op " %0, %1, %3 \n" \
5883+ "5: \n" \
5884 " .set mips0 \n" \
5885 : "=&r" (result), "=&r" (temp), \
5886 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5887@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5888 } else if (kernel_uses_llsc) { \
5889 int temp; \
5890 \
5891- do { \
5892- __asm__ __volatile__( \
5893- " .set "MIPS_ISA_LEVEL" \n" \
5894- " ll %1, %2 # atomic_" #op "_return \n" \
5895- " " #asm_op " %0, %1, %3 \n" \
5896- " sc %0, %2 \n" \
5897- " .set mips0 \n" \
5898- : "=&r" (result), "=&r" (temp), \
5899- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5900- : "Ir" (i)); \
5901- } while (unlikely(!result)); \
5902+ __asm__ __volatile__( \
5903+ " .set "MIPS_ISA_LEVEL" \n" \
5904+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5905+ "2: " #asm_op " %0, %1, %3 \n" \
5906+ " sc %0, %2 \n" \
5907+ post_op \
5908+ extable \
5909+ "4: " #asm_op " %0, %1, %3 \n" \
5910+ "5: \n" \
5911+ " .set mips0 \n" \
5912+ : "=&r" (result), "=&r" (temp), \
5913+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5914+ : "Ir" (i)); \
5915 \
5916 result = temp; result c_op i; \
5917 } else { \
5918 unsigned long flags; \
5919 \
5920 raw_local_irq_save(flags); \
5921- result = v->counter; \
5922- result c_op i; \
5923- v->counter = result; \
5924+ __asm__ __volatile__( \
5925+ " lw %0, %1 \n" \
5926+ "2: " #asm_op " %0, %1, %2 \n" \
5927+ " sw %0, %1 \n" \
5928+ "3: \n" \
5929+ extable \
5930+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5931+ : "Ir" (i)); \
5932 raw_local_irq_restore(flags); \
5933 } \
5934 \
5935@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5936 return result; \
5937 }
5938
5939-#define ATOMIC_OPS(op, c_op, asm_op) \
5940- ATOMIC_OP(op, c_op, asm_op) \
5941- ATOMIC_OP_RETURN(op, c_op, asm_op)
5942+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
5943+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5944
5945-ATOMIC_OPS(add, +=, addu)
5946-ATOMIC_OPS(sub, -=, subu)
5947+#define ATOMIC_OPS(op, asm_op) \
5948+ ATOMIC_OP(op, asm_op) \
5949+ ATOMIC_OP_RETURN(op, asm_op)
5950+
5951+ATOMIC_OPS(add, add)
5952+ATOMIC_OPS(sub, sub)
5953
5954 #undef ATOMIC_OPS
5955 #undef ATOMIC_OP_RETURN
5956+#undef __ATOMIC_OP_RETURN
5957 #undef ATOMIC_OP
5958+#undef __ATOMIC_OP
5959
5960 /*
5961 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5962@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
5963 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5964 * The function returns the old value of @v minus @i.
5965 */
5966-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5967+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5968 {
5969 int result;
5970
5971@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5972 int temp;
5973
5974 __asm__ __volatile__(
5975- " .set arch=r4000 \n"
5976+ " .set "MIPS_ISA_LEVEL" \n"
5977 "1: ll %1, %2 # atomic_sub_if_positive\n"
5978 " subu %0, %1, %3 \n"
5979 " bltz %0, 1f \n"
5980@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5981 return result;
5982 }
5983
5984-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5985-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5986+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5987+{
5988+ return cmpxchg(&v->counter, old, new);
5989+}
5990+
5991+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5992+ int new)
5993+{
5994+ return cmpxchg(&(v->counter), old, new);
5995+}
5996+
5997+static inline int atomic_xchg(atomic_t *v, int new)
5998+{
5999+ return xchg(&v->counter, new);
6000+}
6001+
6002+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6003+{
6004+ return xchg(&(v->counter), new);
6005+}
6006
6007 /**
6008 * __atomic_add_unless - add unless the number is a given value
6009@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6010
6011 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6012 #define atomic_inc_return(v) atomic_add_return(1, (v))
6013+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6014+{
6015+ return atomic_add_return_unchecked(1, v);
6016+}
6017
6018 /*
6019 * atomic_sub_and_test - subtract value from variable and test result
6020@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6021 * other cases.
6022 */
6023 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6024+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6025+{
6026+ return atomic_add_return_unchecked(1, v) == 0;
6027+}
6028
6029 /*
6030 * atomic_dec_and_test - decrement by 1 and test
6031@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6032 * Atomically increments @v by 1.
6033 */
6034 #define atomic_inc(v) atomic_add(1, (v))
6035+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6036+{
6037+ atomic_add_unchecked(1, v);
6038+}
6039
6040 /*
6041 * atomic_dec - decrement and test
6042@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6043 * Atomically decrements @v by 1.
6044 */
6045 #define atomic_dec(v) atomic_sub(1, (v))
6046+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6047+{
6048+ atomic_sub_unchecked(1, v);
6049+}
6050
6051 /*
6052 * atomic_add_negative - add and test if negative
6053@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6054 * @v: pointer of type atomic64_t
6055 *
6056 */
6057-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6058+static inline long atomic64_read(const atomic64_t *v)
6059+{
6060+ return ACCESS_ONCE(v->counter);
6061+}
6062+
6063+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6064+{
6065+ return ACCESS_ONCE(v->counter);
6066+}
6067
6068 /*
6069 * atomic64_set - set atomic variable
6070 * @v: pointer of type atomic64_t
6071 * @i: required value
6072 */
6073-#define atomic64_set(v, i) ((v)->counter = (i))
6074+static inline void atomic64_set(atomic64_t *v, long i)
6075+{
6076+ v->counter = i;
6077+}
6078
6079-#define ATOMIC64_OP(op, c_op, asm_op) \
6080-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6081+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6082+{
6083+ v->counter = i;
6084+}
6085+
6086+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6087+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6088 { \
6089 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6090 long temp; \
6091 \
6092 __asm__ __volatile__( \
6093- " .set arch=r4000 \n" \
6094- "1: lld %0, %1 # atomic64_" #op " \n" \
6095- " " #asm_op " %0, %2 \n" \
6096+ " .set "MIPS_ISA_LEVEL" \n" \
6097+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6098+ "2: " #asm_op " %0, %2 \n" \
6099 " scd %0, %1 \n" \
6100 " beqzl %0, 1b \n" \
6101+ extable \
6102 " .set mips0 \n" \
6103 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6104 : "Ir" (i)); \
6105 } else if (kernel_uses_llsc) { \
6106 long temp; \
6107 \
6108- do { \
6109- __asm__ __volatile__( \
6110- " .set "MIPS_ISA_LEVEL" \n" \
6111- " lld %0, %1 # atomic64_" #op "\n" \
6112- " " #asm_op " %0, %2 \n" \
6113- " scd %0, %1 \n" \
6114- " .set mips0 \n" \
6115- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6116- : "Ir" (i)); \
6117- } while (unlikely(!temp)); \
6118+ __asm__ __volatile__( \
6119+ " .set "MIPS_ISA_LEVEL" \n" \
6120+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6121+ "2: " #asm_op " %0, %2 \n" \
6122+ " scd %0, %1 \n" \
6123+ " beqz %0, 1b \n" \
6124+ extable \
6125+ " .set mips0 \n" \
6126+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6127+ : "Ir" (i)); \
6128 } else { \
6129 unsigned long flags; \
6130 \
6131 raw_local_irq_save(flags); \
6132- v->counter c_op i; \
6133+ __asm__ __volatile__( \
6134+ "2: " #asm_op " %0, %1 \n" \
6135+ extable \
6136+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6137 raw_local_irq_restore(flags); \
6138 } \
6139 }
6140
6141-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6142-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6143+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6144+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6145+
6146+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6147+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6148 { \
6149 long result; \
6150 \
6151@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6152 long temp; \
6153 \
6154 __asm__ __volatile__( \
6155- " .set arch=r4000 \n" \
6156+ " .set mips3 \n" \
6157 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6158- " " #asm_op " %0, %1, %3 \n" \
6159+ "2: " #asm_op " %0, %1, %3 \n" \
6160 " scd %0, %2 \n" \
6161 " beqzl %0, 1b \n" \
6162- " " #asm_op " %0, %1, %3 \n" \
6163+ post_op \
6164+ extable \
6165+ "4: " #asm_op " %0, %1, %3 \n" \
6166+ "5: \n" \
6167 " .set mips0 \n" \
6168 : "=&r" (result), "=&r" (temp), \
6169 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6170@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6171 } else if (kernel_uses_llsc) { \
6172 long temp; \
6173 \
6174- do { \
6175- __asm__ __volatile__( \
6176- " .set "MIPS_ISA_LEVEL" \n" \
6177- " lld %1, %2 # atomic64_" #op "_return\n" \
6178- " " #asm_op " %0, %1, %3 \n" \
6179- " scd %0, %2 \n" \
6180- " .set mips0 \n" \
6181- : "=&r" (result), "=&r" (temp), \
6182- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6183- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6184- : "memory"); \
6185- } while (unlikely(!result)); \
6186+ __asm__ __volatile__( \
6187+ " .set "MIPS_ISA_LEVEL" \n" \
6188+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6189+ "2: " #asm_op " %0, %1, %3 \n" \
6190+ " scd %0, %2 \n" \
6191+ " beqz %0, 1b \n" \
6192+ post_op \
6193+ extable \
6194+ "4: " #asm_op " %0, %1, %3 \n" \
6195+ "5: \n" \
6196+ " .set mips0 \n" \
6197+ : "=&r" (result), "=&r" (temp), \
6198+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6199+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6200+ : "memory"); \
6201 \
6202 result = temp; result c_op i; \
6203 } else { \
6204 unsigned long flags; \
6205 \
6206 raw_local_irq_save(flags); \
6207- result = v->counter; \
6208- result c_op i; \
6209- v->counter = result; \
6210+ __asm__ __volatile__( \
6211+ " ld %0, %1 \n" \
6212+ "2: " #asm_op " %0, %1, %2 \n" \
6213+ " sd %0, %1 \n" \
6214+ "3: \n" \
6215+ extable \
6216+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6217+ : "Ir" (i)); \
6218 raw_local_irq_restore(flags); \
6219 } \
6220 \
6221@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6222 return result; \
6223 }
6224
6225-#define ATOMIC64_OPS(op, c_op, asm_op) \
6226- ATOMIC64_OP(op, c_op, asm_op) \
6227- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6228+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6229+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6230
6231-ATOMIC64_OPS(add, +=, daddu)
6232-ATOMIC64_OPS(sub, -=, dsubu)
6233+#define ATOMIC64_OPS(op, asm_op) \
6234+ ATOMIC64_OP(op, asm_op) \
6235+ ATOMIC64_OP_RETURN(op, asm_op)
6236+
6237+ATOMIC64_OPS(add, dadd)
6238+ATOMIC64_OPS(sub, dsub)
6239
6240 #undef ATOMIC64_OPS
6241 #undef ATOMIC64_OP_RETURN
6242+#undef __ATOMIC64_OP_RETURN
6243 #undef ATOMIC64_OP
6244+#undef __ATOMIC64_OP
6245+#undef __OVERFLOW_EXTABLE
6246+#undef __OVERFLOW_POST
6247
6248 /*
6249 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6250@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6251 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6252 * The function returns the old value of @v minus @i.
6253 */
6254-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6255+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6256 {
6257 long result;
6258
6259@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6260 long temp;
6261
6262 __asm__ __volatile__(
6263- " .set arch=r4000 \n"
6264+ " .set "MIPS_ISA_LEVEL" \n"
6265 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6266 " dsubu %0, %1, %3 \n"
6267 " bltz %0, 1f \n"
6268@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6269 return result;
6270 }
6271
6272-#define atomic64_cmpxchg(v, o, n) \
6273- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6274-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6275+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6276+{
6277+ return cmpxchg(&v->counter, old, new);
6278+}
6279+
6280+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6281+ long new)
6282+{
6283+ return cmpxchg(&(v->counter), old, new);
6284+}
6285+
6286+static inline long atomic64_xchg(atomic64_t *v, long new)
6287+{
6288+ return xchg(&v->counter, new);
6289+}
6290+
6291+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6292+{
6293+ return xchg(&(v->counter), new);
6294+}
6295
6296 /**
6297 * atomic64_add_unless - add unless the number is a given value
6298@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6299
6300 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6301 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6302+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6303
6304 /*
6305 * atomic64_sub_and_test - subtract value from variable and test result
6306@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6307 * other cases.
6308 */
6309 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6310+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6311
6312 /*
6313 * atomic64_dec_and_test - decrement by 1 and test
6314@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6315 * Atomically increments @v by 1.
6316 */
6317 #define atomic64_inc(v) atomic64_add(1, (v))
6318+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6319
6320 /*
6321 * atomic64_dec - decrement and test
6322@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6323 * Atomically decrements @v by 1.
6324 */
6325 #define atomic64_dec(v) atomic64_sub(1, (v))
6326+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6327
6328 /*
6329 * atomic64_add_negative - add and test if negative
6330diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6331index 2b8bbbc..4556df6 100644
6332--- a/arch/mips/include/asm/barrier.h
6333+++ b/arch/mips/include/asm/barrier.h
6334@@ -133,7 +133,7 @@
6335 do { \
6336 compiletime_assert_atomic_type(*p); \
6337 smp_mb(); \
6338- ACCESS_ONCE(*p) = (v); \
6339+ ACCESS_ONCE_RW(*p) = (v); \
6340 } while (0)
6341
6342 #define smp_load_acquire(p) \
6343diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6344index b4db69f..8f3b093 100644
6345--- a/arch/mips/include/asm/cache.h
6346+++ b/arch/mips/include/asm/cache.h
6347@@ -9,10 +9,11 @@
6348 #ifndef _ASM_CACHE_H
6349 #define _ASM_CACHE_H
6350
6351+#include <linux/const.h>
6352 #include <kmalloc.h>
6353
6354 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6355-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6356+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6357
6358 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6359 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6360diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6361index 694925a..990fa62 100644
6362--- a/arch/mips/include/asm/elf.h
6363+++ b/arch/mips/include/asm/elf.h
6364@@ -410,15 +410,18 @@ extern const char *__elf_platform;
6365 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6366 #endif
6367
6368+#ifdef CONFIG_PAX_ASLR
6369+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6370+
6371+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6372+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6373+#endif
6374+
6375 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6376 struct linux_binprm;
6377 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6378 int uses_interp);
6379
6380-struct mm_struct;
6381-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6382-#define arch_randomize_brk arch_randomize_brk
6383-
6384 struct arch_elf_state {
6385 int fp_abi;
6386 int interp_fp_abi;
6387diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6388index c1f6afa..38cc6e9 100644
6389--- a/arch/mips/include/asm/exec.h
6390+++ b/arch/mips/include/asm/exec.h
6391@@ -12,6 +12,6 @@
6392 #ifndef _ASM_EXEC_H
6393 #define _ASM_EXEC_H
6394
6395-extern unsigned long arch_align_stack(unsigned long sp);
6396+#define arch_align_stack(x) ((x) & ~0xfUL)
6397
6398 #endif /* _ASM_EXEC_H */
6399diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6400index 9e8ef59..1139d6b 100644
6401--- a/arch/mips/include/asm/hw_irq.h
6402+++ b/arch/mips/include/asm/hw_irq.h
6403@@ -10,7 +10,7 @@
6404
6405 #include <linux/atomic.h>
6406
6407-extern atomic_t irq_err_count;
6408+extern atomic_unchecked_t irq_err_count;
6409
6410 /*
6411 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6412diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6413index 8feaed6..1bd8a64 100644
6414--- a/arch/mips/include/asm/local.h
6415+++ b/arch/mips/include/asm/local.h
6416@@ -13,15 +13,25 @@ typedef struct
6417 atomic_long_t a;
6418 } local_t;
6419
6420+typedef struct {
6421+ atomic_long_unchecked_t a;
6422+} local_unchecked_t;
6423+
6424 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6425
6426 #define local_read(l) atomic_long_read(&(l)->a)
6427+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6428 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6429+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6430
6431 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6432+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6433 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6434+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6435 #define local_inc(l) atomic_long_inc(&(l)->a)
6436+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6437 #define local_dec(l) atomic_long_dec(&(l)->a)
6438+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6439
6440 /*
6441 * Same as above, but return the result value
6442@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6443 return result;
6444 }
6445
6446+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6447+{
6448+ unsigned long result;
6449+
6450+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6451+ unsigned long temp;
6452+
6453+ __asm__ __volatile__(
6454+ " .set mips3 \n"
6455+ "1:" __LL "%1, %2 # local_add_return \n"
6456+ " addu %0, %1, %3 \n"
6457+ __SC "%0, %2 \n"
6458+ " beqzl %0, 1b \n"
6459+ " addu %0, %1, %3 \n"
6460+ " .set mips0 \n"
6461+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6462+ : "Ir" (i), "m" (l->a.counter)
6463+ : "memory");
6464+ } else if (kernel_uses_llsc) {
6465+ unsigned long temp;
6466+
6467+ __asm__ __volatile__(
6468+ " .set mips3 \n"
6469+ "1:" __LL "%1, %2 # local_add_return \n"
6470+ " addu %0, %1, %3 \n"
6471+ __SC "%0, %2 \n"
6472+ " beqz %0, 1b \n"
6473+ " addu %0, %1, %3 \n"
6474+ " .set mips0 \n"
6475+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6476+ : "Ir" (i), "m" (l->a.counter)
6477+ : "memory");
6478+ } else {
6479+ unsigned long flags;
6480+
6481+ local_irq_save(flags);
6482+ result = l->a.counter;
6483+ result += i;
6484+ l->a.counter = result;
6485+ local_irq_restore(flags);
6486+ }
6487+
6488+ return result;
6489+}
6490+
6491 static __inline__ long local_sub_return(long i, local_t * l)
6492 {
6493 unsigned long result;
6494@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6495
6496 #define local_cmpxchg(l, o, n) \
6497 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6498+#define local_cmpxchg_unchecked(l, o, n) \
6499+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6500 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6501
6502 /**
6503diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6504index 154b70a..426ae3d 100644
6505--- a/arch/mips/include/asm/page.h
6506+++ b/arch/mips/include/asm/page.h
6507@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6508 #ifdef CONFIG_CPU_MIPS32
6509 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6510 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6511- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6512+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6513 #else
6514 typedef struct { unsigned long long pte; } pte_t;
6515 #define pte_val(x) ((x).pte)
6516diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6517index b336037..5b874cc 100644
6518--- a/arch/mips/include/asm/pgalloc.h
6519+++ b/arch/mips/include/asm/pgalloc.h
6520@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6521 {
6522 set_pud(pud, __pud((unsigned long)pmd));
6523 }
6524+
6525+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6526+{
6527+ pud_populate(mm, pud, pmd);
6528+}
6529 #endif
6530
6531 /*
6532diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6533index f8f809f..b5f3fa4 100644
6534--- a/arch/mips/include/asm/pgtable.h
6535+++ b/arch/mips/include/asm/pgtable.h
6536@@ -20,6 +20,9 @@
6537 #include <asm/io.h>
6538 #include <asm/pgtable-bits.h>
6539
6540+#define ktla_ktva(addr) (addr)
6541+#define ktva_ktla(addr) (addr)
6542+
6543 struct mm_struct;
6544 struct vm_area_struct;
6545
6546diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6547index 55ed660..3dc9422 100644
6548--- a/arch/mips/include/asm/thread_info.h
6549+++ b/arch/mips/include/asm/thread_info.h
6550@@ -102,6 +102,9 @@ static inline struct thread_info *current_thread_info(void)
6551 #define TIF_SECCOMP 4 /* secure computing */
6552 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6553 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6554+/* li takes a 32bit immediate */
6555+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6556+
6557 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6558 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6559 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6560@@ -137,14 +140,16 @@ static inline struct thread_info *current_thread_info(void)
6561 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6562 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6563 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6564+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6565
6566 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6567 _TIF_SYSCALL_AUDIT | \
6568- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6569+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6570+ _TIF_GRSEC_SETXID)
6571
6572 /* work to do in syscall_trace_leave() */
6573 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6574- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6575+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6576
6577 /* work to do on interrupt/exception return */
6578 #define _TIF_WORK_MASK \
6579@@ -152,7 +157,7 @@ static inline struct thread_info *current_thread_info(void)
6580 /* work to do on any return to u-space */
6581 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6582 _TIF_WORK_SYSCALL_EXIT | \
6583- _TIF_SYSCALL_TRACEPOINT)
6584+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6585
6586 /*
6587 * We stash processor id into a COP0 register to retrieve it fast
6588diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6589index bf8b324..cec5705 100644
6590--- a/arch/mips/include/asm/uaccess.h
6591+++ b/arch/mips/include/asm/uaccess.h
6592@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6593 __ok == 0; \
6594 })
6595
6596+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6597 #define access_ok(type, addr, size) \
6598 likely(__access_ok((addr), (size), __access_mask))
6599
6600diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6601index 1188e00..41cf144 100644
6602--- a/arch/mips/kernel/binfmt_elfn32.c
6603+++ b/arch/mips/kernel/binfmt_elfn32.c
6604@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6605 #undef ELF_ET_DYN_BASE
6606 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6607
6608+#ifdef CONFIG_PAX_ASLR
6609+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6610+
6611+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6612+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6613+#endif
6614+
6615 #include <asm/processor.h>
6616 #include <linux/module.h>
6617 #include <linux/elfcore.h>
6618diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6619index 9287678..f870e47 100644
6620--- a/arch/mips/kernel/binfmt_elfo32.c
6621+++ b/arch/mips/kernel/binfmt_elfo32.c
6622@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6623 #undef ELF_ET_DYN_BASE
6624 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6625
6626+#ifdef CONFIG_PAX_ASLR
6627+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6628+
6629+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6630+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6631+#endif
6632+
6633 #include <asm/processor.h>
6634
6635 #include <linux/module.h>
6636diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6637index a74ec3a..4f06f18 100644
6638--- a/arch/mips/kernel/i8259.c
6639+++ b/arch/mips/kernel/i8259.c
6640@@ -202,7 +202,7 @@ spurious_8259A_irq:
6641 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6642 spurious_irq_mask |= irqmask;
6643 }
6644- atomic_inc(&irq_err_count);
6645+ atomic_inc_unchecked(&irq_err_count);
6646 /*
6647 * Theoretically we do not have to handle this IRQ,
6648 * but in Linux this does not cause problems and is
6649diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6650index 44a1f79..2bd6aa3 100644
6651--- a/arch/mips/kernel/irq-gt641xx.c
6652+++ b/arch/mips/kernel/irq-gt641xx.c
6653@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6654 }
6655 }
6656
6657- atomic_inc(&irq_err_count);
6658+ atomic_inc_unchecked(&irq_err_count);
6659 }
6660
6661 void __init gt641xx_irq_init(void)
6662diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6663index be15e52..a089cc4 100644
6664--- a/arch/mips/kernel/irq.c
6665+++ b/arch/mips/kernel/irq.c
6666@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6667 printk("unexpected IRQ # %d\n", irq);
6668 }
6669
6670-atomic_t irq_err_count;
6671+atomic_unchecked_t irq_err_count;
6672
6673 int arch_show_interrupts(struct seq_file *p, int prec)
6674 {
6675- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6676+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6677 return 0;
6678 }
6679
6680 asmlinkage void spurious_interrupt(void)
6681 {
6682- atomic_inc(&irq_err_count);
6683+ atomic_inc_unchecked(&irq_err_count);
6684 }
6685
6686 void __init init_IRQ(void)
6687@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6688 }
6689
6690 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6691+
6692+extern void gr_handle_kernel_exploit(void);
6693 static inline void check_stack_overflow(void)
6694 {
6695 unsigned long sp;
6696@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6697 printk("do_IRQ: stack overflow: %ld\n",
6698 sp - sizeof(struct thread_info));
6699 dump_stack();
6700+ gr_handle_kernel_exploit();
6701 }
6702 }
6703 #else
6704diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6705index 0614717..002fa43 100644
6706--- a/arch/mips/kernel/pm-cps.c
6707+++ b/arch/mips/kernel/pm-cps.c
6708@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6709 nc_core_ready_count = nc_addr;
6710
6711 /* Ensure ready_count is zero-initialised before the assembly runs */
6712- ACCESS_ONCE(*nc_core_ready_count) = 0;
6713+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6714 coupled_barrier(&per_cpu(pm_barrier, core), online);
6715
6716 /* Run the generated entry code */
6717diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6718index bf85cc1..b365c61 100644
6719--- a/arch/mips/kernel/process.c
6720+++ b/arch/mips/kernel/process.c
6721@@ -535,18 +535,6 @@ out:
6722 return pc;
6723 }
6724
6725-/*
6726- * Don't forget that the stack pointer must be aligned on a 8 bytes
6727- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6728- */
6729-unsigned long arch_align_stack(unsigned long sp)
6730-{
6731- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6732- sp -= get_random_int() & ~PAGE_MASK;
6733-
6734- return sp & ALMASK;
6735-}
6736-
6737 static void arch_dump_stack(void *info)
6738 {
6739 struct pt_regs *regs;
6740diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6741index 5104528..950bbdc 100644
6742--- a/arch/mips/kernel/ptrace.c
6743+++ b/arch/mips/kernel/ptrace.c
6744@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6745 return ret;
6746 }
6747
6748+#ifdef CONFIG_GRKERNSEC_SETXID
6749+extern void gr_delayed_cred_worker(void);
6750+#endif
6751+
6752 /*
6753 * Notification of system call entry/exit
6754 * - triggered by current->work.syscall_trace
6755@@ -779,6 +783,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6756 tracehook_report_syscall_entry(regs))
6757 ret = -1;
6758
6759+#ifdef CONFIG_GRKERNSEC_SETXID
6760+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6761+ gr_delayed_cred_worker();
6762+#endif
6763+
6764 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6765 trace_sys_enter(regs, regs->regs[2]);
6766
6767diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6768index 07fc524..b9d7f28 100644
6769--- a/arch/mips/kernel/reset.c
6770+++ b/arch/mips/kernel/reset.c
6771@@ -13,6 +13,7 @@
6772 #include <linux/reboot.h>
6773
6774 #include <asm/reboot.h>
6775+#include <asm/bug.h>
6776
6777 /*
6778 * Urgs ... Too many MIPS machines to handle this in a generic way.
6779@@ -29,16 +30,19 @@ void machine_restart(char *command)
6780 {
6781 if (_machine_restart)
6782 _machine_restart(command);
6783+ BUG();
6784 }
6785
6786 void machine_halt(void)
6787 {
6788 if (_machine_halt)
6789 _machine_halt();
6790+ BUG();
6791 }
6792
6793 void machine_power_off(void)
6794 {
6795 if (pm_power_off)
6796 pm_power_off();
6797+ BUG();
6798 }
6799diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6800index 2242bdd..b284048 100644
6801--- a/arch/mips/kernel/sync-r4k.c
6802+++ b/arch/mips/kernel/sync-r4k.c
6803@@ -18,8 +18,8 @@
6804 #include <asm/mipsregs.h>
6805
6806 static atomic_t count_start_flag = ATOMIC_INIT(0);
6807-static atomic_t count_count_start = ATOMIC_INIT(0);
6808-static atomic_t count_count_stop = ATOMIC_INIT(0);
6809+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6810+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6811 static atomic_t count_reference = ATOMIC_INIT(0);
6812
6813 #define COUNTON 100
6814@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6815
6816 for (i = 0; i < NR_LOOPS; i++) {
6817 /* slaves loop on '!= 2' */
6818- while (atomic_read(&count_count_start) != 1)
6819+ while (atomic_read_unchecked(&count_count_start) != 1)
6820 mb();
6821- atomic_set(&count_count_stop, 0);
6822+ atomic_set_unchecked(&count_count_stop, 0);
6823 smp_wmb();
6824
6825 /* this lets the slaves write their count register */
6826- atomic_inc(&count_count_start);
6827+ atomic_inc_unchecked(&count_count_start);
6828
6829 /*
6830 * Everyone initialises count in the last loop:
6831@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6832 /*
6833 * Wait for all slaves to leave the synchronization point:
6834 */
6835- while (atomic_read(&count_count_stop) != 1)
6836+ while (atomic_read_unchecked(&count_count_stop) != 1)
6837 mb();
6838- atomic_set(&count_count_start, 0);
6839+ atomic_set_unchecked(&count_count_start, 0);
6840 smp_wmb();
6841- atomic_inc(&count_count_stop);
6842+ atomic_inc_unchecked(&count_count_stop);
6843 }
6844 /* Arrange for an interrupt in a short while */
6845 write_c0_compare(read_c0_count() + COUNTON);
6846@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6847 initcount = atomic_read(&count_reference);
6848
6849 for (i = 0; i < NR_LOOPS; i++) {
6850- atomic_inc(&count_count_start);
6851- while (atomic_read(&count_count_start) != 2)
6852+ atomic_inc_unchecked(&count_count_start);
6853+ while (atomic_read_unchecked(&count_count_start) != 2)
6854 mb();
6855
6856 /*
6857@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6858 if (i == NR_LOOPS-1)
6859 write_c0_count(initcount);
6860
6861- atomic_inc(&count_count_stop);
6862- while (atomic_read(&count_count_stop) != 2)
6863+ atomic_inc_unchecked(&count_count_stop);
6864+ while (atomic_read_unchecked(&count_count_stop) != 2)
6865 mb();
6866 }
6867 /* Arrange for an interrupt in a short while */
6868diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6869index 33984c0..666a96d 100644
6870--- a/arch/mips/kernel/traps.c
6871+++ b/arch/mips/kernel/traps.c
6872@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6873 siginfo_t info;
6874
6875 prev_state = exception_enter();
6876- die_if_kernel("Integer overflow", regs);
6877+ if (unlikely(!user_mode(regs))) {
6878+
6879+#ifdef CONFIG_PAX_REFCOUNT
6880+ if (fixup_exception(regs)) {
6881+ pax_report_refcount_overflow(regs);
6882+ exception_exit(prev_state);
6883+ return;
6884+ }
6885+#endif
6886+
6887+ die("Integer overflow", regs);
6888+ }
6889
6890 info.si_code = FPE_INTOVF;
6891 info.si_signo = SIGFPE;
6892diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6893index f5e7dda..47198ec 100644
6894--- a/arch/mips/kvm/mips.c
6895+++ b/arch/mips/kvm/mips.c
6896@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6897 return r;
6898 }
6899
6900-int kvm_arch_init(void *opaque)
6901+int kvm_arch_init(const void *opaque)
6902 {
6903 if (kvm_mips_callbacks) {
6904 kvm_err("kvm: module already exists\n");
6905diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6906index 7ff8637..6004edb 100644
6907--- a/arch/mips/mm/fault.c
6908+++ b/arch/mips/mm/fault.c
6909@@ -31,6 +31,23 @@
6910
6911 int show_unhandled_signals = 1;
6912
6913+#ifdef CONFIG_PAX_PAGEEXEC
6914+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6915+{
6916+ unsigned long i;
6917+
6918+ printk(KERN_ERR "PAX: bytes at PC: ");
6919+ for (i = 0; i < 5; i++) {
6920+ unsigned int c;
6921+ if (get_user(c, (unsigned int *)pc+i))
6922+ printk(KERN_CONT "???????? ");
6923+ else
6924+ printk(KERN_CONT "%08x ", c);
6925+ }
6926+ printk("\n");
6927+}
6928+#endif
6929+
6930 /*
6931 * This routine handles page faults. It determines the address,
6932 * and the problem, and then passes it off to one of the appropriate
6933@@ -206,6 +223,14 @@ bad_area:
6934 bad_area_nosemaphore:
6935 /* User mode accesses just cause a SIGSEGV */
6936 if (user_mode(regs)) {
6937+
6938+#ifdef CONFIG_PAX_PAGEEXEC
6939+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6940+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6941+ do_group_exit(SIGKILL);
6942+ }
6943+#endif
6944+
6945 tsk->thread.cp0_badvaddr = address;
6946 tsk->thread.error_code = write;
6947 if (show_unhandled_signals &&
6948diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6949index f1baadd..5472dca 100644
6950--- a/arch/mips/mm/mmap.c
6951+++ b/arch/mips/mm/mmap.c
6952@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6953 struct vm_area_struct *vma;
6954 unsigned long addr = addr0;
6955 int do_color_align;
6956+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6957 struct vm_unmapped_area_info info;
6958
6959 if (unlikely(len > TASK_SIZE))
6960@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6961 do_color_align = 1;
6962
6963 /* requesting a specific address */
6964+
6965+#ifdef CONFIG_PAX_RANDMMAP
6966+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6967+#endif
6968+
6969 if (addr) {
6970 if (do_color_align)
6971 addr = COLOUR_ALIGN(addr, pgoff);
6972@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6973 addr = PAGE_ALIGN(addr);
6974
6975 vma = find_vma(mm, addr);
6976- if (TASK_SIZE - len >= addr &&
6977- (!vma || addr + len <= vma->vm_start))
6978+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6979 return addr;
6980 }
6981
6982 info.length = len;
6983 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6984 info.align_offset = pgoff << PAGE_SHIFT;
6985+ info.threadstack_offset = offset;
6986
6987 if (dir == DOWN) {
6988 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6989@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6990 {
6991 unsigned long random_factor = 0UL;
6992
6993+#ifdef CONFIG_PAX_RANDMMAP
6994+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6995+#endif
6996+
6997 if (current->flags & PF_RANDOMIZE) {
6998 random_factor = get_random_int();
6999 random_factor = random_factor << PAGE_SHIFT;
7000@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7001
7002 if (mmap_is_legacy()) {
7003 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7004+
7005+#ifdef CONFIG_PAX_RANDMMAP
7006+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7007+ mm->mmap_base += mm->delta_mmap;
7008+#endif
7009+
7010 mm->get_unmapped_area = arch_get_unmapped_area;
7011 } else {
7012 mm->mmap_base = mmap_base(random_factor);
7013+
7014+#ifdef CONFIG_PAX_RANDMMAP
7015+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7016+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7017+#endif
7018+
7019 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7020 }
7021 }
7022
7023-static inline unsigned long brk_rnd(void)
7024-{
7025- unsigned long rnd = get_random_int();
7026-
7027- rnd = rnd << PAGE_SHIFT;
7028- /* 8MB for 32bit, 256MB for 64bit */
7029- if (TASK_IS_32BIT_ADDR)
7030- rnd = rnd & 0x7ffffful;
7031- else
7032- rnd = rnd & 0xffffffful;
7033-
7034- return rnd;
7035-}
7036-
7037-unsigned long arch_randomize_brk(struct mm_struct *mm)
7038-{
7039- unsigned long base = mm->brk;
7040- unsigned long ret;
7041-
7042- ret = PAGE_ALIGN(base + brk_rnd());
7043-
7044- if (ret < mm->brk)
7045- return mm->brk;
7046-
7047- return ret;
7048-}
7049-
7050 int __virt_addr_valid(const volatile void *kaddr)
7051 {
7052 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7053diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7054index a2358b4..7cead4f 100644
7055--- a/arch/mips/sgi-ip27/ip27-nmi.c
7056+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7057@@ -187,9 +187,9 @@ void
7058 cont_nmi_dump(void)
7059 {
7060 #ifndef REAL_NMI_SIGNAL
7061- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7062+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7063
7064- atomic_inc(&nmied_cpus);
7065+ atomic_inc_unchecked(&nmied_cpus);
7066 #endif
7067 /*
7068 * Only allow 1 cpu to proceed
7069@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7070 udelay(10000);
7071 }
7072 #else
7073- while (atomic_read(&nmied_cpus) != num_online_cpus());
7074+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7075 #endif
7076
7077 /*
7078diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7079index a046b30..6799527 100644
7080--- a/arch/mips/sni/rm200.c
7081+++ b/arch/mips/sni/rm200.c
7082@@ -270,7 +270,7 @@ spurious_8259A_irq:
7083 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7084 spurious_irq_mask |= irqmask;
7085 }
7086- atomic_inc(&irq_err_count);
7087+ atomic_inc_unchecked(&irq_err_count);
7088 /*
7089 * Theoretically we do not have to handle this IRQ,
7090 * but in Linux this does not cause problems and is
7091diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7092index 41e873b..34d33a7 100644
7093--- a/arch/mips/vr41xx/common/icu.c
7094+++ b/arch/mips/vr41xx/common/icu.c
7095@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7096
7097 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7098
7099- atomic_inc(&irq_err_count);
7100+ atomic_inc_unchecked(&irq_err_count);
7101
7102 return -1;
7103 }
7104diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7105index ae0e4ee..e8f0692 100644
7106--- a/arch/mips/vr41xx/common/irq.c
7107+++ b/arch/mips/vr41xx/common/irq.c
7108@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7109 irq_cascade_t *cascade;
7110
7111 if (irq >= NR_IRQS) {
7112- atomic_inc(&irq_err_count);
7113+ atomic_inc_unchecked(&irq_err_count);
7114 return;
7115 }
7116
7117@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7118 ret = cascade->get_irq(irq);
7119 irq = ret;
7120 if (ret < 0)
7121- atomic_inc(&irq_err_count);
7122+ atomic_inc_unchecked(&irq_err_count);
7123 else
7124 irq_dispatch(irq);
7125 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7126diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7127index 967d144..db12197 100644
7128--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7129+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7130@@ -11,12 +11,14 @@
7131 #ifndef _ASM_PROC_CACHE_H
7132 #define _ASM_PROC_CACHE_H
7133
7134+#include <linux/const.h>
7135+
7136 /* L1 cache */
7137
7138 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7139 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7140-#define L1_CACHE_BYTES 16 /* bytes per entry */
7141 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7143 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7144
7145 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7146diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7147index bcb5df2..84fabd2 100644
7148--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7149+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7150@@ -16,13 +16,15 @@
7151 #ifndef _ASM_PROC_CACHE_H
7152 #define _ASM_PROC_CACHE_H
7153
7154+#include <linux/const.h>
7155+
7156 /*
7157 * L1 cache
7158 */
7159 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7160 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7161-#define L1_CACHE_BYTES 32 /* bytes per entry */
7162 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7163+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7164 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7165
7166 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7167diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7168index 4ce7a01..449202a 100644
7169--- a/arch/openrisc/include/asm/cache.h
7170+++ b/arch/openrisc/include/asm/cache.h
7171@@ -19,11 +19,13 @@
7172 #ifndef __ASM_OPENRISC_CACHE_H
7173 #define __ASM_OPENRISC_CACHE_H
7174
7175+#include <linux/const.h>
7176+
7177 /* FIXME: How can we replace these with values from the CPU...
7178 * they shouldn't be hard-coded!
7179 */
7180
7181-#define L1_CACHE_BYTES 16
7182 #define L1_CACHE_SHIFT 4
7183+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7184
7185 #endif /* __ASM_OPENRISC_CACHE_H */
7186diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7187index 226f8ca9..9d9b87d 100644
7188--- a/arch/parisc/include/asm/atomic.h
7189+++ b/arch/parisc/include/asm/atomic.h
7190@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7191 return dec;
7192 }
7193
7194+#define atomic64_read_unchecked(v) atomic64_read(v)
7195+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7196+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7197+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7198+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7199+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7200+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7201+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7202+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7203+
7204 #endif /* !CONFIG_64BIT */
7205
7206
7207diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7208index 47f11c7..3420df2 100644
7209--- a/arch/parisc/include/asm/cache.h
7210+++ b/arch/parisc/include/asm/cache.h
7211@@ -5,6 +5,7 @@
7212 #ifndef __ARCH_PARISC_CACHE_H
7213 #define __ARCH_PARISC_CACHE_H
7214
7215+#include <linux/const.h>
7216
7217 /*
7218 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7219@@ -15,13 +16,13 @@
7220 * just ruin performance.
7221 */
7222 #ifdef CONFIG_PA20
7223-#define L1_CACHE_BYTES 64
7224 #define L1_CACHE_SHIFT 6
7225 #else
7226-#define L1_CACHE_BYTES 32
7227 #define L1_CACHE_SHIFT 5
7228 #endif
7229
7230+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7231+
7232 #ifndef __ASSEMBLY__
7233
7234 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7235diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7236index 78c9fd3..42fa66a 100644
7237--- a/arch/parisc/include/asm/elf.h
7238+++ b/arch/parisc/include/asm/elf.h
7239@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7240
7241 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7242
7243+#ifdef CONFIG_PAX_ASLR
7244+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7245+
7246+#define PAX_DELTA_MMAP_LEN 16
7247+#define PAX_DELTA_STACK_LEN 16
7248+#endif
7249+
7250 /* This yields a mask that user programs can use to figure out what
7251 instruction set this CPU supports. This could be done in user space,
7252 but it's not easy, and we've already done it here. */
7253diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7254index d174372..f27fe5c 100644
7255--- a/arch/parisc/include/asm/pgalloc.h
7256+++ b/arch/parisc/include/asm/pgalloc.h
7257@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7258 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7259 }
7260
7261+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7262+{
7263+ pgd_populate(mm, pgd, pmd);
7264+}
7265+
7266 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7267 {
7268 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7269@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7270 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7271 #define pmd_free(mm, x) do { } while (0)
7272 #define pgd_populate(mm, pmd, pte) BUG()
7273+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7274
7275 #endif
7276
7277diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7278index 15207b9..3209e65 100644
7279--- a/arch/parisc/include/asm/pgtable.h
7280+++ b/arch/parisc/include/asm/pgtable.h
7281@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7282 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7283 #define PAGE_COPY PAGE_EXECREAD
7284 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7285+
7286+#ifdef CONFIG_PAX_PAGEEXEC
7287+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7288+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7289+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7290+#else
7291+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7292+# define PAGE_COPY_NOEXEC PAGE_COPY
7293+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7294+#endif
7295+
7296 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7297 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7298 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7299diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7300index 0abdd4c..1af92f0 100644
7301--- a/arch/parisc/include/asm/uaccess.h
7302+++ b/arch/parisc/include/asm/uaccess.h
7303@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7304 const void __user *from,
7305 unsigned long n)
7306 {
7307- int sz = __compiletime_object_size(to);
7308+ size_t sz = __compiletime_object_size(to);
7309 int ret = -EFAULT;
7310
7311- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7312+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7313 ret = __copy_from_user(to, from, n);
7314 else
7315 copy_from_user_overflow();
7316diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7317index 3c63a82..b1d6ee9 100644
7318--- a/arch/parisc/kernel/module.c
7319+++ b/arch/parisc/kernel/module.c
7320@@ -98,16 +98,38 @@
7321
7322 /* three functions to determine where in the module core
7323 * or init pieces the location is */
7324+static inline int in_init_rx(struct module *me, void *loc)
7325+{
7326+ return (loc >= me->module_init_rx &&
7327+ loc < (me->module_init_rx + me->init_size_rx));
7328+}
7329+
7330+static inline int in_init_rw(struct module *me, void *loc)
7331+{
7332+ return (loc >= me->module_init_rw &&
7333+ loc < (me->module_init_rw + me->init_size_rw));
7334+}
7335+
7336 static inline int in_init(struct module *me, void *loc)
7337 {
7338- return (loc >= me->module_init &&
7339- loc <= (me->module_init + me->init_size));
7340+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7341+}
7342+
7343+static inline int in_core_rx(struct module *me, void *loc)
7344+{
7345+ return (loc >= me->module_core_rx &&
7346+ loc < (me->module_core_rx + me->core_size_rx));
7347+}
7348+
7349+static inline int in_core_rw(struct module *me, void *loc)
7350+{
7351+ return (loc >= me->module_core_rw &&
7352+ loc < (me->module_core_rw + me->core_size_rw));
7353 }
7354
7355 static inline int in_core(struct module *me, void *loc)
7356 {
7357- return (loc >= me->module_core &&
7358- loc <= (me->module_core + me->core_size));
7359+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7360 }
7361
7362 static inline int in_local(struct module *me, void *loc)
7363@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7364 }
7365
7366 /* align things a bit */
7367- me->core_size = ALIGN(me->core_size, 16);
7368- me->arch.got_offset = me->core_size;
7369- me->core_size += gots * sizeof(struct got_entry);
7370+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7371+ me->arch.got_offset = me->core_size_rw;
7372+ me->core_size_rw += gots * sizeof(struct got_entry);
7373
7374- me->core_size = ALIGN(me->core_size, 16);
7375- me->arch.fdesc_offset = me->core_size;
7376- me->core_size += fdescs * sizeof(Elf_Fdesc);
7377+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7378+ me->arch.fdesc_offset = me->core_size_rw;
7379+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7380
7381 me->arch.got_max = gots;
7382 me->arch.fdesc_max = fdescs;
7383@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7384
7385 BUG_ON(value == 0);
7386
7387- got = me->module_core + me->arch.got_offset;
7388+ got = me->module_core_rw + me->arch.got_offset;
7389 for (i = 0; got[i].addr; i++)
7390 if (got[i].addr == value)
7391 goto out;
7392@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7393 #ifdef CONFIG_64BIT
7394 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7395 {
7396- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7397+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7398
7399 if (!value) {
7400 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7401@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7402
7403 /* Create new one */
7404 fdesc->addr = value;
7405- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7406+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7407 return (Elf_Addr)fdesc;
7408 }
7409 #endif /* CONFIG_64BIT */
7410@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7411
7412 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7413 end = table + sechdrs[me->arch.unwind_section].sh_size;
7414- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7415+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7416
7417 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7418 me->arch.unwind_section, table, end, gp);
7419diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7420index 5aba01a..47cdd5a 100644
7421--- a/arch/parisc/kernel/sys_parisc.c
7422+++ b/arch/parisc/kernel/sys_parisc.c
7423@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7424 unsigned long task_size = TASK_SIZE;
7425 int do_color_align, last_mmap;
7426 struct vm_unmapped_area_info info;
7427+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7428
7429 if (len > task_size)
7430 return -ENOMEM;
7431@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7432 goto found_addr;
7433 }
7434
7435+#ifdef CONFIG_PAX_RANDMMAP
7436+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7437+#endif
7438+
7439 if (addr) {
7440 if (do_color_align && last_mmap)
7441 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7442@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7443 info.high_limit = mmap_upper_limit();
7444 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7445 info.align_offset = shared_align_offset(last_mmap, pgoff);
7446+ info.threadstack_offset = offset;
7447 addr = vm_unmapped_area(&info);
7448
7449 found_addr:
7450@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7451 unsigned long addr = addr0;
7452 int do_color_align, last_mmap;
7453 struct vm_unmapped_area_info info;
7454+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7455
7456 #ifdef CONFIG_64BIT
7457 /* This should only ever run for 32-bit processes. */
7458@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7459 }
7460
7461 /* requesting a specific address */
7462+#ifdef CONFIG_PAX_RANDMMAP
7463+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7464+#endif
7465+
7466 if (addr) {
7467 if (do_color_align && last_mmap)
7468 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7469@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7470 info.high_limit = mm->mmap_base;
7471 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7472 info.align_offset = shared_align_offset(last_mmap, pgoff);
7473+ info.threadstack_offset = offset;
7474 addr = vm_unmapped_area(&info);
7475 if (!(addr & ~PAGE_MASK))
7476 goto found_addr;
7477@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7478 mm->mmap_legacy_base = mmap_legacy_base();
7479 mm->mmap_base = mmap_upper_limit();
7480
7481+#ifdef CONFIG_PAX_RANDMMAP
7482+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7483+ mm->mmap_legacy_base += mm->delta_mmap;
7484+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7485+ }
7486+#endif
7487+
7488 if (mmap_is_legacy()) {
7489 mm->mmap_base = mm->mmap_legacy_base;
7490 mm->get_unmapped_area = arch_get_unmapped_area;
7491diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7492index 47ee620..1107387 100644
7493--- a/arch/parisc/kernel/traps.c
7494+++ b/arch/parisc/kernel/traps.c
7495@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7496
7497 down_read(&current->mm->mmap_sem);
7498 vma = find_vma(current->mm,regs->iaoq[0]);
7499- if (vma && (regs->iaoq[0] >= vma->vm_start)
7500- && (vma->vm_flags & VM_EXEC)) {
7501-
7502+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7503 fault_address = regs->iaoq[0];
7504 fault_space = regs->iasq[0];
7505
7506diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7507index e5120e6..8ddb5cc 100644
7508--- a/arch/parisc/mm/fault.c
7509+++ b/arch/parisc/mm/fault.c
7510@@ -15,6 +15,7 @@
7511 #include <linux/sched.h>
7512 #include <linux/interrupt.h>
7513 #include <linux/module.h>
7514+#include <linux/unistd.h>
7515
7516 #include <asm/uaccess.h>
7517 #include <asm/traps.h>
7518@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7519 static unsigned long
7520 parisc_acctyp(unsigned long code, unsigned int inst)
7521 {
7522- if (code == 6 || code == 16)
7523+ if (code == 6 || code == 7 || code == 16)
7524 return VM_EXEC;
7525
7526 switch (inst & 0xf0000000) {
7527@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7528 }
7529 #endif
7530
7531+#ifdef CONFIG_PAX_PAGEEXEC
7532+/*
7533+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7534+ *
7535+ * returns 1 when task should be killed
7536+ * 2 when rt_sigreturn trampoline was detected
7537+ * 3 when unpatched PLT trampoline was detected
7538+ */
7539+static int pax_handle_fetch_fault(struct pt_regs *regs)
7540+{
7541+
7542+#ifdef CONFIG_PAX_EMUPLT
7543+ int err;
7544+
7545+ do { /* PaX: unpatched PLT emulation */
7546+ unsigned int bl, depwi;
7547+
7548+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7549+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7550+
7551+ if (err)
7552+ break;
7553+
7554+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7555+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7556+
7557+ err = get_user(ldw, (unsigned int *)addr);
7558+ err |= get_user(bv, (unsigned int *)(addr+4));
7559+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7560+
7561+ if (err)
7562+ break;
7563+
7564+ if (ldw == 0x0E801096U &&
7565+ bv == 0xEAC0C000U &&
7566+ ldw2 == 0x0E881095U)
7567+ {
7568+ unsigned int resolver, map;
7569+
7570+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7571+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7572+ if (err)
7573+ break;
7574+
7575+ regs->gr[20] = instruction_pointer(regs)+8;
7576+ regs->gr[21] = map;
7577+ regs->gr[22] = resolver;
7578+ regs->iaoq[0] = resolver | 3UL;
7579+ regs->iaoq[1] = regs->iaoq[0] + 4;
7580+ return 3;
7581+ }
7582+ }
7583+ } while (0);
7584+#endif
7585+
7586+#ifdef CONFIG_PAX_EMUTRAMP
7587+
7588+#ifndef CONFIG_PAX_EMUSIGRT
7589+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7590+ return 1;
7591+#endif
7592+
7593+ do { /* PaX: rt_sigreturn emulation */
7594+ unsigned int ldi1, ldi2, bel, nop;
7595+
7596+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7597+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7598+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7599+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7600+
7601+ if (err)
7602+ break;
7603+
7604+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7605+ ldi2 == 0x3414015AU &&
7606+ bel == 0xE4008200U &&
7607+ nop == 0x08000240U)
7608+ {
7609+ regs->gr[25] = (ldi1 & 2) >> 1;
7610+ regs->gr[20] = __NR_rt_sigreturn;
7611+ regs->gr[31] = regs->iaoq[1] + 16;
7612+ regs->sr[0] = regs->iasq[1];
7613+ regs->iaoq[0] = 0x100UL;
7614+ regs->iaoq[1] = regs->iaoq[0] + 4;
7615+ regs->iasq[0] = regs->sr[2];
7616+ regs->iasq[1] = regs->sr[2];
7617+ return 2;
7618+ }
7619+ } while (0);
7620+#endif
7621+
7622+ return 1;
7623+}
7624+
7625+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7626+{
7627+ unsigned long i;
7628+
7629+ printk(KERN_ERR "PAX: bytes at PC: ");
7630+ for (i = 0; i < 5; i++) {
7631+ unsigned int c;
7632+ if (get_user(c, (unsigned int *)pc+i))
7633+ printk(KERN_CONT "???????? ");
7634+ else
7635+ printk(KERN_CONT "%08x ", c);
7636+ }
7637+ printk("\n");
7638+}
7639+#endif
7640+
7641 int fixup_exception(struct pt_regs *regs)
7642 {
7643 const struct exception_table_entry *fix;
7644@@ -234,8 +345,33 @@ retry:
7645
7646 good_area:
7647
7648- if ((vma->vm_flags & acc_type) != acc_type)
7649+ if ((vma->vm_flags & acc_type) != acc_type) {
7650+
7651+#ifdef CONFIG_PAX_PAGEEXEC
7652+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7653+ (address & ~3UL) == instruction_pointer(regs))
7654+ {
7655+ up_read(&mm->mmap_sem);
7656+ switch (pax_handle_fetch_fault(regs)) {
7657+
7658+#ifdef CONFIG_PAX_EMUPLT
7659+ case 3:
7660+ return;
7661+#endif
7662+
7663+#ifdef CONFIG_PAX_EMUTRAMP
7664+ case 2:
7665+ return;
7666+#endif
7667+
7668+ }
7669+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7670+ do_group_exit(SIGKILL);
7671+ }
7672+#endif
7673+
7674 goto bad_area;
7675+ }
7676
7677 /*
7678 * If for any reason at all we couldn't handle the fault, make
7679diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7680index 22b0940..309f790 100644
7681--- a/arch/powerpc/Kconfig
7682+++ b/arch/powerpc/Kconfig
7683@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7684 config KEXEC
7685 bool "kexec system call"
7686 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7687+ depends on !GRKERNSEC_KMEM
7688 help
7689 kexec is a system call that implements the ability to shutdown your
7690 current kernel, and to start another kernel. It is like a reboot
7691diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7692index 512d278..d31fadd 100644
7693--- a/arch/powerpc/include/asm/atomic.h
7694+++ b/arch/powerpc/include/asm/atomic.h
7695@@ -12,6 +12,11 @@
7696
7697 #define ATOMIC_INIT(i) { (i) }
7698
7699+#define _ASM_EXTABLE(from, to) \
7700+" .section __ex_table,\"a\"\n" \
7701+ PPC_LONG" " #from ", " #to"\n" \
7702+" .previous\n"
7703+
7704 static __inline__ int atomic_read(const atomic_t *v)
7705 {
7706 int t;
7707@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7708 return t;
7709 }
7710
7711+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7712+{
7713+ int t;
7714+
7715+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7716+
7717+ return t;
7718+}
7719+
7720 static __inline__ void atomic_set(atomic_t *v, int i)
7721 {
7722 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7723 }
7724
7725-#define ATOMIC_OP(op, asm_op) \
7726-static __inline__ void atomic_##op(int a, atomic_t *v) \
7727+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7728+{
7729+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7730+}
7731+
7732+#ifdef CONFIG_PAX_REFCOUNT
7733+#define __REFCOUNT_OP(op) op##o.
7734+#define __OVERFLOW_PRE \
7735+ " mcrxr cr0\n"
7736+#define __OVERFLOW_POST \
7737+ " bf 4*cr0+so, 3f\n" \
7738+ "2: .long 0x00c00b00\n" \
7739+ "3:\n"
7740+#define __OVERFLOW_EXTABLE \
7741+ "\n4:\n"
7742+ _ASM_EXTABLE(2b, 4b)
7743+#else
7744+#define __REFCOUNT_OP(op) op
7745+#define __OVERFLOW_PRE
7746+#define __OVERFLOW_POST
7747+#define __OVERFLOW_EXTABLE
7748+#endif
7749+
7750+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7751+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7752 { \
7753 int t; \
7754 \
7755 __asm__ __volatile__( \
7756-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7757+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7758+ pre_op \
7759 #asm_op " %0,%2,%0\n" \
7760+ post_op \
7761 PPC405_ERR77(0,%3) \
7762 " stwcx. %0,0,%3 \n" \
7763 " bne- 1b\n" \
7764+ extable \
7765 : "=&r" (t), "+m" (v->counter) \
7766 : "r" (a), "r" (&v->counter) \
7767 : "cc"); \
7768 } \
7769
7770-#define ATOMIC_OP_RETURN(op, asm_op) \
7771-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7772+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7773+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7774+
7775+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7776+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7777 { \
7778 int t; \
7779 \
7780 __asm__ __volatile__( \
7781 PPC_ATOMIC_ENTRY_BARRIER \
7782-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7783+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7784+ pre_op \
7785 #asm_op " %0,%1,%0\n" \
7786+ post_op \
7787 PPC405_ERR77(0,%2) \
7788 " stwcx. %0,0,%2 \n" \
7789 " bne- 1b\n" \
7790+ extable \
7791 PPC_ATOMIC_EXIT_BARRIER \
7792 : "=&r" (t) \
7793 : "r" (a), "r" (&v->counter) \
7794@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7795 return t; \
7796 }
7797
7798+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7799+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7800+
7801 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7802
7803 ATOMIC_OPS(add, add)
7804@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7805
7806 #undef ATOMIC_OPS
7807 #undef ATOMIC_OP_RETURN
7808+#undef __ATOMIC_OP_RETURN
7809 #undef ATOMIC_OP
7810+#undef __ATOMIC_OP
7811
7812 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7813
7814-static __inline__ void atomic_inc(atomic_t *v)
7815-{
7816- int t;
7817+/*
7818+ * atomic_inc - increment atomic variable
7819+ * @v: pointer of type atomic_t
7820+ *
7821+ * Automatically increments @v by 1
7822+ */
7823+#define atomic_inc(v) atomic_add(1, (v))
7824+#define atomic_inc_return(v) atomic_add_return(1, (v))
7825
7826- __asm__ __volatile__(
7827-"1: lwarx %0,0,%2 # atomic_inc\n\
7828- addic %0,%0,1\n"
7829- PPC405_ERR77(0,%2)
7830-" stwcx. %0,0,%2 \n\
7831- bne- 1b"
7832- : "=&r" (t), "+m" (v->counter)
7833- : "r" (&v->counter)
7834- : "cc", "xer");
7835+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7836+{
7837+ atomic_add_unchecked(1, v);
7838 }
7839
7840-static __inline__ int atomic_inc_return(atomic_t *v)
7841+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7842 {
7843- int t;
7844-
7845- __asm__ __volatile__(
7846- PPC_ATOMIC_ENTRY_BARRIER
7847-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7848- addic %0,%0,1\n"
7849- PPC405_ERR77(0,%1)
7850-" stwcx. %0,0,%1 \n\
7851- bne- 1b"
7852- PPC_ATOMIC_EXIT_BARRIER
7853- : "=&r" (t)
7854- : "r" (&v->counter)
7855- : "cc", "xer", "memory");
7856-
7857- return t;
7858+ return atomic_add_return_unchecked(1, v);
7859 }
7860
7861 /*
7862@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7863 */
7864 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7865
7866-static __inline__ void atomic_dec(atomic_t *v)
7867+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7868 {
7869- int t;
7870-
7871- __asm__ __volatile__(
7872-"1: lwarx %0,0,%2 # atomic_dec\n\
7873- addic %0,%0,-1\n"
7874- PPC405_ERR77(0,%2)\
7875-" stwcx. %0,0,%2\n\
7876- bne- 1b"
7877- : "=&r" (t), "+m" (v->counter)
7878- : "r" (&v->counter)
7879- : "cc", "xer");
7880+ return atomic_add_return_unchecked(1, v) == 0;
7881 }
7882
7883-static __inline__ int atomic_dec_return(atomic_t *v)
7884+/*
7885+ * atomic_dec - decrement atomic variable
7886+ * @v: pointer of type atomic_t
7887+ *
7888+ * Atomically decrements @v by 1
7889+ */
7890+#define atomic_dec(v) atomic_sub(1, (v))
7891+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7892+
7893+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7894 {
7895- int t;
7896-
7897- __asm__ __volatile__(
7898- PPC_ATOMIC_ENTRY_BARRIER
7899-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7900- addic %0,%0,-1\n"
7901- PPC405_ERR77(0,%1)
7902-" stwcx. %0,0,%1\n\
7903- bne- 1b"
7904- PPC_ATOMIC_EXIT_BARRIER
7905- : "=&r" (t)
7906- : "r" (&v->counter)
7907- : "cc", "xer", "memory");
7908-
7909- return t;
7910+ atomic_sub_unchecked(1, v);
7911 }
7912
7913 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7914 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7915
7916+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7917+{
7918+ return cmpxchg(&(v->counter), old, new);
7919+}
7920+
7921+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7922+{
7923+ return xchg(&(v->counter), new);
7924+}
7925+
7926 /**
7927 * __atomic_add_unless - add unless the number is a given value
7928 * @v: pointer of type atomic_t
7929@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7930 PPC_ATOMIC_ENTRY_BARRIER
7931 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7932 cmpw 0,%0,%3 \n\
7933- beq- 2f \n\
7934- add %0,%2,%0 \n"
7935+ beq- 2f \n"
7936+
7937+#ifdef CONFIG_PAX_REFCOUNT
7938+" mcrxr cr0\n"
7939+" addo. %0,%2,%0\n"
7940+" bf 4*cr0+so, 4f\n"
7941+"3:.long " "0x00c00b00""\n"
7942+"4:\n"
7943+#else
7944+ "add %0,%2,%0 \n"
7945+#endif
7946+
7947 PPC405_ERR77(0,%2)
7948 " stwcx. %0,0,%1 \n\
7949 bne- 1b \n"
7950+"5:"
7951+
7952+#ifdef CONFIG_PAX_REFCOUNT
7953+ _ASM_EXTABLE(3b, 5b)
7954+#endif
7955+
7956 PPC_ATOMIC_EXIT_BARRIER
7957 " subf %0,%2,%0 \n\
7958 2:"
7959@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7960 }
7961 #define atomic_dec_if_positive atomic_dec_if_positive
7962
7963+#define smp_mb__before_atomic_dec() smp_mb()
7964+#define smp_mb__after_atomic_dec() smp_mb()
7965+#define smp_mb__before_atomic_inc() smp_mb()
7966+#define smp_mb__after_atomic_inc() smp_mb()
7967+
7968 #ifdef __powerpc64__
7969
7970 #define ATOMIC64_INIT(i) { (i) }
7971@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7972 return t;
7973 }
7974
7975+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7976+{
7977+ long t;
7978+
7979+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7980+
7981+ return t;
7982+}
7983+
7984 static __inline__ void atomic64_set(atomic64_t *v, long i)
7985 {
7986 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7987 }
7988
7989-#define ATOMIC64_OP(op, asm_op) \
7990-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7991+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7992+{
7993+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7994+}
7995+
7996+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7997+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
7998 { \
7999 long t; \
8000 \
8001 __asm__ __volatile__( \
8002 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8003+ pre_op \
8004 #asm_op " %0,%2,%0\n" \
8005+ post_op \
8006 " stdcx. %0,0,%3 \n" \
8007 " bne- 1b\n" \
8008+ extable \
8009 : "=&r" (t), "+m" (v->counter) \
8010 : "r" (a), "r" (&v->counter) \
8011 : "cc"); \
8012 }
8013
8014-#define ATOMIC64_OP_RETURN(op, asm_op) \
8015-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8016+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8017+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8018+
8019+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8020+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8021 { \
8022 long t; \
8023 \
8024 __asm__ __volatile__( \
8025 PPC_ATOMIC_ENTRY_BARRIER \
8026 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8027+ pre_op \
8028 #asm_op " %0,%1,%0\n" \
8029+ post_op \
8030 " stdcx. %0,0,%2 \n" \
8031 " bne- 1b\n" \
8032+ extable \
8033 PPC_ATOMIC_EXIT_BARRIER \
8034 : "=&r" (t) \
8035 : "r" (a), "r" (&v->counter) \
8036@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8037 return t; \
8038 }
8039
8040+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8041+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8042+
8043 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8044
8045 ATOMIC64_OPS(add, add)
8046@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8047
8048 #undef ATOMIC64_OPS
8049 #undef ATOMIC64_OP_RETURN
8050+#undef __ATOMIC64_OP_RETURN
8051 #undef ATOMIC64_OP
8052+#undef __ATOMIC64_OP
8053+#undef __OVERFLOW_EXTABLE
8054+#undef __OVERFLOW_POST
8055+#undef __OVERFLOW_PRE
8056+#undef __REFCOUNT_OP
8057
8058 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8059
8060-static __inline__ void atomic64_inc(atomic64_t *v)
8061-{
8062- long t;
8063+/*
8064+ * atomic64_inc - increment atomic variable
8065+ * @v: pointer of type atomic64_t
8066+ *
8067+ * Automatically increments @v by 1
8068+ */
8069+#define atomic64_inc(v) atomic64_add(1, (v))
8070+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8071
8072- __asm__ __volatile__(
8073-"1: ldarx %0,0,%2 # atomic64_inc\n\
8074- addic %0,%0,1\n\
8075- stdcx. %0,0,%2 \n\
8076- bne- 1b"
8077- : "=&r" (t), "+m" (v->counter)
8078- : "r" (&v->counter)
8079- : "cc", "xer");
8080+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8081+{
8082+ atomic64_add_unchecked(1, v);
8083 }
8084
8085-static __inline__ long atomic64_inc_return(atomic64_t *v)
8086+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8087 {
8088- long t;
8089-
8090- __asm__ __volatile__(
8091- PPC_ATOMIC_ENTRY_BARRIER
8092-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8093- addic %0,%0,1\n\
8094- stdcx. %0,0,%1 \n\
8095- bne- 1b"
8096- PPC_ATOMIC_EXIT_BARRIER
8097- : "=&r" (t)
8098- : "r" (&v->counter)
8099- : "cc", "xer", "memory");
8100-
8101- return t;
8102+ return atomic64_add_return_unchecked(1, v);
8103 }
8104
8105 /*
8106@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8107 */
8108 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8109
8110-static __inline__ void atomic64_dec(atomic64_t *v)
8111+/*
8112+ * atomic64_dec - decrement atomic variable
8113+ * @v: pointer of type atomic64_t
8114+ *
8115+ * Atomically decrements @v by 1
8116+ */
8117+#define atomic64_dec(v) atomic64_sub(1, (v))
8118+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8119+
8120+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8121 {
8122- long t;
8123-
8124- __asm__ __volatile__(
8125-"1: ldarx %0,0,%2 # atomic64_dec\n\
8126- addic %0,%0,-1\n\
8127- stdcx. %0,0,%2\n\
8128- bne- 1b"
8129- : "=&r" (t), "+m" (v->counter)
8130- : "r" (&v->counter)
8131- : "cc", "xer");
8132-}
8133-
8134-static __inline__ long atomic64_dec_return(atomic64_t *v)
8135-{
8136- long t;
8137-
8138- __asm__ __volatile__(
8139- PPC_ATOMIC_ENTRY_BARRIER
8140-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8141- addic %0,%0,-1\n\
8142- stdcx. %0,0,%1\n\
8143- bne- 1b"
8144- PPC_ATOMIC_EXIT_BARRIER
8145- : "=&r" (t)
8146- : "r" (&v->counter)
8147- : "cc", "xer", "memory");
8148-
8149- return t;
8150+ atomic64_sub_unchecked(1, v);
8151 }
8152
8153 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8154@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8155 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8156 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8157
8158+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8159+{
8160+ return cmpxchg(&(v->counter), old, new);
8161+}
8162+
8163+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8164+{
8165+ return xchg(&(v->counter), new);
8166+}
8167+
8168 /**
8169 * atomic64_add_unless - add unless the number is a given value
8170 * @v: pointer of type atomic64_t
8171@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8172
8173 __asm__ __volatile__ (
8174 PPC_ATOMIC_ENTRY_BARRIER
8175-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8176+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8177 cmpd 0,%0,%3 \n\
8178- beq- 2f \n\
8179- add %0,%2,%0 \n"
8180+ beq- 2f \n"
8181+
8182+#ifdef CONFIG_PAX_REFCOUNT
8183+" mcrxr cr0\n"
8184+" addo. %0,%2,%0\n"
8185+" bf 4*cr0+so, 4f\n"
8186+"3:.long " "0x00c00b00""\n"
8187+"4:\n"
8188+#else
8189+ "add %0,%2,%0 \n"
8190+#endif
8191+
8192 " stdcx. %0,0,%1 \n\
8193 bne- 1b \n"
8194 PPC_ATOMIC_EXIT_BARRIER
8195+"5:"
8196+
8197+#ifdef CONFIG_PAX_REFCOUNT
8198+ _ASM_EXTABLE(3b, 5b)
8199+#endif
8200+
8201 " subf %0,%2,%0 \n\
8202 2:"
8203 : "=&r" (t)
8204diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8205index a3bf5be..e03ba81 100644
8206--- a/arch/powerpc/include/asm/barrier.h
8207+++ b/arch/powerpc/include/asm/barrier.h
8208@@ -76,7 +76,7 @@
8209 do { \
8210 compiletime_assert_atomic_type(*p); \
8211 smp_lwsync(); \
8212- ACCESS_ONCE(*p) = (v); \
8213+ ACCESS_ONCE_RW(*p) = (v); \
8214 } while (0)
8215
8216 #define smp_load_acquire(p) \
8217diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8218index 34a05a1..a1f2c67 100644
8219--- a/arch/powerpc/include/asm/cache.h
8220+++ b/arch/powerpc/include/asm/cache.h
8221@@ -4,6 +4,7 @@
8222 #ifdef __KERNEL__
8223
8224 #include <asm/reg.h>
8225+#include <linux/const.h>
8226
8227 /* bytes per L1 cache line */
8228 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8229@@ -23,7 +24,7 @@
8230 #define L1_CACHE_SHIFT 7
8231 #endif
8232
8233-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8234+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8235
8236 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8237
8238diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8239index 57d289a..b36c98c 100644
8240--- a/arch/powerpc/include/asm/elf.h
8241+++ b/arch/powerpc/include/asm/elf.h
8242@@ -30,6 +30,18 @@
8243
8244 #define ELF_ET_DYN_BASE 0x20000000
8245
8246+#ifdef CONFIG_PAX_ASLR
8247+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8248+
8249+#ifdef __powerpc64__
8250+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8251+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8252+#else
8253+#define PAX_DELTA_MMAP_LEN 15
8254+#define PAX_DELTA_STACK_LEN 15
8255+#endif
8256+#endif
8257+
8258 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8259
8260 /*
8261@@ -128,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8262 (0x7ff >> (PAGE_SHIFT - 12)) : \
8263 (0x3ffff >> (PAGE_SHIFT - 12)))
8264
8265-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8266-#define arch_randomize_brk arch_randomize_brk
8267-
8268-
8269 #ifdef CONFIG_SPU_BASE
8270 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8271 #define NT_SPU 1
8272diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8273index 8196e9c..d83a9f3 100644
8274--- a/arch/powerpc/include/asm/exec.h
8275+++ b/arch/powerpc/include/asm/exec.h
8276@@ -4,6 +4,6 @@
8277 #ifndef _ASM_POWERPC_EXEC_H
8278 #define _ASM_POWERPC_EXEC_H
8279
8280-extern unsigned long arch_align_stack(unsigned long sp);
8281+#define arch_align_stack(x) ((x) & ~0xfUL)
8282
8283 #endif /* _ASM_POWERPC_EXEC_H */
8284diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8285index 5acabbd..7ea14fa 100644
8286--- a/arch/powerpc/include/asm/kmap_types.h
8287+++ b/arch/powerpc/include/asm/kmap_types.h
8288@@ -10,7 +10,7 @@
8289 * 2 of the License, or (at your option) any later version.
8290 */
8291
8292-#define KM_TYPE_NR 16
8293+#define KM_TYPE_NR 17
8294
8295 #endif /* __KERNEL__ */
8296 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8297diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8298index b8da913..c02b593 100644
8299--- a/arch/powerpc/include/asm/local.h
8300+++ b/arch/powerpc/include/asm/local.h
8301@@ -9,21 +9,65 @@ typedef struct
8302 atomic_long_t a;
8303 } local_t;
8304
8305+typedef struct
8306+{
8307+ atomic_long_unchecked_t a;
8308+} local_unchecked_t;
8309+
8310 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8311
8312 #define local_read(l) atomic_long_read(&(l)->a)
8313+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8314 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8315+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8316
8317 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8318+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8319 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8320+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8321 #define local_inc(l) atomic_long_inc(&(l)->a)
8322+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8323 #define local_dec(l) atomic_long_dec(&(l)->a)
8324+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8325
8326 static __inline__ long local_add_return(long a, local_t *l)
8327 {
8328 long t;
8329
8330 __asm__ __volatile__(
8331+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8332+
8333+#ifdef CONFIG_PAX_REFCOUNT
8334+" mcrxr cr0\n"
8335+" addo. %0,%1,%0\n"
8336+" bf 4*cr0+so, 3f\n"
8337+"2:.long " "0x00c00b00""\n"
8338+#else
8339+" add %0,%1,%0\n"
8340+#endif
8341+
8342+"3:\n"
8343+ PPC405_ERR77(0,%2)
8344+ PPC_STLCX "%0,0,%2 \n\
8345+ bne- 1b"
8346+
8347+#ifdef CONFIG_PAX_REFCOUNT
8348+"\n4:\n"
8349+ _ASM_EXTABLE(2b, 4b)
8350+#endif
8351+
8352+ : "=&r" (t)
8353+ : "r" (a), "r" (&(l->a.counter))
8354+ : "cc", "memory");
8355+
8356+ return t;
8357+}
8358+
8359+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8360+{
8361+ long t;
8362+
8363+ __asm__ __volatile__(
8364 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8365 add %0,%1,%0\n"
8366 PPC405_ERR77(0,%2)
8367@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8368
8369 #define local_cmpxchg(l, o, n) \
8370 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8371+#define local_cmpxchg_unchecked(l, o, n) \
8372+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8373 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8374
8375 /**
8376diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8377index 8565c25..2865190 100644
8378--- a/arch/powerpc/include/asm/mman.h
8379+++ b/arch/powerpc/include/asm/mman.h
8380@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8381 }
8382 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8383
8384-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8385+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8386 {
8387 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8388 }
8389diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8390index 69c0598..2c56964 100644
8391--- a/arch/powerpc/include/asm/page.h
8392+++ b/arch/powerpc/include/asm/page.h
8393@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8394 * and needs to be executable. This means the whole heap ends
8395 * up being executable.
8396 */
8397-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8398- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8399+#define VM_DATA_DEFAULT_FLAGS32 \
8400+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8401+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8402
8403 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8404 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8405@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8406 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8407 #endif
8408
8409+#define ktla_ktva(addr) (addr)
8410+#define ktva_ktla(addr) (addr)
8411+
8412 #ifndef CONFIG_PPC_BOOK3S_64
8413 /*
8414 * Use the top bit of the higher-level page table entries to indicate whether
8415diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8416index d908a46..3753f71 100644
8417--- a/arch/powerpc/include/asm/page_64.h
8418+++ b/arch/powerpc/include/asm/page_64.h
8419@@ -172,15 +172,18 @@ do { \
8420 * stack by default, so in the absence of a PT_GNU_STACK program header
8421 * we turn execute permission off.
8422 */
8423-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8424- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8425+#define VM_STACK_DEFAULT_FLAGS32 \
8426+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8427+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8428
8429 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8430 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8431
8432+#ifndef CONFIG_PAX_PAGEEXEC
8433 #define VM_STACK_DEFAULT_FLAGS \
8434 (is_32bit_task() ? \
8435 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8436+#endif
8437
8438 #include <asm-generic/getorder.h>
8439
8440diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8441index 4b0be20..c15a27d 100644
8442--- a/arch/powerpc/include/asm/pgalloc-64.h
8443+++ b/arch/powerpc/include/asm/pgalloc-64.h
8444@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8445 #ifndef CONFIG_PPC_64K_PAGES
8446
8447 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8448+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8449
8450 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8451 {
8452@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8453 pud_set(pud, (unsigned long)pmd);
8454 }
8455
8456+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8457+{
8458+ pud_populate(mm, pud, pmd);
8459+}
8460+
8461 #define pmd_populate(mm, pmd, pte_page) \
8462 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8463 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8464@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8465 #endif
8466
8467 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8468+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8469
8470 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8471 pte_t *pte)
8472diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8473index 9835ac4..900430f 100644
8474--- a/arch/powerpc/include/asm/pgtable.h
8475+++ b/arch/powerpc/include/asm/pgtable.h
8476@@ -2,6 +2,7 @@
8477 #define _ASM_POWERPC_PGTABLE_H
8478 #ifdef __KERNEL__
8479
8480+#include <linux/const.h>
8481 #ifndef __ASSEMBLY__
8482 #include <linux/mmdebug.h>
8483 #include <linux/mmzone.h>
8484diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8485index 62cfb0c..50c6402 100644
8486--- a/arch/powerpc/include/asm/pte-hash32.h
8487+++ b/arch/powerpc/include/asm/pte-hash32.h
8488@@ -20,6 +20,7 @@
8489 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8490 #define _PAGE_USER 0x004 /* usermode access allowed */
8491 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8492+#define _PAGE_EXEC _PAGE_GUARDED
8493 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8494 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8495 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8496diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8497index af56b5c..f86f3f6 100644
8498--- a/arch/powerpc/include/asm/reg.h
8499+++ b/arch/powerpc/include/asm/reg.h
8500@@ -253,6 +253,7 @@
8501 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8502 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8503 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8504+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8505 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8506 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8507 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8508diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8509index d607df5..08dc9ae 100644
8510--- a/arch/powerpc/include/asm/smp.h
8511+++ b/arch/powerpc/include/asm/smp.h
8512@@ -51,7 +51,7 @@ struct smp_ops_t {
8513 int (*cpu_disable)(void);
8514 void (*cpu_die)(unsigned int nr);
8515 int (*cpu_bootable)(unsigned int nr);
8516-};
8517+} __no_const;
8518
8519 extern void smp_send_debugger_break(void);
8520 extern void start_secondary_resume(void);
8521diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8522index 4dbe072..b803275 100644
8523--- a/arch/powerpc/include/asm/spinlock.h
8524+++ b/arch/powerpc/include/asm/spinlock.h
8525@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8526 __asm__ __volatile__(
8527 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8528 __DO_SIGN_EXTEND
8529-" addic. %0,%0,1\n\
8530- ble- 2f\n"
8531+
8532+#ifdef CONFIG_PAX_REFCOUNT
8533+" mcrxr cr0\n"
8534+" addico. %0,%0,1\n"
8535+" bf 4*cr0+so, 3f\n"
8536+"2:.long " "0x00c00b00""\n"
8537+#else
8538+" addic. %0,%0,1\n"
8539+#endif
8540+
8541+"3:\n"
8542+ "ble- 4f\n"
8543 PPC405_ERR77(0,%1)
8544 " stwcx. %0,0,%1\n\
8545 bne- 1b\n"
8546 PPC_ACQUIRE_BARRIER
8547-"2:" : "=&r" (tmp)
8548+"4:"
8549+
8550+#ifdef CONFIG_PAX_REFCOUNT
8551+ _ASM_EXTABLE(2b,4b)
8552+#endif
8553+
8554+ : "=&r" (tmp)
8555 : "r" (&rw->lock)
8556 : "cr0", "xer", "memory");
8557
8558@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8559 __asm__ __volatile__(
8560 "# read_unlock\n\t"
8561 PPC_RELEASE_BARRIER
8562-"1: lwarx %0,0,%1\n\
8563- addic %0,%0,-1\n"
8564+"1: lwarx %0,0,%1\n"
8565+
8566+#ifdef CONFIG_PAX_REFCOUNT
8567+" mcrxr cr0\n"
8568+" addico. %0,%0,-1\n"
8569+" bf 4*cr0+so, 3f\n"
8570+"2:.long " "0x00c00b00""\n"
8571+#else
8572+" addic. %0,%0,-1\n"
8573+#endif
8574+
8575+"3:\n"
8576 PPC405_ERR77(0,%1)
8577 " stwcx. %0,0,%1\n\
8578 bne- 1b"
8579+
8580+#ifdef CONFIG_PAX_REFCOUNT
8581+"\n4:\n"
8582+ _ASM_EXTABLE(2b, 4b)
8583+#endif
8584+
8585 : "=&r"(tmp)
8586 : "r"(&rw->lock)
8587 : "cr0", "xer", "memory");
8588diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8589index 7248979..80b75de 100644
8590--- a/arch/powerpc/include/asm/thread_info.h
8591+++ b/arch/powerpc/include/asm/thread_info.h
8592@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
8593 #if defined(CONFIG_PPC64)
8594 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8595 #endif
8596+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8597+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8598
8599 /* as above, but as bit values */
8600 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8601@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
8602 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8603 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8604 #define _TIF_NOHZ (1<<TIF_NOHZ)
8605+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8606 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8607 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8608- _TIF_NOHZ)
8609+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8610
8611 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8612 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8613diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8614index a0c071d..49cdc7f 100644
8615--- a/arch/powerpc/include/asm/uaccess.h
8616+++ b/arch/powerpc/include/asm/uaccess.h
8617@@ -58,6 +58,7 @@
8618
8619 #endif
8620
8621+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8622 #define access_ok(type, addr, size) \
8623 (__chk_user_ptr(addr), \
8624 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8625@@ -318,52 +319,6 @@ do { \
8626 extern unsigned long __copy_tofrom_user(void __user *to,
8627 const void __user *from, unsigned long size);
8628
8629-#ifndef __powerpc64__
8630-
8631-static inline unsigned long copy_from_user(void *to,
8632- const void __user *from, unsigned long n)
8633-{
8634- unsigned long over;
8635-
8636- if (access_ok(VERIFY_READ, from, n))
8637- return __copy_tofrom_user((__force void __user *)to, from, n);
8638- if ((unsigned long)from < TASK_SIZE) {
8639- over = (unsigned long)from + n - TASK_SIZE;
8640- return __copy_tofrom_user((__force void __user *)to, from,
8641- n - over) + over;
8642- }
8643- return n;
8644-}
8645-
8646-static inline unsigned long copy_to_user(void __user *to,
8647- const void *from, unsigned long n)
8648-{
8649- unsigned long over;
8650-
8651- if (access_ok(VERIFY_WRITE, to, n))
8652- return __copy_tofrom_user(to, (__force void __user *)from, n);
8653- if ((unsigned long)to < TASK_SIZE) {
8654- over = (unsigned long)to + n - TASK_SIZE;
8655- return __copy_tofrom_user(to, (__force void __user *)from,
8656- n - over) + over;
8657- }
8658- return n;
8659-}
8660-
8661-#else /* __powerpc64__ */
8662-
8663-#define __copy_in_user(to, from, size) \
8664- __copy_tofrom_user((to), (from), (size))
8665-
8666-extern unsigned long copy_from_user(void *to, const void __user *from,
8667- unsigned long n);
8668-extern unsigned long copy_to_user(void __user *to, const void *from,
8669- unsigned long n);
8670-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8671- unsigned long n);
8672-
8673-#endif /* __powerpc64__ */
8674-
8675 static inline unsigned long __copy_from_user_inatomic(void *to,
8676 const void __user *from, unsigned long n)
8677 {
8678@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8679 if (ret == 0)
8680 return 0;
8681 }
8682+
8683+ if (!__builtin_constant_p(n))
8684+ check_object_size(to, n, false);
8685+
8686 return __copy_tofrom_user((__force void __user *)to, from, n);
8687 }
8688
8689@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8690 if (ret == 0)
8691 return 0;
8692 }
8693+
8694+ if (!__builtin_constant_p(n))
8695+ check_object_size(from, n, true);
8696+
8697 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8698 }
8699
8700@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8701 return __copy_to_user_inatomic(to, from, size);
8702 }
8703
8704+#ifndef __powerpc64__
8705+
8706+static inline unsigned long __must_check copy_from_user(void *to,
8707+ const void __user *from, unsigned long n)
8708+{
8709+ unsigned long over;
8710+
8711+ if ((long)n < 0)
8712+ return n;
8713+
8714+ if (access_ok(VERIFY_READ, from, n)) {
8715+ if (!__builtin_constant_p(n))
8716+ check_object_size(to, n, false);
8717+ return __copy_tofrom_user((__force void __user *)to, from, n);
8718+ }
8719+ if ((unsigned long)from < TASK_SIZE) {
8720+ over = (unsigned long)from + n - TASK_SIZE;
8721+ if (!__builtin_constant_p(n - over))
8722+ check_object_size(to, n - over, false);
8723+ return __copy_tofrom_user((__force void __user *)to, from,
8724+ n - over) + over;
8725+ }
8726+ return n;
8727+}
8728+
8729+static inline unsigned long __must_check copy_to_user(void __user *to,
8730+ const void *from, unsigned long n)
8731+{
8732+ unsigned long over;
8733+
8734+ if ((long)n < 0)
8735+ return n;
8736+
8737+ if (access_ok(VERIFY_WRITE, to, n)) {
8738+ if (!__builtin_constant_p(n))
8739+ check_object_size(from, n, true);
8740+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8741+ }
8742+ if ((unsigned long)to < TASK_SIZE) {
8743+ over = (unsigned long)to + n - TASK_SIZE;
8744+ if (!__builtin_constant_p(n))
8745+ check_object_size(from, n - over, true);
8746+ return __copy_tofrom_user(to, (__force void __user *)from,
8747+ n - over) + over;
8748+ }
8749+ return n;
8750+}
8751+
8752+#else /* __powerpc64__ */
8753+
8754+#define __copy_in_user(to, from, size) \
8755+ __copy_tofrom_user((to), (from), (size))
8756+
8757+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8758+{
8759+ if ((long)n < 0 || n > INT_MAX)
8760+ return n;
8761+
8762+ if (!__builtin_constant_p(n))
8763+ check_object_size(to, n, false);
8764+
8765+ if (likely(access_ok(VERIFY_READ, from, n)))
8766+ n = __copy_from_user(to, from, n);
8767+ else
8768+ memset(to, 0, n);
8769+ return n;
8770+}
8771+
8772+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8773+{
8774+ if ((long)n < 0 || n > INT_MAX)
8775+ return n;
8776+
8777+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n, true);
8780+ n = __copy_to_user(to, from, n);
8781+ }
8782+ return n;
8783+}
8784+
8785+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8786+ unsigned long n);
8787+
8788+#endif /* __powerpc64__ */
8789+
8790 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8791
8792 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8793diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8794index 502cf69..53936a1 100644
8795--- a/arch/powerpc/kernel/Makefile
8796+++ b/arch/powerpc/kernel/Makefile
8797@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8798 CFLAGS_btext.o += -fPIC
8799 endif
8800
8801+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8802+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8803+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8804+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8805+
8806 ifdef CONFIG_FUNCTION_TRACER
8807 # Do not trace early boot code
8808 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8809@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8810 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8811 endif
8812
8813+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8814+
8815 obj-y := cputable.o ptrace.o syscalls.o \
8816 irq.o align.o signal_32.o pmc.o vdso.o \
8817 process.o systbl.o idle.o \
8818diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8819index 3e68d1c..72a5ee6 100644
8820--- a/arch/powerpc/kernel/exceptions-64e.S
8821+++ b/arch/powerpc/kernel/exceptions-64e.S
8822@@ -1010,6 +1010,7 @@ storage_fault_common:
8823 std r14,_DAR(r1)
8824 std r15,_DSISR(r1)
8825 addi r3,r1,STACK_FRAME_OVERHEAD
8826+ bl save_nvgprs
8827 mr r4,r14
8828 mr r5,r15
8829 ld r14,PACA_EXGEN+EX_R14(r13)
8830@@ -1018,8 +1019,7 @@ storage_fault_common:
8831 cmpdi r3,0
8832 bne- 1f
8833 b ret_from_except_lite
8834-1: bl save_nvgprs
8835- mr r5,r3
8836+1: mr r5,r3
8837 addi r3,r1,STACK_FRAME_OVERHEAD
8838 ld r4,_DAR(r1)
8839 bl bad_page_fault
8840diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8841index 9519e6b..13f6c38 100644
8842--- a/arch/powerpc/kernel/exceptions-64s.S
8843+++ b/arch/powerpc/kernel/exceptions-64s.S
8844@@ -1599,10 +1599,10 @@ handle_page_fault:
8845 11: ld r4,_DAR(r1)
8846 ld r5,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848+ bl save_nvgprs
8849 bl do_page_fault
8850 cmpdi r3,0
8851 beq+ 12f
8852- bl save_nvgprs
8853 mr r5,r3
8854 addi r3,r1,STACK_FRAME_OVERHEAD
8855 lwz r4,_DAR(r1)
8856diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8857index 4509603..cdb491f 100644
8858--- a/arch/powerpc/kernel/irq.c
8859+++ b/arch/powerpc/kernel/irq.c
8860@@ -460,6 +460,8 @@ void migrate_irqs(void)
8861 }
8862 #endif
8863
8864+extern void gr_handle_kernel_exploit(void);
8865+
8866 static inline void check_stack_overflow(void)
8867 {
8868 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8869@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8870 pr_err("do_IRQ: stack overflow: %ld\n",
8871 sp - sizeof(struct thread_info));
8872 dump_stack();
8873+ gr_handle_kernel_exploit();
8874 }
8875 #endif
8876 }
8877diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8878index c94d2e0..992a9ce 100644
8879--- a/arch/powerpc/kernel/module_32.c
8880+++ b/arch/powerpc/kernel/module_32.c
8881@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8882 me->arch.core_plt_section = i;
8883 }
8884 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8885- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8886+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8887 return -ENOEXEC;
8888 }
8889
8890@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8891
8892 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8893 /* Init, or core PLT? */
8894- if (location >= mod->module_core
8895- && location < mod->module_core + mod->core_size)
8896+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8897+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8898 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8899- else
8900+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8901+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8902 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8903+ else {
8904+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8905+ return ~0UL;
8906+ }
8907
8908 /* Find this entry, or if that fails, the next avail. entry */
8909 while (entry->jump[0]) {
8910@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8911 }
8912 #ifdef CONFIG_DYNAMIC_FTRACE
8913 module->arch.tramp =
8914- do_plt_call(module->module_core,
8915+ do_plt_call(module->module_core_rx,
8916 (unsigned long)ftrace_caller,
8917 sechdrs, module);
8918 #endif
8919diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8920index b4cc7be..1fe8bb3 100644
8921--- a/arch/powerpc/kernel/process.c
8922+++ b/arch/powerpc/kernel/process.c
8923@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8924 * Lookup NIP late so we have the best change of getting the
8925 * above info out without failing
8926 */
8927- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8928- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8929+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8930+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8931 #endif
8932 show_stack(current, (unsigned long *) regs->gpr[1]);
8933 if (!user_mode(regs))
8934@@ -1549,10 +1549,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8935 newsp = stack[0];
8936 ip = stack[STACK_FRAME_LR_SAVE];
8937 if (!firstframe || ip != lr) {
8938- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8939+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8940 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8941 if ((ip == rth) && curr_frame >= 0) {
8942- printk(" (%pS)",
8943+ printk(" (%pA)",
8944 (void *)current->ret_stack[curr_frame].ret);
8945 curr_frame--;
8946 }
8947@@ -1572,7 +1572,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8948 struct pt_regs *regs = (struct pt_regs *)
8949 (sp + STACK_FRAME_OVERHEAD);
8950 lr = regs->link;
8951- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8952+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8953 regs->trap, (void *)regs->nip, (void *)lr);
8954 firstframe = 1;
8955 }
8956@@ -1608,49 +1608,3 @@ void notrace __ppc64_runlatch_off(void)
8957 mtspr(SPRN_CTRLT, ctrl);
8958 }
8959 #endif /* CONFIG_PPC64 */
8960-
8961-unsigned long arch_align_stack(unsigned long sp)
8962-{
8963- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8964- sp -= get_random_int() & ~PAGE_MASK;
8965- return sp & ~0xf;
8966-}
8967-
8968-static inline unsigned long brk_rnd(void)
8969-{
8970- unsigned long rnd = 0;
8971-
8972- /* 8MB for 32bit, 1GB for 64bit */
8973- if (is_32bit_task())
8974- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8975- else
8976- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8977-
8978- return rnd << PAGE_SHIFT;
8979-}
8980-
8981-unsigned long arch_randomize_brk(struct mm_struct *mm)
8982-{
8983- unsigned long base = mm->brk;
8984- unsigned long ret;
8985-
8986-#ifdef CONFIG_PPC_STD_MMU_64
8987- /*
8988- * If we are using 1TB segments and we are allowed to randomise
8989- * the heap, we can put it above 1TB so it is backed by a 1TB
8990- * segment. Otherwise the heap will be in the bottom 1TB
8991- * which always uses 256MB segments and this may result in a
8992- * performance penalty.
8993- */
8994- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8995- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8996-#endif
8997-
8998- ret = PAGE_ALIGN(base + brk_rnd());
8999-
9000- if (ret < mm->brk)
9001- return mm->brk;
9002-
9003- return ret;
9004-}
9005-
9006diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9007index f21897b..28c0428 100644
9008--- a/arch/powerpc/kernel/ptrace.c
9009+++ b/arch/powerpc/kernel/ptrace.c
9010@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9011 return ret;
9012 }
9013
9014+#ifdef CONFIG_GRKERNSEC_SETXID
9015+extern void gr_delayed_cred_worker(void);
9016+#endif
9017+
9018 /*
9019 * We must return the syscall number to actually look up in the table.
9020 * This can be -1L to skip running any syscall at all.
9021@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9022
9023 secure_computing_strict(regs->gpr[0]);
9024
9025+#ifdef CONFIG_GRKERNSEC_SETXID
9026+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9027+ gr_delayed_cred_worker();
9028+#endif
9029+
9030 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9031 tracehook_report_syscall_entry(regs))
9032 /*
9033@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9034 {
9035 int step;
9036
9037+#ifdef CONFIG_GRKERNSEC_SETXID
9038+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9039+ gr_delayed_cred_worker();
9040+#endif
9041+
9042 audit_syscall_exit(regs);
9043
9044 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9045diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9046index d3a831a..3a33123 100644
9047--- a/arch/powerpc/kernel/signal_32.c
9048+++ b/arch/powerpc/kernel/signal_32.c
9049@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9050 /* Save user registers on the stack */
9051 frame = &rt_sf->uc.uc_mcontext;
9052 addr = frame;
9053- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9054+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9055 sigret = 0;
9056 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9057 } else {
9058diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9059index c7c24d2..1bf7039 100644
9060--- a/arch/powerpc/kernel/signal_64.c
9061+++ b/arch/powerpc/kernel/signal_64.c
9062@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9063 current->thread.fp_state.fpscr = 0;
9064
9065 /* Set up to return from userspace. */
9066- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9067+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9068 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9069 } else {
9070 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9071diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9072index 19e4744..28a8d7b 100644
9073--- a/arch/powerpc/kernel/traps.c
9074+++ b/arch/powerpc/kernel/traps.c
9075@@ -36,6 +36,7 @@
9076 #include <linux/debugfs.h>
9077 #include <linux/ratelimit.h>
9078 #include <linux/context_tracking.h>
9079+#include <linux/uaccess.h>
9080
9081 #include <asm/emulated_ops.h>
9082 #include <asm/pgtable.h>
9083@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9084 return flags;
9085 }
9086
9087+extern void gr_handle_kernel_exploit(void);
9088+
9089 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9090 int signr)
9091 {
9092@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9093 panic("Fatal exception in interrupt");
9094 if (panic_on_oops)
9095 panic("Fatal exception");
9096+
9097+ gr_handle_kernel_exploit();
9098+
9099 do_exit(signr);
9100 }
9101
9102@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9103 enum ctx_state prev_state = exception_enter();
9104 unsigned int reason = get_reason(regs);
9105
9106+#ifdef CONFIG_PAX_REFCOUNT
9107+ unsigned int bkpt;
9108+ const struct exception_table_entry *entry;
9109+
9110+ if (reason & REASON_ILLEGAL) {
9111+ /* Check if PaX bad instruction */
9112+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9113+ current->thread.trap_nr = 0;
9114+ pax_report_refcount_overflow(regs);
9115+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9116+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9117+ regs->nip = entry->fixup;
9118+ return;
9119+ }
9120+ /* fixup_exception() could not handle */
9121+ goto bail;
9122+ }
9123+ }
9124+#endif
9125+
9126 /* We can now get here via a FP Unavailable exception if the core
9127 * has no FPU, in that case the reason flags will be 0 */
9128
9129diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9130index 305eb0d..accc5b40 100644
9131--- a/arch/powerpc/kernel/vdso.c
9132+++ b/arch/powerpc/kernel/vdso.c
9133@@ -34,6 +34,7 @@
9134 #include <asm/vdso.h>
9135 #include <asm/vdso_datapage.h>
9136 #include <asm/setup.h>
9137+#include <asm/mman.h>
9138
9139 #undef DEBUG
9140
9141@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9142 vdso_base = VDSO32_MBASE;
9143 #endif
9144
9145- current->mm->context.vdso_base = 0;
9146+ current->mm->context.vdso_base = ~0UL;
9147
9148 /* vDSO has a problem and was disabled, just don't "enable" it for the
9149 * process
9150@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9151 vdso_base = get_unmapped_area(NULL, vdso_base,
9152 (vdso_pages << PAGE_SHIFT) +
9153 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9154- 0, 0);
9155+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9156 if (IS_ERR_VALUE(vdso_base)) {
9157 rc = vdso_base;
9158 goto fail_mmapsem;
9159diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9160index 27c0fac..6ec4a32 100644
9161--- a/arch/powerpc/kvm/powerpc.c
9162+++ b/arch/powerpc/kvm/powerpc.c
9163@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9164 }
9165 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9166
9167-int kvm_arch_init(void *opaque)
9168+int kvm_arch_init(const void *opaque)
9169 {
9170 return 0;
9171 }
9172diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9173index 5eea6f3..5d10396 100644
9174--- a/arch/powerpc/lib/usercopy_64.c
9175+++ b/arch/powerpc/lib/usercopy_64.c
9176@@ -9,22 +9,6 @@
9177 #include <linux/module.h>
9178 #include <asm/uaccess.h>
9179
9180-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9181-{
9182- if (likely(access_ok(VERIFY_READ, from, n)))
9183- n = __copy_from_user(to, from, n);
9184- else
9185- memset(to, 0, n);
9186- return n;
9187-}
9188-
9189-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9190-{
9191- if (likely(access_ok(VERIFY_WRITE, to, n)))
9192- n = __copy_to_user(to, from, n);
9193- return n;
9194-}
9195-
9196 unsigned long copy_in_user(void __user *to, const void __user *from,
9197 unsigned long n)
9198 {
9199@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9200 return n;
9201 }
9202
9203-EXPORT_SYMBOL(copy_from_user);
9204-EXPORT_SYMBOL(copy_to_user);
9205 EXPORT_SYMBOL(copy_in_user);
9206
9207diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9208index b396868..3eb6b9f 100644
9209--- a/arch/powerpc/mm/fault.c
9210+++ b/arch/powerpc/mm/fault.c
9211@@ -33,6 +33,10 @@
9212 #include <linux/ratelimit.h>
9213 #include <linux/context_tracking.h>
9214 #include <linux/hugetlb.h>
9215+#include <linux/slab.h>
9216+#include <linux/pagemap.h>
9217+#include <linux/compiler.h>
9218+#include <linux/unistd.h>
9219
9220 #include <asm/firmware.h>
9221 #include <asm/page.h>
9222@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9223 }
9224 #endif
9225
9226+#ifdef CONFIG_PAX_PAGEEXEC
9227+/*
9228+ * PaX: decide what to do with offenders (regs->nip = fault address)
9229+ *
9230+ * returns 1 when task should be killed
9231+ */
9232+static int pax_handle_fetch_fault(struct pt_regs *regs)
9233+{
9234+ return 1;
9235+}
9236+
9237+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9238+{
9239+ unsigned long i;
9240+
9241+ printk(KERN_ERR "PAX: bytes at PC: ");
9242+ for (i = 0; i < 5; i++) {
9243+ unsigned int c;
9244+ if (get_user(c, (unsigned int __user *)pc+i))
9245+ printk(KERN_CONT "???????? ");
9246+ else
9247+ printk(KERN_CONT "%08x ", c);
9248+ }
9249+ printk("\n");
9250+}
9251+#endif
9252+
9253 /*
9254 * Check whether the instruction at regs->nip is a store using
9255 * an update addressing form which will update r1.
9256@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9257 * indicate errors in DSISR but can validly be set in SRR1.
9258 */
9259 if (trap == 0x400)
9260- error_code &= 0x48200000;
9261+ error_code &= 0x58200000;
9262 else
9263 is_write = error_code & DSISR_ISSTORE;
9264 #else
9265@@ -383,12 +414,16 @@ good_area:
9266 * "undefined". Of those that can be set, this is the only
9267 * one which seems bad.
9268 */
9269- if (error_code & 0x10000000)
9270+ if (error_code & DSISR_GUARDED)
9271 /* Guarded storage error. */
9272 goto bad_area;
9273 #endif /* CONFIG_8xx */
9274
9275 if (is_exec) {
9276+#ifdef CONFIG_PPC_STD_MMU
9277+ if (error_code & DSISR_GUARDED)
9278+ goto bad_area;
9279+#endif
9280 /*
9281 * Allow execution from readable areas if the MMU does not
9282 * provide separate controls over reading and executing.
9283@@ -483,6 +518,23 @@ bad_area:
9284 bad_area_nosemaphore:
9285 /* User mode accesses cause a SIGSEGV */
9286 if (user_mode(regs)) {
9287+
9288+#ifdef CONFIG_PAX_PAGEEXEC
9289+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9290+#ifdef CONFIG_PPC_STD_MMU
9291+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9292+#else
9293+ if (is_exec && regs->nip == address) {
9294+#endif
9295+ switch (pax_handle_fetch_fault(regs)) {
9296+ }
9297+
9298+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9299+ do_group_exit(SIGKILL);
9300+ }
9301+ }
9302+#endif
9303+
9304 _exception(SIGSEGV, regs, code, address);
9305 goto bail;
9306 }
9307diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9308index cb8bdbe..cde4bc7 100644
9309--- a/arch/powerpc/mm/mmap.c
9310+++ b/arch/powerpc/mm/mmap.c
9311@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9312 return sysctl_legacy_va_layout;
9313 }
9314
9315-static unsigned long mmap_rnd(void)
9316+static unsigned long mmap_rnd(struct mm_struct *mm)
9317 {
9318 unsigned long rnd = 0;
9319
9320+#ifdef CONFIG_PAX_RANDMMAP
9321+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9322+#endif
9323+
9324 if (current->flags & PF_RANDOMIZE) {
9325 /* 8MB for 32bit, 1GB for 64bit */
9326 if (is_32bit_task())
9327@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9328 return rnd << PAGE_SHIFT;
9329 }
9330
9331-static inline unsigned long mmap_base(void)
9332+static inline unsigned long mmap_base(struct mm_struct *mm)
9333 {
9334 unsigned long gap = rlimit(RLIMIT_STACK);
9335
9336@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9337 else if (gap > MAX_GAP)
9338 gap = MAX_GAP;
9339
9340- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9341+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9342 }
9343
9344 /*
9345@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9346 */
9347 if (mmap_is_legacy()) {
9348 mm->mmap_base = TASK_UNMAPPED_BASE;
9349+
9350+#ifdef CONFIG_PAX_RANDMMAP
9351+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9352+ mm->mmap_base += mm->delta_mmap;
9353+#endif
9354+
9355 mm->get_unmapped_area = arch_get_unmapped_area;
9356 } else {
9357- mm->mmap_base = mmap_base();
9358+ mm->mmap_base = mmap_base(mm);
9359+
9360+#ifdef CONFIG_PAX_RANDMMAP
9361+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9362+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9363+#endif
9364+
9365 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9366 }
9367 }
9368diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9369index 0f432a7..abfe841 100644
9370--- a/arch/powerpc/mm/slice.c
9371+++ b/arch/powerpc/mm/slice.c
9372@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9373 if ((mm->task_size - len) < addr)
9374 return 0;
9375 vma = find_vma(mm, addr);
9376- return (!vma || (addr + len) <= vma->vm_start);
9377+ return check_heap_stack_gap(vma, addr, len, 0);
9378 }
9379
9380 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9381@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9382 info.align_offset = 0;
9383
9384 addr = TASK_UNMAPPED_BASE;
9385+
9386+#ifdef CONFIG_PAX_RANDMMAP
9387+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9388+ addr += mm->delta_mmap;
9389+#endif
9390+
9391 while (addr < TASK_SIZE) {
9392 info.low_limit = addr;
9393 if (!slice_scan_available(addr, available, 1, &addr))
9394@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9395 if (fixed && addr > (mm->task_size - len))
9396 return -ENOMEM;
9397
9398+#ifdef CONFIG_PAX_RANDMMAP
9399+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9400+ addr = 0;
9401+#endif
9402+
9403 /* If hint, make sure it matches our alignment restrictions */
9404 if (!fixed && addr) {
9405 addr = _ALIGN_UP(addr, 1ul << pshift);
9406diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9407index d966bbe..372124a 100644
9408--- a/arch/powerpc/platforms/cell/spufs/file.c
9409+++ b/arch/powerpc/platforms/cell/spufs/file.c
9410@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9411 return VM_FAULT_NOPAGE;
9412 }
9413
9414-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9415+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9416 unsigned long address,
9417- void *buf, int len, int write)
9418+ void *buf, size_t len, int write)
9419 {
9420 struct spu_context *ctx = vma->vm_file->private_data;
9421 unsigned long offset = address - vma->vm_start;
9422diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9423index fa934fe..c296056 100644
9424--- a/arch/s390/include/asm/atomic.h
9425+++ b/arch/s390/include/asm/atomic.h
9426@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9427 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9428 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9429
9430+#define atomic64_read_unchecked(v) atomic64_read(v)
9431+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9432+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9433+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9434+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9435+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9436+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9437+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9438+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9439+
9440 #endif /* __ARCH_S390_ATOMIC__ */
9441diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9442index 8d72471..5322500 100644
9443--- a/arch/s390/include/asm/barrier.h
9444+++ b/arch/s390/include/asm/barrier.h
9445@@ -42,7 +42,7 @@
9446 do { \
9447 compiletime_assert_atomic_type(*p); \
9448 barrier(); \
9449- ACCESS_ONCE(*p) = (v); \
9450+ ACCESS_ONCE_RW(*p) = (v); \
9451 } while (0)
9452
9453 #define smp_load_acquire(p) \
9454diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9455index 4d7ccac..d03d0ad 100644
9456--- a/arch/s390/include/asm/cache.h
9457+++ b/arch/s390/include/asm/cache.h
9458@@ -9,8 +9,10 @@
9459 #ifndef __ARCH_S390_CACHE_H
9460 #define __ARCH_S390_CACHE_H
9461
9462-#define L1_CACHE_BYTES 256
9463+#include <linux/const.h>
9464+
9465 #define L1_CACHE_SHIFT 8
9466+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9467 #define NET_SKB_PAD 32
9468
9469 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9470diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9471index c9c875d..b4b0e4c 100644
9472--- a/arch/s390/include/asm/elf.h
9473+++ b/arch/s390/include/asm/elf.h
9474@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9475 the loader. We need to make sure that it is out of the way of the program
9476 that it will "exec", and that there is sufficient room for the brk. */
9477
9478-extern unsigned long randomize_et_dyn(void);
9479-#define ELF_ET_DYN_BASE randomize_et_dyn()
9480+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9481+
9482+#ifdef CONFIG_PAX_ASLR
9483+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9484+
9485+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9486+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9487+#endif
9488
9489 /* This yields a mask that user programs can use to figure out what
9490 instruction set this CPU supports. */
9491@@ -225,9 +231,6 @@ struct linux_binprm;
9492 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9493 int arch_setup_additional_pages(struct linux_binprm *, int);
9494
9495-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9496-#define arch_randomize_brk arch_randomize_brk
9497-
9498 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9499
9500 #endif
9501diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9502index c4a93d6..4d2a9b4 100644
9503--- a/arch/s390/include/asm/exec.h
9504+++ b/arch/s390/include/asm/exec.h
9505@@ -7,6 +7,6 @@
9506 #ifndef __ASM_EXEC_H
9507 #define __ASM_EXEC_H
9508
9509-extern unsigned long arch_align_stack(unsigned long sp);
9510+#define arch_align_stack(x) ((x) & ~0xfUL)
9511
9512 #endif /* __ASM_EXEC_H */
9513diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9514index cd4c68e..6764641 100644
9515--- a/arch/s390/include/asm/uaccess.h
9516+++ b/arch/s390/include/asm/uaccess.h
9517@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9518 __range_ok((unsigned long)(addr), (size)); \
9519 })
9520
9521+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9522 #define access_ok(type, addr, size) __access_ok(addr, size)
9523
9524 /*
9525@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9526 copy_to_user(void __user *to, const void *from, unsigned long n)
9527 {
9528 might_fault();
9529+
9530+ if ((long)n < 0)
9531+ return n;
9532+
9533 return __copy_to_user(to, from, n);
9534 }
9535
9536@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9537 static inline unsigned long __must_check
9538 copy_from_user(void *to, const void __user *from, unsigned long n)
9539 {
9540- unsigned int sz = __compiletime_object_size(to);
9541+ size_t sz = __compiletime_object_size(to);
9542
9543 might_fault();
9544- if (unlikely(sz != -1 && sz < n)) {
9545+
9546+ if ((long)n < 0)
9547+ return n;
9548+
9549+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9550 copy_from_user_overflow();
9551 return n;
9552 }
9553diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9554index 2ca9586..55682a9 100644
9555--- a/arch/s390/kernel/module.c
9556+++ b/arch/s390/kernel/module.c
9557@@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9558
9559 /* Increase core size by size of got & plt and set start
9560 offsets for got and plt. */
9561- me->core_size = ALIGN(me->core_size, 4);
9562- me->arch.got_offset = me->core_size;
9563- me->core_size += me->arch.got_size;
9564- me->arch.plt_offset = me->core_size;
9565- me->core_size += me->arch.plt_size;
9566+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9567+ me->arch.got_offset = me->core_size_rw;
9568+ me->core_size_rw += me->arch.got_size;
9569+ me->arch.plt_offset = me->core_size_rx;
9570+ me->core_size_rx += me->arch.plt_size;
9571 return 0;
9572 }
9573
9574@@ -285,7 +285,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9575 if (info->got_initialized == 0) {
9576 Elf_Addr *gotent;
9577
9578- gotent = me->module_core + me->arch.got_offset +
9579+ gotent = me->module_core_rw + me->arch.got_offset +
9580 info->got_offset;
9581 *gotent = val;
9582 info->got_initialized = 1;
9583@@ -308,7 +308,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9584 rc = apply_rela_bits(loc, val, 0, 64, 0);
9585 else if (r_type == R_390_GOTENT ||
9586 r_type == R_390_GOTPLTENT) {
9587- val += (Elf_Addr) me->module_core - loc;
9588+ val += (Elf_Addr) me->module_core_rw - loc;
9589 rc = apply_rela_bits(loc, val, 1, 32, 1);
9590 }
9591 break;
9592@@ -321,7 +321,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9593 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9594 if (info->plt_initialized == 0) {
9595 unsigned int *ip;
9596- ip = me->module_core + me->arch.plt_offset +
9597+ ip = me->module_core_rx + me->arch.plt_offset +
9598 info->plt_offset;
9599 #ifndef CONFIG_64BIT
9600 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9601@@ -346,7 +346,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9602 val - loc + 0xffffUL < 0x1ffffeUL) ||
9603 (r_type == R_390_PLT32DBL &&
9604 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9605- val = (Elf_Addr) me->module_core +
9606+ val = (Elf_Addr) me->module_core_rx +
9607 me->arch.plt_offset +
9608 info->plt_offset;
9609 val += rela->r_addend - loc;
9610@@ -368,7 +368,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9611 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9612 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9613 val = val + rela->r_addend -
9614- ((Elf_Addr) me->module_core + me->arch.got_offset);
9615+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9616 if (r_type == R_390_GOTOFF16)
9617 rc = apply_rela_bits(loc, val, 0, 16, 0);
9618 else if (r_type == R_390_GOTOFF32)
9619@@ -378,7 +378,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9620 break;
9621 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9622 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9623- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9624+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9625 rela->r_addend - loc;
9626 if (r_type == R_390_GOTPC)
9627 rc = apply_rela_bits(loc, val, 1, 32, 0);
9628diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9629index 13fc097..84d375f 100644
9630--- a/arch/s390/kernel/process.c
9631+++ b/arch/s390/kernel/process.c
9632@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
9633 }
9634 return 0;
9635 }
9636-
9637-unsigned long arch_align_stack(unsigned long sp)
9638-{
9639- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9640- sp -= get_random_int() & ~PAGE_MASK;
9641- return sp & ~0xf;
9642-}
9643-
9644-static inline unsigned long brk_rnd(void)
9645-{
9646- /* 8MB for 32bit, 1GB for 64bit */
9647- if (is_32bit_task())
9648- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9649- else
9650- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9651-}
9652-
9653-unsigned long arch_randomize_brk(struct mm_struct *mm)
9654-{
9655- unsigned long ret;
9656-
9657- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9658- return (ret > mm->brk) ? ret : mm->brk;
9659-}
9660diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9661index 179a2c2..4ba9137 100644
9662--- a/arch/s390/mm/mmap.c
9663+++ b/arch/s390/mm/mmap.c
9664@@ -62,6 +62,12 @@ static inline int mmap_is_legacy(void)
9665
9666 static unsigned long mmap_rnd(void)
9667 {
9668+
9669+#ifdef CONFIG_PAX_RANDMMAP
9670+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
9671+ return 0;
9672+#endif
9673+
9674 if (!(current->flags & PF_RANDOMIZE))
9675 return 0;
9676 if (is_32bit_task())
9677@@ -204,9 +210,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9678 */
9679 if (mmap_is_legacy()) {
9680 mm->mmap_base = mmap_base_legacy();
9681+
9682+#ifdef CONFIG_PAX_RANDMMAP
9683+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9684+ mm->mmap_base += mm->delta_mmap;
9685+#endif
9686+
9687 mm->get_unmapped_area = arch_get_unmapped_area;
9688 } else {
9689 mm->mmap_base = mmap_base();
9690+
9691+#ifdef CONFIG_PAX_RANDMMAP
9692+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9693+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9694+#endif
9695+
9696 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9697 }
9698 }
9699@@ -279,9 +297,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9700 */
9701 if (mmap_is_legacy()) {
9702 mm->mmap_base = mmap_base_legacy();
9703+
9704+#ifdef CONFIG_PAX_RANDMMAP
9705+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9706+ mm->mmap_base += mm->delta_mmap;
9707+#endif
9708+
9709 mm->get_unmapped_area = s390_get_unmapped_area;
9710 } else {
9711 mm->mmap_base = mmap_base();
9712+
9713+#ifdef CONFIG_PAX_RANDMMAP
9714+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9715+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9716+#endif
9717+
9718 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9719 }
9720 }
9721diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9722index ae3d59f..f65f075 100644
9723--- a/arch/score/include/asm/cache.h
9724+++ b/arch/score/include/asm/cache.h
9725@@ -1,7 +1,9 @@
9726 #ifndef _ASM_SCORE_CACHE_H
9727 #define _ASM_SCORE_CACHE_H
9728
9729+#include <linux/const.h>
9730+
9731 #define L1_CACHE_SHIFT 4
9732-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9733+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9734
9735 #endif /* _ASM_SCORE_CACHE_H */
9736diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9737index f9f3cd5..58ff438 100644
9738--- a/arch/score/include/asm/exec.h
9739+++ b/arch/score/include/asm/exec.h
9740@@ -1,6 +1,6 @@
9741 #ifndef _ASM_SCORE_EXEC_H
9742 #define _ASM_SCORE_EXEC_H
9743
9744-extern unsigned long arch_align_stack(unsigned long sp);
9745+#define arch_align_stack(x) (x)
9746
9747 #endif /* _ASM_SCORE_EXEC_H */
9748diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9749index a1519ad3..e8ac1ff 100644
9750--- a/arch/score/kernel/process.c
9751+++ b/arch/score/kernel/process.c
9752@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9753
9754 return task_pt_regs(task)->cp0_epc;
9755 }
9756-
9757-unsigned long arch_align_stack(unsigned long sp)
9758-{
9759- return sp;
9760-}
9761diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9762index ef9e555..331bd29 100644
9763--- a/arch/sh/include/asm/cache.h
9764+++ b/arch/sh/include/asm/cache.h
9765@@ -9,10 +9,11 @@
9766 #define __ASM_SH_CACHE_H
9767 #ifdef __KERNEL__
9768
9769+#include <linux/const.h>
9770 #include <linux/init.h>
9771 #include <cpu/cache.h>
9772
9773-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9774+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9775
9776 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9777
9778diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9779index 6777177..cb5e44f 100644
9780--- a/arch/sh/mm/mmap.c
9781+++ b/arch/sh/mm/mmap.c
9782@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9783 struct mm_struct *mm = current->mm;
9784 struct vm_area_struct *vma;
9785 int do_colour_align;
9786+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9787 struct vm_unmapped_area_info info;
9788
9789 if (flags & MAP_FIXED) {
9790@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9791 if (filp || (flags & MAP_SHARED))
9792 do_colour_align = 1;
9793
9794+#ifdef CONFIG_PAX_RANDMMAP
9795+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9796+#endif
9797+
9798 if (addr) {
9799 if (do_colour_align)
9800 addr = COLOUR_ALIGN(addr, pgoff);
9801@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9802 addr = PAGE_ALIGN(addr);
9803
9804 vma = find_vma(mm, addr);
9805- if (TASK_SIZE - len >= addr &&
9806- (!vma || addr + len <= vma->vm_start))
9807+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9808 return addr;
9809 }
9810
9811 info.flags = 0;
9812 info.length = len;
9813- info.low_limit = TASK_UNMAPPED_BASE;
9814+ info.low_limit = mm->mmap_base;
9815 info.high_limit = TASK_SIZE;
9816 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9817 info.align_offset = pgoff << PAGE_SHIFT;
9818@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9819 struct mm_struct *mm = current->mm;
9820 unsigned long addr = addr0;
9821 int do_colour_align;
9822+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9823 struct vm_unmapped_area_info info;
9824
9825 if (flags & MAP_FIXED) {
9826@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9827 if (filp || (flags & MAP_SHARED))
9828 do_colour_align = 1;
9829
9830+#ifdef CONFIG_PAX_RANDMMAP
9831+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9832+#endif
9833+
9834 /* requesting a specific address */
9835 if (addr) {
9836 if (do_colour_align)
9837@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9838 addr = PAGE_ALIGN(addr);
9839
9840 vma = find_vma(mm, addr);
9841- if (TASK_SIZE - len >= addr &&
9842- (!vma || addr + len <= vma->vm_start))
9843+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9844 return addr;
9845 }
9846
9847@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9848 VM_BUG_ON(addr != -ENOMEM);
9849 info.flags = 0;
9850 info.low_limit = TASK_UNMAPPED_BASE;
9851+
9852+#ifdef CONFIG_PAX_RANDMMAP
9853+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9854+ info.low_limit += mm->delta_mmap;
9855+#endif
9856+
9857 info.high_limit = TASK_SIZE;
9858 addr = vm_unmapped_area(&info);
9859 }
9860diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9861index 4082749..fd97781 100644
9862--- a/arch/sparc/include/asm/atomic_64.h
9863+++ b/arch/sparc/include/asm/atomic_64.h
9864@@ -15,18 +15,38 @@
9865 #define ATOMIC64_INIT(i) { (i) }
9866
9867 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9868+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9869+{
9870+ return ACCESS_ONCE(v->counter);
9871+}
9872 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9873+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9874+{
9875+ return ACCESS_ONCE(v->counter);
9876+}
9877
9878 #define atomic_set(v, i) (((v)->counter) = i)
9879+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9880+{
9881+ v->counter = i;
9882+}
9883 #define atomic64_set(v, i) (((v)->counter) = i)
9884+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9885+{
9886+ v->counter = i;
9887+}
9888
9889-#define ATOMIC_OP(op) \
9890-void atomic_##op(int, atomic_t *); \
9891-void atomic64_##op(long, atomic64_t *);
9892+#define __ATOMIC_OP(op, suffix) \
9893+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9894+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9895
9896-#define ATOMIC_OP_RETURN(op) \
9897-int atomic_##op##_return(int, atomic_t *); \
9898-long atomic64_##op##_return(long, atomic64_t *);
9899+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9900+
9901+#define __ATOMIC_OP_RETURN(op, suffix) \
9902+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9903+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9904+
9905+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9906
9907 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9908
9909@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9910
9911 #undef ATOMIC_OPS
9912 #undef ATOMIC_OP_RETURN
9913+#undef __ATOMIC_OP_RETURN
9914 #undef ATOMIC_OP
9915+#undef __ATOMIC_OP
9916
9917 #define atomic_dec_return(v) atomic_sub_return(1, v)
9918 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9919
9920 #define atomic_inc_return(v) atomic_add_return(1, v)
9921+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9922+{
9923+ return atomic_add_return_unchecked(1, v);
9924+}
9925 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9926+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9927+{
9928+ return atomic64_add_return_unchecked(1, v);
9929+}
9930
9931 /*
9932 * atomic_inc_and_test - increment and test
9933@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9934 * other cases.
9935 */
9936 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9937+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9938+{
9939+ return atomic_inc_return_unchecked(v) == 0;
9940+}
9941 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9942
9943 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9944@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9945 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9946
9947 #define atomic_inc(v) atomic_add(1, v)
9948+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9949+{
9950+ atomic_add_unchecked(1, v);
9951+}
9952 #define atomic64_inc(v) atomic64_add(1, v)
9953+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9954+{
9955+ atomic64_add_unchecked(1, v);
9956+}
9957
9958 #define atomic_dec(v) atomic_sub(1, v)
9959+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9960+{
9961+ atomic_sub_unchecked(1, v);
9962+}
9963 #define atomic64_dec(v) atomic64_sub(1, v)
9964+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9965+{
9966+ atomic64_sub_unchecked(1, v);
9967+}
9968
9969 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9970 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9971
9972 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9973+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9974+{
9975+ return cmpxchg(&v->counter, old, new);
9976+}
9977 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9978+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9979+{
9980+ return xchg(&v->counter, new);
9981+}
9982
9983 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9984 {
9985- int c, old;
9986+ int c, old, new;
9987 c = atomic_read(v);
9988 for (;;) {
9989- if (unlikely(c == (u)))
9990+ if (unlikely(c == u))
9991 break;
9992- old = atomic_cmpxchg((v), c, c + (a));
9993+
9994+ asm volatile("addcc %2, %0, %0\n"
9995+
9996+#ifdef CONFIG_PAX_REFCOUNT
9997+ "tvs %%icc, 6\n"
9998+#endif
9999+
10000+ : "=r" (new)
10001+ : "0" (c), "ir" (a)
10002+ : "cc");
10003+
10004+ old = atomic_cmpxchg(v, c, new);
10005 if (likely(old == c))
10006 break;
10007 c = old;
10008@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10009 #define atomic64_cmpxchg(v, o, n) \
10010 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10011 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10012+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10013+{
10014+ return xchg(&v->counter, new);
10015+}
10016
10017 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10018 {
10019- long c, old;
10020+ long c, old, new;
10021 c = atomic64_read(v);
10022 for (;;) {
10023- if (unlikely(c == (u)))
10024+ if (unlikely(c == u))
10025 break;
10026- old = atomic64_cmpxchg((v), c, c + (a));
10027+
10028+ asm volatile("addcc %2, %0, %0\n"
10029+
10030+#ifdef CONFIG_PAX_REFCOUNT
10031+ "tvs %%xcc, 6\n"
10032+#endif
10033+
10034+ : "=r" (new)
10035+ : "0" (c), "ir" (a)
10036+ : "cc");
10037+
10038+ old = atomic64_cmpxchg(v, c, new);
10039 if (likely(old == c))
10040 break;
10041 c = old;
10042 }
10043- return c != (u);
10044+ return c != u;
10045 }
10046
10047 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10048diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10049index 7664894..45a974b 100644
10050--- a/arch/sparc/include/asm/barrier_64.h
10051+++ b/arch/sparc/include/asm/barrier_64.h
10052@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10053 do { \
10054 compiletime_assert_atomic_type(*p); \
10055 barrier(); \
10056- ACCESS_ONCE(*p) = (v); \
10057+ ACCESS_ONCE_RW(*p) = (v); \
10058 } while (0)
10059
10060 #define smp_load_acquire(p) \
10061diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10062index 5bb6991..5c2132e 100644
10063--- a/arch/sparc/include/asm/cache.h
10064+++ b/arch/sparc/include/asm/cache.h
10065@@ -7,10 +7,12 @@
10066 #ifndef _SPARC_CACHE_H
10067 #define _SPARC_CACHE_H
10068
10069+#include <linux/const.h>
10070+
10071 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10072
10073 #define L1_CACHE_SHIFT 5
10074-#define L1_CACHE_BYTES 32
10075+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10076
10077 #ifdef CONFIG_SPARC32
10078 #define SMP_CACHE_BYTES_SHIFT 5
10079diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10080index a24e41f..47677ff 100644
10081--- a/arch/sparc/include/asm/elf_32.h
10082+++ b/arch/sparc/include/asm/elf_32.h
10083@@ -114,6 +114,13 @@ typedef struct {
10084
10085 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10086
10087+#ifdef CONFIG_PAX_ASLR
10088+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10089+
10090+#define PAX_DELTA_MMAP_LEN 16
10091+#define PAX_DELTA_STACK_LEN 16
10092+#endif
10093+
10094 /* This yields a mask that user programs can use to figure out what
10095 instruction set this cpu supports. This can NOT be done in userspace
10096 on Sparc. */
10097diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10098index 370ca1e..d4f4a98 100644
10099--- a/arch/sparc/include/asm/elf_64.h
10100+++ b/arch/sparc/include/asm/elf_64.h
10101@@ -189,6 +189,13 @@ typedef struct {
10102 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10103 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10104
10105+#ifdef CONFIG_PAX_ASLR
10106+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10107+
10108+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10109+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10110+#endif
10111+
10112 extern unsigned long sparc64_elf_hwcap;
10113 #define ELF_HWCAP sparc64_elf_hwcap
10114
10115diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10116index a3890da..f6a408e 100644
10117--- a/arch/sparc/include/asm/pgalloc_32.h
10118+++ b/arch/sparc/include/asm/pgalloc_32.h
10119@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10120 }
10121
10122 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10123+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10124
10125 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10126 unsigned long address)
10127diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10128index 5e31871..13469c6 100644
10129--- a/arch/sparc/include/asm/pgalloc_64.h
10130+++ b/arch/sparc/include/asm/pgalloc_64.h
10131@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10132 }
10133
10134 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10135+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10136
10137 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10138 {
10139@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10140 }
10141
10142 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10143+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10144
10145 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10146 {
10147diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10148index 59ba6f6..4518128 100644
10149--- a/arch/sparc/include/asm/pgtable.h
10150+++ b/arch/sparc/include/asm/pgtable.h
10151@@ -5,4 +5,8 @@
10152 #else
10153 #include <asm/pgtable_32.h>
10154 #endif
10155+
10156+#define ktla_ktva(addr) (addr)
10157+#define ktva_ktla(addr) (addr)
10158+
10159 #endif
10160diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10161index f06b36a..bca3189 100644
10162--- a/arch/sparc/include/asm/pgtable_32.h
10163+++ b/arch/sparc/include/asm/pgtable_32.h
10164@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10165 #define PAGE_SHARED SRMMU_PAGE_SHARED
10166 #define PAGE_COPY SRMMU_PAGE_COPY
10167 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10168+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10169+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10170+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10171 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10172
10173 /* Top-level page directory - dummy used by init-mm.
10174@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10175
10176 /* xwr */
10177 #define __P000 PAGE_NONE
10178-#define __P001 PAGE_READONLY
10179-#define __P010 PAGE_COPY
10180-#define __P011 PAGE_COPY
10181+#define __P001 PAGE_READONLY_NOEXEC
10182+#define __P010 PAGE_COPY_NOEXEC
10183+#define __P011 PAGE_COPY_NOEXEC
10184 #define __P100 PAGE_READONLY
10185 #define __P101 PAGE_READONLY
10186 #define __P110 PAGE_COPY
10187 #define __P111 PAGE_COPY
10188
10189 #define __S000 PAGE_NONE
10190-#define __S001 PAGE_READONLY
10191-#define __S010 PAGE_SHARED
10192-#define __S011 PAGE_SHARED
10193+#define __S001 PAGE_READONLY_NOEXEC
10194+#define __S010 PAGE_SHARED_NOEXEC
10195+#define __S011 PAGE_SHARED_NOEXEC
10196 #define __S100 PAGE_READONLY
10197 #define __S101 PAGE_READONLY
10198 #define __S110 PAGE_SHARED
10199diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10200index ae51a11..eadfd03 100644
10201--- a/arch/sparc/include/asm/pgtsrmmu.h
10202+++ b/arch/sparc/include/asm/pgtsrmmu.h
10203@@ -111,6 +111,11 @@
10204 SRMMU_EXEC | SRMMU_REF)
10205 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10206 SRMMU_EXEC | SRMMU_REF)
10207+
10208+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10209+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10210+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10211+
10212 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10213 SRMMU_DIRTY | SRMMU_REF)
10214
10215diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10216index 29d64b1..4272fe8 100644
10217--- a/arch/sparc/include/asm/setup.h
10218+++ b/arch/sparc/include/asm/setup.h
10219@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10220 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10221
10222 /* init_64.c */
10223-extern atomic_t dcpage_flushes;
10224-extern atomic_t dcpage_flushes_xcall;
10225+extern atomic_unchecked_t dcpage_flushes;
10226+extern atomic_unchecked_t dcpage_flushes_xcall;
10227
10228 extern int sysctl_tsb_ratio;
10229 #endif
10230diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10231index 9689176..63c18ea 100644
10232--- a/arch/sparc/include/asm/spinlock_64.h
10233+++ b/arch/sparc/include/asm/spinlock_64.h
10234@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10235
10236 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10237
10238-static void inline arch_read_lock(arch_rwlock_t *lock)
10239+static inline void arch_read_lock(arch_rwlock_t *lock)
10240 {
10241 unsigned long tmp1, tmp2;
10242
10243 __asm__ __volatile__ (
10244 "1: ldsw [%2], %0\n"
10245 " brlz,pn %0, 2f\n"
10246-"4: add %0, 1, %1\n"
10247+"4: addcc %0, 1, %1\n"
10248+
10249+#ifdef CONFIG_PAX_REFCOUNT
10250+" tvs %%icc, 6\n"
10251+#endif
10252+
10253 " cas [%2], %0, %1\n"
10254 " cmp %0, %1\n"
10255 " bne,pn %%icc, 1b\n"
10256@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10257 " .previous"
10258 : "=&r" (tmp1), "=&r" (tmp2)
10259 : "r" (lock)
10260- : "memory");
10261+ : "memory", "cc");
10262 }
10263
10264-static int inline arch_read_trylock(arch_rwlock_t *lock)
10265+static inline int arch_read_trylock(arch_rwlock_t *lock)
10266 {
10267 int tmp1, tmp2;
10268
10269@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10270 "1: ldsw [%2], %0\n"
10271 " brlz,a,pn %0, 2f\n"
10272 " mov 0, %0\n"
10273-" add %0, 1, %1\n"
10274+" addcc %0, 1, %1\n"
10275+
10276+#ifdef CONFIG_PAX_REFCOUNT
10277+" tvs %%icc, 6\n"
10278+#endif
10279+
10280 " cas [%2], %0, %1\n"
10281 " cmp %0, %1\n"
10282 " bne,pn %%icc, 1b\n"
10283@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10284 return tmp1;
10285 }
10286
10287-static void inline arch_read_unlock(arch_rwlock_t *lock)
10288+static inline void arch_read_unlock(arch_rwlock_t *lock)
10289 {
10290 unsigned long tmp1, tmp2;
10291
10292 __asm__ __volatile__(
10293 "1: lduw [%2], %0\n"
10294-" sub %0, 1, %1\n"
10295+" subcc %0, 1, %1\n"
10296+
10297+#ifdef CONFIG_PAX_REFCOUNT
10298+" tvs %%icc, 6\n"
10299+#endif
10300+
10301 " cas [%2], %0, %1\n"
10302 " cmp %0, %1\n"
10303 " bne,pn %%xcc, 1b\n"
10304@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10305 : "memory");
10306 }
10307
10308-static void inline arch_write_lock(arch_rwlock_t *lock)
10309+static inline void arch_write_lock(arch_rwlock_t *lock)
10310 {
10311 unsigned long mask, tmp1, tmp2;
10312
10313@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10314 : "memory");
10315 }
10316
10317-static void inline arch_write_unlock(arch_rwlock_t *lock)
10318+static inline void arch_write_unlock(arch_rwlock_t *lock)
10319 {
10320 __asm__ __volatile__(
10321 " stw %%g0, [%0]"
10322@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10323 : "memory");
10324 }
10325
10326-static int inline arch_write_trylock(arch_rwlock_t *lock)
10327+static inline int arch_write_trylock(arch_rwlock_t *lock)
10328 {
10329 unsigned long mask, tmp1, tmp2, result;
10330
10331diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10332index fd7bd0a..2e2fa7a 100644
10333--- a/arch/sparc/include/asm/thread_info_32.h
10334+++ b/arch/sparc/include/asm/thread_info_32.h
10335@@ -47,6 +47,7 @@ struct thread_info {
10336 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10337 unsigned long rwbuf_stkptrs[NSWINS];
10338 unsigned long w_saved;
10339+ unsigned long lowest_stack;
10340 };
10341
10342 /*
10343diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10344index ff45516..73001ab 100644
10345--- a/arch/sparc/include/asm/thread_info_64.h
10346+++ b/arch/sparc/include/asm/thread_info_64.h
10347@@ -61,6 +61,8 @@ struct thread_info {
10348 struct pt_regs *kern_una_regs;
10349 unsigned int kern_una_insn;
10350
10351+ unsigned long lowest_stack;
10352+
10353 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10354 __attribute__ ((aligned(64)));
10355 };
10356@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10357 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10358 /* flag bit 4 is available */
10359 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10360-/* flag bit 6 is available */
10361+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10362 #define TIF_32BIT 7 /* 32-bit binary */
10363 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10364 #define TIF_SECCOMP 9 /* secure computing */
10365 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10366 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10367+
10368 /* NOTE: Thread flags >= 12 should be ones we have no interest
10369 * in using in assembly, else we can't use the mask as
10370 * an immediate value in instructions such as andcc.
10371@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10372 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10373 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10374 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10375+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10376
10377 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10378 _TIF_DO_NOTIFY_RESUME_MASK | \
10379 _TIF_NEED_RESCHED)
10380 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10381
10382+#define _TIF_WORK_SYSCALL \
10383+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10384+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10385+
10386 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10387
10388 /*
10389diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10390index bd56c28..4b63d83 100644
10391--- a/arch/sparc/include/asm/uaccess.h
10392+++ b/arch/sparc/include/asm/uaccess.h
10393@@ -1,5 +1,6 @@
10394 #ifndef ___ASM_SPARC_UACCESS_H
10395 #define ___ASM_SPARC_UACCESS_H
10396+
10397 #if defined(__sparc__) && defined(__arch64__)
10398 #include <asm/uaccess_64.h>
10399 #else
10400diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10401index 64ee103..388aef0 100644
10402--- a/arch/sparc/include/asm/uaccess_32.h
10403+++ b/arch/sparc/include/asm/uaccess_32.h
10404@@ -47,6 +47,7 @@
10405 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10406 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10407 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10408+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10409 #define access_ok(type, addr, size) \
10410 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10411
10412@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10413
10414 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10415 {
10416- if (n && __access_ok((unsigned long) to, n))
10417+ if ((long)n < 0)
10418+ return n;
10419+
10420+ if (n && __access_ok((unsigned long) to, n)) {
10421+ if (!__builtin_constant_p(n))
10422+ check_object_size(from, n, true);
10423 return __copy_user(to, (__force void __user *) from, n);
10424- else
10425+ } else
10426 return n;
10427 }
10428
10429 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10430 {
10431+ if ((long)n < 0)
10432+ return n;
10433+
10434+ if (!__builtin_constant_p(n))
10435+ check_object_size(from, n, true);
10436+
10437 return __copy_user(to, (__force void __user *) from, n);
10438 }
10439
10440 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10441 {
10442- if (n && __access_ok((unsigned long) from, n))
10443+ if ((long)n < 0)
10444+ return n;
10445+
10446+ if (n && __access_ok((unsigned long) from, n)) {
10447+ if (!__builtin_constant_p(n))
10448+ check_object_size(to, n, false);
10449 return __copy_user((__force void __user *) to, from, n);
10450- else
10451+ } else
10452 return n;
10453 }
10454
10455 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10456 {
10457+ if ((long)n < 0)
10458+ return n;
10459+
10460 return __copy_user((__force void __user *) to, from, n);
10461 }
10462
10463diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10464index a35194b..47dabc0d 100644
10465--- a/arch/sparc/include/asm/uaccess_64.h
10466+++ b/arch/sparc/include/asm/uaccess_64.h
10467@@ -10,6 +10,7 @@
10468 #include <linux/compiler.h>
10469 #include <linux/string.h>
10470 #include <linux/thread_info.h>
10471+#include <linux/kernel.h>
10472 #include <asm/asi.h>
10473 #include <asm/spitfire.h>
10474 #include <asm-generic/uaccess-unaligned.h>
10475@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10476 return 1;
10477 }
10478
10479+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10480+{
10481+ return 1;
10482+}
10483+
10484 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10485 {
10486 return 1;
10487@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10488 static inline unsigned long __must_check
10489 copy_from_user(void *to, const void __user *from, unsigned long size)
10490 {
10491- unsigned long ret = ___copy_from_user(to, from, size);
10492+ unsigned long ret;
10493
10494+ if ((long)size < 0 || size > INT_MAX)
10495+ return size;
10496+
10497+ if (!__builtin_constant_p(size))
10498+ check_object_size(to, size, false);
10499+
10500+ ret = ___copy_from_user(to, from, size);
10501 if (unlikely(ret))
10502 ret = copy_from_user_fixup(to, from, size);
10503
10504@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10505 static inline unsigned long __must_check
10506 copy_to_user(void __user *to, const void *from, unsigned long size)
10507 {
10508- unsigned long ret = ___copy_to_user(to, from, size);
10509+ unsigned long ret;
10510
10511+ if ((long)size < 0 || size > INT_MAX)
10512+ return size;
10513+
10514+ if (!__builtin_constant_p(size))
10515+ check_object_size(from, size, true);
10516+
10517+ ret = ___copy_to_user(to, from, size);
10518 if (unlikely(ret))
10519 ret = copy_to_user_fixup(to, from, size);
10520 return ret;
10521diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10522index 7cf9c6e..6206648 100644
10523--- a/arch/sparc/kernel/Makefile
10524+++ b/arch/sparc/kernel/Makefile
10525@@ -4,7 +4,7 @@
10526 #
10527
10528 asflags-y := -ansi
10529-ccflags-y := -Werror
10530+#ccflags-y := -Werror
10531
10532 extra-y := head_$(BITS).o
10533
10534diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10535index 50e7b62..79fae35 100644
10536--- a/arch/sparc/kernel/process_32.c
10537+++ b/arch/sparc/kernel/process_32.c
10538@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10539
10540 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10541 r->psr, r->pc, r->npc, r->y, print_tainted());
10542- printk("PC: <%pS>\n", (void *) r->pc);
10543+ printk("PC: <%pA>\n", (void *) r->pc);
10544 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10545 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10546 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10547 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10548 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10549 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10550- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10551+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10552
10553 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10554 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10555@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10556 rw = (struct reg_window32 *) fp;
10557 pc = rw->ins[7];
10558 printk("[%08lx : ", pc);
10559- printk("%pS ] ", (void *) pc);
10560+ printk("%pA ] ", (void *) pc);
10561 fp = rw->ins[6];
10562 } while (++count < 16);
10563 printk("\n");
10564diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10565index 46a5964..a35c62c 100644
10566--- a/arch/sparc/kernel/process_64.c
10567+++ b/arch/sparc/kernel/process_64.c
10568@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10569 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10570 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10571 if (regs->tstate & TSTATE_PRIV)
10572- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10573+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10574 }
10575
10576 void show_regs(struct pt_regs *regs)
10577@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10578
10579 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10580 regs->tpc, regs->tnpc, regs->y, print_tainted());
10581- printk("TPC: <%pS>\n", (void *) regs->tpc);
10582+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10583 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10584 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10585 regs->u_regs[3]);
10586@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10587 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10588 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10589 regs->u_regs[15]);
10590- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10591+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10592 show_regwindow(regs);
10593 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10594 }
10595@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10596 ((tp && tp->task) ? tp->task->pid : -1));
10597
10598 if (gp->tstate & TSTATE_PRIV) {
10599- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10600+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10601 (void *) gp->tpc,
10602 (void *) gp->o7,
10603 (void *) gp->i7,
10604diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10605index 79cc0d1..ec62734 100644
10606--- a/arch/sparc/kernel/prom_common.c
10607+++ b/arch/sparc/kernel/prom_common.c
10608@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10609
10610 unsigned int prom_early_allocated __initdata;
10611
10612-static struct of_pdt_ops prom_sparc_ops __initdata = {
10613+static struct of_pdt_ops prom_sparc_ops __initconst = {
10614 .nextprop = prom_common_nextprop,
10615 .getproplen = prom_getproplen,
10616 .getproperty = prom_getproperty,
10617diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10618index 9ddc492..27a5619 100644
10619--- a/arch/sparc/kernel/ptrace_64.c
10620+++ b/arch/sparc/kernel/ptrace_64.c
10621@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10622 return ret;
10623 }
10624
10625+#ifdef CONFIG_GRKERNSEC_SETXID
10626+extern void gr_delayed_cred_worker(void);
10627+#endif
10628+
10629 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10630 {
10631 int ret = 0;
10632@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10633 if (test_thread_flag(TIF_NOHZ))
10634 user_exit();
10635
10636+#ifdef CONFIG_GRKERNSEC_SETXID
10637+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10638+ gr_delayed_cred_worker();
10639+#endif
10640+
10641 if (test_thread_flag(TIF_SYSCALL_TRACE))
10642 ret = tracehook_report_syscall_entry(regs);
10643
10644@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10645 if (test_thread_flag(TIF_NOHZ))
10646 user_exit();
10647
10648+#ifdef CONFIG_GRKERNSEC_SETXID
10649+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10650+ gr_delayed_cred_worker();
10651+#endif
10652+
10653 audit_syscall_exit(regs);
10654
10655 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10656diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10657index 61139d9..c1a5f28 100644
10658--- a/arch/sparc/kernel/smp_64.c
10659+++ b/arch/sparc/kernel/smp_64.c
10660@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10661 return;
10662
10663 #ifdef CONFIG_DEBUG_DCFLUSH
10664- atomic_inc(&dcpage_flushes);
10665+ atomic_inc_unchecked(&dcpage_flushes);
10666 #endif
10667
10668 this_cpu = get_cpu();
10669@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10670 xcall_deliver(data0, __pa(pg_addr),
10671 (u64) pg_addr, cpumask_of(cpu));
10672 #ifdef CONFIG_DEBUG_DCFLUSH
10673- atomic_inc(&dcpage_flushes_xcall);
10674+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10675 #endif
10676 }
10677 }
10678@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10679 preempt_disable();
10680
10681 #ifdef CONFIG_DEBUG_DCFLUSH
10682- atomic_inc(&dcpage_flushes);
10683+ atomic_inc_unchecked(&dcpage_flushes);
10684 #endif
10685 data0 = 0;
10686 pg_addr = page_address(page);
10687@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10688 xcall_deliver(data0, __pa(pg_addr),
10689 (u64) pg_addr, cpu_online_mask);
10690 #ifdef CONFIG_DEBUG_DCFLUSH
10691- atomic_inc(&dcpage_flushes_xcall);
10692+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10693 #endif
10694 }
10695 __local_flush_dcache_page(page);
10696diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10697index 646988d..b88905f 100644
10698--- a/arch/sparc/kernel/sys_sparc_32.c
10699+++ b/arch/sparc/kernel/sys_sparc_32.c
10700@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10701 if (len > TASK_SIZE - PAGE_SIZE)
10702 return -ENOMEM;
10703 if (!addr)
10704- addr = TASK_UNMAPPED_BASE;
10705+ addr = current->mm->mmap_base;
10706
10707 info.flags = 0;
10708 info.length = len;
10709diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10710index 30e7ddb..266a3b0 100644
10711--- a/arch/sparc/kernel/sys_sparc_64.c
10712+++ b/arch/sparc/kernel/sys_sparc_64.c
10713@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10714 struct vm_area_struct * vma;
10715 unsigned long task_size = TASK_SIZE;
10716 int do_color_align;
10717+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10718 struct vm_unmapped_area_info info;
10719
10720 if (flags & MAP_FIXED) {
10721 /* We do not accept a shared mapping if it would violate
10722 * cache aliasing constraints.
10723 */
10724- if ((flags & MAP_SHARED) &&
10725+ if ((filp || (flags & MAP_SHARED)) &&
10726 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10727 return -EINVAL;
10728 return addr;
10729@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10730 if (filp || (flags & MAP_SHARED))
10731 do_color_align = 1;
10732
10733+#ifdef CONFIG_PAX_RANDMMAP
10734+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10735+#endif
10736+
10737 if (addr) {
10738 if (do_color_align)
10739 addr = COLOR_ALIGN(addr, pgoff);
10740@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10741 addr = PAGE_ALIGN(addr);
10742
10743 vma = find_vma(mm, addr);
10744- if (task_size - len >= addr &&
10745- (!vma || addr + len <= vma->vm_start))
10746+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10747 return addr;
10748 }
10749
10750 info.flags = 0;
10751 info.length = len;
10752- info.low_limit = TASK_UNMAPPED_BASE;
10753+ info.low_limit = mm->mmap_base;
10754 info.high_limit = min(task_size, VA_EXCLUDE_START);
10755 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10756 info.align_offset = pgoff << PAGE_SHIFT;
10757+ info.threadstack_offset = offset;
10758 addr = vm_unmapped_area(&info);
10759
10760 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10761 VM_BUG_ON(addr != -ENOMEM);
10762 info.low_limit = VA_EXCLUDE_END;
10763+
10764+#ifdef CONFIG_PAX_RANDMMAP
10765+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10766+ info.low_limit += mm->delta_mmap;
10767+#endif
10768+
10769 info.high_limit = task_size;
10770 addr = vm_unmapped_area(&info);
10771 }
10772@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10773 unsigned long task_size = STACK_TOP32;
10774 unsigned long addr = addr0;
10775 int do_color_align;
10776+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10777 struct vm_unmapped_area_info info;
10778
10779 /* This should only ever run for 32-bit processes. */
10780@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10781 /* We do not accept a shared mapping if it would violate
10782 * cache aliasing constraints.
10783 */
10784- if ((flags & MAP_SHARED) &&
10785+ if ((filp || (flags & MAP_SHARED)) &&
10786 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10787 return -EINVAL;
10788 return addr;
10789@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10790 if (filp || (flags & MAP_SHARED))
10791 do_color_align = 1;
10792
10793+#ifdef CONFIG_PAX_RANDMMAP
10794+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10795+#endif
10796+
10797 /* requesting a specific address */
10798 if (addr) {
10799 if (do_color_align)
10800@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10801 addr = PAGE_ALIGN(addr);
10802
10803 vma = find_vma(mm, addr);
10804- if (task_size - len >= addr &&
10805- (!vma || addr + len <= vma->vm_start))
10806+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10807 return addr;
10808 }
10809
10810@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10811 info.high_limit = mm->mmap_base;
10812 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10813 info.align_offset = pgoff << PAGE_SHIFT;
10814+ info.threadstack_offset = offset;
10815 addr = vm_unmapped_area(&info);
10816
10817 /*
10818@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10819 VM_BUG_ON(addr != -ENOMEM);
10820 info.flags = 0;
10821 info.low_limit = TASK_UNMAPPED_BASE;
10822+
10823+#ifdef CONFIG_PAX_RANDMMAP
10824+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10825+ info.low_limit += mm->delta_mmap;
10826+#endif
10827+
10828 info.high_limit = STACK_TOP32;
10829 addr = vm_unmapped_area(&info);
10830 }
10831@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10832 EXPORT_SYMBOL(get_fb_unmapped_area);
10833
10834 /* Essentially the same as PowerPC. */
10835-static unsigned long mmap_rnd(void)
10836+static unsigned long mmap_rnd(struct mm_struct *mm)
10837 {
10838 unsigned long rnd = 0UL;
10839
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10842+#endif
10843+
10844 if (current->flags & PF_RANDOMIZE) {
10845 unsigned long val = get_random_int();
10846 if (test_thread_flag(TIF_32BIT))
10847@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10848
10849 void arch_pick_mmap_layout(struct mm_struct *mm)
10850 {
10851- unsigned long random_factor = mmap_rnd();
10852+ unsigned long random_factor = mmap_rnd(mm);
10853 unsigned long gap;
10854
10855 /*
10856@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10857 gap == RLIM_INFINITY ||
10858 sysctl_legacy_va_layout) {
10859 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10860+
10861+#ifdef CONFIG_PAX_RANDMMAP
10862+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10863+ mm->mmap_base += mm->delta_mmap;
10864+#endif
10865+
10866 mm->get_unmapped_area = arch_get_unmapped_area;
10867 } else {
10868 /* We know it's 32-bit */
10869@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10870 gap = (task_size / 6 * 5);
10871
10872 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10873+
10874+#ifdef CONFIG_PAX_RANDMMAP
10875+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10876+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10877+#endif
10878+
10879 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10880 }
10881 }
10882diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10883index bb00089..e0ea580 100644
10884--- a/arch/sparc/kernel/syscalls.S
10885+++ b/arch/sparc/kernel/syscalls.S
10886@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10887 #endif
10888 .align 32
10889 1: ldx [%g6 + TI_FLAGS], %l5
10890- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10891+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10892 be,pt %icc, rtrap
10893 nop
10894 call syscall_trace_leave
10895@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10896
10897 srl %i3, 0, %o3 ! IEU0
10898 srl %i2, 0, %o2 ! IEU0 Group
10899- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10900+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10901 bne,pn %icc, linux_syscall_trace32 ! CTI
10902 mov %i0, %l5 ! IEU1
10903 5: call %l7 ! CTI Group brk forced
10904@@ -218,7 +218,7 @@ linux_sparc_syscall:
10905
10906 mov %i3, %o3 ! IEU1
10907 mov %i4, %o4 ! IEU0 Group
10908- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10909+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10910 bne,pn %icc, linux_syscall_trace ! CTI Group
10911 mov %i0, %l5 ! IEU0
10912 2: call %l7 ! CTI Group brk forced
10913@@ -233,7 +233,7 @@ ret_sys_call:
10914
10915 cmp %o0, -ERESTART_RESTARTBLOCK
10916 bgeu,pn %xcc, 1f
10917- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10918+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10919 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10920
10921 2:
10922diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10923index 6fd386c5..6907d81 100644
10924--- a/arch/sparc/kernel/traps_32.c
10925+++ b/arch/sparc/kernel/traps_32.c
10926@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10927 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10928 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10929
10930+extern void gr_handle_kernel_exploit(void);
10931+
10932 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10933 {
10934 static int die_counter;
10935@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10936 count++ < 30 &&
10937 (((unsigned long) rw) >= PAGE_OFFSET) &&
10938 !(((unsigned long) rw) & 0x7)) {
10939- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10940+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10941 (void *) rw->ins[7]);
10942 rw = (struct reg_window32 *)rw->ins[6];
10943 }
10944 }
10945 printk("Instruction DUMP:");
10946 instruction_dump ((unsigned long *) regs->pc);
10947- if(regs->psr & PSR_PS)
10948+ if(regs->psr & PSR_PS) {
10949+ gr_handle_kernel_exploit();
10950 do_exit(SIGKILL);
10951+ }
10952 do_exit(SIGSEGV);
10953 }
10954
10955diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10956index 0e69974..0c15a6e 100644
10957--- a/arch/sparc/kernel/traps_64.c
10958+++ b/arch/sparc/kernel/traps_64.c
10959@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10960 i + 1,
10961 p->trapstack[i].tstate, p->trapstack[i].tpc,
10962 p->trapstack[i].tnpc, p->trapstack[i].tt);
10963- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10964+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10965 }
10966 }
10967
10968@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10969
10970 lvl -= 0x100;
10971 if (regs->tstate & TSTATE_PRIV) {
10972+
10973+#ifdef CONFIG_PAX_REFCOUNT
10974+ if (lvl == 6)
10975+ pax_report_refcount_overflow(regs);
10976+#endif
10977+
10978 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10979 die_if_kernel(buffer, regs);
10980 }
10981@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10982 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10983 {
10984 char buffer[32];
10985-
10986+
10987 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10988 0, lvl, SIGTRAP) == NOTIFY_STOP)
10989 return;
10990
10991+#ifdef CONFIG_PAX_REFCOUNT
10992+ if (lvl == 6)
10993+ pax_report_refcount_overflow(regs);
10994+#endif
10995+
10996 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10997
10998 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10999@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11000 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11001 printk("%s" "ERROR(%d): ",
11002 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11003- printk("TPC<%pS>\n", (void *) regs->tpc);
11004+ printk("TPC<%pA>\n", (void *) regs->tpc);
11005 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11006 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11007 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11008@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11009 smp_processor_id(),
11010 (type & 0x1) ? 'I' : 'D',
11011 regs->tpc);
11012- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11013+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11014 panic("Irrecoverable Cheetah+ parity error.");
11015 }
11016
11017@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11018 smp_processor_id(),
11019 (type & 0x1) ? 'I' : 'D',
11020 regs->tpc);
11021- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11022+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11023 }
11024
11025 struct sun4v_error_entry {
11026@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11027 /*0x38*/u64 reserved_5;
11028 };
11029
11030-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11031-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11032+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11033+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11034
11035 static const char *sun4v_err_type_to_str(u8 type)
11036 {
11037@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11038 }
11039
11040 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11041- int cpu, const char *pfx, atomic_t *ocnt)
11042+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11043 {
11044 u64 *raw_ptr = (u64 *) ent;
11045 u32 attrs;
11046@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11047
11048 show_regs(regs);
11049
11050- if ((cnt = atomic_read(ocnt)) != 0) {
11051- atomic_set(ocnt, 0);
11052+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11053+ atomic_set_unchecked(ocnt, 0);
11054 wmb();
11055 printk("%s: Queue overflowed %d times.\n",
11056 pfx, cnt);
11057@@ -2048,7 +2059,7 @@ out:
11058 */
11059 void sun4v_resum_overflow(struct pt_regs *regs)
11060 {
11061- atomic_inc(&sun4v_resum_oflow_cnt);
11062+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11063 }
11064
11065 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11066@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11067 /* XXX Actually even this can make not that much sense. Perhaps
11068 * XXX we should just pull the plug and panic directly from here?
11069 */
11070- atomic_inc(&sun4v_nonresum_oflow_cnt);
11071+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11072 }
11073
11074 static void sun4v_tlb_error(struct pt_regs *regs)
11075@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11076
11077 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11078 regs->tpc, tl);
11079- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11080+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11081 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11082- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11083+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11084 (void *) regs->u_regs[UREG_I7]);
11085 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11086 "pte[%lx] error[%lx]\n",
11087@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11088
11089 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11090 regs->tpc, tl);
11091- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11092+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11093 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11094- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11095+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11096 (void *) regs->u_regs[UREG_I7]);
11097 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11098 "pte[%lx] error[%lx]\n",
11099@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11100 fp = (unsigned long)sf->fp + STACK_BIAS;
11101 }
11102
11103- printk(" [%016lx] %pS\n", pc, (void *) pc);
11104+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11105 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11106 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11107 int index = tsk->curr_ret_stack;
11108 if (tsk->ret_stack && index >= graph) {
11109 pc = tsk->ret_stack[index - graph].ret;
11110- printk(" [%016lx] %pS\n", pc, (void *) pc);
11111+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11112 graph++;
11113 }
11114 }
11115@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11116 return (struct reg_window *) (fp + STACK_BIAS);
11117 }
11118
11119+extern void gr_handle_kernel_exploit(void);
11120+
11121 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11122 {
11123 static int die_counter;
11124@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11125 while (rw &&
11126 count++ < 30 &&
11127 kstack_valid(tp, (unsigned long) rw)) {
11128- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11129+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11130 (void *) rw->ins[7]);
11131
11132 rw = kernel_stack_up(rw);
11133@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11134 }
11135 if (panic_on_oops)
11136 panic("Fatal exception");
11137- if (regs->tstate & TSTATE_PRIV)
11138+ if (regs->tstate & TSTATE_PRIV) {
11139+ gr_handle_kernel_exploit();
11140 do_exit(SIGKILL);
11141+ }
11142 do_exit(SIGSEGV);
11143 }
11144 EXPORT_SYMBOL(die_if_kernel);
11145diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11146index 62098a8..547ab2c 100644
11147--- a/arch/sparc/kernel/unaligned_64.c
11148+++ b/arch/sparc/kernel/unaligned_64.c
11149@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11150 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11151
11152 if (__ratelimit(&ratelimit)) {
11153- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11154+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11155 regs->tpc, (void *) regs->tpc);
11156 }
11157 }
11158diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11159index 3269b02..64f5231 100644
11160--- a/arch/sparc/lib/Makefile
11161+++ b/arch/sparc/lib/Makefile
11162@@ -2,7 +2,7 @@
11163 #
11164
11165 asflags-y := -ansi -DST_DIV0=0x02
11166-ccflags-y := -Werror
11167+#ccflags-y := -Werror
11168
11169 lib-$(CONFIG_SPARC32) += ashrdi3.o
11170 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11171diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11172index 05dac43..76f8ed4 100644
11173--- a/arch/sparc/lib/atomic_64.S
11174+++ b/arch/sparc/lib/atomic_64.S
11175@@ -15,11 +15,22 @@
11176 * a value and does the barriers.
11177 */
11178
11179-#define ATOMIC_OP(op) \
11180-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11181+#ifdef CONFIG_PAX_REFCOUNT
11182+#define __REFCOUNT_OP(op) op##cc
11183+#define __OVERFLOW_IOP tvs %icc, 6;
11184+#define __OVERFLOW_XOP tvs %xcc, 6;
11185+#else
11186+#define __REFCOUNT_OP(op) op
11187+#define __OVERFLOW_IOP
11188+#define __OVERFLOW_XOP
11189+#endif
11190+
11191+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11192+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11193 BACKOFF_SETUP(%o2); \
11194 1: lduw [%o1], %g1; \
11195- op %g1, %o0, %g7; \
11196+ asm_op %g1, %o0, %g7; \
11197+ post_op \
11198 cas [%o1], %g1, %g7; \
11199 cmp %g1, %g7; \
11200 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11201@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11202 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11203 ENDPROC(atomic_##op); \
11204
11205-#define ATOMIC_OP_RETURN(op) \
11206-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11207+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11208+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11209+
11210+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11211+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11212 BACKOFF_SETUP(%o2); \
11213 1: lduw [%o1], %g1; \
11214- op %g1, %o0, %g7; \
11215+ asm_op %g1, %o0, %g7; \
11216+ post_op \
11217 cas [%o1], %g1, %g7; \
11218 cmp %g1, %g7; \
11219 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11220@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11221 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11222 ENDPROC(atomic_##op##_return);
11223
11224+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11225+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11226+
11227 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11228
11229 ATOMIC_OPS(add)
11230@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11231
11232 #undef ATOMIC_OPS
11233 #undef ATOMIC_OP_RETURN
11234+#undef __ATOMIC_OP_RETURN
11235 #undef ATOMIC_OP
11236+#undef __ATOMIC_OP
11237
11238-#define ATOMIC64_OP(op) \
11239-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11240+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11241+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11242 BACKOFF_SETUP(%o2); \
11243 1: ldx [%o1], %g1; \
11244- op %g1, %o0, %g7; \
11245+ asm_op %g1, %o0, %g7; \
11246+ post_op \
11247 casx [%o1], %g1, %g7; \
11248 cmp %g1, %g7; \
11249 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11250@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11251 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11252 ENDPROC(atomic64_##op); \
11253
11254-#define ATOMIC64_OP_RETURN(op) \
11255-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11256+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11257+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11258+
11259+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11260+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11261 BACKOFF_SETUP(%o2); \
11262 1: ldx [%o1], %g1; \
11263- op %g1, %o0, %g7; \
11264+ asm_op %g1, %o0, %g7; \
11265+ post_op \
11266 casx [%o1], %g1, %g7; \
11267 cmp %g1, %g7; \
11268 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11269@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11270 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11271 ENDPROC(atomic64_##op##_return);
11272
11273+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11274+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11275+
11276 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11277
11278 ATOMIC64_OPS(add)
11279@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11280
11281 #undef ATOMIC64_OPS
11282 #undef ATOMIC64_OP_RETURN
11283+#undef __ATOMIC64_OP_RETURN
11284 #undef ATOMIC64_OP
11285+#undef __ATOMIC64_OP
11286+#undef __OVERFLOW_XOP
11287+#undef __OVERFLOW_IOP
11288+#undef __REFCOUNT_OP
11289
11290 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11291 BACKOFF_SETUP(%o2)
11292diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11293index 1d649a9..fbc5bfc 100644
11294--- a/arch/sparc/lib/ksyms.c
11295+++ b/arch/sparc/lib/ksyms.c
11296@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11297 /* Atomic counter implementation. */
11298 #define ATOMIC_OP(op) \
11299 EXPORT_SYMBOL(atomic_##op); \
11300-EXPORT_SYMBOL(atomic64_##op);
11301+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11302+EXPORT_SYMBOL(atomic64_##op); \
11303+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11304
11305 #define ATOMIC_OP_RETURN(op) \
11306 EXPORT_SYMBOL(atomic_##op##_return); \
11307@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11308 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11309
11310 ATOMIC_OPS(add)
11311+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11312+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11313 ATOMIC_OPS(sub)
11314
11315 #undef ATOMIC_OPS
11316diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11317index 30c3ecc..736f015 100644
11318--- a/arch/sparc/mm/Makefile
11319+++ b/arch/sparc/mm/Makefile
11320@@ -2,7 +2,7 @@
11321 #
11322
11323 asflags-y := -ansi
11324-ccflags-y := -Werror
11325+#ccflags-y := -Werror
11326
11327 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11328 obj-y += fault_$(BITS).o
11329diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11330index 70d8171..274c6c0 100644
11331--- a/arch/sparc/mm/fault_32.c
11332+++ b/arch/sparc/mm/fault_32.c
11333@@ -21,6 +21,9 @@
11334 #include <linux/perf_event.h>
11335 #include <linux/interrupt.h>
11336 #include <linux/kdebug.h>
11337+#include <linux/slab.h>
11338+#include <linux/pagemap.h>
11339+#include <linux/compiler.h>
11340
11341 #include <asm/page.h>
11342 #include <asm/pgtable.h>
11343@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11344 return safe_compute_effective_address(regs, insn);
11345 }
11346
11347+#ifdef CONFIG_PAX_PAGEEXEC
11348+#ifdef CONFIG_PAX_DLRESOLVE
11349+static void pax_emuplt_close(struct vm_area_struct *vma)
11350+{
11351+ vma->vm_mm->call_dl_resolve = 0UL;
11352+}
11353+
11354+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11355+{
11356+ unsigned int *kaddr;
11357+
11358+ vmf->page = alloc_page(GFP_HIGHUSER);
11359+ if (!vmf->page)
11360+ return VM_FAULT_OOM;
11361+
11362+ kaddr = kmap(vmf->page);
11363+ memset(kaddr, 0, PAGE_SIZE);
11364+ kaddr[0] = 0x9DE3BFA8U; /* save */
11365+ flush_dcache_page(vmf->page);
11366+ kunmap(vmf->page);
11367+ return VM_FAULT_MAJOR;
11368+}
11369+
11370+static const struct vm_operations_struct pax_vm_ops = {
11371+ .close = pax_emuplt_close,
11372+ .fault = pax_emuplt_fault
11373+};
11374+
11375+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11376+{
11377+ int ret;
11378+
11379+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11380+ vma->vm_mm = current->mm;
11381+ vma->vm_start = addr;
11382+ vma->vm_end = addr + PAGE_SIZE;
11383+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11384+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11385+ vma->vm_ops = &pax_vm_ops;
11386+
11387+ ret = insert_vm_struct(current->mm, vma);
11388+ if (ret)
11389+ return ret;
11390+
11391+ ++current->mm->total_vm;
11392+ return 0;
11393+}
11394+#endif
11395+
11396+/*
11397+ * PaX: decide what to do with offenders (regs->pc = fault address)
11398+ *
11399+ * returns 1 when task should be killed
11400+ * 2 when patched PLT trampoline was detected
11401+ * 3 when unpatched PLT trampoline was detected
11402+ */
11403+static int pax_handle_fetch_fault(struct pt_regs *regs)
11404+{
11405+
11406+#ifdef CONFIG_PAX_EMUPLT
11407+ int err;
11408+
11409+ do { /* PaX: patched PLT emulation #1 */
11410+ unsigned int sethi1, sethi2, jmpl;
11411+
11412+ err = get_user(sethi1, (unsigned int *)regs->pc);
11413+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11414+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11415+
11416+ if (err)
11417+ break;
11418+
11419+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11420+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11421+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11422+ {
11423+ unsigned int addr;
11424+
11425+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11426+ addr = regs->u_regs[UREG_G1];
11427+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11428+ regs->pc = addr;
11429+ regs->npc = addr+4;
11430+ return 2;
11431+ }
11432+ } while (0);
11433+
11434+ do { /* PaX: patched PLT emulation #2 */
11435+ unsigned int ba;
11436+
11437+ err = get_user(ba, (unsigned int *)regs->pc);
11438+
11439+ if (err)
11440+ break;
11441+
11442+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11443+ unsigned int addr;
11444+
11445+ if ((ba & 0xFFC00000U) == 0x30800000U)
11446+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11447+ else
11448+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11449+ regs->pc = addr;
11450+ regs->npc = addr+4;
11451+ return 2;
11452+ }
11453+ } while (0);
11454+
11455+ do { /* PaX: patched PLT emulation #3 */
11456+ unsigned int sethi, bajmpl, nop;
11457+
11458+ err = get_user(sethi, (unsigned int *)regs->pc);
11459+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11460+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11461+
11462+ if (err)
11463+ break;
11464+
11465+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11466+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11467+ nop == 0x01000000U)
11468+ {
11469+ unsigned int addr;
11470+
11471+ addr = (sethi & 0x003FFFFFU) << 10;
11472+ regs->u_regs[UREG_G1] = addr;
11473+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11474+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11475+ else
11476+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11477+ regs->pc = addr;
11478+ regs->npc = addr+4;
11479+ return 2;
11480+ }
11481+ } while (0);
11482+
11483+ do { /* PaX: unpatched PLT emulation step 1 */
11484+ unsigned int sethi, ba, nop;
11485+
11486+ err = get_user(sethi, (unsigned int *)regs->pc);
11487+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11488+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11489+
11490+ if (err)
11491+ break;
11492+
11493+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11494+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11495+ nop == 0x01000000U)
11496+ {
11497+ unsigned int addr, save, call;
11498+
11499+ if ((ba & 0xFFC00000U) == 0x30800000U)
11500+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11501+ else
11502+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11503+
11504+ err = get_user(save, (unsigned int *)addr);
11505+ err |= get_user(call, (unsigned int *)(addr+4));
11506+ err |= get_user(nop, (unsigned int *)(addr+8));
11507+ if (err)
11508+ break;
11509+
11510+#ifdef CONFIG_PAX_DLRESOLVE
11511+ if (save == 0x9DE3BFA8U &&
11512+ (call & 0xC0000000U) == 0x40000000U &&
11513+ nop == 0x01000000U)
11514+ {
11515+ struct vm_area_struct *vma;
11516+ unsigned long call_dl_resolve;
11517+
11518+ down_read(&current->mm->mmap_sem);
11519+ call_dl_resolve = current->mm->call_dl_resolve;
11520+ up_read(&current->mm->mmap_sem);
11521+ if (likely(call_dl_resolve))
11522+ goto emulate;
11523+
11524+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11525+
11526+ down_write(&current->mm->mmap_sem);
11527+ if (current->mm->call_dl_resolve) {
11528+ call_dl_resolve = current->mm->call_dl_resolve;
11529+ up_write(&current->mm->mmap_sem);
11530+ if (vma)
11531+ kmem_cache_free(vm_area_cachep, vma);
11532+ goto emulate;
11533+ }
11534+
11535+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11536+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11537+ up_write(&current->mm->mmap_sem);
11538+ if (vma)
11539+ kmem_cache_free(vm_area_cachep, vma);
11540+ return 1;
11541+ }
11542+
11543+ if (pax_insert_vma(vma, call_dl_resolve)) {
11544+ up_write(&current->mm->mmap_sem);
11545+ kmem_cache_free(vm_area_cachep, vma);
11546+ return 1;
11547+ }
11548+
11549+ current->mm->call_dl_resolve = call_dl_resolve;
11550+ up_write(&current->mm->mmap_sem);
11551+
11552+emulate:
11553+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11554+ regs->pc = call_dl_resolve;
11555+ regs->npc = addr+4;
11556+ return 3;
11557+ }
11558+#endif
11559+
11560+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11561+ if ((save & 0xFFC00000U) == 0x05000000U &&
11562+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11563+ nop == 0x01000000U)
11564+ {
11565+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11566+ regs->u_regs[UREG_G2] = addr + 4;
11567+ addr = (save & 0x003FFFFFU) << 10;
11568+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11569+ regs->pc = addr;
11570+ regs->npc = addr+4;
11571+ return 3;
11572+ }
11573+ }
11574+ } while (0);
11575+
11576+ do { /* PaX: unpatched PLT emulation step 2 */
11577+ unsigned int save, call, nop;
11578+
11579+ err = get_user(save, (unsigned int *)(regs->pc-4));
11580+ err |= get_user(call, (unsigned int *)regs->pc);
11581+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11582+ if (err)
11583+ break;
11584+
11585+ if (save == 0x9DE3BFA8U &&
11586+ (call & 0xC0000000U) == 0x40000000U &&
11587+ nop == 0x01000000U)
11588+ {
11589+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11590+
11591+ regs->u_regs[UREG_RETPC] = regs->pc;
11592+ regs->pc = dl_resolve;
11593+ regs->npc = dl_resolve+4;
11594+ return 3;
11595+ }
11596+ } while (0);
11597+#endif
11598+
11599+ return 1;
11600+}
11601+
11602+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11603+{
11604+ unsigned long i;
11605+
11606+ printk(KERN_ERR "PAX: bytes at PC: ");
11607+ for (i = 0; i < 8; i++) {
11608+ unsigned int c;
11609+ if (get_user(c, (unsigned int *)pc+i))
11610+ printk(KERN_CONT "???????? ");
11611+ else
11612+ printk(KERN_CONT "%08x ", c);
11613+ }
11614+ printk("\n");
11615+}
11616+#endif
11617+
11618 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11619 int text_fault)
11620 {
11621@@ -226,6 +500,24 @@ good_area:
11622 if (!(vma->vm_flags & VM_WRITE))
11623 goto bad_area;
11624 } else {
11625+
11626+#ifdef CONFIG_PAX_PAGEEXEC
11627+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11628+ up_read(&mm->mmap_sem);
11629+ switch (pax_handle_fetch_fault(regs)) {
11630+
11631+#ifdef CONFIG_PAX_EMUPLT
11632+ case 2:
11633+ case 3:
11634+ return;
11635+#endif
11636+
11637+ }
11638+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11639+ do_group_exit(SIGKILL);
11640+ }
11641+#endif
11642+
11643 /* Allow reads even for write-only mappings */
11644 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11645 goto bad_area;
11646diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11647index 4798232..f76e3aa 100644
11648--- a/arch/sparc/mm/fault_64.c
11649+++ b/arch/sparc/mm/fault_64.c
11650@@ -22,6 +22,9 @@
11651 #include <linux/kdebug.h>
11652 #include <linux/percpu.h>
11653 #include <linux/context_tracking.h>
11654+#include <linux/slab.h>
11655+#include <linux/pagemap.h>
11656+#include <linux/compiler.h>
11657
11658 #include <asm/page.h>
11659 #include <asm/pgtable.h>
11660@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11661 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11662 regs->tpc);
11663 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11664- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11665+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11666 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11667 dump_stack();
11668 unhandled_fault(regs->tpc, current, regs);
11669@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11670 show_regs(regs);
11671 }
11672
11673+#ifdef CONFIG_PAX_PAGEEXEC
11674+#ifdef CONFIG_PAX_DLRESOLVE
11675+static void pax_emuplt_close(struct vm_area_struct *vma)
11676+{
11677+ vma->vm_mm->call_dl_resolve = 0UL;
11678+}
11679+
11680+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11681+{
11682+ unsigned int *kaddr;
11683+
11684+ vmf->page = alloc_page(GFP_HIGHUSER);
11685+ if (!vmf->page)
11686+ return VM_FAULT_OOM;
11687+
11688+ kaddr = kmap(vmf->page);
11689+ memset(kaddr, 0, PAGE_SIZE);
11690+ kaddr[0] = 0x9DE3BFA8U; /* save */
11691+ flush_dcache_page(vmf->page);
11692+ kunmap(vmf->page);
11693+ return VM_FAULT_MAJOR;
11694+}
11695+
11696+static const struct vm_operations_struct pax_vm_ops = {
11697+ .close = pax_emuplt_close,
11698+ .fault = pax_emuplt_fault
11699+};
11700+
11701+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11702+{
11703+ int ret;
11704+
11705+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11706+ vma->vm_mm = current->mm;
11707+ vma->vm_start = addr;
11708+ vma->vm_end = addr + PAGE_SIZE;
11709+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11710+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11711+ vma->vm_ops = &pax_vm_ops;
11712+
11713+ ret = insert_vm_struct(current->mm, vma);
11714+ if (ret)
11715+ return ret;
11716+
11717+ ++current->mm->total_vm;
11718+ return 0;
11719+}
11720+#endif
11721+
11722+/*
11723+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11724+ *
11725+ * returns 1 when task should be killed
11726+ * 2 when patched PLT trampoline was detected
11727+ * 3 when unpatched PLT trampoline was detected
11728+ */
11729+static int pax_handle_fetch_fault(struct pt_regs *regs)
11730+{
11731+
11732+#ifdef CONFIG_PAX_EMUPLT
11733+ int err;
11734+
11735+ do { /* PaX: patched PLT emulation #1 */
11736+ unsigned int sethi1, sethi2, jmpl;
11737+
11738+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11739+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11740+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11741+
11742+ if (err)
11743+ break;
11744+
11745+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11746+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11747+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11748+ {
11749+ unsigned long addr;
11750+
11751+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11752+ addr = regs->u_regs[UREG_G1];
11753+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11754+
11755+ if (test_thread_flag(TIF_32BIT))
11756+ addr &= 0xFFFFFFFFUL;
11757+
11758+ regs->tpc = addr;
11759+ regs->tnpc = addr+4;
11760+ return 2;
11761+ }
11762+ } while (0);
11763+
11764+ do { /* PaX: patched PLT emulation #2 */
11765+ unsigned int ba;
11766+
11767+ err = get_user(ba, (unsigned int *)regs->tpc);
11768+
11769+ if (err)
11770+ break;
11771+
11772+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11773+ unsigned long addr;
11774+
11775+ if ((ba & 0xFFC00000U) == 0x30800000U)
11776+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11777+ else
11778+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11779+
11780+ if (test_thread_flag(TIF_32BIT))
11781+ addr &= 0xFFFFFFFFUL;
11782+
11783+ regs->tpc = addr;
11784+ regs->tnpc = addr+4;
11785+ return 2;
11786+ }
11787+ } while (0);
11788+
11789+ do { /* PaX: patched PLT emulation #3 */
11790+ unsigned int sethi, bajmpl, nop;
11791+
11792+ err = get_user(sethi, (unsigned int *)regs->tpc);
11793+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11794+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11795+
11796+ if (err)
11797+ break;
11798+
11799+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11800+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11801+ nop == 0x01000000U)
11802+ {
11803+ unsigned long addr;
11804+
11805+ addr = (sethi & 0x003FFFFFU) << 10;
11806+ regs->u_regs[UREG_G1] = addr;
11807+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11808+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11809+ else
11810+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11811+
11812+ if (test_thread_flag(TIF_32BIT))
11813+ addr &= 0xFFFFFFFFUL;
11814+
11815+ regs->tpc = addr;
11816+ regs->tnpc = addr+4;
11817+ return 2;
11818+ }
11819+ } while (0);
11820+
11821+ do { /* PaX: patched PLT emulation #4 */
11822+ unsigned int sethi, mov1, call, mov2;
11823+
11824+ err = get_user(sethi, (unsigned int *)regs->tpc);
11825+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11826+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11827+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11828+
11829+ if (err)
11830+ break;
11831+
11832+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11833+ mov1 == 0x8210000FU &&
11834+ (call & 0xC0000000U) == 0x40000000U &&
11835+ mov2 == 0x9E100001U)
11836+ {
11837+ unsigned long addr;
11838+
11839+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11840+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11841+
11842+ if (test_thread_flag(TIF_32BIT))
11843+ addr &= 0xFFFFFFFFUL;
11844+
11845+ regs->tpc = addr;
11846+ regs->tnpc = addr+4;
11847+ return 2;
11848+ }
11849+ } while (0);
11850+
11851+ do { /* PaX: patched PLT emulation #5 */
11852+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11853+
11854+ err = get_user(sethi, (unsigned int *)regs->tpc);
11855+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11856+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11857+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11858+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11859+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11860+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11861+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11862+
11863+ if (err)
11864+ break;
11865+
11866+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11867+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11868+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11869+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11870+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11871+ sllx == 0x83287020U &&
11872+ jmpl == 0x81C04005U &&
11873+ nop == 0x01000000U)
11874+ {
11875+ unsigned long addr;
11876+
11877+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11878+ regs->u_regs[UREG_G1] <<= 32;
11879+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11880+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11881+ regs->tpc = addr;
11882+ regs->tnpc = addr+4;
11883+ return 2;
11884+ }
11885+ } while (0);
11886+
11887+ do { /* PaX: patched PLT emulation #6 */
11888+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11889+
11890+ err = get_user(sethi, (unsigned int *)regs->tpc);
11891+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11892+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11893+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11894+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11895+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11896+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11897+
11898+ if (err)
11899+ break;
11900+
11901+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11902+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11903+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11904+ sllx == 0x83287020U &&
11905+ (or & 0xFFFFE000U) == 0x8A116000U &&
11906+ jmpl == 0x81C04005U &&
11907+ nop == 0x01000000U)
11908+ {
11909+ unsigned long addr;
11910+
11911+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11912+ regs->u_regs[UREG_G1] <<= 32;
11913+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11914+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11915+ regs->tpc = addr;
11916+ regs->tnpc = addr+4;
11917+ return 2;
11918+ }
11919+ } while (0);
11920+
11921+ do { /* PaX: unpatched PLT emulation step 1 */
11922+ unsigned int sethi, ba, nop;
11923+
11924+ err = get_user(sethi, (unsigned int *)regs->tpc);
11925+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11926+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11927+
11928+ if (err)
11929+ break;
11930+
11931+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11932+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11933+ nop == 0x01000000U)
11934+ {
11935+ unsigned long addr;
11936+ unsigned int save, call;
11937+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11938+
11939+ if ((ba & 0xFFC00000U) == 0x30800000U)
11940+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11941+ else
11942+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11943+
11944+ if (test_thread_flag(TIF_32BIT))
11945+ addr &= 0xFFFFFFFFUL;
11946+
11947+ err = get_user(save, (unsigned int *)addr);
11948+ err |= get_user(call, (unsigned int *)(addr+4));
11949+ err |= get_user(nop, (unsigned int *)(addr+8));
11950+ if (err)
11951+ break;
11952+
11953+#ifdef CONFIG_PAX_DLRESOLVE
11954+ if (save == 0x9DE3BFA8U &&
11955+ (call & 0xC0000000U) == 0x40000000U &&
11956+ nop == 0x01000000U)
11957+ {
11958+ struct vm_area_struct *vma;
11959+ unsigned long call_dl_resolve;
11960+
11961+ down_read(&current->mm->mmap_sem);
11962+ call_dl_resolve = current->mm->call_dl_resolve;
11963+ up_read(&current->mm->mmap_sem);
11964+ if (likely(call_dl_resolve))
11965+ goto emulate;
11966+
11967+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11968+
11969+ down_write(&current->mm->mmap_sem);
11970+ if (current->mm->call_dl_resolve) {
11971+ call_dl_resolve = current->mm->call_dl_resolve;
11972+ up_write(&current->mm->mmap_sem);
11973+ if (vma)
11974+ kmem_cache_free(vm_area_cachep, vma);
11975+ goto emulate;
11976+ }
11977+
11978+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11979+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11980+ up_write(&current->mm->mmap_sem);
11981+ if (vma)
11982+ kmem_cache_free(vm_area_cachep, vma);
11983+ return 1;
11984+ }
11985+
11986+ if (pax_insert_vma(vma, call_dl_resolve)) {
11987+ up_write(&current->mm->mmap_sem);
11988+ kmem_cache_free(vm_area_cachep, vma);
11989+ return 1;
11990+ }
11991+
11992+ current->mm->call_dl_resolve = call_dl_resolve;
11993+ up_write(&current->mm->mmap_sem);
11994+
11995+emulate:
11996+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11997+ regs->tpc = call_dl_resolve;
11998+ regs->tnpc = addr+4;
11999+ return 3;
12000+ }
12001+#endif
12002+
12003+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12004+ if ((save & 0xFFC00000U) == 0x05000000U &&
12005+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12006+ nop == 0x01000000U)
12007+ {
12008+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12009+ regs->u_regs[UREG_G2] = addr + 4;
12010+ addr = (save & 0x003FFFFFU) << 10;
12011+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12012+
12013+ if (test_thread_flag(TIF_32BIT))
12014+ addr &= 0xFFFFFFFFUL;
12015+
12016+ regs->tpc = addr;
12017+ regs->tnpc = addr+4;
12018+ return 3;
12019+ }
12020+
12021+ /* PaX: 64-bit PLT stub */
12022+ err = get_user(sethi1, (unsigned int *)addr);
12023+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12024+ err |= get_user(or1, (unsigned int *)(addr+8));
12025+ err |= get_user(or2, (unsigned int *)(addr+12));
12026+ err |= get_user(sllx, (unsigned int *)(addr+16));
12027+ err |= get_user(add, (unsigned int *)(addr+20));
12028+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12029+ err |= get_user(nop, (unsigned int *)(addr+28));
12030+ if (err)
12031+ break;
12032+
12033+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12034+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12035+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12036+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12037+ sllx == 0x89293020U &&
12038+ add == 0x8A010005U &&
12039+ jmpl == 0x89C14000U &&
12040+ nop == 0x01000000U)
12041+ {
12042+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12043+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12044+ regs->u_regs[UREG_G4] <<= 32;
12045+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12046+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12047+ regs->u_regs[UREG_G4] = addr + 24;
12048+ addr = regs->u_regs[UREG_G5];
12049+ regs->tpc = addr;
12050+ regs->tnpc = addr+4;
12051+ return 3;
12052+ }
12053+ }
12054+ } while (0);
12055+
12056+#ifdef CONFIG_PAX_DLRESOLVE
12057+ do { /* PaX: unpatched PLT emulation step 2 */
12058+ unsigned int save, call, nop;
12059+
12060+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12061+ err |= get_user(call, (unsigned int *)regs->tpc);
12062+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12063+ if (err)
12064+ break;
12065+
12066+ if (save == 0x9DE3BFA8U &&
12067+ (call & 0xC0000000U) == 0x40000000U &&
12068+ nop == 0x01000000U)
12069+ {
12070+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12071+
12072+ if (test_thread_flag(TIF_32BIT))
12073+ dl_resolve &= 0xFFFFFFFFUL;
12074+
12075+ regs->u_regs[UREG_RETPC] = regs->tpc;
12076+ regs->tpc = dl_resolve;
12077+ regs->tnpc = dl_resolve+4;
12078+ return 3;
12079+ }
12080+ } while (0);
12081+#endif
12082+
12083+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12084+ unsigned int sethi, ba, nop;
12085+
12086+ err = get_user(sethi, (unsigned int *)regs->tpc);
12087+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12088+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12089+
12090+ if (err)
12091+ break;
12092+
12093+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12094+ (ba & 0xFFF00000U) == 0x30600000U &&
12095+ nop == 0x01000000U)
12096+ {
12097+ unsigned long addr;
12098+
12099+ addr = (sethi & 0x003FFFFFU) << 10;
12100+ regs->u_regs[UREG_G1] = addr;
12101+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12102+
12103+ if (test_thread_flag(TIF_32BIT))
12104+ addr &= 0xFFFFFFFFUL;
12105+
12106+ regs->tpc = addr;
12107+ regs->tnpc = addr+4;
12108+ return 2;
12109+ }
12110+ } while (0);
12111+
12112+#endif
12113+
12114+ return 1;
12115+}
12116+
12117+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12118+{
12119+ unsigned long i;
12120+
12121+ printk(KERN_ERR "PAX: bytes at PC: ");
12122+ for (i = 0; i < 8; i++) {
12123+ unsigned int c;
12124+ if (get_user(c, (unsigned int *)pc+i))
12125+ printk(KERN_CONT "???????? ");
12126+ else
12127+ printk(KERN_CONT "%08x ", c);
12128+ }
12129+ printk("\n");
12130+}
12131+#endif
12132+
12133 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12134 {
12135 enum ctx_state prev_state = exception_enter();
12136@@ -353,6 +816,29 @@ retry:
12137 if (!vma)
12138 goto bad_area;
12139
12140+#ifdef CONFIG_PAX_PAGEEXEC
12141+ /* PaX: detect ITLB misses on non-exec pages */
12142+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12143+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12144+ {
12145+ if (address != regs->tpc)
12146+ goto good_area;
12147+
12148+ up_read(&mm->mmap_sem);
12149+ switch (pax_handle_fetch_fault(regs)) {
12150+
12151+#ifdef CONFIG_PAX_EMUPLT
12152+ case 2:
12153+ case 3:
12154+ return;
12155+#endif
12156+
12157+ }
12158+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12159+ do_group_exit(SIGKILL);
12160+ }
12161+#endif
12162+
12163 /* Pure DTLB misses do not tell us whether the fault causing
12164 * load/store/atomic was a write or not, it only says that there
12165 * was no match. So in such a case we (carefully) read the
12166diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12167index 4242eab..9ae6360 100644
12168--- a/arch/sparc/mm/hugetlbpage.c
12169+++ b/arch/sparc/mm/hugetlbpage.c
12170@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12171 unsigned long addr,
12172 unsigned long len,
12173 unsigned long pgoff,
12174- unsigned long flags)
12175+ unsigned long flags,
12176+ unsigned long offset)
12177 {
12178+ struct mm_struct *mm = current->mm;
12179 unsigned long task_size = TASK_SIZE;
12180 struct vm_unmapped_area_info info;
12181
12182@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12183
12184 info.flags = 0;
12185 info.length = len;
12186- info.low_limit = TASK_UNMAPPED_BASE;
12187+ info.low_limit = mm->mmap_base;
12188 info.high_limit = min(task_size, VA_EXCLUDE_START);
12189 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12190 info.align_offset = 0;
12191+ info.threadstack_offset = offset;
12192 addr = vm_unmapped_area(&info);
12193
12194 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12195 VM_BUG_ON(addr != -ENOMEM);
12196 info.low_limit = VA_EXCLUDE_END;
12197+
12198+#ifdef CONFIG_PAX_RANDMMAP
12199+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12200+ info.low_limit += mm->delta_mmap;
12201+#endif
12202+
12203 info.high_limit = task_size;
12204 addr = vm_unmapped_area(&info);
12205 }
12206@@ -55,7 +64,8 @@ static unsigned long
12207 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12208 const unsigned long len,
12209 const unsigned long pgoff,
12210- const unsigned long flags)
12211+ const unsigned long flags,
12212+ const unsigned long offset)
12213 {
12214 struct mm_struct *mm = current->mm;
12215 unsigned long addr = addr0;
12216@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12217 info.high_limit = mm->mmap_base;
12218 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12219 info.align_offset = 0;
12220+ info.threadstack_offset = offset;
12221 addr = vm_unmapped_area(&info);
12222
12223 /*
12224@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12225 VM_BUG_ON(addr != -ENOMEM);
12226 info.flags = 0;
12227 info.low_limit = TASK_UNMAPPED_BASE;
12228+
12229+#ifdef CONFIG_PAX_RANDMMAP
12230+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12231+ info.low_limit += mm->delta_mmap;
12232+#endif
12233+
12234 info.high_limit = STACK_TOP32;
12235 addr = vm_unmapped_area(&info);
12236 }
12237@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12238 struct mm_struct *mm = current->mm;
12239 struct vm_area_struct *vma;
12240 unsigned long task_size = TASK_SIZE;
12241+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12242
12243 if (test_thread_flag(TIF_32BIT))
12244 task_size = STACK_TOP32;
12245@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12246 return addr;
12247 }
12248
12249+#ifdef CONFIG_PAX_RANDMMAP
12250+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12251+#endif
12252+
12253 if (addr) {
12254 addr = ALIGN(addr, HPAGE_SIZE);
12255 vma = find_vma(mm, addr);
12256- if (task_size - len >= addr &&
12257- (!vma || addr + len <= vma->vm_start))
12258+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12259 return addr;
12260 }
12261 if (mm->get_unmapped_area == arch_get_unmapped_area)
12262 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12263- pgoff, flags);
12264+ pgoff, flags, offset);
12265 else
12266 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12267- pgoff, flags);
12268+ pgoff, flags, offset);
12269 }
12270
12271 pte_t *huge_pte_alloc(struct mm_struct *mm,
12272diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12273index 4ca0d6b..e89bca1 100644
12274--- a/arch/sparc/mm/init_64.c
12275+++ b/arch/sparc/mm/init_64.c
12276@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12277 int num_kernel_image_mappings;
12278
12279 #ifdef CONFIG_DEBUG_DCFLUSH
12280-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12281+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12282 #ifdef CONFIG_SMP
12283-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12284+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12285 #endif
12286 #endif
12287
12288@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12289 {
12290 BUG_ON(tlb_type == hypervisor);
12291 #ifdef CONFIG_DEBUG_DCFLUSH
12292- atomic_inc(&dcpage_flushes);
12293+ atomic_inc_unchecked(&dcpage_flushes);
12294 #endif
12295
12296 #ifdef DCACHE_ALIASING_POSSIBLE
12297@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12298
12299 #ifdef CONFIG_DEBUG_DCFLUSH
12300 seq_printf(m, "DCPageFlushes\t: %d\n",
12301- atomic_read(&dcpage_flushes));
12302+ atomic_read_unchecked(&dcpage_flushes));
12303 #ifdef CONFIG_SMP
12304 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12305- atomic_read(&dcpage_flushes_xcall));
12306+ atomic_read_unchecked(&dcpage_flushes_xcall));
12307 #endif /* CONFIG_SMP */
12308 #endif /* CONFIG_DEBUG_DCFLUSH */
12309 }
12310diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12311index 7cca418..53fc030 100644
12312--- a/arch/tile/Kconfig
12313+++ b/arch/tile/Kconfig
12314@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12315
12316 config KEXEC
12317 bool "kexec system call"
12318+ depends on !GRKERNSEC_KMEM
12319 ---help---
12320 kexec is a system call that implements the ability to shutdown your
12321 current kernel, and to start another kernel. It is like a reboot
12322diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12323index 7b11c5f..755a026 100644
12324--- a/arch/tile/include/asm/atomic_64.h
12325+++ b/arch/tile/include/asm/atomic_64.h
12326@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12327
12328 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12329
12330+#define atomic64_read_unchecked(v) atomic64_read(v)
12331+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12332+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12333+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12334+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12335+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12336+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12337+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12338+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12339+
12340 /* Define this to indicate that cmpxchg is an efficient operation. */
12341 #define __HAVE_ARCH_CMPXCHG
12342
12343diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12344index 6160761..00cac88 100644
12345--- a/arch/tile/include/asm/cache.h
12346+++ b/arch/tile/include/asm/cache.h
12347@@ -15,11 +15,12 @@
12348 #ifndef _ASM_TILE_CACHE_H
12349 #define _ASM_TILE_CACHE_H
12350
12351+#include <linux/const.h>
12352 #include <arch/chip.h>
12353
12354 /* bytes per L1 data cache line */
12355 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12356-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12357+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12358
12359 /* bytes per L2 cache line */
12360 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12361diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12362index f41cb53..31d3ab4 100644
12363--- a/arch/tile/include/asm/uaccess.h
12364+++ b/arch/tile/include/asm/uaccess.h
12365@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12366 const void __user *from,
12367 unsigned long n)
12368 {
12369- int sz = __compiletime_object_size(to);
12370+ size_t sz = __compiletime_object_size(to);
12371
12372- if (likely(sz == -1 || sz >= n))
12373+ if (likely(sz == (size_t)-1 || sz >= n))
12374 n = _copy_from_user(to, from, n);
12375 else
12376 copy_from_user_overflow();
12377diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12378index 8416240..a012fb7 100644
12379--- a/arch/tile/mm/hugetlbpage.c
12380+++ b/arch/tile/mm/hugetlbpage.c
12381@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12382 info.high_limit = TASK_SIZE;
12383 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12384 info.align_offset = 0;
12385+ info.threadstack_offset = 0;
12386 return vm_unmapped_area(&info);
12387 }
12388
12389@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12390 info.high_limit = current->mm->mmap_base;
12391 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12392 info.align_offset = 0;
12393+ info.threadstack_offset = 0;
12394 addr = vm_unmapped_area(&info);
12395
12396 /*
12397diff --git a/arch/um/Makefile b/arch/um/Makefile
12398index e4b1a96..16162f8 100644
12399--- a/arch/um/Makefile
12400+++ b/arch/um/Makefile
12401@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12402 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12403 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12404
12405+ifdef CONSTIFY_PLUGIN
12406+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12407+endif
12408+
12409 #This will adjust *FLAGS accordingly to the platform.
12410 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12411
12412diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12413index 19e1bdd..3665b77 100644
12414--- a/arch/um/include/asm/cache.h
12415+++ b/arch/um/include/asm/cache.h
12416@@ -1,6 +1,7 @@
12417 #ifndef __UM_CACHE_H
12418 #define __UM_CACHE_H
12419
12420+#include <linux/const.h>
12421
12422 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12423 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12424@@ -12,6 +13,6 @@
12425 # define L1_CACHE_SHIFT 5
12426 #endif
12427
12428-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12429+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12430
12431 #endif
12432diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12433index 2e0a6b1..a64d0f5 100644
12434--- a/arch/um/include/asm/kmap_types.h
12435+++ b/arch/um/include/asm/kmap_types.h
12436@@ -8,6 +8,6 @@
12437
12438 /* No more #include "asm/arch/kmap_types.h" ! */
12439
12440-#define KM_TYPE_NR 14
12441+#define KM_TYPE_NR 15
12442
12443 #endif
12444diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12445index 71c5d13..4c7b9f1 100644
12446--- a/arch/um/include/asm/page.h
12447+++ b/arch/um/include/asm/page.h
12448@@ -14,6 +14,9 @@
12449 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12450 #define PAGE_MASK (~(PAGE_SIZE-1))
12451
12452+#define ktla_ktva(addr) (addr)
12453+#define ktva_ktla(addr) (addr)
12454+
12455 #ifndef __ASSEMBLY__
12456
12457 struct page;
12458diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12459index 2b4274e..754fe06 100644
12460--- a/arch/um/include/asm/pgtable-3level.h
12461+++ b/arch/um/include/asm/pgtable-3level.h
12462@@ -58,6 +58,7 @@
12463 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12464 #define pud_populate(mm, pud, pmd) \
12465 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12466+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12467
12468 #ifdef CONFIG_64BIT
12469 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12470diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12471index f17bca8..48adb87 100644
12472--- a/arch/um/kernel/process.c
12473+++ b/arch/um/kernel/process.c
12474@@ -356,22 +356,6 @@ int singlestepping(void * t)
12475 return 2;
12476 }
12477
12478-/*
12479- * Only x86 and x86_64 have an arch_align_stack().
12480- * All other arches have "#define arch_align_stack(x) (x)"
12481- * in their asm/exec.h
12482- * As this is included in UML from asm-um/system-generic.h,
12483- * we can use it to behave as the subarch does.
12484- */
12485-#ifndef arch_align_stack
12486-unsigned long arch_align_stack(unsigned long sp)
12487-{
12488- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12489- sp -= get_random_int() % 8192;
12490- return sp & ~0xf;
12491-}
12492-#endif
12493-
12494 unsigned long get_wchan(struct task_struct *p)
12495 {
12496 unsigned long stack_page, sp, ip;
12497diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12498index ad8f795..2c7eec6 100644
12499--- a/arch/unicore32/include/asm/cache.h
12500+++ b/arch/unicore32/include/asm/cache.h
12501@@ -12,8 +12,10 @@
12502 #ifndef __UNICORE_CACHE_H__
12503 #define __UNICORE_CACHE_H__
12504
12505-#define L1_CACHE_SHIFT (5)
12506-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12507+#include <linux/const.h>
12508+
12509+#define L1_CACHE_SHIFT 5
12510+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12511
12512 /*
12513 * Memory returned by kmalloc() may be used for DMA, so we must make
12514diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12515index b7d31ca..9481ec5 100644
12516--- a/arch/x86/Kconfig
12517+++ b/arch/x86/Kconfig
12518@@ -132,7 +132,7 @@ config X86
12519 select RTC_LIB
12520 select HAVE_DEBUG_STACKOVERFLOW
12521 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12522- select HAVE_CC_STACKPROTECTOR
12523+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12524 select GENERIC_CPU_AUTOPROBE
12525 select HAVE_ARCH_AUDITSYSCALL
12526 select ARCH_SUPPORTS_ATOMIC_RMW
12527@@ -266,7 +266,7 @@ config X86_HT
12528
12529 config X86_32_LAZY_GS
12530 def_bool y
12531- depends on X86_32 && !CC_STACKPROTECTOR
12532+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12533
12534 config ARCH_HWEIGHT_CFLAGS
12535 string
12536@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12537
12538 menuconfig HYPERVISOR_GUEST
12539 bool "Linux guest support"
12540+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12541 ---help---
12542 Say Y here to enable options for running Linux under various hyper-
12543 visors. This option enables basic hypervisor detection and platform
12544@@ -1013,6 +1014,7 @@ config VM86
12545
12546 config X86_16BIT
12547 bool "Enable support for 16-bit segments" if EXPERT
12548+ depends on !GRKERNSEC
12549 default y
12550 ---help---
12551 This option is required by programs like Wine to run 16-bit
12552@@ -1186,6 +1188,7 @@ choice
12553
12554 config NOHIGHMEM
12555 bool "off"
12556+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12557 ---help---
12558 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12559 However, the address space of 32-bit x86 processors is only 4
12560@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12561
12562 config HIGHMEM4G
12563 bool "4GB"
12564+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12565 ---help---
12566 Select this if you have a 32-bit processor and between 1 and 4
12567 gigabytes of physical RAM.
12568@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12569 hex
12570 default 0xB0000000 if VMSPLIT_3G_OPT
12571 default 0x80000000 if VMSPLIT_2G
12572- default 0x78000000 if VMSPLIT_2G_OPT
12573+ default 0x70000000 if VMSPLIT_2G_OPT
12574 default 0x40000000 if VMSPLIT_1G
12575 default 0xC0000000
12576 depends on X86_32
12577@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12578
12579 config KEXEC
12580 bool "kexec system call"
12581+ depends on !GRKERNSEC_KMEM
12582 ---help---
12583 kexec is a system call that implements the ability to shutdown your
12584 current kernel, and to start another kernel. It is like a reboot
12585@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12586
12587 config PHYSICAL_ALIGN
12588 hex "Alignment value to which kernel should be aligned"
12589- default "0x200000"
12590+ default "0x1000000"
12591+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12592+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12593 range 0x2000 0x1000000 if X86_32
12594 range 0x200000 0x1000000 if X86_64
12595 ---help---
12596@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12597 def_bool n
12598 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12599 depends on X86_32 || IA32_EMULATION
12600+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12601 ---help---
12602 Certain buggy versions of glibc will crash if they are
12603 presented with a 32-bit vDSO that is not mapped at the address
12604diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12605index 6983314..54ad7e8 100644
12606--- a/arch/x86/Kconfig.cpu
12607+++ b/arch/x86/Kconfig.cpu
12608@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12609
12610 config X86_F00F_BUG
12611 def_bool y
12612- depends on M586MMX || M586TSC || M586 || M486
12613+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12614
12615 config X86_INVD_BUG
12616 def_bool y
12617@@ -327,7 +327,7 @@ config X86_INVD_BUG
12618
12619 config X86_ALIGNMENT_16
12620 def_bool y
12621- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12622+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12623
12624 config X86_INTEL_USERCOPY
12625 def_bool y
12626@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12627 # generates cmov.
12628 config X86_CMOV
12629 def_bool y
12630- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12631+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12632
12633 config X86_MINIMUM_CPU_FAMILY
12634 int
12635diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12636index 20028da..88d5946 100644
12637--- a/arch/x86/Kconfig.debug
12638+++ b/arch/x86/Kconfig.debug
12639@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12640 config DEBUG_RODATA
12641 bool "Write protect kernel read-only data structures"
12642 default y
12643- depends on DEBUG_KERNEL
12644+ depends on DEBUG_KERNEL && BROKEN
12645 ---help---
12646 Mark the kernel read-only data as write-protected in the pagetables,
12647 in order to catch accidental (and incorrect) writes to such const
12648@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12649
12650 config DEBUG_SET_MODULE_RONX
12651 bool "Set loadable kernel module data as NX and text as RO"
12652- depends on MODULES
12653+ depends on MODULES && BROKEN
12654 ---help---
12655 This option helps catch unintended modifications to loadable
12656 kernel module's text and read-only data. It also prevents execution
12657diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12658index 5ba2d9c..41e5bb6 100644
12659--- a/arch/x86/Makefile
12660+++ b/arch/x86/Makefile
12661@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12662 # CPU-specific tuning. Anything which can be shared with UML should go here.
12663 include $(srctree)/arch/x86/Makefile_32.cpu
12664 KBUILD_CFLAGS += $(cflags-y)
12665-
12666- # temporary until string.h is fixed
12667- KBUILD_CFLAGS += -ffreestanding
12668 else
12669 BITS := 64
12670 UTS_MACHINE := x86_64
12671@@ -107,6 +104,9 @@ else
12672 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12673 endif
12674
12675+# temporary until string.h is fixed
12676+KBUILD_CFLAGS += -ffreestanding
12677+
12678 # Make sure compiler does not have buggy stack-protector support.
12679 ifdef CONFIG_CC_STACKPROTECTOR
12680 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12681@@ -181,6 +181,7 @@ archheaders:
12682 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12683
12684 archprepare:
12685+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12686 ifeq ($(CONFIG_KEXEC_FILE),y)
12687 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12688 endif
12689@@ -264,3 +265,9 @@ define archhelp
12690 echo ' FDARGS="..." arguments for the booted kernel'
12691 echo ' FDINITRD=file initrd for the booted kernel'
12692 endef
12693+
12694+define OLD_LD
12695+
12696+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12697+*** Please upgrade your binutils to 2.18 or newer
12698+endef
12699diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12700index 57bbf2f..b100fce 100644
12701--- a/arch/x86/boot/Makefile
12702+++ b/arch/x86/boot/Makefile
12703@@ -58,6 +58,9 @@ clean-files += cpustr.h
12704 # ---------------------------------------------------------------------------
12705
12706 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12707+ifdef CONSTIFY_PLUGIN
12708+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12709+endif
12710 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12711 GCOV_PROFILE := n
12712
12713diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12714index 878e4b9..20537ab 100644
12715--- a/arch/x86/boot/bitops.h
12716+++ b/arch/x86/boot/bitops.h
12717@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12718 u8 v;
12719 const u32 *p = (const u32 *)addr;
12720
12721- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12722+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12723 return v;
12724 }
12725
12726@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12727
12728 static inline void set_bit(int nr, void *addr)
12729 {
12730- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12731+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12732 }
12733
12734 #endif /* BOOT_BITOPS_H */
12735diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12736index bd49ec6..94c7f58 100644
12737--- a/arch/x86/boot/boot.h
12738+++ b/arch/x86/boot/boot.h
12739@@ -84,7 +84,7 @@ static inline void io_delay(void)
12740 static inline u16 ds(void)
12741 {
12742 u16 seg;
12743- asm("movw %%ds,%0" : "=rm" (seg));
12744+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12745 return seg;
12746 }
12747
12748diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12749index 0a291cd..9686efc 100644
12750--- a/arch/x86/boot/compressed/Makefile
12751+++ b/arch/x86/boot/compressed/Makefile
12752@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12753 KBUILD_CFLAGS += -mno-mmx -mno-sse
12754 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12755 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12756+ifdef CONSTIFY_PLUGIN
12757+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12758+endif
12759
12760 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12761 GCOV_PROFILE := n
12762diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12763index a53440e..c3dbf1e 100644
12764--- a/arch/x86/boot/compressed/efi_stub_32.S
12765+++ b/arch/x86/boot/compressed/efi_stub_32.S
12766@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12767 * parameter 2, ..., param n. To make things easy, we save the return
12768 * address of efi_call_phys in a global variable.
12769 */
12770- popl %ecx
12771- movl %ecx, saved_return_addr(%edx)
12772- /* get the function pointer into ECX*/
12773- popl %ecx
12774- movl %ecx, efi_rt_function_ptr(%edx)
12775+ popl saved_return_addr(%edx)
12776+ popl efi_rt_function_ptr(%edx)
12777
12778 /*
12779 * 3. Call the physical function.
12780 */
12781- call *%ecx
12782+ call *efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 4. Balance the stack. And because EAX contain the return value,
12786@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12787 1: popl %edx
12788 subl $1b, %edx
12789
12790- movl efi_rt_function_ptr(%edx), %ecx
12791- pushl %ecx
12792+ pushl efi_rt_function_ptr(%edx)
12793
12794 /*
12795 * 10. Push the saved return address onto the stack and return.
12796 */
12797- movl saved_return_addr(%edx), %ecx
12798- pushl %ecx
12799- ret
12800+ jmpl *saved_return_addr(%edx)
12801 ENDPROC(efi_call_phys)
12802 .previous
12803
12804diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12805index 630384a..278e788 100644
12806--- a/arch/x86/boot/compressed/efi_thunk_64.S
12807+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12808@@ -189,8 +189,8 @@ efi_gdt64:
12809 .long 0 /* Filled out by user */
12810 .word 0
12811 .quad 0x0000000000000000 /* NULL descriptor */
12812- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12813- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12814+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12815+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12816 .quad 0x0080890000000000 /* TS descriptor */
12817 .quad 0x0000000000000000 /* TS continued */
12818 efi_gdt64_end:
12819diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12820index 1d7fbbc..36ecd58 100644
12821--- a/arch/x86/boot/compressed/head_32.S
12822+++ b/arch/x86/boot/compressed/head_32.S
12823@@ -140,10 +140,10 @@ preferred_addr:
12824 addl %eax, %ebx
12825 notl %eax
12826 andl %eax, %ebx
12827- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12828+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12829 jge 1f
12830 #endif
12831- movl $LOAD_PHYSICAL_ADDR, %ebx
12832+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12833 1:
12834
12835 /* Target address to relocate to for decompression */
12836diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12837index 6b1766c..ad465c9 100644
12838--- a/arch/x86/boot/compressed/head_64.S
12839+++ b/arch/x86/boot/compressed/head_64.S
12840@@ -94,10 +94,10 @@ ENTRY(startup_32)
12841 addl %eax, %ebx
12842 notl %eax
12843 andl %eax, %ebx
12844- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12845+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12846 jge 1f
12847 #endif
12848- movl $LOAD_PHYSICAL_ADDR, %ebx
12849+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12850 1:
12851
12852 /* Target address to relocate to for decompression */
12853@@ -322,10 +322,10 @@ preferred_addr:
12854 addq %rax, %rbp
12855 notq %rax
12856 andq %rax, %rbp
12857- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12858+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12859 jge 1f
12860 #endif
12861- movq $LOAD_PHYSICAL_ADDR, %rbp
12862+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12863 1:
12864
12865 /* Target address to relocate to for decompression */
12866@@ -434,8 +434,8 @@ gdt:
12867 .long gdt
12868 .word 0
12869 .quad 0x0000000000000000 /* NULL descriptor */
12870- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12871- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12872+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12873+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12874 .quad 0x0080890000000000 /* TS descriptor */
12875 .quad 0x0000000000000000 /* TS continued */
12876 gdt_end:
12877diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12878index a950864..c710239 100644
12879--- a/arch/x86/boot/compressed/misc.c
12880+++ b/arch/x86/boot/compressed/misc.c
12881@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12882 * Calculate the delta between where vmlinux was linked to load
12883 * and where it was actually loaded.
12884 */
12885- delta = min_addr - LOAD_PHYSICAL_ADDR;
12886+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12887 if (!delta) {
12888 debug_putstr("No relocation needed... ");
12889 return;
12890@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12891 Elf32_Ehdr ehdr;
12892 Elf32_Phdr *phdrs, *phdr;
12893 #endif
12894- void *dest;
12895+ void *dest, *prev;
12896 int i;
12897
12898 memcpy(&ehdr, output, sizeof(ehdr));
12899@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12900 case PT_LOAD:
12901 #ifdef CONFIG_RELOCATABLE
12902 dest = output;
12903- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12904+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12905 #else
12906 dest = (void *)(phdr->p_paddr);
12907 #endif
12908 memcpy(dest,
12909 output + phdr->p_offset,
12910 phdr->p_filesz);
12911+ if (i)
12912+ memset(prev, 0xff, dest - prev);
12913+ prev = dest + phdr->p_filesz;
12914 break;
12915 default: /* Ignore other PT_* */ break;
12916 }
12917@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12918 error("Destination address too large");
12919 #endif
12920 #ifndef CONFIG_RELOCATABLE
12921- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12922+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12923 error("Wrong destination address");
12924 #endif
12925
12926diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12927index 1fd7d57..0f7d096 100644
12928--- a/arch/x86/boot/cpucheck.c
12929+++ b/arch/x86/boot/cpucheck.c
12930@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12931 u32 ecx = MSR_K7_HWCR;
12932 u32 eax, edx;
12933
12934- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12935+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12936 eax &= ~(1 << 15);
12937- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12938+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12939
12940 get_cpuflags(); /* Make sure it really did something */
12941 err = check_cpuflags();
12942@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12943 u32 ecx = MSR_VIA_FCR;
12944 u32 eax, edx;
12945
12946- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12947+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12948 eax |= (1<<1)|(1<<7);
12949- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12950+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12951
12952 set_bit(X86_FEATURE_CX8, cpu.flags);
12953 err = check_cpuflags();
12954@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12955 u32 eax, edx;
12956 u32 level = 1;
12957
12958- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12959- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12960- asm("cpuid"
12961+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12962+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12963+ asm volatile("cpuid"
12964 : "+a" (level), "=d" (cpu.flags[0])
12965 : : "ecx", "ebx");
12966- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12967+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12968
12969 err = check_cpuflags();
12970 } else if (err == 0x01 &&
12971diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12972index 16ef025..91e033b 100644
12973--- a/arch/x86/boot/header.S
12974+++ b/arch/x86/boot/header.S
12975@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12976 # single linked list of
12977 # struct setup_data
12978
12979-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12980+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12981
12982 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12983+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12984+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12985+#else
12986 #define VO_INIT_SIZE (VO__end - VO__text)
12987+#endif
12988 #if ZO_INIT_SIZE > VO_INIT_SIZE
12989 #define INIT_SIZE ZO_INIT_SIZE
12990 #else
12991diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12992index db75d07..8e6d0af 100644
12993--- a/arch/x86/boot/memory.c
12994+++ b/arch/x86/boot/memory.c
12995@@ -19,7 +19,7 @@
12996
12997 static int detect_memory_e820(void)
12998 {
12999- int count = 0;
13000+ unsigned int count = 0;
13001 struct biosregs ireg, oreg;
13002 struct e820entry *desc = boot_params.e820_map;
13003 static struct e820entry buf; /* static so it is zeroed */
13004diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13005index ba3e100..6501b8f 100644
13006--- a/arch/x86/boot/video-vesa.c
13007+++ b/arch/x86/boot/video-vesa.c
13008@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13009
13010 boot_params.screen_info.vesapm_seg = oreg.es;
13011 boot_params.screen_info.vesapm_off = oreg.di;
13012+ boot_params.screen_info.vesapm_size = oreg.cx;
13013 }
13014
13015 /*
13016diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13017index 43eda28..5ab5fdb 100644
13018--- a/arch/x86/boot/video.c
13019+++ b/arch/x86/boot/video.c
13020@@ -96,7 +96,7 @@ static void store_mode_params(void)
13021 static unsigned int get_entry(void)
13022 {
13023 char entry_buf[4];
13024- int i, len = 0;
13025+ unsigned int i, len = 0;
13026 int key;
13027 unsigned int v;
13028
13029diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13030index 9105655..41779c1 100644
13031--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13032+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13033@@ -8,6 +8,8 @@
13034 * including this sentence is retained in full.
13035 */
13036
13037+#include <asm/alternative-asm.h>
13038+
13039 .extern crypto_ft_tab
13040 .extern crypto_it_tab
13041 .extern crypto_fl_tab
13042@@ -70,6 +72,8 @@
13043 je B192; \
13044 leaq 32(r9),r9;
13045
13046+#define ret pax_force_retaddr; ret
13047+
13048 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13049 movq r1,r2; \
13050 movq r3,r4; \
13051diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13052index 6bd2c6c..368c93e 100644
13053--- a/arch/x86/crypto/aesni-intel_asm.S
13054+++ b/arch/x86/crypto/aesni-intel_asm.S
13055@@ -31,6 +31,7 @@
13056
13057 #include <linux/linkage.h>
13058 #include <asm/inst.h>
13059+#include <asm/alternative-asm.h>
13060
13061 /*
13062 * The following macros are used to move an (un)aligned 16 byte value to/from
13063@@ -217,7 +218,7 @@ enc: .octa 0x2
13064 * num_initial_blocks = b mod 4
13065 * encrypt the initial num_initial_blocks blocks and apply ghash on
13066 * the ciphertext
13067-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13068+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13069 * are clobbered
13070 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13071 */
13072@@ -227,8 +228,8 @@ enc: .octa 0x2
13073 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13074 MOVADQ SHUF_MASK(%rip), %xmm14
13075 mov arg7, %r10 # %r10 = AAD
13076- mov arg8, %r12 # %r12 = aadLen
13077- mov %r12, %r11
13078+ mov arg8, %r15 # %r15 = aadLen
13079+ mov %r15, %r11
13080 pxor %xmm\i, %xmm\i
13081
13082 _get_AAD_loop\num_initial_blocks\operation:
13083@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13084 psrldq $4, %xmm\i
13085 pxor \TMP1, %xmm\i
13086 add $4, %r10
13087- sub $4, %r12
13088+ sub $4, %r15
13089 jne _get_AAD_loop\num_initial_blocks\operation
13090
13091 cmp $16, %r11
13092 je _get_AAD_loop2_done\num_initial_blocks\operation
13093
13094- mov $16, %r12
13095+ mov $16, %r15
13096 _get_AAD_loop2\num_initial_blocks\operation:
13097 psrldq $4, %xmm\i
13098- sub $4, %r12
13099- cmp %r11, %r12
13100+ sub $4, %r15
13101+ cmp %r11, %r15
13102 jne _get_AAD_loop2\num_initial_blocks\operation
13103
13104 _get_AAD_loop2_done\num_initial_blocks\operation:
13105@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13106 * num_initial_blocks = b mod 4
13107 * encrypt the initial num_initial_blocks blocks and apply ghash on
13108 * the ciphertext
13109-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13110+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13111 * are clobbered
13112 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13113 */
13114@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13115 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13116 MOVADQ SHUF_MASK(%rip), %xmm14
13117 mov arg7, %r10 # %r10 = AAD
13118- mov arg8, %r12 # %r12 = aadLen
13119- mov %r12, %r11
13120+ mov arg8, %r15 # %r15 = aadLen
13121+ mov %r15, %r11
13122 pxor %xmm\i, %xmm\i
13123 _get_AAD_loop\num_initial_blocks\operation:
13124 movd (%r10), \TMP1
13125@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13126 psrldq $4, %xmm\i
13127 pxor \TMP1, %xmm\i
13128 add $4, %r10
13129- sub $4, %r12
13130+ sub $4, %r15
13131 jne _get_AAD_loop\num_initial_blocks\operation
13132 cmp $16, %r11
13133 je _get_AAD_loop2_done\num_initial_blocks\operation
13134- mov $16, %r12
13135+ mov $16, %r15
13136 _get_AAD_loop2\num_initial_blocks\operation:
13137 psrldq $4, %xmm\i
13138- sub $4, %r12
13139- cmp %r11, %r12
13140+ sub $4, %r15
13141+ cmp %r11, %r15
13142 jne _get_AAD_loop2\num_initial_blocks\operation
13143 _get_AAD_loop2_done\num_initial_blocks\operation:
13144 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13145@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13146 *
13147 *****************************************************************************/
13148 ENTRY(aesni_gcm_dec)
13149- push %r12
13150+ push %r15
13151 push %r13
13152 push %r14
13153 mov %rsp, %r14
13154@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13155 */
13156 sub $VARIABLE_OFFSET, %rsp
13157 and $~63, %rsp # align rsp to 64 bytes
13158- mov %arg6, %r12
13159- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13160+ mov %arg6, %r15
13161+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13162 movdqa SHUF_MASK(%rip), %xmm2
13163 PSHUFB_XMM %xmm2, %xmm13
13164
13165@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13166 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13167 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13168 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13169- mov %r13, %r12
13170- and $(3<<4), %r12
13171+ mov %r13, %r15
13172+ and $(3<<4), %r15
13173 jz _initial_num_blocks_is_0_decrypt
13174- cmp $(2<<4), %r12
13175+ cmp $(2<<4), %r15
13176 jb _initial_num_blocks_is_1_decrypt
13177 je _initial_num_blocks_is_2_decrypt
13178 _initial_num_blocks_is_3_decrypt:
13179@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13180 sub $16, %r11
13181 add %r13, %r11
13182 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13183- lea SHIFT_MASK+16(%rip), %r12
13184- sub %r13, %r12
13185+ lea SHIFT_MASK+16(%rip), %r15
13186+ sub %r13, %r15
13187 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13188 # (%r13 is the number of bytes in plaintext mod 16)
13189- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13190+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13191 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13192
13193 movdqa %xmm1, %xmm2
13194 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13195- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13196+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13197 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13198 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13199 pand %xmm1, %xmm2
13200@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13201 sub $1, %r13
13202 jne _less_than_8_bytes_left_decrypt
13203 _multiple_of_16_bytes_decrypt:
13204- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13205- shl $3, %r12 # convert into number of bits
13206- movd %r12d, %xmm15 # len(A) in %xmm15
13207+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13208+ shl $3, %r15 # convert into number of bits
13209+ movd %r15d, %xmm15 # len(A) in %xmm15
13210 shl $3, %arg4 # len(C) in bits (*128)
13211 MOVQ_R64_XMM %arg4, %xmm1
13212 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13213@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13214 mov %r14, %rsp
13215 pop %r14
13216 pop %r13
13217- pop %r12
13218+ pop %r15
13219+ pax_force_retaddr
13220 ret
13221 ENDPROC(aesni_gcm_dec)
13222
13223@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13224 * poly = x^128 + x^127 + x^126 + x^121 + 1
13225 ***************************************************************************/
13226 ENTRY(aesni_gcm_enc)
13227- push %r12
13228+ push %r15
13229 push %r13
13230 push %r14
13231 mov %rsp, %r14
13232@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13233 #
13234 sub $VARIABLE_OFFSET, %rsp
13235 and $~63, %rsp
13236- mov %arg6, %r12
13237- movdqu (%r12), %xmm13
13238+ mov %arg6, %r15
13239+ movdqu (%r15), %xmm13
13240 movdqa SHUF_MASK(%rip), %xmm2
13241 PSHUFB_XMM %xmm2, %xmm13
13242
13243@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13244 movdqa %xmm13, HashKey(%rsp)
13245 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13246 and $-16, %r13
13247- mov %r13, %r12
13248+ mov %r13, %r15
13249
13250 # Encrypt first few blocks
13251
13252- and $(3<<4), %r12
13253+ and $(3<<4), %r15
13254 jz _initial_num_blocks_is_0_encrypt
13255- cmp $(2<<4), %r12
13256+ cmp $(2<<4), %r15
13257 jb _initial_num_blocks_is_1_encrypt
13258 je _initial_num_blocks_is_2_encrypt
13259 _initial_num_blocks_is_3_encrypt:
13260@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13261 sub $16, %r11
13262 add %r13, %r11
13263 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13264- lea SHIFT_MASK+16(%rip), %r12
13265- sub %r13, %r12
13266+ lea SHIFT_MASK+16(%rip), %r15
13267+ sub %r13, %r15
13268 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13269 # (%r13 is the number of bytes in plaintext mod 16)
13270- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13271+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13272 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13273 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13274- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13275+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13276 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13277 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13278 movdqa SHUF_MASK(%rip), %xmm10
13279@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13280 sub $1, %r13
13281 jne _less_than_8_bytes_left_encrypt
13282 _multiple_of_16_bytes_encrypt:
13283- mov arg8, %r12 # %r12 = addLen (number of bytes)
13284- shl $3, %r12
13285- movd %r12d, %xmm15 # len(A) in %xmm15
13286+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13287+ shl $3, %r15
13288+ movd %r15d, %xmm15 # len(A) in %xmm15
13289 shl $3, %arg4 # len(C) in bits (*128)
13290 MOVQ_R64_XMM %arg4, %xmm1
13291 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13292@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13293 mov %r14, %rsp
13294 pop %r14
13295 pop %r13
13296- pop %r12
13297+ pop %r15
13298+ pax_force_retaddr
13299 ret
13300 ENDPROC(aesni_gcm_enc)
13301
13302@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13303 pxor %xmm1, %xmm0
13304 movaps %xmm0, (TKEYP)
13305 add $0x10, TKEYP
13306+ pax_force_retaddr
13307 ret
13308 ENDPROC(_key_expansion_128)
13309 ENDPROC(_key_expansion_256a)
13310@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13311 shufps $0b01001110, %xmm2, %xmm1
13312 movaps %xmm1, 0x10(TKEYP)
13313 add $0x20, TKEYP
13314+ pax_force_retaddr
13315 ret
13316 ENDPROC(_key_expansion_192a)
13317
13318@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13319
13320 movaps %xmm0, (TKEYP)
13321 add $0x10, TKEYP
13322+ pax_force_retaddr
13323 ret
13324 ENDPROC(_key_expansion_192b)
13325
13326@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13327 pxor %xmm1, %xmm2
13328 movaps %xmm2, (TKEYP)
13329 add $0x10, TKEYP
13330+ pax_force_retaddr
13331 ret
13332 ENDPROC(_key_expansion_256b)
13333
13334@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13335 #ifndef __x86_64__
13336 popl KEYP
13337 #endif
13338+ pax_force_retaddr
13339 ret
13340 ENDPROC(aesni_set_key)
13341
13342@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13343 popl KLEN
13344 popl KEYP
13345 #endif
13346+ pax_force_retaddr
13347 ret
13348 ENDPROC(aesni_enc)
13349
13350@@ -1985,6 +1994,7 @@ _aesni_enc1:
13351 AESENC KEY STATE
13352 movaps 0x70(TKEYP), KEY
13353 AESENCLAST KEY STATE
13354+ pax_force_retaddr
13355 ret
13356 ENDPROC(_aesni_enc1)
13357
13358@@ -2094,6 +2104,7 @@ _aesni_enc4:
13359 AESENCLAST KEY STATE2
13360 AESENCLAST KEY STATE3
13361 AESENCLAST KEY STATE4
13362+ pax_force_retaddr
13363 ret
13364 ENDPROC(_aesni_enc4)
13365
13366@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13367 popl KLEN
13368 popl KEYP
13369 #endif
13370+ pax_force_retaddr
13371 ret
13372 ENDPROC(aesni_dec)
13373
13374@@ -2175,6 +2187,7 @@ _aesni_dec1:
13375 AESDEC KEY STATE
13376 movaps 0x70(TKEYP), KEY
13377 AESDECLAST KEY STATE
13378+ pax_force_retaddr
13379 ret
13380 ENDPROC(_aesni_dec1)
13381
13382@@ -2284,6 +2297,7 @@ _aesni_dec4:
13383 AESDECLAST KEY STATE2
13384 AESDECLAST KEY STATE3
13385 AESDECLAST KEY STATE4
13386+ pax_force_retaddr
13387 ret
13388 ENDPROC(_aesni_dec4)
13389
13390@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13391 popl KEYP
13392 popl LEN
13393 #endif
13394+ pax_force_retaddr
13395 ret
13396 ENDPROC(aesni_ecb_enc)
13397
13398@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13399 popl KEYP
13400 popl LEN
13401 #endif
13402+ pax_force_retaddr
13403 ret
13404 ENDPROC(aesni_ecb_dec)
13405
13406@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13407 popl LEN
13408 popl IVP
13409 #endif
13410+ pax_force_retaddr
13411 ret
13412 ENDPROC(aesni_cbc_enc)
13413
13414@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13415 popl LEN
13416 popl IVP
13417 #endif
13418+ pax_force_retaddr
13419 ret
13420 ENDPROC(aesni_cbc_dec)
13421
13422@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13423 mov $1, TCTR_LOW
13424 MOVQ_R64_XMM TCTR_LOW INC
13425 MOVQ_R64_XMM CTR TCTR_LOW
13426+ pax_force_retaddr
13427 ret
13428 ENDPROC(_aesni_inc_init)
13429
13430@@ -2590,6 +2609,7 @@ _aesni_inc:
13431 .Linc_low:
13432 movaps CTR, IV
13433 PSHUFB_XMM BSWAP_MASK IV
13434+ pax_force_retaddr
13435 ret
13436 ENDPROC(_aesni_inc)
13437
13438@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13439 .Lctr_enc_ret:
13440 movups IV, (IVP)
13441 .Lctr_enc_just_ret:
13442+ pax_force_retaddr
13443 ret
13444 ENDPROC(aesni_ctr_enc)
13445
13446@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13447 pxor INC, STATE4
13448 movdqu STATE4, 0x70(OUTP)
13449
13450+ pax_force_retaddr
13451 ret
13452 ENDPROC(aesni_xts_crypt8)
13453
13454diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13455index 246c670..466e2d6 100644
13456--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13457+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13458@@ -21,6 +21,7 @@
13459 */
13460
13461 #include <linux/linkage.h>
13462+#include <asm/alternative-asm.h>
13463
13464 .file "blowfish-x86_64-asm.S"
13465 .text
13466@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13467 jnz .L__enc_xor;
13468
13469 write_block();
13470+ pax_force_retaddr
13471 ret;
13472 .L__enc_xor:
13473 xor_block();
13474+ pax_force_retaddr
13475 ret;
13476 ENDPROC(__blowfish_enc_blk)
13477
13478@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13479
13480 movq %r11, %rbp;
13481
13482+ pax_force_retaddr
13483 ret;
13484 ENDPROC(blowfish_dec_blk)
13485
13486@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13487
13488 popq %rbx;
13489 popq %rbp;
13490+ pax_force_retaddr
13491 ret;
13492
13493 .L__enc_xor4:
13494@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13495
13496 popq %rbx;
13497 popq %rbp;
13498+ pax_force_retaddr
13499 ret;
13500 ENDPROC(__blowfish_enc_blk_4way)
13501
13502@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13503 popq %rbx;
13504 popq %rbp;
13505
13506+ pax_force_retaddr
13507 ret;
13508 ENDPROC(blowfish_dec_blk_4way)
13509diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13510index ce71f92..1dce7ec 100644
13511--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13512+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13513@@ -16,6 +16,7 @@
13514 */
13515
13516 #include <linux/linkage.h>
13517+#include <asm/alternative-asm.h>
13518
13519 #define CAMELLIA_TABLE_BYTE_LEN 272
13520
13521@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13522 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13523 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13524 %rcx, (%r9));
13525+ pax_force_retaddr
13526 ret;
13527 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13528
13529@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13530 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13531 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13532 %rax, (%r9));
13533+ pax_force_retaddr
13534 ret;
13535 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13536
13537@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13538 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13539 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13540
13541+ pax_force_retaddr
13542 ret;
13543
13544 .align 8
13545@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13546 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13547 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13548
13549+ pax_force_retaddr
13550 ret;
13551
13552 .align 8
13553@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13554 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13555 %xmm8, %rsi);
13556
13557+ pax_force_retaddr
13558 ret;
13559 ENDPROC(camellia_ecb_enc_16way)
13560
13561@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13562 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13563 %xmm8, %rsi);
13564
13565+ pax_force_retaddr
13566 ret;
13567 ENDPROC(camellia_ecb_dec_16way)
13568
13569@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13570 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13571 %xmm8, %rsi);
13572
13573+ pax_force_retaddr
13574 ret;
13575 ENDPROC(camellia_cbc_dec_16way)
13576
13577@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13578 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13579 %xmm8, %rsi);
13580
13581+ pax_force_retaddr
13582 ret;
13583 ENDPROC(camellia_ctr_16way)
13584
13585@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13586 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13587 %xmm8, %rsi);
13588
13589+ pax_force_retaddr
13590 ret;
13591 ENDPROC(camellia_xts_crypt_16way)
13592
13593diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13594index 0e0b886..5a3123c 100644
13595--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13596+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13597@@ -11,6 +11,7 @@
13598 */
13599
13600 #include <linux/linkage.h>
13601+#include <asm/alternative-asm.h>
13602
13603 #define CAMELLIA_TABLE_BYTE_LEN 272
13604
13605@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13606 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13607 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13608 %rcx, (%r9));
13609+ pax_force_retaddr
13610 ret;
13611 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13612
13613@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13614 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13615 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13616 %rax, (%r9));
13617+ pax_force_retaddr
13618 ret;
13619 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13620
13621@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13622 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13623 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13624
13625+ pax_force_retaddr
13626 ret;
13627
13628 .align 8
13629@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13630 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13631 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13632
13633+ pax_force_retaddr
13634 ret;
13635
13636 .align 8
13637@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13638
13639 vzeroupper;
13640
13641+ pax_force_retaddr
13642 ret;
13643 ENDPROC(camellia_ecb_enc_32way)
13644
13645@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13646
13647 vzeroupper;
13648
13649+ pax_force_retaddr
13650 ret;
13651 ENDPROC(camellia_ecb_dec_32way)
13652
13653@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13654
13655 vzeroupper;
13656
13657+ pax_force_retaddr
13658 ret;
13659 ENDPROC(camellia_cbc_dec_32way)
13660
13661@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13662
13663 vzeroupper;
13664
13665+ pax_force_retaddr
13666 ret;
13667 ENDPROC(camellia_ctr_32way)
13668
13669@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13670
13671 vzeroupper;
13672
13673+ pax_force_retaddr
13674 ret;
13675 ENDPROC(camellia_xts_crypt_32way)
13676
13677diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13678index 310319c..db3d7b5 100644
13679--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13680+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13681@@ -21,6 +21,7 @@
13682 */
13683
13684 #include <linux/linkage.h>
13685+#include <asm/alternative-asm.h>
13686
13687 .file "camellia-x86_64-asm_64.S"
13688 .text
13689@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13690 enc_outunpack(mov, RT1);
13691
13692 movq RRBP, %rbp;
13693+ pax_force_retaddr
13694 ret;
13695
13696 .L__enc_xor:
13697 enc_outunpack(xor, RT1);
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702 ENDPROC(__camellia_enc_blk)
13703
13704@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13705 dec_outunpack();
13706
13707 movq RRBP, %rbp;
13708+ pax_force_retaddr
13709 ret;
13710 ENDPROC(camellia_dec_blk)
13711
13712@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13713
13714 movq RRBP, %rbp;
13715 popq %rbx;
13716+ pax_force_retaddr
13717 ret;
13718
13719 .L__enc2_xor:
13720@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13721
13722 movq RRBP, %rbp;
13723 popq %rbx;
13724+ pax_force_retaddr
13725 ret;
13726 ENDPROC(__camellia_enc_blk_2way)
13727
13728@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13729
13730 movq RRBP, %rbp;
13731 movq RXOR, %rbx;
13732+ pax_force_retaddr
13733 ret;
13734 ENDPROC(camellia_dec_blk_2way)
13735diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13736index c35fd5d..2d8c7db 100644
13737--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13738+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13739@@ -24,6 +24,7 @@
13740 */
13741
13742 #include <linux/linkage.h>
13743+#include <asm/alternative-asm.h>
13744
13745 .file "cast5-avx-x86_64-asm_64.S"
13746
13747@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13748 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13749 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13750
13751+ pax_force_retaddr
13752 ret;
13753 ENDPROC(__cast5_enc_blk16)
13754
13755@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13756 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13757 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13758
13759+ pax_force_retaddr
13760 ret;
13761
13762 .L__skip_dec:
13763@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13764 vmovdqu RR4, (6*4*4)(%r11);
13765 vmovdqu RL4, (7*4*4)(%r11);
13766
13767+ pax_force_retaddr
13768 ret;
13769 ENDPROC(cast5_ecb_enc_16way)
13770
13771@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13772 vmovdqu RR4, (6*4*4)(%r11);
13773 vmovdqu RL4, (7*4*4)(%r11);
13774
13775+ pax_force_retaddr
13776 ret;
13777 ENDPROC(cast5_ecb_dec_16way)
13778
13779@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13780 * %rdx: src
13781 */
13782
13783- pushq %r12;
13784+ pushq %r14;
13785
13786 movq %rsi, %r11;
13787- movq %rdx, %r12;
13788+ movq %rdx, %r14;
13789
13790 vmovdqu (0*16)(%rdx), RL1;
13791 vmovdqu (1*16)(%rdx), RR1;
13792@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13793 call __cast5_dec_blk16;
13794
13795 /* xor with src */
13796- vmovq (%r12), RX;
13797+ vmovq (%r14), RX;
13798 vpshufd $0x4f, RX, RX;
13799 vpxor RX, RR1, RR1;
13800- vpxor 0*16+8(%r12), RL1, RL1;
13801- vpxor 1*16+8(%r12), RR2, RR2;
13802- vpxor 2*16+8(%r12), RL2, RL2;
13803- vpxor 3*16+8(%r12), RR3, RR3;
13804- vpxor 4*16+8(%r12), RL3, RL3;
13805- vpxor 5*16+8(%r12), RR4, RR4;
13806- vpxor 6*16+8(%r12), RL4, RL4;
13807+ vpxor 0*16+8(%r14), RL1, RL1;
13808+ vpxor 1*16+8(%r14), RR2, RR2;
13809+ vpxor 2*16+8(%r14), RL2, RL2;
13810+ vpxor 3*16+8(%r14), RR3, RR3;
13811+ vpxor 4*16+8(%r14), RL3, RL3;
13812+ vpxor 5*16+8(%r14), RR4, RR4;
13813+ vpxor 6*16+8(%r14), RL4, RL4;
13814
13815 vmovdqu RR1, (0*16)(%r11);
13816 vmovdqu RL1, (1*16)(%r11);
13817@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13818 vmovdqu RR4, (6*16)(%r11);
13819 vmovdqu RL4, (7*16)(%r11);
13820
13821- popq %r12;
13822+ popq %r14;
13823
13824+ pax_force_retaddr
13825 ret;
13826 ENDPROC(cast5_cbc_dec_16way)
13827
13828@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13829 * %rcx: iv (big endian, 64bit)
13830 */
13831
13832- pushq %r12;
13833+ pushq %r14;
13834
13835 movq %rsi, %r11;
13836- movq %rdx, %r12;
13837+ movq %rdx, %r14;
13838
13839 vpcmpeqd RTMP, RTMP, RTMP;
13840 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13841@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13842 call __cast5_enc_blk16;
13843
13844 /* dst = src ^ iv */
13845- vpxor (0*16)(%r12), RR1, RR1;
13846- vpxor (1*16)(%r12), RL1, RL1;
13847- vpxor (2*16)(%r12), RR2, RR2;
13848- vpxor (3*16)(%r12), RL2, RL2;
13849- vpxor (4*16)(%r12), RR3, RR3;
13850- vpxor (5*16)(%r12), RL3, RL3;
13851- vpxor (6*16)(%r12), RR4, RR4;
13852- vpxor (7*16)(%r12), RL4, RL4;
13853+ vpxor (0*16)(%r14), RR1, RR1;
13854+ vpxor (1*16)(%r14), RL1, RL1;
13855+ vpxor (2*16)(%r14), RR2, RR2;
13856+ vpxor (3*16)(%r14), RL2, RL2;
13857+ vpxor (4*16)(%r14), RR3, RR3;
13858+ vpxor (5*16)(%r14), RL3, RL3;
13859+ vpxor (6*16)(%r14), RR4, RR4;
13860+ vpxor (7*16)(%r14), RL4, RL4;
13861 vmovdqu RR1, (0*16)(%r11);
13862 vmovdqu RL1, (1*16)(%r11);
13863 vmovdqu RR2, (2*16)(%r11);
13864@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13865 vmovdqu RR4, (6*16)(%r11);
13866 vmovdqu RL4, (7*16)(%r11);
13867
13868- popq %r12;
13869+ popq %r14;
13870
13871+ pax_force_retaddr
13872 ret;
13873 ENDPROC(cast5_ctr_16way)
13874diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13875index e3531f8..e123f35 100644
13876--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13877+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13878@@ -24,6 +24,7 @@
13879 */
13880
13881 #include <linux/linkage.h>
13882+#include <asm/alternative-asm.h>
13883 #include "glue_helper-asm-avx.S"
13884
13885 .file "cast6-avx-x86_64-asm_64.S"
13886@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13887 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13888 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13889
13890+ pax_force_retaddr
13891 ret;
13892 ENDPROC(__cast6_enc_blk8)
13893
13894@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13895 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13896 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13897
13898+ pax_force_retaddr
13899 ret;
13900 ENDPROC(__cast6_dec_blk8)
13901
13902@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13903
13904 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13905
13906+ pax_force_retaddr
13907 ret;
13908 ENDPROC(cast6_ecb_enc_8way)
13909
13910@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13911
13912 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13913
13914+ pax_force_retaddr
13915 ret;
13916 ENDPROC(cast6_ecb_dec_8way)
13917
13918@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13919 * %rdx: src
13920 */
13921
13922- pushq %r12;
13923+ pushq %r14;
13924
13925 movq %rsi, %r11;
13926- movq %rdx, %r12;
13927+ movq %rdx, %r14;
13928
13929 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13930
13931 call __cast6_dec_blk8;
13932
13933- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13934+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13935
13936- popq %r12;
13937+ popq %r14;
13938
13939+ pax_force_retaddr
13940 ret;
13941 ENDPROC(cast6_cbc_dec_8way)
13942
13943@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13944 * %rcx: iv (little endian, 128bit)
13945 */
13946
13947- pushq %r12;
13948+ pushq %r14;
13949
13950 movq %rsi, %r11;
13951- movq %rdx, %r12;
13952+ movq %rdx, %r14;
13953
13954 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13955 RD2, RX, RKR, RKM);
13956
13957 call __cast6_enc_blk8;
13958
13959- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13960+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13961
13962- popq %r12;
13963+ popq %r14;
13964
13965+ pax_force_retaddr
13966 ret;
13967 ENDPROC(cast6_ctr_8way)
13968
13969@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13970 /* dst <= regs xor IVs(in dst) */
13971 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13972
13973+ pax_force_retaddr
13974 ret;
13975 ENDPROC(cast6_xts_enc_8way)
13976
13977@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13978 /* dst <= regs xor IVs(in dst) */
13979 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13980
13981+ pax_force_retaddr
13982 ret;
13983 ENDPROC(cast6_xts_dec_8way)
13984diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13985index 26d49eb..8bf39c8 100644
13986--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13987+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13988@@ -45,6 +45,7 @@
13989
13990 #include <asm/inst.h>
13991 #include <linux/linkage.h>
13992+#include <asm/alternative-asm.h>
13993
13994 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13995
13996@@ -309,6 +310,7 @@ do_return:
13997 popq %rsi
13998 popq %rdi
13999 popq %rbx
14000+ pax_force_retaddr
14001 ret
14002
14003 ################################################################
14004@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14005 ## PCLMULQDQ tables
14006 ## Table is 128 entries x 2 words (8 bytes) each
14007 ################################################################
14008-.section .rotata, "a", %progbits
14009+.section .rodata, "a", %progbits
14010 .align 8
14011 K_table:
14012 .long 0x493c7d27, 0x00000001
14013diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014index 5d1e007..098cb4f 100644
14015--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14016+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14017@@ -18,6 +18,7 @@
14018
14019 #include <linux/linkage.h>
14020 #include <asm/inst.h>
14021+#include <asm/alternative-asm.h>
14022
14023 .data
14024
14025@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14026 psrlq $1, T2
14027 pxor T2, T1
14028 pxor T1, DATA
14029+ pax_force_retaddr
14030 ret
14031 ENDPROC(__clmul_gf128mul_ble)
14032
14033@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14034 call __clmul_gf128mul_ble
14035 PSHUFB_XMM BSWAP DATA
14036 movups DATA, (%rdi)
14037+ pax_force_retaddr
14038 ret
14039 ENDPROC(clmul_ghash_mul)
14040
14041@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14042 PSHUFB_XMM BSWAP DATA
14043 movups DATA, (%rdi)
14044 .Lupdate_just_ret:
14045+ pax_force_retaddr
14046 ret
14047 ENDPROC(clmul_ghash_update)
14048diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049index 9279e0b..c4b3d2c 100644
14050--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14051+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14052@@ -1,4 +1,5 @@
14053 #include <linux/linkage.h>
14054+#include <asm/alternative-asm.h>
14055
14056 # enter salsa20_encrypt_bytes
14057 ENTRY(salsa20_encrypt_bytes)
14058@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14059 add %r11,%rsp
14060 mov %rdi,%rax
14061 mov %rsi,%rdx
14062+ pax_force_retaddr
14063 ret
14064 # bytesatleast65:
14065 ._bytesatleast65:
14066@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14067 add %r11,%rsp
14068 mov %rdi,%rax
14069 mov %rsi,%rdx
14070+ pax_force_retaddr
14071 ret
14072 ENDPROC(salsa20_keysetup)
14073
14074@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14075 add %r11,%rsp
14076 mov %rdi,%rax
14077 mov %rsi,%rdx
14078+ pax_force_retaddr
14079 ret
14080 ENDPROC(salsa20_ivsetup)
14081diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082index 2f202f4..d9164d6 100644
14083--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14084+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14085@@ -24,6 +24,7 @@
14086 */
14087
14088 #include <linux/linkage.h>
14089+#include <asm/alternative-asm.h>
14090 #include "glue_helper-asm-avx.S"
14091
14092 .file "serpent-avx-x86_64-asm_64.S"
14093@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14094 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14095 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14096
14097+ pax_force_retaddr
14098 ret;
14099 ENDPROC(__serpent_enc_blk8_avx)
14100
14101@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14102 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14103 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14104
14105+ pax_force_retaddr
14106 ret;
14107 ENDPROC(__serpent_dec_blk8_avx)
14108
14109@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14110
14111 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14112
14113+ pax_force_retaddr
14114 ret;
14115 ENDPROC(serpent_ecb_enc_8way_avx)
14116
14117@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14118
14119 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14120
14121+ pax_force_retaddr
14122 ret;
14123 ENDPROC(serpent_ecb_dec_8way_avx)
14124
14125@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14126
14127 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14128
14129+ pax_force_retaddr
14130 ret;
14131 ENDPROC(serpent_cbc_dec_8way_avx)
14132
14133@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14134
14135 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14136
14137+ pax_force_retaddr
14138 ret;
14139 ENDPROC(serpent_ctr_8way_avx)
14140
14141@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14142 /* dst <= regs xor IVs(in dst) */
14143 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14144
14145+ pax_force_retaddr
14146 ret;
14147 ENDPROC(serpent_xts_enc_8way_avx)
14148
14149@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14150 /* dst <= regs xor IVs(in dst) */
14151 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14152
14153+ pax_force_retaddr
14154 ret;
14155 ENDPROC(serpent_xts_dec_8way_avx)
14156diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14157index b222085..abd483c 100644
14158--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14159+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14160@@ -15,6 +15,7 @@
14161 */
14162
14163 #include <linux/linkage.h>
14164+#include <asm/alternative-asm.h>
14165 #include "glue_helper-asm-avx2.S"
14166
14167 .file "serpent-avx2-asm_64.S"
14168@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14169 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14170 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14171
14172+ pax_force_retaddr
14173 ret;
14174 ENDPROC(__serpent_enc_blk16)
14175
14176@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14177 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14178 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14179
14180+ pax_force_retaddr
14181 ret;
14182 ENDPROC(__serpent_dec_blk16)
14183
14184@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14185
14186 vzeroupper;
14187
14188+ pax_force_retaddr
14189 ret;
14190 ENDPROC(serpent_ecb_enc_16way)
14191
14192@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14193
14194 vzeroupper;
14195
14196+ pax_force_retaddr
14197 ret;
14198 ENDPROC(serpent_ecb_dec_16way)
14199
14200@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14201
14202 vzeroupper;
14203
14204+ pax_force_retaddr
14205 ret;
14206 ENDPROC(serpent_cbc_dec_16way)
14207
14208@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14209
14210 vzeroupper;
14211
14212+ pax_force_retaddr
14213 ret;
14214 ENDPROC(serpent_ctr_16way)
14215
14216@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14217
14218 vzeroupper;
14219
14220+ pax_force_retaddr
14221 ret;
14222 ENDPROC(serpent_xts_enc_16way)
14223
14224@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14225
14226 vzeroupper;
14227
14228+ pax_force_retaddr
14229 ret;
14230 ENDPROC(serpent_xts_dec_16way)
14231diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232index acc066c..1559cc4 100644
14233--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14234+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14235@@ -25,6 +25,7 @@
14236 */
14237
14238 #include <linux/linkage.h>
14239+#include <asm/alternative-asm.h>
14240
14241 .file "serpent-sse2-x86_64-asm_64.S"
14242 .text
14243@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14244 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14245 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14246
14247+ pax_force_retaddr
14248 ret;
14249
14250 .L__enc_xor8:
14251 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14252 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14253
14254+ pax_force_retaddr
14255 ret;
14256 ENDPROC(__serpent_enc_blk_8way)
14257
14258@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14259 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14260 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14261
14262+ pax_force_retaddr
14263 ret;
14264 ENDPROC(serpent_dec_blk_8way)
14265diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14266index a410950..9dfe7ad 100644
14267--- a/arch/x86/crypto/sha1_ssse3_asm.S
14268+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14269@@ -29,6 +29,7 @@
14270 */
14271
14272 #include <linux/linkage.h>
14273+#include <asm/alternative-asm.h>
14274
14275 #define CTX %rdi // arg1
14276 #define BUF %rsi // arg2
14277@@ -75,9 +76,9 @@
14278
14279 push %rbx
14280 push %rbp
14281- push %r12
14282+ push %r14
14283
14284- mov %rsp, %r12
14285+ mov %rsp, %r14
14286 sub $64, %rsp # allocate workspace
14287 and $~15, %rsp # align stack
14288
14289@@ -99,11 +100,12 @@
14290 xor %rax, %rax
14291 rep stosq
14292
14293- mov %r12, %rsp # deallocate workspace
14294+ mov %r14, %rsp # deallocate workspace
14295
14296- pop %r12
14297+ pop %r14
14298 pop %rbp
14299 pop %rbx
14300+ pax_force_retaddr
14301 ret
14302
14303 ENDPROC(\name)
14304diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14305index 642f156..51a513c 100644
14306--- a/arch/x86/crypto/sha256-avx-asm.S
14307+++ b/arch/x86/crypto/sha256-avx-asm.S
14308@@ -49,6 +49,7 @@
14309
14310 #ifdef CONFIG_AS_AVX
14311 #include <linux/linkage.h>
14312+#include <asm/alternative-asm.h>
14313
14314 ## assume buffers not aligned
14315 #define VMOVDQ vmovdqu
14316@@ -460,6 +461,7 @@ done_hash:
14317 popq %r13
14318 popq %rbp
14319 popq %rbx
14320+ pax_force_retaddr
14321 ret
14322 ENDPROC(sha256_transform_avx)
14323
14324diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14325index 9e86944..3795e6a 100644
14326--- a/arch/x86/crypto/sha256-avx2-asm.S
14327+++ b/arch/x86/crypto/sha256-avx2-asm.S
14328@@ -50,6 +50,7 @@
14329
14330 #ifdef CONFIG_AS_AVX2
14331 #include <linux/linkage.h>
14332+#include <asm/alternative-asm.h>
14333
14334 ## assume buffers not aligned
14335 #define VMOVDQ vmovdqu
14336@@ -720,6 +721,7 @@ done_hash:
14337 popq %r12
14338 popq %rbp
14339 popq %rbx
14340+ pax_force_retaddr
14341 ret
14342 ENDPROC(sha256_transform_rorx)
14343
14344diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14345index f833b74..8c62a9e 100644
14346--- a/arch/x86/crypto/sha256-ssse3-asm.S
14347+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14348@@ -47,6 +47,7 @@
14349 ########################################################################
14350
14351 #include <linux/linkage.h>
14352+#include <asm/alternative-asm.h>
14353
14354 ## assume buffers not aligned
14355 #define MOVDQ movdqu
14356@@ -471,6 +472,7 @@ done_hash:
14357 popq %rbp
14358 popq %rbx
14359
14360+ pax_force_retaddr
14361 ret
14362 ENDPROC(sha256_transform_ssse3)
14363
14364diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14365index 974dde9..a823ff9 100644
14366--- a/arch/x86/crypto/sha512-avx-asm.S
14367+++ b/arch/x86/crypto/sha512-avx-asm.S
14368@@ -49,6 +49,7 @@
14369
14370 #ifdef CONFIG_AS_AVX
14371 #include <linux/linkage.h>
14372+#include <asm/alternative-asm.h>
14373
14374 .text
14375
14376@@ -364,6 +365,7 @@ updateblock:
14377 mov frame_RSPSAVE(%rsp), %rsp
14378
14379 nowork:
14380+ pax_force_retaddr
14381 ret
14382 ENDPROC(sha512_transform_avx)
14383
14384diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14385index 568b961..ed20c37 100644
14386--- a/arch/x86/crypto/sha512-avx2-asm.S
14387+++ b/arch/x86/crypto/sha512-avx2-asm.S
14388@@ -51,6 +51,7 @@
14389
14390 #ifdef CONFIG_AS_AVX2
14391 #include <linux/linkage.h>
14392+#include <asm/alternative-asm.h>
14393
14394 .text
14395
14396@@ -678,6 +679,7 @@ done_hash:
14397
14398 # Restore Stack Pointer
14399 mov frame_RSPSAVE(%rsp), %rsp
14400+ pax_force_retaddr
14401 ret
14402 ENDPROC(sha512_transform_rorx)
14403
14404diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14405index fb56855..6edd768 100644
14406--- a/arch/x86/crypto/sha512-ssse3-asm.S
14407+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14408@@ -48,6 +48,7 @@
14409 ########################################################################
14410
14411 #include <linux/linkage.h>
14412+#include <asm/alternative-asm.h>
14413
14414 .text
14415
14416@@ -363,6 +364,7 @@ updateblock:
14417 mov frame_RSPSAVE(%rsp), %rsp
14418
14419 nowork:
14420+ pax_force_retaddr
14421 ret
14422 ENDPROC(sha512_transform_ssse3)
14423
14424diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425index 0505813..b067311 100644
14426--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14427+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14428@@ -24,6 +24,7 @@
14429 */
14430
14431 #include <linux/linkage.h>
14432+#include <asm/alternative-asm.h>
14433 #include "glue_helper-asm-avx.S"
14434
14435 .file "twofish-avx-x86_64-asm_64.S"
14436@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14437 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14438 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14439
14440+ pax_force_retaddr
14441 ret;
14442 ENDPROC(__twofish_enc_blk8)
14443
14444@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14445 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14446 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14447
14448+ pax_force_retaddr
14449 ret;
14450 ENDPROC(__twofish_dec_blk8)
14451
14452@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14453
14454 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14455
14456+ pax_force_retaddr
14457 ret;
14458 ENDPROC(twofish_ecb_enc_8way)
14459
14460@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14461
14462 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14463
14464+ pax_force_retaddr
14465 ret;
14466 ENDPROC(twofish_ecb_dec_8way)
14467
14468@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14469 * %rdx: src
14470 */
14471
14472- pushq %r12;
14473+ pushq %r14;
14474
14475 movq %rsi, %r11;
14476- movq %rdx, %r12;
14477+ movq %rdx, %r14;
14478
14479 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14480
14481 call __twofish_dec_blk8;
14482
14483- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14484+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14485
14486- popq %r12;
14487+ popq %r14;
14488
14489+ pax_force_retaddr
14490 ret;
14491 ENDPROC(twofish_cbc_dec_8way)
14492
14493@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14494 * %rcx: iv (little endian, 128bit)
14495 */
14496
14497- pushq %r12;
14498+ pushq %r14;
14499
14500 movq %rsi, %r11;
14501- movq %rdx, %r12;
14502+ movq %rdx, %r14;
14503
14504 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14505 RD2, RX0, RX1, RY0);
14506
14507 call __twofish_enc_blk8;
14508
14509- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14510+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14511
14512- popq %r12;
14513+ popq %r14;
14514
14515+ pax_force_retaddr
14516 ret;
14517 ENDPROC(twofish_ctr_8way)
14518
14519@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14520 /* dst <= regs xor IVs(in dst) */
14521 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14522
14523+ pax_force_retaddr
14524 ret;
14525 ENDPROC(twofish_xts_enc_8way)
14526
14527@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14528 /* dst <= regs xor IVs(in dst) */
14529 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14530
14531+ pax_force_retaddr
14532 ret;
14533 ENDPROC(twofish_xts_dec_8way)
14534diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535index 1c3b7ce..02f578d 100644
14536--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14537+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14538@@ -21,6 +21,7 @@
14539 */
14540
14541 #include <linux/linkage.h>
14542+#include <asm/alternative-asm.h>
14543
14544 .file "twofish-x86_64-asm-3way.S"
14545 .text
14546@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14547 popq %r13;
14548 popq %r14;
14549 popq %r15;
14550+ pax_force_retaddr
14551 ret;
14552
14553 .L__enc_xor3:
14554@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14555 popq %r13;
14556 popq %r14;
14557 popq %r15;
14558+ pax_force_retaddr
14559 ret;
14560 ENDPROC(__twofish_enc_blk_3way)
14561
14562@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14563 popq %r13;
14564 popq %r14;
14565 popq %r15;
14566+ pax_force_retaddr
14567 ret;
14568 ENDPROC(twofish_dec_blk_3way)
14569diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14570index a039d21..524b8b2 100644
14571--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14572+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14573@@ -22,6 +22,7 @@
14574
14575 #include <linux/linkage.h>
14576 #include <asm/asm-offsets.h>
14577+#include <asm/alternative-asm.h>
14578
14579 #define a_offset 0
14580 #define b_offset 4
14581@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14582
14583 popq R1
14584 movq $1,%rax
14585+ pax_force_retaddr
14586 ret
14587 ENDPROC(twofish_enc_blk)
14588
14589@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14590
14591 popq R1
14592 movq $1,%rax
14593+ pax_force_retaddr
14594 ret
14595 ENDPROC(twofish_dec_blk)
14596diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14597index ae6aad1..719d6d9 100644
14598--- a/arch/x86/ia32/ia32_aout.c
14599+++ b/arch/x86/ia32/ia32_aout.c
14600@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14601 unsigned long dump_start, dump_size;
14602 struct user32 dump;
14603
14604+ memset(&dump, 0, sizeof(dump));
14605+
14606 fs = get_fs();
14607 set_fs(KERNEL_DS);
14608 has_dumped = 1;
14609diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14610index d0165c9..0d5639b 100644
14611--- a/arch/x86/ia32/ia32_signal.c
14612+++ b/arch/x86/ia32/ia32_signal.c
14613@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14614 if (__get_user(set.sig[0], &frame->sc.oldmask)
14615 || (_COMPAT_NSIG_WORDS > 1
14616 && __copy_from_user((((char *) &set.sig) + 4),
14617- &frame->extramask,
14618+ frame->extramask,
14619 sizeof(frame->extramask))))
14620 goto badframe;
14621
14622@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14623 sp -= frame_size;
14624 /* Align the stack pointer according to the i386 ABI,
14625 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14626- sp = ((sp + 4) & -16ul) - 4;
14627+ sp = ((sp - 12) & -16ul) - 4;
14628 return (void __user *) sp;
14629 }
14630
14631@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14632 } else {
14633 /* Return stub is in 32bit vsyscall page */
14634 if (current->mm->context.vdso)
14635- restorer = current->mm->context.vdso +
14636- selected_vdso32->sym___kernel_sigreturn;
14637+ restorer = (void __force_user *)(current->mm->context.vdso +
14638+ selected_vdso32->sym___kernel_sigreturn);
14639 else
14640- restorer = &frame->retcode;
14641+ restorer = frame->retcode;
14642 }
14643
14644 put_user_try {
14645@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14646 * These are actually not used anymore, but left because some
14647 * gdb versions depend on them as a marker.
14648 */
14649- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14650+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14651 } put_user_catch(err);
14652
14653 if (err)
14654@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14655 0xb8,
14656 __NR_ia32_rt_sigreturn,
14657 0x80cd,
14658- 0,
14659+ 0
14660 };
14661
14662 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14663@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14664
14665 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14666 restorer = ksig->ka.sa.sa_restorer;
14667+ else if (current->mm->context.vdso)
14668+ /* Return stub is in 32bit vsyscall page */
14669+ restorer = (void __force_user *)(current->mm->context.vdso +
14670+ selected_vdso32->sym___kernel_rt_sigreturn);
14671 else
14672- restorer = current->mm->context.vdso +
14673- selected_vdso32->sym___kernel_rt_sigreturn;
14674+ restorer = frame->retcode;
14675 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14676
14677 /*
14678 * Not actually used anymore, but left because some gdb
14679 * versions need it.
14680 */
14681- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14682+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14683 } put_user_catch(err);
14684
14685 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14686diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14687index 156ebca..9591cf0 100644
14688--- a/arch/x86/ia32/ia32entry.S
14689+++ b/arch/x86/ia32/ia32entry.S
14690@@ -15,8 +15,10 @@
14691 #include <asm/irqflags.h>
14692 #include <asm/asm.h>
14693 #include <asm/smap.h>
14694+#include <asm/pgtable.h>
14695 #include <linux/linkage.h>
14696 #include <linux/err.h>
14697+#include <asm/alternative-asm.h>
14698
14699 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14700 #include <linux/elf-em.h>
14701@@ -62,12 +64,12 @@
14702 */
14703 .macro LOAD_ARGS32 offset, _r9=0
14704 .if \_r9
14705- movl \offset+16(%rsp),%r9d
14706+ movl \offset+R9(%rsp),%r9d
14707 .endif
14708- movl \offset+40(%rsp),%ecx
14709- movl \offset+48(%rsp),%edx
14710- movl \offset+56(%rsp),%esi
14711- movl \offset+64(%rsp),%edi
14712+ movl \offset+RCX(%rsp),%ecx
14713+ movl \offset+RDX(%rsp),%edx
14714+ movl \offset+RSI(%rsp),%esi
14715+ movl \offset+RDI(%rsp),%edi
14716 movl %eax,%eax /* zero extension */
14717 .endm
14718
14719@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14720 ENDPROC(native_irq_enable_sysexit)
14721 #endif
14722
14723+ .macro pax_enter_kernel_user
14724+ pax_set_fptr_mask
14725+#ifdef CONFIG_PAX_MEMORY_UDEREF
14726+ call pax_enter_kernel_user
14727+#endif
14728+ .endm
14729+
14730+ .macro pax_exit_kernel_user
14731+#ifdef CONFIG_PAX_MEMORY_UDEREF
14732+ call pax_exit_kernel_user
14733+#endif
14734+#ifdef CONFIG_PAX_RANDKSTACK
14735+ pushq %rax
14736+ pushq %r11
14737+ call pax_randomize_kstack
14738+ popq %r11
14739+ popq %rax
14740+#endif
14741+ .endm
14742+
14743+ .macro pax_erase_kstack
14744+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14745+ call pax_erase_kstack
14746+#endif
14747+ .endm
14748+
14749 /*
14750 * 32bit SYSENTER instruction entry.
14751 *
14752@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14753 CFI_REGISTER rsp,rbp
14754 SWAPGS_UNSAFE_STACK
14755 movq PER_CPU_VAR(kernel_stack), %rsp
14756- addq $(KERNEL_STACK_OFFSET),%rsp
14757- /*
14758- * No need to follow this irqs on/off section: the syscall
14759- * disabled irqs, here we enable it straight after entry:
14760- */
14761- ENABLE_INTERRUPTS(CLBR_NONE)
14762 movl %ebp,%ebp /* zero extension */
14763 pushq_cfi $__USER32_DS
14764 /*CFI_REL_OFFSET ss,0*/
14765@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14766 CFI_REL_OFFSET rsp,0
14767 pushfq_cfi
14768 /*CFI_REL_OFFSET rflags,0*/
14769- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14770- CFI_REGISTER rip,r10
14771+ orl $X86_EFLAGS_IF,(%rsp)
14772+ GET_THREAD_INFO(%r11)
14773+ movl TI_sysenter_return(%r11), %r11d
14774+ CFI_REGISTER rip,r11
14775 pushq_cfi $__USER32_CS
14776 /*CFI_REL_OFFSET cs,0*/
14777 movl %eax, %eax
14778- pushq_cfi %r10
14779+ pushq_cfi %r11
14780 CFI_REL_OFFSET rip,0
14781 pushq_cfi %rax
14782 cld
14783 SAVE_ARGS 0,1,0
14784+ pax_enter_kernel_user
14785+
14786+#ifdef CONFIG_PAX_RANDKSTACK
14787+ pax_erase_kstack
14788+#endif
14789+
14790+ /*
14791+ * No need to follow this irqs on/off section: the syscall
14792+ * disabled irqs, here we enable it straight after entry:
14793+ */
14794+ ENABLE_INTERRUPTS(CLBR_NONE)
14795 /* no need to do an access_ok check here because rbp has been
14796 32bit zero extended */
14797+
14798+#ifdef CONFIG_PAX_MEMORY_UDEREF
14799+ addq pax_user_shadow_base,%rbp
14800+ ASM_PAX_OPEN_USERLAND
14801+#endif
14802+
14803 ASM_STAC
14804 1: movl (%rbp),%ebp
14805 _ASM_EXTABLE(1b,ia32_badarg)
14806 ASM_CLAC
14807
14808+#ifdef CONFIG_PAX_MEMORY_UDEREF
14809+ ASM_PAX_CLOSE_USERLAND
14810+#endif
14811+
14812 /*
14813 * Sysenter doesn't filter flags, so we need to clear NT
14814 * ourselves. To save a few cycles, we can check whether
14815@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14816 jnz sysenter_fix_flags
14817 sysenter_flags_fixed:
14818
14819- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14820- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14821+ GET_THREAD_INFO(%r11)
14822+ orl $TS_COMPAT,TI_status(%r11)
14823+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14824 CFI_REMEMBER_STATE
14825 jnz sysenter_tracesys
14826 cmpq $(IA32_NR_syscalls-1),%rax
14827@@ -172,14 +218,17 @@ sysenter_do_call:
14828 sysenter_dispatch:
14829 call *ia32_sys_call_table(,%rax,8)
14830 movq %rax,RAX-ARGOFFSET(%rsp)
14831+ GET_THREAD_INFO(%r11)
14832 DISABLE_INTERRUPTS(CLBR_NONE)
14833 TRACE_IRQS_OFF
14834- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14835+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14836 jnz sysexit_audit
14837 sysexit_from_sys_call:
14838- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14839+ pax_exit_kernel_user
14840+ pax_erase_kstack
14841+ andl $~TS_COMPAT,TI_status(%r11)
14842 /* clear IF, that popfq doesn't enable interrupts early */
14843- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14844+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14845 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14846 CFI_REGISTER rip,rdx
14847 RESTORE_ARGS 0,24,0,0,0,0
14848@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852+
14853+ pax_erase_kstack
14854+
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871+ GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877+ testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881@@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890@@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894+
14895+ pax_erase_kstack
14896+
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905+ CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912+ SAVE_ARGS 8*6,0,0
14913+ pax_enter_kernel_user
14914+
14915+#ifdef CONFIG_PAX_RANDKSTACK
14916+ pax_erase_kstack
14917+#endif
14918+
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924- SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ ASM_PAX_OPEN_USERLAND
14935+ movq pax_user_shadow_base,%r8
14936+ addq RSP-ARGOFFSET(%rsp),%r8
14937+#endif
14938+
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945+
14946+#ifdef CONFIG_PAX_MEMORY_UDEREF
14947+ ASM_PAX_CLOSE_USERLAND
14948+#endif
14949+
14950+ GET_THREAD_INFO(%r11)
14951+ orl $TS_COMPAT,TI_status(%r11)
14952+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956@@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960+ GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969+ pax_exit_kernel_user
14970+ pax_erase_kstack
14971+ andl $~TS_COMPAT,TI_status(%r11)
14972+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976@@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985@@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989+
14990+ pax_erase_kstack
14991+
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997+
14998+#ifdef CONFIG_PAX_MEMORY_UDEREF
14999+ ASM_PAX_CLOSE_USERLAND
15000+#endif
15001+
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009- /*
15010- * No need to follow this irqs on/off section: the syscall
15011- * disabled irqs and here we enable it straight after entry:
15012- */
15013- ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022+ pax_enter_kernel_user
15023+
15024+#ifdef CONFIG_PAX_RANDKSTACK
15025+ pax_erase_kstack
15026+#endif
15027+
15028+ /*
15029+ * No need to follow this irqs on/off section: the syscall
15030+ * disabled irqs and here we enable it straight after entry:
15031+ */
15032+ ENABLE_INTERRUPTS(CLBR_NONE)
15033+ GET_THREAD_INFO(%r11)
15034+ orl $TS_COMPAT,TI_status(%r11)
15035+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039@@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043+
15044+ pax_erase_kstack
15045+
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050index 8e0ceec..af13504 100644
15051--- a/arch/x86/ia32/sys_ia32.c
15052+++ b/arch/x86/ia32/sys_ia32.c
15053@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057- typeof(ubuf->st_uid) uid = 0;
15058- typeof(ubuf->st_gid) gid = 0;
15059+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065index 372231c..51b537d 100644
15066--- a/arch/x86/include/asm/alternative-asm.h
15067+++ b/arch/x86/include/asm/alternative-asm.h
15068@@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072+#ifdef KERNEXEC_PLUGIN
15073+ .macro pax_force_retaddr_bts rip=0
15074+ btsq $63,\rip(%rsp)
15075+ .endm
15076+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077+ .macro pax_force_retaddr rip=0, reload=0
15078+ btsq $63,\rip(%rsp)
15079+ .endm
15080+ .macro pax_force_fptr ptr
15081+ btsq $63,\ptr
15082+ .endm
15083+ .macro pax_set_fptr_mask
15084+ .endm
15085+#endif
15086+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087+ .macro pax_force_retaddr rip=0, reload=0
15088+ .if \reload
15089+ pax_set_fptr_mask
15090+ .endif
15091+ orq %r12,\rip(%rsp)
15092+ .endm
15093+ .macro pax_force_fptr ptr
15094+ orq %r12,\ptr
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ movabs $0x8000000000000000,%r12
15098+ .endm
15099+#endif
15100+#else
15101+ .macro pax_force_retaddr rip=0, reload=0
15102+ .endm
15103+ .macro pax_force_fptr ptr
15104+ .endm
15105+ .macro pax_force_retaddr_bts rip=0
15106+ .endm
15107+ .macro pax_set_fptr_mask
15108+ .endm
15109+#endif
15110+
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115index 473bdbe..b1e3377 100644
15116--- a/arch/x86/include/asm/alternative.h
15117+++ b/arch/x86/include/asm/alternative.h
15118@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122- ".pushsection .altinstr_replacement, \"ax\"\n" \
15123+ ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131- ".pushsection .altinstr_replacement, \"ax\"\n" \
15132+ ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137index efc3b22..85c4f3a 100644
15138--- a/arch/x86/include/asm/apic.h
15139+++ b/arch/x86/include/asm/apic.h
15140@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144-extern unsigned int apic_verbosity;
15145+extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150index 20370c6..a2eb9b0 100644
15151--- a/arch/x86/include/asm/apm.h
15152+++ b/arch/x86/include/asm/apm.h
15153@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157- "lcall *%%cs:apm_bios_entry\n\t"
15158+ "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166- "lcall *%%cs:apm_bios_entry\n\t"
15167+ "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172index 5e5cd12..51cdc93 100644
15173--- a/arch/x86/include/asm/atomic.h
15174+++ b/arch/x86/include/asm/atomic.h
15175@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179+ * atomic_read_unchecked - read atomic variable
15180+ * @v: pointer of type atomic_unchecked_t
15181+ *
15182+ * Atomically reads the value of @v.
15183+ */
15184+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185+{
15186+ return ACCESS_ONCE((v)->counter);
15187+}
15188+
15189+/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197+ * atomic_set_unchecked - set atomic variable
15198+ * @v: pointer of type atomic_unchecked_t
15199+ * @i: required value
15200+ *
15201+ * Atomically sets the value of @v to @i.
15202+ */
15203+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204+{
15205+ v->counter = i;
15206+}
15207+
15208+/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216- asm volatile(LOCK_PREFIX "addl %1,%0"
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218+
15219+#ifdef CONFIG_PAX_REFCOUNT
15220+ "jno 0f\n"
15221+ LOCK_PREFIX "subl %1,%0\n"
15222+ "int $4\n0:\n"
15223+ _ASM_EXTABLE(0b, 0b)
15224+#endif
15225+
15226+ : "+m" (v->counter)
15227+ : "ir" (i));
15228+}
15229+
15230+/**
15231+ * atomic_add_unchecked - add integer to atomic variable
15232+ * @i: integer value to add
15233+ * @v: pointer of type atomic_unchecked_t
15234+ *
15235+ * Atomically adds @i to @v.
15236+ */
15237+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238+{
15239+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247- asm volatile(LOCK_PREFIX "subl %1,%0"
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249+
15250+#ifdef CONFIG_PAX_REFCOUNT
15251+ "jno 0f\n"
15252+ LOCK_PREFIX "addl %1,%0\n"
15253+ "int $4\n0:\n"
15254+ _ASM_EXTABLE(0b, 0b)
15255+#endif
15256+
15257+ : "+m" (v->counter)
15258+ : "ir" (i));
15259+}
15260+
15261+/**
15262+ * atomic_sub_unchecked - subtract integer from atomic variable
15263+ * @i: integer value to subtract
15264+ * @v: pointer of type atomic_unchecked_t
15265+ *
15266+ * Atomically subtracts @i from @v.
15267+ */
15268+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269+{
15270+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287- asm volatile(LOCK_PREFIX "incl %0"
15288+ asm volatile(LOCK_PREFIX "incl %0\n"
15289+
15290+#ifdef CONFIG_PAX_REFCOUNT
15291+ "jno 0f\n"
15292+ LOCK_PREFIX "decl %0\n"
15293+ "int $4\n0:\n"
15294+ _ASM_EXTABLE(0b, 0b)
15295+#endif
15296+
15297+ : "+m" (v->counter));
15298+}
15299+
15300+/**
15301+ * atomic_inc_unchecked - increment atomic variable
15302+ * @v: pointer of type atomic_unchecked_t
15303+ *
15304+ * Atomically increments @v by 1.
15305+ */
15306+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307+{
15308+ asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316- asm volatile(LOCK_PREFIX "decl %0"
15317+ asm volatile(LOCK_PREFIX "decl %0\n"
15318+
15319+#ifdef CONFIG_PAX_REFCOUNT
15320+ "jno 0f\n"
15321+ LOCK_PREFIX "incl %0\n"
15322+ "int $4\n0:\n"
15323+ _ASM_EXTABLE(0b, 0b)
15324+#endif
15325+
15326+ : "+m" (v->counter));
15327+}
15328+
15329+/**
15330+ * atomic_dec_unchecked - decrement atomic variable
15331+ * @v: pointer of type atomic_unchecked_t
15332+ *
15333+ * Atomically decrements @v by 1.
15334+ */
15335+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336+{
15337+ asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356+}
15357+
15358+/**
15359+ * atomic_inc_and_test_unchecked - increment and test
15360+ * @v: pointer of type atomic_unchecked_t
15361+ *
15362+ * Atomically increments @v by 1
15363+ * and returns true if the result is zero, or false for all
15364+ * other cases.
15365+ */
15366+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367+{
15368+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385-static inline int atomic_add_return(int i, atomic_t *v)
15386+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387+{
15388+ return i + xadd_check_overflow(&v->counter, i);
15389+}
15390+
15391+/**
15392+ * atomic_add_return_unchecked - add integer and return
15393+ * @i: integer value to add
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically adds @i to @v and returns @i + @v
15397+ */
15398+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406-static inline int atomic_sub_return(int i, atomic_t *v)
15407+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414+{
15415+ return atomic_add_return_unchecked(1, v);
15416+}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421+{
15422+ return cmpxchg(&v->counter, old, new);
15423+}
15424+
15425+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434+{
15435+ return xchg(&v->counter, new);
15436+}
15437+
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 */
15443 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15444 {
15445- int c, old;
15446+ int c, old, new;
15447 c = atomic_read(v);
15448 for (;;) {
15449- if (unlikely(c == (u)))
15450+ if (unlikely(c == u))
15451 break;
15452- old = atomic_cmpxchg((v), c, c + (a));
15453+
15454+ asm volatile("addl %2,%0\n"
15455+
15456+#ifdef CONFIG_PAX_REFCOUNT
15457+ "jno 0f\n"
15458+ "subl %2,%0\n"
15459+ "int $4\n0:\n"
15460+ _ASM_EXTABLE(0b, 0b)
15461+#endif
15462+
15463+ : "=r" (new)
15464+ : "0" (c), "ir" (a));
15465+
15466+ old = atomic_cmpxchg(v, c, new);
15467 if (likely(old == c))
15468 break;
15469 c = old;
15470@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15471 }
15472
15473 /**
15474+ * atomic_inc_not_zero_hint - increment if not null
15475+ * @v: pointer of type atomic_t
15476+ * @hint: probable value of the atomic before the increment
15477+ *
15478+ * This version of atomic_inc_not_zero() gives a hint of probable
15479+ * value of the atomic. This helps processor to not read the memory
15480+ * before doing the atomic read/modify/write cycle, lowering
15481+ * number of bus transactions on some arches.
15482+ *
15483+ * Returns: 0 if increment was not done, 1 otherwise.
15484+ */
15485+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15486+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15487+{
15488+ int val, c = hint, new;
15489+
15490+ /* sanity test, should be removed by compiler if hint is a constant */
15491+ if (!hint)
15492+ return __atomic_add_unless(v, 1, 0);
15493+
15494+ do {
15495+ asm volatile("incl %0\n"
15496+
15497+#ifdef CONFIG_PAX_REFCOUNT
15498+ "jno 0f\n"
15499+ "decl %0\n"
15500+ "int $4\n0:\n"
15501+ _ASM_EXTABLE(0b, 0b)
15502+#endif
15503+
15504+ : "=r" (new)
15505+ : "0" (c));
15506+
15507+ val = atomic_cmpxchg(v, c, new);
15508+ if (val == c)
15509+ return 1;
15510+ c = val;
15511+ } while (c);
15512+
15513+ return 0;
15514+}
15515+
15516+/**
15517 * atomic_inc_short - increment of a short integer
15518 * @v: pointer to type int
15519 *
15520@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15521 }
15522
15523 /* These are x86-specific, used by some header files */
15524-#define atomic_clear_mask(mask, addr) \
15525- asm volatile(LOCK_PREFIX "andl %0,%1" \
15526- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15527+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15528+{
15529+ asm volatile(LOCK_PREFIX "andl %1,%0"
15530+ : "+m" (v->counter)
15531+ : "r" (~(mask))
15532+ : "memory");
15533+}
15534
15535-#define atomic_set_mask(mask, addr) \
15536- asm volatile(LOCK_PREFIX "orl %0,%1" \
15537- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15538- : "memory")
15539+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15540+{
15541+ asm volatile(LOCK_PREFIX "andl %1,%0"
15542+ : "+m" (v->counter)
15543+ : "r" (~(mask))
15544+ : "memory");
15545+}
15546+
15547+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15548+{
15549+ asm volatile(LOCK_PREFIX "orl %1,%0"
15550+ : "+m" (v->counter)
15551+ : "r" (mask)
15552+ : "memory");
15553+}
15554+
15555+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15556+{
15557+ asm volatile(LOCK_PREFIX "orl %1,%0"
15558+ : "+m" (v->counter)
15559+ : "r" (mask)
15560+ : "memory");
15561+}
15562
15563 #ifdef CONFIG_X86_32
15564 # include <asm/atomic64_32.h>
15565diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15566index b154de7..bf18a5a 100644
15567--- a/arch/x86/include/asm/atomic64_32.h
15568+++ b/arch/x86/include/asm/atomic64_32.h
15569@@ -12,6 +12,14 @@ typedef struct {
15570 u64 __aligned(8) counter;
15571 } atomic64_t;
15572
15573+#ifdef CONFIG_PAX_REFCOUNT
15574+typedef struct {
15575+ u64 __aligned(8) counter;
15576+} atomic64_unchecked_t;
15577+#else
15578+typedef atomic64_t atomic64_unchecked_t;
15579+#endif
15580+
15581 #define ATOMIC64_INIT(val) { (val) }
15582
15583 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15584@@ -37,21 +45,31 @@ typedef struct {
15585 ATOMIC64_DECL_ONE(sym##_386)
15586
15587 ATOMIC64_DECL_ONE(add_386);
15588+ATOMIC64_DECL_ONE(add_unchecked_386);
15589 ATOMIC64_DECL_ONE(sub_386);
15590+ATOMIC64_DECL_ONE(sub_unchecked_386);
15591 ATOMIC64_DECL_ONE(inc_386);
15592+ATOMIC64_DECL_ONE(inc_unchecked_386);
15593 ATOMIC64_DECL_ONE(dec_386);
15594+ATOMIC64_DECL_ONE(dec_unchecked_386);
15595 #endif
15596
15597 #define alternative_atomic64(f, out, in...) \
15598 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15599
15600 ATOMIC64_DECL(read);
15601+ATOMIC64_DECL(read_unchecked);
15602 ATOMIC64_DECL(set);
15603+ATOMIC64_DECL(set_unchecked);
15604 ATOMIC64_DECL(xchg);
15605 ATOMIC64_DECL(add_return);
15606+ATOMIC64_DECL(add_return_unchecked);
15607 ATOMIC64_DECL(sub_return);
15608+ATOMIC64_DECL(sub_return_unchecked);
15609 ATOMIC64_DECL(inc_return);
15610+ATOMIC64_DECL(inc_return_unchecked);
15611 ATOMIC64_DECL(dec_return);
15612+ATOMIC64_DECL(dec_return_unchecked);
15613 ATOMIC64_DECL(dec_if_positive);
15614 ATOMIC64_DECL(inc_not_zero);
15615 ATOMIC64_DECL(add_unless);
15616@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15617 }
15618
15619 /**
15620+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15621+ * @p: pointer to type atomic64_unchecked_t
15622+ * @o: expected value
15623+ * @n: new value
15624+ *
15625+ * Atomically sets @v to @n if it was equal to @o and returns
15626+ * the old value.
15627+ */
15628+
15629+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15630+{
15631+ return cmpxchg64(&v->counter, o, n);
15632+}
15633+
15634+/**
15635 * atomic64_xchg - xchg atomic64 variable
15636 * @v: pointer to type atomic64_t
15637 * @n: value to assign
15638@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15639 }
15640
15641 /**
15642+ * atomic64_set_unchecked - set atomic64 variable
15643+ * @v: pointer to type atomic64_unchecked_t
15644+ * @n: value to assign
15645+ *
15646+ * Atomically sets the value of @v to @n.
15647+ */
15648+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15649+{
15650+ unsigned high = (unsigned)(i >> 32);
15651+ unsigned low = (unsigned)i;
15652+ alternative_atomic64(set, /* no output */,
15653+ "S" (v), "b" (low), "c" (high)
15654+ : "eax", "edx", "memory");
15655+}
15656+
15657+/**
15658 * atomic64_read - read atomic64 variable
15659 * @v: pointer to type atomic64_t
15660 *
15661@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15662 }
15663
15664 /**
15665+ * atomic64_read_unchecked - read atomic64 variable
15666+ * @v: pointer to type atomic64_unchecked_t
15667+ *
15668+ * Atomically reads the value of @v and returns it.
15669+ */
15670+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15671+{
15672+ long long r;
15673+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15674+ return r;
15675+ }
15676+
15677+/**
15678 * atomic64_add_return - add and return
15679 * @i: integer value to add
15680 * @v: pointer to type atomic64_t
15681@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15682 return i;
15683 }
15684
15685+/**
15686+ * atomic64_add_return_unchecked - add and return
15687+ * @i: integer value to add
15688+ * @v: pointer to type atomic64_unchecked_t
15689+ *
15690+ * Atomically adds @i to @v and returns @i + *@v
15691+ */
15692+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15693+{
15694+ alternative_atomic64(add_return_unchecked,
15695+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15696+ ASM_NO_INPUT_CLOBBER("memory"));
15697+ return i;
15698+}
15699+
15700 /*
15701 * Other variants with different arithmetic operators:
15702 */
15703@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15704 return a;
15705 }
15706
15707+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15708+{
15709+ long long a;
15710+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15711+ "S" (v) : "memory", "ecx");
15712+ return a;
15713+}
15714+
15715 static inline long long atomic64_dec_return(atomic64_t *v)
15716 {
15717 long long a;
15718@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15719 }
15720
15721 /**
15722+ * atomic64_add_unchecked - add integer to atomic64 variable
15723+ * @i: integer value to add
15724+ * @v: pointer to type atomic64_unchecked_t
15725+ *
15726+ * Atomically adds @i to @v.
15727+ */
15728+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15729+{
15730+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15731+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15732+ ASM_NO_INPUT_CLOBBER("memory"));
15733+ return i;
15734+}
15735+
15736+/**
15737 * atomic64_sub - subtract the atomic64 variable
15738 * @i: integer value to subtract
15739 * @v: pointer to type atomic64_t
15740diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15741index f8d273e..02f39f3 100644
15742--- a/arch/x86/include/asm/atomic64_64.h
15743+++ b/arch/x86/include/asm/atomic64_64.h
15744@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15745 }
15746
15747 /**
15748+ * atomic64_read_unchecked - read atomic64 variable
15749+ * @v: pointer of type atomic64_unchecked_t
15750+ *
15751+ * Atomically reads the value of @v.
15752+ * Doesn't imply a read memory barrier.
15753+ */
15754+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15755+{
15756+ return ACCESS_ONCE((v)->counter);
15757+}
15758+
15759+/**
15760 * atomic64_set - set atomic64 variable
15761 * @v: pointer to type atomic64_t
15762 * @i: required value
15763@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15764 }
15765
15766 /**
15767+ * atomic64_set_unchecked - set atomic64 variable
15768+ * @v: pointer to type atomic64_unchecked_t
15769+ * @i: required value
15770+ *
15771+ * Atomically sets the value of @v to @i.
15772+ */
15773+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15774+{
15775+ v->counter = i;
15776+}
15777+
15778+/**
15779 * atomic64_add - add integer to atomic64 variable
15780 * @i: integer value to add
15781 * @v: pointer to type atomic64_t
15782@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15783 */
15784 static inline void atomic64_add(long i, atomic64_t *v)
15785 {
15786+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15787+
15788+#ifdef CONFIG_PAX_REFCOUNT
15789+ "jno 0f\n"
15790+ LOCK_PREFIX "subq %1,%0\n"
15791+ "int $4\n0:\n"
15792+ _ASM_EXTABLE(0b, 0b)
15793+#endif
15794+
15795+ : "=m" (v->counter)
15796+ : "er" (i), "m" (v->counter));
15797+}
15798+
15799+/**
15800+ * atomic64_add_unchecked - add integer to atomic64 variable
15801+ * @i: integer value to add
15802+ * @v: pointer to type atomic64_unchecked_t
15803+ *
15804+ * Atomically adds @i to @v.
15805+ */
15806+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15807+{
15808 asm volatile(LOCK_PREFIX "addq %1,%0"
15809 : "=m" (v->counter)
15810 : "er" (i), "m" (v->counter));
15811@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15812 */
15813 static inline void atomic64_sub(long i, atomic64_t *v)
15814 {
15815- asm volatile(LOCK_PREFIX "subq %1,%0"
15816+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15817+
15818+#ifdef CONFIG_PAX_REFCOUNT
15819+ "jno 0f\n"
15820+ LOCK_PREFIX "addq %1,%0\n"
15821+ "int $4\n0:\n"
15822+ _ASM_EXTABLE(0b, 0b)
15823+#endif
15824+
15825+ : "=m" (v->counter)
15826+ : "er" (i), "m" (v->counter));
15827+}
15828+
15829+/**
15830+ * atomic64_sub_unchecked - subtract the atomic64 variable
15831+ * @i: integer value to subtract
15832+ * @v: pointer to type atomic64_unchecked_t
15833+ *
15834+ * Atomically subtracts @i from @v.
15835+ */
15836+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15837+{
15838+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15839 : "=m" (v->counter)
15840 : "er" (i), "m" (v->counter));
15841 }
15842@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15843 */
15844 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15845 {
15846- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15847+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15848 }
15849
15850 /**
15851@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15852 */
15853 static inline void atomic64_inc(atomic64_t *v)
15854 {
15855+ asm volatile(LOCK_PREFIX "incq %0\n"
15856+
15857+#ifdef CONFIG_PAX_REFCOUNT
15858+ "jno 0f\n"
15859+ LOCK_PREFIX "decq %0\n"
15860+ "int $4\n0:\n"
15861+ _ASM_EXTABLE(0b, 0b)
15862+#endif
15863+
15864+ : "=m" (v->counter)
15865+ : "m" (v->counter));
15866+}
15867+
15868+/**
15869+ * atomic64_inc_unchecked - increment atomic64 variable
15870+ * @v: pointer to type atomic64_unchecked_t
15871+ *
15872+ * Atomically increments @v by 1.
15873+ */
15874+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15875+{
15876 asm volatile(LOCK_PREFIX "incq %0"
15877 : "=m" (v->counter)
15878 : "m" (v->counter));
15879@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15880 */
15881 static inline void atomic64_dec(atomic64_t *v)
15882 {
15883- asm volatile(LOCK_PREFIX "decq %0"
15884+ asm volatile(LOCK_PREFIX "decq %0\n"
15885+
15886+#ifdef CONFIG_PAX_REFCOUNT
15887+ "jno 0f\n"
15888+ LOCK_PREFIX "incq %0\n"
15889+ "int $4\n0:\n"
15890+ _ASM_EXTABLE(0b, 0b)
15891+#endif
15892+
15893+ : "=m" (v->counter)
15894+ : "m" (v->counter));
15895+}
15896+
15897+/**
15898+ * atomic64_dec_unchecked - decrement atomic64 variable
15899+ * @v: pointer to type atomic64_t
15900+ *
15901+ * Atomically decrements @v by 1.
15902+ */
15903+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15904+{
15905+ asm volatile(LOCK_PREFIX "decq %0\n"
15906 : "=m" (v->counter)
15907 : "m" (v->counter));
15908 }
15909@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15910 */
15911 static inline int atomic64_dec_and_test(atomic64_t *v)
15912 {
15913- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15914+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15915 }
15916
15917 /**
15918@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15919 */
15920 static inline int atomic64_inc_and_test(atomic64_t *v)
15921 {
15922- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15923+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15924 }
15925
15926 /**
15927@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15928 */
15929 static inline int atomic64_add_negative(long i, atomic64_t *v)
15930 {
15931- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15932+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15933 }
15934
15935 /**
15936@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15937 */
15938 static inline long atomic64_add_return(long i, atomic64_t *v)
15939 {
15940+ return i + xadd_check_overflow(&v->counter, i);
15941+}
15942+
15943+/**
15944+ * atomic64_add_return_unchecked - add and return
15945+ * @i: integer value to add
15946+ * @v: pointer to type atomic64_unchecked_t
15947+ *
15948+ * Atomically adds @i to @v and returns @i + @v
15949+ */
15950+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15951+{
15952 return i + xadd(&v->counter, i);
15953 }
15954
15955@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15956 }
15957
15958 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15959+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15960+{
15961+ return atomic64_add_return_unchecked(1, v);
15962+}
15963 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15964
15965 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15966@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15967 return cmpxchg(&v->counter, old, new);
15968 }
15969
15970+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15971+{
15972+ return cmpxchg(&v->counter, old, new);
15973+}
15974+
15975 static inline long atomic64_xchg(atomic64_t *v, long new)
15976 {
15977 return xchg(&v->counter, new);
15978@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15979 */
15980 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15981 {
15982- long c, old;
15983+ long c, old, new;
15984 c = atomic64_read(v);
15985 for (;;) {
15986- if (unlikely(c == (u)))
15987+ if (unlikely(c == u))
15988 break;
15989- old = atomic64_cmpxchg((v), c, c + (a));
15990+
15991+ asm volatile("add %2,%0\n"
15992+
15993+#ifdef CONFIG_PAX_REFCOUNT
15994+ "jno 0f\n"
15995+ "sub %2,%0\n"
15996+ "int $4\n0:\n"
15997+ _ASM_EXTABLE(0b, 0b)
15998+#endif
15999+
16000+ : "=r" (new)
16001+ : "0" (c), "ir" (a));
16002+
16003+ old = atomic64_cmpxchg(v, c, new);
16004 if (likely(old == c))
16005 break;
16006 c = old;
16007 }
16008- return c != (u);
16009+ return c != u;
16010 }
16011
16012 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16013diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16014index 2ab1eb3..1e8cc5d 100644
16015--- a/arch/x86/include/asm/barrier.h
16016+++ b/arch/x86/include/asm/barrier.h
16017@@ -57,7 +57,7 @@
16018 do { \
16019 compiletime_assert_atomic_type(*p); \
16020 smp_mb(); \
16021- ACCESS_ONCE(*p) = (v); \
16022+ ACCESS_ONCE_RW(*p) = (v); \
16023 } while (0)
16024
16025 #define smp_load_acquire(p) \
16026@@ -74,7 +74,7 @@ do { \
16027 do { \
16028 compiletime_assert_atomic_type(*p); \
16029 barrier(); \
16030- ACCESS_ONCE(*p) = (v); \
16031+ ACCESS_ONCE_RW(*p) = (v); \
16032 } while (0)
16033
16034 #define smp_load_acquire(p) \
16035diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16036index cfe3b95..d01b118 100644
16037--- a/arch/x86/include/asm/bitops.h
16038+++ b/arch/x86/include/asm/bitops.h
16039@@ -50,7 +50,7 @@
16040 * a mask operation on a byte.
16041 */
16042 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16043-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16044+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16045 #define CONST_MASK(nr) (1 << ((nr) & 7))
16046
16047 /**
16048@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16049 */
16050 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16051 {
16052- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16053+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16054 }
16055
16056 /**
16057@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16058 */
16059 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16060 {
16061- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16062+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16063 }
16064
16065 /**
16066@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16067 */
16068 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16069 {
16070- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16071+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16072 }
16073
16074 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16075@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16076 *
16077 * Undefined if no bit exists, so code should check against 0 first.
16078 */
16079-static inline unsigned long __ffs(unsigned long word)
16080+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16081 {
16082 asm("rep; bsf %1,%0"
16083 : "=r" (word)
16084@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16085 *
16086 * Undefined if no zero exists, so code should check against ~0UL first.
16087 */
16088-static inline unsigned long ffz(unsigned long word)
16089+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16090 {
16091 asm("rep; bsf %1,%0"
16092 : "=r" (word)
16093@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16094 *
16095 * Undefined if no set bit exists, so code should check against 0 first.
16096 */
16097-static inline unsigned long __fls(unsigned long word)
16098+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16099 {
16100 asm("bsr %1,%0"
16101 : "=r" (word)
16102@@ -434,7 +434,7 @@ static inline int ffs(int x)
16103 * set bit if value is nonzero. The last (most significant) bit is
16104 * at position 32.
16105 */
16106-static inline int fls(int x)
16107+static inline int __intentional_overflow(-1) fls(int x)
16108 {
16109 int r;
16110
16111@@ -476,7 +476,7 @@ static inline int fls(int x)
16112 * at position 64.
16113 */
16114 #ifdef CONFIG_X86_64
16115-static __always_inline int fls64(__u64 x)
16116+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16117 {
16118 int bitpos = -1;
16119 /*
16120diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16121index 4fa687a..60f2d39 100644
16122--- a/arch/x86/include/asm/boot.h
16123+++ b/arch/x86/include/asm/boot.h
16124@@ -6,10 +6,15 @@
16125 #include <uapi/asm/boot.h>
16126
16127 /* Physical address where kernel should be loaded. */
16128-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16129+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16130 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16131 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16132
16133+#ifndef __ASSEMBLY__
16134+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16135+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16136+#endif
16137+
16138 /* Minimum kernel alignment, as a power of two */
16139 #ifdef CONFIG_X86_64
16140 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16141diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16142index 48f99f1..d78ebf9 100644
16143--- a/arch/x86/include/asm/cache.h
16144+++ b/arch/x86/include/asm/cache.h
16145@@ -5,12 +5,13 @@
16146
16147 /* L1 cache line size */
16148 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16149-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16150+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16151
16152 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16153+#define __read_only __attribute__((__section__(".data..read_only")))
16154
16155 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16156-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16157+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16158
16159 #ifdef CONFIG_X86_VSMP
16160 #ifdef CONFIG_SMP
16161diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16162index 1f1297b..72b8439 100644
16163--- a/arch/x86/include/asm/calling.h
16164+++ b/arch/x86/include/asm/calling.h
16165@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16166 #define RSP 152
16167 #define SS 160
16168
16169-#define ARGOFFSET R11
16170+#define ARGOFFSET R15
16171
16172 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16173- subq $9*8+\addskip, %rsp
16174- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16175- movq_cfi rdi, 8*8
16176- movq_cfi rsi, 7*8
16177- movq_cfi rdx, 6*8
16178+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16179+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16180+ movq_cfi rdi, RDI
16181+ movq_cfi rsi, RSI
16182+ movq_cfi rdx, RDX
16183
16184 .if \save_rcx
16185- movq_cfi rcx, 5*8
16186+ movq_cfi rcx, RCX
16187 .endif
16188
16189 .if \rax_enosys
16190- movq $-ENOSYS, 4*8(%rsp)
16191+ movq $-ENOSYS, RAX(%rsp)
16192 .else
16193- movq_cfi rax, 4*8
16194+ movq_cfi rax, RAX
16195 .endif
16196
16197 .if \save_r891011
16198- movq_cfi r8, 3*8
16199- movq_cfi r9, 2*8
16200- movq_cfi r10, 1*8
16201- movq_cfi r11, 0*8
16202+ movq_cfi r8, R8
16203+ movq_cfi r9, R9
16204+ movq_cfi r10, R10
16205+ movq_cfi r11, R11
16206 .endif
16207
16208+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16209+ movq_cfi r12, R12
16210+#endif
16211+
16212 .endm
16213
16214-#define ARG_SKIP (9*8)
16215+#define ARG_SKIP ORIG_RAX
16216
16217 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16218 rstor_r8910=1, rstor_rdx=1
16219+
16220+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16221+ movq_cfi_restore R12, r12
16222+#endif
16223+
16224 .if \rstor_r11
16225- movq_cfi_restore 0*8, r11
16226+ movq_cfi_restore R11, r11
16227 .endif
16228
16229 .if \rstor_r8910
16230- movq_cfi_restore 1*8, r10
16231- movq_cfi_restore 2*8, r9
16232- movq_cfi_restore 3*8, r8
16233+ movq_cfi_restore R10, r10
16234+ movq_cfi_restore R9, r9
16235+ movq_cfi_restore R8, r8
16236 .endif
16237
16238 .if \rstor_rax
16239- movq_cfi_restore 4*8, rax
16240+ movq_cfi_restore RAX, rax
16241 .endif
16242
16243 .if \rstor_rcx
16244- movq_cfi_restore 5*8, rcx
16245+ movq_cfi_restore RCX, rcx
16246 .endif
16247
16248 .if \rstor_rdx
16249- movq_cfi_restore 6*8, rdx
16250+ movq_cfi_restore RDX, rdx
16251 .endif
16252
16253- movq_cfi_restore 7*8, rsi
16254- movq_cfi_restore 8*8, rdi
16255+ movq_cfi_restore RSI, rsi
16256+ movq_cfi_restore RDI, rdi
16257
16258- .if ARG_SKIP+\addskip > 0
16259- addq $ARG_SKIP+\addskip, %rsp
16260- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16261+ .if ORIG_RAX+\addskip > 0
16262+ addq $ORIG_RAX+\addskip, %rsp
16263+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16264 .endif
16265 .endm
16266
16267- .macro LOAD_ARGS offset, skiprax=0
16268- movq \offset(%rsp), %r11
16269- movq \offset+8(%rsp), %r10
16270- movq \offset+16(%rsp), %r9
16271- movq \offset+24(%rsp), %r8
16272- movq \offset+40(%rsp), %rcx
16273- movq \offset+48(%rsp), %rdx
16274- movq \offset+56(%rsp), %rsi
16275- movq \offset+64(%rsp), %rdi
16276+ .macro LOAD_ARGS skiprax=0
16277+ movq R11(%rsp), %r11
16278+ movq R10(%rsp), %r10
16279+ movq R9(%rsp), %r9
16280+ movq R8(%rsp), %r8
16281+ movq RCX(%rsp), %rcx
16282+ movq RDX(%rsp), %rdx
16283+ movq RSI(%rsp), %rsi
16284+ movq RDI(%rsp), %rdi
16285 .if \skiprax
16286 .else
16287- movq \offset+72(%rsp), %rax
16288+ movq ORIG_RAX(%rsp), %rax
16289 .endif
16290 .endm
16291
16292-#define REST_SKIP (6*8)
16293-
16294 .macro SAVE_REST
16295- subq $REST_SKIP, %rsp
16296- CFI_ADJUST_CFA_OFFSET REST_SKIP
16297- movq_cfi rbx, 5*8
16298- movq_cfi rbp, 4*8
16299- movq_cfi r12, 3*8
16300- movq_cfi r13, 2*8
16301- movq_cfi r14, 1*8
16302- movq_cfi r15, 0*8
16303+ movq_cfi rbx, RBX
16304+ movq_cfi rbp, RBP
16305+
16306+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16307+ movq_cfi r12, R12
16308+#endif
16309+
16310+ movq_cfi r13, R13
16311+ movq_cfi r14, R14
16312+ movq_cfi r15, R15
16313 .endm
16314
16315 .macro RESTORE_REST
16316- movq_cfi_restore 0*8, r15
16317- movq_cfi_restore 1*8, r14
16318- movq_cfi_restore 2*8, r13
16319- movq_cfi_restore 3*8, r12
16320- movq_cfi_restore 4*8, rbp
16321- movq_cfi_restore 5*8, rbx
16322- addq $REST_SKIP, %rsp
16323- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16324+ movq_cfi_restore R15, r15
16325+ movq_cfi_restore R14, r14
16326+ movq_cfi_restore R13, r13
16327+
16328+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16329+ movq_cfi_restore R12, r12
16330+#endif
16331+
16332+ movq_cfi_restore RBP, rbp
16333+ movq_cfi_restore RBX, rbx
16334 .endm
16335
16336 .macro SAVE_ALL
16337diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16338index f50de69..2b0a458 100644
16339--- a/arch/x86/include/asm/checksum_32.h
16340+++ b/arch/x86/include/asm/checksum_32.h
16341@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16342 int len, __wsum sum,
16343 int *src_err_ptr, int *dst_err_ptr);
16344
16345+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16346+ int len, __wsum sum,
16347+ int *src_err_ptr, int *dst_err_ptr);
16348+
16349+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16350+ int len, __wsum sum,
16351+ int *src_err_ptr, int *dst_err_ptr);
16352+
16353 /*
16354 * Note: when you get a NULL pointer exception here this means someone
16355 * passed in an incorrect kernel address to one of these functions.
16356@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16357
16358 might_sleep();
16359 stac();
16360- ret = csum_partial_copy_generic((__force void *)src, dst,
16361+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16362 len, sum, err_ptr, NULL);
16363 clac();
16364
16365@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16366 might_sleep();
16367 if (access_ok(VERIFY_WRITE, dst, len)) {
16368 stac();
16369- ret = csum_partial_copy_generic(src, (__force void *)dst,
16370+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16371 len, sum, NULL, err_ptr);
16372 clac();
16373 return ret;
16374diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16375index 99c105d7..2f667ac 100644
16376--- a/arch/x86/include/asm/cmpxchg.h
16377+++ b/arch/x86/include/asm/cmpxchg.h
16378@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16379 __compiletime_error("Bad argument size for cmpxchg");
16380 extern void __xadd_wrong_size(void)
16381 __compiletime_error("Bad argument size for xadd");
16382+extern void __xadd_check_overflow_wrong_size(void)
16383+ __compiletime_error("Bad argument size for xadd_check_overflow");
16384 extern void __add_wrong_size(void)
16385 __compiletime_error("Bad argument size for add");
16386+extern void __add_check_overflow_wrong_size(void)
16387+ __compiletime_error("Bad argument size for add_check_overflow");
16388
16389 /*
16390 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16391@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16392 __ret; \
16393 })
16394
16395+#ifdef CONFIG_PAX_REFCOUNT
16396+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16397+ ({ \
16398+ __typeof__ (*(ptr)) __ret = (arg); \
16399+ switch (sizeof(*(ptr))) { \
16400+ case __X86_CASE_L: \
16401+ asm volatile (lock #op "l %0, %1\n" \
16402+ "jno 0f\n" \
16403+ "mov %0,%1\n" \
16404+ "int $4\n0:\n" \
16405+ _ASM_EXTABLE(0b, 0b) \
16406+ : "+r" (__ret), "+m" (*(ptr)) \
16407+ : : "memory", "cc"); \
16408+ break; \
16409+ case __X86_CASE_Q: \
16410+ asm volatile (lock #op "q %q0, %1\n" \
16411+ "jno 0f\n" \
16412+ "mov %0,%1\n" \
16413+ "int $4\n0:\n" \
16414+ _ASM_EXTABLE(0b, 0b) \
16415+ : "+r" (__ret), "+m" (*(ptr)) \
16416+ : : "memory", "cc"); \
16417+ break; \
16418+ default: \
16419+ __ ## op ## _check_overflow_wrong_size(); \
16420+ } \
16421+ __ret; \
16422+ })
16423+#else
16424+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16425+#endif
16426+
16427 /*
16428 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16429 * Since this is generally used to protect other memory information, we
16430@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16431 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16432 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16433
16434+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16435+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16436+
16437 #define __add(ptr, inc, lock) \
16438 ({ \
16439 __typeof__ (*(ptr)) __ret = (inc); \
16440diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16441index 59c6c40..5e0b22c 100644
16442--- a/arch/x86/include/asm/compat.h
16443+++ b/arch/x86/include/asm/compat.h
16444@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16445 typedef u32 compat_uint_t;
16446 typedef u32 compat_ulong_t;
16447 typedef u64 __attribute__((aligned(4))) compat_u64;
16448-typedef u32 compat_uptr_t;
16449+typedef u32 __user compat_uptr_t;
16450
16451 struct compat_timespec {
16452 compat_time_t tv_sec;
16453diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16454index 90a5485..43b6211 100644
16455--- a/arch/x86/include/asm/cpufeature.h
16456+++ b/arch/x86/include/asm/cpufeature.h
16457@@ -213,7 +213,7 @@
16458 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16459 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16460 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16461-
16462+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16463
16464 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16465 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16466@@ -221,7 +221,7 @@
16467 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16468 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16469 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16470-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16471+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16472 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16473 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16474 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16475@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16476 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16477 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16478 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16479+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16480
16481 #if __GNUC__ >= 4
16482 extern void warn_pre_alternatives(void);
16483@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16484
16485 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16486 t_warn:
16487- warn_pre_alternatives();
16488+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16489+ warn_pre_alternatives();
16490 return false;
16491 #endif
16492
16493@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16494 ".section .discard,\"aw\",@progbits\n"
16495 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16496 ".previous\n"
16497- ".section .altinstr_replacement,\"ax\"\n"
16498+ ".section .altinstr_replacement,\"a\"\n"
16499 "3: movb $1,%0\n"
16500 "4:\n"
16501 ".previous\n"
16502@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16503 " .byte 2b - 1b\n" /* src len */
16504 " .byte 4f - 3f\n" /* repl len */
16505 ".previous\n"
16506- ".section .altinstr_replacement,\"ax\"\n"
16507+ ".section .altinstr_replacement,\"a\"\n"
16508 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16509 "4:\n"
16510 ".previous\n"
16511@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16512 ".section .discard,\"aw\",@progbits\n"
16513 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16514 ".previous\n"
16515- ".section .altinstr_replacement,\"ax\"\n"
16516+ ".section .altinstr_replacement,\"a\"\n"
16517 "3: movb $0,%0\n"
16518 "4:\n"
16519 ".previous\n"
16520@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16521 ".section .discard,\"aw\",@progbits\n"
16522 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16523 ".previous\n"
16524- ".section .altinstr_replacement,\"ax\"\n"
16525+ ".section .altinstr_replacement,\"a\"\n"
16526 "5: movb $1,%0\n"
16527 "6:\n"
16528 ".previous\n"
16529diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16530index a94b82e..59ecefa 100644
16531--- a/arch/x86/include/asm/desc.h
16532+++ b/arch/x86/include/asm/desc.h
16533@@ -4,6 +4,7 @@
16534 #include <asm/desc_defs.h>
16535 #include <asm/ldt.h>
16536 #include <asm/mmu.h>
16537+#include <asm/pgtable.h>
16538
16539 #include <linux/smp.h>
16540 #include <linux/percpu.h>
16541@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16542
16543 desc->type = (info->read_exec_only ^ 1) << 1;
16544 desc->type |= info->contents << 2;
16545+ desc->type |= info->seg_not_present ^ 1;
16546
16547 desc->s = 1;
16548 desc->dpl = 0x3;
16549@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16550 }
16551
16552 extern struct desc_ptr idt_descr;
16553-extern gate_desc idt_table[];
16554-extern struct desc_ptr debug_idt_descr;
16555-extern gate_desc debug_idt_table[];
16556-
16557-struct gdt_page {
16558- struct desc_struct gdt[GDT_ENTRIES];
16559-} __attribute__((aligned(PAGE_SIZE)));
16560-
16561-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16562+extern gate_desc idt_table[IDT_ENTRIES];
16563+extern const struct desc_ptr debug_idt_descr;
16564+extern gate_desc debug_idt_table[IDT_ENTRIES];
16565
16566+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16567 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16568 {
16569- return per_cpu(gdt_page, cpu).gdt;
16570+ return cpu_gdt_table[cpu];
16571 }
16572
16573 #ifdef CONFIG_X86_64
16574@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16575 unsigned long base, unsigned dpl, unsigned flags,
16576 unsigned short seg)
16577 {
16578- gate->a = (seg << 16) | (base & 0xffff);
16579- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16580+ gate->gate.offset_low = base;
16581+ gate->gate.seg = seg;
16582+ gate->gate.reserved = 0;
16583+ gate->gate.type = type;
16584+ gate->gate.s = 0;
16585+ gate->gate.dpl = dpl;
16586+ gate->gate.p = 1;
16587+ gate->gate.offset_high = base >> 16;
16588 }
16589
16590 #endif
16591@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16592
16593 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16594 {
16595+ pax_open_kernel();
16596 memcpy(&idt[entry], gate, sizeof(*gate));
16597+ pax_close_kernel();
16598 }
16599
16600 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16601 {
16602+ pax_open_kernel();
16603 memcpy(&ldt[entry], desc, 8);
16604+ pax_close_kernel();
16605 }
16606
16607 static inline void
16608@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16609 default: size = sizeof(*gdt); break;
16610 }
16611
16612+ pax_open_kernel();
16613 memcpy(&gdt[entry], desc, size);
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16618@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16619
16620 static inline void native_load_tr_desc(void)
16621 {
16622+ pax_open_kernel();
16623 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16624+ pax_close_kernel();
16625 }
16626
16627 static inline void native_load_gdt(const struct desc_ptr *dtr)
16628@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16629 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16630 unsigned int i;
16631
16632+ pax_open_kernel();
16633 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16634 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16635+ pax_close_kernel();
16636 }
16637
16638 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16639@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16640 preempt_enable();
16641 }
16642
16643-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16644+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16645 {
16646 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16647 }
16648@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16649 }
16650
16651 #ifdef CONFIG_X86_64
16652-static inline void set_nmi_gate(int gate, void *addr)
16653+static inline void set_nmi_gate(int gate, const void *addr)
16654 {
16655 gate_desc s;
16656
16657@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16658 #endif
16659
16660 #ifdef CONFIG_TRACING
16661-extern struct desc_ptr trace_idt_descr;
16662-extern gate_desc trace_idt_table[];
16663+extern const struct desc_ptr trace_idt_descr;
16664+extern gate_desc trace_idt_table[IDT_ENTRIES];
16665 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16666 {
16667 write_idt_entry(trace_idt_table, entry, gate);
16668 }
16669
16670-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16671+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16672 unsigned dpl, unsigned ist, unsigned seg)
16673 {
16674 gate_desc s;
16675@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16676 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16677 #endif
16678
16679-static inline void _set_gate(int gate, unsigned type, void *addr,
16680+static inline void _set_gate(int gate, unsigned type, const void *addr,
16681 unsigned dpl, unsigned ist, unsigned seg)
16682 {
16683 gate_desc s;
16684@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16685 #define set_intr_gate(n, addr) \
16686 do { \
16687 BUG_ON((unsigned)n > 0xFF); \
16688- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16689+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16690 __KERNEL_CS); \
16691- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16692+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16693 0, 0, __KERNEL_CS); \
16694 } while (0)
16695
16696@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16697 /*
16698 * This routine sets up an interrupt gate at directory privilege level 3.
16699 */
16700-static inline void set_system_intr_gate(unsigned int n, void *addr)
16701+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16702 {
16703 BUG_ON((unsigned)n > 0xFF);
16704 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16705 }
16706
16707-static inline void set_system_trap_gate(unsigned int n, void *addr)
16708+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16709 {
16710 BUG_ON((unsigned)n > 0xFF);
16711 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16712 }
16713
16714-static inline void set_trap_gate(unsigned int n, void *addr)
16715+static inline void set_trap_gate(unsigned int n, const void *addr)
16716 {
16717 BUG_ON((unsigned)n > 0xFF);
16718 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16719@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16720 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16721 {
16722 BUG_ON((unsigned)n > 0xFF);
16723- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16724+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16725 }
16726
16727-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16728+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16729 {
16730 BUG_ON((unsigned)n > 0xFF);
16731 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16732 }
16733
16734-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16735+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16736 {
16737 BUG_ON((unsigned)n > 0xFF);
16738 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16739@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16740 else
16741 load_idt((const struct desc_ptr *)&idt_descr);
16742 }
16743+
16744+#ifdef CONFIG_X86_32
16745+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16746+{
16747+ struct desc_struct d;
16748+
16749+ if (likely(limit))
16750+ limit = (limit - 1UL) >> PAGE_SHIFT;
16751+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16752+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16753+}
16754+#endif
16755+
16756 #endif /* _ASM_X86_DESC_H */
16757diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16758index 278441f..b95a174 100644
16759--- a/arch/x86/include/asm/desc_defs.h
16760+++ b/arch/x86/include/asm/desc_defs.h
16761@@ -31,6 +31,12 @@ struct desc_struct {
16762 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16763 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16764 };
16765+ struct {
16766+ u16 offset_low;
16767+ u16 seg;
16768+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16769+ unsigned offset_high: 16;
16770+ } gate;
16771 };
16772 } __attribute__((packed));
16773
16774diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16775index ced283a..ffe04cc 100644
16776--- a/arch/x86/include/asm/div64.h
16777+++ b/arch/x86/include/asm/div64.h
16778@@ -39,7 +39,7 @@
16779 __mod; \
16780 })
16781
16782-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16783+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16784 {
16785 union {
16786 u64 v64;
16787diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16788index ca3347a..1a5082a 100644
16789--- a/arch/x86/include/asm/elf.h
16790+++ b/arch/x86/include/asm/elf.h
16791@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16792
16793 #include <asm/vdso.h>
16794
16795-#ifdef CONFIG_X86_64
16796-extern unsigned int vdso64_enabled;
16797-#endif
16798 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16799 extern unsigned int vdso32_enabled;
16800 #endif
16801@@ -249,7 +246,25 @@ extern int force_personality32;
16802 the loader. We need to make sure that it is out of the way of the program
16803 that it will "exec", and that there is sufficient room for the brk. */
16804
16805+#ifdef CONFIG_PAX_SEGMEXEC
16806+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16807+#else
16808 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16809+#endif
16810+
16811+#ifdef CONFIG_PAX_ASLR
16812+#ifdef CONFIG_X86_32
16813+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16814+
16815+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16816+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16817+#else
16818+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16819+
16820+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16821+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16822+#endif
16823+#endif
16824
16825 /* This yields a mask that user programs can use to figure out what
16826 instruction set this CPU supports. This could be done in user space,
16827@@ -298,17 +313,13 @@ do { \
16828
16829 #define ARCH_DLINFO \
16830 do { \
16831- if (vdso64_enabled) \
16832- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16833- (unsigned long __force)current->mm->context.vdso); \
16834+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16835 } while (0)
16836
16837 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16838 #define ARCH_DLINFO_X32 \
16839 do { \
16840- if (vdso64_enabled) \
16841- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16842- (unsigned long __force)current->mm->context.vdso); \
16843+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16844 } while (0)
16845
16846 #define AT_SYSINFO 32
16847@@ -323,10 +334,10 @@ else \
16848
16849 #endif /* !CONFIG_X86_32 */
16850
16851-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16852+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16853
16854 #define VDSO_ENTRY \
16855- ((unsigned long)current->mm->context.vdso + \
16856+ (current->mm->context.vdso + \
16857 selected_vdso32->sym___kernel_vsyscall)
16858
16859 struct linux_binprm;
16860@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16861 int uses_interp);
16862 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16863
16864-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16865-#define arch_randomize_brk arch_randomize_brk
16866-
16867 /*
16868 * True on X86_32 or when emulating IA32 on X86_64
16869 */
16870diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16871index 77a99ac..39ff7f5 100644
16872--- a/arch/x86/include/asm/emergency-restart.h
16873+++ b/arch/x86/include/asm/emergency-restart.h
16874@@ -1,6 +1,6 @@
16875 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16876 #define _ASM_X86_EMERGENCY_RESTART_H
16877
16878-extern void machine_emergency_restart(void);
16879+extern void machine_emergency_restart(void) __noreturn;
16880
16881 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16882diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16883index 1c7eefe..d0e4702 100644
16884--- a/arch/x86/include/asm/floppy.h
16885+++ b/arch/x86/include/asm/floppy.h
16886@@ -229,18 +229,18 @@ static struct fd_routine_l {
16887 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16888 } fd_routine[] = {
16889 {
16890- request_dma,
16891- free_dma,
16892- get_dma_residue,
16893- dma_mem_alloc,
16894- hard_dma_setup
16895+ ._request_dma = request_dma,
16896+ ._free_dma = free_dma,
16897+ ._get_dma_residue = get_dma_residue,
16898+ ._dma_mem_alloc = dma_mem_alloc,
16899+ ._dma_setup = hard_dma_setup
16900 },
16901 {
16902- vdma_request_dma,
16903- vdma_nop,
16904- vdma_get_dma_residue,
16905- vdma_mem_alloc,
16906- vdma_dma_setup
16907+ ._request_dma = vdma_request_dma,
16908+ ._free_dma = vdma_nop,
16909+ ._get_dma_residue = vdma_get_dma_residue,
16910+ ._dma_mem_alloc = vdma_mem_alloc,
16911+ ._dma_setup = vdma_dma_setup
16912 }
16913 };
16914
16915diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16916index 72ba21a..79f3f66 100644
16917--- a/arch/x86/include/asm/fpu-internal.h
16918+++ b/arch/x86/include/asm/fpu-internal.h
16919@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16920 #define user_insn(insn, output, input...) \
16921 ({ \
16922 int err; \
16923+ pax_open_userland(); \
16924 asm volatile(ASM_STAC "\n" \
16925- "1:" #insn "\n\t" \
16926+ "1:" \
16927+ __copyuser_seg \
16928+ #insn "\n\t" \
16929 "2: " ASM_CLAC "\n" \
16930 ".section .fixup,\"ax\"\n" \
16931 "3: movl $-1,%[err]\n" \
16932@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16933 _ASM_EXTABLE(1b, 3b) \
16934 : [err] "=r" (err), output \
16935 : "0"(0), input); \
16936+ pax_close_userland(); \
16937 err; \
16938 })
16939
16940@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16941 "fnclex\n\t"
16942 "emms\n\t"
16943 "fildl %P[addr]" /* set F?P to defined value */
16944- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16945+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16946 }
16947
16948 return fpu_restore_checking(&tsk->thread.fpu);
16949diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16950index b4c1f54..e290c08 100644
16951--- a/arch/x86/include/asm/futex.h
16952+++ b/arch/x86/include/asm/futex.h
16953@@ -12,6 +12,7 @@
16954 #include <asm/smap.h>
16955
16956 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16957+ typecheck(u32 __user *, uaddr); \
16958 asm volatile("\t" ASM_STAC "\n" \
16959 "1:\t" insn "\n" \
16960 "2:\t" ASM_CLAC "\n" \
16961@@ -20,15 +21,16 @@
16962 "\tjmp\t2b\n" \
16963 "\t.previous\n" \
16964 _ASM_EXTABLE(1b, 3b) \
16965- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16966+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16967 : "i" (-EFAULT), "0" (oparg), "1" (0))
16968
16969 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16970+ typecheck(u32 __user *, uaddr); \
16971 asm volatile("\t" ASM_STAC "\n" \
16972 "1:\tmovl %2, %0\n" \
16973 "\tmovl\t%0, %3\n" \
16974 "\t" insn "\n" \
16975- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16976+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16977 "\tjnz\t1b\n" \
16978 "3:\t" ASM_CLAC "\n" \
16979 "\t.section .fixup,\"ax\"\n" \
16980@@ -38,7 +40,7 @@
16981 _ASM_EXTABLE(1b, 4b) \
16982 _ASM_EXTABLE(2b, 4b) \
16983 : "=&a" (oldval), "=&r" (ret), \
16984- "+m" (*uaddr), "=&r" (tem) \
16985+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16986 : "r" (oparg), "i" (-EFAULT), "1" (0))
16987
16988 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16989@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16990
16991 pagefault_disable();
16992
16993+ pax_open_userland();
16994 switch (op) {
16995 case FUTEX_OP_SET:
16996- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16997+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16998 break;
16999 case FUTEX_OP_ADD:
17000- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17001+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17002 uaddr, oparg);
17003 break;
17004 case FUTEX_OP_OR:
17005@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006 default:
17007 ret = -ENOSYS;
17008 }
17009+ pax_close_userland();
17010
17011 pagefault_enable();
17012
17013diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17014index 9662290..49ca5e5 100644
17015--- a/arch/x86/include/asm/hw_irq.h
17016+++ b/arch/x86/include/asm/hw_irq.h
17017@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17018 #endif /* CONFIG_X86_LOCAL_APIC */
17019
17020 /* Statistics */
17021-extern atomic_t irq_err_count;
17022-extern atomic_t irq_mis_count;
17023+extern atomic_unchecked_t irq_err_count;
17024+extern atomic_unchecked_t irq_mis_count;
17025
17026 /* EISA */
17027 extern void eisa_set_level_irq(unsigned int irq);
17028diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17029index ccffa53..3c90c87 100644
17030--- a/arch/x86/include/asm/i8259.h
17031+++ b/arch/x86/include/asm/i8259.h
17032@@ -62,7 +62,7 @@ struct legacy_pic {
17033 void (*init)(int auto_eoi);
17034 int (*irq_pending)(unsigned int irq);
17035 void (*make_irq)(unsigned int irq);
17036-};
17037+} __do_const;
17038
17039 extern struct legacy_pic *legacy_pic;
17040 extern struct legacy_pic null_legacy_pic;
17041diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17042index 34a5b93..27e40a6 100644
17043--- a/arch/x86/include/asm/io.h
17044+++ b/arch/x86/include/asm/io.h
17045@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17046 "m" (*(volatile type __force *)addr) barrier); }
17047
17048 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17049-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17050-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17051+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17052+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17053
17054 build_mmio_read(__readb, "b", unsigned char, "=q", )
17055-build_mmio_read(__readw, "w", unsigned short, "=r", )
17056-build_mmio_read(__readl, "l", unsigned int, "=r", )
17057+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17058+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17059
17060 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17061 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17062@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17063 * this function
17064 */
17065
17066-static inline phys_addr_t virt_to_phys(volatile void *address)
17067+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17068 {
17069 return __pa(address);
17070 }
17071@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17072 return ioremap_nocache(offset, size);
17073 }
17074
17075-extern void iounmap(volatile void __iomem *addr);
17076+extern void iounmap(const volatile void __iomem *addr);
17077
17078 extern void set_iounmap_nonlazy(void);
17079
17080@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17081
17082 #include <linux/vmalloc.h>
17083
17084+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17085+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17086+{
17087+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17088+}
17089+
17090+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17091+{
17092+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17093+}
17094+
17095 /*
17096 * Convert a virtual cached pointer to an uncached pointer
17097 */
17098diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17099index 0a8b519..80e7d5b 100644
17100--- a/arch/x86/include/asm/irqflags.h
17101+++ b/arch/x86/include/asm/irqflags.h
17102@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17103 sti; \
17104 sysexit
17105
17106+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17107+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17108+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17109+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17110+
17111 #else
17112 #define INTERRUPT_RETURN iret
17113 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17114diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17115index 4421b5d..8543006 100644
17116--- a/arch/x86/include/asm/kprobes.h
17117+++ b/arch/x86/include/asm/kprobes.h
17118@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17119 #define RELATIVEJUMP_SIZE 5
17120 #define RELATIVECALL_OPCODE 0xe8
17121 #define RELATIVE_ADDR_SIZE 4
17122-#define MAX_STACK_SIZE 64
17123-#define MIN_STACK_SIZE(ADDR) \
17124- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17125- THREAD_SIZE - (unsigned long)(ADDR))) \
17126- ? (MAX_STACK_SIZE) \
17127- : (((unsigned long)current_thread_info()) + \
17128- THREAD_SIZE - (unsigned long)(ADDR)))
17129+#define MAX_STACK_SIZE 64UL
17130+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17131
17132 #define flush_insn_slot(p) do { } while (0)
17133
17134diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17135index 4ad6560..75c7bdd 100644
17136--- a/arch/x86/include/asm/local.h
17137+++ b/arch/x86/include/asm/local.h
17138@@ -10,33 +10,97 @@ typedef struct {
17139 atomic_long_t a;
17140 } local_t;
17141
17142+typedef struct {
17143+ atomic_long_unchecked_t a;
17144+} local_unchecked_t;
17145+
17146 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17147
17148 #define local_read(l) atomic_long_read(&(l)->a)
17149+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17150 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17151+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17152
17153 static inline void local_inc(local_t *l)
17154 {
17155- asm volatile(_ASM_INC "%0"
17156+ asm volatile(_ASM_INC "%0\n"
17157+
17158+#ifdef CONFIG_PAX_REFCOUNT
17159+ "jno 0f\n"
17160+ _ASM_DEC "%0\n"
17161+ "int $4\n0:\n"
17162+ _ASM_EXTABLE(0b, 0b)
17163+#endif
17164+
17165+ : "+m" (l->a.counter));
17166+}
17167+
17168+static inline void local_inc_unchecked(local_unchecked_t *l)
17169+{
17170+ asm volatile(_ASM_INC "%0\n"
17171 : "+m" (l->a.counter));
17172 }
17173
17174 static inline void local_dec(local_t *l)
17175 {
17176- asm volatile(_ASM_DEC "%0"
17177+ asm volatile(_ASM_DEC "%0\n"
17178+
17179+#ifdef CONFIG_PAX_REFCOUNT
17180+ "jno 0f\n"
17181+ _ASM_INC "%0\n"
17182+ "int $4\n0:\n"
17183+ _ASM_EXTABLE(0b, 0b)
17184+#endif
17185+
17186+ : "+m" (l->a.counter));
17187+}
17188+
17189+static inline void local_dec_unchecked(local_unchecked_t *l)
17190+{
17191+ asm volatile(_ASM_DEC "%0\n"
17192 : "+m" (l->a.counter));
17193 }
17194
17195 static inline void local_add(long i, local_t *l)
17196 {
17197- asm volatile(_ASM_ADD "%1,%0"
17198+ asm volatile(_ASM_ADD "%1,%0\n"
17199+
17200+#ifdef CONFIG_PAX_REFCOUNT
17201+ "jno 0f\n"
17202+ _ASM_SUB "%1,%0\n"
17203+ "int $4\n0:\n"
17204+ _ASM_EXTABLE(0b, 0b)
17205+#endif
17206+
17207+ : "+m" (l->a.counter)
17208+ : "ir" (i));
17209+}
17210+
17211+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17212+{
17213+ asm volatile(_ASM_ADD "%1,%0\n"
17214 : "+m" (l->a.counter)
17215 : "ir" (i));
17216 }
17217
17218 static inline void local_sub(long i, local_t *l)
17219 {
17220- asm volatile(_ASM_SUB "%1,%0"
17221+ asm volatile(_ASM_SUB "%1,%0\n"
17222+
17223+#ifdef CONFIG_PAX_REFCOUNT
17224+ "jno 0f\n"
17225+ _ASM_ADD "%1,%0\n"
17226+ "int $4\n0:\n"
17227+ _ASM_EXTABLE(0b, 0b)
17228+#endif
17229+
17230+ : "+m" (l->a.counter)
17231+ : "ir" (i));
17232+}
17233+
17234+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17235+{
17236+ asm volatile(_ASM_SUB "%1,%0\n"
17237 : "+m" (l->a.counter)
17238 : "ir" (i));
17239 }
17240@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17241 */
17242 static inline int local_sub_and_test(long i, local_t *l)
17243 {
17244- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17245+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17246 }
17247
17248 /**
17249@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17250 */
17251 static inline int local_dec_and_test(local_t *l)
17252 {
17253- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17254+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17255 }
17256
17257 /**
17258@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17259 */
17260 static inline int local_inc_and_test(local_t *l)
17261 {
17262- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17263+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17264 }
17265
17266 /**
17267@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17268 */
17269 static inline int local_add_negative(long i, local_t *l)
17270 {
17271- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17272+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17273 }
17274
17275 /**
17276@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17277 static inline long local_add_return(long i, local_t *l)
17278 {
17279 long __i = i;
17280+ asm volatile(_ASM_XADD "%0, %1\n"
17281+
17282+#ifdef CONFIG_PAX_REFCOUNT
17283+ "jno 0f\n"
17284+ _ASM_MOV "%0,%1\n"
17285+ "int $4\n0:\n"
17286+ _ASM_EXTABLE(0b, 0b)
17287+#endif
17288+
17289+ : "+r" (i), "+m" (l->a.counter)
17290+ : : "memory");
17291+ return i + __i;
17292+}
17293+
17294+/**
17295+ * local_add_return_unchecked - add and return
17296+ * @i: integer value to add
17297+ * @l: pointer to type local_unchecked_t
17298+ *
17299+ * Atomically adds @i to @l and returns @i + @l
17300+ */
17301+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17302+{
17303+ long __i = i;
17304 asm volatile(_ASM_XADD "%0, %1;"
17305 : "+r" (i), "+m" (l->a.counter)
17306 : : "memory");
17307@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17308
17309 #define local_cmpxchg(l, o, n) \
17310 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17311+#define local_cmpxchg_unchecked(l, o, n) \
17312+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17313 /* Always has a lock prefix */
17314 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17315
17316diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17317new file mode 100644
17318index 0000000..2bfd3ba
17319--- /dev/null
17320+++ b/arch/x86/include/asm/mman.h
17321@@ -0,0 +1,15 @@
17322+#ifndef _X86_MMAN_H
17323+#define _X86_MMAN_H
17324+
17325+#include <uapi/asm/mman.h>
17326+
17327+#ifdef __KERNEL__
17328+#ifndef __ASSEMBLY__
17329+#ifdef CONFIG_X86_32
17330+#define arch_mmap_check i386_mmap_check
17331+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17332+#endif
17333+#endif
17334+#endif
17335+
17336+#endif /* X86_MMAN_H */
17337diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17338index 09b9620..923aecd 100644
17339--- a/arch/x86/include/asm/mmu.h
17340+++ b/arch/x86/include/asm/mmu.h
17341@@ -9,7 +9,7 @@
17342 * we put the segment information here.
17343 */
17344 typedef struct {
17345- void *ldt;
17346+ struct desc_struct *ldt;
17347 int size;
17348
17349 #ifdef CONFIG_X86_64
17350@@ -18,7 +18,19 @@ typedef struct {
17351 #endif
17352
17353 struct mutex lock;
17354- void __user *vdso;
17355+ unsigned long vdso;
17356+
17357+#ifdef CONFIG_X86_32
17358+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17359+ unsigned long user_cs_base;
17360+ unsigned long user_cs_limit;
17361+
17362+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17363+ cpumask_t cpu_user_cs_mask;
17364+#endif
17365+
17366+#endif
17367+#endif
17368
17369 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17370 } mm_context_t;
17371diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17372index 883f6b93..6869d96 100644
17373--- a/arch/x86/include/asm/mmu_context.h
17374+++ b/arch/x86/include/asm/mmu_context.h
17375@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17376
17377 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17378 {
17379+
17380+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17381+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17382+ unsigned int i;
17383+ pgd_t *pgd;
17384+
17385+ pax_open_kernel();
17386+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17387+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17388+ set_pgd_batched(pgd+i, native_make_pgd(0));
17389+ pax_close_kernel();
17390+ }
17391+#endif
17392+
17393 #ifdef CONFIG_SMP
17394 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17395 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17396@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17397 struct task_struct *tsk)
17398 {
17399 unsigned cpu = smp_processor_id();
17400+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17401+ int tlbstate = TLBSTATE_OK;
17402+#endif
17403
17404 if (likely(prev != next)) {
17405 #ifdef CONFIG_SMP
17406+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17407+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17408+#endif
17409 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17410 this_cpu_write(cpu_tlbstate.active_mm, next);
17411 #endif
17412 cpumask_set_cpu(cpu, mm_cpumask(next));
17413
17414 /* Re-load page tables */
17415+#ifdef CONFIG_PAX_PER_CPU_PGD
17416+ pax_open_kernel();
17417+
17418+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17419+ if (static_cpu_has(X86_FEATURE_PCID))
17420+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17421+ else
17422+#endif
17423+
17424+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17425+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17426+ pax_close_kernel();
17427+ 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));
17428+
17429+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17430+ if (static_cpu_has(X86_FEATURE_PCID)) {
17431+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17432+ u64 descriptor[2];
17433+ descriptor[0] = PCID_USER;
17434+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17435+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17436+ descriptor[0] = PCID_KERNEL;
17437+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17438+ }
17439+ } else {
17440+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17441+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17442+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17443+ else
17444+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17445+ }
17446+ } else
17447+#endif
17448+
17449+ load_cr3(get_cpu_pgd(cpu, kernel));
17450+#else
17451 load_cr3(next->pgd);
17452+#endif
17453 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17454
17455 /* Stop flush ipis for the previous mm */
17456@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17457 */
17458 if (unlikely(prev->context.ldt != next->context.ldt))
17459 load_LDT_nolock(&next->context);
17460+
17461+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17462+ if (!(__supported_pte_mask & _PAGE_NX)) {
17463+ smp_mb__before_atomic();
17464+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17465+ smp_mb__after_atomic();
17466+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17467+ }
17468+#endif
17469+
17470+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17471+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17472+ prev->context.user_cs_limit != next->context.user_cs_limit))
17473+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17474+#ifdef CONFIG_SMP
17475+ else if (unlikely(tlbstate != TLBSTATE_OK))
17476+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17477+#endif
17478+#endif
17479+
17480 }
17481+ else {
17482+
17483+#ifdef CONFIG_PAX_PER_CPU_PGD
17484+ pax_open_kernel();
17485+
17486+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17487+ if (static_cpu_has(X86_FEATURE_PCID))
17488+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17489+ else
17490+#endif
17491+
17492+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17493+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17494+ pax_close_kernel();
17495+ 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));
17496+
17497+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17498+ if (static_cpu_has(X86_FEATURE_PCID)) {
17499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17500+ u64 descriptor[2];
17501+ descriptor[0] = PCID_USER;
17502+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17503+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17504+ descriptor[0] = PCID_KERNEL;
17505+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17506+ }
17507+ } else {
17508+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17509+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17510+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17511+ else
17512+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17513+ }
17514+ } else
17515+#endif
17516+
17517+ load_cr3(get_cpu_pgd(cpu, kernel));
17518+#endif
17519+
17520 #ifdef CONFIG_SMP
17521- else {
17522 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17523 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17524
17525@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17526 * tlb flush IPI delivery. We must reload CR3
17527 * to make sure to use no freed page tables.
17528 */
17529+
17530+#ifndef CONFIG_PAX_PER_CPU_PGD
17531 load_cr3(next->pgd);
17532 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17533+#endif
17534+
17535 load_mm_cr4(next);
17536 load_LDT_nolock(&next->context);
17537+
17538+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17539+ if (!(__supported_pte_mask & _PAGE_NX))
17540+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17541+#endif
17542+
17543+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17544+#ifdef CONFIG_PAX_PAGEEXEC
17545+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17546+#endif
17547+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17548+#endif
17549+
17550 }
17551+#endif
17552 }
17553-#endif
17554 }
17555
17556 #define activate_mm(prev, next) \
17557diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17558index e3b7819..b257c64 100644
17559--- a/arch/x86/include/asm/module.h
17560+++ b/arch/x86/include/asm/module.h
17561@@ -5,6 +5,7 @@
17562
17563 #ifdef CONFIG_X86_64
17564 /* X86_64 does not define MODULE_PROC_FAMILY */
17565+#define MODULE_PROC_FAMILY ""
17566 #elif defined CONFIG_M486
17567 #define MODULE_PROC_FAMILY "486 "
17568 #elif defined CONFIG_M586
17569@@ -57,8 +58,20 @@
17570 #error unknown processor family
17571 #endif
17572
17573-#ifdef CONFIG_X86_32
17574-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17575+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17576+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17577+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17578+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17579+#else
17580+#define MODULE_PAX_KERNEXEC ""
17581 #endif
17582
17583+#ifdef CONFIG_PAX_MEMORY_UDEREF
17584+#define MODULE_PAX_UDEREF "UDEREF "
17585+#else
17586+#define MODULE_PAX_UDEREF ""
17587+#endif
17588+
17589+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17590+
17591 #endif /* _ASM_X86_MODULE_H */
17592diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17593index 5f2fc44..106caa6 100644
17594--- a/arch/x86/include/asm/nmi.h
17595+++ b/arch/x86/include/asm/nmi.h
17596@@ -36,26 +36,35 @@ enum {
17597
17598 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17599
17600+struct nmiaction;
17601+
17602+struct nmiwork {
17603+ const struct nmiaction *action;
17604+ u64 max_duration;
17605+ struct irq_work irq_work;
17606+};
17607+
17608 struct nmiaction {
17609 struct list_head list;
17610 nmi_handler_t handler;
17611- u64 max_duration;
17612- struct irq_work irq_work;
17613 unsigned long flags;
17614 const char *name;
17615-};
17616+ struct nmiwork *work;
17617+} __do_const;
17618
17619 #define register_nmi_handler(t, fn, fg, n, init...) \
17620 ({ \
17621- static struct nmiaction init fn##_na = { \
17622+ static struct nmiwork fn##_nw; \
17623+ static const struct nmiaction init fn##_na = { \
17624 .handler = (fn), \
17625 .name = (n), \
17626 .flags = (fg), \
17627+ .work = &fn##_nw, \
17628 }; \
17629 __register_nmi_handler((t), &fn##_na); \
17630 })
17631
17632-int __register_nmi_handler(unsigned int, struct nmiaction *);
17633+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17634
17635 void unregister_nmi_handler(unsigned int, const char *);
17636
17637diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17638index 802dde3..9183e68 100644
17639--- a/arch/x86/include/asm/page.h
17640+++ b/arch/x86/include/asm/page.h
17641@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17642 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17643
17644 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17645+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17646
17647 #define __boot_va(x) __va(x)
17648 #define __boot_pa(x) __pa(x)
17649@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17650 * virt_to_page(kaddr) returns a valid pointer if and only if
17651 * virt_addr_valid(kaddr) returns true.
17652 */
17653-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17654 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17655 extern bool __virt_addr_valid(unsigned long kaddr);
17656 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17657
17658+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17659+#define virt_to_page(kaddr) \
17660+ ({ \
17661+ const void *__kaddr = (const void *)(kaddr); \
17662+ BUG_ON(!virt_addr_valid(__kaddr)); \
17663+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17664+ })
17665+#else
17666+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17667+#endif
17668+
17669 #endif /* __ASSEMBLY__ */
17670
17671 #include <asm-generic/memory_model.h>
17672diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17673index b3bebf9..13ac22e 100644
17674--- a/arch/x86/include/asm/page_64.h
17675+++ b/arch/x86/include/asm/page_64.h
17676@@ -7,9 +7,9 @@
17677
17678 /* duplicated to the one in bootmem.h */
17679 extern unsigned long max_pfn;
17680-extern unsigned long phys_base;
17681+extern const unsigned long phys_base;
17682
17683-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17684+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17685 {
17686 unsigned long y = x - __START_KERNEL_map;
17687
17688@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17689 }
17690
17691 #ifdef CONFIG_DEBUG_VIRTUAL
17692-extern unsigned long __phys_addr(unsigned long);
17693-extern unsigned long __phys_addr_symbol(unsigned long);
17694+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17695+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17696 #else
17697 #define __phys_addr(x) __phys_addr_nodebug(x)
17698 #define __phys_addr_symbol(x) \
17699diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17700index 965c47d..ffe0af8 100644
17701--- a/arch/x86/include/asm/paravirt.h
17702+++ b/arch/x86/include/asm/paravirt.h
17703@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17704 return (pmd_t) { ret };
17705 }
17706
17707-static inline pmdval_t pmd_val(pmd_t pmd)
17708+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17709 {
17710 pmdval_t ret;
17711
17712@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17713 val);
17714 }
17715
17716+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17717+{
17718+ pgdval_t val = native_pgd_val(pgd);
17719+
17720+ if (sizeof(pgdval_t) > sizeof(long))
17721+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17722+ val, (u64)val >> 32);
17723+ else
17724+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17725+ val);
17726+}
17727+
17728 static inline void pgd_clear(pgd_t *pgdp)
17729 {
17730 set_pgd(pgdp, __pgd(0));
17731@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17732 pv_mmu_ops.set_fixmap(idx, phys, flags);
17733 }
17734
17735+#ifdef CONFIG_PAX_KERNEXEC
17736+static inline unsigned long pax_open_kernel(void)
17737+{
17738+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17739+}
17740+
17741+static inline unsigned long pax_close_kernel(void)
17742+{
17743+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17744+}
17745+#else
17746+static inline unsigned long pax_open_kernel(void) { return 0; }
17747+static inline unsigned long pax_close_kernel(void) { return 0; }
17748+#endif
17749+
17750 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17751
17752 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17753@@ -906,7 +933,7 @@ extern void default_banner(void);
17754
17755 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17756 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17757-#define PARA_INDIRECT(addr) *%cs:addr
17758+#define PARA_INDIRECT(addr) *%ss:addr
17759 #endif
17760
17761 #define INTERRUPT_RETURN \
17762@@ -981,6 +1008,21 @@ extern void default_banner(void);
17763 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17764 CLBR_NONE, \
17765 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17766+
17767+#define GET_CR0_INTO_RDI \
17768+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17769+ mov %rax,%rdi
17770+
17771+#define SET_RDI_INTO_CR0 \
17772+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17773+
17774+#define GET_CR3_INTO_RDI \
17775+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17776+ mov %rax,%rdi
17777+
17778+#define SET_RDI_INTO_CR3 \
17779+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17780+
17781 #endif /* CONFIG_X86_32 */
17782
17783 #endif /* __ASSEMBLY__ */
17784diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17785index 7549b8b..f0edfda 100644
17786--- a/arch/x86/include/asm/paravirt_types.h
17787+++ b/arch/x86/include/asm/paravirt_types.h
17788@@ -84,7 +84,7 @@ struct pv_init_ops {
17789 */
17790 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17791 unsigned long addr, unsigned len);
17792-};
17793+} __no_const __no_randomize_layout;
17794
17795
17796 struct pv_lazy_ops {
17797@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17798 void (*enter)(void);
17799 void (*leave)(void);
17800 void (*flush)(void);
17801-};
17802+} __no_randomize_layout;
17803
17804 struct pv_time_ops {
17805 unsigned long long (*sched_clock)(void);
17806 unsigned long long (*steal_clock)(int cpu);
17807 unsigned long (*get_tsc_khz)(void);
17808-};
17809+} __no_const __no_randomize_layout;
17810
17811 struct pv_cpu_ops {
17812 /* hooks for various privileged instructions */
17813@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17814
17815 void (*start_context_switch)(struct task_struct *prev);
17816 void (*end_context_switch)(struct task_struct *next);
17817-};
17818+} __no_const __no_randomize_layout;
17819
17820 struct pv_irq_ops {
17821 /*
17822@@ -215,7 +215,7 @@ struct pv_irq_ops {
17823 #ifdef CONFIG_X86_64
17824 void (*adjust_exception_frame)(void);
17825 #endif
17826-};
17827+} __no_randomize_layout;
17828
17829 struct pv_apic_ops {
17830 #ifdef CONFIG_X86_LOCAL_APIC
17831@@ -223,7 +223,7 @@ struct pv_apic_ops {
17832 unsigned long start_eip,
17833 unsigned long start_esp);
17834 #endif
17835-};
17836+} __no_const __no_randomize_layout;
17837
17838 struct pv_mmu_ops {
17839 unsigned long (*read_cr2)(void);
17840@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17841 struct paravirt_callee_save make_pud;
17842
17843 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17844+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17845 #endif /* PAGETABLE_LEVELS == 4 */
17846 #endif /* PAGETABLE_LEVELS >= 3 */
17847
17848@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17849 an mfn. We can tell which is which from the index. */
17850 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17851 phys_addr_t phys, pgprot_t flags);
17852-};
17853+
17854+#ifdef CONFIG_PAX_KERNEXEC
17855+ unsigned long (*pax_open_kernel)(void);
17856+ unsigned long (*pax_close_kernel)(void);
17857+#endif
17858+
17859+} __no_randomize_layout;
17860
17861 struct arch_spinlock;
17862 #ifdef CONFIG_SMP
17863@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17864 struct pv_lock_ops {
17865 struct paravirt_callee_save lock_spinning;
17866 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17867-};
17868+} __no_randomize_layout;
17869
17870 /* This contains all the paravirt structures: we get a convenient
17871 * number for each function using the offset which we use to indicate
17872- * what to patch. */
17873+ * what to patch.
17874+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17875+ */
17876+
17877 struct paravirt_patch_template {
17878 struct pv_init_ops pv_init_ops;
17879 struct pv_time_ops pv_time_ops;
17880@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17881 struct pv_apic_ops pv_apic_ops;
17882 struct pv_mmu_ops pv_mmu_ops;
17883 struct pv_lock_ops pv_lock_ops;
17884-};
17885+} __no_randomize_layout;
17886
17887 extern struct pv_info pv_info;
17888 extern struct pv_init_ops pv_init_ops;
17889diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17890index c4412e9..90e88c5 100644
17891--- a/arch/x86/include/asm/pgalloc.h
17892+++ b/arch/x86/include/asm/pgalloc.h
17893@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17894 pmd_t *pmd, pte_t *pte)
17895 {
17896 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17897+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17898+}
17899+
17900+static inline void pmd_populate_user(struct mm_struct *mm,
17901+ pmd_t *pmd, pte_t *pte)
17902+{
17903+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17904 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17905 }
17906
17907@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17908
17909 #ifdef CONFIG_X86_PAE
17910 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17911+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17912+{
17913+ pud_populate(mm, pudp, pmd);
17914+}
17915 #else /* !CONFIG_X86_PAE */
17916 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17917 {
17918 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17919 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17920 }
17921+
17922+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17923+{
17924+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17925+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17926+}
17927 #endif /* CONFIG_X86_PAE */
17928
17929 #if PAGETABLE_LEVELS > 3
17930@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17931 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17932 }
17933
17934+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17935+{
17936+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17937+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17938+}
17939+
17940 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17941 {
17942 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17943diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17944index fd74a11..35fd5af 100644
17945--- a/arch/x86/include/asm/pgtable-2level.h
17946+++ b/arch/x86/include/asm/pgtable-2level.h
17947@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17948
17949 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17950 {
17951+ pax_open_kernel();
17952 *pmdp = pmd;
17953+ pax_close_kernel();
17954 }
17955
17956 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17957diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17958index cdaa58c..e61122b 100644
17959--- a/arch/x86/include/asm/pgtable-3level.h
17960+++ b/arch/x86/include/asm/pgtable-3level.h
17961@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17962
17963 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17964 {
17965+ pax_open_kernel();
17966 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17967+ pax_close_kernel();
17968 }
17969
17970 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17971 {
17972+ pax_open_kernel();
17973 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17974+ pax_close_kernel();
17975 }
17976
17977 /*
17978diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17979index a0c35bf..7045c6a 100644
17980--- a/arch/x86/include/asm/pgtable.h
17981+++ b/arch/x86/include/asm/pgtable.h
17982@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17983
17984 #ifndef __PAGETABLE_PUD_FOLDED
17985 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17986+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17987 #define pgd_clear(pgd) native_pgd_clear(pgd)
17988 #endif
17989
17990@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17991
17992 #define arch_end_context_switch(prev) do {} while(0)
17993
17994+#define pax_open_kernel() native_pax_open_kernel()
17995+#define pax_close_kernel() native_pax_close_kernel()
17996 #endif /* CONFIG_PARAVIRT */
17997
17998+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17999+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18000+
18001+#ifdef CONFIG_PAX_KERNEXEC
18002+static inline unsigned long native_pax_open_kernel(void)
18003+{
18004+ unsigned long cr0;
18005+
18006+ preempt_disable();
18007+ barrier();
18008+ cr0 = read_cr0() ^ X86_CR0_WP;
18009+ BUG_ON(cr0 & X86_CR0_WP);
18010+ write_cr0(cr0);
18011+ barrier();
18012+ return cr0 ^ X86_CR0_WP;
18013+}
18014+
18015+static inline unsigned long native_pax_close_kernel(void)
18016+{
18017+ unsigned long cr0;
18018+
18019+ barrier();
18020+ cr0 = read_cr0() ^ X86_CR0_WP;
18021+ BUG_ON(!(cr0 & X86_CR0_WP));
18022+ write_cr0(cr0);
18023+ barrier();
18024+ preempt_enable_no_resched();
18025+ return cr0 ^ X86_CR0_WP;
18026+}
18027+#else
18028+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18029+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18030+#endif
18031+
18032 /*
18033 * The following only work if pte_present() is true.
18034 * Undefined behaviour if not..
18035 */
18036+static inline int pte_user(pte_t pte)
18037+{
18038+ return pte_val(pte) & _PAGE_USER;
18039+}
18040+
18041 static inline int pte_dirty(pte_t pte)
18042 {
18043 return pte_flags(pte) & _PAGE_DIRTY;
18044@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18045 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18046 }
18047
18048+static inline unsigned long pgd_pfn(pgd_t pgd)
18049+{
18050+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18051+}
18052+
18053 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18054
18055 static inline int pmd_large(pmd_t pte)
18056@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18057 return pte_clear_flags(pte, _PAGE_RW);
18058 }
18059
18060+static inline pte_t pte_mkread(pte_t pte)
18061+{
18062+ return __pte(pte_val(pte) | _PAGE_USER);
18063+}
18064+
18065 static inline pte_t pte_mkexec(pte_t pte)
18066 {
18067- return pte_clear_flags(pte, _PAGE_NX);
18068+#ifdef CONFIG_X86_PAE
18069+ if (__supported_pte_mask & _PAGE_NX)
18070+ return pte_clear_flags(pte, _PAGE_NX);
18071+ else
18072+#endif
18073+ return pte_set_flags(pte, _PAGE_USER);
18074+}
18075+
18076+static inline pte_t pte_exprotect(pte_t pte)
18077+{
18078+#ifdef CONFIG_X86_PAE
18079+ if (__supported_pte_mask & _PAGE_NX)
18080+ return pte_set_flags(pte, _PAGE_NX);
18081+ else
18082+#endif
18083+ return pte_clear_flags(pte, _PAGE_USER);
18084 }
18085
18086 static inline pte_t pte_mkdirty(pte_t pte)
18087@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18088 #endif
18089
18090 #ifndef __ASSEMBLY__
18091+
18092+#ifdef CONFIG_PAX_PER_CPU_PGD
18093+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18094+enum cpu_pgd_type {kernel = 0, user = 1};
18095+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18096+{
18097+ return cpu_pgd[cpu][type];
18098+}
18099+#endif
18100+
18101 #include <linux/mm_types.h>
18102 #include <linux/mmdebug.h>
18103 #include <linux/log2.h>
18104@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18105 * Currently stuck as a macro due to indirect forward reference to
18106 * linux/mmzone.h's __section_mem_map_addr() definition:
18107 */
18108-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18109+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18110
18111 /* Find an entry in the second-level page table.. */
18112 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18113@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18114 * Currently stuck as a macro due to indirect forward reference to
18115 * linux/mmzone.h's __section_mem_map_addr() definition:
18116 */
18117-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18118+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18119
18120 /* to find an entry in a page-table-directory. */
18121 static inline unsigned long pud_index(unsigned long address)
18122@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18123
18124 static inline int pgd_bad(pgd_t pgd)
18125 {
18126- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18127+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18128 }
18129
18130 static inline int pgd_none(pgd_t pgd)
18131@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18132 * pgd_offset() returns a (pgd_t *)
18133 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18134 */
18135-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18136+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18137+
18138+#ifdef CONFIG_PAX_PER_CPU_PGD
18139+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18140+#endif
18141+
18142 /*
18143 * a shortcut which implies the use of the kernel's pgd, instead
18144 * of a process's
18145@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18146 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18147 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18148
18149+#ifdef CONFIG_X86_32
18150+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18151+#else
18152+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18153+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18154+
18155+#ifdef CONFIG_PAX_MEMORY_UDEREF
18156+#ifdef __ASSEMBLY__
18157+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18158+#else
18159+extern unsigned long pax_user_shadow_base;
18160+extern pgdval_t clone_pgd_mask;
18161+#endif
18162+#else
18163+#define pax_user_shadow_base (0UL)
18164+#endif
18165+
18166+#endif
18167+
18168 #ifndef __ASSEMBLY__
18169
18170 extern int direct_gbpages;
18171@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18172 * dst and src can be on the same page, but the range must not overlap,
18173 * and must not cross a page boundary.
18174 */
18175-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18176+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18177 {
18178- memcpy(dst, src, count * sizeof(pgd_t));
18179+ pax_open_kernel();
18180+ while (count--)
18181+ *dst++ = *src++;
18182+ pax_close_kernel();
18183 }
18184
18185+#ifdef CONFIG_PAX_PER_CPU_PGD
18186+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18187+#endif
18188+
18189+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18190+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18191+#else
18192+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18193+#endif
18194+
18195 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18196 static inline int page_level_shift(enum pg_level level)
18197 {
18198diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18199index b6c0b40..3535d47 100644
18200--- a/arch/x86/include/asm/pgtable_32.h
18201+++ b/arch/x86/include/asm/pgtable_32.h
18202@@ -25,9 +25,6 @@
18203 struct mm_struct;
18204 struct vm_area_struct;
18205
18206-extern pgd_t swapper_pg_dir[1024];
18207-extern pgd_t initial_page_table[1024];
18208-
18209 static inline void pgtable_cache_init(void) { }
18210 static inline void check_pgt_cache(void) { }
18211 void paging_init(void);
18212@@ -45,6 +42,12 @@ void paging_init(void);
18213 # include <asm/pgtable-2level.h>
18214 #endif
18215
18216+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18217+extern pgd_t initial_page_table[PTRS_PER_PGD];
18218+#ifdef CONFIG_X86_PAE
18219+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18220+#endif
18221+
18222 #if defined(CONFIG_HIGHPTE)
18223 #define pte_offset_map(dir, address) \
18224 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18225@@ -59,12 +62,17 @@ void paging_init(void);
18226 /* Clear a kernel PTE and flush it from the TLB */
18227 #define kpte_clear_flush(ptep, vaddr) \
18228 do { \
18229+ pax_open_kernel(); \
18230 pte_clear(&init_mm, (vaddr), (ptep)); \
18231+ pax_close_kernel(); \
18232 __flush_tlb_one((vaddr)); \
18233 } while (0)
18234
18235 #endif /* !__ASSEMBLY__ */
18236
18237+#define HAVE_ARCH_UNMAPPED_AREA
18238+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18239+
18240 /*
18241 * kern_addr_valid() is (1) for FLATMEM and (0) for
18242 * SPARSEMEM and DISCONTIGMEM
18243diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18244index 9fb2f2b..b04b4bf 100644
18245--- a/arch/x86/include/asm/pgtable_32_types.h
18246+++ b/arch/x86/include/asm/pgtable_32_types.h
18247@@ -8,7 +8,7 @@
18248 */
18249 #ifdef CONFIG_X86_PAE
18250 # include <asm/pgtable-3level_types.h>
18251-# define PMD_SIZE (1UL << PMD_SHIFT)
18252+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18253 # define PMD_MASK (~(PMD_SIZE - 1))
18254 #else
18255 # include <asm/pgtable-2level_types.h>
18256@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18257 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18258 #endif
18259
18260+#ifdef CONFIG_PAX_KERNEXEC
18261+#ifndef __ASSEMBLY__
18262+extern unsigned char MODULES_EXEC_VADDR[];
18263+extern unsigned char MODULES_EXEC_END[];
18264+#endif
18265+#include <asm/boot.h>
18266+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18267+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18268+#else
18269+#define ktla_ktva(addr) (addr)
18270+#define ktva_ktla(addr) (addr)
18271+#endif
18272+
18273 #define MODULES_VADDR VMALLOC_START
18274 #define MODULES_END VMALLOC_END
18275 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18276diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18277index 2ee7811..55aca24 100644
18278--- a/arch/x86/include/asm/pgtable_64.h
18279+++ b/arch/x86/include/asm/pgtable_64.h
18280@@ -16,11 +16,16 @@
18281
18282 extern pud_t level3_kernel_pgt[512];
18283 extern pud_t level3_ident_pgt[512];
18284+extern pud_t level3_vmalloc_start_pgt[512];
18285+extern pud_t level3_vmalloc_end_pgt[512];
18286+extern pud_t level3_vmemmap_pgt[512];
18287+extern pud_t level2_vmemmap_pgt[512];
18288 extern pmd_t level2_kernel_pgt[512];
18289 extern pmd_t level2_fixmap_pgt[512];
18290-extern pmd_t level2_ident_pgt[512];
18291-extern pte_t level1_fixmap_pgt[512];
18292-extern pgd_t init_level4_pgt[];
18293+extern pmd_t level2_ident_pgt[2][512];
18294+extern pte_t level1_fixmap_pgt[3][512];
18295+extern pte_t level1_vsyscall_pgt[512];
18296+extern pgd_t init_level4_pgt[512];
18297
18298 #define swapper_pg_dir init_level4_pgt
18299
18300@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18301
18302 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18303 {
18304+ pax_open_kernel();
18305 *pmdp = pmd;
18306+ pax_close_kernel();
18307 }
18308
18309 static inline void native_pmd_clear(pmd_t *pmd)
18310@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18311
18312 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18313 {
18314+ pax_open_kernel();
18315 *pudp = pud;
18316+ pax_close_kernel();
18317 }
18318
18319 static inline void native_pud_clear(pud_t *pud)
18320@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18321
18322 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18323 {
18324+ pax_open_kernel();
18325+ *pgdp = pgd;
18326+ pax_close_kernel();
18327+}
18328+
18329+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18330+{
18331 *pgdp = pgd;
18332 }
18333
18334diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18335index 602b602..acb53ed 100644
18336--- a/arch/x86/include/asm/pgtable_64_types.h
18337+++ b/arch/x86/include/asm/pgtable_64_types.h
18338@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18339 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18340 #define MODULES_END _AC(0xffffffffff000000, UL)
18341 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18342+#define MODULES_EXEC_VADDR MODULES_VADDR
18343+#define MODULES_EXEC_END MODULES_END
18344 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18345 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18346 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18347 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18348
18349+#define ktla_ktva(addr) (addr)
18350+#define ktva_ktla(addr) (addr)
18351+
18352 #define EARLY_DYNAMIC_PAGE_TABLES 64
18353
18354 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18355diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18356index 8c7c108..1c1b77f 100644
18357--- a/arch/x86/include/asm/pgtable_types.h
18358+++ b/arch/x86/include/asm/pgtable_types.h
18359@@ -85,8 +85,10 @@
18360
18361 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18362 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18363-#else
18364+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18365 #define _PAGE_NX (_AT(pteval_t, 0))
18366+#else
18367+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18368 #endif
18369
18370 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18371@@ -141,6 +143,9 @@ enum page_cache_mode {
18372 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18373 _PAGE_ACCESSED)
18374
18375+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18376+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18377+
18378 #define __PAGE_KERNEL_EXEC \
18379 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18380 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18381@@ -148,7 +153,7 @@ enum page_cache_mode {
18382 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18383 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18384 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18385-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18386+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18387 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18388 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18389 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18390@@ -194,7 +199,7 @@ enum page_cache_mode {
18391 #ifdef CONFIG_X86_64
18392 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18393 #else
18394-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18395+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18396 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18397 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18398 #endif
18399@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18400 {
18401 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18402 }
18403+#endif
18404
18405+#if PAGETABLE_LEVELS == 3
18406+#include <asm-generic/pgtable-nopud.h>
18407+#endif
18408+
18409+#if PAGETABLE_LEVELS == 2
18410+#include <asm-generic/pgtable-nopmd.h>
18411+#endif
18412+
18413+#ifndef __ASSEMBLY__
18414 #if PAGETABLE_LEVELS > 3
18415 typedef struct { pudval_t pud; } pud_t;
18416
18417@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18418 return pud.pud;
18419 }
18420 #else
18421-#include <asm-generic/pgtable-nopud.h>
18422-
18423 static inline pudval_t native_pud_val(pud_t pud)
18424 {
18425 return native_pgd_val(pud.pgd);
18426@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18427 return pmd.pmd;
18428 }
18429 #else
18430-#include <asm-generic/pgtable-nopmd.h>
18431-
18432 static inline pmdval_t native_pmd_val(pmd_t pmd)
18433 {
18434 return native_pgd_val(pmd.pud.pgd);
18435@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18436
18437 extern pteval_t __supported_pte_mask;
18438 extern void set_nx(void);
18439-extern int nx_enabled;
18440
18441 #define pgprot_writecombine pgprot_writecombine
18442 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18443diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18444index 8f327184..368fb29 100644
18445--- a/arch/x86/include/asm/preempt.h
18446+++ b/arch/x86/include/asm/preempt.h
18447@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18448 */
18449 static __always_inline bool __preempt_count_dec_and_test(void)
18450 {
18451- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18452+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18453 }
18454
18455 /*
18456diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18457index ec1c935..5cc6023 100644
18458--- a/arch/x86/include/asm/processor.h
18459+++ b/arch/x86/include/asm/processor.h
18460@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18461 /* Index into per_cpu list: */
18462 u16 cpu_index;
18463 u32 microcode;
18464-};
18465+} __randomize_layout;
18466
18467 #define X86_VENDOR_INTEL 0
18468 #define X86_VENDOR_CYRIX 1
18469@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18470 : "memory");
18471 }
18472
18473+/* invpcid (%rdx),%rax */
18474+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18475+
18476+#define INVPCID_SINGLE_ADDRESS 0UL
18477+#define INVPCID_SINGLE_CONTEXT 1UL
18478+#define INVPCID_ALL_GLOBAL 2UL
18479+#define INVPCID_ALL_NONGLOBAL 3UL
18480+
18481+#define PCID_KERNEL 0UL
18482+#define PCID_USER 1UL
18483+#define PCID_NOFLUSH (1UL << 63)
18484+
18485 static inline void load_cr3(pgd_t *pgdir)
18486 {
18487- write_cr3(__pa(pgdir));
18488+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18489 }
18490
18491 #ifdef CONFIG_X86_32
18492@@ -282,7 +294,7 @@ struct tss_struct {
18493
18494 } ____cacheline_aligned;
18495
18496-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18497+extern struct tss_struct init_tss[NR_CPUS];
18498
18499 /*
18500 * Save the original ist values for checking stack pointers during debugging
18501@@ -479,6 +491,7 @@ struct thread_struct {
18502 unsigned short ds;
18503 unsigned short fsindex;
18504 unsigned short gsindex;
18505+ unsigned short ss;
18506 #endif
18507 #ifdef CONFIG_X86_32
18508 unsigned long ip;
18509@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18510 */
18511 #define TASK_SIZE PAGE_OFFSET
18512 #define TASK_SIZE_MAX TASK_SIZE
18513+
18514+#ifdef CONFIG_PAX_SEGMEXEC
18515+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18516+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18517+#else
18518 #define STACK_TOP TASK_SIZE
18519-#define STACK_TOP_MAX STACK_TOP
18520+#endif
18521+
18522+#define STACK_TOP_MAX TASK_SIZE
18523
18524 #define INIT_THREAD { \
18525- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18526+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18527 .vm86_info = NULL, \
18528 .sysenter_cs = __KERNEL_CS, \
18529 .io_bitmap_ptr = NULL, \
18530@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18531 */
18532 #define INIT_TSS { \
18533 .x86_tss = { \
18534- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18535+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18536 .ss0 = __KERNEL_DS, \
18537 .ss1 = __KERNEL_CS, \
18538 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18539@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18540 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18541
18542 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18543-#define KSTK_TOP(info) \
18544-({ \
18545- unsigned long *__ptr = (unsigned long *)(info); \
18546- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18547-})
18548+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18549
18550 /*
18551 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18552@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18553 #define task_pt_regs(task) \
18554 ({ \
18555 struct pt_regs *__regs__; \
18556- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18557+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18558 __regs__ - 1; \
18559 })
18560
18561@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18562 * particular problem by preventing anything from being mapped
18563 * at the maximum canonical address.
18564 */
18565-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18566+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18567
18568 /* This decides where the kernel will search for a free chunk of vm
18569 * space during mmap's.
18570 */
18571 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18572- 0xc0000000 : 0xFFFFe000)
18573+ 0xc0000000 : 0xFFFFf000)
18574
18575 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18576 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18577@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18578 #define STACK_TOP_MAX TASK_SIZE_MAX
18579
18580 #define INIT_THREAD { \
18581- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18582+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18583 }
18584
18585 #define INIT_TSS { \
18586- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18587+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18588 }
18589
18590 /*
18591@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18592 */
18593 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18594
18595+#ifdef CONFIG_PAX_SEGMEXEC
18596+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18597+#endif
18598+
18599 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18600
18601 /* Get/set a process' ability to use the timestamp counter instruction */
18602@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18603 return 0;
18604 }
18605
18606-extern unsigned long arch_align_stack(unsigned long sp);
18607+#define arch_align_stack(x) ((x) & ~0xfUL)
18608 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18609
18610 void default_idle(void);
18611@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18612 #define xen_set_default_idle 0
18613 #endif
18614
18615-void stop_this_cpu(void *dummy);
18616+void stop_this_cpu(void *dummy) __noreturn;
18617 void df_debug(struct pt_regs *regs, long error_code);
18618 #endif /* _ASM_X86_PROCESSOR_H */
18619diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18620index 86fc2bb..bd5049a 100644
18621--- a/arch/x86/include/asm/ptrace.h
18622+++ b/arch/x86/include/asm/ptrace.h
18623@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18624 }
18625
18626 /*
18627- * user_mode_vm(regs) determines whether a register set came from user mode.
18628+ * user_mode(regs) determines whether a register set came from user mode.
18629 * This is true if V8086 mode was enabled OR if the register set was from
18630 * protected mode with RPL-3 CS value. This tricky test checks that with
18631 * one comparison. Many places in the kernel can bypass this full check
18632- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18633+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18634+ * be used.
18635 */
18636-static inline int user_mode(struct pt_regs *regs)
18637+static inline int user_mode_novm(struct pt_regs *regs)
18638 {
18639 #ifdef CONFIG_X86_32
18640 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18641 #else
18642- return !!(regs->cs & 3);
18643+ return !!(regs->cs & SEGMENT_RPL_MASK);
18644 #endif
18645 }
18646
18647-static inline int user_mode_vm(struct pt_regs *regs)
18648+static inline int user_mode(struct pt_regs *regs)
18649 {
18650 #ifdef CONFIG_X86_32
18651 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18652 USER_RPL;
18653 #else
18654- return user_mode(regs);
18655+ return user_mode_novm(regs);
18656 #endif
18657 }
18658
18659@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18660 #ifdef CONFIG_X86_64
18661 static inline bool user_64bit_mode(struct pt_regs *regs)
18662 {
18663+ unsigned long cs = regs->cs & 0xffff;
18664 #ifndef CONFIG_PARAVIRT
18665 /*
18666 * On non-paravirt systems, this is the only long mode CPL 3
18667 * selector. We do not allow long mode selectors in the LDT.
18668 */
18669- return regs->cs == __USER_CS;
18670+ return cs == __USER_CS;
18671 #else
18672 /* Headers are too twisted for this to go in paravirt.h. */
18673- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18674+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18675 #endif
18676 }
18677
18678@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18679 * Traps from the kernel do not save sp and ss.
18680 * Use the helper function to retrieve sp.
18681 */
18682- if (offset == offsetof(struct pt_regs, sp) &&
18683- regs->cs == __KERNEL_CS)
18684- return kernel_stack_pointer(regs);
18685+ if (offset == offsetof(struct pt_regs, sp)) {
18686+ unsigned long cs = regs->cs & 0xffff;
18687+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18688+ return kernel_stack_pointer(regs);
18689+ }
18690 #endif
18691 return *(unsigned long *)((unsigned long)regs + offset);
18692 }
18693diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18694index ae0e241..e80b10b 100644
18695--- a/arch/x86/include/asm/qrwlock.h
18696+++ b/arch/x86/include/asm/qrwlock.h
18697@@ -7,8 +7,8 @@
18698 #define queue_write_unlock queue_write_unlock
18699 static inline void queue_write_unlock(struct qrwlock *lock)
18700 {
18701- barrier();
18702- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18703+ barrier();
18704+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18705 }
18706 #endif
18707
18708diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18709index 9c6b890..5305f53 100644
18710--- a/arch/x86/include/asm/realmode.h
18711+++ b/arch/x86/include/asm/realmode.h
18712@@ -22,16 +22,14 @@ struct real_mode_header {
18713 #endif
18714 /* APM/BIOS reboot */
18715 u32 machine_real_restart_asm;
18716-#ifdef CONFIG_X86_64
18717 u32 machine_real_restart_seg;
18718-#endif
18719 };
18720
18721 /* This must match data at trampoline_32/64.S */
18722 struct trampoline_header {
18723 #ifdef CONFIG_X86_32
18724 u32 start;
18725- u16 gdt_pad;
18726+ u16 boot_cs;
18727 u16 gdt_limit;
18728 u32 gdt_base;
18729 #else
18730diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18731index a82c4f1..ac45053 100644
18732--- a/arch/x86/include/asm/reboot.h
18733+++ b/arch/x86/include/asm/reboot.h
18734@@ -6,13 +6,13 @@
18735 struct pt_regs;
18736
18737 struct machine_ops {
18738- void (*restart)(char *cmd);
18739- void (*halt)(void);
18740- void (*power_off)(void);
18741+ void (* __noreturn restart)(char *cmd);
18742+ void (* __noreturn halt)(void);
18743+ void (* __noreturn power_off)(void);
18744 void (*shutdown)(void);
18745 void (*crash_shutdown)(struct pt_regs *);
18746- void (*emergency_restart)(void);
18747-};
18748+ void (* __noreturn emergency_restart)(void);
18749+} __no_const;
18750
18751 extern struct machine_ops machine_ops;
18752
18753diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18754index 8f7866a..e442f20 100644
18755--- a/arch/x86/include/asm/rmwcc.h
18756+++ b/arch/x86/include/asm/rmwcc.h
18757@@ -3,7 +3,34 @@
18758
18759 #ifdef CC_HAVE_ASM_GOTO
18760
18761-#define __GEN_RMWcc(fullop, var, cc, ...) \
18762+#ifdef CONFIG_PAX_REFCOUNT
18763+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18764+do { \
18765+ asm_volatile_goto (fullop \
18766+ ";jno 0f\n" \
18767+ fullantiop \
18768+ ";int $4\n0:\n" \
18769+ _ASM_EXTABLE(0b, 0b) \
18770+ ";j" cc " %l[cc_label]" \
18771+ : : "m" (var), ## __VA_ARGS__ \
18772+ : "memory" : cc_label); \
18773+ return 0; \
18774+cc_label: \
18775+ return 1; \
18776+} while (0)
18777+#else
18778+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18779+do { \
18780+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18781+ : : "m" (var), ## __VA_ARGS__ \
18782+ : "memory" : cc_label); \
18783+ return 0; \
18784+cc_label: \
18785+ return 1; \
18786+} while (0)
18787+#endif
18788+
18789+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18790 do { \
18791 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18792 : : "m" (var), ## __VA_ARGS__ \
18793@@ -13,15 +40,46 @@ cc_label: \
18794 return 1; \
18795 } while (0)
18796
18797-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18798- __GEN_RMWcc(op " " arg0, var, cc)
18799+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18800+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18801
18802-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18803- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18804+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18805+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18806+
18807+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18808+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18809+
18810+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18811+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18812
18813 #else /* !CC_HAVE_ASM_GOTO */
18814
18815-#define __GEN_RMWcc(fullop, var, cc, ...) \
18816+#ifdef CONFIG_PAX_REFCOUNT
18817+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18818+do { \
18819+ char c; \
18820+ asm volatile (fullop \
18821+ ";jno 0f\n" \
18822+ fullantiop \
18823+ ";int $4\n0:\n" \
18824+ _ASM_EXTABLE(0b, 0b) \
18825+ "; set" cc " %1" \
18826+ : "+m" (var), "=qm" (c) \
18827+ : __VA_ARGS__ : "memory"); \
18828+ return c != 0; \
18829+} while (0)
18830+#else
18831+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18832+do { \
18833+ char c; \
18834+ asm volatile (fullop "; set" cc " %1" \
18835+ : "+m" (var), "=qm" (c) \
18836+ : __VA_ARGS__ : "memory"); \
18837+ return c != 0; \
18838+} while (0)
18839+#endif
18840+
18841+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18842 do { \
18843 char c; \
18844 asm volatile (fullop "; set" cc " %1" \
18845@@ -30,11 +88,17 @@ do { \
18846 return c != 0; \
18847 } while (0)
18848
18849-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18850- __GEN_RMWcc(op " " arg0, var, cc)
18851+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18852+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18853+
18854+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18855+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18856+
18857+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18858+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18859
18860-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18861- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18862+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18863+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18864
18865 #endif /* CC_HAVE_ASM_GOTO */
18866
18867diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18868index cad82c9..2e5c5c1 100644
18869--- a/arch/x86/include/asm/rwsem.h
18870+++ b/arch/x86/include/asm/rwsem.h
18871@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18872 {
18873 asm volatile("# beginning down_read\n\t"
18874 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 /* adds 0x00000001 */
18884 " jns 1f\n"
18885 " call call_rwsem_down_read_failed\n"
18886@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18887 "1:\n\t"
18888 " mov %1,%2\n\t"
18889 " add %3,%2\n\t"
18890+
18891+#ifdef CONFIG_PAX_REFCOUNT
18892+ "jno 0f\n"
18893+ "sub %3,%2\n"
18894+ "int $4\n0:\n"
18895+ _ASM_EXTABLE(0b, 0b)
18896+#endif
18897+
18898 " jle 2f\n\t"
18899 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18900 " jnz 1b\n\t"
18901@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18902 long tmp;
18903 asm volatile("# beginning down_write\n\t"
18904 LOCK_PREFIX " xadd %1,(%2)\n\t"
18905+
18906+#ifdef CONFIG_PAX_REFCOUNT
18907+ "jno 0f\n"
18908+ "mov %1,(%2)\n"
18909+ "int $4\n0:\n"
18910+ _ASM_EXTABLE(0b, 0b)
18911+#endif
18912+
18913 /* adds 0xffff0001, returns the old value */
18914 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18915 /* was the active mask 0 before? */
18916@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18917 long tmp;
18918 asm volatile("# beginning __up_read\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 1, returns the old value */
18929 " jns 1f\n\t"
18930 " call call_rwsem_wake\n" /* expects old value in %edx */
18931@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18932 long tmp;
18933 asm volatile("# beginning __up_write\n\t"
18934 LOCK_PREFIX " xadd %1,(%2)\n\t"
18935+
18936+#ifdef CONFIG_PAX_REFCOUNT
18937+ "jno 0f\n"
18938+ "mov %1,(%2)\n"
18939+ "int $4\n0:\n"
18940+ _ASM_EXTABLE(0b, 0b)
18941+#endif
18942+
18943 /* subtracts 0xffff0001, returns the old value */
18944 " jns 1f\n\t"
18945 " call call_rwsem_wake\n" /* expects old value in %edx */
18946@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18947 {
18948 asm volatile("# beginning __downgrade_write\n\t"
18949 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18950+
18951+#ifdef CONFIG_PAX_REFCOUNT
18952+ "jno 0f\n"
18953+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18954+ "int $4\n0:\n"
18955+ _ASM_EXTABLE(0b, 0b)
18956+#endif
18957+
18958 /*
18959 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18960 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18961@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18962 */
18963 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18964 {
18965- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18966+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18967+
18968+#ifdef CONFIG_PAX_REFCOUNT
18969+ "jno 0f\n"
18970+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18971+ "int $4\n0:\n"
18972+ _ASM_EXTABLE(0b, 0b)
18973+#endif
18974+
18975 : "+m" (sem->count)
18976 : "er" (delta));
18977 }
18978@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18979 */
18980 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18981 {
18982- return delta + xadd(&sem->count, delta);
18983+ return delta + xadd_check_overflow(&sem->count, delta);
18984 }
18985
18986 #endif /* __KERNEL__ */
18987diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18988index e657b7b..81fefb444 100644
18989--- a/arch/x86/include/asm/segment.h
18990+++ b/arch/x86/include/asm/segment.h
18991@@ -73,10 +73,15 @@
18992 * 26 - ESPFIX small SS
18993 * 27 - per-cpu [ offset to per-cpu data area ]
18994 * 28 - stack_canary-20 [ for stack protector ]
18995- * 29 - unused
18996- * 30 - unused
18997+ * 29 - PCI BIOS CS
18998+ * 30 - PCI BIOS DS
18999 * 31 - TSS for double fault handler
19000 */
19001+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19002+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19003+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19004+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19005+
19006 #define GDT_ENTRY_TLS_MIN 6
19007 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19008
19009@@ -88,6 +93,8 @@
19010
19011 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19012
19013+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19014+
19015 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19016
19017 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19018@@ -113,6 +120,12 @@
19019 #define __KERNEL_STACK_CANARY 0
19020 #endif
19021
19022+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19023+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19024+
19025+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19026+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19027+
19028 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19029
19030 /*
19031@@ -140,7 +153,7 @@
19032 */
19033
19034 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19035-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19036+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19037
19038
19039 #else
19040@@ -164,6 +177,8 @@
19041 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19042 #define __USER32_DS __USER_DS
19043
19044+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19045+
19046 #define GDT_ENTRY_TSS 8 /* needs two entries */
19047 #define GDT_ENTRY_LDT 10 /* needs two entries */
19048 #define GDT_ENTRY_TLS_MIN 12
19049@@ -172,6 +187,8 @@
19050 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19051 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19052
19053+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19054+
19055 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19056 #define FS_TLS 0
19057 #define GS_TLS 1
19058@@ -179,12 +196,14 @@
19059 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19060 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19061
19062-#define GDT_ENTRIES 16
19063+#define GDT_ENTRIES 17
19064
19065 #endif
19066
19067 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19068+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19069 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19070+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19071 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19072 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19073 #ifndef CONFIG_PARAVIRT
19074@@ -267,7 +286,7 @@ static inline unsigned long get_limit(unsigned long segment)
19075 {
19076 unsigned long __limit;
19077 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19078- return __limit + 1;
19079+ return __limit;
19080 }
19081
19082 #endif /* !__ASSEMBLY__ */
19083diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19084index 8d3120f..352b440 100644
19085--- a/arch/x86/include/asm/smap.h
19086+++ b/arch/x86/include/asm/smap.h
19087@@ -25,11 +25,40 @@
19088
19089 #include <asm/alternative-asm.h>
19090
19091+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19092+#define ASM_PAX_OPEN_USERLAND \
19093+ 661: jmp 663f; \
19094+ .pushsection .altinstr_replacement, "a" ; \
19095+ 662: pushq %rax; nop; \
19096+ .popsection ; \
19097+ .pushsection .altinstructions, "a" ; \
19098+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19099+ .popsection ; \
19100+ call __pax_open_userland; \
19101+ popq %rax; \
19102+ 663:
19103+
19104+#define ASM_PAX_CLOSE_USERLAND \
19105+ 661: jmp 663f; \
19106+ .pushsection .altinstr_replacement, "a" ; \
19107+ 662: pushq %rax; nop; \
19108+ .popsection; \
19109+ .pushsection .altinstructions, "a" ; \
19110+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19111+ .popsection; \
19112+ call __pax_close_userland; \
19113+ popq %rax; \
19114+ 663:
19115+#else
19116+#define ASM_PAX_OPEN_USERLAND
19117+#define ASM_PAX_CLOSE_USERLAND
19118+#endif
19119+
19120 #ifdef CONFIG_X86_SMAP
19121
19122 #define ASM_CLAC \
19123 661: ASM_NOP3 ; \
19124- .pushsection .altinstr_replacement, "ax" ; \
19125+ .pushsection .altinstr_replacement, "a" ; \
19126 662: __ASM_CLAC ; \
19127 .popsection ; \
19128 .pushsection .altinstructions, "a" ; \
19129@@ -38,7 +67,7 @@
19130
19131 #define ASM_STAC \
19132 661: ASM_NOP3 ; \
19133- .pushsection .altinstr_replacement, "ax" ; \
19134+ .pushsection .altinstr_replacement, "a" ; \
19135 662: __ASM_STAC ; \
19136 .popsection ; \
19137 .pushsection .altinstructions, "a" ; \
19138@@ -56,6 +85,37 @@
19139
19140 #include <asm/alternative.h>
19141
19142+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19143+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19144+
19145+extern void __pax_open_userland(void);
19146+static __always_inline unsigned long pax_open_userland(void)
19147+{
19148+
19149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19150+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19151+ :
19152+ : [open] "i" (__pax_open_userland)
19153+ : "memory", "rax");
19154+#endif
19155+
19156+ return 0;
19157+}
19158+
19159+extern void __pax_close_userland(void);
19160+static __always_inline unsigned long pax_close_userland(void)
19161+{
19162+
19163+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19164+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19165+ :
19166+ : [close] "i" (__pax_close_userland)
19167+ : "memory", "rax");
19168+#endif
19169+
19170+ return 0;
19171+}
19172+
19173 #ifdef CONFIG_X86_SMAP
19174
19175 static __always_inline void clac(void)
19176diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19177index 8cd1cc3..827e09e 100644
19178--- a/arch/x86/include/asm/smp.h
19179+++ b/arch/x86/include/asm/smp.h
19180@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19181 /* cpus sharing the last level cache: */
19182 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19183 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19184-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19185+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19186
19187 static inline struct cpumask *cpu_sibling_mask(int cpu)
19188 {
19189@@ -78,7 +78,7 @@ struct smp_ops {
19190
19191 void (*send_call_func_ipi)(const struct cpumask *mask);
19192 void (*send_call_func_single_ipi)(int cpu);
19193-};
19194+} __no_const;
19195
19196 /* Globals due to paravirt */
19197 extern void set_cpu_sibling_map(int cpu);
19198@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19199 extern int safe_smp_processor_id(void);
19200
19201 #elif defined(CONFIG_X86_64_SMP)
19202-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19203-
19204-#define stack_smp_processor_id() \
19205-({ \
19206- struct thread_info *ti; \
19207- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19208- ti->cpu; \
19209-})
19210+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19211+#define stack_smp_processor_id() raw_smp_processor_id()
19212 #define safe_smp_processor_id() smp_processor_id()
19213
19214 #endif
19215diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19216index 6a99859..03cb807 100644
19217--- a/arch/x86/include/asm/stackprotector.h
19218+++ b/arch/x86/include/asm/stackprotector.h
19219@@ -47,7 +47,7 @@
19220 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19221 */
19222 #define GDT_STACK_CANARY_INIT \
19223- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19224+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19225
19226 /*
19227 * Initialize the stackprotector canary value.
19228@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19229
19230 static inline void load_stack_canary_segment(void)
19231 {
19232-#ifdef CONFIG_X86_32
19233+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19234 asm volatile ("mov %0, %%gs" : : "r" (0));
19235 #endif
19236 }
19237diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19238index 70bbe39..4ae2bd4 100644
19239--- a/arch/x86/include/asm/stacktrace.h
19240+++ b/arch/x86/include/asm/stacktrace.h
19241@@ -11,28 +11,20 @@
19242
19243 extern int kstack_depth_to_print;
19244
19245-struct thread_info;
19246+struct task_struct;
19247 struct stacktrace_ops;
19248
19249-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19250- unsigned long *stack,
19251- unsigned long bp,
19252- const struct stacktrace_ops *ops,
19253- void *data,
19254- unsigned long *end,
19255- int *graph);
19256+typedef unsigned long walk_stack_t(struct task_struct *task,
19257+ void *stack_start,
19258+ unsigned long *stack,
19259+ unsigned long bp,
19260+ const struct stacktrace_ops *ops,
19261+ void *data,
19262+ unsigned long *end,
19263+ int *graph);
19264
19265-extern unsigned long
19266-print_context_stack(struct thread_info *tinfo,
19267- unsigned long *stack, unsigned long bp,
19268- const struct stacktrace_ops *ops, void *data,
19269- unsigned long *end, int *graph);
19270-
19271-extern unsigned long
19272-print_context_stack_bp(struct thread_info *tinfo,
19273- unsigned long *stack, unsigned long bp,
19274- const struct stacktrace_ops *ops, void *data,
19275- unsigned long *end, int *graph);
19276+extern walk_stack_t print_context_stack;
19277+extern walk_stack_t print_context_stack_bp;
19278
19279 /* Generic stack tracer with callbacks */
19280
19281@@ -40,7 +32,7 @@ struct stacktrace_ops {
19282 void (*address)(void *data, unsigned long address, int reliable);
19283 /* On negative return stop dumping */
19284 int (*stack)(void *data, char *name);
19285- walk_stack_t walk_stack;
19286+ walk_stack_t *walk_stack;
19287 };
19288
19289 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19290diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19291index 751bf4b..a1278b5 100644
19292--- a/arch/x86/include/asm/switch_to.h
19293+++ b/arch/x86/include/asm/switch_to.h
19294@@ -112,7 +112,7 @@ do { \
19295 "call __switch_to\n\t" \
19296 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19297 __switch_canary \
19298- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19299+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19300 "movq %%rax,%%rdi\n\t" \
19301 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19302 "jnz ret_from_fork\n\t" \
19303@@ -123,7 +123,7 @@ do { \
19304 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19305 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19306 [_tif_fork] "i" (_TIF_FORK), \
19307- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19308+ [thread_info] "m" (current_tinfo), \
19309 [current_task] "m" (current_task) \
19310 __switch_canary_iparam \
19311 : "memory", "cc" __EXTRA_CLOBBER)
19312diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19313index 1d4e4f2..506db18 100644
19314--- a/arch/x86/include/asm/thread_info.h
19315+++ b/arch/x86/include/asm/thread_info.h
19316@@ -24,7 +24,6 @@ struct exec_domain;
19317 #include <linux/atomic.h>
19318
19319 struct thread_info {
19320- struct task_struct *task; /* main task structure */
19321 struct exec_domain *exec_domain; /* execution domain */
19322 __u32 flags; /* low level flags */
19323 __u32 status; /* thread synchronous flags */
19324@@ -32,13 +31,13 @@ struct thread_info {
19325 int saved_preempt_count;
19326 mm_segment_t addr_limit;
19327 void __user *sysenter_return;
19328+ unsigned long lowest_stack;
19329 unsigned int sig_on_uaccess_error:1;
19330 unsigned int uaccess_err:1; /* uaccess failed */
19331 };
19332
19333-#define INIT_THREAD_INFO(tsk) \
19334+#define INIT_THREAD_INFO \
19335 { \
19336- .task = &tsk, \
19337 .exec_domain = &default_exec_domain, \
19338 .flags = 0, \
19339 .cpu = 0, \
19340@@ -46,7 +45,7 @@ struct thread_info {
19341 .addr_limit = KERNEL_DS, \
19342 }
19343
19344-#define init_thread_info (init_thread_union.thread_info)
19345+#define init_thread_info (init_thread_union.stack)
19346 #define init_stack (init_thread_union.stack)
19347
19348 #else /* !__ASSEMBLY__ */
19349@@ -86,6 +85,7 @@ struct thread_info {
19350 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19351 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19352 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19353+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19354
19355 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19356 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19357@@ -109,17 +109,18 @@ struct thread_info {
19358 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19359 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19360 #define _TIF_X32 (1 << TIF_X32)
19361+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19362
19363 /* work to do in syscall_trace_enter() */
19364 #define _TIF_WORK_SYSCALL_ENTRY \
19365 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19366 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19367- _TIF_NOHZ)
19368+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19369
19370 /* work to do in syscall_trace_leave() */
19371 #define _TIF_WORK_SYSCALL_EXIT \
19372 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19373- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19374+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19375
19376 /* work to do on interrupt/exception return */
19377 #define _TIF_WORK_MASK \
19378@@ -130,7 +131,7 @@ struct thread_info {
19379 /* work to do on any return to user space */
19380 #define _TIF_ALLWORK_MASK \
19381 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19382- _TIF_NOHZ)
19383+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19384
19385 /* Only used for 64 bit */
19386 #define _TIF_DO_NOTIFY_MASK \
19387@@ -145,7 +146,6 @@ struct thread_info {
19388 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19389
19390 #define STACK_WARN (THREAD_SIZE/8)
19391-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19392
19393 /*
19394 * macros/functions for gaining access to the thread information structure
19395@@ -156,12 +156,11 @@ struct thread_info {
19396
19397 DECLARE_PER_CPU(unsigned long, kernel_stack);
19398
19399+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19400+
19401 static inline struct thread_info *current_thread_info(void)
19402 {
19403- struct thread_info *ti;
19404- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19405- KERNEL_STACK_OFFSET - THREAD_SIZE);
19406- return ti;
19407+ return this_cpu_read_stable(current_tinfo);
19408 }
19409
19410 static inline unsigned long current_stack_pointer(void)
19411@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19412
19413 /* how to get the thread information struct from ASM */
19414 #define GET_THREAD_INFO(reg) \
19415- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19416- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19417-
19418-/*
19419- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19420- * a certain register (to be used in assembler memory operands).
19421- */
19422-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19423+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19424
19425 #endif
19426
19427@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19428 extern void arch_task_cache_init(void);
19429 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19430 extern void arch_release_task_struct(struct task_struct *tsk);
19431+
19432+#define __HAVE_THREAD_FUNCTIONS
19433+#define task_thread_info(task) (&(task)->tinfo)
19434+#define task_stack_page(task) ((task)->stack)
19435+#define setup_thread_stack(p, org) do {} while (0)
19436+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19437+
19438 #endif
19439 #endif /* _ASM_X86_THREAD_INFO_H */
19440diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19441index cd79194..e7a9491 100644
19442--- a/arch/x86/include/asm/tlbflush.h
19443+++ b/arch/x86/include/asm/tlbflush.h
19444@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19445
19446 static inline void __native_flush_tlb(void)
19447 {
19448+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19449+ u64 descriptor[2];
19450+
19451+ descriptor[0] = PCID_KERNEL;
19452+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19453+ return;
19454+ }
19455+
19456+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19457+ if (static_cpu_has(X86_FEATURE_PCID)) {
19458+ unsigned int cpu = raw_get_cpu();
19459+
19460+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19461+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19462+ raw_put_cpu_no_resched();
19463+ return;
19464+ }
19465+#endif
19466+
19467 native_write_cr3(native_read_cr3());
19468 }
19469
19470 static inline void __native_flush_tlb_global_irq_disabled(void)
19471 {
19472- unsigned long cr4;
19473+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19474+ u64 descriptor[2];
19475
19476- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19477- /* clear PGE */
19478- native_write_cr4(cr4 & ~X86_CR4_PGE);
19479- /* write old PGE again and flush TLBs */
19480- native_write_cr4(cr4);
19481+ descriptor[0] = PCID_KERNEL;
19482+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19483+ } else {
19484+ unsigned long cr4;
19485+
19486+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19487+ /* clear PGE */
19488+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19489+ /* write old PGE again and flush TLBs */
19490+ native_write_cr4(cr4);
19491+ }
19492 }
19493
19494 static inline void __native_flush_tlb_global(void)
19495@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19496
19497 static inline void __native_flush_tlb_single(unsigned long addr)
19498 {
19499+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19500+ u64 descriptor[2];
19501+
19502+ descriptor[0] = PCID_KERNEL;
19503+ descriptor[1] = addr;
19504+
19505+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19506+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19507+ if (addr < TASK_SIZE_MAX)
19508+ descriptor[1] += pax_user_shadow_base;
19509+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19510+ }
19511+
19512+ descriptor[0] = PCID_USER;
19513+ descriptor[1] = addr;
19514+#endif
19515+
19516+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19517+ return;
19518+ }
19519+
19520+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19521+ if (static_cpu_has(X86_FEATURE_PCID)) {
19522+ unsigned int cpu = raw_get_cpu();
19523+
19524+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19525+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19526+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19527+ raw_put_cpu_no_resched();
19528+
19529+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19530+ addr += pax_user_shadow_base;
19531+ }
19532+#endif
19533+
19534 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19535 }
19536
19537diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19538index ace9dec..3f9e253 100644
19539--- a/arch/x86/include/asm/uaccess.h
19540+++ b/arch/x86/include/asm/uaccess.h
19541@@ -7,6 +7,7 @@
19542 #include <linux/compiler.h>
19543 #include <linux/thread_info.h>
19544 #include <linux/string.h>
19545+#include <linux/spinlock.h>
19546 #include <asm/asm.h>
19547 #include <asm/page.h>
19548 #include <asm/smap.h>
19549@@ -29,7 +30,12 @@
19550
19551 #define get_ds() (KERNEL_DS)
19552 #define get_fs() (current_thread_info()->addr_limit)
19553+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19554+void __set_fs(mm_segment_t x);
19555+void set_fs(mm_segment_t x);
19556+#else
19557 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19558+#endif
19559
19560 #define segment_eq(a, b) ((a).seg == (b).seg)
19561
19562@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19563 * checks that the pointer is in the user space range - after calling
19564 * this function, memory access functions may still return -EFAULT.
19565 */
19566-#define access_ok(type, addr, size) \
19567- likely(!__range_not_ok(addr, size, user_addr_max()))
19568+extern int _cond_resched(void);
19569+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19570+#define access_ok(type, addr, size) \
19571+({ \
19572+ unsigned long __size = size; \
19573+ unsigned long __addr = (unsigned long)addr; \
19574+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19575+ if (__ret_ao && __size) { \
19576+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19577+ unsigned long __end_ao = __addr + __size - 1; \
19578+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19579+ while (__addr_ao <= __end_ao) { \
19580+ char __c_ao; \
19581+ __addr_ao += PAGE_SIZE; \
19582+ if (__size > PAGE_SIZE) \
19583+ _cond_resched(); \
19584+ if (__get_user(__c_ao, (char __user *)__addr)) \
19585+ break; \
19586+ if (type != VERIFY_WRITE) { \
19587+ __addr = __addr_ao; \
19588+ continue; \
19589+ } \
19590+ if (__put_user(__c_ao, (char __user *)__addr)) \
19591+ break; \
19592+ __addr = __addr_ao; \
19593+ } \
19594+ } \
19595+ } \
19596+ __ret_ao; \
19597+})
19598
19599 /*
19600 * The exception table consists of pairs of addresses relative to the
19601@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19602 extern int __get_user_bad(void);
19603
19604 /*
19605- * This is a type: either unsigned long, if the argument fits into
19606- * that type, or otherwise unsigned long long.
19607+ * This is a type: either (un)signed int, if the argument fits into
19608+ * that type, or otherwise (un)signed long long.
19609 */
19610 #define __inttype(x) \
19611-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19612+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19613+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19614+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19615
19616 /**
19617 * get_user: - Get a simple variable from user space.
19618@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19619 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19620 __chk_user_ptr(ptr); \
19621 might_fault(); \
19622+ pax_open_userland(); \
19623 asm volatile("call __get_user_%P3" \
19624 : "=a" (__ret_gu), "=r" (__val_gu) \
19625 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19626 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19627+ pax_close_userland(); \
19628 __ret_gu; \
19629 })
19630
19631@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19632 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19633 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19634
19635-
19636+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19637+#define __copyuser_seg "gs;"
19638+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19639+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19640+#else
19641+#define __copyuser_seg
19642+#define __COPYUSER_SET_ES
19643+#define __COPYUSER_RESTORE_ES
19644+#endif
19645
19646 #ifdef CONFIG_X86_32
19647 #define __put_user_asm_u64(x, addr, err, errret) \
19648 asm volatile(ASM_STAC "\n" \
19649- "1: movl %%eax,0(%2)\n" \
19650- "2: movl %%edx,4(%2)\n" \
19651+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19652+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19653 "3: " ASM_CLAC "\n" \
19654 ".section .fixup,\"ax\"\n" \
19655 "4: movl %3,%0\n" \
19656@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19657
19658 #define __put_user_asm_ex_u64(x, addr) \
19659 asm volatile(ASM_STAC "\n" \
19660- "1: movl %%eax,0(%1)\n" \
19661- "2: movl %%edx,4(%1)\n" \
19662+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19663+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19664 "3: " ASM_CLAC "\n" \
19665 _ASM_EXTABLE_EX(1b, 2b) \
19666 _ASM_EXTABLE_EX(2b, 3b) \
19667@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19668 __typeof__(*(ptr)) __pu_val; \
19669 __chk_user_ptr(ptr); \
19670 might_fault(); \
19671- __pu_val = x; \
19672+ __pu_val = (x); \
19673+ pax_open_userland(); \
19674 switch (sizeof(*(ptr))) { \
19675 case 1: \
19676 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19677@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19678 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19679 break; \
19680 } \
19681+ pax_close_userland(); \
19682 __ret_pu; \
19683 })
19684
19685@@ -355,8 +403,10 @@ do { \
19686 } while (0)
19687
19688 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19689+do { \
19690+ pax_open_userland(); \
19691 asm volatile(ASM_STAC "\n" \
19692- "1: mov"itype" %2,%"rtype"1\n" \
19693+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19694 "2: " ASM_CLAC "\n" \
19695 ".section .fixup,\"ax\"\n" \
19696 "3: mov %3,%0\n" \
19697@@ -364,8 +414,10 @@ do { \
19698 " jmp 2b\n" \
19699 ".previous\n" \
19700 _ASM_EXTABLE(1b, 3b) \
19701- : "=r" (err), ltype(x) \
19702- : "m" (__m(addr)), "i" (errret), "0" (err))
19703+ : "=r" (err), ltype (x) \
19704+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19705+ pax_close_userland(); \
19706+} while (0)
19707
19708 #define __get_user_size_ex(x, ptr, size) \
19709 do { \
19710@@ -389,7 +441,7 @@ do { \
19711 } while (0)
19712
19713 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19714- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19715+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19716 "2:\n" \
19717 _ASM_EXTABLE_EX(1b, 2b) \
19718 : ltype(x) : "m" (__m(addr)))
19719@@ -406,13 +458,24 @@ do { \
19720 int __gu_err; \
19721 unsigned long __gu_val; \
19722 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19723- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19724+ (x) = (__typeof__(*(ptr)))__gu_val; \
19725 __gu_err; \
19726 })
19727
19728 /* FIXME: this hack is definitely wrong -AK */
19729 struct __large_struct { unsigned long buf[100]; };
19730-#define __m(x) (*(struct __large_struct __user *)(x))
19731+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19732+#define ____m(x) \
19733+({ \
19734+ unsigned long ____x = (unsigned long)(x); \
19735+ if (____x < pax_user_shadow_base) \
19736+ ____x += pax_user_shadow_base; \
19737+ (typeof(x))____x; \
19738+})
19739+#else
19740+#define ____m(x) (x)
19741+#endif
19742+#define __m(x) (*(struct __large_struct __user *)____m(x))
19743
19744 /*
19745 * Tell gcc we read from memory instead of writing: this is because
19746@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19747 * aliasing issues.
19748 */
19749 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19750+do { \
19751+ pax_open_userland(); \
19752 asm volatile(ASM_STAC "\n" \
19753- "1: mov"itype" %"rtype"1,%2\n" \
19754+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19755 "2: " ASM_CLAC "\n" \
19756 ".section .fixup,\"ax\"\n" \
19757 "3: mov %3,%0\n" \
19758@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19759 ".previous\n" \
19760 _ASM_EXTABLE(1b, 3b) \
19761 : "=r"(err) \
19762- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19763+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19764+ pax_close_userland(); \
19765+} while (0)
19766
19767 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19768- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19769+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19770 "2:\n" \
19771 _ASM_EXTABLE_EX(1b, 2b) \
19772 : : ltype(x), "m" (__m(addr)))
19773@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19774 */
19775 #define uaccess_try do { \
19776 current_thread_info()->uaccess_err = 0; \
19777+ pax_open_userland(); \
19778 stac(); \
19779 barrier();
19780
19781 #define uaccess_catch(err) \
19782 clac(); \
19783+ pax_close_userland(); \
19784 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19785 } while (0)
19786
19787@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19788 * On error, the variable @x is set to zero.
19789 */
19790
19791+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19792+#define __get_user(x, ptr) get_user((x), (ptr))
19793+#else
19794 #define __get_user(x, ptr) \
19795 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19796+#endif
19797
19798 /**
19799 * __put_user: - Write a simple value into user space, with less checking.
19800@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19801 * Returns zero on success, or -EFAULT on error.
19802 */
19803
19804+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19805+#define __put_user(x, ptr) put_user((x), (ptr))
19806+#else
19807 #define __put_user(x, ptr) \
19808 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19809+#endif
19810
19811 #define __get_user_unaligned __get_user
19812 #define __put_user_unaligned __put_user
19813@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19814 #define get_user_ex(x, ptr) do { \
19815 unsigned long __gue_val; \
19816 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19817- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19818+ (x) = (__typeof__(*(ptr)))__gue_val; \
19819 } while (0)
19820
19821 #define put_user_try uaccess_try
19822@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19823 extern __must_check long strnlen_user(const char __user *str, long n);
19824
19825 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19826-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19827+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19828
19829 extern void __cmpxchg_wrong_size(void)
19830 __compiletime_error("Bad argument size for cmpxchg");
19831@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19832 __typeof__(ptr) __uval = (uval); \
19833 __typeof__(*(ptr)) __old = (old); \
19834 __typeof__(*(ptr)) __new = (new); \
19835+ pax_open_userland(); \
19836 switch (size) { \
19837 case 1: \
19838 { \
19839 asm volatile("\t" ASM_STAC "\n" \
19840- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19841+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19842 "2:\t" ASM_CLAC "\n" \
19843 "\t.section .fixup, \"ax\"\n" \
19844 "3:\tmov %3, %0\n" \
19845 "\tjmp 2b\n" \
19846 "\t.previous\n" \
19847 _ASM_EXTABLE(1b, 3b) \
19848- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19849+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19850 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19851 : "memory" \
19852 ); \
19853@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19854 case 2: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 4: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19875+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19888 __cmpxchg_wrong_size(); \
19889 \
19890 asm volatile("\t" ASM_STAC "\n" \
19891- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19892+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19905 default: \
19906 __cmpxchg_wrong_size(); \
19907 } \
19908+ pax_close_userland(); \
19909 *__uval = __old; \
19910 __ret; \
19911 })
19912@@ -636,17 +715,6 @@ extern struct movsl_mask {
19913
19914 #define ARCH_HAS_NOCACHE_UACCESS 1
19915
19916-#ifdef CONFIG_X86_32
19917-# include <asm/uaccess_32.h>
19918-#else
19919-# include <asm/uaccess_64.h>
19920-#endif
19921-
19922-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19923- unsigned n);
19924-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19925- unsigned n);
19926-
19927 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19928 # define copy_user_diag __compiletime_error
19929 #else
19930@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19931 extern void copy_user_diag("copy_from_user() buffer size is too small")
19932 copy_from_user_overflow(void);
19933 extern void copy_user_diag("copy_to_user() buffer size is too small")
19934-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19935+copy_to_user_overflow(void);
19936
19937 #undef copy_user_diag
19938
19939@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19940
19941 extern void
19942 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19943-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19944+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19945 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19946
19947 #else
19948@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19949
19950 #endif
19951
19952+#ifdef CONFIG_X86_32
19953+# include <asm/uaccess_32.h>
19954+#else
19955+# include <asm/uaccess_64.h>
19956+#endif
19957+
19958 static inline unsigned long __must_check
19959 copy_from_user(void *to, const void __user *from, unsigned long n)
19960 {
19961- int sz = __compiletime_object_size(to);
19962+ size_t sz = __compiletime_object_size(to);
19963
19964 might_fault();
19965
19966@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19967 * case, and do only runtime checking for non-constant sizes.
19968 */
19969
19970- if (likely(sz < 0 || sz >= n))
19971- n = _copy_from_user(to, from, n);
19972- else if(__builtin_constant_p(n))
19973- copy_from_user_overflow();
19974- else
19975- __copy_from_user_overflow(sz, n);
19976+ if (likely(sz != (size_t)-1 && sz < n)) {
19977+ if(__builtin_constant_p(n))
19978+ copy_from_user_overflow();
19979+ else
19980+ __copy_from_user_overflow(sz, n);
19981+ } else if (access_ok(VERIFY_READ, from, n))
19982+ n = __copy_from_user(to, from, n);
19983+ else if ((long)n > 0)
19984+ memset(to, 0, n);
19985
19986 return n;
19987 }
19988@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19989 static inline unsigned long __must_check
19990 copy_to_user(void __user *to, const void *from, unsigned long n)
19991 {
19992- int sz = __compiletime_object_size(from);
19993+ size_t sz = __compiletime_object_size(from);
19994
19995 might_fault();
19996
19997 /* See the comment in copy_from_user() above. */
19998- if (likely(sz < 0 || sz >= n))
19999- n = _copy_to_user(to, from, n);
20000- else if(__builtin_constant_p(n))
20001- copy_to_user_overflow();
20002- else
20003- __copy_to_user_overflow(sz, n);
20004+ if (likely(sz != (size_t)-1 && sz < n)) {
20005+ if(__builtin_constant_p(n))
20006+ copy_to_user_overflow();
20007+ else
20008+ __copy_to_user_overflow(sz, n);
20009+ } else if (access_ok(VERIFY_WRITE, to, n))
20010+ n = __copy_to_user(to, from, n);
20011
20012 return n;
20013 }
20014diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20015index 3c03a5d..edb68ae 100644
20016--- a/arch/x86/include/asm/uaccess_32.h
20017+++ b/arch/x86/include/asm/uaccess_32.h
20018@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20019 * anything, so this is accurate.
20020 */
20021
20022-static __always_inline unsigned long __must_check
20023+static __always_inline __size_overflow(3) unsigned long __must_check
20024 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20025 {
20026+ if ((long)n < 0)
20027+ return n;
20028+
20029+ check_object_size(from, n, true);
20030+
20031 if (__builtin_constant_p(n)) {
20032 unsigned long ret;
20033
20034@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20035 __copy_to_user(void __user *to, const void *from, unsigned long n)
20036 {
20037 might_fault();
20038+
20039 return __copy_to_user_inatomic(to, from, n);
20040 }
20041
20042-static __always_inline unsigned long
20043+static __always_inline __size_overflow(3) unsigned long
20044 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20045 {
20046+ if ((long)n < 0)
20047+ return n;
20048+
20049 /* Avoid zeroing the tail if the copy fails..
20050 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20051 * but as the zeroing behaviour is only significant when n is not
20052@@ -137,6 +146,12 @@ static __always_inline unsigned long
20053 __copy_from_user(void *to, const void __user *from, unsigned long n)
20054 {
20055 might_fault();
20056+
20057+ if ((long)n < 0)
20058+ return n;
20059+
20060+ check_object_size(to, n, false);
20061+
20062 if (__builtin_constant_p(n)) {
20063 unsigned long ret;
20064
20065@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20066 const void __user *from, unsigned long n)
20067 {
20068 might_fault();
20069+
20070+ if ((long)n < 0)
20071+ return n;
20072+
20073 if (__builtin_constant_p(n)) {
20074 unsigned long ret;
20075
20076@@ -181,7 +200,10 @@ static __always_inline unsigned long
20077 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20078 unsigned long n)
20079 {
20080- return __copy_from_user_ll_nocache_nozero(to, from, n);
20081+ if ((long)n < 0)
20082+ return n;
20083+
20084+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20085 }
20086
20087 #endif /* _ASM_X86_UACCESS_32_H */
20088diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20089index f2f9b39..2ae1bf8 100644
20090--- a/arch/x86/include/asm/uaccess_64.h
20091+++ b/arch/x86/include/asm/uaccess_64.h
20092@@ -10,6 +10,9 @@
20093 #include <asm/alternative.h>
20094 #include <asm/cpufeature.h>
20095 #include <asm/page.h>
20096+#include <asm/pgtable.h>
20097+
20098+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20099
20100 /*
20101 * Copy To/From Userspace
20102@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20103 __must_check unsigned long
20104 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20105
20106-static __always_inline __must_check unsigned long
20107-copy_user_generic(void *to, const void *from, unsigned len)
20108+static __always_inline __must_check __size_overflow(3) unsigned long
20109+copy_user_generic(void *to, const void *from, unsigned long len)
20110 {
20111 unsigned ret;
20112
20113@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20114 }
20115
20116 __must_check unsigned long
20117-copy_in_user(void __user *to, const void __user *from, unsigned len);
20118+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20119
20120 static __always_inline __must_check
20121-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20122+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20123 {
20124- int ret = 0;
20125+ size_t sz = __compiletime_object_size(dst);
20126+ unsigned ret = 0;
20127+
20128+ if (size > INT_MAX)
20129+ return size;
20130+
20131+ check_object_size(dst, size, false);
20132+
20133+#ifdef CONFIG_PAX_MEMORY_UDEREF
20134+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20135+ return size;
20136+#endif
20137+
20138+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20139+ if(__builtin_constant_p(size))
20140+ copy_from_user_overflow();
20141+ else
20142+ __copy_from_user_overflow(sz, size);
20143+ return size;
20144+ }
20145
20146 if (!__builtin_constant_p(size))
20147- return copy_user_generic(dst, (__force void *)src, size);
20148+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20149 switch (size) {
20150- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20151+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20152 ret, "b", "b", "=q", 1);
20153 return ret;
20154- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20155+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20156 ret, "w", "w", "=r", 2);
20157 return ret;
20158- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20159+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20160 ret, "l", "k", "=r", 4);
20161 return ret;
20162- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20163+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20164 ret, "q", "", "=r", 8);
20165 return ret;
20166 case 10:
20167- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20168+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20169 ret, "q", "", "=r", 10);
20170 if (unlikely(ret))
20171 return ret;
20172 __get_user_asm(*(u16 *)(8 + (char *)dst),
20173- (u16 __user *)(8 + (char __user *)src),
20174+ (const u16 __user *)(8 + (const char __user *)src),
20175 ret, "w", "w", "=r", 2);
20176 return ret;
20177 case 16:
20178- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20179+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20180 ret, "q", "", "=r", 16);
20181 if (unlikely(ret))
20182 return ret;
20183 __get_user_asm(*(u64 *)(8 + (char *)dst),
20184- (u64 __user *)(8 + (char __user *)src),
20185+ (const u64 __user *)(8 + (const char __user *)src),
20186 ret, "q", "", "=r", 8);
20187 return ret;
20188 default:
20189- return copy_user_generic(dst, (__force void *)src, size);
20190+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20191 }
20192 }
20193
20194 static __always_inline __must_check
20195-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20196+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20197 {
20198 might_fault();
20199 return __copy_from_user_nocheck(dst, src, size);
20200 }
20201
20202 static __always_inline __must_check
20203-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20204+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20205 {
20206- int ret = 0;
20207+ size_t sz = __compiletime_object_size(src);
20208+ unsigned ret = 0;
20209+
20210+ if (size > INT_MAX)
20211+ return size;
20212+
20213+ check_object_size(src, size, true);
20214+
20215+#ifdef CONFIG_PAX_MEMORY_UDEREF
20216+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20217+ return size;
20218+#endif
20219+
20220+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20221+ if(__builtin_constant_p(size))
20222+ copy_to_user_overflow();
20223+ else
20224+ __copy_to_user_overflow(sz, size);
20225+ return size;
20226+ }
20227
20228 if (!__builtin_constant_p(size))
20229- return copy_user_generic((__force void *)dst, src, size);
20230+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20231 switch (size) {
20232- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20233+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20234 ret, "b", "b", "iq", 1);
20235 return ret;
20236- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20237+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20238 ret, "w", "w", "ir", 2);
20239 return ret;
20240- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20241+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20242 ret, "l", "k", "ir", 4);
20243 return ret;
20244- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20245+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20246 ret, "q", "", "er", 8);
20247 return ret;
20248 case 10:
20249- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20250+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20251 ret, "q", "", "er", 10);
20252 if (unlikely(ret))
20253 return ret;
20254 asm("":::"memory");
20255- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20256+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20257 ret, "w", "w", "ir", 2);
20258 return ret;
20259 case 16:
20260- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20261+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20262 ret, "q", "", "er", 16);
20263 if (unlikely(ret))
20264 return ret;
20265 asm("":::"memory");
20266- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20267+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20268 ret, "q", "", "er", 8);
20269 return ret;
20270 default:
20271- return copy_user_generic((__force void *)dst, src, size);
20272+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20273 }
20274 }
20275
20276 static __always_inline __must_check
20277-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20278+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20279 {
20280 might_fault();
20281 return __copy_to_user_nocheck(dst, src, size);
20282 }
20283
20284 static __always_inline __must_check
20285-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20286+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20287 {
20288- int ret = 0;
20289+ unsigned ret = 0;
20290
20291 might_fault();
20292+
20293+ if (size > INT_MAX)
20294+ return size;
20295+
20296+#ifdef CONFIG_PAX_MEMORY_UDEREF
20297+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20298+ return size;
20299+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20300+ return size;
20301+#endif
20302+
20303 if (!__builtin_constant_p(size))
20304- return copy_user_generic((__force void *)dst,
20305- (__force void *)src, size);
20306+ return copy_user_generic((__force_kernel void *)____m(dst),
20307+ (__force_kernel const void *)____m(src), size);
20308 switch (size) {
20309 case 1: {
20310 u8 tmp;
20311- __get_user_asm(tmp, (u8 __user *)src,
20312+ __get_user_asm(tmp, (const u8 __user *)src,
20313 ret, "b", "b", "=q", 1);
20314 if (likely(!ret))
20315 __put_user_asm(tmp, (u8 __user *)dst,
20316@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20317 }
20318 case 2: {
20319 u16 tmp;
20320- __get_user_asm(tmp, (u16 __user *)src,
20321+ __get_user_asm(tmp, (const u16 __user *)src,
20322 ret, "w", "w", "=r", 2);
20323 if (likely(!ret))
20324 __put_user_asm(tmp, (u16 __user *)dst,
20325@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20326
20327 case 4: {
20328 u32 tmp;
20329- __get_user_asm(tmp, (u32 __user *)src,
20330+ __get_user_asm(tmp, (const u32 __user *)src,
20331 ret, "l", "k", "=r", 4);
20332 if (likely(!ret))
20333 __put_user_asm(tmp, (u32 __user *)dst,
20334@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20335 }
20336 case 8: {
20337 u64 tmp;
20338- __get_user_asm(tmp, (u64 __user *)src,
20339+ __get_user_asm(tmp, (const u64 __user *)src,
20340 ret, "q", "", "=r", 8);
20341 if (likely(!ret))
20342 __put_user_asm(tmp, (u64 __user *)dst,
20343@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20344 return ret;
20345 }
20346 default:
20347- return copy_user_generic((__force void *)dst,
20348- (__force void *)src, size);
20349+ return copy_user_generic((__force_kernel void *)____m(dst),
20350+ (__force_kernel const void *)____m(src), size);
20351 }
20352 }
20353
20354-static __must_check __always_inline int
20355-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20356+static __must_check __always_inline unsigned long
20357+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20358 {
20359 return __copy_from_user_nocheck(dst, src, size);
20360 }
20361
20362-static __must_check __always_inline int
20363-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20364+static __must_check __always_inline unsigned long
20365+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20366 {
20367 return __copy_to_user_nocheck(dst, src, size);
20368 }
20369
20370-extern long __copy_user_nocache(void *dst, const void __user *src,
20371- unsigned size, int zerorest);
20372+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20373+ unsigned long size, int zerorest);
20374
20375-static inline int
20376-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20377+static inline unsigned long
20378+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20379 {
20380 might_fault();
20381+
20382+ if (size > INT_MAX)
20383+ return size;
20384+
20385+#ifdef CONFIG_PAX_MEMORY_UDEREF
20386+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20387+ return size;
20388+#endif
20389+
20390 return __copy_user_nocache(dst, src, size, 1);
20391 }
20392
20393-static inline int
20394+static inline unsigned long
20395 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20396- unsigned size)
20397+ unsigned long size)
20398 {
20399+ if (size > INT_MAX)
20400+ return size;
20401+
20402+#ifdef CONFIG_PAX_MEMORY_UDEREF
20403+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20404+ return size;
20405+#endif
20406+
20407 return __copy_user_nocache(dst, src, size, 0);
20408 }
20409
20410 unsigned long
20411-copy_user_handle_tail(char *to, char *from, unsigned len);
20412+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20413
20414 #endif /* _ASM_X86_UACCESS_64_H */
20415diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20416index 5b238981..77fdd78 100644
20417--- a/arch/x86/include/asm/word-at-a-time.h
20418+++ b/arch/x86/include/asm/word-at-a-time.h
20419@@ -11,7 +11,7 @@
20420 * and shift, for example.
20421 */
20422 struct word_at_a_time {
20423- const unsigned long one_bits, high_bits;
20424+ unsigned long one_bits, high_bits;
20425 };
20426
20427 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20428diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20429index f58a9c7..dc378042a 100644
20430--- a/arch/x86/include/asm/x86_init.h
20431+++ b/arch/x86/include/asm/x86_init.h
20432@@ -129,7 +129,7 @@ struct x86_init_ops {
20433 struct x86_init_timers timers;
20434 struct x86_init_iommu iommu;
20435 struct x86_init_pci pci;
20436-};
20437+} __no_const;
20438
20439 /**
20440 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20441@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20442 void (*setup_percpu_clockev)(void);
20443 void (*early_percpu_clock_init)(void);
20444 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20445-};
20446+} __no_const;
20447
20448 struct timespec;
20449
20450@@ -168,7 +168,7 @@ struct x86_platform_ops {
20451 void (*save_sched_clock_state)(void);
20452 void (*restore_sched_clock_state)(void);
20453 void (*apic_post_init)(void);
20454-};
20455+} __no_const;
20456
20457 struct pci_dev;
20458 struct msi_msg;
20459@@ -182,7 +182,7 @@ struct x86_msi_ops {
20460 void (*teardown_msi_irqs)(struct pci_dev *dev);
20461 void (*restore_msi_irqs)(struct pci_dev *dev);
20462 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20463-};
20464+} __no_const;
20465
20466 struct IO_APIC_route_entry;
20467 struct io_apic_irq_attr;
20468@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20469 unsigned int destination, int vector,
20470 struct io_apic_irq_attr *attr);
20471 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20472-};
20473+} __no_const;
20474
20475 extern struct x86_init_ops x86_init;
20476 extern struct x86_cpuinit_ops x86_cpuinit;
20477diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20478index 358dcd3..23c0bf1 100644
20479--- a/arch/x86/include/asm/xen/page.h
20480+++ b/arch/x86/include/asm/xen/page.h
20481@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20482 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20483 * cases needing an extended handling.
20484 */
20485-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20486+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20487 {
20488 unsigned long mfn;
20489
20490diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20491index c9a6d68..cb57f42 100644
20492--- a/arch/x86/include/asm/xsave.h
20493+++ b/arch/x86/include/asm/xsave.h
20494@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20495 if (unlikely(err))
20496 return -EFAULT;
20497
20498+ pax_open_userland();
20499 __asm__ __volatile__(ASM_STAC "\n"
20500- "1:"XSAVE"\n"
20501+ "1:"
20502+ __copyuser_seg
20503+ XSAVE"\n"
20504 "2: " ASM_CLAC "\n"
20505 xstate_fault
20506 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20507 : "memory");
20508+ pax_close_userland();
20509 return err;
20510 }
20511
20512@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20513 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20514 {
20515 int err = 0;
20516- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20517+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20518 u32 lmask = mask;
20519 u32 hmask = mask >> 32;
20520
20521+ pax_open_userland();
20522 __asm__ __volatile__(ASM_STAC "\n"
20523- "1:"XRSTOR"\n"
20524+ "1:"
20525+ __copyuser_seg
20526+ XRSTOR"\n"
20527 "2: " ASM_CLAC "\n"
20528 xstate_fault
20529 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20530 : "memory"); /* memory required? */
20531+ pax_close_userland();
20532 return err;
20533 }
20534
20535diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20536index d993e33..8db1b18 100644
20537--- a/arch/x86/include/uapi/asm/e820.h
20538+++ b/arch/x86/include/uapi/asm/e820.h
20539@@ -58,7 +58,7 @@ struct e820map {
20540 #define ISA_START_ADDRESS 0xa0000
20541 #define ISA_END_ADDRESS 0x100000
20542
20543-#define BIOS_BEGIN 0x000a0000
20544+#define BIOS_BEGIN 0x000c0000
20545 #define BIOS_END 0x00100000
20546
20547 #define BIOS_ROM_BASE 0xffe00000
20548diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20549index 7b0a55a..ad115bf 100644
20550--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20551+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20552@@ -49,7 +49,6 @@
20553 #define EFLAGS 144
20554 #define RSP 152
20555 #define SS 160
20556-#define ARGOFFSET R11
20557 #endif /* __ASSEMBLY__ */
20558
20559 /* top of stack page */
20560diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20561index cdb1b70..426434c 100644
20562--- a/arch/x86/kernel/Makefile
20563+++ b/arch/x86/kernel/Makefile
20564@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20565 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20566 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20567 obj-y += probe_roms.o
20568-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20569+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20570 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20571 obj-$(CONFIG_X86_64) += mcount_64.o
20572 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20573diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20574index 803b684..68c64f1 100644
20575--- a/arch/x86/kernel/acpi/boot.c
20576+++ b/arch/x86/kernel/acpi/boot.c
20577@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20578 * If your system is blacklisted here, but you find that acpi=force
20579 * works for you, please contact linux-acpi@vger.kernel.org
20580 */
20581-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20582+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20583 /*
20584 * Boxes that need ACPI disabled
20585 */
20586@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20587 };
20588
20589 /* second table for DMI checks that should run after early-quirks */
20590-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20591+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20592 /*
20593 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20594 * which includes some code which overrides all temperature
20595diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20596index d1daead..acd77e2 100644
20597--- a/arch/x86/kernel/acpi/sleep.c
20598+++ b/arch/x86/kernel/acpi/sleep.c
20599@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20600 #else /* CONFIG_64BIT */
20601 #ifdef CONFIG_SMP
20602 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20603+
20604+ pax_open_kernel();
20605 early_gdt_descr.address =
20606 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20607+ pax_close_kernel();
20608+
20609 initial_gs = per_cpu_offset(smp_processor_id());
20610 #endif
20611 initial_code = (unsigned long)wakeup_long64;
20612diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20613index 665c6b7..eae4d56 100644
20614--- a/arch/x86/kernel/acpi/wakeup_32.S
20615+++ b/arch/x86/kernel/acpi/wakeup_32.S
20616@@ -29,13 +29,11 @@ wakeup_pmode_return:
20617 # and restore the stack ... but you need gdt for this to work
20618 movl saved_context_esp, %esp
20619
20620- movl %cs:saved_magic, %eax
20621- cmpl $0x12345678, %eax
20622+ cmpl $0x12345678, saved_magic
20623 jne bogus_magic
20624
20625 # jump to place where we left off
20626- movl saved_eip, %eax
20627- jmp *%eax
20628+ jmp *(saved_eip)
20629
20630 bogus_magic:
20631 jmp bogus_magic
20632diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20633index 703130f..27a155d 100644
20634--- a/arch/x86/kernel/alternative.c
20635+++ b/arch/x86/kernel/alternative.c
20636@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20637 */
20638 for (a = start; a < end; a++) {
20639 instr = (u8 *)&a->instr_offset + a->instr_offset;
20640+
20641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20642+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20643+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20644+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20648 BUG_ON(a->replacementlen > a->instrlen);
20649 BUG_ON(a->instrlen > sizeof(insnbuf));
20650@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20651 add_nops(insnbuf + a->replacementlen,
20652 a->instrlen - a->replacementlen);
20653
20654+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20655+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20656+ instr = ktva_ktla(instr);
20657+#endif
20658+
20659 text_poke_early(instr, insnbuf, a->instrlen);
20660 }
20661 }
20662@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20663 for (poff = start; poff < end; poff++) {
20664 u8 *ptr = (u8 *)poff + *poff;
20665
20666+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20667+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20668+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20669+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20670+#endif
20671+
20672 if (!*poff || ptr < text || ptr >= text_end)
20673 continue;
20674 /* turn DS segment override prefix into lock prefix */
20675- if (*ptr == 0x3e)
20676+ if (*ktla_ktva(ptr) == 0x3e)
20677 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20678 }
20679 mutex_unlock(&text_mutex);
20680@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20681 for (poff = start; poff < end; poff++) {
20682 u8 *ptr = (u8 *)poff + *poff;
20683
20684+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20685+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20686+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20687+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+#endif
20689+
20690 if (!*poff || ptr < text || ptr >= text_end)
20691 continue;
20692 /* turn lock prefix into DS segment override prefix */
20693- if (*ptr == 0xf0)
20694+ if (*ktla_ktva(ptr) == 0xf0)
20695 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20696 }
20697 mutex_unlock(&text_mutex);
20698@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20699
20700 BUG_ON(p->len > MAX_PATCH_LEN);
20701 /* prep the buffer with the original instructions */
20702- memcpy(insnbuf, p->instr, p->len);
20703+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20704 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20705 (unsigned long)p->instr, p->len);
20706
20707@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20708 if (!uniproc_patched || num_possible_cpus() == 1)
20709 free_init_pages("SMP alternatives",
20710 (unsigned long)__smp_locks,
20711- (unsigned long)__smp_locks_end);
20712+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20713 #endif
20714
20715 apply_paravirt(__parainstructions, __parainstructions_end);
20716@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20717 * instructions. And on the local CPU you need to be protected again NMI or MCE
20718 * handlers seeing an inconsistent instruction while you patch.
20719 */
20720-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20721+void *__kprobes text_poke_early(void *addr, const void *opcode,
20722 size_t len)
20723 {
20724 unsigned long flags;
20725 local_irq_save(flags);
20726- memcpy(addr, opcode, len);
20727+
20728+ pax_open_kernel();
20729+ memcpy(ktla_ktva(addr), opcode, len);
20730 sync_core();
20731+ pax_close_kernel();
20732+
20733 local_irq_restore(flags);
20734 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20735 that causes hangs on some VIA CPUs. */
20736@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20737 */
20738 void *text_poke(void *addr, const void *opcode, size_t len)
20739 {
20740- unsigned long flags;
20741- char *vaddr;
20742+ unsigned char *vaddr = ktla_ktva(addr);
20743 struct page *pages[2];
20744- int i;
20745+ size_t i;
20746
20747 if (!core_kernel_text((unsigned long)addr)) {
20748- pages[0] = vmalloc_to_page(addr);
20749- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20750+ pages[0] = vmalloc_to_page(vaddr);
20751+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20752 } else {
20753- pages[0] = virt_to_page(addr);
20754+ pages[0] = virt_to_page(vaddr);
20755 WARN_ON(!PageReserved(pages[0]));
20756- pages[1] = virt_to_page(addr + PAGE_SIZE);
20757+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20758 }
20759 BUG_ON(!pages[0]);
20760- local_irq_save(flags);
20761- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20762- if (pages[1])
20763- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20764- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20765- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20766- clear_fixmap(FIX_TEXT_POKE0);
20767- if (pages[1])
20768- clear_fixmap(FIX_TEXT_POKE1);
20769- local_flush_tlb();
20770- sync_core();
20771- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20772- that causes hangs on some VIA CPUs. */
20773+ text_poke_early(addr, opcode, len);
20774 for (i = 0; i < len; i++)
20775- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20776- local_irq_restore(flags);
20777+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20778 return addr;
20779 }
20780
20781@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20782 if (likely(!bp_patching_in_progress))
20783 return 0;
20784
20785- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20786+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20787 return 0;
20788
20789 /* set up the specified breakpoint handler */
20790@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20791 */
20792 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20793 {
20794- unsigned char int3 = 0xcc;
20795+ const unsigned char int3 = 0xcc;
20796
20797 bp_int3_handler = handler;
20798 bp_int3_addr = (u8 *)addr + sizeof(int3);
20799diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20800index ad3639a..bd4253c 100644
20801--- a/arch/x86/kernel/apic/apic.c
20802+++ b/arch/x86/kernel/apic/apic.c
20803@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20804 /*
20805 * Debug level, exported for io_apic.c
20806 */
20807-unsigned int apic_verbosity;
20808+int apic_verbosity;
20809
20810 int pic_mode;
20811
20812@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20813 apic_write(APIC_ESR, 0);
20814 v = apic_read(APIC_ESR);
20815 ack_APIC_irq();
20816- atomic_inc(&irq_err_count);
20817+ atomic_inc_unchecked(&irq_err_count);
20818
20819 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20820 smp_processor_id(), v);
20821diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20822index de918c4..32eed23 100644
20823--- a/arch/x86/kernel/apic/apic_flat_64.c
20824+++ b/arch/x86/kernel/apic/apic_flat_64.c
20825@@ -154,7 +154,7 @@ static int flat_probe(void)
20826 return 1;
20827 }
20828
20829-static struct apic apic_flat = {
20830+static struct apic apic_flat __read_only = {
20831 .name = "flat",
20832 .probe = flat_probe,
20833 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20834@@ -260,7 +260,7 @@ static int physflat_probe(void)
20835 return 0;
20836 }
20837
20838-static struct apic apic_physflat = {
20839+static struct apic apic_physflat __read_only = {
20840
20841 .name = "physical flat",
20842 .probe = physflat_probe,
20843diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20844index b205cdb..d8503ff 100644
20845--- a/arch/x86/kernel/apic/apic_noop.c
20846+++ b/arch/x86/kernel/apic/apic_noop.c
20847@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20848 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20849 }
20850
20851-struct apic apic_noop = {
20852+struct apic apic_noop __read_only = {
20853 .name = "noop",
20854 .probe = noop_probe,
20855 .acpi_madt_oem_check = NULL,
20856diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20857index c4a8d63..fe893ac 100644
20858--- a/arch/x86/kernel/apic/bigsmp_32.c
20859+++ b/arch/x86/kernel/apic/bigsmp_32.c
20860@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20861 return dmi_bigsmp;
20862 }
20863
20864-static struct apic apic_bigsmp = {
20865+static struct apic apic_bigsmp __read_only = {
20866
20867 .name = "bigsmp",
20868 .probe = probe_bigsmp,
20869diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20870index f4dc246..fbab133 100644
20871--- a/arch/x86/kernel/apic/io_apic.c
20872+++ b/arch/x86/kernel/apic/io_apic.c
20873@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20874 return ret;
20875 }
20876
20877-atomic_t irq_mis_count;
20878+atomic_unchecked_t irq_mis_count;
20879
20880 #ifdef CONFIG_GENERIC_PENDING_IRQ
20881 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20882@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20883 * at the cpu.
20884 */
20885 if (!(v & (1 << (i & 0x1f)))) {
20886- atomic_inc(&irq_mis_count);
20887+ atomic_inc_unchecked(&irq_mis_count);
20888
20889 eoi_ioapic_irq(irq, cfg);
20890 }
20891@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20892 ioapic_irqd_unmask(data, cfg, masked);
20893 }
20894
20895-static struct irq_chip ioapic_chip __read_mostly = {
20896+static struct irq_chip ioapic_chip = {
20897 .name = "IO-APIC",
20898 .irq_startup = startup_ioapic_irq,
20899 .irq_mask = mask_ioapic_irq,
20900@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20901 ack_APIC_irq();
20902 }
20903
20904-static struct irq_chip lapic_chip __read_mostly = {
20905+static struct irq_chip lapic_chip = {
20906 .name = "local-APIC",
20907 .irq_mask = mask_lapic_irq,
20908 .irq_unmask = unmask_lapic_irq,
20909diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20910index bda4886..f9c7195 100644
20911--- a/arch/x86/kernel/apic/probe_32.c
20912+++ b/arch/x86/kernel/apic/probe_32.c
20913@@ -72,7 +72,7 @@ static int probe_default(void)
20914 return 1;
20915 }
20916
20917-static struct apic apic_default = {
20918+static struct apic apic_default __read_only = {
20919
20920 .name = "default",
20921 .probe = probe_default,
20922diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20923index 6cedd79..023ff8e 100644
20924--- a/arch/x86/kernel/apic/vector.c
20925+++ b/arch/x86/kernel/apic/vector.c
20926@@ -21,7 +21,7 @@
20927
20928 static DEFINE_RAW_SPINLOCK(vector_lock);
20929
20930-void lock_vector_lock(void)
20931+void lock_vector_lock(void) __acquires(vector_lock)
20932 {
20933 /* Used to the online set of cpus does not change
20934 * during assign_irq_vector.
20935@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20936 raw_spin_lock(&vector_lock);
20937 }
20938
20939-void unlock_vector_lock(void)
20940+void unlock_vector_lock(void) __releases(vector_lock)
20941 {
20942 raw_spin_unlock(&vector_lock);
20943 }
20944diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20945index e658f21..b695a1a 100644
20946--- a/arch/x86/kernel/apic/x2apic_cluster.c
20947+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20948@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20949 return notifier_from_errno(err);
20950 }
20951
20952-static struct notifier_block __refdata x2apic_cpu_notifier = {
20953+static struct notifier_block x2apic_cpu_notifier = {
20954 .notifier_call = update_clusterinfo,
20955 };
20956
20957@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20958 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20959 }
20960
20961-static struct apic apic_x2apic_cluster = {
20962+static struct apic apic_x2apic_cluster __read_only = {
20963
20964 .name = "cluster x2apic",
20965 .probe = x2apic_cluster_probe,
20966diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20967index 6fae733..5ca17af 100644
20968--- a/arch/x86/kernel/apic/x2apic_phys.c
20969+++ b/arch/x86/kernel/apic/x2apic_phys.c
20970@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20971 return apic == &apic_x2apic_phys;
20972 }
20973
20974-static struct apic apic_x2apic_phys = {
20975+static struct apic apic_x2apic_phys __read_only = {
20976
20977 .name = "physical x2apic",
20978 .probe = x2apic_phys_probe,
20979diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20980index 8e9dcfd..c61b3e4 100644
20981--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20982+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20983@@ -348,7 +348,7 @@ static int uv_probe(void)
20984 return apic == &apic_x2apic_uv_x;
20985 }
20986
20987-static struct apic __refdata apic_x2apic_uv_x = {
20988+static struct apic apic_x2apic_uv_x __read_only = {
20989
20990 .name = "UV large system",
20991 .probe = uv_probe,
20992diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20993index 927ec92..de68f32 100644
20994--- a/arch/x86/kernel/apm_32.c
20995+++ b/arch/x86/kernel/apm_32.c
20996@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20997 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20998 * even though they are called in protected mode.
20999 */
21000-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21001+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21002 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21003
21004 static const char driver_version[] = "1.16ac"; /* no spaces */
21005@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21006 BUG_ON(cpu != 0);
21007 gdt = get_cpu_gdt_table(cpu);
21008 save_desc_40 = gdt[0x40 / 8];
21009+
21010+ pax_open_kernel();
21011 gdt[0x40 / 8] = bad_bios_desc;
21012+ pax_close_kernel();
21013
21014 apm_irq_save(flags);
21015 APM_DO_SAVE_SEGS;
21016@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21017 &call->esi);
21018 APM_DO_RESTORE_SEGS;
21019 apm_irq_restore(flags);
21020+
21021+ pax_open_kernel();
21022 gdt[0x40 / 8] = save_desc_40;
21023+ pax_close_kernel();
21024+
21025 put_cpu();
21026
21027 return call->eax & 0xff;
21028@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21029 BUG_ON(cpu != 0);
21030 gdt = get_cpu_gdt_table(cpu);
21031 save_desc_40 = gdt[0x40 / 8];
21032+
21033+ pax_open_kernel();
21034 gdt[0x40 / 8] = bad_bios_desc;
21035+ pax_close_kernel();
21036
21037 apm_irq_save(flags);
21038 APM_DO_SAVE_SEGS;
21039@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21040 &call->eax);
21041 APM_DO_RESTORE_SEGS;
21042 apm_irq_restore(flags);
21043+
21044+ pax_open_kernel();
21045 gdt[0x40 / 8] = save_desc_40;
21046+ pax_close_kernel();
21047+
21048 put_cpu();
21049 return error;
21050 }
21051@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21052 return 0;
21053 }
21054
21055-static struct dmi_system_id __initdata apm_dmi_table[] = {
21056+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21057 {
21058 print_if_true,
21059 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21060@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21061 * code to that CPU.
21062 */
21063 gdt = get_cpu_gdt_table(0);
21064+
21065+ pax_open_kernel();
21066 set_desc_base(&gdt[APM_CS >> 3],
21067 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21068 set_desc_base(&gdt[APM_CS_16 >> 3],
21069 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21070 set_desc_base(&gdt[APM_DS >> 3],
21071 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21072+ pax_close_kernel();
21073
21074 proc_create("apm", 0, NULL, &apm_file_ops);
21075
21076diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21077index 9f6b934..cf5ffb3 100644
21078--- a/arch/x86/kernel/asm-offsets.c
21079+++ b/arch/x86/kernel/asm-offsets.c
21080@@ -32,6 +32,8 @@ void common(void) {
21081 OFFSET(TI_flags, thread_info, flags);
21082 OFFSET(TI_status, thread_info, status);
21083 OFFSET(TI_addr_limit, thread_info, addr_limit);
21084+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21085+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21086
21087 BLANK();
21088 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21089@@ -52,8 +54,26 @@ void common(void) {
21090 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21091 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21092 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21093+
21094+#ifdef CONFIG_PAX_KERNEXEC
21095+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21096 #endif
21097
21098+#ifdef CONFIG_PAX_MEMORY_UDEREF
21099+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21100+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21101+#ifdef CONFIG_X86_64
21102+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21103+#endif
21104+#endif
21105+
21106+#endif
21107+
21108+ BLANK();
21109+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21110+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21111+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21112+
21113 #ifdef CONFIG_XEN
21114 BLANK();
21115 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21116diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21117index fdcbb4d..036dd93 100644
21118--- a/arch/x86/kernel/asm-offsets_64.c
21119+++ b/arch/x86/kernel/asm-offsets_64.c
21120@@ -80,6 +80,7 @@ int main(void)
21121 BLANK();
21122 #undef ENTRY
21123
21124+ DEFINE(TSS_size, sizeof(struct tss_struct));
21125 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21126 BLANK();
21127
21128diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21129index 80091ae..0c5184f 100644
21130--- a/arch/x86/kernel/cpu/Makefile
21131+++ b/arch/x86/kernel/cpu/Makefile
21132@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21133 CFLAGS_REMOVE_perf_event.o = -pg
21134 endif
21135
21136-# Make sure load_percpu_segment has no stackprotector
21137-nostackp := $(call cc-option, -fno-stack-protector)
21138-CFLAGS_common.o := $(nostackp)
21139-
21140 obj-y := intel_cacheinfo.o scattered.o topology.o
21141 obj-y += common.o
21142 obj-y += rdrand.o
21143diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21144index a220239..607fc38 100644
21145--- a/arch/x86/kernel/cpu/amd.c
21146+++ b/arch/x86/kernel/cpu/amd.c
21147@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21148 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21149 {
21150 /* AMD errata T13 (order #21922) */
21151- if ((c->x86 == 6)) {
21152+ if (c->x86 == 6) {
21153 /* Duron Rev A0 */
21154 if (c->x86_model == 3 && c->x86_mask == 0)
21155 size = 64;
21156diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21157index 2346c95..c061472 100644
21158--- a/arch/x86/kernel/cpu/common.c
21159+++ b/arch/x86/kernel/cpu/common.c
21160@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21161
21162 static const struct cpu_dev *this_cpu = &default_cpu;
21163
21164-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21165-#ifdef CONFIG_X86_64
21166- /*
21167- * We need valid kernel segments for data and code in long mode too
21168- * IRET will check the segment types kkeil 2000/10/28
21169- * Also sysret mandates a special GDT layout
21170- *
21171- * TLS descriptors are currently at a different place compared to i386.
21172- * Hopefully nobody expects them at a fixed place (Wine?)
21173- */
21174- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21175- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21176- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21177- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21178- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21179- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21180-#else
21181- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21182- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21183- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21184- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21185- /*
21186- * Segments used for calling PnP BIOS have byte granularity.
21187- * They code segments and data segments have fixed 64k limits,
21188- * the transfer segment sizes are set at run time.
21189- */
21190- /* 32-bit code */
21191- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21192- /* 16-bit code */
21193- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21194- /* 16-bit data */
21195- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21196- /* 16-bit data */
21197- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21198- /* 16-bit data */
21199- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21200- /*
21201- * The APM segments have byte granularity and their bases
21202- * are set at run time. All have 64k limits.
21203- */
21204- /* 32-bit code */
21205- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21206- /* 16-bit code */
21207- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21208- /* data */
21209- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21210-
21211- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21212- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21213- GDT_STACK_CANARY_INIT
21214-#endif
21215-} };
21216-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21217-
21218 static int __init x86_xsave_setup(char *s)
21219 {
21220 if (strlen(s))
21221@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21222 }
21223 }
21224
21225+#ifdef CONFIG_X86_64
21226+static __init int setup_disable_pcid(char *arg)
21227+{
21228+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21229+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21230+
21231+#ifdef CONFIG_PAX_MEMORY_UDEREF
21232+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21233+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21234+#endif
21235+
21236+ return 1;
21237+}
21238+__setup("nopcid", setup_disable_pcid);
21239+
21240+static void setup_pcid(struct cpuinfo_x86 *c)
21241+{
21242+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21243+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21244+
21245+#ifdef CONFIG_PAX_MEMORY_UDEREF
21246+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21247+ pax_open_kernel();
21248+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21249+ pax_close_kernel();
21250+ printk("PAX: slow and weak UDEREF enabled\n");
21251+ } else
21252+ printk("PAX: UDEREF disabled\n");
21253+#endif
21254+
21255+ return;
21256+ }
21257+
21258+ printk("PAX: PCID detected\n");
21259+ cr4_set_bits(X86_CR4_PCIDE);
21260+
21261+#ifdef CONFIG_PAX_MEMORY_UDEREF
21262+ pax_open_kernel();
21263+ clone_pgd_mask = ~(pgdval_t)0UL;
21264+ pax_close_kernel();
21265+ if (pax_user_shadow_base)
21266+ printk("PAX: weak UDEREF enabled\n");
21267+ else {
21268+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21269+ printk("PAX: strong UDEREF enabled\n");
21270+ }
21271+#endif
21272+
21273+ if (cpu_has(c, X86_FEATURE_INVPCID))
21274+ printk("PAX: INVPCID detected\n");
21275+}
21276+#endif
21277+
21278 /*
21279 * Some CPU features depend on higher CPUID levels, which may not always
21280 * be available due to CPUID level capping or broken virtualization
21281@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21282 {
21283 struct desc_ptr gdt_descr;
21284
21285- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21286+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21287 gdt_descr.size = GDT_SIZE - 1;
21288 load_gdt(&gdt_descr);
21289 /* Reload the per-cpu base */
21290@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 setup_smep(c);
21292 setup_smap(c);
21293
21294+#ifdef CONFIG_X86_32
21295+#ifdef CONFIG_PAX_PAGEEXEC
21296+ if (!(__supported_pte_mask & _PAGE_NX))
21297+ clear_cpu_cap(c, X86_FEATURE_PSE);
21298+#endif
21299+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21300+ clear_cpu_cap(c, X86_FEATURE_SEP);
21301+#endif
21302+#endif
21303+
21304+#ifdef CONFIG_X86_64
21305+ setup_pcid(c);
21306+#endif
21307+
21308 /*
21309 * The vendor-specific functions might have changed features.
21310 * Now we do "generic changes."
21311@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21312 void enable_sep_cpu(void)
21313 {
21314 int cpu = get_cpu();
21315- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21316+ struct tss_struct *tss = init_tss + cpu;
21317
21318 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21319 put_cpu();
21320@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21321 }
21322 __setup("clearcpuid=", setup_disablecpuid);
21323
21324+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21325+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21326+
21327 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21328- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21329+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21330 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21331
21332 #ifdef CONFIG_X86_64
21333-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21334-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21335- (unsigned long) debug_idt_table };
21336+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21337+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21338
21339 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21340 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21341@@ -1307,7 +1322,7 @@ void cpu_init(void)
21342 */
21343 load_ucode_ap();
21344
21345- t = &per_cpu(init_tss, cpu);
21346+ t = init_tss + cpu;
21347 oist = &per_cpu(orig_ist, cpu);
21348
21349 #ifdef CONFIG_NUMA
21350@@ -1339,7 +1354,6 @@ void cpu_init(void)
21351 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21352 barrier();
21353
21354- x86_configure_nx();
21355 x2apic_setup();
21356
21357 /*
21358@@ -1391,7 +1405,7 @@ void cpu_init(void)
21359 {
21360 int cpu = smp_processor_id();
21361 struct task_struct *curr = current;
21362- struct tss_struct *t = &per_cpu(init_tss, cpu);
21363+ struct tss_struct *t = init_tss + cpu;
21364 struct thread_struct *thread = &curr->thread;
21365
21366 wait_for_master_cpu(cpu);
21367diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21368index 6596433..1ad6eaf 100644
21369--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21370+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21371@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21372 };
21373
21374 #ifdef CONFIG_AMD_NB
21375+static struct attribute *default_attrs_amd_nb[] = {
21376+ &type.attr,
21377+ &level.attr,
21378+ &coherency_line_size.attr,
21379+ &physical_line_partition.attr,
21380+ &ways_of_associativity.attr,
21381+ &number_of_sets.attr,
21382+ &size.attr,
21383+ &shared_cpu_map.attr,
21384+ &shared_cpu_list.attr,
21385+ NULL,
21386+ NULL,
21387+ NULL,
21388+ NULL
21389+};
21390+
21391 static struct attribute **amd_l3_attrs(void)
21392 {
21393 static struct attribute **attrs;
21394@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21395
21396 n = ARRAY_SIZE(default_attrs);
21397
21398- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21399- n += 2;
21400-
21401- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21402- n += 1;
21403-
21404- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21405- if (attrs == NULL)
21406- return attrs = default_attrs;
21407-
21408- for (n = 0; default_attrs[n]; n++)
21409- attrs[n] = default_attrs[n];
21410+ attrs = default_attrs_amd_nb;
21411
21412 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21413 attrs[n++] = &cache_disable_0.attr;
21414@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21415 .default_attrs = default_attrs,
21416 };
21417
21418+#ifdef CONFIG_AMD_NB
21419+static struct kobj_type ktype_cache_amd_nb = {
21420+ .sysfs_ops = &sysfs_ops,
21421+ .default_attrs = default_attrs_amd_nb,
21422+};
21423+#endif
21424+
21425 static struct kobj_type ktype_percpu_entry = {
21426 .sysfs_ops = &sysfs_ops,
21427 };
21428@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21429 return retval;
21430 }
21431
21432+#ifdef CONFIG_AMD_NB
21433+ amd_l3_attrs();
21434+#endif
21435+
21436 for (i = 0; i < num_cache_leaves; i++) {
21437+ struct kobj_type *ktype;
21438+
21439 this_object = INDEX_KOBJECT_PTR(cpu, i);
21440 this_object->cpu = cpu;
21441 this_object->index = i;
21442
21443 this_leaf = CPUID4_INFO_IDX(cpu, i);
21444
21445- ktype_cache.default_attrs = default_attrs;
21446+ ktype = &ktype_cache;
21447 #ifdef CONFIG_AMD_NB
21448 if (this_leaf->base.nb)
21449- ktype_cache.default_attrs = amd_l3_attrs();
21450+ ktype = &ktype_cache_amd_nb;
21451 #endif
21452 retval = kobject_init_and_add(&(this_object->kobj),
21453- &ktype_cache,
21454+ ktype,
21455 per_cpu(ici_cache_kobject, cpu),
21456 "index%1lu", i);
21457 if (unlikely(retval)) {
21458diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21459index 11dd8f2..fd88f68 100644
21460--- a/arch/x86/kernel/cpu/mcheck/mce.c
21461+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21462@@ -47,6 +47,7 @@
21463 #include <asm/tlbflush.h>
21464 #include <asm/mce.h>
21465 #include <asm/msr.h>
21466+#include <asm/local.h>
21467
21468 #include "mce-internal.h"
21469
21470@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21471 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21472 m->cs, m->ip);
21473
21474- if (m->cs == __KERNEL_CS)
21475+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21476 print_symbol("{%s}", m->ip);
21477 pr_cont("\n");
21478 }
21479@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21480
21481 #define PANIC_TIMEOUT 5 /* 5 seconds */
21482
21483-static atomic_t mce_panicked;
21484+static atomic_unchecked_t mce_panicked;
21485
21486 static int fake_panic;
21487-static atomic_t mce_fake_panicked;
21488+static atomic_unchecked_t mce_fake_panicked;
21489
21490 /* Panic in progress. Enable interrupts and wait for final IPI */
21491 static void wait_for_panic(void)
21492@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21493 /*
21494 * Make sure only one CPU runs in machine check panic
21495 */
21496- if (atomic_inc_return(&mce_panicked) > 1)
21497+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21498 wait_for_panic();
21499 barrier();
21500
21501@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21502 console_verbose();
21503 } else {
21504 /* Don't log too much for fake panic */
21505- if (atomic_inc_return(&mce_fake_panicked) > 1)
21506+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21507 return;
21508 }
21509 /* First print corrected ones that are still unlogged */
21510@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21511 if (!fake_panic) {
21512 if (panic_timeout == 0)
21513 panic_timeout = mca_cfg.panic_timeout;
21514- panic(msg);
21515+ panic("%s", msg);
21516 } else
21517 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21518 }
21519@@ -746,7 +747,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21520 * might have been modified by someone else.
21521 */
21522 rmb();
21523- if (atomic_read(&mce_panicked))
21524+ if (atomic_read_unchecked(&mce_panicked))
21525 wait_for_panic();
21526 if (!mca_cfg.monarch_timeout)
21527 goto out;
21528@@ -1672,7 +1673,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21529 }
21530
21531 /* Call the installed machine check handler for this CPU setup. */
21532-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21533+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21534 unexpected_machine_check;
21535
21536 /*
21537@@ -1695,7 +1696,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 return;
21539 }
21540
21541+ pax_open_kernel();
21542 machine_check_vector = do_machine_check;
21543+ pax_close_kernel();
21544
21545 __mcheck_cpu_init_generic();
21546 __mcheck_cpu_init_vendor(c);
21547@@ -1709,7 +1712,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21548 */
21549
21550 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21551-static int mce_chrdev_open_count; /* #times opened */
21552+static local_t mce_chrdev_open_count; /* #times opened */
21553 static int mce_chrdev_open_exclu; /* already open exclusive? */
21554
21555 static int mce_chrdev_open(struct inode *inode, struct file *file)
21556@@ -1717,7 +1720,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21557 spin_lock(&mce_chrdev_state_lock);
21558
21559 if (mce_chrdev_open_exclu ||
21560- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21561+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564 return -EBUSY;
21565@@ -1725,7 +1728,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21566
21567 if (file->f_flags & O_EXCL)
21568 mce_chrdev_open_exclu = 1;
21569- mce_chrdev_open_count++;
21570+ local_inc(&mce_chrdev_open_count);
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573
21574@@ -1736,7 +1739,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21575 {
21576 spin_lock(&mce_chrdev_state_lock);
21577
21578- mce_chrdev_open_count--;
21579+ local_dec(&mce_chrdev_open_count);
21580 mce_chrdev_open_exclu = 0;
21581
21582 spin_unlock(&mce_chrdev_state_lock);
21583@@ -2411,7 +2414,7 @@ static __init void mce_init_banks(void)
21584
21585 for (i = 0; i < mca_cfg.banks; i++) {
21586 struct mce_bank *b = &mce_banks[i];
21587- struct device_attribute *a = &b->attr;
21588+ device_attribute_no_const *a = &b->attr;
21589
21590 sysfs_attr_init(&a->attr);
21591 a->attr.name = b->attrname;
21592@@ -2518,7 +2521,7 @@ struct dentry *mce_get_debugfs_dir(void)
21593 static void mce_reset(void)
21594 {
21595 cpu_missing = 0;
21596- atomic_set(&mce_fake_panicked, 0);
21597+ atomic_set_unchecked(&mce_fake_panicked, 0);
21598 atomic_set(&mce_executing, 0);
21599 atomic_set(&mce_callin, 0);
21600 atomic_set(&global_nwo, 0);
21601diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21602index 737b0ad..09ec66e 100644
21603--- a/arch/x86/kernel/cpu/mcheck/p5.c
21604+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21605@@ -12,6 +12,7 @@
21606 #include <asm/tlbflush.h>
21607 #include <asm/mce.h>
21608 #include <asm/msr.h>
21609+#include <asm/pgtable.h>
21610
21611 /* By default disabled */
21612 int mce_p5_enabled __read_mostly;
21613@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21614 if (!cpu_has(c, X86_FEATURE_MCE))
21615 return;
21616
21617+ pax_open_kernel();
21618 machine_check_vector = pentium_machine_check;
21619+ pax_close_kernel();
21620 /* Make sure the vector pointer is visible before we enable MCEs: */
21621 wmb();
21622
21623diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21624index 44f1382..315b292 100644
21625--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21626+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21627@@ -11,6 +11,7 @@
21628 #include <asm/tlbflush.h>
21629 #include <asm/mce.h>
21630 #include <asm/msr.h>
21631+#include <asm/pgtable.h>
21632
21633 /* Machine check handler for WinChip C6: */
21634 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21635@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21636 {
21637 u32 lo, hi;
21638
21639+ pax_open_kernel();
21640 machine_check_vector = winchip_machine_check;
21641+ pax_close_kernel();
21642 /* Make sure the vector pointer is visible before we enable MCEs: */
21643 wmb();
21644
21645diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21646index 36a8361..e7058c2 100644
21647--- a/arch/x86/kernel/cpu/microcode/core.c
21648+++ b/arch/x86/kernel/cpu/microcode/core.c
21649@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21650 return NOTIFY_OK;
21651 }
21652
21653-static struct notifier_block __refdata mc_cpu_notifier = {
21654+static struct notifier_block mc_cpu_notifier = {
21655 .notifier_call = mc_cpu_callback,
21656 };
21657
21658diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21659index 746e7fd..8dc677e 100644
21660--- a/arch/x86/kernel/cpu/microcode/intel.c
21661+++ b/arch/x86/kernel/cpu/microcode/intel.c
21662@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21663
21664 static int get_ucode_user(void *to, const void *from, size_t n)
21665 {
21666- return copy_from_user(to, from, n);
21667+ return copy_from_user(to, (const void __force_user *)from, n);
21668 }
21669
21670 static enum ucode_state
21671 request_microcode_user(int cpu, const void __user *buf, size_t size)
21672 {
21673- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21674+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21675 }
21676
21677 static void microcode_fini_cpu(int cpu)
21678diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21679index ea5f363..cb0e905 100644
21680--- a/arch/x86/kernel/cpu/mtrr/main.c
21681+++ b/arch/x86/kernel/cpu/mtrr/main.c
21682@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21683 u64 size_or_mask, size_and_mask;
21684 static bool mtrr_aps_delayed_init;
21685
21686-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21687+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21688
21689 const struct mtrr_ops *mtrr_if;
21690
21691diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21692index df5e41f..816c719 100644
21693--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21694+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21695@@ -25,7 +25,7 @@ struct mtrr_ops {
21696 int (*validate_add_page)(unsigned long base, unsigned long size,
21697 unsigned int type);
21698 int (*have_wrcomb)(void);
21699-};
21700+} __do_const;
21701
21702 extern int generic_get_free_region(unsigned long base, unsigned long size,
21703 int replace_reg);
21704diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21705index b71a7f8..534af0e 100644
21706--- a/arch/x86/kernel/cpu/perf_event.c
21707+++ b/arch/x86/kernel/cpu/perf_event.c
21708@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21709
21710 }
21711
21712-static struct attribute_group x86_pmu_format_group = {
21713+static attribute_group_no_const x86_pmu_format_group = {
21714 .name = "format",
21715 .attrs = NULL,
21716 };
21717@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21718 NULL,
21719 };
21720
21721-static struct attribute_group x86_pmu_events_group = {
21722+static attribute_group_no_const x86_pmu_events_group = {
21723 .name = "events",
21724 .attrs = events_attr,
21725 };
21726@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21727 if (idx > GDT_ENTRIES)
21728 return 0;
21729
21730- desc = raw_cpu_ptr(gdt_page.gdt);
21731+ desc = get_cpu_gdt_table(smp_processor_id());
21732 }
21733
21734 return get_desc_base(desc + idx);
21735@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21736 break;
21737
21738 perf_callchain_store(entry, frame.return_address);
21739- fp = frame.next_frame;
21740+ fp = (const void __force_user *)frame.next_frame;
21741 }
21742 }
21743
21744diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21745index 97242a9..cf9c30e 100644
21746--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21747+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21748@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21749 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21750 {
21751 struct attribute **attrs;
21752- struct attribute_group *attr_group;
21753+ attribute_group_no_const *attr_group;
21754 int i = 0, j;
21755
21756 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21757diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21758index 2589906..1ca1000 100644
21759--- a/arch/x86/kernel/cpu/perf_event_intel.c
21760+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21761@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21762 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21763
21764 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21765- u64 capabilities;
21766+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21767
21768- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21769- x86_pmu.intel_cap.capabilities = capabilities;
21770+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21771+ x86_pmu.intel_cap.capabilities = capabilities;
21772 }
21773
21774 intel_ds_init();
21775diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21776index 76d8cbe..e5f9681 100644
21777--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21778+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21779@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21780 NULL,
21781 };
21782
21783-static struct attribute_group rapl_pmu_events_group = {
21784+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21785 .name = "events",
21786 .attrs = NULL, /* patched at runtime */
21787 };
21788diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21789index c635b8b..b78835e 100644
21790--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21791+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21792@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21793 static int __init uncore_type_init(struct intel_uncore_type *type)
21794 {
21795 struct intel_uncore_pmu *pmus;
21796- struct attribute_group *attr_group;
21797+ attribute_group_no_const *attr_group;
21798 struct attribute **attrs;
21799 int i, j;
21800
21801diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21802index 6c8c1e7..515b98a 100644
21803--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21804+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21805@@ -114,7 +114,7 @@ struct intel_uncore_box {
21806 struct uncore_event_desc {
21807 struct kobj_attribute attr;
21808 const char *config;
21809-};
21810+} __do_const;
21811
21812 ssize_t uncore_event_show(struct kobject *kobj,
21813 struct kobj_attribute *attr, char *buf);
21814diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21815index 83741a7..bd3507d 100644
21816--- a/arch/x86/kernel/cpuid.c
21817+++ b/arch/x86/kernel/cpuid.c
21818@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21819 return notifier_from_errno(err);
21820 }
21821
21822-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21823+static struct notifier_block cpuid_class_cpu_notifier =
21824 {
21825 .notifier_call = cpuid_class_cpu_callback,
21826 };
21827diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21828index aceb2f9..c76d3e3 100644
21829--- a/arch/x86/kernel/crash.c
21830+++ b/arch/x86/kernel/crash.c
21831@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21832 #ifdef CONFIG_X86_32
21833 struct pt_regs fixed_regs;
21834
21835- if (!user_mode_vm(regs)) {
21836+ if (!user_mode(regs)) {
21837 crash_fixup_ss_esp(&fixed_regs, regs);
21838 regs = &fixed_regs;
21839 }
21840diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21841index afa64ad..dce67dd 100644
21842--- a/arch/x86/kernel/crash_dump_64.c
21843+++ b/arch/x86/kernel/crash_dump_64.c
21844@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21845 return -ENOMEM;
21846
21847 if (userbuf) {
21848- if (copy_to_user(buf, vaddr + offset, csize)) {
21849+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21850 iounmap(vaddr);
21851 return -EFAULT;
21852 }
21853diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21854index f6dfd93..892ade4 100644
21855--- a/arch/x86/kernel/doublefault.c
21856+++ b/arch/x86/kernel/doublefault.c
21857@@ -12,7 +12,7 @@
21858
21859 #define DOUBLEFAULT_STACKSIZE (1024)
21860 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21861-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21862+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21863
21864 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21865
21866@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21867 unsigned long gdt, tss;
21868
21869 native_store_gdt(&gdt_desc);
21870- gdt = gdt_desc.address;
21871+ gdt = (unsigned long)gdt_desc.address;
21872
21873 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21874
21875@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21876 /* 0x2 bit is always set */
21877 .flags = X86_EFLAGS_SF | 0x2,
21878 .sp = STACK_START,
21879- .es = __USER_DS,
21880+ .es = __KERNEL_DS,
21881 .cs = __KERNEL_CS,
21882 .ss = __KERNEL_DS,
21883- .ds = __USER_DS,
21884+ .ds = __KERNEL_DS,
21885 .fs = __KERNEL_PERCPU,
21886
21887 .__cr3 = __pa_nodebug(swapper_pg_dir),
21888diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21889index cf3df1d..b637d9a 100644
21890--- a/arch/x86/kernel/dumpstack.c
21891+++ b/arch/x86/kernel/dumpstack.c
21892@@ -2,6 +2,9 @@
21893 * Copyright (C) 1991, 1992 Linus Torvalds
21894 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21895 */
21896+#ifdef CONFIG_GRKERNSEC_HIDESYM
21897+#define __INCLUDED_BY_HIDESYM 1
21898+#endif
21899 #include <linux/kallsyms.h>
21900 #include <linux/kprobes.h>
21901 #include <linux/uaccess.h>
21902@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21903
21904 void printk_address(unsigned long address)
21905 {
21906- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21907+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21908 }
21909
21910 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21911 static void
21912 print_ftrace_graph_addr(unsigned long addr, void *data,
21913 const struct stacktrace_ops *ops,
21914- struct thread_info *tinfo, int *graph)
21915+ struct task_struct *task, int *graph)
21916 {
21917- struct task_struct *task;
21918 unsigned long ret_addr;
21919 int index;
21920
21921 if (addr != (unsigned long)return_to_handler)
21922 return;
21923
21924- task = tinfo->task;
21925 index = task->curr_ret_stack;
21926
21927 if (!task->ret_stack || index < *graph)
21928@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21929 static inline void
21930 print_ftrace_graph_addr(unsigned long addr, void *data,
21931 const struct stacktrace_ops *ops,
21932- struct thread_info *tinfo, int *graph)
21933+ struct task_struct *task, int *graph)
21934 { }
21935 #endif
21936
21937@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21938 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21939 */
21940
21941-static inline int valid_stack_ptr(struct thread_info *tinfo,
21942- void *p, unsigned int size, void *end)
21943+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21944 {
21945- void *t = tinfo;
21946 if (end) {
21947 if (p < end && p >= (end-THREAD_SIZE))
21948 return 1;
21949@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21950 }
21951
21952 unsigned long
21953-print_context_stack(struct thread_info *tinfo,
21954+print_context_stack(struct task_struct *task, void *stack_start,
21955 unsigned long *stack, unsigned long bp,
21956 const struct stacktrace_ops *ops, void *data,
21957 unsigned long *end, int *graph)
21958 {
21959 struct stack_frame *frame = (struct stack_frame *)bp;
21960
21961- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21962+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21963 unsigned long addr;
21964
21965 addr = *stack;
21966@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21967 } else {
21968 ops->address(data, addr, 0);
21969 }
21970- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21971+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21972 }
21973 stack++;
21974 }
21975@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21976 EXPORT_SYMBOL_GPL(print_context_stack);
21977
21978 unsigned long
21979-print_context_stack_bp(struct thread_info *tinfo,
21980+print_context_stack_bp(struct task_struct *task, void *stack_start,
21981 unsigned long *stack, unsigned long bp,
21982 const struct stacktrace_ops *ops, void *data,
21983 unsigned long *end, int *graph)
21984@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21985 struct stack_frame *frame = (struct stack_frame *)bp;
21986 unsigned long *ret_addr = &frame->return_address;
21987
21988- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21989+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21990 unsigned long addr = *ret_addr;
21991
21992 if (!__kernel_text_address(addr))
21993@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21994 ops->address(data, addr, 1);
21995 frame = frame->next_frame;
21996 ret_addr = &frame->return_address;
21997- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21998+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21999 }
22000
22001 return (unsigned long)frame;
22002@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
22003 static void print_trace_address(void *data, unsigned long addr, int reliable)
22004 {
22005 touch_nmi_watchdog();
22006- printk(data);
22007+ printk("%s", (char *)data);
22008 printk_stack_address(addr, reliable);
22009 }
22010
22011@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22012 EXPORT_SYMBOL_GPL(oops_begin);
22013 NOKPROBE_SYMBOL(oops_begin);
22014
22015+extern void gr_handle_kernel_exploit(void);
22016+
22017 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22018 {
22019 if (regs && kexec_should_crash(current))
22020@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22021 panic("Fatal exception in interrupt");
22022 if (panic_on_oops)
22023 panic("Fatal exception");
22024- do_exit(signr);
22025+
22026+ gr_handle_kernel_exploit();
22027+
22028+ do_group_exit(signr);
22029 }
22030 NOKPROBE_SYMBOL(oops_end);
22031
22032@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22033 print_modules();
22034 show_regs(regs);
22035 #ifdef CONFIG_X86_32
22036- if (user_mode_vm(regs)) {
22037+ if (user_mode(regs)) {
22038 sp = regs->sp;
22039 ss = regs->ss & 0xffff;
22040 } else {
22041@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22042 unsigned long flags = oops_begin();
22043 int sig = SIGSEGV;
22044
22045- if (!user_mode_vm(regs))
22046+ if (!user_mode(regs))
22047 report_bug(regs->ip, regs);
22048
22049 if (__die(str, regs, err))
22050diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22051index 5abd4cd..c65733b 100644
22052--- a/arch/x86/kernel/dumpstack_32.c
22053+++ b/arch/x86/kernel/dumpstack_32.c
22054@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22055 bp = stack_frame(task, regs);
22056
22057 for (;;) {
22058- struct thread_info *context;
22059+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22060 void *end_stack;
22061
22062 end_stack = is_hardirq_stack(stack, cpu);
22063 if (!end_stack)
22064 end_stack = is_softirq_stack(stack, cpu);
22065
22066- context = task_thread_info(task);
22067- bp = ops->walk_stack(context, stack, bp, ops, data,
22068+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22069 end_stack, &graph);
22070
22071 /* Stop if not on irq stack */
22072@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22073 int i;
22074
22075 show_regs_print_info(KERN_EMERG);
22076- __show_regs(regs, !user_mode_vm(regs));
22077+ __show_regs(regs, !user_mode(regs));
22078
22079 /*
22080 * When in-kernel, we also print out the stack and code at the
22081 * time of the fault..
22082 */
22083- if (!user_mode_vm(regs)) {
22084+ if (!user_mode(regs)) {
22085 unsigned int code_prologue = code_bytes * 43 / 64;
22086 unsigned int code_len = code_bytes;
22087 unsigned char c;
22088 u8 *ip;
22089+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22090
22091 pr_emerg("Stack:\n");
22092 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22093
22094 pr_emerg("Code:");
22095
22096- ip = (u8 *)regs->ip - code_prologue;
22097+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22098 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22099 /* try starting at IP */
22100- ip = (u8 *)regs->ip;
22101+ ip = (u8 *)regs->ip + cs_base;
22102 code_len = code_len - code_prologue + 1;
22103 }
22104 for (i = 0; i < code_len; i++, ip++) {
22105@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22106 pr_cont(" Bad EIP value.");
22107 break;
22108 }
22109- if (ip == (u8 *)regs->ip)
22110+ if (ip == (u8 *)regs->ip + cs_base)
22111 pr_cont(" <%02x>", c);
22112 else
22113 pr_cont(" %02x", c);
22114@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22115 {
22116 unsigned short ud2;
22117
22118+ ip = ktla_ktva(ip);
22119 if (ip < PAGE_OFFSET)
22120 return 0;
22121 if (probe_kernel_address((unsigned short *)ip, ud2))
22122@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22123
22124 return ud2 == 0x0b0f;
22125 }
22126+
22127+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22128+void pax_check_alloca(unsigned long size)
22129+{
22130+ unsigned long sp = (unsigned long)&sp, stack_left;
22131+
22132+ /* all kernel stacks are of the same size */
22133+ stack_left = sp & (THREAD_SIZE - 1);
22134+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22135+}
22136+EXPORT_SYMBOL(pax_check_alloca);
22137+#endif
22138diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22139index ff86f19..73eabf4 100644
22140--- a/arch/x86/kernel/dumpstack_64.c
22141+++ b/arch/x86/kernel/dumpstack_64.c
22142@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22143 const struct stacktrace_ops *ops, void *data)
22144 {
22145 const unsigned cpu = get_cpu();
22146- struct thread_info *tinfo;
22147 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22148 unsigned long dummy;
22149 unsigned used = 0;
22150 int graph = 0;
22151 int done = 0;
22152+ void *stack_start;
22153
22154 if (!task)
22155 task = current;
22156@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22157 * current stack address. If the stacks consist of nested
22158 * exceptions
22159 */
22160- tinfo = task_thread_info(task);
22161 while (!done) {
22162 unsigned long *stack_end;
22163 enum stack_type stype;
22164@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22165 if (ops->stack(data, id) < 0)
22166 break;
22167
22168- bp = ops->walk_stack(tinfo, stack, bp, ops,
22169+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22170 data, stack_end, &graph);
22171 ops->stack(data, "<EOE>");
22172 /*
22173@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22174 * second-to-last pointer (index -2 to end) in the
22175 * exception stack:
22176 */
22177+ if ((u16)stack_end[-1] != __KERNEL_DS)
22178+ goto out;
22179 stack = (unsigned long *) stack_end[-2];
22180 done = 0;
22181 break;
22182@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22183
22184 if (ops->stack(data, "IRQ") < 0)
22185 break;
22186- bp = ops->walk_stack(tinfo, stack, bp,
22187+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22188 ops, data, stack_end, &graph);
22189 /*
22190 * We link to the next stack (which would be
22191@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22192 /*
22193 * This handles the process stack:
22194 */
22195- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22196+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22197+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22198+out:
22199 put_cpu();
22200 }
22201 EXPORT_SYMBOL(dump_trace);
22202@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22203 {
22204 unsigned short ud2;
22205
22206- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22207+ if (probe_kernel_address((unsigned short *)ip, ud2))
22208 return 0;
22209
22210 return ud2 == 0x0b0f;
22211 }
22212+
22213+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22214+void pax_check_alloca(unsigned long size)
22215+{
22216+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22217+ unsigned cpu, used;
22218+ char *id;
22219+
22220+ /* check the process stack first */
22221+ stack_start = (unsigned long)task_stack_page(current);
22222+ stack_end = stack_start + THREAD_SIZE;
22223+ if (likely(stack_start <= sp && sp < stack_end)) {
22224+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22225+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22226+ return;
22227+ }
22228+
22229+ cpu = get_cpu();
22230+
22231+ /* check the irq stacks */
22232+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22233+ stack_start = stack_end - IRQ_STACK_SIZE;
22234+ if (stack_start <= sp && sp < stack_end) {
22235+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22236+ put_cpu();
22237+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22238+ return;
22239+ }
22240+
22241+ /* check the exception stacks */
22242+ used = 0;
22243+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22244+ stack_start = stack_end - EXCEPTION_STKSZ;
22245+ if (stack_end && stack_start <= sp && sp < stack_end) {
22246+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22247+ put_cpu();
22248+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22249+ return;
22250+ }
22251+
22252+ put_cpu();
22253+
22254+ /* unknown stack */
22255+ BUG();
22256+}
22257+EXPORT_SYMBOL(pax_check_alloca);
22258+#endif
22259diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22260index 46201de..ebffabf 100644
22261--- a/arch/x86/kernel/e820.c
22262+++ b/arch/x86/kernel/e820.c
22263@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22264
22265 static void early_panic(char *msg)
22266 {
22267- early_printk(msg);
22268- panic(msg);
22269+ early_printk("%s", msg);
22270+ panic("%s", msg);
22271 }
22272
22273 static int userdef __initdata;
22274diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22275index a62536a..8444df4 100644
22276--- a/arch/x86/kernel/early_printk.c
22277+++ b/arch/x86/kernel/early_printk.c
22278@@ -7,6 +7,7 @@
22279 #include <linux/pci_regs.h>
22280 #include <linux/pci_ids.h>
22281 #include <linux/errno.h>
22282+#include <linux/sched.h>
22283 #include <asm/io.h>
22284 #include <asm/processor.h>
22285 #include <asm/fcntl.h>
22286diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22287index 31e2d5b..b31c76d 100644
22288--- a/arch/x86/kernel/entry_32.S
22289+++ b/arch/x86/kernel/entry_32.S
22290@@ -177,13 +177,154 @@
22291 /*CFI_REL_OFFSET gs, PT_GS*/
22292 .endm
22293 .macro SET_KERNEL_GS reg
22294+
22295+#ifdef CONFIG_CC_STACKPROTECTOR
22296 movl $(__KERNEL_STACK_CANARY), \reg
22297+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22298+ movl $(__USER_DS), \reg
22299+#else
22300+ xorl \reg, \reg
22301+#endif
22302+
22303 movl \reg, %gs
22304 .endm
22305
22306 #endif /* CONFIG_X86_32_LAZY_GS */
22307
22308-.macro SAVE_ALL
22309+.macro pax_enter_kernel
22310+#ifdef CONFIG_PAX_KERNEXEC
22311+ call pax_enter_kernel
22312+#endif
22313+.endm
22314+
22315+.macro pax_exit_kernel
22316+#ifdef CONFIG_PAX_KERNEXEC
22317+ call pax_exit_kernel
22318+#endif
22319+.endm
22320+
22321+#ifdef CONFIG_PAX_KERNEXEC
22322+ENTRY(pax_enter_kernel)
22323+#ifdef CONFIG_PARAVIRT
22324+ pushl %eax
22325+ pushl %ecx
22326+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22327+ mov %eax, %esi
22328+#else
22329+ mov %cr0, %esi
22330+#endif
22331+ bts $16, %esi
22332+ jnc 1f
22333+ mov %cs, %esi
22334+ cmp $__KERNEL_CS, %esi
22335+ jz 3f
22336+ ljmp $__KERNEL_CS, $3f
22337+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22338+2:
22339+#ifdef CONFIG_PARAVIRT
22340+ mov %esi, %eax
22341+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22342+#else
22343+ mov %esi, %cr0
22344+#endif
22345+3:
22346+#ifdef CONFIG_PARAVIRT
22347+ popl %ecx
22348+ popl %eax
22349+#endif
22350+ ret
22351+ENDPROC(pax_enter_kernel)
22352+
22353+ENTRY(pax_exit_kernel)
22354+#ifdef CONFIG_PARAVIRT
22355+ pushl %eax
22356+ pushl %ecx
22357+#endif
22358+ mov %cs, %esi
22359+ cmp $__KERNEXEC_KERNEL_CS, %esi
22360+ jnz 2f
22361+#ifdef CONFIG_PARAVIRT
22362+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22363+ mov %eax, %esi
22364+#else
22365+ mov %cr0, %esi
22366+#endif
22367+ btr $16, %esi
22368+ ljmp $__KERNEL_CS, $1f
22369+1:
22370+#ifdef CONFIG_PARAVIRT
22371+ mov %esi, %eax
22372+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22373+#else
22374+ mov %esi, %cr0
22375+#endif
22376+2:
22377+#ifdef CONFIG_PARAVIRT
22378+ popl %ecx
22379+ popl %eax
22380+#endif
22381+ ret
22382+ENDPROC(pax_exit_kernel)
22383+#endif
22384+
22385+ .macro pax_erase_kstack
22386+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22387+ call pax_erase_kstack
22388+#endif
22389+ .endm
22390+
22391+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22392+/*
22393+ * ebp: thread_info
22394+ */
22395+ENTRY(pax_erase_kstack)
22396+ pushl %edi
22397+ pushl %ecx
22398+ pushl %eax
22399+
22400+ mov TI_lowest_stack(%ebp), %edi
22401+ mov $-0xBEEF, %eax
22402+ std
22403+
22404+1: mov %edi, %ecx
22405+ and $THREAD_SIZE_asm - 1, %ecx
22406+ shr $2, %ecx
22407+ repne scasl
22408+ jecxz 2f
22409+
22410+ cmp $2*16, %ecx
22411+ jc 2f
22412+
22413+ mov $2*16, %ecx
22414+ repe scasl
22415+ jecxz 2f
22416+ jne 1b
22417+
22418+2: cld
22419+ or $2*4, %edi
22420+ mov %esp, %ecx
22421+ sub %edi, %ecx
22422+
22423+ cmp $THREAD_SIZE_asm, %ecx
22424+ jb 3f
22425+ ud2
22426+3:
22427+
22428+ shr $2, %ecx
22429+ rep stosl
22430+
22431+ mov TI_task_thread_sp0(%ebp), %edi
22432+ sub $128, %edi
22433+ mov %edi, TI_lowest_stack(%ebp)
22434+
22435+ popl %eax
22436+ popl %ecx
22437+ popl %edi
22438+ ret
22439+ENDPROC(pax_erase_kstack)
22440+#endif
22441+
22442+.macro __SAVE_ALL _DS
22443 cld
22444 PUSH_GS
22445 pushl_cfi %fs
22446@@ -206,7 +347,7 @@
22447 CFI_REL_OFFSET ecx, 0
22448 pushl_cfi %ebx
22449 CFI_REL_OFFSET ebx, 0
22450- movl $(__USER_DS), %edx
22451+ movl $\_DS, %edx
22452 movl %edx, %ds
22453 movl %edx, %es
22454 movl $(__KERNEL_PERCPU), %edx
22455@@ -214,6 +355,15 @@
22456 SET_KERNEL_GS %edx
22457 .endm
22458
22459+.macro SAVE_ALL
22460+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22461+ __SAVE_ALL __KERNEL_DS
22462+ pax_enter_kernel
22463+#else
22464+ __SAVE_ALL __USER_DS
22465+#endif
22466+.endm
22467+
22468 .macro RESTORE_INT_REGS
22469 popl_cfi %ebx
22470 CFI_RESTORE ebx
22471@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22472 popfl_cfi
22473 jmp syscall_exit
22474 CFI_ENDPROC
22475-END(ret_from_fork)
22476+ENDPROC(ret_from_fork)
22477
22478 ENTRY(ret_from_kernel_thread)
22479 CFI_STARTPROC
22480@@ -340,7 +490,15 @@ ret_from_intr:
22481 andl $SEGMENT_RPL_MASK, %eax
22482 #endif
22483 cmpl $USER_RPL, %eax
22484+
22485+#ifdef CONFIG_PAX_KERNEXEC
22486+ jae resume_userspace
22487+
22488+ pax_exit_kernel
22489+ jmp resume_kernel
22490+#else
22491 jb resume_kernel # not returning to v8086 or userspace
22492+#endif
22493
22494 ENTRY(resume_userspace)
22495 LOCKDEP_SYS_EXIT
22496@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22497 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22498 # int/exception return?
22499 jne work_pending
22500- jmp restore_all
22501-END(ret_from_exception)
22502+ jmp restore_all_pax
22503+ENDPROC(ret_from_exception)
22504
22505 #ifdef CONFIG_PREEMPT
22506 ENTRY(resume_kernel)
22507@@ -365,7 +523,7 @@ need_resched:
22508 jz restore_all
22509 call preempt_schedule_irq
22510 jmp need_resched
22511-END(resume_kernel)
22512+ENDPROC(resume_kernel)
22513 #endif
22514 CFI_ENDPROC
22515
22516@@ -395,30 +553,45 @@ sysenter_past_esp:
22517 /*CFI_REL_OFFSET cs, 0*/
22518 /*
22519 * Push current_thread_info()->sysenter_return to the stack.
22520- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22521- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22522 */
22523- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22524+ pushl_cfi $0
22525 CFI_REL_OFFSET eip, 0
22526
22527 pushl_cfi %eax
22528 SAVE_ALL
22529+ GET_THREAD_INFO(%ebp)
22530+ movl TI_sysenter_return(%ebp),%ebp
22531+ movl %ebp,PT_EIP(%esp)
22532 ENABLE_INTERRUPTS(CLBR_NONE)
22533
22534 /*
22535 * Load the potential sixth argument from user stack.
22536 * Careful about security.
22537 */
22538+ movl PT_OLDESP(%esp),%ebp
22539+
22540+#ifdef CONFIG_PAX_MEMORY_UDEREF
22541+ mov PT_OLDSS(%esp),%ds
22542+1: movl %ds:(%ebp),%ebp
22543+ push %ss
22544+ pop %ds
22545+#else
22546 cmpl $__PAGE_OFFSET-3,%ebp
22547 jae syscall_fault
22548 ASM_STAC
22549 1: movl (%ebp),%ebp
22550 ASM_CLAC
22551+#endif
22552+
22553 movl %ebp,PT_EBP(%esp)
22554 _ASM_EXTABLE(1b,syscall_fault)
22555
22556 GET_THREAD_INFO(%ebp)
22557
22558+#ifdef CONFIG_PAX_RANDKSTACK
22559+ pax_erase_kstack
22560+#endif
22561+
22562 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22563 jnz sysenter_audit
22564 sysenter_do_call:
22565@@ -434,12 +607,24 @@ sysenter_after_call:
22566 testl $_TIF_ALLWORK_MASK, %ecx
22567 jne sysexit_audit
22568 sysenter_exit:
22569+
22570+#ifdef CONFIG_PAX_RANDKSTACK
22571+ pushl_cfi %eax
22572+ movl %esp, %eax
22573+ call pax_randomize_kstack
22574+ popl_cfi %eax
22575+#endif
22576+
22577+ pax_erase_kstack
22578+
22579 /* if something modifies registers it must also disable sysexit */
22580 movl PT_EIP(%esp), %edx
22581 movl PT_OLDESP(%esp), %ecx
22582 xorl %ebp,%ebp
22583 TRACE_IRQS_ON
22584 1: mov PT_FS(%esp), %fs
22585+2: mov PT_DS(%esp), %ds
22586+3: mov PT_ES(%esp), %es
22587 PTGS_TO_GS
22588 ENABLE_INTERRUPTS_SYSEXIT
22589
22590@@ -453,6 +638,9 @@ sysenter_audit:
22591 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22592 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22593 call __audit_syscall_entry
22594+
22595+ pax_erase_kstack
22596+
22597 popl_cfi %ecx /* get that remapped edx off the stack */
22598 popl_cfi %ecx /* get that remapped esi off the stack */
22599 movl PT_EAX(%esp),%eax /* reload syscall number */
22600@@ -479,10 +667,16 @@ sysexit_audit:
22601
22602 CFI_ENDPROC
22603 .pushsection .fixup,"ax"
22604-2: movl $0,PT_FS(%esp)
22605+4: movl $0,PT_FS(%esp)
22606+ jmp 1b
22607+5: movl $0,PT_DS(%esp)
22608+ jmp 1b
22609+6: movl $0,PT_ES(%esp)
22610 jmp 1b
22611 .popsection
22612- _ASM_EXTABLE(1b,2b)
22613+ _ASM_EXTABLE(1b,4b)
22614+ _ASM_EXTABLE(2b,5b)
22615+ _ASM_EXTABLE(3b,6b)
22616 PTGS_TO_GS_EX
22617 ENDPROC(ia32_sysenter_target)
22618
22619@@ -493,6 +687,11 @@ ENTRY(system_call)
22620 pushl_cfi %eax # save orig_eax
22621 SAVE_ALL
22622 GET_THREAD_INFO(%ebp)
22623+
22624+#ifdef CONFIG_PAX_RANDKSTACK
22625+ pax_erase_kstack
22626+#endif
22627+
22628 # system call tracing in operation / emulation
22629 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22630 jnz syscall_trace_entry
22631@@ -512,6 +711,15 @@ syscall_exit:
22632 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22633 jne syscall_exit_work
22634
22635+restore_all_pax:
22636+
22637+#ifdef CONFIG_PAX_RANDKSTACK
22638+ movl %esp, %eax
22639+ call pax_randomize_kstack
22640+#endif
22641+
22642+ pax_erase_kstack
22643+
22644 restore_all:
22645 TRACE_IRQS_IRET
22646 restore_all_notrace:
22647@@ -566,14 +774,34 @@ ldt_ss:
22648 * compensating for the offset by changing to the ESPFIX segment with
22649 * a base address that matches for the difference.
22650 */
22651-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22652+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22653 mov %esp, %edx /* load kernel esp */
22654 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22655 mov %dx, %ax /* eax: new kernel esp */
22656 sub %eax, %edx /* offset (low word is 0) */
22657+#ifdef CONFIG_SMP
22658+ movl PER_CPU_VAR(cpu_number), %ebx
22659+ shll $PAGE_SHIFT_asm, %ebx
22660+ addl $cpu_gdt_table, %ebx
22661+#else
22662+ movl $cpu_gdt_table, %ebx
22663+#endif
22664 shr $16, %edx
22665- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22666- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22667+
22668+#ifdef CONFIG_PAX_KERNEXEC
22669+ mov %cr0, %esi
22670+ btr $16, %esi
22671+ mov %esi, %cr0
22672+#endif
22673+
22674+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22675+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22676+
22677+#ifdef CONFIG_PAX_KERNEXEC
22678+ bts $16, %esi
22679+ mov %esi, %cr0
22680+#endif
22681+
22682 pushl_cfi $__ESPFIX_SS
22683 pushl_cfi %eax /* new kernel esp */
22684 /* Disable interrupts, but do not irqtrace this section: we
22685@@ -603,20 +831,18 @@ work_resched:
22686 movl TI_flags(%ebp), %ecx
22687 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22688 # than syscall tracing?
22689- jz restore_all
22690+ jz restore_all_pax
22691 testb $_TIF_NEED_RESCHED, %cl
22692 jnz work_resched
22693
22694 work_notifysig: # deal with pending signals and
22695 # notify-resume requests
22696+ movl %esp, %eax
22697 #ifdef CONFIG_VM86
22698 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22699- movl %esp, %eax
22700 jne work_notifysig_v86 # returning to kernel-space or
22701 # vm86-space
22702 1:
22703-#else
22704- movl %esp, %eax
22705 #endif
22706 TRACE_IRQS_ON
22707 ENABLE_INTERRUPTS(CLBR_NONE)
22708@@ -637,7 +863,7 @@ work_notifysig_v86:
22709 movl %eax, %esp
22710 jmp 1b
22711 #endif
22712-END(work_pending)
22713+ENDPROC(work_pending)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717@@ -645,11 +871,14 @@ syscall_trace_entry:
22718 movl $-ENOSYS,PT_EAX(%esp)
22719 movl %esp, %eax
22720 call syscall_trace_enter
22721+
22722+ pax_erase_kstack
22723+
22724 /* What it returned is what we'll actually use. */
22725 cmpl $(NR_syscalls), %eax
22726 jnae syscall_call
22727 jmp syscall_exit
22728-END(syscall_trace_entry)
22729+ENDPROC(syscall_trace_entry)
22730
22731 # perform syscall exit tracing
22732 ALIGN
22733@@ -662,26 +891,30 @@ syscall_exit_work:
22734 movl %esp, %eax
22735 call syscall_trace_leave
22736 jmp resume_userspace
22737-END(syscall_exit_work)
22738+ENDPROC(syscall_exit_work)
22739 CFI_ENDPROC
22740
22741 RING0_INT_FRAME # can't unwind into user space anyway
22742 syscall_fault:
22743+#ifdef CONFIG_PAX_MEMORY_UDEREF
22744+ push %ss
22745+ pop %ds
22746+#endif
22747 ASM_CLAC
22748 GET_THREAD_INFO(%ebp)
22749 movl $-EFAULT,PT_EAX(%esp)
22750 jmp resume_userspace
22751-END(syscall_fault)
22752+ENDPROC(syscall_fault)
22753
22754 syscall_badsys:
22755 movl $-ENOSYS,%eax
22756 jmp syscall_after_call
22757-END(syscall_badsys)
22758+ENDPROC(syscall_badsys)
22759
22760 sysenter_badsys:
22761 movl $-ENOSYS,%eax
22762 jmp sysenter_after_call
22763-END(sysenter_badsys)
22764+ENDPROC(sysenter_badsys)
22765 CFI_ENDPROC
22766
22767 .macro FIXUP_ESPFIX_STACK
22768@@ -694,8 +927,15 @@ END(sysenter_badsys)
22769 */
22770 #ifdef CONFIG_X86_ESPFIX32
22771 /* fixup the stack */
22772- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22773- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22774+#ifdef CONFIG_SMP
22775+ movl PER_CPU_VAR(cpu_number), %ebx
22776+ shll $PAGE_SHIFT_asm, %ebx
22777+ addl $cpu_gdt_table, %ebx
22778+#else
22779+ movl $cpu_gdt_table, %ebx
22780+#endif
22781+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22782+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22783 shl $16, %eax
22784 addl %esp, %eax /* the adjusted stack pointer */
22785 pushl_cfi $__KERNEL_DS
22786@@ -751,7 +991,7 @@ vector=vector+1
22787 .endr
22788 2: jmp common_interrupt
22789 .endr
22790-END(irq_entries_start)
22791+ENDPROC(irq_entries_start)
22792
22793 .previous
22794 END(interrupt)
22795@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22796 pushl_cfi $do_coprocessor_error
22797 jmp error_code
22798 CFI_ENDPROC
22799-END(coprocessor_error)
22800+ENDPROC(coprocessor_error)
22801
22802 ENTRY(simd_coprocessor_error)
22803 RING0_INT_FRAME
22804@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22805 .section .altinstructions,"a"
22806 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22807 .previous
22808-.section .altinstr_replacement,"ax"
22809+.section .altinstr_replacement,"a"
22810 663: pushl $do_simd_coprocessor_error
22811 664:
22812 .previous
22813@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22814 #endif
22815 jmp error_code
22816 CFI_ENDPROC
22817-END(simd_coprocessor_error)
22818+ENDPROC(simd_coprocessor_error)
22819
22820 ENTRY(device_not_available)
22821 RING0_INT_FRAME
22822@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22823 pushl_cfi $do_device_not_available
22824 jmp error_code
22825 CFI_ENDPROC
22826-END(device_not_available)
22827+ENDPROC(device_not_available)
22828
22829 #ifdef CONFIG_PARAVIRT
22830 ENTRY(native_iret)
22831 iret
22832 _ASM_EXTABLE(native_iret, iret_exc)
22833-END(native_iret)
22834+ENDPROC(native_iret)
22835
22836 ENTRY(native_irq_enable_sysexit)
22837 sti
22838 sysexit
22839-END(native_irq_enable_sysexit)
22840+ENDPROC(native_irq_enable_sysexit)
22841 #endif
22842
22843 ENTRY(overflow)
22844@@ -860,7 +1100,7 @@ ENTRY(overflow)
22845 pushl_cfi $do_overflow
22846 jmp error_code
22847 CFI_ENDPROC
22848-END(overflow)
22849+ENDPROC(overflow)
22850
22851 ENTRY(bounds)
22852 RING0_INT_FRAME
22853@@ -869,7 +1109,7 @@ ENTRY(bounds)
22854 pushl_cfi $do_bounds
22855 jmp error_code
22856 CFI_ENDPROC
22857-END(bounds)
22858+ENDPROC(bounds)
22859
22860 ENTRY(invalid_op)
22861 RING0_INT_FRAME
22862@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22863 pushl_cfi $do_invalid_op
22864 jmp error_code
22865 CFI_ENDPROC
22866-END(invalid_op)
22867+ENDPROC(invalid_op)
22868
22869 ENTRY(coprocessor_segment_overrun)
22870 RING0_INT_FRAME
22871@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22872 pushl_cfi $do_coprocessor_segment_overrun
22873 jmp error_code
22874 CFI_ENDPROC
22875-END(coprocessor_segment_overrun)
22876+ENDPROC(coprocessor_segment_overrun)
22877
22878 ENTRY(invalid_TSS)
22879 RING0_EC_FRAME
22880@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22881 pushl_cfi $do_invalid_TSS
22882 jmp error_code
22883 CFI_ENDPROC
22884-END(invalid_TSS)
22885+ENDPROC(invalid_TSS)
22886
22887 ENTRY(segment_not_present)
22888 RING0_EC_FRAME
22889@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22890 pushl_cfi $do_segment_not_present
22891 jmp error_code
22892 CFI_ENDPROC
22893-END(segment_not_present)
22894+ENDPROC(segment_not_present)
22895
22896 ENTRY(stack_segment)
22897 RING0_EC_FRAME
22898@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22899 pushl_cfi $do_stack_segment
22900 jmp error_code
22901 CFI_ENDPROC
22902-END(stack_segment)
22903+ENDPROC(stack_segment)
22904
22905 ENTRY(alignment_check)
22906 RING0_EC_FRAME
22907@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22908 pushl_cfi $do_alignment_check
22909 jmp error_code
22910 CFI_ENDPROC
22911-END(alignment_check)
22912+ENDPROC(alignment_check)
22913
22914 ENTRY(divide_error)
22915 RING0_INT_FRAME
22916@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22917 pushl_cfi $do_divide_error
22918 jmp error_code
22919 CFI_ENDPROC
22920-END(divide_error)
22921+ENDPROC(divide_error)
22922
22923 #ifdef CONFIG_X86_MCE
22924 ENTRY(machine_check)
22925@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22926 pushl_cfi machine_check_vector
22927 jmp error_code
22928 CFI_ENDPROC
22929-END(machine_check)
22930+ENDPROC(machine_check)
22931 #endif
22932
22933 ENTRY(spurious_interrupt_bug)
22934@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22935 pushl_cfi $do_spurious_interrupt_bug
22936 jmp error_code
22937 CFI_ENDPROC
22938-END(spurious_interrupt_bug)
22939+ENDPROC(spurious_interrupt_bug)
22940
22941 #ifdef CONFIG_XEN
22942 /* Xen doesn't set %esp to be precisely what the normal sysenter
22943@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22944
22945 ENTRY(mcount)
22946 ret
22947-END(mcount)
22948+ENDPROC(mcount)
22949
22950 ENTRY(ftrace_caller)
22951 pushl %eax
22952@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22953 .globl ftrace_stub
22954 ftrace_stub:
22955 ret
22956-END(ftrace_caller)
22957+ENDPROC(ftrace_caller)
22958
22959 ENTRY(ftrace_regs_caller)
22960 pushf /* push flags before compare (in cs location) */
22961@@ -1185,7 +1425,7 @@ trace:
22962 popl %ecx
22963 popl %eax
22964 jmp ftrace_stub
22965-END(mcount)
22966+ENDPROC(mcount)
22967 #endif /* CONFIG_DYNAMIC_FTRACE */
22968 #endif /* CONFIG_FUNCTION_TRACER */
22969
22970@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22971 popl %ecx
22972 popl %eax
22973 ret
22974-END(ftrace_graph_caller)
22975+ENDPROC(ftrace_graph_caller)
22976
22977 .globl return_to_handler
22978 return_to_handler:
22979@@ -1264,15 +1504,18 @@ error_code:
22980 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22981 REG_TO_PTGS %ecx
22982 SET_KERNEL_GS %ecx
22983- movl $(__USER_DS), %ecx
22984+ movl $(__KERNEL_DS), %ecx
22985 movl %ecx, %ds
22986 movl %ecx, %es
22987+
22988+ pax_enter_kernel
22989+
22990 TRACE_IRQS_OFF
22991 movl %esp,%eax # pt_regs pointer
22992 call *%edi
22993 jmp ret_from_exception
22994 CFI_ENDPROC
22995-END(page_fault)
22996+ENDPROC(page_fault)
22997
22998 /*
22999 * Debug traps and NMI can happen at the one SYSENTER instruction
23000@@ -1315,7 +1558,7 @@ debug_stack_correct:
23001 call do_debug
23002 jmp ret_from_exception
23003 CFI_ENDPROC
23004-END(debug)
23005+ENDPROC(debug)
23006
23007 /*
23008 * NMI is doubly nasty. It can happen _while_ we're handling
23009@@ -1355,6 +1598,9 @@ nmi_stack_correct:
23010 xorl %edx,%edx # zero error code
23011 movl %esp,%eax # pt_regs pointer
23012 call do_nmi
23013+
23014+ pax_exit_kernel
23015+
23016 jmp restore_all_notrace
23017 CFI_ENDPROC
23018
23019@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
23020 FIXUP_ESPFIX_STACK # %eax == %esp
23021 xorl %edx,%edx # zero error code
23022 call do_nmi
23023+
23024+ pax_exit_kernel
23025+
23026 RESTORE_REGS
23027 lss 12+4(%esp), %esp # back to espfix stack
23028 CFI_ADJUST_CFA_OFFSET -24
23029 jmp irq_return
23030 #endif
23031 CFI_ENDPROC
23032-END(nmi)
23033+ENDPROC(nmi)
23034
23035 ENTRY(int3)
23036 RING0_INT_FRAME
23037@@ -1411,14 +1660,14 @@ ENTRY(int3)
23038 call do_int3
23039 jmp ret_from_exception
23040 CFI_ENDPROC
23041-END(int3)
23042+ENDPROC(int3)
23043
23044 ENTRY(general_protection)
23045 RING0_EC_FRAME
23046 pushl_cfi $do_general_protection
23047 jmp error_code
23048 CFI_ENDPROC
23049-END(general_protection)
23050+ENDPROC(general_protection)
23051
23052 #ifdef CONFIG_KVM_GUEST
23053 ENTRY(async_page_fault)
23054@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23055 pushl_cfi $do_async_page_fault
23056 jmp error_code
23057 CFI_ENDPROC
23058-END(async_page_fault)
23059+ENDPROC(async_page_fault)
23060 #endif
23061
23062diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23063index f0095a7..ec77893 100644
23064--- a/arch/x86/kernel/entry_64.S
23065+++ b/arch/x86/kernel/entry_64.S
23066@@ -59,6 +59,8 @@
23067 #include <asm/smap.h>
23068 #include <asm/pgtable_types.h>
23069 #include <linux/err.h>
23070+#include <asm/pgtable.h>
23071+#include <asm/alternative-asm.h>
23072
23073 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23074 #include <linux/elf-em.h>
23075@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23076 ENDPROC(native_usergs_sysret64)
23077 #endif /* CONFIG_PARAVIRT */
23078
23079+ .macro ljmpq sel, off
23080+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23081+ .byte 0x48; ljmp *1234f(%rip)
23082+ .pushsection .rodata
23083+ .align 16
23084+ 1234: .quad \off; .word \sel
23085+ .popsection
23086+#else
23087+ pushq $\sel
23088+ pushq $\off
23089+ lretq
23090+#endif
23091+ .endm
23092+
23093+ .macro pax_enter_kernel
23094+ pax_set_fptr_mask
23095+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23096+ call pax_enter_kernel
23097+#endif
23098+ .endm
23099+
23100+ .macro pax_exit_kernel
23101+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23102+ call pax_exit_kernel
23103+#endif
23104+
23105+ .endm
23106+
23107+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23108+ENTRY(pax_enter_kernel)
23109+ pushq %rdi
23110+
23111+#ifdef CONFIG_PARAVIRT
23112+ PV_SAVE_REGS(CLBR_RDI)
23113+#endif
23114+
23115+#ifdef CONFIG_PAX_KERNEXEC
23116+ GET_CR0_INTO_RDI
23117+ bts $16,%rdi
23118+ jnc 3f
23119+ mov %cs,%edi
23120+ cmp $__KERNEL_CS,%edi
23121+ jnz 2f
23122+1:
23123+#endif
23124+
23125+#ifdef CONFIG_PAX_MEMORY_UDEREF
23126+ 661: jmp 111f
23127+ .pushsection .altinstr_replacement, "a"
23128+ 662: ASM_NOP2
23129+ .popsection
23130+ .pushsection .altinstructions, "a"
23131+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23132+ .popsection
23133+ GET_CR3_INTO_RDI
23134+ cmp $0,%dil
23135+ jnz 112f
23136+ mov $__KERNEL_DS,%edi
23137+ mov %edi,%ss
23138+ jmp 111f
23139+112: cmp $1,%dil
23140+ jz 113f
23141+ ud2
23142+113: sub $4097,%rdi
23143+ bts $63,%rdi
23144+ SET_RDI_INTO_CR3
23145+ mov $__UDEREF_KERNEL_DS,%edi
23146+ mov %edi,%ss
23147+111:
23148+#endif
23149+
23150+#ifdef CONFIG_PARAVIRT
23151+ PV_RESTORE_REGS(CLBR_RDI)
23152+#endif
23153+
23154+ popq %rdi
23155+ pax_force_retaddr
23156+ retq
23157+
23158+#ifdef CONFIG_PAX_KERNEXEC
23159+2: ljmpq __KERNEL_CS,1b
23160+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23161+4: SET_RDI_INTO_CR0
23162+ jmp 1b
23163+#endif
23164+ENDPROC(pax_enter_kernel)
23165+
23166+ENTRY(pax_exit_kernel)
23167+ pushq %rdi
23168+
23169+#ifdef CONFIG_PARAVIRT
23170+ PV_SAVE_REGS(CLBR_RDI)
23171+#endif
23172+
23173+#ifdef CONFIG_PAX_KERNEXEC
23174+ mov %cs,%rdi
23175+ cmp $__KERNEXEC_KERNEL_CS,%edi
23176+ jz 2f
23177+ GET_CR0_INTO_RDI
23178+ bts $16,%rdi
23179+ jnc 4f
23180+1:
23181+#endif
23182+
23183+#ifdef CONFIG_PAX_MEMORY_UDEREF
23184+ 661: jmp 111f
23185+ .pushsection .altinstr_replacement, "a"
23186+ 662: ASM_NOP2
23187+ .popsection
23188+ .pushsection .altinstructions, "a"
23189+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23190+ .popsection
23191+ mov %ss,%edi
23192+ cmp $__UDEREF_KERNEL_DS,%edi
23193+ jnz 111f
23194+ GET_CR3_INTO_RDI
23195+ cmp $0,%dil
23196+ jz 112f
23197+ ud2
23198+112: add $4097,%rdi
23199+ bts $63,%rdi
23200+ SET_RDI_INTO_CR3
23201+ mov $__KERNEL_DS,%edi
23202+ mov %edi,%ss
23203+111:
23204+#endif
23205+
23206+#ifdef CONFIG_PARAVIRT
23207+ PV_RESTORE_REGS(CLBR_RDI);
23208+#endif
23209+
23210+ popq %rdi
23211+ pax_force_retaddr
23212+ retq
23213+
23214+#ifdef CONFIG_PAX_KERNEXEC
23215+2: GET_CR0_INTO_RDI
23216+ btr $16,%rdi
23217+ jnc 4f
23218+ ljmpq __KERNEL_CS,3f
23219+3: SET_RDI_INTO_CR0
23220+ jmp 1b
23221+4: ud2
23222+ jmp 4b
23223+#endif
23224+ENDPROC(pax_exit_kernel)
23225+#endif
23226+
23227+ .macro pax_enter_kernel_user
23228+ pax_set_fptr_mask
23229+#ifdef CONFIG_PAX_MEMORY_UDEREF
23230+ call pax_enter_kernel_user
23231+#endif
23232+ .endm
23233+
23234+ .macro pax_exit_kernel_user
23235+#ifdef CONFIG_PAX_MEMORY_UDEREF
23236+ call pax_exit_kernel_user
23237+#endif
23238+#ifdef CONFIG_PAX_RANDKSTACK
23239+ pushq %rax
23240+ pushq %r11
23241+ call pax_randomize_kstack
23242+ popq %r11
23243+ popq %rax
23244+#endif
23245+ .endm
23246+
23247+#ifdef CONFIG_PAX_MEMORY_UDEREF
23248+ENTRY(pax_enter_kernel_user)
23249+ pushq %rdi
23250+ pushq %rbx
23251+
23252+#ifdef CONFIG_PARAVIRT
23253+ PV_SAVE_REGS(CLBR_RDI)
23254+#endif
23255+
23256+ 661: jmp 111f
23257+ .pushsection .altinstr_replacement, "a"
23258+ 662: ASM_NOP2
23259+ .popsection
23260+ .pushsection .altinstructions, "a"
23261+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23262+ .popsection
23263+ GET_CR3_INTO_RDI
23264+ cmp $1,%dil
23265+ jnz 4f
23266+ sub $4097,%rdi
23267+ bts $63,%rdi
23268+ SET_RDI_INTO_CR3
23269+ jmp 3f
23270+111:
23271+
23272+ GET_CR3_INTO_RDI
23273+ mov %rdi,%rbx
23274+ add $__START_KERNEL_map,%rbx
23275+ sub phys_base(%rip),%rbx
23276+
23277+#ifdef CONFIG_PARAVIRT
23278+ cmpl $0, pv_info+PARAVIRT_enabled
23279+ jz 1f
23280+ pushq %rdi
23281+ i = 0
23282+ .rept USER_PGD_PTRS
23283+ mov i*8(%rbx),%rsi
23284+ mov $0,%sil
23285+ lea i*8(%rbx),%rdi
23286+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23287+ i = i + 1
23288+ .endr
23289+ popq %rdi
23290+ jmp 2f
23291+1:
23292+#endif
23293+
23294+ i = 0
23295+ .rept USER_PGD_PTRS
23296+ movb $0,i*8(%rbx)
23297+ i = i + 1
23298+ .endr
23299+
23300+2: SET_RDI_INTO_CR3
23301+
23302+#ifdef CONFIG_PAX_KERNEXEC
23303+ GET_CR0_INTO_RDI
23304+ bts $16,%rdi
23305+ SET_RDI_INTO_CR0
23306+#endif
23307+
23308+3:
23309+
23310+#ifdef CONFIG_PARAVIRT
23311+ PV_RESTORE_REGS(CLBR_RDI)
23312+#endif
23313+
23314+ popq %rbx
23315+ popq %rdi
23316+ pax_force_retaddr
23317+ retq
23318+4: ud2
23319+ENDPROC(pax_enter_kernel_user)
23320+
23321+ENTRY(pax_exit_kernel_user)
23322+ pushq %rdi
23323+ pushq %rbx
23324+
23325+#ifdef CONFIG_PARAVIRT
23326+ PV_SAVE_REGS(CLBR_RDI)
23327+#endif
23328+
23329+ GET_CR3_INTO_RDI
23330+ 661: jmp 1f
23331+ .pushsection .altinstr_replacement, "a"
23332+ 662: ASM_NOP2
23333+ .popsection
23334+ .pushsection .altinstructions, "a"
23335+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23336+ .popsection
23337+ cmp $0,%dil
23338+ jnz 3f
23339+ add $4097,%rdi
23340+ bts $63,%rdi
23341+ SET_RDI_INTO_CR3
23342+ jmp 2f
23343+1:
23344+
23345+ mov %rdi,%rbx
23346+
23347+#ifdef CONFIG_PAX_KERNEXEC
23348+ GET_CR0_INTO_RDI
23349+ btr $16,%rdi
23350+ jnc 3f
23351+ SET_RDI_INTO_CR0
23352+#endif
23353+
23354+ add $__START_KERNEL_map,%rbx
23355+ sub phys_base(%rip),%rbx
23356+
23357+#ifdef CONFIG_PARAVIRT
23358+ cmpl $0, pv_info+PARAVIRT_enabled
23359+ jz 1f
23360+ i = 0
23361+ .rept USER_PGD_PTRS
23362+ mov i*8(%rbx),%rsi
23363+ mov $0x67,%sil
23364+ lea i*8(%rbx),%rdi
23365+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23366+ i = i + 1
23367+ .endr
23368+ jmp 2f
23369+1:
23370+#endif
23371+
23372+ i = 0
23373+ .rept USER_PGD_PTRS
23374+ movb $0x67,i*8(%rbx)
23375+ i = i + 1
23376+ .endr
23377+2:
23378+
23379+#ifdef CONFIG_PARAVIRT
23380+ PV_RESTORE_REGS(CLBR_RDI)
23381+#endif
23382+
23383+ popq %rbx
23384+ popq %rdi
23385+ pax_force_retaddr
23386+ retq
23387+3: ud2
23388+ENDPROC(pax_exit_kernel_user)
23389+#endif
23390+
23391+ .macro pax_enter_kernel_nmi
23392+ pax_set_fptr_mask
23393+
23394+#ifdef CONFIG_PAX_KERNEXEC
23395+ GET_CR0_INTO_RDI
23396+ bts $16,%rdi
23397+ jc 110f
23398+ SET_RDI_INTO_CR0
23399+ or $2,%ebx
23400+110:
23401+#endif
23402+
23403+#ifdef CONFIG_PAX_MEMORY_UDEREF
23404+ 661: jmp 111f
23405+ .pushsection .altinstr_replacement, "a"
23406+ 662: ASM_NOP2
23407+ .popsection
23408+ .pushsection .altinstructions, "a"
23409+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23410+ .popsection
23411+ GET_CR3_INTO_RDI
23412+ cmp $0,%dil
23413+ jz 111f
23414+ sub $4097,%rdi
23415+ or $4,%ebx
23416+ bts $63,%rdi
23417+ SET_RDI_INTO_CR3
23418+ mov $__UDEREF_KERNEL_DS,%edi
23419+ mov %edi,%ss
23420+111:
23421+#endif
23422+ .endm
23423+
23424+ .macro pax_exit_kernel_nmi
23425+#ifdef CONFIG_PAX_KERNEXEC
23426+ btr $1,%ebx
23427+ jnc 110f
23428+ GET_CR0_INTO_RDI
23429+ btr $16,%rdi
23430+ SET_RDI_INTO_CR0
23431+110:
23432+#endif
23433+
23434+#ifdef CONFIG_PAX_MEMORY_UDEREF
23435+ btr $2,%ebx
23436+ jnc 111f
23437+ GET_CR3_INTO_RDI
23438+ add $4097,%rdi
23439+ bts $63,%rdi
23440+ SET_RDI_INTO_CR3
23441+ mov $__KERNEL_DS,%edi
23442+ mov %edi,%ss
23443+111:
23444+#endif
23445+ .endm
23446+
23447+ .macro pax_erase_kstack
23448+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23449+ call pax_erase_kstack
23450+#endif
23451+ .endm
23452+
23453+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23454+ENTRY(pax_erase_kstack)
23455+ pushq %rdi
23456+ pushq %rcx
23457+ pushq %rax
23458+ pushq %r11
23459+
23460+ GET_THREAD_INFO(%r11)
23461+ mov TI_lowest_stack(%r11), %rdi
23462+ mov $-0xBEEF, %rax
23463+ std
23464+
23465+1: mov %edi, %ecx
23466+ and $THREAD_SIZE_asm - 1, %ecx
23467+ shr $3, %ecx
23468+ repne scasq
23469+ jecxz 2f
23470+
23471+ cmp $2*8, %ecx
23472+ jc 2f
23473+
23474+ mov $2*8, %ecx
23475+ repe scasq
23476+ jecxz 2f
23477+ jne 1b
23478+
23479+2: cld
23480+ or $2*8, %rdi
23481+ mov %esp, %ecx
23482+ sub %edi, %ecx
23483+
23484+ cmp $THREAD_SIZE_asm, %rcx
23485+ jb 3f
23486+ ud2
23487+3:
23488+
23489+ shr $3, %ecx
23490+ rep stosq
23491+
23492+ mov TI_task_thread_sp0(%r11), %rdi
23493+ sub $256, %rdi
23494+ mov %rdi, TI_lowest_stack(%r11)
23495+
23496+ popq %r11
23497+ popq %rax
23498+ popq %rcx
23499+ popq %rdi
23500+ pax_force_retaddr
23501+ ret
23502+ENDPROC(pax_erase_kstack)
23503+#endif
23504
23505 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23506 #ifdef CONFIG_TRACE_IRQFLAGS
23507@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23508 .endm
23509
23510 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23511- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23512+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23513 jnc 1f
23514 TRACE_IRQS_ON_DEBUG
23515 1:
23516@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23517 js 1f /* negative -> in kernel */
23518 SWAPGS
23519 xorl %ebx,%ebx
23520-1: ret
23521+1:
23522+#ifdef CONFIG_PAX_MEMORY_UDEREF
23523+ testb $3, CS+8(%rsp)
23524+ jnz 1f
23525+ pax_enter_kernel
23526+ jmp 2f
23527+1: pax_enter_kernel_user
23528+2:
23529+#else
23530+ pax_enter_kernel
23531+#endif
23532+ pax_force_retaddr
23533+ ret
23534 CFI_ENDPROC
23535-END(save_paranoid)
23536+ENDPROC(save_paranoid)
23537+
23538+ENTRY(save_paranoid_nmi)
23539+ XCPT_FRAME 1 RDI+8
23540+ cld
23541+ movq_cfi rdi, RDI+8
23542+ movq_cfi rsi, RSI+8
23543+ movq_cfi rdx, RDX+8
23544+ movq_cfi rcx, RCX+8
23545+ movq_cfi rax, RAX+8
23546+ movq_cfi r8, R8+8
23547+ movq_cfi r9, R9+8
23548+ movq_cfi r10, R10+8
23549+ movq_cfi r11, R11+8
23550+ movq_cfi rbx, RBX+8
23551+ movq_cfi rbp, RBP+8
23552+ movq_cfi r12, R12+8
23553+ movq_cfi r13, R13+8
23554+ movq_cfi r14, R14+8
23555+ movq_cfi r15, R15+8
23556+ movl $1,%ebx
23557+ movl $MSR_GS_BASE,%ecx
23558+ rdmsr
23559+ testl %edx,%edx
23560+ js 1f /* negative -> in kernel */
23561+ SWAPGS
23562+ xorl %ebx,%ebx
23563+1: pax_enter_kernel_nmi
23564+ pax_force_retaddr
23565+ ret
23566+ CFI_ENDPROC
23567+ENDPROC(save_paranoid_nmi)
23568
23569 /*
23570 * A newly forked process directly context switches into this address.
23571@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23572
23573 RESTORE_REST
23574
23575- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23576+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23577 jz 1f
23578
23579 /*
23580@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23581 jmp int_ret_from_sys_call
23582
23583 1:
23584- subq $REST_SKIP, %rsp # leave space for volatiles
23585- CFI_ADJUST_CFA_OFFSET REST_SKIP
23586 movq %rbp, %rdi
23587 call *%rbx
23588 movl $0, RAX(%rsp)
23589 RESTORE_REST
23590 jmp int_ret_from_sys_call
23591 CFI_ENDPROC
23592-END(ret_from_fork)
23593+ENDPROC(ret_from_fork)
23594
23595 /*
23596 * System call entry. Up to 6 arguments in registers are supported.
23597@@ -324,7 +792,7 @@ END(ret_from_fork)
23598 ENTRY(system_call)
23599 CFI_STARTPROC simple
23600 CFI_SIGNAL_FRAME
23601- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23602+ CFI_DEF_CFA rsp,0
23603 CFI_REGISTER rip,rcx
23604 /*CFI_REGISTER rflags,r11*/
23605 SWAPGS_UNSAFE_STACK
23606@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23607
23608 movq %rsp,PER_CPU_VAR(old_rsp)
23609 movq PER_CPU_VAR(kernel_stack),%rsp
23610+ SAVE_ARGS 8*6, 0, rax_enosys=1
23611+ pax_enter_kernel_user
23612+
23613+#ifdef CONFIG_PAX_RANDKSTACK
23614+ pax_erase_kstack
23615+#endif
23616+
23617 /*
23618 * No need to follow this irqs off/on section - it's straight
23619 * and short:
23620 */
23621 ENABLE_INTERRUPTS(CLBR_NONE)
23622- SAVE_ARGS 8, 0, rax_enosys=1
23623 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23624 movq %rcx,RIP-ARGOFFSET(%rsp)
23625 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23626- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23627+ GET_THREAD_INFO(%rcx)
23628+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23629 jnz tracesys
23630 system_call_fastpath:
23631 #if __SYSCALL_MASK == ~0
23632@@ -376,10 +851,13 @@ ret_from_sys_call:
23633 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23634 * very bad.
23635 */
23636- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23637+ GET_THREAD_INFO(%rcx)
23638+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23639 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23640
23641 CFI_REMEMBER_STATE
23642+ pax_exit_kernel_user
23643+ pax_erase_kstack
23644 /*
23645 * sysretq will re-enable interrupts:
23646 */
23647@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23648
23649 /* Do syscall tracing */
23650 tracesys:
23651- leaq -REST_SKIP(%rsp), %rdi
23652+ movq %rsp, %rdi
23653 movq $AUDIT_ARCH_X86_64, %rsi
23654 call syscall_trace_enter_phase1
23655 test %rax, %rax
23656 jnz tracesys_phase2 /* if needed, run the slow path */
23657- LOAD_ARGS 0 /* else restore clobbered regs */
23658+
23659+ pax_erase_kstack
23660+
23661+ LOAD_ARGS /* else restore clobbered regs */
23662 jmp system_call_fastpath /* and return to the fast path */
23663
23664 tracesys_phase2:
23665@@ -415,12 +896,14 @@ tracesys_phase2:
23666 movq %rax,%rdx
23667 call syscall_trace_enter_phase2
23668
23669+ pax_erase_kstack
23670+
23671 /*
23672 * Reload arg registers from stack in case ptrace changed them.
23673 * We don't reload %rax because syscall_trace_entry_phase2() returned
23674 * the value it wants us to use in the table lookup.
23675 */
23676- LOAD_ARGS ARGOFFSET, 1
23677+ LOAD_ARGS 1
23678 RESTORE_REST
23679 #if __SYSCALL_MASK == ~0
23680 cmpq $__NR_syscall_max,%rax
23681@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23682 andl %edi,%edx
23683 jnz int_careful
23684 andl $~TS_COMPAT,TI_status(%rcx)
23685- jmp retint_swapgs
23686+ pax_exit_kernel_user
23687+ pax_erase_kstack
23688+ jmp retint_swapgs_pax
23689
23690 /* Either reschedule or signal or syscall exit tracking needed. */
23691 /* First do a reschedule test. */
23692@@ -497,7 +982,7 @@ int_restore_rest:
23693 TRACE_IRQS_OFF
23694 jmp int_with_check
23695 CFI_ENDPROC
23696-END(system_call)
23697+ENDPROC(system_call)
23698
23699 .macro FORK_LIKE func
23700 ENTRY(stub_\func)
23701@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23702 DEFAULT_FRAME 0 8 /* offset 8: return address */
23703 call sys_\func
23704 RESTORE_TOP_OF_STACK %r11, 8
23705- ret $REST_SKIP /* pop extended registers */
23706+ pax_force_retaddr
23707+ ret
23708 CFI_ENDPROC
23709-END(stub_\func)
23710+ENDPROC(stub_\func)
23711 .endm
23712
23713 .macro FIXED_FRAME label,func
23714@@ -522,9 +1008,10 @@ ENTRY(\label)
23715 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23716 call \func
23717 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23718+ pax_force_retaddr
23719 ret
23720 CFI_ENDPROC
23721-END(\label)
23722+ENDPROC(\label)
23723 .endm
23724
23725 FORK_LIKE clone
23726@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23727 RESTORE_REST
23728 jmp int_ret_from_sys_call
23729 CFI_ENDPROC
23730-END(stub_execve)
23731+ENDPROC(stub_execve)
23732
23733 ENTRY(stub_execveat)
23734 CFI_STARTPROC
23735@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23736 RESTORE_REST
23737 jmp int_ret_from_sys_call
23738 CFI_ENDPROC
23739-END(stub_execveat)
23740+ENDPROC(stub_execveat)
23741
23742 /*
23743 * sigreturn is special because it needs to restore all registers on return.
23744@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23745 RESTORE_REST
23746 jmp int_ret_from_sys_call
23747 CFI_ENDPROC
23748-END(stub_rt_sigreturn)
23749+ENDPROC(stub_rt_sigreturn)
23750
23751 #ifdef CONFIG_X86_X32_ABI
23752 ENTRY(stub_x32_rt_sigreturn)
23753@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23754 RESTORE_REST
23755 jmp int_ret_from_sys_call
23756 CFI_ENDPROC
23757-END(stub_x32_rt_sigreturn)
23758+ENDPROC(stub_x32_rt_sigreturn)
23759
23760 ENTRY(stub_x32_execve)
23761 CFI_STARTPROC
23762@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23763 RESTORE_REST
23764 jmp int_ret_from_sys_call
23765 CFI_ENDPROC
23766-END(stub_x32_execve)
23767+ENDPROC(stub_x32_execve)
23768
23769 ENTRY(stub_x32_execveat)
23770 CFI_STARTPROC
23771@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23772 RESTORE_REST
23773 jmp int_ret_from_sys_call
23774 CFI_ENDPROC
23775-END(stub_x32_execveat)
23776+ENDPROC(stub_x32_execveat)
23777
23778 #endif
23779
23780@@ -653,7 +1140,7 @@ vector=vector+1
23781 2: jmp common_interrupt
23782 .endr
23783 CFI_ENDPROC
23784-END(irq_entries_start)
23785+ENDPROC(irq_entries_start)
23786
23787 .previous
23788 END(interrupt)
23789@@ -670,28 +1157,29 @@ END(interrupt)
23790 /* 0(%rsp): ~(interrupt number) */
23791 .macro interrupt func
23792 /* reserve pt_regs for scratch regs and rbp */
23793- subq $ORIG_RAX-RBP, %rsp
23794- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23795+ subq $ORIG_RAX, %rsp
23796+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23797 cld
23798- /* start from rbp in pt_regs and jump over */
23799- movq_cfi rdi, (RDI-RBP)
23800- movq_cfi rsi, (RSI-RBP)
23801- movq_cfi rdx, (RDX-RBP)
23802- movq_cfi rcx, (RCX-RBP)
23803- movq_cfi rax, (RAX-RBP)
23804- movq_cfi r8, (R8-RBP)
23805- movq_cfi r9, (R9-RBP)
23806- movq_cfi r10, (R10-RBP)
23807- movq_cfi r11, (R11-RBP)
23808+ /* start from r15 in pt_regs and jump over */
23809+ movq_cfi rdi, RDI
23810+ movq_cfi rsi, RSI
23811+ movq_cfi rdx, RDX
23812+ movq_cfi rcx, RCX
23813+ movq_cfi rax, RAX
23814+ movq_cfi r8, R8
23815+ movq_cfi r9, R9
23816+ movq_cfi r10, R10
23817+ movq_cfi r11, R11
23818+ movq_cfi r12, R12
23819
23820 /* Save rbp so that we can unwind from get_irq_regs() */
23821- movq_cfi rbp, 0
23822+ movq_cfi rbp, RBP
23823
23824 /* Save previous stack value */
23825 movq %rsp, %rsi
23826
23827- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23828- testl $3, CS-RBP(%rsi)
23829+ movq %rsp,%rdi /* arg1 for handler */
23830+ testb $3, CS(%rsi)
23831 je 1f
23832 SWAPGS
23833 /*
23834@@ -711,6 +1199,18 @@ END(interrupt)
23835 0x06 /* DW_OP_deref */, \
23836 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23837 0x22 /* DW_OP_plus */
23838+
23839+#ifdef CONFIG_PAX_MEMORY_UDEREF
23840+ testb $3, CS(%rdi)
23841+ jnz 1f
23842+ pax_enter_kernel
23843+ jmp 2f
23844+1: pax_enter_kernel_user
23845+2:
23846+#else
23847+ pax_enter_kernel
23848+#endif
23849+
23850 /* We entered an interrupt context - irqs are off: */
23851 TRACE_IRQS_OFF
23852
23853@@ -735,14 +1235,14 @@ ret_from_intr:
23854
23855 /* Restore saved previous stack */
23856 popq %rsi
23857- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23858- leaq ARGOFFSET-RBP(%rsi), %rsp
23859+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23860+ movq %rsi, %rsp
23861 CFI_DEF_CFA_REGISTER rsp
23862- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23863+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23864
23865 exit_intr:
23866 GET_THREAD_INFO(%rcx)
23867- testl $3,CS-ARGOFFSET(%rsp)
23868+ testb $3,CS-ARGOFFSET(%rsp)
23869 je retint_kernel
23870
23871 /* Interrupt came from user space */
23872@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23873 * The iretq could re-enable interrupts:
23874 */
23875 DISABLE_INTERRUPTS(CLBR_ANY)
23876+ pax_exit_kernel_user
23877+retint_swapgs_pax:
23878 TRACE_IRQS_IRETQ
23879
23880 /*
23881 * Try to use SYSRET instead of IRET if we're returning to
23882 * a completely clean 64-bit userspace context.
23883 */
23884- movq (RCX-R11)(%rsp), %rcx
23885- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23886+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23887+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23888 jne opportunistic_sysret_failed
23889
23890 /*
23891@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23892 shr $__VIRTUAL_MASK_SHIFT, %rcx
23893 jnz opportunistic_sysret_failed
23894
23895- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23896+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23897 jne opportunistic_sysret_failed
23898
23899 movq (R11-ARGOFFSET)(%rsp), %r11
23900@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel
23905+
23906+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908+ * namely calling EFI runtime services with a phys mapping. We're
23909+ * starting off with NOPs and patch in the real instrumentation
23910+ * (BTS/OR) before starting any userland process; even before starting
23911+ * up the APs.
23912+ */
23913+ .pushsection .altinstr_replacement, "a"
23914+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23915+ 602:
23916+ .popsection
23917+ 603: .fill 602b-601b, 1, 0x90
23918+ .pushsection .altinstructions, "a"
23919+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920+ .popsection
23921+#else
23922+ pax_force_retaddr (RIP-ARGOFFSET)
23923+#endif
23924+
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932- movq (2*8)(%rsp),%rax /* RIP */
23933+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935- movq (3*8)(%rsp),%rax /* CS */
23936+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938- movq (4*8)(%rsp),%rax /* RFLAGS */
23939+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941- movq (6*8)(%rsp),%rax /* SS */
23942+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944- movq (5*8)(%rsp),%rax /* RSP */
23945+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953-END(common_interrupt)
23954+ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958@@ -951,7 +1474,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962-END(\sym)
23963+ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980+#ifdef CONFIG_SMP
23981+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982+ lea init_tss(%r13), %r13
23983+#else
23984+ lea init_tss(%rip), %r13
23985+#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993-END(\sym)
23994+ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998@@ -1167,9 +1696,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002+ pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005-END(native_load_gs_index)
24006+ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014+ pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017-END(do_softirq_own_stack)
24018+ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 #endif
24024 jmp error_exit
24025 CFI_ENDPROC
24026-END(xen_do_hypervisor_callback)
24027+ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035-END(xen_failsafe_callback)
24036+ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044- testl %ebx,%ebx /* swapgs needed? */
24045+ testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047+#ifdef CONFIG_PAX_MEMORY_UDEREF
24048+ pax_exit_kernel_user
24049+#else
24050+ pax_exit_kernel
24051+#endif
24052 TRACE_IRQS_IRETQ 0
24053 SWAPGS_UNSAFE_STACK
24054 RESTORE_ALL 8
24055 INTERRUPT_RETURN
24056 paranoid_restore:
24057+ pax_exit_kernel
24058 TRACE_IRQS_IRETQ_DEBUG 0
24059 RESTORE_ALL 8
24060+ pax_force_retaddr_bts
24061 INTERRUPT_RETURN
24062 CFI_ENDPROC
24063-END(paranoid_exit)
24064+ENDPROC(paranoid_exit)
24065
24066 /*
24067 * Exception entry point. This expects an error code/orig_rax on the stack.
24068@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24069 movq %r14, R14+8(%rsp)
24070 movq %r15, R15+8(%rsp)
24071 xorl %ebx,%ebx
24072- testl $3,CS+8(%rsp)
24073+ testb $3,CS+8(%rsp)
24074 je error_kernelspace
24075 error_swapgs:
24076 SWAPGS
24077 error_sti:
24078+#ifdef CONFIG_PAX_MEMORY_UDEREF
24079+ testb $3, CS+8(%rsp)
24080+ jnz 1f
24081+ pax_enter_kernel
24082+ jmp 2f
24083+1: pax_enter_kernel_user
24084+2:
24085+#else
24086+ pax_enter_kernel
24087+#endif
24088 TRACE_IRQS_OFF
24089+ pax_force_retaddr
24090 ret
24091
24092 /*
24093@@ -1422,7 +1971,7 @@ error_bad_iret:
24094 decl %ebx /* Return to usergs */
24095 jmp error_sti
24096 CFI_ENDPROC
24097-END(error_entry)
24098+ENDPROC(error_entry)
24099
24100
24101 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24102@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24103 DISABLE_INTERRUPTS(CLBR_NONE)
24104 TRACE_IRQS_OFF
24105 GET_THREAD_INFO(%rcx)
24106- testl %eax,%eax
24107+ testl $1,%eax
24108 jne retint_kernel
24109 LOCKDEP_SYS_EXIT_IRQ
24110 movl TI_flags(%rcx),%edx
24111@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24112 jnz retint_careful
24113 jmp retint_swapgs
24114 CFI_ENDPROC
24115-END(error_exit)
24116+ENDPROC(error_exit)
24117
24118 /*
24119 * Test if a given stack is an NMI stack or not.
24120@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24121 * If %cs was not the kernel segment, then the NMI triggered in user
24122 * space, which means it is definitely not nested.
24123 */
24124+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24125+ je 1f
24126 cmpl $__KERNEL_CS, 16(%rsp)
24127 jne first_nmi
24128-
24129+1:
24130 /*
24131 * Check the special variable on the stack to see if NMIs are
24132 * executing.
24133@@ -1536,8 +2087,7 @@ nested_nmi:
24134
24135 1:
24136 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24137- leaq -1*8(%rsp), %rdx
24138- movq %rdx, %rsp
24139+ subq $8, %rsp
24140 CFI_ADJUST_CFA_OFFSET 1*8
24141 leaq -10*8(%rsp), %rdx
24142 pushq_cfi $__KERNEL_DS
24143@@ -1555,6 +2105,7 @@ nested_nmi_out:
24144 CFI_RESTORE rdx
24145
24146 /* No need to check faults here */
24147+# pax_force_retaddr_bts
24148 INTERRUPT_RETURN
24149
24150 CFI_RESTORE_STATE
24151@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24152 subq $ORIG_RAX-R15, %rsp
24153 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24154 /*
24155- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24156+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24157 * as we should not be calling schedule in NMI context.
24158 * Even with normal interrupts enabled. An NMI should not be
24159 * setting NEED_RESCHED or anything that normal interrupts and
24160 * exceptions might do.
24161 */
24162- call save_paranoid
24163+ call save_paranoid_nmi
24164 DEFAULT_FRAME 0
24165
24166 /*
24167@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24168 * NMI itself takes a page fault, the page fault that was preempted
24169 * will read the information from the NMI page fault and not the
24170 * origin fault. Save it off and restore it if it changes.
24171- * Use the r12 callee-saved register.
24172+ * Use the r13 callee-saved register.
24173 */
24174- movq %cr2, %r12
24175+ movq %cr2, %r13
24176
24177 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24178 movq %rsp,%rdi
24179@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24180
24181 /* Did the NMI take a page fault? Restore cr2 if it did */
24182 movq %cr2, %rcx
24183- cmpq %rcx, %r12
24184+ cmpq %rcx, %r13
24185 je 1f
24186- movq %r12, %cr2
24187+ movq %r13, %cr2
24188 1:
24189
24190- testl %ebx,%ebx /* swapgs needed? */
24191+ testl $1,%ebx /* swapgs needed? */
24192 jnz nmi_restore
24193 nmi_swapgs:
24194 SWAPGS_UNSAFE_STACK
24195 nmi_restore:
24196+ pax_exit_kernel_nmi
24197 /* Pop the extra iret frame at once */
24198 RESTORE_ALL 6*8
24199+ testb $3, 8(%rsp)
24200+ jnz 1f
24201+ pax_force_retaddr_bts
24202+1:
24203
24204 /* Clear the NMI executing stack variable */
24205 movq $0, 5*8(%rsp)
24206 jmp irq_return
24207 CFI_ENDPROC
24208-END(nmi)
24209+ENDPROC(nmi)
24210
24211 ENTRY(ignore_sysret)
24212 CFI_STARTPROC
24213 mov $-ENOSYS,%eax
24214 sysret
24215 CFI_ENDPROC
24216-END(ignore_sysret)
24217+ENDPROC(ignore_sysret)
24218
24219diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24220index f5d0730..5bce89c 100644
24221--- a/arch/x86/kernel/espfix_64.c
24222+++ b/arch/x86/kernel/espfix_64.c
24223@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24224 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24225 static void *espfix_pages[ESPFIX_MAX_PAGES];
24226
24227-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24228- __aligned(PAGE_SIZE);
24229+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24230
24231 static unsigned int page_random, slot_random;
24232
24233@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24234 void __init init_espfix_bsp(void)
24235 {
24236 pgd_t *pgd_p;
24237+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24238
24239 /* Install the espfix pud into the kernel page directory */
24240- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24241+ pgd_p = &init_level4_pgt[index];
24242 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24243
24244+#ifdef CONFIG_PAX_PER_CPU_PGD
24245+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24246+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24247+#endif
24248+
24249 /* Randomize the locations */
24250 init_espfix_random();
24251
24252@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24253 set_pte(&pte_p[n*PTE_STRIDE], pte);
24254
24255 /* Job is done for this CPU and any CPU which shares this page */
24256- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24257+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24258
24259 unlock_done:
24260 mutex_unlock(&espfix_init_mutex);
24261diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24262index 8b7b0a5..2395f29 100644
24263--- a/arch/x86/kernel/ftrace.c
24264+++ b/arch/x86/kernel/ftrace.c
24265@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24266 * kernel identity mapping to modify code.
24267 */
24268 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24269- ip = (unsigned long)__va(__pa_symbol(ip));
24270+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24271
24272 return ip;
24273 }
24274@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24275 {
24276 unsigned char replaced[MCOUNT_INSN_SIZE];
24277
24278+ ip = ktla_ktva(ip);
24279+
24280 /*
24281 * Note: Due to modules and __init, code can
24282 * disappear and change, we need to protect against faulting
24283@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24284 unsigned char old[MCOUNT_INSN_SIZE];
24285 int ret;
24286
24287- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24288+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24289
24290 ftrace_update_func = ip;
24291 /* Make sure the breakpoints see the ftrace_update_func update */
24292@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24293 unsigned char replaced[MCOUNT_INSN_SIZE];
24294 unsigned char brk = BREAKPOINT_INSTRUCTION;
24295
24296- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24297+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24298 return -EFAULT;
24299
24300 /* Make sure it is what we expect it to be */
24301diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24302index b111ab5..3d419ea 100644
24303--- a/arch/x86/kernel/head64.c
24304+++ b/arch/x86/kernel/head64.c
24305@@ -68,12 +68,12 @@ again:
24306 pgd = *pgd_p;
24307
24308 /*
24309- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24310- * critical -- __PAGE_OFFSET would point us back into the dynamic
24311+ * The use of __early_va rather than __va here is critical:
24312+ * __va would point us back into the dynamic
24313 * range and we might end up looping forever...
24314 */
24315 if (pgd)
24316- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24317+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24318 else {
24319 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24320 reset_early_page_tables();
24321@@ -83,13 +83,13 @@ again:
24322 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24323 for (i = 0; i < PTRS_PER_PUD; i++)
24324 pud_p[i] = 0;
24325- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24326+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24327 }
24328 pud_p += pud_index(address);
24329 pud = *pud_p;
24330
24331 if (pud)
24332- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24333+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24334 else {
24335 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24336 reset_early_page_tables();
24337@@ -99,7 +99,7 @@ again:
24338 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24339 for (i = 0; i < PTRS_PER_PMD; i++)
24340 pmd_p[i] = 0;
24341- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24342+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24343 }
24344 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24345 pmd_p[pmd_index(address)] = pmd;
24346@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24347 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24348 early_printk("Kernel alive\n");
24349
24350- clear_page(init_level4_pgt);
24351 /* set init_level4_pgt kernel high mapping*/
24352 init_level4_pgt[511] = early_level4_pgt[511];
24353
24354diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24355index 30a2aa3..d62e1dd 100644
24356--- a/arch/x86/kernel/head_32.S
24357+++ b/arch/x86/kernel/head_32.S
24358@@ -26,6 +26,12 @@
24359 /* Physical address */
24360 #define pa(X) ((X) - __PAGE_OFFSET)
24361
24362+#ifdef CONFIG_PAX_KERNEXEC
24363+#define ta(X) (X)
24364+#else
24365+#define ta(X) ((X) - __PAGE_OFFSET)
24366+#endif
24367+
24368 /*
24369 * References to members of the new_cpu_data structure.
24370 */
24371@@ -55,11 +61,7 @@
24372 * and small than max_low_pfn, otherwise will waste some page table entries
24373 */
24374
24375-#if PTRS_PER_PMD > 1
24376-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24377-#else
24378-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24379-#endif
24380+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24381
24382 /* Number of possible pages in the lowmem region */
24383 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24384@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24385 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24386
24387 /*
24388+ * Real beginning of normal "text" segment
24389+ */
24390+ENTRY(stext)
24391+ENTRY(_stext)
24392+
24393+/*
24394 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24395 * %esi points to the real-mode code as a 32-bit pointer.
24396 * CS and DS must be 4 GB flat segments, but we don't depend on
24397@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24398 * can.
24399 */
24400 __HEAD
24401+
24402+#ifdef CONFIG_PAX_KERNEXEC
24403+ jmp startup_32
24404+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24405+.fill PAGE_SIZE-5,1,0xcc
24406+#endif
24407+
24408 ENTRY(startup_32)
24409 movl pa(stack_start),%ecx
24410
24411@@ -106,6 +121,59 @@ ENTRY(startup_32)
24412 2:
24413 leal -__PAGE_OFFSET(%ecx),%esp
24414
24415+#ifdef CONFIG_SMP
24416+ movl $pa(cpu_gdt_table),%edi
24417+ movl $__per_cpu_load,%eax
24418+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24419+ rorl $16,%eax
24420+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24421+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24422+ movl $__per_cpu_end - 1,%eax
24423+ subl $__per_cpu_start,%eax
24424+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24425+#endif
24426+
24427+#ifdef CONFIG_PAX_MEMORY_UDEREF
24428+ movl $NR_CPUS,%ecx
24429+ movl $pa(cpu_gdt_table),%edi
24430+1:
24431+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24432+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24433+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24434+ addl $PAGE_SIZE_asm,%edi
24435+ loop 1b
24436+#endif
24437+
24438+#ifdef CONFIG_PAX_KERNEXEC
24439+ movl $pa(boot_gdt),%edi
24440+ movl $__LOAD_PHYSICAL_ADDR,%eax
24441+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24442+ rorl $16,%eax
24443+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24444+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24445+ rorl $16,%eax
24446+
24447+ ljmp $(__BOOT_CS),$1f
24448+1:
24449+
24450+ movl $NR_CPUS,%ecx
24451+ movl $pa(cpu_gdt_table),%edi
24452+ addl $__PAGE_OFFSET,%eax
24453+1:
24454+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24455+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24456+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24457+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24458+ rorl $16,%eax
24459+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24460+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24461+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24462+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24463+ rorl $16,%eax
24464+ addl $PAGE_SIZE_asm,%edi
24465+ loop 1b
24466+#endif
24467+
24468 /*
24469 * Clear BSS first so that there are no surprises...
24470 */
24471@@ -201,8 +269,11 @@ ENTRY(startup_32)
24472 movl %eax, pa(max_pfn_mapped)
24473
24474 /* Do early initialization of the fixmap area */
24475- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24476- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24477+#ifdef CONFIG_COMPAT_VDSO
24478+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24479+#else
24480+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24481+#endif
24482 #else /* Not PAE */
24483
24484 page_pde_offset = (__PAGE_OFFSET >> 20);
24485@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24486 movl %eax, pa(max_pfn_mapped)
24487
24488 /* Do early initialization of the fixmap area */
24489- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24490- movl %eax,pa(initial_page_table+0xffc)
24491+#ifdef CONFIG_COMPAT_VDSO
24492+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24493+#else
24494+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24495+#endif
24496 #endif
24497
24498 #ifdef CONFIG_PARAVIRT
24499@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24500 cmpl $num_subarch_entries, %eax
24501 jae bad_subarch
24502
24503- movl pa(subarch_entries)(,%eax,4), %eax
24504- subl $__PAGE_OFFSET, %eax
24505- jmp *%eax
24506+ jmp *pa(subarch_entries)(,%eax,4)
24507
24508 bad_subarch:
24509 WEAK(lguest_entry)
24510@@ -261,10 +333,10 @@ WEAK(xen_entry)
24511 __INITDATA
24512
24513 subarch_entries:
24514- .long default_entry /* normal x86/PC */
24515- .long lguest_entry /* lguest hypervisor */
24516- .long xen_entry /* Xen hypervisor */
24517- .long default_entry /* Moorestown MID */
24518+ .long ta(default_entry) /* normal x86/PC */
24519+ .long ta(lguest_entry) /* lguest hypervisor */
24520+ .long ta(xen_entry) /* Xen hypervisor */
24521+ .long ta(default_entry) /* Moorestown MID */
24522 num_subarch_entries = (. - subarch_entries) / 4
24523 .previous
24524 #else
24525@@ -354,6 +426,7 @@ default_entry:
24526 movl pa(mmu_cr4_features),%eax
24527 movl %eax,%cr4
24528
24529+#ifdef CONFIG_X86_PAE
24530 testb $X86_CR4_PAE, %al # check if PAE is enabled
24531 jz enable_paging
24532
24533@@ -382,6 +455,9 @@ default_entry:
24534 /* Make changes effective */
24535 wrmsr
24536
24537+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24538+#endif
24539+
24540 enable_paging:
24541
24542 /*
24543@@ -449,14 +525,20 @@ is486:
24544 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24545 movl %eax,%ss # after changing gdt.
24546
24547- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24548+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24549 movl %eax,%ds
24550 movl %eax,%es
24551
24552 movl $(__KERNEL_PERCPU), %eax
24553 movl %eax,%fs # set this cpu's percpu
24554
24555+#ifdef CONFIG_CC_STACKPROTECTOR
24556 movl $(__KERNEL_STACK_CANARY),%eax
24557+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24558+ movl $(__USER_DS),%eax
24559+#else
24560+ xorl %eax,%eax
24561+#endif
24562 movl %eax,%gs
24563
24564 xorl %eax,%eax # Clear LDT
24565@@ -513,8 +595,11 @@ setup_once:
24566 * relocation. Manually set base address in stack canary
24567 * segment descriptor.
24568 */
24569- movl $gdt_page,%eax
24570+ movl $cpu_gdt_table,%eax
24571 movl $stack_canary,%ecx
24572+#ifdef CONFIG_SMP
24573+ addl $__per_cpu_load,%ecx
24574+#endif
24575 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24576 shrl $16, %ecx
24577 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24578@@ -551,7 +636,7 @@ early_idt_handler_common:
24579 cmpl $2,(%esp) # X86_TRAP_NMI
24580 je is_nmi # Ignore NMI
24581
24582- cmpl $2,%ss:early_recursion_flag
24583+ cmpl $1,%ss:early_recursion_flag
24584 je hlt_loop
24585 incl %ss:early_recursion_flag
24586
24587@@ -589,8 +674,8 @@ early_idt_handler_common:
24588 pushl (20+6*4)(%esp) /* trapno */
24589 pushl $fault_msg
24590 call printk
24591-#endif
24592 call dump_stack
24593+#endif
24594 hlt_loop:
24595 hlt
24596 jmp hlt_loop
24597@@ -610,8 +695,11 @@ ENDPROC(early_idt_handler_common)
24598 /* This is the default interrupt "handler" :-) */
24599 ALIGN
24600 ignore_int:
24601- cld
24602 #ifdef CONFIG_PRINTK
24603+ cmpl $2,%ss:early_recursion_flag
24604+ je hlt_loop
24605+ incl %ss:early_recursion_flag
24606+ cld
24607 pushl %eax
24608 pushl %ecx
24609 pushl %edx
24610@@ -620,9 +708,6 @@ ignore_int:
24611 movl $(__KERNEL_DS),%eax
24612 movl %eax,%ds
24613 movl %eax,%es
24614- cmpl $2,early_recursion_flag
24615- je hlt_loop
24616- incl early_recursion_flag
24617 pushl 16(%esp)
24618 pushl 24(%esp)
24619 pushl 32(%esp)
24620@@ -656,29 +741,34 @@ ENTRY(setup_once_ref)
24621 /*
24622 * BSS section
24623 */
24624-__PAGE_ALIGNED_BSS
24625- .align PAGE_SIZE
24626 #ifdef CONFIG_X86_PAE
24627+.section .initial_pg_pmd,"a",@progbits
24628 initial_pg_pmd:
24629 .fill 1024*KPMDS,4,0
24630 #else
24631+.section .initial_page_table,"a",@progbits
24632 ENTRY(initial_page_table)
24633 .fill 1024,4,0
24634 #endif
24635+.section .initial_pg_fixmap,"a",@progbits
24636 initial_pg_fixmap:
24637 .fill 1024,4,0
24638+.section .empty_zero_page,"a",@progbits
24639 ENTRY(empty_zero_page)
24640 .fill 4096,1,0
24641+.section .swapper_pg_dir,"a",@progbits
24642 ENTRY(swapper_pg_dir)
24643+#ifdef CONFIG_X86_PAE
24644+ .fill 4,8,0
24645+#else
24646 .fill 1024,4,0
24647+#endif
24648
24649 /*
24650 * This starts the data section.
24651 */
24652 #ifdef CONFIG_X86_PAE
24653-__PAGE_ALIGNED_DATA
24654- /* Page-aligned for the benefit of paravirt? */
24655- .align PAGE_SIZE
24656+.section .initial_page_table,"a",@progbits
24657 ENTRY(initial_page_table)
24658 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24659 # if KPMDS == 3
24660@@ -697,12 +787,20 @@ ENTRY(initial_page_table)
24661 # error "Kernel PMDs should be 1, 2 or 3"
24662 # endif
24663 .align PAGE_SIZE /* needs to be page-sized too */
24664+
24665+#ifdef CONFIG_PAX_PER_CPU_PGD
24666+ENTRY(cpu_pgd)
24667+ .rept 2*NR_CPUS
24668+ .fill 4,8,0
24669+ .endr
24670+#endif
24671+
24672 #endif
24673
24674 .data
24675 .balign 4
24676 ENTRY(stack_start)
24677- .long init_thread_union+THREAD_SIZE
24678+ .long init_thread_union+THREAD_SIZE-8
24679
24680 __INITRODATA
24681 int_msg:
24682@@ -730,7 +828,7 @@ fault_msg:
24683 * segment size, and 32-bit linear address value:
24684 */
24685
24686- .data
24687+.section .rodata,"a",@progbits
24688 .globl boot_gdt_descr
24689 .globl idt_descr
24690
24691@@ -739,7 +837,7 @@ fault_msg:
24692 .word 0 # 32 bit align gdt_desc.address
24693 boot_gdt_descr:
24694 .word __BOOT_DS+7
24695- .long boot_gdt - __PAGE_OFFSET
24696+ .long pa(boot_gdt)
24697
24698 .word 0 # 32-bit align idt_desc.address
24699 idt_descr:
24700@@ -750,7 +848,7 @@ idt_descr:
24701 .word 0 # 32 bit align gdt_desc.address
24702 ENTRY(early_gdt_descr)
24703 .word GDT_ENTRIES*8-1
24704- .long gdt_page /* Overwritten for secondary CPUs */
24705+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24706
24707 /*
24708 * The boot_gdt must mirror the equivalent in setup.S and is
24709@@ -759,5 +857,65 @@ ENTRY(early_gdt_descr)
24710 .align L1_CACHE_BYTES
24711 ENTRY(boot_gdt)
24712 .fill GDT_ENTRY_BOOT_CS,8,0
24713- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24714- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24715+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24716+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24717+
24718+ .align PAGE_SIZE_asm
24719+ENTRY(cpu_gdt_table)
24720+ .rept NR_CPUS
24721+ .quad 0x0000000000000000 /* NULL descriptor */
24722+ .quad 0x0000000000000000 /* 0x0b reserved */
24723+ .quad 0x0000000000000000 /* 0x13 reserved */
24724+ .quad 0x0000000000000000 /* 0x1b reserved */
24725+
24726+#ifdef CONFIG_PAX_KERNEXEC
24727+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24728+#else
24729+ .quad 0x0000000000000000 /* 0x20 unused */
24730+#endif
24731+
24732+ .quad 0x0000000000000000 /* 0x28 unused */
24733+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24734+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24735+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24736+ .quad 0x0000000000000000 /* 0x4b reserved */
24737+ .quad 0x0000000000000000 /* 0x53 reserved */
24738+ .quad 0x0000000000000000 /* 0x5b reserved */
24739+
24740+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24741+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24742+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24743+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24744+
24745+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24746+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24747+
24748+ /*
24749+ * Segments used for calling PnP BIOS have byte granularity.
24750+ * The code segments and data segments have fixed 64k limits,
24751+ * the transfer segment sizes are set at run time.
24752+ */
24753+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24754+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24755+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24756+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24757+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24758+
24759+ /*
24760+ * The APM segments have byte granularity and their bases
24761+ * are set at run time. All have 64k limits.
24762+ */
24763+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24764+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24765+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24766+
24767+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24768+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24769+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24770+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24771+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24772+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24773+
24774+ /* Be sure this is zeroed to avoid false validations in Xen */
24775+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24776+ .endr
24777diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24778index f8a8406..ad6d014 100644
24779--- a/arch/x86/kernel/head_64.S
24780+++ b/arch/x86/kernel/head_64.S
24781@@ -20,6 +20,8 @@
24782 #include <asm/processor-flags.h>
24783 #include <asm/percpu.h>
24784 #include <asm/nops.h>
24785+#include <asm/cpufeature.h>
24786+#include <asm/alternative-asm.h>
24787
24788 #ifdef CONFIG_PARAVIRT
24789 #include <asm/asm-offsets.h>
24790@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24791 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24792 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24793 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24794+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24795+L3_VMALLOC_START = pud_index(VMALLOC_START)
24796+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24797+L3_VMALLOC_END = pud_index(VMALLOC_END)
24798+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24799+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24800
24801 .text
24802 __HEAD
24803@@ -89,11 +97,26 @@ startup_64:
24804 * Fixup the physical addresses in the page table
24805 */
24806 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24807+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24808+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24809+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24810+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24811+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24812
24813- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24814- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24815+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24816+#ifndef CONFIG_XEN
24817+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24818+#endif
24819
24820+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24821+
24822+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24823+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24824+
24825+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24826+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24827 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24828+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24829
24830 /*
24831 * Set up the identity mapping for the switchover. These
24832@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24833 * after the boot processor executes this code.
24834 */
24835
24836+ orq $-1, %rbp
24837 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24838 1:
24839
24840- /* Enable PAE mode and PGE */
24841- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24842+ /* Enable PAE mode and PSE/PGE */
24843+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24844 movq %rcx, %cr4
24845
24846 /* Setup early boot stage 4 level pagetables. */
24847@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24848 movl $MSR_EFER, %ecx
24849 rdmsr
24850 btsl $_EFER_SCE, %eax /* Enable System Call */
24851- btl $20,%edi /* No Execute supported? */
24852+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24853 jnc 1f
24854 btsl $_EFER_NX, %eax
24855+ cmpq $-1, %rbp
24856+ je 1f
24857 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24858+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24859+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24860+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24861+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24862+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24863+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24864+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24865+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24866+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24867 1: wrmsr /* Make changes effective */
24868
24869 /* Setup cr0 */
24870@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24871 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24872 * address given in m16:64.
24873 */
24874+ pax_set_fptr_mask
24875 movq initial_code(%rip),%rax
24876 pushq $0 # fake return address to stop unwinder
24877 pushq $__KERNEL_CS # set correct cs
24878@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24879 .quad INIT_PER_CPU_VAR(irq_stack_union)
24880
24881 GLOBAL(stack_start)
24882- .quad init_thread_union+THREAD_SIZE-8
24883+ .quad init_thread_union+THREAD_SIZE-16
24884 .word 0
24885 __FINITDATA
24886
24887@@ -393,7 +429,7 @@ early_idt_handler_common:
24888 call dump_stack
24889 #ifdef CONFIG_KALLSYMS
24890 leaq early_idt_ripmsg(%rip),%rdi
24891- movq 40(%rsp),%rsi # %rip again
24892+ movq 88(%rsp),%rsi # %rip again
24893 call __print_symbol
24894 #endif
24895 #endif /* EARLY_PRINTK */
24896@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24897 early_recursion_flag:
24898 .long 0
24899
24900+ .section .rodata,"a",@progbits
24901 #ifdef CONFIG_EARLY_PRINTK
24902 early_idt_msg:
24903 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24904@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
24905 NEXT_PAGE(early_dynamic_pgts)
24906 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24907
24908- .data
24909+ .section .rodata,"a",@progbits
24910
24911-#ifndef CONFIG_XEN
24912 NEXT_PAGE(init_level4_pgt)
24913- .fill 512,8,0
24914-#else
24915-NEXT_PAGE(init_level4_pgt)
24916- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24917 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24918 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24919+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24920+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24921+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24922+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24923+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24924+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24925 .org init_level4_pgt + L4_START_KERNEL*8, 0
24926 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24927 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24928
24929+#ifdef CONFIG_PAX_PER_CPU_PGD
24930+NEXT_PAGE(cpu_pgd)
24931+ .rept 2*NR_CPUS
24932+ .fill 512,8,0
24933+ .endr
24934+#endif
24935+
24936 NEXT_PAGE(level3_ident_pgt)
24937 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24938+#ifdef CONFIG_XEN
24939 .fill 511, 8, 0
24940+#else
24941+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24942+ .fill 510,8,0
24943+#endif
24944+
24945+NEXT_PAGE(level3_vmalloc_start_pgt)
24946+ .fill 512,8,0
24947+
24948+NEXT_PAGE(level3_vmalloc_end_pgt)
24949+ .fill 512,8,0
24950+
24951+NEXT_PAGE(level3_vmemmap_pgt)
24952+ .fill L3_VMEMMAP_START,8,0
24953+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24954+
24955 NEXT_PAGE(level2_ident_pgt)
24956- /* Since I easily can, map the first 1G.
24957+ /* Since I easily can, map the first 2G.
24958 * Don't set NX because code runs from these pages.
24959 */
24960- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24961-#endif
24962+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24963
24964 NEXT_PAGE(level3_kernel_pgt)
24965 .fill L3_START_KERNEL,8,0
24966@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
24967 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24968 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24969
24970+NEXT_PAGE(level2_vmemmap_pgt)
24971+ .fill 512,8,0
24972+
24973 NEXT_PAGE(level2_kernel_pgt)
24974 /*
24975 * 512 MB kernel mapping. We spend a full page on this pagetable
24976@@ -494,23 +557,61 @@ NEXT_PAGE(level2_kernel_pgt)
24977 KERNEL_IMAGE_SIZE/PMD_SIZE)
24978
24979 NEXT_PAGE(level2_fixmap_pgt)
24980- .fill 506,8,0
24981- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24982- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24983- .fill 5,8,0
24984+ .fill 504,8,0
24985+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
24986+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
24987+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
24988+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24989+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24990+ .fill 4,8,0
24991
24992 NEXT_PAGE(level1_fixmap_pgt)
24993+ .fill 3*512,8,0
24994+
24995+NEXT_PAGE(level1_vsyscall_pgt)
24996 .fill 512,8,0
24997
24998 #undef PMDS
24999
25000- .data
25001+ .align PAGE_SIZE
25002+ENTRY(cpu_gdt_table)
25003+ .rept NR_CPUS
25004+ .quad 0x0000000000000000 /* NULL descriptor */
25005+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25006+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25007+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25008+ .quad 0x00cffb000000ffff /* __USER32_CS */
25009+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25010+ .quad 0x00affb000000ffff /* __USER_CS */
25011+
25012+#ifdef CONFIG_PAX_KERNEXEC
25013+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25014+#else
25015+ .quad 0x0 /* unused */
25016+#endif
25017+
25018+ .quad 0,0 /* TSS */
25019+ .quad 0,0 /* LDT */
25020+ .quad 0,0,0 /* three TLS descriptors */
25021+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25022+ /* asm/segment.h:GDT_ENTRIES must match this */
25023+
25024+#ifdef CONFIG_PAX_MEMORY_UDEREF
25025+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25026+#else
25027+ .quad 0x0 /* unused */
25028+#endif
25029+
25030+ /* zero the remaining page */
25031+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25032+ .endr
25033+
25034 .align 16
25035 .globl early_gdt_descr
25036 early_gdt_descr:
25037 .word GDT_ENTRIES*8-1
25038 early_gdt_descr_base:
25039- .quad INIT_PER_CPU_VAR(gdt_page)
25040+ .quad cpu_gdt_table
25041
25042 ENTRY(phys_base)
25043 /* This must match the first entry in level2_kernel_pgt */
25044@@ -534,8 +635,8 @@ NEXT_PAGE(kasan_zero_pud)
25045
25046
25047 #include "../../x86/xen/xen-head.S"
25048-
25049- __PAGE_ALIGNED_BSS
25050+
25051+ .section .rodata,"a",@progbits
25052 NEXT_PAGE(empty_zero_page)
25053 .skip PAGE_SIZE
25054
25055diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25056index 05fd74f..c3548b1 100644
25057--- a/arch/x86/kernel/i386_ksyms_32.c
25058+++ b/arch/x86/kernel/i386_ksyms_32.c
25059@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25060 EXPORT_SYMBOL(cmpxchg8b_emu);
25061 #endif
25062
25063+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25064+
25065 /* Networking helper routines. */
25066 EXPORT_SYMBOL(csum_partial_copy_generic);
25067+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25068+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25069
25070 EXPORT_SYMBOL(__get_user_1);
25071 EXPORT_SYMBOL(__get_user_2);
25072@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25073 EXPORT_SYMBOL(___preempt_schedule_context);
25074 #endif
25075 #endif
25076+
25077+#ifdef CONFIG_PAX_KERNEXEC
25078+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25079+#endif
25080+
25081+#ifdef CONFIG_PAX_PER_CPU_PGD
25082+EXPORT_SYMBOL(cpu_pgd);
25083+#endif
25084diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25085index f341d56..d9b527b 100644
25086--- a/arch/x86/kernel/i387.c
25087+++ b/arch/x86/kernel/i387.c
25088@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25089 static inline bool interrupted_user_mode(void)
25090 {
25091 struct pt_regs *regs = get_irq_regs();
25092- return regs && user_mode_vm(regs);
25093+ return regs && user_mode(regs);
25094 }
25095
25096 /*
25097diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25098index e7cc537..67d7372 100644
25099--- a/arch/x86/kernel/i8259.c
25100+++ b/arch/x86/kernel/i8259.c
25101@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25102 static void make_8259A_irq(unsigned int irq)
25103 {
25104 disable_irq_nosync(irq);
25105- io_apic_irqs &= ~(1<<irq);
25106+ io_apic_irqs &= ~(1UL<<irq);
25107 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25108 enable_irq(irq);
25109 }
25110@@ -208,7 +208,7 @@ spurious_8259A_irq:
25111 "spurious 8259A interrupt: IRQ%d.\n", irq);
25112 spurious_irq_mask |= irqmask;
25113 }
25114- atomic_inc(&irq_err_count);
25115+ atomic_inc_unchecked(&irq_err_count);
25116 /*
25117 * Theoretically we do not have to handle this IRQ,
25118 * but in Linux this does not cause problems and is
25119@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25120 /* (slave's support for AEOI in flat mode is to be investigated) */
25121 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25122
25123+ pax_open_kernel();
25124 if (auto_eoi)
25125 /*
25126 * In AEOI mode we just have to mask the interrupt
25127 * when acking.
25128 */
25129- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25130+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25131 else
25132- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25133+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25134+ pax_close_kernel();
25135
25136 udelay(100); /* wait for 8259A to initialize */
25137
25138diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25139index a979b5b..1d6db75 100644
25140--- a/arch/x86/kernel/io_delay.c
25141+++ b/arch/x86/kernel/io_delay.c
25142@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25143 * Quirk table for systems that misbehave (lock up, etc.) if port
25144 * 0x80 is used:
25145 */
25146-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25147+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25148 {
25149 .callback = dmi_io_delay_0xed_port,
25150 .ident = "Compaq Presario V6000",
25151diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25152index 4ddaf66..49d5c18 100644
25153--- a/arch/x86/kernel/ioport.c
25154+++ b/arch/x86/kernel/ioport.c
25155@@ -6,6 +6,7 @@
25156 #include <linux/sched.h>
25157 #include <linux/kernel.h>
25158 #include <linux/capability.h>
25159+#include <linux/security.h>
25160 #include <linux/errno.h>
25161 #include <linux/types.h>
25162 #include <linux/ioport.h>
25163@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25164 return -EINVAL;
25165 if (turn_on && !capable(CAP_SYS_RAWIO))
25166 return -EPERM;
25167+#ifdef CONFIG_GRKERNSEC_IO
25168+ if (turn_on && grsec_disable_privio) {
25169+ gr_handle_ioperm();
25170+ return -ENODEV;
25171+ }
25172+#endif
25173
25174 /*
25175 * If it's the first ioperm() call in this thread's lifetime, set the
25176@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25177 * because the ->io_bitmap_max value must match the bitmap
25178 * contents:
25179 */
25180- tss = &per_cpu(init_tss, get_cpu());
25181+ tss = init_tss + get_cpu();
25182
25183 if (turn_on)
25184 bitmap_clear(t->io_bitmap_ptr, from, num);
25185@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25186 if (level > old) {
25187 if (!capable(CAP_SYS_RAWIO))
25188 return -EPERM;
25189+#ifdef CONFIG_GRKERNSEC_IO
25190+ if (grsec_disable_privio) {
25191+ gr_handle_iopl();
25192+ return -ENODEV;
25193+ }
25194+#endif
25195 }
25196 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25197 t->iopl = level << 12;
25198diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25199index 67b1cbe..6ad4cbc 100644
25200--- a/arch/x86/kernel/irq.c
25201+++ b/arch/x86/kernel/irq.c
25202@@ -22,7 +22,7 @@
25203 #define CREATE_TRACE_POINTS
25204 #include <asm/trace/irq_vectors.h>
25205
25206-atomic_t irq_err_count;
25207+atomic_unchecked_t irq_err_count;
25208
25209 /* Function pointer for generic interrupt vector handling */
25210 void (*x86_platform_ipi_callback)(void) = NULL;
25211@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25212 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25213 seq_puts(p, " Hypervisor callback interrupts\n");
25214 #endif
25215- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25216+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25217 #if defined(CONFIG_X86_IO_APIC)
25218- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25219+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25220 #endif
25221 return 0;
25222 }
25223@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25224
25225 u64 arch_irq_stat(void)
25226 {
25227- u64 sum = atomic_read(&irq_err_count);
25228+ u64 sum = atomic_read_unchecked(&irq_err_count);
25229 return sum;
25230 }
25231
25232diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25233index 28d28f5..e6cc9ae 100644
25234--- a/arch/x86/kernel/irq_32.c
25235+++ b/arch/x86/kernel/irq_32.c
25236@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25237
25238 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25239
25240+extern void gr_handle_kernel_exploit(void);
25241+
25242 int sysctl_panic_on_stackoverflow __read_mostly;
25243
25244 /* Debugging check for stack overflow: is there less than 1KB free? */
25245@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25246 __asm__ __volatile__("andl %%esp,%0" :
25247 "=r" (sp) : "0" (THREAD_SIZE - 1));
25248
25249- return sp < (sizeof(struct thread_info) + STACK_WARN);
25250+ return sp < STACK_WARN;
25251 }
25252
25253 static void print_stack_overflow(void)
25254 {
25255 printk(KERN_WARNING "low stack detected by irq handler\n");
25256 dump_stack();
25257+ gr_handle_kernel_exploit();
25258 if (sysctl_panic_on_stackoverflow)
25259 panic("low stack detected by irq handler - check messages\n");
25260 }
25261@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25262 static inline int
25263 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25264 {
25265- struct irq_stack *curstk, *irqstk;
25266+ struct irq_stack *irqstk;
25267 u32 *isp, *prev_esp, arg1, arg2;
25268
25269- curstk = (struct irq_stack *) current_stack();
25270 irqstk = __this_cpu_read(hardirq_stack);
25271
25272 /*
25273@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25274 * handler) we can't do that and just have to keep using the
25275 * current stack (which is the irq stack already after all)
25276 */
25277- if (unlikely(curstk == irqstk))
25278+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25279 return 0;
25280
25281- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25282+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25283
25284 /* Save the next esp at the bottom of the stack */
25285 prev_esp = (u32 *)irqstk;
25286 *prev_esp = current_stack_pointer();
25287
25288+#ifdef CONFIG_PAX_MEMORY_UDEREF
25289+ __set_fs(MAKE_MM_SEG(0));
25290+#endif
25291+
25292 if (unlikely(overflow))
25293 call_on_stack(print_stack_overflow, isp);
25294
25295@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25296 : "0" (irq), "1" (desc), "2" (isp),
25297 "D" (desc->handle_irq)
25298 : "memory", "cc", "ecx");
25299+
25300+#ifdef CONFIG_PAX_MEMORY_UDEREF
25301+ __set_fs(current_thread_info()->addr_limit);
25302+#endif
25303+
25304 return 1;
25305 }
25306
25307@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25308 */
25309 void irq_ctx_init(int cpu)
25310 {
25311- struct irq_stack *irqstk;
25312-
25313 if (per_cpu(hardirq_stack, cpu))
25314 return;
25315
25316- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25317- THREADINFO_GFP,
25318- THREAD_SIZE_ORDER));
25319- per_cpu(hardirq_stack, cpu) = irqstk;
25320-
25321- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25322- THREADINFO_GFP,
25323- THREAD_SIZE_ORDER));
25324- per_cpu(softirq_stack, cpu) = irqstk;
25325-
25326- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25327- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25328+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25329+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25330 }
25331
25332 void do_softirq_own_stack(void)
25333 {
25334- struct thread_info *curstk;
25335 struct irq_stack *irqstk;
25336 u32 *isp, *prev_esp;
25337
25338- curstk = current_stack();
25339 irqstk = __this_cpu_read(softirq_stack);
25340
25341 /* build the stack frame on the softirq stack */
25342@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25343 prev_esp = (u32 *)irqstk;
25344 *prev_esp = current_stack_pointer();
25345
25346+#ifdef CONFIG_PAX_MEMORY_UDEREF
25347+ __set_fs(MAKE_MM_SEG(0));
25348+#endif
25349+
25350 call_on_stack(__do_softirq, isp);
25351+
25352+#ifdef CONFIG_PAX_MEMORY_UDEREF
25353+ __set_fs(current_thread_info()->addr_limit);
25354+#endif
25355+
25356 }
25357
25358 bool handle_irq(unsigned irq, struct pt_regs *regs)
25359@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25360 if (unlikely(!desc))
25361 return false;
25362
25363- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25364+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25365 if (unlikely(overflow))
25366 print_stack_overflow();
25367 desc->handle_irq(irq, desc);
25368diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25369index e4b503d..824fce8 100644
25370--- a/arch/x86/kernel/irq_64.c
25371+++ b/arch/x86/kernel/irq_64.c
25372@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25373 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25374 EXPORT_PER_CPU_SYMBOL(irq_regs);
25375
25376+extern void gr_handle_kernel_exploit(void);
25377+
25378 int sysctl_panic_on_stackoverflow;
25379
25380 /*
25381@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25382 u64 estack_top, estack_bottom;
25383 u64 curbase = (u64)task_stack_page(current);
25384
25385- if (user_mode_vm(regs))
25386+ if (user_mode(regs))
25387 return;
25388
25389 if (regs->sp >= curbase + sizeof(struct thread_info) +
25390@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25391 irq_stack_top, irq_stack_bottom,
25392 estack_top, estack_bottom);
25393
25394+ gr_handle_kernel_exploit();
25395+
25396 if (sysctl_panic_on_stackoverflow)
25397 panic("low stack detected by irq handler - check messages\n");
25398 #endif
25399diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25400index 26d5a55..a01160a 100644
25401--- a/arch/x86/kernel/jump_label.c
25402+++ b/arch/x86/kernel/jump_label.c
25403@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25404 * Jump label is enabled for the first time.
25405 * So we expect a default_nop...
25406 */
25407- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25408+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25409 != 0))
25410 bug_at((void *)entry->code, __LINE__);
25411 } else {
25412@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25413 * ...otherwise expect an ideal_nop. Otherwise
25414 * something went horribly wrong.
25415 */
25416- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25417+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25418 != 0))
25419 bug_at((void *)entry->code, __LINE__);
25420 }
25421@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25422 * are converting the default nop to the ideal nop.
25423 */
25424 if (init) {
25425- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25426+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25427 bug_at((void *)entry->code, __LINE__);
25428 } else {
25429 code.jump = 0xe9;
25430 code.offset = entry->target -
25431 (entry->code + JUMP_LABEL_NOP_SIZE);
25432- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25433+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25434 bug_at((void *)entry->code, __LINE__);
25435 }
25436 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25437diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25438index 25ecd56..e12482f 100644
25439--- a/arch/x86/kernel/kgdb.c
25440+++ b/arch/x86/kernel/kgdb.c
25441@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25442 #ifdef CONFIG_X86_32
25443 switch (regno) {
25444 case GDB_SS:
25445- if (!user_mode_vm(regs))
25446+ if (!user_mode(regs))
25447 *(unsigned long *)mem = __KERNEL_DS;
25448 break;
25449 case GDB_SP:
25450- if (!user_mode_vm(regs))
25451+ if (!user_mode(regs))
25452 *(unsigned long *)mem = kernel_stack_pointer(regs);
25453 break;
25454 case GDB_GS:
25455@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25456 bp->attr.bp_addr = breakinfo[breakno].addr;
25457 bp->attr.bp_len = breakinfo[breakno].len;
25458 bp->attr.bp_type = breakinfo[breakno].type;
25459- info->address = breakinfo[breakno].addr;
25460+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25461+ info->address = ktla_ktva(breakinfo[breakno].addr);
25462+ else
25463+ info->address = breakinfo[breakno].addr;
25464 info->len = breakinfo[breakno].len;
25465 info->type = breakinfo[breakno].type;
25466 val = arch_install_hw_breakpoint(bp);
25467@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25468 case 'k':
25469 /* clear the trace bit */
25470 linux_regs->flags &= ~X86_EFLAGS_TF;
25471- atomic_set(&kgdb_cpu_doing_single_step, -1);
25472+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25473
25474 /* set the trace bit if we're stepping */
25475 if (remcomInBuffer[0] == 's') {
25476 linux_regs->flags |= X86_EFLAGS_TF;
25477- atomic_set(&kgdb_cpu_doing_single_step,
25478+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25479 raw_smp_processor_id());
25480 }
25481
25482@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25483
25484 switch (cmd) {
25485 case DIE_DEBUG:
25486- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25487+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25488 if (user_mode(regs))
25489 return single_step_cont(regs, args);
25490 break;
25491@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25492 #endif /* CONFIG_DEBUG_RODATA */
25493
25494 bpt->type = BP_BREAKPOINT;
25495- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25496+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25497 BREAK_INSTR_SIZE);
25498 if (err)
25499 return err;
25500- err = probe_kernel_write((char *)bpt->bpt_addr,
25501+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25502 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25503 #ifdef CONFIG_DEBUG_RODATA
25504 if (!err)
25505@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25506 return -EBUSY;
25507 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25508 BREAK_INSTR_SIZE);
25509- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25510+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25511 if (err)
25512 return err;
25513 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25514@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25515 if (mutex_is_locked(&text_mutex))
25516 goto knl_write;
25517 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25518- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25519+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25520 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25521 goto knl_write;
25522 return err;
25523 knl_write:
25524 #endif /* CONFIG_DEBUG_RODATA */
25525- return probe_kernel_write((char *)bpt->bpt_addr,
25526+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25527 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25528 }
25529
25530diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25531index 4e3d5a9..03fffd8 100644
25532--- a/arch/x86/kernel/kprobes/core.c
25533+++ b/arch/x86/kernel/kprobes/core.c
25534@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25535 s32 raddr;
25536 } __packed *insn;
25537
25538- insn = (struct __arch_relative_insn *)from;
25539+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25540+
25541+ pax_open_kernel();
25542 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25543 insn->op = op;
25544+ pax_close_kernel();
25545 }
25546
25547 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25548@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25549 kprobe_opcode_t opcode;
25550 kprobe_opcode_t *orig_opcodes = opcodes;
25551
25552- if (search_exception_tables((unsigned long)opcodes))
25553+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25554 return 0; /* Page fault may occur on this address. */
25555
25556 retry:
25557@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25558 * Fortunately, we know that the original code is the ideal 5-byte
25559 * long NOP.
25560 */
25561- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25562+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25563 if (faddr)
25564 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25565 else
25566 buf[0] = kp->opcode;
25567- return (unsigned long)buf;
25568+ return ktva_ktla((unsigned long)buf);
25569 }
25570
25571 /*
25572@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25573 /* Another subsystem puts a breakpoint, failed to recover */
25574 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25575 return 0;
25576+ pax_open_kernel();
25577 memcpy(dest, insn.kaddr, insn.length);
25578+ pax_close_kernel();
25579
25580 #ifdef CONFIG_X86_64
25581 if (insn_rip_relative(&insn)) {
25582@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25583 return 0;
25584 }
25585 disp = (u8 *) dest + insn_offset_displacement(&insn);
25586+ pax_open_kernel();
25587 *(s32 *) disp = (s32) newdisp;
25588+ pax_close_kernel();
25589 }
25590 #endif
25591 return insn.length;
25592@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25593 * nor set current_kprobe, because it doesn't use single
25594 * stepping.
25595 */
25596- regs->ip = (unsigned long)p->ainsn.insn;
25597+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25598 preempt_enable_no_resched();
25599 return;
25600 }
25601@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25602 regs->flags &= ~X86_EFLAGS_IF;
25603 /* single step inline if the instruction is an int3 */
25604 if (p->opcode == BREAKPOINT_INSTRUCTION)
25605- regs->ip = (unsigned long)p->addr;
25606+ regs->ip = ktla_ktva((unsigned long)p->addr);
25607 else
25608- regs->ip = (unsigned long)p->ainsn.insn;
25609+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25610 }
25611 NOKPROBE_SYMBOL(setup_singlestep);
25612
25613@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25614 struct kprobe *p;
25615 struct kprobe_ctlblk *kcb;
25616
25617- if (user_mode_vm(regs))
25618+ if (user_mode(regs))
25619 return 0;
25620
25621 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25622@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25623 setup_singlestep(p, regs, kcb, 0);
25624 return 1;
25625 }
25626- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25627+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25628 /*
25629 * The breakpoint instruction was removed right
25630 * after we hit it. Another cpu has removed
25631@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
25632 " movq %rax, 152(%rsp)\n"
25633 RESTORE_REGS_STRING
25634 " popfq\n"
25635+#ifdef KERNEXEC_PLUGIN
25636+ " btsq $63,(%rsp)\n"
25637+#endif
25638 #else
25639 " pushf\n"
25640 SAVE_REGS_STRING
25641@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25642 struct kprobe_ctlblk *kcb)
25643 {
25644 unsigned long *tos = stack_addr(regs);
25645- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25646+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25647 unsigned long orig_ip = (unsigned long)p->addr;
25648 kprobe_opcode_t *insn = p->ainsn.insn;
25649
25650@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25651 struct die_args *args = data;
25652 int ret = NOTIFY_DONE;
25653
25654- if (args->regs && user_mode_vm(args->regs))
25655+ if (args->regs && user_mode(args->regs))
25656 return ret;
25657
25658 if (val == DIE_GPF) {
25659diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25660index 7b3b9d1..e2478b91 100644
25661--- a/arch/x86/kernel/kprobes/opt.c
25662+++ b/arch/x86/kernel/kprobes/opt.c
25663@@ -79,6 +79,7 @@ found:
25664 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25665 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25666 {
25667+ pax_open_kernel();
25668 #ifdef CONFIG_X86_64
25669 *addr++ = 0x48;
25670 *addr++ = 0xbf;
25671@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25672 *addr++ = 0xb8;
25673 #endif
25674 *(unsigned long *)addr = val;
25675+ pax_close_kernel();
25676 }
25677
25678 asm (
25679@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25680 * Verify if the address gap is in 2GB range, because this uses
25681 * a relative jump.
25682 */
25683- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25684+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25685 if (abs(rel) > 0x7fffffff) {
25686 __arch_remove_optimized_kprobe(op, 0);
25687 return -ERANGE;
25688@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25689 op->optinsn.size = ret;
25690
25691 /* Copy arch-dep-instance from template */
25692- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25693+ pax_open_kernel();
25694+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25695+ pax_close_kernel();
25696
25697 /* Set probe information */
25698 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25699
25700 /* Set probe function call */
25701- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25702+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25703
25704 /* Set returning jmp instruction at the tail of out-of-line buffer */
25705- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25706+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25707 (u8 *)op->kp.addr + op->optinsn.size);
25708
25709 flush_icache_range((unsigned long) buf,
25710@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25711 WARN_ON(kprobe_disabled(&op->kp));
25712
25713 /* Backup instructions which will be replaced by jump address */
25714- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25715+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25716 RELATIVE_ADDR_SIZE);
25717
25718 insn_buf[0] = RELATIVEJUMP_OPCODE;
25719@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25720 /* This kprobe is really able to run optimized path. */
25721 op = container_of(p, struct optimized_kprobe, kp);
25722 /* Detour through copied instructions */
25723- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25724+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25725 if (!reenter)
25726 reset_current_kprobe();
25727 preempt_enable_no_resched();
25728diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25729index c2bedae..25e7ab60 100644
25730--- a/arch/x86/kernel/ksysfs.c
25731+++ b/arch/x86/kernel/ksysfs.c
25732@@ -184,7 +184,7 @@ out:
25733
25734 static struct kobj_attribute type_attr = __ATTR_RO(type);
25735
25736-static struct bin_attribute data_attr = {
25737+static bin_attribute_no_const data_attr __read_only = {
25738 .attr = {
25739 .name = "data",
25740 .mode = S_IRUGO,
25741diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25742index c37886d..d851d32 100644
25743--- a/arch/x86/kernel/ldt.c
25744+++ b/arch/x86/kernel/ldt.c
25745@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25746 if (reload) {
25747 #ifdef CONFIG_SMP
25748 preempt_disable();
25749- load_LDT(pc);
25750+ load_LDT_nolock(pc);
25751 if (!cpumask_equal(mm_cpumask(current->mm),
25752 cpumask_of(smp_processor_id())))
25753 smp_call_function(flush_ldt, current->mm, 1);
25754 preempt_enable();
25755 #else
25756- load_LDT(pc);
25757+ load_LDT_nolock(pc);
25758 #endif
25759 }
25760 if (oldsize) {
25761@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25762 return err;
25763
25764 for (i = 0; i < old->size; i++)
25765- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25766+ write_ldt_entry(new->ldt, i, old->ldt + i);
25767 return 0;
25768 }
25769
25770@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25771 retval = copy_ldt(&mm->context, &old_mm->context);
25772 mutex_unlock(&old_mm->context.lock);
25773 }
25774+
25775+ if (tsk == current) {
25776+ mm->context.vdso = 0;
25777+
25778+#ifdef CONFIG_X86_32
25779+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25780+ mm->context.user_cs_base = 0UL;
25781+ mm->context.user_cs_limit = ~0UL;
25782+
25783+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25784+ cpus_clear(mm->context.cpu_user_cs_mask);
25785+#endif
25786+
25787+#endif
25788+#endif
25789+
25790+ }
25791+
25792 return retval;
25793 }
25794
25795@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25796 }
25797 }
25798
25799+#ifdef CONFIG_PAX_SEGMEXEC
25800+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25801+ error = -EINVAL;
25802+ goto out_unlock;
25803+ }
25804+#endif
25805+
25806 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25807 error = -EINVAL;
25808 goto out_unlock;
25809diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25810index ff3c3101d..d7c0cd8 100644
25811--- a/arch/x86/kernel/livepatch.c
25812+++ b/arch/x86/kernel/livepatch.c
25813@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25814 int ret, numpages, size = 4;
25815 bool readonly;
25816 unsigned long val;
25817- unsigned long core = (unsigned long)mod->module_core;
25818- unsigned long core_ro_size = mod->core_ro_size;
25819- unsigned long core_size = mod->core_size;
25820+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25821+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25822+ unsigned long core_size_rx = mod->core_size_rx;
25823+ unsigned long core_size_rw = mod->core_size_rw;
25824
25825 switch (type) {
25826 case R_X86_64_NONE:
25827@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25828 return -EINVAL;
25829 }
25830
25831- if (loc < core || loc >= core + core_size)
25832+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25833+ (loc < core_rw || loc >= core_rw + core_size_rw))
25834 /* loc does not point to any symbol inside the module */
25835 return -EINVAL;
25836
25837- if (loc < core + core_ro_size)
25838+ if (loc < core_rx + core_size_rx)
25839 readonly = true;
25840 else
25841 readonly = false;
25842diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25843index 469b23d..5449cfe 100644
25844--- a/arch/x86/kernel/machine_kexec_32.c
25845+++ b/arch/x86/kernel/machine_kexec_32.c
25846@@ -26,7 +26,7 @@
25847 #include <asm/cacheflush.h>
25848 #include <asm/debugreg.h>
25849
25850-static void set_idt(void *newidt, __u16 limit)
25851+static void set_idt(struct desc_struct *newidt, __u16 limit)
25852 {
25853 struct desc_ptr curidt;
25854
25855@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25856 }
25857
25858
25859-static void set_gdt(void *newgdt, __u16 limit)
25860+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25861 {
25862 struct desc_ptr curgdt;
25863
25864@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25865 }
25866
25867 control_page = page_address(image->control_code_page);
25868- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25869+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25870
25871 relocate_kernel_ptr = control_page;
25872 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25873diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25874index 94ea120..4154cea 100644
25875--- a/arch/x86/kernel/mcount_64.S
25876+++ b/arch/x86/kernel/mcount_64.S
25877@@ -7,7 +7,7 @@
25878 #include <linux/linkage.h>
25879 #include <asm/ptrace.h>
25880 #include <asm/ftrace.h>
25881-
25882+#include <asm/alternative-asm.h>
25883
25884 .code64
25885 .section .entry.text, "ax"
25886@@ -148,8 +148,9 @@
25887 #ifdef CONFIG_DYNAMIC_FTRACE
25888
25889 ENTRY(function_hook)
25890+ pax_force_retaddr
25891 retq
25892-END(function_hook)
25893+ENDPROC(function_hook)
25894
25895 ENTRY(ftrace_caller)
25896 /* save_mcount_regs fills in first two parameters */
25897@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25898 #endif
25899
25900 GLOBAL(ftrace_stub)
25901+ pax_force_retaddr
25902 retq
25903-END(ftrace_caller)
25904+ENDPROC(ftrace_caller)
25905
25906 ENTRY(ftrace_regs_caller)
25907 /* Save the current flags before any operations that can change them */
25908@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25909
25910 jmp ftrace_return
25911
25912-END(ftrace_regs_caller)
25913+ENDPROC(ftrace_regs_caller)
25914
25915
25916 #else /* ! CONFIG_DYNAMIC_FTRACE */
25917@@ -272,18 +274,20 @@ fgraph_trace:
25918 #endif
25919
25920 GLOBAL(ftrace_stub)
25921+ pax_force_retaddr
25922 retq
25923
25924 trace:
25925 /* save_mcount_regs fills in first two parameters */
25926 save_mcount_regs
25927
25928+ pax_force_fptr ftrace_trace_function
25929 call *ftrace_trace_function
25930
25931 restore_mcount_regs
25932
25933 jmp fgraph_trace
25934-END(function_hook)
25935+ENDPROC(function_hook)
25936 #endif /* CONFIG_DYNAMIC_FTRACE */
25937 #endif /* CONFIG_FUNCTION_TRACER */
25938
25939@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25940
25941 restore_mcount_regs
25942
25943+ pax_force_retaddr
25944 retq
25945-END(ftrace_graph_caller)
25946+ENDPROC(ftrace_graph_caller)
25947
25948 GLOBAL(return_to_handler)
25949 subq $24, %rsp
25950@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25951 movq 8(%rsp), %rdx
25952 movq (%rsp), %rax
25953 addq $24, %rsp
25954+ pax_force_fptr %rdi
25955 jmp *%rdi
25956+ENDPROC(return_to_handler)
25957 #endif
25958diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25959index d1ac80b..f593701 100644
25960--- a/arch/x86/kernel/module.c
25961+++ b/arch/x86/kernel/module.c
25962@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
25963 }
25964 #endif
25965
25966-void *module_alloc(unsigned long size)
25967+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25968 {
25969 void *p;
25970
25971- if (PAGE_ALIGN(size) > MODULES_LEN)
25972+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25973 return NULL;
25974
25975 p = __vmalloc_node_range(size, MODULE_ALIGN,
25976 MODULES_VADDR + get_module_load_offset(),
25977- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25978- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
25979+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25980+ prot, 0, NUMA_NO_NODE,
25981 __builtin_return_address(0));
25982 if (p && (kasan_module_alloc(p, size) < 0)) {
25983 vfree(p);
25984@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
25985 return p;
25986 }
25987
25988+void *module_alloc(unsigned long size)
25989+{
25990+
25991+#ifdef CONFIG_PAX_KERNEXEC
25992+ return __module_alloc(size, PAGE_KERNEL);
25993+#else
25994+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25995+#endif
25996+
25997+}
25998+
25999+#ifdef CONFIG_PAX_KERNEXEC
26000+#ifdef CONFIG_X86_32
26001+void *module_alloc_exec(unsigned long size)
26002+{
26003+ struct vm_struct *area;
26004+
26005+ if (size == 0)
26006+ return NULL;
26007+
26008+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26009+return area ? area->addr : NULL;
26010+}
26011+EXPORT_SYMBOL(module_alloc_exec);
26012+
26013+void module_memfree_exec(void *module_region)
26014+{
26015+ vunmap(module_region);
26016+}
26017+EXPORT_SYMBOL(module_memfree_exec);
26018+#else
26019+void module_memfree_exec(void *module_region)
26020+{
26021+ module_memfree(module_region);
26022+}
26023+EXPORT_SYMBOL(module_memfree_exec);
26024+
26025+void *module_alloc_exec(unsigned long size)
26026+{
26027+ return __module_alloc(size, PAGE_KERNEL_RX);
26028+}
26029+EXPORT_SYMBOL(module_alloc_exec);
26030+#endif
26031+#endif
26032+
26033 #ifdef CONFIG_X86_32
26034 int apply_relocate(Elf32_Shdr *sechdrs,
26035 const char *strtab,
26036@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26037 unsigned int i;
26038 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26039 Elf32_Sym *sym;
26040- uint32_t *location;
26041+ uint32_t *plocation, location;
26042
26043 DEBUGP("Applying relocate section %u to %u\n",
26044 relsec, sechdrs[relsec].sh_info);
26045 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26046 /* This is where to make the change */
26047- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26048- + rel[i].r_offset;
26049+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26050+ location = (uint32_t)plocation;
26051+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26052+ plocation = ktla_ktva((void *)plocation);
26053 /* This is the symbol it is referring to. Note that all
26054 undefined symbols have been resolved. */
26055 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26056@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26057 switch (ELF32_R_TYPE(rel[i].r_info)) {
26058 case R_386_32:
26059 /* We add the value into the location given */
26060- *location += sym->st_value;
26061+ pax_open_kernel();
26062+ *plocation += sym->st_value;
26063+ pax_close_kernel();
26064 break;
26065 case R_386_PC32:
26066 /* Add the value, subtract its position */
26067- *location += sym->st_value - (uint32_t)location;
26068+ pax_open_kernel();
26069+ *plocation += sym->st_value - location;
26070+ pax_close_kernel();
26071 break;
26072 default:
26073 pr_err("%s: Unknown relocation: %u\n",
26074@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26075 case R_X86_64_NONE:
26076 break;
26077 case R_X86_64_64:
26078+ pax_open_kernel();
26079 *(u64 *)loc = val;
26080+ pax_close_kernel();
26081 break;
26082 case R_X86_64_32:
26083+ pax_open_kernel();
26084 *(u32 *)loc = val;
26085+ pax_close_kernel();
26086 if (val != *(u32 *)loc)
26087 goto overflow;
26088 break;
26089 case R_X86_64_32S:
26090+ pax_open_kernel();
26091 *(s32 *)loc = val;
26092+ pax_close_kernel();
26093 if ((s64)val != *(s32 *)loc)
26094 goto overflow;
26095 break;
26096 case R_X86_64_PC32:
26097 val -= (u64)loc;
26098+ pax_open_kernel();
26099 *(u32 *)loc = val;
26100+ pax_close_kernel();
26101+
26102 #if 0
26103 if ((s64)val != *(s32 *)loc)
26104 goto overflow;
26105diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26106index 113e707..0a690e1 100644
26107--- a/arch/x86/kernel/msr.c
26108+++ b/arch/x86/kernel/msr.c
26109@@ -39,6 +39,7 @@
26110 #include <linux/notifier.h>
26111 #include <linux/uaccess.h>
26112 #include <linux/gfp.h>
26113+#include <linux/grsecurity.h>
26114
26115 #include <asm/processor.h>
26116 #include <asm/msr.h>
26117@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26118 int err = 0;
26119 ssize_t bytes = 0;
26120
26121+#ifdef CONFIG_GRKERNSEC_KMEM
26122+ gr_handle_msr_write();
26123+ return -EPERM;
26124+#endif
26125+
26126 if (count % 8)
26127 return -EINVAL; /* Invalid chunk size */
26128
26129@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26130 err = -EBADF;
26131 break;
26132 }
26133+#ifdef CONFIG_GRKERNSEC_KMEM
26134+ gr_handle_msr_write();
26135+ return -EPERM;
26136+#endif
26137 if (copy_from_user(&regs, uregs, sizeof regs)) {
26138 err = -EFAULT;
26139 break;
26140@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26141 return notifier_from_errno(err);
26142 }
26143
26144-static struct notifier_block __refdata msr_class_cpu_notifier = {
26145+static struct notifier_block msr_class_cpu_notifier = {
26146 .notifier_call = msr_class_cpu_callback,
26147 };
26148
26149diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26150index c3e985d..110a36a 100644
26151--- a/arch/x86/kernel/nmi.c
26152+++ b/arch/x86/kernel/nmi.c
26153@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26154
26155 static void nmi_max_handler(struct irq_work *w)
26156 {
26157- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26158+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26159 int remainder_ns, decimal_msecs;
26160- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26161+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26162
26163 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26164 decimal_msecs = remainder_ns / 1000;
26165
26166 printk_ratelimited(KERN_INFO
26167 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26168- a->handler, whole_msecs, decimal_msecs);
26169+ n->action->handler, whole_msecs, decimal_msecs);
26170 }
26171
26172 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26173@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26174 delta = sched_clock() - delta;
26175 trace_nmi_handler(a->handler, (int)delta, thishandled);
26176
26177- if (delta < nmi_longest_ns || delta < a->max_duration)
26178+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26179 continue;
26180
26181- a->max_duration = delta;
26182- irq_work_queue(&a->irq_work);
26183+ a->work->max_duration = delta;
26184+ irq_work_queue(&a->work->irq_work);
26185 }
26186
26187 rcu_read_unlock();
26188@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26189 }
26190 NOKPROBE_SYMBOL(nmi_handle);
26191
26192-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26193+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26194 {
26195 struct nmi_desc *desc = nmi_to_desc(type);
26196 unsigned long flags;
26197@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26198 if (!action->handler)
26199 return -EINVAL;
26200
26201- init_irq_work(&action->irq_work, nmi_max_handler);
26202+ action->work->action = action;
26203+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26204
26205 spin_lock_irqsave(&desc->lock, flags);
26206
26207@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26208 * event confuses some handlers (kdump uses this flag)
26209 */
26210 if (action->flags & NMI_FLAG_FIRST)
26211- list_add_rcu(&action->list, &desc->head);
26212+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26213 else
26214- list_add_tail_rcu(&action->list, &desc->head);
26215+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26216
26217 spin_unlock_irqrestore(&desc->lock, flags);
26218 return 0;
26219@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26220 if (!strcmp(n->name, name)) {
26221 WARN(in_nmi(),
26222 "Trying to free NMI (%s) from NMI context!\n", n->name);
26223- list_del_rcu(&n->list);
26224+ pax_list_del_rcu((struct list_head *)&n->list);
26225 break;
26226 }
26227 }
26228@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26229 dotraplinkage notrace void
26230 do_nmi(struct pt_regs *regs, long error_code)
26231 {
26232+
26233+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26234+ if (!user_mode(regs)) {
26235+ unsigned long cs = regs->cs & 0xFFFF;
26236+ unsigned long ip = ktva_ktla(regs->ip);
26237+
26238+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26239+ regs->ip = ip;
26240+ }
26241+#endif
26242+
26243 nmi_nesting_preprocess(regs);
26244
26245 nmi_enter();
26246diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26247index 6d9582e..f746287 100644
26248--- a/arch/x86/kernel/nmi_selftest.c
26249+++ b/arch/x86/kernel/nmi_selftest.c
26250@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26251 {
26252 /* trap all the unknown NMIs we may generate */
26253 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26254- __initdata);
26255+ __initconst);
26256 }
26257
26258 static void __init cleanup_nmi_testsuite(void)
26259@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26260 unsigned long timeout;
26261
26262 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26263- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26264+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26265 nmi_fail = FAILURE;
26266 return;
26267 }
26268diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26269index bbb6c73..24a58ef 100644
26270--- a/arch/x86/kernel/paravirt-spinlocks.c
26271+++ b/arch/x86/kernel/paravirt-spinlocks.c
26272@@ -8,7 +8,7 @@
26273
26274 #include <asm/paravirt.h>
26275
26276-struct pv_lock_ops pv_lock_ops = {
26277+struct pv_lock_ops pv_lock_ops __read_only = {
26278 #ifdef CONFIG_SMP
26279 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26280 .unlock_kick = paravirt_nop,
26281diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26282index 548d25f..f8fb99c 100644
26283--- a/arch/x86/kernel/paravirt.c
26284+++ b/arch/x86/kernel/paravirt.c
26285@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26286 {
26287 return x;
26288 }
26289+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26290+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26291+#endif
26292
26293 void __init default_banner(void)
26294 {
26295@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26296
26297 if (opfunc == NULL)
26298 /* If there's no function, patch it with a ud2a (BUG) */
26299- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26300- else if (opfunc == _paravirt_nop)
26301+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26302+ else if (opfunc == (void *)_paravirt_nop)
26303 /* If the operation is a nop, then nop the callsite */
26304 ret = paravirt_patch_nop();
26305
26306 /* identity functions just return their single argument */
26307- else if (opfunc == _paravirt_ident_32)
26308+ else if (opfunc == (void *)_paravirt_ident_32)
26309 ret = paravirt_patch_ident_32(insnbuf, len);
26310- else if (opfunc == _paravirt_ident_64)
26311+ else if (opfunc == (void *)_paravirt_ident_64)
26312 ret = paravirt_patch_ident_64(insnbuf, len);
26313+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26314+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26315+ ret = paravirt_patch_ident_64(insnbuf, len);
26316+#endif
26317
26318 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26319 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26320@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26321 if (insn_len > len || start == NULL)
26322 insn_len = len;
26323 else
26324- memcpy(insnbuf, start, insn_len);
26325+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26326
26327 return insn_len;
26328 }
26329@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26330 return this_cpu_read(paravirt_lazy_mode);
26331 }
26332
26333-struct pv_info pv_info = {
26334+struct pv_info pv_info __read_only = {
26335 .name = "bare hardware",
26336 .paravirt_enabled = 0,
26337 .kernel_rpl = 0,
26338@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26339 #endif
26340 };
26341
26342-struct pv_init_ops pv_init_ops = {
26343+struct pv_init_ops pv_init_ops __read_only = {
26344 .patch = native_patch,
26345 };
26346
26347-struct pv_time_ops pv_time_ops = {
26348+struct pv_time_ops pv_time_ops __read_only = {
26349 .sched_clock = native_sched_clock,
26350 .steal_clock = native_steal_clock,
26351 };
26352
26353-__visible struct pv_irq_ops pv_irq_ops = {
26354+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26355 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26356 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26357 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26358@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26359 #endif
26360 };
26361
26362-__visible struct pv_cpu_ops pv_cpu_ops = {
26363+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26364 .cpuid = native_cpuid,
26365 .get_debugreg = native_get_debugreg,
26366 .set_debugreg = native_set_debugreg,
26367@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26368 NOKPROBE_SYMBOL(native_set_debugreg);
26369 NOKPROBE_SYMBOL(native_load_idt);
26370
26371-struct pv_apic_ops pv_apic_ops = {
26372+struct pv_apic_ops pv_apic_ops __read_only= {
26373 #ifdef CONFIG_X86_LOCAL_APIC
26374 .startup_ipi_hook = paravirt_nop,
26375 #endif
26376 };
26377
26378-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26379+#ifdef CONFIG_X86_32
26380+#ifdef CONFIG_X86_PAE
26381+/* 64-bit pagetable entries */
26382+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26383+#else
26384 /* 32-bit pagetable entries */
26385 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26386+#endif
26387 #else
26388 /* 64-bit pagetable entries */
26389 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26390 #endif
26391
26392-struct pv_mmu_ops pv_mmu_ops = {
26393+struct pv_mmu_ops pv_mmu_ops __read_only = {
26394
26395 .read_cr2 = native_read_cr2,
26396 .write_cr2 = native_write_cr2,
26397@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26398 .make_pud = PTE_IDENT,
26399
26400 .set_pgd = native_set_pgd,
26401+ .set_pgd_batched = native_set_pgd_batched,
26402 #endif
26403 #endif /* PAGETABLE_LEVELS >= 3 */
26404
26405@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26406 },
26407
26408 .set_fixmap = native_set_fixmap,
26409+
26410+#ifdef CONFIG_PAX_KERNEXEC
26411+ .pax_open_kernel = native_pax_open_kernel,
26412+ .pax_close_kernel = native_pax_close_kernel,
26413+#endif
26414+
26415 };
26416
26417 EXPORT_SYMBOL_GPL(pv_time_ops);
26418diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26419index a1da673..b6f5831 100644
26420--- a/arch/x86/kernel/paravirt_patch_64.c
26421+++ b/arch/x86/kernel/paravirt_patch_64.c
26422@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26423 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26424 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26425 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26426+
26427+#ifndef CONFIG_PAX_MEMORY_UDEREF
26428 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26429+#endif
26430+
26431 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26432 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26433
26434@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26435 PATCH_SITE(pv_mmu_ops, read_cr3);
26436 PATCH_SITE(pv_mmu_ops, write_cr3);
26437 PATCH_SITE(pv_cpu_ops, clts);
26438+
26439+#ifndef CONFIG_PAX_MEMORY_UDEREF
26440 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26441+#endif
26442+
26443 PATCH_SITE(pv_cpu_ops, wbinvd);
26444
26445 patch_site:
26446diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26447index 0497f71..7186c0d 100644
26448--- a/arch/x86/kernel/pci-calgary_64.c
26449+++ b/arch/x86/kernel/pci-calgary_64.c
26450@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26451 tce_space = be64_to_cpu(readq(target));
26452 tce_space = tce_space & TAR_SW_BITS;
26453
26454- tce_space = tce_space & (~specified_table_size);
26455+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26456 info->tce_space = (u64 *)__va(tce_space);
26457 }
26458 }
26459diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26460index 35ccf75..7a15747 100644
26461--- a/arch/x86/kernel/pci-iommu_table.c
26462+++ b/arch/x86/kernel/pci-iommu_table.c
26463@@ -2,7 +2,7 @@
26464 #include <asm/iommu_table.h>
26465 #include <linux/string.h>
26466 #include <linux/kallsyms.h>
26467-
26468+#include <linux/sched.h>
26469
26470 #define DEBUG 1
26471
26472diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26473index 77dd0ad..9ec4723 100644
26474--- a/arch/x86/kernel/pci-swiotlb.c
26475+++ b/arch/x86/kernel/pci-swiotlb.c
26476@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26477 struct dma_attrs *attrs)
26478 {
26479 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26480- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26481+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26482 else
26483 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26484 }
26485diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26486index a388bb8..97064ad 100644
26487--- a/arch/x86/kernel/process.c
26488+++ b/arch/x86/kernel/process.c
26489@@ -38,7 +38,8 @@
26490 * section. Since TSS's are completely CPU-local, we want them
26491 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26492 */
26493-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26494+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26495+EXPORT_SYMBOL(init_tss);
26496
26497 #ifdef CONFIG_X86_64
26498 static DEFINE_PER_CPU(unsigned char, is_idle);
26499@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26500 task_xstate_cachep =
26501 kmem_cache_create("task_xstate", xstate_size,
26502 __alignof__(union thread_xstate),
26503- SLAB_PANIC | SLAB_NOTRACK, NULL);
26504+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26505 setup_xstate_comp();
26506 }
26507
26508@@ -110,7 +111,7 @@ void exit_thread(void)
26509 unsigned long *bp = t->io_bitmap_ptr;
26510
26511 if (bp) {
26512- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26513+ struct tss_struct *tss = init_tss + get_cpu();
26514
26515 t->io_bitmap_ptr = NULL;
26516 clear_thread_flag(TIF_IO_BITMAP);
26517@@ -130,6 +131,9 @@ void flush_thread(void)
26518 {
26519 struct task_struct *tsk = current;
26520
26521+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26522+ loadsegment(gs, 0);
26523+#endif
26524 flush_ptrace_hw_breakpoint(tsk);
26525 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26526 drop_init_fpu(tsk);
26527@@ -276,7 +280,7 @@ static void __exit_idle(void)
26528 void exit_idle(void)
26529 {
26530 /* idle loop has pid 0 */
26531- if (current->pid)
26532+ if (task_pid_nr(current))
26533 return;
26534 __exit_idle();
26535 }
26536@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26537 return ret;
26538 }
26539 #endif
26540-void stop_this_cpu(void *dummy)
26541+__noreturn void stop_this_cpu(void *dummy)
26542 {
26543 local_irq_disable();
26544 /*
26545@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26546 }
26547 early_param("idle", idle_setup);
26548
26549-unsigned long arch_align_stack(unsigned long sp)
26550+#ifdef CONFIG_PAX_RANDKSTACK
26551+void pax_randomize_kstack(struct pt_regs *regs)
26552 {
26553- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26554- sp -= get_random_int() % 8192;
26555- return sp & ~0xf;
26556-}
26557+ struct thread_struct *thread = &current->thread;
26558+ unsigned long time;
26559
26560-unsigned long arch_randomize_brk(struct mm_struct *mm)
26561-{
26562- unsigned long range_end = mm->brk + 0x02000000;
26563- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26564-}
26565+ if (!randomize_va_space)
26566+ return;
26567+
26568+ if (v8086_mode(regs))
26569+ return;
26570
26571+ rdtscl(time);
26572+
26573+ /* P4 seems to return a 0 LSB, ignore it */
26574+#ifdef CONFIG_MPENTIUM4
26575+ time &= 0x3EUL;
26576+ time <<= 2;
26577+#elif defined(CONFIG_X86_64)
26578+ time &= 0xFUL;
26579+ time <<= 4;
26580+#else
26581+ time &= 0x1FUL;
26582+ time <<= 3;
26583+#endif
26584+
26585+ thread->sp0 ^= time;
26586+ load_sp0(init_tss + smp_processor_id(), thread);
26587+
26588+#ifdef CONFIG_X86_64
26589+ this_cpu_write(kernel_stack, thread->sp0);
26590+#endif
26591+}
26592+#endif
26593diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26594index 603c4f9..3a105d7 100644
26595--- a/arch/x86/kernel/process_32.c
26596+++ b/arch/x86/kernel/process_32.c
26597@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26598 unsigned long thread_saved_pc(struct task_struct *tsk)
26599 {
26600 return ((unsigned long *)tsk->thread.sp)[3];
26601+//XXX return tsk->thread.eip;
26602 }
26603
26604 void __show_regs(struct pt_regs *regs, int all)
26605@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26606 unsigned long sp;
26607 unsigned short ss, gs;
26608
26609- if (user_mode_vm(regs)) {
26610+ if (user_mode(regs)) {
26611 sp = regs->sp;
26612 ss = regs->ss & 0xffff;
26613- gs = get_user_gs(regs);
26614 } else {
26615 sp = kernel_stack_pointer(regs);
26616 savesegment(ss, ss);
26617- savesegment(gs, gs);
26618 }
26619+ gs = get_user_gs(regs);
26620
26621 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26622 (u16)regs->cs, regs->ip, regs->flags,
26623- smp_processor_id());
26624+ raw_smp_processor_id());
26625 print_symbol("EIP is at %s\n", regs->ip);
26626
26627 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26628@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26629 int copy_thread(unsigned long clone_flags, unsigned long sp,
26630 unsigned long arg, struct task_struct *p)
26631 {
26632- struct pt_regs *childregs = task_pt_regs(p);
26633+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26634 struct task_struct *tsk;
26635 int err;
26636
26637 p->thread.sp = (unsigned long) childregs;
26638 p->thread.sp0 = (unsigned long) (childregs+1);
26639+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26640 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26641
26642 if (unlikely(p->flags & PF_KTHREAD)) {
26643 /* kernel thread */
26644 memset(childregs, 0, sizeof(struct pt_regs));
26645 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26646- task_user_gs(p) = __KERNEL_STACK_CANARY;
26647- childregs->ds = __USER_DS;
26648- childregs->es = __USER_DS;
26649+ savesegment(gs, childregs->gs);
26650+ childregs->ds = __KERNEL_DS;
26651+ childregs->es = __KERNEL_DS;
26652 childregs->fs = __KERNEL_PERCPU;
26653 childregs->bx = sp; /* function */
26654 childregs->bp = arg;
26655@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26656 struct thread_struct *prev = &prev_p->thread,
26657 *next = &next_p->thread;
26658 int cpu = smp_processor_id();
26659- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26660+ struct tss_struct *tss = init_tss + cpu;
26661 fpu_switch_t fpu;
26662
26663 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26664@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26665 */
26666 lazy_save_gs(prev->gs);
26667
26668+#ifdef CONFIG_PAX_MEMORY_UDEREF
26669+ __set_fs(task_thread_info(next_p)->addr_limit);
26670+#endif
26671+
26672 /*
26673 * Load the per-thread Thread-Local Storage descriptor.
26674 */
26675@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26676 */
26677 arch_end_context_switch(next_p);
26678
26679- this_cpu_write(kernel_stack,
26680- (unsigned long)task_stack_page(next_p) +
26681- THREAD_SIZE - KERNEL_STACK_OFFSET);
26682+ this_cpu_write(current_task, next_p);
26683+ this_cpu_write(current_tinfo, &next_p->tinfo);
26684+ this_cpu_write(kernel_stack, next->sp0);
26685
26686 /*
26687 * Restore %gs if needed (which is common)
26688@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26689
26690 switch_fpu_finish(next_p, fpu);
26691
26692- this_cpu_write(current_task, next_p);
26693-
26694 return prev_p;
26695 }
26696
26697@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26698 } while (count++ < 16);
26699 return 0;
26700 }
26701-
26702diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26703index 67fcc43..0d2c630 100644
26704--- a/arch/x86/kernel/process_64.c
26705+++ b/arch/x86/kernel/process_64.c
26706@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26707 struct pt_regs *childregs;
26708 struct task_struct *me = current;
26709
26710- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26711+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26712 childregs = task_pt_regs(p);
26713 p->thread.sp = (unsigned long) childregs;
26714 p->thread.usersp = me->thread.usersp;
26715+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26716 set_tsk_thread_flag(p, TIF_FORK);
26717 p->thread.io_bitmap_ptr = NULL;
26718
26719@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26720 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26721 savesegment(es, p->thread.es);
26722 savesegment(ds, p->thread.ds);
26723+ savesegment(ss, p->thread.ss);
26724+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26725 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26726
26727 if (unlikely(p->flags & PF_KTHREAD)) {
26728@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26729 struct thread_struct *prev = &prev_p->thread;
26730 struct thread_struct *next = &next_p->thread;
26731 int cpu = smp_processor_id();
26732- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26733+ struct tss_struct *tss = init_tss + cpu;
26734 unsigned fsindex, gsindex;
26735 fpu_switch_t fpu;
26736
26737@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26738 if (unlikely(next->ds | prev->ds))
26739 loadsegment(ds, next->ds);
26740
26741+ savesegment(ss, prev->ss);
26742+ if (unlikely(next->ss != prev->ss))
26743+ loadsegment(ss, next->ss);
26744+
26745 /*
26746 * Switch FS and GS.
26747 *
26748@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26749 prev->usersp = this_cpu_read(old_rsp);
26750 this_cpu_write(old_rsp, next->usersp);
26751 this_cpu_write(current_task, next_p);
26752+ this_cpu_write(current_tinfo, &next_p->tinfo);
26753
26754 /*
26755 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26756@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26757 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26758 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26759
26760- this_cpu_write(kernel_stack,
26761- (unsigned long)task_stack_page(next_p) +
26762- THREAD_SIZE - KERNEL_STACK_OFFSET);
26763+ this_cpu_write(kernel_stack, next->sp0);
26764
26765 /*
26766 * Now maybe reload the debug registers and handle I/O bitmaps
26767@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26768 if (!p || p == current || p->state == TASK_RUNNING)
26769 return 0;
26770 stack = (unsigned long)task_stack_page(p);
26771- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26772+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26773 return 0;
26774 fp = *(u64 *)(p->thread.sp);
26775 do {
26776- if (fp < (unsigned long)stack ||
26777- fp >= (unsigned long)stack+THREAD_SIZE)
26778+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26779 return 0;
26780 ip = *(u64 *)(fp+8);
26781 if (!in_sched_functions(ip))
26782diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26783index e510618..5165ac0 100644
26784--- a/arch/x86/kernel/ptrace.c
26785+++ b/arch/x86/kernel/ptrace.c
26786@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26787 unsigned long sp = (unsigned long)&regs->sp;
26788 u32 *prev_esp;
26789
26790- if (context == (sp & ~(THREAD_SIZE - 1)))
26791+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26792 return sp;
26793
26794- prev_esp = (u32 *)(context);
26795+ prev_esp = *(u32 **)(context);
26796 if (prev_esp)
26797 return (unsigned long)prev_esp;
26798
26799@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26800 if (child->thread.gs != value)
26801 return do_arch_prctl(child, ARCH_SET_GS, value);
26802 return 0;
26803+
26804+ case offsetof(struct user_regs_struct,ip):
26805+ /*
26806+ * Protect against any attempt to set ip to an
26807+ * impossible address. There are dragons lurking if the
26808+ * address is noncanonical. (This explicitly allows
26809+ * setting ip to TASK_SIZE_MAX, because user code can do
26810+ * that all by itself by running off the end of its
26811+ * address space.
26812+ */
26813+ if (value > TASK_SIZE_MAX)
26814+ return -EIO;
26815+ break;
26816+
26817 #endif
26818 }
26819
26820@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26821 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26822 {
26823 int i;
26824- int dr7 = 0;
26825+ unsigned long dr7 = 0;
26826 struct arch_hw_breakpoint *info;
26827
26828 for (i = 0; i < HBP_NUM; i++) {
26829@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26830 unsigned long addr, unsigned long data)
26831 {
26832 int ret;
26833- unsigned long __user *datap = (unsigned long __user *)data;
26834+ unsigned long __user *datap = (__force unsigned long __user *)data;
26835
26836 switch (request) {
26837 /* read the word at location addr in the USER area. */
26838@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26839 if ((int) addr < 0)
26840 return -EIO;
26841 ret = do_get_thread_area(child, addr,
26842- (struct user_desc __user *)data);
26843+ (__force struct user_desc __user *) data);
26844 break;
26845
26846 case PTRACE_SET_THREAD_AREA:
26847 if ((int) addr < 0)
26848 return -EIO;
26849 ret = do_set_thread_area(child, addr,
26850- (struct user_desc __user *)data, 0);
26851+ (__force struct user_desc __user *) data, 0);
26852 break;
26853 #endif
26854
26855@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26856
26857 #ifdef CONFIG_X86_64
26858
26859-static struct user_regset x86_64_regsets[] __read_mostly = {
26860+static user_regset_no_const x86_64_regsets[] __read_only = {
26861 [REGSET_GENERAL] = {
26862 .core_note_type = NT_PRSTATUS,
26863 .n = sizeof(struct user_regs_struct) / sizeof(long),
26864@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26865 #endif /* CONFIG_X86_64 */
26866
26867 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26868-static struct user_regset x86_32_regsets[] __read_mostly = {
26869+static user_regset_no_const x86_32_regsets[] __read_only = {
26870 [REGSET_GENERAL] = {
26871 .core_note_type = NT_PRSTATUS,
26872 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26873@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26874 */
26875 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26876
26877-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26878+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26879 {
26880 #ifdef CONFIG_X86_64
26881 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26882@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26883 memset(info, 0, sizeof(*info));
26884 info->si_signo = SIGTRAP;
26885 info->si_code = si_code;
26886- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26887+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26888 }
26889
26890 void user_single_step_siginfo(struct task_struct *tsk,
26891@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26892 }
26893 }
26894
26895+#ifdef CONFIG_GRKERNSEC_SETXID
26896+extern void gr_delayed_cred_worker(void);
26897+#endif
26898+
26899 /*
26900 * We can return 0 to resume the syscall or anything else to go to phase
26901 * 2. If we resume the syscall, we need to put something appropriate in
26902@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26903
26904 BUG_ON(regs != task_pt_regs(current));
26905
26906+#ifdef CONFIG_GRKERNSEC_SETXID
26907+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26908+ gr_delayed_cred_worker();
26909+#endif
26910+
26911 /*
26912 * If we stepped into a sysenter/syscall insn, it trapped in
26913 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26914@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26915 */
26916 user_exit();
26917
26918+#ifdef CONFIG_GRKERNSEC_SETXID
26919+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26920+ gr_delayed_cred_worker();
26921+#endif
26922+
26923 audit_syscall_exit(regs);
26924
26925 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26926diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26927index e5ecd20..60f7eef 100644
26928--- a/arch/x86/kernel/pvclock.c
26929+++ b/arch/x86/kernel/pvclock.c
26930@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26931 reset_hung_task_detector();
26932 }
26933
26934-static atomic64_t last_value = ATOMIC64_INIT(0);
26935+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26936
26937 void pvclock_resume(void)
26938 {
26939- atomic64_set(&last_value, 0);
26940+ atomic64_set_unchecked(&last_value, 0);
26941 }
26942
26943 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26944@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26945 * updating at the same time, and one of them could be slightly behind,
26946 * making the assumption that last_value always go forward fail to hold.
26947 */
26948- last = atomic64_read(&last_value);
26949+ last = atomic64_read_unchecked(&last_value);
26950 do {
26951 if (ret < last)
26952 return last;
26953- last = atomic64_cmpxchg(&last_value, last, ret);
26954+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26955 } while (unlikely(last != ret));
26956
26957 return ret;
26958diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26959index 86db4bc..a50a54a 100644
26960--- a/arch/x86/kernel/reboot.c
26961+++ b/arch/x86/kernel/reboot.c
26962@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26963
26964 void __noreturn machine_real_restart(unsigned int type)
26965 {
26966+
26967+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26968+ struct desc_struct *gdt;
26969+#endif
26970+
26971 local_irq_disable();
26972
26973 /*
26974@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
26975
26976 /* Jump to the identity-mapped low memory code */
26977 #ifdef CONFIG_X86_32
26978- asm volatile("jmpl *%0" : :
26979+
26980+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26981+ gdt = get_cpu_gdt_table(smp_processor_id());
26982+ pax_open_kernel();
26983+#ifdef CONFIG_PAX_MEMORY_UDEREF
26984+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26985+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26986+ loadsegment(ds, __KERNEL_DS);
26987+ loadsegment(es, __KERNEL_DS);
26988+ loadsegment(ss, __KERNEL_DS);
26989+#endif
26990+#ifdef CONFIG_PAX_KERNEXEC
26991+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26992+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26993+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26994+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26995+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26996+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26997+#endif
26998+ pax_close_kernel();
26999+#endif
27000+
27001+ asm volatile("ljmpl *%0" : :
27002 "rm" (real_mode_header->machine_real_restart_asm),
27003 "a" (type));
27004 #else
27005@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27006 /*
27007 * This is a single dmi_table handling all reboot quirks.
27008 */
27009-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27010+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27011
27012 /* Acer */
27013 { /* Handle reboot issue on Acer Aspire one */
27014@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27015 * This means that this function can never return, it can misbehave
27016 * by not rebooting properly and hanging.
27017 */
27018-static void native_machine_emergency_restart(void)
27019+static void __noreturn native_machine_emergency_restart(void)
27020 {
27021 int i;
27022 int attempt = 0;
27023@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27024 #endif
27025 }
27026
27027-static void __machine_emergency_restart(int emergency)
27028+static void __noreturn __machine_emergency_restart(int emergency)
27029 {
27030 reboot_emergency = emergency;
27031 machine_ops.emergency_restart();
27032 }
27033
27034-static void native_machine_restart(char *__unused)
27035+static void __noreturn native_machine_restart(char *__unused)
27036 {
27037 pr_notice("machine restart\n");
27038
27039@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27040 __machine_emergency_restart(0);
27041 }
27042
27043-static void native_machine_halt(void)
27044+static void __noreturn native_machine_halt(void)
27045 {
27046 /* Stop other cpus and apics */
27047 machine_shutdown();
27048@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27049 stop_this_cpu(NULL);
27050 }
27051
27052-static void native_machine_power_off(void)
27053+static void __noreturn native_machine_power_off(void)
27054 {
27055 if (pm_power_off) {
27056 if (!reboot_force)
27057@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27058 }
27059 /* A fallback in case there is no PM info available */
27060 tboot_shutdown(TB_SHUTDOWN_HALT);
27061+ unreachable();
27062 }
27063
27064-struct machine_ops machine_ops = {
27065+struct machine_ops machine_ops __read_only = {
27066 .power_off = native_machine_power_off,
27067 .shutdown = native_machine_shutdown,
27068 .emergency_restart = native_machine_emergency_restart,
27069diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27070index c8e41e9..64049ef 100644
27071--- a/arch/x86/kernel/reboot_fixups_32.c
27072+++ b/arch/x86/kernel/reboot_fixups_32.c
27073@@ -57,7 +57,7 @@ struct device_fixup {
27074 unsigned int vendor;
27075 unsigned int device;
27076 void (*reboot_fixup)(struct pci_dev *);
27077-};
27078+} __do_const;
27079
27080 /*
27081 * PCI ids solely used for fixups_table go here
27082diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27083index 3fd2c69..a444264 100644
27084--- a/arch/x86/kernel/relocate_kernel_64.S
27085+++ b/arch/x86/kernel/relocate_kernel_64.S
27086@@ -96,8 +96,7 @@ relocate_kernel:
27087
27088 /* jump to identity mapped page */
27089 addq $(identity_mapped - relocate_kernel), %r8
27090- pushq %r8
27091- ret
27092+ jmp *%r8
27093
27094 identity_mapped:
27095 /* set return address to 0 if not preserving context */
27096diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27097index 0a2421c..11f3f36 100644
27098--- a/arch/x86/kernel/setup.c
27099+++ b/arch/x86/kernel/setup.c
27100@@ -111,6 +111,7 @@
27101 #include <asm/mce.h>
27102 #include <asm/alternative.h>
27103 #include <asm/prom.h>
27104+#include <asm/boot.h>
27105
27106 /*
27107 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27108@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27109 #endif
27110
27111
27112-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27113-__visible unsigned long mmu_cr4_features;
27114+#ifdef CONFIG_X86_64
27115+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27116+#elif defined(CONFIG_X86_PAE)
27117+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27118 #else
27119-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27120+__visible unsigned long mmu_cr4_features __read_only;
27121 #endif
27122
27123 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27124@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27125 * area (640->1Mb) as ram even though it is not.
27126 * take them out.
27127 */
27128- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27129+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27130
27131 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27132 }
27133@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27134 /* called before trim_bios_range() to spare extra sanitize */
27135 static void __init e820_add_kernel_range(void)
27136 {
27137- u64 start = __pa_symbol(_text);
27138+ u64 start = __pa_symbol(ktla_ktva(_text));
27139 u64 size = __pa_symbol(_end) - start;
27140
27141 /*
27142@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27143
27144 void __init setup_arch(char **cmdline_p)
27145 {
27146+#ifdef CONFIG_X86_32
27147+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27148+#else
27149 memblock_reserve(__pa_symbol(_text),
27150 (unsigned long)__bss_stop - (unsigned long)_text);
27151+#endif
27152
27153 early_reserve_initrd();
27154
27155@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27156
27157 if (!boot_params.hdr.root_flags)
27158 root_mountflags &= ~MS_RDONLY;
27159- init_mm.start_code = (unsigned long) _text;
27160- init_mm.end_code = (unsigned long) _etext;
27161+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27162+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27163 init_mm.end_data = (unsigned long) _edata;
27164 init_mm.brk = _brk_end;
27165
27166 mpx_mm_init(&init_mm);
27167
27168- code_resource.start = __pa_symbol(_text);
27169- code_resource.end = __pa_symbol(_etext)-1;
27170- data_resource.start = __pa_symbol(_etext);
27171+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27172+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27173+ data_resource.start = __pa_symbol(_sdata);
27174 data_resource.end = __pa_symbol(_edata)-1;
27175 bss_resource.start = __pa_symbol(__bss_start);
27176 bss_resource.end = __pa_symbol(__bss_stop)-1;
27177diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27178index e4fcb87..9c06c55 100644
27179--- a/arch/x86/kernel/setup_percpu.c
27180+++ b/arch/x86/kernel/setup_percpu.c
27181@@ -21,19 +21,17 @@
27182 #include <asm/cpu.h>
27183 #include <asm/stackprotector.h>
27184
27185-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27186+#ifdef CONFIG_SMP
27187+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27188 EXPORT_PER_CPU_SYMBOL(cpu_number);
27189+#endif
27190
27191-#ifdef CONFIG_X86_64
27192 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27193-#else
27194-#define BOOT_PERCPU_OFFSET 0
27195-#endif
27196
27197 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27198 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27199
27200-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27201+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27202 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27203 };
27204 EXPORT_SYMBOL(__per_cpu_offset);
27205@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27206 {
27207 #ifdef CONFIG_NEED_MULTIPLE_NODES
27208 pg_data_t *last = NULL;
27209- unsigned int cpu;
27210+ int cpu;
27211
27212 for_each_possible_cpu(cpu) {
27213 int node = early_cpu_to_node(cpu);
27214@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27215 {
27216 #ifdef CONFIG_X86_32
27217 struct desc_struct gdt;
27218+ unsigned long base = per_cpu_offset(cpu);
27219
27220- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27221- 0x2 | DESCTYPE_S, 0x8);
27222- gdt.s = 1;
27223+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27224+ 0x83 | DESCTYPE_S, 0xC);
27225 write_gdt_entry(get_cpu_gdt_table(cpu),
27226 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27227 #endif
27228@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27229 /* alrighty, percpu areas up and running */
27230 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27231 for_each_possible_cpu(cpu) {
27232+#ifdef CONFIG_CC_STACKPROTECTOR
27233+#ifdef CONFIG_X86_32
27234+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27235+#endif
27236+#endif
27237 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27238 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27239 per_cpu(cpu_number, cpu) = cpu;
27240@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27241 */
27242 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27243 #endif
27244+#ifdef CONFIG_CC_STACKPROTECTOR
27245+#ifdef CONFIG_X86_32
27246+ if (!cpu)
27247+ per_cpu(stack_canary.canary, cpu) = canary;
27248+#endif
27249+#endif
27250 /*
27251 * Up to this point, the boot CPU has been using .init.data
27252 * area. Reload any changed state for the boot CPU.
27253diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27254index e504246..ba10432 100644
27255--- a/arch/x86/kernel/signal.c
27256+++ b/arch/x86/kernel/signal.c
27257@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27258 * Align the stack pointer according to the i386 ABI,
27259 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27260 */
27261- sp = ((sp + 4) & -16ul) - 4;
27262+ sp = ((sp - 12) & -16ul) - 4;
27263 #else /* !CONFIG_X86_32 */
27264 sp = round_down(sp, 16) - 8;
27265 #endif
27266@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27267 }
27268
27269 if (current->mm->context.vdso)
27270- restorer = current->mm->context.vdso +
27271- selected_vdso32->sym___kernel_sigreturn;
27272+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27273 else
27274- restorer = &frame->retcode;
27275+ restorer = (void __user *)&frame->retcode;
27276 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27277 restorer = ksig->ka.sa.sa_restorer;
27278
27279@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27280 * reasons and because gdb uses it as a signature to notice
27281 * signal handler stack frames.
27282 */
27283- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27284+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27285
27286 if (err)
27287 return -EFAULT;
27288@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27289 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27290
27291 /* Set up to return from userspace. */
27292- restorer = current->mm->context.vdso +
27293- selected_vdso32->sym___kernel_rt_sigreturn;
27294+ if (current->mm->context.vdso)
27295+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27296+ else
27297+ restorer = (void __user *)&frame->retcode;
27298 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27299 restorer = ksig->ka.sa.sa_restorer;
27300 put_user_ex(restorer, &frame->pretcode);
27301@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27302 * reasons and because gdb uses it as a signature to notice
27303 * signal handler stack frames.
27304 */
27305- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27306+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27307 } put_user_catch(err);
27308
27309 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27310@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27311 {
27312 int usig = signr_convert(ksig->sig);
27313 sigset_t *set = sigmask_to_save();
27314- compat_sigset_t *cset = (compat_sigset_t *) set;
27315+ sigset_t sigcopy;
27316+ compat_sigset_t *cset;
27317+
27318+ sigcopy = *set;
27319+
27320+ cset = (compat_sigset_t *) &sigcopy;
27321
27322 /* Set up the stack frame */
27323 if (is_ia32_frame()) {
27324@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27325 } else if (is_x32_frame()) {
27326 return x32_setup_rt_frame(ksig, cset, regs);
27327 } else {
27328- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27329+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27330 }
27331 }
27332
27333diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27334index be8e1bd..a3d93fa 100644
27335--- a/arch/x86/kernel/smp.c
27336+++ b/arch/x86/kernel/smp.c
27337@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27338
27339 __setup("nonmi_ipi", nonmi_ipi_setup);
27340
27341-struct smp_ops smp_ops = {
27342+struct smp_ops smp_ops __read_only = {
27343 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27344 .smp_prepare_cpus = native_smp_prepare_cpus,
27345 .smp_cpus_done = native_smp_cpus_done,
27346diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27347index febc6aa..37d8edf 100644
27348--- a/arch/x86/kernel/smpboot.c
27349+++ b/arch/x86/kernel/smpboot.c
27350@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27351
27352 enable_start_cpu0 = 0;
27353
27354-#ifdef CONFIG_X86_32
27355+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27356+ barrier();
27357+
27358 /* switch away from the initial page table */
27359+#ifdef CONFIG_PAX_PER_CPU_PGD
27360+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27361+#else
27362 load_cr3(swapper_pg_dir);
27363+#endif
27364 __flush_tlb_all();
27365-#endif
27366
27367- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27368- barrier();
27369 /*
27370 * Check TSC synchronization with the BP:
27371 */
27372@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27373 alternatives_enable_smp();
27374
27375 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27376- (THREAD_SIZE + task_stack_page(idle))) - 1);
27377+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27378 per_cpu(current_task, cpu) = idle;
27379+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27380
27381 #ifdef CONFIG_X86_32
27382 /* Stack for startup_32 can be just as for start_secondary onwards */
27383@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27384 clear_tsk_thread_flag(idle, TIF_FORK);
27385 initial_gs = per_cpu_offset(cpu);
27386 #endif
27387- per_cpu(kernel_stack, cpu) =
27388- (unsigned long)task_stack_page(idle) -
27389- KERNEL_STACK_OFFSET + THREAD_SIZE;
27390+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27391+ pax_open_kernel();
27392 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27393+ pax_close_kernel();
27394 initial_code = (unsigned long)start_secondary;
27395 stack_start = idle->thread.sp;
27396
27397@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27398 /* the FPU context is blank, nobody can own it */
27399 __cpu_disable_lazy_restore(cpu);
27400
27401+#ifdef CONFIG_PAX_PER_CPU_PGD
27402+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27403+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27404+ KERNEL_PGD_PTRS);
27405+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27406+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27407+ KERNEL_PGD_PTRS);
27408+#endif
27409+
27410 err = do_boot_cpu(apicid, cpu, tidle);
27411 if (err) {
27412 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27413diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27414index 9b4d51d..5d28b58 100644
27415--- a/arch/x86/kernel/step.c
27416+++ b/arch/x86/kernel/step.c
27417@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27418 struct desc_struct *desc;
27419 unsigned long base;
27420
27421- seg &= ~7UL;
27422+ seg >>= 3;
27423
27424 mutex_lock(&child->mm->context.lock);
27425- if (unlikely((seg >> 3) >= child->mm->context.size))
27426+ if (unlikely(seg >= child->mm->context.size))
27427 addr = -1L; /* bogus selector, access would fault */
27428 else {
27429 desc = child->mm->context.ldt + seg;
27430@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27431 addr += base;
27432 }
27433 mutex_unlock(&child->mm->context.lock);
27434- }
27435+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27436+ addr = ktla_ktva(addr);
27437
27438 return addr;
27439 }
27440@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27441 unsigned char opcode[15];
27442 unsigned long addr = convert_ip_to_linear(child, regs);
27443
27444+ if (addr == -EINVAL)
27445+ return 0;
27446+
27447 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27448 for (i = 0; i < copied; i++) {
27449 switch (opcode[i]) {
27450diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27451new file mode 100644
27452index 0000000..5877189
27453--- /dev/null
27454+++ b/arch/x86/kernel/sys_i386_32.c
27455@@ -0,0 +1,189 @@
27456+/*
27457+ * This file contains various random system calls that
27458+ * have a non-standard calling sequence on the Linux/i386
27459+ * platform.
27460+ */
27461+
27462+#include <linux/errno.h>
27463+#include <linux/sched.h>
27464+#include <linux/mm.h>
27465+#include <linux/fs.h>
27466+#include <linux/smp.h>
27467+#include <linux/sem.h>
27468+#include <linux/msg.h>
27469+#include <linux/shm.h>
27470+#include <linux/stat.h>
27471+#include <linux/syscalls.h>
27472+#include <linux/mman.h>
27473+#include <linux/file.h>
27474+#include <linux/utsname.h>
27475+#include <linux/ipc.h>
27476+#include <linux/elf.h>
27477+
27478+#include <linux/uaccess.h>
27479+#include <linux/unistd.h>
27480+
27481+#include <asm/syscalls.h>
27482+
27483+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27484+{
27485+ unsigned long pax_task_size = TASK_SIZE;
27486+
27487+#ifdef CONFIG_PAX_SEGMEXEC
27488+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27489+ pax_task_size = SEGMEXEC_TASK_SIZE;
27490+#endif
27491+
27492+ if (flags & MAP_FIXED)
27493+ if (len > pax_task_size || addr > pax_task_size - len)
27494+ return -EINVAL;
27495+
27496+ return 0;
27497+}
27498+
27499+/*
27500+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27501+ */
27502+static unsigned long get_align_mask(void)
27503+{
27504+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27505+ return 0;
27506+
27507+ if (!(current->flags & PF_RANDOMIZE))
27508+ return 0;
27509+
27510+ return va_align.mask;
27511+}
27512+
27513+unsigned long
27514+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27515+ unsigned long len, unsigned long pgoff, unsigned long flags)
27516+{
27517+ struct mm_struct *mm = current->mm;
27518+ struct vm_area_struct *vma;
27519+ unsigned long pax_task_size = TASK_SIZE;
27520+ struct vm_unmapped_area_info info;
27521+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27522+
27523+#ifdef CONFIG_PAX_SEGMEXEC
27524+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27525+ pax_task_size = SEGMEXEC_TASK_SIZE;
27526+#endif
27527+
27528+ pax_task_size -= PAGE_SIZE;
27529+
27530+ if (len > pax_task_size)
27531+ return -ENOMEM;
27532+
27533+ if (flags & MAP_FIXED)
27534+ return addr;
27535+
27536+#ifdef CONFIG_PAX_RANDMMAP
27537+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27538+#endif
27539+
27540+ if (addr) {
27541+ addr = PAGE_ALIGN(addr);
27542+ if (pax_task_size - len >= addr) {
27543+ vma = find_vma(mm, addr);
27544+ if (check_heap_stack_gap(vma, addr, len, offset))
27545+ return addr;
27546+ }
27547+ }
27548+
27549+ info.flags = 0;
27550+ info.length = len;
27551+ info.align_mask = filp ? get_align_mask() : 0;
27552+ info.align_offset = pgoff << PAGE_SHIFT;
27553+ info.threadstack_offset = offset;
27554+
27555+#ifdef CONFIG_PAX_PAGEEXEC
27556+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27557+ info.low_limit = 0x00110000UL;
27558+ info.high_limit = mm->start_code;
27559+
27560+#ifdef CONFIG_PAX_RANDMMAP
27561+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27562+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27563+#endif
27564+
27565+ if (info.low_limit < info.high_limit) {
27566+ addr = vm_unmapped_area(&info);
27567+ if (!IS_ERR_VALUE(addr))
27568+ return addr;
27569+ }
27570+ } else
27571+#endif
27572+
27573+ info.low_limit = mm->mmap_base;
27574+ info.high_limit = pax_task_size;
27575+
27576+ return vm_unmapped_area(&info);
27577+}
27578+
27579+unsigned long
27580+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27581+ const unsigned long len, const unsigned long pgoff,
27582+ const unsigned long flags)
27583+{
27584+ struct vm_area_struct *vma;
27585+ struct mm_struct *mm = current->mm;
27586+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27587+ struct vm_unmapped_area_info info;
27588+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27589+
27590+#ifdef CONFIG_PAX_SEGMEXEC
27591+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27592+ pax_task_size = SEGMEXEC_TASK_SIZE;
27593+#endif
27594+
27595+ pax_task_size -= PAGE_SIZE;
27596+
27597+ /* requested length too big for entire address space */
27598+ if (len > pax_task_size)
27599+ return -ENOMEM;
27600+
27601+ if (flags & MAP_FIXED)
27602+ return addr;
27603+
27604+#ifdef CONFIG_PAX_PAGEEXEC
27605+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27606+ goto bottomup;
27607+#endif
27608+
27609+#ifdef CONFIG_PAX_RANDMMAP
27610+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27611+#endif
27612+
27613+ /* requesting a specific address */
27614+ if (addr) {
27615+ addr = PAGE_ALIGN(addr);
27616+ if (pax_task_size - len >= addr) {
27617+ vma = find_vma(mm, addr);
27618+ if (check_heap_stack_gap(vma, addr, len, offset))
27619+ return addr;
27620+ }
27621+ }
27622+
27623+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27624+ info.length = len;
27625+ info.low_limit = PAGE_SIZE;
27626+ info.high_limit = mm->mmap_base;
27627+ info.align_mask = filp ? get_align_mask() : 0;
27628+ info.align_offset = pgoff << PAGE_SHIFT;
27629+ info.threadstack_offset = offset;
27630+
27631+ addr = vm_unmapped_area(&info);
27632+ if (!(addr & ~PAGE_MASK))
27633+ return addr;
27634+ VM_BUG_ON(addr != -ENOMEM);
27635+
27636+bottomup:
27637+ /*
27638+ * A failed mmap() very likely causes application failure,
27639+ * so fall back to the bottom-up function here. This scenario
27640+ * can happen with large stack limits and large mmap()
27641+ * allocations.
27642+ */
27643+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27644+}
27645diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27646index 30277e2..5664a29 100644
27647--- a/arch/x86/kernel/sys_x86_64.c
27648+++ b/arch/x86/kernel/sys_x86_64.c
27649@@ -81,8 +81,8 @@ out:
27650 return error;
27651 }
27652
27653-static void find_start_end(unsigned long flags, unsigned long *begin,
27654- unsigned long *end)
27655+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27656+ unsigned long *begin, unsigned long *end)
27657 {
27658 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27659 unsigned long new_begin;
27660@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27661 *begin = new_begin;
27662 }
27663 } else {
27664- *begin = current->mm->mmap_legacy_base;
27665+ *begin = mm->mmap_legacy_base;
27666 *end = TASK_SIZE;
27667 }
27668 }
27669@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27670 struct vm_area_struct *vma;
27671 struct vm_unmapped_area_info info;
27672 unsigned long begin, end;
27673+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27674
27675 if (flags & MAP_FIXED)
27676 return addr;
27677
27678- find_start_end(flags, &begin, &end);
27679+ find_start_end(mm, flags, &begin, &end);
27680
27681 if (len > end)
27682 return -ENOMEM;
27683
27684+#ifdef CONFIG_PAX_RANDMMAP
27685+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27686+#endif
27687+
27688 if (addr) {
27689 addr = PAGE_ALIGN(addr);
27690 vma = find_vma(mm, addr);
27691- if (end - len >= addr &&
27692- (!vma || addr + len <= vma->vm_start))
27693+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27694 return addr;
27695 }
27696
27697@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27698 info.high_limit = end;
27699 info.align_mask = filp ? get_align_mask() : 0;
27700 info.align_offset = pgoff << PAGE_SHIFT;
27701+ info.threadstack_offset = offset;
27702 return vm_unmapped_area(&info);
27703 }
27704
27705@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27706 struct mm_struct *mm = current->mm;
27707 unsigned long addr = addr0;
27708 struct vm_unmapped_area_info info;
27709+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27710
27711 /* requested length too big for entire address space */
27712 if (len > TASK_SIZE)
27713@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27714 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27715 goto bottomup;
27716
27717+#ifdef CONFIG_PAX_RANDMMAP
27718+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27719+#endif
27720+
27721 /* requesting a specific address */
27722 if (addr) {
27723 addr = PAGE_ALIGN(addr);
27724 vma = find_vma(mm, addr);
27725- if (TASK_SIZE - len >= addr &&
27726- (!vma || addr + len <= vma->vm_start))
27727+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27728 return addr;
27729 }
27730
27731@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27732 info.high_limit = mm->mmap_base;
27733 info.align_mask = filp ? get_align_mask() : 0;
27734 info.align_offset = pgoff << PAGE_SHIFT;
27735+ info.threadstack_offset = offset;
27736 addr = vm_unmapped_area(&info);
27737 if (!(addr & ~PAGE_MASK))
27738 return addr;
27739diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27740index 91a4496..42fc304 100644
27741--- a/arch/x86/kernel/tboot.c
27742+++ b/arch/x86/kernel/tboot.c
27743@@ -44,6 +44,7 @@
27744 #include <asm/setup.h>
27745 #include <asm/e820.h>
27746 #include <asm/io.h>
27747+#include <asm/tlbflush.h>
27748
27749 #include "../realmode/rm/wakeup.h"
27750
27751@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27752
27753 void tboot_shutdown(u32 shutdown_type)
27754 {
27755- void (*shutdown)(void);
27756+ void (* __noreturn shutdown)(void);
27757
27758 if (!tboot_enabled())
27759 return;
27760@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27761 tboot->shutdown_type = shutdown_type;
27762
27763 switch_to_tboot_pt();
27764+ cr4_clear_bits(X86_CR4_PCIDE);
27765
27766- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27767+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27768 shutdown();
27769
27770 /* should not reach here */
27771@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27772 return -ENODEV;
27773 }
27774
27775-static atomic_t ap_wfs_count;
27776+static atomic_unchecked_t ap_wfs_count;
27777
27778 static int tboot_wait_for_aps(int num_aps)
27779 {
27780@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27781 {
27782 switch (action) {
27783 case CPU_DYING:
27784- atomic_inc(&ap_wfs_count);
27785+ atomic_inc_unchecked(&ap_wfs_count);
27786 if (num_online_cpus() == 1)
27787- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27788+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27789 return NOTIFY_BAD;
27790 break;
27791 }
27792@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27793
27794 tboot_create_trampoline();
27795
27796- atomic_set(&ap_wfs_count, 0);
27797+ atomic_set_unchecked(&ap_wfs_count, 0);
27798 register_hotcpu_notifier(&tboot_cpu_notifier);
27799
27800 #ifdef CONFIG_DEBUG_FS
27801diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27802index 25adc0e..1df4349 100644
27803--- a/arch/x86/kernel/time.c
27804+++ b/arch/x86/kernel/time.c
27805@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27806 {
27807 unsigned long pc = instruction_pointer(regs);
27808
27809- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27810+ if (!user_mode(regs) && in_lock_functions(pc)) {
27811 #ifdef CONFIG_FRAME_POINTER
27812- return *(unsigned long *)(regs->bp + sizeof(long));
27813+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27814 #else
27815 unsigned long *sp =
27816 (unsigned long *)kernel_stack_pointer(regs);
27817@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27818 * or above a saved flags. Eflags has bits 22-31 zero,
27819 * kernel addresses don't.
27820 */
27821+
27822+#ifdef CONFIG_PAX_KERNEXEC
27823+ return ktla_ktva(sp[0]);
27824+#else
27825 if (sp[0] >> 22)
27826 return sp[0];
27827 if (sp[1] >> 22)
27828 return sp[1];
27829 #endif
27830+
27831+#endif
27832 }
27833 return pc;
27834 }
27835diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27836index 7fc5e84..c6e445a 100644
27837--- a/arch/x86/kernel/tls.c
27838+++ b/arch/x86/kernel/tls.c
27839@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27840 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27841 return -EINVAL;
27842
27843+#ifdef CONFIG_PAX_SEGMEXEC
27844+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27845+ return -EINVAL;
27846+#endif
27847+
27848 set_tls_desc(p, idx, &info, 1);
27849
27850 return 0;
27851@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27852
27853 if (kbuf)
27854 info = kbuf;
27855- else if (__copy_from_user(infobuf, ubuf, count))
27856+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27857 return -EFAULT;
27858 else
27859 info = infobuf;
27860diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27861index 1c113db..287b42e 100644
27862--- a/arch/x86/kernel/tracepoint.c
27863+++ b/arch/x86/kernel/tracepoint.c
27864@@ -9,11 +9,11 @@
27865 #include <linux/atomic.h>
27866
27867 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27868-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27869+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27870 (unsigned long) trace_idt_table };
27871
27872 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27873-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27874+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27875
27876 static int trace_irq_vector_refcount;
27877 static DEFINE_MUTEX(irq_vector_mutex);
27878diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27879index 4ff5d16..736e3e1 100644
27880--- a/arch/x86/kernel/traps.c
27881+++ b/arch/x86/kernel/traps.c
27882@@ -68,7 +68,7 @@
27883 #include <asm/proto.h>
27884
27885 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27886-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27887+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27888 #else
27889 #include <asm/processor-flags.h>
27890 #include <asm/setup.h>
27891@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27892 #endif
27893
27894 /* Must be page-aligned because the real IDT is used in a fixmap. */
27895-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27896+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27897
27898 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27899 EXPORT_SYMBOL_GPL(used_vectors);
27900@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27901 {
27902 enum ctx_state prev_state;
27903
27904- if (user_mode_vm(regs)) {
27905+ if (user_mode(regs)) {
27906 /* Other than that, we're just an exception. */
27907 prev_state = exception_enter();
27908 } else {
27909@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27910 /* Must be before exception_exit. */
27911 preempt_count_sub(HARDIRQ_OFFSET);
27912
27913- if (user_mode_vm(regs))
27914+ if (user_mode(regs))
27915 return exception_exit(prev_state);
27916 else
27917 rcu_nmi_exit();
27918@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27919 *
27920 * IST exception handlers normally cannot schedule. As a special
27921 * exception, if the exception interrupted userspace code (i.e.
27922- * user_mode_vm(regs) would return true) and the exception was not
27923+ * user_mode(regs) would return true) and the exception was not
27924 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27925 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27926 * Callers are responsible for enabling interrupts themselves inside
27927@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27928 */
27929 void ist_begin_non_atomic(struct pt_regs *regs)
27930 {
27931- BUG_ON(!user_mode_vm(regs));
27932+ BUG_ON(!user_mode(regs));
27933
27934 /*
27935 * Sanity check: we need to be on the normal thread stack. This
27936@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27937 }
27938
27939 static nokprobe_inline int
27940-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27941+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27942 struct pt_regs *regs, long error_code)
27943 {
27944 #ifdef CONFIG_X86_32
27945- if (regs->flags & X86_VM_MASK) {
27946+ if (v8086_mode(regs)) {
27947 /*
27948 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27949 * On nmi (interrupt 2), do_trap should not be called.
27950@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27951 return -1;
27952 }
27953 #endif
27954- if (!user_mode(regs)) {
27955+ if (!user_mode_novm(regs)) {
27956 if (!fixup_exception(regs)) {
27957 tsk->thread.error_code = error_code;
27958 tsk->thread.trap_nr = trapnr;
27959+
27960+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27961+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27962+ str = "PAX: suspicious stack segment fault";
27963+#endif
27964+
27965 die(str, regs, error_code);
27966 }
27967+
27968+#ifdef CONFIG_PAX_REFCOUNT
27969+ if (trapnr == X86_TRAP_OF)
27970+ pax_report_refcount_overflow(regs);
27971+#endif
27972+
27973 return 0;
27974 }
27975
27976@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27977 }
27978
27979 static void
27980-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27981+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27982 long error_code, siginfo_t *info)
27983 {
27984 struct task_struct *tsk = current;
27985@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27986 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27987 printk_ratelimit()) {
27988 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27989- tsk->comm, tsk->pid, str,
27990+ tsk->comm, task_pid_nr(tsk), str,
27991 regs->ip, regs->sp, error_code);
27992 print_vma_addr(" in ", regs->ip);
27993 pr_cont("\n");
27994@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27995 tsk->thread.error_code = error_code;
27996 tsk->thread.trap_nr = X86_TRAP_DF;
27997
27998+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27999+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28000+ die("grsec: kernel stack overflow detected", regs, error_code);
28001+#endif
28002+
28003 #ifdef CONFIG_DOUBLEFAULT
28004 df_debug(regs, error_code);
28005 #endif
28006@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
28007 goto exit;
28008 conditional_sti(regs);
28009
28010- if (!user_mode_vm(regs))
28011+ if (!user_mode(regs))
28012 die("bounds", regs, error_code);
28013
28014 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
28015@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
28016 conditional_sti(regs);
28017
28018 #ifdef CONFIG_X86_32
28019- if (regs->flags & X86_VM_MASK) {
28020+ if (v8086_mode(regs)) {
28021 local_irq_enable();
28022 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28023 goto exit;
28024@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28025 #endif
28026
28027 tsk = current;
28028- if (!user_mode(regs)) {
28029+ if (!user_mode_novm(regs)) {
28030 if (fixup_exception(regs))
28031 goto exit;
28032
28033 tsk->thread.error_code = error_code;
28034 tsk->thread.trap_nr = X86_TRAP_GP;
28035 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28036- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28037+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28038+
28039+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28040+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28041+ die("PAX: suspicious general protection fault", regs, error_code);
28042+ else
28043+#endif
28044+
28045 die("general protection fault", regs, error_code);
28046+ }
28047 goto exit;
28048 }
28049
28050+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28051+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28052+ struct mm_struct *mm = tsk->mm;
28053+ unsigned long limit;
28054+
28055+ down_write(&mm->mmap_sem);
28056+ limit = mm->context.user_cs_limit;
28057+ if (limit < TASK_SIZE) {
28058+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28059+ up_write(&mm->mmap_sem);
28060+ return;
28061+ }
28062+ up_write(&mm->mmap_sem);
28063+ }
28064+#endif
28065+
28066 tsk->thread.error_code = error_code;
28067 tsk->thread.trap_nr = X86_TRAP_GP;
28068
28069@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28070 container_of(task_pt_regs(current),
28071 struct bad_iret_stack, regs);
28072
28073+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28074+ new_stack = s;
28075+
28076 /* Copy the IRET target to the new stack. */
28077 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28078
28079 /* Copy the remainder of the stack from the current stack. */
28080 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28081
28082- BUG_ON(!user_mode_vm(&new_stack->regs));
28083+ BUG_ON(!user_mode(&new_stack->regs));
28084 return new_stack;
28085 }
28086 NOKPROBE_SYMBOL(fixup_bad_iret);
28087@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28088 * then it's very likely the result of an icebp/int01 trap.
28089 * User wants a sigtrap for that.
28090 */
28091- if (!dr6 && user_mode_vm(regs))
28092+ if (!dr6 && user_mode(regs))
28093 user_icebp = 1;
28094
28095 /* Catch kmemcheck conditions first of all! */
28096@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28097 /* It's safe to allow irq's after DR6 has been saved */
28098 preempt_conditional_sti(regs);
28099
28100- if (regs->flags & X86_VM_MASK) {
28101+ if (v8086_mode(regs)) {
28102 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28103 X86_TRAP_DB);
28104 preempt_conditional_cli(regs);
28105@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28106 * We already checked v86 mode above, so we can check for kernel mode
28107 * by just checking the CPL of CS.
28108 */
28109- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28110+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28111 tsk->thread.debugreg6 &= ~DR_STEP;
28112 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28113 regs->flags &= ~X86_EFLAGS_TF;
28114@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28115 return;
28116 conditional_sti(regs);
28117
28118- if (!user_mode_vm(regs))
28119+ if (!user_mode(regs))
28120 {
28121 if (!fixup_exception(regs)) {
28122 task->thread.error_code = error_code;
28123diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28124index 5054497..139f8f8 100644
28125--- a/arch/x86/kernel/tsc.c
28126+++ b/arch/x86/kernel/tsc.c
28127@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28128 */
28129 smp_wmb();
28130
28131- ACCESS_ONCE(c2n->head) = data;
28132+ ACCESS_ONCE_RW(c2n->head) = data;
28133 }
28134
28135 /*
28136diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28137index 81f8adb0..fff670e 100644
28138--- a/arch/x86/kernel/uprobes.c
28139+++ b/arch/x86/kernel/uprobes.c
28140@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28141 int ret = NOTIFY_DONE;
28142
28143 /* We are only interested in userspace traps */
28144- if (regs && !user_mode_vm(regs))
28145+ if (regs && !user_mode(regs))
28146 return NOTIFY_DONE;
28147
28148 switch (val) {
28149@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28150
28151 if (nleft != rasize) {
28152 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28153- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28154+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28155
28156 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28157 }
28158diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28159index b9242ba..50c5edd 100644
28160--- a/arch/x86/kernel/verify_cpu.S
28161+++ b/arch/x86/kernel/verify_cpu.S
28162@@ -20,6 +20,7 @@
28163 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28164 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28165 * arch/x86/kernel/head_32.S: processor startup
28166+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28167 *
28168 * verify_cpu, returns the status of longmode and SSE in register %eax.
28169 * 0: Success 1: Failure
28170diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28171index e8edcf5..27f9344 100644
28172--- a/arch/x86/kernel/vm86_32.c
28173+++ b/arch/x86/kernel/vm86_32.c
28174@@ -44,6 +44,7 @@
28175 #include <linux/ptrace.h>
28176 #include <linux/audit.h>
28177 #include <linux/stddef.h>
28178+#include <linux/grsecurity.h>
28179
28180 #include <asm/uaccess.h>
28181 #include <asm/io.h>
28182@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28183 do_exit(SIGSEGV);
28184 }
28185
28186- tss = &per_cpu(init_tss, get_cpu());
28187+ tss = init_tss + get_cpu();
28188 current->thread.sp0 = current->thread.saved_sp0;
28189 current->thread.sysenter_cs = __KERNEL_CS;
28190 load_sp0(tss, &current->thread);
28191@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28192
28193 if (tsk->thread.saved_sp0)
28194 return -EPERM;
28195+
28196+#ifdef CONFIG_GRKERNSEC_VM86
28197+ if (!capable(CAP_SYS_RAWIO)) {
28198+ gr_handle_vm86();
28199+ return -EPERM;
28200+ }
28201+#endif
28202+
28203 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28204 offsetof(struct kernel_vm86_struct, vm86plus) -
28205 sizeof(info.regs));
28206@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28207 int tmp;
28208 struct vm86plus_struct __user *v86;
28209
28210+#ifdef CONFIG_GRKERNSEC_VM86
28211+ if (!capable(CAP_SYS_RAWIO)) {
28212+ gr_handle_vm86();
28213+ return -EPERM;
28214+ }
28215+#endif
28216+
28217 tsk = current;
28218 switch (cmd) {
28219 case VM86_REQUEST_IRQ:
28220@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28221 tsk->thread.saved_fs = info->regs32->fs;
28222 tsk->thread.saved_gs = get_user_gs(info->regs32);
28223
28224- tss = &per_cpu(init_tss, get_cpu());
28225+ tss = init_tss + get_cpu();
28226 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28227 if (cpu_has_sep)
28228 tsk->thread.sysenter_cs = 0;
28229@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28230 goto cannot_handle;
28231 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28232 goto cannot_handle;
28233- intr_ptr = (unsigned long __user *) (i << 2);
28234+ intr_ptr = (__force unsigned long __user *) (i << 2);
28235 if (get_user(segoffs, intr_ptr))
28236 goto cannot_handle;
28237 if ((segoffs >> 16) == BIOSSEG)
28238diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28239index 00bf300..129df8e 100644
28240--- a/arch/x86/kernel/vmlinux.lds.S
28241+++ b/arch/x86/kernel/vmlinux.lds.S
28242@@ -26,6 +26,13 @@
28243 #include <asm/page_types.h>
28244 #include <asm/cache.h>
28245 #include <asm/boot.h>
28246+#include <asm/segment.h>
28247+
28248+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28249+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28250+#else
28251+#define __KERNEL_TEXT_OFFSET 0
28252+#endif
28253
28254 #undef i386 /* in case the preprocessor is a 32bit one */
28255
28256@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28257
28258 PHDRS {
28259 text PT_LOAD FLAGS(5); /* R_E */
28260+#ifdef CONFIG_X86_32
28261+ module PT_LOAD FLAGS(5); /* R_E */
28262+#endif
28263+#ifdef CONFIG_XEN
28264+ rodata PT_LOAD FLAGS(5); /* R_E */
28265+#else
28266+ rodata PT_LOAD FLAGS(4); /* R__ */
28267+#endif
28268 data PT_LOAD FLAGS(6); /* RW_ */
28269-#ifdef CONFIG_X86_64
28270+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28271 #ifdef CONFIG_SMP
28272 percpu PT_LOAD FLAGS(6); /* RW_ */
28273 #endif
28274+ text.init PT_LOAD FLAGS(5); /* R_E */
28275+ text.exit PT_LOAD FLAGS(5); /* R_E */
28276 init PT_LOAD FLAGS(7); /* RWE */
28277-#endif
28278 note PT_NOTE FLAGS(0); /* ___ */
28279 }
28280
28281 SECTIONS
28282 {
28283 #ifdef CONFIG_X86_32
28284- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28285- phys_startup_32 = startup_32 - LOAD_OFFSET;
28286+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28287 #else
28288- . = __START_KERNEL;
28289- phys_startup_64 = startup_64 - LOAD_OFFSET;
28290+ . = __START_KERNEL;
28291 #endif
28292
28293 /* Text and read-only data */
28294- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28295- _text = .;
28296+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28297 /* bootstrapping code */
28298+#ifdef CONFIG_X86_32
28299+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28300+#else
28301+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28302+#endif
28303+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28304+ _text = .;
28305 HEAD_TEXT
28306 . = ALIGN(8);
28307 _stext = .;
28308@@ -104,13 +124,47 @@ SECTIONS
28309 IRQENTRY_TEXT
28310 *(.fixup)
28311 *(.gnu.warning)
28312- /* End of text section */
28313- _etext = .;
28314 } :text = 0x9090
28315
28316- NOTES :text :note
28317+ . += __KERNEL_TEXT_OFFSET;
28318
28319- EXCEPTION_TABLE(16) :text = 0x9090
28320+#ifdef CONFIG_X86_32
28321+ . = ALIGN(PAGE_SIZE);
28322+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28323+
28324+#ifdef CONFIG_PAX_KERNEXEC
28325+ MODULES_EXEC_VADDR = .;
28326+ BYTE(0)
28327+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28328+ . = ALIGN(HPAGE_SIZE) - 1;
28329+ MODULES_EXEC_END = .;
28330+#endif
28331+
28332+ } :module
28333+#endif
28334+
28335+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28336+ /* End of text section */
28337+ BYTE(0)
28338+ _etext = . - __KERNEL_TEXT_OFFSET;
28339+ }
28340+
28341+#ifdef CONFIG_X86_32
28342+ . = ALIGN(PAGE_SIZE);
28343+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28344+ . = ALIGN(PAGE_SIZE);
28345+ *(.empty_zero_page)
28346+ *(.initial_pg_fixmap)
28347+ *(.initial_pg_pmd)
28348+ *(.initial_page_table)
28349+ *(.swapper_pg_dir)
28350+ } :rodata
28351+#endif
28352+
28353+ . = ALIGN(PAGE_SIZE);
28354+ NOTES :rodata :note
28355+
28356+ EXCEPTION_TABLE(16) :rodata
28357
28358 #if defined(CONFIG_DEBUG_RODATA)
28359 /* .text should occupy whole number of pages */
28360@@ -122,16 +176,20 @@ SECTIONS
28361
28362 /* Data */
28363 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28364+
28365+#ifdef CONFIG_PAX_KERNEXEC
28366+ . = ALIGN(HPAGE_SIZE);
28367+#else
28368+ . = ALIGN(PAGE_SIZE);
28369+#endif
28370+
28371 /* Start of data section */
28372 _sdata = .;
28373
28374 /* init_task */
28375 INIT_TASK_DATA(THREAD_SIZE)
28376
28377-#ifdef CONFIG_X86_32
28378- /* 32 bit has nosave before _edata */
28379 NOSAVE_DATA
28380-#endif
28381
28382 PAGE_ALIGNED_DATA(PAGE_SIZE)
28383
28384@@ -174,12 +232,19 @@ SECTIONS
28385 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28386
28387 /* Init code and data - will be freed after init */
28388- . = ALIGN(PAGE_SIZE);
28389 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28390+ BYTE(0)
28391+
28392+#ifdef CONFIG_PAX_KERNEXEC
28393+ . = ALIGN(HPAGE_SIZE);
28394+#else
28395+ . = ALIGN(PAGE_SIZE);
28396+#endif
28397+
28398 __init_begin = .; /* paired with __init_end */
28399- }
28400+ } :init.begin
28401
28402-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28403+#ifdef CONFIG_SMP
28404 /*
28405 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28406 * output PHDR, so the next output section - .init.text - should
28407@@ -190,12 +255,27 @@ SECTIONS
28408 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28409 #endif
28410
28411- INIT_TEXT_SECTION(PAGE_SIZE)
28412-#ifdef CONFIG_X86_64
28413- :init
28414-#endif
28415+ . = ALIGN(PAGE_SIZE);
28416+ init_begin = .;
28417+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28418+ VMLINUX_SYMBOL(_sinittext) = .;
28419+ INIT_TEXT
28420+ . = ALIGN(PAGE_SIZE);
28421+ } :text.init
28422
28423- INIT_DATA_SECTION(16)
28424+ /*
28425+ * .exit.text is discard at runtime, not link time, to deal with
28426+ * references from .altinstructions and .eh_frame
28427+ */
28428+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28429+ EXIT_TEXT
28430+ VMLINUX_SYMBOL(_einittext) = .;
28431+ . = ALIGN(16);
28432+ } :text.exit
28433+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28434+
28435+ . = ALIGN(PAGE_SIZE);
28436+ INIT_DATA_SECTION(16) :init
28437
28438 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28439 __x86_cpu_dev_start = .;
28440@@ -266,19 +346,12 @@ SECTIONS
28441 }
28442
28443 . = ALIGN(8);
28444- /*
28445- * .exit.text is discard at runtime, not link time, to deal with
28446- * references from .altinstructions and .eh_frame
28447- */
28448- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28449- EXIT_TEXT
28450- }
28451
28452 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28453 EXIT_DATA
28454 }
28455
28456-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28457+#ifndef CONFIG_SMP
28458 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28459 #endif
28460
28461@@ -297,16 +370,10 @@ SECTIONS
28462 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28463 __smp_locks = .;
28464 *(.smp_locks)
28465- . = ALIGN(PAGE_SIZE);
28466 __smp_locks_end = .;
28467+ . = ALIGN(PAGE_SIZE);
28468 }
28469
28470-#ifdef CONFIG_X86_64
28471- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28472- NOSAVE_DATA
28473- }
28474-#endif
28475-
28476 /* BSS */
28477 . = ALIGN(PAGE_SIZE);
28478 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28479@@ -322,6 +389,7 @@ SECTIONS
28480 __brk_base = .;
28481 . += 64 * 1024; /* 64k alignment slop space */
28482 *(.brk_reservation) /* areas brk users have reserved */
28483+ . = ALIGN(HPAGE_SIZE);
28484 __brk_limit = .;
28485 }
28486
28487@@ -348,13 +416,12 @@ SECTIONS
28488 * for the boot processor.
28489 */
28490 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28491-INIT_PER_CPU(gdt_page);
28492 INIT_PER_CPU(irq_stack_union);
28493
28494 /*
28495 * Build-time check on the image size:
28496 */
28497-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28498+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28499 "kernel image bigger than KERNEL_IMAGE_SIZE");
28500
28501 #ifdef CONFIG_SMP
28502diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28503index 2dcc6ff..082dc7a 100644
28504--- a/arch/x86/kernel/vsyscall_64.c
28505+++ b/arch/x86/kernel/vsyscall_64.c
28506@@ -38,15 +38,13 @@
28507 #define CREATE_TRACE_POINTS
28508 #include "vsyscall_trace.h"
28509
28510-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28511+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28512
28513 static int __init vsyscall_setup(char *str)
28514 {
28515 if (str) {
28516 if (!strcmp("emulate", str))
28517 vsyscall_mode = EMULATE;
28518- else if (!strcmp("native", str))
28519- vsyscall_mode = NATIVE;
28520 else if (!strcmp("none", str))
28521 vsyscall_mode = NONE;
28522 else
28523@@ -264,8 +262,7 @@ do_ret:
28524 return true;
28525
28526 sigsegv:
28527- force_sig(SIGSEGV, current);
28528- return true;
28529+ do_group_exit(SIGKILL);
28530 }
28531
28532 /*
28533@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28534 static struct vm_area_struct gate_vma = {
28535 .vm_start = VSYSCALL_ADDR,
28536 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28537- .vm_page_prot = PAGE_READONLY_EXEC,
28538- .vm_flags = VM_READ | VM_EXEC,
28539+ .vm_page_prot = PAGE_READONLY,
28540+ .vm_flags = VM_READ,
28541 .vm_ops = &gate_vma_ops,
28542 };
28543
28544@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28545 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28546
28547 if (vsyscall_mode != NONE)
28548- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28549- vsyscall_mode == NATIVE
28550- ? PAGE_KERNEL_VSYSCALL
28551- : PAGE_KERNEL_VVAR);
28552+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28553
28554 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28555 (unsigned long)VSYSCALL_ADDR);
28556diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28557index 37d8fa4..66e319a 100644
28558--- a/arch/x86/kernel/x8664_ksyms_64.c
28559+++ b/arch/x86/kernel/x8664_ksyms_64.c
28560@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28561 EXPORT_SYMBOL(copy_user_generic_unrolled);
28562 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28563 EXPORT_SYMBOL(__copy_user_nocache);
28564-EXPORT_SYMBOL(_copy_from_user);
28565-EXPORT_SYMBOL(_copy_to_user);
28566
28567 EXPORT_SYMBOL(copy_page);
28568 EXPORT_SYMBOL(clear_page);
28569@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28570 EXPORT_SYMBOL(___preempt_schedule_context);
28571 #endif
28572 #endif
28573+
28574+#ifdef CONFIG_PAX_PER_CPU_PGD
28575+EXPORT_SYMBOL(cpu_pgd);
28576+#endif
28577diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28578index 234b072..b7ab191 100644
28579--- a/arch/x86/kernel/x86_init.c
28580+++ b/arch/x86/kernel/x86_init.c
28581@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28582 static void default_nmi_init(void) { };
28583 static int default_i8042_detect(void) { return 1; };
28584
28585-struct x86_platform_ops x86_platform = {
28586+struct x86_platform_ops x86_platform __read_only = {
28587 .calibrate_tsc = native_calibrate_tsc,
28588 .get_wallclock = mach_get_cmos_time,
28589 .set_wallclock = mach_set_rtc_mmss,
28590@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28591 EXPORT_SYMBOL_GPL(x86_platform);
28592
28593 #if defined(CONFIG_PCI_MSI)
28594-struct x86_msi_ops x86_msi = {
28595+struct x86_msi_ops x86_msi __read_only = {
28596 .setup_msi_irqs = native_setup_msi_irqs,
28597 .compose_msi_msg = native_compose_msi_msg,
28598 .teardown_msi_irq = native_teardown_msi_irq,
28599@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28600 }
28601 #endif
28602
28603-struct x86_io_apic_ops x86_io_apic_ops = {
28604+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28605 .init = native_io_apic_init_mappings,
28606 .read = native_io_apic_read,
28607 .write = native_io_apic_write,
28608diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28609index cdc6cf9..e04f495 100644
28610--- a/arch/x86/kernel/xsave.c
28611+++ b/arch/x86/kernel/xsave.c
28612@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28613
28614 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28615 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28616- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28617+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28618
28619 if (!use_xsave())
28620 return err;
28621
28622- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28623+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28624
28625 /*
28626 * Read the xstate_bv which we copied (directly from the cpu or
28627 * from the state in task struct) to the user buffers.
28628 */
28629- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28630+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28631
28632 /*
28633 * For legacy compatible, we always set FP/SSE bits in the bit
28634@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28635 */
28636 xstate_bv |= XSTATE_FPSSE;
28637
28638- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28639+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28640
28641 return err;
28642 }
28643@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28644 {
28645 int err;
28646
28647+ buf = (struct xsave_struct __user *)____m(buf);
28648 if (use_xsave())
28649 err = xsave_user(buf);
28650 else if (use_fxsr())
28651@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28652 */
28653 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28654 {
28655+ buf = (void __user *)____m(buf);
28656 if (use_xsave()) {
28657 if ((unsigned long)buf % 64 || fx_only) {
28658 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28659diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28660index 307f9ec..0d8aa91 100644
28661--- a/arch/x86/kvm/cpuid.c
28662+++ b/arch/x86/kvm/cpuid.c
28663@@ -186,15 +186,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28664 struct kvm_cpuid2 *cpuid,
28665 struct kvm_cpuid_entry2 __user *entries)
28666 {
28667- int r;
28668+ int r, i;
28669
28670 r = -E2BIG;
28671 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28672 goto out;
28673 r = -EFAULT;
28674- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28675- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28676+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28677 goto out;
28678+ for (i = 0; i < cpuid->nent; ++i) {
28679+ struct kvm_cpuid_entry2 cpuid_entry;
28680+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28681+ goto out;
28682+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28683+ }
28684 vcpu->arch.cpuid_nent = cpuid->nent;
28685 kvm_apic_set_version(vcpu);
28686 kvm_x86_ops->cpuid_update(vcpu);
28687@@ -207,15 +212,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28688 struct kvm_cpuid2 *cpuid,
28689 struct kvm_cpuid_entry2 __user *entries)
28690 {
28691- int r;
28692+ int r, i;
28693
28694 r = -E2BIG;
28695 if (cpuid->nent < vcpu->arch.cpuid_nent)
28696 goto out;
28697 r = -EFAULT;
28698- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28699- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28700+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28701 goto out;
28702+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28703+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28704+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28705+ goto out;
28706+ }
28707 return 0;
28708
28709 out:
28710diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28711index 106c015..2db7161 100644
28712--- a/arch/x86/kvm/emulate.c
28713+++ b/arch/x86/kvm/emulate.c
28714@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28715 int cr = ctxt->modrm_reg;
28716 u64 efer = 0;
28717
28718- static u64 cr_reserved_bits[] = {
28719+ static const u64 cr_reserved_bits[] = {
28720 0xffffffff00000000ULL,
28721 0, 0, 0, /* CR3 checked later */
28722 CR4_RESERVED_BITS,
28723diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28724index 4ee827d..83c8e31 100644
28725--- a/arch/x86/kvm/lapic.c
28726+++ b/arch/x86/kvm/lapic.c
28727@@ -56,7 +56,7 @@
28728 #define APIC_BUS_CYCLE_NS 1
28729
28730 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28731-#define apic_debug(fmt, arg...)
28732+#define apic_debug(fmt, arg...) do {} while (0)
28733
28734 #define APIC_LVT_NUM 6
28735 /* 14 is the version for Xeon and Pentium 8.4.8*/
28736@@ -1064,6 +1064,17 @@ static void update_divide_count(struct kvm_lapic *apic)
28737 apic->divide_count);
28738 }
28739
28740+static void apic_update_lvtt(struct kvm_lapic *apic)
28741+{
28742+ u32 timer_mode = kvm_apic_get_reg(apic, APIC_LVTT) &
28743+ apic->lapic_timer.timer_mode_mask;
28744+
28745+ if (apic->lapic_timer.timer_mode != timer_mode) {
28746+ apic->lapic_timer.timer_mode = timer_mode;
28747+ hrtimer_cancel(&apic->lapic_timer.timer);
28748+ }
28749+}
28750+
28751 static void apic_timer_expired(struct kvm_lapic *apic)
28752 {
28753 struct kvm_vcpu *vcpu = apic->vcpu;
28754@@ -1272,6 +1283,7 @@ static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
28755 apic_set_reg(apic, APIC_LVTT + 0x10 * i,
28756 lvt_val | APIC_LVT_MASKED);
28757 }
28758+ apic_update_lvtt(apic);
28759 atomic_set(&apic->lapic_timer.pending, 0);
28760
28761 }
28762@@ -1304,20 +1316,13 @@ static int apic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
28763
28764 break;
28765
28766- case APIC_LVTT: {
28767- u32 timer_mode = val & apic->lapic_timer.timer_mode_mask;
28768-
28769- if (apic->lapic_timer.timer_mode != timer_mode) {
28770- apic->lapic_timer.timer_mode = timer_mode;
28771- hrtimer_cancel(&apic->lapic_timer.timer);
28772- }
28773-
28774+ case APIC_LVTT:
28775 if (!kvm_apic_sw_enabled(apic))
28776 val |= APIC_LVT_MASKED;
28777 val &= (apic_lvt_mask[0] | apic->lapic_timer.timer_mode_mask);
28778 apic_set_reg(apic, APIC_LVTT, val);
28779+ apic_update_lvtt(apic);
28780 break;
28781- }
28782
28783 case APIC_TMICT:
28784 if (apic_lvtt_tscdeadline(apic))
28785@@ -1552,7 +1557,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu)
28786
28787 for (i = 0; i < APIC_LVT_NUM; i++)
28788 apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED);
28789- apic->lapic_timer.timer_mode = 0;
28790+ apic_update_lvtt(apic);
28791 apic_set_reg(apic, APIC_LVT0,
28792 SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT));
28793
28794@@ -1778,6 +1783,7 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu,
28795
28796 apic_update_ppr(apic);
28797 hrtimer_cancel(&apic->lapic_timer.timer);
28798+ apic_update_lvtt(apic);
28799 update_divide_count(apic);
28800 start_apic_timer(apic);
28801 apic->irr_pending = true;
28802diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
28803index 0bc6c65..ca4f92d 100644
28804--- a/arch/x86/kvm/lapic.h
28805+++ b/arch/x86/kvm/lapic.h
28806@@ -165,7 +165,7 @@ static inline u16 apic_logical_id(struct kvm_apic_map *map, u32 ldr)
28807
28808 static inline bool kvm_apic_has_events(struct kvm_vcpu *vcpu)
28809 {
28810- return vcpu->arch.apic->pending_events;
28811+ return kvm_vcpu_has_lapic(vcpu) && vcpu->arch.apic->pending_events;
28812 }
28813
28814 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector);
28815diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28816index 6e6d115..43fecbf 100644
28817--- a/arch/x86/kvm/paging_tmpl.h
28818+++ b/arch/x86/kvm/paging_tmpl.h
28819@@ -343,7 +343,7 @@ retry_walk:
28820 if (unlikely(kvm_is_error_hva(host_addr)))
28821 goto error;
28822
28823- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28824+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28825 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28826 goto error;
28827 walker->ptep_user[walker->level - 1] = ptep_user;
28828diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28829index a4e62fc..fbbad55 100644
28830--- a/arch/x86/kvm/svm.c
28831+++ b/arch/x86/kvm/svm.c
28832@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28833 int cpu = raw_smp_processor_id();
28834
28835 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28836+
28837+ pax_open_kernel();
28838 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28839+ pax_close_kernel();
28840+
28841 load_TR_desc();
28842 }
28843
28844@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28845 #endif
28846 #endif
28847
28848+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28849+ __set_fs(current_thread_info()->addr_limit);
28850+#endif
28851+
28852 reload_tss(vcpu);
28853
28854 local_irq_disable();
28855diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28856index 5318d64..ff5f7aa 100644
28857--- a/arch/x86/kvm/vmx.c
28858+++ b/arch/x86/kvm/vmx.c
28859@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28860 #endif
28861 }
28862
28863-static void vmcs_clear_bits(unsigned long field, u32 mask)
28864+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28865 {
28866 vmcs_writel(field, vmcs_readl(field) & ~mask);
28867 }
28868
28869-static void vmcs_set_bits(unsigned long field, u32 mask)
28870+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28871 {
28872 vmcs_writel(field, vmcs_readl(field) | mask);
28873 }
28874@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28875 struct desc_struct *descs;
28876
28877 descs = (void *)gdt->address;
28878+
28879+ pax_open_kernel();
28880 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28881+ pax_close_kernel();
28882+
28883 load_TR_desc();
28884 }
28885
28886@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28887 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28888 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28889
28890+#ifdef CONFIG_PAX_PER_CPU_PGD
28891+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28892+#endif
28893+
28894 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28895 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28896 vmx->loaded_vmcs->cpu = cpu;
28897@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28898 * reads and returns guest's timestamp counter "register"
28899 * guest_tsc = host_tsc + tsc_offset -- 21.3
28900 */
28901-static u64 guest_read_tsc(void)
28902+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28903 {
28904 u64 host_tsc, tsc_offset;
28905
28906@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28907 unsigned long cr4;
28908
28909 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28910+
28911+#ifndef CONFIG_PAX_PER_CPU_PGD
28912 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28913+#endif
28914
28915 /* Save the most likely value for this task's CR4 in the VMCS. */
28916 cr4 = cr4_read_shadow();
28917@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28918 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28919 vmx->host_idt_base = dt.address;
28920
28921- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28922+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28923
28924 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28925 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28926@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28927 * page upon invalidation. No need to do anything if not
28928 * using the APIC_ACCESS_ADDR VMCS field.
28929 */
28930- if (!flexpriority_enabled)
28931- kvm_x86_ops->set_apic_access_page_addr = NULL;
28932+ if (!flexpriority_enabled) {
28933+ pax_open_kernel();
28934+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28935+ pax_close_kernel();
28936+ }
28937
28938- if (!cpu_has_vmx_tpr_shadow())
28939- kvm_x86_ops->update_cr8_intercept = NULL;
28940+ if (!cpu_has_vmx_tpr_shadow()) {
28941+ pax_open_kernel();
28942+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28943+ pax_close_kernel();
28944+ }
28945
28946 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28947 kvm_disable_largepages();
28948@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28949 if (!cpu_has_vmx_apicv())
28950 enable_apicv = 0;
28951
28952+ pax_open_kernel();
28953 if (enable_apicv)
28954- kvm_x86_ops->update_cr8_intercept = NULL;
28955+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28956 else {
28957- kvm_x86_ops->hwapic_irr_update = NULL;
28958- kvm_x86_ops->hwapic_isr_update = NULL;
28959- kvm_x86_ops->deliver_posted_interrupt = NULL;
28960- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28961+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28962+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28963+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28964+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28965 }
28966+ pax_close_kernel();
28967
28968 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28969 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28970@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
28971 enable_pml = 0;
28972
28973 if (!enable_pml) {
28974- kvm_x86_ops->slot_enable_log_dirty = NULL;
28975- kvm_x86_ops->slot_disable_log_dirty = NULL;
28976- kvm_x86_ops->flush_log_dirty = NULL;
28977- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28978+ pax_open_kernel();
28979+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28980+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28981+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28982+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28983+ pax_close_kernel();
28984 }
28985
28986 return alloc_kvm_area();
28987@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28988 "jmp 2f \n\t"
28989 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28990 "2: "
28991+
28992+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28993+ "ljmp %[cs],$3f\n\t"
28994+ "3: "
28995+#endif
28996+
28997 /* Save guest registers, load host registers, keep flags */
28998 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28999 "pop %0 \n\t"
29000@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29001 #endif
29002 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
29003 [wordsize]"i"(sizeof(ulong))
29004+
29005+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
29006+ ,[cs]"i"(__KERNEL_CS)
29007+#endif
29008+
29009 : "cc", "memory"
29010 #ifdef CONFIG_X86_64
29011 , "rax", "rbx", "rdi", "rsi"
29012@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29013 if (debugctlmsr)
29014 update_debugctlmsr(debugctlmsr);
29015
29016-#ifndef CONFIG_X86_64
29017+#ifdef CONFIG_X86_32
29018 /*
29019 * The sysexit path does not restore ds/es, so we must set them to
29020 * a reasonable value ourselves.
29021@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
29022 * may be executed in interrupt context, which saves and restore segments
29023 * around it, nullifying its effect.
29024 */
29025- loadsegment(ds, __USER_DS);
29026- loadsegment(es, __USER_DS);
29027+ loadsegment(ds, __KERNEL_DS);
29028+ loadsegment(es, __KERNEL_DS);
29029+ loadsegment(ss, __KERNEL_DS);
29030+
29031+#ifdef CONFIG_PAX_KERNEXEC
29032+ loadsegment(fs, __KERNEL_PERCPU);
29033+#endif
29034+
29035+#ifdef CONFIG_PAX_MEMORY_UDEREF
29036+ __set_fs(current_thread_info()->addr_limit);
29037+#endif
29038+
29039 #endif
29040
29041 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
29042diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
29043index 8838057..8f42ce3 100644
29044--- a/arch/x86/kvm/x86.c
29045+++ b/arch/x86/kvm/x86.c
29046@@ -1895,8 +1895,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29047 {
29048 struct kvm *kvm = vcpu->kvm;
29049 int lm = is_long_mode(vcpu);
29050- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29051- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29052+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29053+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29054 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29055 : kvm->arch.xen_hvm_config.blob_size_32;
29056 u32 page_num = data & ~PAGE_MASK;
29057@@ -2833,6 +2833,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29058 if (n < msr_list.nmsrs)
29059 goto out;
29060 r = -EFAULT;
29061+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29062+ goto out;
29063 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29064 num_msrs_to_save * sizeof(u32)))
29065 goto out;
29066@@ -5737,7 +5739,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29067 };
29068 #endif
29069
29070-int kvm_arch_init(void *opaque)
29071+int kvm_arch_init(const void *opaque)
29072 {
29073 int r;
29074 struct kvm_x86_ops *ops = opaque;
29075diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29076index ac4453d..1f43bf3 100644
29077--- a/arch/x86/lguest/boot.c
29078+++ b/arch/x86/lguest/boot.c
29079@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29080 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29081 * Launcher to reboot us.
29082 */
29083-static void lguest_restart(char *reason)
29084+static __noreturn void lguest_restart(char *reason)
29085 {
29086 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29087+ BUG();
29088 }
29089
29090 /*G:050
29091diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29092index 00933d5..3a64af9 100644
29093--- a/arch/x86/lib/atomic64_386_32.S
29094+++ b/arch/x86/lib/atomic64_386_32.S
29095@@ -48,6 +48,10 @@ BEGIN(read)
29096 movl (v), %eax
29097 movl 4(v), %edx
29098 RET_ENDP
29099+BEGIN(read_unchecked)
29100+ movl (v), %eax
29101+ movl 4(v), %edx
29102+RET_ENDP
29103 #undef v
29104
29105 #define v %esi
29106@@ -55,6 +59,10 @@ BEGIN(set)
29107 movl %ebx, (v)
29108 movl %ecx, 4(v)
29109 RET_ENDP
29110+BEGIN(set_unchecked)
29111+ movl %ebx, (v)
29112+ movl %ecx, 4(v)
29113+RET_ENDP
29114 #undef v
29115
29116 #define v %esi
29117@@ -70,6 +78,20 @@ RET_ENDP
29118 BEGIN(add)
29119 addl %eax, (v)
29120 adcl %edx, 4(v)
29121+
29122+#ifdef CONFIG_PAX_REFCOUNT
29123+ jno 0f
29124+ subl %eax, (v)
29125+ sbbl %edx, 4(v)
29126+ int $4
29127+0:
29128+ _ASM_EXTABLE(0b, 0b)
29129+#endif
29130+
29131+RET_ENDP
29132+BEGIN(add_unchecked)
29133+ addl %eax, (v)
29134+ adcl %edx, 4(v)
29135 RET_ENDP
29136 #undef v
29137
29138@@ -77,6 +99,24 @@ RET_ENDP
29139 BEGIN(add_return)
29140 addl (v), %eax
29141 adcl 4(v), %edx
29142+
29143+#ifdef CONFIG_PAX_REFCOUNT
29144+ into
29145+1234:
29146+ _ASM_EXTABLE(1234b, 2f)
29147+#endif
29148+
29149+ movl %eax, (v)
29150+ movl %edx, 4(v)
29151+
29152+#ifdef CONFIG_PAX_REFCOUNT
29153+2:
29154+#endif
29155+
29156+RET_ENDP
29157+BEGIN(add_return_unchecked)
29158+ addl (v), %eax
29159+ adcl 4(v), %edx
29160 movl %eax, (v)
29161 movl %edx, 4(v)
29162 RET_ENDP
29163@@ -86,6 +126,20 @@ RET_ENDP
29164 BEGIN(sub)
29165 subl %eax, (v)
29166 sbbl %edx, 4(v)
29167+
29168+#ifdef CONFIG_PAX_REFCOUNT
29169+ jno 0f
29170+ addl %eax, (v)
29171+ adcl %edx, 4(v)
29172+ int $4
29173+0:
29174+ _ASM_EXTABLE(0b, 0b)
29175+#endif
29176+
29177+RET_ENDP
29178+BEGIN(sub_unchecked)
29179+ subl %eax, (v)
29180+ sbbl %edx, 4(v)
29181 RET_ENDP
29182 #undef v
29183
29184@@ -96,6 +150,27 @@ BEGIN(sub_return)
29185 sbbl $0, %edx
29186 addl (v), %eax
29187 adcl 4(v), %edx
29188+
29189+#ifdef CONFIG_PAX_REFCOUNT
29190+ into
29191+1234:
29192+ _ASM_EXTABLE(1234b, 2f)
29193+#endif
29194+
29195+ movl %eax, (v)
29196+ movl %edx, 4(v)
29197+
29198+#ifdef CONFIG_PAX_REFCOUNT
29199+2:
29200+#endif
29201+
29202+RET_ENDP
29203+BEGIN(sub_return_unchecked)
29204+ negl %edx
29205+ negl %eax
29206+ sbbl $0, %edx
29207+ addl (v), %eax
29208+ adcl 4(v), %edx
29209 movl %eax, (v)
29210 movl %edx, 4(v)
29211 RET_ENDP
29212@@ -105,6 +180,20 @@ RET_ENDP
29213 BEGIN(inc)
29214 addl $1, (v)
29215 adcl $0, 4(v)
29216+
29217+#ifdef CONFIG_PAX_REFCOUNT
29218+ jno 0f
29219+ subl $1, (v)
29220+ sbbl $0, 4(v)
29221+ int $4
29222+0:
29223+ _ASM_EXTABLE(0b, 0b)
29224+#endif
29225+
29226+RET_ENDP
29227+BEGIN(inc_unchecked)
29228+ addl $1, (v)
29229+ adcl $0, 4(v)
29230 RET_ENDP
29231 #undef v
29232
29233@@ -114,6 +203,26 @@ BEGIN(inc_return)
29234 movl 4(v), %edx
29235 addl $1, %eax
29236 adcl $0, %edx
29237+
29238+#ifdef CONFIG_PAX_REFCOUNT
29239+ into
29240+1234:
29241+ _ASM_EXTABLE(1234b, 2f)
29242+#endif
29243+
29244+ movl %eax, (v)
29245+ movl %edx, 4(v)
29246+
29247+#ifdef CONFIG_PAX_REFCOUNT
29248+2:
29249+#endif
29250+
29251+RET_ENDP
29252+BEGIN(inc_return_unchecked)
29253+ movl (v), %eax
29254+ movl 4(v), %edx
29255+ addl $1, %eax
29256+ adcl $0, %edx
29257 movl %eax, (v)
29258 movl %edx, 4(v)
29259 RET_ENDP
29260@@ -123,6 +232,20 @@ RET_ENDP
29261 BEGIN(dec)
29262 subl $1, (v)
29263 sbbl $0, 4(v)
29264+
29265+#ifdef CONFIG_PAX_REFCOUNT
29266+ jno 0f
29267+ addl $1, (v)
29268+ adcl $0, 4(v)
29269+ int $4
29270+0:
29271+ _ASM_EXTABLE(0b, 0b)
29272+#endif
29273+
29274+RET_ENDP
29275+BEGIN(dec_unchecked)
29276+ subl $1, (v)
29277+ sbbl $0, 4(v)
29278 RET_ENDP
29279 #undef v
29280
29281@@ -132,6 +255,26 @@ BEGIN(dec_return)
29282 movl 4(v), %edx
29283 subl $1, %eax
29284 sbbl $0, %edx
29285+
29286+#ifdef CONFIG_PAX_REFCOUNT
29287+ into
29288+1234:
29289+ _ASM_EXTABLE(1234b, 2f)
29290+#endif
29291+
29292+ movl %eax, (v)
29293+ movl %edx, 4(v)
29294+
29295+#ifdef CONFIG_PAX_REFCOUNT
29296+2:
29297+#endif
29298+
29299+RET_ENDP
29300+BEGIN(dec_return_unchecked)
29301+ movl (v), %eax
29302+ movl 4(v), %edx
29303+ subl $1, %eax
29304+ sbbl $0, %edx
29305 movl %eax, (v)
29306 movl %edx, 4(v)
29307 RET_ENDP
29308@@ -143,6 +286,13 @@ BEGIN(add_unless)
29309 adcl %edx, %edi
29310 addl (v), %eax
29311 adcl 4(v), %edx
29312+
29313+#ifdef CONFIG_PAX_REFCOUNT
29314+ into
29315+1234:
29316+ _ASM_EXTABLE(1234b, 2f)
29317+#endif
29318+
29319 cmpl %eax, %ecx
29320 je 3f
29321 1:
29322@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29323 1:
29324 addl $1, %eax
29325 adcl $0, %edx
29326+
29327+#ifdef CONFIG_PAX_REFCOUNT
29328+ into
29329+1234:
29330+ _ASM_EXTABLE(1234b, 2f)
29331+#endif
29332+
29333 movl %eax, (v)
29334 movl %edx, 4(v)
29335 movl $1, %eax
29336@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29337 movl 4(v), %edx
29338 subl $1, %eax
29339 sbbl $0, %edx
29340+
29341+#ifdef CONFIG_PAX_REFCOUNT
29342+ into
29343+1234:
29344+ _ASM_EXTABLE(1234b, 1f)
29345+#endif
29346+
29347 js 1f
29348 movl %eax, (v)
29349 movl %edx, 4(v)
29350diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29351index f5cc9eb..51fa319 100644
29352--- a/arch/x86/lib/atomic64_cx8_32.S
29353+++ b/arch/x86/lib/atomic64_cx8_32.S
29354@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29355 CFI_STARTPROC
29356
29357 read64 %ecx
29358+ pax_force_retaddr
29359 ret
29360 CFI_ENDPROC
29361 ENDPROC(atomic64_read_cx8)
29362
29363+ENTRY(atomic64_read_unchecked_cx8)
29364+ CFI_STARTPROC
29365+
29366+ read64 %ecx
29367+ pax_force_retaddr
29368+ ret
29369+ CFI_ENDPROC
29370+ENDPROC(atomic64_read_unchecked_cx8)
29371+
29372 ENTRY(atomic64_set_cx8)
29373 CFI_STARTPROC
29374
29375@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29376 cmpxchg8b (%esi)
29377 jne 1b
29378
29379+ pax_force_retaddr
29380 ret
29381 CFI_ENDPROC
29382 ENDPROC(atomic64_set_cx8)
29383
29384+ENTRY(atomic64_set_unchecked_cx8)
29385+ CFI_STARTPROC
29386+
29387+1:
29388+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29389+ * are atomic on 586 and newer */
29390+ cmpxchg8b (%esi)
29391+ jne 1b
29392+
29393+ pax_force_retaddr
29394+ ret
29395+ CFI_ENDPROC
29396+ENDPROC(atomic64_set_unchecked_cx8)
29397+
29398 ENTRY(atomic64_xchg_cx8)
29399 CFI_STARTPROC
29400
29401@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29402 cmpxchg8b (%esi)
29403 jne 1b
29404
29405+ pax_force_retaddr
29406 ret
29407 CFI_ENDPROC
29408 ENDPROC(atomic64_xchg_cx8)
29409
29410-.macro addsub_return func ins insc
29411-ENTRY(atomic64_\func\()_return_cx8)
29412+.macro addsub_return func ins insc unchecked=""
29413+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29414 CFI_STARTPROC
29415 SAVE ebp
29416 SAVE ebx
29417@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29418 movl %edx, %ecx
29419 \ins\()l %esi, %ebx
29420 \insc\()l %edi, %ecx
29421+
29422+.ifb \unchecked
29423+#ifdef CONFIG_PAX_REFCOUNT
29424+ into
29425+2:
29426+ _ASM_EXTABLE(2b, 3f)
29427+#endif
29428+.endif
29429+
29430 LOCK_PREFIX
29431 cmpxchg8b (%ebp)
29432 jne 1b
29433-
29434-10:
29435 movl %ebx, %eax
29436 movl %ecx, %edx
29437+
29438+.ifb \unchecked
29439+#ifdef CONFIG_PAX_REFCOUNT
29440+3:
29441+#endif
29442+.endif
29443+
29444 RESTORE edi
29445 RESTORE esi
29446 RESTORE ebx
29447 RESTORE ebp
29448+ pax_force_retaddr
29449 ret
29450 CFI_ENDPROC
29451-ENDPROC(atomic64_\func\()_return_cx8)
29452+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29453 .endm
29454
29455 addsub_return add add adc
29456 addsub_return sub sub sbb
29457+addsub_return add add adc _unchecked
29458+addsub_return sub sub sbb _unchecked
29459
29460-.macro incdec_return func ins insc
29461-ENTRY(atomic64_\func\()_return_cx8)
29462+.macro incdec_return func ins insc unchecked=""
29463+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29464 CFI_STARTPROC
29465 SAVE ebx
29466
29467@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29468 movl %edx, %ecx
29469 \ins\()l $1, %ebx
29470 \insc\()l $0, %ecx
29471+
29472+.ifb \unchecked
29473+#ifdef CONFIG_PAX_REFCOUNT
29474+ into
29475+2:
29476+ _ASM_EXTABLE(2b, 3f)
29477+#endif
29478+.endif
29479+
29480 LOCK_PREFIX
29481 cmpxchg8b (%esi)
29482 jne 1b
29483
29484-10:
29485 movl %ebx, %eax
29486 movl %ecx, %edx
29487+
29488+.ifb \unchecked
29489+#ifdef CONFIG_PAX_REFCOUNT
29490+3:
29491+#endif
29492+.endif
29493+
29494 RESTORE ebx
29495+ pax_force_retaddr
29496 ret
29497 CFI_ENDPROC
29498-ENDPROC(atomic64_\func\()_return_cx8)
29499+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29500 .endm
29501
29502 incdec_return inc add adc
29503 incdec_return dec sub sbb
29504+incdec_return inc add adc _unchecked
29505+incdec_return dec sub sbb _unchecked
29506
29507 ENTRY(atomic64_dec_if_positive_cx8)
29508 CFI_STARTPROC
29509@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29510 movl %edx, %ecx
29511 subl $1, %ebx
29512 sbb $0, %ecx
29513+
29514+#ifdef CONFIG_PAX_REFCOUNT
29515+ into
29516+1234:
29517+ _ASM_EXTABLE(1234b, 2f)
29518+#endif
29519+
29520 js 2f
29521 LOCK_PREFIX
29522 cmpxchg8b (%esi)
29523@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29524 movl %ebx, %eax
29525 movl %ecx, %edx
29526 RESTORE ebx
29527+ pax_force_retaddr
29528 ret
29529 CFI_ENDPROC
29530 ENDPROC(atomic64_dec_if_positive_cx8)
29531@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29532 movl %edx, %ecx
29533 addl %ebp, %ebx
29534 adcl %edi, %ecx
29535+
29536+#ifdef CONFIG_PAX_REFCOUNT
29537+ into
29538+1234:
29539+ _ASM_EXTABLE(1234b, 3f)
29540+#endif
29541+
29542 LOCK_PREFIX
29543 cmpxchg8b (%esi)
29544 jne 1b
29545@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29546 CFI_ADJUST_CFA_OFFSET -8
29547 RESTORE ebx
29548 RESTORE ebp
29549+ pax_force_retaddr
29550 ret
29551 4:
29552 cmpl %edx, 4(%esp)
29553@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29554 xorl %ecx, %ecx
29555 addl $1, %ebx
29556 adcl %edx, %ecx
29557+
29558+#ifdef CONFIG_PAX_REFCOUNT
29559+ into
29560+1234:
29561+ _ASM_EXTABLE(1234b, 3f)
29562+#endif
29563+
29564 LOCK_PREFIX
29565 cmpxchg8b (%esi)
29566 jne 1b
29567@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29568 movl $1, %eax
29569 3:
29570 RESTORE ebx
29571+ pax_force_retaddr
29572 ret
29573 CFI_ENDPROC
29574 ENDPROC(atomic64_inc_not_zero_cx8)
29575diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29576index e78b8eee..7e173a8 100644
29577--- a/arch/x86/lib/checksum_32.S
29578+++ b/arch/x86/lib/checksum_32.S
29579@@ -29,7 +29,8 @@
29580 #include <asm/dwarf2.h>
29581 #include <asm/errno.h>
29582 #include <asm/asm.h>
29583-
29584+#include <asm/segment.h>
29585+
29586 /*
29587 * computes a partial checksum, e.g. for TCP/UDP fragments
29588 */
29589@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29590
29591 #define ARGBASE 16
29592 #define FP 12
29593-
29594-ENTRY(csum_partial_copy_generic)
29595+
29596+ENTRY(csum_partial_copy_generic_to_user)
29597 CFI_STARTPROC
29598+
29599+#ifdef CONFIG_PAX_MEMORY_UDEREF
29600+ pushl_cfi %gs
29601+ popl_cfi %es
29602+ jmp csum_partial_copy_generic
29603+#endif
29604+
29605+ENTRY(csum_partial_copy_generic_from_user)
29606+
29607+#ifdef CONFIG_PAX_MEMORY_UDEREF
29608+ pushl_cfi %gs
29609+ popl_cfi %ds
29610+#endif
29611+
29612+ENTRY(csum_partial_copy_generic)
29613 subl $4,%esp
29614 CFI_ADJUST_CFA_OFFSET 4
29615 pushl_cfi %edi
29616@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29617 jmp 4f
29618 SRC(1: movw (%esi), %bx )
29619 addl $2, %esi
29620-DST( movw %bx, (%edi) )
29621+DST( movw %bx, %es:(%edi) )
29622 addl $2, %edi
29623 addw %bx, %ax
29624 adcl $0, %eax
29625@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29626 SRC(1: movl (%esi), %ebx )
29627 SRC( movl 4(%esi), %edx )
29628 adcl %ebx, %eax
29629-DST( movl %ebx, (%edi) )
29630+DST( movl %ebx, %es:(%edi) )
29631 adcl %edx, %eax
29632-DST( movl %edx, 4(%edi) )
29633+DST( movl %edx, %es:4(%edi) )
29634
29635 SRC( movl 8(%esi), %ebx )
29636 SRC( movl 12(%esi), %edx )
29637 adcl %ebx, %eax
29638-DST( movl %ebx, 8(%edi) )
29639+DST( movl %ebx, %es:8(%edi) )
29640 adcl %edx, %eax
29641-DST( movl %edx, 12(%edi) )
29642+DST( movl %edx, %es:12(%edi) )
29643
29644 SRC( movl 16(%esi), %ebx )
29645 SRC( movl 20(%esi), %edx )
29646 adcl %ebx, %eax
29647-DST( movl %ebx, 16(%edi) )
29648+DST( movl %ebx, %es:16(%edi) )
29649 adcl %edx, %eax
29650-DST( movl %edx, 20(%edi) )
29651+DST( movl %edx, %es:20(%edi) )
29652
29653 SRC( movl 24(%esi), %ebx )
29654 SRC( movl 28(%esi), %edx )
29655 adcl %ebx, %eax
29656-DST( movl %ebx, 24(%edi) )
29657+DST( movl %ebx, %es:24(%edi) )
29658 adcl %edx, %eax
29659-DST( movl %edx, 28(%edi) )
29660+DST( movl %edx, %es:28(%edi) )
29661
29662 lea 32(%esi), %esi
29663 lea 32(%edi), %edi
29664@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29665 shrl $2, %edx # This clears CF
29666 SRC(3: movl (%esi), %ebx )
29667 adcl %ebx, %eax
29668-DST( movl %ebx, (%edi) )
29669+DST( movl %ebx, %es:(%edi) )
29670 lea 4(%esi), %esi
29671 lea 4(%edi), %edi
29672 dec %edx
29673@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29674 jb 5f
29675 SRC( movw (%esi), %cx )
29676 leal 2(%esi), %esi
29677-DST( movw %cx, (%edi) )
29678+DST( movw %cx, %es:(%edi) )
29679 leal 2(%edi), %edi
29680 je 6f
29681 shll $16,%ecx
29682 SRC(5: movb (%esi), %cl )
29683-DST( movb %cl, (%edi) )
29684+DST( movb %cl, %es:(%edi) )
29685 6: addl %ecx, %eax
29686 adcl $0, %eax
29687 7:
29688@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29689
29690 6001:
29691 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29692- movl $-EFAULT, (%ebx)
29693+ movl $-EFAULT, %ss:(%ebx)
29694
29695 # zero the complete destination - computing the rest
29696 # is too much work
29697@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29698
29699 6002:
29700 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29701- movl $-EFAULT,(%ebx)
29702+ movl $-EFAULT,%ss:(%ebx)
29703 jmp 5000b
29704
29705 .previous
29706
29707+ pushl_cfi %ss
29708+ popl_cfi %ds
29709+ pushl_cfi %ss
29710+ popl_cfi %es
29711 popl_cfi %ebx
29712 CFI_RESTORE ebx
29713 popl_cfi %esi
29714@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29715 popl_cfi %ecx # equivalent to addl $4,%esp
29716 ret
29717 CFI_ENDPROC
29718-ENDPROC(csum_partial_copy_generic)
29719+ENDPROC(csum_partial_copy_generic_to_user)
29720
29721 #else
29722
29723 /* Version for PentiumII/PPro */
29724
29725 #define ROUND1(x) \
29726+ nop; nop; nop; \
29727 SRC(movl x(%esi), %ebx ) ; \
29728 addl %ebx, %eax ; \
29729- DST(movl %ebx, x(%edi) ) ;
29730+ DST(movl %ebx, %es:x(%edi)) ;
29731
29732 #define ROUND(x) \
29733+ nop; nop; nop; \
29734 SRC(movl x(%esi), %ebx ) ; \
29735 adcl %ebx, %eax ; \
29736- DST(movl %ebx, x(%edi) ) ;
29737+ DST(movl %ebx, %es:x(%edi)) ;
29738
29739 #define ARGBASE 12
29740-
29741-ENTRY(csum_partial_copy_generic)
29742+
29743+ENTRY(csum_partial_copy_generic_to_user)
29744 CFI_STARTPROC
29745+
29746+#ifdef CONFIG_PAX_MEMORY_UDEREF
29747+ pushl_cfi %gs
29748+ popl_cfi %es
29749+ jmp csum_partial_copy_generic
29750+#endif
29751+
29752+ENTRY(csum_partial_copy_generic_from_user)
29753+
29754+#ifdef CONFIG_PAX_MEMORY_UDEREF
29755+ pushl_cfi %gs
29756+ popl_cfi %ds
29757+#endif
29758+
29759+ENTRY(csum_partial_copy_generic)
29760 pushl_cfi %ebx
29761 CFI_REL_OFFSET ebx, 0
29762 pushl_cfi %edi
29763@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29764 subl %ebx, %edi
29765 lea -1(%esi),%edx
29766 andl $-32,%edx
29767- lea 3f(%ebx,%ebx), %ebx
29768+ lea 3f(%ebx,%ebx,2), %ebx
29769 testl %esi, %esi
29770 jmp *%ebx
29771 1: addl $64,%esi
29772@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29773 jb 5f
29774 SRC( movw (%esi), %dx )
29775 leal 2(%esi), %esi
29776-DST( movw %dx, (%edi) )
29777+DST( movw %dx, %es:(%edi) )
29778 leal 2(%edi), %edi
29779 je 6f
29780 shll $16,%edx
29781 5:
29782 SRC( movb (%esi), %dl )
29783-DST( movb %dl, (%edi) )
29784+DST( movb %dl, %es:(%edi) )
29785 6: addl %edx, %eax
29786 adcl $0, %eax
29787 7:
29788 .section .fixup, "ax"
29789 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29790- movl $-EFAULT, (%ebx)
29791+ movl $-EFAULT, %ss:(%ebx)
29792 # zero the complete destination (computing the rest is too much work)
29793 movl ARGBASE+8(%esp),%edi # dst
29794 movl ARGBASE+12(%esp),%ecx # len
29795@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29796 rep; stosb
29797 jmp 7b
29798 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29799- movl $-EFAULT, (%ebx)
29800+ movl $-EFAULT, %ss:(%ebx)
29801 jmp 7b
29802 .previous
29803
29804+#ifdef CONFIG_PAX_MEMORY_UDEREF
29805+ pushl_cfi %ss
29806+ popl_cfi %ds
29807+ pushl_cfi %ss
29808+ popl_cfi %es
29809+#endif
29810+
29811 popl_cfi %esi
29812 CFI_RESTORE esi
29813 popl_cfi %edi
29814@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29815 CFI_RESTORE ebx
29816 ret
29817 CFI_ENDPROC
29818-ENDPROC(csum_partial_copy_generic)
29819+ENDPROC(csum_partial_copy_generic_to_user)
29820
29821 #undef ROUND
29822 #undef ROUND1
29823diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29824index f2145cf..cea889d 100644
29825--- a/arch/x86/lib/clear_page_64.S
29826+++ b/arch/x86/lib/clear_page_64.S
29827@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29828 movl $4096/8,%ecx
29829 xorl %eax,%eax
29830 rep stosq
29831+ pax_force_retaddr
29832 ret
29833 CFI_ENDPROC
29834 ENDPROC(clear_page_c)
29835@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29836 movl $4096,%ecx
29837 xorl %eax,%eax
29838 rep stosb
29839+ pax_force_retaddr
29840 ret
29841 CFI_ENDPROC
29842 ENDPROC(clear_page_c_e)
29843@@ -43,6 +45,7 @@ ENTRY(clear_page)
29844 leaq 64(%rdi),%rdi
29845 jnz .Lloop
29846 nop
29847+ pax_force_retaddr
29848 ret
29849 CFI_ENDPROC
29850 .Lclear_page_end:
29851@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29852
29853 #include <asm/cpufeature.h>
29854
29855- .section .altinstr_replacement,"ax"
29856+ .section .altinstr_replacement,"a"
29857 1: .byte 0xeb /* jmp <disp8> */
29858 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29859 2: .byte 0xeb /* jmp <disp8> */
29860diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29861index 40a1725..5d12ac4 100644
29862--- a/arch/x86/lib/cmpxchg16b_emu.S
29863+++ b/arch/x86/lib/cmpxchg16b_emu.S
29864@@ -8,6 +8,7 @@
29865 #include <linux/linkage.h>
29866 #include <asm/dwarf2.h>
29867 #include <asm/percpu.h>
29868+#include <asm/alternative-asm.h>
29869
29870 .text
29871
29872@@ -46,12 +47,14 @@ CFI_STARTPROC
29873 CFI_REMEMBER_STATE
29874 popfq_cfi
29875 mov $1, %al
29876+ pax_force_retaddr
29877 ret
29878
29879 CFI_RESTORE_STATE
29880 .Lnot_same:
29881 popfq_cfi
29882 xor %al,%al
29883+ pax_force_retaddr
29884 ret
29885
29886 CFI_ENDPROC
29887diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29888index 176cca6..e0d658e 100644
29889--- a/arch/x86/lib/copy_page_64.S
29890+++ b/arch/x86/lib/copy_page_64.S
29891@@ -9,6 +9,7 @@ copy_page_rep:
29892 CFI_STARTPROC
29893 movl $4096/8, %ecx
29894 rep movsq
29895+ pax_force_retaddr
29896 ret
29897 CFI_ENDPROC
29898 ENDPROC(copy_page_rep)
29899@@ -24,8 +25,8 @@ ENTRY(copy_page)
29900 CFI_ADJUST_CFA_OFFSET 2*8
29901 movq %rbx, (%rsp)
29902 CFI_REL_OFFSET rbx, 0
29903- movq %r12, 1*8(%rsp)
29904- CFI_REL_OFFSET r12, 1*8
29905+ movq %r13, 1*8(%rsp)
29906+ CFI_REL_OFFSET r13, 1*8
29907
29908 movl $(4096/64)-5, %ecx
29909 .p2align 4
29910@@ -38,7 +39,7 @@ ENTRY(copy_page)
29911 movq 0x8*4(%rsi), %r9
29912 movq 0x8*5(%rsi), %r10
29913 movq 0x8*6(%rsi), %r11
29914- movq 0x8*7(%rsi), %r12
29915+ movq 0x8*7(%rsi), %r13
29916
29917 prefetcht0 5*64(%rsi)
29918
29919@@ -49,7 +50,7 @@ ENTRY(copy_page)
29920 movq %r9, 0x8*4(%rdi)
29921 movq %r10, 0x8*5(%rdi)
29922 movq %r11, 0x8*6(%rdi)
29923- movq %r12, 0x8*7(%rdi)
29924+ movq %r13, 0x8*7(%rdi)
29925
29926 leaq 64 (%rsi), %rsi
29927 leaq 64 (%rdi), %rdi
29928@@ -68,7 +69,7 @@ ENTRY(copy_page)
29929 movq 0x8*4(%rsi), %r9
29930 movq 0x8*5(%rsi), %r10
29931 movq 0x8*6(%rsi), %r11
29932- movq 0x8*7(%rsi), %r12
29933+ movq 0x8*7(%rsi), %r13
29934
29935 movq %rax, 0x8*0(%rdi)
29936 movq %rbx, 0x8*1(%rdi)
29937@@ -77,7 +78,7 @@ ENTRY(copy_page)
29938 movq %r9, 0x8*4(%rdi)
29939 movq %r10, 0x8*5(%rdi)
29940 movq %r11, 0x8*6(%rdi)
29941- movq %r12, 0x8*7(%rdi)
29942+ movq %r13, 0x8*7(%rdi)
29943
29944 leaq 64(%rdi), %rdi
29945 leaq 64(%rsi), %rsi
29946@@ -85,10 +86,11 @@ ENTRY(copy_page)
29947
29948 movq (%rsp), %rbx
29949 CFI_RESTORE rbx
29950- movq 1*8(%rsp), %r12
29951- CFI_RESTORE r12
29952+ movq 1*8(%rsp), %r13
29953+ CFI_RESTORE r13
29954 addq $2*8, %rsp
29955 CFI_ADJUST_CFA_OFFSET -2*8
29956+ pax_force_retaddr
29957 ret
29958 .Lcopy_page_end:
29959 CFI_ENDPROC
29960@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29961
29962 #include <asm/cpufeature.h>
29963
29964- .section .altinstr_replacement,"ax"
29965+ .section .altinstr_replacement,"a"
29966 1: .byte 0xeb /* jmp <disp8> */
29967 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29968 2:
29969diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29970index dee945d..a84067b 100644
29971--- a/arch/x86/lib/copy_user_64.S
29972+++ b/arch/x86/lib/copy_user_64.S
29973@@ -18,31 +18,7 @@
29974 #include <asm/alternative-asm.h>
29975 #include <asm/asm.h>
29976 #include <asm/smap.h>
29977-
29978-/*
29979- * By placing feature2 after feature1 in altinstructions section, we logically
29980- * implement:
29981- * If CPU has feature2, jmp to alt2 is used
29982- * else if CPU has feature1, jmp to alt1 is used
29983- * else jmp to orig is used.
29984- */
29985- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29986-0:
29987- .byte 0xe9 /* 32bit jump */
29988- .long \orig-1f /* by default jump to orig */
29989-1:
29990- .section .altinstr_replacement,"ax"
29991-2: .byte 0xe9 /* near jump with 32bit immediate */
29992- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29993-3: .byte 0xe9 /* near jump with 32bit immediate */
29994- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29995- .previous
29996-
29997- .section .altinstructions,"a"
29998- altinstruction_entry 0b,2b,\feature1,5,5
29999- altinstruction_entry 0b,3b,\feature2,5,5
30000- .previous
30001- .endm
30002+#include <asm/pgtable.h>
30003
30004 .macro ALIGN_DESTINATION
30005 #ifdef FIX_ALIGNMENT
30006@@ -70,52 +46,6 @@
30007 #endif
30008 .endm
30009
30010-/* Standard copy_to_user with segment limit checking */
30011-ENTRY(_copy_to_user)
30012- CFI_STARTPROC
30013- GET_THREAD_INFO(%rax)
30014- movq %rdi,%rcx
30015- addq %rdx,%rcx
30016- jc bad_to_user
30017- cmpq TI_addr_limit(%rax),%rcx
30018- ja bad_to_user
30019- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30020- copy_user_generic_unrolled,copy_user_generic_string, \
30021- copy_user_enhanced_fast_string
30022- CFI_ENDPROC
30023-ENDPROC(_copy_to_user)
30024-
30025-/* Standard copy_from_user with segment limit checking */
30026-ENTRY(_copy_from_user)
30027- CFI_STARTPROC
30028- GET_THREAD_INFO(%rax)
30029- movq %rsi,%rcx
30030- addq %rdx,%rcx
30031- jc bad_from_user
30032- cmpq TI_addr_limit(%rax),%rcx
30033- ja bad_from_user
30034- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
30035- copy_user_generic_unrolled,copy_user_generic_string, \
30036- copy_user_enhanced_fast_string
30037- CFI_ENDPROC
30038-ENDPROC(_copy_from_user)
30039-
30040- .section .fixup,"ax"
30041- /* must zero dest */
30042-ENTRY(bad_from_user)
30043-bad_from_user:
30044- CFI_STARTPROC
30045- movl %edx,%ecx
30046- xorl %eax,%eax
30047- rep
30048- stosb
30049-bad_to_user:
30050- movl %edx,%eax
30051- ret
30052- CFI_ENDPROC
30053-ENDPROC(bad_from_user)
30054- .previous
30055-
30056 /*
30057 * copy_user_generic_unrolled - memory copy with exception handling.
30058 * This version is for CPUs like P4 that don't have efficient micro
30059@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
30060 */
30061 ENTRY(copy_user_generic_unrolled)
30062 CFI_STARTPROC
30063+ ASM_PAX_OPEN_USERLAND
30064 ASM_STAC
30065 cmpl $8,%edx
30066 jb 20f /* less then 8 bytes, go to byte copy loop */
30067@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
30068 jnz 21b
30069 23: xor %eax,%eax
30070 ASM_CLAC
30071+ ASM_PAX_CLOSE_USERLAND
30072+ pax_force_retaddr
30073 ret
30074
30075 .section .fixup,"ax"
30076@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
30077 */
30078 ENTRY(copy_user_generic_string)
30079 CFI_STARTPROC
30080+ ASM_PAX_OPEN_USERLAND
30081 ASM_STAC
30082 cmpl $8,%edx
30083 jb 2f /* less than 8 bytes, go to byte copy loop */
30084@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
30085 movsb
30086 xorl %eax,%eax
30087 ASM_CLAC
30088+ ASM_PAX_CLOSE_USERLAND
30089+ pax_force_retaddr
30090 ret
30091
30092 .section .fixup,"ax"
30093@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
30094 */
30095 ENTRY(copy_user_enhanced_fast_string)
30096 CFI_STARTPROC
30097+ ASM_PAX_OPEN_USERLAND
30098 ASM_STAC
30099 movl %edx,%ecx
30100 1: rep
30101 movsb
30102 xorl %eax,%eax
30103 ASM_CLAC
30104+ ASM_PAX_CLOSE_USERLAND
30105+ pax_force_retaddr
30106 ret
30107
30108 .section .fixup,"ax"
30109diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30110index 6a4f43c..c70fb52 100644
30111--- a/arch/x86/lib/copy_user_nocache_64.S
30112+++ b/arch/x86/lib/copy_user_nocache_64.S
30113@@ -8,6 +8,7 @@
30114
30115 #include <linux/linkage.h>
30116 #include <asm/dwarf2.h>
30117+#include <asm/alternative-asm.h>
30118
30119 #define FIX_ALIGNMENT 1
30120
30121@@ -16,6 +17,7 @@
30122 #include <asm/thread_info.h>
30123 #include <asm/asm.h>
30124 #include <asm/smap.h>
30125+#include <asm/pgtable.h>
30126
30127 .macro ALIGN_DESTINATION
30128 #ifdef FIX_ALIGNMENT
30129@@ -49,6 +51,16 @@
30130 */
30131 ENTRY(__copy_user_nocache)
30132 CFI_STARTPROC
30133+
30134+#ifdef CONFIG_PAX_MEMORY_UDEREF
30135+ mov pax_user_shadow_base,%rcx
30136+ cmp %rcx,%rsi
30137+ jae 1f
30138+ add %rcx,%rsi
30139+1:
30140+#endif
30141+
30142+ ASM_PAX_OPEN_USERLAND
30143 ASM_STAC
30144 cmpl $8,%edx
30145 jb 20f /* less then 8 bytes, go to byte copy loop */
30146@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30147 jnz 21b
30148 23: xorl %eax,%eax
30149 ASM_CLAC
30150+ ASM_PAX_CLOSE_USERLAND
30151 sfence
30152+ pax_force_retaddr
30153 ret
30154
30155 .section .fixup,"ax"
30156diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30157index 2419d5f..fe52d0e 100644
30158--- a/arch/x86/lib/csum-copy_64.S
30159+++ b/arch/x86/lib/csum-copy_64.S
30160@@ -9,6 +9,7 @@
30161 #include <asm/dwarf2.h>
30162 #include <asm/errno.h>
30163 #include <asm/asm.h>
30164+#include <asm/alternative-asm.h>
30165
30166 /*
30167 * Checksum copy with exception handling.
30168@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30169 CFI_ADJUST_CFA_OFFSET 7*8
30170 movq %rbx, 2*8(%rsp)
30171 CFI_REL_OFFSET rbx, 2*8
30172- movq %r12, 3*8(%rsp)
30173- CFI_REL_OFFSET r12, 3*8
30174+ movq %r15, 3*8(%rsp)
30175+ CFI_REL_OFFSET r15, 3*8
30176 movq %r14, 4*8(%rsp)
30177 CFI_REL_OFFSET r14, 4*8
30178 movq %r13, 5*8(%rsp)
30179@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30180 movl %edx, %ecx
30181
30182 xorl %r9d, %r9d
30183- movq %rcx, %r12
30184+ movq %rcx, %r15
30185
30186- shrq $6, %r12
30187+ shrq $6, %r15
30188 jz .Lhandle_tail /* < 64 */
30189
30190 clc
30191
30192 /* main loop. clear in 64 byte blocks */
30193 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30194- /* r11: temp3, rdx: temp4, r12 loopcnt */
30195+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30196 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30197 .p2align 4
30198 .Lloop:
30199@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30200 adcq %r14, %rax
30201 adcq %r13, %rax
30202
30203- decl %r12d
30204+ decl %r15d
30205
30206 dest
30207 movq %rbx, (%rsi)
30208@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30209 .Lende:
30210 movq 2*8(%rsp), %rbx
30211 CFI_RESTORE rbx
30212- movq 3*8(%rsp), %r12
30213- CFI_RESTORE r12
30214+ movq 3*8(%rsp), %r15
30215+ CFI_RESTORE r15
30216 movq 4*8(%rsp), %r14
30217 CFI_RESTORE r14
30218 movq 5*8(%rsp), %r13
30219@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30220 CFI_RESTORE rbp
30221 addq $7*8, %rsp
30222 CFI_ADJUST_CFA_OFFSET -7*8
30223+ pax_force_retaddr
30224 ret
30225 CFI_RESTORE_STATE
30226
30227diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30228index 1318f75..44c30fd 100644
30229--- a/arch/x86/lib/csum-wrappers_64.c
30230+++ b/arch/x86/lib/csum-wrappers_64.c
30231@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30232 len -= 2;
30233 }
30234 }
30235+ pax_open_userland();
30236 stac();
30237- isum = csum_partial_copy_generic((__force const void *)src,
30238+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30239 dst, len, isum, errp, NULL);
30240 clac();
30241+ pax_close_userland();
30242 if (unlikely(*errp))
30243 goto out_err;
30244
30245@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30246 }
30247
30248 *errp = 0;
30249+ pax_open_userland();
30250 stac();
30251- ret = csum_partial_copy_generic(src, (void __force *)dst,
30252+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30253 len, isum, NULL, errp);
30254 clac();
30255+ pax_close_userland();
30256 return ret;
30257 }
30258 EXPORT_SYMBOL(csum_partial_copy_to_user);
30259diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30260index a451235..a74bfa3 100644
30261--- a/arch/x86/lib/getuser.S
30262+++ b/arch/x86/lib/getuser.S
30263@@ -33,17 +33,40 @@
30264 #include <asm/thread_info.h>
30265 #include <asm/asm.h>
30266 #include <asm/smap.h>
30267+#include <asm/segment.h>
30268+#include <asm/pgtable.h>
30269+#include <asm/alternative-asm.h>
30270+
30271+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30272+#define __copyuser_seg gs;
30273+#else
30274+#define __copyuser_seg
30275+#endif
30276
30277 .text
30278 ENTRY(__get_user_1)
30279 CFI_STARTPROC
30280+
30281+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30282 GET_THREAD_INFO(%_ASM_DX)
30283 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30284 jae bad_get_user
30285+
30286+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30287+ mov pax_user_shadow_base,%_ASM_DX
30288+ cmp %_ASM_DX,%_ASM_AX
30289+ jae 1234f
30290+ add %_ASM_DX,%_ASM_AX
30291+1234:
30292+#endif
30293+
30294+#endif
30295+
30296 ASM_STAC
30297-1: movzbl (%_ASM_AX),%edx
30298+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30299 xor %eax,%eax
30300 ASM_CLAC
30301+ pax_force_retaddr
30302 ret
30303 CFI_ENDPROC
30304 ENDPROC(__get_user_1)
30305@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30306 ENTRY(__get_user_2)
30307 CFI_STARTPROC
30308 add $1,%_ASM_AX
30309+
30310+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30311 jc bad_get_user
30312 GET_THREAD_INFO(%_ASM_DX)
30313 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30314 jae bad_get_user
30315+
30316+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30317+ mov pax_user_shadow_base,%_ASM_DX
30318+ cmp %_ASM_DX,%_ASM_AX
30319+ jae 1234f
30320+ add %_ASM_DX,%_ASM_AX
30321+1234:
30322+#endif
30323+
30324+#endif
30325+
30326 ASM_STAC
30327-2: movzwl -1(%_ASM_AX),%edx
30328+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30329 xor %eax,%eax
30330 ASM_CLAC
30331+ pax_force_retaddr
30332 ret
30333 CFI_ENDPROC
30334 ENDPROC(__get_user_2)
30335@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30336 ENTRY(__get_user_4)
30337 CFI_STARTPROC
30338 add $3,%_ASM_AX
30339+
30340+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30341 jc bad_get_user
30342 GET_THREAD_INFO(%_ASM_DX)
30343 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30344 jae bad_get_user
30345+
30346+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30347+ mov pax_user_shadow_base,%_ASM_DX
30348+ cmp %_ASM_DX,%_ASM_AX
30349+ jae 1234f
30350+ add %_ASM_DX,%_ASM_AX
30351+1234:
30352+#endif
30353+
30354+#endif
30355+
30356 ASM_STAC
30357-3: movl -3(%_ASM_AX),%edx
30358+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30359 xor %eax,%eax
30360 ASM_CLAC
30361+ pax_force_retaddr
30362 ret
30363 CFI_ENDPROC
30364 ENDPROC(__get_user_4)
30365@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30366 GET_THREAD_INFO(%_ASM_DX)
30367 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30368 jae bad_get_user
30369+
30370+#ifdef CONFIG_PAX_MEMORY_UDEREF
30371+ mov pax_user_shadow_base,%_ASM_DX
30372+ cmp %_ASM_DX,%_ASM_AX
30373+ jae 1234f
30374+ add %_ASM_DX,%_ASM_AX
30375+1234:
30376+#endif
30377+
30378 ASM_STAC
30379 4: movq -7(%_ASM_AX),%rdx
30380 xor %eax,%eax
30381 ASM_CLAC
30382+ pax_force_retaddr
30383 ret
30384 #else
30385 add $7,%_ASM_AX
30386@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30387 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30388 jae bad_get_user_8
30389 ASM_STAC
30390-4: movl -7(%_ASM_AX),%edx
30391-5: movl -3(%_ASM_AX),%ecx
30392+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30393+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30394 xor %eax,%eax
30395 ASM_CLAC
30396+ pax_force_retaddr
30397 ret
30398 #endif
30399 CFI_ENDPROC
30400@@ -113,6 +175,7 @@ bad_get_user:
30401 xor %edx,%edx
30402 mov $(-EFAULT),%_ASM_AX
30403 ASM_CLAC
30404+ pax_force_retaddr
30405 ret
30406 CFI_ENDPROC
30407 END(bad_get_user)
30408@@ -124,6 +187,7 @@ bad_get_user_8:
30409 xor %ecx,%ecx
30410 mov $(-EFAULT),%_ASM_AX
30411 ASM_CLAC
30412+ pax_force_retaddr
30413 ret
30414 CFI_ENDPROC
30415 END(bad_get_user_8)
30416diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30417index 85994f5..9929d7f 100644
30418--- a/arch/x86/lib/insn.c
30419+++ b/arch/x86/lib/insn.c
30420@@ -20,8 +20,10 @@
30421
30422 #ifdef __KERNEL__
30423 #include <linux/string.h>
30424+#include <asm/pgtable_types.h>
30425 #else
30426 #include <string.h>
30427+#define ktla_ktva(addr) addr
30428 #endif
30429 #include <asm/inat.h>
30430 #include <asm/insn.h>
30431@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30432 buf_len = MAX_INSN_SIZE;
30433
30434 memset(insn, 0, sizeof(*insn));
30435- insn->kaddr = kaddr;
30436- insn->end_kaddr = kaddr + buf_len;
30437- insn->next_byte = kaddr;
30438+ insn->kaddr = ktla_ktva(kaddr);
30439+ insn->end_kaddr = insn->kaddr + buf_len;
30440+ insn->next_byte = insn->kaddr;
30441 insn->x86_64 = x86_64 ? 1 : 0;
30442 insn->opnd_bytes = 4;
30443 if (x86_64)
30444diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30445index 05a95e7..326f2fa 100644
30446--- a/arch/x86/lib/iomap_copy_64.S
30447+++ b/arch/x86/lib/iomap_copy_64.S
30448@@ -17,6 +17,7 @@
30449
30450 #include <linux/linkage.h>
30451 #include <asm/dwarf2.h>
30452+#include <asm/alternative-asm.h>
30453
30454 /*
30455 * override generic version in lib/iomap_copy.c
30456@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30457 CFI_STARTPROC
30458 movl %edx,%ecx
30459 rep movsd
30460+ pax_force_retaddr
30461 ret
30462 CFI_ENDPROC
30463 ENDPROC(__iowrite32_copy)
30464diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30465index 89b53c9..97357ca 100644
30466--- a/arch/x86/lib/memcpy_64.S
30467+++ b/arch/x86/lib/memcpy_64.S
30468@@ -24,7 +24,7 @@
30469 * This gets patched over the unrolled variant (below) via the
30470 * alternative instructions framework:
30471 */
30472- .section .altinstr_replacement, "ax", @progbits
30473+ .section .altinstr_replacement, "a", @progbits
30474 .Lmemcpy_c:
30475 movq %rdi, %rax
30476 movq %rdx, %rcx
30477@@ -33,6 +33,7 @@
30478 rep movsq
30479 movl %edx, %ecx
30480 rep movsb
30481+ pax_force_retaddr
30482 ret
30483 .Lmemcpy_e:
30484 .previous
30485@@ -44,11 +45,12 @@
30486 * This gets patched over the unrolled variant (below) via the
30487 * alternative instructions framework:
30488 */
30489- .section .altinstr_replacement, "ax", @progbits
30490+ .section .altinstr_replacement, "a", @progbits
30491 .Lmemcpy_c_e:
30492 movq %rdi, %rax
30493 movq %rdx, %rcx
30494 rep movsb
30495+ pax_force_retaddr
30496 ret
30497 .Lmemcpy_e_e:
30498 .previous
30499@@ -138,6 +140,7 @@ ENTRY(memcpy)
30500 movq %r9, 1*8(%rdi)
30501 movq %r10, -2*8(%rdi, %rdx)
30502 movq %r11, -1*8(%rdi, %rdx)
30503+ pax_force_retaddr
30504 retq
30505 .p2align 4
30506 .Lless_16bytes:
30507@@ -150,6 +153,7 @@ ENTRY(memcpy)
30508 movq -1*8(%rsi, %rdx), %r9
30509 movq %r8, 0*8(%rdi)
30510 movq %r9, -1*8(%rdi, %rdx)
30511+ pax_force_retaddr
30512 retq
30513 .p2align 4
30514 .Lless_8bytes:
30515@@ -163,6 +167,7 @@ ENTRY(memcpy)
30516 movl -4(%rsi, %rdx), %r8d
30517 movl %ecx, (%rdi)
30518 movl %r8d, -4(%rdi, %rdx)
30519+ pax_force_retaddr
30520 retq
30521 .p2align 4
30522 .Lless_3bytes:
30523@@ -181,6 +186,7 @@ ENTRY(memcpy)
30524 movb %cl, (%rdi)
30525
30526 .Lend:
30527+ pax_force_retaddr
30528 retq
30529 CFI_ENDPROC
30530 ENDPROC(memcpy)
30531diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30532index 9c4b530..830b77a 100644
30533--- a/arch/x86/lib/memmove_64.S
30534+++ b/arch/x86/lib/memmove_64.S
30535@@ -205,14 +205,16 @@ ENTRY(__memmove)
30536 movb (%rsi), %r11b
30537 movb %r11b, (%rdi)
30538 13:
30539+ pax_force_retaddr
30540 retq
30541 CFI_ENDPROC
30542
30543- .section .altinstr_replacement,"ax"
30544+ .section .altinstr_replacement,"a"
30545 .Lmemmove_begin_forward_efs:
30546 /* Forward moving data. */
30547 movq %rdx, %rcx
30548 rep movsb
30549+ pax_force_retaddr
30550 retq
30551 .Lmemmove_end_forward_efs:
30552 .previous
30553diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30554index 6f44935..fbf5f6d 100644
30555--- a/arch/x86/lib/memset_64.S
30556+++ b/arch/x86/lib/memset_64.S
30557@@ -16,7 +16,7 @@
30558 *
30559 * rax original destination
30560 */
30561- .section .altinstr_replacement, "ax", @progbits
30562+ .section .altinstr_replacement, "a", @progbits
30563 .Lmemset_c:
30564 movq %rdi,%r9
30565 movq %rdx,%rcx
30566@@ -30,6 +30,7 @@
30567 movl %edx,%ecx
30568 rep stosb
30569 movq %r9,%rax
30570+ pax_force_retaddr
30571 ret
30572 .Lmemset_e:
30573 .previous
30574@@ -45,13 +46,14 @@
30575 *
30576 * rax original destination
30577 */
30578- .section .altinstr_replacement, "ax", @progbits
30579+ .section .altinstr_replacement, "a", @progbits
30580 .Lmemset_c_e:
30581 movq %rdi,%r9
30582 movb %sil,%al
30583 movq %rdx,%rcx
30584 rep stosb
30585 movq %r9,%rax
30586+ pax_force_retaddr
30587 ret
30588 .Lmemset_e_e:
30589 .previous
30590@@ -120,6 +122,7 @@ ENTRY(__memset)
30591
30592 .Lende:
30593 movq %r10,%rax
30594+ pax_force_retaddr
30595 ret
30596
30597 CFI_RESTORE_STATE
30598diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30599index c9f2d9b..e7fd2c0 100644
30600--- a/arch/x86/lib/mmx_32.c
30601+++ b/arch/x86/lib/mmx_32.c
30602@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30603 {
30604 void *p;
30605 int i;
30606+ unsigned long cr0;
30607
30608 if (unlikely(in_interrupt()))
30609 return __memcpy(to, from, len);
30610@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30611 kernel_fpu_begin();
30612
30613 __asm__ __volatile__ (
30614- "1: prefetch (%0)\n" /* This set is 28 bytes */
30615- " prefetch 64(%0)\n"
30616- " prefetch 128(%0)\n"
30617- " prefetch 192(%0)\n"
30618- " prefetch 256(%0)\n"
30619+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30620+ " prefetch 64(%1)\n"
30621+ " prefetch 128(%1)\n"
30622+ " prefetch 192(%1)\n"
30623+ " prefetch 256(%1)\n"
30624 "2: \n"
30625 ".section .fixup, \"ax\"\n"
30626- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30627+ "3: \n"
30628+
30629+#ifdef CONFIG_PAX_KERNEXEC
30630+ " movl %%cr0, %0\n"
30631+ " movl %0, %%eax\n"
30632+ " andl $0xFFFEFFFF, %%eax\n"
30633+ " movl %%eax, %%cr0\n"
30634+#endif
30635+
30636+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30637+
30638+#ifdef CONFIG_PAX_KERNEXEC
30639+ " movl %0, %%cr0\n"
30640+#endif
30641+
30642 " jmp 2b\n"
30643 ".previous\n"
30644 _ASM_EXTABLE(1b, 3b)
30645- : : "r" (from));
30646+ : "=&r" (cr0) : "r" (from) : "ax");
30647
30648 for ( ; i > 5; i--) {
30649 __asm__ __volatile__ (
30650- "1: prefetch 320(%0)\n"
30651- "2: movq (%0), %%mm0\n"
30652- " movq 8(%0), %%mm1\n"
30653- " movq 16(%0), %%mm2\n"
30654- " movq 24(%0), %%mm3\n"
30655- " movq %%mm0, (%1)\n"
30656- " movq %%mm1, 8(%1)\n"
30657- " movq %%mm2, 16(%1)\n"
30658- " movq %%mm3, 24(%1)\n"
30659- " movq 32(%0), %%mm0\n"
30660- " movq 40(%0), %%mm1\n"
30661- " movq 48(%0), %%mm2\n"
30662- " movq 56(%0), %%mm3\n"
30663- " movq %%mm0, 32(%1)\n"
30664- " movq %%mm1, 40(%1)\n"
30665- " movq %%mm2, 48(%1)\n"
30666- " movq %%mm3, 56(%1)\n"
30667+ "1: prefetch 320(%1)\n"
30668+ "2: movq (%1), %%mm0\n"
30669+ " movq 8(%1), %%mm1\n"
30670+ " movq 16(%1), %%mm2\n"
30671+ " movq 24(%1), %%mm3\n"
30672+ " movq %%mm0, (%2)\n"
30673+ " movq %%mm1, 8(%2)\n"
30674+ " movq %%mm2, 16(%2)\n"
30675+ " movq %%mm3, 24(%2)\n"
30676+ " movq 32(%1), %%mm0\n"
30677+ " movq 40(%1), %%mm1\n"
30678+ " movq 48(%1), %%mm2\n"
30679+ " movq 56(%1), %%mm3\n"
30680+ " movq %%mm0, 32(%2)\n"
30681+ " movq %%mm1, 40(%2)\n"
30682+ " movq %%mm2, 48(%2)\n"
30683+ " movq %%mm3, 56(%2)\n"
30684 ".section .fixup, \"ax\"\n"
30685- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30686+ "3:\n"
30687+
30688+#ifdef CONFIG_PAX_KERNEXEC
30689+ " movl %%cr0, %0\n"
30690+ " movl %0, %%eax\n"
30691+ " andl $0xFFFEFFFF, %%eax\n"
30692+ " movl %%eax, %%cr0\n"
30693+#endif
30694+
30695+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30696+
30697+#ifdef CONFIG_PAX_KERNEXEC
30698+ " movl %0, %%cr0\n"
30699+#endif
30700+
30701 " jmp 2b\n"
30702 ".previous\n"
30703 _ASM_EXTABLE(1b, 3b)
30704- : : "r" (from), "r" (to) : "memory");
30705+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30706
30707 from += 64;
30708 to += 64;
30709@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30710 static void fast_copy_page(void *to, void *from)
30711 {
30712 int i;
30713+ unsigned long cr0;
30714
30715 kernel_fpu_begin();
30716
30717@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30718 * but that is for later. -AV
30719 */
30720 __asm__ __volatile__(
30721- "1: prefetch (%0)\n"
30722- " prefetch 64(%0)\n"
30723- " prefetch 128(%0)\n"
30724- " prefetch 192(%0)\n"
30725- " prefetch 256(%0)\n"
30726+ "1: prefetch (%1)\n"
30727+ " prefetch 64(%1)\n"
30728+ " prefetch 128(%1)\n"
30729+ " prefetch 192(%1)\n"
30730+ " prefetch 256(%1)\n"
30731 "2: \n"
30732 ".section .fixup, \"ax\"\n"
30733- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30734+ "3: \n"
30735+
30736+#ifdef CONFIG_PAX_KERNEXEC
30737+ " movl %%cr0, %0\n"
30738+ " movl %0, %%eax\n"
30739+ " andl $0xFFFEFFFF, %%eax\n"
30740+ " movl %%eax, %%cr0\n"
30741+#endif
30742+
30743+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30744+
30745+#ifdef CONFIG_PAX_KERNEXEC
30746+ " movl %0, %%cr0\n"
30747+#endif
30748+
30749 " jmp 2b\n"
30750 ".previous\n"
30751- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30752+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30753
30754 for (i = 0; i < (4096-320)/64; i++) {
30755 __asm__ __volatile__ (
30756- "1: prefetch 320(%0)\n"
30757- "2: movq (%0), %%mm0\n"
30758- " movntq %%mm0, (%1)\n"
30759- " movq 8(%0), %%mm1\n"
30760- " movntq %%mm1, 8(%1)\n"
30761- " movq 16(%0), %%mm2\n"
30762- " movntq %%mm2, 16(%1)\n"
30763- " movq 24(%0), %%mm3\n"
30764- " movntq %%mm3, 24(%1)\n"
30765- " movq 32(%0), %%mm4\n"
30766- " movntq %%mm4, 32(%1)\n"
30767- " movq 40(%0), %%mm5\n"
30768- " movntq %%mm5, 40(%1)\n"
30769- " movq 48(%0), %%mm6\n"
30770- " movntq %%mm6, 48(%1)\n"
30771- " movq 56(%0), %%mm7\n"
30772- " movntq %%mm7, 56(%1)\n"
30773+ "1: prefetch 320(%1)\n"
30774+ "2: movq (%1), %%mm0\n"
30775+ " movntq %%mm0, (%2)\n"
30776+ " movq 8(%1), %%mm1\n"
30777+ " movntq %%mm1, 8(%2)\n"
30778+ " movq 16(%1), %%mm2\n"
30779+ " movntq %%mm2, 16(%2)\n"
30780+ " movq 24(%1), %%mm3\n"
30781+ " movntq %%mm3, 24(%2)\n"
30782+ " movq 32(%1), %%mm4\n"
30783+ " movntq %%mm4, 32(%2)\n"
30784+ " movq 40(%1), %%mm5\n"
30785+ " movntq %%mm5, 40(%2)\n"
30786+ " movq 48(%1), %%mm6\n"
30787+ " movntq %%mm6, 48(%2)\n"
30788+ " movq 56(%1), %%mm7\n"
30789+ " movntq %%mm7, 56(%2)\n"
30790 ".section .fixup, \"ax\"\n"
30791- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30792+ "3:\n"
30793+
30794+#ifdef CONFIG_PAX_KERNEXEC
30795+ " movl %%cr0, %0\n"
30796+ " movl %0, %%eax\n"
30797+ " andl $0xFFFEFFFF, %%eax\n"
30798+ " movl %%eax, %%cr0\n"
30799+#endif
30800+
30801+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30802+
30803+#ifdef CONFIG_PAX_KERNEXEC
30804+ " movl %0, %%cr0\n"
30805+#endif
30806+
30807 " jmp 2b\n"
30808 ".previous\n"
30809- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30810+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30811
30812 from += 64;
30813 to += 64;
30814@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30815 static void fast_copy_page(void *to, void *from)
30816 {
30817 int i;
30818+ unsigned long cr0;
30819
30820 kernel_fpu_begin();
30821
30822 __asm__ __volatile__ (
30823- "1: prefetch (%0)\n"
30824- " prefetch 64(%0)\n"
30825- " prefetch 128(%0)\n"
30826- " prefetch 192(%0)\n"
30827- " prefetch 256(%0)\n"
30828+ "1: prefetch (%1)\n"
30829+ " prefetch 64(%1)\n"
30830+ " prefetch 128(%1)\n"
30831+ " prefetch 192(%1)\n"
30832+ " prefetch 256(%1)\n"
30833 "2: \n"
30834 ".section .fixup, \"ax\"\n"
30835- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30836+ "3: \n"
30837+
30838+#ifdef CONFIG_PAX_KERNEXEC
30839+ " movl %%cr0, %0\n"
30840+ " movl %0, %%eax\n"
30841+ " andl $0xFFFEFFFF, %%eax\n"
30842+ " movl %%eax, %%cr0\n"
30843+#endif
30844+
30845+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30846+
30847+#ifdef CONFIG_PAX_KERNEXEC
30848+ " movl %0, %%cr0\n"
30849+#endif
30850+
30851 " jmp 2b\n"
30852 ".previous\n"
30853- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30854+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30855
30856 for (i = 0; i < 4096/64; i++) {
30857 __asm__ __volatile__ (
30858- "1: prefetch 320(%0)\n"
30859- "2: movq (%0), %%mm0\n"
30860- " movq 8(%0), %%mm1\n"
30861- " movq 16(%0), %%mm2\n"
30862- " movq 24(%0), %%mm3\n"
30863- " movq %%mm0, (%1)\n"
30864- " movq %%mm1, 8(%1)\n"
30865- " movq %%mm2, 16(%1)\n"
30866- " movq %%mm3, 24(%1)\n"
30867- " movq 32(%0), %%mm0\n"
30868- " movq 40(%0), %%mm1\n"
30869- " movq 48(%0), %%mm2\n"
30870- " movq 56(%0), %%mm3\n"
30871- " movq %%mm0, 32(%1)\n"
30872- " movq %%mm1, 40(%1)\n"
30873- " movq %%mm2, 48(%1)\n"
30874- " movq %%mm3, 56(%1)\n"
30875+ "1: prefetch 320(%1)\n"
30876+ "2: movq (%1), %%mm0\n"
30877+ " movq 8(%1), %%mm1\n"
30878+ " movq 16(%1), %%mm2\n"
30879+ " movq 24(%1), %%mm3\n"
30880+ " movq %%mm0, (%2)\n"
30881+ " movq %%mm1, 8(%2)\n"
30882+ " movq %%mm2, 16(%2)\n"
30883+ " movq %%mm3, 24(%2)\n"
30884+ " movq 32(%1), %%mm0\n"
30885+ " movq 40(%1), %%mm1\n"
30886+ " movq 48(%1), %%mm2\n"
30887+ " movq 56(%1), %%mm3\n"
30888+ " movq %%mm0, 32(%2)\n"
30889+ " movq %%mm1, 40(%2)\n"
30890+ " movq %%mm2, 48(%2)\n"
30891+ " movq %%mm3, 56(%2)\n"
30892 ".section .fixup, \"ax\"\n"
30893- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30894+ "3:\n"
30895+
30896+#ifdef CONFIG_PAX_KERNEXEC
30897+ " movl %%cr0, %0\n"
30898+ " movl %0, %%eax\n"
30899+ " andl $0xFFFEFFFF, %%eax\n"
30900+ " movl %%eax, %%cr0\n"
30901+#endif
30902+
30903+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30904+
30905+#ifdef CONFIG_PAX_KERNEXEC
30906+ " movl %0, %%cr0\n"
30907+#endif
30908+
30909 " jmp 2b\n"
30910 ".previous\n"
30911 _ASM_EXTABLE(1b, 3b)
30912- : : "r" (from), "r" (to) : "memory");
30913+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30914
30915 from += 64;
30916 to += 64;
30917diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30918index f6d13ee..d789440 100644
30919--- a/arch/x86/lib/msr-reg.S
30920+++ b/arch/x86/lib/msr-reg.S
30921@@ -3,6 +3,7 @@
30922 #include <asm/dwarf2.h>
30923 #include <asm/asm.h>
30924 #include <asm/msr.h>
30925+#include <asm/alternative-asm.h>
30926
30927 #ifdef CONFIG_X86_64
30928 /*
30929@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30930 movl %edi, 28(%r10)
30931 popq_cfi %rbp
30932 popq_cfi %rbx
30933+ pax_force_retaddr
30934 ret
30935 3:
30936 CFI_RESTORE_STATE
30937diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30938index fc6ba17..14ad9a5 100644
30939--- a/arch/x86/lib/putuser.S
30940+++ b/arch/x86/lib/putuser.S
30941@@ -16,7 +16,9 @@
30942 #include <asm/errno.h>
30943 #include <asm/asm.h>
30944 #include <asm/smap.h>
30945-
30946+#include <asm/segment.h>
30947+#include <asm/pgtable.h>
30948+#include <asm/alternative-asm.h>
30949
30950 /*
30951 * __put_user_X
30952@@ -30,57 +32,125 @@
30953 * as they get called from within inline assembly.
30954 */
30955
30956-#define ENTER CFI_STARTPROC ; \
30957- GET_THREAD_INFO(%_ASM_BX)
30958-#define EXIT ASM_CLAC ; \
30959- ret ; \
30960+#define ENTER CFI_STARTPROC
30961+#define EXIT ASM_CLAC ; \
30962+ pax_force_retaddr ; \
30963+ ret ; \
30964 CFI_ENDPROC
30965
30966+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30967+#define _DEST %_ASM_CX,%_ASM_BX
30968+#else
30969+#define _DEST %_ASM_CX
30970+#endif
30971+
30972+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30973+#define __copyuser_seg gs;
30974+#else
30975+#define __copyuser_seg
30976+#endif
30977+
30978 .text
30979 ENTRY(__put_user_1)
30980 ENTER
30981+
30982+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30983+ GET_THREAD_INFO(%_ASM_BX)
30984 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30985 jae bad_put_user
30986+
30987+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30988+ mov pax_user_shadow_base,%_ASM_BX
30989+ cmp %_ASM_BX,%_ASM_CX
30990+ jb 1234f
30991+ xor %ebx,%ebx
30992+1234:
30993+#endif
30994+
30995+#endif
30996+
30997 ASM_STAC
30998-1: movb %al,(%_ASM_CX)
30999+1: __copyuser_seg movb %al,(_DEST)
31000 xor %eax,%eax
31001 EXIT
31002 ENDPROC(__put_user_1)
31003
31004 ENTRY(__put_user_2)
31005 ENTER
31006+
31007+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31008+ GET_THREAD_INFO(%_ASM_BX)
31009 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31010 sub $1,%_ASM_BX
31011 cmp %_ASM_BX,%_ASM_CX
31012 jae bad_put_user
31013+
31014+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31015+ mov pax_user_shadow_base,%_ASM_BX
31016+ cmp %_ASM_BX,%_ASM_CX
31017+ jb 1234f
31018+ xor %ebx,%ebx
31019+1234:
31020+#endif
31021+
31022+#endif
31023+
31024 ASM_STAC
31025-2: movw %ax,(%_ASM_CX)
31026+2: __copyuser_seg movw %ax,(_DEST)
31027 xor %eax,%eax
31028 EXIT
31029 ENDPROC(__put_user_2)
31030
31031 ENTRY(__put_user_4)
31032 ENTER
31033+
31034+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31035+ GET_THREAD_INFO(%_ASM_BX)
31036 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31037 sub $3,%_ASM_BX
31038 cmp %_ASM_BX,%_ASM_CX
31039 jae bad_put_user
31040+
31041+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31042+ mov pax_user_shadow_base,%_ASM_BX
31043+ cmp %_ASM_BX,%_ASM_CX
31044+ jb 1234f
31045+ xor %ebx,%ebx
31046+1234:
31047+#endif
31048+
31049+#endif
31050+
31051 ASM_STAC
31052-3: movl %eax,(%_ASM_CX)
31053+3: __copyuser_seg movl %eax,(_DEST)
31054 xor %eax,%eax
31055 EXIT
31056 ENDPROC(__put_user_4)
31057
31058 ENTRY(__put_user_8)
31059 ENTER
31060+
31061+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
31062+ GET_THREAD_INFO(%_ASM_BX)
31063 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
31064 sub $7,%_ASM_BX
31065 cmp %_ASM_BX,%_ASM_CX
31066 jae bad_put_user
31067+
31068+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31069+ mov pax_user_shadow_base,%_ASM_BX
31070+ cmp %_ASM_BX,%_ASM_CX
31071+ jb 1234f
31072+ xor %ebx,%ebx
31073+1234:
31074+#endif
31075+
31076+#endif
31077+
31078 ASM_STAC
31079-4: mov %_ASM_AX,(%_ASM_CX)
31080+4: __copyuser_seg mov %_ASM_AX,(_DEST)
31081 #ifdef CONFIG_X86_32
31082-5: movl %edx,4(%_ASM_CX)
31083+5: __copyuser_seg movl %edx,4(_DEST)
31084 #endif
31085 xor %eax,%eax
31086 EXIT
31087diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
31088index 5dff5f0..cadebf4 100644
31089--- a/arch/x86/lib/rwsem.S
31090+++ b/arch/x86/lib/rwsem.S
31091@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
31092 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31093 CFI_RESTORE __ASM_REG(dx)
31094 restore_common_regs
31095+ pax_force_retaddr
31096 ret
31097 CFI_ENDPROC
31098 ENDPROC(call_rwsem_down_read_failed)
31099@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
31100 movq %rax,%rdi
31101 call rwsem_down_write_failed
31102 restore_common_regs
31103+ pax_force_retaddr
31104 ret
31105 CFI_ENDPROC
31106 ENDPROC(call_rwsem_down_write_failed)
31107@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31108 movq %rax,%rdi
31109 call rwsem_wake
31110 restore_common_regs
31111-1: ret
31112+1: pax_force_retaddr
31113+ ret
31114 CFI_ENDPROC
31115 ENDPROC(call_rwsem_wake)
31116
31117@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31118 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31119 CFI_RESTORE __ASM_REG(dx)
31120 restore_common_regs
31121+ pax_force_retaddr
31122 ret
31123 CFI_ENDPROC
31124 ENDPROC(call_rwsem_downgrade_wake)
31125diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31126index b30b5eb..2b57052 100644
31127--- a/arch/x86/lib/thunk_64.S
31128+++ b/arch/x86/lib/thunk_64.S
31129@@ -9,6 +9,7 @@
31130 #include <asm/dwarf2.h>
31131 #include <asm/calling.h>
31132 #include <asm/asm.h>
31133+#include <asm/alternative-asm.h>
31134
31135 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31136 .macro THUNK name, func, put_ret_addr_in_rdi=0
31137@@ -16,11 +17,11 @@
31138 \name:
31139 CFI_STARTPROC
31140
31141- /* this one pushes 9 elems, the next one would be %rIP */
31142- SAVE_ARGS
31143+ /* this one pushes 15+1 elems, the next one would be %rIP */
31144+ SAVE_ARGS 8
31145
31146 .if \put_ret_addr_in_rdi
31147- movq_cfi_restore 9*8, rdi
31148+ movq_cfi_restore RIP, rdi
31149 .endif
31150
31151 call \func
31152@@ -47,9 +48,10 @@
31153
31154 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31155 CFI_STARTPROC
31156- SAVE_ARGS
31157+ SAVE_ARGS 8
31158 restore:
31159- RESTORE_ARGS
31160+ RESTORE_ARGS 1,8
31161+ pax_force_retaddr
31162 ret
31163 CFI_ENDPROC
31164 _ASM_NOKPROBE(restore)
31165diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31166index e2f5e21..4b22130 100644
31167--- a/arch/x86/lib/usercopy_32.c
31168+++ b/arch/x86/lib/usercopy_32.c
31169@@ -42,11 +42,13 @@ do { \
31170 int __d0; \
31171 might_fault(); \
31172 __asm__ __volatile__( \
31173+ __COPYUSER_SET_ES \
31174 ASM_STAC "\n" \
31175 "0: rep; stosl\n" \
31176 " movl %2,%0\n" \
31177 "1: rep; stosb\n" \
31178 "2: " ASM_CLAC "\n" \
31179+ __COPYUSER_RESTORE_ES \
31180 ".section .fixup,\"ax\"\n" \
31181 "3: lea 0(%2,%0,4),%0\n" \
31182 " jmp 2b\n" \
31183@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31184
31185 #ifdef CONFIG_X86_INTEL_USERCOPY
31186 static unsigned long
31187-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31188+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31189 {
31190 int d0, d1;
31191 __asm__ __volatile__(
31192@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31193 " .align 2,0x90\n"
31194 "3: movl 0(%4), %%eax\n"
31195 "4: movl 4(%4), %%edx\n"
31196- "5: movl %%eax, 0(%3)\n"
31197- "6: movl %%edx, 4(%3)\n"
31198+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31199+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31200 "7: movl 8(%4), %%eax\n"
31201 "8: movl 12(%4),%%edx\n"
31202- "9: movl %%eax, 8(%3)\n"
31203- "10: movl %%edx, 12(%3)\n"
31204+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31205+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31206 "11: movl 16(%4), %%eax\n"
31207 "12: movl 20(%4), %%edx\n"
31208- "13: movl %%eax, 16(%3)\n"
31209- "14: movl %%edx, 20(%3)\n"
31210+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31211+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31212 "15: movl 24(%4), %%eax\n"
31213 "16: movl 28(%4), %%edx\n"
31214- "17: movl %%eax, 24(%3)\n"
31215- "18: movl %%edx, 28(%3)\n"
31216+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31217+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31218 "19: movl 32(%4), %%eax\n"
31219 "20: movl 36(%4), %%edx\n"
31220- "21: movl %%eax, 32(%3)\n"
31221- "22: movl %%edx, 36(%3)\n"
31222+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31223+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31224 "23: movl 40(%4), %%eax\n"
31225 "24: movl 44(%4), %%edx\n"
31226- "25: movl %%eax, 40(%3)\n"
31227- "26: movl %%edx, 44(%3)\n"
31228+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31229+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31230 "27: movl 48(%4), %%eax\n"
31231 "28: movl 52(%4), %%edx\n"
31232- "29: movl %%eax, 48(%3)\n"
31233- "30: movl %%edx, 52(%3)\n"
31234+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31235+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31236 "31: movl 56(%4), %%eax\n"
31237 "32: movl 60(%4), %%edx\n"
31238- "33: movl %%eax, 56(%3)\n"
31239- "34: movl %%edx, 60(%3)\n"
31240+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31241+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31242 " addl $-64, %0\n"
31243 " addl $64, %4\n"
31244 " addl $64, %3\n"
31245@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31246 " shrl $2, %0\n"
31247 " andl $3, %%eax\n"
31248 " cld\n"
31249+ __COPYUSER_SET_ES
31250 "99: rep; movsl\n"
31251 "36: movl %%eax, %0\n"
31252 "37: rep; movsb\n"
31253 "100:\n"
31254+ __COPYUSER_RESTORE_ES
31255+ ".section .fixup,\"ax\"\n"
31256+ "101: lea 0(%%eax,%0,4),%0\n"
31257+ " jmp 100b\n"
31258+ ".previous\n"
31259+ _ASM_EXTABLE(1b,100b)
31260+ _ASM_EXTABLE(2b,100b)
31261+ _ASM_EXTABLE(3b,100b)
31262+ _ASM_EXTABLE(4b,100b)
31263+ _ASM_EXTABLE(5b,100b)
31264+ _ASM_EXTABLE(6b,100b)
31265+ _ASM_EXTABLE(7b,100b)
31266+ _ASM_EXTABLE(8b,100b)
31267+ _ASM_EXTABLE(9b,100b)
31268+ _ASM_EXTABLE(10b,100b)
31269+ _ASM_EXTABLE(11b,100b)
31270+ _ASM_EXTABLE(12b,100b)
31271+ _ASM_EXTABLE(13b,100b)
31272+ _ASM_EXTABLE(14b,100b)
31273+ _ASM_EXTABLE(15b,100b)
31274+ _ASM_EXTABLE(16b,100b)
31275+ _ASM_EXTABLE(17b,100b)
31276+ _ASM_EXTABLE(18b,100b)
31277+ _ASM_EXTABLE(19b,100b)
31278+ _ASM_EXTABLE(20b,100b)
31279+ _ASM_EXTABLE(21b,100b)
31280+ _ASM_EXTABLE(22b,100b)
31281+ _ASM_EXTABLE(23b,100b)
31282+ _ASM_EXTABLE(24b,100b)
31283+ _ASM_EXTABLE(25b,100b)
31284+ _ASM_EXTABLE(26b,100b)
31285+ _ASM_EXTABLE(27b,100b)
31286+ _ASM_EXTABLE(28b,100b)
31287+ _ASM_EXTABLE(29b,100b)
31288+ _ASM_EXTABLE(30b,100b)
31289+ _ASM_EXTABLE(31b,100b)
31290+ _ASM_EXTABLE(32b,100b)
31291+ _ASM_EXTABLE(33b,100b)
31292+ _ASM_EXTABLE(34b,100b)
31293+ _ASM_EXTABLE(35b,100b)
31294+ _ASM_EXTABLE(36b,100b)
31295+ _ASM_EXTABLE(37b,100b)
31296+ _ASM_EXTABLE(99b,101b)
31297+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31298+ : "1"(to), "2"(from), "0"(size)
31299+ : "eax", "edx", "memory");
31300+ return size;
31301+}
31302+
31303+static unsigned long
31304+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31305+{
31306+ int d0, d1;
31307+ __asm__ __volatile__(
31308+ " .align 2,0x90\n"
31309+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31310+ " cmpl $67, %0\n"
31311+ " jbe 3f\n"
31312+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31313+ " .align 2,0x90\n"
31314+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31315+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31316+ "5: movl %%eax, 0(%3)\n"
31317+ "6: movl %%edx, 4(%3)\n"
31318+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31319+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31320+ "9: movl %%eax, 8(%3)\n"
31321+ "10: movl %%edx, 12(%3)\n"
31322+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31323+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31324+ "13: movl %%eax, 16(%3)\n"
31325+ "14: movl %%edx, 20(%3)\n"
31326+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31327+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31328+ "17: movl %%eax, 24(%3)\n"
31329+ "18: movl %%edx, 28(%3)\n"
31330+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31331+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31332+ "21: movl %%eax, 32(%3)\n"
31333+ "22: movl %%edx, 36(%3)\n"
31334+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31335+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31336+ "25: movl %%eax, 40(%3)\n"
31337+ "26: movl %%edx, 44(%3)\n"
31338+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31339+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31340+ "29: movl %%eax, 48(%3)\n"
31341+ "30: movl %%edx, 52(%3)\n"
31342+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31343+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31344+ "33: movl %%eax, 56(%3)\n"
31345+ "34: movl %%edx, 60(%3)\n"
31346+ " addl $-64, %0\n"
31347+ " addl $64, %4\n"
31348+ " addl $64, %3\n"
31349+ " cmpl $63, %0\n"
31350+ " ja 1b\n"
31351+ "35: movl %0, %%eax\n"
31352+ " shrl $2, %0\n"
31353+ " andl $3, %%eax\n"
31354+ " cld\n"
31355+ "99: rep; "__copyuser_seg" movsl\n"
31356+ "36: movl %%eax, %0\n"
31357+ "37: rep; "__copyuser_seg" movsb\n"
31358+ "100:\n"
31359 ".section .fixup,\"ax\"\n"
31360 "101: lea 0(%%eax,%0,4),%0\n"
31361 " jmp 100b\n"
31362@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31363 int d0, d1;
31364 __asm__ __volatile__(
31365 " .align 2,0x90\n"
31366- "0: movl 32(%4), %%eax\n"
31367+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31368 " cmpl $67, %0\n"
31369 " jbe 2f\n"
31370- "1: movl 64(%4), %%eax\n"
31371+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31372 " .align 2,0x90\n"
31373- "2: movl 0(%4), %%eax\n"
31374- "21: movl 4(%4), %%edx\n"
31375+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31376+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31377 " movl %%eax, 0(%3)\n"
31378 " movl %%edx, 4(%3)\n"
31379- "3: movl 8(%4), %%eax\n"
31380- "31: movl 12(%4),%%edx\n"
31381+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31382+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31383 " movl %%eax, 8(%3)\n"
31384 " movl %%edx, 12(%3)\n"
31385- "4: movl 16(%4), %%eax\n"
31386- "41: movl 20(%4), %%edx\n"
31387+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31388+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31389 " movl %%eax, 16(%3)\n"
31390 " movl %%edx, 20(%3)\n"
31391- "10: movl 24(%4), %%eax\n"
31392- "51: movl 28(%4), %%edx\n"
31393+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31394+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31395 " movl %%eax, 24(%3)\n"
31396 " movl %%edx, 28(%3)\n"
31397- "11: movl 32(%4), %%eax\n"
31398- "61: movl 36(%4), %%edx\n"
31399+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31400+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31401 " movl %%eax, 32(%3)\n"
31402 " movl %%edx, 36(%3)\n"
31403- "12: movl 40(%4), %%eax\n"
31404- "71: movl 44(%4), %%edx\n"
31405+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31406+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31407 " movl %%eax, 40(%3)\n"
31408 " movl %%edx, 44(%3)\n"
31409- "13: movl 48(%4), %%eax\n"
31410- "81: movl 52(%4), %%edx\n"
31411+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31412+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31413 " movl %%eax, 48(%3)\n"
31414 " movl %%edx, 52(%3)\n"
31415- "14: movl 56(%4), %%eax\n"
31416- "91: movl 60(%4), %%edx\n"
31417+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31418+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31419 " movl %%eax, 56(%3)\n"
31420 " movl %%edx, 60(%3)\n"
31421 " addl $-64, %0\n"
31422@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31423 " shrl $2, %0\n"
31424 " andl $3, %%eax\n"
31425 " cld\n"
31426- "6: rep; movsl\n"
31427+ "6: rep; "__copyuser_seg" movsl\n"
31428 " movl %%eax,%0\n"
31429- "7: rep; movsb\n"
31430+ "7: rep; "__copyuser_seg" movsb\n"
31431 "8:\n"
31432 ".section .fixup,\"ax\"\n"
31433 "9: lea 0(%%eax,%0,4),%0\n"
31434@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31435
31436 __asm__ __volatile__(
31437 " .align 2,0x90\n"
31438- "0: movl 32(%4), %%eax\n"
31439+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31440 " cmpl $67, %0\n"
31441 " jbe 2f\n"
31442- "1: movl 64(%4), %%eax\n"
31443+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31444 " .align 2,0x90\n"
31445- "2: movl 0(%4), %%eax\n"
31446- "21: movl 4(%4), %%edx\n"
31447+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31448+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31449 " movnti %%eax, 0(%3)\n"
31450 " movnti %%edx, 4(%3)\n"
31451- "3: movl 8(%4), %%eax\n"
31452- "31: movl 12(%4),%%edx\n"
31453+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31454+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31455 " movnti %%eax, 8(%3)\n"
31456 " movnti %%edx, 12(%3)\n"
31457- "4: movl 16(%4), %%eax\n"
31458- "41: movl 20(%4), %%edx\n"
31459+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31460+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31461 " movnti %%eax, 16(%3)\n"
31462 " movnti %%edx, 20(%3)\n"
31463- "10: movl 24(%4), %%eax\n"
31464- "51: movl 28(%4), %%edx\n"
31465+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31466+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31467 " movnti %%eax, 24(%3)\n"
31468 " movnti %%edx, 28(%3)\n"
31469- "11: movl 32(%4), %%eax\n"
31470- "61: movl 36(%4), %%edx\n"
31471+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31472+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31473 " movnti %%eax, 32(%3)\n"
31474 " movnti %%edx, 36(%3)\n"
31475- "12: movl 40(%4), %%eax\n"
31476- "71: movl 44(%4), %%edx\n"
31477+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31478+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31479 " movnti %%eax, 40(%3)\n"
31480 " movnti %%edx, 44(%3)\n"
31481- "13: movl 48(%4), %%eax\n"
31482- "81: movl 52(%4), %%edx\n"
31483+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31484+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31485 " movnti %%eax, 48(%3)\n"
31486 " movnti %%edx, 52(%3)\n"
31487- "14: movl 56(%4), %%eax\n"
31488- "91: movl 60(%4), %%edx\n"
31489+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31490+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31491 " movnti %%eax, 56(%3)\n"
31492 " movnti %%edx, 60(%3)\n"
31493 " addl $-64, %0\n"
31494@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31495 " shrl $2, %0\n"
31496 " andl $3, %%eax\n"
31497 " cld\n"
31498- "6: rep; movsl\n"
31499+ "6: rep; "__copyuser_seg" movsl\n"
31500 " movl %%eax,%0\n"
31501- "7: rep; movsb\n"
31502+ "7: rep; "__copyuser_seg" movsb\n"
31503 "8:\n"
31504 ".section .fixup,\"ax\"\n"
31505 "9: lea 0(%%eax,%0,4),%0\n"
31506@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31507
31508 __asm__ __volatile__(
31509 " .align 2,0x90\n"
31510- "0: movl 32(%4), %%eax\n"
31511+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31512 " cmpl $67, %0\n"
31513 " jbe 2f\n"
31514- "1: movl 64(%4), %%eax\n"
31515+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31516 " .align 2,0x90\n"
31517- "2: movl 0(%4), %%eax\n"
31518- "21: movl 4(%4), %%edx\n"
31519+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31520+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31521 " movnti %%eax, 0(%3)\n"
31522 " movnti %%edx, 4(%3)\n"
31523- "3: movl 8(%4), %%eax\n"
31524- "31: movl 12(%4),%%edx\n"
31525+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31526+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31527 " movnti %%eax, 8(%3)\n"
31528 " movnti %%edx, 12(%3)\n"
31529- "4: movl 16(%4), %%eax\n"
31530- "41: movl 20(%4), %%edx\n"
31531+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31532+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31533 " movnti %%eax, 16(%3)\n"
31534 " movnti %%edx, 20(%3)\n"
31535- "10: movl 24(%4), %%eax\n"
31536- "51: movl 28(%4), %%edx\n"
31537+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31538+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31539 " movnti %%eax, 24(%3)\n"
31540 " movnti %%edx, 28(%3)\n"
31541- "11: movl 32(%4), %%eax\n"
31542- "61: movl 36(%4), %%edx\n"
31543+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31544+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31545 " movnti %%eax, 32(%3)\n"
31546 " movnti %%edx, 36(%3)\n"
31547- "12: movl 40(%4), %%eax\n"
31548- "71: movl 44(%4), %%edx\n"
31549+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31550+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31551 " movnti %%eax, 40(%3)\n"
31552 " movnti %%edx, 44(%3)\n"
31553- "13: movl 48(%4), %%eax\n"
31554- "81: movl 52(%4), %%edx\n"
31555+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31556+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31557 " movnti %%eax, 48(%3)\n"
31558 " movnti %%edx, 52(%3)\n"
31559- "14: movl 56(%4), %%eax\n"
31560- "91: movl 60(%4), %%edx\n"
31561+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31562+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31563 " movnti %%eax, 56(%3)\n"
31564 " movnti %%edx, 60(%3)\n"
31565 " addl $-64, %0\n"
31566@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31567 " shrl $2, %0\n"
31568 " andl $3, %%eax\n"
31569 " cld\n"
31570- "6: rep; movsl\n"
31571+ "6: rep; "__copyuser_seg" movsl\n"
31572 " movl %%eax,%0\n"
31573- "7: rep; movsb\n"
31574+ "7: rep; "__copyuser_seg" movsb\n"
31575 "8:\n"
31576 ".section .fixup,\"ax\"\n"
31577 "9: lea 0(%%eax,%0,4),%0\n"
31578@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31579 */
31580 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31581 unsigned long size);
31582-unsigned long __copy_user_intel(void __user *to, const void *from,
31583+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31584+ unsigned long size);
31585+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31586 unsigned long size);
31587 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31588 const void __user *from, unsigned long size);
31589 #endif /* CONFIG_X86_INTEL_USERCOPY */
31590
31591 /* Generic arbitrary sized copy. */
31592-#define __copy_user(to, from, size) \
31593+#define __copy_user(to, from, size, prefix, set, restore) \
31594 do { \
31595 int __d0, __d1, __d2; \
31596 __asm__ __volatile__( \
31597+ set \
31598 " cmp $7,%0\n" \
31599 " jbe 1f\n" \
31600 " movl %1,%0\n" \
31601 " negl %0\n" \
31602 " andl $7,%0\n" \
31603 " subl %0,%3\n" \
31604- "4: rep; movsb\n" \
31605+ "4: rep; "prefix"movsb\n" \
31606 " movl %3,%0\n" \
31607 " shrl $2,%0\n" \
31608 " andl $3,%3\n" \
31609 " .align 2,0x90\n" \
31610- "0: rep; movsl\n" \
31611+ "0: rep; "prefix"movsl\n" \
31612 " movl %3,%0\n" \
31613- "1: rep; movsb\n" \
31614+ "1: rep; "prefix"movsb\n" \
31615 "2:\n" \
31616+ restore \
31617 ".section .fixup,\"ax\"\n" \
31618 "5: addl %3,%0\n" \
31619 " jmp 2b\n" \
31620@@ -538,14 +650,14 @@ do { \
31621 " negl %0\n" \
31622 " andl $7,%0\n" \
31623 " subl %0,%3\n" \
31624- "4: rep; movsb\n" \
31625+ "4: rep; "__copyuser_seg"movsb\n" \
31626 " movl %3,%0\n" \
31627 " shrl $2,%0\n" \
31628 " andl $3,%3\n" \
31629 " .align 2,0x90\n" \
31630- "0: rep; movsl\n" \
31631+ "0: rep; "__copyuser_seg"movsl\n" \
31632 " movl %3,%0\n" \
31633- "1: rep; movsb\n" \
31634+ "1: rep; "__copyuser_seg"movsb\n" \
31635 "2:\n" \
31636 ".section .fixup,\"ax\"\n" \
31637 "5: addl %3,%0\n" \
31638@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31639 {
31640 stac();
31641 if (movsl_is_ok(to, from, n))
31642- __copy_user(to, from, n);
31643+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31644 else
31645- n = __copy_user_intel(to, from, n);
31646+ n = __generic_copy_to_user_intel(to, from, n);
31647 clac();
31648 return n;
31649 }
31650@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31651 {
31652 stac();
31653 if (movsl_is_ok(to, from, n))
31654- __copy_user(to, from, n);
31655+ __copy_user(to, from, n, __copyuser_seg, "", "");
31656 else
31657- n = __copy_user_intel((void __user *)to,
31658- (const void *)from, n);
31659+ n = __generic_copy_from_user_intel(to, from, n);
31660 clac();
31661 return n;
31662 }
31663@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31664 if (n > 64 && cpu_has_xmm2)
31665 n = __copy_user_intel_nocache(to, from, n);
31666 else
31667- __copy_user(to, from, n);
31668+ __copy_user(to, from, n, __copyuser_seg, "", "");
31669 #else
31670- __copy_user(to, from, n);
31671+ __copy_user(to, from, n, __copyuser_seg, "", "");
31672 #endif
31673 clac();
31674 return n;
31675 }
31676 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31677
31678-/**
31679- * copy_to_user: - Copy a block of data into user space.
31680- * @to: Destination address, in user space.
31681- * @from: Source address, in kernel space.
31682- * @n: Number of bytes to copy.
31683- *
31684- * Context: User context only. This function may sleep.
31685- *
31686- * Copy data from kernel space to user space.
31687- *
31688- * Returns number of bytes that could not be copied.
31689- * On success, this will be zero.
31690- */
31691-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31692+#ifdef CONFIG_PAX_MEMORY_UDEREF
31693+void __set_fs(mm_segment_t x)
31694 {
31695- if (access_ok(VERIFY_WRITE, to, n))
31696- n = __copy_to_user(to, from, n);
31697- return n;
31698+ switch (x.seg) {
31699+ case 0:
31700+ loadsegment(gs, 0);
31701+ break;
31702+ case TASK_SIZE_MAX:
31703+ loadsegment(gs, __USER_DS);
31704+ break;
31705+ case -1UL:
31706+ loadsegment(gs, __KERNEL_DS);
31707+ break;
31708+ default:
31709+ BUG();
31710+ }
31711 }
31712-EXPORT_SYMBOL(_copy_to_user);
31713+EXPORT_SYMBOL(__set_fs);
31714
31715-/**
31716- * copy_from_user: - Copy a block of data from user space.
31717- * @to: Destination address, in kernel space.
31718- * @from: Source address, in user space.
31719- * @n: Number of bytes to copy.
31720- *
31721- * Context: User context only. This function may sleep.
31722- *
31723- * Copy data from user space to kernel space.
31724- *
31725- * Returns number of bytes that could not be copied.
31726- * On success, this will be zero.
31727- *
31728- * If some data could not be copied, this function will pad the copied
31729- * data to the requested size using zero bytes.
31730- */
31731-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31732+void set_fs(mm_segment_t x)
31733 {
31734- if (access_ok(VERIFY_READ, from, n))
31735- n = __copy_from_user(to, from, n);
31736- else
31737- memset(to, 0, n);
31738- return n;
31739+ current_thread_info()->addr_limit = x;
31740+ __set_fs(x);
31741 }
31742-EXPORT_SYMBOL(_copy_from_user);
31743+EXPORT_SYMBOL(set_fs);
31744+#endif
31745diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31746index 0a42327..7a82465 100644
31747--- a/arch/x86/lib/usercopy_64.c
31748+++ b/arch/x86/lib/usercopy_64.c
31749@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31750 might_fault();
31751 /* no memory constraint because it doesn't change any memory gcc knows
31752 about */
31753+ pax_open_userland();
31754 stac();
31755 asm volatile(
31756 " testq %[size8],%[size8]\n"
31757@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31758 _ASM_EXTABLE(0b,3b)
31759 _ASM_EXTABLE(1b,2b)
31760 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31761- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31762+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31763 [zero] "r" (0UL), [eight] "r" (8UL));
31764 clac();
31765+ pax_close_userland();
31766 return size;
31767 }
31768 EXPORT_SYMBOL(__clear_user);
31769@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31770 }
31771 EXPORT_SYMBOL(clear_user);
31772
31773-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31774+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31775 {
31776- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31777- return copy_user_generic((__force void *)to, (__force void *)from, len);
31778- }
31779- return len;
31780+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31781+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31782+ return len;
31783 }
31784 EXPORT_SYMBOL(copy_in_user);
31785
31786@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31787 * it is not necessary to optimize tail handling.
31788 */
31789 __visible unsigned long
31790-copy_user_handle_tail(char *to, char *from, unsigned len)
31791+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31792 {
31793+ clac();
31794+ pax_close_userland();
31795 for (; len; --len, to++) {
31796 char c;
31797
31798@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31799 if (__put_user_nocheck(c, to, sizeof(char)))
31800 break;
31801 }
31802- clac();
31803
31804 /* If the destination is a kernel buffer, we always clear the end */
31805- if (!__addr_ok(to))
31806+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31807 memset(to, 0, len);
31808 return len;
31809 }
31810diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31811index c4cc740..60a7362 100644
31812--- a/arch/x86/mm/Makefile
31813+++ b/arch/x86/mm/Makefile
31814@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31815 obj-$(CONFIG_MEMTEST) += memtest.o
31816
31817 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31818+
31819+quote:="
31820+obj-$(CONFIG_X86_64) += uderef_64.o
31821+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31822diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31823index 903ec1e..c4166b2 100644
31824--- a/arch/x86/mm/extable.c
31825+++ b/arch/x86/mm/extable.c
31826@@ -6,12 +6,24 @@
31827 static inline unsigned long
31828 ex_insn_addr(const struct exception_table_entry *x)
31829 {
31830- return (unsigned long)&x->insn + x->insn;
31831+ unsigned long reloc = 0;
31832+
31833+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31834+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31835+#endif
31836+
31837+ return (unsigned long)&x->insn + x->insn + reloc;
31838 }
31839 static inline unsigned long
31840 ex_fixup_addr(const struct exception_table_entry *x)
31841 {
31842- return (unsigned long)&x->fixup + x->fixup;
31843+ unsigned long reloc = 0;
31844+
31845+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31846+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31847+#endif
31848+
31849+ return (unsigned long)&x->fixup + x->fixup + reloc;
31850 }
31851
31852 int fixup_exception(struct pt_regs *regs)
31853@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31854 unsigned long new_ip;
31855
31856 #ifdef CONFIG_PNPBIOS
31857- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31858+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31859 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31860 extern u32 pnp_bios_is_utter_crap;
31861 pnp_bios_is_utter_crap = 1;
31862@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31863 i += 4;
31864 p->fixup -= i;
31865 i += 4;
31866+
31867+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31868+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31869+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31870+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31871+#endif
31872+
31873 }
31874 }
31875
31876diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31877index ede025f..1ef909b 100644
31878--- a/arch/x86/mm/fault.c
31879+++ b/arch/x86/mm/fault.c
31880@@ -13,12 +13,19 @@
31881 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31882 #include <linux/prefetch.h> /* prefetchw */
31883 #include <linux/context_tracking.h> /* exception_enter(), ... */
31884+#include <linux/unistd.h>
31885+#include <linux/compiler.h>
31886
31887 #include <asm/traps.h> /* dotraplinkage, ... */
31888 #include <asm/pgalloc.h> /* pgd_*(), ... */
31889 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31890 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31891 #include <asm/vsyscall.h> /* emulate_vsyscall */
31892+#include <asm/tlbflush.h>
31893+
31894+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31895+#include <asm/stacktrace.h>
31896+#endif
31897
31898 #define CREATE_TRACE_POINTS
31899 #include <asm/trace/exceptions.h>
31900@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31901 int ret = 0;
31902
31903 /* kprobe_running() needs smp_processor_id() */
31904- if (kprobes_built_in() && !user_mode_vm(regs)) {
31905+ if (kprobes_built_in() && !user_mode(regs)) {
31906 preempt_disable();
31907 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31908 ret = 1;
31909@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31910 return !instr_lo || (instr_lo>>1) == 1;
31911 case 0x00:
31912 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31913- if (probe_kernel_address(instr, opcode))
31914+ if (user_mode(regs)) {
31915+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31916+ return 0;
31917+ } else if (probe_kernel_address(instr, opcode))
31918 return 0;
31919
31920 *prefetch = (instr_lo == 0xF) &&
31921@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31922 while (instr < max_instr) {
31923 unsigned char opcode;
31924
31925- if (probe_kernel_address(instr, opcode))
31926+ if (user_mode(regs)) {
31927+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31928+ break;
31929+ } else if (probe_kernel_address(instr, opcode))
31930 break;
31931
31932 instr++;
31933@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31934 force_sig_info(si_signo, &info, tsk);
31935 }
31936
31937+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31938+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31939+#endif
31940+
31941+#ifdef CONFIG_PAX_EMUTRAMP
31942+static int pax_handle_fetch_fault(struct pt_regs *regs);
31943+#endif
31944+
31945+#ifdef CONFIG_PAX_PAGEEXEC
31946+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31947+{
31948+ pgd_t *pgd;
31949+ pud_t *pud;
31950+ pmd_t *pmd;
31951+
31952+ pgd = pgd_offset(mm, address);
31953+ if (!pgd_present(*pgd))
31954+ return NULL;
31955+ pud = pud_offset(pgd, address);
31956+ if (!pud_present(*pud))
31957+ return NULL;
31958+ pmd = pmd_offset(pud, address);
31959+ if (!pmd_present(*pmd))
31960+ return NULL;
31961+ return pmd;
31962+}
31963+#endif
31964+
31965 DEFINE_SPINLOCK(pgd_lock);
31966 LIST_HEAD(pgd_list);
31967
31968@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31969 for (address = VMALLOC_START & PMD_MASK;
31970 address >= TASK_SIZE && address < FIXADDR_TOP;
31971 address += PMD_SIZE) {
31972+
31973+#ifdef CONFIG_PAX_PER_CPU_PGD
31974+ unsigned long cpu;
31975+#else
31976 struct page *page;
31977+#endif
31978
31979 spin_lock(&pgd_lock);
31980+
31981+#ifdef CONFIG_PAX_PER_CPU_PGD
31982+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31983+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31984+ pmd_t *ret;
31985+
31986+ ret = vmalloc_sync_one(pgd, address);
31987+ if (!ret)
31988+ break;
31989+ pgd = get_cpu_pgd(cpu, kernel);
31990+#else
31991 list_for_each_entry(page, &pgd_list, lru) {
31992+ pgd_t *pgd;
31993 spinlock_t *pgt_lock;
31994 pmd_t *ret;
31995
31996@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31997 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31998
31999 spin_lock(pgt_lock);
32000- ret = vmalloc_sync_one(page_address(page), address);
32001+ pgd = page_address(page);
32002+#endif
32003+
32004+ ret = vmalloc_sync_one(pgd, address);
32005+
32006+#ifndef CONFIG_PAX_PER_CPU_PGD
32007 spin_unlock(pgt_lock);
32008+#endif
32009
32010 if (!ret)
32011 break;
32012@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
32013 * an interrupt in the middle of a task switch..
32014 */
32015 pgd_paddr = read_cr3();
32016+
32017+#ifdef CONFIG_PAX_PER_CPU_PGD
32018+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
32019+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
32020+#endif
32021+
32022 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
32023 if (!pmd_k)
32024 return -1;
32025@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
32026 * happen within a race in page table update. In the later
32027 * case just flush:
32028 */
32029- pgd = pgd_offset(current->active_mm, address);
32030+
32031 pgd_ref = pgd_offset_k(address);
32032 if (pgd_none(*pgd_ref))
32033 return -1;
32034
32035+#ifdef CONFIG_PAX_PER_CPU_PGD
32036+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
32037+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
32038+ if (pgd_none(*pgd)) {
32039+ set_pgd(pgd, *pgd_ref);
32040+ arch_flush_lazy_mmu_mode();
32041+ } else {
32042+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
32043+ }
32044+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
32045+#else
32046+ pgd = pgd_offset(current->active_mm, address);
32047+#endif
32048+
32049 if (pgd_none(*pgd)) {
32050 set_pgd(pgd, *pgd_ref);
32051 arch_flush_lazy_mmu_mode();
32052@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
32053 static int is_errata100(struct pt_regs *regs, unsigned long address)
32054 {
32055 #ifdef CONFIG_X86_64
32056- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
32057+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
32058 return 1;
32059 #endif
32060 return 0;
32061@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
32062 }
32063
32064 static const char nx_warning[] = KERN_CRIT
32065-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
32066+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
32067 static const char smep_warning[] = KERN_CRIT
32068-"unable to execute userspace code (SMEP?) (uid: %d)\n";
32069+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
32070
32071 static void
32072 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32073@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32074 if (!oops_may_print())
32075 return;
32076
32077- if (error_code & PF_INSTR) {
32078+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
32079 unsigned int level;
32080 pgd_t *pgd;
32081 pte_t *pte;
32082@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
32083 pte = lookup_address_in_pgd(pgd, address, &level);
32084
32085 if (pte && pte_present(*pte) && !pte_exec(*pte))
32086- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
32087+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32088 if (pte && pte_present(*pte) && pte_exec(*pte) &&
32089 (pgd_flags(*pgd) & _PAGE_USER) &&
32090 (__read_cr4() & X86_CR4_SMEP))
32091- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
32092+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
32093 }
32094
32095+#ifdef CONFIG_PAX_KERNEXEC
32096+ if (init_mm.start_code <= address && address < init_mm.end_code) {
32097+ if (current->signal->curr_ip)
32098+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
32099+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
32100+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32101+ else
32102+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
32103+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
32104+ }
32105+#endif
32106+
32107 printk(KERN_ALERT "BUG: unable to handle kernel ");
32108 if (address < PAGE_SIZE)
32109 printk(KERN_CONT "NULL pointer dereference");
32110@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32111 return;
32112 }
32113 #endif
32114+
32115+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32116+ if (pax_is_fetch_fault(regs, error_code, address)) {
32117+
32118+#ifdef CONFIG_PAX_EMUTRAMP
32119+ switch (pax_handle_fetch_fault(regs)) {
32120+ case 2:
32121+ return;
32122+ }
32123+#endif
32124+
32125+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32126+ do_group_exit(SIGKILL);
32127+ }
32128+#endif
32129+
32130 /* Kernel addresses are always protection faults: */
32131 if (address >= TASK_SIZE)
32132 error_code |= PF_PROT;
32133@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32134 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32135 printk(KERN_ERR
32136 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32137- tsk->comm, tsk->pid, address);
32138+ tsk->comm, task_pid_nr(tsk), address);
32139 code = BUS_MCEERR_AR;
32140 }
32141 #endif
32142@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32143 return 1;
32144 }
32145
32146+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32147+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32148+{
32149+ pte_t *pte;
32150+ pmd_t *pmd;
32151+ spinlock_t *ptl;
32152+ unsigned char pte_mask;
32153+
32154+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32155+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32156+ return 0;
32157+
32158+ /* PaX: it's our fault, let's handle it if we can */
32159+
32160+ /* PaX: take a look at read faults before acquiring any locks */
32161+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32162+ /* instruction fetch attempt from a protected page in user mode */
32163+ up_read(&mm->mmap_sem);
32164+
32165+#ifdef CONFIG_PAX_EMUTRAMP
32166+ switch (pax_handle_fetch_fault(regs)) {
32167+ case 2:
32168+ return 1;
32169+ }
32170+#endif
32171+
32172+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32173+ do_group_exit(SIGKILL);
32174+ }
32175+
32176+ pmd = pax_get_pmd(mm, address);
32177+ if (unlikely(!pmd))
32178+ return 0;
32179+
32180+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32181+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32182+ pte_unmap_unlock(pte, ptl);
32183+ return 0;
32184+ }
32185+
32186+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32187+ /* write attempt to a protected page in user mode */
32188+ pte_unmap_unlock(pte, ptl);
32189+ return 0;
32190+ }
32191+
32192+#ifdef CONFIG_SMP
32193+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32194+#else
32195+ if (likely(address > get_limit(regs->cs)))
32196+#endif
32197+ {
32198+ set_pte(pte, pte_mkread(*pte));
32199+ __flush_tlb_one(address);
32200+ pte_unmap_unlock(pte, ptl);
32201+ up_read(&mm->mmap_sem);
32202+ return 1;
32203+ }
32204+
32205+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32206+
32207+ /*
32208+ * PaX: fill DTLB with user rights and retry
32209+ */
32210+ __asm__ __volatile__ (
32211+ "orb %2,(%1)\n"
32212+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32213+/*
32214+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32215+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32216+ * page fault when examined during a TLB load attempt. this is true not only
32217+ * for PTEs holding a non-present entry but also present entries that will
32218+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32219+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32220+ * for our target pages since their PTEs are simply not in the TLBs at all.
32221+
32222+ * the best thing in omitting it is that we gain around 15-20% speed in the
32223+ * fast path of the page fault handler and can get rid of tracing since we
32224+ * can no longer flush unintended entries.
32225+ */
32226+ "invlpg (%0)\n"
32227+#endif
32228+ __copyuser_seg"testb $0,(%0)\n"
32229+ "xorb %3,(%1)\n"
32230+ :
32231+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32232+ : "memory", "cc");
32233+ pte_unmap_unlock(pte, ptl);
32234+ up_read(&mm->mmap_sem);
32235+ return 1;
32236+}
32237+#endif
32238+
32239 /*
32240 * Handle a spurious fault caused by a stale TLB entry.
32241 *
32242@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32243 static inline int
32244 access_error(unsigned long error_code, struct vm_area_struct *vma)
32245 {
32246+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32247+ return 1;
32248+
32249 if (error_code & PF_WRITE) {
32250 /* write, present and write, not present: */
32251 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32252@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32253 if (error_code & PF_USER)
32254 return false;
32255
32256- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32257+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32258 return false;
32259
32260 return true;
32261@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32262 tsk = current;
32263 mm = tsk->mm;
32264
32265+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32266+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32267+ if (!search_exception_tables(regs->ip)) {
32268+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32269+ bad_area_nosemaphore(regs, error_code, address);
32270+ return;
32271+ }
32272+ if (address < pax_user_shadow_base) {
32273+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32274+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32275+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32276+ } else
32277+ address -= pax_user_shadow_base;
32278+ }
32279+#endif
32280+
32281 /*
32282 * Detect and handle instructions that would cause a page fault for
32283 * both a tracked kernel page and a userspace page.
32284@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32285 * User-mode registers count as a user access even for any
32286 * potential system fault or CPU buglet:
32287 */
32288- if (user_mode_vm(regs)) {
32289+ if (user_mode(regs)) {
32290 local_irq_enable();
32291 error_code |= PF_USER;
32292 flags |= FAULT_FLAG_USER;
32293@@ -1187,6 +1411,11 @@ retry:
32294 might_sleep();
32295 }
32296
32297+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32298+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32299+ return;
32300+#endif
32301+
32302 vma = find_vma(mm, address);
32303 if (unlikely(!vma)) {
32304 bad_area(regs, error_code, address);
32305@@ -1198,18 +1427,24 @@ retry:
32306 bad_area(regs, error_code, address);
32307 return;
32308 }
32309- if (error_code & PF_USER) {
32310- /*
32311- * Accessing the stack below %sp is always a bug.
32312- * The large cushion allows instructions like enter
32313- * and pusha to work. ("enter $65535, $31" pushes
32314- * 32 pointers and then decrements %sp by 65535.)
32315- */
32316- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32317- bad_area(regs, error_code, address);
32318- return;
32319- }
32320+ /*
32321+ * Accessing the stack below %sp is always a bug.
32322+ * The large cushion allows instructions like enter
32323+ * and pusha to work. ("enter $65535, $31" pushes
32324+ * 32 pointers and then decrements %sp by 65535.)
32325+ */
32326+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32327+ bad_area(regs, error_code, address);
32328+ return;
32329 }
32330+
32331+#ifdef CONFIG_PAX_SEGMEXEC
32332+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32333+ bad_area(regs, error_code, address);
32334+ return;
32335+ }
32336+#endif
32337+
32338 if (unlikely(expand_stack(vma, address))) {
32339 bad_area(regs, error_code, address);
32340 return;
32341@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32342 }
32343 NOKPROBE_SYMBOL(trace_do_page_fault);
32344 #endif /* CONFIG_TRACING */
32345+
32346+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32347+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32348+{
32349+ struct mm_struct *mm = current->mm;
32350+ unsigned long ip = regs->ip;
32351+
32352+ if (v8086_mode(regs))
32353+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32354+
32355+#ifdef CONFIG_PAX_PAGEEXEC
32356+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32357+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32358+ return true;
32359+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32360+ return true;
32361+ return false;
32362+ }
32363+#endif
32364+
32365+#ifdef CONFIG_PAX_SEGMEXEC
32366+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32367+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32368+ return true;
32369+ return false;
32370+ }
32371+#endif
32372+
32373+ return false;
32374+}
32375+#endif
32376+
32377+#ifdef CONFIG_PAX_EMUTRAMP
32378+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32379+{
32380+ int err;
32381+
32382+ do { /* PaX: libffi trampoline emulation */
32383+ unsigned char mov, jmp;
32384+ unsigned int addr1, addr2;
32385+
32386+#ifdef CONFIG_X86_64
32387+ if ((regs->ip + 9) >> 32)
32388+ break;
32389+#endif
32390+
32391+ err = get_user(mov, (unsigned char __user *)regs->ip);
32392+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32393+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32394+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32395+
32396+ if (err)
32397+ break;
32398+
32399+ if (mov == 0xB8 && jmp == 0xE9) {
32400+ regs->ax = addr1;
32401+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32402+ return 2;
32403+ }
32404+ } while (0);
32405+
32406+ do { /* PaX: gcc trampoline emulation #1 */
32407+ unsigned char mov1, mov2;
32408+ unsigned short jmp;
32409+ unsigned int addr1, addr2;
32410+
32411+#ifdef CONFIG_X86_64
32412+ if ((regs->ip + 11) >> 32)
32413+ break;
32414+#endif
32415+
32416+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32417+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32418+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32419+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32420+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32421+
32422+ if (err)
32423+ break;
32424+
32425+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32426+ regs->cx = addr1;
32427+ regs->ax = addr2;
32428+ regs->ip = addr2;
32429+ return 2;
32430+ }
32431+ } while (0);
32432+
32433+ do { /* PaX: gcc trampoline emulation #2 */
32434+ unsigned char mov, jmp;
32435+ unsigned int addr1, addr2;
32436+
32437+#ifdef CONFIG_X86_64
32438+ if ((regs->ip + 9) >> 32)
32439+ break;
32440+#endif
32441+
32442+ err = get_user(mov, (unsigned char __user *)regs->ip);
32443+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32444+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32445+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32446+
32447+ if (err)
32448+ break;
32449+
32450+ if (mov == 0xB9 && jmp == 0xE9) {
32451+ regs->cx = addr1;
32452+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32453+ return 2;
32454+ }
32455+ } while (0);
32456+
32457+ return 1; /* PaX in action */
32458+}
32459+
32460+#ifdef CONFIG_X86_64
32461+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32462+{
32463+ int err;
32464+
32465+ do { /* PaX: libffi trampoline emulation */
32466+ unsigned short mov1, mov2, jmp1;
32467+ unsigned char stcclc, jmp2;
32468+ unsigned long addr1, addr2;
32469+
32470+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32471+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32472+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32473+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32474+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32475+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32476+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32477+
32478+ if (err)
32479+ break;
32480+
32481+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32482+ regs->r11 = addr1;
32483+ regs->r10 = addr2;
32484+ if (stcclc == 0xF8)
32485+ regs->flags &= ~X86_EFLAGS_CF;
32486+ else
32487+ regs->flags |= X86_EFLAGS_CF;
32488+ regs->ip = addr1;
32489+ return 2;
32490+ }
32491+ } while (0);
32492+
32493+ do { /* PaX: gcc trampoline emulation #1 */
32494+ unsigned short mov1, mov2, jmp1;
32495+ unsigned char jmp2;
32496+ unsigned int addr1;
32497+ unsigned long addr2;
32498+
32499+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32500+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32501+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32502+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32503+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32504+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32505+
32506+ if (err)
32507+ break;
32508+
32509+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32510+ regs->r11 = addr1;
32511+ regs->r10 = addr2;
32512+ regs->ip = addr1;
32513+ return 2;
32514+ }
32515+ } while (0);
32516+
32517+ do { /* PaX: gcc trampoline emulation #2 */
32518+ unsigned short mov1, mov2, jmp1;
32519+ unsigned char jmp2;
32520+ unsigned long addr1, addr2;
32521+
32522+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32523+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32524+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32525+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32526+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32527+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32528+
32529+ if (err)
32530+ break;
32531+
32532+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32533+ regs->r11 = addr1;
32534+ regs->r10 = addr2;
32535+ regs->ip = addr1;
32536+ return 2;
32537+ }
32538+ } while (0);
32539+
32540+ return 1; /* PaX in action */
32541+}
32542+#endif
32543+
32544+/*
32545+ * PaX: decide what to do with offenders (regs->ip = fault address)
32546+ *
32547+ * returns 1 when task should be killed
32548+ * 2 when gcc trampoline was detected
32549+ */
32550+static int pax_handle_fetch_fault(struct pt_regs *regs)
32551+{
32552+ if (v8086_mode(regs))
32553+ return 1;
32554+
32555+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32556+ return 1;
32557+
32558+#ifdef CONFIG_X86_32
32559+ return pax_handle_fetch_fault_32(regs);
32560+#else
32561+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32562+ return pax_handle_fetch_fault_32(regs);
32563+ else
32564+ return pax_handle_fetch_fault_64(regs);
32565+#endif
32566+}
32567+#endif
32568+
32569+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32570+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32571+{
32572+ long i;
32573+
32574+ printk(KERN_ERR "PAX: bytes at PC: ");
32575+ for (i = 0; i < 20; i++) {
32576+ unsigned char c;
32577+ if (get_user(c, (unsigned char __force_user *)pc+i))
32578+ printk(KERN_CONT "?? ");
32579+ else
32580+ printk(KERN_CONT "%02x ", c);
32581+ }
32582+ printk("\n");
32583+
32584+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32585+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32586+ unsigned long c;
32587+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32588+#ifdef CONFIG_X86_32
32589+ printk(KERN_CONT "???????? ");
32590+#else
32591+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32592+ printk(KERN_CONT "???????? ???????? ");
32593+ else
32594+ printk(KERN_CONT "???????????????? ");
32595+#endif
32596+ } else {
32597+#ifdef CONFIG_X86_64
32598+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32599+ printk(KERN_CONT "%08x ", (unsigned int)c);
32600+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32601+ } else
32602+#endif
32603+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32604+ }
32605+ }
32606+ printk("\n");
32607+}
32608+#endif
32609+
32610+/**
32611+ * probe_kernel_write(): safely attempt to write to a location
32612+ * @dst: address to write to
32613+ * @src: pointer to the data that shall be written
32614+ * @size: size of the data chunk
32615+ *
32616+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32617+ * happens, handle that and return -EFAULT.
32618+ */
32619+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32620+{
32621+ long ret;
32622+ mm_segment_t old_fs = get_fs();
32623+
32624+ set_fs(KERNEL_DS);
32625+ pagefault_disable();
32626+ pax_open_kernel();
32627+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32628+ pax_close_kernel();
32629+ pagefault_enable();
32630+ set_fs(old_fs);
32631+
32632+ return ret ? -EFAULT : 0;
32633+}
32634diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32635index 81bf3d2..7ef25c2 100644
32636--- a/arch/x86/mm/gup.c
32637+++ b/arch/x86/mm/gup.c
32638@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32639 addr = start;
32640 len = (unsigned long) nr_pages << PAGE_SHIFT;
32641 end = start + len;
32642- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32643+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32644 (void __user *)start, len)))
32645 return 0;
32646
32647@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32648 goto slow_irqon;
32649 #endif
32650
32651+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32652+ (void __user *)start, len)))
32653+ return 0;
32654+
32655 /*
32656 * XXX: batch / limit 'nr', to avoid large irq off latency
32657 * needs some instrumenting to determine the common sizes used by
32658diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32659index 4500142..53a363c 100644
32660--- a/arch/x86/mm/highmem_32.c
32661+++ b/arch/x86/mm/highmem_32.c
32662@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32663 idx = type + KM_TYPE_NR*smp_processor_id();
32664 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32665 BUG_ON(!pte_none(*(kmap_pte-idx)));
32666+
32667+ pax_open_kernel();
32668 set_pte(kmap_pte-idx, mk_pte(page, prot));
32669+ pax_close_kernel();
32670+
32671 arch_flush_lazy_mmu_mode();
32672
32673 return (void *)vaddr;
32674diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32675index 42982b2..7168fc3 100644
32676--- a/arch/x86/mm/hugetlbpage.c
32677+++ b/arch/x86/mm/hugetlbpage.c
32678@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32679 #ifdef CONFIG_HUGETLB_PAGE
32680 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32681 unsigned long addr, unsigned long len,
32682- unsigned long pgoff, unsigned long flags)
32683+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32684 {
32685 struct hstate *h = hstate_file(file);
32686 struct vm_unmapped_area_info info;
32687-
32688+
32689 info.flags = 0;
32690 info.length = len;
32691 info.low_limit = current->mm->mmap_legacy_base;
32692 info.high_limit = TASK_SIZE;
32693 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32694 info.align_offset = 0;
32695+ info.threadstack_offset = offset;
32696 return vm_unmapped_area(&info);
32697 }
32698
32699 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32700 unsigned long addr0, unsigned long len,
32701- unsigned long pgoff, unsigned long flags)
32702+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32703 {
32704 struct hstate *h = hstate_file(file);
32705 struct vm_unmapped_area_info info;
32706@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32707 info.high_limit = current->mm->mmap_base;
32708 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32709 info.align_offset = 0;
32710+ info.threadstack_offset = offset;
32711 addr = vm_unmapped_area(&info);
32712
32713 /*
32714@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32715 VM_BUG_ON(addr != -ENOMEM);
32716 info.flags = 0;
32717 info.low_limit = TASK_UNMAPPED_BASE;
32718+
32719+#ifdef CONFIG_PAX_RANDMMAP
32720+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32721+ info.low_limit += current->mm->delta_mmap;
32722+#endif
32723+
32724 info.high_limit = TASK_SIZE;
32725 addr = vm_unmapped_area(&info);
32726 }
32727@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32728 struct hstate *h = hstate_file(file);
32729 struct mm_struct *mm = current->mm;
32730 struct vm_area_struct *vma;
32731+ unsigned long pax_task_size = TASK_SIZE;
32732+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32733
32734 if (len & ~huge_page_mask(h))
32735 return -EINVAL;
32736- if (len > TASK_SIZE)
32737+
32738+#ifdef CONFIG_PAX_SEGMEXEC
32739+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32740+ pax_task_size = SEGMEXEC_TASK_SIZE;
32741+#endif
32742+
32743+ pax_task_size -= PAGE_SIZE;
32744+
32745+ if (len > pax_task_size)
32746 return -ENOMEM;
32747
32748 if (flags & MAP_FIXED) {
32749@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32750 return addr;
32751 }
32752
32753+#ifdef CONFIG_PAX_RANDMMAP
32754+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32755+#endif
32756+
32757 if (addr) {
32758 addr = ALIGN(addr, huge_page_size(h));
32759 vma = find_vma(mm, addr);
32760- if (TASK_SIZE - len >= addr &&
32761- (!vma || addr + len <= vma->vm_start))
32762+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32763 return addr;
32764 }
32765 if (mm->get_unmapped_area == arch_get_unmapped_area)
32766 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32767- pgoff, flags);
32768+ pgoff, flags, offset);
32769 else
32770 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32771- pgoff, flags);
32772+ pgoff, flags, offset);
32773 }
32774 #endif /* CONFIG_HUGETLB_PAGE */
32775
32776diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32777index a110efc..a31a18f 100644
32778--- a/arch/x86/mm/init.c
32779+++ b/arch/x86/mm/init.c
32780@@ -4,6 +4,7 @@
32781 #include <linux/swap.h>
32782 #include <linux/memblock.h>
32783 #include <linux/bootmem.h> /* for max_low_pfn */
32784+#include <linux/tboot.h>
32785
32786 #include <asm/cacheflush.h>
32787 #include <asm/e820.h>
32788@@ -17,6 +18,8 @@
32789 #include <asm/proto.h>
32790 #include <asm/dma.h> /* for MAX_DMA_PFN */
32791 #include <asm/microcode.h>
32792+#include <asm/desc.h>
32793+#include <asm/bios_ebda.h>
32794
32795 /*
32796 * We need to define the tracepoints somewhere, and tlb.c
32797@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32798 early_ioremap_page_table_range_init();
32799 #endif
32800
32801+#ifdef CONFIG_PAX_PER_CPU_PGD
32802+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32803+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32804+ KERNEL_PGD_PTRS);
32805+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32806+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32807+ KERNEL_PGD_PTRS);
32808+ load_cr3(get_cpu_pgd(0, kernel));
32809+#else
32810 load_cr3(swapper_pg_dir);
32811+#endif
32812+
32813 __flush_tlb_all();
32814
32815 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32816@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32817 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32818 * mmio resources as well as potential bios/acpi data regions.
32819 */
32820+
32821+#ifdef CONFIG_GRKERNSEC_KMEM
32822+static unsigned int ebda_start __read_only;
32823+static unsigned int ebda_end __read_only;
32824+#endif
32825+
32826 int devmem_is_allowed(unsigned long pagenr)
32827 {
32828- if (pagenr < 256)
32829+#ifdef CONFIG_GRKERNSEC_KMEM
32830+ /* allow BDA */
32831+ if (!pagenr)
32832 return 1;
32833+ /* allow EBDA */
32834+ if (pagenr >= ebda_start && pagenr < ebda_end)
32835+ return 1;
32836+ /* if tboot is in use, allow access to its hardcoded serial log range */
32837+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32838+ return 1;
32839+#else
32840+ if (!pagenr)
32841+ return 1;
32842+#ifdef CONFIG_VM86
32843+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32844+ return 1;
32845+#endif
32846+#endif
32847+
32848+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32849+ return 1;
32850+#ifdef CONFIG_GRKERNSEC_KMEM
32851+ /* throw out everything else below 1MB */
32852+ if (pagenr <= 256)
32853+ return 0;
32854+#endif
32855 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32856 return 0;
32857 if (!page_is_ram(pagenr))
32858@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32859 #endif
32860 }
32861
32862+#ifdef CONFIG_GRKERNSEC_KMEM
32863+static inline void gr_init_ebda(void)
32864+{
32865+ unsigned int ebda_addr;
32866+ unsigned int ebda_size = 0;
32867+
32868+ ebda_addr = get_bios_ebda();
32869+ if (ebda_addr) {
32870+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32871+ ebda_size <<= 10;
32872+ }
32873+ if (ebda_addr && ebda_size) {
32874+ ebda_start = ebda_addr >> PAGE_SHIFT;
32875+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32876+ } else {
32877+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32878+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32879+ }
32880+}
32881+#else
32882+static inline void gr_init_ebda(void) { }
32883+#endif
32884+
32885 void free_initmem(void)
32886 {
32887+#ifdef CONFIG_PAX_KERNEXEC
32888+#ifdef CONFIG_X86_32
32889+ /* PaX: limit KERNEL_CS to actual size */
32890+ unsigned long addr, limit;
32891+ struct desc_struct d;
32892+ int cpu;
32893+#else
32894+ pgd_t *pgd;
32895+ pud_t *pud;
32896+ pmd_t *pmd;
32897+ unsigned long addr, end;
32898+#endif
32899+#endif
32900+
32901+ gr_init_ebda();
32902+
32903+#ifdef CONFIG_PAX_KERNEXEC
32904+#ifdef CONFIG_X86_32
32905+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32906+ limit = (limit - 1UL) >> PAGE_SHIFT;
32907+
32908+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32909+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32910+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32911+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32912+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32913+ }
32914+
32915+ /* PaX: make KERNEL_CS read-only */
32916+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32917+ if (!paravirt_enabled())
32918+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32919+/*
32920+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32921+ pgd = pgd_offset_k(addr);
32922+ pud = pud_offset(pgd, addr);
32923+ pmd = pmd_offset(pud, addr);
32924+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32925+ }
32926+*/
32927+#ifdef CONFIG_X86_PAE
32928+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32929+/*
32930+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32931+ pgd = pgd_offset_k(addr);
32932+ pud = pud_offset(pgd, addr);
32933+ pmd = pmd_offset(pud, addr);
32934+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32935+ }
32936+*/
32937+#endif
32938+
32939+#ifdef CONFIG_MODULES
32940+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32941+#endif
32942+
32943+#else
32944+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32945+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32946+ pgd = pgd_offset_k(addr);
32947+ pud = pud_offset(pgd, addr);
32948+ pmd = pmd_offset(pud, addr);
32949+ if (!pmd_present(*pmd))
32950+ continue;
32951+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32952+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32953+ else
32954+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32955+ }
32956+
32957+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32958+ end = addr + KERNEL_IMAGE_SIZE;
32959+ for (; addr < end; addr += PMD_SIZE) {
32960+ pgd = pgd_offset_k(addr);
32961+ pud = pud_offset(pgd, addr);
32962+ pmd = pmd_offset(pud, addr);
32963+ if (!pmd_present(*pmd))
32964+ continue;
32965+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32966+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32967+ }
32968+#endif
32969+
32970+ flush_tlb_all();
32971+#endif
32972+
32973 free_init_pages("unused kernel",
32974 (unsigned long)(&__init_begin),
32975 (unsigned long)(&__init_end));
32976diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32977index c8140e1..59257fc 100644
32978--- a/arch/x86/mm/init_32.c
32979+++ b/arch/x86/mm/init_32.c
32980@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32981 bool __read_mostly __vmalloc_start_set = false;
32982
32983 /*
32984- * Creates a middle page table and puts a pointer to it in the
32985- * given global directory entry. This only returns the gd entry
32986- * in non-PAE compilation mode, since the middle layer is folded.
32987- */
32988-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32989-{
32990- pud_t *pud;
32991- pmd_t *pmd_table;
32992-
32993-#ifdef CONFIG_X86_PAE
32994- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32995- pmd_table = (pmd_t *)alloc_low_page();
32996- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32997- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32998- pud = pud_offset(pgd, 0);
32999- BUG_ON(pmd_table != pmd_offset(pud, 0));
33000-
33001- return pmd_table;
33002- }
33003-#endif
33004- pud = pud_offset(pgd, 0);
33005- pmd_table = pmd_offset(pud, 0);
33006-
33007- return pmd_table;
33008-}
33009-
33010-/*
33011 * Create a page table and place a pointer to it in a middle page
33012 * directory entry:
33013 */
33014@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
33015 pte_t *page_table = (pte_t *)alloc_low_page();
33016
33017 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
33018+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
33019+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
33020+#else
33021 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
33022+#endif
33023 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
33024 }
33025
33026 return pte_offset_kernel(pmd, 0);
33027 }
33028
33029+static pmd_t * __init one_md_table_init(pgd_t *pgd)
33030+{
33031+ pud_t *pud;
33032+ pmd_t *pmd_table;
33033+
33034+ pud = pud_offset(pgd, 0);
33035+ pmd_table = pmd_offset(pud, 0);
33036+
33037+ return pmd_table;
33038+}
33039+
33040 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
33041 {
33042 int pgd_idx = pgd_index(vaddr);
33043@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33044 int pgd_idx, pmd_idx;
33045 unsigned long vaddr;
33046 pgd_t *pgd;
33047+ pud_t *pud;
33048 pmd_t *pmd;
33049 pte_t *pte = NULL;
33050 unsigned long count = page_table_range_init_count(start, end);
33051@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33052 pgd = pgd_base + pgd_idx;
33053
33054 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
33055- pmd = one_md_table_init(pgd);
33056- pmd = pmd + pmd_index(vaddr);
33057+ pud = pud_offset(pgd, vaddr);
33058+ pmd = pmd_offset(pud, vaddr);
33059+
33060+#ifdef CONFIG_X86_PAE
33061+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33062+#endif
33063+
33064 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
33065 pmd++, pmd_idx++) {
33066 pte = page_table_kmap_check(one_page_table_init(pmd),
33067@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
33068 }
33069 }
33070
33071-static inline int is_kernel_text(unsigned long addr)
33072+static inline int is_kernel_text(unsigned long start, unsigned long end)
33073 {
33074- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
33075- return 1;
33076- return 0;
33077+ if ((start >= ktla_ktva((unsigned long)_etext) ||
33078+ end <= ktla_ktva((unsigned long)_stext)) &&
33079+ (start >= ktla_ktva((unsigned long)_einittext) ||
33080+ end <= ktla_ktva((unsigned long)_sinittext)) &&
33081+
33082+#ifdef CONFIG_ACPI_SLEEP
33083+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
33084+#endif
33085+
33086+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
33087+ return 0;
33088+ return 1;
33089 }
33090
33091 /*
33092@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
33093 unsigned long last_map_addr = end;
33094 unsigned long start_pfn, end_pfn;
33095 pgd_t *pgd_base = swapper_pg_dir;
33096- int pgd_idx, pmd_idx, pte_ofs;
33097+ unsigned int pgd_idx, pmd_idx, pte_ofs;
33098 unsigned long pfn;
33099 pgd_t *pgd;
33100+ pud_t *pud;
33101 pmd_t *pmd;
33102 pte_t *pte;
33103 unsigned pages_2m, pages_4k;
33104@@ -291,8 +295,13 @@ repeat:
33105 pfn = start_pfn;
33106 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33107 pgd = pgd_base + pgd_idx;
33108- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
33109- pmd = one_md_table_init(pgd);
33110+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33111+ pud = pud_offset(pgd, 0);
33112+ pmd = pmd_offset(pud, 0);
33113+
33114+#ifdef CONFIG_X86_PAE
33115+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33116+#endif
33117
33118 if (pfn >= end_pfn)
33119 continue;
33120@@ -304,14 +313,13 @@ repeat:
33121 #endif
33122 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33123 pmd++, pmd_idx++) {
33124- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33125+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33126
33127 /*
33128 * Map with big pages if possible, otherwise
33129 * create normal page tables:
33130 */
33131 if (use_pse) {
33132- unsigned int addr2;
33133 pgprot_t prot = PAGE_KERNEL_LARGE;
33134 /*
33135 * first pass will use the same initial
33136@@ -322,11 +330,7 @@ repeat:
33137 _PAGE_PSE);
33138
33139 pfn &= PMD_MASK >> PAGE_SHIFT;
33140- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33141- PAGE_OFFSET + PAGE_SIZE-1;
33142-
33143- if (is_kernel_text(addr) ||
33144- is_kernel_text(addr2))
33145+ if (is_kernel_text(address, address + PMD_SIZE))
33146 prot = PAGE_KERNEL_LARGE_EXEC;
33147
33148 pages_2m++;
33149@@ -343,7 +347,7 @@ repeat:
33150 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33151 pte += pte_ofs;
33152 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33153- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33154+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33155 pgprot_t prot = PAGE_KERNEL;
33156 /*
33157 * first pass will use the same initial
33158@@ -351,7 +355,7 @@ repeat:
33159 */
33160 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33161
33162- if (is_kernel_text(addr))
33163+ if (is_kernel_text(address, address + PAGE_SIZE))
33164 prot = PAGE_KERNEL_EXEC;
33165
33166 pages_4k++;
33167@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33168
33169 pud = pud_offset(pgd, va);
33170 pmd = pmd_offset(pud, va);
33171- if (!pmd_present(*pmd))
33172+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33173 break;
33174
33175 /* should not be large page here */
33176@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33177
33178 static void __init pagetable_init(void)
33179 {
33180- pgd_t *pgd_base = swapper_pg_dir;
33181-
33182- permanent_kmaps_init(pgd_base);
33183+ permanent_kmaps_init(swapper_pg_dir);
33184 }
33185
33186-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33187+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33188 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33189
33190 /* user-defined highmem size */
33191@@ -787,10 +789,10 @@ void __init mem_init(void)
33192 ((unsigned long)&__init_end -
33193 (unsigned long)&__init_begin) >> 10,
33194
33195- (unsigned long)&_etext, (unsigned long)&_edata,
33196- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33197+ (unsigned long)&_sdata, (unsigned long)&_edata,
33198+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33199
33200- (unsigned long)&_text, (unsigned long)&_etext,
33201+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33202 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33203
33204 /*
33205@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33206 if (!kernel_set_to_readonly)
33207 return;
33208
33209+ start = ktla_ktva(start);
33210 pr_debug("Set kernel text: %lx - %lx for read write\n",
33211 start, start+size);
33212
33213@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33214 if (!kernel_set_to_readonly)
33215 return;
33216
33217+ start = ktla_ktva(start);
33218 pr_debug("Set kernel text: %lx - %lx for read only\n",
33219 start, start+size);
33220
33221@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33222 unsigned long start = PFN_ALIGN(_text);
33223 unsigned long size = PFN_ALIGN(_etext) - start;
33224
33225+ start = ktla_ktva(start);
33226 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33227 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33228 size >> 10);
33229diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33230index 30eb05a..ae671ac 100644
33231--- a/arch/x86/mm/init_64.c
33232+++ b/arch/x86/mm/init_64.c
33233@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33234 * around without checking the pgd every time.
33235 */
33236
33237-pteval_t __supported_pte_mask __read_mostly = ~0;
33238+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33239 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33240
33241 int force_personality32;
33242@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33243
33244 for (address = start; address <= end; address += PGDIR_SIZE) {
33245 const pgd_t *pgd_ref = pgd_offset_k(address);
33246+
33247+#ifdef CONFIG_PAX_PER_CPU_PGD
33248+ unsigned long cpu;
33249+#else
33250 struct page *page;
33251+#endif
33252
33253 /*
33254 * When it is called after memory hot remove, pgd_none()
33255@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33256 continue;
33257
33258 spin_lock(&pgd_lock);
33259+
33260+#ifdef CONFIG_PAX_PER_CPU_PGD
33261+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33262+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33263+
33264+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33265+ BUG_ON(pgd_page_vaddr(*pgd)
33266+ != pgd_page_vaddr(*pgd_ref));
33267+
33268+ if (removed) {
33269+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33270+ pgd_clear(pgd);
33271+ } else {
33272+ if (pgd_none(*pgd))
33273+ set_pgd(pgd, *pgd_ref);
33274+ }
33275+
33276+ pgd = pgd_offset_cpu(cpu, kernel, address);
33277+#else
33278 list_for_each_entry(page, &pgd_list, lru) {
33279 pgd_t *pgd;
33280 spinlock_t *pgt_lock;
33281@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33282 /* the pgt_lock only for Xen */
33283 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33284 spin_lock(pgt_lock);
33285+#endif
33286
33287 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33288 BUG_ON(pgd_page_vaddr(*pgd)
33289@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33290 set_pgd(pgd, *pgd_ref);
33291 }
33292
33293+#ifndef CONFIG_PAX_PER_CPU_PGD
33294 spin_unlock(pgt_lock);
33295+#endif
33296+
33297 }
33298 spin_unlock(&pgd_lock);
33299 }
33300@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33301 {
33302 if (pgd_none(*pgd)) {
33303 pud_t *pud = (pud_t *)spp_getpage();
33304- pgd_populate(&init_mm, pgd, pud);
33305+ pgd_populate_kernel(&init_mm, pgd, pud);
33306 if (pud != pud_offset(pgd, 0))
33307 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33308 pud, pud_offset(pgd, 0));
33309@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33310 {
33311 if (pud_none(*pud)) {
33312 pmd_t *pmd = (pmd_t *) spp_getpage();
33313- pud_populate(&init_mm, pud, pmd);
33314+ pud_populate_kernel(&init_mm, pud, pmd);
33315 if (pmd != pmd_offset(pud, 0))
33316 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33317 pmd, pmd_offset(pud, 0));
33318@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33319 pmd = fill_pmd(pud, vaddr);
33320 pte = fill_pte(pmd, vaddr);
33321
33322+ pax_open_kernel();
33323 set_pte(pte, new_pte);
33324+ pax_close_kernel();
33325
33326 /*
33327 * It's enough to flush this one mapping.
33328@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33329 pgd = pgd_offset_k((unsigned long)__va(phys));
33330 if (pgd_none(*pgd)) {
33331 pud = (pud_t *) spp_getpage();
33332- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33333- _PAGE_USER));
33334+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33335 }
33336 pud = pud_offset(pgd, (unsigned long)__va(phys));
33337 if (pud_none(*pud)) {
33338 pmd = (pmd_t *) spp_getpage();
33339- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33340- _PAGE_USER));
33341+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33342 }
33343 pmd = pmd_offset(pud, phys);
33344 BUG_ON(!pmd_none(*pmd));
33345@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33346 prot);
33347
33348 spin_lock(&init_mm.page_table_lock);
33349- pud_populate(&init_mm, pud, pmd);
33350+ pud_populate_kernel(&init_mm, pud, pmd);
33351 spin_unlock(&init_mm.page_table_lock);
33352 }
33353 __flush_tlb_all();
33354@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33355 page_size_mask);
33356
33357 spin_lock(&init_mm.page_table_lock);
33358- pgd_populate(&init_mm, pgd, pud);
33359+ pgd_populate_kernel(&init_mm, pgd, pud);
33360 spin_unlock(&init_mm.page_table_lock);
33361 pgd_changed = true;
33362 }
33363diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33364index 9ca35fc..4b2b7b7 100644
33365--- a/arch/x86/mm/iomap_32.c
33366+++ b/arch/x86/mm/iomap_32.c
33367@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33368 type = kmap_atomic_idx_push();
33369 idx = type + KM_TYPE_NR * smp_processor_id();
33370 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33371+
33372+ pax_open_kernel();
33373 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33374+ pax_close_kernel();
33375+
33376 arch_flush_lazy_mmu_mode();
33377
33378 return (void *)vaddr;
33379diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33380index fdf617c..b9e85bc 100644
33381--- a/arch/x86/mm/ioremap.c
33382+++ b/arch/x86/mm/ioremap.c
33383@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33384 unsigned long i;
33385
33386 for (i = 0; i < nr_pages; ++i)
33387- if (pfn_valid(start_pfn + i) &&
33388- !PageReserved(pfn_to_page(start_pfn + i)))
33389+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33390+ !PageReserved(pfn_to_page(start_pfn + i))))
33391 return 1;
33392
33393 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33394@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33395 *
33396 * Caller must ensure there is only one unmapping for the same pointer.
33397 */
33398-void iounmap(volatile void __iomem *addr)
33399+void iounmap(const volatile void __iomem *addr)
33400 {
33401 struct vm_struct *p, *o;
33402
33403@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33404 */
33405 void *xlate_dev_mem_ptr(phys_addr_t phys)
33406 {
33407- void *addr;
33408- unsigned long start = phys & PAGE_MASK;
33409-
33410 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33411- if (page_is_ram(start >> PAGE_SHIFT))
33412+ if (page_is_ram(phys >> PAGE_SHIFT))
33413+#ifdef CONFIG_HIGHMEM
33414+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33415+#endif
33416 return __va(phys);
33417
33418- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33419- if (addr)
33420- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33421-
33422- return addr;
33423+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33424 }
33425
33426 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33427 {
33428 if (page_is_ram(phys >> PAGE_SHIFT))
33429+#ifdef CONFIG_HIGHMEM
33430+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33431+#endif
33432 return;
33433
33434 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33435 return;
33436 }
33437
33438-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33439+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33440
33441 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33442 {
33443@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33444 early_ioremap_setup();
33445
33446 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33447- memset(bm_pte, 0, sizeof(bm_pte));
33448- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33449+ pmd_populate_user(&init_mm, pmd, bm_pte);
33450
33451 /*
33452 * The boot-ioremap range spans multiple pmds, for which
33453diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33454index b4f2e7e..96c9c3e 100644
33455--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33456+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33457@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33458 * memory (e.g. tracked pages)? For now, we need this to avoid
33459 * invoking kmemcheck for PnP BIOS calls.
33460 */
33461- if (regs->flags & X86_VM_MASK)
33462+ if (v8086_mode(regs))
33463 return false;
33464- if (regs->cs != __KERNEL_CS)
33465+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33466 return false;
33467
33468 pte = kmemcheck_pte_lookup(address);
33469diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33470index df4552b..12c129c 100644
33471--- a/arch/x86/mm/mmap.c
33472+++ b/arch/x86/mm/mmap.c
33473@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33474 * Leave an at least ~128 MB hole with possible stack randomization.
33475 */
33476 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33477-#define MAX_GAP (TASK_SIZE/6*5)
33478+#define MAX_GAP (pax_task_size/6*5)
33479
33480 static int mmap_is_legacy(void)
33481 {
33482@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33483 return rnd << PAGE_SHIFT;
33484 }
33485
33486-static unsigned long mmap_base(void)
33487+static unsigned long mmap_base(struct mm_struct *mm)
33488 {
33489 unsigned long gap = rlimit(RLIMIT_STACK);
33490+ unsigned long pax_task_size = TASK_SIZE;
33491+
33492+#ifdef CONFIG_PAX_SEGMEXEC
33493+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33494+ pax_task_size = SEGMEXEC_TASK_SIZE;
33495+#endif
33496
33497 if (gap < MIN_GAP)
33498 gap = MIN_GAP;
33499 else if (gap > MAX_GAP)
33500 gap = MAX_GAP;
33501
33502- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33503+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33504 }
33505
33506 /*
33507 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33508 * does, but not when emulating X86_32
33509 */
33510-static unsigned long mmap_legacy_base(void)
33511+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33512 {
33513- if (mmap_is_ia32())
33514+ if (mmap_is_ia32()) {
33515+
33516+#ifdef CONFIG_PAX_SEGMEXEC
33517+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33518+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33519+ else
33520+#endif
33521+
33522 return TASK_UNMAPPED_BASE;
33523- else
33524+ } else
33525 return TASK_UNMAPPED_BASE + mmap_rnd();
33526 }
33527
33528@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33529 */
33530 void arch_pick_mmap_layout(struct mm_struct *mm)
33531 {
33532- mm->mmap_legacy_base = mmap_legacy_base();
33533- mm->mmap_base = mmap_base();
33534+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33535+ mm->mmap_base = mmap_base(mm);
33536+
33537+#ifdef CONFIG_PAX_RANDMMAP
33538+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33539+ mm->mmap_legacy_base += mm->delta_mmap;
33540+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33541+ }
33542+#endif
33543
33544 if (mmap_is_legacy()) {
33545 mm->mmap_base = mm->mmap_legacy_base;
33546diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33547index 0057a7a..95c7edd 100644
33548--- a/arch/x86/mm/mmio-mod.c
33549+++ b/arch/x86/mm/mmio-mod.c
33550@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33551 break;
33552 default:
33553 {
33554- unsigned char *ip = (unsigned char *)instptr;
33555+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33556 my_trace->opcode = MMIO_UNKNOWN_OP;
33557 my_trace->width = 0;
33558 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33559@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33560 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33561 void __iomem *addr)
33562 {
33563- static atomic_t next_id;
33564+ static atomic_unchecked_t next_id;
33565 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33566 /* These are page-unaligned. */
33567 struct mmiotrace_map map = {
33568@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33569 .private = trace
33570 },
33571 .phys = offset,
33572- .id = atomic_inc_return(&next_id)
33573+ .id = atomic_inc_return_unchecked(&next_id)
33574 };
33575 map.map_id = trace->id;
33576
33577@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33578 ioremap_trace_core(offset, size, addr);
33579 }
33580
33581-static void iounmap_trace_core(volatile void __iomem *addr)
33582+static void iounmap_trace_core(const volatile void __iomem *addr)
33583 {
33584 struct mmiotrace_map map = {
33585 .phys = 0,
33586@@ -328,7 +328,7 @@ not_enabled:
33587 }
33588 }
33589
33590-void mmiotrace_iounmap(volatile void __iomem *addr)
33591+void mmiotrace_iounmap(const volatile void __iomem *addr)
33592 {
33593 might_sleep();
33594 if (is_enabled()) /* recheck and proper locking in *_core() */
33595diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33596index cd4785b..25188b6 100644
33597--- a/arch/x86/mm/numa.c
33598+++ b/arch/x86/mm/numa.c
33599@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33600 }
33601 }
33602
33603-static int __init numa_register_memblks(struct numa_meminfo *mi)
33604+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33605 {
33606 unsigned long uninitialized_var(pfn_align);
33607 int i, nid;
33608diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33609index 536ea2f..f42c293 100644
33610--- a/arch/x86/mm/pageattr.c
33611+++ b/arch/x86/mm/pageattr.c
33612@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33613 */
33614 #ifdef CONFIG_PCI_BIOS
33615 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33616- pgprot_val(forbidden) |= _PAGE_NX;
33617+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33618 #endif
33619
33620 /*
33621@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33622 * Does not cover __inittext since that is gone later on. On
33623 * 64bit we do not enforce !NX on the low mapping
33624 */
33625- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33626- pgprot_val(forbidden) |= _PAGE_NX;
33627+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33628+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33629
33630+#ifdef CONFIG_DEBUG_RODATA
33631 /*
33632 * The .rodata section needs to be read-only. Using the pfn
33633 * catches all aliases.
33634@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33635 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33636 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33637 pgprot_val(forbidden) |= _PAGE_RW;
33638+#endif
33639
33640 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33641 /*
33642@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33643 }
33644 #endif
33645
33646+#ifdef CONFIG_PAX_KERNEXEC
33647+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33648+ pgprot_val(forbidden) |= _PAGE_RW;
33649+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33650+ }
33651+#endif
33652+
33653 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33654
33655 return prot;
33656@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33657 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33658 {
33659 /* change init_mm */
33660+ pax_open_kernel();
33661 set_pte_atomic(kpte, pte);
33662+
33663 #ifdef CONFIG_X86_32
33664 if (!SHARED_KERNEL_PMD) {
33665+
33666+#ifdef CONFIG_PAX_PER_CPU_PGD
33667+ unsigned long cpu;
33668+#else
33669 struct page *page;
33670+#endif
33671
33672+#ifdef CONFIG_PAX_PER_CPU_PGD
33673+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33674+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33675+#else
33676 list_for_each_entry(page, &pgd_list, lru) {
33677- pgd_t *pgd;
33678+ pgd_t *pgd = (pgd_t *)page_address(page);
33679+#endif
33680+
33681 pud_t *pud;
33682 pmd_t *pmd;
33683
33684- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33685+ pgd += pgd_index(address);
33686 pud = pud_offset(pgd, address);
33687 pmd = pmd_offset(pud, address);
33688 set_pte_atomic((pte_t *)pmd, pte);
33689 }
33690 }
33691 #endif
33692+ pax_close_kernel();
33693 }
33694
33695 static int
33696diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33697index 7ac6869..c0ba541 100644
33698--- a/arch/x86/mm/pat.c
33699+++ b/arch/x86/mm/pat.c
33700@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33701 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33702
33703 if (pg_flags == _PGMT_DEFAULT)
33704- return -1;
33705+ return _PAGE_CACHE_MODE_NUM;
33706 else if (pg_flags == _PGMT_WC)
33707 return _PAGE_CACHE_MODE_WC;
33708 else if (pg_flags == _PGMT_UC_MINUS)
33709@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33710
33711 page = pfn_to_page(pfn);
33712 type = get_page_memtype(page);
33713- if (type != -1) {
33714+ if (type != _PAGE_CACHE_MODE_NUM) {
33715 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33716 start, end - 1, type, req_type);
33717 if (new_type)
33718@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33719
33720 if (!entry) {
33721 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33722- current->comm, current->pid, start, end - 1);
33723+ current->comm, task_pid_nr(current), start, end - 1);
33724 return -EINVAL;
33725 }
33726
33727@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33728 page = pfn_to_page(paddr >> PAGE_SHIFT);
33729 rettype = get_page_memtype(page);
33730 /*
33731- * -1 from get_page_memtype() implies RAM page is in its
33732+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33733 * default state and not reserved, and hence of type WB
33734 */
33735- if (rettype == -1)
33736+ if (rettype == _PAGE_CACHE_MODE_NUM)
33737 rettype = _PAGE_CACHE_MODE_WB;
33738
33739 return rettype;
33740@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33741
33742 while (cursor < to) {
33743 if (!devmem_is_allowed(pfn)) {
33744- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33745- current->comm, from, to - 1);
33746+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33747+ current->comm, from, to - 1, cursor);
33748 return 0;
33749 }
33750 cursor += PAGE_SIZE;
33751@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33752 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33753 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33754 "for [mem %#010Lx-%#010Lx]\n",
33755- current->comm, current->pid,
33756+ current->comm, task_pid_nr(current),
33757 cattr_name(pcm),
33758 base, (unsigned long long)(base + size-1));
33759 return -EINVAL;
33760@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33761 pcm = lookup_memtype(paddr);
33762 if (want_pcm != pcm) {
33763 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33764- current->comm, current->pid,
33765+ current->comm, task_pid_nr(current),
33766 cattr_name(want_pcm),
33767 (unsigned long long)paddr,
33768 (unsigned long long)(paddr + size - 1),
33769@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33770 free_memtype(paddr, paddr + size);
33771 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33772 " for [mem %#010Lx-%#010Lx], got %s\n",
33773- current->comm, current->pid,
33774+ current->comm, task_pid_nr(current),
33775 cattr_name(want_pcm),
33776 (unsigned long long)paddr,
33777 (unsigned long long)(paddr + size - 1),
33778diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33779index 6582adc..fcc5d0b 100644
33780--- a/arch/x86/mm/pat_rbtree.c
33781+++ b/arch/x86/mm/pat_rbtree.c
33782@@ -161,7 +161,7 @@ success:
33783
33784 failure:
33785 printk(KERN_INFO "%s:%d conflicting memory types "
33786- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33787+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33788 end, cattr_name(found_type), cattr_name(match->type));
33789 return -EBUSY;
33790 }
33791diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33792index 9f0614d..92ae64a 100644
33793--- a/arch/x86/mm/pf_in.c
33794+++ b/arch/x86/mm/pf_in.c
33795@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33796 int i;
33797 enum reason_type rv = OTHERS;
33798
33799- p = (unsigned char *)ins_addr;
33800+ p = (unsigned char *)ktla_ktva(ins_addr);
33801 p += skip_prefix(p, &prf);
33802 p += get_opcode(p, &opcode);
33803
33804@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33805 struct prefix_bits prf;
33806 int i;
33807
33808- p = (unsigned char *)ins_addr;
33809+ p = (unsigned char *)ktla_ktva(ins_addr);
33810 p += skip_prefix(p, &prf);
33811 p += get_opcode(p, &opcode);
33812
33813@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33814 struct prefix_bits prf;
33815 int i;
33816
33817- p = (unsigned char *)ins_addr;
33818+ p = (unsigned char *)ktla_ktva(ins_addr);
33819 p += skip_prefix(p, &prf);
33820 p += get_opcode(p, &opcode);
33821
33822@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33823 struct prefix_bits prf;
33824 int i;
33825
33826- p = (unsigned char *)ins_addr;
33827+ p = (unsigned char *)ktla_ktva(ins_addr);
33828 p += skip_prefix(p, &prf);
33829 p += get_opcode(p, &opcode);
33830 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33831@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33832 struct prefix_bits prf;
33833 int i;
33834
33835- p = (unsigned char *)ins_addr;
33836+ p = (unsigned char *)ktla_ktva(ins_addr);
33837 p += skip_prefix(p, &prf);
33838 p += get_opcode(p, &opcode);
33839 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33840diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33841index 7b22ada..b11e66f 100644
33842--- a/arch/x86/mm/pgtable.c
33843+++ b/arch/x86/mm/pgtable.c
33844@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33845 list_del(&page->lru);
33846 }
33847
33848-#define UNSHARED_PTRS_PER_PGD \
33849- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33850+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33851+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33852
33853+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33854+{
33855+ unsigned int count = USER_PGD_PTRS;
33856
33857+ if (!pax_user_shadow_base)
33858+ return;
33859+
33860+ while (count--)
33861+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33862+}
33863+#endif
33864+
33865+#ifdef CONFIG_PAX_PER_CPU_PGD
33866+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33867+{
33868+ unsigned int count = USER_PGD_PTRS;
33869+
33870+ while (count--) {
33871+ pgd_t pgd;
33872+
33873+#ifdef CONFIG_X86_64
33874+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33875+#else
33876+ pgd = *src++;
33877+#endif
33878+
33879+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33880+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33881+#endif
33882+
33883+ *dst++ = pgd;
33884+ }
33885+
33886+}
33887+#endif
33888+
33889+#ifdef CONFIG_X86_64
33890+#define pxd_t pud_t
33891+#define pyd_t pgd_t
33892+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33893+#define pgtable_pxd_page_ctor(page) true
33894+#define pgtable_pxd_page_dtor(page) do {} while (0)
33895+#define pxd_free(mm, pud) pud_free((mm), (pud))
33896+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33897+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33898+#define PYD_SIZE PGDIR_SIZE
33899+#define mm_inc_nr_pxds(mm) do {} while (0)
33900+#define mm_dec_nr_pxds(mm) do {} while (0)
33901+#else
33902+#define pxd_t pmd_t
33903+#define pyd_t pud_t
33904+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33905+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33906+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33907+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33908+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33909+#define pyd_offset(mm, address) pud_offset((mm), (address))
33910+#define PYD_SIZE PUD_SIZE
33911+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33912+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33913+#endif
33914+
33915+#ifdef CONFIG_PAX_PER_CPU_PGD
33916+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33917+static inline void pgd_dtor(pgd_t *pgd) {}
33918+#else
33919 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33920 {
33921 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33922@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33923 pgd_list_del(pgd);
33924 spin_unlock(&pgd_lock);
33925 }
33926+#endif
33927
33928 /*
33929 * List of all pgd's needed for non-PAE so it can invalidate entries
33930@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33931 * -- nyc
33932 */
33933
33934-#ifdef CONFIG_X86_PAE
33935+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33936 /*
33937 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33938 * updating the top-level pagetable entries to guarantee the
33939@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33940 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33941 * and initialize the kernel pmds here.
33942 */
33943-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33944+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33945
33946 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33947 {
33948@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33949 */
33950 flush_tlb_mm(mm);
33951 }
33952+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33953+#define PREALLOCATED_PXDS USER_PGD_PTRS
33954 #else /* !CONFIG_X86_PAE */
33955
33956 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33957-#define PREALLOCATED_PMDS 0
33958+#define PREALLOCATED_PXDS 0
33959
33960 #endif /* CONFIG_X86_PAE */
33961
33962-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33963+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33964 {
33965 int i;
33966
33967- for(i = 0; i < PREALLOCATED_PMDS; i++)
33968- if (pmds[i]) {
33969- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33970- free_page((unsigned long)pmds[i]);
33971- mm_dec_nr_pmds(mm);
33972+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33973+ if (pxds[i]) {
33974+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33975+ free_page((unsigned long)pxds[i]);
33976+ mm_dec_nr_pxds(mm);
33977 }
33978 }
33979
33980-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33981+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33982 {
33983 int i;
33984 bool failed = false;
33985
33986- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33987- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33988- if (!pmd)
33989+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33990+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33991+ if (!pxd)
33992 failed = true;
33993- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33994- free_page((unsigned long)pmd);
33995- pmd = NULL;
33996+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33997+ free_page((unsigned long)pxd);
33998+ pxd = NULL;
33999 failed = true;
34000 }
34001- if (pmd)
34002- mm_inc_nr_pmds(mm);
34003- pmds[i] = pmd;
34004+ if (pxd)
34005+ mm_inc_nr_pxds(mm);
34006+ pxds[i] = pxd;
34007 }
34008
34009 if (failed) {
34010- free_pmds(mm, pmds);
34011+ free_pxds(mm, pxds);
34012 return -ENOMEM;
34013 }
34014
34015@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
34016 * preallocate which never got a corresponding vma will need to be
34017 * freed manually.
34018 */
34019-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
34020+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
34021 {
34022 int i;
34023
34024- for(i = 0; i < PREALLOCATED_PMDS; i++) {
34025+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
34026 pgd_t pgd = pgdp[i];
34027
34028 if (pgd_val(pgd) != 0) {
34029- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
34030+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
34031
34032- pgdp[i] = native_make_pgd(0);
34033+ set_pgd(pgdp + i, native_make_pgd(0));
34034
34035- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
34036- pmd_free(mm, pmd);
34037- mm_dec_nr_pmds(mm);
34038+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
34039+ pxd_free(mm, pxd);
34040+ mm_dec_nr_pxds(mm);
34041 }
34042 }
34043 }
34044
34045-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
34046+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
34047 {
34048- pud_t *pud;
34049+ pyd_t *pyd;
34050 int i;
34051
34052- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
34053+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
34054 return;
34055
34056- pud = pud_offset(pgd, 0);
34057+#ifdef CONFIG_X86_64
34058+ pyd = pyd_offset(mm, 0L);
34059+#else
34060+ pyd = pyd_offset(pgd, 0L);
34061+#endif
34062
34063- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
34064- pmd_t *pmd = pmds[i];
34065+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
34066+ pxd_t *pxd = pxds[i];
34067
34068 if (i >= KERNEL_PGD_BOUNDARY)
34069- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34070- sizeof(pmd_t) * PTRS_PER_PMD);
34071+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
34072+ sizeof(pxd_t) * PTRS_PER_PMD);
34073
34074- pud_populate(mm, pud, pmd);
34075+ pyd_populate(mm, pyd, pxd);
34076 }
34077 }
34078
34079 pgd_t *pgd_alloc(struct mm_struct *mm)
34080 {
34081 pgd_t *pgd;
34082- pmd_t *pmds[PREALLOCATED_PMDS];
34083+ pxd_t *pxds[PREALLOCATED_PXDS];
34084
34085 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
34086
34087@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34088
34089 mm->pgd = pgd;
34090
34091- if (preallocate_pmds(mm, pmds) != 0)
34092+ if (preallocate_pxds(mm, pxds) != 0)
34093 goto out_free_pgd;
34094
34095 if (paravirt_pgd_alloc(mm) != 0)
34096- goto out_free_pmds;
34097+ goto out_free_pxds;
34098
34099 /*
34100 * Make sure that pre-populating the pmds is atomic with
34101@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34102 spin_lock(&pgd_lock);
34103
34104 pgd_ctor(mm, pgd);
34105- pgd_prepopulate_pmd(mm, pgd, pmds);
34106+ pgd_prepopulate_pxd(mm, pgd, pxds);
34107
34108 spin_unlock(&pgd_lock);
34109
34110 return pgd;
34111
34112-out_free_pmds:
34113- free_pmds(mm, pmds);
34114+out_free_pxds:
34115+ free_pxds(mm, pxds);
34116 out_free_pgd:
34117 free_page((unsigned long)pgd);
34118 out:
34119@@ -317,7 +389,7 @@ out:
34120
34121 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34122 {
34123- pgd_mop_up_pmds(mm, pgd);
34124+ pgd_mop_up_pxds(mm, pgd);
34125 pgd_dtor(pgd);
34126 paravirt_pgd_free(mm, pgd);
34127 free_page((unsigned long)pgd);
34128diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34129index 75cc097..79a097f 100644
34130--- a/arch/x86/mm/pgtable_32.c
34131+++ b/arch/x86/mm/pgtable_32.c
34132@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34133 return;
34134 }
34135 pte = pte_offset_kernel(pmd, vaddr);
34136+
34137+ pax_open_kernel();
34138 if (pte_val(pteval))
34139 set_pte_at(&init_mm, vaddr, pte, pteval);
34140 else
34141 pte_clear(&init_mm, vaddr, pte);
34142+ pax_close_kernel();
34143
34144 /*
34145 * It's enough to flush this one mapping.
34146diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34147index e666cbb..61788c45 100644
34148--- a/arch/x86/mm/physaddr.c
34149+++ b/arch/x86/mm/physaddr.c
34150@@ -10,7 +10,7 @@
34151 #ifdef CONFIG_X86_64
34152
34153 #ifdef CONFIG_DEBUG_VIRTUAL
34154-unsigned long __phys_addr(unsigned long x)
34155+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34156 {
34157 unsigned long y = x - __START_KERNEL_map;
34158
34159@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34160 #else
34161
34162 #ifdef CONFIG_DEBUG_VIRTUAL
34163-unsigned long __phys_addr(unsigned long x)
34164+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34165 {
34166 unsigned long phys_addr = x - PAGE_OFFSET;
34167 /* VMALLOC_* aren't constants */
34168diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34169index 90555bf..f5f1828 100644
34170--- a/arch/x86/mm/setup_nx.c
34171+++ b/arch/x86/mm/setup_nx.c
34172@@ -5,8 +5,10 @@
34173 #include <asm/pgtable.h>
34174 #include <asm/proto.h>
34175
34176+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34177 static int disable_nx;
34178
34179+#ifndef CONFIG_PAX_PAGEEXEC
34180 /*
34181 * noexec = on|off
34182 *
34183@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34184 return 0;
34185 }
34186 early_param("noexec", noexec_setup);
34187+#endif
34188+
34189+#endif
34190
34191 void x86_configure_nx(void)
34192 {
34193+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34194 if (cpu_has_nx && !disable_nx)
34195 __supported_pte_mask |= _PAGE_NX;
34196 else
34197+#endif
34198 __supported_pte_mask &= ~_PAGE_NX;
34199 }
34200
34201diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34202index 3250f23..7a97ba2 100644
34203--- a/arch/x86/mm/tlb.c
34204+++ b/arch/x86/mm/tlb.c
34205@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34206 BUG();
34207 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34208 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34209+
34210+#ifndef CONFIG_PAX_PER_CPU_PGD
34211 load_cr3(swapper_pg_dir);
34212+#endif
34213+
34214 /*
34215 * This gets called in the idle path where RCU
34216 * functions differently. Tracing normally
34217diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34218new file mode 100644
34219index 0000000..dace51c
34220--- /dev/null
34221+++ b/arch/x86/mm/uderef_64.c
34222@@ -0,0 +1,37 @@
34223+#include <linux/mm.h>
34224+#include <asm/pgtable.h>
34225+#include <asm/uaccess.h>
34226+
34227+#ifdef CONFIG_PAX_MEMORY_UDEREF
34228+/* PaX: due to the special call convention these functions must
34229+ * - remain leaf functions under all configurations,
34230+ * - never be called directly, only dereferenced from the wrappers.
34231+ */
34232+void __pax_open_userland(void)
34233+{
34234+ unsigned int cpu;
34235+
34236+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34237+ return;
34238+
34239+ cpu = raw_get_cpu();
34240+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34241+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34242+ raw_put_cpu_no_resched();
34243+}
34244+EXPORT_SYMBOL(__pax_open_userland);
34245+
34246+void __pax_close_userland(void)
34247+{
34248+ unsigned int cpu;
34249+
34250+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34251+ return;
34252+
34253+ cpu = raw_get_cpu();
34254+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34255+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34256+ raw_put_cpu_no_resched();
34257+}
34258+EXPORT_SYMBOL(__pax_close_userland);
34259+#endif
34260diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34261index 6440221..f84b5c7 100644
34262--- a/arch/x86/net/bpf_jit.S
34263+++ b/arch/x86/net/bpf_jit.S
34264@@ -9,6 +9,7 @@
34265 */
34266 #include <linux/linkage.h>
34267 #include <asm/dwarf2.h>
34268+#include <asm/alternative-asm.h>
34269
34270 /*
34271 * Calling convention :
34272@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34273 jle bpf_slow_path_word
34274 mov (SKBDATA,%rsi),%eax
34275 bswap %eax /* ntohl() */
34276+ pax_force_retaddr
34277 ret
34278
34279 sk_load_half:
34280@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34281 jle bpf_slow_path_half
34282 movzwl (SKBDATA,%rsi),%eax
34283 rol $8,%ax # ntohs()
34284+ pax_force_retaddr
34285 ret
34286
34287 sk_load_byte:
34288@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34289 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34290 jle bpf_slow_path_byte
34291 movzbl (SKBDATA,%rsi),%eax
34292+ pax_force_retaddr
34293 ret
34294
34295 /* rsi contains offset and can be scratched */
34296@@ -90,6 +94,7 @@ bpf_slow_path_word:
34297 js bpf_error
34298 mov - MAX_BPF_STACK + 32(%rbp),%eax
34299 bswap %eax
34300+ pax_force_retaddr
34301 ret
34302
34303 bpf_slow_path_half:
34304@@ -98,12 +103,14 @@ bpf_slow_path_half:
34305 mov - MAX_BPF_STACK + 32(%rbp),%ax
34306 rol $8,%ax
34307 movzwl %ax,%eax
34308+ pax_force_retaddr
34309 ret
34310
34311 bpf_slow_path_byte:
34312 bpf_slow_path_common(1)
34313 js bpf_error
34314 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34315+ pax_force_retaddr
34316 ret
34317
34318 #define sk_negative_common(SIZE) \
34319@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34320 sk_negative_common(4)
34321 mov (%rax), %eax
34322 bswap %eax
34323+ pax_force_retaddr
34324 ret
34325
34326 bpf_slow_path_half_neg:
34327@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34328 mov (%rax),%ax
34329 rol $8,%ax
34330 movzwl %ax,%eax
34331+ pax_force_retaddr
34332 ret
34333
34334 bpf_slow_path_byte_neg:
34335@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34336 .globl sk_load_byte_negative_offset
34337 sk_negative_common(1)
34338 movzbl (%rax), %eax
34339+ pax_force_retaddr
34340 ret
34341
34342 bpf_error:
34343@@ -156,4 +166,5 @@ bpf_error:
34344 mov - MAX_BPF_STACK + 16(%rbp),%r14
34345 mov - MAX_BPF_STACK + 24(%rbp),%r15
34346 leaveq
34347+ pax_force_retaddr
34348 ret
34349diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34350index ddeff48..877ead6 100644
34351--- a/arch/x86/net/bpf_jit_comp.c
34352+++ b/arch/x86/net/bpf_jit_comp.c
34353@@ -13,7 +13,11 @@
34354 #include <linux/if_vlan.h>
34355 #include <asm/cacheflush.h>
34356
34357+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34358+int bpf_jit_enable __read_only;
34359+#else
34360 int bpf_jit_enable __read_mostly;
34361+#endif
34362
34363 /*
34364 * assembly code in arch/x86/net/bpf_jit.S
34365@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34366 static void jit_fill_hole(void *area, unsigned int size)
34367 {
34368 /* fill whole space with int3 instructions */
34369+ pax_open_kernel();
34370 memset(area, 0xcc, size);
34371+ pax_close_kernel();
34372 }
34373
34374 struct jit_context {
34375@@ -924,7 +930,9 @@ common_load:
34376 pr_err("bpf_jit_compile fatal error\n");
34377 return -EFAULT;
34378 }
34379+ pax_open_kernel();
34380 memcpy(image + proglen, temp, ilen);
34381+ pax_close_kernel();
34382 }
34383 proglen += ilen;
34384 addrs[i] = proglen;
34385@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34386
34387 if (image) {
34388 bpf_flush_icache(header, image + proglen);
34389- set_memory_ro((unsigned long)header, header->pages);
34390 prog->bpf_func = (void *)image;
34391 prog->jited = true;
34392 }
34393@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34394 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34395 struct bpf_binary_header *header = (void *)addr;
34396
34397- if (!fp->jited)
34398- goto free_filter;
34399+ if (fp->jited)
34400+ bpf_jit_binary_free(header);
34401
34402- set_memory_rw(addr, header->pages);
34403- bpf_jit_binary_free(header);
34404-
34405-free_filter:
34406 bpf_prog_unlock_free(fp);
34407 }
34408diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34409index 5d04be5..2beeaa2 100644
34410--- a/arch/x86/oprofile/backtrace.c
34411+++ b/arch/x86/oprofile/backtrace.c
34412@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34413 struct stack_frame_ia32 *fp;
34414 unsigned long bytes;
34415
34416- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34417+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34418 if (bytes != 0)
34419 return NULL;
34420
34421- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34422+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34423
34424 oprofile_add_trace(bufhead[0].return_address);
34425
34426@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34427 struct stack_frame bufhead[2];
34428 unsigned long bytes;
34429
34430- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34431+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34432 if (bytes != 0)
34433 return NULL;
34434
34435@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34436 {
34437 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34438
34439- if (!user_mode_vm(regs)) {
34440+ if (!user_mode(regs)) {
34441 unsigned long stack = kernel_stack_pointer(regs);
34442 if (depth)
34443 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34444diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34445index 1d2e639..f6ef82a 100644
34446--- a/arch/x86/oprofile/nmi_int.c
34447+++ b/arch/x86/oprofile/nmi_int.c
34448@@ -23,6 +23,7 @@
34449 #include <asm/nmi.h>
34450 #include <asm/msr.h>
34451 #include <asm/apic.h>
34452+#include <asm/pgtable.h>
34453
34454 #include "op_counter.h"
34455 #include "op_x86_model.h"
34456@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34457 if (ret)
34458 return ret;
34459
34460- if (!model->num_virt_counters)
34461- model->num_virt_counters = model->num_counters;
34462+ if (!model->num_virt_counters) {
34463+ pax_open_kernel();
34464+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34465+ pax_close_kernel();
34466+ }
34467
34468 mux_init(ops);
34469
34470diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34471index 50d86c0..7985318 100644
34472--- a/arch/x86/oprofile/op_model_amd.c
34473+++ b/arch/x86/oprofile/op_model_amd.c
34474@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34475 num_counters = AMD64_NUM_COUNTERS;
34476 }
34477
34478- op_amd_spec.num_counters = num_counters;
34479- op_amd_spec.num_controls = num_counters;
34480- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34481+ pax_open_kernel();
34482+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34483+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34484+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34485+ pax_close_kernel();
34486
34487 return 0;
34488 }
34489diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34490index d90528e..0127e2b 100644
34491--- a/arch/x86/oprofile/op_model_ppro.c
34492+++ b/arch/x86/oprofile/op_model_ppro.c
34493@@ -19,6 +19,7 @@
34494 #include <asm/msr.h>
34495 #include <asm/apic.h>
34496 #include <asm/nmi.h>
34497+#include <asm/pgtable.h>
34498
34499 #include "op_x86_model.h"
34500 #include "op_counter.h"
34501@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34502
34503 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34504
34505- op_arch_perfmon_spec.num_counters = num_counters;
34506- op_arch_perfmon_spec.num_controls = num_counters;
34507+ pax_open_kernel();
34508+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34509+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34510+ pax_close_kernel();
34511 }
34512
34513 static int arch_perfmon_init(struct oprofile_operations *ignore)
34514diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34515index 71e8a67..6a313bb 100644
34516--- a/arch/x86/oprofile/op_x86_model.h
34517+++ b/arch/x86/oprofile/op_x86_model.h
34518@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34519 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34520 struct op_msrs const * const msrs);
34521 #endif
34522-};
34523+} __do_const;
34524
34525 struct op_counter_config;
34526
34527diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34528index 852aa4c..71613f2 100644
34529--- a/arch/x86/pci/intel_mid_pci.c
34530+++ b/arch/x86/pci/intel_mid_pci.c
34531@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34532 pci_mmcfg_late_init();
34533 pcibios_enable_irq = intel_mid_pci_irq_enable;
34534 pcibios_disable_irq = intel_mid_pci_irq_disable;
34535- pci_root_ops = intel_mid_pci_ops;
34536+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34537 pci_soc_mode = 1;
34538 /* Continue with standard init */
34539 return 1;
34540diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34541index 5dc6ca5..25c03f5 100644
34542--- a/arch/x86/pci/irq.c
34543+++ b/arch/x86/pci/irq.c
34544@@ -51,7 +51,7 @@ struct irq_router {
34545 struct irq_router_handler {
34546 u16 vendor;
34547 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34548-};
34549+} __do_const;
34550
34551 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34552 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34553@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34554 return 0;
34555 }
34556
34557-static __initdata struct irq_router_handler pirq_routers[] = {
34558+static __initconst const struct irq_router_handler pirq_routers[] = {
34559 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34560 { PCI_VENDOR_ID_AL, ali_router_probe },
34561 { PCI_VENDOR_ID_ITE, ite_router_probe },
34562@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34563 static void __init pirq_find_router(struct irq_router *r)
34564 {
34565 struct irq_routing_table *rt = pirq_table;
34566- struct irq_router_handler *h;
34567+ const struct irq_router_handler *h;
34568
34569 #ifdef CONFIG_PCI_BIOS
34570 if (!rt->signature) {
34571@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34572 return 0;
34573 }
34574
34575-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34576+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34577 {
34578 .callback = fix_broken_hp_bios_irq9,
34579 .ident = "HP Pavilion N5400 Series Laptop",
34580diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34581index 9b83b90..4112152 100644
34582--- a/arch/x86/pci/pcbios.c
34583+++ b/arch/x86/pci/pcbios.c
34584@@ -79,7 +79,7 @@ union bios32 {
34585 static struct {
34586 unsigned long address;
34587 unsigned short segment;
34588-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34589+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34590
34591 /*
34592 * Returns the entry point for the given service, NULL on error
34593@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34594 unsigned long length; /* %ecx */
34595 unsigned long entry; /* %edx */
34596 unsigned long flags;
34597+ struct desc_struct d, *gdt;
34598
34599 local_irq_save(flags);
34600- __asm__("lcall *(%%edi); cld"
34601+
34602+ gdt = get_cpu_gdt_table(smp_processor_id());
34603+
34604+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34605+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34606+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34607+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34608+
34609+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34610 : "=a" (return_code),
34611 "=b" (address),
34612 "=c" (length),
34613 "=d" (entry)
34614 : "0" (service),
34615 "1" (0),
34616- "D" (&bios32_indirect));
34617+ "D" (&bios32_indirect),
34618+ "r"(__PCIBIOS_DS)
34619+ : "memory");
34620+
34621+ pax_open_kernel();
34622+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34623+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34624+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34625+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34626+ pax_close_kernel();
34627+
34628 local_irq_restore(flags);
34629
34630 switch (return_code) {
34631- case 0:
34632- return address + entry;
34633- case 0x80: /* Not present */
34634- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34635- return 0;
34636- default: /* Shouldn't happen */
34637- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34638- service, return_code);
34639+ case 0: {
34640+ int cpu;
34641+ unsigned char flags;
34642+
34643+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34644+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34645+ printk(KERN_WARNING "bios32_service: not valid\n");
34646 return 0;
34647+ }
34648+ address = address + PAGE_OFFSET;
34649+ length += 16UL; /* some BIOSs underreport this... */
34650+ flags = 4;
34651+ if (length >= 64*1024*1024) {
34652+ length >>= PAGE_SHIFT;
34653+ flags |= 8;
34654+ }
34655+
34656+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34657+ gdt = get_cpu_gdt_table(cpu);
34658+ pack_descriptor(&d, address, length, 0x9b, flags);
34659+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34660+ pack_descriptor(&d, address, length, 0x93, flags);
34661+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34662+ }
34663+ return entry;
34664+ }
34665+ case 0x80: /* Not present */
34666+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34667+ return 0;
34668+ default: /* Shouldn't happen */
34669+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34670+ service, return_code);
34671+ return 0;
34672 }
34673 }
34674
34675 static struct {
34676 unsigned long address;
34677 unsigned short segment;
34678-} pci_indirect = { 0, __KERNEL_CS };
34679+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34680
34681-static int pci_bios_present;
34682+static int pci_bios_present __read_only;
34683
34684 static int __init check_pcibios(void)
34685 {
34686@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34687 unsigned long flags, pcibios_entry;
34688
34689 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34690- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34691+ pci_indirect.address = pcibios_entry;
34692
34693 local_irq_save(flags);
34694- __asm__(
34695- "lcall *(%%edi); cld\n\t"
34696+ __asm__("movw %w6, %%ds\n\t"
34697+ "lcall *%%ss:(%%edi); cld\n\t"
34698+ "push %%ss\n\t"
34699+ "pop %%ds\n\t"
34700 "jc 1f\n\t"
34701 "xor %%ah, %%ah\n"
34702 "1:"
34703@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34704 "=b" (ebx),
34705 "=c" (ecx)
34706 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34707- "D" (&pci_indirect)
34708+ "D" (&pci_indirect),
34709+ "r" (__PCIBIOS_DS)
34710 : "memory");
34711 local_irq_restore(flags);
34712
34713@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34714
34715 switch (len) {
34716 case 1:
34717- __asm__("lcall *(%%esi); cld\n\t"
34718+ __asm__("movw %w6, %%ds\n\t"
34719+ "lcall *%%ss:(%%esi); cld\n\t"
34720+ "push %%ss\n\t"
34721+ "pop %%ds\n\t"
34722 "jc 1f\n\t"
34723 "xor %%ah, %%ah\n"
34724 "1:"
34725@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34726 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34727 "b" (bx),
34728 "D" ((long)reg),
34729- "S" (&pci_indirect));
34730+ "S" (&pci_indirect),
34731+ "r" (__PCIBIOS_DS));
34732 /*
34733 * Zero-extend the result beyond 8 bits, do not trust the
34734 * BIOS having done it:
34735@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34736 *value &= 0xff;
34737 break;
34738 case 2:
34739- __asm__("lcall *(%%esi); cld\n\t"
34740+ __asm__("movw %w6, %%ds\n\t"
34741+ "lcall *%%ss:(%%esi); cld\n\t"
34742+ "push %%ss\n\t"
34743+ "pop %%ds\n\t"
34744 "jc 1f\n\t"
34745 "xor %%ah, %%ah\n"
34746 "1:"
34747@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34748 : "1" (PCIBIOS_READ_CONFIG_WORD),
34749 "b" (bx),
34750 "D" ((long)reg),
34751- "S" (&pci_indirect));
34752+ "S" (&pci_indirect),
34753+ "r" (__PCIBIOS_DS));
34754 /*
34755 * Zero-extend the result beyond 16 bits, do not trust the
34756 * BIOS having done it:
34757@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34758 *value &= 0xffff;
34759 break;
34760 case 4:
34761- __asm__("lcall *(%%esi); cld\n\t"
34762+ __asm__("movw %w6, %%ds\n\t"
34763+ "lcall *%%ss:(%%esi); cld\n\t"
34764+ "push %%ss\n\t"
34765+ "pop %%ds\n\t"
34766 "jc 1f\n\t"
34767 "xor %%ah, %%ah\n"
34768 "1:"
34769@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34770 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34771 "b" (bx),
34772 "D" ((long)reg),
34773- "S" (&pci_indirect));
34774+ "S" (&pci_indirect),
34775+ "r" (__PCIBIOS_DS));
34776 break;
34777 }
34778
34779@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34780
34781 switch (len) {
34782 case 1:
34783- __asm__("lcall *(%%esi); cld\n\t"
34784+ __asm__("movw %w6, %%ds\n\t"
34785+ "lcall *%%ss:(%%esi); cld\n\t"
34786+ "push %%ss\n\t"
34787+ "pop %%ds\n\t"
34788 "jc 1f\n\t"
34789 "xor %%ah, %%ah\n"
34790 "1:"
34791@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34792 "c" (value),
34793 "b" (bx),
34794 "D" ((long)reg),
34795- "S" (&pci_indirect));
34796+ "S" (&pci_indirect),
34797+ "r" (__PCIBIOS_DS));
34798 break;
34799 case 2:
34800- __asm__("lcall *(%%esi); cld\n\t"
34801+ __asm__("movw %w6, %%ds\n\t"
34802+ "lcall *%%ss:(%%esi); cld\n\t"
34803+ "push %%ss\n\t"
34804+ "pop %%ds\n\t"
34805 "jc 1f\n\t"
34806 "xor %%ah, %%ah\n"
34807 "1:"
34808@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34809 "c" (value),
34810 "b" (bx),
34811 "D" ((long)reg),
34812- "S" (&pci_indirect));
34813+ "S" (&pci_indirect),
34814+ "r" (__PCIBIOS_DS));
34815 break;
34816 case 4:
34817- __asm__("lcall *(%%esi); cld\n\t"
34818+ __asm__("movw %w6, %%ds\n\t"
34819+ "lcall *%%ss:(%%esi); cld\n\t"
34820+ "push %%ss\n\t"
34821+ "pop %%ds\n\t"
34822 "jc 1f\n\t"
34823 "xor %%ah, %%ah\n"
34824 "1:"
34825@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34826 "c" (value),
34827 "b" (bx),
34828 "D" ((long)reg),
34829- "S" (&pci_indirect));
34830+ "S" (&pci_indirect),
34831+ "r" (__PCIBIOS_DS));
34832 break;
34833 }
34834
34835@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34836
34837 DBG("PCI: Fetching IRQ routing table... ");
34838 __asm__("push %%es\n\t"
34839+ "movw %w8, %%ds\n\t"
34840 "push %%ds\n\t"
34841 "pop %%es\n\t"
34842- "lcall *(%%esi); cld\n\t"
34843+ "lcall *%%ss:(%%esi); cld\n\t"
34844 "pop %%es\n\t"
34845+ "push %%ss\n\t"
34846+ "pop %%ds\n"
34847 "jc 1f\n\t"
34848 "xor %%ah, %%ah\n"
34849 "1:"
34850@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34851 "1" (0),
34852 "D" ((long) &opt),
34853 "S" (&pci_indirect),
34854- "m" (opt)
34855+ "m" (opt),
34856+ "r" (__PCIBIOS_DS)
34857 : "memory");
34858 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34859 if (ret & 0xff00)
34860@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34861 {
34862 int ret;
34863
34864- __asm__("lcall *(%%esi); cld\n\t"
34865+ __asm__("movw %w5, %%ds\n\t"
34866+ "lcall *%%ss:(%%esi); cld\n\t"
34867+ "push %%ss\n\t"
34868+ "pop %%ds\n"
34869 "jc 1f\n\t"
34870 "xor %%ah, %%ah\n"
34871 "1:"
34872@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34873 : "0" (PCIBIOS_SET_PCI_HW_INT),
34874 "b" ((dev->bus->number << 8) | dev->devfn),
34875 "c" ((irq << 8) | (pin + 10)),
34876- "S" (&pci_indirect));
34877+ "S" (&pci_indirect),
34878+ "r" (__PCIBIOS_DS));
34879 return !(ret & 0xff00);
34880 }
34881 EXPORT_SYMBOL(pcibios_set_irq_routing);
34882diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34883index 40e7cda..c7e6672 100644
34884--- a/arch/x86/platform/efi/efi_32.c
34885+++ b/arch/x86/platform/efi/efi_32.c
34886@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34887 {
34888 struct desc_ptr gdt_descr;
34889
34890+#ifdef CONFIG_PAX_KERNEXEC
34891+ struct desc_struct d;
34892+#endif
34893+
34894 local_irq_save(efi_rt_eflags);
34895
34896 load_cr3(initial_page_table);
34897 __flush_tlb_all();
34898
34899+#ifdef CONFIG_PAX_KERNEXEC
34900+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34901+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34902+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34903+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34904+#endif
34905+
34906 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34907 gdt_descr.size = GDT_SIZE - 1;
34908 load_gdt(&gdt_descr);
34909@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34910 {
34911 struct desc_ptr gdt_descr;
34912
34913+#ifdef CONFIG_PAX_KERNEXEC
34914+ struct desc_struct d;
34915+
34916+ memset(&d, 0, sizeof d);
34917+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34918+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34919+#endif
34920+
34921 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34922 gdt_descr.size = GDT_SIZE - 1;
34923 load_gdt(&gdt_descr);
34924
34925+#ifdef CONFIG_PAX_PER_CPU_PGD
34926+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34927+#else
34928 load_cr3(swapper_pg_dir);
34929+#endif
34930+
34931 __flush_tlb_all();
34932
34933 local_irq_restore(efi_rt_eflags);
34934diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34935index 17e80d8..9fa6e41 100644
34936--- a/arch/x86/platform/efi/efi_64.c
34937+++ b/arch/x86/platform/efi/efi_64.c
34938@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34939 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34940 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34941 }
34942+
34943+#ifdef CONFIG_PAX_PER_CPU_PGD
34944+ load_cr3(swapper_pg_dir);
34945+#endif
34946+
34947 __flush_tlb_all();
34948 }
34949
34950@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34951 for (pgd = 0; pgd < n_pgds; pgd++)
34952 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34953 kfree(save_pgd);
34954+
34955+#ifdef CONFIG_PAX_PER_CPU_PGD
34956+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34957+#endif
34958+
34959 __flush_tlb_all();
34960 local_irq_restore(efi_flags);
34961 early_code_mapping_set_exec(0);
34962@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34963 unsigned npages;
34964 pgd_t *pgd;
34965
34966- if (efi_enabled(EFI_OLD_MEMMAP))
34967+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34968+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34969+ * able to execute the EFI services.
34970+ */
34971+ if (__supported_pte_mask & _PAGE_NX) {
34972+ unsigned long addr = (unsigned long) __va(0);
34973+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34974+
34975+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34976+#ifdef CONFIG_PAX_PER_CPU_PGD
34977+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34978+#endif
34979+ set_pgd(pgd_offset_k(addr), pe);
34980+ }
34981+
34982 return 0;
34983+ }
34984
34985 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34986 pgd = __va(efi_scratch.efi_pgt);
34987diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34988index 040192b..7d3300f 100644
34989--- a/arch/x86/platform/efi/efi_stub_32.S
34990+++ b/arch/x86/platform/efi/efi_stub_32.S
34991@@ -6,7 +6,9 @@
34992 */
34993
34994 #include <linux/linkage.h>
34995+#include <linux/init.h>
34996 #include <asm/page_types.h>
34997+#include <asm/segment.h>
34998
34999 /*
35000 * efi_call_phys(void *, ...) is a function with variable parameters.
35001@@ -20,7 +22,7 @@
35002 * service functions will comply with gcc calling convention, too.
35003 */
35004
35005-.text
35006+__INIT
35007 ENTRY(efi_call_phys)
35008 /*
35009 * 0. The function can only be called in Linux kernel. So CS has been
35010@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
35011 * The mapping of lower virtual memory has been created in prolog and
35012 * epilog.
35013 */
35014- movl $1f, %edx
35015- subl $__PAGE_OFFSET, %edx
35016- jmp *%edx
35017+#ifdef CONFIG_PAX_KERNEXEC
35018+ movl $(__KERNEXEC_EFI_DS), %edx
35019+ mov %edx, %ds
35020+ mov %edx, %es
35021+ mov %edx, %ss
35022+ addl $2f,(1f)
35023+ ljmp *(1f)
35024+
35025+__INITDATA
35026+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
35027+.previous
35028+
35029+2:
35030+ subl $2b,(1b)
35031+#else
35032+ jmp 1f-__PAGE_OFFSET
35033 1:
35034+#endif
35035
35036 /*
35037 * 2. Now on the top of stack is the return
35038@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
35039 * parameter 2, ..., param n. To make things easy, we save the return
35040 * address of efi_call_phys in a global variable.
35041 */
35042- popl %edx
35043- movl %edx, saved_return_addr
35044- /* get the function pointer into ECX*/
35045- popl %ecx
35046- movl %ecx, efi_rt_function_ptr
35047- movl $2f, %edx
35048- subl $__PAGE_OFFSET, %edx
35049- pushl %edx
35050+ popl (saved_return_addr)
35051+ popl (efi_rt_function_ptr)
35052
35053 /*
35054 * 3. Clear PG bit in %CR0.
35055@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
35056 /*
35057 * 5. Call the physical function.
35058 */
35059- jmp *%ecx
35060+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
35061
35062-2:
35063 /*
35064 * 6. After EFI runtime service returns, control will return to
35065 * following instruction. We'd better readjust stack pointer first.
35066@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
35067 movl %cr0, %edx
35068 orl $0x80000000, %edx
35069 movl %edx, %cr0
35070- jmp 1f
35071-1:
35072+
35073 /*
35074 * 8. Now restore the virtual mode from flat mode by
35075 * adding EIP with PAGE_OFFSET.
35076 */
35077- movl $1f, %edx
35078- jmp *%edx
35079+#ifdef CONFIG_PAX_KERNEXEC
35080+ movl $(__KERNEL_DS), %edx
35081+ mov %edx, %ds
35082+ mov %edx, %es
35083+ mov %edx, %ss
35084+ ljmp $(__KERNEL_CS),$1f
35085+#else
35086+ jmp 1f+__PAGE_OFFSET
35087+#endif
35088 1:
35089
35090 /*
35091 * 9. Balance the stack. And because EAX contain the return value,
35092 * we'd better not clobber it.
35093 */
35094- leal efi_rt_function_ptr, %edx
35095- movl (%edx), %ecx
35096- pushl %ecx
35097+ pushl (efi_rt_function_ptr)
35098
35099 /*
35100- * 10. Push the saved return address onto the stack and return.
35101+ * 10. Return to the saved return address.
35102 */
35103- leal saved_return_addr, %edx
35104- movl (%edx), %ecx
35105- pushl %ecx
35106- ret
35107+ jmpl *(saved_return_addr)
35108 ENDPROC(efi_call_phys)
35109 .previous
35110
35111-.data
35112+__INITDATA
35113 saved_return_addr:
35114 .long 0
35115 efi_rt_function_ptr:
35116diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35117index 86d0f9e..6d499f4 100644
35118--- a/arch/x86/platform/efi/efi_stub_64.S
35119+++ b/arch/x86/platform/efi/efi_stub_64.S
35120@@ -11,6 +11,7 @@
35121 #include <asm/msr.h>
35122 #include <asm/processor-flags.h>
35123 #include <asm/page_types.h>
35124+#include <asm/alternative-asm.h>
35125
35126 #define SAVE_XMM \
35127 mov %rsp, %rax; \
35128@@ -88,6 +89,7 @@ ENTRY(efi_call)
35129 RESTORE_PGT
35130 addq $48, %rsp
35131 RESTORE_XMM
35132+ pax_force_retaddr 0, 1
35133 ret
35134 ENDPROC(efi_call)
35135
35136diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35137index 3005f0c..d06aeb0 100644
35138--- a/arch/x86/platform/intel-mid/intel-mid.c
35139+++ b/arch/x86/platform/intel-mid/intel-mid.c
35140@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35141 /* intel_mid_ops to store sub arch ops */
35142 struct intel_mid_ops *intel_mid_ops;
35143 /* getter function for sub arch ops*/
35144-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35145+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35146 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35147 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35148
35149@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35150 {
35151 };
35152
35153-static void intel_mid_reboot(void)
35154+static void __noreturn intel_mid_reboot(void)
35155 {
35156 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35157+ BUG();
35158 }
35159
35160 static unsigned long __init intel_mid_calibrate_tsc(void)
35161diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35162index 3c1c386..59a68ed 100644
35163--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35164+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35165@@ -13,6 +13,6 @@
35166 /* For every CPU addition a new get_<cpuname>_ops interface needs
35167 * to be added.
35168 */
35169-extern void *get_penwell_ops(void);
35170-extern void *get_cloverview_ops(void);
35171-extern void *get_tangier_ops(void);
35172+extern const void *get_penwell_ops(void);
35173+extern const void *get_cloverview_ops(void);
35174+extern const void *get_tangier_ops(void);
35175diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35176index 23381d2..8ddc10e 100644
35177--- a/arch/x86/platform/intel-mid/mfld.c
35178+++ b/arch/x86/platform/intel-mid/mfld.c
35179@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35180 pm_power_off = mfld_power_off;
35181 }
35182
35183-void *get_penwell_ops(void)
35184+const void *get_penwell_ops(void)
35185 {
35186 return &penwell_ops;
35187 }
35188
35189-void *get_cloverview_ops(void)
35190+const void *get_cloverview_ops(void)
35191 {
35192 return &penwell_ops;
35193 }
35194diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35195index aaca917..66eadbc 100644
35196--- a/arch/x86/platform/intel-mid/mrfl.c
35197+++ b/arch/x86/platform/intel-mid/mrfl.c
35198@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35199 .arch_setup = tangier_arch_setup,
35200 };
35201
35202-void *get_tangier_ops(void)
35203+const void *get_tangier_ops(void)
35204 {
35205 return &tangier_ops;
35206 }
35207diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35208index c9a0838..fae0977 100644
35209--- a/arch/x86/platform/intel-quark/imr_selftest.c
35210+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35211@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35212 */
35213 static void __init imr_self_test(void)
35214 {
35215- phys_addr_t base = virt_to_phys(&_text);
35216+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35217 size_t size = virt_to_phys(&__end_rodata) - base;
35218 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35219 int ret;
35220diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35221index d6ee929..3637cb5 100644
35222--- a/arch/x86/platform/olpc/olpc_dt.c
35223+++ b/arch/x86/platform/olpc/olpc_dt.c
35224@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35225 return res;
35226 }
35227
35228-static struct of_pdt_ops prom_olpc_ops __initdata = {
35229+static struct of_pdt_ops prom_olpc_ops __initconst = {
35230 .nextprop = olpc_dt_nextprop,
35231 .getproplen = olpc_dt_getproplen,
35232 .getproperty = olpc_dt_getproperty,
35233diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35234index 3e32ed5..cc0adc5 100644
35235--- a/arch/x86/power/cpu.c
35236+++ b/arch/x86/power/cpu.c
35237@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35238 static void fix_processor_context(void)
35239 {
35240 int cpu = smp_processor_id();
35241- struct tss_struct *t = &per_cpu(init_tss, cpu);
35242-#ifdef CONFIG_X86_64
35243- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35244- tss_desc tss;
35245-#endif
35246+ struct tss_struct *t = init_tss + cpu;
35247+
35248 set_tss_desc(cpu, t); /*
35249 * This just modifies memory; should not be
35250 * necessary. But... This is necessary, because
35251@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35252 */
35253
35254 #ifdef CONFIG_X86_64
35255- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35256- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35257- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35258-
35259 syscall_init(); /* This sets MSR_*STAR and related */
35260 #endif
35261 load_TR_desc(); /* This does ltr */
35262diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35263index 0b7a63d..0d0f2c2 100644
35264--- a/arch/x86/realmode/init.c
35265+++ b/arch/x86/realmode/init.c
35266@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35267 __va(real_mode_header->trampoline_header);
35268
35269 #ifdef CONFIG_X86_32
35270- trampoline_header->start = __pa_symbol(startup_32_smp);
35271+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35272+
35273+#ifdef CONFIG_PAX_KERNEXEC
35274+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35275+#endif
35276+
35277+ trampoline_header->boot_cs = __BOOT_CS;
35278 trampoline_header->gdt_limit = __BOOT_DS + 7;
35279 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35280 #else
35281@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35282 *trampoline_cr4_features = __read_cr4();
35283
35284 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35285- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35286+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35287 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35288 #endif
35289 }
35290diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35291index 2730d77..2e4cd19 100644
35292--- a/arch/x86/realmode/rm/Makefile
35293+++ b/arch/x86/realmode/rm/Makefile
35294@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35295
35296 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35297 -I$(srctree)/arch/x86/boot
35298+ifdef CONSTIFY_PLUGIN
35299+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35300+endif
35301 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35302 GCOV_PROFILE := n
35303diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35304index a28221d..93c40f1 100644
35305--- a/arch/x86/realmode/rm/header.S
35306+++ b/arch/x86/realmode/rm/header.S
35307@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35308 #endif
35309 /* APM/BIOS reboot */
35310 .long pa_machine_real_restart_asm
35311-#ifdef CONFIG_X86_64
35312+#ifdef CONFIG_X86_32
35313+ .long __KERNEL_CS
35314+#else
35315 .long __KERNEL32_CS
35316 #endif
35317 END(real_mode_header)
35318diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35319index d66c607..3def845 100644
35320--- a/arch/x86/realmode/rm/reboot.S
35321+++ b/arch/x86/realmode/rm/reboot.S
35322@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35323 lgdtl pa_tr_gdt
35324
35325 /* Disable paging to drop us out of long mode */
35326+ movl %cr4, %eax
35327+ andl $~X86_CR4_PCIDE, %eax
35328+ movl %eax, %cr4
35329+
35330 movl %cr0, %eax
35331 andl $~X86_CR0_PG, %eax
35332 movl %eax, %cr0
35333diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35334index 48ddd76..c26749f 100644
35335--- a/arch/x86/realmode/rm/trampoline_32.S
35336+++ b/arch/x86/realmode/rm/trampoline_32.S
35337@@ -24,6 +24,12 @@
35338 #include <asm/page_types.h>
35339 #include "realmode.h"
35340
35341+#ifdef CONFIG_PAX_KERNEXEC
35342+#define ta(X) (X)
35343+#else
35344+#define ta(X) (pa_ ## X)
35345+#endif
35346+
35347 .text
35348 .code16
35349
35350@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35351
35352 cli # We should be safe anyway
35353
35354- movl tr_start, %eax # where we need to go
35355-
35356 movl $0xA5A5A5A5, trampoline_status
35357 # write marker for master knows we're running
35358
35359@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35360 movw $1, %dx # protected mode (PE) bit
35361 lmsw %dx # into protected mode
35362
35363- ljmpl $__BOOT_CS, $pa_startup_32
35364+ ljmpl *(trampoline_header)
35365
35366 .section ".text32","ax"
35367 .code32
35368@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35369 .balign 8
35370 GLOBAL(trampoline_header)
35371 tr_start: .space 4
35372- tr_gdt_pad: .space 2
35373+ tr_boot_cs: .space 2
35374 tr_gdt: .space 6
35375 END(trampoline_header)
35376
35377diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35378index dac7b20..72dbaca 100644
35379--- a/arch/x86/realmode/rm/trampoline_64.S
35380+++ b/arch/x86/realmode/rm/trampoline_64.S
35381@@ -93,6 +93,7 @@ ENTRY(startup_32)
35382 movl %edx, %gs
35383
35384 movl pa_tr_cr4, %eax
35385+ andl $~X86_CR4_PCIDE, %eax
35386 movl %eax, %cr4 # Enable PAE mode
35387
35388 # Setup trampoline 4 level pagetables
35389@@ -106,7 +107,7 @@ ENTRY(startup_32)
35390 wrmsr
35391
35392 # Enable paging and in turn activate Long Mode
35393- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35394+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35395 movl %eax, %cr0
35396
35397 /*
35398diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35399index 9e7e147..25a4158 100644
35400--- a/arch/x86/realmode/rm/wakeup_asm.S
35401+++ b/arch/x86/realmode/rm/wakeup_asm.S
35402@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35403 lgdtl pmode_gdt
35404
35405 /* This really couldn't... */
35406- movl pmode_entry, %eax
35407 movl pmode_cr0, %ecx
35408 movl %ecx, %cr0
35409- ljmpl $__KERNEL_CS, $pa_startup_32
35410- /* -> jmp *%eax in trampoline_32.S */
35411+
35412+ ljmpl *pmode_entry
35413 #else
35414 jmp trampoline_start
35415 #endif
35416diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35417index 604a37e..e49702a 100644
35418--- a/arch/x86/tools/Makefile
35419+++ b/arch/x86/tools/Makefile
35420@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35421
35422 $(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
35423
35424-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35425+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35426 hostprogs-y += relocs
35427 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35428 PHONY += relocs
35429diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35430index 0c2fae8..88036b7 100644
35431--- a/arch/x86/tools/relocs.c
35432+++ b/arch/x86/tools/relocs.c
35433@@ -1,5 +1,7 @@
35434 /* This is included from relocs_32/64.c */
35435
35436+#include "../../../include/generated/autoconf.h"
35437+
35438 #define ElfW(type) _ElfW(ELF_BITS, type)
35439 #define _ElfW(bits, type) __ElfW(bits, type)
35440 #define __ElfW(bits, type) Elf##bits##_##type
35441@@ -11,6 +13,7 @@
35442 #define Elf_Sym ElfW(Sym)
35443
35444 static Elf_Ehdr ehdr;
35445+static Elf_Phdr *phdr;
35446
35447 struct relocs {
35448 uint32_t *offset;
35449@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35450 }
35451 }
35452
35453+static void read_phdrs(FILE *fp)
35454+{
35455+ unsigned int i;
35456+
35457+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35458+ if (!phdr) {
35459+ die("Unable to allocate %d program headers\n",
35460+ ehdr.e_phnum);
35461+ }
35462+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35463+ die("Seek to %d failed: %s\n",
35464+ ehdr.e_phoff, strerror(errno));
35465+ }
35466+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35467+ die("Cannot read ELF program headers: %s\n",
35468+ strerror(errno));
35469+ }
35470+ for(i = 0; i < ehdr.e_phnum; i++) {
35471+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35472+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35473+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35474+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35475+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35476+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35477+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35478+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35479+ }
35480+
35481+}
35482+
35483 static void read_shdrs(FILE *fp)
35484 {
35485- int i;
35486+ unsigned int i;
35487 Elf_Shdr shdr;
35488
35489 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35490@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35491
35492 static void read_strtabs(FILE *fp)
35493 {
35494- int i;
35495+ unsigned int i;
35496 for (i = 0; i < ehdr.e_shnum; i++) {
35497 struct section *sec = &secs[i];
35498 if (sec->shdr.sh_type != SHT_STRTAB) {
35499@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35500
35501 static void read_symtabs(FILE *fp)
35502 {
35503- int i,j;
35504+ unsigned int i,j;
35505 for (i = 0; i < ehdr.e_shnum; i++) {
35506 struct section *sec = &secs[i];
35507 if (sec->shdr.sh_type != SHT_SYMTAB) {
35508@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35509 }
35510
35511
35512-static void read_relocs(FILE *fp)
35513+static void read_relocs(FILE *fp, int use_real_mode)
35514 {
35515- int i,j;
35516+ unsigned int i,j;
35517+ uint32_t base;
35518+
35519 for (i = 0; i < ehdr.e_shnum; i++) {
35520 struct section *sec = &secs[i];
35521 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35522@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35523 die("Cannot read symbol table: %s\n",
35524 strerror(errno));
35525 }
35526+ base = 0;
35527+
35528+#ifdef CONFIG_X86_32
35529+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35530+ if (phdr[j].p_type != PT_LOAD )
35531+ continue;
35532+ 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)
35533+ continue;
35534+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35535+ break;
35536+ }
35537+#endif
35538+
35539 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35540 Elf_Rel *rel = &sec->reltab[j];
35541- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35542+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35543 rel->r_info = elf_xword_to_cpu(rel->r_info);
35544 #if (SHT_REL_TYPE == SHT_RELA)
35545 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35546@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35547
35548 static void print_absolute_symbols(void)
35549 {
35550- int i;
35551+ unsigned int i;
35552 const char *format;
35553
35554 if (ELF_BITS == 64)
35555@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35556 for (i = 0; i < ehdr.e_shnum; i++) {
35557 struct section *sec = &secs[i];
35558 char *sym_strtab;
35559- int j;
35560+ unsigned int j;
35561
35562 if (sec->shdr.sh_type != SHT_SYMTAB) {
35563 continue;
35564@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35565
35566 static void print_absolute_relocs(void)
35567 {
35568- int i, printed = 0;
35569+ unsigned int i, printed = 0;
35570 const char *format;
35571
35572 if (ELF_BITS == 64)
35573@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35574 struct section *sec_applies, *sec_symtab;
35575 char *sym_strtab;
35576 Elf_Sym *sh_symtab;
35577- int j;
35578+ unsigned int j;
35579 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35580 continue;
35581 }
35582@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35583 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35584 Elf_Sym *sym, const char *symname))
35585 {
35586- int i;
35587+ unsigned int i;
35588 /* Walk through the relocations */
35589 for (i = 0; i < ehdr.e_shnum; i++) {
35590 char *sym_strtab;
35591 Elf_Sym *sh_symtab;
35592 struct section *sec_applies, *sec_symtab;
35593- int j;
35594+ unsigned int j;
35595 struct section *sec = &secs[i];
35596
35597 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35598@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35599 {
35600 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35601 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35602+ char *sym_strtab = sec->link->link->strtab;
35603+
35604+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35605+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35606+ return 0;
35607+
35608+#ifdef CONFIG_PAX_KERNEXEC
35609+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35610+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35611+ return 0;
35612+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35613+ return 0;
35614+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35615+ return 0;
35616+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35617+ return 0;
35618+#endif
35619
35620 switch (r_type) {
35621 case R_386_NONE:
35622@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35623
35624 static void emit_relocs(int as_text, int use_real_mode)
35625 {
35626- int i;
35627+ unsigned int i;
35628 int (*write_reloc)(uint32_t, FILE *) = write32;
35629 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35630 const char *symname);
35631@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35632 {
35633 regex_init(use_real_mode);
35634 read_ehdr(fp);
35635+ read_phdrs(fp);
35636 read_shdrs(fp);
35637 read_strtabs(fp);
35638 read_symtabs(fp);
35639- read_relocs(fp);
35640+ read_relocs(fp, use_real_mode);
35641 if (ELF_BITS == 64)
35642 percpu_init();
35643 if (show_absolute_syms) {
35644diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35645index f40281e..92728c9 100644
35646--- a/arch/x86/um/mem_32.c
35647+++ b/arch/x86/um/mem_32.c
35648@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35649 gate_vma.vm_start = FIXADDR_USER_START;
35650 gate_vma.vm_end = FIXADDR_USER_END;
35651 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35652- gate_vma.vm_page_prot = __P101;
35653+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35654
35655 return 0;
35656 }
35657diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35658index 80ffa5b..a33bd15 100644
35659--- a/arch/x86/um/tls_32.c
35660+++ b/arch/x86/um/tls_32.c
35661@@ -260,7 +260,7 @@ out:
35662 if (unlikely(task == current &&
35663 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35664 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35665- "without flushed TLS.", current->pid);
35666+ "without flushed TLS.", task_pid_nr(current));
35667 }
35668
35669 return 0;
35670diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35671index 8533c96..ff98c52 100644
35672--- a/arch/x86/vdso/Makefile
35673+++ b/arch/x86/vdso/Makefile
35674@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35675 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35676 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35677
35678-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35679+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35680 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35681 GCOV_PROFILE := n
35682
35683diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35684index 0224987..c7d65a5 100644
35685--- a/arch/x86/vdso/vdso2c.h
35686+++ b/arch/x86/vdso/vdso2c.h
35687@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35688 unsigned long load_size = -1; /* Work around bogus warning */
35689 unsigned long mapping_size;
35690 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35691- int i;
35692+ unsigned int i;
35693 unsigned long j;
35694 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35695 *alt_sec = NULL;
35696diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35697index e904c27..b9eaa03 100644
35698--- a/arch/x86/vdso/vdso32-setup.c
35699+++ b/arch/x86/vdso/vdso32-setup.c
35700@@ -14,6 +14,7 @@
35701 #include <asm/cpufeature.h>
35702 #include <asm/processor.h>
35703 #include <asm/vdso.h>
35704+#include <asm/mman.h>
35705
35706 #ifdef CONFIG_COMPAT_VDSO
35707 #define VDSO_DEFAULT 0
35708diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35709index 1c9f750..cfddb1a 100644
35710--- a/arch/x86/vdso/vma.c
35711+++ b/arch/x86/vdso/vma.c
35712@@ -19,10 +19,7 @@
35713 #include <asm/page.h>
35714 #include <asm/hpet.h>
35715 #include <asm/desc.h>
35716-
35717-#if defined(CONFIG_X86_64)
35718-unsigned int __read_mostly vdso64_enabled = 1;
35719-#endif
35720+#include <asm/mman.h>
35721
35722 void __init init_vdso_image(const struct vdso_image *image)
35723 {
35724@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35725 .pages = no_pages,
35726 };
35727
35728+#ifdef CONFIG_PAX_RANDMMAP
35729+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35730+ calculate_addr = false;
35731+#endif
35732+
35733 if (calculate_addr) {
35734 addr = vdso_addr(current->mm->start_stack,
35735 image->size - image->sym_vvar_start);
35736@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35737 down_write(&mm->mmap_sem);
35738
35739 addr = get_unmapped_area(NULL, addr,
35740- image->size - image->sym_vvar_start, 0, 0);
35741+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35742 if (IS_ERR_VALUE(addr)) {
35743 ret = addr;
35744 goto up_fail;
35745 }
35746
35747 text_start = addr - image->sym_vvar_start;
35748- current->mm->context.vdso = (void __user *)text_start;
35749+ mm->context.vdso = text_start;
35750
35751 /*
35752 * MAYWRITE to allow gdb to COW and set breakpoints
35753@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35754 hpet_address >> PAGE_SHIFT,
35755 PAGE_SIZE,
35756 pgprot_noncached(PAGE_READONLY));
35757-
35758- if (ret)
35759- goto up_fail;
35760 }
35761 #endif
35762
35763 up_fail:
35764 if (ret)
35765- current->mm->context.vdso = NULL;
35766+ current->mm->context.vdso = 0;
35767
35768 up_write(&mm->mmap_sem);
35769 return ret;
35770@@ -191,8 +190,8 @@ static int load_vdso32(void)
35771
35772 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35773 current_thread_info()->sysenter_return =
35774- current->mm->context.vdso +
35775- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35776+ (void __force_user *)(current->mm->context.vdso +
35777+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35778
35779 return 0;
35780 }
35781@@ -201,9 +200,6 @@ static int load_vdso32(void)
35782 #ifdef CONFIG_X86_64
35783 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35784 {
35785- if (!vdso64_enabled)
35786- return 0;
35787-
35788 return map_vdso(&vdso_image_64, true);
35789 }
35790
35791@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35792 int uses_interp)
35793 {
35794 #ifdef CONFIG_X86_X32_ABI
35795- if (test_thread_flag(TIF_X32)) {
35796- if (!vdso64_enabled)
35797- return 0;
35798-
35799+ if (test_thread_flag(TIF_X32))
35800 return map_vdso(&vdso_image_x32, true);
35801- }
35802 #endif
35803
35804 return load_vdso32();
35805@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35806 #endif
35807
35808 #ifdef CONFIG_X86_64
35809-static __init int vdso_setup(char *s)
35810-{
35811- vdso64_enabled = simple_strtoul(s, NULL, 0);
35812- return 0;
35813-}
35814-__setup("vdso=", vdso_setup);
35815-#endif
35816-
35817-#ifdef CONFIG_X86_64
35818 static void vgetcpu_cpu_init(void *arg)
35819 {
35820 int cpu = smp_processor_id();
35821diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35822index e88fda8..76ce7ce 100644
35823--- a/arch/x86/xen/Kconfig
35824+++ b/arch/x86/xen/Kconfig
35825@@ -9,6 +9,7 @@ config XEN
35826 select XEN_HAVE_PVMMU
35827 depends on X86_64 || (X86_32 && X86_PAE)
35828 depends on X86_TSC
35829+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35830 help
35831 This is the Linux Xen port. Enabling this will allow the
35832 kernel to boot in a paravirtualized environment under the
35833diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35834index 5240f56..0c12163 100644
35835--- a/arch/x86/xen/enlighten.c
35836+++ b/arch/x86/xen/enlighten.c
35837@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35838
35839 struct shared_info xen_dummy_shared_info;
35840
35841-void *xen_initial_gdt;
35842-
35843 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35844 __read_mostly int xen_have_vector_callback;
35845 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35846@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35847 {
35848 unsigned long va = dtr->address;
35849 unsigned int size = dtr->size + 1;
35850- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35851- unsigned long frames[pages];
35852+ unsigned long frames[65536 / PAGE_SIZE];
35853 int f;
35854
35855 /*
35856@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35857 {
35858 unsigned long va = dtr->address;
35859 unsigned int size = dtr->size + 1;
35860- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35861- unsigned long frames[pages];
35862+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35863 int f;
35864
35865 /*
35866@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35867 * 8-byte entries, or 16 4k pages..
35868 */
35869
35870- BUG_ON(size > 65536);
35871+ BUG_ON(size > GDT_SIZE);
35872 BUG_ON(va & ~PAGE_MASK);
35873
35874 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35875@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35876 return 0;
35877 }
35878
35879-static void set_xen_basic_apic_ops(void)
35880+static void __init set_xen_basic_apic_ops(void)
35881 {
35882 apic->read = xen_apic_read;
35883 apic->write = xen_apic_write;
35884@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35885 #endif
35886 };
35887
35888-static void xen_reboot(int reason)
35889+static __noreturn void xen_reboot(int reason)
35890 {
35891 struct sched_shutdown r = { .reason = reason };
35892
35893- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35894- BUG();
35895+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35896+ BUG();
35897 }
35898
35899-static void xen_restart(char *msg)
35900+static __noreturn void xen_restart(char *msg)
35901 {
35902 xen_reboot(SHUTDOWN_reboot);
35903 }
35904
35905-static void xen_emergency_restart(void)
35906+static __noreturn void xen_emergency_restart(void)
35907 {
35908 xen_reboot(SHUTDOWN_reboot);
35909 }
35910
35911-static void xen_machine_halt(void)
35912+static __noreturn void xen_machine_halt(void)
35913 {
35914 xen_reboot(SHUTDOWN_poweroff);
35915 }
35916
35917-static void xen_machine_power_off(void)
35918+static __noreturn void xen_machine_power_off(void)
35919 {
35920 if (pm_power_off)
35921 pm_power_off();
35922@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35923 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35924 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35925
35926- setup_stack_canary_segment(0);
35927- switch_to_new_gdt(0);
35928+ setup_stack_canary_segment(cpu);
35929+#ifdef CONFIG_X86_64
35930+ load_percpu_segment(cpu);
35931+#endif
35932+ switch_to_new_gdt(cpu);
35933
35934 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35935 pv_cpu_ops.load_gdt = xen_load_gdt;
35936@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35937 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35938
35939 /* Work out if we support NX */
35940- x86_configure_nx();
35941+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35942+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35943+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35944+ unsigned l, h;
35945+
35946+ __supported_pte_mask |= _PAGE_NX;
35947+ rdmsr(MSR_EFER, l, h);
35948+ l |= EFER_NX;
35949+ wrmsr(MSR_EFER, l, h);
35950+ }
35951+#endif
35952
35953 /* Get mfn list */
35954 xen_build_dynamic_phys_to_machine();
35955@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35956
35957 machine_ops = xen_machine_ops;
35958
35959- /*
35960- * The only reliable way to retain the initial address of the
35961- * percpu gdt_page is to remember it here, so we can go and
35962- * mark it RW later, when the initial percpu area is freed.
35963- */
35964- xen_initial_gdt = &per_cpu(gdt_page, 0);
35965-
35966 xen_smp_init();
35967
35968 #ifdef CONFIG_ACPI_NUMA
35969diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35970index adca9e2..cdba9d1 100644
35971--- a/arch/x86/xen/mmu.c
35972+++ b/arch/x86/xen/mmu.c
35973@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35974 return val;
35975 }
35976
35977-static pteval_t pte_pfn_to_mfn(pteval_t val)
35978+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35979 {
35980 if (val & _PAGE_PRESENT) {
35981 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35982@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35983 * L3_k[511] -> level2_fixmap_pgt */
35984 convert_pfn_mfn(level3_kernel_pgt);
35985
35986+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35987+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35988+ convert_pfn_mfn(level3_vmemmap_pgt);
35989 /* L3_k[511][506] -> level1_fixmap_pgt */
35990+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35991 convert_pfn_mfn(level2_fixmap_pgt);
35992 }
35993 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35994@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35995 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35996 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35997 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35998+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35999+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
36000+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
36001 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
36002 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
36003+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
36004 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
36005 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
36006- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
36007+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
36008+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
36009+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
36010+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
36011
36012 /* Pin down new L4 */
36013 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
36014@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
36015 pv_mmu_ops.set_pud = xen_set_pud;
36016 #if PAGETABLE_LEVELS == 4
36017 pv_mmu_ops.set_pgd = xen_set_pgd;
36018+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
36019 #endif
36020
36021 /* This will work as long as patching hasn't happened yet
36022@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
36023 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
36024 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
36025 .set_pgd = xen_set_pgd_hyper,
36026+ .set_pgd_batched = xen_set_pgd_hyper,
36027
36028 .alloc_pud = xen_alloc_pmd_init,
36029 .release_pud = xen_release_pmd_init,
36030diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
36031index 08e8489..b1e182f 100644
36032--- a/arch/x86/xen/smp.c
36033+++ b/arch/x86/xen/smp.c
36034@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
36035
36036 if (xen_pv_domain()) {
36037 if (!xen_feature(XENFEAT_writable_page_tables))
36038- /* We've switched to the "real" per-cpu gdt, so make
36039- * sure the old memory can be recycled. */
36040- make_lowmem_page_readwrite(xen_initial_gdt);
36041-
36042 #ifdef CONFIG_X86_32
36043 /*
36044 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
36045 * expects __USER_DS
36046 */
36047- loadsegment(ds, __USER_DS);
36048- loadsegment(es, __USER_DS);
36049+ loadsegment(ds, __KERNEL_DS);
36050+ loadsegment(es, __KERNEL_DS);
36051 #endif
36052
36053 xen_filter_cpu_maps();
36054@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36055 #ifdef CONFIG_X86_32
36056 /* Note: PVH is not yet supported on x86_32. */
36057 ctxt->user_regs.fs = __KERNEL_PERCPU;
36058- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
36059+ savesegment(gs, ctxt->user_regs.gs);
36060 #endif
36061 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
36062
36063@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
36064 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
36065 ctxt->flags = VGCF_IN_KERNEL;
36066 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
36067- ctxt->user_regs.ds = __USER_DS;
36068- ctxt->user_regs.es = __USER_DS;
36069+ ctxt->user_regs.ds = __KERNEL_DS;
36070+ ctxt->user_regs.es = __KERNEL_DS;
36071 ctxt->user_regs.ss = __KERNEL_DS;
36072
36073 xen_copy_trap_info(ctxt->trap_ctxt);
36074@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
36075 int rc;
36076
36077 per_cpu(current_task, cpu) = idle;
36078+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
36079 #ifdef CONFIG_X86_32
36080 irq_ctx_init(cpu);
36081 #else
36082 clear_tsk_thread_flag(idle, TIF_FORK);
36083 #endif
36084- per_cpu(kernel_stack, cpu) =
36085- (unsigned long)task_stack_page(idle) -
36086- KERNEL_STACK_OFFSET + THREAD_SIZE;
36087+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
36088
36089 xen_setup_runstate_info(cpu);
36090 xen_setup_timer(cpu);
36091@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
36092
36093 void __init xen_smp_init(void)
36094 {
36095- smp_ops = xen_smp_ops;
36096+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
36097 xen_fill_possible_map();
36098 }
36099
36100diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
36101index fd92a64..1f72641 100644
36102--- a/arch/x86/xen/xen-asm_32.S
36103+++ b/arch/x86/xen/xen-asm_32.S
36104@@ -99,7 +99,7 @@ ENTRY(xen_iret)
36105 pushw %fs
36106 movl $(__KERNEL_PERCPU), %eax
36107 movl %eax, %fs
36108- movl %fs:xen_vcpu, %eax
36109+ mov PER_CPU_VAR(xen_vcpu), %eax
36110 POP_FS
36111 #else
36112 movl %ss:xen_vcpu, %eax
36113diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36114index 674b2225..f1f5dc1 100644
36115--- a/arch/x86/xen/xen-head.S
36116+++ b/arch/x86/xen/xen-head.S
36117@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36118 #ifdef CONFIG_X86_32
36119 mov %esi,xen_start_info
36120 mov $init_thread_union+THREAD_SIZE,%esp
36121+#ifdef CONFIG_SMP
36122+ movl $cpu_gdt_table,%edi
36123+ movl $__per_cpu_load,%eax
36124+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36125+ rorl $16,%eax
36126+ movb %al,__KERNEL_PERCPU + 4(%edi)
36127+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36128+ movl $__per_cpu_end - 1,%eax
36129+ subl $__per_cpu_start,%eax
36130+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36131+#endif
36132 #else
36133 mov %rsi,xen_start_info
36134 mov $init_thread_union+THREAD_SIZE,%rsp
36135diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36136index 9e195c6..523ed36 100644
36137--- a/arch/x86/xen/xen-ops.h
36138+++ b/arch/x86/xen/xen-ops.h
36139@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36140 void xen_syscall32_target(void);
36141 #endif
36142
36143-extern void *xen_initial_gdt;
36144-
36145 struct trap_info;
36146 void xen_copy_trap_info(struct trap_info *traps);
36147
36148diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36149index 525bd3d..ef888b1 100644
36150--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36151+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36152@@ -119,9 +119,9 @@
36153 ----------------------------------------------------------------------*/
36154
36155 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36156-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36157 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36158 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36159+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36160
36161 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36162 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36163diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36164index 2f33760..835e50a 100644
36165--- a/arch/xtensa/variants/fsf/include/variant/core.h
36166+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36167@@ -11,6 +11,7 @@
36168 #ifndef _XTENSA_CORE_H
36169 #define _XTENSA_CORE_H
36170
36171+#include <linux/const.h>
36172
36173 /****************************************************************************
36174 Parameters Useful for Any Code, USER or PRIVILEGED
36175@@ -112,9 +113,9 @@
36176 ----------------------------------------------------------------------*/
36177
36178 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36179-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36180 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36181 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36182+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36183
36184 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36185 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36186diff --git a/block/bio.c b/block/bio.c
36187index f66a4ea..73ddf55 100644
36188--- a/block/bio.c
36189+++ b/block/bio.c
36190@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36191 /*
36192 * Overflow, abort
36193 */
36194- if (end < start)
36195+ if (end < start || end - start > INT_MAX - nr_pages)
36196 return ERR_PTR(-EINVAL);
36197
36198 nr_pages += end - start;
36199@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36200 /*
36201 * Overflow, abort
36202 */
36203- if (end < start)
36204+ if (end < start || end - start > INT_MAX - nr_pages)
36205 return ERR_PTR(-EINVAL);
36206
36207 nr_pages += end - start;
36208diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36209index 0736729..2ec3b48 100644
36210--- a/block/blk-iopoll.c
36211+++ b/block/blk-iopoll.c
36212@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36213 }
36214 EXPORT_SYMBOL(blk_iopoll_complete);
36215
36216-static void blk_iopoll_softirq(struct softirq_action *h)
36217+static __latent_entropy void blk_iopoll_softirq(void)
36218 {
36219 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36220 int rearm = 0, budget = blk_iopoll_budget;
36221diff --git a/block/blk-map.c b/block/blk-map.c
36222index b8d2725..08c52b0 100644
36223--- a/block/blk-map.c
36224+++ b/block/blk-map.c
36225@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36226 if (!len || !kbuf)
36227 return -EINVAL;
36228
36229- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36230+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36231 if (do_copy)
36232 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36233 else
36234diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36235index 53b1737..08177d2e 100644
36236--- a/block/blk-softirq.c
36237+++ b/block/blk-softirq.c
36238@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36239 * Softirq action handler - move entries to local list and loop over them
36240 * while passing them to the queue registered handler.
36241 */
36242-static void blk_done_softirq(struct softirq_action *h)
36243+static __latent_entropy void blk_done_softirq(void)
36244 {
36245 struct list_head *cpu_list, local_list;
36246
36247diff --git a/block/bsg.c b/block/bsg.c
36248index d214e92..9649863 100644
36249--- a/block/bsg.c
36250+++ b/block/bsg.c
36251@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36252 struct sg_io_v4 *hdr, struct bsg_device *bd,
36253 fmode_t has_write_perm)
36254 {
36255+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36256+ unsigned char *cmdptr;
36257+
36258 if (hdr->request_len > BLK_MAX_CDB) {
36259 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36260 if (!rq->cmd)
36261 return -ENOMEM;
36262- }
36263+ cmdptr = rq->cmd;
36264+ } else
36265+ cmdptr = tmpcmd;
36266
36267- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36268+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36269 hdr->request_len))
36270 return -EFAULT;
36271
36272+ if (cmdptr != rq->cmd)
36273+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36274+
36275 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36276 if (blk_verify_command(rq->cmd, has_write_perm))
36277 return -EPERM;
36278diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36279index f678c73..f35aa18 100644
36280--- a/block/compat_ioctl.c
36281+++ b/block/compat_ioctl.c
36282@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36283 cgc = compat_alloc_user_space(sizeof(*cgc));
36284 cgc32 = compat_ptr(arg);
36285
36286- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36287+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36288 get_user(data, &cgc32->buffer) ||
36289 put_user(compat_ptr(data), &cgc->buffer) ||
36290 copy_in_user(&cgc->buflen, &cgc32->buflen,
36291@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36292 err |= __get_user(f->spec1, &uf->spec1);
36293 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36294 err |= __get_user(name, &uf->name);
36295- f->name = compat_ptr(name);
36296+ f->name = (void __force_kernel *)compat_ptr(name);
36297 if (err) {
36298 err = -EFAULT;
36299 goto out;
36300diff --git a/block/genhd.c b/block/genhd.c
36301index ea982ea..86e0f9e 100644
36302--- a/block/genhd.c
36303+++ b/block/genhd.c
36304@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36305
36306 /*
36307 * Register device numbers dev..(dev+range-1)
36308- * range must be nonzero
36309+ * Noop if @range is zero.
36310 * The hash chain is sorted on range, so that subranges can override.
36311 */
36312 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36313 struct kobject *(*probe)(dev_t, int *, void *),
36314 int (*lock)(dev_t, void *), void *data)
36315 {
36316- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36317+ if (range)
36318+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36319 }
36320
36321 EXPORT_SYMBOL(blk_register_region);
36322
36323+/* undo blk_register_region(), noop if @range is zero */
36324 void blk_unregister_region(dev_t devt, unsigned long range)
36325 {
36326- kobj_unmap(bdev_map, devt, range);
36327+ if (range)
36328+ kobj_unmap(bdev_map, devt, range);
36329 }
36330
36331 EXPORT_SYMBOL(blk_unregister_region);
36332diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36333index 26cb624..a49c3a5 100644
36334--- a/block/partitions/efi.c
36335+++ b/block/partitions/efi.c
36336@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36337 if (!gpt)
36338 return NULL;
36339
36340+ if (!le32_to_cpu(gpt->num_partition_entries))
36341+ return NULL;
36342+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36343+ if (!pte)
36344+ return NULL;
36345+
36346 count = le32_to_cpu(gpt->num_partition_entries) *
36347 le32_to_cpu(gpt->sizeof_partition_entry);
36348- if (!count)
36349- return NULL;
36350- pte = kmalloc(count, GFP_KERNEL);
36351- if (!pte)
36352- return NULL;
36353-
36354 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36355 (u8 *) pte, count) < count) {
36356 kfree(pte);
36357diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36358index e1f71c3..02d295a 100644
36359--- a/block/scsi_ioctl.c
36360+++ b/block/scsi_ioctl.c
36361@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36362 return put_user(0, p);
36363 }
36364
36365-static int sg_get_timeout(struct request_queue *q)
36366+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36367 {
36368 return jiffies_to_clock_t(q->sg_timeout);
36369 }
36370@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36371 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36372 struct sg_io_hdr *hdr, fmode_t mode)
36373 {
36374- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36375+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36376+ unsigned char *cmdptr;
36377+
36378+ if (rq->cmd != rq->__cmd)
36379+ cmdptr = rq->cmd;
36380+ else
36381+ cmdptr = tmpcmd;
36382+
36383+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36384 return -EFAULT;
36385+
36386+ if (cmdptr != rq->cmd)
36387+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36388+
36389 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36390 return -EPERM;
36391
36392@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36393 int err;
36394 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36395 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36396+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36397+ unsigned char *cmdptr;
36398
36399 if (!sic)
36400 return -EINVAL;
36401@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36402 */
36403 err = -EFAULT;
36404 rq->cmd_len = cmdlen;
36405- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36406+
36407+ if (rq->cmd != rq->__cmd)
36408+ cmdptr = rq->cmd;
36409+ else
36410+ cmdptr = tmpcmd;
36411+
36412+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36413 goto error;
36414
36415+ if (rq->cmd != cmdptr)
36416+ memcpy(rq->cmd, cmdptr, cmdlen);
36417+
36418 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36419 goto error;
36420
36421diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36422index 650afac1..f3307de 100644
36423--- a/crypto/cryptd.c
36424+++ b/crypto/cryptd.c
36425@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36426
36427 struct cryptd_blkcipher_request_ctx {
36428 crypto_completion_t complete;
36429-};
36430+} __no_const;
36431
36432 struct cryptd_hash_ctx {
36433 struct crypto_shash *child;
36434@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36435
36436 struct cryptd_aead_request_ctx {
36437 crypto_completion_t complete;
36438-};
36439+} __no_const;
36440
36441 static void cryptd_queue_worker(struct work_struct *work);
36442
36443diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36444index c305d41..a96de79 100644
36445--- a/crypto/pcrypt.c
36446+++ b/crypto/pcrypt.c
36447@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36448 int ret;
36449
36450 pinst->kobj.kset = pcrypt_kset;
36451- ret = kobject_add(&pinst->kobj, NULL, name);
36452+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36453 if (!ret)
36454 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36455
36456diff --git a/crypto/zlib.c b/crypto/zlib.c
36457index 0eefa9d..0fa3d29 100644
36458--- a/crypto/zlib.c
36459+++ b/crypto/zlib.c
36460@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36461 zlib_comp_exit(ctx);
36462
36463 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36464- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36465+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36466 : MAX_WBITS;
36467 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36468- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36469+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36470 : DEF_MEM_LEVEL;
36471
36472 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36473diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36474index 3b37676..898edfa 100644
36475--- a/drivers/acpi/acpica/hwxfsleep.c
36476+++ b/drivers/acpi/acpica/hwxfsleep.c
36477@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36478 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36479
36480 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36481- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36482- acpi_hw_extended_sleep},
36483- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36484- acpi_hw_extended_wake_prep},
36485- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36486+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36487+ .extended_function = acpi_hw_extended_sleep},
36488+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36489+ .extended_function = acpi_hw_extended_wake_prep},
36490+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36491+ .extended_function = acpi_hw_extended_wake}
36492 };
36493
36494 /*
36495diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36496index 16129c7..8b675cd 100644
36497--- a/drivers/acpi/apei/apei-internal.h
36498+++ b/drivers/acpi/apei/apei-internal.h
36499@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36500 struct apei_exec_ins_type {
36501 u32 flags;
36502 apei_exec_ins_func_t run;
36503-};
36504+} __do_const;
36505
36506 struct apei_exec_context {
36507 u32 ip;
36508diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36509index e82d097..0c855c1 100644
36510--- a/drivers/acpi/apei/ghes.c
36511+++ b/drivers/acpi/apei/ghes.c
36512@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36513 const struct acpi_hest_generic *generic,
36514 const struct acpi_hest_generic_status *estatus)
36515 {
36516- static atomic_t seqno;
36517+ static atomic_unchecked_t seqno;
36518 unsigned int curr_seqno;
36519 char pfx_seq[64];
36520
36521@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36522 else
36523 pfx = KERN_ERR;
36524 }
36525- curr_seqno = atomic_inc_return(&seqno);
36526+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36527 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36528 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36529 pfx_seq, generic->header.source_id);
36530diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36531index a83e3c6..c3d617f 100644
36532--- a/drivers/acpi/bgrt.c
36533+++ b/drivers/acpi/bgrt.c
36534@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36535 if (!bgrt_image)
36536 return -ENODEV;
36537
36538- bin_attr_image.private = bgrt_image;
36539- bin_attr_image.size = bgrt_image_size;
36540+ pax_open_kernel();
36541+ *(void **)&bin_attr_image.private = bgrt_image;
36542+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36543+ pax_close_kernel();
36544
36545 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36546 if (!bgrt_kobj)
36547diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36548index 9b693d5..8953d54 100644
36549--- a/drivers/acpi/blacklist.c
36550+++ b/drivers/acpi/blacklist.c
36551@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36552 u32 is_critical_error;
36553 };
36554
36555-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36556+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36557
36558 /*
36559 * POLICY: If *anything* doesn't work, put it on the blacklist.
36560@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36561 return 0;
36562 }
36563
36564-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36565+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36566 {
36567 .callback = dmi_disable_osi_vista,
36568 .ident = "Fujitsu Siemens",
36569diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36570index 8b67bd0..b59593e 100644
36571--- a/drivers/acpi/bus.c
36572+++ b/drivers/acpi/bus.c
36573@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36574 }
36575 #endif
36576
36577-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36578+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36579 /*
36580 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36581 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36582@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36583 {}
36584 };
36585 #else
36586-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36587+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36588 {}
36589 };
36590 #endif
36591diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36592index c68e724..e863008 100644
36593--- a/drivers/acpi/custom_method.c
36594+++ b/drivers/acpi/custom_method.c
36595@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36596 struct acpi_table_header table;
36597 acpi_status status;
36598
36599+#ifdef CONFIG_GRKERNSEC_KMEM
36600+ return -EPERM;
36601+#endif
36602+
36603 if (!(*ppos)) {
36604 /* parse the table header to get the table length */
36605 if (count <= sizeof(struct acpi_table_header))
36606diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36607index 735db11..91e07ff 100644
36608--- a/drivers/acpi/device_pm.c
36609+++ b/drivers/acpi/device_pm.c
36610@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36611
36612 #endif /* CONFIG_PM_SLEEP */
36613
36614+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36615+
36616 static struct dev_pm_domain acpi_general_pm_domain = {
36617 .ops = {
36618 .runtime_suspend = acpi_subsys_runtime_suspend,
36619@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36620 .restore_early = acpi_subsys_resume_early,
36621 #endif
36622 },
36623+ .detach = acpi_dev_pm_detach
36624 };
36625
36626 /**
36627@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36628 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36629 }
36630
36631- dev->pm_domain->detach = acpi_dev_pm_detach;
36632 return 0;
36633 }
36634 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36635diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36636index a8dd2f7..e15950e 100644
36637--- a/drivers/acpi/ec.c
36638+++ b/drivers/acpi/ec.c
36639@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36640 return 0;
36641 }
36642
36643-static struct dmi_system_id ec_dmi_table[] __initdata = {
36644+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36645 {
36646 ec_skip_dsdt_scan, "Compal JFL92", {
36647 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36648diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36649index 139d9e4..9a9d799 100644
36650--- a/drivers/acpi/pci_slot.c
36651+++ b/drivers/acpi/pci_slot.c
36652@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36653 return 0;
36654 }
36655
36656-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36657+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36658 /*
36659 * Fujitsu Primequest machines will return 1023 to indicate an
36660 * error if the _SUN method is evaluated on SxFy objects that
36661diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36662index d9f7158..168e742 100644
36663--- a/drivers/acpi/processor_driver.c
36664+++ b/drivers/acpi/processor_driver.c
36665@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36666 return NOTIFY_OK;
36667 }
36668
36669-static struct notifier_block __refdata acpi_cpu_notifier = {
36670+static struct notifier_block __refconst acpi_cpu_notifier = {
36671 .notifier_call = acpi_cpu_soft_notify,
36672 };
36673
36674diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36675index f98db0b..8309c83 100644
36676--- a/drivers/acpi/processor_idle.c
36677+++ b/drivers/acpi/processor_idle.c
36678@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36679 {
36680 int i, count = CPUIDLE_DRIVER_STATE_START;
36681 struct acpi_processor_cx *cx;
36682- struct cpuidle_state *state;
36683+ cpuidle_state_no_const *state;
36684 struct cpuidle_driver *drv = &acpi_idle_driver;
36685
36686 if (!pr->flags.power_setup_done)
36687diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36688index e5dd808..1eceed1 100644
36689--- a/drivers/acpi/processor_pdc.c
36690+++ b/drivers/acpi/processor_pdc.c
36691@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36692 return 0;
36693 }
36694
36695-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36696+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36697 {
36698 set_no_mwait, "Extensa 5220", {
36699 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36700diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36701index 7f251dd..47b262c 100644
36702--- a/drivers/acpi/sleep.c
36703+++ b/drivers/acpi/sleep.c
36704@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36705 return 0;
36706 }
36707
36708-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36709+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36710 {
36711 .callback = init_old_suspend_ordering,
36712 .ident = "Abit KN9 (nForce4 variant)",
36713diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36714index 13e577c..cef11ee 100644
36715--- a/drivers/acpi/sysfs.c
36716+++ b/drivers/acpi/sysfs.c
36717@@ -423,11 +423,11 @@ static u32 num_counters;
36718 static struct attribute **all_attrs;
36719 static u32 acpi_gpe_count;
36720
36721-static struct attribute_group interrupt_stats_attr_group = {
36722+static attribute_group_no_const interrupt_stats_attr_group = {
36723 .name = "interrupts",
36724 };
36725
36726-static struct kobj_attribute *counter_attrs;
36727+static kobj_attribute_no_const *counter_attrs;
36728
36729 static void delete_gpe_attr_array(void)
36730 {
36731diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36732index d24fa19..782f1e6 100644
36733--- a/drivers/acpi/thermal.c
36734+++ b/drivers/acpi/thermal.c
36735@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36736 return 0;
36737 }
36738
36739-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36740+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36741 /*
36742 * Award BIOS on this AOpen makes thermal control almost worthless.
36743 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36744diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36745index 26eb70c..4d66ddf 100644
36746--- a/drivers/acpi/video.c
36747+++ b/drivers/acpi/video.c
36748@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36749 return 0;
36750 }
36751
36752-static struct dmi_system_id video_dmi_table[] __initdata = {
36753+static const struct dmi_system_id video_dmi_table[] __initconst = {
36754 /*
36755 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36756 */
36757diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36758index 287c4ba..6a600bc 100644
36759--- a/drivers/ata/libahci.c
36760+++ b/drivers/ata/libahci.c
36761@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36762 }
36763 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36764
36765-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36766+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36767 struct ata_taskfile *tf, int is_cmd, u16 flags,
36768 unsigned long timeout_msec)
36769 {
36770diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36771index 87b4b7f..d876fbd 100644
36772--- a/drivers/ata/libata-core.c
36773+++ b/drivers/ata/libata-core.c
36774@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36775 static void ata_dev_xfermask(struct ata_device *dev);
36776 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36777
36778-atomic_t ata_print_id = ATOMIC_INIT(0);
36779+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36780
36781 struct ata_force_param {
36782 const char *name;
36783@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36784 struct ata_port *ap;
36785 unsigned int tag;
36786
36787- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36788+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36789 ap = qc->ap;
36790
36791 qc->flags = 0;
36792@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36793 struct ata_port *ap;
36794 struct ata_link *link;
36795
36796- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36797+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36798 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36799 ap = qc->ap;
36800 link = qc->dev->link;
36801@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36802 return;
36803
36804 spin_lock(&lock);
36805+ pax_open_kernel();
36806
36807 for (cur = ops->inherits; cur; cur = cur->inherits) {
36808 void **inherit = (void **)cur;
36809@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36810 if (IS_ERR(*pp))
36811 *pp = NULL;
36812
36813- ops->inherits = NULL;
36814+ *(struct ata_port_operations **)&ops->inherits = NULL;
36815
36816+ pax_close_kernel();
36817 spin_unlock(&lock);
36818 }
36819
36820@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36821
36822 /* give ports names and add SCSI hosts */
36823 for (i = 0; i < host->n_ports; i++) {
36824- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36825+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36826 host->ports[i]->local_port_no = i + 1;
36827 }
36828
36829diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36830index b061ba2..fdcd85f 100644
36831--- a/drivers/ata/libata-scsi.c
36832+++ b/drivers/ata/libata-scsi.c
36833@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36834
36835 if (rc)
36836 return rc;
36837- ap->print_id = atomic_inc_return(&ata_print_id);
36838+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36839 return 0;
36840 }
36841 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36842diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36843index f840ca1..edd6ef3 100644
36844--- a/drivers/ata/libata.h
36845+++ b/drivers/ata/libata.h
36846@@ -53,7 +53,7 @@ enum {
36847 ATA_DNXFER_QUIET = (1 << 31),
36848 };
36849
36850-extern atomic_t ata_print_id;
36851+extern atomic_unchecked_t ata_print_id;
36852 extern int atapi_passthru16;
36853 extern int libata_fua;
36854 extern int libata_noacpi;
36855diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36856index a9b0c82..207d97d 100644
36857--- a/drivers/ata/pata_arasan_cf.c
36858+++ b/drivers/ata/pata_arasan_cf.c
36859@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36860 /* Handle platform specific quirks */
36861 if (quirk) {
36862 if (quirk & CF_BROKEN_PIO) {
36863- ap->ops->set_piomode = NULL;
36864+ pax_open_kernel();
36865+ *(void **)&ap->ops->set_piomode = NULL;
36866+ pax_close_kernel();
36867 ap->pio_mask = 0;
36868 }
36869 if (quirk & CF_BROKEN_MWDMA)
36870diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36871index f9b983a..887b9d8 100644
36872--- a/drivers/atm/adummy.c
36873+++ b/drivers/atm/adummy.c
36874@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36875 vcc->pop(vcc, skb);
36876 else
36877 dev_kfree_skb_any(skb);
36878- atomic_inc(&vcc->stats->tx);
36879+ atomic_inc_unchecked(&vcc->stats->tx);
36880
36881 return 0;
36882 }
36883diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36884index f1a9198..f466a4a 100644
36885--- a/drivers/atm/ambassador.c
36886+++ b/drivers/atm/ambassador.c
36887@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36888 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36889
36890 // VC layer stats
36891- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36892+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36893
36894 // free the descriptor
36895 kfree (tx_descr);
36896@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36897 dump_skb ("<<<", vc, skb);
36898
36899 // VC layer stats
36900- atomic_inc(&atm_vcc->stats->rx);
36901+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36902 __net_timestamp(skb);
36903 // end of our responsibility
36904 atm_vcc->push (atm_vcc, skb);
36905@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36906 } else {
36907 PRINTK (KERN_INFO, "dropped over-size frame");
36908 // should we count this?
36909- atomic_inc(&atm_vcc->stats->rx_drop);
36910+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36911 }
36912
36913 } else {
36914@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36915 }
36916
36917 if (check_area (skb->data, skb->len)) {
36918- atomic_inc(&atm_vcc->stats->tx_err);
36919+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36920 return -ENOMEM; // ?
36921 }
36922
36923diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36924index 480fa6f..947067c 100644
36925--- a/drivers/atm/atmtcp.c
36926+++ b/drivers/atm/atmtcp.c
36927@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36928 if (vcc->pop) vcc->pop(vcc,skb);
36929 else dev_kfree_skb(skb);
36930 if (dev_data) return 0;
36931- atomic_inc(&vcc->stats->tx_err);
36932+ atomic_inc_unchecked(&vcc->stats->tx_err);
36933 return -ENOLINK;
36934 }
36935 size = skb->len+sizeof(struct atmtcp_hdr);
36936@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36937 if (!new_skb) {
36938 if (vcc->pop) vcc->pop(vcc,skb);
36939 else dev_kfree_skb(skb);
36940- atomic_inc(&vcc->stats->tx_err);
36941+ atomic_inc_unchecked(&vcc->stats->tx_err);
36942 return -ENOBUFS;
36943 }
36944 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36945@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36946 if (vcc->pop) vcc->pop(vcc,skb);
36947 else dev_kfree_skb(skb);
36948 out_vcc->push(out_vcc,new_skb);
36949- atomic_inc(&vcc->stats->tx);
36950- atomic_inc(&out_vcc->stats->rx);
36951+ atomic_inc_unchecked(&vcc->stats->tx);
36952+ atomic_inc_unchecked(&out_vcc->stats->rx);
36953 return 0;
36954 }
36955
36956@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36957 read_unlock(&vcc_sklist_lock);
36958 if (!out_vcc) {
36959 result = -EUNATCH;
36960- atomic_inc(&vcc->stats->tx_err);
36961+ atomic_inc_unchecked(&vcc->stats->tx_err);
36962 goto done;
36963 }
36964 skb_pull(skb,sizeof(struct atmtcp_hdr));
36965@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36966 __net_timestamp(new_skb);
36967 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36968 out_vcc->push(out_vcc,new_skb);
36969- atomic_inc(&vcc->stats->tx);
36970- atomic_inc(&out_vcc->stats->rx);
36971+ atomic_inc_unchecked(&vcc->stats->tx);
36972+ atomic_inc_unchecked(&out_vcc->stats->rx);
36973 done:
36974 if (vcc->pop) vcc->pop(vcc,skb);
36975 else dev_kfree_skb(skb);
36976diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36977index 6339efd..2b441d5 100644
36978--- a/drivers/atm/eni.c
36979+++ b/drivers/atm/eni.c
36980@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36981 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36982 vcc->dev->number);
36983 length = 0;
36984- atomic_inc(&vcc->stats->rx_err);
36985+ atomic_inc_unchecked(&vcc->stats->rx_err);
36986 }
36987 else {
36988 length = ATM_CELL_SIZE-1; /* no HEC */
36989@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36990 size);
36991 }
36992 eff = length = 0;
36993- atomic_inc(&vcc->stats->rx_err);
36994+ atomic_inc_unchecked(&vcc->stats->rx_err);
36995 }
36996 else {
36997 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36998@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36999 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
37000 vcc->dev->number,vcc->vci,length,size << 2,descr);
37001 length = eff = 0;
37002- atomic_inc(&vcc->stats->rx_err);
37003+ atomic_inc_unchecked(&vcc->stats->rx_err);
37004 }
37005 }
37006 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
37007@@ -770,7 +770,7 @@ rx_dequeued++;
37008 vcc->push(vcc,skb);
37009 pushed++;
37010 }
37011- atomic_inc(&vcc->stats->rx);
37012+ atomic_inc_unchecked(&vcc->stats->rx);
37013 }
37014 wake_up(&eni_dev->rx_wait);
37015 }
37016@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
37017 DMA_TO_DEVICE);
37018 if (vcc->pop) vcc->pop(vcc,skb);
37019 else dev_kfree_skb_irq(skb);
37020- atomic_inc(&vcc->stats->tx);
37021+ atomic_inc_unchecked(&vcc->stats->tx);
37022 wake_up(&eni_dev->tx_wait);
37023 dma_complete++;
37024 }
37025diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
37026index 82f2ae0..f205c02 100644
37027--- a/drivers/atm/firestream.c
37028+++ b/drivers/atm/firestream.c
37029@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
37030 }
37031 }
37032
37033- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37034+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37035
37036 fs_dprintk (FS_DEBUG_TXMEM, "i");
37037 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
37038@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37039 #endif
37040 skb_put (skb, qe->p1 & 0xffff);
37041 ATM_SKB(skb)->vcc = atm_vcc;
37042- atomic_inc(&atm_vcc->stats->rx);
37043+ atomic_inc_unchecked(&atm_vcc->stats->rx);
37044 __net_timestamp(skb);
37045 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
37046 atm_vcc->push (atm_vcc, skb);
37047@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
37048 kfree (pe);
37049 }
37050 if (atm_vcc)
37051- atomic_inc(&atm_vcc->stats->rx_drop);
37052+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37053 break;
37054 case 0x1f: /* Reassembly abort: no buffers. */
37055 /* Silently increment error counter. */
37056 if (atm_vcc)
37057- atomic_inc(&atm_vcc->stats->rx_drop);
37058+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
37059 break;
37060 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
37061 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
37062diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
37063index 75dde90..4309ead 100644
37064--- a/drivers/atm/fore200e.c
37065+++ b/drivers/atm/fore200e.c
37066@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
37067 #endif
37068 /* check error condition */
37069 if (*entry->status & STATUS_ERROR)
37070- atomic_inc(&vcc->stats->tx_err);
37071+ atomic_inc_unchecked(&vcc->stats->tx_err);
37072 else
37073- atomic_inc(&vcc->stats->tx);
37074+ atomic_inc_unchecked(&vcc->stats->tx);
37075 }
37076 }
37077
37078@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37079 if (skb == NULL) {
37080 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
37081
37082- atomic_inc(&vcc->stats->rx_drop);
37083+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37084 return -ENOMEM;
37085 }
37086
37087@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
37088
37089 dev_kfree_skb_any(skb);
37090
37091- atomic_inc(&vcc->stats->rx_drop);
37092+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37093 return -ENOMEM;
37094 }
37095
37096 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37097
37098 vcc->push(vcc, skb);
37099- atomic_inc(&vcc->stats->rx);
37100+ atomic_inc_unchecked(&vcc->stats->rx);
37101
37102 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
37103
37104@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
37105 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
37106 fore200e->atm_dev->number,
37107 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
37108- atomic_inc(&vcc->stats->rx_err);
37109+ atomic_inc_unchecked(&vcc->stats->rx_err);
37110 }
37111 }
37112
37113@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37114 goto retry_here;
37115 }
37116
37117- atomic_inc(&vcc->stats->tx_err);
37118+ atomic_inc_unchecked(&vcc->stats->tx_err);
37119
37120 fore200e->tx_sat++;
37121 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37122diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37123index 93dca2e..c5daa69 100644
37124--- a/drivers/atm/he.c
37125+++ b/drivers/atm/he.c
37126@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37127
37128 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37129 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37130- atomic_inc(&vcc->stats->rx_drop);
37131+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37132 goto return_host_buffers;
37133 }
37134
37135@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37136 RBRQ_LEN_ERR(he_dev->rbrq_head)
37137 ? "LEN_ERR" : "",
37138 vcc->vpi, vcc->vci);
37139- atomic_inc(&vcc->stats->rx_err);
37140+ atomic_inc_unchecked(&vcc->stats->rx_err);
37141 goto return_host_buffers;
37142 }
37143
37144@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37145 vcc->push(vcc, skb);
37146 spin_lock(&he_dev->global_lock);
37147
37148- atomic_inc(&vcc->stats->rx);
37149+ atomic_inc_unchecked(&vcc->stats->rx);
37150
37151 return_host_buffers:
37152 ++pdus_assembled;
37153@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37154 tpd->vcc->pop(tpd->vcc, tpd->skb);
37155 else
37156 dev_kfree_skb_any(tpd->skb);
37157- atomic_inc(&tpd->vcc->stats->tx_err);
37158+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37159 }
37160 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37161 return;
37162@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37163 vcc->pop(vcc, skb);
37164 else
37165 dev_kfree_skb_any(skb);
37166- atomic_inc(&vcc->stats->tx_err);
37167+ atomic_inc_unchecked(&vcc->stats->tx_err);
37168 return -EINVAL;
37169 }
37170
37171@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37172 vcc->pop(vcc, skb);
37173 else
37174 dev_kfree_skb_any(skb);
37175- atomic_inc(&vcc->stats->tx_err);
37176+ atomic_inc_unchecked(&vcc->stats->tx_err);
37177 return -EINVAL;
37178 }
37179 #endif
37180@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37181 vcc->pop(vcc, skb);
37182 else
37183 dev_kfree_skb_any(skb);
37184- atomic_inc(&vcc->stats->tx_err);
37185+ atomic_inc_unchecked(&vcc->stats->tx_err);
37186 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37187 return -ENOMEM;
37188 }
37189@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37190 vcc->pop(vcc, skb);
37191 else
37192 dev_kfree_skb_any(skb);
37193- atomic_inc(&vcc->stats->tx_err);
37194+ atomic_inc_unchecked(&vcc->stats->tx_err);
37195 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37196 return -ENOMEM;
37197 }
37198@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37199 __enqueue_tpd(he_dev, tpd, cid);
37200 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37201
37202- atomic_inc(&vcc->stats->tx);
37203+ atomic_inc_unchecked(&vcc->stats->tx);
37204
37205 return 0;
37206 }
37207diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37208index 527bbd5..96570c8 100644
37209--- a/drivers/atm/horizon.c
37210+++ b/drivers/atm/horizon.c
37211@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37212 {
37213 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37214 // VC layer stats
37215- atomic_inc(&vcc->stats->rx);
37216+ atomic_inc_unchecked(&vcc->stats->rx);
37217 __net_timestamp(skb);
37218 // end of our responsibility
37219 vcc->push (vcc, skb);
37220@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37221 dev->tx_iovec = NULL;
37222
37223 // VC layer stats
37224- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37225+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37226
37227 // free the skb
37228 hrz_kfree_skb (skb);
37229diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37230index 074616b..d6b3d5f 100644
37231--- a/drivers/atm/idt77252.c
37232+++ b/drivers/atm/idt77252.c
37233@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37234 else
37235 dev_kfree_skb(skb);
37236
37237- atomic_inc(&vcc->stats->tx);
37238+ atomic_inc_unchecked(&vcc->stats->tx);
37239 }
37240
37241 atomic_dec(&scq->used);
37242@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37243 if ((sb = dev_alloc_skb(64)) == NULL) {
37244 printk("%s: Can't allocate buffers for aal0.\n",
37245 card->name);
37246- atomic_add(i, &vcc->stats->rx_drop);
37247+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37248 break;
37249 }
37250 if (!atm_charge(vcc, sb->truesize)) {
37251 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37252 card->name);
37253- atomic_add(i - 1, &vcc->stats->rx_drop);
37254+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37255 dev_kfree_skb(sb);
37256 break;
37257 }
37258@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37259 ATM_SKB(sb)->vcc = vcc;
37260 __net_timestamp(sb);
37261 vcc->push(vcc, sb);
37262- atomic_inc(&vcc->stats->rx);
37263+ atomic_inc_unchecked(&vcc->stats->rx);
37264
37265 cell += ATM_CELL_PAYLOAD;
37266 }
37267@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37268 "(CDC: %08x)\n",
37269 card->name, len, rpp->len, readl(SAR_REG_CDC));
37270 recycle_rx_pool_skb(card, rpp);
37271- atomic_inc(&vcc->stats->rx_err);
37272+ atomic_inc_unchecked(&vcc->stats->rx_err);
37273 return;
37274 }
37275 if (stat & SAR_RSQE_CRC) {
37276 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37277 recycle_rx_pool_skb(card, rpp);
37278- atomic_inc(&vcc->stats->rx_err);
37279+ atomic_inc_unchecked(&vcc->stats->rx_err);
37280 return;
37281 }
37282 if (skb_queue_len(&rpp->queue) > 1) {
37283@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37284 RXPRINTK("%s: Can't alloc RX skb.\n",
37285 card->name);
37286 recycle_rx_pool_skb(card, rpp);
37287- atomic_inc(&vcc->stats->rx_err);
37288+ atomic_inc_unchecked(&vcc->stats->rx_err);
37289 return;
37290 }
37291 if (!atm_charge(vcc, skb->truesize)) {
37292@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37293 __net_timestamp(skb);
37294
37295 vcc->push(vcc, skb);
37296- atomic_inc(&vcc->stats->rx);
37297+ atomic_inc_unchecked(&vcc->stats->rx);
37298
37299 return;
37300 }
37301@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37302 __net_timestamp(skb);
37303
37304 vcc->push(vcc, skb);
37305- atomic_inc(&vcc->stats->rx);
37306+ atomic_inc_unchecked(&vcc->stats->rx);
37307
37308 if (skb->truesize > SAR_FB_SIZE_3)
37309 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37310@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37311 if (vcc->qos.aal != ATM_AAL0) {
37312 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37313 card->name, vpi, vci);
37314- atomic_inc(&vcc->stats->rx_drop);
37315+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37316 goto drop;
37317 }
37318
37319 if ((sb = dev_alloc_skb(64)) == NULL) {
37320 printk("%s: Can't allocate buffers for AAL0.\n",
37321 card->name);
37322- atomic_inc(&vcc->stats->rx_err);
37323+ atomic_inc_unchecked(&vcc->stats->rx_err);
37324 goto drop;
37325 }
37326
37327@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37328 ATM_SKB(sb)->vcc = vcc;
37329 __net_timestamp(sb);
37330 vcc->push(vcc, sb);
37331- atomic_inc(&vcc->stats->rx);
37332+ atomic_inc_unchecked(&vcc->stats->rx);
37333
37334 drop:
37335 skb_pull(queue, 64);
37336@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37337
37338 if (vc == NULL) {
37339 printk("%s: NULL connection in send().\n", card->name);
37340- atomic_inc(&vcc->stats->tx_err);
37341+ atomic_inc_unchecked(&vcc->stats->tx_err);
37342 dev_kfree_skb(skb);
37343 return -EINVAL;
37344 }
37345 if (!test_bit(VCF_TX, &vc->flags)) {
37346 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37347- atomic_inc(&vcc->stats->tx_err);
37348+ atomic_inc_unchecked(&vcc->stats->tx_err);
37349 dev_kfree_skb(skb);
37350 return -EINVAL;
37351 }
37352@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37353 break;
37354 default:
37355 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37356- atomic_inc(&vcc->stats->tx_err);
37357+ atomic_inc_unchecked(&vcc->stats->tx_err);
37358 dev_kfree_skb(skb);
37359 return -EINVAL;
37360 }
37361
37362 if (skb_shinfo(skb)->nr_frags != 0) {
37363 printk("%s: No scatter-gather yet.\n", card->name);
37364- atomic_inc(&vcc->stats->tx_err);
37365+ atomic_inc_unchecked(&vcc->stats->tx_err);
37366 dev_kfree_skb(skb);
37367 return -EINVAL;
37368 }
37369@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37370
37371 err = queue_skb(card, vc, skb, oam);
37372 if (err) {
37373- atomic_inc(&vcc->stats->tx_err);
37374+ atomic_inc_unchecked(&vcc->stats->tx_err);
37375 dev_kfree_skb(skb);
37376 return err;
37377 }
37378@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37379 skb = dev_alloc_skb(64);
37380 if (!skb) {
37381 printk("%s: Out of memory in send_oam().\n", card->name);
37382- atomic_inc(&vcc->stats->tx_err);
37383+ atomic_inc_unchecked(&vcc->stats->tx_err);
37384 return -ENOMEM;
37385 }
37386 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37387diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37388index 924f8e2..3375a3e 100644
37389--- a/drivers/atm/iphase.c
37390+++ b/drivers/atm/iphase.c
37391@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37392 status = (u_short) (buf_desc_ptr->desc_mode);
37393 if (status & (RX_CER | RX_PTE | RX_OFL))
37394 {
37395- atomic_inc(&vcc->stats->rx_err);
37396+ atomic_inc_unchecked(&vcc->stats->rx_err);
37397 IF_ERR(printk("IA: bad packet, dropping it");)
37398 if (status & RX_CER) {
37399 IF_ERR(printk(" cause: packet CRC error\n");)
37400@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37401 len = dma_addr - buf_addr;
37402 if (len > iadev->rx_buf_sz) {
37403 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37404- atomic_inc(&vcc->stats->rx_err);
37405+ atomic_inc_unchecked(&vcc->stats->rx_err);
37406 goto out_free_desc;
37407 }
37408
37409@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37410 ia_vcc = INPH_IA_VCC(vcc);
37411 if (ia_vcc == NULL)
37412 {
37413- atomic_inc(&vcc->stats->rx_err);
37414+ atomic_inc_unchecked(&vcc->stats->rx_err);
37415 atm_return(vcc, skb->truesize);
37416 dev_kfree_skb_any(skb);
37417 goto INCR_DLE;
37418@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37419 if ((length > iadev->rx_buf_sz) || (length >
37420 (skb->len - sizeof(struct cpcs_trailer))))
37421 {
37422- atomic_inc(&vcc->stats->rx_err);
37423+ atomic_inc_unchecked(&vcc->stats->rx_err);
37424 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37425 length, skb->len);)
37426 atm_return(vcc, skb->truesize);
37427@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37428
37429 IF_RX(printk("rx_dle_intr: skb push");)
37430 vcc->push(vcc,skb);
37431- atomic_inc(&vcc->stats->rx);
37432+ atomic_inc_unchecked(&vcc->stats->rx);
37433 iadev->rx_pkt_cnt++;
37434 }
37435 INCR_DLE:
37436@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37437 {
37438 struct k_sonet_stats *stats;
37439 stats = &PRIV(_ia_dev[board])->sonet_stats;
37440- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37441- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37442- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37443- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37444- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37445- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37446- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37447- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37448- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37449+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37450+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37451+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37452+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37453+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37454+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37455+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37456+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37457+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37458 }
37459 ia_cmds.status = 0;
37460 break;
37461@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37462 if ((desc == 0) || (desc > iadev->num_tx_desc))
37463 {
37464 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37465- atomic_inc(&vcc->stats->tx);
37466+ atomic_inc_unchecked(&vcc->stats->tx);
37467 if (vcc->pop)
37468 vcc->pop(vcc, skb);
37469 else
37470@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37471 ATM_DESC(skb) = vcc->vci;
37472 skb_queue_tail(&iadev->tx_dma_q, skb);
37473
37474- atomic_inc(&vcc->stats->tx);
37475+ atomic_inc_unchecked(&vcc->stats->tx);
37476 iadev->tx_pkt_cnt++;
37477 /* Increment transaction counter */
37478 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37479
37480 #if 0
37481 /* add flow control logic */
37482- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37483+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37484 if (iavcc->vc_desc_cnt > 10) {
37485 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37486 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37487diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37488index ce43ae3..969de38 100644
37489--- a/drivers/atm/lanai.c
37490+++ b/drivers/atm/lanai.c
37491@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37492 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37493 lanai_endtx(lanai, lvcc);
37494 lanai_free_skb(lvcc->tx.atmvcc, skb);
37495- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37496+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37497 }
37498
37499 /* Try to fill the buffer - don't call unless there is backlog */
37500@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37501 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37502 __net_timestamp(skb);
37503 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37504- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37505+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37506 out:
37507 lvcc->rx.buf.ptr = end;
37508 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37509@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37510 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37511 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37512 lanai->stats.service_rxnotaal5++;
37513- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37514+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37515 return 0;
37516 }
37517 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37518@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37519 int bytes;
37520 read_unlock(&vcc_sklist_lock);
37521 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37522- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37523+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37524 lvcc->stats.x.aal5.service_trash++;
37525 bytes = (SERVICE_GET_END(s) * 16) -
37526 (((unsigned long) lvcc->rx.buf.ptr) -
37527@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37528 }
37529 if (s & SERVICE_STREAM) {
37530 read_unlock(&vcc_sklist_lock);
37531- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37532+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37533 lvcc->stats.x.aal5.service_stream++;
37534 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37535 "PDU on VCI %d!\n", lanai->number, vci);
37536@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37537 return 0;
37538 }
37539 DPRINTK("got rx crc error on vci %d\n", vci);
37540- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37541+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37542 lvcc->stats.x.aal5.service_rxcrc++;
37543 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37544 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37545diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37546index b7e1cc0..eb336bfe 100644
37547--- a/drivers/atm/nicstar.c
37548+++ b/drivers/atm/nicstar.c
37549@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37550 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37551 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37552 card->index);
37553- atomic_inc(&vcc->stats->tx_err);
37554+ atomic_inc_unchecked(&vcc->stats->tx_err);
37555 dev_kfree_skb_any(skb);
37556 return -EINVAL;
37557 }
37558@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37559 if (!vc->tx) {
37560 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37561 card->index);
37562- atomic_inc(&vcc->stats->tx_err);
37563+ atomic_inc_unchecked(&vcc->stats->tx_err);
37564 dev_kfree_skb_any(skb);
37565 return -EINVAL;
37566 }
37567@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37568 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37569 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37570 card->index);
37571- atomic_inc(&vcc->stats->tx_err);
37572+ atomic_inc_unchecked(&vcc->stats->tx_err);
37573 dev_kfree_skb_any(skb);
37574 return -EINVAL;
37575 }
37576
37577 if (skb_shinfo(skb)->nr_frags != 0) {
37578 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37579- atomic_inc(&vcc->stats->tx_err);
37580+ atomic_inc_unchecked(&vcc->stats->tx_err);
37581 dev_kfree_skb_any(skb);
37582 return -EINVAL;
37583 }
37584@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37585 }
37586
37587 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37588- atomic_inc(&vcc->stats->tx_err);
37589+ atomic_inc_unchecked(&vcc->stats->tx_err);
37590 dev_kfree_skb_any(skb);
37591 return -EIO;
37592 }
37593- atomic_inc(&vcc->stats->tx);
37594+ atomic_inc_unchecked(&vcc->stats->tx);
37595
37596 return 0;
37597 }
37598@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37599 printk
37600 ("nicstar%d: Can't allocate buffers for aal0.\n",
37601 card->index);
37602- atomic_add(i, &vcc->stats->rx_drop);
37603+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37604 break;
37605 }
37606 if (!atm_charge(vcc, sb->truesize)) {
37607 RXPRINTK
37608 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37609 card->index);
37610- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37611+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37612 dev_kfree_skb_any(sb);
37613 break;
37614 }
37615@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37616 ATM_SKB(sb)->vcc = vcc;
37617 __net_timestamp(sb);
37618 vcc->push(vcc, sb);
37619- atomic_inc(&vcc->stats->rx);
37620+ atomic_inc_unchecked(&vcc->stats->rx);
37621 cell += ATM_CELL_PAYLOAD;
37622 }
37623
37624@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37625 if (iovb == NULL) {
37626 printk("nicstar%d: Out of iovec buffers.\n",
37627 card->index);
37628- atomic_inc(&vcc->stats->rx_drop);
37629+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37630 recycle_rx_buf(card, skb);
37631 return;
37632 }
37633@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37634 small or large buffer itself. */
37635 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37636 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37637- atomic_inc(&vcc->stats->rx_err);
37638+ atomic_inc_unchecked(&vcc->stats->rx_err);
37639 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37640 NS_MAX_IOVECS);
37641 NS_PRV_IOVCNT(iovb) = 0;
37642@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37643 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37644 card->index);
37645 which_list(card, skb);
37646- atomic_inc(&vcc->stats->rx_err);
37647+ atomic_inc_unchecked(&vcc->stats->rx_err);
37648 recycle_rx_buf(card, skb);
37649 vc->rx_iov = NULL;
37650 recycle_iov_buf(card, iovb);
37651@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37652 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37653 card->index);
37654 which_list(card, skb);
37655- atomic_inc(&vcc->stats->rx_err);
37656+ atomic_inc_unchecked(&vcc->stats->rx_err);
37657 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37658 NS_PRV_IOVCNT(iovb));
37659 vc->rx_iov = NULL;
37660@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37661 printk(" - PDU size mismatch.\n");
37662 else
37663 printk(".\n");
37664- atomic_inc(&vcc->stats->rx_err);
37665+ atomic_inc_unchecked(&vcc->stats->rx_err);
37666 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37667 NS_PRV_IOVCNT(iovb));
37668 vc->rx_iov = NULL;
37669@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37670 /* skb points to a small buffer */
37671 if (!atm_charge(vcc, skb->truesize)) {
37672 push_rxbufs(card, skb);
37673- atomic_inc(&vcc->stats->rx_drop);
37674+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37675 } else {
37676 skb_put(skb, len);
37677 dequeue_sm_buf(card, skb);
37678@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37679 ATM_SKB(skb)->vcc = vcc;
37680 __net_timestamp(skb);
37681 vcc->push(vcc, skb);
37682- atomic_inc(&vcc->stats->rx);
37683+ atomic_inc_unchecked(&vcc->stats->rx);
37684 }
37685 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37686 struct sk_buff *sb;
37687@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37688 if (len <= NS_SMBUFSIZE) {
37689 if (!atm_charge(vcc, sb->truesize)) {
37690 push_rxbufs(card, sb);
37691- atomic_inc(&vcc->stats->rx_drop);
37692+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37693 } else {
37694 skb_put(sb, len);
37695 dequeue_sm_buf(card, sb);
37696@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37697 ATM_SKB(sb)->vcc = vcc;
37698 __net_timestamp(sb);
37699 vcc->push(vcc, sb);
37700- atomic_inc(&vcc->stats->rx);
37701+ atomic_inc_unchecked(&vcc->stats->rx);
37702 }
37703
37704 push_rxbufs(card, skb);
37705@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37706
37707 if (!atm_charge(vcc, skb->truesize)) {
37708 push_rxbufs(card, skb);
37709- atomic_inc(&vcc->stats->rx_drop);
37710+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37711 } else {
37712 dequeue_lg_buf(card, skb);
37713 #ifdef NS_USE_DESTRUCTORS
37714@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37715 ATM_SKB(skb)->vcc = vcc;
37716 __net_timestamp(skb);
37717 vcc->push(vcc, skb);
37718- atomic_inc(&vcc->stats->rx);
37719+ atomic_inc_unchecked(&vcc->stats->rx);
37720 }
37721
37722 push_rxbufs(card, sb);
37723@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37724 printk
37725 ("nicstar%d: Out of huge buffers.\n",
37726 card->index);
37727- atomic_inc(&vcc->stats->rx_drop);
37728+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37729 recycle_iovec_rx_bufs(card,
37730 (struct iovec *)
37731 iovb->data,
37732@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37733 card->hbpool.count++;
37734 } else
37735 dev_kfree_skb_any(hb);
37736- atomic_inc(&vcc->stats->rx_drop);
37737+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37738 } else {
37739 /* Copy the small buffer to the huge buffer */
37740 sb = (struct sk_buff *)iov->iov_base;
37741@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37742 #endif /* NS_USE_DESTRUCTORS */
37743 __net_timestamp(hb);
37744 vcc->push(vcc, hb);
37745- atomic_inc(&vcc->stats->rx);
37746+ atomic_inc_unchecked(&vcc->stats->rx);
37747 }
37748 }
37749
37750diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37751index 74e18b0..f16afa0 100644
37752--- a/drivers/atm/solos-pci.c
37753+++ b/drivers/atm/solos-pci.c
37754@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37755 }
37756 atm_charge(vcc, skb->truesize);
37757 vcc->push(vcc, skb);
37758- atomic_inc(&vcc->stats->rx);
37759+ atomic_inc_unchecked(&vcc->stats->rx);
37760 break;
37761
37762 case PKT_STATUS:
37763@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37764 vcc = SKB_CB(oldskb)->vcc;
37765
37766 if (vcc) {
37767- atomic_inc(&vcc->stats->tx);
37768+ atomic_inc_unchecked(&vcc->stats->tx);
37769 solos_pop(vcc, oldskb);
37770 } else {
37771 dev_kfree_skb_irq(oldskb);
37772diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37773index 0215934..ce9f5b1 100644
37774--- a/drivers/atm/suni.c
37775+++ b/drivers/atm/suni.c
37776@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37777
37778
37779 #define ADD_LIMITED(s,v) \
37780- atomic_add((v),&stats->s); \
37781- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37782+ atomic_add_unchecked((v),&stats->s); \
37783+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37784
37785
37786 static void suni_hz(unsigned long from_timer)
37787diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37788index 5120a96..e2572bd 100644
37789--- a/drivers/atm/uPD98402.c
37790+++ b/drivers/atm/uPD98402.c
37791@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37792 struct sonet_stats tmp;
37793 int error = 0;
37794
37795- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37796+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37797 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37798 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37799 if (zero && !error) {
37800@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37801
37802
37803 #define ADD_LIMITED(s,v) \
37804- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37805- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37806- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37807+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37808+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37809+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37810
37811
37812 static void stat_event(struct atm_dev *dev)
37813@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37814 if (reason & uPD98402_INT_PFM) stat_event(dev);
37815 if (reason & uPD98402_INT_PCO) {
37816 (void) GET(PCOCR); /* clear interrupt cause */
37817- atomic_add(GET(HECCT),
37818+ atomic_add_unchecked(GET(HECCT),
37819 &PRIV(dev)->sonet_stats.uncorr_hcs);
37820 }
37821 if ((reason & uPD98402_INT_RFO) &&
37822@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37823 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37824 uPD98402_INT_LOS),PIMR); /* enable them */
37825 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37826- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37827- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37828- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37829+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37830+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37831+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37832 return 0;
37833 }
37834
37835diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37836index cecfb94..87009ec 100644
37837--- a/drivers/atm/zatm.c
37838+++ b/drivers/atm/zatm.c
37839@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37840 }
37841 if (!size) {
37842 dev_kfree_skb_irq(skb);
37843- if (vcc) atomic_inc(&vcc->stats->rx_err);
37844+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37845 continue;
37846 }
37847 if (!atm_charge(vcc,skb->truesize)) {
37848@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37849 skb->len = size;
37850 ATM_SKB(skb)->vcc = vcc;
37851 vcc->push(vcc,skb);
37852- atomic_inc(&vcc->stats->rx);
37853+ atomic_inc_unchecked(&vcc->stats->rx);
37854 }
37855 zout(pos & 0xffff,MTA(mbx));
37856 #if 0 /* probably a stupid idea */
37857@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37858 skb_queue_head(&zatm_vcc->backlog,skb);
37859 break;
37860 }
37861- atomic_inc(&vcc->stats->tx);
37862+ atomic_inc_unchecked(&vcc->stats->tx);
37863 wake_up(&zatm_vcc->tx_wait);
37864 }
37865
37866diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37867index 79bc203..fa3945b 100644
37868--- a/drivers/base/bus.c
37869+++ b/drivers/base/bus.c
37870@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37871 return -EINVAL;
37872
37873 mutex_lock(&subsys->p->mutex);
37874- list_add_tail(&sif->node, &subsys->p->interfaces);
37875+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37876 if (sif->add_dev) {
37877 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37878 while ((dev = subsys_dev_iter_next(&iter)))
37879@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37880 subsys = sif->subsys;
37881
37882 mutex_lock(&subsys->p->mutex);
37883- list_del_init(&sif->node);
37884+ pax_list_del_init((struct list_head *)&sif->node);
37885 if (sif->remove_dev) {
37886 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37887 while ((dev = subsys_dev_iter_next(&iter)))
37888diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37889index 25798db..15f130e 100644
37890--- a/drivers/base/devtmpfs.c
37891+++ b/drivers/base/devtmpfs.c
37892@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37893 if (!thread)
37894 return 0;
37895
37896- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37897+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37898 if (err)
37899 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37900 else
37901@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37902 *err = sys_unshare(CLONE_NEWNS);
37903 if (*err)
37904 goto out;
37905- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37906+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37907 if (*err)
37908 goto out;
37909- sys_chdir("/.."); /* will traverse into overmounted root */
37910- sys_chroot(".");
37911+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37912+ sys_chroot((char __force_user *)".");
37913 complete(&setup_done);
37914 while (1) {
37915 spin_lock(&req_lock);
37916diff --git a/drivers/base/node.c b/drivers/base/node.c
37917index 36fabe43..8cfc112 100644
37918--- a/drivers/base/node.c
37919+++ b/drivers/base/node.c
37920@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37921 struct node_attr {
37922 struct device_attribute attr;
37923 enum node_states state;
37924-};
37925+} __do_const;
37926
37927 static ssize_t show_node_state(struct device *dev,
37928 struct device_attribute *attr, char *buf)
37929diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37930index 45937f8..b9a342e 100644
37931--- a/drivers/base/power/domain.c
37932+++ b/drivers/base/power/domain.c
37933@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37934 {
37935 struct cpuidle_driver *cpuidle_drv;
37936 struct gpd_cpuidle_data *cpuidle_data;
37937- struct cpuidle_state *idle_state;
37938+ cpuidle_state_no_const *idle_state;
37939 int ret = 0;
37940
37941 if (IS_ERR_OR_NULL(genpd) || state < 0)
37942@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37943 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37944 {
37945 struct gpd_cpuidle_data *cpuidle_data;
37946- struct cpuidle_state *idle_state;
37947+ cpuidle_state_no_const *idle_state;
37948 int ret = 0;
37949
37950 if (IS_ERR_OR_NULL(genpd))
37951@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
37952 return ret;
37953 }
37954
37955- dev->pm_domain->detach = genpd_dev_pm_detach;
37956+ pax_open_kernel();
37957+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37958+ pax_close_kernel();
37959+
37960 pm_genpd_poweron(pd);
37961
37962 return 0;
37963diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37964index d2be3f9..0a3167a 100644
37965--- a/drivers/base/power/sysfs.c
37966+++ b/drivers/base/power/sysfs.c
37967@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37968 return -EIO;
37969 }
37970 }
37971- return sprintf(buf, p);
37972+ return sprintf(buf, "%s", p);
37973 }
37974
37975 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37976diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37977index aab7158..b172db2 100644
37978--- a/drivers/base/power/wakeup.c
37979+++ b/drivers/base/power/wakeup.c
37980@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37981 * They need to be modified together atomically, so it's better to use one
37982 * atomic variable to hold them both.
37983 */
37984-static atomic_t combined_event_count = ATOMIC_INIT(0);
37985+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37986
37987 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37988 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37989
37990 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37991 {
37992- unsigned int comb = atomic_read(&combined_event_count);
37993+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37994
37995 *cnt = (comb >> IN_PROGRESS_BITS);
37996 *inpr = comb & MAX_IN_PROGRESS;
37997@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37998 ws->start_prevent_time = ws->last_time;
37999
38000 /* Increment the counter of events in progress. */
38001- cec = atomic_inc_return(&combined_event_count);
38002+ cec = atomic_inc_return_unchecked(&combined_event_count);
38003
38004 trace_wakeup_source_activate(ws->name, cec);
38005 }
38006@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
38007 * Increment the counter of registered wakeup events and decrement the
38008 * couter of wakeup events in progress simultaneously.
38009 */
38010- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
38011+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
38012 trace_wakeup_source_deactivate(ws->name, cec);
38013
38014 split_counters(&cnt, &inpr);
38015diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
38016index 8d98a32..61d3165 100644
38017--- a/drivers/base/syscore.c
38018+++ b/drivers/base/syscore.c
38019@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
38020 void register_syscore_ops(struct syscore_ops *ops)
38021 {
38022 mutex_lock(&syscore_ops_lock);
38023- list_add_tail(&ops->node, &syscore_ops_list);
38024+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
38025 mutex_unlock(&syscore_ops_lock);
38026 }
38027 EXPORT_SYMBOL_GPL(register_syscore_ops);
38028@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
38029 void unregister_syscore_ops(struct syscore_ops *ops)
38030 {
38031 mutex_lock(&syscore_ops_lock);
38032- list_del(&ops->node);
38033+ pax_list_del((struct list_head *)&ops->node);
38034 mutex_unlock(&syscore_ops_lock);
38035 }
38036 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
38037diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
38038index ff20f19..018f1da 100644
38039--- a/drivers/block/cciss.c
38040+++ b/drivers/block/cciss.c
38041@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
38042 while (!list_empty(&h->reqQ)) {
38043 c = list_entry(h->reqQ.next, CommandList_struct, list);
38044 /* can't do anything if fifo is full */
38045- if ((h->access.fifo_full(h))) {
38046+ if ((h->access->fifo_full(h))) {
38047 dev_warn(&h->pdev->dev, "fifo full\n");
38048 break;
38049 }
38050@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
38051 h->Qdepth--;
38052
38053 /* Tell the controller execute command */
38054- h->access.submit_command(h, c);
38055+ h->access->submit_command(h, c);
38056
38057 /* Put job onto the completed Q */
38058 addQ(&h->cmpQ, c);
38059@@ -3444,17 +3444,17 @@ startio:
38060
38061 static inline unsigned long get_next_completion(ctlr_info_t *h)
38062 {
38063- return h->access.command_completed(h);
38064+ return h->access->command_completed(h);
38065 }
38066
38067 static inline int interrupt_pending(ctlr_info_t *h)
38068 {
38069- return h->access.intr_pending(h);
38070+ return h->access->intr_pending(h);
38071 }
38072
38073 static inline long interrupt_not_for_us(ctlr_info_t *h)
38074 {
38075- return ((h->access.intr_pending(h) == 0) ||
38076+ return ((h->access->intr_pending(h) == 0) ||
38077 (h->interrupts_enabled == 0));
38078 }
38079
38080@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
38081 u32 a;
38082
38083 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
38084- return h->access.command_completed(h);
38085+ return h->access->command_completed(h);
38086
38087 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
38088 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
38089@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
38090 trans_support & CFGTBL_Trans_use_short_tags);
38091
38092 /* Change the access methods to the performant access methods */
38093- h->access = SA5_performant_access;
38094+ h->access = &SA5_performant_access;
38095 h->transMethod = CFGTBL_Trans_Performant;
38096
38097 return;
38098@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
38099 if (prod_index < 0)
38100 return -ENODEV;
38101 h->product_name = products[prod_index].product_name;
38102- h->access = *(products[prod_index].access);
38103+ h->access = products[prod_index].access;
38104
38105 if (cciss_board_disabled(h)) {
38106 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
38107@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
38108 }
38109
38110 /* make sure the board interrupts are off */
38111- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38112+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38113 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38114 if (rc)
38115 goto clean2;
38116@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38117 * fake ones to scoop up any residual completions.
38118 */
38119 spin_lock_irqsave(&h->lock, flags);
38120- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38121+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38122 spin_unlock_irqrestore(&h->lock, flags);
38123 free_irq(h->intr[h->intr_mode], h);
38124 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38125@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38126 dev_info(&h->pdev->dev, "Board READY.\n");
38127 dev_info(&h->pdev->dev,
38128 "Waiting for stale completions to drain.\n");
38129- h->access.set_intr_mask(h, CCISS_INTR_ON);
38130+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38131 msleep(10000);
38132- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38133+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38134
38135 rc = controller_reset_failed(h->cfgtable);
38136 if (rc)
38137@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38138 cciss_scsi_setup(h);
38139
38140 /* Turn the interrupts on so we can service requests */
38141- h->access.set_intr_mask(h, CCISS_INTR_ON);
38142+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38143
38144 /* Get the firmware version */
38145 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38146@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38147 kfree(flush_buf);
38148 if (return_code != IO_OK)
38149 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38150- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38151+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38152 free_irq(h->intr[h->intr_mode], h);
38153 }
38154
38155diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38156index 7fda30e..2f27946 100644
38157--- a/drivers/block/cciss.h
38158+++ b/drivers/block/cciss.h
38159@@ -101,7 +101,7 @@ struct ctlr_info
38160 /* information about each logical volume */
38161 drive_info_struct *drv[CISS_MAX_LUN];
38162
38163- struct access_method access;
38164+ struct access_method *access;
38165
38166 /* queue and queue Info */
38167 struct list_head reqQ;
38168@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38169 }
38170
38171 static struct access_method SA5_access = {
38172- SA5_submit_command,
38173- SA5_intr_mask,
38174- SA5_fifo_full,
38175- SA5_intr_pending,
38176- SA5_completed,
38177+ .submit_command = SA5_submit_command,
38178+ .set_intr_mask = SA5_intr_mask,
38179+ .fifo_full = SA5_fifo_full,
38180+ .intr_pending = SA5_intr_pending,
38181+ .command_completed = SA5_completed,
38182 };
38183
38184 static struct access_method SA5B_access = {
38185- SA5_submit_command,
38186- SA5B_intr_mask,
38187- SA5_fifo_full,
38188- SA5B_intr_pending,
38189- SA5_completed,
38190+ .submit_command = SA5_submit_command,
38191+ .set_intr_mask = SA5B_intr_mask,
38192+ .fifo_full = SA5_fifo_full,
38193+ .intr_pending = SA5B_intr_pending,
38194+ .command_completed = SA5_completed,
38195 };
38196
38197 static struct access_method SA5_performant_access = {
38198- SA5_submit_command,
38199- SA5_performant_intr_mask,
38200- SA5_fifo_full,
38201- SA5_performant_intr_pending,
38202- SA5_performant_completed,
38203+ .submit_command = SA5_submit_command,
38204+ .set_intr_mask = SA5_performant_intr_mask,
38205+ .fifo_full = SA5_fifo_full,
38206+ .intr_pending = SA5_performant_intr_pending,
38207+ .command_completed = SA5_performant_completed,
38208 };
38209
38210 struct board_type {
38211diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38212index 2b94403..fd6ad1f 100644
38213--- a/drivers/block/cpqarray.c
38214+++ b/drivers/block/cpqarray.c
38215@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38216 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38217 goto Enomem4;
38218 }
38219- hba[i]->access.set_intr_mask(hba[i], 0);
38220+ hba[i]->access->set_intr_mask(hba[i], 0);
38221 if (request_irq(hba[i]->intr, do_ida_intr,
38222 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38223 {
38224@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38225 add_timer(&hba[i]->timer);
38226
38227 /* Enable IRQ now that spinlock and rate limit timer are set up */
38228- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38229+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38230
38231 for(j=0; j<NWD; j++) {
38232 struct gendisk *disk = ida_gendisk[i][j];
38233@@ -694,7 +694,7 @@ DBGINFO(
38234 for(i=0; i<NR_PRODUCTS; i++) {
38235 if (board_id == products[i].board_id) {
38236 c->product_name = products[i].product_name;
38237- c->access = *(products[i].access);
38238+ c->access = products[i].access;
38239 break;
38240 }
38241 }
38242@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38243 hba[ctlr]->intr = intr;
38244 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38245 hba[ctlr]->product_name = products[j].product_name;
38246- hba[ctlr]->access = *(products[j].access);
38247+ hba[ctlr]->access = products[j].access;
38248 hba[ctlr]->ctlr = ctlr;
38249 hba[ctlr]->board_id = board_id;
38250 hba[ctlr]->pci_dev = NULL; /* not PCI */
38251@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38252
38253 while((c = h->reqQ) != NULL) {
38254 /* Can't do anything if we're busy */
38255- if (h->access.fifo_full(h) == 0)
38256+ if (h->access->fifo_full(h) == 0)
38257 return;
38258
38259 /* Get the first entry from the request Q */
38260@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38261 h->Qdepth--;
38262
38263 /* Tell the controller to do our bidding */
38264- h->access.submit_command(h, c);
38265+ h->access->submit_command(h, c);
38266
38267 /* Get onto the completion Q */
38268 addQ(&h->cmpQ, c);
38269@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38270 unsigned long flags;
38271 __u32 a,a1;
38272
38273- istat = h->access.intr_pending(h);
38274+ istat = h->access->intr_pending(h);
38275 /* Is this interrupt for us? */
38276 if (istat == 0)
38277 return IRQ_NONE;
38278@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38279 */
38280 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38281 if (istat & FIFO_NOT_EMPTY) {
38282- while((a = h->access.command_completed(h))) {
38283+ while((a = h->access->command_completed(h))) {
38284 a1 = a; a &= ~3;
38285 if ((c = h->cmpQ) == NULL)
38286 {
38287@@ -1448,11 +1448,11 @@ static int sendcmd(
38288 /*
38289 * Disable interrupt
38290 */
38291- info_p->access.set_intr_mask(info_p, 0);
38292+ info_p->access->set_intr_mask(info_p, 0);
38293 /* Make sure there is room in the command FIFO */
38294 /* Actually it should be completely empty at this time. */
38295 for (i = 200000; i > 0; i--) {
38296- temp = info_p->access.fifo_full(info_p);
38297+ temp = info_p->access->fifo_full(info_p);
38298 if (temp != 0) {
38299 break;
38300 }
38301@@ -1465,7 +1465,7 @@ DBG(
38302 /*
38303 * Send the cmd
38304 */
38305- info_p->access.submit_command(info_p, c);
38306+ info_p->access->submit_command(info_p, c);
38307 complete = pollcomplete(ctlr);
38308
38309 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38310@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38311 * we check the new geometry. Then turn interrupts back on when
38312 * we're done.
38313 */
38314- host->access.set_intr_mask(host, 0);
38315+ host->access->set_intr_mask(host, 0);
38316 getgeometry(ctlr);
38317- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38318+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38319
38320 for(i=0; i<NWD; i++) {
38321 struct gendisk *disk = ida_gendisk[ctlr][i];
38322@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38323 /* Wait (up to 2 seconds) for a command to complete */
38324
38325 for (i = 200000; i > 0; i--) {
38326- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38327+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38328 if (done == 0) {
38329 udelay(10); /* a short fixed delay */
38330 } else
38331diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38332index be73e9d..7fbf140 100644
38333--- a/drivers/block/cpqarray.h
38334+++ b/drivers/block/cpqarray.h
38335@@ -99,7 +99,7 @@ struct ctlr_info {
38336 drv_info_t drv[NWD];
38337 struct proc_dir_entry *proc;
38338
38339- struct access_method access;
38340+ struct access_method *access;
38341
38342 cmdlist_t *reqQ;
38343 cmdlist_t *cmpQ;
38344diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38345index 434c77d..6d3219a 100644
38346--- a/drivers/block/drbd/drbd_bitmap.c
38347+++ b/drivers/block/drbd/drbd_bitmap.c
38348@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38349 submit_bio(rw, bio);
38350 /* this should not count as user activity and cause the
38351 * resync to throttle -- see drbd_rs_should_slow_down(). */
38352- atomic_add(len >> 9, &device->rs_sect_ev);
38353+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38354 }
38355 }
38356
38357diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38358index b905e98..0812ed8 100644
38359--- a/drivers/block/drbd/drbd_int.h
38360+++ b/drivers/block/drbd/drbd_int.h
38361@@ -385,7 +385,7 @@ struct drbd_epoch {
38362 struct drbd_connection *connection;
38363 struct list_head list;
38364 unsigned int barrier_nr;
38365- atomic_t epoch_size; /* increased on every request added. */
38366+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38367 atomic_t active; /* increased on every req. added, and dec on every finished. */
38368 unsigned long flags;
38369 };
38370@@ -946,7 +946,7 @@ struct drbd_device {
38371 unsigned int al_tr_number;
38372 int al_tr_cycle;
38373 wait_queue_head_t seq_wait;
38374- atomic_t packet_seq;
38375+ atomic_unchecked_t packet_seq;
38376 unsigned int peer_seq;
38377 spinlock_t peer_seq_lock;
38378 unsigned long comm_bm_set; /* communicated number of set bits. */
38379@@ -955,8 +955,8 @@ struct drbd_device {
38380 struct mutex own_state_mutex;
38381 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38382 char congestion_reason; /* Why we where congested... */
38383- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38384- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38385+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38386+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38387 int rs_last_sect_ev; /* counter to compare with */
38388 int rs_last_events; /* counter of read or write "events" (unit sectors)
38389 * on the lower level device when we last looked. */
38390diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38391index 1fc8342..7e7742b 100644
38392--- a/drivers/block/drbd/drbd_main.c
38393+++ b/drivers/block/drbd/drbd_main.c
38394@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38395 p->sector = sector;
38396 p->block_id = block_id;
38397 p->blksize = blksize;
38398- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38399+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38400 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38401 }
38402
38403@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38404 return -EIO;
38405 p->sector = cpu_to_be64(req->i.sector);
38406 p->block_id = (unsigned long)req;
38407- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38408+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38409 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38410 if (device->state.conn >= C_SYNC_SOURCE &&
38411 device->state.conn <= C_PAUSED_SYNC_T)
38412@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38413 atomic_set(&device->unacked_cnt, 0);
38414 atomic_set(&device->local_cnt, 0);
38415 atomic_set(&device->pp_in_use_by_net, 0);
38416- atomic_set(&device->rs_sect_in, 0);
38417- atomic_set(&device->rs_sect_ev, 0);
38418+ atomic_set_unchecked(&device->rs_sect_in, 0);
38419+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38420 atomic_set(&device->ap_in_flight, 0);
38421 atomic_set(&device->md_io.in_use, 0);
38422
38423@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38424 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38425 struct drbd_resource *resource = connection->resource;
38426
38427- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38428- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38429+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38430+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38431 kfree(connection->current_epoch);
38432
38433 idr_destroy(&connection->peer_devices);
38434diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38435index 74df8cf..e41fc24 100644
38436--- a/drivers/block/drbd/drbd_nl.c
38437+++ b/drivers/block/drbd/drbd_nl.c
38438@@ -3637,13 +3637,13 @@ finish:
38439
38440 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38441 {
38442- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38443+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38444 struct sk_buff *msg;
38445 struct drbd_genlmsghdr *d_out;
38446 unsigned seq;
38447 int err = -ENOMEM;
38448
38449- seq = atomic_inc_return(&drbd_genl_seq);
38450+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38451 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38452 if (!msg)
38453 goto failed;
38454diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38455index cee2035..22f66bd 100644
38456--- a/drivers/block/drbd/drbd_receiver.c
38457+++ b/drivers/block/drbd/drbd_receiver.c
38458@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38459 struct drbd_device *device = peer_device->device;
38460 int err;
38461
38462- atomic_set(&device->packet_seq, 0);
38463+ atomic_set_unchecked(&device->packet_seq, 0);
38464 device->peer_seq = 0;
38465
38466 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38467@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38468 do {
38469 next_epoch = NULL;
38470
38471- epoch_size = atomic_read(&epoch->epoch_size);
38472+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38473
38474 switch (ev & ~EV_CLEANUP) {
38475 case EV_PUT:
38476@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38477 rv = FE_DESTROYED;
38478 } else {
38479 epoch->flags = 0;
38480- atomic_set(&epoch->epoch_size, 0);
38481+ atomic_set_unchecked(&epoch->epoch_size, 0);
38482 /* atomic_set(&epoch->active, 0); is already zero */
38483 if (rv == FE_STILL_LIVE)
38484 rv = FE_RECYCLED;
38485@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38486 conn_wait_active_ee_empty(connection);
38487 drbd_flush(connection);
38488
38489- if (atomic_read(&connection->current_epoch->epoch_size)) {
38490+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38491 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38492 if (epoch)
38493 break;
38494@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38495 }
38496
38497 epoch->flags = 0;
38498- atomic_set(&epoch->epoch_size, 0);
38499+ atomic_set_unchecked(&epoch->epoch_size, 0);
38500 atomic_set(&epoch->active, 0);
38501
38502 spin_lock(&connection->epoch_lock);
38503- if (atomic_read(&connection->current_epoch->epoch_size)) {
38504+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38505 list_add(&epoch->list, &connection->current_epoch->list);
38506 connection->current_epoch = epoch;
38507 connection->epochs++;
38508@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38509 list_add_tail(&peer_req->w.list, &device->sync_ee);
38510 spin_unlock_irq(&device->resource->req_lock);
38511
38512- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38513+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38514 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38515 return 0;
38516
38517@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38518 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38519 }
38520
38521- atomic_add(pi->size >> 9, &device->rs_sect_in);
38522+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38523
38524 return err;
38525 }
38526@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38527
38528 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38529 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38530- atomic_inc(&connection->current_epoch->epoch_size);
38531+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38532 err2 = drbd_drain_block(peer_device, pi->size);
38533 if (!err)
38534 err = err2;
38535@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38536
38537 spin_lock(&connection->epoch_lock);
38538 peer_req->epoch = connection->current_epoch;
38539- atomic_inc(&peer_req->epoch->epoch_size);
38540+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38541 atomic_inc(&peer_req->epoch->active);
38542 spin_unlock(&connection->epoch_lock);
38543
38544@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38545
38546 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38547 (int)part_stat_read(&disk->part0, sectors[1]) -
38548- atomic_read(&device->rs_sect_ev);
38549+ atomic_read_unchecked(&device->rs_sect_ev);
38550
38551 if (atomic_read(&device->ap_actlog_cnt)
38552 || curr_events - device->rs_last_events > 64) {
38553@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38554 device->use_csums = true;
38555 } else if (pi->cmd == P_OV_REPLY) {
38556 /* track progress, we may need to throttle */
38557- atomic_add(size >> 9, &device->rs_sect_in);
38558+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38559 peer_req->w.cb = w_e_end_ov_reply;
38560 dec_rs_pending(device);
38561 /* drbd_rs_begin_io done when we sent this request,
38562@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38563 goto out_free_e;
38564
38565 submit_for_resync:
38566- atomic_add(size >> 9, &device->rs_sect_ev);
38567+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38568
38569 submit:
38570 update_receiver_timing_details(connection, drbd_submit_peer_request);
38571@@ -4564,7 +4564,7 @@ struct data_cmd {
38572 int expect_payload;
38573 size_t pkt_size;
38574 int (*fn)(struct drbd_connection *, struct packet_info *);
38575-};
38576+} __do_const;
38577
38578 static struct data_cmd drbd_cmd_handler[] = {
38579 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38580@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38581 if (!list_empty(&connection->current_epoch->list))
38582 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38583 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38584- atomic_set(&connection->current_epoch->epoch_size, 0);
38585+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38586 connection->send.seen_any_write_yet = false;
38587
38588 drbd_info(connection, "Connection closed\n");
38589@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38590 put_ldev(device);
38591 }
38592 dec_rs_pending(device);
38593- atomic_add(blksize >> 9, &device->rs_sect_in);
38594+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38595
38596 return 0;
38597 }
38598@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38599 struct asender_cmd {
38600 size_t pkt_size;
38601 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38602-};
38603+} __do_const;
38604
38605 static struct asender_cmd asender_tbl[] = {
38606 [P_PING] = { 0, got_Ping },
38607diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38608index d0fae55..4469096 100644
38609--- a/drivers/block/drbd/drbd_worker.c
38610+++ b/drivers/block/drbd/drbd_worker.c
38611@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38612 list_add_tail(&peer_req->w.list, &device->read_ee);
38613 spin_unlock_irq(&device->resource->req_lock);
38614
38615- atomic_add(size >> 9, &device->rs_sect_ev);
38616+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38617 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38618 return 0;
38619
38620@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38621 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38622 int number, mxb;
38623
38624- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38625+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38626 device->rs_in_flight -= sect_in;
38627
38628 rcu_read_lock();
38629@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38630 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38631 struct fifo_buffer *plan;
38632
38633- atomic_set(&device->rs_sect_in, 0);
38634- atomic_set(&device->rs_sect_ev, 0);
38635+ atomic_set_unchecked(&device->rs_sect_in, 0);
38636+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38637 device->rs_in_flight = 0;
38638 device->rs_last_events =
38639 (int)part_stat_read(&disk->part0, sectors[0]) +
38640diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38641index 773e964..e85af00 100644
38642--- a/drivers/block/loop.c
38643+++ b/drivers/block/loop.c
38644@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38645
38646 file_start_write(file);
38647 set_fs(get_ds());
38648- bw = file->f_op->write(file, buf, len, &pos);
38649+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38650 set_fs(old_fs);
38651 file_end_write(file);
38652 if (likely(bw == len))
38653diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38654index 09e628da..7607aaa 100644
38655--- a/drivers/block/pktcdvd.c
38656+++ b/drivers/block/pktcdvd.c
38657@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38658
38659 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38660 {
38661- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38662+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38663 }
38664
38665 /*
38666@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38667 return -EROFS;
38668 }
38669 pd->settings.fp = ti.fp;
38670- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38671+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38672
38673 if (ti.nwa_v) {
38674 pd->nwa = be32_to_cpu(ti.next_writable);
38675diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38676index b67066d..515b7f4 100644
38677--- a/drivers/block/rbd.c
38678+++ b/drivers/block/rbd.c
38679@@ -64,7 +64,7 @@
38680 * If the counter is already at its maximum value returns
38681 * -EINVAL without updating it.
38682 */
38683-static int atomic_inc_return_safe(atomic_t *v)
38684+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38685 {
38686 unsigned int counter;
38687
38688diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38689index e5565fb..71be10b4 100644
38690--- a/drivers/block/smart1,2.h
38691+++ b/drivers/block/smart1,2.h
38692@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38693 }
38694
38695 static struct access_method smart4_access = {
38696- smart4_submit_command,
38697- smart4_intr_mask,
38698- smart4_fifo_full,
38699- smart4_intr_pending,
38700- smart4_completed,
38701+ .submit_command = smart4_submit_command,
38702+ .set_intr_mask = smart4_intr_mask,
38703+ .fifo_full = smart4_fifo_full,
38704+ .intr_pending = smart4_intr_pending,
38705+ .command_completed = smart4_completed,
38706 };
38707
38708 /*
38709@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38710 }
38711
38712 static struct access_method smart2_access = {
38713- smart2_submit_command,
38714- smart2_intr_mask,
38715- smart2_fifo_full,
38716- smart2_intr_pending,
38717- smart2_completed,
38718+ .submit_command = smart2_submit_command,
38719+ .set_intr_mask = smart2_intr_mask,
38720+ .fifo_full = smart2_fifo_full,
38721+ .intr_pending = smart2_intr_pending,
38722+ .command_completed = smart2_completed,
38723 };
38724
38725 /*
38726@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38727 }
38728
38729 static struct access_method smart2e_access = {
38730- smart2e_submit_command,
38731- smart2e_intr_mask,
38732- smart2e_fifo_full,
38733- smart2e_intr_pending,
38734- smart2e_completed,
38735+ .submit_command = smart2e_submit_command,
38736+ .set_intr_mask = smart2e_intr_mask,
38737+ .fifo_full = smart2e_fifo_full,
38738+ .intr_pending = smart2e_intr_pending,
38739+ .command_completed = smart2e_completed,
38740 };
38741
38742 /*
38743@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38744 }
38745
38746 static struct access_method smart1_access = {
38747- smart1_submit_command,
38748- smart1_intr_mask,
38749- smart1_fifo_full,
38750- smart1_intr_pending,
38751- smart1_completed,
38752+ .submit_command = smart1_submit_command,
38753+ .set_intr_mask = smart1_intr_mask,
38754+ .fifo_full = smart1_fifo_full,
38755+ .intr_pending = smart1_intr_pending,
38756+ .command_completed = smart1_completed,
38757 };
38758diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38759index 55c135b..9f8d60c 100644
38760--- a/drivers/bluetooth/btwilink.c
38761+++ b/drivers/bluetooth/btwilink.c
38762@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38763
38764 static int bt_ti_probe(struct platform_device *pdev)
38765 {
38766- static struct ti_st *hst;
38767+ struct ti_st *hst;
38768 struct hci_dev *hdev;
38769 int err;
38770
38771diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38772index 5d28a45..a538f90 100644
38773--- a/drivers/cdrom/cdrom.c
38774+++ b/drivers/cdrom/cdrom.c
38775@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38776 ENSURE(reset, CDC_RESET);
38777 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38778 cdi->mc_flags = 0;
38779- cdo->n_minors = 0;
38780 cdi->options = CDO_USE_FFLAGS;
38781
38782 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38783@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38784 else
38785 cdi->cdda_method = CDDA_OLD;
38786
38787- if (!cdo->generic_packet)
38788- cdo->generic_packet = cdrom_dummy_generic_packet;
38789+ if (!cdo->generic_packet) {
38790+ pax_open_kernel();
38791+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38792+ pax_close_kernel();
38793+ }
38794
38795 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38796 mutex_lock(&cdrom_mutex);
38797@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38798 if (cdi->exit)
38799 cdi->exit(cdi);
38800
38801- cdi->ops->n_minors--;
38802 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38803 }
38804
38805@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38806 */
38807 nr = nframes;
38808 do {
38809- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38810+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38811 if (cgc.buffer)
38812 break;
38813
38814@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38815 struct cdrom_device_info *cdi;
38816 int ret;
38817
38818- ret = scnprintf(info + *pos, max_size - *pos, header);
38819+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38820 if (!ret)
38821 return 1;
38822
38823diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38824index 584bc31..e64a12c 100644
38825--- a/drivers/cdrom/gdrom.c
38826+++ b/drivers/cdrom/gdrom.c
38827@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38828 .audio_ioctl = gdrom_audio_ioctl,
38829 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38830 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38831- .n_minors = 1,
38832 };
38833
38834 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38835diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38836index a4af822..ed58cd1 100644
38837--- a/drivers/char/Kconfig
38838+++ b/drivers/char/Kconfig
38839@@ -17,7 +17,8 @@ config DEVMEM
38840
38841 config DEVKMEM
38842 bool "/dev/kmem virtual device support"
38843- default y
38844+ default n
38845+ depends on !GRKERNSEC_KMEM
38846 help
38847 Say Y here if you want to support the /dev/kmem device. The
38848 /dev/kmem device is rarely used, but can be used for certain
38849@@ -586,6 +587,7 @@ config DEVPORT
38850 bool
38851 depends on !M68K
38852 depends on ISA || PCI
38853+ depends on !GRKERNSEC_KMEM
38854 default y
38855
38856 source "drivers/s390/char/Kconfig"
38857diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38858index a48e05b..6bac831 100644
38859--- a/drivers/char/agp/compat_ioctl.c
38860+++ b/drivers/char/agp/compat_ioctl.c
38861@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38862 return -ENOMEM;
38863 }
38864
38865- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38866+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38867 sizeof(*usegment) * ureserve.seg_count)) {
38868 kfree(usegment);
38869 kfree(ksegment);
38870diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38871index 09f17eb..8531d2f 100644
38872--- a/drivers/char/agp/frontend.c
38873+++ b/drivers/char/agp/frontend.c
38874@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38875 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38876 return -EFAULT;
38877
38878- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38879+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38880 return -EFAULT;
38881
38882 client = agp_find_client_by_pid(reserve.pid);
38883@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38884 if (segment == NULL)
38885 return -ENOMEM;
38886
38887- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38888+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38889 sizeof(struct agp_segment) * reserve.seg_count)) {
38890 kfree(segment);
38891 return -EFAULT;
38892diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38893index 4f94375..413694e 100644
38894--- a/drivers/char/genrtc.c
38895+++ b/drivers/char/genrtc.c
38896@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38897 switch (cmd) {
38898
38899 case RTC_PLL_GET:
38900+ memset(&pll, 0, sizeof(pll));
38901 if (get_rtc_pll(&pll))
38902 return -EINVAL;
38903 else
38904diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38905index 5c0baa9..44011b1 100644
38906--- a/drivers/char/hpet.c
38907+++ b/drivers/char/hpet.c
38908@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38909 }
38910
38911 static int
38912-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38913+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38914 struct hpet_info *info)
38915 {
38916 struct hpet_timer __iomem *timer;
38917diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38918index 24cc4ed..f9807cf 100644
38919--- a/drivers/char/i8k.c
38920+++ b/drivers/char/i8k.c
38921@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38922 },
38923 };
38924
38925-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38926+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38927 {
38928 .ident = "Dell Inspiron",
38929 .matches = {
38930diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38931index 9bb5928..57a7801 100644
38932--- a/drivers/char/ipmi/ipmi_msghandler.c
38933+++ b/drivers/char/ipmi/ipmi_msghandler.c
38934@@ -436,7 +436,7 @@ struct ipmi_smi {
38935 struct proc_dir_entry *proc_dir;
38936 char proc_dir_name[10];
38937
38938- atomic_t stats[IPMI_NUM_STATS];
38939+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38940
38941 /*
38942 * run_to_completion duplicate of smb_info, smi_info
38943@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38944 static DEFINE_MUTEX(smi_watchers_mutex);
38945
38946 #define ipmi_inc_stat(intf, stat) \
38947- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38948+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38949 #define ipmi_get_stat(intf, stat) \
38950- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38951+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38952
38953 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38954 "ACPI", "SMBIOS", "PCI",
38955@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38956 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38957 init_waitqueue_head(&intf->waitq);
38958 for (i = 0; i < IPMI_NUM_STATS; i++)
38959- atomic_set(&intf->stats[i], 0);
38960+ atomic_set_unchecked(&intf->stats[i], 0);
38961
38962 intf->proc_dir = NULL;
38963
38964diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38965index 518585c..6c985cef 100644
38966--- a/drivers/char/ipmi/ipmi_si_intf.c
38967+++ b/drivers/char/ipmi/ipmi_si_intf.c
38968@@ -289,7 +289,7 @@ struct smi_info {
38969 unsigned char slave_addr;
38970
38971 /* Counters and things for the proc filesystem. */
38972- atomic_t stats[SI_NUM_STATS];
38973+ atomic_unchecked_t stats[SI_NUM_STATS];
38974
38975 struct task_struct *thread;
38976
38977@@ -298,9 +298,9 @@ struct smi_info {
38978 };
38979
38980 #define smi_inc_stat(smi, stat) \
38981- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38982+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38983 #define smi_get_stat(smi, stat) \
38984- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38985+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38986
38987 #define SI_MAX_PARMS 4
38988
38989@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
38990 atomic_set(&new_smi->req_events, 0);
38991 new_smi->run_to_completion = false;
38992 for (i = 0; i < SI_NUM_STATS; i++)
38993- atomic_set(&new_smi->stats[i], 0);
38994+ atomic_set_unchecked(&new_smi->stats[i], 0);
38995
38996 new_smi->interrupt_disabled = true;
38997 atomic_set(&new_smi->need_watch, 0);
38998diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38999index 297110c..3f69b43 100644
39000--- a/drivers/char/mem.c
39001+++ b/drivers/char/mem.c
39002@@ -18,6 +18,7 @@
39003 #include <linux/raw.h>
39004 #include <linux/tty.h>
39005 #include <linux/capability.h>
39006+#include <linux/security.h>
39007 #include <linux/ptrace.h>
39008 #include <linux/device.h>
39009 #include <linux/highmem.h>
39010@@ -36,6 +37,10 @@
39011
39012 #define DEVPORT_MINOR 4
39013
39014+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39015+extern const struct file_operations grsec_fops;
39016+#endif
39017+
39018 static inline unsigned long size_inside_page(unsigned long start,
39019 unsigned long size)
39020 {
39021@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39022
39023 while (cursor < to) {
39024 if (!devmem_is_allowed(pfn)) {
39025+#ifdef CONFIG_GRKERNSEC_KMEM
39026+ gr_handle_mem_readwrite(from, to);
39027+#else
39028 printk(KERN_INFO
39029 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
39030 current->comm, from, to);
39031+#endif
39032 return 0;
39033 }
39034 cursor += PAGE_SIZE;
39035@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39036 }
39037 return 1;
39038 }
39039+#elif defined(CONFIG_GRKERNSEC_KMEM)
39040+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39041+{
39042+ return 0;
39043+}
39044 #else
39045 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
39046 {
39047@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39048 #endif
39049
39050 while (count > 0) {
39051- unsigned long remaining;
39052+ unsigned long remaining = 0;
39053+ char *temp;
39054
39055 sz = size_inside_page(p, count);
39056
39057@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
39058 if (!ptr)
39059 return -EFAULT;
39060
39061- remaining = copy_to_user(buf, ptr, sz);
39062+#ifdef CONFIG_PAX_USERCOPY
39063+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39064+ if (!temp) {
39065+ unxlate_dev_mem_ptr(p, ptr);
39066+ return -ENOMEM;
39067+ }
39068+ remaining = probe_kernel_read(temp, ptr, sz);
39069+#else
39070+ temp = ptr;
39071+#endif
39072+
39073+ if (!remaining)
39074+ remaining = copy_to_user(buf, temp, sz);
39075+
39076+#ifdef CONFIG_PAX_USERCOPY
39077+ kfree(temp);
39078+#endif
39079+
39080 unxlate_dev_mem_ptr(p, ptr);
39081 if (remaining)
39082 return -EFAULT;
39083@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39084 size_t count, loff_t *ppos)
39085 {
39086 unsigned long p = *ppos;
39087- ssize_t low_count, read, sz;
39088+ ssize_t low_count, read, sz, err = 0;
39089 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
39090- int err = 0;
39091
39092 read = 0;
39093 if (p < (unsigned long) high_memory) {
39094@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39095 }
39096 #endif
39097 while (low_count > 0) {
39098+ char *temp;
39099+
39100 sz = size_inside_page(p, low_count);
39101
39102 /*
39103@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
39104 */
39105 kbuf = xlate_dev_kmem_ptr((void *)p);
39106
39107- if (copy_to_user(buf, kbuf, sz))
39108+#ifdef CONFIG_PAX_USERCOPY
39109+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
39110+ if (!temp)
39111+ return -ENOMEM;
39112+ err = probe_kernel_read(temp, kbuf, sz);
39113+#else
39114+ temp = kbuf;
39115+#endif
39116+
39117+ if (!err)
39118+ err = copy_to_user(buf, temp, sz);
39119+
39120+#ifdef CONFIG_PAX_USERCOPY
39121+ kfree(temp);
39122+#endif
39123+
39124+ if (err)
39125 return -EFAULT;
39126 buf += sz;
39127 p += sz;
39128@@ -804,6 +853,9 @@ static const struct memdev {
39129 #ifdef CONFIG_PRINTK
39130 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39131 #endif
39132+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39133+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39134+#endif
39135 };
39136
39137 static int memory_open(struct inode *inode, struct file *filp)
39138@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39139 continue;
39140
39141 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39142- NULL, devlist[minor].name);
39143+ NULL, "%s", devlist[minor].name);
39144 }
39145
39146 return tty_init();
39147diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39148index 9df78e2..01ba9ae 100644
39149--- a/drivers/char/nvram.c
39150+++ b/drivers/char/nvram.c
39151@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39152
39153 spin_unlock_irq(&rtc_lock);
39154
39155- if (copy_to_user(buf, contents, tmp - contents))
39156+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39157 return -EFAULT;
39158
39159 *ppos = i;
39160diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39161index 0ea9986..e7b07e4 100644
39162--- a/drivers/char/pcmcia/synclink_cs.c
39163+++ b/drivers/char/pcmcia/synclink_cs.c
39164@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39165
39166 if (debug_level >= DEBUG_LEVEL_INFO)
39167 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39168- __FILE__, __LINE__, info->device_name, port->count);
39169+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39170
39171 if (tty_port_close_start(port, tty, filp) == 0)
39172 goto cleanup;
39173@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39174 cleanup:
39175 if (debug_level >= DEBUG_LEVEL_INFO)
39176 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39177- tty->driver->name, port->count);
39178+ tty->driver->name, atomic_read(&port->count));
39179 }
39180
39181 /* Wait until the transmitter is empty.
39182@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39183
39184 if (debug_level >= DEBUG_LEVEL_INFO)
39185 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39186- __FILE__, __LINE__, tty->driver->name, port->count);
39187+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39188
39189 /* If port is closing, signal caller to try again */
39190 if (port->flags & ASYNC_CLOSING){
39191@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39192 goto cleanup;
39193 }
39194 spin_lock(&port->lock);
39195- port->count++;
39196+ atomic_inc(&port->count);
39197 spin_unlock(&port->lock);
39198 spin_unlock_irqrestore(&info->netlock, flags);
39199
39200- if (port->count == 1) {
39201+ if (atomic_read(&port->count) == 1) {
39202 /* 1st open on this device, init hardware */
39203 retval = startup(info, tty);
39204 if (retval < 0)
39205@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39206 unsigned short new_crctype;
39207
39208 /* return error if TTY interface open */
39209- if (info->port.count)
39210+ if (atomic_read(&info->port.count))
39211 return -EBUSY;
39212
39213 switch (encoding)
39214@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39215
39216 /* arbitrate between network and tty opens */
39217 spin_lock_irqsave(&info->netlock, flags);
39218- if (info->port.count != 0 || info->netcount != 0) {
39219+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39220 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39221 spin_unlock_irqrestore(&info->netlock, flags);
39222 return -EBUSY;
39223@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39224 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39225
39226 /* return error if TTY interface open */
39227- if (info->port.count)
39228+ if (atomic_read(&info->port.count))
39229 return -EBUSY;
39230
39231 if (cmd != SIOCWANDEV)
39232diff --git a/drivers/char/random.c b/drivers/char/random.c
39233index 9cd6968..6416f00 100644
39234--- a/drivers/char/random.c
39235+++ b/drivers/char/random.c
39236@@ -289,9 +289,6 @@
39237 /*
39238 * To allow fractional bits to be tracked, the entropy_count field is
39239 * denominated in units of 1/8th bits.
39240- *
39241- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39242- * credit_entropy_bits() needs to be 64 bits wide.
39243 */
39244 #define ENTROPY_SHIFT 3
39245 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39246@@ -439,9 +436,9 @@ struct entropy_store {
39247 };
39248
39249 static void push_to_pool(struct work_struct *work);
39250-static __u32 input_pool_data[INPUT_POOL_WORDS];
39251-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39252-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39253+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39254+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39255+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39256
39257 static struct entropy_store input_pool = {
39258 .poolinfo = &poolinfo_table[0],
39259@@ -635,7 +632,7 @@ retry:
39260 /* The +2 corresponds to the /4 in the denominator */
39261
39262 do {
39263- unsigned int anfrac = min(pnfrac, pool_size/2);
39264+ u64 anfrac = min(pnfrac, pool_size/2);
39265 unsigned int add =
39266 ((pool_size - entropy_count)*anfrac*3) >> s;
39267
39268@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39269
39270 extract_buf(r, tmp);
39271 i = min_t(int, nbytes, EXTRACT_SIZE);
39272- if (copy_to_user(buf, tmp, i)) {
39273+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39274 ret = -EFAULT;
39275 break;
39276 }
39277@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39278 static int proc_do_uuid(struct ctl_table *table, int write,
39279 void __user *buffer, size_t *lenp, loff_t *ppos)
39280 {
39281- struct ctl_table fake_table;
39282+ ctl_table_no_const fake_table;
39283 unsigned char buf[64], tmp_uuid[16], *uuid;
39284
39285 uuid = table->data;
39286@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39287 static int proc_do_entropy(struct ctl_table *table, int write,
39288 void __user *buffer, size_t *lenp, loff_t *ppos)
39289 {
39290- struct ctl_table fake_table;
39291+ ctl_table_no_const fake_table;
39292 int entropy_count;
39293
39294 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39295diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39296index e496dae..3db53b6 100644
39297--- a/drivers/char/sonypi.c
39298+++ b/drivers/char/sonypi.c
39299@@ -54,6 +54,7 @@
39300
39301 #include <asm/uaccess.h>
39302 #include <asm/io.h>
39303+#include <asm/local.h>
39304
39305 #include <linux/sonypi.h>
39306
39307@@ -490,7 +491,7 @@ static struct sonypi_device {
39308 spinlock_t fifo_lock;
39309 wait_queue_head_t fifo_proc_list;
39310 struct fasync_struct *fifo_async;
39311- int open_count;
39312+ local_t open_count;
39313 int model;
39314 struct input_dev *input_jog_dev;
39315 struct input_dev *input_key_dev;
39316@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39317 static int sonypi_misc_release(struct inode *inode, struct file *file)
39318 {
39319 mutex_lock(&sonypi_device.lock);
39320- sonypi_device.open_count--;
39321+ local_dec(&sonypi_device.open_count);
39322 mutex_unlock(&sonypi_device.lock);
39323 return 0;
39324 }
39325@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39326 {
39327 mutex_lock(&sonypi_device.lock);
39328 /* Flush input queue on first open */
39329- if (!sonypi_device.open_count)
39330+ if (!local_read(&sonypi_device.open_count))
39331 kfifo_reset(&sonypi_device.fifo);
39332- sonypi_device.open_count++;
39333+ local_inc(&sonypi_device.open_count);
39334 mutex_unlock(&sonypi_device.lock);
39335
39336 return 0;
39337@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39338
39339 static struct platform_device *sonypi_platform_device;
39340
39341-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39342+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39343 {
39344 .ident = "Sony Vaio",
39345 .matches = {
39346diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39347index 565a947..dcdc06e 100644
39348--- a/drivers/char/tpm/tpm_acpi.c
39349+++ b/drivers/char/tpm/tpm_acpi.c
39350@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39351 virt = acpi_os_map_iomem(start, len);
39352 if (!virt) {
39353 kfree(log->bios_event_log);
39354+ log->bios_event_log = NULL;
39355 printk("%s: ERROR - Unable to map memory\n", __func__);
39356 return -EIO;
39357 }
39358
39359- memcpy_fromio(log->bios_event_log, virt, len);
39360+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39361
39362 acpi_os_unmap_iomem(virt, len);
39363 return 0;
39364diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39365index 3a56a13..f8cbd25 100644
39366--- a/drivers/char/tpm/tpm_eventlog.c
39367+++ b/drivers/char/tpm/tpm_eventlog.c
39368@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39369 event = addr;
39370
39371 if ((event->event_type == 0 && event->event_size == 0) ||
39372- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39373+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39374 return NULL;
39375
39376 return addr;
39377@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39378 return NULL;
39379
39380 if ((event->event_type == 0 && event->event_size == 0) ||
39381- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39382+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39383 return NULL;
39384
39385 (*pos)++;
39386@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39387 int i;
39388
39389 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39390- seq_putc(m, data[i]);
39391+ if (!seq_putc(m, data[i]))
39392+ return -EFAULT;
39393
39394 return 0;
39395 }
39396diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39397index 72d7028..1586601 100644
39398--- a/drivers/char/virtio_console.c
39399+++ b/drivers/char/virtio_console.c
39400@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39401 if (to_user) {
39402 ssize_t ret;
39403
39404- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39405+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39406 if (ret)
39407 return -EFAULT;
39408 } else {
39409@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39410 if (!port_has_data(port) && !port->host_connected)
39411 return 0;
39412
39413- return fill_readbuf(port, ubuf, count, true);
39414+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39415 }
39416
39417 static int wait_port_writable(struct port *port, bool nonblock)
39418diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39419index 956b7e5..b655045 100644
39420--- a/drivers/clk/clk-composite.c
39421+++ b/drivers/clk/clk-composite.c
39422@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39423 struct clk *clk;
39424 struct clk_init_data init;
39425 struct clk_composite *composite;
39426- struct clk_ops *clk_composite_ops;
39427+ clk_ops_no_const *clk_composite_ops;
39428
39429 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39430 if (!composite) {
39431diff --git a/drivers/clk/hisilicon/clk-hi3620.c b/drivers/clk/hisilicon/clk-hi3620.c
39432index 2e4f6d4..b4cf487 100644
39433--- a/drivers/clk/hisilicon/clk-hi3620.c
39434+++ b/drivers/clk/hisilicon/clk-hi3620.c
39435@@ -38,44 +38,44 @@
39436 #include "clk.h"
39437
39438 /* clock parent list */
39439-static const char *timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39440-static const char *timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39441-static const char *timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39442-static const char *timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39443-static const char *timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39444-static const char *timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39445-static const char *timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39446-static const char *timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39447-static const char *timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39448-static const char *timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39449-static const char *uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39450-static const char *uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39451-static const char *uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39452-static const char *uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39453-static const char *uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39454-static const char *spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39455-static const char *spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39456-static const char *spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39457+static const char * const timer0_mux_p[] __initconst = { "osc32k", "timerclk01", };
39458+static const char * const timer1_mux_p[] __initconst = { "osc32k", "timerclk01", };
39459+static const char * const timer2_mux_p[] __initconst = { "osc32k", "timerclk23", };
39460+static const char * const timer3_mux_p[] __initconst = { "osc32k", "timerclk23", };
39461+static const char * const timer4_mux_p[] __initconst = { "osc32k", "timerclk45", };
39462+static const char * const timer5_mux_p[] __initconst = { "osc32k", "timerclk45", };
39463+static const char * const timer6_mux_p[] __initconst = { "osc32k", "timerclk67", };
39464+static const char * const timer7_mux_p[] __initconst = { "osc32k", "timerclk67", };
39465+static const char * const timer8_mux_p[] __initconst = { "osc32k", "timerclk89", };
39466+static const char * const timer9_mux_p[] __initconst = { "osc32k", "timerclk89", };
39467+static const char * const uart0_mux_p[] __initconst = { "osc26m", "pclk", };
39468+static const char * const uart1_mux_p[] __initconst = { "osc26m", "pclk", };
39469+static const char * const uart2_mux_p[] __initconst = { "osc26m", "pclk", };
39470+static const char * const uart3_mux_p[] __initconst = { "osc26m", "pclk", };
39471+static const char * const uart4_mux_p[] __initconst = { "osc26m", "pclk", };
39472+static const char * const spi0_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39473+static const char * const spi1_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39474+static const char * const spi2_mux_p[] __initconst = { "osc26m", "rclk_cfgaxi", };
39475 /* share axi parent */
39476-static const char *saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39477-static const char *pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39478-static const char *pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39479-static const char *sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39480-static const char *mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39481-static const char *mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39482-static const char *g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39483-static const char *venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39484-static const char *vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39485-static const char *vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39486-static const char *edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39487-static const char *ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39488+static const char * const saxi_mux_p[] __initconst = { "armpll3", "armpll2", };
39489+static const char * const pwm0_mux_p[] __initconst = { "osc32k", "osc26m", };
39490+static const char * const pwm1_mux_p[] __initconst = { "osc32k", "osc26m", };
39491+static const char * const sd_mux_p[] __initconst = { "armpll2", "armpll3", };
39492+static const char * const mmc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39493+static const char * const mmc1_mux2_p[] __initconst = { "osc26m", "mmc1_div", };
39494+static const char * const g2d_mux_p[] __initconst = { "armpll2", "armpll3", };
39495+static const char * const venc_mux_p[] __initconst = { "armpll2", "armpll3", };
39496+static const char * const vdec_mux_p[] __initconst = { "armpll2", "armpll3", };
39497+static const char * const vpp_mux_p[] __initconst = { "armpll2", "armpll3", };
39498+static const char * const edc0_mux_p[] __initconst = { "armpll2", "armpll3", };
39499+static const char * const ldi0_mux_p[] __initconst = { "armpll2", "armpll4",
39500 "armpll3", "armpll5", };
39501-static const char *edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39502-static const char *ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39503+static const char * const edc1_mux_p[] __initconst = { "armpll2", "armpll3", };
39504+static const char * const ldi1_mux_p[] __initconst = { "armpll2", "armpll4",
39505 "armpll3", "armpll5", };
39506-static const char *rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39507-static const char *mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39508-static const char *mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39509+static const char * const rclk_hsic_p[] __initconst = { "armpll3", "armpll2", };
39510+static const char * const mmc2_mux_p[] __initconst = { "armpll2", "armpll3", };
39511+static const char * const mmc3_mux_p[] __initconst = { "armpll2", "armpll3", };
39512
39513
39514 /* fixed rate clocks */
39515diff --git a/drivers/clk/hisilicon/clk-hix5hd2.c b/drivers/clk/hisilicon/clk-hix5hd2.c
39516index 3f369c6..05f9ffd 100644
39517--- a/drivers/clk/hisilicon/clk-hix5hd2.c
39518+++ b/drivers/clk/hisilicon/clk-hix5hd2.c
39519@@ -46,15 +46,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = {
39520 { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, },
39521 };
39522
39523-static const char *sfc_mux_p[] __initconst = {
39524+static const char * const sfc_mux_p[] __initconst = {
39525 "24m", "150m", "200m", "100m", "75m", };
39526 static u32 sfc_mux_table[] = {0, 4, 5, 6, 7};
39527
39528-static const char *sdio_mux_p[] __initconst = {
39529+static const char * const sdio_mux_p[] __initconst = {
39530 "75m", "100m", "50m", "15m", };
39531 static u32 sdio_mux_table[] = {0, 1, 2, 3};
39532
39533-static const char *fephy_mux_p[] __initconst = { "25m", "125m"};
39534+static const char * const fephy_mux_p[] __initconst = { "25m", "125m"};
39535 static u32 fephy_mux_table[] = {0, 1};
39536
39537
39538diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
39539index 7eb684c..147c6fc 100644
39540--- a/drivers/clk/rockchip/clk-rk3188.c
39541+++ b/drivers/clk/rockchip/clk-rk3188.c
39542@@ -704,7 +704,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = {
39543 GATE(ACLK_GPS, "aclk_gps", "aclk_peri", 0, RK2928_CLKGATE_CON(8), 13, GFLAGS),
39544 };
39545
39546-static const char *rk3188_critical_clocks[] __initconst = {
39547+static const char * const rk3188_critical_clocks[] __initconst = {
39548 "aclk_cpu",
39549 "aclk_peri",
39550 "hclk_peri",
39551diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
39552index 05d7a0b..4fc131c 100644
39553--- a/drivers/clk/rockchip/clk-rk3288.c
39554+++ b/drivers/clk/rockchip/clk-rk3288.c
39555@@ -771,7 +771,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
39556 GATE(0, "pclk_isp_in", "ext_isp", 0, RK3288_CLKGATE_CON(16), 3, GFLAGS),
39557 };
39558
39559-static const char *rk3288_critical_clocks[] __initconst = {
39560+static const char * const rk3288_critical_clocks[] __initconst = {
39561 "aclk_cpu",
39562 "aclk_peri",
39563 "hclk_peri",
39564diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
39565index 58d2e3b..0c21b0d 100644
39566--- a/drivers/clk/rockchip/clk.h
39567+++ b/drivers/clk/rockchip/clk.h
39568@@ -182,7 +182,7 @@ struct clk *rockchip_clk_register_mmc(const char *name,
39569 const char **parent_names, u8 num_parents,
39570 void __iomem *reg, int shift);
39571
39572-#define PNAME(x) static const char *x[] __initconst
39573+#define PNAME(x) static const char * const x[] __initconst
39574
39575 enum rockchip_clk_branch_type {
39576 branch_composite,
39577diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39578index e4c7538..99c50cd 100644
39579--- a/drivers/clk/samsung/clk.h
39580+++ b/drivers/clk/samsung/clk.h
39581@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39582 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39583 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39584
39585-#define PNAME(x) static const char *x[] __initdata
39586+#define PNAME(x) static const char * const x[] __initconst
39587
39588 /**
39589 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39590diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39591index dd3a78c..386d49c 100644
39592--- a/drivers/clk/socfpga/clk-gate.c
39593+++ b/drivers/clk/socfpga/clk-gate.c
39594@@ -22,6 +22,7 @@
39595 #include <linux/mfd/syscon.h>
39596 #include <linux/of.h>
39597 #include <linux/regmap.h>
39598+#include <asm/pgtable.h>
39599
39600 #include "clk.h"
39601
39602@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39603 return 0;
39604 }
39605
39606-static struct clk_ops gateclk_ops = {
39607+static clk_ops_no_const gateclk_ops __read_only = {
39608 .prepare = socfpga_clk_prepare,
39609 .recalc_rate = socfpga_clk_recalc_rate,
39610 .get_parent = socfpga_clk_get_parent,
39611@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39612 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39613 socfpga_clk->hw.bit_idx = clk_gate[1];
39614
39615- gateclk_ops.enable = clk_gate_ops.enable;
39616- gateclk_ops.disable = clk_gate_ops.disable;
39617+ pax_open_kernel();
39618+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39619+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39620+ pax_close_kernel();
39621 }
39622
39623 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39624diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39625index de6da95..c98278b 100644
39626--- a/drivers/clk/socfpga/clk-pll.c
39627+++ b/drivers/clk/socfpga/clk-pll.c
39628@@ -21,6 +21,7 @@
39629 #include <linux/io.h>
39630 #include <linux/of.h>
39631 #include <linux/of_address.h>
39632+#include <asm/pgtable.h>
39633
39634 #include "clk.h"
39635
39636@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39637 CLK_MGR_PLL_CLK_SRC_MASK;
39638 }
39639
39640-static struct clk_ops clk_pll_ops = {
39641+static clk_ops_no_const clk_pll_ops __read_only = {
39642 .recalc_rate = clk_pll_recalc_rate,
39643 .get_parent = clk_pll_get_parent,
39644 };
39645@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39646 pll_clk->hw.hw.init = &init;
39647
39648 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39649- clk_pll_ops.enable = clk_gate_ops.enable;
39650- clk_pll_ops.disable = clk_gate_ops.disable;
39651+ pax_open_kernel();
39652+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39653+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39654+ pax_close_kernel();
39655
39656 clk = clk_register(NULL, &pll_clk->hw.hw);
39657 if (WARN_ON(IS_ERR(clk))) {
39658diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
39659index 3654f61..81abe81 100644
39660--- a/drivers/clk/ti/composite.c
39661+++ b/drivers/clk/ti/composite.c
39662@@ -69,7 +69,7 @@ struct component_clk {
39663 struct list_head link;
39664 };
39665
39666-static const char * __initconst component_clk_types[] = {
39667+static const char * const __initconst component_clk_types[] = {
39668 "gate", "divider", "mux"
39669 };
39670
39671diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
39672index f870aad..04ba1e4 100644
39673--- a/drivers/clk/zynq/clkc.c
39674+++ b/drivers/clk/zynq/clkc.c
39675@@ -85,22 +85,22 @@ static DEFINE_SPINLOCK(canmioclk_lock);
39676 static DEFINE_SPINLOCK(dbgclk_lock);
39677 static DEFINE_SPINLOCK(aperclk_lock);
39678
39679-static const char *armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39680-static const char *ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39681-static const char *iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39682-static const char *gem0_mux_parents[] __initconst = {"gem0_div1", "dummy_name"};
39683-static const char *gem1_mux_parents[] __initconst = {"gem1_div1", "dummy_name"};
39684-static const char *can0_mio_mux2_parents[] __initconst = {"can0_gate",
39685+static const char * const armpll_parents[] __initconst = {"armpll_int", "ps_clk"};
39686+static const char * const ddrpll_parents[] __initconst = {"ddrpll_int", "ps_clk"};
39687+static const char * const iopll_parents[] __initconst = {"iopll_int", "ps_clk"};
39688+static const char * gem0_mux_parents[] __initdata = {"gem0_div1", "dummy_name"};
39689+static const char * gem1_mux_parents[] __initdata = {"gem1_div1", "dummy_name"};
39690+static const char * const can0_mio_mux2_parents[] __initconst = {"can0_gate",
39691 "can0_mio_mux"};
39692-static const char *can1_mio_mux2_parents[] __initconst = {"can1_gate",
39693+static const char * const can1_mio_mux2_parents[] __initconst = {"can1_gate",
39694 "can1_mio_mux"};
39695-static const char *dbg_emio_mux_parents[] __initconst = {"dbg_div",
39696+static const char * dbg_emio_mux_parents[] __initdata = {"dbg_div",
39697 "dummy_name"};
39698
39699-static const char *dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39700-static const char *gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39701-static const char *gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39702-static const char *swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39703+static const char * const dbgtrc_emio_input_names[] __initconst = {"trace_emio_clk"};
39704+static const char * const gem0_emio_input_names[] __initconst = {"gem0_emio_clk"};
39705+static const char * const gem1_emio_input_names[] __initconst = {"gem1_emio_clk"};
39706+static const char * const swdt_ext_clk_input_names[] __initconst = {"swdt_ext_clk"};
39707
39708 static void __init zynq_clk_register_fclk(enum zynq_clk fclk,
39709 const char *clk_name, void __iomem *fclk_ctrl_reg,
39710diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39711index b0c18ed..1713a80 100644
39712--- a/drivers/cpufreq/acpi-cpufreq.c
39713+++ b/drivers/cpufreq/acpi-cpufreq.c
39714@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39715 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39716 per_cpu(acfreq_data, cpu) = data;
39717
39718- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39719- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39720+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39721+ pax_open_kernel();
39722+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39723+ pax_close_kernel();
39724+ }
39725
39726 result = acpi_processor_register_performance(data->acpi_data, cpu);
39727 if (result)
39728@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39729 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39730 break;
39731 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39732- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39733+ pax_open_kernel();
39734+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39735+ pax_close_kernel();
39736 break;
39737 default:
39738 break;
39739@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39740 if (!msrs)
39741 return;
39742
39743- acpi_cpufreq_driver.boost_supported = true;
39744- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39745+ pax_open_kernel();
39746+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39747+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39748+ pax_close_kernel();
39749
39750 cpu_notifier_register_begin();
39751
39752diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39753index bab67db..91af7e3 100644
39754--- a/drivers/cpufreq/cpufreq-dt.c
39755+++ b/drivers/cpufreq/cpufreq-dt.c
39756@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39757 if (!IS_ERR(cpu_reg))
39758 regulator_put(cpu_reg);
39759
39760- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39761+ pax_open_kernel();
39762+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39763+ pax_close_kernel();
39764
39765 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39766 if (ret)
39767diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39768index 8ae655c..3141442 100644
39769--- a/drivers/cpufreq/cpufreq.c
39770+++ b/drivers/cpufreq/cpufreq.c
39771@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39772 }
39773
39774 mutex_lock(&cpufreq_governor_mutex);
39775- list_del(&governor->governor_list);
39776+ pax_list_del(&governor->governor_list);
39777 mutex_unlock(&cpufreq_governor_mutex);
39778 return;
39779 }
39780@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39781 return NOTIFY_OK;
39782 }
39783
39784-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39785+static struct notifier_block cpufreq_cpu_notifier = {
39786 .notifier_call = cpufreq_cpu_callback,
39787 };
39788
39789@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39790 return 0;
39791
39792 write_lock_irqsave(&cpufreq_driver_lock, flags);
39793- cpufreq_driver->boost_enabled = state;
39794+ pax_open_kernel();
39795+ *(bool *)&cpufreq_driver->boost_enabled = state;
39796+ pax_close_kernel();
39797 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39798
39799 ret = cpufreq_driver->set_boost(state);
39800 if (ret) {
39801 write_lock_irqsave(&cpufreq_driver_lock, flags);
39802- cpufreq_driver->boost_enabled = !state;
39803+ pax_open_kernel();
39804+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39805+ pax_close_kernel();
39806 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39807
39808 pr_err("%s: Cannot %s BOOST\n",
39809@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39810 cpufreq_driver = driver_data;
39811 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39812
39813- if (driver_data->setpolicy)
39814- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39815+ if (driver_data->setpolicy) {
39816+ pax_open_kernel();
39817+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39818+ pax_close_kernel();
39819+ }
39820
39821 if (cpufreq_boost_supported()) {
39822 /*
39823 * Check if driver provides function to enable boost -
39824 * if not, use cpufreq_boost_set_sw as default
39825 */
39826- if (!cpufreq_driver->set_boost)
39827- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39828+ if (!cpufreq_driver->set_boost) {
39829+ pax_open_kernel();
39830+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39831+ pax_close_kernel();
39832+ }
39833
39834 ret = cpufreq_sysfs_create_file(&boost.attr);
39835 if (ret) {
39836diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39837index 1b44496..b80ff5e 100644
39838--- a/drivers/cpufreq/cpufreq_governor.c
39839+++ b/drivers/cpufreq/cpufreq_governor.c
39840@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39841 struct dbs_data *dbs_data;
39842 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39843 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39844- struct od_ops *od_ops = NULL;
39845+ const struct od_ops *od_ops = NULL;
39846 struct od_dbs_tuners *od_tuners = NULL;
39847 struct cs_dbs_tuners *cs_tuners = NULL;
39848 struct cpu_dbs_common_info *cpu_cdbs;
39849@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39850
39851 if ((cdata->governor == GOV_CONSERVATIVE) &&
39852 (!policy->governor->initialized)) {
39853- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39854+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39855
39856 cpufreq_register_notifier(cs_ops->notifier_block,
39857 CPUFREQ_TRANSITION_NOTIFIER);
39858@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39859
39860 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39861 (policy->governor->initialized == 1)) {
39862- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39863+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39864
39865 cpufreq_unregister_notifier(cs_ops->notifier_block,
39866 CPUFREQ_TRANSITION_NOTIFIER);
39867diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39868index cc401d1..8197340 100644
39869--- a/drivers/cpufreq/cpufreq_governor.h
39870+++ b/drivers/cpufreq/cpufreq_governor.h
39871@@ -212,7 +212,7 @@ struct common_dbs_data {
39872 void (*exit)(struct dbs_data *dbs_data);
39873
39874 /* Governor specific ops, see below */
39875- void *gov_ops;
39876+ const void *gov_ops;
39877 };
39878
39879 /* Governor Per policy data */
39880@@ -232,7 +232,7 @@ struct od_ops {
39881 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39882 unsigned int freq_next, unsigned int relation);
39883 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39884-};
39885+} __no_const;
39886
39887 struct cs_ops {
39888 struct notifier_block *notifier_block;
39889diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39890index ad3f38f..8f086cd 100644
39891--- a/drivers/cpufreq/cpufreq_ondemand.c
39892+++ b/drivers/cpufreq/cpufreq_ondemand.c
39893@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39894
39895 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39896
39897-static struct od_ops od_ops = {
39898+static struct od_ops od_ops __read_only = {
39899 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39900 .powersave_bias_target = generic_powersave_bias_target,
39901 .freq_increase = dbs_freq_increase,
39902@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39903 (struct cpufreq_policy *, unsigned int, unsigned int),
39904 unsigned int powersave_bias)
39905 {
39906- od_ops.powersave_bias_target = f;
39907+ pax_open_kernel();
39908+ *(void **)&od_ops.powersave_bias_target = f;
39909+ pax_close_kernel();
39910 od_set_powersave_bias(powersave_bias);
39911 }
39912 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39913
39914 void od_unregister_powersave_bias_handler(void)
39915 {
39916- od_ops.powersave_bias_target = generic_powersave_bias_target;
39917+ pax_open_kernel();
39918+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39919+ pax_close_kernel();
39920 od_set_powersave_bias(0);
39921 }
39922 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39923diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39924index 872c577..5fb3c20 100644
39925--- a/drivers/cpufreq/intel_pstate.c
39926+++ b/drivers/cpufreq/intel_pstate.c
39927@@ -133,10 +133,10 @@ struct pstate_funcs {
39928 struct cpu_defaults {
39929 struct pstate_adjust_policy pid_policy;
39930 struct pstate_funcs funcs;
39931-};
39932+} __do_const;
39933
39934 static struct pstate_adjust_policy pid_params;
39935-static struct pstate_funcs pstate_funcs;
39936+static struct pstate_funcs *pstate_funcs;
39937 static int hwp_active;
39938
39939 struct perf_limits {
39940@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39941
39942 cpu->pstate.current_pstate = pstate;
39943
39944- pstate_funcs.set(cpu, pstate);
39945+ pstate_funcs->set(cpu, pstate);
39946 }
39947
39948 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39949 {
39950- cpu->pstate.min_pstate = pstate_funcs.get_min();
39951- cpu->pstate.max_pstate = pstate_funcs.get_max();
39952- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39953- cpu->pstate.scaling = pstate_funcs.get_scaling();
39954+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39955+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39956+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39957+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39958
39959- if (pstate_funcs.get_vid)
39960- pstate_funcs.get_vid(cpu);
39961+ if (pstate_funcs->get_vid)
39962+ pstate_funcs->get_vid(cpu);
39963 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39964 }
39965
39966@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
39967 rdmsrl(MSR_IA32_APERF, aperf);
39968 rdmsrl(MSR_IA32_MPERF, mperf);
39969
39970- if (!pstate_funcs.get_max() ||
39971- !pstate_funcs.get_min() ||
39972- !pstate_funcs.get_turbo())
39973+ if (!pstate_funcs->get_max() ||
39974+ !pstate_funcs->get_min() ||
39975+ !pstate_funcs->get_turbo())
39976 return -ENODEV;
39977
39978 rdmsrl(MSR_IA32_APERF, tmp);
39979@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
39980 return 0;
39981 }
39982
39983-static void copy_pid_params(struct pstate_adjust_policy *policy)
39984+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39985 {
39986 pid_params.sample_rate_ms = policy->sample_rate_ms;
39987 pid_params.p_gain_pct = policy->p_gain_pct;
39988@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39989
39990 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39991 {
39992- pstate_funcs.get_max = funcs->get_max;
39993- pstate_funcs.get_min = funcs->get_min;
39994- pstate_funcs.get_turbo = funcs->get_turbo;
39995- pstate_funcs.get_scaling = funcs->get_scaling;
39996- pstate_funcs.set = funcs->set;
39997- pstate_funcs.get_vid = funcs->get_vid;
39998+ pstate_funcs = funcs;
39999 }
40000
40001 #if IS_ENABLED(CONFIG_ACPI)
40002diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
40003index 529cfd9..0e28fff 100644
40004--- a/drivers/cpufreq/p4-clockmod.c
40005+++ b/drivers/cpufreq/p4-clockmod.c
40006@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40007 case 0x0F: /* Core Duo */
40008 case 0x16: /* Celeron Core */
40009 case 0x1C: /* Atom */
40010- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40011+ pax_open_kernel();
40012+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40013+ pax_close_kernel();
40014 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
40015 case 0x0D: /* Pentium M (Dothan) */
40016- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40017+ pax_open_kernel();
40018+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40019+ pax_close_kernel();
40020 /* fall through */
40021 case 0x09: /* Pentium M (Banias) */
40022 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
40023@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
40024
40025 /* on P-4s, the TSC runs with constant frequency independent whether
40026 * throttling is active or not. */
40027- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40028+ pax_open_kernel();
40029+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
40030+ pax_close_kernel();
40031
40032 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
40033 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
40034diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
40035index 9bb42ba..b01b4a2 100644
40036--- a/drivers/cpufreq/sparc-us3-cpufreq.c
40037+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
40038@@ -18,14 +18,12 @@
40039 #include <asm/head.h>
40040 #include <asm/timer.h>
40041
40042-static struct cpufreq_driver *cpufreq_us3_driver;
40043-
40044 struct us3_freq_percpu_info {
40045 struct cpufreq_frequency_table table[4];
40046 };
40047
40048 /* Indexed by cpu number. */
40049-static struct us3_freq_percpu_info *us3_freq_table;
40050+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
40051
40052 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
40053 * in the Safari config register.
40054@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
40055
40056 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
40057 {
40058- if (cpufreq_us3_driver)
40059- us3_freq_target(policy, 0);
40060+ us3_freq_target(policy, 0);
40061
40062 return 0;
40063 }
40064
40065+static int __init us3_freq_init(void);
40066+static void __exit us3_freq_exit(void);
40067+
40068+static struct cpufreq_driver cpufreq_us3_driver = {
40069+ .init = us3_freq_cpu_init,
40070+ .verify = cpufreq_generic_frequency_table_verify,
40071+ .target_index = us3_freq_target,
40072+ .get = us3_freq_get,
40073+ .exit = us3_freq_cpu_exit,
40074+ .name = "UltraSPARC-III",
40075+
40076+};
40077+
40078 static int __init us3_freq_init(void)
40079 {
40080 unsigned long manuf, impl, ver;
40081- int ret;
40082
40083 if (tlb_type != cheetah && tlb_type != cheetah_plus)
40084 return -ENODEV;
40085@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
40086 (impl == CHEETAH_IMPL ||
40087 impl == CHEETAH_PLUS_IMPL ||
40088 impl == JAGUAR_IMPL ||
40089- impl == PANTHER_IMPL)) {
40090- struct cpufreq_driver *driver;
40091-
40092- ret = -ENOMEM;
40093- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
40094- if (!driver)
40095- goto err_out;
40096-
40097- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
40098- GFP_KERNEL);
40099- if (!us3_freq_table)
40100- goto err_out;
40101-
40102- driver->init = us3_freq_cpu_init;
40103- driver->verify = cpufreq_generic_frequency_table_verify;
40104- driver->target_index = us3_freq_target;
40105- driver->get = us3_freq_get;
40106- driver->exit = us3_freq_cpu_exit;
40107- strcpy(driver->name, "UltraSPARC-III");
40108-
40109- cpufreq_us3_driver = driver;
40110- ret = cpufreq_register_driver(driver);
40111- if (ret)
40112- goto err_out;
40113-
40114- return 0;
40115-
40116-err_out:
40117- if (driver) {
40118- kfree(driver);
40119- cpufreq_us3_driver = NULL;
40120- }
40121- kfree(us3_freq_table);
40122- us3_freq_table = NULL;
40123- return ret;
40124- }
40125+ impl == PANTHER_IMPL))
40126+ return cpufreq_register_driver(&cpufreq_us3_driver);
40127
40128 return -ENODEV;
40129 }
40130
40131 static void __exit us3_freq_exit(void)
40132 {
40133- if (cpufreq_us3_driver) {
40134- cpufreq_unregister_driver(cpufreq_us3_driver);
40135- kfree(cpufreq_us3_driver);
40136- cpufreq_us3_driver = NULL;
40137- kfree(us3_freq_table);
40138- us3_freq_table = NULL;
40139- }
40140+ cpufreq_unregister_driver(&cpufreq_us3_driver);
40141 }
40142
40143 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
40144diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
40145index 7d4a315..21bb886 100644
40146--- a/drivers/cpufreq/speedstep-centrino.c
40147+++ b/drivers/cpufreq/speedstep-centrino.c
40148@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
40149 !cpu_has(cpu, X86_FEATURE_EST))
40150 return -ENODEV;
40151
40152- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
40153- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40154+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
40155+ pax_open_kernel();
40156+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
40157+ pax_close_kernel();
40158+ }
40159
40160 if (policy->cpu != 0)
40161 return -ENODEV;
40162diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
40163index 2697e87..c32476c 100644
40164--- a/drivers/cpuidle/driver.c
40165+++ b/drivers/cpuidle/driver.c
40166@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
40167
40168 static void poll_idle_init(struct cpuidle_driver *drv)
40169 {
40170- struct cpuidle_state *state = &drv->states[0];
40171+ cpuidle_state_no_const *state = &drv->states[0];
40172
40173 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
40174 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
40175diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
40176index fb9f511..213e6cc 100644
40177--- a/drivers/cpuidle/governor.c
40178+++ b/drivers/cpuidle/governor.c
40179@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
40180 mutex_lock(&cpuidle_lock);
40181 if (__cpuidle_find_governor(gov->name) == NULL) {
40182 ret = 0;
40183- list_add_tail(&gov->governor_list, &cpuidle_governors);
40184+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
40185 if (!cpuidle_curr_governor ||
40186 cpuidle_curr_governor->rating < gov->rating)
40187 cpuidle_switch_governor(gov);
40188diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
40189index 832a2c3..1794080 100644
40190--- a/drivers/cpuidle/sysfs.c
40191+++ b/drivers/cpuidle/sysfs.c
40192@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
40193 NULL
40194 };
40195
40196-static struct attribute_group cpuidle_attr_group = {
40197+static attribute_group_no_const cpuidle_attr_group = {
40198 .attrs = cpuidle_default_attrs,
40199 .name = "cpuidle",
40200 };
40201diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c
40202index f347ab7..08b0da2 100644
40203--- a/drivers/crypto/caam/caamhash.c
40204+++ b/drivers/crypto/caam/caamhash.c
40205@@ -1543,6 +1543,8 @@ static int ahash_init(struct ahash_request *req)
40206
40207 state->current_buf = 0;
40208 state->buf_dma = 0;
40209+ state->buflen_0 = 0;
40210+ state->buflen_1 = 0;
40211
40212 return 0;
40213 }
40214diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c
40215index ae31e55..a48dc25 100644
40216--- a/drivers/crypto/caam/caamrng.c
40217+++ b/drivers/crypto/caam/caamrng.c
40218@@ -56,7 +56,7 @@
40219
40220 /* Buffer, its dma address and lock */
40221 struct buf_data {
40222- u8 buf[RN_BUF_SIZE];
40223+ u8 buf[RN_BUF_SIZE] ____cacheline_aligned;
40224 dma_addr_t addr;
40225 struct completion filled;
40226 u32 hw_desc[DESC_JOB_O_LEN];
40227diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
40228index 8d2a772..33826c9 100644
40229--- a/drivers/crypto/hifn_795x.c
40230+++ b/drivers/crypto/hifn_795x.c
40231@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
40232 MODULE_PARM_DESC(hifn_pll_ref,
40233 "PLL reference clock (pci[freq] or ext[freq], default ext)");
40234
40235-static atomic_t hifn_dev_number;
40236+static atomic_unchecked_t hifn_dev_number;
40237
40238 #define ACRYPTO_OP_DECRYPT 0
40239 #define ACRYPTO_OP_ENCRYPT 1
40240@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
40241 goto err_out_disable_pci_device;
40242
40243 snprintf(name, sizeof(name), "hifn%d",
40244- atomic_inc_return(&hifn_dev_number)-1);
40245+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
40246
40247 err = pci_request_regions(pdev, name);
40248 if (err)
40249diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
40250index 30b538d8..1610d75 100644
40251--- a/drivers/devfreq/devfreq.c
40252+++ b/drivers/devfreq/devfreq.c
40253@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
40254 goto err_out;
40255 }
40256
40257- list_add(&governor->node, &devfreq_governor_list);
40258+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
40259
40260 list_for_each_entry(devfreq, &devfreq_list, node) {
40261 int ret = 0;
40262@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
40263 }
40264 }
40265
40266- list_del(&governor->node);
40267+ pax_list_del((struct list_head *)&governor->node);
40268 err_out:
40269 mutex_unlock(&devfreq_list_lock);
40270
40271diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
40272index 8ee383d..736b5de 100644
40273--- a/drivers/dma/sh/shdma-base.c
40274+++ b/drivers/dma/sh/shdma-base.c
40275@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
40276 schan->slave_id = -EINVAL;
40277 }
40278
40279- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
40280- sdev->desc_size, GFP_KERNEL);
40281+ schan->desc = kcalloc(sdev->desc_size,
40282+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
40283 if (!schan->desc) {
40284 ret = -ENOMEM;
40285 goto edescalloc;
40286diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
40287index 9f1d4c7..fceff78 100644
40288--- a/drivers/dma/sh/shdmac.c
40289+++ b/drivers/dma/sh/shdmac.c
40290@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
40291 return ret;
40292 }
40293
40294-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
40295+static struct notifier_block sh_dmae_nmi_notifier = {
40296 .notifier_call = sh_dmae_nmi_handler,
40297
40298 /* Run before NMI debug handler and KGDB */
40299diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
40300index 592af5f..bb1d583 100644
40301--- a/drivers/edac/edac_device.c
40302+++ b/drivers/edac/edac_device.c
40303@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
40304 */
40305 int edac_device_alloc_index(void)
40306 {
40307- static atomic_t device_indexes = ATOMIC_INIT(0);
40308+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
40309
40310- return atomic_inc_return(&device_indexes) - 1;
40311+ return atomic_inc_return_unchecked(&device_indexes) - 1;
40312 }
40313 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
40314
40315diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
40316index c84eecb..4d7381d 100644
40317--- a/drivers/edac/edac_mc_sysfs.c
40318+++ b/drivers/edac/edac_mc_sysfs.c
40319@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
40320 struct dev_ch_attribute {
40321 struct device_attribute attr;
40322 int channel;
40323-};
40324+} __do_const;
40325
40326 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40327 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40328@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
40329 }
40330
40331 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
40332+ pax_open_kernel();
40333 if (mci->get_sdram_scrub_rate) {
40334- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40335- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40336+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
40337+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
40338 }
40339
40340 if (mci->set_sdram_scrub_rate) {
40341- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40342- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40343+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
40344+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
40345 }
40346+ pax_close_kernel();
40347
40348 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
40349 if (err) {
40350diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40351index 2cf44b4d..6dd2dc7 100644
40352--- a/drivers/edac/edac_pci.c
40353+++ b/drivers/edac/edac_pci.c
40354@@ -29,7 +29,7 @@
40355
40356 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40357 static LIST_HEAD(edac_pci_list);
40358-static atomic_t pci_indexes = ATOMIC_INIT(0);
40359+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40360
40361 /*
40362 * edac_pci_alloc_ctl_info
40363@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40364 */
40365 int edac_pci_alloc_index(void)
40366 {
40367- return atomic_inc_return(&pci_indexes) - 1;
40368+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40369 }
40370 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40371
40372diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40373index 24d877f..4e30133 100644
40374--- a/drivers/edac/edac_pci_sysfs.c
40375+++ b/drivers/edac/edac_pci_sysfs.c
40376@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40377 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40378 static int edac_pci_poll_msec = 1000; /* one second workq period */
40379
40380-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40381-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40382+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40383+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40384
40385 static struct kobject *edac_pci_top_main_kobj;
40386 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40387@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40388 void *value;
40389 ssize_t(*show) (void *, char *);
40390 ssize_t(*store) (void *, const char *, size_t);
40391-};
40392+} __do_const;
40393
40394 /* Set of show/store abstract level functions for PCI Parity object */
40395 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40396@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40397 edac_printk(KERN_CRIT, EDAC_PCI,
40398 "Signaled System Error on %s\n",
40399 pci_name(dev));
40400- atomic_inc(&pci_nonparity_count);
40401+ atomic_inc_unchecked(&pci_nonparity_count);
40402 }
40403
40404 if (status & (PCI_STATUS_PARITY)) {
40405@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40406 "Master Data Parity Error on %s\n",
40407 pci_name(dev));
40408
40409- atomic_inc(&pci_parity_count);
40410+ atomic_inc_unchecked(&pci_parity_count);
40411 }
40412
40413 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40414@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40415 "Detected Parity Error on %s\n",
40416 pci_name(dev));
40417
40418- atomic_inc(&pci_parity_count);
40419+ atomic_inc_unchecked(&pci_parity_count);
40420 }
40421 }
40422
40423@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40424 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40425 "Signaled System Error on %s\n",
40426 pci_name(dev));
40427- atomic_inc(&pci_nonparity_count);
40428+ atomic_inc_unchecked(&pci_nonparity_count);
40429 }
40430
40431 if (status & (PCI_STATUS_PARITY)) {
40432@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40433 "Master Data Parity Error on "
40434 "%s\n", pci_name(dev));
40435
40436- atomic_inc(&pci_parity_count);
40437+ atomic_inc_unchecked(&pci_parity_count);
40438 }
40439
40440 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40441@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40442 "Detected Parity Error on %s\n",
40443 pci_name(dev));
40444
40445- atomic_inc(&pci_parity_count);
40446+ atomic_inc_unchecked(&pci_parity_count);
40447 }
40448 }
40449 }
40450@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40451 if (!check_pci_errors)
40452 return;
40453
40454- before_count = atomic_read(&pci_parity_count);
40455+ before_count = atomic_read_unchecked(&pci_parity_count);
40456
40457 /* scan all PCI devices looking for a Parity Error on devices and
40458 * bridges.
40459@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40460 /* Only if operator has selected panic on PCI Error */
40461 if (edac_pci_get_panic_on_pe()) {
40462 /* If the count is different 'after' from 'before' */
40463- if (before_count != atomic_read(&pci_parity_count))
40464+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40465 panic("EDAC: PCI Parity Error");
40466 }
40467 }
40468diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40469index c2359a1..8bd119d 100644
40470--- a/drivers/edac/mce_amd.h
40471+++ b/drivers/edac/mce_amd.h
40472@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40473 bool (*mc0_mce)(u16, u8);
40474 bool (*mc1_mce)(u16, u8);
40475 bool (*mc2_mce)(u16, u8);
40476-};
40477+} __no_const;
40478
40479 void amd_report_gart_errors(bool);
40480 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40481diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40482index 57ea7f4..af06b76 100644
40483--- a/drivers/firewire/core-card.c
40484+++ b/drivers/firewire/core-card.c
40485@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40486 const struct fw_card_driver *driver,
40487 struct device *device)
40488 {
40489- static atomic_t index = ATOMIC_INIT(-1);
40490+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40491
40492- card->index = atomic_inc_return(&index);
40493+ card->index = atomic_inc_return_unchecked(&index);
40494 card->driver = driver;
40495 card->device = device;
40496 card->current_tlabel = 0;
40497@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40498
40499 void fw_core_remove_card(struct fw_card *card)
40500 {
40501- struct fw_card_driver dummy_driver = dummy_driver_template;
40502+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40503
40504 card->driver->update_phy_reg(card, 4,
40505 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40506diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40507index f9e3aee..269dbdb 100644
40508--- a/drivers/firewire/core-device.c
40509+++ b/drivers/firewire/core-device.c
40510@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40511 struct config_rom_attribute {
40512 struct device_attribute attr;
40513 u32 key;
40514-};
40515+} __do_const;
40516
40517 static ssize_t show_immediate(struct device *dev,
40518 struct device_attribute *dattr, char *buf)
40519diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40520index d6a09b9..18e90dd 100644
40521--- a/drivers/firewire/core-transaction.c
40522+++ b/drivers/firewire/core-transaction.c
40523@@ -38,6 +38,7 @@
40524 #include <linux/timer.h>
40525 #include <linux/types.h>
40526 #include <linux/workqueue.h>
40527+#include <linux/sched.h>
40528
40529 #include <asm/byteorder.h>
40530
40531diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40532index e1480ff6..1a429bd 100644
40533--- a/drivers/firewire/core.h
40534+++ b/drivers/firewire/core.h
40535@@ -111,6 +111,7 @@ struct fw_card_driver {
40536
40537 int (*stop_iso)(struct fw_iso_context *ctx);
40538 };
40539+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40540
40541 void fw_card_initialize(struct fw_card *card,
40542 const struct fw_card_driver *driver, struct device *device);
40543diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40544index f51d376..b118e40 100644
40545--- a/drivers/firewire/ohci.c
40546+++ b/drivers/firewire/ohci.c
40547@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40548 be32_to_cpu(ohci->next_header));
40549 }
40550
40551+#ifndef CONFIG_GRKERNSEC
40552 if (param_remote_dma) {
40553 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40554 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40555 }
40556+#endif
40557
40558 spin_unlock_irq(&ohci->lock);
40559
40560@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40561 unsigned long flags;
40562 int n, ret = 0;
40563
40564+#ifndef CONFIG_GRKERNSEC
40565 if (param_remote_dma)
40566 return 0;
40567+#endif
40568
40569 /*
40570 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40571diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40572index 94a58a0..f5eba42 100644
40573--- a/drivers/firmware/dmi-id.c
40574+++ b/drivers/firmware/dmi-id.c
40575@@ -16,7 +16,7 @@
40576 struct dmi_device_attribute{
40577 struct device_attribute dev_attr;
40578 int field;
40579-};
40580+} __do_const;
40581 #define to_dmi_dev_attr(_dev_attr) \
40582 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40583
40584diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40585index 4fd9961..52d60ce 100644
40586--- a/drivers/firmware/efi/cper.c
40587+++ b/drivers/firmware/efi/cper.c
40588@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40589 */
40590 u64 cper_next_record_id(void)
40591 {
40592- static atomic64_t seq;
40593+ static atomic64_unchecked_t seq;
40594
40595- if (!atomic64_read(&seq))
40596- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40597+ if (!atomic64_read_unchecked(&seq))
40598+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40599
40600- return atomic64_inc_return(&seq);
40601+ return atomic64_inc_return_unchecked(&seq);
40602 }
40603 EXPORT_SYMBOL_GPL(cper_next_record_id);
40604
40605diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40606index 3061bb8..92b5fcc 100644
40607--- a/drivers/firmware/efi/efi.c
40608+++ b/drivers/firmware/efi/efi.c
40609@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40610 };
40611
40612 static struct efivars generic_efivars;
40613-static struct efivar_operations generic_ops;
40614+static efivar_operations_no_const generic_ops __read_only;
40615
40616 static int generic_ops_register(void)
40617 {
40618- generic_ops.get_variable = efi.get_variable;
40619- generic_ops.set_variable = efi.set_variable;
40620- generic_ops.get_next_variable = efi.get_next_variable;
40621- generic_ops.query_variable_store = efi_query_variable_store;
40622+ pax_open_kernel();
40623+ *(void **)&generic_ops.get_variable = efi.get_variable;
40624+ *(void **)&generic_ops.set_variable = efi.set_variable;
40625+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40626+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40627+ pax_close_kernel();
40628
40629 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40630 }
40631diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40632index 7b2e049..a253334 100644
40633--- a/drivers/firmware/efi/efivars.c
40634+++ b/drivers/firmware/efi/efivars.c
40635@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40636 static int
40637 create_efivars_bin_attributes(void)
40638 {
40639- struct bin_attribute *attr;
40640+ bin_attribute_no_const *attr;
40641 int error;
40642
40643 /* new_var */
40644diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40645index 87b8e3b..c4afb35 100644
40646--- a/drivers/firmware/efi/runtime-map.c
40647+++ b/drivers/firmware/efi/runtime-map.c
40648@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40649 kfree(entry);
40650 }
40651
40652-static struct kobj_type __refdata map_ktype = {
40653+static const struct kobj_type __refconst map_ktype = {
40654 .sysfs_ops = &map_attr_ops,
40655 .default_attrs = def_attrs,
40656 .release = map_release,
40657diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40658index f1ab05e..ab51228 100644
40659--- a/drivers/firmware/google/gsmi.c
40660+++ b/drivers/firmware/google/gsmi.c
40661@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40662 return local_hash_64(input, 32);
40663 }
40664
40665-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40666+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40667 {
40668 .ident = "Google Board",
40669 .matches = {
40670diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40671index 2f569aa..26e4f39 100644
40672--- a/drivers/firmware/google/memconsole.c
40673+++ b/drivers/firmware/google/memconsole.c
40674@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40675 return false;
40676 }
40677
40678-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40679+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40680 {
40681 .ident = "Google Board",
40682 .matches = {
40683@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40684 if (!found_memconsole())
40685 return -ENODEV;
40686
40687- memconsole_bin_attr.size = memconsole_length;
40688+ pax_open_kernel();
40689+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40690+ pax_close_kernel();
40691+
40692 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40693 }
40694
40695diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40696index cc016c61..d35279e 100644
40697--- a/drivers/firmware/memmap.c
40698+++ b/drivers/firmware/memmap.c
40699@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40700 kfree(entry);
40701 }
40702
40703-static struct kobj_type __refdata memmap_ktype = {
40704+static const struct kobj_type __refconst memmap_ktype = {
40705 .release = release_firmware_map_entry,
40706 .sysfs_ops = &memmap_attr_ops,
40707 .default_attrs = def_attrs,
40708diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40709index 3cfcfc6..09d6f117 100644
40710--- a/drivers/gpio/gpio-em.c
40711+++ b/drivers/gpio/gpio-em.c
40712@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40713 struct em_gio_priv *p;
40714 struct resource *io[2], *irq[2];
40715 struct gpio_chip *gpio_chip;
40716- struct irq_chip *irq_chip;
40717+ irq_chip_no_const *irq_chip;
40718 const char *name = dev_name(&pdev->dev);
40719 int ret;
40720
40721diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40722index 7818cd1..1be40e5 100644
40723--- a/drivers/gpio/gpio-ich.c
40724+++ b/drivers/gpio/gpio-ich.c
40725@@ -94,7 +94,7 @@ struct ichx_desc {
40726 * this option allows driver caching written output values
40727 */
40728 bool use_outlvl_cache;
40729-};
40730+} __do_const;
40731
40732 static struct {
40733 spinlock_t lock;
40734diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40735index f476ae2..05e1bdd 100644
40736--- a/drivers/gpio/gpio-omap.c
40737+++ b/drivers/gpio/gpio-omap.c
40738@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40739 const struct omap_gpio_platform_data *pdata;
40740 struct resource *res;
40741 struct gpio_bank *bank;
40742- struct irq_chip *irqc;
40743+ irq_chip_no_const *irqc;
40744 int ret;
40745
40746 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40747diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40748index c49522e..9a7ee54 100644
40749--- a/drivers/gpio/gpio-rcar.c
40750+++ b/drivers/gpio/gpio-rcar.c
40751@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40752 struct gpio_rcar_priv *p;
40753 struct resource *io, *irq;
40754 struct gpio_chip *gpio_chip;
40755- struct irq_chip *irq_chip;
40756+ irq_chip_no_const *irq_chip;
40757 struct device *dev = &pdev->dev;
40758 const char *name = dev_name(dev);
40759 int ret;
40760diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40761index c1caa45..f0f97d2 100644
40762--- a/drivers/gpio/gpio-vr41xx.c
40763+++ b/drivers/gpio/gpio-vr41xx.c
40764@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40765 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40766 maskl, pendl, maskh, pendh);
40767
40768- atomic_inc(&irq_err_count);
40769+ atomic_inc_unchecked(&irq_err_count);
40770
40771 return -EINVAL;
40772 }
40773diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40774index 1ca9295..9f3d481 100644
40775--- a/drivers/gpio/gpiolib.c
40776+++ b/drivers/gpio/gpiolib.c
40777@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40778 }
40779
40780 if (gpiochip->irqchip) {
40781- gpiochip->irqchip->irq_request_resources = NULL;
40782- gpiochip->irqchip->irq_release_resources = NULL;
40783+ pax_open_kernel();
40784+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40785+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40786+ pax_close_kernel();
40787 gpiochip->irqchip = NULL;
40788 }
40789 }
40790@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40791 gpiochip->irqchip = NULL;
40792 return -EINVAL;
40793 }
40794- irqchip->irq_request_resources = gpiochip_irq_reqres;
40795- irqchip->irq_release_resources = gpiochip_irq_relres;
40796+
40797+ pax_open_kernel();
40798+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40799+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40800+ pax_close_kernel();
40801
40802 /*
40803 * Prepare the mapping since the irqchip shall be orthogonal to
40804diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40805index 488f51d..301d462 100644
40806--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40807+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40808@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40809 enum cache_policy alternate_policy,
40810 void __user *alternate_aperture_base,
40811 uint64_t alternate_aperture_size);
40812-};
40813+} __no_const;
40814
40815 /**
40816 * struct device_queue_manager
40817diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40818index 5940531..a75b0e5 100644
40819--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40820+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40821@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40822
40823 void (*submit_packet)(struct kernel_queue *kq);
40824 void (*rollback_packet)(struct kernel_queue *kq);
40825-};
40826+} __no_const;
40827
40828 struct kernel_queue {
40829 struct kernel_queue_ops ops;
40830diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40831index 9b23525..65f4110 100644
40832--- a/drivers/gpu/drm/drm_context.c
40833+++ b/drivers/gpu/drm/drm_context.c
40834@@ -53,6 +53,9 @@ struct drm_ctx_list {
40835 */
40836 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40837 {
40838+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40839+ return;
40840+
40841 mutex_lock(&dev->struct_mutex);
40842 idr_remove(&dev->ctx_idr, ctx_handle);
40843 mutex_unlock(&dev->struct_mutex);
40844@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40845 */
40846 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40847 {
40848+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40849+ return -EINVAL;
40850+
40851 idr_init(&dev->ctx_idr);
40852 return 0;
40853 }
40854@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40855 */
40856 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40857 {
40858+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40859+ return;
40860+
40861 mutex_lock(&dev->struct_mutex);
40862 idr_destroy(&dev->ctx_idr);
40863 mutex_unlock(&dev->struct_mutex);
40864@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40865 {
40866 struct drm_ctx_list *pos, *tmp;
40867
40868+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40869+ return;
40870+
40871 mutex_lock(&dev->ctxlist_mutex);
40872
40873 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40874 if (pos->tag == file &&
40875- pos->handle != DRM_KERNEL_CONTEXT) {
40876+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40877 if (dev->driver->context_dtor)
40878 dev->driver->context_dtor(dev, pos->handle);
40879
40880@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40881 struct drm_local_map *map;
40882 struct drm_map_list *_entry;
40883
40884+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40885+ return -EINVAL;
40886+
40887 mutex_lock(&dev->struct_mutex);
40888
40889 map = idr_find(&dev->ctx_idr, request->ctx_id);
40890@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40891 struct drm_local_map *map = NULL;
40892 struct drm_map_list *r_list = NULL;
40893
40894+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40895+ return -EINVAL;
40896+
40897 mutex_lock(&dev->struct_mutex);
40898 list_for_each_entry(r_list, &dev->maplist, head) {
40899 if (r_list->map
40900@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40901 {
40902 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40903
40904- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40905+ if (file_priv->master->lock.hw_lock == NULL) {
40906+ DRM_ERROR(
40907+ "Device has been unregistered. Hard exit. Process %d\n",
40908+ task_pid_nr(current));
40909+ send_sig(SIGTERM, current, 0);
40910+ return -EPERM;
40911+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40912 DRM_ERROR("Lock isn't held after context switch\n");
40913 }
40914
40915@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40916 struct drm_ctx ctx;
40917 int i;
40918
40919+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40920+ return -EINVAL;
40921+
40922 if (res->count >= DRM_RESERVED_CONTEXTS) {
40923 memset(&ctx, 0, sizeof(ctx));
40924 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40925@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40926 struct drm_ctx_list *ctx_entry;
40927 struct drm_ctx *ctx = data;
40928
40929+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40930+ return -EINVAL;
40931+
40932 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40933- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40934+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40935 /* Skip kernel's context and get a new one. */
40936 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40937 }
40938@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40939 {
40940 struct drm_ctx *ctx = data;
40941
40942+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40943+ return -EINVAL;
40944+
40945 /* This is 0, because we don't handle any context flags */
40946 ctx->flags = 0;
40947
40948@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40949 {
40950 struct drm_ctx *ctx = data;
40951
40952+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40953+ return -EINVAL;
40954+
40955 DRM_DEBUG("%d\n", ctx->handle);
40956 return drm_context_switch(dev, dev->last_context, ctx->handle);
40957 }
40958@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40959 {
40960 struct drm_ctx *ctx = data;
40961
40962+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40963+ return -EINVAL;
40964+
40965 DRM_DEBUG("%d\n", ctx->handle);
40966 drm_context_switch_complete(dev, file_priv, ctx->handle);
40967
40968@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40969 {
40970 struct drm_ctx *ctx = data;
40971
40972+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40973+ return -EINVAL;
40974+
40975 DRM_DEBUG("%d\n", ctx->handle);
40976- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40977+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40978 if (dev->driver->context_dtor)
40979 dev->driver->context_dtor(dev, ctx->handle);
40980 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40981diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40982index b6f076b..2918de2 100644
40983--- a/drivers/gpu/drm/drm_crtc.c
40984+++ b/drivers/gpu/drm/drm_crtc.c
40985@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40986 goto done;
40987 }
40988
40989- if (copy_to_user(&enum_ptr[copied].name,
40990+ if (copy_to_user(enum_ptr[copied].name,
40991 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40992 ret = -EFAULT;
40993 goto done;
40994diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40995index d512134..a80a8e4 100644
40996--- a/drivers/gpu/drm/drm_drv.c
40997+++ b/drivers/gpu/drm/drm_drv.c
40998@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40999
41000 drm_device_set_unplugged(dev);
41001
41002- if (dev->open_count == 0) {
41003+ if (local_read(&dev->open_count) == 0) {
41004 drm_put_dev(dev);
41005 }
41006 mutex_unlock(&drm_global_mutex);
41007@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
41008 if (drm_ht_create(&dev->map_hash, 12))
41009 goto err_minors;
41010
41011- ret = drm_legacy_ctxbitmap_init(dev);
41012- if (ret) {
41013- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
41014- goto err_ht;
41015+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
41016+ ret = drm_legacy_ctxbitmap_init(dev);
41017+ if (ret) {
41018+ DRM_ERROR(
41019+ "Cannot allocate memory for context bitmap.\n");
41020+ goto err_ht;
41021+ }
41022 }
41023
41024 if (drm_core_check_feature(dev, DRIVER_GEM)) {
41025diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
41026index 076dd60..e4a4ba7 100644
41027--- a/drivers/gpu/drm/drm_fops.c
41028+++ b/drivers/gpu/drm/drm_fops.c
41029@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
41030 return PTR_ERR(minor);
41031
41032 dev = minor->dev;
41033- if (!dev->open_count++)
41034+ if (local_inc_return(&dev->open_count) == 1)
41035 need_setup = 1;
41036
41037 /* share address_space across all char-devs of a single device */
41038@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
41039 return 0;
41040
41041 err_undo:
41042- dev->open_count--;
41043+ local_dec(&dev->open_count);
41044 drm_minor_release(minor);
41045 return retcode;
41046 }
41047@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
41048
41049 mutex_lock(&drm_global_mutex);
41050
41051- DRM_DEBUG("open_count = %d\n", dev->open_count);
41052+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
41053
41054 mutex_lock(&dev->struct_mutex);
41055 list_del(&file_priv->lhead);
41056@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
41057 * Begin inline drm_release
41058 */
41059
41060- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
41061+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
41062 task_pid_nr(current),
41063 (long)old_encode_dev(file_priv->minor->kdev->devt),
41064- dev->open_count);
41065+ local_read(&dev->open_count));
41066
41067 /* Release any auth tokens that might point to this file_priv,
41068 (do that under the drm_global_mutex) */
41069@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
41070 * End inline drm_release
41071 */
41072
41073- if (!--dev->open_count) {
41074+ if (local_dec_and_test(&dev->open_count)) {
41075 retcode = drm_lastclose(dev);
41076 if (drm_device_is_unplugged(dev))
41077 drm_put_dev(dev);
41078diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
41079index 3d2e91c..d31c4c9 100644
41080--- a/drivers/gpu/drm/drm_global.c
41081+++ b/drivers/gpu/drm/drm_global.c
41082@@ -36,7 +36,7 @@
41083 struct drm_global_item {
41084 struct mutex mutex;
41085 void *object;
41086- int refcount;
41087+ atomic_t refcount;
41088 };
41089
41090 static struct drm_global_item glob[DRM_GLOBAL_NUM];
41091@@ -49,7 +49,7 @@ void drm_global_init(void)
41092 struct drm_global_item *item = &glob[i];
41093 mutex_init(&item->mutex);
41094 item->object = NULL;
41095- item->refcount = 0;
41096+ atomic_set(&item->refcount, 0);
41097 }
41098 }
41099
41100@@ -59,7 +59,7 @@ void drm_global_release(void)
41101 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
41102 struct drm_global_item *item = &glob[i];
41103 BUG_ON(item->object != NULL);
41104- BUG_ON(item->refcount != 0);
41105+ BUG_ON(atomic_read(&item->refcount) != 0);
41106 }
41107 }
41108
41109@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41110 struct drm_global_item *item = &glob[ref->global_type];
41111
41112 mutex_lock(&item->mutex);
41113- if (item->refcount == 0) {
41114+ if (atomic_read(&item->refcount) == 0) {
41115 item->object = kzalloc(ref->size, GFP_KERNEL);
41116 if (unlikely(item->object == NULL)) {
41117 ret = -ENOMEM;
41118@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
41119 goto out_err;
41120
41121 }
41122- ++item->refcount;
41123+ atomic_inc(&item->refcount);
41124 ref->object = item->object;
41125 mutex_unlock(&item->mutex);
41126 return 0;
41127@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
41128 struct drm_global_item *item = &glob[ref->global_type];
41129
41130 mutex_lock(&item->mutex);
41131- BUG_ON(item->refcount == 0);
41132+ BUG_ON(atomic_read(&item->refcount) == 0);
41133 BUG_ON(ref->object != item->object);
41134- if (--item->refcount == 0) {
41135+ if (atomic_dec_and_test(&item->refcount)) {
41136 ref->release(ref);
41137 item->object = NULL;
41138 }
41139diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
41140index f1b32f9..394f791 100644
41141--- a/drivers/gpu/drm/drm_info.c
41142+++ b/drivers/gpu/drm/drm_info.c
41143@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
41144 struct drm_local_map *map;
41145 struct drm_map_list *r_list;
41146
41147- /* Hardcoded from _DRM_FRAME_BUFFER,
41148- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
41149- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
41150- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
41151+ static const char * const types[] = {
41152+ [_DRM_FRAME_BUFFER] = "FB",
41153+ [_DRM_REGISTERS] = "REG",
41154+ [_DRM_SHM] = "SHM",
41155+ [_DRM_AGP] = "AGP",
41156+ [_DRM_SCATTER_GATHER] = "SG",
41157+ [_DRM_CONSISTENT] = "PCI"};
41158 const char *type;
41159 int i;
41160
41161@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
41162 map = r_list->map;
41163 if (!map)
41164 continue;
41165- if (map->type < 0 || map->type > 5)
41166+ if (map->type >= ARRAY_SIZE(types))
41167 type = "??";
41168 else
41169 type = types[map->type];
41170diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
41171index 2f4c4343..dd12cd2 100644
41172--- a/drivers/gpu/drm/drm_ioc32.c
41173+++ b/drivers/gpu/drm/drm_ioc32.c
41174@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
41175 request = compat_alloc_user_space(nbytes);
41176 if (!access_ok(VERIFY_WRITE, request, nbytes))
41177 return -EFAULT;
41178- list = (struct drm_buf_desc *) (request + 1);
41179+ list = (struct drm_buf_desc __user *) (request + 1);
41180
41181 if (__put_user(count, &request->count)
41182 || __put_user(list, &request->list))
41183@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
41184 request = compat_alloc_user_space(nbytes);
41185 if (!access_ok(VERIFY_WRITE, request, nbytes))
41186 return -EFAULT;
41187- list = (struct drm_buf_pub *) (request + 1);
41188+ list = (struct drm_buf_pub __user *) (request + 1);
41189
41190 if (__put_user(count, &request->count)
41191 || __put_user(list, &request->list))
41192@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
41193 return 0;
41194 }
41195
41196-drm_ioctl_compat_t *drm_compat_ioctls[] = {
41197+drm_ioctl_compat_t drm_compat_ioctls[] = {
41198 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
41199 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
41200 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
41201@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
41202 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41203 {
41204 unsigned int nr = DRM_IOCTL_NR(cmd);
41205- drm_ioctl_compat_t *fn;
41206 int ret;
41207
41208 /* Assume that ioctls without an explicit compat routine will just
41209@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41210 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
41211 return drm_ioctl(filp, cmd, arg);
41212
41213- fn = drm_compat_ioctls[nr];
41214-
41215- if (fn != NULL)
41216- ret = (*fn) (filp, cmd, arg);
41217+ if (drm_compat_ioctls[nr] != NULL)
41218+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
41219 else
41220 ret = drm_ioctl(filp, cmd, arg);
41221
41222diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
41223index 3785d66..1c489ef 100644
41224--- a/drivers/gpu/drm/drm_ioctl.c
41225+++ b/drivers/gpu/drm/drm_ioctl.c
41226@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
41227 struct drm_file *file_priv = filp->private_data;
41228 struct drm_device *dev;
41229 const struct drm_ioctl_desc *ioctl = NULL;
41230- drm_ioctl_t *func;
41231+ drm_ioctl_no_const_t func;
41232 unsigned int nr = DRM_IOCTL_NR(cmd);
41233 int retcode = -EINVAL;
41234 char stack_kdata[128];
41235diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
41236index f861361..b61d4c7 100644
41237--- a/drivers/gpu/drm/drm_lock.c
41238+++ b/drivers/gpu/drm/drm_lock.c
41239@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
41240 struct drm_master *master = file_priv->master;
41241 int ret = 0;
41242
41243+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41244+ return -EINVAL;
41245+
41246 ++file_priv->lock_count;
41247
41248- if (lock->context == DRM_KERNEL_CONTEXT) {
41249+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41250 DRM_ERROR("Process %d using kernel context %d\n",
41251 task_pid_nr(current), lock->context);
41252 return -EINVAL;
41253@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
41254 struct drm_lock *lock = data;
41255 struct drm_master *master = file_priv->master;
41256
41257- if (lock->context == DRM_KERNEL_CONTEXT) {
41258+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
41259+ return -EINVAL;
41260+
41261+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
41262 DRM_ERROR("Process %d using kernel context %d\n",
41263 task_pid_nr(current), lock->context);
41264 return -EINVAL;
41265 }
41266
41267+ if (!master->lock.hw_lock) {
41268+ DRM_ERROR(
41269+ "Device has been unregistered. Hard exit. Process %d\n",
41270+ task_pid_nr(current));
41271+ send_sig(SIGTERM, current, 0);
41272+ return -EPERM;
41273+ }
41274+
41275 if (drm_legacy_lock_free(&master->lock, lock->context)) {
41276 /* FIXME: Should really bail out here. */
41277 }
41278diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41279index d4813e0..6c1ab4d 100644
41280--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41281+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
41282@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
41283 u32 pipeconf_reg = PIPEACONF;
41284 u32 dspcntr_reg = DSPACNTR;
41285
41286- u32 pipeconf = dev_priv->pipeconf[pipe];
41287- u32 dspcntr = dev_priv->dspcntr[pipe];
41288+ u32 pipeconf;
41289+ u32 dspcntr;
41290 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
41291
41292+ if (pipe == -1)
41293+ return;
41294+
41295+ pipeconf = dev_priv->pipeconf[pipe];
41296+ dspcntr = dev_priv->dspcntr[pipe];
41297+
41298 if (pipe) {
41299 pipeconf_reg = PIPECCONF;
41300 dspcntr_reg = DSPCCNTR;
41301diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
41302index 93ec5dc..82acbaf 100644
41303--- a/drivers/gpu/drm/i810/i810_drv.h
41304+++ b/drivers/gpu/drm/i810/i810_drv.h
41305@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
41306 int page_flipping;
41307
41308 wait_queue_head_t irq_queue;
41309- atomic_t irq_received;
41310- atomic_t irq_emitted;
41311+ atomic_unchecked_t irq_received;
41312+ atomic_unchecked_t irq_emitted;
41313
41314 int front_offset;
41315 } drm_i810_private_t;
41316diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
41317index 1a46787..7fb387c 100644
41318--- a/drivers/gpu/drm/i915/i915_dma.c
41319+++ b/drivers/gpu/drm/i915/i915_dma.c
41320@@ -149,6 +149,9 @@ static int i915_getparam(struct drm_device *dev, void *data,
41321 case I915_PARAM_MMAP_VERSION:
41322 value = 1;
41323 break;
41324+ case I915_PARAM_HAS_LEGACY_CONTEXT:
41325+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
41326+ break;
41327 default:
41328 DRM_DEBUG("Unknown parameter %d\n", param->param);
41329 return -EINVAL;
41330@@ -362,7 +365,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
41331 * locking inversion with the driver load path. And the access here is
41332 * completely racy anyway. So don't bother with locking for now.
41333 */
41334- return dev->open_count == 0;
41335+ return local_read(&dev->open_count) == 0;
41336 }
41337
41338 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
41339diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41340index 38a7425..5322b16 100644
41341--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41342+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41343@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41344 static int
41345 validate_exec_list(struct drm_device *dev,
41346 struct drm_i915_gem_exec_object2 *exec,
41347- int count)
41348+ unsigned int count)
41349 {
41350 unsigned relocs_total = 0;
41351 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41352 unsigned invalid_flags;
41353- int i;
41354+ unsigned int i;
41355
41356 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41357 if (USES_FULL_PPGTT(dev))
41358diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41359index 176de63..b50b66a 100644
41360--- a/drivers/gpu/drm/i915/i915_ioc32.c
41361+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41362@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41363 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41364 || __put_user(batchbuffer32.num_cliprects,
41365 &batchbuffer->num_cliprects)
41366- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41367+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41368 &batchbuffer->cliprects))
41369 return -EFAULT;
41370
41371@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41372
41373 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41374 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41375- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41376+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41377 &cmdbuffer->buf)
41378 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41379 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41380 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41381 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41382- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41383+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41384 &cmdbuffer->cliprects))
41385 return -EFAULT;
41386
41387@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41388 (unsigned long)request);
41389 }
41390
41391-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41392+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41393 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41394 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41395 [DRM_I915_GETPARAM] = compat_i915_getparam,
41396@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41397 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41398 {
41399 unsigned int nr = DRM_IOCTL_NR(cmd);
41400- drm_ioctl_compat_t *fn = NULL;
41401 int ret;
41402
41403 if (nr < DRM_COMMAND_BASE)
41404 return drm_compat_ioctl(filp, cmd, arg);
41405
41406- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41407- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41408-
41409- if (fn != NULL)
41410- ret = (*fn) (filp, cmd, arg);
41411+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41412+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41413 else
41414 ret = drm_ioctl(filp, cmd, arg);
41415
41416diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41417index f75173c..f283e45 100644
41418--- a/drivers/gpu/drm/i915/intel_display.c
41419+++ b/drivers/gpu/drm/i915/intel_display.c
41420@@ -13056,13 +13056,13 @@ struct intel_quirk {
41421 int subsystem_vendor;
41422 int subsystem_device;
41423 void (*hook)(struct drm_device *dev);
41424-};
41425+} __do_const;
41426
41427 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41428 struct intel_dmi_quirk {
41429 void (*hook)(struct drm_device *dev);
41430 const struct dmi_system_id (*dmi_id_list)[];
41431-};
41432+} __do_const;
41433
41434 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41435 {
41436@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41437 return 1;
41438 }
41439
41440-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41441+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41442 {
41443- .dmi_id_list = &(const struct dmi_system_id[]) {
41444- {
41445- .callback = intel_dmi_reverse_brightness,
41446- .ident = "NCR Corporation",
41447- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41448- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41449- },
41450- },
41451- { } /* terminating entry */
41452+ .callback = intel_dmi_reverse_brightness,
41453+ .ident = "NCR Corporation",
41454+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41455+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41456 },
41457+ },
41458+ { } /* terminating entry */
41459+};
41460+
41461+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41462+ {
41463+ .dmi_id_list = &intel_dmi_quirks_table,
41464 .hook = quirk_invert_brightness,
41465 },
41466 };
41467diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41468index a002f53..0d60514 100644
41469--- a/drivers/gpu/drm/imx/imx-drm-core.c
41470+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41471@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41472 if (imxdrm->pipes >= MAX_CRTC)
41473 return -EINVAL;
41474
41475- if (imxdrm->drm->open_count)
41476+ if (local_read(&imxdrm->drm->open_count))
41477 return -EBUSY;
41478
41479 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41480diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41481index b4a20149..219ab78 100644
41482--- a/drivers/gpu/drm/mga/mga_drv.h
41483+++ b/drivers/gpu/drm/mga/mga_drv.h
41484@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41485 u32 clear_cmd;
41486 u32 maccess;
41487
41488- atomic_t vbl_received; /**< Number of vblanks received. */
41489+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41490 wait_queue_head_t fence_queue;
41491- atomic_t last_fence_retired;
41492+ atomic_unchecked_t last_fence_retired;
41493 u32 next_fence_to_post;
41494
41495 unsigned int fb_cpp;
41496diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41497index 729bfd5..14bae78 100644
41498--- a/drivers/gpu/drm/mga/mga_ioc32.c
41499+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41500@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41501 return 0;
41502 }
41503
41504-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41505+drm_ioctl_compat_t mga_compat_ioctls[] = {
41506 [DRM_MGA_INIT] = compat_mga_init,
41507 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41508 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41509@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41510 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41511 {
41512 unsigned int nr = DRM_IOCTL_NR(cmd);
41513- drm_ioctl_compat_t *fn = NULL;
41514 int ret;
41515
41516 if (nr < DRM_COMMAND_BASE)
41517 return drm_compat_ioctl(filp, cmd, arg);
41518
41519- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41520- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41521-
41522- if (fn != NULL)
41523- ret = (*fn) (filp, cmd, arg);
41524+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41525+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41526 else
41527 ret = drm_ioctl(filp, cmd, arg);
41528
41529diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41530index 1b071b8..de8601a 100644
41531--- a/drivers/gpu/drm/mga/mga_irq.c
41532+++ b/drivers/gpu/drm/mga/mga_irq.c
41533@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41534 if (crtc != 0)
41535 return 0;
41536
41537- return atomic_read(&dev_priv->vbl_received);
41538+ return atomic_read_unchecked(&dev_priv->vbl_received);
41539 }
41540
41541
41542@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41543 /* VBLANK interrupt */
41544 if (status & MGA_VLINEPEN) {
41545 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41546- atomic_inc(&dev_priv->vbl_received);
41547+ atomic_inc_unchecked(&dev_priv->vbl_received);
41548 drm_handle_vblank(dev, 0);
41549 handled = 1;
41550 }
41551@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41552 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41553 MGA_WRITE(MGA_PRIMEND, prim_end);
41554
41555- atomic_inc(&dev_priv->last_fence_retired);
41556+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41557 wake_up(&dev_priv->fence_queue);
41558 handled = 1;
41559 }
41560@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41561 * using fences.
41562 */
41563 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41564- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41565+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41566 - *sequence) <= (1 << 23)));
41567
41568 *sequence = cur_fence;
41569diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41570index 0190b69..60c3eaf 100644
41571--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41572+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41573@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41574 struct bit_table {
41575 const char id;
41576 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41577-};
41578+} __no_const;
41579
41580 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41581
41582diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41583index 8763deb..936b423 100644
41584--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41585+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41586@@ -940,7 +940,8 @@ static struct drm_driver
41587 driver_stub = {
41588 .driver_features =
41589 DRIVER_USE_AGP |
41590- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41591+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41592+ DRIVER_KMS_LEGACY_CONTEXT,
41593
41594 .load = nouveau_drm_load,
41595 .unload = nouveau_drm_unload,
41596diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41597index fc68f09..0511d71 100644
41598--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41599+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41600@@ -121,7 +121,6 @@ struct nouveau_drm {
41601 struct drm_global_reference mem_global_ref;
41602 struct ttm_bo_global_ref bo_global_ref;
41603 struct ttm_bo_device bdev;
41604- atomic_t validate_sequence;
41605 int (*move)(struct nouveau_channel *,
41606 struct ttm_buffer_object *,
41607 struct ttm_mem_reg *, struct ttm_mem_reg *);
41608diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41609index 462679a..88e32a7 100644
41610--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41611+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41612@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41613 unsigned long arg)
41614 {
41615 unsigned int nr = DRM_IOCTL_NR(cmd);
41616- drm_ioctl_compat_t *fn = NULL;
41617+ drm_ioctl_compat_t fn = NULL;
41618 int ret;
41619
41620 if (nr < DRM_COMMAND_BASE)
41621diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41622index 273e501..3b6c0a2 100644
41623--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41624+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41625@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41626 }
41627
41628 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41629- nouveau_vram_manager_init,
41630- nouveau_vram_manager_fini,
41631- nouveau_vram_manager_new,
41632- nouveau_vram_manager_del,
41633- nouveau_vram_manager_debug
41634+ .init = nouveau_vram_manager_init,
41635+ .takedown = nouveau_vram_manager_fini,
41636+ .get_node = nouveau_vram_manager_new,
41637+ .put_node = nouveau_vram_manager_del,
41638+ .debug = nouveau_vram_manager_debug
41639 };
41640
41641 static int
41642@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41643 }
41644
41645 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41646- nouveau_gart_manager_init,
41647- nouveau_gart_manager_fini,
41648- nouveau_gart_manager_new,
41649- nouveau_gart_manager_del,
41650- nouveau_gart_manager_debug
41651+ .init = nouveau_gart_manager_init,
41652+ .takedown = nouveau_gart_manager_fini,
41653+ .get_node = nouveau_gart_manager_new,
41654+ .put_node = nouveau_gart_manager_del,
41655+ .debug = nouveau_gart_manager_debug
41656 };
41657
41658 /*XXX*/
41659@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41660 }
41661
41662 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41663- nv04_gart_manager_init,
41664- nv04_gart_manager_fini,
41665- nv04_gart_manager_new,
41666- nv04_gart_manager_del,
41667- nv04_gart_manager_debug
41668+ .init = nv04_gart_manager_init,
41669+ .takedown = nv04_gart_manager_fini,
41670+ .get_node = nv04_gart_manager_new,
41671+ .put_node = nv04_gart_manager_del,
41672+ .debug = nv04_gart_manager_debug
41673 };
41674
41675 int
41676diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41677index c7592ec..dd45ebc 100644
41678--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41679+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41680@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41681 * locking inversion with the driver load path. And the access here is
41682 * completely racy anyway. So don't bother with locking for now.
41683 */
41684- return dev->open_count == 0;
41685+ return local_read(&dev->open_count) == 0;
41686 }
41687
41688 static const struct vga_switcheroo_client_ops
41689diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41690index 9782364..89bd954 100644
41691--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41692+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41693@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41694 int ret;
41695
41696 mutex_lock(&qdev->async_io_mutex);
41697- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41698+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41699 if (qdev->last_sent_io_cmd > irq_num) {
41700 if (intr)
41701 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41702- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41703+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41704 else
41705 ret = wait_event_timeout(qdev->io_cmd_event,
41706- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41707+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41708 /* 0 is timeout, just bail the "hw" has gone away */
41709 if (ret <= 0)
41710 goto out;
41711- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41712+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41713 }
41714 outb(val, addr);
41715 qdev->last_sent_io_cmd = irq_num + 1;
41716 if (intr)
41717 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41718- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41719+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41720 else
41721 ret = wait_event_timeout(qdev->io_cmd_event,
41722- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41723+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41724 out:
41725 if (ret > 0)
41726 ret = 0;
41727diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41728index 6911b8c..89d6867 100644
41729--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41730+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41731@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41732 struct drm_info_node *node = (struct drm_info_node *) m->private;
41733 struct qxl_device *qdev = node->minor->dev->dev_private;
41734
41735- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41736- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41737- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41738- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41739+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41740+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41741+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41742+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41743 seq_printf(m, "%d\n", qdev->irq_received_error);
41744 return 0;
41745 }
41746diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41747index 7c6cafe..460f542 100644
41748--- a/drivers/gpu/drm/qxl/qxl_drv.h
41749+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41750@@ -290,10 +290,10 @@ struct qxl_device {
41751 unsigned int last_sent_io_cmd;
41752
41753 /* interrupt handling */
41754- atomic_t irq_received;
41755- atomic_t irq_received_display;
41756- atomic_t irq_received_cursor;
41757- atomic_t irq_received_io_cmd;
41758+ atomic_unchecked_t irq_received;
41759+ atomic_unchecked_t irq_received_display;
41760+ atomic_unchecked_t irq_received_cursor;
41761+ atomic_unchecked_t irq_received_io_cmd;
41762 unsigned irq_received_error;
41763 wait_queue_head_t display_event;
41764 wait_queue_head_t cursor_event;
41765diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41766index b110883..dd06418 100644
41767--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41768+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41769@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41770
41771 /* TODO copy slow path code from i915 */
41772 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41773- 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);
41774+ 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);
41775
41776 {
41777 struct qxl_drawable *draw = fb_cmd;
41778@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41779 struct drm_qxl_reloc reloc;
41780
41781 if (copy_from_user(&reloc,
41782- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41783+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41784 sizeof(reloc))) {
41785 ret = -EFAULT;
41786 goto out_free_bos;
41787@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41788
41789 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41790
41791- struct drm_qxl_command *commands =
41792- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41793+ struct drm_qxl_command __user *commands =
41794+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41795
41796- if (copy_from_user(&user_cmd, &commands[cmd_num],
41797+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41798 sizeof(user_cmd)))
41799 return -EFAULT;
41800
41801diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41802index 0bf1e20..42a7310 100644
41803--- a/drivers/gpu/drm/qxl/qxl_irq.c
41804+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41805@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41806 if (!pending)
41807 return IRQ_NONE;
41808
41809- atomic_inc(&qdev->irq_received);
41810+ atomic_inc_unchecked(&qdev->irq_received);
41811
41812 if (pending & QXL_INTERRUPT_DISPLAY) {
41813- atomic_inc(&qdev->irq_received_display);
41814+ atomic_inc_unchecked(&qdev->irq_received_display);
41815 wake_up_all(&qdev->display_event);
41816 qxl_queue_garbage_collect(qdev, false);
41817 }
41818 if (pending & QXL_INTERRUPT_CURSOR) {
41819- atomic_inc(&qdev->irq_received_cursor);
41820+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41821 wake_up_all(&qdev->cursor_event);
41822 }
41823 if (pending & QXL_INTERRUPT_IO_CMD) {
41824- atomic_inc(&qdev->irq_received_io_cmd);
41825+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41826 wake_up_all(&qdev->io_cmd_event);
41827 }
41828 if (pending & QXL_INTERRUPT_ERROR) {
41829@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41830 init_waitqueue_head(&qdev->io_cmd_event);
41831 INIT_WORK(&qdev->client_monitors_config_work,
41832 qxl_client_monitors_config_work_func);
41833- atomic_set(&qdev->irq_received, 0);
41834- atomic_set(&qdev->irq_received_display, 0);
41835- atomic_set(&qdev->irq_received_cursor, 0);
41836- atomic_set(&qdev->irq_received_io_cmd, 0);
41837+ atomic_set_unchecked(&qdev->irq_received, 0);
41838+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41839+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41840+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41841 qdev->irq_received_error = 0;
41842 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41843 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41844diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41845index 0cbc4c9..0e46686 100644
41846--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41847+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41848@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41849 }
41850 }
41851
41852-static struct vm_operations_struct qxl_ttm_vm_ops;
41853+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41854 static const struct vm_operations_struct *ttm_vm_ops;
41855
41856 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41857@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41858 return r;
41859 if (unlikely(ttm_vm_ops == NULL)) {
41860 ttm_vm_ops = vma->vm_ops;
41861+ pax_open_kernel();
41862 qxl_ttm_vm_ops = *ttm_vm_ops;
41863 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41864+ pax_close_kernel();
41865 }
41866 vma->vm_ops = &qxl_ttm_vm_ops;
41867 return 0;
41868@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41869 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41870 {
41871 #if defined(CONFIG_DEBUG_FS)
41872- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41873- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41874- unsigned i;
41875+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41876+ {
41877+ .name = "qxl_mem_mm",
41878+ .show = &qxl_mm_dump_table,
41879+ },
41880+ {
41881+ .name = "qxl_surf_mm",
41882+ .show = &qxl_mm_dump_table,
41883+ }
41884+ };
41885
41886- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41887- if (i == 0)
41888- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41889- else
41890- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41891- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41892- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41893- qxl_mem_types_list[i].driver_features = 0;
41894- if (i == 0)
41895- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41896- else
41897- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41898+ pax_open_kernel();
41899+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41900+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41901+ pax_close_kernel();
41902
41903- }
41904- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41905+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41906 #else
41907 return 0;
41908 #endif
41909diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41910index 2c45ac9..5d740f8 100644
41911--- a/drivers/gpu/drm/r128/r128_cce.c
41912+++ b/drivers/gpu/drm/r128/r128_cce.c
41913@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41914
41915 /* GH: Simple idle check.
41916 */
41917- atomic_set(&dev_priv->idle_count, 0);
41918+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41919
41920 /* We don't support anything other than bus-mastering ring mode,
41921 * but the ring can be in either AGP or PCI space for the ring
41922diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41923index 723e5d6..102dbaf 100644
41924--- a/drivers/gpu/drm/r128/r128_drv.h
41925+++ b/drivers/gpu/drm/r128/r128_drv.h
41926@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41927 int is_pci;
41928 unsigned long cce_buffers_offset;
41929
41930- atomic_t idle_count;
41931+ atomic_unchecked_t idle_count;
41932
41933 int page_flipping;
41934 int current_page;
41935 u32 crtc_offset;
41936 u32 crtc_offset_cntl;
41937
41938- atomic_t vbl_received;
41939+ atomic_unchecked_t vbl_received;
41940
41941 u32 color_fmt;
41942 unsigned int front_offset;
41943diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41944index 663f38c..ec159a1 100644
41945--- a/drivers/gpu/drm/r128/r128_ioc32.c
41946+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41947@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41948 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41949 }
41950
41951-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41952+drm_ioctl_compat_t r128_compat_ioctls[] = {
41953 [DRM_R128_INIT] = compat_r128_init,
41954 [DRM_R128_DEPTH] = compat_r128_depth,
41955 [DRM_R128_STIPPLE] = compat_r128_stipple,
41956@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41957 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41958 {
41959 unsigned int nr = DRM_IOCTL_NR(cmd);
41960- drm_ioctl_compat_t *fn = NULL;
41961 int ret;
41962
41963 if (nr < DRM_COMMAND_BASE)
41964 return drm_compat_ioctl(filp, cmd, arg);
41965
41966- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41967- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41968-
41969- if (fn != NULL)
41970- ret = (*fn) (filp, cmd, arg);
41971+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41972+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41973 else
41974 ret = drm_ioctl(filp, cmd, arg);
41975
41976diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41977index c2ae496..30b5993 100644
41978--- a/drivers/gpu/drm/r128/r128_irq.c
41979+++ b/drivers/gpu/drm/r128/r128_irq.c
41980@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41981 if (crtc != 0)
41982 return 0;
41983
41984- return atomic_read(&dev_priv->vbl_received);
41985+ return atomic_read_unchecked(&dev_priv->vbl_received);
41986 }
41987
41988 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41989@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41990 /* VBLANK interrupt */
41991 if (status & R128_CRTC_VBLANK_INT) {
41992 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41993- atomic_inc(&dev_priv->vbl_received);
41994+ atomic_inc_unchecked(&dev_priv->vbl_received);
41995 drm_handle_vblank(dev, 0);
41996 return IRQ_HANDLED;
41997 }
41998diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41999index 8fd2d9f..18c9660 100644
42000--- a/drivers/gpu/drm/r128/r128_state.c
42001+++ b/drivers/gpu/drm/r128/r128_state.c
42002@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
42003
42004 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
42005 {
42006- if (atomic_read(&dev_priv->idle_count) == 0)
42007+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
42008 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
42009 else
42010- atomic_set(&dev_priv->idle_count, 0);
42011+ atomic_set_unchecked(&dev_priv->idle_count, 0);
42012 }
42013
42014 #endif
42015diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
42016index b928c17..e5d9400 100644
42017--- a/drivers/gpu/drm/radeon/mkregtable.c
42018+++ b/drivers/gpu/drm/radeon/mkregtable.c
42019@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
42020 regex_t mask_rex;
42021 regmatch_t match[4];
42022 char buf[1024];
42023- size_t end;
42024+ long end;
42025 int len;
42026 int done = 0;
42027 int r;
42028 unsigned o;
42029 struct offset *offset;
42030 char last_reg_s[10];
42031- int last_reg;
42032+ unsigned long last_reg;
42033
42034 if (regcomp
42035 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
42036diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
42037index aa232fd..7e5f6e1 100644
42038--- a/drivers/gpu/drm/radeon/radeon_device.c
42039+++ b/drivers/gpu/drm/radeon/radeon_device.c
42040@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
42041 * locking inversion with the driver load path. And the access here is
42042 * completely racy anyway. So don't bother with locking for now.
42043 */
42044- return dev->open_count == 0;
42045+ return local_read(&dev->open_count) == 0;
42046 }
42047
42048 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
42049diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
42050index 46bd393..6ae4719 100644
42051--- a/drivers/gpu/drm/radeon/radeon_drv.h
42052+++ b/drivers/gpu/drm/radeon/radeon_drv.h
42053@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
42054
42055 /* SW interrupt */
42056 wait_queue_head_t swi_queue;
42057- atomic_t swi_emitted;
42058+ atomic_unchecked_t swi_emitted;
42059 int vblank_crtc;
42060 uint32_t irq_enable_reg;
42061 uint32_t r500_disp_irq_reg;
42062diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
42063index 0b98ea1..a3c770f 100644
42064--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
42065+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
42066@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42067 request = compat_alloc_user_space(sizeof(*request));
42068 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
42069 || __put_user(req32.param, &request->param)
42070- || __put_user((void __user *)(unsigned long)req32.value,
42071+ || __put_user((unsigned long)req32.value,
42072 &request->value))
42073 return -EFAULT;
42074
42075@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
42076 #define compat_radeon_cp_setparam NULL
42077 #endif /* X86_64 || IA64 */
42078
42079-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42080+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
42081 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
42082 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
42083 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
42084@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
42085 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
42086 {
42087 unsigned int nr = DRM_IOCTL_NR(cmd);
42088- drm_ioctl_compat_t *fn = NULL;
42089 int ret;
42090
42091 if (nr < DRM_COMMAND_BASE)
42092 return drm_compat_ioctl(filp, cmd, arg);
42093
42094- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
42095- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
42096-
42097- if (fn != NULL)
42098- ret = (*fn) (filp, cmd, arg);
42099+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
42100+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
42101 else
42102 ret = drm_ioctl(filp, cmd, arg);
42103
42104diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
42105index 244b19b..c19226d 100644
42106--- a/drivers/gpu/drm/radeon/radeon_irq.c
42107+++ b/drivers/gpu/drm/radeon/radeon_irq.c
42108@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
42109 unsigned int ret;
42110 RING_LOCALS;
42111
42112- atomic_inc(&dev_priv->swi_emitted);
42113- ret = atomic_read(&dev_priv->swi_emitted);
42114+ atomic_inc_unchecked(&dev_priv->swi_emitted);
42115+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
42116
42117 BEGIN_RING(4);
42118 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
42119@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
42120 drm_radeon_private_t *dev_priv =
42121 (drm_radeon_private_t *) dev->dev_private;
42122
42123- atomic_set(&dev_priv->swi_emitted, 0);
42124+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
42125 init_waitqueue_head(&dev_priv->swi_queue);
42126
42127 dev->max_vblank_count = 0x001fffff;
42128diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
42129index 15aee72..cda326e 100644
42130--- a/drivers/gpu/drm/radeon/radeon_state.c
42131+++ b/drivers/gpu/drm/radeon/radeon_state.c
42132@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
42133 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
42134 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
42135
42136- if (copy_from_user(&depth_boxes, clear->depth_boxes,
42137+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
42138 sarea_priv->nbox * sizeof(depth_boxes[0])))
42139 return -EFAULT;
42140
42141@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
42142 {
42143 drm_radeon_private_t *dev_priv = dev->dev_private;
42144 drm_radeon_getparam_t *param = data;
42145- int value;
42146+ int value = 0;
42147
42148 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
42149
42150diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
42151index edafd3c..3af7c9c 100644
42152--- a/drivers/gpu/drm/radeon/radeon_ttm.c
42153+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
42154@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
42155 man->size = size >> PAGE_SHIFT;
42156 }
42157
42158-static struct vm_operations_struct radeon_ttm_vm_ops;
42159+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
42160 static const struct vm_operations_struct *ttm_vm_ops = NULL;
42161
42162 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42163@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
42164 }
42165 if (unlikely(ttm_vm_ops == NULL)) {
42166 ttm_vm_ops = vma->vm_ops;
42167+ pax_open_kernel();
42168 radeon_ttm_vm_ops = *ttm_vm_ops;
42169 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
42170+ pax_close_kernel();
42171 }
42172 vma->vm_ops = &radeon_ttm_vm_ops;
42173 return 0;
42174diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
42175index 1a52522..8e78043 100644
42176--- a/drivers/gpu/drm/tegra/dc.c
42177+++ b/drivers/gpu/drm/tegra/dc.c
42178@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
42179 }
42180
42181 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
42182- dc->debugfs_files[i].data = dc;
42183+ *(void **)&dc->debugfs_files[i].data = dc;
42184
42185 err = drm_debugfs_create_files(dc->debugfs_files,
42186 ARRAY_SIZE(debugfs_files),
42187diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
42188index ed970f6..4eeea42 100644
42189--- a/drivers/gpu/drm/tegra/dsi.c
42190+++ b/drivers/gpu/drm/tegra/dsi.c
42191@@ -62,7 +62,7 @@ struct tegra_dsi {
42192 struct clk *clk_lp;
42193 struct clk *clk;
42194
42195- struct drm_info_list *debugfs_files;
42196+ drm_info_list_no_const *debugfs_files;
42197 struct drm_minor *minor;
42198 struct dentry *debugfs;
42199
42200diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
42201index 7eaaee74..cc2bc04 100644
42202--- a/drivers/gpu/drm/tegra/hdmi.c
42203+++ b/drivers/gpu/drm/tegra/hdmi.c
42204@@ -64,7 +64,7 @@ struct tegra_hdmi {
42205 bool stereo;
42206 bool dvi;
42207
42208- struct drm_info_list *debugfs_files;
42209+ drm_info_list_no_const *debugfs_files;
42210 struct drm_minor *minor;
42211 struct dentry *debugfs;
42212 };
42213diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42214index aa0bd054..aea6a01 100644
42215--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
42216+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
42217@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
42218 }
42219
42220 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
42221- ttm_bo_man_init,
42222- ttm_bo_man_takedown,
42223- ttm_bo_man_get_node,
42224- ttm_bo_man_put_node,
42225- ttm_bo_man_debug
42226+ .init = ttm_bo_man_init,
42227+ .takedown = ttm_bo_man_takedown,
42228+ .get_node = ttm_bo_man_get_node,
42229+ .put_node = ttm_bo_man_put_node,
42230+ .debug = ttm_bo_man_debug
42231 };
42232 EXPORT_SYMBOL(ttm_bo_manager_func);
42233diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
42234index a1803fb..c53f6b0 100644
42235--- a/drivers/gpu/drm/ttm/ttm_memory.c
42236+++ b/drivers/gpu/drm/ttm/ttm_memory.c
42237@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
42238 zone->glob = glob;
42239 glob->zone_kernel = zone;
42240 ret = kobject_init_and_add(
42241- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42242+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42243 if (unlikely(ret != 0)) {
42244 kobject_put(&zone->kobj);
42245 return ret;
42246@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
42247 zone->glob = glob;
42248 glob->zone_dma32 = zone;
42249 ret = kobject_init_and_add(
42250- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
42251+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
42252 if (unlikely(ret != 0)) {
42253 kobject_put(&zone->kobj);
42254 return ret;
42255diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42256index 025c429..314062f 100644
42257--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
42258+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
42259@@ -54,7 +54,7 @@
42260
42261 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42262 #define SMALL_ALLOCATION 16
42263-#define FREE_ALL_PAGES (~0U)
42264+#define FREE_ALL_PAGES (~0UL)
42265 /* times are in msecs */
42266 #define PAGE_FREE_INTERVAL 1000
42267
42268@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
42269 * @free_all: If set to true will free all pages in pool
42270 * @use_static: Safe to use static buffer
42271 **/
42272-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
42273+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
42274 bool use_static)
42275 {
42276 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42277 unsigned long irq_flags;
42278 struct page *p;
42279 struct page **pages_to_free;
42280- unsigned freed_pages = 0,
42281- npages_to_free = nr_free;
42282+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42283
42284 if (NUM_PAGES_TO_ALLOC < nr_free)
42285 npages_to_free = NUM_PAGES_TO_ALLOC;
42286@@ -371,7 +370,8 @@ restart:
42287 __list_del(&p->lru, &pool->list);
42288
42289 ttm_pool_update_free_locked(pool, freed_pages);
42290- nr_free -= freed_pages;
42291+ if (likely(nr_free != FREE_ALL_PAGES))
42292+ nr_free -= freed_pages;
42293 }
42294
42295 spin_unlock_irqrestore(&pool->lock, irq_flags);
42296@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42297 unsigned i;
42298 unsigned pool_offset;
42299 struct ttm_page_pool *pool;
42300- int shrink_pages = sc->nr_to_scan;
42301+ unsigned long shrink_pages = sc->nr_to_scan;
42302 unsigned long freed = 0;
42303
42304 if (!mutex_trylock(&lock))
42305@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42306 pool_offset = ++start_pool % NUM_POOLS;
42307 /* select start pool in round robin fashion */
42308 for (i = 0; i < NUM_POOLS; ++i) {
42309- unsigned nr_free = shrink_pages;
42310+ unsigned long nr_free = shrink_pages;
42311 if (shrink_pages == 0)
42312 break;
42313 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
42314@@ -673,7 +673,7 @@ out:
42315 }
42316
42317 /* Put all pages in pages list to correct pool to wait for reuse */
42318-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
42319+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
42320 enum ttm_caching_state cstate)
42321 {
42322 unsigned long irq_flags;
42323@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42324 struct list_head plist;
42325 struct page *p = NULL;
42326 gfp_t gfp_flags = GFP_USER;
42327- unsigned count;
42328+ unsigned long count;
42329 int r;
42330
42331 /* set zero flag for page allocation if required */
42332diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42333index 01e1d27..aaa018a 100644
42334--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42335+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42336@@ -56,7 +56,7 @@
42337
42338 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42339 #define SMALL_ALLOCATION 4
42340-#define FREE_ALL_PAGES (~0U)
42341+#define FREE_ALL_PAGES (~0UL)
42342 /* times are in msecs */
42343 #define IS_UNDEFINED (0)
42344 #define IS_WC (1<<1)
42345@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42346 * @nr_free: If set to true will free all pages in pool
42347 * @use_static: Safe to use static buffer
42348 **/
42349-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42350+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42351 bool use_static)
42352 {
42353 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42354@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42355 struct dma_page *dma_p, *tmp;
42356 struct page **pages_to_free;
42357 struct list_head d_pages;
42358- unsigned freed_pages = 0,
42359- npages_to_free = nr_free;
42360+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42361
42362 if (NUM_PAGES_TO_ALLOC < nr_free)
42363 npages_to_free = NUM_PAGES_TO_ALLOC;
42364@@ -499,7 +498,8 @@ restart:
42365 /* remove range of pages from the pool */
42366 if (freed_pages) {
42367 ttm_pool_update_free_locked(pool, freed_pages);
42368- nr_free -= freed_pages;
42369+ if (likely(nr_free != FREE_ALL_PAGES))
42370+ nr_free -= freed_pages;
42371 }
42372
42373 spin_unlock_irqrestore(&pool->lock, irq_flags);
42374@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42375 struct dma_page *d_page, *next;
42376 enum pool_type type;
42377 bool is_cached = false;
42378- unsigned count = 0, i, npages = 0;
42379+ unsigned long count = 0, i, npages = 0;
42380 unsigned long irq_flags;
42381
42382 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42383@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42384 static unsigned start_pool;
42385 unsigned idx = 0;
42386 unsigned pool_offset;
42387- unsigned shrink_pages = sc->nr_to_scan;
42388+ unsigned long shrink_pages = sc->nr_to_scan;
42389 struct device_pools *p;
42390 unsigned long freed = 0;
42391
42392@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42393 goto out;
42394 pool_offset = ++start_pool % _manager->npools;
42395 list_for_each_entry(p, &_manager->pools, pools) {
42396- unsigned nr_free;
42397+ unsigned long nr_free;
42398
42399 if (!p->dev)
42400 continue;
42401@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42402 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42403 freed += nr_free - shrink_pages;
42404
42405- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42406+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42407 p->pool->dev_name, p->pool->name, current->pid,
42408 nr_free, shrink_pages);
42409 }
42410diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42411index 5fc16ce..1bd84ec 100644
42412--- a/drivers/gpu/drm/udl/udl_fb.c
42413+++ b/drivers/gpu/drm/udl/udl_fb.c
42414@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42415 fb_deferred_io_cleanup(info);
42416 kfree(info->fbdefio);
42417 info->fbdefio = NULL;
42418- info->fbops->fb_mmap = udl_fb_mmap;
42419 }
42420
42421 pr_warn("released /dev/fb%d user=%d count=%d\n",
42422diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42423index ef8c500..01030c8 100644
42424--- a/drivers/gpu/drm/via/via_drv.h
42425+++ b/drivers/gpu/drm/via/via_drv.h
42426@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42427 typedef uint32_t maskarray_t[5];
42428
42429 typedef struct drm_via_irq {
42430- atomic_t irq_received;
42431+ atomic_unchecked_t irq_received;
42432 uint32_t pending_mask;
42433 uint32_t enable_mask;
42434 wait_queue_head_t irq_queue;
42435@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42436 struct timeval last_vblank;
42437 int last_vblank_valid;
42438 unsigned usec_per_vblank;
42439- atomic_t vbl_received;
42440+ atomic_unchecked_t vbl_received;
42441 drm_via_state_t hc_state;
42442 char pci_buf[VIA_PCI_BUF_SIZE];
42443 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42444diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42445index 1319433..a993b0c 100644
42446--- a/drivers/gpu/drm/via/via_irq.c
42447+++ b/drivers/gpu/drm/via/via_irq.c
42448@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42449 if (crtc != 0)
42450 return 0;
42451
42452- return atomic_read(&dev_priv->vbl_received);
42453+ return atomic_read_unchecked(&dev_priv->vbl_received);
42454 }
42455
42456 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42457@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42458
42459 status = VIA_READ(VIA_REG_INTERRUPT);
42460 if (status & VIA_IRQ_VBLANK_PENDING) {
42461- atomic_inc(&dev_priv->vbl_received);
42462- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42463+ atomic_inc_unchecked(&dev_priv->vbl_received);
42464+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42465 do_gettimeofday(&cur_vblank);
42466 if (dev_priv->last_vblank_valid) {
42467 dev_priv->usec_per_vblank =
42468@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42469 dev_priv->last_vblank = cur_vblank;
42470 dev_priv->last_vblank_valid = 1;
42471 }
42472- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42473+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42474 DRM_DEBUG("US per vblank is: %u\n",
42475 dev_priv->usec_per_vblank);
42476 }
42477@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42478
42479 for (i = 0; i < dev_priv->num_irqs; ++i) {
42480 if (status & cur_irq->pending_mask) {
42481- atomic_inc(&cur_irq->irq_received);
42482+ atomic_inc_unchecked(&cur_irq->irq_received);
42483 wake_up(&cur_irq->irq_queue);
42484 handled = 1;
42485 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42486@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42487 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42488 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42489 masks[irq][4]));
42490- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42491+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42492 } else {
42493 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42494 (((cur_irq_sequence =
42495- atomic_read(&cur_irq->irq_received)) -
42496+ atomic_read_unchecked(&cur_irq->irq_received)) -
42497 *sequence) <= (1 << 23)));
42498 }
42499 *sequence = cur_irq_sequence;
42500@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42501 }
42502
42503 for (i = 0; i < dev_priv->num_irqs; ++i) {
42504- atomic_set(&cur_irq->irq_received, 0);
42505+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42506 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42507 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42508 init_waitqueue_head(&cur_irq->irq_queue);
42509@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42510 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42511 case VIA_IRQ_RELATIVE:
42512 irqwait->request.sequence +=
42513- atomic_read(&cur_irq->irq_received);
42514+ atomic_read_unchecked(&cur_irq->irq_received);
42515 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42516 case VIA_IRQ_ABSOLUTE:
42517 break;
42518diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42519index d26a6da..5fa41ed 100644
42520--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42521+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42522@@ -447,7 +447,7 @@ struct vmw_private {
42523 * Fencing and IRQs.
42524 */
42525
42526- atomic_t marker_seq;
42527+ atomic_unchecked_t marker_seq;
42528 wait_queue_head_t fence_queue;
42529 wait_queue_head_t fifo_queue;
42530 spinlock_t waiter_lock;
42531diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42532index 39f2b03..d1b0a64 100644
42533--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42534+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42535@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42536 (unsigned int) min,
42537 (unsigned int) fifo->capabilities);
42538
42539- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42540+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42541 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42542 vmw_marker_queue_init(&fifo->marker_queue);
42543 return vmw_fifo_send_fence(dev_priv, &dummy);
42544@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42545 if (reserveable)
42546 iowrite32(bytes, fifo_mem +
42547 SVGA_FIFO_RESERVED);
42548- return fifo_mem + (next_cmd >> 2);
42549+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42550 } else {
42551 need_bounce = true;
42552 }
42553@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42554
42555 fm = vmw_fifo_reserve(dev_priv, bytes);
42556 if (unlikely(fm == NULL)) {
42557- *seqno = atomic_read(&dev_priv->marker_seq);
42558+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42559 ret = -ENOMEM;
42560 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42561 false, 3*HZ);
42562@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42563 }
42564
42565 do {
42566- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42567+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42568 } while (*seqno == 0);
42569
42570 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42571diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42572index 170b61b..fec7348 100644
42573--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42574+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42575@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42576 }
42577
42578 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42579- vmw_gmrid_man_init,
42580- vmw_gmrid_man_takedown,
42581- vmw_gmrid_man_get_node,
42582- vmw_gmrid_man_put_node,
42583- vmw_gmrid_man_debug
42584+ .init = vmw_gmrid_man_init,
42585+ .takedown = vmw_gmrid_man_takedown,
42586+ .get_node = vmw_gmrid_man_get_node,
42587+ .put_node = vmw_gmrid_man_put_node,
42588+ .debug = vmw_gmrid_man_debug
42589 };
42590diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42591index 69c8ce2..cacb0ab 100644
42592--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42593+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42594@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42595 int ret;
42596
42597 num_clips = arg->num_clips;
42598- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42599+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42600
42601 if (unlikely(num_clips == 0))
42602 return 0;
42603@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42604 int ret;
42605
42606 num_clips = arg->num_clips;
42607- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42608+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42609
42610 if (unlikely(num_clips == 0))
42611 return 0;
42612diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42613index 9fe9827..0aa2fc0 100644
42614--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42615+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42616@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42617 * emitted. Then the fence is stale and signaled.
42618 */
42619
42620- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42621+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42622 > VMW_FENCE_WRAP);
42623
42624 return ret;
42625@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42626
42627 if (fifo_idle)
42628 down_read(&fifo_state->rwsem);
42629- signal_seq = atomic_read(&dev_priv->marker_seq);
42630+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42631 ret = 0;
42632
42633 for (;;) {
42634diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42635index efd1ffd..0ae13ca 100644
42636--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42637+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42638@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42639 while (!vmw_lag_lt(queue, us)) {
42640 spin_lock(&queue->lock);
42641 if (list_empty(&queue->head))
42642- seqno = atomic_read(&dev_priv->marker_seq);
42643+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42644 else {
42645 marker = list_first_entry(&queue->head,
42646 struct vmw_marker, head);
42647diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42648index 37ac7b5..d52a5c9 100644
42649--- a/drivers/gpu/vga/vga_switcheroo.c
42650+++ b/drivers/gpu/vga/vga_switcheroo.c
42651@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42652
42653 /* this version is for the case where the power switch is separate
42654 to the device being powered down. */
42655-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42656+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42657 {
42658 /* copy over all the bus versions */
42659 if (dev->bus && dev->bus->pm) {
42660@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42661 return ret;
42662 }
42663
42664-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42665+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42666 {
42667 /* copy over all the bus versions */
42668 if (dev->bus && dev->bus->pm) {
42669diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42670index 56ce8c2..32ce524 100644
42671--- a/drivers/hid/hid-core.c
42672+++ b/drivers/hid/hid-core.c
42673@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42674
42675 int hid_add_device(struct hid_device *hdev)
42676 {
42677- static atomic_t id = ATOMIC_INIT(0);
42678+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42679 int ret;
42680
42681 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42682@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42683 /* XXX hack, any other cleaner solution after the driver core
42684 * is converted to allow more than 20 bytes as the device name? */
42685 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42686- hdev->vendor, hdev->product, atomic_inc_return(&id));
42687+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42688
42689 hid_debug_register(hdev, dev_name(&hdev->dev));
42690 ret = device_add(&hdev->dev);
42691diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42692index c13fb5b..55a3802 100644
42693--- a/drivers/hid/hid-wiimote-debug.c
42694+++ b/drivers/hid/hid-wiimote-debug.c
42695@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42696 else if (size == 0)
42697 return -EIO;
42698
42699- if (copy_to_user(u, buf, size))
42700+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42701 return -EFAULT;
42702
42703 *off += size;
42704diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42705index 00bc30e..d8e5097 100644
42706--- a/drivers/hv/channel.c
42707+++ b/drivers/hv/channel.c
42708@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42709 int ret = 0;
42710
42711 next_gpadl_handle =
42712- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42713+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42714
42715 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42716 if (ret)
42717diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42718index 50e51a5..b0bfd78 100644
42719--- a/drivers/hv/hv.c
42720+++ b/drivers/hv/hv.c
42721@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42722 u64 output_address = (output) ? virt_to_phys(output) : 0;
42723 u32 output_address_hi = output_address >> 32;
42724 u32 output_address_lo = output_address & 0xFFFFFFFF;
42725- void *hypercall_page = hv_context.hypercall_page;
42726+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42727
42728 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42729 "=a"(hv_status_lo) : "d" (control_hi),
42730@@ -164,7 +164,7 @@ int hv_init(void)
42731 /* See if the hypercall page is already set */
42732 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42733
42734- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42735+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42736
42737 if (!virtaddr)
42738 goto cleanup;
42739diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42740index ff16938..e60879c 100644
42741--- a/drivers/hv/hv_balloon.c
42742+++ b/drivers/hv/hv_balloon.c
42743@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42744
42745 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42746 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42747-static atomic_t trans_id = ATOMIC_INIT(0);
42748+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42749
42750 static int dm_ring_size = (5 * PAGE_SIZE);
42751
42752@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42753 pr_info("Memory hot add failed\n");
42754
42755 dm->state = DM_INITIALIZED;
42756- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42757+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42758 vmbus_sendpacket(dm->dev->channel, &resp,
42759 sizeof(struct dm_hot_add_response),
42760 (unsigned long)NULL,
42761@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42762 memset(&status, 0, sizeof(struct dm_status));
42763 status.hdr.type = DM_STATUS_REPORT;
42764 status.hdr.size = sizeof(struct dm_status);
42765- status.hdr.trans_id = atomic_inc_return(&trans_id);
42766+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42767
42768 /*
42769 * The host expects the guest to report free memory.
42770@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42771 * send the status. This can happen if we were interrupted
42772 * after we picked our transaction ID.
42773 */
42774- if (status.hdr.trans_id != atomic_read(&trans_id))
42775+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42776 return;
42777
42778 /*
42779@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42780 */
42781
42782 do {
42783- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42784+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42785 ret = vmbus_sendpacket(dm_device.dev->channel,
42786 bl_resp,
42787 bl_resp->hdr.size,
42788@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42789
42790 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42791 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42792- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42793+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42794 resp.hdr.size = sizeof(struct dm_unballoon_response);
42795
42796 vmbus_sendpacket(dm_device.dev->channel, &resp,
42797@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42798 memset(&version_req, 0, sizeof(struct dm_version_request));
42799 version_req.hdr.type = DM_VERSION_REQUEST;
42800 version_req.hdr.size = sizeof(struct dm_version_request);
42801- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42802+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42803 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42804 version_req.is_last_attempt = 1;
42805
42806@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42807 memset(&version_req, 0, sizeof(struct dm_version_request));
42808 version_req.hdr.type = DM_VERSION_REQUEST;
42809 version_req.hdr.size = sizeof(struct dm_version_request);
42810- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42811+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42812 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42813 version_req.is_last_attempt = 0;
42814
42815@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42816 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42817 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42818 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42819- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42820+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42821
42822 cap_msg.caps.cap_bits.balloon = 1;
42823 cap_msg.caps.cap_bits.hot_add = 1;
42824diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42825index 44b1c94..6dccc2c 100644
42826--- a/drivers/hv/hyperv_vmbus.h
42827+++ b/drivers/hv/hyperv_vmbus.h
42828@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42829 struct vmbus_connection {
42830 enum vmbus_connect_state conn_state;
42831
42832- atomic_t next_gpadl_handle;
42833+ atomic_unchecked_t next_gpadl_handle;
42834
42835 /*
42836 * Represents channel interrupts. Each bit position represents a
42837diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42838index f518b8d7..4bc0b64 100644
42839--- a/drivers/hv/vmbus_drv.c
42840+++ b/drivers/hv/vmbus_drv.c
42841@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42842 {
42843 int ret = 0;
42844
42845- static atomic_t device_num = ATOMIC_INIT(0);
42846+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42847
42848 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42849- atomic_inc_return(&device_num));
42850+ atomic_inc_return_unchecked(&device_num));
42851
42852 child_device_obj->device.bus = &hv_bus;
42853 child_device_obj->device.parent = &hv_acpi_dev->dev;
42854diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42855index 579bdf9..0dac21d5 100644
42856--- a/drivers/hwmon/acpi_power_meter.c
42857+++ b/drivers/hwmon/acpi_power_meter.c
42858@@ -116,7 +116,7 @@ struct sensor_template {
42859 struct device_attribute *devattr,
42860 const char *buf, size_t count);
42861 int index;
42862-};
42863+} __do_const;
42864
42865 /* Averaging interval */
42866 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42867@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42868 struct sensor_template *attrs)
42869 {
42870 struct device *dev = &resource->acpi_dev->dev;
42871- struct sensor_device_attribute *sensors =
42872+ sensor_device_attribute_no_const *sensors =
42873 &resource->sensors[resource->num_sensors];
42874 int res = 0;
42875
42876@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42877 return 0;
42878 }
42879
42880-static struct dmi_system_id __initdata pm_dmi_table[] = {
42881+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42882 {
42883 enable_cap_knobs, "IBM Active Energy Manager",
42884 {
42885diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42886index 0af63da..05a183a 100644
42887--- a/drivers/hwmon/applesmc.c
42888+++ b/drivers/hwmon/applesmc.c
42889@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42890 {
42891 struct applesmc_node_group *grp;
42892 struct applesmc_dev_attr *node;
42893- struct attribute *attr;
42894+ attribute_no_const *attr;
42895 int ret, i;
42896
42897 for (grp = groups; grp->format; grp++) {
42898diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42899index cccef87..06ce8ec 100644
42900--- a/drivers/hwmon/asus_atk0110.c
42901+++ b/drivers/hwmon/asus_atk0110.c
42902@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42903 struct atk_sensor_data {
42904 struct list_head list;
42905 struct atk_data *data;
42906- struct device_attribute label_attr;
42907- struct device_attribute input_attr;
42908- struct device_attribute limit1_attr;
42909- struct device_attribute limit2_attr;
42910+ device_attribute_no_const label_attr;
42911+ device_attribute_no_const input_attr;
42912+ device_attribute_no_const limit1_attr;
42913+ device_attribute_no_const limit2_attr;
42914 char label_attr_name[ATTR_NAME_SIZE];
42915 char input_attr_name[ATTR_NAME_SIZE];
42916 char limit1_attr_name[ATTR_NAME_SIZE];
42917@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42918 static struct device_attribute atk_name_attr =
42919 __ATTR(name, 0444, atk_name_show, NULL);
42920
42921-static void atk_init_attribute(struct device_attribute *attr, char *name,
42922+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42923 sysfs_show_func show)
42924 {
42925 sysfs_attr_init(&attr->attr);
42926diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42927index 5b7fec8..05c957a 100644
42928--- a/drivers/hwmon/coretemp.c
42929+++ b/drivers/hwmon/coretemp.c
42930@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42931 return NOTIFY_OK;
42932 }
42933
42934-static struct notifier_block coretemp_cpu_notifier __refdata = {
42935+static struct notifier_block coretemp_cpu_notifier = {
42936 .notifier_call = coretemp_cpu_callback,
42937 };
42938
42939diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42940index 7a8a6fb..015c1fd 100644
42941--- a/drivers/hwmon/ibmaem.c
42942+++ b/drivers/hwmon/ibmaem.c
42943@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42944 struct aem_rw_sensor_template *rw)
42945 {
42946 struct device *dev = &data->pdev->dev;
42947- struct sensor_device_attribute *sensors = data->sensors;
42948+ sensor_device_attribute_no_const *sensors = data->sensors;
42949 int err;
42950
42951 /* Set up read-only sensors */
42952diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42953index 17ae2eb..21b71dd 100644
42954--- a/drivers/hwmon/iio_hwmon.c
42955+++ b/drivers/hwmon/iio_hwmon.c
42956@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42957 {
42958 struct device *dev = &pdev->dev;
42959 struct iio_hwmon_state *st;
42960- struct sensor_device_attribute *a;
42961+ sensor_device_attribute_no_const *a;
42962 int ret, i;
42963 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42964 enum iio_chan_type type;
42965diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42966index 37f0170..414ec2c 100644
42967--- a/drivers/hwmon/nct6683.c
42968+++ b/drivers/hwmon/nct6683.c
42969@@ -397,11 +397,11 @@ static struct attribute_group *
42970 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42971 int repeat)
42972 {
42973- struct sensor_device_attribute_2 *a2;
42974- struct sensor_device_attribute *a;
42975+ sensor_device_attribute_2_no_const *a2;
42976+ sensor_device_attribute_no_const *a;
42977 struct sensor_device_template **t;
42978 struct sensor_device_attr_u *su;
42979- struct attribute_group *group;
42980+ attribute_group_no_const *group;
42981 struct attribute **attrs;
42982 int i, j, count;
42983
42984diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42985index 0773930..6f04305 100644
42986--- a/drivers/hwmon/nct6775.c
42987+++ b/drivers/hwmon/nct6775.c
42988@@ -952,10 +952,10 @@ static struct attribute_group *
42989 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42990 int repeat)
42991 {
42992- struct attribute_group *group;
42993+ attribute_group_no_const *group;
42994 struct sensor_device_attr_u *su;
42995- struct sensor_device_attribute *a;
42996- struct sensor_device_attribute_2 *a2;
42997+ sensor_device_attribute_no_const *a;
42998+ sensor_device_attribute_2_no_const *a2;
42999 struct attribute **attrs;
43000 struct sensor_device_template **t;
43001 int i, count;
43002diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
43003index f2e47c7..45d7941 100644
43004--- a/drivers/hwmon/pmbus/pmbus_core.c
43005+++ b/drivers/hwmon/pmbus/pmbus_core.c
43006@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
43007 return 0;
43008 }
43009
43010-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43011+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
43012 const char *name,
43013 umode_t mode,
43014 ssize_t (*show)(struct device *dev,
43015@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
43016 dev_attr->store = store;
43017 }
43018
43019-static void pmbus_attr_init(struct sensor_device_attribute *a,
43020+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
43021 const char *name,
43022 umode_t mode,
43023 ssize_t (*show)(struct device *dev,
43024@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
43025 u16 reg, u8 mask)
43026 {
43027 struct pmbus_boolean *boolean;
43028- struct sensor_device_attribute *a;
43029+ sensor_device_attribute_no_const *a;
43030
43031 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
43032 if (!boolean)
43033@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
43034 bool update, bool readonly)
43035 {
43036 struct pmbus_sensor *sensor;
43037- struct device_attribute *a;
43038+ device_attribute_no_const *a;
43039
43040 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
43041 if (!sensor)
43042@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
43043 const char *lstring, int index)
43044 {
43045 struct pmbus_label *label;
43046- struct device_attribute *a;
43047+ device_attribute_no_const *a;
43048
43049 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
43050 if (!label)
43051diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
43052index d4f0935..7420593 100644
43053--- a/drivers/hwmon/sht15.c
43054+++ b/drivers/hwmon/sht15.c
43055@@ -169,7 +169,7 @@ struct sht15_data {
43056 int supply_uv;
43057 bool supply_uv_valid;
43058 struct work_struct update_supply_work;
43059- atomic_t interrupt_handled;
43060+ atomic_unchecked_t interrupt_handled;
43061 };
43062
43063 /**
43064@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
43065 ret = gpio_direction_input(data->pdata->gpio_data);
43066 if (ret)
43067 return ret;
43068- atomic_set(&data->interrupt_handled, 0);
43069+ atomic_set_unchecked(&data->interrupt_handled, 0);
43070
43071 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43072 if (gpio_get_value(data->pdata->gpio_data) == 0) {
43073 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
43074 /* Only relevant if the interrupt hasn't occurred. */
43075- if (!atomic_read(&data->interrupt_handled))
43076+ if (!atomic_read_unchecked(&data->interrupt_handled))
43077 schedule_work(&data->read_work);
43078 }
43079 ret = wait_event_timeout(data->wait_queue,
43080@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
43081
43082 /* First disable the interrupt */
43083 disable_irq_nosync(irq);
43084- atomic_inc(&data->interrupt_handled);
43085+ atomic_inc_unchecked(&data->interrupt_handled);
43086 /* Then schedule a reading work struct */
43087 if (data->state != SHT15_READING_NOTHING)
43088 schedule_work(&data->read_work);
43089@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
43090 * If not, then start the interrupt again - care here as could
43091 * have gone low in meantime so verify it hasn't!
43092 */
43093- atomic_set(&data->interrupt_handled, 0);
43094+ atomic_set_unchecked(&data->interrupt_handled, 0);
43095 enable_irq(gpio_to_irq(data->pdata->gpio_data));
43096 /* If still not occurred or another handler was scheduled */
43097 if (gpio_get_value(data->pdata->gpio_data)
43098- || atomic_read(&data->interrupt_handled))
43099+ || atomic_read_unchecked(&data->interrupt_handled))
43100 return;
43101 }
43102
43103diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
43104index ac91c07..8e69663 100644
43105--- a/drivers/hwmon/via-cputemp.c
43106+++ b/drivers/hwmon/via-cputemp.c
43107@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
43108 return NOTIFY_OK;
43109 }
43110
43111-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
43112+static struct notifier_block via_cputemp_cpu_notifier = {
43113 .notifier_call = via_cputemp_cpu_callback,
43114 };
43115
43116diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
43117index 65e3240..e6c511d 100644
43118--- a/drivers/i2c/busses/i2c-amd756-s4882.c
43119+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
43120@@ -39,7 +39,7 @@
43121 extern struct i2c_adapter amd756_smbus;
43122
43123 static struct i2c_adapter *s4882_adapter;
43124-static struct i2c_algorithm *s4882_algo;
43125+static i2c_algorithm_no_const *s4882_algo;
43126
43127 /* Wrapper access functions for multiplexed SMBus */
43128 static DEFINE_MUTEX(amd756_lock);
43129diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
43130index b19a310..d6eece0 100644
43131--- a/drivers/i2c/busses/i2c-diolan-u2c.c
43132+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
43133@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
43134 /* usb layer */
43135
43136 /* Send command to device, and get response. */
43137-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43138+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
43139 {
43140 int ret = 0;
43141 int actual;
43142diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
43143index 88eda09..cf40434 100644
43144--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
43145+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
43146@@ -37,7 +37,7 @@
43147 extern struct i2c_adapter *nforce2_smbus;
43148
43149 static struct i2c_adapter *s4985_adapter;
43150-static struct i2c_algorithm *s4985_algo;
43151+static i2c_algorithm_no_const *s4985_algo;
43152
43153 /* Wrapper access functions for multiplexed SMBus */
43154 static DEFINE_MUTEX(nforce2_lock);
43155diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
43156index 71c7a39..71dd3e0 100644
43157--- a/drivers/i2c/i2c-dev.c
43158+++ b/drivers/i2c/i2c-dev.c
43159@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
43160 break;
43161 }
43162
43163- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
43164+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
43165 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
43166 if (IS_ERR(rdwr_pa[i].buf)) {
43167 res = PTR_ERR(rdwr_pa[i].buf);
43168diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
43169index 0b510ba..4fbb5085 100644
43170--- a/drivers/ide/ide-cd.c
43171+++ b/drivers/ide/ide-cd.c
43172@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
43173 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
43174 if ((unsigned long)buf & alignment
43175 || blk_rq_bytes(rq) & q->dma_pad_mask
43176- || object_is_on_stack(buf))
43177+ || object_starts_on_stack(buf))
43178 drive->dma = 0;
43179 }
43180 }
43181diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
43182index 4df97f6..c751151 100644
43183--- a/drivers/iio/industrialio-core.c
43184+++ b/drivers/iio/industrialio-core.c
43185@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
43186 }
43187
43188 static
43189-int __iio_device_attr_init(struct device_attribute *dev_attr,
43190+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
43191 const char *postfix,
43192 struct iio_chan_spec const *chan,
43193 ssize_t (*readfunc)(struct device *dev,
43194diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
43195index e28a494..f7c2671 100644
43196--- a/drivers/infiniband/core/cm.c
43197+++ b/drivers/infiniband/core/cm.c
43198@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
43199
43200 struct cm_counter_group {
43201 struct kobject obj;
43202- atomic_long_t counter[CM_ATTR_COUNT];
43203+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
43204 };
43205
43206 struct cm_counter_attribute {
43207@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
43208 struct ib_mad_send_buf *msg = NULL;
43209 int ret;
43210
43211- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43212+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43213 counter[CM_REQ_COUNTER]);
43214
43215 /* Quick state check to discard duplicate REQs. */
43216@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
43217 if (!cm_id_priv)
43218 return;
43219
43220- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43221+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43222 counter[CM_REP_COUNTER]);
43223 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
43224 if (ret)
43225@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
43226 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
43227 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
43228 spin_unlock_irq(&cm_id_priv->lock);
43229- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43230+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43231 counter[CM_RTU_COUNTER]);
43232 goto out;
43233 }
43234@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
43235 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
43236 dreq_msg->local_comm_id);
43237 if (!cm_id_priv) {
43238- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43239+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43240 counter[CM_DREQ_COUNTER]);
43241 cm_issue_drep(work->port, work->mad_recv_wc);
43242 return -EINVAL;
43243@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
43244 case IB_CM_MRA_REP_RCVD:
43245 break;
43246 case IB_CM_TIMEWAIT:
43247- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43248+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43249 counter[CM_DREQ_COUNTER]);
43250 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43251 goto unlock;
43252@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
43253 cm_free_msg(msg);
43254 goto deref;
43255 case IB_CM_DREQ_RCVD:
43256- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43257+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43258 counter[CM_DREQ_COUNTER]);
43259 goto unlock;
43260 default:
43261@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
43262 ib_modify_mad(cm_id_priv->av.port->mad_agent,
43263 cm_id_priv->msg, timeout)) {
43264 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
43265- atomic_long_inc(&work->port->
43266+ atomic_long_inc_unchecked(&work->port->
43267 counter_group[CM_RECV_DUPLICATES].
43268 counter[CM_MRA_COUNTER]);
43269 goto out;
43270@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
43271 break;
43272 case IB_CM_MRA_REQ_RCVD:
43273 case IB_CM_MRA_REP_RCVD:
43274- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43275+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43276 counter[CM_MRA_COUNTER]);
43277 /* fall through */
43278 default:
43279@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
43280 case IB_CM_LAP_IDLE:
43281 break;
43282 case IB_CM_MRA_LAP_SENT:
43283- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43284+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43285 counter[CM_LAP_COUNTER]);
43286 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
43287 goto unlock;
43288@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
43289 cm_free_msg(msg);
43290 goto deref;
43291 case IB_CM_LAP_RCVD:
43292- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43293+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43294 counter[CM_LAP_COUNTER]);
43295 goto unlock;
43296 default:
43297@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43298 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43299 if (cur_cm_id_priv) {
43300 spin_unlock_irq(&cm.lock);
43301- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43302+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43303 counter[CM_SIDR_REQ_COUNTER]);
43304 goto out; /* Duplicate message. */
43305 }
43306@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43307 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43308 msg->retries = 1;
43309
43310- atomic_long_add(1 + msg->retries,
43311+ atomic_long_add_unchecked(1 + msg->retries,
43312 &port->counter_group[CM_XMIT].counter[attr_index]);
43313 if (msg->retries)
43314- atomic_long_add(msg->retries,
43315+ atomic_long_add_unchecked(msg->retries,
43316 &port->counter_group[CM_XMIT_RETRIES].
43317 counter[attr_index]);
43318
43319@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43320 }
43321
43322 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43323- atomic_long_inc(&port->counter_group[CM_RECV].
43324+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43325 counter[attr_id - CM_ATTR_ID_OFFSET]);
43326
43327 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43328@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43329 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43330
43331 return sprintf(buf, "%ld\n",
43332- atomic_long_read(&group->counter[cm_attr->index]));
43333+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43334 }
43335
43336 static const struct sysfs_ops cm_counter_ops = {
43337diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43338index 9f5ad7c..588cd84 100644
43339--- a/drivers/infiniband/core/fmr_pool.c
43340+++ b/drivers/infiniband/core/fmr_pool.c
43341@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43342
43343 struct task_struct *thread;
43344
43345- atomic_t req_ser;
43346- atomic_t flush_ser;
43347+ atomic_unchecked_t req_ser;
43348+ atomic_unchecked_t flush_ser;
43349
43350 wait_queue_head_t force_wait;
43351 };
43352@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43353 struct ib_fmr_pool *pool = pool_ptr;
43354
43355 do {
43356- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43357+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43358 ib_fmr_batch_release(pool);
43359
43360- atomic_inc(&pool->flush_ser);
43361+ atomic_inc_unchecked(&pool->flush_ser);
43362 wake_up_interruptible(&pool->force_wait);
43363
43364 if (pool->flush_function)
43365@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43366 }
43367
43368 set_current_state(TASK_INTERRUPTIBLE);
43369- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43370+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43371 !kthread_should_stop())
43372 schedule();
43373 __set_current_state(TASK_RUNNING);
43374@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43375 pool->dirty_watermark = params->dirty_watermark;
43376 pool->dirty_len = 0;
43377 spin_lock_init(&pool->pool_lock);
43378- atomic_set(&pool->req_ser, 0);
43379- atomic_set(&pool->flush_ser, 0);
43380+ atomic_set_unchecked(&pool->req_ser, 0);
43381+ atomic_set_unchecked(&pool->flush_ser, 0);
43382 init_waitqueue_head(&pool->force_wait);
43383
43384 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43385@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43386 }
43387 spin_unlock_irq(&pool->pool_lock);
43388
43389- serial = atomic_inc_return(&pool->req_ser);
43390+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43391 wake_up_process(pool->thread);
43392
43393 if (wait_event_interruptible(pool->force_wait,
43394- atomic_read(&pool->flush_ser) - serial >= 0))
43395+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43396 return -EINTR;
43397
43398 return 0;
43399@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43400 } else {
43401 list_add_tail(&fmr->list, &pool->dirty_list);
43402 if (++pool->dirty_len >= pool->dirty_watermark) {
43403- atomic_inc(&pool->req_ser);
43404+ atomic_inc_unchecked(&pool->req_ser);
43405 wake_up_process(pool->thread);
43406 }
43407 }
43408diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43409index a9f0489..27a161b 100644
43410--- a/drivers/infiniband/core/uverbs_cmd.c
43411+++ b/drivers/infiniband/core/uverbs_cmd.c
43412@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43413 if (copy_from_user(&cmd, buf, sizeof cmd))
43414 return -EFAULT;
43415
43416+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43417+ return -EFAULT;
43418+
43419 INIT_UDATA(&udata, buf + sizeof cmd,
43420 (unsigned long) cmd.response + sizeof resp,
43421 in_len - sizeof cmd, out_len - sizeof resp);
43422diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43423index 6791fd1..78bdcdf 100644
43424--- a/drivers/infiniband/hw/cxgb4/mem.c
43425+++ b/drivers/infiniband/hw/cxgb4/mem.c
43426@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43427 int err;
43428 struct fw_ri_tpte tpt;
43429 u32 stag_idx;
43430- static atomic_t key;
43431+ static atomic_unchecked_t key;
43432
43433 if (c4iw_fatal_error(rdev))
43434 return -EIO;
43435@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43436 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43437 rdev->stats.stag.max = rdev->stats.stag.cur;
43438 mutex_unlock(&rdev->stats.lock);
43439- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43440+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43441 }
43442 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43443 __func__, stag_state, type, pdid, stag_idx);
43444diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43445index 79b3dbc..96e5fcc 100644
43446--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43447+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43448@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43449 struct ib_atomic_eth *ateth;
43450 struct ipath_ack_entry *e;
43451 u64 vaddr;
43452- atomic64_t *maddr;
43453+ atomic64_unchecked_t *maddr;
43454 u64 sdata;
43455 u32 rkey;
43456 u8 next;
43457@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43458 IB_ACCESS_REMOTE_ATOMIC)))
43459 goto nack_acc_unlck;
43460 /* Perform atomic OP and save result. */
43461- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43462+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43463 sdata = be64_to_cpu(ateth->swap_data);
43464 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43465 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43466- (u64) atomic64_add_return(sdata, maddr) - sdata :
43467+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43468 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43469 be64_to_cpu(ateth->compare_data),
43470 sdata);
43471diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43472index 1f95bba..9530f87 100644
43473--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43474+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43475@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43476 unsigned long flags;
43477 struct ib_wc wc;
43478 u64 sdata;
43479- atomic64_t *maddr;
43480+ atomic64_unchecked_t *maddr;
43481 enum ib_wc_status send_status;
43482
43483 /*
43484@@ -382,11 +382,11 @@ again:
43485 IB_ACCESS_REMOTE_ATOMIC)))
43486 goto acc_err;
43487 /* Perform atomic OP and save result. */
43488- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43489+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43490 sdata = wqe->wr.wr.atomic.compare_add;
43491 *(u64 *) sqp->s_sge.sge.vaddr =
43492 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43493- (u64) atomic64_add_return(sdata, maddr) - sdata :
43494+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43495 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43496 sdata, wqe->wr.wr.atomic.swap);
43497 goto send_comp;
43498diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43499index 5904026..f1c30e5 100644
43500--- a/drivers/infiniband/hw/mlx4/mad.c
43501+++ b/drivers/infiniband/hw/mlx4/mad.c
43502@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43503
43504 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43505 {
43506- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43507+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43508 cpu_to_be64(0xff00000000000000LL);
43509 }
43510
43511diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43512index ed327e6..ca1739e0 100644
43513--- a/drivers/infiniband/hw/mlx4/mcg.c
43514+++ b/drivers/infiniband/hw/mlx4/mcg.c
43515@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43516 {
43517 char name[20];
43518
43519- atomic_set(&ctx->tid, 0);
43520+ atomic_set_unchecked(&ctx->tid, 0);
43521 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43522 ctx->mcg_wq = create_singlethread_workqueue(name);
43523 if (!ctx->mcg_wq)
43524diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43525index f829fd9..1a8d436 100644
43526--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43527+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43528@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
43529 struct list_head mcg_mgid0_list;
43530 struct workqueue_struct *mcg_wq;
43531 struct mlx4_ib_demux_pv_ctx **tun;
43532- atomic_t tid;
43533+ atomic_unchecked_t tid;
43534 int flushing; /* flushing the work queue */
43535 };
43536
43537diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43538index 9d3e5c1..6f166df 100644
43539--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43540+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43541@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43542 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43543 }
43544
43545-int mthca_QUERY_FW(struct mthca_dev *dev)
43546+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43547 {
43548 struct mthca_mailbox *mailbox;
43549 u32 *outbox;
43550@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43551 CMD_TIME_CLASS_B);
43552 }
43553
43554-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43555+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43556 int num_mtt)
43557 {
43558 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43559@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43560 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43561 }
43562
43563-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43564+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43565 int eq_num)
43566 {
43567 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43568@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43569 CMD_TIME_CLASS_B);
43570 }
43571
43572-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43573+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43574 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43575 void *in_mad, void *response_mad)
43576 {
43577diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43578index ded76c1..0cf0a08 100644
43579--- a/drivers/infiniband/hw/mthca/mthca_main.c
43580+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43581@@ -692,7 +692,7 @@ err_close:
43582 return err;
43583 }
43584
43585-static int mthca_setup_hca(struct mthca_dev *dev)
43586+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43587 {
43588 int err;
43589
43590diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43591index ed9a989..6aa5dc2 100644
43592--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43593+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43594@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43595 * through the bitmaps)
43596 */
43597
43598-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43599+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43600 {
43601 int o;
43602 int m;
43603@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43604 return key;
43605 }
43606
43607-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43608+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43609 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43610 {
43611 struct mthca_mailbox *mailbox;
43612@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43613 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43614 }
43615
43616-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43617+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43618 u64 *buffer_list, int buffer_size_shift,
43619 int list_len, u64 iova, u64 total_size,
43620 u32 access, struct mthca_mr *mr)
43621diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43622index 415f8e1..e34214e 100644
43623--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43624+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43625@@ -764,7 +764,7 @@ unlock:
43626 return 0;
43627 }
43628
43629-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43630+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43631 {
43632 struct mthca_dev *dev = to_mdev(ibcq->device);
43633 struct mthca_cq *cq = to_mcq(ibcq);
43634diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43635index 3b2a6dc..bce26ff 100644
43636--- a/drivers/infiniband/hw/nes/nes.c
43637+++ b/drivers/infiniband/hw/nes/nes.c
43638@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43639 LIST_HEAD(nes_adapter_list);
43640 static LIST_HEAD(nes_dev_list);
43641
43642-atomic_t qps_destroyed;
43643+atomic_unchecked_t qps_destroyed;
43644
43645 static unsigned int ee_flsh_adapter;
43646 static unsigned int sysfs_nonidx_addr;
43647@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43648 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43649 struct nes_adapter *nesadapter = nesdev->nesadapter;
43650
43651- atomic_inc(&qps_destroyed);
43652+ atomic_inc_unchecked(&qps_destroyed);
43653
43654 /* Free the control structures */
43655
43656diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43657index bd9d132..70d84f4 100644
43658--- a/drivers/infiniband/hw/nes/nes.h
43659+++ b/drivers/infiniband/hw/nes/nes.h
43660@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43661 extern unsigned int wqm_quanta;
43662 extern struct list_head nes_adapter_list;
43663
43664-extern atomic_t cm_connects;
43665-extern atomic_t cm_accepts;
43666-extern atomic_t cm_disconnects;
43667-extern atomic_t cm_closes;
43668-extern atomic_t cm_connecteds;
43669-extern atomic_t cm_connect_reqs;
43670-extern atomic_t cm_rejects;
43671-extern atomic_t mod_qp_timouts;
43672-extern atomic_t qps_created;
43673-extern atomic_t qps_destroyed;
43674-extern atomic_t sw_qps_destroyed;
43675+extern atomic_unchecked_t cm_connects;
43676+extern atomic_unchecked_t cm_accepts;
43677+extern atomic_unchecked_t cm_disconnects;
43678+extern atomic_unchecked_t cm_closes;
43679+extern atomic_unchecked_t cm_connecteds;
43680+extern atomic_unchecked_t cm_connect_reqs;
43681+extern atomic_unchecked_t cm_rejects;
43682+extern atomic_unchecked_t mod_qp_timouts;
43683+extern atomic_unchecked_t qps_created;
43684+extern atomic_unchecked_t qps_destroyed;
43685+extern atomic_unchecked_t sw_qps_destroyed;
43686 extern u32 mh_detected;
43687 extern u32 mh_pauses_sent;
43688 extern u32 cm_packets_sent;
43689@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43690 extern u32 cm_packets_received;
43691 extern u32 cm_packets_dropped;
43692 extern u32 cm_packets_retrans;
43693-extern atomic_t cm_listens_created;
43694-extern atomic_t cm_listens_destroyed;
43695+extern atomic_unchecked_t cm_listens_created;
43696+extern atomic_unchecked_t cm_listens_destroyed;
43697 extern u32 cm_backlog_drops;
43698-extern atomic_t cm_loopbacks;
43699-extern atomic_t cm_nodes_created;
43700-extern atomic_t cm_nodes_destroyed;
43701-extern atomic_t cm_accel_dropped_pkts;
43702-extern atomic_t cm_resets_recvd;
43703-extern atomic_t pau_qps_created;
43704-extern atomic_t pau_qps_destroyed;
43705+extern atomic_unchecked_t cm_loopbacks;
43706+extern atomic_unchecked_t cm_nodes_created;
43707+extern atomic_unchecked_t cm_nodes_destroyed;
43708+extern atomic_unchecked_t cm_accel_dropped_pkts;
43709+extern atomic_unchecked_t cm_resets_recvd;
43710+extern atomic_unchecked_t pau_qps_created;
43711+extern atomic_unchecked_t pau_qps_destroyed;
43712
43713 extern u32 int_mod_timer_init;
43714 extern u32 int_mod_cq_depth_256;
43715diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43716index 6f09a72..cf4399d 100644
43717--- a/drivers/infiniband/hw/nes/nes_cm.c
43718+++ b/drivers/infiniband/hw/nes/nes_cm.c
43719@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43720 u32 cm_packets_retrans;
43721 u32 cm_packets_created;
43722 u32 cm_packets_received;
43723-atomic_t cm_listens_created;
43724-atomic_t cm_listens_destroyed;
43725+atomic_unchecked_t cm_listens_created;
43726+atomic_unchecked_t cm_listens_destroyed;
43727 u32 cm_backlog_drops;
43728-atomic_t cm_loopbacks;
43729-atomic_t cm_nodes_created;
43730-atomic_t cm_nodes_destroyed;
43731-atomic_t cm_accel_dropped_pkts;
43732-atomic_t cm_resets_recvd;
43733+atomic_unchecked_t cm_loopbacks;
43734+atomic_unchecked_t cm_nodes_created;
43735+atomic_unchecked_t cm_nodes_destroyed;
43736+atomic_unchecked_t cm_accel_dropped_pkts;
43737+atomic_unchecked_t cm_resets_recvd;
43738
43739 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43740 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43741@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43742 /* instance of function pointers for client API */
43743 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43744 static struct nes_cm_ops nes_cm_api = {
43745- mini_cm_accelerated,
43746- mini_cm_listen,
43747- mini_cm_del_listen,
43748- mini_cm_connect,
43749- mini_cm_close,
43750- mini_cm_accept,
43751- mini_cm_reject,
43752- mini_cm_recv_pkt,
43753- mini_cm_dealloc_core,
43754- mini_cm_get,
43755- mini_cm_set
43756+ .accelerated = mini_cm_accelerated,
43757+ .listen = mini_cm_listen,
43758+ .stop_listener = mini_cm_del_listen,
43759+ .connect = mini_cm_connect,
43760+ .close = mini_cm_close,
43761+ .accept = mini_cm_accept,
43762+ .reject = mini_cm_reject,
43763+ .recv_pkt = mini_cm_recv_pkt,
43764+ .destroy_cm_core = mini_cm_dealloc_core,
43765+ .get = mini_cm_get,
43766+ .set = mini_cm_set
43767 };
43768
43769 static struct nes_cm_core *g_cm_core;
43770
43771-atomic_t cm_connects;
43772-atomic_t cm_accepts;
43773-atomic_t cm_disconnects;
43774-atomic_t cm_closes;
43775-atomic_t cm_connecteds;
43776-atomic_t cm_connect_reqs;
43777-atomic_t cm_rejects;
43778+atomic_unchecked_t cm_connects;
43779+atomic_unchecked_t cm_accepts;
43780+atomic_unchecked_t cm_disconnects;
43781+atomic_unchecked_t cm_closes;
43782+atomic_unchecked_t cm_connecteds;
43783+atomic_unchecked_t cm_connect_reqs;
43784+atomic_unchecked_t cm_rejects;
43785
43786 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43787 {
43788@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43789 kfree(listener);
43790 listener = NULL;
43791 ret = 0;
43792- atomic_inc(&cm_listens_destroyed);
43793+ atomic_inc_unchecked(&cm_listens_destroyed);
43794 } else {
43795 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43796 }
43797@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43798 cm_node->rem_mac);
43799
43800 add_hte_node(cm_core, cm_node);
43801- atomic_inc(&cm_nodes_created);
43802+ atomic_inc_unchecked(&cm_nodes_created);
43803
43804 return cm_node;
43805 }
43806@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43807 }
43808
43809 atomic_dec(&cm_core->node_cnt);
43810- atomic_inc(&cm_nodes_destroyed);
43811+ atomic_inc_unchecked(&cm_nodes_destroyed);
43812 nesqp = cm_node->nesqp;
43813 if (nesqp) {
43814 nesqp->cm_node = NULL;
43815@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43816
43817 static void drop_packet(struct sk_buff *skb)
43818 {
43819- atomic_inc(&cm_accel_dropped_pkts);
43820+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43821 dev_kfree_skb_any(skb);
43822 }
43823
43824@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43825 {
43826
43827 int reset = 0; /* whether to send reset in case of err.. */
43828- atomic_inc(&cm_resets_recvd);
43829+ atomic_inc_unchecked(&cm_resets_recvd);
43830 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43831 " refcnt=%d\n", cm_node, cm_node->state,
43832 atomic_read(&cm_node->ref_count));
43833@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43834 rem_ref_cm_node(cm_node->cm_core, cm_node);
43835 return NULL;
43836 }
43837- atomic_inc(&cm_loopbacks);
43838+ atomic_inc_unchecked(&cm_loopbacks);
43839 loopbackremotenode->loopbackpartner = cm_node;
43840 loopbackremotenode->tcp_cntxt.rcv_wscale =
43841 NES_CM_DEFAULT_RCV_WND_SCALE;
43842@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43843 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43844 else {
43845 rem_ref_cm_node(cm_core, cm_node);
43846- atomic_inc(&cm_accel_dropped_pkts);
43847+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43848 dev_kfree_skb_any(skb);
43849 }
43850 break;
43851@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43852
43853 if ((cm_id) && (cm_id->event_handler)) {
43854 if (issue_disconn) {
43855- atomic_inc(&cm_disconnects);
43856+ atomic_inc_unchecked(&cm_disconnects);
43857 cm_event.event = IW_CM_EVENT_DISCONNECT;
43858 cm_event.status = disconn_status;
43859 cm_event.local_addr = cm_id->local_addr;
43860@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43861 }
43862
43863 if (issue_close) {
43864- atomic_inc(&cm_closes);
43865+ atomic_inc_unchecked(&cm_closes);
43866 nes_disconnect(nesqp, 1);
43867
43868 cm_id->provider_data = nesqp;
43869@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43870
43871 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43872 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43873- atomic_inc(&cm_accepts);
43874+ atomic_inc_unchecked(&cm_accepts);
43875
43876 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43877 netdev_refcnt_read(nesvnic->netdev));
43878@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43879 struct nes_cm_core *cm_core;
43880 u8 *start_buff;
43881
43882- atomic_inc(&cm_rejects);
43883+ atomic_inc_unchecked(&cm_rejects);
43884 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43885 loopback = cm_node->loopbackpartner;
43886 cm_core = cm_node->cm_core;
43887@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43888 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43889 ntohs(laddr->sin_port));
43890
43891- atomic_inc(&cm_connects);
43892+ atomic_inc_unchecked(&cm_connects);
43893 nesqp->active_conn = 1;
43894
43895 /* cache the cm_id in the qp */
43896@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43897 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43898 return err;
43899 }
43900- atomic_inc(&cm_listens_created);
43901+ atomic_inc_unchecked(&cm_listens_created);
43902 }
43903
43904 cm_id->add_ref(cm_id);
43905@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43906
43907 if (nesqp->destroyed)
43908 return;
43909- atomic_inc(&cm_connecteds);
43910+ atomic_inc_unchecked(&cm_connecteds);
43911 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43912 " local port 0x%04X. jiffies = %lu.\n",
43913 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43914@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43915
43916 cm_id->add_ref(cm_id);
43917 ret = cm_id->event_handler(cm_id, &cm_event);
43918- atomic_inc(&cm_closes);
43919+ atomic_inc_unchecked(&cm_closes);
43920 cm_event.event = IW_CM_EVENT_CLOSE;
43921 cm_event.status = 0;
43922 cm_event.provider_data = cm_id->provider_data;
43923@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43924 return;
43925 cm_id = cm_node->cm_id;
43926
43927- atomic_inc(&cm_connect_reqs);
43928+ atomic_inc_unchecked(&cm_connect_reqs);
43929 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43930 cm_node, cm_id, jiffies);
43931
43932@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43933 return;
43934 cm_id = cm_node->cm_id;
43935
43936- atomic_inc(&cm_connect_reqs);
43937+ atomic_inc_unchecked(&cm_connect_reqs);
43938 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43939 cm_node, cm_id, jiffies);
43940
43941diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43942index 4166452..fc952c3 100644
43943--- a/drivers/infiniband/hw/nes/nes_mgt.c
43944+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43945@@ -40,8 +40,8 @@
43946 #include "nes.h"
43947 #include "nes_mgt.h"
43948
43949-atomic_t pau_qps_created;
43950-atomic_t pau_qps_destroyed;
43951+atomic_unchecked_t pau_qps_created;
43952+atomic_unchecked_t pau_qps_destroyed;
43953
43954 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43955 {
43956@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43957 {
43958 struct sk_buff *skb;
43959 unsigned long flags;
43960- atomic_inc(&pau_qps_destroyed);
43961+ atomic_inc_unchecked(&pau_qps_destroyed);
43962
43963 /* Free packets that have not yet been forwarded */
43964 /* Lock is acquired by skb_dequeue when removing the skb */
43965@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43966 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43967 skb_queue_head_init(&nesqp->pau_list);
43968 spin_lock_init(&nesqp->pau_lock);
43969- atomic_inc(&pau_qps_created);
43970+ atomic_inc_unchecked(&pau_qps_created);
43971 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43972 }
43973
43974diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43975index 70acda9..a96de9d 100644
43976--- a/drivers/infiniband/hw/nes/nes_nic.c
43977+++ b/drivers/infiniband/hw/nes/nes_nic.c
43978@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43979 target_stat_values[++index] = mh_detected;
43980 target_stat_values[++index] = mh_pauses_sent;
43981 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43982- target_stat_values[++index] = atomic_read(&cm_connects);
43983- target_stat_values[++index] = atomic_read(&cm_accepts);
43984- target_stat_values[++index] = atomic_read(&cm_disconnects);
43985- target_stat_values[++index] = atomic_read(&cm_connecteds);
43986- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43987- target_stat_values[++index] = atomic_read(&cm_rejects);
43988- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43989- target_stat_values[++index] = atomic_read(&qps_created);
43990- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43991- target_stat_values[++index] = atomic_read(&qps_destroyed);
43992- target_stat_values[++index] = atomic_read(&cm_closes);
43993+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43994+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43995+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43996+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43997+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43998+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43999+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
44000+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
44001+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
44002+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
44003+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
44004 target_stat_values[++index] = cm_packets_sent;
44005 target_stat_values[++index] = cm_packets_bounced;
44006 target_stat_values[++index] = cm_packets_created;
44007 target_stat_values[++index] = cm_packets_received;
44008 target_stat_values[++index] = cm_packets_dropped;
44009 target_stat_values[++index] = cm_packets_retrans;
44010- target_stat_values[++index] = atomic_read(&cm_listens_created);
44011- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
44012+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
44013+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
44014 target_stat_values[++index] = cm_backlog_drops;
44015- target_stat_values[++index] = atomic_read(&cm_loopbacks);
44016- target_stat_values[++index] = atomic_read(&cm_nodes_created);
44017- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
44018- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
44019- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
44020+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
44021+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
44022+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
44023+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
44024+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
44025 target_stat_values[++index] = nesadapter->free_4kpbl;
44026 target_stat_values[++index] = nesadapter->free_256pbl;
44027 target_stat_values[++index] = int_mod_timer_init;
44028 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
44029 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
44030 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
44031- target_stat_values[++index] = atomic_read(&pau_qps_created);
44032- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
44033+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
44034+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
44035 }
44036
44037 /**
44038diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
44039index c0d0296..3185f57 100644
44040--- a/drivers/infiniband/hw/nes/nes_verbs.c
44041+++ b/drivers/infiniband/hw/nes/nes_verbs.c
44042@@ -46,9 +46,9 @@
44043
44044 #include <rdma/ib_umem.h>
44045
44046-atomic_t mod_qp_timouts;
44047-atomic_t qps_created;
44048-atomic_t sw_qps_destroyed;
44049+atomic_unchecked_t mod_qp_timouts;
44050+atomic_unchecked_t qps_created;
44051+atomic_unchecked_t sw_qps_destroyed;
44052
44053 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
44054
44055@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
44056 if (init_attr->create_flags)
44057 return ERR_PTR(-EINVAL);
44058
44059- atomic_inc(&qps_created);
44060+ atomic_inc_unchecked(&qps_created);
44061 switch (init_attr->qp_type) {
44062 case IB_QPT_RC:
44063 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
44064@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
44065 struct iw_cm_event cm_event;
44066 int ret = 0;
44067
44068- atomic_inc(&sw_qps_destroyed);
44069+ atomic_inc_unchecked(&sw_qps_destroyed);
44070 nesqp->destroyed = 1;
44071
44072 /* Blow away the connection if it exists. */
44073diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
44074index ffd48bf..83cdb56 100644
44075--- a/drivers/infiniband/hw/qib/qib.h
44076+++ b/drivers/infiniband/hw/qib/qib.h
44077@@ -52,6 +52,7 @@
44078 #include <linux/kref.h>
44079 #include <linux/sched.h>
44080 #include <linux/kthread.h>
44081+#include <linux/slab.h>
44082
44083 #include "qib_common.h"
44084 #include "qib_verbs.h"
44085diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44086index cdc7df4..a2fdfdb 100644
44087--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44088+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
44089@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
44090 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
44091 }
44092
44093-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
44094+static struct rtnl_link_ops ipoib_link_ops = {
44095 .kind = "ipoib",
44096 .maxtype = IFLA_IPOIB_MAX,
44097 .policy = ipoib_policy,
44098diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
44099index e853a21..56fc5a8 100644
44100--- a/drivers/input/gameport/gameport.c
44101+++ b/drivers/input/gameport/gameport.c
44102@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
44103 */
44104 static void gameport_init_port(struct gameport *gameport)
44105 {
44106- static atomic_t gameport_no = ATOMIC_INIT(-1);
44107+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
44108
44109 __module_get(THIS_MODULE);
44110
44111 mutex_init(&gameport->drv_mutex);
44112 device_initialize(&gameport->dev);
44113 dev_set_name(&gameport->dev, "gameport%lu",
44114- (unsigned long)atomic_inc_return(&gameport_no));
44115+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
44116 gameport->dev.bus = &gameport_bus;
44117 gameport->dev.release = gameport_release_port;
44118 if (gameport->parent)
44119diff --git a/drivers/input/input.c b/drivers/input/input.c
44120index cc357f1..ee42fbc 100644
44121--- a/drivers/input/input.c
44122+++ b/drivers/input/input.c
44123@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
44124 */
44125 struct input_dev *input_allocate_device(void)
44126 {
44127- static atomic_t input_no = ATOMIC_INIT(-1);
44128+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
44129 struct input_dev *dev;
44130
44131 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
44132@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
44133 INIT_LIST_HEAD(&dev->node);
44134
44135 dev_set_name(&dev->dev, "input%lu",
44136- (unsigned long)atomic_inc_return(&input_no));
44137+ (unsigned long)atomic_inc_return_unchecked(&input_no));
44138
44139 __module_get(THIS_MODULE);
44140 }
44141diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
44142index 4a95b22..874c182 100644
44143--- a/drivers/input/joystick/sidewinder.c
44144+++ b/drivers/input/joystick/sidewinder.c
44145@@ -30,6 +30,7 @@
44146 #include <linux/kernel.h>
44147 #include <linux/module.h>
44148 #include <linux/slab.h>
44149+#include <linux/sched.h>
44150 #include <linux/input.h>
44151 #include <linux/gameport.h>
44152 #include <linux/jiffies.h>
44153diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
44154index 3aa2f3f..53c00ea 100644
44155--- a/drivers/input/joystick/xpad.c
44156+++ b/drivers/input/joystick/xpad.c
44157@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
44158
44159 static int xpad_led_probe(struct usb_xpad *xpad)
44160 {
44161- static atomic_t led_seq = ATOMIC_INIT(-1);
44162+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
44163 unsigned long led_no;
44164 struct xpad_led *led;
44165 struct led_classdev *led_cdev;
44166@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
44167 if (!led)
44168 return -ENOMEM;
44169
44170- led_no = atomic_inc_return(&led_seq);
44171+ led_no = atomic_inc_return_unchecked(&led_seq);
44172
44173 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
44174 led->xpad = xpad;
44175diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
44176index ac1fa5f..5f7502c 100644
44177--- a/drivers/input/misc/ims-pcu.c
44178+++ b/drivers/input/misc/ims-pcu.c
44179@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
44180
44181 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44182 {
44183- static atomic_t device_no = ATOMIC_INIT(-1);
44184+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
44185
44186 const struct ims_pcu_device_info *info;
44187 int error;
44188@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
44189 }
44190
44191 /* Device appears to be operable, complete initialization */
44192- pcu->device_no = atomic_inc_return(&device_no);
44193+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
44194
44195 /*
44196 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
44197diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
44198index d02e1bd..d719719 100644
44199--- a/drivers/input/mouse/psmouse.h
44200+++ b/drivers/input/mouse/psmouse.h
44201@@ -124,7 +124,7 @@ struct psmouse_attribute {
44202 ssize_t (*set)(struct psmouse *psmouse, void *data,
44203 const char *buf, size_t count);
44204 bool protect;
44205-};
44206+} __do_const;
44207 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
44208
44209 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
44210diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
44211index b604564..3f14ae4 100644
44212--- a/drivers/input/mousedev.c
44213+++ b/drivers/input/mousedev.c
44214@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
44215
44216 spin_unlock_irq(&client->packet_lock);
44217
44218- if (copy_to_user(buffer, data, count))
44219+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
44220 return -EFAULT;
44221
44222 return count;
44223diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
44224index a05a517..323a2fd 100644
44225--- a/drivers/input/serio/serio.c
44226+++ b/drivers/input/serio/serio.c
44227@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
44228 */
44229 static void serio_init_port(struct serio *serio)
44230 {
44231- static atomic_t serio_no = ATOMIC_INIT(-1);
44232+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
44233
44234 __module_get(THIS_MODULE);
44235
44236@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
44237 mutex_init(&serio->drv_mutex);
44238 device_initialize(&serio->dev);
44239 dev_set_name(&serio->dev, "serio%lu",
44240- (unsigned long)atomic_inc_return(&serio_no));
44241+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
44242 serio->dev.bus = &serio_bus;
44243 serio->dev.release = serio_release_port;
44244 serio->dev.groups = serio_device_attr_groups;
44245diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
44246index 71ef5d6..93380a9 100644
44247--- a/drivers/input/serio/serio_raw.c
44248+++ b/drivers/input/serio/serio_raw.c
44249@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
44250
44251 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44252 {
44253- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
44254+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
44255 struct serio_raw *serio_raw;
44256 int err;
44257
44258@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
44259 }
44260
44261 snprintf(serio_raw->name, sizeof(serio_raw->name),
44262- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
44263+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
44264 kref_init(&serio_raw->kref);
44265 INIT_LIST_HEAD(&serio_raw->client_list);
44266 init_waitqueue_head(&serio_raw->wait);
44267diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
44268index 92e2243..8fd9092 100644
44269--- a/drivers/input/touchscreen/htcpen.c
44270+++ b/drivers/input/touchscreen/htcpen.c
44271@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
44272 }
44273 };
44274
44275-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
44276+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
44277 {
44278 .ident = "Shift",
44279 .matches = {
44280diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
44281index 48882c1..93e0987 100644
44282--- a/drivers/iommu/amd_iommu.c
44283+++ b/drivers/iommu/amd_iommu.c
44284@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
44285
44286 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
44287 {
44288+ phys_addr_t physaddr;
44289 WARN_ON(address & 0x7ULL);
44290
44291 memset(cmd, 0, sizeof(*cmd));
44292- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
44293- cmd->data[1] = upper_32_bits(__pa(address));
44294+
44295+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44296+ if (object_starts_on_stack((void *)address)) {
44297+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44298+ physaddr = __pa((u64)adjbuf);
44299+ } else
44300+#endif
44301+ physaddr = __pa(address);
44302+
44303+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44304+ cmd->data[1] = upper_32_bits(physaddr);
44305 cmd->data[2] = 1;
44306 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44307 }
44308diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44309index bd6252b..0716605 100644
44310--- a/drivers/iommu/arm-smmu.c
44311+++ b/drivers/iommu/arm-smmu.c
44312@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44313
44314 struct arm_smmu_domain {
44315 struct arm_smmu_device *smmu;
44316- struct io_pgtable_ops *pgtbl_ops;
44317+ struct io_pgtable *pgtbl;
44318 spinlock_t pgtbl_lock;
44319 struct arm_smmu_cfg cfg;
44320 enum arm_smmu_domain_stage stage;
44321@@ -807,7 +807,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44322 {
44323 int irq, start, ret = 0;
44324 unsigned long ias, oas;
44325- struct io_pgtable_ops *pgtbl_ops;
44326+ struct io_pgtable *pgtbl;
44327 struct io_pgtable_cfg pgtbl_cfg;
44328 enum io_pgtable_fmt fmt;
44329 struct arm_smmu_domain *smmu_domain = domain->priv;
44330@@ -892,14 +892,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44331 };
44332
44333 smmu_domain->smmu = smmu;
44334- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44335- if (!pgtbl_ops) {
44336+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44337+ if (!pgtbl) {
44338 ret = -ENOMEM;
44339 goto out_clear_smmu;
44340 }
44341
44342 /* Update our support page sizes to reflect the page table format */
44343- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44344+ pax_open_kernel();
44345+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44346+ pax_close_kernel();
44347
44348 /* Initialise the context bank with our page table cfg */
44349 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44350@@ -920,7 +922,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44351 mutex_unlock(&smmu_domain->init_mutex);
44352
44353 /* Publish page table ops for map/unmap */
44354- smmu_domain->pgtbl_ops = pgtbl_ops;
44355+ smmu_domain->pgtbl = pgtbl;
44356 return 0;
44357
44358 out_clear_smmu:
44359@@ -953,8 +955,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44360 free_irq(irq, domain);
44361 }
44362
44363- if (smmu_domain->pgtbl_ops)
44364- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44365+ free_io_pgtable(smmu_domain->pgtbl);
44366
44367 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44368 }
44369@@ -1178,13 +1179,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44370 int ret;
44371 unsigned long flags;
44372 struct arm_smmu_domain *smmu_domain = domain->priv;
44373- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44374+ struct io_pgtable *iop = smmu_domain->pgtbl;
44375
44376- if (!ops)
44377+ if (!iop)
44378 return -ENODEV;
44379
44380 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44381- ret = ops->map(ops, iova, paddr, size, prot);
44382+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44383 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44384 return ret;
44385 }
44386@@ -1195,13 +1196,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44387 size_t ret;
44388 unsigned long flags;
44389 struct arm_smmu_domain *smmu_domain = domain->priv;
44390- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44391+ struct io_pgtable *iop = smmu_domain->pgtbl;
44392
44393- if (!ops)
44394+ if (!iop)
44395 return 0;
44396
44397 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44398- ret = ops->unmap(ops, iova, size);
44399+ ret = iop->ops->unmap(iop, iova, size);
44400 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44401 return ret;
44402 }
44403@@ -1212,7 +1213,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44404 struct arm_smmu_domain *smmu_domain = domain->priv;
44405 struct arm_smmu_device *smmu = smmu_domain->smmu;
44406 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44407- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44408+ struct io_pgtable *iop = smmu_domain->pgtbl;
44409 struct device *dev = smmu->dev;
44410 void __iomem *cb_base;
44411 u32 tmp;
44412@@ -1235,7 +1236,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44413 dev_err(dev,
44414 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44415 &iova);
44416- return ops->iova_to_phys(ops, iova);
44417+ return iop->ops->iova_to_phys(iop, iova);
44418 }
44419
44420 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44421@@ -1256,9 +1257,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44422 phys_addr_t ret;
44423 unsigned long flags;
44424 struct arm_smmu_domain *smmu_domain = domain->priv;
44425- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44426+ struct io_pgtable *iop = smmu_domain->pgtbl;
44427
44428- if (!ops)
44429+ if (!iop)
44430 return 0;
44431
44432 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44433@@ -1266,7 +1267,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44434 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44435 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44436 } else {
44437- ret = ops->iova_to_phys(ops, iova);
44438+ ret = iop->ops->iova_to_phys(iop, iova);
44439 }
44440
44441 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44442@@ -1625,7 +1626,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44443 size |= SZ_64K | SZ_512M;
44444 }
44445
44446- arm_smmu_ops.pgsize_bitmap &= size;
44447+ pax_open_kernel();
44448+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44449+ pax_close_kernel();
44450 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44451
44452 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44453diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44454index b610a8d..08eb879 100644
44455--- a/drivers/iommu/io-pgtable-arm.c
44456+++ b/drivers/iommu/io-pgtable-arm.c
44457@@ -36,12 +36,6 @@
44458 #define io_pgtable_to_data(x) \
44459 container_of((x), struct arm_lpae_io_pgtable, iop)
44460
44461-#define io_pgtable_ops_to_pgtable(x) \
44462- container_of((x), struct io_pgtable, ops)
44463-
44464-#define io_pgtable_ops_to_data(x) \
44465- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44466-
44467 /*
44468 * For consistency with the architecture, we always consider
44469 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44470@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44471 return pte;
44472 }
44473
44474-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44475+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44476 phys_addr_t paddr, size_t size, int iommu_prot)
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 arm_lpae_iopte *ptep = data->pgd;
44481 int lvl = ARM_LPAE_START_LVL(data);
44482 arm_lpae_iopte prot;
44483@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44484 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44485 }
44486
44487-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44488+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44489 size_t size)
44490 {
44491 size_t unmapped;
44492- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44493- struct io_pgtable *iop = &data->iop;
44494+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44495 arm_lpae_iopte *ptep = data->pgd;
44496 int lvl = ARM_LPAE_START_LVL(data);
44497
44498@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44499 return unmapped;
44500 }
44501
44502-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44503+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44504 unsigned long iova)
44505 {
44506- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44507+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44508 arm_lpae_iopte pte, *ptep = data->pgd;
44509 int lvl = ARM_LPAE_START_LVL(data);
44510
44511@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44512 }
44513 }
44514
44515+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44516+ .map = arm_lpae_map,
44517+ .unmap = arm_lpae_unmap,
44518+ .iova_to_phys = arm_lpae_iova_to_phys,
44519+};
44520+
44521 static struct arm_lpae_io_pgtable *
44522 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44523 {
44524@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44525 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44526 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44527
44528- data->iop.ops = (struct io_pgtable_ops) {
44529- .map = arm_lpae_map,
44530- .unmap = arm_lpae_unmap,
44531- .iova_to_phys = arm_lpae_iova_to_phys,
44532- };
44533+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44534
44535 return data;
44536 }
44537@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44538 .flush_pgtable = dummy_flush_pgtable,
44539 };
44540
44541-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44542+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44543 {
44544- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44545+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44546 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44547
44548 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44549@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44550 data->bits_per_level, data->pgd);
44551 }
44552
44553-#define __FAIL(ops, i) ({ \
44554+#define __FAIL(iop, i) ({ \
44555 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44556- arm_lpae_dump_ops(ops); \
44557+ arm_lpae_dump_ops(iop); \
44558 selftest_running = false; \
44559 -EFAULT; \
44560 })
44561@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44562 int i, j;
44563 unsigned long iova;
44564 size_t size;
44565- struct io_pgtable_ops *ops;
44566+ struct io_pgtable *iop;
44567+ const struct io_pgtable_ops *ops;
44568
44569 selftest_running = true;
44570
44571 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44572 cfg_cookie = cfg;
44573- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44574- if (!ops) {
44575+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44576+ if (!iop) {
44577 pr_err("selftest: failed to allocate io pgtable ops\n");
44578 return -ENOMEM;
44579 }
44580+ ops = iop->ops;
44581
44582 /*
44583 * Initial sanity checks.
44584 * Empty page tables shouldn't provide any translations.
44585 */
44586- if (ops->iova_to_phys(ops, 42))
44587- return __FAIL(ops, i);
44588+ if (ops->iova_to_phys(iop, 42))
44589+ return __FAIL(iop, i);
44590
44591- if (ops->iova_to_phys(ops, SZ_1G + 42))
44592- return __FAIL(ops, i);
44593+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44594+ return __FAIL(iop, i);
44595
44596- if (ops->iova_to_phys(ops, SZ_2G + 42))
44597- return __FAIL(ops, i);
44598+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44599+ return __FAIL(iop, i);
44600
44601 /*
44602 * Distinct mappings of different granule sizes.
44603@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44604 while (j != BITS_PER_LONG) {
44605 size = 1UL << j;
44606
44607- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44608+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44609 IOMMU_WRITE |
44610 IOMMU_NOEXEC |
44611 IOMMU_CACHE))
44612- return __FAIL(ops, i);
44613+ return __FAIL(iop, i);
44614
44615 /* Overlapping mappings */
44616- if (!ops->map(ops, iova, iova + size, size,
44617+ if (!ops->map(iop, iova, iova + size, size,
44618 IOMMU_READ | IOMMU_NOEXEC))
44619- return __FAIL(ops, i);
44620+ return __FAIL(iop, i);
44621
44622- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44623- return __FAIL(ops, i);
44624+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44625+ return __FAIL(iop, i);
44626
44627 iova += SZ_1G;
44628 j++;
44629@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44630
44631 /* Partial unmap */
44632 size = 1UL << __ffs(cfg->pgsize_bitmap);
44633- if (ops->unmap(ops, SZ_1G + size, size) != size)
44634- return __FAIL(ops, i);
44635+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44636+ return __FAIL(iop, i);
44637
44638 /* Remap of partial unmap */
44639- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44640- return __FAIL(ops, i);
44641+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44642+ return __FAIL(iop, i);
44643
44644- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44645- return __FAIL(ops, i);
44646+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44647+ return __FAIL(iop, i);
44648
44649 /* Full unmap */
44650 iova = 0;
44651@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44652 while (j != BITS_PER_LONG) {
44653 size = 1UL << j;
44654
44655- if (ops->unmap(ops, iova, size) != size)
44656- return __FAIL(ops, i);
44657+ if (ops->unmap(iop, iova, size) != size)
44658+ return __FAIL(iop, i);
44659
44660- if (ops->iova_to_phys(ops, iova + 42))
44661- return __FAIL(ops, i);
44662+ if (ops->iova_to_phys(iop, iova + 42))
44663+ return __FAIL(iop, i);
44664
44665 /* Remap full block */
44666- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44667- return __FAIL(ops, i);
44668+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44669+ return __FAIL(iop, i);
44670
44671- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44672- return __FAIL(ops, i);
44673+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44674+ return __FAIL(iop, i);
44675
44676 iova += SZ_1G;
44677 j++;
44678 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44679 }
44680
44681- free_io_pgtable_ops(ops);
44682+ free_io_pgtable(iop);
44683 }
44684
44685 selftest_running = false;
44686diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44687index 6436fe2..088c965 100644
44688--- a/drivers/iommu/io-pgtable.c
44689+++ b/drivers/iommu/io-pgtable.c
44690@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44691 #endif
44692 };
44693
44694-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44695+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44696 struct io_pgtable_cfg *cfg,
44697 void *cookie)
44698 {
44699@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44700 iop->cookie = cookie;
44701 iop->cfg = *cfg;
44702
44703- return &iop->ops;
44704+ return iop;
44705 }
44706
44707 /*
44708 * It is the IOMMU driver's responsibility to ensure that the page table
44709 * is no longer accessible to the walker by this point.
44710 */
44711-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44712+void free_io_pgtable(struct io_pgtable *iop)
44713 {
44714- struct io_pgtable *iop;
44715-
44716- if (!ops)
44717+ if (!iop)
44718 return;
44719
44720- iop = container_of(ops, struct io_pgtable, ops);
44721 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44722 io_pgtable_init_table[iop->fmt]->free(iop);
44723 }
44724diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44725index 10e32f6..0b276c8 100644
44726--- a/drivers/iommu/io-pgtable.h
44727+++ b/drivers/iommu/io-pgtable.h
44728@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44729 * These functions map directly onto the iommu_ops member functions with
44730 * the same names.
44731 */
44732+struct io_pgtable;
44733 struct io_pgtable_ops {
44734- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44735+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44736 phys_addr_t paddr, size_t size, int prot);
44737- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44738+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44739 size_t size);
44740- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44741+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44742 unsigned long iova);
44743 };
44744
44745 /**
44746- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44747+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44748 *
44749 * @fmt: The page table format.
44750 * @cfg: The page table configuration. This will be modified to represent
44751@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44752 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44753 * the callback routines in cfg->tlb.
44754 */
44755-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44756- struct io_pgtable_cfg *cfg,
44757- void *cookie);
44758+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44759+ struct io_pgtable_cfg *cfg,
44760+ void *cookie);
44761
44762 /**
44763 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44764@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44765 *
44766 * @ops: The ops returned from alloc_io_pgtable_ops.
44767 */
44768-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44769+void free_io_pgtable(struct io_pgtable *iop);
44770
44771
44772 /*
44773@@ -125,7 +126,7 @@ struct io_pgtable {
44774 enum io_pgtable_fmt fmt;
44775 void *cookie;
44776 struct io_pgtable_cfg cfg;
44777- struct io_pgtable_ops ops;
44778+ const struct io_pgtable_ops *ops;
44779 };
44780
44781 /**
44782diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44783index 72e683d..c9db262 100644
44784--- a/drivers/iommu/iommu.c
44785+++ b/drivers/iommu/iommu.c
44786@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44787 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44788 {
44789 int err;
44790- struct notifier_block *nb;
44791+ notifier_block_no_const *nb;
44792 struct iommu_callback_data cb = {
44793 .ops = ops,
44794 };
44795diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44796index bc39bdf..e2de272 100644
44797--- a/drivers/iommu/ipmmu-vmsa.c
44798+++ b/drivers/iommu/ipmmu-vmsa.c
44799@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44800 struct iommu_domain *io_domain;
44801
44802 struct io_pgtable_cfg cfg;
44803- struct io_pgtable_ops *iop;
44804+ struct io_pgtable *iop;
44805
44806 unsigned int context_id;
44807 spinlock_t lock; /* Protects mappings */
44808@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44809 domain->cfg.oas = 40;
44810 domain->cfg.tlb = &ipmmu_gather_ops;
44811
44812- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44813- domain);
44814+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44815 if (!domain->iop)
44816 return -EINVAL;
44817
44818@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44819 * been detached.
44820 */
44821 ipmmu_domain_destroy_context(domain);
44822- free_io_pgtable_ops(domain->iop);
44823+ free_io_pgtable(domain->iop);
44824 kfree(domain);
44825 }
44826
44827@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44828 if (!domain)
44829 return -ENODEV;
44830
44831- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44832+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44833 }
44834
44835 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44836@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44837 {
44838 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44839
44840- return domain->iop->unmap(domain->iop, iova, size);
44841+ return domain->iop->ops->unmap(domain->iop, iova, size);
44842 }
44843
44844 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44845@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44846
44847 /* TODO: Is locking needed ? */
44848
44849- return domain->iop->iova_to_phys(domain->iop, iova);
44850+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44851 }
44852
44853 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44854diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44855index 390079e..1da9d6c 100644
44856--- a/drivers/iommu/irq_remapping.c
44857+++ b/drivers/iommu/irq_remapping.c
44858@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44859 void panic_if_irq_remap(const char *msg)
44860 {
44861 if (irq_remapping_enabled)
44862- panic(msg);
44863+ panic("%s", msg);
44864 }
44865
44866 static void ir_ack_apic_edge(struct irq_data *data)
44867@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44868
44869 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44870 {
44871- chip->irq_print_chip = ir_print_prefix;
44872- chip->irq_ack = ir_ack_apic_edge;
44873- chip->irq_eoi = ir_ack_apic_level;
44874- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44875+ pax_open_kernel();
44876+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44877+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44878+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44879+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44880+ pax_close_kernel();
44881 }
44882
44883 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44884diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44885index 471e1cd..b53b870 100644
44886--- a/drivers/irqchip/irq-gic.c
44887+++ b/drivers/irqchip/irq-gic.c
44888@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44889 * Supported arch specific GIC irq extension.
44890 * Default make them NULL.
44891 */
44892-struct irq_chip gic_arch_extn = {
44893+irq_chip_no_const gic_arch_extn = {
44894 .irq_eoi = NULL,
44895 .irq_mask = NULL,
44896 .irq_unmask = NULL,
44897@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44898 chained_irq_exit(chip, desc);
44899 }
44900
44901-static struct irq_chip gic_chip = {
44902+static irq_chip_no_const gic_chip __read_only = {
44903 .name = "GIC",
44904 .irq_mask = gic_mask_irq,
44905 .irq_unmask = gic_unmask_irq,
44906diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44907index 9a0767b..5e5f86f 100644
44908--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44909+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44910@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44911 struct intc_irqpin_iomem *i;
44912 struct resource *io[INTC_IRQPIN_REG_NR];
44913 struct resource *irq;
44914- struct irq_chip *irq_chip;
44915+ irq_chip_no_const *irq_chip;
44916 void (*enable_fn)(struct irq_data *d);
44917 void (*disable_fn)(struct irq_data *d);
44918 const char *name = dev_name(dev);
44919diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44920index 384e6ed..7a771b2 100644
44921--- a/drivers/irqchip/irq-renesas-irqc.c
44922+++ b/drivers/irqchip/irq-renesas-irqc.c
44923@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44924 struct irqc_priv *p;
44925 struct resource *io;
44926 struct resource *irq;
44927- struct irq_chip *irq_chip;
44928+ irq_chip_no_const *irq_chip;
44929 const char *name = dev_name(&pdev->dev);
44930 int ret;
44931 int k;
44932diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44933index 6a2df32..dc962f1 100644
44934--- a/drivers/isdn/capi/capi.c
44935+++ b/drivers/isdn/capi/capi.c
44936@@ -81,8 +81,8 @@ struct capiminor {
44937
44938 struct capi20_appl *ap;
44939 u32 ncci;
44940- atomic_t datahandle;
44941- atomic_t msgid;
44942+ atomic_unchecked_t datahandle;
44943+ atomic_unchecked_t msgid;
44944
44945 struct tty_port port;
44946 int ttyinstop;
44947@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44948 capimsg_setu16(s, 2, mp->ap->applid);
44949 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44950 capimsg_setu8 (s, 5, CAPI_RESP);
44951- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44952+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44953 capimsg_setu32(s, 8, mp->ncci);
44954 capimsg_setu16(s, 12, datahandle);
44955 }
44956@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44957 mp->outbytes -= len;
44958 spin_unlock_bh(&mp->outlock);
44959
44960- datahandle = atomic_inc_return(&mp->datahandle);
44961+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44962 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44963 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44964 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44965 capimsg_setu16(skb->data, 2, mp->ap->applid);
44966 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44967 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44968- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44969+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44970 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44971 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44972 capimsg_setu16(skb->data, 16, len); /* Data length */
44973diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44974index aecec6d..11e13c5 100644
44975--- a/drivers/isdn/gigaset/bas-gigaset.c
44976+++ b/drivers/isdn/gigaset/bas-gigaset.c
44977@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44978
44979
44980 static const struct gigaset_ops gigops = {
44981- gigaset_write_cmd,
44982- gigaset_write_room,
44983- gigaset_chars_in_buffer,
44984- gigaset_brkchars,
44985- gigaset_init_bchannel,
44986- gigaset_close_bchannel,
44987- gigaset_initbcshw,
44988- gigaset_freebcshw,
44989- gigaset_reinitbcshw,
44990- gigaset_initcshw,
44991- gigaset_freecshw,
44992- gigaset_set_modem_ctrl,
44993- gigaset_baud_rate,
44994- gigaset_set_line_ctrl,
44995- gigaset_isoc_send_skb,
44996- gigaset_isoc_input,
44997+ .write_cmd = gigaset_write_cmd,
44998+ .write_room = gigaset_write_room,
44999+ .chars_in_buffer = gigaset_chars_in_buffer,
45000+ .brkchars = gigaset_brkchars,
45001+ .init_bchannel = gigaset_init_bchannel,
45002+ .close_bchannel = gigaset_close_bchannel,
45003+ .initbcshw = gigaset_initbcshw,
45004+ .freebcshw = gigaset_freebcshw,
45005+ .reinitbcshw = gigaset_reinitbcshw,
45006+ .initcshw = gigaset_initcshw,
45007+ .freecshw = gigaset_freecshw,
45008+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45009+ .baud_rate = gigaset_baud_rate,
45010+ .set_line_ctrl = gigaset_set_line_ctrl,
45011+ .send_skb = gigaset_isoc_send_skb,
45012+ .handle_input = gigaset_isoc_input,
45013 };
45014
45015 /* bas_gigaset_init
45016diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
45017index 600c79b..3752bab 100644
45018--- a/drivers/isdn/gigaset/interface.c
45019+++ b/drivers/isdn/gigaset/interface.c
45020@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
45021 }
45022 tty->driver_data = cs;
45023
45024- ++cs->port.count;
45025+ atomic_inc(&cs->port.count);
45026
45027- if (cs->port.count == 1) {
45028+ if (atomic_read(&cs->port.count) == 1) {
45029 tty_port_tty_set(&cs->port, tty);
45030 cs->port.low_latency = 1;
45031 }
45032@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
45033
45034 if (!cs->connected)
45035 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
45036- else if (!cs->port.count)
45037+ else if (!atomic_read(&cs->port.count))
45038 dev_warn(cs->dev, "%s: device not opened\n", __func__);
45039- else if (!--cs->port.count)
45040+ else if (!atomic_dec_return(&cs->port.count))
45041 tty_port_tty_set(&cs->port, NULL);
45042
45043 mutex_unlock(&cs->mutex);
45044diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
45045index 8c91fd5..14f13ce 100644
45046--- a/drivers/isdn/gigaset/ser-gigaset.c
45047+++ b/drivers/isdn/gigaset/ser-gigaset.c
45048@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
45049 }
45050
45051 static const struct gigaset_ops ops = {
45052- gigaset_write_cmd,
45053- gigaset_write_room,
45054- gigaset_chars_in_buffer,
45055- gigaset_brkchars,
45056- gigaset_init_bchannel,
45057- gigaset_close_bchannel,
45058- gigaset_initbcshw,
45059- gigaset_freebcshw,
45060- gigaset_reinitbcshw,
45061- gigaset_initcshw,
45062- gigaset_freecshw,
45063- gigaset_set_modem_ctrl,
45064- gigaset_baud_rate,
45065- gigaset_set_line_ctrl,
45066- gigaset_m10x_send_skb, /* asyncdata.c */
45067- gigaset_m10x_input, /* asyncdata.c */
45068+ .write_cmd = gigaset_write_cmd,
45069+ .write_room = gigaset_write_room,
45070+ .chars_in_buffer = gigaset_chars_in_buffer,
45071+ .brkchars = gigaset_brkchars,
45072+ .init_bchannel = gigaset_init_bchannel,
45073+ .close_bchannel = gigaset_close_bchannel,
45074+ .initbcshw = gigaset_initbcshw,
45075+ .freebcshw = gigaset_freebcshw,
45076+ .reinitbcshw = gigaset_reinitbcshw,
45077+ .initcshw = gigaset_initcshw,
45078+ .freecshw = gigaset_freecshw,
45079+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45080+ .baud_rate = gigaset_baud_rate,
45081+ .set_line_ctrl = gigaset_set_line_ctrl,
45082+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
45083+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
45084 };
45085
45086
45087diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
45088index 5f306e2..5342f88 100644
45089--- a/drivers/isdn/gigaset/usb-gigaset.c
45090+++ b/drivers/isdn/gigaset/usb-gigaset.c
45091@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
45092 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
45093 memcpy(cs->hw.usb->bchars, buf, 6);
45094 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
45095- 0, 0, &buf, 6, 2000);
45096+ 0, 0, buf, 6, 2000);
45097 }
45098
45099 static void gigaset_freebcshw(struct bc_state *bcs)
45100@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
45101 }
45102
45103 static const struct gigaset_ops ops = {
45104- gigaset_write_cmd,
45105- gigaset_write_room,
45106- gigaset_chars_in_buffer,
45107- gigaset_brkchars,
45108- gigaset_init_bchannel,
45109- gigaset_close_bchannel,
45110- gigaset_initbcshw,
45111- gigaset_freebcshw,
45112- gigaset_reinitbcshw,
45113- gigaset_initcshw,
45114- gigaset_freecshw,
45115- gigaset_set_modem_ctrl,
45116- gigaset_baud_rate,
45117- gigaset_set_line_ctrl,
45118- gigaset_m10x_send_skb,
45119- gigaset_m10x_input,
45120+ .write_cmd = gigaset_write_cmd,
45121+ .write_room = gigaset_write_room,
45122+ .chars_in_buffer = gigaset_chars_in_buffer,
45123+ .brkchars = gigaset_brkchars,
45124+ .init_bchannel = gigaset_init_bchannel,
45125+ .close_bchannel = gigaset_close_bchannel,
45126+ .initbcshw = gigaset_initbcshw,
45127+ .freebcshw = gigaset_freebcshw,
45128+ .reinitbcshw = gigaset_reinitbcshw,
45129+ .initcshw = gigaset_initcshw,
45130+ .freecshw = gigaset_freecshw,
45131+ .set_modem_ctrl = gigaset_set_modem_ctrl,
45132+ .baud_rate = gigaset_baud_rate,
45133+ .set_line_ctrl = gigaset_set_line_ctrl,
45134+ .send_skb = gigaset_m10x_send_skb,
45135+ .handle_input = gigaset_m10x_input,
45136 };
45137
45138 /*
45139diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
45140index 4d9b195..455075c 100644
45141--- a/drivers/isdn/hardware/avm/b1.c
45142+++ b/drivers/isdn/hardware/avm/b1.c
45143@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
45144 }
45145 if (left) {
45146 if (t4file->user) {
45147- if (copy_from_user(buf, dp, left))
45148+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45149 return -EFAULT;
45150 } else {
45151 memcpy(buf, dp, left);
45152@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
45153 }
45154 if (left) {
45155 if (config->user) {
45156- if (copy_from_user(buf, dp, left))
45157+ if (left > sizeof buf || copy_from_user(buf, dp, left))
45158 return -EFAULT;
45159 } else {
45160 memcpy(buf, dp, left);
45161diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
45162index 9b856e1..fa03c92 100644
45163--- a/drivers/isdn/i4l/isdn_common.c
45164+++ b/drivers/isdn/i4l/isdn_common.c
45165@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
45166 } else
45167 return -EINVAL;
45168 case IIOCDBGVAR:
45169+ if (!capable(CAP_SYS_RAWIO))
45170+ return -EPERM;
45171 if (arg) {
45172 if (copy_to_user(argp, &dev, sizeof(ulong)))
45173 return -EFAULT;
45174diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
45175index 91d5730..336523e 100644
45176--- a/drivers/isdn/i4l/isdn_concap.c
45177+++ b/drivers/isdn/i4l/isdn_concap.c
45178@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
45179 }
45180
45181 struct concap_device_ops isdn_concap_reliable_dl_dops = {
45182- &isdn_concap_dl_data_req,
45183- &isdn_concap_dl_connect_req,
45184- &isdn_concap_dl_disconn_req
45185+ .data_req = &isdn_concap_dl_data_req,
45186+ .connect_req = &isdn_concap_dl_connect_req,
45187+ .disconn_req = &isdn_concap_dl_disconn_req
45188 };
45189
45190 /* The following should better go into a dedicated source file such that
45191diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
45192index bc91261..2ef7e36 100644
45193--- a/drivers/isdn/i4l/isdn_tty.c
45194+++ b/drivers/isdn/i4l/isdn_tty.c
45195@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
45196
45197 #ifdef ISDN_DEBUG_MODEM_OPEN
45198 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
45199- port->count);
45200+ atomic_read(&port->count));
45201 #endif
45202- port->count++;
45203+ atomic_inc(&port->count);
45204 port->tty = tty;
45205 /*
45206 * Start up serial port
45207@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45208 #endif
45209 return;
45210 }
45211- if ((tty->count == 1) && (port->count != 1)) {
45212+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
45213 /*
45214 * Uh, oh. tty->count is 1, which means that the tty
45215 * structure will be freed. Info->count should always
45216@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
45217 * serial port won't be shutdown.
45218 */
45219 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
45220- "info->count is %d\n", port->count);
45221- port->count = 1;
45222+ "info->count is %d\n", atomic_read(&port->count));
45223+ atomic_set(&port->count, 1);
45224 }
45225- if (--port->count < 0) {
45226+ if (atomic_dec_return(&port->count) < 0) {
45227 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
45228- info->line, port->count);
45229- port->count = 0;
45230+ info->line, atomic_read(&port->count));
45231+ atomic_set(&port->count, 0);
45232 }
45233- if (port->count) {
45234+ if (atomic_read(&port->count)) {
45235 #ifdef ISDN_DEBUG_MODEM_OPEN
45236 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
45237 #endif
45238@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
45239 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
45240 return;
45241 isdn_tty_shutdown(info);
45242- port->count = 0;
45243+ atomic_set(&port->count, 0);
45244 port->flags &= ~ASYNC_NORMAL_ACTIVE;
45245 port->tty = NULL;
45246 wake_up_interruptible(&port->open_wait);
45247@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
45248 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
45249 modem_info *info = &dev->mdm.info[i];
45250
45251- if (info->port.count == 0)
45252+ if (atomic_read(&info->port.count) == 0)
45253 continue;
45254 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
45255 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
45256diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
45257index e2d4e58..40cd045 100644
45258--- a/drivers/isdn/i4l/isdn_x25iface.c
45259+++ b/drivers/isdn/i4l/isdn_x25iface.c
45260@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
45261
45262
45263 static struct concap_proto_ops ix25_pops = {
45264- &isdn_x25iface_proto_new,
45265- &isdn_x25iface_proto_del,
45266- &isdn_x25iface_proto_restart,
45267- &isdn_x25iface_proto_close,
45268- &isdn_x25iface_xmit,
45269- &isdn_x25iface_receive,
45270- &isdn_x25iface_connect_ind,
45271- &isdn_x25iface_disconn_ind
45272+ .proto_new = &isdn_x25iface_proto_new,
45273+ .proto_del = &isdn_x25iface_proto_del,
45274+ .restart = &isdn_x25iface_proto_restart,
45275+ .close = &isdn_x25iface_proto_close,
45276+ .encap_and_xmit = &isdn_x25iface_xmit,
45277+ .data_ind = &isdn_x25iface_receive,
45278+ .connect_ind = &isdn_x25iface_connect_ind,
45279+ .disconn_ind = &isdn_x25iface_disconn_ind
45280 };
45281
45282 /* error message helper function */
45283diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
45284index 358a574..b4987ea 100644
45285--- a/drivers/isdn/icn/icn.c
45286+++ b/drivers/isdn/icn/icn.c
45287@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
45288 if (count > len)
45289 count = len;
45290 if (user) {
45291- if (copy_from_user(msg, buf, count))
45292+ if (count > sizeof msg || copy_from_user(msg, buf, count))
45293 return -EFAULT;
45294 } else
45295 memcpy(msg, buf, count);
45296diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
45297index 87f7dff..7300125 100644
45298--- a/drivers/isdn/mISDN/dsp_cmx.c
45299+++ b/drivers/isdn/mISDN/dsp_cmx.c
45300@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
45301 static u16 dsp_count; /* last sample count */
45302 static int dsp_count_valid; /* if we have last sample count */
45303
45304-void
45305+void __intentional_overflow(-1)
45306 dsp_cmx_send(void *arg)
45307 {
45308 struct dsp_conf *conf;
45309diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45310index 312ffd3..9263d05 100644
45311--- a/drivers/lguest/core.c
45312+++ b/drivers/lguest/core.c
45313@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45314 * The end address needs +1 because __get_vm_area allocates an
45315 * extra guard page, so we need space for that.
45316 */
45317+
45318+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45319+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45320+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45321+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45322+#else
45323 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45324 VM_ALLOC, switcher_addr, switcher_addr
45325 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45326+#endif
45327+
45328 if (!switcher_vma) {
45329 err = -ENOMEM;
45330 printk("lguest: could not map switcher pages high\n");
45331@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45332 * Now the Switcher is mapped at the right address, we can't fail!
45333 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45334 */
45335- memcpy(switcher_vma->addr, start_switcher_text,
45336+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45337 end_switcher_text - start_switcher_text);
45338
45339 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45340diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45341index e3abebc9..6a35328 100644
45342--- a/drivers/lguest/page_tables.c
45343+++ b/drivers/lguest/page_tables.c
45344@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45345 /*:*/
45346
45347 #ifdef CONFIG_X86_PAE
45348-static void release_pmd(pmd_t *spmd)
45349+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45350 {
45351 /* If the entry's not present, there's nothing to release. */
45352 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45353diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45354index 30f2aef..391c748 100644
45355--- a/drivers/lguest/x86/core.c
45356+++ b/drivers/lguest/x86/core.c
45357@@ -60,7 +60,7 @@ static struct {
45358 /* Offset from where switcher.S was compiled to where we've copied it */
45359 static unsigned long switcher_offset(void)
45360 {
45361- return switcher_addr - (unsigned long)start_switcher_text;
45362+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45363 }
45364
45365 /* This cpu's struct lguest_pages (after the Switcher text page) */
45366@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45367 * These copies are pretty cheap, so we do them unconditionally: */
45368 /* Save the current Host top-level page directory.
45369 */
45370+
45371+#ifdef CONFIG_PAX_PER_CPU_PGD
45372+ pages->state.host_cr3 = read_cr3();
45373+#else
45374 pages->state.host_cr3 = __pa(current->mm->pgd);
45375+#endif
45376+
45377 /*
45378 * Set up the Guest's page tables to see this CPU's pages (and no
45379 * other CPU's pages).
45380@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45381 * compiled-in switcher code and the high-mapped copy we just made.
45382 */
45383 for (i = 0; i < IDT_ENTRIES; i++)
45384- default_idt_entries[i] += switcher_offset();
45385+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45386
45387 /*
45388 * Set up the Switcher's per-cpu areas.
45389@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45390 * it will be undisturbed when we switch. To change %cs and jump we
45391 * need this structure to feed to Intel's "lcall" instruction.
45392 */
45393- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45394+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45395 lguest_entry.segment = LGUEST_CS;
45396
45397 /*
45398diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45399index 40634b0..4f5855e 100644
45400--- a/drivers/lguest/x86/switcher_32.S
45401+++ b/drivers/lguest/x86/switcher_32.S
45402@@ -87,6 +87,7 @@
45403 #include <asm/page.h>
45404 #include <asm/segment.h>
45405 #include <asm/lguest.h>
45406+#include <asm/processor-flags.h>
45407
45408 // We mark the start of the code to copy
45409 // It's placed in .text tho it's never run here
45410@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45411 // Changes type when we load it: damn Intel!
45412 // For after we switch over our page tables
45413 // That entry will be read-only: we'd crash.
45414+
45415+#ifdef CONFIG_PAX_KERNEXEC
45416+ mov %cr0, %edx
45417+ xor $X86_CR0_WP, %edx
45418+ mov %edx, %cr0
45419+#endif
45420+
45421 movl $(GDT_ENTRY_TSS*8), %edx
45422 ltr %dx
45423
45424@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45425 // Let's clear it again for our return.
45426 // The GDT descriptor of the Host
45427 // Points to the table after two "size" bytes
45428- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45429+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45430 // Clear "used" from type field (byte 5, bit 2)
45431- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45432+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45433+
45434+#ifdef CONFIG_PAX_KERNEXEC
45435+ mov %cr0, %eax
45436+ xor $X86_CR0_WP, %eax
45437+ mov %eax, %cr0
45438+#endif
45439
45440 // Once our page table's switched, the Guest is live!
45441 // The Host fades as we run this final step.
45442@@ -295,13 +309,12 @@ deliver_to_host:
45443 // I consulted gcc, and it gave
45444 // These instructions, which I gladly credit:
45445 leal (%edx,%ebx,8), %eax
45446- movzwl (%eax),%edx
45447- movl 4(%eax), %eax
45448- xorw %ax, %ax
45449- orl %eax, %edx
45450+ movl 4(%eax), %edx
45451+ movw (%eax), %dx
45452 // Now the address of the handler's in %edx
45453 // We call it now: its "iret" drops us home.
45454- jmp *%edx
45455+ ljmp $__KERNEL_CS, $1f
45456+1: jmp *%edx
45457
45458 // Every interrupt can come to us here
45459 // But we must truly tell each apart.
45460diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45461index a08e3ee..df8ade2 100644
45462--- a/drivers/md/bcache/closure.h
45463+++ b/drivers/md/bcache/closure.h
45464@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45465 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45466 struct workqueue_struct *wq)
45467 {
45468- BUG_ON(object_is_on_stack(cl));
45469+ BUG_ON(object_starts_on_stack(cl));
45470 closure_set_ip(cl);
45471 cl->fn = fn;
45472 cl->wq = wq;
45473diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45474index 3a57679..c58cdaf 100644
45475--- a/drivers/md/bitmap.c
45476+++ b/drivers/md/bitmap.c
45477@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45478 chunk_kb ? "KB" : "B");
45479 if (bitmap->storage.file) {
45480 seq_printf(seq, ", file: ");
45481- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45482+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45483 }
45484
45485 seq_printf(seq, "\n");
45486diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45487index c8a18e4..0ab43e5 100644
45488--- a/drivers/md/dm-ioctl.c
45489+++ b/drivers/md/dm-ioctl.c
45490@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45491 cmd == DM_LIST_VERSIONS_CMD)
45492 return 0;
45493
45494- if ((cmd == DM_DEV_CREATE_CMD)) {
45495+ if (cmd == DM_DEV_CREATE_CMD) {
45496 if (!*param->name) {
45497 DMWARN("name not supplied when creating device");
45498 return -EINVAL;
45499diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45500index 089d627..ef7352e 100644
45501--- a/drivers/md/dm-raid1.c
45502+++ b/drivers/md/dm-raid1.c
45503@@ -40,7 +40,7 @@ enum dm_raid1_error {
45504
45505 struct mirror {
45506 struct mirror_set *ms;
45507- atomic_t error_count;
45508+ atomic_unchecked_t error_count;
45509 unsigned long error_type;
45510 struct dm_dev *dev;
45511 sector_t offset;
45512@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45513 struct mirror *m;
45514
45515 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45516- if (!atomic_read(&m->error_count))
45517+ if (!atomic_read_unchecked(&m->error_count))
45518 return m;
45519
45520 return NULL;
45521@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45522 * simple way to tell if a device has encountered
45523 * errors.
45524 */
45525- atomic_inc(&m->error_count);
45526+ atomic_inc_unchecked(&m->error_count);
45527
45528 if (test_and_set_bit(error_type, &m->error_type))
45529 return;
45530@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45531 struct mirror *m = get_default_mirror(ms);
45532
45533 do {
45534- if (likely(!atomic_read(&m->error_count)))
45535+ if (likely(!atomic_read_unchecked(&m->error_count)))
45536 return m;
45537
45538 if (m-- == ms->mirror)
45539@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45540 {
45541 struct mirror *default_mirror = get_default_mirror(m->ms);
45542
45543- return !atomic_read(&default_mirror->error_count);
45544+ return !atomic_read_unchecked(&default_mirror->error_count);
45545 }
45546
45547 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45548@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45549 */
45550 if (likely(region_in_sync(ms, region, 1)))
45551 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45552- else if (m && atomic_read(&m->error_count))
45553+ else if (m && atomic_read_unchecked(&m->error_count))
45554 m = NULL;
45555
45556 if (likely(m))
45557@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45558 }
45559
45560 ms->mirror[mirror].ms = ms;
45561- atomic_set(&(ms->mirror[mirror].error_count), 0);
45562+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45563 ms->mirror[mirror].error_type = 0;
45564 ms->mirror[mirror].offset = offset;
45565
45566@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45567 */
45568 static char device_status_char(struct mirror *m)
45569 {
45570- if (!atomic_read(&(m->error_count)))
45571+ if (!atomic_read_unchecked(&(m->error_count)))
45572 return 'A';
45573
45574 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45575diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45576index f478a4c..4b8e5ef 100644
45577--- a/drivers/md/dm-stats.c
45578+++ b/drivers/md/dm-stats.c
45579@@ -382,7 +382,7 @@ do_sync_free:
45580 synchronize_rcu_expedited();
45581 dm_stat_free(&s->rcu_head);
45582 } else {
45583- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45584+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45585 call_rcu(&s->rcu_head, dm_stat_free);
45586 }
45587 return 0;
45588@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45589 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45590 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45591 ));
45592- ACCESS_ONCE(last->last_sector) = end_sector;
45593- ACCESS_ONCE(last->last_rw) = bi_rw;
45594+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45595+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45596 }
45597
45598 rcu_read_lock();
45599diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45600index f8b37d4..5c5cafd 100644
45601--- a/drivers/md/dm-stripe.c
45602+++ b/drivers/md/dm-stripe.c
45603@@ -21,7 +21,7 @@ struct stripe {
45604 struct dm_dev *dev;
45605 sector_t physical_start;
45606
45607- atomic_t error_count;
45608+ atomic_unchecked_t error_count;
45609 };
45610
45611 struct stripe_c {
45612@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45613 kfree(sc);
45614 return r;
45615 }
45616- atomic_set(&(sc->stripe[i].error_count), 0);
45617+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45618 }
45619
45620 ti->private = sc;
45621@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45622 DMEMIT("%d ", sc->stripes);
45623 for (i = 0; i < sc->stripes; i++) {
45624 DMEMIT("%s ", sc->stripe[i].dev->name);
45625- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45626+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45627 'D' : 'A';
45628 }
45629 buffer[i] = '\0';
45630@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45631 */
45632 for (i = 0; i < sc->stripes; i++)
45633 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45634- atomic_inc(&(sc->stripe[i].error_count));
45635- if (atomic_read(&(sc->stripe[i].error_count)) <
45636+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45637+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45638 DM_IO_ERROR_THRESHOLD)
45639 schedule_work(&sc->trigger_event);
45640 }
45641diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45642index 757f1ba..bf9ec8f 100644
45643--- a/drivers/md/dm-table.c
45644+++ b/drivers/md/dm-table.c
45645@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45646 if (!dev_size)
45647 return 0;
45648
45649- if ((start >= dev_size) || (start + len > dev_size)) {
45650+ if ((start >= dev_size) || (len > dev_size - start)) {
45651 DMWARN("%s: %s too small for target: "
45652 "start=%llu, len=%llu, dev_size=%llu",
45653 dm_device_name(ti->table->md), bdevname(bdev, b),
45654diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45655index 79f6941..b33b4e0 100644
45656--- a/drivers/md/dm-thin-metadata.c
45657+++ b/drivers/md/dm-thin-metadata.c
45658@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45659 {
45660 pmd->info.tm = pmd->tm;
45661 pmd->info.levels = 2;
45662- pmd->info.value_type.context = pmd->data_sm;
45663+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45664 pmd->info.value_type.size = sizeof(__le64);
45665 pmd->info.value_type.inc = data_block_inc;
45666 pmd->info.value_type.dec = data_block_dec;
45667@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45668
45669 pmd->bl_info.tm = pmd->tm;
45670 pmd->bl_info.levels = 1;
45671- pmd->bl_info.value_type.context = pmd->data_sm;
45672+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45673 pmd->bl_info.value_type.size = sizeof(__le64);
45674 pmd->bl_info.value_type.inc = data_block_inc;
45675 pmd->bl_info.value_type.dec = data_block_dec;
45676diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45677index 9b4e30a..83c927d 100644
45678--- a/drivers/md/dm.c
45679+++ b/drivers/md/dm.c
45680@@ -188,9 +188,9 @@ struct mapped_device {
45681 /*
45682 * Event handling.
45683 */
45684- atomic_t event_nr;
45685+ atomic_unchecked_t event_nr;
45686 wait_queue_head_t eventq;
45687- atomic_t uevent_seq;
45688+ atomic_unchecked_t uevent_seq;
45689 struct list_head uevent_list;
45690 spinlock_t uevent_lock; /* Protect access to uevent_list */
45691
45692@@ -2170,8 +2170,8 @@ static struct mapped_device *alloc_dev(int minor)
45693 spin_lock_init(&md->deferred_lock);
45694 atomic_set(&md->holders, 1);
45695 atomic_set(&md->open_count, 0);
45696- atomic_set(&md->event_nr, 0);
45697- atomic_set(&md->uevent_seq, 0);
45698+ atomic_set_unchecked(&md->event_nr, 0);
45699+ atomic_set_unchecked(&md->uevent_seq, 0);
45700 INIT_LIST_HEAD(&md->uevent_list);
45701 INIT_LIST_HEAD(&md->table_devices);
45702 spin_lock_init(&md->uevent_lock);
45703@@ -2336,7 +2336,7 @@ static void event_callback(void *context)
45704
45705 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45706
45707- atomic_inc(&md->event_nr);
45708+ atomic_inc_unchecked(&md->event_nr);
45709 wake_up(&md->eventq);
45710 }
45711
45712@@ -3182,18 +3182,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45713
45714 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45715 {
45716- return atomic_add_return(1, &md->uevent_seq);
45717+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45718 }
45719
45720 uint32_t dm_get_event_nr(struct mapped_device *md)
45721 {
45722- return atomic_read(&md->event_nr);
45723+ return atomic_read_unchecked(&md->event_nr);
45724 }
45725
45726 int dm_wait_event(struct mapped_device *md, int event_nr)
45727 {
45728 return wait_event_interruptible(md->eventq,
45729- (event_nr != atomic_read(&md->event_nr)));
45730+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45731 }
45732
45733 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45734diff --git a/drivers/md/md.c b/drivers/md/md.c
45735index b7bf8ee..ee17152 100644
45736--- a/drivers/md/md.c
45737+++ b/drivers/md/md.c
45738@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45739 * start build, activate spare
45740 */
45741 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45742-static atomic_t md_event_count;
45743+static atomic_unchecked_t md_event_count;
45744 void md_new_event(struct mddev *mddev)
45745 {
45746- atomic_inc(&md_event_count);
45747+ atomic_inc_unchecked(&md_event_count);
45748 wake_up(&md_event_waiters);
45749 }
45750 EXPORT_SYMBOL_GPL(md_new_event);
45751@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45752 */
45753 static void md_new_event_inintr(struct mddev *mddev)
45754 {
45755- atomic_inc(&md_event_count);
45756+ atomic_inc_unchecked(&md_event_count);
45757 wake_up(&md_event_waiters);
45758 }
45759
45760@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45761 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45762 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45763 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45764- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45765+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45766
45767 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45768 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45769@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45770 else
45771 sb->resync_offset = cpu_to_le64(0);
45772
45773- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45774+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45775
45776 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45777 sb->size = cpu_to_le64(mddev->dev_sectors);
45778@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45779 static ssize_t
45780 errors_show(struct md_rdev *rdev, char *page)
45781 {
45782- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45783+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45784 }
45785
45786 static ssize_t
45787@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45788 char *e;
45789 unsigned long n = simple_strtoul(buf, &e, 10);
45790 if (*buf && (*e == 0 || *e == '\n')) {
45791- atomic_set(&rdev->corrected_errors, n);
45792+ atomic_set_unchecked(&rdev->corrected_errors, n);
45793 return len;
45794 }
45795 return -EINVAL;
45796@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45797 rdev->sb_loaded = 0;
45798 rdev->bb_page = NULL;
45799 atomic_set(&rdev->nr_pending, 0);
45800- atomic_set(&rdev->read_errors, 0);
45801- atomic_set(&rdev->corrected_errors, 0);
45802+ atomic_set_unchecked(&rdev->read_errors, 0);
45803+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45804
45805 INIT_LIST_HEAD(&rdev->same_set);
45806 init_waitqueue_head(&rdev->blocked_wait);
45807@@ -7086,7 +7086,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45808
45809 spin_unlock(&pers_lock);
45810 seq_printf(seq, "\n");
45811- seq->poll_event = atomic_read(&md_event_count);
45812+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45813 return 0;
45814 }
45815 if (v == (void*)2) {
45816@@ -7189,7 +7189,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45817 return error;
45818
45819 seq = file->private_data;
45820- seq->poll_event = atomic_read(&md_event_count);
45821+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45822 return error;
45823 }
45824
45825@@ -7206,7 +7206,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45826 /* always allow read */
45827 mask = POLLIN | POLLRDNORM;
45828
45829- if (seq->poll_event != atomic_read(&md_event_count))
45830+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45831 mask |= POLLERR | POLLPRI;
45832 return mask;
45833 }
45834@@ -7253,7 +7253,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45835 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45836 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45837 (int)part_stat_read(&disk->part0, sectors[1]) -
45838- atomic_read(&disk->sync_io);
45839+ atomic_read_unchecked(&disk->sync_io);
45840 /* sync IO will cause sync_io to increase before the disk_stats
45841 * as sync_io is counted when a request starts, and
45842 * disk_stats is counted when it completes.
45843diff --git a/drivers/md/md.h b/drivers/md/md.h
45844index 318ca8f..31e4478 100644
45845--- a/drivers/md/md.h
45846+++ b/drivers/md/md.h
45847@@ -94,13 +94,13 @@ struct md_rdev {
45848 * only maintained for arrays that
45849 * support hot removal
45850 */
45851- atomic_t read_errors; /* number of consecutive read errors that
45852+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45853 * we have tried to ignore.
45854 */
45855 struct timespec last_read_error; /* monotonic time since our
45856 * last read error
45857 */
45858- atomic_t corrected_errors; /* number of corrected read errors,
45859+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45860 * for reporting to userspace and storing
45861 * in superblock.
45862 */
45863@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45864
45865 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45866 {
45867- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45868+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45869 }
45870
45871 struct md_personality
45872diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45873index e8a9042..35bd145 100644
45874--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45875+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45876@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45877 * Flick into a mode where all blocks get allocated in the new area.
45878 */
45879 smm->begin = old_len;
45880- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45881+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45882
45883 /*
45884 * Extend.
45885@@ -714,7 +714,7 @@ out:
45886 /*
45887 * Switch back to normal behaviour.
45888 */
45889- memcpy(sm, &ops, sizeof(*sm));
45890+ memcpy((void *)sm, &ops, sizeof(*sm));
45891 return r;
45892 }
45893
45894diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45895index 3e6d115..ffecdeb 100644
45896--- a/drivers/md/persistent-data/dm-space-map.h
45897+++ b/drivers/md/persistent-data/dm-space-map.h
45898@@ -71,6 +71,7 @@ struct dm_space_map {
45899 dm_sm_threshold_fn fn,
45900 void *context);
45901 };
45902+typedef struct dm_space_map __no_const dm_space_map_no_const;
45903
45904 /*----------------------------------------------------------------*/
45905
45906diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45907index d34e238..34f8d98 100644
45908--- a/drivers/md/raid1.c
45909+++ b/drivers/md/raid1.c
45910@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45911 if (r1_sync_page_io(rdev, sect, s,
45912 bio->bi_io_vec[idx].bv_page,
45913 READ) != 0)
45914- atomic_add(s, &rdev->corrected_errors);
45915+ atomic_add_unchecked(s, &rdev->corrected_errors);
45916 }
45917 sectors -= s;
45918 sect += s;
45919@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45920 !test_bit(Faulty, &rdev->flags)) {
45921 if (r1_sync_page_io(rdev, sect, s,
45922 conf->tmppage, READ)) {
45923- atomic_add(s, &rdev->corrected_errors);
45924+ atomic_add_unchecked(s, &rdev->corrected_errors);
45925 printk(KERN_INFO
45926 "md/raid1:%s: read error corrected "
45927 "(%d sectors at %llu on %s)\n",
45928diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45929index a7196c4..439f012 100644
45930--- a/drivers/md/raid10.c
45931+++ b/drivers/md/raid10.c
45932@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45933 /* The write handler will notice the lack of
45934 * R10BIO_Uptodate and record any errors etc
45935 */
45936- atomic_add(r10_bio->sectors,
45937+ atomic_add_unchecked(r10_bio->sectors,
45938 &conf->mirrors[d].rdev->corrected_errors);
45939
45940 /* for reconstruct, we always reschedule after a read.
45941@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45942 {
45943 struct timespec cur_time_mon;
45944 unsigned long hours_since_last;
45945- unsigned int read_errors = atomic_read(&rdev->read_errors);
45946+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45947
45948 ktime_get_ts(&cur_time_mon);
45949
45950@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45951 * overflowing the shift of read_errors by hours_since_last.
45952 */
45953 if (hours_since_last >= 8 * sizeof(read_errors))
45954- atomic_set(&rdev->read_errors, 0);
45955+ atomic_set_unchecked(&rdev->read_errors, 0);
45956 else
45957- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45958+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45959 }
45960
45961 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45962@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45963 return;
45964
45965 check_decay_read_errors(mddev, rdev);
45966- atomic_inc(&rdev->read_errors);
45967- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45968+ atomic_inc_unchecked(&rdev->read_errors);
45969+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45970 char b[BDEVNAME_SIZE];
45971 bdevname(rdev->bdev, b);
45972
45973@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45974 "md/raid10:%s: %s: Raid device exceeded "
45975 "read_error threshold [cur %d:max %d]\n",
45976 mdname(mddev), b,
45977- atomic_read(&rdev->read_errors), max_read_errors);
45978+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45979 printk(KERN_NOTICE
45980 "md/raid10:%s: %s: Failing raid device\n",
45981 mdname(mddev), b);
45982@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45983 sect +
45984 choose_data_offset(r10_bio, rdev)),
45985 bdevname(rdev->bdev, b));
45986- atomic_add(s, &rdev->corrected_errors);
45987+ atomic_add_unchecked(s, &rdev->corrected_errors);
45988 }
45989
45990 rdev_dec_pending(rdev, mddev);
45991diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45992index 007ab86..d11593d 100644
45993--- a/drivers/md/raid5.c
45994+++ b/drivers/md/raid5.c
45995@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45996 struct bio_vec bvl;
45997 struct bvec_iter iter;
45998 struct page *bio_page;
45999- int page_offset;
46000+ s64 page_offset;
46001 struct async_submit_ctl submit;
46002 enum async_tx_flags flags = 0;
46003
46004 if (bio->bi_iter.bi_sector >= sector)
46005- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
46006+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
46007 else
46008- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
46009+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
46010
46011 if (frombio)
46012 flags |= ASYNC_TX_FENCE;
46013 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
46014
46015 bio_for_each_segment(bvl, bio, iter) {
46016- int len = bvl.bv_len;
46017- int clen;
46018- int b_offset = 0;
46019+ s64 len = bvl.bv_len;
46020+ s64 clen;
46021+ s64 b_offset = 0;
46022
46023 if (page_offset < 0) {
46024 b_offset = -page_offset;
46025@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
46026 return 1;
46027 }
46028
46029+#ifdef CONFIG_GRKERNSEC_HIDESYM
46030+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
46031+#endif
46032+
46033 static int grow_stripes(struct r5conf *conf, int num)
46034 {
46035 struct kmem_cache *sc;
46036@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
46037 "raid%d-%s", conf->level, mdname(conf->mddev));
46038 else
46039 sprintf(conf->cache_name[0],
46040+#ifdef CONFIG_GRKERNSEC_HIDESYM
46041+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
46042+#else
46043 "raid%d-%p", conf->level, conf->mddev);
46044+#endif
46045 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
46046
46047 conf->active_name = 0;
46048@@ -2015,21 +2023,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
46049 mdname(conf->mddev), STRIPE_SECTORS,
46050 (unsigned long long)s,
46051 bdevname(rdev->bdev, b));
46052- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
46053+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
46054 clear_bit(R5_ReadError, &sh->dev[i].flags);
46055 clear_bit(R5_ReWrite, &sh->dev[i].flags);
46056 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
46057 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
46058
46059- if (atomic_read(&rdev->read_errors))
46060- atomic_set(&rdev->read_errors, 0);
46061+ if (atomic_read_unchecked(&rdev->read_errors))
46062+ atomic_set_unchecked(&rdev->read_errors, 0);
46063 } else {
46064 const char *bdn = bdevname(rdev->bdev, b);
46065 int retry = 0;
46066 int set_bad = 0;
46067
46068 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
46069- atomic_inc(&rdev->read_errors);
46070+ atomic_inc_unchecked(&rdev->read_errors);
46071 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
46072 printk_ratelimited(
46073 KERN_WARNING
46074@@ -2057,7 +2065,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
46075 mdname(conf->mddev),
46076 (unsigned long long)s,
46077 bdn);
46078- } else if (atomic_read(&rdev->read_errors)
46079+ } else if (atomic_read_unchecked(&rdev->read_errors)
46080 > conf->max_nr_stripes)
46081 printk(KERN_WARNING
46082 "md/raid:%s: Too many read errors, failing device %s.\n",
46083diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
46084index 983db75..ef9248c 100644
46085--- a/drivers/media/dvb-core/dvbdev.c
46086+++ b/drivers/media/dvb-core/dvbdev.c
46087@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
46088 const struct dvb_device *template, void *priv, int type)
46089 {
46090 struct dvb_device *dvbdev;
46091- struct file_operations *dvbdevfops;
46092+ file_operations_no_const *dvbdevfops;
46093 struct device *clsdev;
46094 int minor;
46095 int id;
46096diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
46097index 6ad22b6..6e90e2a 100644
46098--- a/drivers/media/dvb-frontends/af9033.h
46099+++ b/drivers/media/dvb-frontends/af9033.h
46100@@ -96,6 +96,6 @@ struct af9033_ops {
46101 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
46102 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
46103 int onoff);
46104-};
46105+} __no_const;
46106
46107 #endif /* AF9033_H */
46108diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
46109index 9b6c3bb..baeb5c7 100644
46110--- a/drivers/media/dvb-frontends/dib3000.h
46111+++ b/drivers/media/dvb-frontends/dib3000.h
46112@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
46113 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
46114 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
46115 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
46116-};
46117+} __no_const;
46118
46119 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
46120 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
46121diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
46122index 1fea0e9..321ce8f 100644
46123--- a/drivers/media/dvb-frontends/dib7000p.h
46124+++ b/drivers/media/dvb-frontends/dib7000p.h
46125@@ -64,7 +64,7 @@ struct dib7000p_ops {
46126 int (*get_adc_power)(struct dvb_frontend *fe);
46127 int (*slave_reset)(struct dvb_frontend *fe);
46128 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
46129-};
46130+} __no_const;
46131
46132 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
46133 void *dib7000p_attach(struct dib7000p_ops *ops);
46134diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
46135index 84cc103..5780c54 100644
46136--- a/drivers/media/dvb-frontends/dib8000.h
46137+++ b/drivers/media/dvb-frontends/dib8000.h
46138@@ -61,7 +61,7 @@ struct dib8000_ops {
46139 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
46140 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
46141 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
46142-};
46143+} __no_const;
46144
46145 #if IS_ENABLED(CONFIG_DVB_DIB8000)
46146 void *dib8000_attach(struct dib8000_ops *ops);
46147diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
46148index 860c98fc..497fa25 100644
46149--- a/drivers/media/pci/cx88/cx88-video.c
46150+++ b/drivers/media/pci/cx88/cx88-video.c
46151@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
46152
46153 /* ------------------------------------------------------------------ */
46154
46155-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46156-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46157-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46158+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46159+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46160+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
46161
46162 module_param_array(video_nr, int, NULL, 0444);
46163 module_param_array(vbi_nr, int, NULL, 0444);
46164diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
46165index 802642d..5534900 100644
46166--- a/drivers/media/pci/ivtv/ivtv-driver.c
46167+++ b/drivers/media/pci/ivtv/ivtv-driver.c
46168@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
46169 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
46170
46171 /* ivtv instance counter */
46172-static atomic_t ivtv_instance = ATOMIC_INIT(0);
46173+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
46174
46175 /* Parameter declarations */
46176 static int cardtype[IVTV_MAX_CARDS];
46177diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
46178index 570d119..ed25830 100644
46179--- a/drivers/media/pci/solo6x10/solo6x10-core.c
46180+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
46181@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
46182
46183 static int solo_sysfs_init(struct solo_dev *solo_dev)
46184 {
46185- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
46186+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
46187 struct device *dev = &solo_dev->dev;
46188 const char *driver;
46189 int i;
46190diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
46191index 7ddc767..1c24361 100644
46192--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
46193+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
46194@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
46195
46196 int solo_g723_init(struct solo_dev *solo_dev)
46197 {
46198- static struct snd_device_ops ops = { NULL };
46199+ static struct snd_device_ops ops = { };
46200 struct snd_card *card;
46201 struct snd_kcontrol_new kctl;
46202 char name[32];
46203diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46204index 8c84846..27b4f83 100644
46205--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
46206+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
46207@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
46208
46209 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
46210 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
46211- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
46212+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
46213 if (p2m_id < 0)
46214 p2m_id = -p2m_id;
46215 }
46216diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
46217index 1ca54b0..7d7cb9a 100644
46218--- a/drivers/media/pci/solo6x10/solo6x10.h
46219+++ b/drivers/media/pci/solo6x10/solo6x10.h
46220@@ -218,7 +218,7 @@ struct solo_dev {
46221
46222 /* P2M DMA Engine */
46223 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
46224- atomic_t p2m_count;
46225+ atomic_unchecked_t p2m_count;
46226 int p2m_jiffies;
46227 unsigned int p2m_timeouts;
46228
46229diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
46230index c135165..dc69499 100644
46231--- a/drivers/media/pci/tw68/tw68-core.c
46232+++ b/drivers/media/pci/tw68/tw68-core.c
46233@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
46234 module_param_array(card, int, NULL, 0444);
46235 MODULE_PARM_DESC(card, "card type");
46236
46237-static atomic_t tw68_instance = ATOMIC_INIT(0);
46238+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
46239
46240 /* ------------------------------------------------------------------ */
46241
46242diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
46243index ba2d8f9..1566684 100644
46244--- a/drivers/media/platform/omap/omap_vout.c
46245+++ b/drivers/media/platform/omap/omap_vout.c
46246@@ -63,7 +63,6 @@ enum omap_vout_channels {
46247 OMAP_VIDEO2,
46248 };
46249
46250-static struct videobuf_queue_ops video_vbq_ops;
46251 /* Variables configurable through module params*/
46252 static u32 video1_numbuffers = 3;
46253 static u32 video2_numbuffers = 3;
46254@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
46255 {
46256 struct videobuf_queue *q;
46257 struct omap_vout_device *vout = NULL;
46258+ static struct videobuf_queue_ops video_vbq_ops = {
46259+ .buf_setup = omap_vout_buffer_setup,
46260+ .buf_prepare = omap_vout_buffer_prepare,
46261+ .buf_release = omap_vout_buffer_release,
46262+ .buf_queue = omap_vout_buffer_queue,
46263+ };
46264
46265 vout = video_drvdata(file);
46266 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
46267@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
46268 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
46269
46270 q = &vout->vbq;
46271- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
46272- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
46273- video_vbq_ops.buf_release = omap_vout_buffer_release;
46274- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
46275 spin_lock_init(&vout->vbq_lock);
46276
46277 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46278diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46279index fb2acc5..a2fcbdc4 100644
46280--- a/drivers/media/platform/s5p-tv/mixer.h
46281+++ b/drivers/media/platform/s5p-tv/mixer.h
46282@@ -156,7 +156,7 @@ struct mxr_layer {
46283 /** layer index (unique identifier) */
46284 int idx;
46285 /** callbacks for layer methods */
46286- struct mxr_layer_ops ops;
46287+ struct mxr_layer_ops *ops;
46288 /** format array */
46289 const struct mxr_format **fmt_array;
46290 /** size of format array */
46291diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46292index 74344c7..a39e70e 100644
46293--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46294+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46295@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46296 {
46297 struct mxr_layer *layer;
46298 int ret;
46299- struct mxr_layer_ops ops = {
46300+ static struct mxr_layer_ops ops = {
46301 .release = mxr_graph_layer_release,
46302 .buffer_set = mxr_graph_buffer_set,
46303 .stream_set = mxr_graph_stream_set,
46304diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46305index b713403..53cb5ad 100644
46306--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46307+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46308@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46309 layer->update_buf = next;
46310 }
46311
46312- layer->ops.buffer_set(layer, layer->update_buf);
46313+ layer->ops->buffer_set(layer, layer->update_buf);
46314
46315 if (done && done != layer->shadow_buf)
46316 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46317diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46318index 72d4f2e..4b2ea0d 100644
46319--- a/drivers/media/platform/s5p-tv/mixer_video.c
46320+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46321@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46322 layer->geo.src.height = layer->geo.src.full_height;
46323
46324 mxr_geometry_dump(mdev, &layer->geo);
46325- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46326+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46327 mxr_geometry_dump(mdev, &layer->geo);
46328 }
46329
46330@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46331 layer->geo.dst.full_width = mbus_fmt.width;
46332 layer->geo.dst.full_height = mbus_fmt.height;
46333 layer->geo.dst.field = mbus_fmt.field;
46334- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46335+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46336
46337 mxr_geometry_dump(mdev, &layer->geo);
46338 }
46339@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46340 /* set source size to highest accepted value */
46341 geo->src.full_width = max(geo->dst.full_width, pix->width);
46342 geo->src.full_height = max(geo->dst.full_height, pix->height);
46343- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46344+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46345 mxr_geometry_dump(mdev, &layer->geo);
46346 /* set cropping to total visible screen */
46347 geo->src.width = pix->width;
46348@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46349 geo->src.x_offset = 0;
46350 geo->src.y_offset = 0;
46351 /* assure consistency of geometry */
46352- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46353+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46354 mxr_geometry_dump(mdev, &layer->geo);
46355 /* set full size to lowest possible value */
46356 geo->src.full_width = 0;
46357 geo->src.full_height = 0;
46358- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46359+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46360 mxr_geometry_dump(mdev, &layer->geo);
46361
46362 /* returning results */
46363@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46364 target->width = s->r.width;
46365 target->height = s->r.height;
46366
46367- layer->ops.fix_geometry(layer, stage, s->flags);
46368+ layer->ops->fix_geometry(layer, stage, s->flags);
46369
46370 /* retrieve update selection rectangle */
46371 res.left = target->x_offset;
46372@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46373 mxr_output_get(mdev);
46374
46375 mxr_layer_update_output(layer);
46376- layer->ops.format_set(layer);
46377+ layer->ops->format_set(layer);
46378 /* enabling layer in hardware */
46379 spin_lock_irqsave(&layer->enq_slock, flags);
46380 layer->state = MXR_LAYER_STREAMING;
46381 spin_unlock_irqrestore(&layer->enq_slock, flags);
46382
46383- layer->ops.stream_set(layer, MXR_ENABLE);
46384+ layer->ops->stream_set(layer, MXR_ENABLE);
46385 mxr_streamer_get(mdev);
46386
46387 return 0;
46388@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46389 spin_unlock_irqrestore(&layer->enq_slock, flags);
46390
46391 /* disabling layer in hardware */
46392- layer->ops.stream_set(layer, MXR_DISABLE);
46393+ layer->ops->stream_set(layer, MXR_DISABLE);
46394 /* remove one streamer */
46395 mxr_streamer_put(mdev);
46396 /* allow changes in output configuration */
46397@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46398
46399 void mxr_layer_release(struct mxr_layer *layer)
46400 {
46401- if (layer->ops.release)
46402- layer->ops.release(layer);
46403+ if (layer->ops->release)
46404+ layer->ops->release(layer);
46405 }
46406
46407 void mxr_base_layer_release(struct mxr_layer *layer)
46408@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46409
46410 layer->mdev = mdev;
46411 layer->idx = idx;
46412- layer->ops = *ops;
46413+ layer->ops = ops;
46414
46415 spin_lock_init(&layer->enq_slock);
46416 INIT_LIST_HEAD(&layer->enq_list);
46417diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46418index c9388c4..ce71ece 100644
46419--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46420+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46421@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46422 {
46423 struct mxr_layer *layer;
46424 int ret;
46425- struct mxr_layer_ops ops = {
46426+ static struct mxr_layer_ops ops = {
46427 .release = mxr_vp_layer_release,
46428 .buffer_set = mxr_vp_buffer_set,
46429 .stream_set = mxr_vp_stream_set,
46430diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46431index 82affae..42833ec 100644
46432--- a/drivers/media/radio/radio-cadet.c
46433+++ b/drivers/media/radio/radio-cadet.c
46434@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46435 unsigned char readbuf[RDS_BUFFER];
46436 int i = 0;
46437
46438+ if (count > RDS_BUFFER)
46439+ return -EFAULT;
46440 mutex_lock(&dev->lock);
46441 if (dev->rdsstat == 0)
46442 cadet_start_rds(dev);
46443@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46444 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46445 mutex_unlock(&dev->lock);
46446
46447- if (i && copy_to_user(data, readbuf, i))
46448- return -EFAULT;
46449+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46450+ i = -EFAULT;
46451+
46452 return i;
46453 }
46454
46455diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46456index 5236035..c622c74 100644
46457--- a/drivers/media/radio/radio-maxiradio.c
46458+++ b/drivers/media/radio/radio-maxiradio.c
46459@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46460 /* TEA5757 pin mappings */
46461 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46462
46463-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46464+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46465
46466 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46467 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46468diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46469index 050b3bb..79f62b9 100644
46470--- a/drivers/media/radio/radio-shark.c
46471+++ b/drivers/media/radio/radio-shark.c
46472@@ -79,7 +79,7 @@ struct shark_device {
46473 u32 last_val;
46474 };
46475
46476-static atomic_t shark_instance = ATOMIC_INIT(0);
46477+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46478
46479 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46480 {
46481diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46482index 8654e0d..0608a64 100644
46483--- a/drivers/media/radio/radio-shark2.c
46484+++ b/drivers/media/radio/radio-shark2.c
46485@@ -74,7 +74,7 @@ struct shark_device {
46486 u8 *transfer_buffer;
46487 };
46488
46489-static atomic_t shark_instance = ATOMIC_INIT(0);
46490+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46491
46492 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46493 {
46494diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46495index dccf586..d5db411 100644
46496--- a/drivers/media/radio/radio-si476x.c
46497+++ b/drivers/media/radio/radio-si476x.c
46498@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46499 struct si476x_radio *radio;
46500 struct v4l2_ctrl *ctrl;
46501
46502- static atomic_t instance = ATOMIC_INIT(0);
46503+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46504
46505 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46506 if (!radio)
46507diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46508index 704397f..4d05977 100644
46509--- a/drivers/media/radio/wl128x/fmdrv_common.c
46510+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46511@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46512 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46513
46514 /* Radio Nr */
46515-static u32 radio_nr = -1;
46516+static int radio_nr = -1;
46517 module_param(radio_nr, int, 0444);
46518 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46519
46520diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46521index 9fd1527..8927230 100644
46522--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46523+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46524@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46525
46526 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46527 {
46528- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46529- char result[64];
46530- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46531- sizeof(result), 0);
46532+ char *buf;
46533+ char *result;
46534+ int retval;
46535+
46536+ buf = kmalloc(2, GFP_KERNEL);
46537+ if (buf == NULL)
46538+ return -ENOMEM;
46539+ result = kmalloc(64, GFP_KERNEL);
46540+ if (result == NULL) {
46541+ kfree(buf);
46542+ return -ENOMEM;
46543+ }
46544+
46545+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46546+ buf[1] = enable ? 1 : 0;
46547+
46548+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46549+
46550+ kfree(buf);
46551+ kfree(result);
46552+ return retval;
46553 }
46554
46555 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46556 {
46557- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46558- char state[3];
46559- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46560+ char *buf;
46561+ char *state;
46562+ int retval;
46563+
46564+ buf = kmalloc(2, GFP_KERNEL);
46565+ if (buf == NULL)
46566+ return -ENOMEM;
46567+ state = kmalloc(3, GFP_KERNEL);
46568+ if (state == NULL) {
46569+ kfree(buf);
46570+ return -ENOMEM;
46571+ }
46572+
46573+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46574+ buf[1] = enable ? 1 : 0;
46575+
46576+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46577+
46578+ kfree(buf);
46579+ kfree(state);
46580+ return retval;
46581 }
46582
46583 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46584 {
46585- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46586- char state[3];
46587+ char *query;
46588+ char *state;
46589 int ret;
46590+ query = kmalloc(1, GFP_KERNEL);
46591+ if (query == NULL)
46592+ return -ENOMEM;
46593+ state = kmalloc(3, GFP_KERNEL);
46594+ if (state == NULL) {
46595+ kfree(query);
46596+ return -ENOMEM;
46597+ }
46598+
46599+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46600
46601 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46602
46603- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46604- sizeof(state), 0);
46605+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46606 if (ret < 0) {
46607 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46608 "state info\n");
46609@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46610
46611 /* Copy this pointer as we are gonna need it in the release phase */
46612 cinergyt2_usb_device = adap->dev;
46613-
46614+ kfree(query);
46615+ kfree(state);
46616 return 0;
46617 }
46618
46619@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46620 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46621 {
46622 struct cinergyt2_state *st = d->priv;
46623- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46624+ u8 *key, *cmd;
46625 int i;
46626
46627+ cmd = kmalloc(1, GFP_KERNEL);
46628+ if (cmd == NULL)
46629+ return -EINVAL;
46630+ key = kzalloc(5, GFP_KERNEL);
46631+ if (key == NULL) {
46632+ kfree(cmd);
46633+ return -EINVAL;
46634+ }
46635+
46636+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46637+
46638 *state = REMOTE_NO_KEY_PRESSED;
46639
46640- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46641+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46642 if (key[4] == 0xff) {
46643 /* key repeat */
46644 st->rc_counter++;
46645@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46646 *event = d->last_event;
46647 deb_rc("repeat key, event %x\n",
46648 *event);
46649- return 0;
46650+ goto out;
46651 }
46652 }
46653 deb_rc("repeated key (non repeatable)\n");
46654 }
46655- return 0;
46656+ goto out;
46657 }
46658
46659 /* hack to pass checksum on the custom field */
46660@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46661
46662 deb_rc("key: %*ph\n", 5, key);
46663 }
46664+out:
46665+ kfree(cmd);
46666+ kfree(key);
46667 return 0;
46668 }
46669
46670diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46671index c890fe4..f9b2ae6 100644
46672--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46673+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46674@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46675 fe_status_t *status)
46676 {
46677 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46678- struct dvbt_get_status_msg result;
46679- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46680+ struct dvbt_get_status_msg *result;
46681+ u8 *cmd;
46682 int ret;
46683
46684- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46685- sizeof(result), 0);
46686+ cmd = kmalloc(1, GFP_KERNEL);
46687+ if (cmd == NULL)
46688+ return -ENOMEM;
46689+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46690+ if (result == NULL) {
46691+ kfree(cmd);
46692+ return -ENOMEM;
46693+ }
46694+
46695+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46696+
46697+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46698+ sizeof(*result), 0);
46699 if (ret < 0)
46700- return ret;
46701+ goto out;
46702
46703 *status = 0;
46704
46705- if (0xffff - le16_to_cpu(result.gain) > 30)
46706+ if (0xffff - le16_to_cpu(result->gain) > 30)
46707 *status |= FE_HAS_SIGNAL;
46708- if (result.lock_bits & (1 << 6))
46709+ if (result->lock_bits & (1 << 6))
46710 *status |= FE_HAS_LOCK;
46711- if (result.lock_bits & (1 << 5))
46712+ if (result->lock_bits & (1 << 5))
46713 *status |= FE_HAS_SYNC;
46714- if (result.lock_bits & (1 << 4))
46715+ if (result->lock_bits & (1 << 4))
46716 *status |= FE_HAS_CARRIER;
46717- if (result.lock_bits & (1 << 1))
46718+ if (result->lock_bits & (1 << 1))
46719 *status |= FE_HAS_VITERBI;
46720
46721 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46722 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46723 *status &= ~FE_HAS_LOCK;
46724
46725- return 0;
46726+out:
46727+ kfree(cmd);
46728+ kfree(result);
46729+ return ret;
46730 }
46731
46732 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46733 {
46734 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46735- struct dvbt_get_status_msg status;
46736- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46737+ struct dvbt_get_status_msg *status;
46738+ char *cmd;
46739 int ret;
46740
46741- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46742- sizeof(status), 0);
46743+ cmd = kmalloc(1, GFP_KERNEL);
46744+ if (cmd == NULL)
46745+ return -ENOMEM;
46746+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46747+ if (status == NULL) {
46748+ kfree(cmd);
46749+ return -ENOMEM;
46750+ }
46751+
46752+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46753+
46754+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46755+ sizeof(*status), 0);
46756 if (ret < 0)
46757- return ret;
46758+ goto out;
46759
46760- *ber = le32_to_cpu(status.viterbi_error_rate);
46761+ *ber = le32_to_cpu(status->viterbi_error_rate);
46762+out:
46763+ kfree(cmd);
46764+ kfree(status);
46765 return 0;
46766 }
46767
46768 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46769 {
46770 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46771- struct dvbt_get_status_msg status;
46772- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46773+ struct dvbt_get_status_msg *status;
46774+ u8 *cmd;
46775 int ret;
46776
46777- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46778- sizeof(status), 0);
46779+ cmd = kmalloc(1, GFP_KERNEL);
46780+ if (cmd == NULL)
46781+ return -ENOMEM;
46782+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46783+ if (status == NULL) {
46784+ kfree(cmd);
46785+ return -ENOMEM;
46786+ }
46787+
46788+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46789+
46790+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46791+ sizeof(*status), 0);
46792 if (ret < 0) {
46793 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46794 ret);
46795- return ret;
46796+ goto out;
46797 }
46798- *unc = le32_to_cpu(status.uncorrected_block_count);
46799- return 0;
46800+ *unc = le32_to_cpu(status->uncorrected_block_count);
46801+
46802+out:
46803+ kfree(cmd);
46804+ kfree(status);
46805+ return ret;
46806 }
46807
46808 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46809 u16 *strength)
46810 {
46811 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46812- struct dvbt_get_status_msg status;
46813- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46814+ struct dvbt_get_status_msg *status;
46815+ char *cmd;
46816 int ret;
46817
46818- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46819- sizeof(status), 0);
46820+ cmd = kmalloc(1, GFP_KERNEL);
46821+ if (cmd == NULL)
46822+ return -ENOMEM;
46823+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46824+ if (status == NULL) {
46825+ kfree(cmd);
46826+ return -ENOMEM;
46827+ }
46828+
46829+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46830+
46831+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46832+ sizeof(*status), 0);
46833 if (ret < 0) {
46834 err("cinergyt2_fe_read_signal_strength() Failed!"
46835 " (Error=%d)\n", ret);
46836- return ret;
46837+ goto out;
46838 }
46839- *strength = (0xffff - le16_to_cpu(status.gain));
46840+ *strength = (0xffff - le16_to_cpu(status->gain));
46841+
46842+out:
46843+ kfree(cmd);
46844+ kfree(status);
46845 return 0;
46846 }
46847
46848 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46849 {
46850 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46851- struct dvbt_get_status_msg status;
46852- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46853+ struct dvbt_get_status_msg *status;
46854+ char *cmd;
46855 int ret;
46856
46857- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46858- sizeof(status), 0);
46859+ cmd = kmalloc(1, GFP_KERNEL);
46860+ if (cmd == NULL)
46861+ return -ENOMEM;
46862+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46863+ if (status == NULL) {
46864+ kfree(cmd);
46865+ return -ENOMEM;
46866+ }
46867+
46868+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46869+
46870+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46871+ sizeof(*status), 0);
46872 if (ret < 0) {
46873 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46874- return ret;
46875+ goto out;
46876 }
46877- *snr = (status.snr << 8) | status.snr;
46878- return 0;
46879+ *snr = (status->snr << 8) | status->snr;
46880+
46881+out:
46882+ kfree(cmd);
46883+ kfree(status);
46884+ return ret;
46885 }
46886
46887 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46888@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46889 {
46890 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46891 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46892- struct dvbt_set_parameters_msg param;
46893- char result[2];
46894+ struct dvbt_set_parameters_msg *param;
46895+ char *result;
46896 int err;
46897
46898- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46899- param.tps = cpu_to_le16(compute_tps(fep));
46900- param.freq = cpu_to_le32(fep->frequency / 1000);
46901- param.flags = 0;
46902+ result = kmalloc(2, GFP_KERNEL);
46903+ if (result == NULL)
46904+ return -ENOMEM;
46905+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46906+ if (param == NULL) {
46907+ kfree(result);
46908+ return -ENOMEM;
46909+ }
46910+
46911+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46912+ param->tps = cpu_to_le16(compute_tps(fep));
46913+ param->freq = cpu_to_le32(fep->frequency / 1000);
46914+ param->flags = 0;
46915
46916 switch (fep->bandwidth_hz) {
46917 default:
46918 case 8000000:
46919- param.bandwidth = 8;
46920+ param->bandwidth = 8;
46921 break;
46922 case 7000000:
46923- param.bandwidth = 7;
46924+ param->bandwidth = 7;
46925 break;
46926 case 6000000:
46927- param.bandwidth = 6;
46928+ param->bandwidth = 6;
46929 break;
46930 }
46931
46932 err = dvb_usb_generic_rw(state->d,
46933- (char *)&param, sizeof(param),
46934- result, sizeof(result), 0);
46935+ (char *)param, sizeof(*param),
46936+ result, 2, 0);
46937 if (err < 0)
46938 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46939
46940- return (err < 0) ? err : 0;
46941+ kfree(result);
46942+ kfree(param);
46943+ return err;
46944 }
46945
46946 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46947diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46948index 733a7ff..f8b52e3 100644
46949--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46950+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46951@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46952
46953 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46954 {
46955- struct hexline hx;
46956- u8 reset;
46957+ struct hexline *hx;
46958+ u8 *reset;
46959 int ret,pos=0;
46960
46961+ reset = kmalloc(1, GFP_KERNEL);
46962+ if (reset == NULL)
46963+ return -ENOMEM;
46964+
46965+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46966+ if (hx == NULL) {
46967+ kfree(reset);
46968+ return -ENOMEM;
46969+ }
46970+
46971 /* stop the CPU */
46972- reset = 1;
46973- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46974+ reset[0] = 1;
46975+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46976 err("could not stop the USB controller CPU.");
46977
46978- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46979- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46980- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46981+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46982+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46983+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46984
46985- if (ret != hx.len) {
46986+ if (ret != hx->len) {
46987 err("error while transferring firmware "
46988 "(transferred size: %d, block size: %d)",
46989- ret,hx.len);
46990+ ret,hx->len);
46991 ret = -EINVAL;
46992 break;
46993 }
46994 }
46995 if (ret < 0) {
46996 err("firmware download failed at %d with %d",pos,ret);
46997+ kfree(reset);
46998+ kfree(hx);
46999 return ret;
47000 }
47001
47002 if (ret == 0) {
47003 /* restart the CPU */
47004- reset = 0;
47005- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
47006+ reset[0] = 0;
47007+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
47008 err("could not restart the USB controller CPU.");
47009 ret = -EINVAL;
47010 }
47011 } else
47012 ret = -EIO;
47013
47014+ kfree(reset);
47015+ kfree(hx);
47016+
47017 return ret;
47018 }
47019 EXPORT_SYMBOL(usb_cypress_load_firmware);
47020diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
47021index 1a3df10..57997a5 100644
47022--- a/drivers/media/usb/dvb-usb/dw2102.c
47023+++ b/drivers/media/usb/dvb-usb/dw2102.c
47024@@ -118,7 +118,7 @@ struct su3000_state {
47025
47026 struct s6x0_state {
47027 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
47028-};
47029+} __no_const;
47030
47031 /* debug */
47032 static int dvb_usb_dw2102_debug;
47033diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
47034index 5801ae7..83f71fa 100644
47035--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
47036+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
47037@@ -87,8 +87,11 @@ struct technisat_usb2_state {
47038 static int technisat_usb2_i2c_access(struct usb_device *udev,
47039 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
47040 {
47041- u8 b[64];
47042- int ret, actual_length;
47043+ u8 *b = kmalloc(64, GFP_KERNEL);
47044+ int ret, actual_length, error = 0;
47045+
47046+ if (b == NULL)
47047+ return -ENOMEM;
47048
47049 deb_i2c("i2c-access: %02x, tx: ", device_addr);
47050 debug_dump(tx, txlen, deb_i2c);
47051@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47052
47053 if (ret < 0) {
47054 err("i2c-error: out failed %02x = %d", device_addr, ret);
47055- return -ENODEV;
47056+ error = -ENODEV;
47057+ goto out;
47058 }
47059
47060 ret = usb_bulk_msg(udev,
47061@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47062 b, 64, &actual_length, 1000);
47063 if (ret < 0) {
47064 err("i2c-error: in failed %02x = %d", device_addr, ret);
47065- return -ENODEV;
47066+ error = -ENODEV;
47067+ goto out;
47068 }
47069
47070 if (b[0] != I2C_STATUS_OK) {
47071@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47072 /* handle tuner-i2c-nak */
47073 if (!(b[0] == I2C_STATUS_NAK &&
47074 device_addr == 0x60
47075- /* && device_is_technisat_usb2 */))
47076- return -ENODEV;
47077+ /* && device_is_technisat_usb2 */)) {
47078+ error = -ENODEV;
47079+ goto out;
47080+ }
47081 }
47082
47083 deb_i2c("status: %d, ", b[0]);
47084@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
47085
47086 deb_i2c("\n");
47087
47088- return 0;
47089+out:
47090+ kfree(b);
47091+ return error;
47092 }
47093
47094 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
47095@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47096 {
47097 int ret;
47098
47099- u8 led[8] = {
47100- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47101- 0
47102- };
47103+ u8 *led = kzalloc(8, GFP_KERNEL);
47104+
47105+ if (led == NULL)
47106+ return -ENOMEM;
47107
47108 if (disable_led_control && state != TECH_LED_OFF)
47109 return 0;
47110
47111+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
47112+
47113 switch (state) {
47114 case TECH_LED_ON:
47115 led[1] = 0x82;
47116@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
47117 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
47118 USB_TYPE_VENDOR | USB_DIR_OUT,
47119 0, 0,
47120- led, sizeof(led), 500);
47121+ led, 8, 500);
47122
47123 mutex_unlock(&d->i2c_mutex);
47124+
47125+ kfree(led);
47126+
47127 return ret;
47128 }
47129
47130 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
47131 {
47132 int ret;
47133- u8 b = 0;
47134+ u8 *b = kzalloc(1, GFP_KERNEL);
47135+
47136+ if (b == NULL)
47137+ return -ENOMEM;
47138
47139 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
47140 return -EAGAIN;
47141@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
47142 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
47143 USB_TYPE_VENDOR | USB_DIR_OUT,
47144 (red << 8) | green, 0,
47145- &b, 1, 500);
47146+ b, 1, 500);
47147
47148 mutex_unlock(&d->i2c_mutex);
47149
47150+ kfree(b);
47151+
47152 return ret;
47153 }
47154
47155@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47156 struct dvb_usb_device_description **desc, int *cold)
47157 {
47158 int ret;
47159- u8 version[3];
47160+ u8 *version = kmalloc(3, GFP_KERNEL);
47161
47162 /* first select the interface */
47163 if (usb_set_interface(udev, 0, 1) != 0)
47164@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47165
47166 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
47167
47168+ if (version == NULL)
47169+ return 0;
47170+
47171 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
47172 GET_VERSION_INFO_VENDOR_REQUEST,
47173 USB_TYPE_VENDOR | USB_DIR_IN,
47174 0, 0,
47175- version, sizeof(version), 500);
47176+ version, 3, 500);
47177
47178 if (ret < 0)
47179 *cold = 1;
47180@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
47181 *cold = 0;
47182 }
47183
47184+ kfree(version);
47185+
47186 return 0;
47187 }
47188
47189@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
47190
47191 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47192 {
47193- u8 buf[62], *b;
47194+ u8 *buf, *b;
47195 int ret;
47196 struct ir_raw_event ev;
47197
47198+ buf = kmalloc(62, GFP_KERNEL);
47199+
47200+ if (buf == NULL)
47201+ return -ENOMEM;
47202+
47203 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
47204 buf[1] = 0x08;
47205 buf[2] = 0x8f;
47206@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
47207 GET_IR_DATA_VENDOR_REQUEST,
47208 USB_TYPE_VENDOR | USB_DIR_IN,
47209 0x8080, 0,
47210- buf, sizeof(buf), 500);
47211+ buf, 62, 500);
47212
47213 unlock:
47214 mutex_unlock(&d->i2c_mutex);
47215
47216- if (ret < 0)
47217+ if (ret < 0) {
47218+ kfree(buf);
47219 return ret;
47220+ }
47221
47222- if (ret == 1)
47223+ if (ret == 1) {
47224+ kfree(buf);
47225 return 0; /* no key pressed */
47226+ }
47227
47228 /* decoding */
47229 b = buf+1;
47230@@ -656,6 +689,8 @@ unlock:
47231
47232 ir_raw_event_handle(d->rc_dev);
47233
47234+ kfree(buf);
47235+
47236 return 1;
47237 }
47238
47239diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47240index af63543..0436f20 100644
47241--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47242+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
47243@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47244 * by passing a very big num_planes value */
47245 uplane = compat_alloc_user_space(num_planes *
47246 sizeof(struct v4l2_plane));
47247- kp->m.planes = (__force struct v4l2_plane *)uplane;
47248+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
47249
47250 while (--num_planes >= 0) {
47251 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
47252@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
47253 if (num_planes == 0)
47254 return 0;
47255
47256- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
47257+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
47258 if (get_user(p, &up->m.planes))
47259 return -EFAULT;
47260 uplane32 = compat_ptr(p);
47261@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
47262 get_user(kp->flags, &up->flags) ||
47263 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
47264 return -EFAULT;
47265- kp->base = (__force void *)compat_ptr(tmp);
47266+ kp->base = (__force_kernel void *)compat_ptr(tmp);
47267 return 0;
47268 }
47269
47270@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47271 n * sizeof(struct v4l2_ext_control32)))
47272 return -EFAULT;
47273 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
47274- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
47275+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
47276 while (--n >= 0) {
47277 u32 id;
47278
47279@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
47280 {
47281 struct v4l2_ext_control32 __user *ucontrols;
47282 struct v4l2_ext_control __user *kcontrols =
47283- (__force struct v4l2_ext_control __user *)kp->controls;
47284+ (struct v4l2_ext_control __force_user *)kp->controls;
47285 int n = kp->count;
47286 compat_caddr_t p;
47287
47288@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
47289 get_user(tmp, &up->edid) ||
47290 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47291 return -EFAULT;
47292- kp->edid = (__force u8 *)compat_ptr(tmp);
47293+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47294 return 0;
47295 }
47296
47297diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47298index 015f92a..59e311e 100644
47299--- a/drivers/media/v4l2-core/v4l2-device.c
47300+++ b/drivers/media/v4l2-core/v4l2-device.c
47301@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47302 EXPORT_SYMBOL_GPL(v4l2_device_put);
47303
47304 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47305- atomic_t *instance)
47306+ atomic_unchecked_t *instance)
47307 {
47308- int num = atomic_inc_return(instance) - 1;
47309+ int num = atomic_inc_return_unchecked(instance) - 1;
47310 int len = strlen(basename);
47311
47312 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47313diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47314index b084072..36706d7 100644
47315--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47316+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47317@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47318 struct file *file, void *fh, void *p);
47319 } u;
47320 void (*debug)(const void *arg, bool write_only);
47321-};
47322+} __do_const;
47323+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47324
47325 /* This control needs a priority check */
47326 #define INFO_FL_PRIO (1 << 0)
47327@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47328 struct video_device *vfd = video_devdata(file);
47329 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47330 bool write_only = false;
47331- struct v4l2_ioctl_info default_info;
47332+ v4l2_ioctl_info_no_const default_info;
47333 const struct v4l2_ioctl_info *info;
47334 void *fh = file->private_data;
47335 struct v4l2_fh *vfh = NULL;
47336@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47337 ret = -EINVAL;
47338 break;
47339 }
47340- *user_ptr = (void __user *)buf->m.planes;
47341+ *user_ptr = (void __force_user *)buf->m.planes;
47342 *kernel_ptr = (void **)&buf->m.planes;
47343 *array_size = sizeof(struct v4l2_plane) * buf->length;
47344 ret = 1;
47345@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47346 ret = -EINVAL;
47347 break;
47348 }
47349- *user_ptr = (void __user *)edid->edid;
47350+ *user_ptr = (void __force_user *)edid->edid;
47351 *kernel_ptr = (void **)&edid->edid;
47352 *array_size = edid->blocks * 128;
47353 ret = 1;
47354@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47355 ret = -EINVAL;
47356 break;
47357 }
47358- *user_ptr = (void __user *)ctrls->controls;
47359+ *user_ptr = (void __force_user *)ctrls->controls;
47360 *kernel_ptr = (void **)&ctrls->controls;
47361 *array_size = sizeof(struct v4l2_ext_control)
47362 * ctrls->count;
47363@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47364 }
47365
47366 if (has_array_args) {
47367- *kernel_ptr = (void __force *)user_ptr;
47368+ *kernel_ptr = (void __force_kernel *)user_ptr;
47369 if (copy_to_user(user_ptr, mbuf, array_size))
47370 err = -EFAULT;
47371 goto out_array_args;
47372diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47373index 24696f5..3637780 100644
47374--- a/drivers/memory/omap-gpmc.c
47375+++ b/drivers/memory/omap-gpmc.c
47376@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
47377 };
47378
47379 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47380-static struct irq_chip gpmc_irq_chip;
47381 static int gpmc_irq_start;
47382
47383 static struct resource gpmc_mem_root;
47384@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47385
47386 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47387
47388+static struct irq_chip gpmc_irq_chip = {
47389+ .name = "gpmc",
47390+ .irq_startup = gpmc_irq_noop_ret,
47391+ .irq_enable = gpmc_irq_enable,
47392+ .irq_disable = gpmc_irq_disable,
47393+ .irq_shutdown = gpmc_irq_noop,
47394+ .irq_ack = gpmc_irq_noop,
47395+ .irq_mask = gpmc_irq_noop,
47396+ .irq_unmask = gpmc_irq_noop,
47397+};
47398+
47399 static int gpmc_setup_irq(void)
47400 {
47401 int i;
47402@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
47403 return gpmc_irq_start;
47404 }
47405
47406- gpmc_irq_chip.name = "gpmc";
47407- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47408- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47409- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47410- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47411- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47412- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47413- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47414-
47415 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47416 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47417
47418diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47419index 187f836..679544b 100644
47420--- a/drivers/message/fusion/mptbase.c
47421+++ b/drivers/message/fusion/mptbase.c
47422@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47423 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47424 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47425
47426+#ifdef CONFIG_GRKERNSEC_HIDESYM
47427+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47428+#else
47429 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47430 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47431+#endif
47432+
47433 /*
47434 * Rounding UP to nearest 4-kB boundary here...
47435 */
47436@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47437 ioc->facts.GlobalCredits);
47438
47439 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47440+#ifdef CONFIG_GRKERNSEC_HIDESYM
47441+ NULL, NULL);
47442+#else
47443 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47444+#endif
47445 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47446 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47447 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47448diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47449index 5bdaae1..eced16f 100644
47450--- a/drivers/message/fusion/mptsas.c
47451+++ b/drivers/message/fusion/mptsas.c
47452@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47453 return 0;
47454 }
47455
47456+static inline void
47457+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47458+{
47459+ if (phy_info->port_details) {
47460+ phy_info->port_details->rphy = rphy;
47461+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47462+ ioc->name, rphy));
47463+ }
47464+
47465+ if (rphy) {
47466+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47467+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47468+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47469+ ioc->name, rphy, rphy->dev.release));
47470+ }
47471+}
47472+
47473 /* no mutex */
47474 static void
47475 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47476@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47477 return NULL;
47478 }
47479
47480-static inline void
47481-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47482-{
47483- if (phy_info->port_details) {
47484- phy_info->port_details->rphy = rphy;
47485- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47486- ioc->name, rphy));
47487- }
47488-
47489- if (rphy) {
47490- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47491- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47492- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47493- ioc->name, rphy, rphy->dev.release));
47494- }
47495-}
47496-
47497 static inline struct sas_port *
47498 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47499 {
47500diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47501index 9a8e185..27ff17d 100644
47502--- a/drivers/mfd/ab8500-debugfs.c
47503+++ b/drivers/mfd/ab8500-debugfs.c
47504@@ -100,7 +100,7 @@ static int irq_last;
47505 static u32 *irq_count;
47506 static int num_irqs;
47507
47508-static struct device_attribute **dev_attr;
47509+static device_attribute_no_const **dev_attr;
47510 static char **event_name;
47511
47512 static u8 avg_sample = SAMPLE_16;
47513diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47514index 5615522..1eb6f3dc 100644
47515--- a/drivers/mfd/kempld-core.c
47516+++ b/drivers/mfd/kempld-core.c
47517@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47518 .remove = kempld_remove,
47519 };
47520
47521-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47522+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47523 {
47524 .ident = "BHL6",
47525 .matches = {
47526diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47527index c880c89..45a7c68 100644
47528--- a/drivers/mfd/max8925-i2c.c
47529+++ b/drivers/mfd/max8925-i2c.c
47530@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47531 const struct i2c_device_id *id)
47532 {
47533 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47534- static struct max8925_chip *chip;
47535+ struct max8925_chip *chip;
47536 struct device_node *node = client->dev.of_node;
47537
47538 if (node && !pdata) {
47539diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47540index 7612d89..70549c2 100644
47541--- a/drivers/mfd/tps65910.c
47542+++ b/drivers/mfd/tps65910.c
47543@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47544 struct tps65910_platform_data *pdata)
47545 {
47546 int ret = 0;
47547- static struct regmap_irq_chip *tps6591x_irqs_chip;
47548+ struct regmap_irq_chip *tps6591x_irqs_chip;
47549
47550 if (!irq) {
47551 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47552diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47553index 1b772ef..01e77d33 100644
47554--- a/drivers/mfd/twl4030-irq.c
47555+++ b/drivers/mfd/twl4030-irq.c
47556@@ -34,6 +34,7 @@
47557 #include <linux/of.h>
47558 #include <linux/irqdomain.h>
47559 #include <linux/i2c/twl.h>
47560+#include <asm/pgtable.h>
47561
47562 #include "twl-core.h"
47563
47564@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47565 * Install an irq handler for each of the SIH modules;
47566 * clone dummy irq_chip since PIH can't *do* anything
47567 */
47568- twl4030_irq_chip = dummy_irq_chip;
47569- twl4030_irq_chip.name = "twl4030";
47570+ pax_open_kernel();
47571+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47572+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47573
47574- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47575+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47576+ pax_close_kernel();
47577
47578 for (i = irq_base; i < irq_end; i++) {
47579 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47580diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47581index 464419b..64bae8d 100644
47582--- a/drivers/misc/c2port/core.c
47583+++ b/drivers/misc/c2port/core.c
47584@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47585 goto error_idr_alloc;
47586 c2dev->id = ret;
47587
47588- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47589+ pax_open_kernel();
47590+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47591+ pax_close_kernel();
47592
47593 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47594 "c2port%d", c2dev->id);
47595diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47596index 8385177..2f54635 100644
47597--- a/drivers/misc/eeprom/sunxi_sid.c
47598+++ b/drivers/misc/eeprom/sunxi_sid.c
47599@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47600
47601 platform_set_drvdata(pdev, sid_data);
47602
47603- sid_bin_attr.size = sid_data->keysize;
47604+ pax_open_kernel();
47605+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47606+ pax_close_kernel();
47607 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47608 return -ENODEV;
47609
47610diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47611index 36f5d52..32311c3 100644
47612--- a/drivers/misc/kgdbts.c
47613+++ b/drivers/misc/kgdbts.c
47614@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47615 char before[BREAK_INSTR_SIZE];
47616 char after[BREAK_INSTR_SIZE];
47617
47618- probe_kernel_read(before, (char *)kgdbts_break_test,
47619+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47620 BREAK_INSTR_SIZE);
47621 init_simple_test();
47622 ts.tst = plant_and_detach_test;
47623@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47624 /* Activate test with initial breakpoint */
47625 if (!is_early)
47626 kgdb_breakpoint();
47627- probe_kernel_read(after, (char *)kgdbts_break_test,
47628+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47629 BREAK_INSTR_SIZE);
47630 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47631 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47632diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47633index 3ef4627..8d00486 100644
47634--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47635+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47636@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47637 * the lid is closed. This leads to interrupts as soon as a little move
47638 * is done.
47639 */
47640- atomic_inc(&lis3->count);
47641+ atomic_inc_unchecked(&lis3->count);
47642
47643 wake_up_interruptible(&lis3->misc_wait);
47644 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47645@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47646 if (lis3->pm_dev)
47647 pm_runtime_get_sync(lis3->pm_dev);
47648
47649- atomic_set(&lis3->count, 0);
47650+ atomic_set_unchecked(&lis3->count, 0);
47651 return 0;
47652 }
47653
47654@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47655 add_wait_queue(&lis3->misc_wait, &wait);
47656 while (true) {
47657 set_current_state(TASK_INTERRUPTIBLE);
47658- data = atomic_xchg(&lis3->count, 0);
47659+ data = atomic_xchg_unchecked(&lis3->count, 0);
47660 if (data)
47661 break;
47662
47663@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47664 struct lis3lv02d, miscdev);
47665
47666 poll_wait(file, &lis3->misc_wait, wait);
47667- if (atomic_read(&lis3->count))
47668+ if (atomic_read_unchecked(&lis3->count))
47669 return POLLIN | POLLRDNORM;
47670 return 0;
47671 }
47672diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47673index c439c82..1f20f57 100644
47674--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47675+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47676@@ -297,7 +297,7 @@ struct lis3lv02d {
47677 struct input_polled_dev *idev; /* input device */
47678 struct platform_device *pdev; /* platform device */
47679 struct regulator_bulk_data regulators[2];
47680- atomic_t count; /* interrupt count after last read */
47681+ atomic_unchecked_t count; /* interrupt count after last read */
47682 union axis_conversion ac; /* hw -> logical axis */
47683 int mapped_btns[3];
47684
47685diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47686index 2f30bad..c4c13d0 100644
47687--- a/drivers/misc/sgi-gru/gruhandles.c
47688+++ b/drivers/misc/sgi-gru/gruhandles.c
47689@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47690 unsigned long nsec;
47691
47692 nsec = CLKS2NSEC(clks);
47693- atomic_long_inc(&mcs_op_statistics[op].count);
47694- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47695+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47696+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47697 if (mcs_op_statistics[op].max < nsec)
47698 mcs_op_statistics[op].max = nsec;
47699 }
47700diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47701index 4f76359..cdfcb2e 100644
47702--- a/drivers/misc/sgi-gru/gruprocfs.c
47703+++ b/drivers/misc/sgi-gru/gruprocfs.c
47704@@ -32,9 +32,9 @@
47705
47706 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47707
47708-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47709+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47710 {
47711- unsigned long val = atomic_long_read(v);
47712+ unsigned long val = atomic_long_read_unchecked(v);
47713
47714 seq_printf(s, "%16lu %s\n", val, id);
47715 }
47716@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47717
47718 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47719 for (op = 0; op < mcsop_last; op++) {
47720- count = atomic_long_read(&mcs_op_statistics[op].count);
47721- total = atomic_long_read(&mcs_op_statistics[op].total);
47722+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47723+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47724 max = mcs_op_statistics[op].max;
47725 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47726 count ? total / count : 0, max);
47727diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47728index 5c3ce24..4915ccb 100644
47729--- a/drivers/misc/sgi-gru/grutables.h
47730+++ b/drivers/misc/sgi-gru/grutables.h
47731@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47732 * GRU statistics.
47733 */
47734 struct gru_stats_s {
47735- atomic_long_t vdata_alloc;
47736- atomic_long_t vdata_free;
47737- atomic_long_t gts_alloc;
47738- atomic_long_t gts_free;
47739- atomic_long_t gms_alloc;
47740- atomic_long_t gms_free;
47741- atomic_long_t gts_double_allocate;
47742- atomic_long_t assign_context;
47743- atomic_long_t assign_context_failed;
47744- atomic_long_t free_context;
47745- atomic_long_t load_user_context;
47746- atomic_long_t load_kernel_context;
47747- atomic_long_t lock_kernel_context;
47748- atomic_long_t unlock_kernel_context;
47749- atomic_long_t steal_user_context;
47750- atomic_long_t steal_kernel_context;
47751- atomic_long_t steal_context_failed;
47752- atomic_long_t nopfn;
47753- atomic_long_t asid_new;
47754- atomic_long_t asid_next;
47755- atomic_long_t asid_wrap;
47756- atomic_long_t asid_reuse;
47757- atomic_long_t intr;
47758- atomic_long_t intr_cbr;
47759- atomic_long_t intr_tfh;
47760- atomic_long_t intr_spurious;
47761- atomic_long_t intr_mm_lock_failed;
47762- atomic_long_t call_os;
47763- atomic_long_t call_os_wait_queue;
47764- atomic_long_t user_flush_tlb;
47765- atomic_long_t user_unload_context;
47766- atomic_long_t user_exception;
47767- atomic_long_t set_context_option;
47768- atomic_long_t check_context_retarget_intr;
47769- atomic_long_t check_context_unload;
47770- atomic_long_t tlb_dropin;
47771- atomic_long_t tlb_preload_page;
47772- atomic_long_t tlb_dropin_fail_no_asid;
47773- atomic_long_t tlb_dropin_fail_upm;
47774- atomic_long_t tlb_dropin_fail_invalid;
47775- atomic_long_t tlb_dropin_fail_range_active;
47776- atomic_long_t tlb_dropin_fail_idle;
47777- atomic_long_t tlb_dropin_fail_fmm;
47778- atomic_long_t tlb_dropin_fail_no_exception;
47779- atomic_long_t tfh_stale_on_fault;
47780- atomic_long_t mmu_invalidate_range;
47781- atomic_long_t mmu_invalidate_page;
47782- atomic_long_t flush_tlb;
47783- atomic_long_t flush_tlb_gru;
47784- atomic_long_t flush_tlb_gru_tgh;
47785- atomic_long_t flush_tlb_gru_zero_asid;
47786+ atomic_long_unchecked_t vdata_alloc;
47787+ atomic_long_unchecked_t vdata_free;
47788+ atomic_long_unchecked_t gts_alloc;
47789+ atomic_long_unchecked_t gts_free;
47790+ atomic_long_unchecked_t gms_alloc;
47791+ atomic_long_unchecked_t gms_free;
47792+ atomic_long_unchecked_t gts_double_allocate;
47793+ atomic_long_unchecked_t assign_context;
47794+ atomic_long_unchecked_t assign_context_failed;
47795+ atomic_long_unchecked_t free_context;
47796+ atomic_long_unchecked_t load_user_context;
47797+ atomic_long_unchecked_t load_kernel_context;
47798+ atomic_long_unchecked_t lock_kernel_context;
47799+ atomic_long_unchecked_t unlock_kernel_context;
47800+ atomic_long_unchecked_t steal_user_context;
47801+ atomic_long_unchecked_t steal_kernel_context;
47802+ atomic_long_unchecked_t steal_context_failed;
47803+ atomic_long_unchecked_t nopfn;
47804+ atomic_long_unchecked_t asid_new;
47805+ atomic_long_unchecked_t asid_next;
47806+ atomic_long_unchecked_t asid_wrap;
47807+ atomic_long_unchecked_t asid_reuse;
47808+ atomic_long_unchecked_t intr;
47809+ atomic_long_unchecked_t intr_cbr;
47810+ atomic_long_unchecked_t intr_tfh;
47811+ atomic_long_unchecked_t intr_spurious;
47812+ atomic_long_unchecked_t intr_mm_lock_failed;
47813+ atomic_long_unchecked_t call_os;
47814+ atomic_long_unchecked_t call_os_wait_queue;
47815+ atomic_long_unchecked_t user_flush_tlb;
47816+ atomic_long_unchecked_t user_unload_context;
47817+ atomic_long_unchecked_t user_exception;
47818+ atomic_long_unchecked_t set_context_option;
47819+ atomic_long_unchecked_t check_context_retarget_intr;
47820+ atomic_long_unchecked_t check_context_unload;
47821+ atomic_long_unchecked_t tlb_dropin;
47822+ atomic_long_unchecked_t tlb_preload_page;
47823+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47824+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47825+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47826+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47827+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47828+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47829+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47830+ atomic_long_unchecked_t tfh_stale_on_fault;
47831+ atomic_long_unchecked_t mmu_invalidate_range;
47832+ atomic_long_unchecked_t mmu_invalidate_page;
47833+ atomic_long_unchecked_t flush_tlb;
47834+ atomic_long_unchecked_t flush_tlb_gru;
47835+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47836+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47837
47838- atomic_long_t copy_gpa;
47839- atomic_long_t read_gpa;
47840+ atomic_long_unchecked_t copy_gpa;
47841+ atomic_long_unchecked_t read_gpa;
47842
47843- atomic_long_t mesq_receive;
47844- atomic_long_t mesq_receive_none;
47845- atomic_long_t mesq_send;
47846- atomic_long_t mesq_send_failed;
47847- atomic_long_t mesq_noop;
47848- atomic_long_t mesq_send_unexpected_error;
47849- atomic_long_t mesq_send_lb_overflow;
47850- atomic_long_t mesq_send_qlimit_reached;
47851- atomic_long_t mesq_send_amo_nacked;
47852- atomic_long_t mesq_send_put_nacked;
47853- atomic_long_t mesq_page_overflow;
47854- atomic_long_t mesq_qf_locked;
47855- atomic_long_t mesq_qf_noop_not_full;
47856- atomic_long_t mesq_qf_switch_head_failed;
47857- atomic_long_t mesq_qf_unexpected_error;
47858- atomic_long_t mesq_noop_unexpected_error;
47859- atomic_long_t mesq_noop_lb_overflow;
47860- atomic_long_t mesq_noop_qlimit_reached;
47861- atomic_long_t mesq_noop_amo_nacked;
47862- atomic_long_t mesq_noop_put_nacked;
47863- atomic_long_t mesq_noop_page_overflow;
47864+ atomic_long_unchecked_t mesq_receive;
47865+ atomic_long_unchecked_t mesq_receive_none;
47866+ atomic_long_unchecked_t mesq_send;
47867+ atomic_long_unchecked_t mesq_send_failed;
47868+ atomic_long_unchecked_t mesq_noop;
47869+ atomic_long_unchecked_t mesq_send_unexpected_error;
47870+ atomic_long_unchecked_t mesq_send_lb_overflow;
47871+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47872+ atomic_long_unchecked_t mesq_send_amo_nacked;
47873+ atomic_long_unchecked_t mesq_send_put_nacked;
47874+ atomic_long_unchecked_t mesq_page_overflow;
47875+ atomic_long_unchecked_t mesq_qf_locked;
47876+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47877+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47878+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47879+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47880+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47881+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47882+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47883+ atomic_long_unchecked_t mesq_noop_put_nacked;
47884+ atomic_long_unchecked_t mesq_noop_page_overflow;
47885
47886 };
47887
47888@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47889 tghop_invalidate, mcsop_last};
47890
47891 struct mcs_op_statistic {
47892- atomic_long_t count;
47893- atomic_long_t total;
47894+ atomic_long_unchecked_t count;
47895+ atomic_long_unchecked_t total;
47896 unsigned long max;
47897 };
47898
47899@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47900
47901 #define STAT(id) do { \
47902 if (gru_options & OPT_STATS) \
47903- atomic_long_inc(&gru_stats.id); \
47904+ atomic_long_inc_unchecked(&gru_stats.id); \
47905 } while (0)
47906
47907 #ifdef CONFIG_SGI_GRU_DEBUG
47908diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47909index c862cd4..0d176fe 100644
47910--- a/drivers/misc/sgi-xp/xp.h
47911+++ b/drivers/misc/sgi-xp/xp.h
47912@@ -288,7 +288,7 @@ struct xpc_interface {
47913 xpc_notify_func, void *);
47914 void (*received) (short, int, void *);
47915 enum xp_retval (*partid_to_nasids) (short, void *);
47916-};
47917+} __no_const;
47918
47919 extern struct xpc_interface xpc_interface;
47920
47921diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47922index 01be66d..e3a0c7e 100644
47923--- a/drivers/misc/sgi-xp/xp_main.c
47924+++ b/drivers/misc/sgi-xp/xp_main.c
47925@@ -78,13 +78,13 @@ xpc_notloaded(void)
47926 }
47927
47928 struct xpc_interface xpc_interface = {
47929- (void (*)(int))xpc_notloaded,
47930- (void (*)(int))xpc_notloaded,
47931- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47932- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47933+ .connect = (void (*)(int))xpc_notloaded,
47934+ .disconnect = (void (*)(int))xpc_notloaded,
47935+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47936+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47937 void *))xpc_notloaded,
47938- (void (*)(short, int, void *))xpc_notloaded,
47939- (enum xp_retval(*)(short, void *))xpc_notloaded
47940+ .received = (void (*)(short, int, void *))xpc_notloaded,
47941+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47942 };
47943 EXPORT_SYMBOL_GPL(xpc_interface);
47944
47945diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47946index b94d5f7..7f494c5 100644
47947--- a/drivers/misc/sgi-xp/xpc.h
47948+++ b/drivers/misc/sgi-xp/xpc.h
47949@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47950 void (*received_payload) (struct xpc_channel *, void *);
47951 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47952 };
47953+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47954
47955 /* struct xpc_partition act_state values (for XPC HB) */
47956
47957@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47958 /* found in xpc_main.c */
47959 extern struct device *xpc_part;
47960 extern struct device *xpc_chan;
47961-extern struct xpc_arch_operations xpc_arch_ops;
47962+extern xpc_arch_operations_no_const xpc_arch_ops;
47963 extern int xpc_disengage_timelimit;
47964 extern int xpc_disengage_timedout;
47965 extern int xpc_activate_IRQ_rcvd;
47966diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47967index 82dc574..8539ab2 100644
47968--- a/drivers/misc/sgi-xp/xpc_main.c
47969+++ b/drivers/misc/sgi-xp/xpc_main.c
47970@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47971 .notifier_call = xpc_system_die,
47972 };
47973
47974-struct xpc_arch_operations xpc_arch_ops;
47975+xpc_arch_operations_no_const xpc_arch_ops;
47976
47977 /*
47978 * Timer function to enforce the timelimit on the partition disengage.
47979@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47980
47981 if (((die_args->trapnr == X86_TRAP_MF) ||
47982 (die_args->trapnr == X86_TRAP_XF)) &&
47983- !user_mode_vm(die_args->regs))
47984+ !user_mode(die_args->regs))
47985 xpc_die_deactivate();
47986
47987 break;
47988diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47989index ed2e71a..54c498e 100644
47990--- a/drivers/mmc/card/block.c
47991+++ b/drivers/mmc/card/block.c
47992@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47993 if (idata->ic.postsleep_min_us)
47994 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47995
47996- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47997+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47998 err = -EFAULT;
47999 goto cmd_rel_host;
48000 }
48001diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
48002index 18c4afe..43be71e 100644
48003--- a/drivers/mmc/host/dw_mmc.h
48004+++ b/drivers/mmc/host/dw_mmc.h
48005@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
48006 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
48007 int (*parse_dt)(struct dw_mci *host);
48008 int (*execute_tuning)(struct dw_mci_slot *slot);
48009-};
48010+} __do_const;
48011 #endif /* _DW_MMC_H_ */
48012diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
48013index 7fe1619..ae0781b 100644
48014--- a/drivers/mmc/host/mmci.c
48015+++ b/drivers/mmc/host/mmci.c
48016@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
48017 mmc->caps |= MMC_CAP_CMD23;
48018
48019 if (variant->busy_detect) {
48020- mmci_ops.card_busy = mmci_card_busy;
48021+ pax_open_kernel();
48022+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
48023+ pax_close_kernel();
48024 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
48025 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
48026 mmc->max_busy_timeout = 0;
48027diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
48028index f84cfb0..aebe5d6 100644
48029--- a/drivers/mmc/host/omap_hsmmc.c
48030+++ b/drivers/mmc/host/omap_hsmmc.c
48031@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
48032
48033 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
48034 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
48035- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48036+ pax_open_kernel();
48037+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
48038+ pax_close_kernel();
48039 }
48040
48041 pm_runtime_enable(host->dev);
48042diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
48043index 10ef824..88461a2 100644
48044--- a/drivers/mmc/host/sdhci-esdhc-imx.c
48045+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
48046@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
48047 host->mmc->caps |= MMC_CAP_1_8V_DDR;
48048 }
48049
48050- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
48051- sdhci_esdhc_ops.platform_execute_tuning =
48052+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
48053+ pax_open_kernel();
48054+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
48055 esdhc_executing_tuning;
48056+ pax_close_kernel();
48057+ }
48058
48059 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
48060 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
48061diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
48062index c6d2dd7..81b1ca3 100644
48063--- a/drivers/mmc/host/sdhci-s3c.c
48064+++ b/drivers/mmc/host/sdhci-s3c.c
48065@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
48066 * we can use overriding functions instead of default.
48067 */
48068 if (sc->no_divider) {
48069- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48070- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48071- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48072+ pax_open_kernel();
48073+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
48074+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
48075+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
48076+ pax_close_kernel();
48077 }
48078
48079 /* It supports additional host capabilities if needed */
48080diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
48081index 423666b..81ff5eb 100644
48082--- a/drivers/mtd/chips/cfi_cmdset_0020.c
48083+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
48084@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
48085 size_t totlen = 0, thislen;
48086 int ret = 0;
48087 size_t buflen = 0;
48088- static char *buffer;
48089+ char *buffer;
48090
48091 if (!ECCBUF_SIZE) {
48092 /* We should fall back to a general writev implementation.
48093diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
48094index f44c606..aa4e804 100644
48095--- a/drivers/mtd/nand/denali.c
48096+++ b/drivers/mtd/nand/denali.c
48097@@ -24,6 +24,7 @@
48098 #include <linux/slab.h>
48099 #include <linux/mtd/mtd.h>
48100 #include <linux/module.h>
48101+#include <linux/slab.h>
48102
48103 #include "denali.h"
48104
48105diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48106index 33f3c3c..d6bbe6a 100644
48107--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48108+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
48109@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
48110
48111 /* first try to map the upper buffer directly */
48112 if (virt_addr_valid(this->upper_buf) &&
48113- !object_is_on_stack(this->upper_buf)) {
48114+ !object_starts_on_stack(this->upper_buf)) {
48115 sg_init_one(sgl, this->upper_buf, this->upper_len);
48116 ret = dma_map_sg(this->dev, sgl, 1, dr);
48117 if (ret == 0)
48118diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
48119index a5dfbfb..8042ab4 100644
48120--- a/drivers/mtd/nftlmount.c
48121+++ b/drivers/mtd/nftlmount.c
48122@@ -24,6 +24,7 @@
48123 #include <asm/errno.h>
48124 #include <linux/delay.h>
48125 #include <linux/slab.h>
48126+#include <linux/sched.h>
48127 #include <linux/mtd/mtd.h>
48128 #include <linux/mtd/nand.h>
48129 #include <linux/mtd/nftl.h>
48130diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
48131index c23184a..4115c41 100644
48132--- a/drivers/mtd/sm_ftl.c
48133+++ b/drivers/mtd/sm_ftl.c
48134@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
48135 #define SM_CIS_VENDOR_OFFSET 0x59
48136 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
48137 {
48138- struct attribute_group *attr_group;
48139+ attribute_group_no_const *attr_group;
48140 struct attribute **attributes;
48141 struct sm_sysfs_attribute *vendor_attribute;
48142 char *vendor;
48143diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
48144index 7b11243..b3278a3 100644
48145--- a/drivers/net/bonding/bond_netlink.c
48146+++ b/drivers/net/bonding/bond_netlink.c
48147@@ -585,7 +585,7 @@ nla_put_failure:
48148 return -EMSGSIZE;
48149 }
48150
48151-struct rtnl_link_ops bond_link_ops __read_mostly = {
48152+struct rtnl_link_ops bond_link_ops = {
48153 .kind = "bond",
48154 .priv_size = sizeof(struct bonding),
48155 .setup = bond_setup,
48156diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
48157index b3b922a..80bba38 100644
48158--- a/drivers/net/caif/caif_hsi.c
48159+++ b/drivers/net/caif/caif_hsi.c
48160@@ -1444,7 +1444,7 @@ err:
48161 return -ENODEV;
48162 }
48163
48164-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
48165+static struct rtnl_link_ops caif_hsi_link_ops = {
48166 .kind = "cfhsi",
48167 .priv_size = sizeof(struct cfhsi),
48168 .setup = cfhsi_setup,
48169diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
48170index 58808f65..0bdc7b3 100644
48171--- a/drivers/net/can/Kconfig
48172+++ b/drivers/net/can/Kconfig
48173@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
48174
48175 config CAN_FLEXCAN
48176 tristate "Support for Freescale FLEXCAN based chips"
48177- depends on ARM || PPC
48178+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
48179 ---help---
48180 Say Y here if you want to support for Freescale FlexCAN.
48181
48182diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
48183index b0f6924..59e9640 100644
48184--- a/drivers/net/can/dev.c
48185+++ b/drivers/net/can/dev.c
48186@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
48187 return -EOPNOTSUPP;
48188 }
48189
48190-static struct rtnl_link_ops can_link_ops __read_mostly = {
48191+static struct rtnl_link_ops can_link_ops = {
48192 .kind = "can",
48193 .maxtype = IFLA_CAN_MAX,
48194 .policy = can_policy,
48195diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
48196index 674f367..ec3a31f 100644
48197--- a/drivers/net/can/vcan.c
48198+++ b/drivers/net/can/vcan.c
48199@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
48200 dev->destructor = free_netdev;
48201 }
48202
48203-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
48204+static struct rtnl_link_ops vcan_link_ops = {
48205 .kind = "vcan",
48206 .setup = vcan_setup,
48207 };
48208diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
48209index 49adbf1..fff7ff8 100644
48210--- a/drivers/net/dummy.c
48211+++ b/drivers/net/dummy.c
48212@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
48213 return 0;
48214 }
48215
48216-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
48217+static struct rtnl_link_ops dummy_link_ops = {
48218 .kind = DRV_NAME,
48219 .setup = dummy_setup,
48220 .validate = dummy_validate,
48221diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
48222index 0443654..4f0aa18 100644
48223--- a/drivers/net/ethernet/8390/ax88796.c
48224+++ b/drivers/net/ethernet/8390/ax88796.c
48225@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
48226 if (ax->plat->reg_offsets)
48227 ei_local->reg_offset = ax->plat->reg_offsets;
48228 else {
48229+ resource_size_t _mem_size = mem_size;
48230+ do_div(_mem_size, 0x18);
48231 ei_local->reg_offset = ax->reg_offsets;
48232 for (ret = 0; ret < 0x18; ret++)
48233- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
48234+ ax->reg_offsets[ret] = _mem_size * ret;
48235 }
48236
48237 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
48238diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
48239index 6725dc0..163549c 100644
48240--- a/drivers/net/ethernet/altera/altera_tse_main.c
48241+++ b/drivers/net/ethernet/altera/altera_tse_main.c
48242@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
48243 return 0;
48244 }
48245
48246-static struct net_device_ops altera_tse_netdev_ops = {
48247+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
48248 .ndo_open = tse_open,
48249 .ndo_stop = tse_shutdown,
48250 .ndo_start_xmit = tse_start_xmit,
48251@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
48252 ndev->netdev_ops = &altera_tse_netdev_ops;
48253 altera_tse_set_ethtool_ops(ndev);
48254
48255+ pax_open_kernel();
48256 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
48257
48258 if (priv->hash_filter)
48259 altera_tse_netdev_ops.ndo_set_rx_mode =
48260 tse_set_rx_mode_hashfilter;
48261+ pax_close_kernel();
48262
48263 /* Scatter/gather IO is not supported,
48264 * so it is turned off
48265diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48266index 29a0927..5a348e24 100644
48267--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48268+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
48269@@ -1122,14 +1122,14 @@ do { \
48270 * operations, everything works on mask values.
48271 */
48272 #define XMDIO_READ(_pdata, _mmd, _reg) \
48273- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
48274+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
48275 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
48276
48277 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
48278 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
48279
48280 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
48281- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
48282+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
48283 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
48284
48285 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
48286diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48287index 8a50b01..39c1ad0 100644
48288--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48289+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
48290@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
48291
48292 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
48293
48294- pdata->hw_if.config_dcb_tc(pdata);
48295+ pdata->hw_if->config_dcb_tc(pdata);
48296
48297 return 0;
48298 }
48299@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48300
48301 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48302
48303- pdata->hw_if.config_dcb_pfc(pdata);
48304+ pdata->hw_if->config_dcb_pfc(pdata);
48305
48306 return 0;
48307 }
48308diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48309index d81fc6b..6f8ab25 100644
48310--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48311+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48312@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48313
48314 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48315 {
48316- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48317+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48318 struct xgbe_channel *channel;
48319 struct xgbe_ring *ring;
48320 struct xgbe_ring_data *rdata;
48321@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48322
48323 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48324 {
48325- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48326+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48327 struct xgbe_channel *channel;
48328 struct xgbe_ring *ring;
48329 struct xgbe_ring_desc *rdesc;
48330@@ -620,17 +620,12 @@ err_out:
48331 return 0;
48332 }
48333
48334-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48335-{
48336- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48337-
48338- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48339- desc_if->free_ring_resources = xgbe_free_ring_resources;
48340- desc_if->map_tx_skb = xgbe_map_tx_skb;
48341- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48342- desc_if->unmap_rdata = xgbe_unmap_rdata;
48343- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48344- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48345-
48346- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48347-}
48348+const struct xgbe_desc_if default_xgbe_desc_if = {
48349+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48350+ .free_ring_resources = xgbe_free_ring_resources,
48351+ .map_tx_skb = xgbe_map_tx_skb,
48352+ .map_rx_buffer = xgbe_map_rx_buffer,
48353+ .unmap_rdata = xgbe_unmap_rdata,
48354+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48355+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48356+};
48357diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48358index 400757b..d8c53f6 100644
48359--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48360+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48361@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48362
48363 static int xgbe_init(struct xgbe_prv_data *pdata)
48364 {
48365- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48366+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48367 int ret;
48368
48369 DBGPR("-->xgbe_init\n");
48370@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48371 return 0;
48372 }
48373
48374-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48375-{
48376- DBGPR("-->xgbe_init_function_ptrs\n");
48377-
48378- hw_if->tx_complete = xgbe_tx_complete;
48379-
48380- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
48381- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
48382- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
48383- hw_if->set_mac_address = xgbe_set_mac_address;
48384-
48385- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48386- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48387-
48388- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48389- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48390- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48391- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48392- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48393-
48394- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48395- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48396-
48397- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48398- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48399- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48400-
48401- hw_if->enable_tx = xgbe_enable_tx;
48402- hw_if->disable_tx = xgbe_disable_tx;
48403- hw_if->enable_rx = xgbe_enable_rx;
48404- hw_if->disable_rx = xgbe_disable_rx;
48405-
48406- hw_if->powerup_tx = xgbe_powerup_tx;
48407- hw_if->powerdown_tx = xgbe_powerdown_tx;
48408- hw_if->powerup_rx = xgbe_powerup_rx;
48409- hw_if->powerdown_rx = xgbe_powerdown_rx;
48410-
48411- hw_if->dev_xmit = xgbe_dev_xmit;
48412- hw_if->dev_read = xgbe_dev_read;
48413- hw_if->enable_int = xgbe_enable_int;
48414- hw_if->disable_int = xgbe_disable_int;
48415- hw_if->init = xgbe_init;
48416- hw_if->exit = xgbe_exit;
48417+const struct xgbe_hw_if default_xgbe_hw_if = {
48418+ .tx_complete = xgbe_tx_complete,
48419+
48420+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
48421+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
48422+ .add_mac_addresses = xgbe_add_mac_addresses,
48423+ .set_mac_address = xgbe_set_mac_address,
48424+
48425+ .enable_rx_csum = xgbe_enable_rx_csum,
48426+ .disable_rx_csum = xgbe_disable_rx_csum,
48427+
48428+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48429+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48430+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48431+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48432+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48433+
48434+ .read_mmd_regs = xgbe_read_mmd_regs,
48435+ .write_mmd_regs = xgbe_write_mmd_regs,
48436+
48437+ .set_gmii_speed = xgbe_set_gmii_speed,
48438+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48439+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48440+
48441+ .enable_tx = xgbe_enable_tx,
48442+ .disable_tx = xgbe_disable_tx,
48443+ .enable_rx = xgbe_enable_rx,
48444+ .disable_rx = xgbe_disable_rx,
48445+
48446+ .powerup_tx = xgbe_powerup_tx,
48447+ .powerdown_tx = xgbe_powerdown_tx,
48448+ .powerup_rx = xgbe_powerup_rx,
48449+ .powerdown_rx = xgbe_powerdown_rx,
48450+
48451+ .dev_xmit = xgbe_dev_xmit,
48452+ .dev_read = xgbe_dev_read,
48453+ .enable_int = xgbe_enable_int,
48454+ .disable_int = xgbe_disable_int,
48455+ .init = xgbe_init,
48456+ .exit = xgbe_exit,
48457
48458 /* Descriptor related Sequences have to be initialized here */
48459- hw_if->tx_desc_init = xgbe_tx_desc_init;
48460- hw_if->rx_desc_init = xgbe_rx_desc_init;
48461- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48462- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48463- hw_if->is_last_desc = xgbe_is_last_desc;
48464- hw_if->is_context_desc = xgbe_is_context_desc;
48465- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48466+ .tx_desc_init = xgbe_tx_desc_init,
48467+ .rx_desc_init = xgbe_rx_desc_init,
48468+ .tx_desc_reset = xgbe_tx_desc_reset,
48469+ .rx_desc_reset = xgbe_rx_desc_reset,
48470+ .is_last_desc = xgbe_is_last_desc,
48471+ .is_context_desc = xgbe_is_context_desc,
48472+ .tx_start_xmit = xgbe_tx_start_xmit,
48473
48474 /* For FLOW ctrl */
48475- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48476- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48477+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48478+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48479
48480 /* For RX coalescing */
48481- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48482- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48483- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48484- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48485+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48486+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48487+ .usec_to_riwt = xgbe_usec_to_riwt,
48488+ .riwt_to_usec = xgbe_riwt_to_usec,
48489
48490 /* For RX and TX threshold config */
48491- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48492- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48493+ .config_rx_threshold = xgbe_config_rx_threshold,
48494+ .config_tx_threshold = xgbe_config_tx_threshold,
48495
48496 /* For RX and TX Store and Forward Mode config */
48497- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48498- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48499+ .config_rsf_mode = xgbe_config_rsf_mode,
48500+ .config_tsf_mode = xgbe_config_tsf_mode,
48501
48502 /* For TX DMA Operating on Second Frame config */
48503- hw_if->config_osp_mode = xgbe_config_osp_mode;
48504+ .config_osp_mode = xgbe_config_osp_mode,
48505
48506 /* For RX and TX PBL config */
48507- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48508- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48509- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48510- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48511- hw_if->config_pblx8 = xgbe_config_pblx8;
48512+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48513+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48514+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48515+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48516+ .config_pblx8 = xgbe_config_pblx8,
48517
48518 /* For MMC statistics support */
48519- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48520- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48521- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48522+ .tx_mmc_int = xgbe_tx_mmc_int,
48523+ .rx_mmc_int = xgbe_rx_mmc_int,
48524+ .read_mmc_stats = xgbe_read_mmc_stats,
48525
48526 /* For PTP config */
48527- hw_if->config_tstamp = xgbe_config_tstamp;
48528- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48529- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48530- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48531- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48532+ .config_tstamp = xgbe_config_tstamp,
48533+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48534+ .set_tstamp_time = xgbe_set_tstamp_time,
48535+ .get_tstamp_time = xgbe_get_tstamp_time,
48536+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48537
48538 /* For Data Center Bridging config */
48539- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48540- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48541+ .config_dcb_tc = xgbe_config_dcb_tc,
48542+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48543
48544 /* For Receive Side Scaling */
48545- hw_if->enable_rss = xgbe_enable_rss;
48546- hw_if->disable_rss = xgbe_disable_rss;
48547- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48548- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48549-
48550- DBGPR("<--xgbe_init_function_ptrs\n");
48551-}
48552+ .enable_rss = xgbe_enable_rss,
48553+ .disable_rss = xgbe_disable_rss,
48554+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48555+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48556+};
48557diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48558index 885b02b..4b31a4c 100644
48559--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48560+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48561@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48562 * support, tell it now
48563 */
48564 if (ring->tx.xmit_more)
48565- pdata->hw_if.tx_start_xmit(channel, ring);
48566+ pdata->hw_if->tx_start_xmit(channel, ring);
48567
48568 return NETDEV_TX_BUSY;
48569 }
48570@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48571
48572 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48573 {
48574- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48575+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48576 struct xgbe_channel *channel;
48577 enum xgbe_int int_id;
48578 unsigned int i;
48579@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48580
48581 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48582 {
48583- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48584+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48585 struct xgbe_channel *channel;
48586 enum xgbe_int int_id;
48587 unsigned int i;
48588@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48589 static irqreturn_t xgbe_isr(int irq, void *data)
48590 {
48591 struct xgbe_prv_data *pdata = data;
48592- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48593+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48594 struct xgbe_channel *channel;
48595 unsigned int dma_isr, dma_ch_isr;
48596 unsigned int mac_isr, mac_tssr;
48597@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48598
48599 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48600 {
48601- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48602+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48603
48604 DBGPR("-->xgbe_init_tx_coalesce\n");
48605
48606@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48607
48608 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48609 {
48610- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48611+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48612
48613 DBGPR("-->xgbe_init_rx_coalesce\n");
48614
48615@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48616
48617 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48618 {
48619- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48620+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48621 struct xgbe_channel *channel;
48622 struct xgbe_ring *ring;
48623 struct xgbe_ring_data *rdata;
48624@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48625
48626 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48627 {
48628- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48629+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48630 struct xgbe_channel *channel;
48631 struct xgbe_ring *ring;
48632 struct xgbe_ring_data *rdata;
48633@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48634 static void xgbe_adjust_link(struct net_device *netdev)
48635 {
48636 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48637- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48638+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48639 struct phy_device *phydev = pdata->phydev;
48640 int new_state = 0;
48641
48642@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48643 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
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 unsigned long flags;
48649
48650 DBGPR("-->xgbe_powerdown\n");
48651@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48652 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
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 unsigned long flags;
48658
48659 DBGPR("-->xgbe_powerup\n");
48660@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48661
48662 static int xgbe_start(struct xgbe_prv_data *pdata)
48663 {
48664- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48665+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48666 struct net_device *netdev = pdata->netdev;
48667 int ret;
48668
48669@@ -976,7 +976,7 @@ err_napi:
48670
48671 static void xgbe_stop(struct xgbe_prv_data *pdata)
48672 {
48673- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48674+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48675 struct xgbe_channel *channel;
48676 struct net_device *netdev = pdata->netdev;
48677 struct netdev_queue *txq;
48678@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48679 return -ERANGE;
48680 }
48681
48682- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48683+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48684
48685 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48686
48687@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48688 static int xgbe_open(struct net_device *netdev)
48689 {
48690 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48691- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48692+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48693 int ret;
48694
48695 DBGPR("-->xgbe_open\n");
48696@@ -1424,7 +1424,7 @@ err_phy_init:
48697 static int xgbe_close(struct net_device *netdev)
48698 {
48699 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48700- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48701+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48702
48703 DBGPR("-->xgbe_close\n");
48704
48705@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48706 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48707 {
48708 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48709- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48710- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48711+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48712+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48713 struct xgbe_channel *channel;
48714 struct xgbe_ring *ring;
48715 struct xgbe_packet_data *packet;
48716@@ -1521,7 +1521,7 @@ tx_netdev_return:
48717 static void xgbe_set_rx_mode(struct net_device *netdev)
48718 {
48719 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48720- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48721+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48722 unsigned int pr_mode, am_mode;
48723
48724 DBGPR("-->xgbe_set_rx_mode\n");
48725@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48726 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48727 {
48728 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48729- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48730+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48731 struct sockaddr *saddr = addr;
48732
48733 DBGPR("-->xgbe_set_mac_address\n");
48734@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48735
48736 DBGPR("-->%s\n", __func__);
48737
48738- pdata->hw_if.read_mmc_stats(pdata);
48739+ pdata->hw_if->read_mmc_stats(pdata);
48740
48741 s->rx_packets = pstats->rxframecount_gb;
48742 s->rx_bytes = pstats->rxoctetcount_gb;
48743@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48744 u16 vid)
48745 {
48746 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48747- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48748+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48749
48750 DBGPR("-->%s\n", __func__);
48751
48752@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48753 u16 vid)
48754 {
48755 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48756- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48757+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48758
48759 DBGPR("-->%s\n", __func__);
48760
48761@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48762 netdev_features_t features)
48763 {
48764 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48765- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48766+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48767 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48768 int ret = 0;
48769
48770@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48771 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48772 {
48773 struct xgbe_prv_data *pdata = channel->pdata;
48774- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48775- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48776+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48777+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48778 struct xgbe_ring *ring = channel->rx_ring;
48779 struct xgbe_ring_data *rdata;
48780
48781@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48782 static int xgbe_tx_poll(struct xgbe_channel *channel)
48783 {
48784 struct xgbe_prv_data *pdata = channel->pdata;
48785- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48786- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48787+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48788+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48789 struct xgbe_ring *ring = channel->tx_ring;
48790 struct xgbe_ring_data *rdata;
48791 struct xgbe_ring_desc *rdesc;
48792@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48793 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48794 {
48795 struct xgbe_prv_data *pdata = channel->pdata;
48796- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48797+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48798 struct xgbe_ring *ring = channel->rx_ring;
48799 struct xgbe_ring_data *rdata;
48800 struct xgbe_packet_data *packet;
48801diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48802index ebf4893..a8f51c6 100644
48803--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48804+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48805@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48806
48807 DBGPR("-->%s\n", __func__);
48808
48809- pdata->hw_if.read_mmc_stats(pdata);
48810+ pdata->hw_if->read_mmc_stats(pdata);
48811 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48812 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48813 *data++ = *(u64 *)stat;
48814@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48815 struct ethtool_coalesce *ec)
48816 {
48817 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48818- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48819+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48820 unsigned int riwt;
48821
48822 DBGPR("-->xgbe_get_coalesce\n");
48823@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48824 struct ethtool_coalesce *ec)
48825 {
48826 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48827- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48828+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48829 unsigned int rx_frames, rx_riwt, rx_usecs;
48830 unsigned int tx_frames, tx_usecs;
48831
48832@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48833 const u8 *key, const u8 hfunc)
48834 {
48835 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48836- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48837+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48838 unsigned int ret;
48839
48840 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48841diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48842index 32dd651..225cca3 100644
48843--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48844+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48845@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48846 DBGPR("<--xgbe_default_config\n");
48847 }
48848
48849-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48850-{
48851- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48852- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48853-}
48854-
48855 #ifdef CONFIG_ACPI
48856 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48857 {
48858@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48859 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48860
48861 /* Set all the function pointers */
48862- xgbe_init_all_fptrs(pdata);
48863- hw_if = &pdata->hw_if;
48864- desc_if = &pdata->desc_if;
48865+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48866+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48867
48868 /* Issue software reset to device */
48869 hw_if->exit(pdata);
48870diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48871index 59e267f..0842a88 100644
48872--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48873+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48874@@ -126,7 +126,7 @@
48875 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48876 {
48877 struct xgbe_prv_data *pdata = mii->priv;
48878- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48879+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48880 int mmd_data;
48881
48882 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48883@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48884 u16 mmd_val)
48885 {
48886 struct xgbe_prv_data *pdata = mii->priv;
48887- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48888+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48889 int mmd_data = mmd_val;
48890
48891 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48892diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48893index f326178..8bd7daf 100644
48894--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48895+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48896@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48897 tstamp_cc);
48898 u64 nsec;
48899
48900- nsec = pdata->hw_if.get_tstamp_time(pdata);
48901+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48902
48903 return nsec;
48904 }
48905@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48906
48907 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48908
48909- pdata->hw_if.update_tstamp_addend(pdata, addend);
48910+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48911
48912 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48913
48914diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48915index 13e8f95..1d8beef 100644
48916--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48917+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48918@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48919 int dev_irq;
48920 unsigned int per_channel_irq;
48921
48922- struct xgbe_hw_if hw_if;
48923- struct xgbe_desc_if desc_if;
48924+ struct xgbe_hw_if *hw_if;
48925+ struct xgbe_desc_if *desc_if;
48926
48927 /* AXI DMA settings */
48928 unsigned int coherent;
48929@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48930 #endif
48931 };
48932
48933+extern const struct xgbe_hw_if default_xgbe_hw_if;
48934+extern const struct xgbe_desc_if default_xgbe_desc_if;
48935+
48936 /* Function prototypes*/
48937
48938 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48939diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48940index adcacda..fa6e0ae 100644
48941--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48942+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48943@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48944 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48945 {
48946 /* RX_MODE controlling object */
48947- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48948+ bnx2x_init_rx_mode_obj(bp);
48949
48950 /* multicast configuration controlling object */
48951 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48952diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48953index 07cdf9b..b08ecc7 100644
48954--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48955+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48956@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48957 return rc;
48958 }
48959
48960-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48961- struct bnx2x_rx_mode_obj *o)
48962+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48963 {
48964 if (CHIP_IS_E1x(bp)) {
48965- o->wait_comp = bnx2x_empty_rx_mode_wait;
48966- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48967+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48968+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48969 } else {
48970- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48971- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48972+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48973+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48974 }
48975 }
48976
48977diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48978index 86baecb..ff3bb46 100644
48979--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48980+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48981@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48982
48983 /********************* RX MODE ****************/
48984
48985-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48986- struct bnx2x_rx_mode_obj *o);
48987+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48988
48989 /**
48990 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48991diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48992index 31c9f82..e65e986 100644
48993--- a/drivers/net/ethernet/broadcom/tg3.h
48994+++ b/drivers/net/ethernet/broadcom/tg3.h
48995@@ -150,6 +150,7 @@
48996 #define CHIPREV_ID_5750_A0 0x4000
48997 #define CHIPREV_ID_5750_A1 0x4001
48998 #define CHIPREV_ID_5750_A3 0x4003
48999+#define CHIPREV_ID_5750_C1 0x4201
49000 #define CHIPREV_ID_5750_C2 0x4202
49001 #define CHIPREV_ID_5752_A0_HW 0x5000
49002 #define CHIPREV_ID_5752_A0 0x6000
49003diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
49004index 903466e..b285864 100644
49005--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
49006+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
49007@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
49008 }
49009
49010 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
49011- bna_cb_ioceth_enable,
49012- bna_cb_ioceth_disable,
49013- bna_cb_ioceth_hbfail,
49014- bna_cb_ioceth_reset
49015+ .enable_cbfn = bna_cb_ioceth_enable,
49016+ .disable_cbfn = bna_cb_ioceth_disable,
49017+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
49018+ .reset_cbfn = bna_cb_ioceth_reset
49019 };
49020
49021 static void bna_attr_init(struct bna_ioceth *ioceth)
49022diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49023index 8cffcdf..aadf043 100644
49024--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49025+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
49026@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
49027 */
49028 struct l2t_skb_cb {
49029 arp_failure_handler_func arp_failure_handler;
49030-};
49031+} __no_const;
49032
49033 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
49034
49035diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49036index d929951..a2c23f5 100644
49037--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49038+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
49039@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
49040
49041 int i;
49042 struct adapter *ap = netdev2adap(dev);
49043- static const unsigned int *reg_ranges;
49044+ const unsigned int *reg_ranges;
49045 int arr_size = 0, buf_size = 0;
49046
49047 if (is_t4(ap->params.chip)) {
49048diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
49049index badff18..e15c4ec 100644
49050--- a/drivers/net/ethernet/dec/tulip/de4x5.c
49051+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
49052@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49053 for (i=0; i<ETH_ALEN; i++) {
49054 tmp.addr[i] = dev->dev_addr[i];
49055 }
49056- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49057+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
49058 break;
49059
49060 case DE4X5_SET_HWADDR: /* Set the hardware address */
49061@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
49062 spin_lock_irqsave(&lp->lock, flags);
49063 memcpy(&statbuf, &lp->pktStats, ioc->len);
49064 spin_unlock_irqrestore(&lp->lock, flags);
49065- if (copy_to_user(ioc->data, &statbuf, ioc->len))
49066+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
49067 return -EFAULT;
49068 break;
49069 }
49070diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
49071index 893753f..3b5d790 100644
49072--- a/drivers/net/ethernet/emulex/benet/be_main.c
49073+++ b/drivers/net/ethernet/emulex/benet/be_main.c
49074@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
49075
49076 if (wrapped)
49077 newacc += 65536;
49078- ACCESS_ONCE(*acc) = newacc;
49079+ ACCESS_ONCE_RW(*acc) = newacc;
49080 }
49081
49082 static void populate_erx_stats(struct be_adapter *adapter,
49083diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
49084index 6d0c5d5..55be363 100644
49085--- a/drivers/net/ethernet/faraday/ftgmac100.c
49086+++ b/drivers/net/ethernet/faraday/ftgmac100.c
49087@@ -30,6 +30,8 @@
49088 #include <linux/netdevice.h>
49089 #include <linux/phy.h>
49090 #include <linux/platform_device.h>
49091+#include <linux/interrupt.h>
49092+#include <linux/irqreturn.h>
49093 #include <net/ip.h>
49094
49095 #include "ftgmac100.h"
49096diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
49097index dce5f7b..2433466 100644
49098--- a/drivers/net/ethernet/faraday/ftmac100.c
49099+++ b/drivers/net/ethernet/faraday/ftmac100.c
49100@@ -31,6 +31,8 @@
49101 #include <linux/module.h>
49102 #include <linux/netdevice.h>
49103 #include <linux/platform_device.h>
49104+#include <linux/interrupt.h>
49105+#include <linux/irqreturn.h>
49106
49107 #include "ftmac100.h"
49108
49109diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49110index fabcfa1..188fd22 100644
49111--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49112+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
49113@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
49114 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
49115
49116 /* Update the base adjustement value. */
49117- ACCESS_ONCE(pf->ptp_base_adj) = incval;
49118+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
49119 smp_mb(); /* Force the above update. */
49120 }
49121
49122diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49123index 79c00f5..8da39f6 100644
49124--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49125+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
49126@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
49127 }
49128
49129 /* update the base incval used to calculate frequency adjustment */
49130- ACCESS_ONCE(adapter->base_incval) = incval;
49131+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
49132 smp_mb();
49133
49134 /* need lock to prevent incorrect read while modifying cyclecounter */
49135diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49136index 8c234ec..757331f 100644
49137--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49138+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
49139@@ -468,8 +468,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
49140 wmb();
49141
49142 /* we want to dirty this cache line once */
49143- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
49144- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
49145+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
49146+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
49147
49148 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
49149
49150diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49151index 6223930..975033d 100644
49152--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
49153+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
49154@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49155 struct __vxge_hw_fifo *fifo;
49156 struct vxge_hw_fifo_config *config;
49157 u32 txdl_size, txdl_per_memblock;
49158- struct vxge_hw_mempool_cbs fifo_mp_callback;
49159+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
49160+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
49161+ };
49162+
49163 struct __vxge_hw_virtualpath *vpath;
49164
49165 if ((vp == NULL) || (attr == NULL)) {
49166@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
49167 goto exit;
49168 }
49169
49170- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
49171-
49172 fifo->mempool =
49173 __vxge_hw_mempool_create(vpath->hldev,
49174 fifo->config->memblock_size,
49175diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49176index 2bb48d5..d1a865d 100644
49177--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49178+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
49179@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
49180 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
49181 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
49182 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49183- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49184+ pax_open_kernel();
49185+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49186+ pax_close_kernel();
49187 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49188 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49189 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49190diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49191index be7d7a6..a8983f8 100644
49192--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49193+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49194@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49195 case QLCNIC_NON_PRIV_FUNC:
49196 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49197 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49198- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49199+ pax_open_kernel();
49200+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49201+ pax_close_kernel();
49202 break;
49203 case QLCNIC_PRIV_FUNC:
49204 ahw->op_mode = QLCNIC_PRIV_FUNC;
49205 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49206- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49207+ pax_open_kernel();
49208+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49209+ pax_close_kernel();
49210 break;
49211 case QLCNIC_MGMT_FUNC:
49212 ahw->op_mode = QLCNIC_MGMT_FUNC;
49213 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49214- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49215+ pax_open_kernel();
49216+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49217+ pax_close_kernel();
49218 break;
49219 default:
49220 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49221diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49222index 332bb8a..e6adcd1 100644
49223--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49224+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49225@@ -1285,7 +1285,7 @@ flash_temp:
49226 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49227 {
49228 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49229- static const struct qlcnic_dump_operations *fw_dump_ops;
49230+ const struct qlcnic_dump_operations *fw_dump_ops;
49231 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49232 u32 entry_offset, dump, no_entries, buf_offset = 0;
49233 int i, k, ops_cnt, ops_index, dump_size = 0;
49234diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49235index c70ab40..00b28e0 100644
49236--- a/drivers/net/ethernet/realtek/r8169.c
49237+++ b/drivers/net/ethernet/realtek/r8169.c
49238@@ -788,22 +788,22 @@ struct rtl8169_private {
49239 struct mdio_ops {
49240 void (*write)(struct rtl8169_private *, int, int);
49241 int (*read)(struct rtl8169_private *, int);
49242- } mdio_ops;
49243+ } __no_const mdio_ops;
49244
49245 struct pll_power_ops {
49246 void (*down)(struct rtl8169_private *);
49247 void (*up)(struct rtl8169_private *);
49248- } pll_power_ops;
49249+ } __no_const pll_power_ops;
49250
49251 struct jumbo_ops {
49252 void (*enable)(struct rtl8169_private *);
49253 void (*disable)(struct rtl8169_private *);
49254- } jumbo_ops;
49255+ } __no_const jumbo_ops;
49256
49257 struct csi_ops {
49258 void (*write)(struct rtl8169_private *, int, int);
49259 u32 (*read)(struct rtl8169_private *, int);
49260- } csi_ops;
49261+ } __no_const csi_ops;
49262
49263 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49264 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49265diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49266index 6b861e3..204ac86 100644
49267--- a/drivers/net/ethernet/sfc/ptp.c
49268+++ b/drivers/net/ethernet/sfc/ptp.c
49269@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49270 ptp->start.dma_addr);
49271
49272 /* Clear flag that signals MC ready */
49273- ACCESS_ONCE(*start) = 0;
49274+ ACCESS_ONCE_RW(*start) = 0;
49275 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49276 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49277 EFX_BUG_ON_PARANOID(rc);
49278diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
49279index 10b6173..b605dfd5 100644
49280--- a/drivers/net/ethernet/sfc/selftest.c
49281+++ b/drivers/net/ethernet/sfc/selftest.c
49282@@ -46,7 +46,7 @@ struct efx_loopback_payload {
49283 struct iphdr ip;
49284 struct udphdr udp;
49285 __be16 iteration;
49286- const char msg[64];
49287+ char msg[64];
49288 } __packed;
49289
49290 /* Loopback test source MAC address */
49291diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49292index 08c483b..2c4a553 100644
49293--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49294+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49295@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49296
49297 writel(value, ioaddr + MMC_CNTRL);
49298
49299- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49300- MMC_CNTRL, value);
49301+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49302+// MMC_CNTRL, value);
49303 }
49304
49305 /* To mask all all interrupts.*/
49306diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49307index 17e2766..c332f1e 100644
49308--- a/drivers/net/ethernet/via/via-rhine.c
49309+++ b/drivers/net/ethernet/via/via-rhine.c
49310@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
49311 }
49312 };
49313
49314-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49315+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49316 {
49317 .ident = "EPIA-M",
49318 .matches = {
49319diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49320index 384ca4f..dd7d4f9 100644
49321--- a/drivers/net/hyperv/hyperv_net.h
49322+++ b/drivers/net/hyperv/hyperv_net.h
49323@@ -171,7 +171,7 @@ struct rndis_device {
49324 enum rndis_device_state state;
49325 bool link_state;
49326 bool link_change;
49327- atomic_t new_req_id;
49328+ atomic_unchecked_t new_req_id;
49329
49330 spinlock_t request_lock;
49331 struct list_head req_list;
49332diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49333index 7816d98..7890614 100644
49334--- a/drivers/net/hyperv/rndis_filter.c
49335+++ b/drivers/net/hyperv/rndis_filter.c
49336@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49337 * template
49338 */
49339 set = &rndis_msg->msg.set_req;
49340- set->req_id = atomic_inc_return(&dev->new_req_id);
49341+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49342
49343 /* Add to the request list */
49344 spin_lock_irqsave(&dev->request_lock, flags);
49345@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49346
49347 /* Setup the rndis set */
49348 halt = &request->request_msg.msg.halt_req;
49349- halt->req_id = atomic_inc_return(&dev->new_req_id);
49350+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49351
49352 /* Ignore return since this msg is optional. */
49353 rndis_filter_send_request(dev, request);
49354diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49355index 34f846b..4a0d5b1 100644
49356--- a/drivers/net/ifb.c
49357+++ b/drivers/net/ifb.c
49358@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49359 return 0;
49360 }
49361
49362-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49363+static struct rtnl_link_ops ifb_link_ops = {
49364 .kind = "ifb",
49365 .priv_size = sizeof(struct ifb_private),
49366 .setup = ifb_setup,
49367diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49368index 1df38bd..4bc20b0 100644
49369--- a/drivers/net/macvlan.c
49370+++ b/drivers/net/macvlan.c
49371@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49372 free_nskb:
49373 kfree_skb(nskb);
49374 err:
49375- atomic_long_inc(&skb->dev->rx_dropped);
49376+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49377 }
49378
49379 static void macvlan_flush_sources(struct macvlan_port *port,
49380@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49381 int macvlan_link_register(struct rtnl_link_ops *ops)
49382 {
49383 /* common fields */
49384- ops->priv_size = sizeof(struct macvlan_dev);
49385- ops->validate = macvlan_validate;
49386- ops->maxtype = IFLA_MACVLAN_MAX;
49387- ops->policy = macvlan_policy;
49388- ops->changelink = macvlan_changelink;
49389- ops->get_size = macvlan_get_size;
49390- ops->fill_info = macvlan_fill_info;
49391+ pax_open_kernel();
49392+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49393+ *(void **)&ops->validate = macvlan_validate;
49394+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49395+ *(const void **)&ops->policy = macvlan_policy;
49396+ *(void **)&ops->changelink = macvlan_changelink;
49397+ *(void **)&ops->get_size = macvlan_get_size;
49398+ *(void **)&ops->fill_info = macvlan_fill_info;
49399+ pax_close_kernel();
49400
49401 return rtnl_link_register(ops);
49402 };
49403@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49404 return NOTIFY_DONE;
49405 }
49406
49407-static struct notifier_block macvlan_notifier_block __read_mostly = {
49408+static struct notifier_block macvlan_notifier_block = {
49409 .notifier_call = macvlan_device_event,
49410 };
49411
49412diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49413index 27ecc5c..f636328 100644
49414--- a/drivers/net/macvtap.c
49415+++ b/drivers/net/macvtap.c
49416@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49417 dev->tx_queue_len = TUN_READQ_SIZE;
49418 }
49419
49420-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49421+static struct rtnl_link_ops macvtap_link_ops = {
49422 .kind = "macvtap",
49423 .setup = macvtap_setup,
49424 .newlink = macvtap_newlink,
49425@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49426
49427 ret = 0;
49428 u = q->flags;
49429- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49430+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49431 put_user(u, &ifr->ifr_flags))
49432 ret = -EFAULT;
49433 macvtap_put_vlan(vlan);
49434@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49435 return NOTIFY_DONE;
49436 }
49437
49438-static struct notifier_block macvtap_notifier_block __read_mostly = {
49439+static struct notifier_block macvtap_notifier_block = {
49440 .notifier_call = macvtap_device_event,
49441 };
49442
49443diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49444index 34924df..a747360 100644
49445--- a/drivers/net/nlmon.c
49446+++ b/drivers/net/nlmon.c
49447@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49448 return 0;
49449 }
49450
49451-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49452+static struct rtnl_link_ops nlmon_link_ops = {
49453 .kind = "nlmon",
49454 .priv_size = sizeof(struct nlmon),
49455 .setup = nlmon_setup,
49456diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49457index bdfe51f..e7845c7 100644
49458--- a/drivers/net/phy/phy_device.c
49459+++ b/drivers/net/phy/phy_device.c
49460@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49461 * zero on success.
49462 *
49463 */
49464-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49465+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49466 struct phy_c45_device_ids *c45_ids) {
49467 int phy_reg;
49468 int i, reg_addr;
49469@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49470 * its return value is in turn returned.
49471 *
49472 */
49473-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49474+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49475 bool is_c45, struct phy_c45_device_ids *c45_ids)
49476 {
49477 int phy_reg;
49478@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49479 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49480 {
49481 struct phy_c45_device_ids c45_ids = {0};
49482- u32 phy_id = 0;
49483+ int phy_id = 0;
49484 int r;
49485
49486 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49487diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49488index 9d15566..5ad4ef6 100644
49489--- a/drivers/net/ppp/ppp_generic.c
49490+++ b/drivers/net/ppp/ppp_generic.c
49491@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49492 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49493 struct ppp_stats stats;
49494 struct ppp_comp_stats cstats;
49495- char *vers;
49496
49497 switch (cmd) {
49498 case SIOCGPPPSTATS:
49499@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49500 break;
49501
49502 case SIOCGPPPVER:
49503- vers = PPP_VERSION;
49504- if (copy_to_user(addr, vers, strlen(vers) + 1))
49505+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49506 break;
49507 err = 0;
49508 break;
49509diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49510index 079f7ad..b2a2bfa7 100644
49511--- a/drivers/net/slip/slhc.c
49512+++ b/drivers/net/slip/slhc.c
49513@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49514 register struct tcphdr *thp;
49515 register struct iphdr *ip;
49516 register struct cstate *cs;
49517- int len, hdrlen;
49518+ long len, hdrlen;
49519 unsigned char *cp = icp;
49520
49521 /* We've got a compressed packet; read the change byte */
49522diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49523index 7d39484..d58499d 100644
49524--- a/drivers/net/team/team.c
49525+++ b/drivers/net/team/team.c
49526@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
49527 return TEAM_DEFAULT_NUM_RX_QUEUES;
49528 }
49529
49530-static struct rtnl_link_ops team_link_ops __read_mostly = {
49531+static struct rtnl_link_ops team_link_ops = {
49532 .kind = DRV_NAME,
49533 .priv_size = sizeof(struct team),
49534 .setup = team_setup,
49535@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
49536 return NOTIFY_DONE;
49537 }
49538
49539-static struct notifier_block team_notifier_block __read_mostly = {
49540+static struct notifier_block team_notifier_block = {
49541 .notifier_call = team_device_event,
49542 };
49543
49544diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49545index 857dca4..642f532 100644
49546--- a/drivers/net/tun.c
49547+++ b/drivers/net/tun.c
49548@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49549 return -EINVAL;
49550 }
49551
49552-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49553+static struct rtnl_link_ops tun_link_ops = {
49554 .kind = DRV_NAME,
49555 .priv_size = sizeof(struct tun_struct),
49556 .setup = tun_setup,
49557@@ -1830,7 +1830,7 @@ unlock:
49558 }
49559
49560 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49561- unsigned long arg, int ifreq_len)
49562+ unsigned long arg, size_t ifreq_len)
49563 {
49564 struct tun_file *tfile = file->private_data;
49565 struct tun_struct *tun;
49566@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49567 int le;
49568 int ret;
49569
49570+ if (ifreq_len > sizeof ifr)
49571+ return -EFAULT;
49572+
49573 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49574 if (copy_from_user(&ifr, argp, ifreq_len))
49575 return -EFAULT;
49576diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49577index 778e915..58c4d95 100644
49578--- a/drivers/net/usb/hso.c
49579+++ b/drivers/net/usb/hso.c
49580@@ -70,7 +70,7 @@
49581 #include <asm/byteorder.h>
49582 #include <linux/serial_core.h>
49583 #include <linux/serial.h>
49584-
49585+#include <asm/local.h>
49586
49587 #define MOD_AUTHOR "Option Wireless"
49588 #define MOD_DESCRIPTION "USB High Speed Option driver"
49589@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49590 struct urb *urb;
49591
49592 urb = serial->rx_urb[0];
49593- if (serial->port.count > 0) {
49594+ if (atomic_read(&serial->port.count) > 0) {
49595 count = put_rxbuf_data(urb, serial);
49596 if (count == -1)
49597 return;
49598@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49599 DUMP1(urb->transfer_buffer, urb->actual_length);
49600
49601 /* Anyone listening? */
49602- if (serial->port.count == 0)
49603+ if (atomic_read(&serial->port.count) == 0)
49604 return;
49605
49606 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49607@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49608 tty_port_tty_set(&serial->port, tty);
49609
49610 /* check for port already opened, if not set the termios */
49611- serial->port.count++;
49612- if (serial->port.count == 1) {
49613+ if (atomic_inc_return(&serial->port.count) == 1) {
49614 serial->rx_state = RX_IDLE;
49615 /* Force default termio settings */
49616 _hso_serial_set_termios(tty, NULL);
49617@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49618 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49619 if (result) {
49620 hso_stop_serial_device(serial->parent);
49621- serial->port.count--;
49622+ atomic_dec(&serial->port.count);
49623 } else {
49624 kref_get(&serial->parent->ref);
49625 }
49626@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49627
49628 /* reset the rts and dtr */
49629 /* do the actual close */
49630- serial->port.count--;
49631+ atomic_dec(&serial->port.count);
49632
49633- if (serial->port.count <= 0) {
49634- serial->port.count = 0;
49635+ if (atomic_read(&serial->port.count) <= 0) {
49636+ atomic_set(&serial->port.count, 0);
49637 tty_port_tty_set(&serial->port, NULL);
49638 if (!usb_gone)
49639 hso_stop_serial_device(serial->parent);
49640@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49641
49642 /* the actual setup */
49643 spin_lock_irqsave(&serial->serial_lock, flags);
49644- if (serial->port.count)
49645+ if (atomic_read(&serial->port.count))
49646 _hso_serial_set_termios(tty, old);
49647 else
49648 tty->termios = *old;
49649@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49650 D1("Pending read interrupt on port %d\n", i);
49651 spin_lock(&serial->serial_lock);
49652 if (serial->rx_state == RX_IDLE &&
49653- serial->port.count > 0) {
49654+ atomic_read(&serial->port.count) > 0) {
49655 /* Setup and send a ctrl req read on
49656 * port i */
49657 if (!serial->rx_urb_filled[0]) {
49658@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49659 /* Start all serial ports */
49660 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49661 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49662- if (dev2ser(serial_table[i])->port.count) {
49663+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49664 result =
49665 hso_start_serial_device(serial_table[i], GFP_NOIO);
49666 hso_kick_transmit(dev2ser(serial_table[i]));
49667diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49668index 9f7c0ab..1577b4a 100644
49669--- a/drivers/net/usb/r8152.c
49670+++ b/drivers/net/usb/r8152.c
49671@@ -601,7 +601,7 @@ struct r8152 {
49672 void (*unload)(struct r8152 *);
49673 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49674 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49675- } rtl_ops;
49676+ } __no_const rtl_ops;
49677
49678 int intr_interval;
49679 u32 saved_wolopts;
49680diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49681index a2515887..6d13233 100644
49682--- a/drivers/net/usb/sierra_net.c
49683+++ b/drivers/net/usb/sierra_net.c
49684@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49685 /* atomic counter partially included in MAC address to make sure 2 devices
49686 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49687 */
49688-static atomic_t iface_counter = ATOMIC_INIT(0);
49689+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49690
49691 /*
49692 * SYNC Timer Delay definition used to set the expiry time
49693@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49694 dev->net->netdev_ops = &sierra_net_device_ops;
49695
49696 /* change MAC addr to include, ifacenum, and to be unique */
49697- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49698+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49699 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49700
49701 /* we will have to manufacture ethernet headers, prepare template */
49702diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
49703index 777757a..395a767 100644
49704--- a/drivers/net/usb/usbnet.c
49705+++ b/drivers/net/usb/usbnet.c
49706@@ -1285,7 +1285,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
49707 struct net_device *net)
49708 {
49709 struct usbnet *dev = netdev_priv(net);
49710- int length;
49711+ unsigned int length;
49712 struct urb *urb = NULL;
49713 struct skb_data *entry;
49714 struct driver_info *info = dev->driver_info;
49715@@ -1413,7 +1413,7 @@ not_drop:
49716 }
49717 } else
49718 netif_dbg(dev, tx_queued, dev->net,
49719- "> tx, len %d, type 0x%x\n", length, skb->protocol);
49720+ "> tx, len %u, type 0x%x\n", length, skb->protocol);
49721 #ifdef CONFIG_PM
49722 deferred:
49723 #endif
49724diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49725index 59b0e97..a6ed579 100644
49726--- a/drivers/net/virtio_net.c
49727+++ b/drivers/net/virtio_net.c
49728@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49729 #define RECEIVE_AVG_WEIGHT 64
49730
49731 /* Minimum alignment for mergeable packet buffers. */
49732-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49733+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49734
49735 #define VIRTNET_DRIVER_VERSION "1.0.0"
49736
49737diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49738index fceb637..37c70fd 100644
49739--- a/drivers/net/vxlan.c
49740+++ b/drivers/net/vxlan.c
49741@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49742 return vxlan->net;
49743 }
49744
49745-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49746+static struct rtnl_link_ops vxlan_link_ops = {
49747 .kind = "vxlan",
49748 .maxtype = IFLA_VXLAN_MAX,
49749 .policy = vxlan_policy,
49750@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49751 return NOTIFY_DONE;
49752 }
49753
49754-static struct notifier_block vxlan_notifier_block __read_mostly = {
49755+static struct notifier_block vxlan_notifier_block = {
49756 .notifier_call = vxlan_lowerdev_event,
49757 };
49758
49759diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49760index 5920c99..ff2e4a5 100644
49761--- a/drivers/net/wan/lmc/lmc_media.c
49762+++ b/drivers/net/wan/lmc/lmc_media.c
49763@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49764 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49765
49766 lmc_media_t lmc_ds3_media = {
49767- lmc_ds3_init, /* special media init stuff */
49768- lmc_ds3_default, /* reset to default state */
49769- lmc_ds3_set_status, /* reset status to state provided */
49770- lmc_dummy_set_1, /* set clock source */
49771- lmc_dummy_set2_1, /* set line speed */
49772- lmc_ds3_set_100ft, /* set cable length */
49773- lmc_ds3_set_scram, /* set scrambler */
49774- lmc_ds3_get_link_status, /* get link status */
49775- lmc_dummy_set_1, /* set link status */
49776- lmc_ds3_set_crc_length, /* set CRC length */
49777- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49778- lmc_ds3_watchdog
49779+ .init = lmc_ds3_init, /* special media init stuff */
49780+ .defaults = lmc_ds3_default, /* reset to default state */
49781+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49782+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49783+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49784+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49785+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49786+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49787+ .set_link_status = lmc_dummy_set_1, /* set link status */
49788+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49789+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49790+ .watchdog = lmc_ds3_watchdog
49791 };
49792
49793 lmc_media_t lmc_hssi_media = {
49794- lmc_hssi_init, /* special media init stuff */
49795- lmc_hssi_default, /* reset to default state */
49796- lmc_hssi_set_status, /* reset status to state provided */
49797- lmc_hssi_set_clock, /* set clock source */
49798- lmc_dummy_set2_1, /* set line speed */
49799- lmc_dummy_set_1, /* set cable length */
49800- lmc_dummy_set_1, /* set scrambler */
49801- lmc_hssi_get_link_status, /* get link status */
49802- lmc_hssi_set_link_status, /* set link status */
49803- lmc_hssi_set_crc_length, /* set CRC length */
49804- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49805- lmc_hssi_watchdog
49806+ .init = lmc_hssi_init, /* special media init stuff */
49807+ .defaults = lmc_hssi_default, /* reset to default state */
49808+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49809+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49810+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49811+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49812+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49813+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49814+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49815+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49816+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49817+ .watchdog = lmc_hssi_watchdog
49818 };
49819
49820-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49821- lmc_ssi_default, /* reset to default state */
49822- lmc_ssi_set_status, /* reset status to state provided */
49823- lmc_ssi_set_clock, /* set clock source */
49824- lmc_ssi_set_speed, /* set line speed */
49825- lmc_dummy_set_1, /* set cable length */
49826- lmc_dummy_set_1, /* set scrambler */
49827- lmc_ssi_get_link_status, /* get link status */
49828- lmc_ssi_set_link_status, /* set link status */
49829- lmc_ssi_set_crc_length, /* set CRC length */
49830- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49831- lmc_ssi_watchdog
49832+lmc_media_t lmc_ssi_media = {
49833+ .init = lmc_ssi_init, /* special media init stuff */
49834+ .defaults = lmc_ssi_default, /* reset to default state */
49835+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49836+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49837+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49838+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49839+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49840+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49841+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49842+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49843+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49844+ .watchdog = lmc_ssi_watchdog
49845 };
49846
49847 lmc_media_t lmc_t1_media = {
49848- lmc_t1_init, /* special media init stuff */
49849- lmc_t1_default, /* reset to default state */
49850- lmc_t1_set_status, /* reset status to state provided */
49851- lmc_t1_set_clock, /* set clock source */
49852- lmc_dummy_set2_1, /* set line speed */
49853- lmc_dummy_set_1, /* set cable length */
49854- lmc_dummy_set_1, /* set scrambler */
49855- lmc_t1_get_link_status, /* get link status */
49856- lmc_dummy_set_1, /* set link status */
49857- lmc_t1_set_crc_length, /* set CRC length */
49858- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49859- lmc_t1_watchdog
49860+ .init = lmc_t1_init, /* special media init stuff */
49861+ .defaults = lmc_t1_default, /* reset to default state */
49862+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49863+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49864+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49865+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49866+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49867+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49868+ .set_link_status = lmc_dummy_set_1, /* set link status */
49869+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49870+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49871+ .watchdog = lmc_t1_watchdog
49872 };
49873
49874 static void
49875diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49876index feacc3b..5bac0de 100644
49877--- a/drivers/net/wan/z85230.c
49878+++ b/drivers/net/wan/z85230.c
49879@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49880
49881 struct z8530_irqhandler z8530_sync =
49882 {
49883- z8530_rx,
49884- z8530_tx,
49885- z8530_status
49886+ .rx = z8530_rx,
49887+ .tx = z8530_tx,
49888+ .status = z8530_status
49889 };
49890
49891 EXPORT_SYMBOL(z8530_sync);
49892@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49893 }
49894
49895 static struct z8530_irqhandler z8530_dma_sync = {
49896- z8530_dma_rx,
49897- z8530_dma_tx,
49898- z8530_dma_status
49899+ .rx = z8530_dma_rx,
49900+ .tx = z8530_dma_tx,
49901+ .status = z8530_dma_status
49902 };
49903
49904 static struct z8530_irqhandler z8530_txdma_sync = {
49905- z8530_rx,
49906- z8530_dma_tx,
49907- z8530_dma_status
49908+ .rx = z8530_rx,
49909+ .tx = z8530_dma_tx,
49910+ .status = z8530_dma_status
49911 };
49912
49913 /**
49914@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49915
49916 struct z8530_irqhandler z8530_nop=
49917 {
49918- z8530_rx_clear,
49919- z8530_tx_clear,
49920- z8530_status_clear
49921+ .rx = z8530_rx_clear,
49922+ .tx = z8530_tx_clear,
49923+ .status = z8530_status_clear
49924 };
49925
49926
49927diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49928index 0b60295..b8bfa5b 100644
49929--- a/drivers/net/wimax/i2400m/rx.c
49930+++ b/drivers/net/wimax/i2400m/rx.c
49931@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49932 if (i2400m->rx_roq == NULL)
49933 goto error_roq_alloc;
49934
49935- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49936+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49937 GFP_KERNEL);
49938 if (rd == NULL) {
49939 result = -ENOMEM;
49940diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49941index e71a2ce..2268d61 100644
49942--- a/drivers/net/wireless/airo.c
49943+++ b/drivers/net/wireless/airo.c
49944@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49945 struct airo_info *ai = dev->ml_priv;
49946 int ridcode;
49947 int enabled;
49948- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49949+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49950 unsigned char *iobuf;
49951
49952 /* Only super-user can write RIDs */
49953diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49954index da92bfa..5a9001a 100644
49955--- a/drivers/net/wireless/at76c50x-usb.c
49956+++ b/drivers/net/wireless/at76c50x-usb.c
49957@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49958 }
49959
49960 /* Convert timeout from the DFU status to jiffies */
49961-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49962+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49963 {
49964 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49965 | (s->poll_timeout[1] << 8)
49966diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49967index 2fd9e18..3f55bdd 100644
49968--- a/drivers/net/wireless/ath/ath10k/htc.c
49969+++ b/drivers/net/wireless/ath/ath10k/htc.c
49970@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49971 /* registered target arrival callback from the HIF layer */
49972 int ath10k_htc_init(struct ath10k *ar)
49973 {
49974- struct ath10k_hif_cb htc_callbacks;
49975+ static struct ath10k_hif_cb htc_callbacks = {
49976+ .rx_completion = ath10k_htc_rx_completion_handler,
49977+ .tx_completion = ath10k_htc_tx_completion_handler,
49978+ };
49979 struct ath10k_htc_ep *ep = NULL;
49980 struct ath10k_htc *htc = &ar->htc;
49981
49982@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49983 ath10k_htc_reset_endpoint_states(htc);
49984
49985 /* setup HIF layer callbacks */
49986- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49987- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49988 htc->ar = ar;
49989
49990 /* Get HIF default pipe for HTC message exchange */
49991diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49992index 527179c..a890150 100644
49993--- a/drivers/net/wireless/ath/ath10k/htc.h
49994+++ b/drivers/net/wireless/ath/ath10k/htc.h
49995@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49996
49997 struct ath10k_htc_ops {
49998 void (*target_send_suspend_complete)(struct ath10k *ar);
49999-};
50000+} __no_const;
50001
50002 struct ath10k_htc_ep_ops {
50003 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
50004 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
50005 void (*ep_tx_credits)(struct ath10k *);
50006-};
50007+} __no_const;
50008
50009 /* service connection information */
50010 struct ath10k_htc_svc_conn_req {
50011diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50012index f816909..e56cd8b 100644
50013--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50014+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
50015@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50016 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
50017 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
50018
50019- ACCESS_ONCE(ads->ds_link) = i->link;
50020- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
50021+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
50022+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
50023
50024 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
50025 ctl6 = SM(i->keytype, AR_EncrType);
50026@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50027
50028 if ((i->is_first || i->is_last) &&
50029 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
50030- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
50031+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
50032 | set11nTries(i->rates, 1)
50033 | set11nTries(i->rates, 2)
50034 | set11nTries(i->rates, 3)
50035 | (i->dur_update ? AR_DurUpdateEna : 0)
50036 | SM(0, AR_BurstDur);
50037
50038- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
50039+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
50040 | set11nRate(i->rates, 1)
50041 | set11nRate(i->rates, 2)
50042 | set11nRate(i->rates, 3);
50043 } else {
50044- ACCESS_ONCE(ads->ds_ctl2) = 0;
50045- ACCESS_ONCE(ads->ds_ctl3) = 0;
50046+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
50047+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
50048 }
50049
50050 if (!i->is_first) {
50051- ACCESS_ONCE(ads->ds_ctl0) = 0;
50052- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50053- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50054+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
50055+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50056+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50057 return;
50058 }
50059
50060@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50061 break;
50062 }
50063
50064- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50065+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
50066 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50067 | SM(i->txpower[0], AR_XmitPower0)
50068 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50069@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50070 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
50071 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
50072
50073- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
50074- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
50075+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
50076+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
50077
50078 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
50079 return;
50080
50081- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50082+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
50083 | set11nPktDurRTSCTS(i->rates, 1);
50084
50085- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50086+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
50087 | set11nPktDurRTSCTS(i->rates, 3);
50088
50089- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50090+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
50091 | set11nRateFlags(i->rates, 1)
50092 | set11nRateFlags(i->rates, 2)
50093 | set11nRateFlags(i->rates, 3)
50094 | SM(i->rtscts_rate, AR_RTSCTSRate);
50095
50096- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50097- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50098- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50099+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
50100+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
50101+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
50102 }
50103
50104 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
50105diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50106index da84b70..83e4978 100644
50107--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50108+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
50109@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50110 (i->qcu << AR_TxQcuNum_S) | desc_len;
50111
50112 checksum += val;
50113- ACCESS_ONCE(ads->info) = val;
50114+ ACCESS_ONCE_RW(ads->info) = val;
50115
50116 checksum += i->link;
50117- ACCESS_ONCE(ads->link) = i->link;
50118+ ACCESS_ONCE_RW(ads->link) = i->link;
50119
50120 checksum += i->buf_addr[0];
50121- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
50122+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
50123 checksum += i->buf_addr[1];
50124- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50125+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50126 checksum += i->buf_addr[2];
50127- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50128+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50129 checksum += i->buf_addr[3];
50130- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50131+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50132
50133 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50134- ACCESS_ONCE(ads->ctl3) = val;
50135+ ACCESS_ONCE_RW(ads->ctl3) = val;
50136 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50137- ACCESS_ONCE(ads->ctl5) = val;
50138+ ACCESS_ONCE_RW(ads->ctl5) = val;
50139 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50140- ACCESS_ONCE(ads->ctl7) = val;
50141+ ACCESS_ONCE_RW(ads->ctl7) = val;
50142 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50143- ACCESS_ONCE(ads->ctl9) = val;
50144+ ACCESS_ONCE_RW(ads->ctl9) = val;
50145
50146 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50147- ACCESS_ONCE(ads->ctl10) = checksum;
50148+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50149
50150 if (i->is_first || i->is_last) {
50151- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50152+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50153 | set11nTries(i->rates, 1)
50154 | set11nTries(i->rates, 2)
50155 | set11nTries(i->rates, 3)
50156 | (i->dur_update ? AR_DurUpdateEna : 0)
50157 | SM(0, AR_BurstDur);
50158
50159- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50160+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50161 | set11nRate(i->rates, 1)
50162 | set11nRate(i->rates, 2)
50163 | set11nRate(i->rates, 3);
50164 } else {
50165- ACCESS_ONCE(ads->ctl13) = 0;
50166- ACCESS_ONCE(ads->ctl14) = 0;
50167+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50168+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50169 }
50170
50171 ads->ctl20 = 0;
50172@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50173
50174 ctl17 = SM(i->keytype, AR_EncrType);
50175 if (!i->is_first) {
50176- ACCESS_ONCE(ads->ctl11) = 0;
50177- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50178- ACCESS_ONCE(ads->ctl15) = 0;
50179- ACCESS_ONCE(ads->ctl16) = 0;
50180- ACCESS_ONCE(ads->ctl17) = ctl17;
50181- ACCESS_ONCE(ads->ctl18) = 0;
50182- ACCESS_ONCE(ads->ctl19) = 0;
50183+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50184+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50185+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50186+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50187+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50188+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50189+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50190 return;
50191 }
50192
50193- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50194+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50195 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50196 | SM(i->txpower[0], AR_XmitPower0)
50197 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50198@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50199 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50200 ctl12 |= SM(val, AR_PAPRDChainMask);
50201
50202- ACCESS_ONCE(ads->ctl12) = ctl12;
50203- ACCESS_ONCE(ads->ctl17) = ctl17;
50204+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50205+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50206
50207- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50208+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50209 | set11nPktDurRTSCTS(i->rates, 1);
50210
50211- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50212+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50213 | set11nPktDurRTSCTS(i->rates, 3);
50214
50215- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50216+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50217 | set11nRateFlags(i->rates, 1)
50218 | set11nRateFlags(i->rates, 2)
50219 | set11nRateFlags(i->rates, 3)
50220 | SM(i->rtscts_rate, AR_RTSCTSRate);
50221
50222- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50223+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50224
50225- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50226- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50227- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50228+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50229+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50230+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50231 }
50232
50233 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50234diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50235index e82e570..8c3cf90 100644
50236--- a/drivers/net/wireless/ath/ath9k/hw.h
50237+++ b/drivers/net/wireless/ath/ath9k/hw.h
50238@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
50239
50240 /* ANI */
50241 void (*ani_cache_ini_regs)(struct ath_hw *ah);
50242-};
50243+} __no_const;
50244
50245 /**
50246 * struct ath_spec_scan - parameters for Atheros spectral scan
50247@@ -722,7 +722,7 @@ struct ath_hw_ops {
50248 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50249 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50250 #endif
50251-};
50252+} __no_const;
50253
50254 struct ath_nf_limits {
50255 s16 max;
50256diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50257index 9ede991..a8f08fb 100644
50258--- a/drivers/net/wireless/ath/ath9k/main.c
50259+++ b/drivers/net/wireless/ath/ath9k/main.c
50260@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
50261 if (!ath9k_is_chanctx_enabled())
50262 return;
50263
50264- ath9k_ops.hw_scan = ath9k_hw_scan;
50265- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50266- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50267- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50268- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50269- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50270- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50271- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50272- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50273- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50274+ pax_open_kernel();
50275+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50276+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50277+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50278+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50279+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50280+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50281+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50282+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50283+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50284+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50285+ pax_close_kernel();
50286 }
50287
50288 #endif
50289diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50290index 058a9f2..d5cb1ba 100644
50291--- a/drivers/net/wireless/b43/phy_lp.c
50292+++ b/drivers/net/wireless/b43/phy_lp.c
50293@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50294 {
50295 struct ssb_bus *bus = dev->dev->sdev->bus;
50296
50297- static const struct b206x_channel *chandata = NULL;
50298+ const struct b206x_channel *chandata = NULL;
50299 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50300 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50301 u16 old_comm15, scale;
50302diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50303index e566580..2c218ca 100644
50304--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50305+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50306@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50307 */
50308 if (il3945_mod_params.disable_hw_scan) {
50309 D_INFO("Disabling hw_scan\n");
50310- il3945_mac_ops.hw_scan = NULL;
50311+ pax_open_kernel();
50312+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50313+ pax_close_kernel();
50314 }
50315
50316 D_INFO("*** LOAD DRIVER ***\n");
50317diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50318index 0ffb6ff..c0b7f0e 100644
50319--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50320+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50321@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50322 {
50323 struct iwl_priv *priv = file->private_data;
50324 char buf[64];
50325- int buf_size;
50326+ size_t buf_size;
50327 u32 offset, len;
50328
50329 memset(buf, 0, sizeof(buf));
50330@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50331 struct iwl_priv *priv = file->private_data;
50332
50333 char buf[8];
50334- int buf_size;
50335+ size_t buf_size;
50336 u32 reset_flag;
50337
50338 memset(buf, 0, sizeof(buf));
50339@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50340 {
50341 struct iwl_priv *priv = file->private_data;
50342 char buf[8];
50343- int buf_size;
50344+ size_t buf_size;
50345 int ht40;
50346
50347 memset(buf, 0, sizeof(buf));
50348@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50349 {
50350 struct iwl_priv *priv = file->private_data;
50351 char buf[8];
50352- int buf_size;
50353+ size_t buf_size;
50354 int value;
50355
50356 memset(buf, 0, sizeof(buf));
50357@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50358 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50359 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50360
50361-static const char *fmt_value = " %-30s %10u\n";
50362-static const char *fmt_hex = " %-30s 0x%02X\n";
50363-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50364-static const char *fmt_header =
50365+static const char fmt_value[] = " %-30s %10u\n";
50366+static const char fmt_hex[] = " %-30s 0x%02X\n";
50367+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50368+static const char fmt_header[] =
50369 "%-32s current cumulative delta max\n";
50370
50371 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50372@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50373 {
50374 struct iwl_priv *priv = file->private_data;
50375 char buf[8];
50376- int buf_size;
50377+ size_t buf_size;
50378 int clear;
50379
50380 memset(buf, 0, sizeof(buf));
50381@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50382 {
50383 struct iwl_priv *priv = file->private_data;
50384 char buf[8];
50385- int buf_size;
50386+ size_t buf_size;
50387 int trace;
50388
50389 memset(buf, 0, sizeof(buf));
50390@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50391 {
50392 struct iwl_priv *priv = file->private_data;
50393 char buf[8];
50394- int buf_size;
50395+ size_t buf_size;
50396 int missed;
50397
50398 memset(buf, 0, sizeof(buf));
50399@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50400
50401 struct iwl_priv *priv = file->private_data;
50402 char buf[8];
50403- int buf_size;
50404+ size_t buf_size;
50405 int plcp;
50406
50407 memset(buf, 0, sizeof(buf));
50408@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50409
50410 struct iwl_priv *priv = file->private_data;
50411 char buf[8];
50412- int buf_size;
50413+ size_t buf_size;
50414 int flush;
50415
50416 memset(buf, 0, sizeof(buf));
50417@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50418
50419 struct iwl_priv *priv = file->private_data;
50420 char buf[8];
50421- int buf_size;
50422+ size_t buf_size;
50423 int rts;
50424
50425 if (!priv->cfg->ht_params)
50426@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50427 {
50428 struct iwl_priv *priv = file->private_data;
50429 char buf[8];
50430- int buf_size;
50431+ size_t buf_size;
50432
50433 memset(buf, 0, sizeof(buf));
50434 buf_size = min(count, sizeof(buf) - 1);
50435@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50436 struct iwl_priv *priv = file->private_data;
50437 u32 event_log_flag;
50438 char buf[8];
50439- int buf_size;
50440+ size_t buf_size;
50441
50442 /* check that the interface is up */
50443 if (!iwl_is_ready(priv))
50444@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50445 struct iwl_priv *priv = file->private_data;
50446 char buf[8];
50447 u32 calib_disabled;
50448- int buf_size;
50449+ size_t buf_size;
50450
50451 memset(buf, 0, sizeof(buf));
50452 buf_size = min(count, sizeof(buf) - 1);
50453diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50454index cb72edb..242b24f 100644
50455--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50456+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50457@@ -1837,7 +1837,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50458 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50459
50460 char buf[8];
50461- int buf_size;
50462+ size_t buf_size;
50463 u32 reset_flag;
50464
50465 memset(buf, 0, sizeof(buf));
50466@@ -1858,7 +1858,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50467 {
50468 struct iwl_trans *trans = file->private_data;
50469 char buf[8];
50470- int buf_size;
50471+ size_t buf_size;
50472 int csr;
50473
50474 memset(buf, 0, sizeof(buf));
50475diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50476index 8908be6..fe97ddd 100644
50477--- a/drivers/net/wireless/mac80211_hwsim.c
50478+++ b/drivers/net/wireless/mac80211_hwsim.c
50479@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
50480 if (channels < 1)
50481 return -EINVAL;
50482
50483- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50484- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50485- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50486- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50487- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50488- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50489- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50490- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50491- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50492- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50493- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50494- mac80211_hwsim_assign_vif_chanctx;
50495- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50496- mac80211_hwsim_unassign_vif_chanctx;
50497+ pax_open_kernel();
50498+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50499+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50500+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50501+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50502+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50503+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50504+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50505+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50506+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50507+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50508+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50509+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50510+ pax_close_kernel();
50511
50512 spin_lock_init(&hwsim_radio_lock);
50513 INIT_LIST_HEAD(&hwsim_radios);
50514diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50515index 60d44ce..884dd1c 100644
50516--- a/drivers/net/wireless/rndis_wlan.c
50517+++ b/drivers/net/wireless/rndis_wlan.c
50518@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50519
50520 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50521
50522- if (rts_threshold < 0 || rts_threshold > 2347)
50523+ if (rts_threshold > 2347)
50524 rts_threshold = 2347;
50525
50526 tmp = cpu_to_le32(rts_threshold);
50527diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50528index 9bb398b..b0cc047 100644
50529--- a/drivers/net/wireless/rt2x00/rt2x00.h
50530+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50531@@ -375,7 +375,7 @@ struct rt2x00_intf {
50532 * for hardware which doesn't support hardware
50533 * sequence counting.
50534 */
50535- atomic_t seqno;
50536+ atomic_unchecked_t seqno;
50537 };
50538
50539 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50540diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50541index 68b620b..92ecd9e 100644
50542--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50543+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50544@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50545 * sequence counter given by mac80211.
50546 */
50547 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50548- seqno = atomic_add_return(0x10, &intf->seqno);
50549+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50550 else
50551- seqno = atomic_read(&intf->seqno);
50552+ seqno = atomic_read_unchecked(&intf->seqno);
50553
50554 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50555 hdr->seq_ctrl |= cpu_to_le16(seqno);
50556diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50557index b661f896..ddf7d2b 100644
50558--- a/drivers/net/wireless/ti/wl1251/sdio.c
50559+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50560@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50561
50562 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50563
50564- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50565- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50566+ pax_open_kernel();
50567+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50568+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50569+ pax_close_kernel();
50570
50571 wl1251_info("using dedicated interrupt line");
50572 } else {
50573- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50574- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50575+ pax_open_kernel();
50576+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50577+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50578+ pax_close_kernel();
50579
50580 wl1251_info("using SDIO interrupt");
50581 }
50582diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50583index 144d1f8..7030936 100644
50584--- a/drivers/net/wireless/ti/wl12xx/main.c
50585+++ b/drivers/net/wireless/ti/wl12xx/main.c
50586@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50587 sizeof(wl->conf.mem));
50588
50589 /* read data preparation is only needed by wl127x */
50590- wl->ops->prepare_read = wl127x_prepare_read;
50591+ pax_open_kernel();
50592+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50593+ pax_close_kernel();
50594
50595 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50596 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50597@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50598 sizeof(wl->conf.mem));
50599
50600 /* read data preparation is only needed by wl127x */
50601- wl->ops->prepare_read = wl127x_prepare_read;
50602+ pax_open_kernel();
50603+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50604+ pax_close_kernel();
50605
50606 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50607 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50608diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50609index 717c4f5..a813aeb 100644
50610--- a/drivers/net/wireless/ti/wl18xx/main.c
50611+++ b/drivers/net/wireless/ti/wl18xx/main.c
50612@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50613 }
50614
50615 if (!checksum_param) {
50616- wl18xx_ops.set_rx_csum = NULL;
50617- wl18xx_ops.init_vif = NULL;
50618+ pax_open_kernel();
50619+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50620+ *(void **)&wl18xx_ops.init_vif = NULL;
50621+ pax_close_kernel();
50622 }
50623
50624 /* Enable 11a Band only if we have 5G antennas */
50625diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50626index a912dc0..a8225ba 100644
50627--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50628+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50629@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50630 {
50631 struct zd_usb *usb = urb->context;
50632 struct zd_usb_interrupt *intr = &usb->intr;
50633- int len;
50634+ unsigned int len;
50635 u16 int_num;
50636
50637 ZD_ASSERT(in_interrupt());
50638diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50639index ce2e2cf..f81e500 100644
50640--- a/drivers/nfc/nfcwilink.c
50641+++ b/drivers/nfc/nfcwilink.c
50642@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50643
50644 static int nfcwilink_probe(struct platform_device *pdev)
50645 {
50646- static struct nfcwilink *drv;
50647+ struct nfcwilink *drv;
50648 int rc;
50649 __u32 protocols;
50650
50651diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50652index 24d3d24..ff70d28 100644
50653--- a/drivers/nfc/st21nfca/st21nfca.c
50654+++ b/drivers/nfc/st21nfca/st21nfca.c
50655@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50656 goto exit;
50657 }
50658
50659- gate = uid_skb->data;
50660+ memcpy(gate, uid_skb->data, uid_skb->len);
50661 *len = uid_skb->len;
50662 exit:
50663 kfree_skb(uid_skb);
50664diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50665index 3a896c9..ac7b1c8 100644
50666--- a/drivers/of/fdt.c
50667+++ b/drivers/of/fdt.c
50668@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50669 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50670 return 0;
50671 }
50672- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50673+ pax_open_kernel();
50674+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50675+ pax_close_kernel();
50676 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50677 }
50678 late_initcall(of_fdt_raw_init);
50679diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50680index d93b2b6..ae50401 100644
50681--- a/drivers/oprofile/buffer_sync.c
50682+++ b/drivers/oprofile/buffer_sync.c
50683@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50684 if (cookie == NO_COOKIE)
50685 offset = pc;
50686 if (cookie == INVALID_COOKIE) {
50687- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50688+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50689 offset = pc;
50690 }
50691 if (cookie != last_cookie) {
50692@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50693 /* add userspace sample */
50694
50695 if (!mm) {
50696- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50697+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50698 return 0;
50699 }
50700
50701 cookie = lookup_dcookie(mm, s->eip, &offset);
50702
50703 if (cookie == INVALID_COOKIE) {
50704- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50705+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50706 return 0;
50707 }
50708
50709@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50710 /* ignore backtraces if failed to add a sample */
50711 if (state == sb_bt_start) {
50712 state = sb_bt_ignore;
50713- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50714+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50715 }
50716 }
50717 release_mm(mm);
50718diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50719index c0cc4e7..44d4e54 100644
50720--- a/drivers/oprofile/event_buffer.c
50721+++ b/drivers/oprofile/event_buffer.c
50722@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50723 }
50724
50725 if (buffer_pos == buffer_size) {
50726- atomic_inc(&oprofile_stats.event_lost_overflow);
50727+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50728 return;
50729 }
50730
50731diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50732index ed2c3ec..deda85a 100644
50733--- a/drivers/oprofile/oprof.c
50734+++ b/drivers/oprofile/oprof.c
50735@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50736 if (oprofile_ops.switch_events())
50737 return;
50738
50739- atomic_inc(&oprofile_stats.multiplex_counter);
50740+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50741 start_switch_worker();
50742 }
50743
50744diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50745index ee2cfce..7f8f699 100644
50746--- a/drivers/oprofile/oprofile_files.c
50747+++ b/drivers/oprofile/oprofile_files.c
50748@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50749
50750 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50751
50752-static ssize_t timeout_read(struct file *file, char __user *buf,
50753+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50754 size_t count, loff_t *offset)
50755 {
50756 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50757diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50758index 59659ce..6c860a0 100644
50759--- a/drivers/oprofile/oprofile_stats.c
50760+++ b/drivers/oprofile/oprofile_stats.c
50761@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50762 cpu_buf->sample_invalid_eip = 0;
50763 }
50764
50765- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50766- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50767- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50768- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50769- atomic_set(&oprofile_stats.multiplex_counter, 0);
50770+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50771+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50772+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50773+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50774+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50775 }
50776
50777
50778diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50779index 1fc622b..8c48fc3 100644
50780--- a/drivers/oprofile/oprofile_stats.h
50781+++ b/drivers/oprofile/oprofile_stats.h
50782@@ -13,11 +13,11 @@
50783 #include <linux/atomic.h>
50784
50785 struct oprofile_stat_struct {
50786- atomic_t sample_lost_no_mm;
50787- atomic_t sample_lost_no_mapping;
50788- atomic_t bt_lost_no_mapping;
50789- atomic_t event_lost_overflow;
50790- atomic_t multiplex_counter;
50791+ atomic_unchecked_t sample_lost_no_mm;
50792+ atomic_unchecked_t sample_lost_no_mapping;
50793+ atomic_unchecked_t bt_lost_no_mapping;
50794+ atomic_unchecked_t event_lost_overflow;
50795+ atomic_unchecked_t multiplex_counter;
50796 };
50797
50798 extern struct oprofile_stat_struct oprofile_stats;
50799diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50800index 3f49345..c750d0b 100644
50801--- a/drivers/oprofile/oprofilefs.c
50802+++ b/drivers/oprofile/oprofilefs.c
50803@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50804
50805 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50806 {
50807- atomic_t *val = file->private_data;
50808- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50809+ atomic_unchecked_t *val = file->private_data;
50810+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50811 }
50812
50813
50814@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50815
50816
50817 int oprofilefs_create_ro_atomic(struct dentry *root,
50818- char const *name, atomic_t *val)
50819+ char const *name, atomic_unchecked_t *val)
50820 {
50821 return __oprofilefs_create_file(root, name,
50822 &atomic_ro_fops, 0444, val);
50823diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50824index bdef916..88c7dee 100644
50825--- a/drivers/oprofile/timer_int.c
50826+++ b/drivers/oprofile/timer_int.c
50827@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50828 return NOTIFY_OK;
50829 }
50830
50831-static struct notifier_block __refdata oprofile_cpu_notifier = {
50832+static struct notifier_block oprofile_cpu_notifier = {
50833 .notifier_call = oprofile_cpu_notify,
50834 };
50835
50836diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50837index 3b47080..6cd05dd 100644
50838--- a/drivers/parport/procfs.c
50839+++ b/drivers/parport/procfs.c
50840@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50841
50842 *ppos += len;
50843
50844- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50845+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50846 }
50847
50848 #ifdef CONFIG_PARPORT_1284
50849@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50850
50851 *ppos += len;
50852
50853- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50854+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50855 }
50856 #endif /* IEEE1284.3 support. */
50857
50858diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50859index ba46e58..90cfc24 100644
50860--- a/drivers/pci/host/pci-host-generic.c
50861+++ b/drivers/pci/host/pci-host-generic.c
50862@@ -26,9 +26,9 @@
50863 #include <linux/platform_device.h>
50864
50865 struct gen_pci_cfg_bus_ops {
50866+ struct pci_ops ops;
50867 u32 bus_shift;
50868- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50869-};
50870+} __do_const;
50871
50872 struct gen_pci_cfg_windows {
50873 struct resource res;
50874@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50875 }
50876
50877 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50878+ .ops = {
50879+ .map_bus = gen_pci_map_cfg_bus_cam,
50880+ .read = pci_generic_config_read,
50881+ .write = pci_generic_config_write,
50882+ },
50883 .bus_shift = 16,
50884- .map_bus = gen_pci_map_cfg_bus_cam,
50885 };
50886
50887 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50888@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50889 }
50890
50891 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50892+ .ops = {
50893+ .map_bus = gen_pci_map_cfg_bus_ecam,
50894+ .read = pci_generic_config_read,
50895+ .write = pci_generic_config_write,
50896+ },
50897 .bus_shift = 20,
50898- .map_bus = gen_pci_map_cfg_bus_ecam,
50899-};
50900-
50901-static struct pci_ops gen_pci_ops = {
50902- .read = pci_generic_config_read,
50903- .write = pci_generic_config_write,
50904 };
50905
50906 static const struct of_device_id gen_pci_of_match[] = {
50907@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50908 .private_data = (void **)&pci,
50909 .setup = gen_pci_setup,
50910 .map_irq = of_irq_parse_and_map_pci,
50911- .ops = &gen_pci_ops,
50912 };
50913
50914 if (!pci)
50915@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50916
50917 of_id = of_match_node(gen_pci_of_match, np);
50918 pci->cfg.ops = of_id->data;
50919- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50920+ hw.ops = &pci->cfg.ops->ops;
50921 pci->host.dev.parent = dev;
50922 INIT_LIST_HEAD(&pci->host.windows);
50923 INIT_LIST_HEAD(&pci->resources);
50924diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50925index 6ca2399..68d866b 100644
50926--- a/drivers/pci/hotplug/acpiphp_ibm.c
50927+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50928@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50929 goto init_cleanup;
50930 }
50931
50932- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50933+ pax_open_kernel();
50934+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50935+ pax_close_kernel();
50936 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50937
50938 return retval;
50939diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50940index 66b7bbe..26bee78 100644
50941--- a/drivers/pci/hotplug/cpcihp_generic.c
50942+++ b/drivers/pci/hotplug/cpcihp_generic.c
50943@@ -73,7 +73,6 @@ static u16 port;
50944 static unsigned int enum_bit;
50945 static u8 enum_mask;
50946
50947-static struct cpci_hp_controller_ops generic_hpc_ops;
50948 static struct cpci_hp_controller generic_hpc;
50949
50950 static int __init validate_parameters(void)
50951@@ -139,6 +138,10 @@ static int query_enum(void)
50952 return ((value & enum_mask) == enum_mask);
50953 }
50954
50955+static struct cpci_hp_controller_ops generic_hpc_ops = {
50956+ .query_enum = query_enum,
50957+};
50958+
50959 static int __init cpcihp_generic_init(void)
50960 {
50961 int status;
50962@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50963 pci_dev_put(dev);
50964
50965 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50966- generic_hpc_ops.query_enum = query_enum;
50967 generic_hpc.ops = &generic_hpc_ops;
50968
50969 status = cpci_hp_register_controller(&generic_hpc);
50970diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50971index 7ecf34e..effed62 100644
50972--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50973+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50974@@ -59,7 +59,6 @@
50975 /* local variables */
50976 static bool debug;
50977 static bool poll;
50978-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50979 static struct cpci_hp_controller zt5550_hpc;
50980
50981 /* Primary cPCI bus bridge device */
50982@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50983 return 0;
50984 }
50985
50986+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50987+ .query_enum = zt5550_hc_query_enum,
50988+};
50989+
50990 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50991 {
50992 int status;
50993@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50994 dbg("returned from zt5550_hc_config");
50995
50996 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50997- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50998 zt5550_hpc.ops = &zt5550_hpc_ops;
50999 if (!poll) {
51000 zt5550_hpc.irq = hc_dev->irq;
51001 zt5550_hpc.irq_flags = IRQF_SHARED;
51002 zt5550_hpc.dev_id = hc_dev;
51003
51004- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51005- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51006- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51007+ pax_open_kernel();
51008+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
51009+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
51010+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
51011+ pax_open_kernel();
51012 } else {
51013 info("using ENUM# polling mode");
51014 }
51015diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
51016index 1e08ff8c..3cd145f 100644
51017--- a/drivers/pci/hotplug/cpqphp_nvram.c
51018+++ b/drivers/pci/hotplug/cpqphp_nvram.c
51019@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
51020
51021 void compaq_nvram_init (void __iomem *rom_start)
51022 {
51023+#ifndef CONFIG_PAX_KERNEXEC
51024 if (rom_start)
51025 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
51026+#endif
51027
51028 dbg("int15 entry = %p\n", compaq_int15_entry_point);
51029
51030diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
51031index 56d8486..f26113f 100644
51032--- a/drivers/pci/hotplug/pci_hotplug_core.c
51033+++ b/drivers/pci/hotplug/pci_hotplug_core.c
51034@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
51035 return -EINVAL;
51036 }
51037
51038- slot->ops->owner = owner;
51039- slot->ops->mod_name = mod_name;
51040+ pax_open_kernel();
51041+ *(struct module **)&slot->ops->owner = owner;
51042+ *(const char **)&slot->ops->mod_name = mod_name;
51043+ pax_close_kernel();
51044
51045 mutex_lock(&pci_hp_mutex);
51046 /*
51047diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
51048index 07aa722..84514b4 100644
51049--- a/drivers/pci/hotplug/pciehp_core.c
51050+++ b/drivers/pci/hotplug/pciehp_core.c
51051@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
51052 struct slot *slot = ctrl->slot;
51053 struct hotplug_slot *hotplug = NULL;
51054 struct hotplug_slot_info *info = NULL;
51055- struct hotplug_slot_ops *ops = NULL;
51056+ hotplug_slot_ops_no_const *ops = NULL;
51057 char name[SLOT_NAME_SIZE];
51058 int retval = -ENOMEM;
51059
51060diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
51061index c3e7dfc..cbd9625 100644
51062--- a/drivers/pci/msi.c
51063+++ b/drivers/pci/msi.c
51064@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51065 {
51066 struct attribute **msi_attrs;
51067 struct attribute *msi_attr;
51068- struct device_attribute *msi_dev_attr;
51069- struct attribute_group *msi_irq_group;
51070+ device_attribute_no_const *msi_dev_attr;
51071+ attribute_group_no_const *msi_irq_group;
51072 const struct attribute_group **msi_irq_groups;
51073 struct msi_desc *entry;
51074 int ret = -ENOMEM;
51075@@ -573,7 +573,7 @@ error_attrs:
51076 count = 0;
51077 msi_attr = msi_attrs[count];
51078 while (msi_attr) {
51079- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51080+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51081 kfree(msi_attr->name);
51082 kfree(msi_dev_attr);
51083 ++count;
51084diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51085index 312f23a..d21181c 100644
51086--- a/drivers/pci/pci-sysfs.c
51087+++ b/drivers/pci/pci-sysfs.c
51088@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51089 {
51090 /* allocate attribute structure, piggyback attribute name */
51091 int name_len = write_combine ? 13 : 10;
51092- struct bin_attribute *res_attr;
51093+ bin_attribute_no_const *res_attr;
51094 int retval;
51095
51096 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51097@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51098 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51099 {
51100 int retval;
51101- struct bin_attribute *attr;
51102+ bin_attribute_no_const *attr;
51103
51104 /* If the device has VPD, try to expose it in sysfs. */
51105 if (dev->vpd) {
51106@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51107 {
51108 int retval;
51109 int rom_size = 0;
51110- struct bin_attribute *attr;
51111+ bin_attribute_no_const *attr;
51112
51113 if (!sysfs_initialized)
51114 return -EACCES;
51115diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51116index 4091f82..7d98eef 100644
51117--- a/drivers/pci/pci.h
51118+++ b/drivers/pci/pci.h
51119@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51120 struct pci_vpd {
51121 unsigned int len;
51122 const struct pci_vpd_ops *ops;
51123- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51124+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51125 };
51126
51127 int pci_vpd_pci22_init(struct pci_dev *dev);
51128diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51129index 820740a..8b1c673 100644
51130--- a/drivers/pci/pcie/aspm.c
51131+++ b/drivers/pci/pcie/aspm.c
51132@@ -27,9 +27,9 @@
51133 #define MODULE_PARAM_PREFIX "pcie_aspm."
51134
51135 /* Note: those are not register definitions */
51136-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51137-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51138-#define ASPM_STATE_L1 (4) /* L1 state */
51139+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51140+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51141+#define ASPM_STATE_L1 (4U) /* L1 state */
51142 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51143 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51144
51145diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51146index be35da2..ec16cdb 100644
51147--- a/drivers/pci/pcie/portdrv_pci.c
51148+++ b/drivers/pci/pcie/portdrv_pci.c
51149@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51150 return 0;
51151 }
51152
51153-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51154+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51155 /*
51156 * Boxes that should not use MSI for PCIe PME signaling.
51157 */
51158diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51159index 8d2f400..c97cc91 100644
51160--- a/drivers/pci/probe.c
51161+++ b/drivers/pci/probe.c
51162@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51163 u16 orig_cmd;
51164 struct pci_bus_region region, inverted_region;
51165
51166- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51167+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51168
51169 /* No printks while decoding is disabled! */
51170 if (!dev->mmio_always_on) {
51171diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51172index 3f155e7..0f4b1f0 100644
51173--- a/drivers/pci/proc.c
51174+++ b/drivers/pci/proc.c
51175@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51176 static int __init pci_proc_init(void)
51177 {
51178 struct pci_dev *dev = NULL;
51179+
51180+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51181+#ifdef CONFIG_GRKERNSEC_PROC_USER
51182+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51183+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51184+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51185+#endif
51186+#else
51187 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51188+#endif
51189 proc_create("devices", 0, proc_bus_pci_dir,
51190 &proc_bus_pci_dev_operations);
51191 proc_initialized = 1;
51192diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51193index 3474920..acc9581 100644
51194--- a/drivers/platform/chrome/chromeos_pstore.c
51195+++ b/drivers/platform/chrome/chromeos_pstore.c
51196@@ -13,7 +13,7 @@
51197 #include <linux/platform_device.h>
51198 #include <linux/pstore_ram.h>
51199
51200-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51201+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51202 {
51203 /*
51204 * Today all Chromebooks/boxes ship with Google_* as version and
51205diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51206index 1e1e594..8fe59c5 100644
51207--- a/drivers/platform/x86/alienware-wmi.c
51208+++ b/drivers/platform/x86/alienware-wmi.c
51209@@ -150,7 +150,7 @@ struct wmax_led_args {
51210 } __packed;
51211
51212 static struct platform_device *platform_device;
51213-static struct device_attribute *zone_dev_attrs;
51214+static device_attribute_no_const *zone_dev_attrs;
51215 static struct attribute **zone_attrs;
51216 static struct platform_zone *zone_data;
51217
51218@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51219 }
51220 };
51221
51222-static struct attribute_group zone_attribute_group = {
51223+static attribute_group_no_const zone_attribute_group = {
51224 .name = "rgb_zones",
51225 };
51226
51227diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51228index 7543a56..367ca8ed 100644
51229--- a/drivers/platform/x86/asus-wmi.c
51230+++ b/drivers/platform/x86/asus-wmi.c
51231@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51232 int err;
51233 u32 retval = -1;
51234
51235+#ifdef CONFIG_GRKERNSEC_KMEM
51236+ return -EPERM;
51237+#endif
51238+
51239 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51240
51241 if (err < 0)
51242@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51243 int err;
51244 u32 retval = -1;
51245
51246+#ifdef CONFIG_GRKERNSEC_KMEM
51247+ return -EPERM;
51248+#endif
51249+
51250 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51251 &retval);
51252
51253@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51254 union acpi_object *obj;
51255 acpi_status status;
51256
51257+#ifdef CONFIG_GRKERNSEC_KMEM
51258+ return -EPERM;
51259+#endif
51260+
51261 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51262 1, asus->debug.method_id,
51263 &input, &output);
51264diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51265index bceb30b..bf063d4 100644
51266--- a/drivers/platform/x86/compal-laptop.c
51267+++ b/drivers/platform/x86/compal-laptop.c
51268@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51269 return 1;
51270 }
51271
51272-static struct dmi_system_id __initdata compal_dmi_table[] = {
51273+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51274 {
51275 .ident = "FL90/IFL90",
51276 .matches = {
51277diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51278index 458e6c9..089aee7 100644
51279--- a/drivers/platform/x86/hdaps.c
51280+++ b/drivers/platform/x86/hdaps.c
51281@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51282 "ThinkPad T42p", so the order of the entries matters.
51283 If your ThinkPad is not recognized, please update to latest
51284 BIOS. This is especially the case for some R52 ThinkPads. */
51285-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51286+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51287 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51288 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51289 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51290diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51291index 97c2be1..2ee50ce 100644
51292--- a/drivers/platform/x86/ibm_rtl.c
51293+++ b/drivers/platform/x86/ibm_rtl.c
51294@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51295 }
51296
51297
51298-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51299+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51300 { \
51301 .matches = { \
51302 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51303diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51304index a4a4258..a58a04c 100644
51305--- a/drivers/platform/x86/intel_oaktrail.c
51306+++ b/drivers/platform/x86/intel_oaktrail.c
51307@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51308 return 0;
51309 }
51310
51311-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51312+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51313 {
51314 .ident = "OakTrail platform",
51315 .matches = {
51316diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51317index 0859877..59d596d 100644
51318--- a/drivers/platform/x86/msi-laptop.c
51319+++ b/drivers/platform/x86/msi-laptop.c
51320@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51321 return 1;
51322 }
51323
51324-static struct dmi_system_id __initdata msi_dmi_table[] = {
51325+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51326 {
51327 .ident = "MSI S270",
51328 .matches = {
51329@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51330
51331 if (!quirks->ec_read_only) {
51332 /* allow userland write sysfs file */
51333- dev_attr_bluetooth.store = store_bluetooth;
51334- dev_attr_wlan.store = store_wlan;
51335- dev_attr_threeg.store = store_threeg;
51336- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51337- dev_attr_wlan.attr.mode |= S_IWUSR;
51338- dev_attr_threeg.attr.mode |= S_IWUSR;
51339+ pax_open_kernel();
51340+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51341+ *(void **)&dev_attr_wlan.store = store_wlan;
51342+ *(void **)&dev_attr_threeg.store = store_threeg;
51343+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51344+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51345+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51346+ pax_close_kernel();
51347 }
51348
51349 /* disable hardware control by fn key */
51350diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51351index 6d2bac0..ec2b029 100644
51352--- a/drivers/platform/x86/msi-wmi.c
51353+++ b/drivers/platform/x86/msi-wmi.c
51354@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51355 static void msi_wmi_notify(u32 value, void *context)
51356 {
51357 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51358- static struct key_entry *key;
51359+ struct key_entry *key;
51360 union acpi_object *obj;
51361 acpi_status status;
51362
51363diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51364index 9e701b2..c68a7b5 100644
51365--- a/drivers/platform/x86/samsung-laptop.c
51366+++ b/drivers/platform/x86/samsung-laptop.c
51367@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51368 return 0;
51369 }
51370
51371-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51372+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51373 {
51374 .matches = {
51375 DMI_MATCH(DMI_SYS_VENDOR,
51376diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51377index e6aac72..e11ff24 100644
51378--- a/drivers/platform/x86/samsung-q10.c
51379+++ b/drivers/platform/x86/samsung-q10.c
51380@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51381 return 1;
51382 }
51383
51384-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51385+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51386 {
51387 .ident = "Samsung Q10",
51388 .matches = {
51389diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51390index e51c1e7..71bb385 100644
51391--- a/drivers/platform/x86/sony-laptop.c
51392+++ b/drivers/platform/x86/sony-laptop.c
51393@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51394 }
51395
51396 /* High speed charging function */
51397-static struct device_attribute *hsc_handle;
51398+static device_attribute_no_const *hsc_handle;
51399
51400 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51401 struct device_attribute *attr,
51402@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51403 }
51404
51405 /* low battery function */
51406-static struct device_attribute *lowbatt_handle;
51407+static device_attribute_no_const *lowbatt_handle;
51408
51409 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51410 struct device_attribute *attr,
51411@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51412 }
51413
51414 /* fan speed function */
51415-static struct device_attribute *fan_handle, *hsf_handle;
51416+static device_attribute_no_const *fan_handle, *hsf_handle;
51417
51418 static ssize_t sony_nc_hsfan_store(struct device *dev,
51419 struct device_attribute *attr,
51420@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51421 }
51422
51423 /* USB charge function */
51424-static struct device_attribute *uc_handle;
51425+static device_attribute_no_const *uc_handle;
51426
51427 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51428 struct device_attribute *attr,
51429@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51430 }
51431
51432 /* Panel ID function */
51433-static struct device_attribute *panel_handle;
51434+static device_attribute_no_const *panel_handle;
51435
51436 static ssize_t sony_nc_panelid_show(struct device *dev,
51437 struct device_attribute *attr, char *buffer)
51438@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51439 }
51440
51441 /* smart connect function */
51442-static struct device_attribute *sc_handle;
51443+static device_attribute_no_const *sc_handle;
51444
51445 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51446 struct device_attribute *attr,
51447@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51448 .drv.pm = &sony_pic_pm,
51449 };
51450
51451-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51452+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51453 {
51454 .ident = "Sony Vaio",
51455 .matches = {
51456diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51457index 3b8ceee..e18652c 100644
51458--- a/drivers/platform/x86/thinkpad_acpi.c
51459+++ b/drivers/platform/x86/thinkpad_acpi.c
51460@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
51461 return 0;
51462 }
51463
51464-void static hotkey_mask_warn_incomplete_mask(void)
51465+static void hotkey_mask_warn_incomplete_mask(void)
51466 {
51467 /* log only what the user can fix... */
51468 const u32 wantedmask = hotkey_driver_mask &
51469@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51470 && !tp_features.bright_unkfw)
51471 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51472 }
51473+}
51474
51475 #undef TPACPI_COMPARE_KEY
51476 #undef TPACPI_MAY_SEND_KEY
51477-}
51478
51479 /*
51480 * Polling driver
51481diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51482index 438d4c7..ca8a2fb 100644
51483--- a/drivers/pnp/pnpbios/bioscalls.c
51484+++ b/drivers/pnp/pnpbios/bioscalls.c
51485@@ -59,7 +59,7 @@ do { \
51486 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51487 } while(0)
51488
51489-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51490+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51491 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51492
51493 /*
51494@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51495
51496 cpu = get_cpu();
51497 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51498+
51499+ pax_open_kernel();
51500 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51501+ pax_close_kernel();
51502
51503 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51504 spin_lock_irqsave(&pnp_bios_lock, flags);
51505@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51506 :"memory");
51507 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51508
51509+ pax_open_kernel();
51510 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51511+ pax_close_kernel();
51512+
51513 put_cpu();
51514
51515 /* If we get here and this is set then the PnP BIOS faulted on us. */
51516@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51517 return status;
51518 }
51519
51520-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51521+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51522 {
51523 int i;
51524
51525@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51526 pnp_bios_callpoint.offset = header->fields.pm16offset;
51527 pnp_bios_callpoint.segment = PNP_CS16;
51528
51529+ pax_open_kernel();
51530+
51531 for_each_possible_cpu(i) {
51532 struct desc_struct *gdt = get_cpu_gdt_table(i);
51533 if (!gdt)
51534@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51535 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51536 (unsigned long)__va(header->fields.pm16dseg));
51537 }
51538+
51539+ pax_close_kernel();
51540 }
51541diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51542index facd43b..b291260 100644
51543--- a/drivers/pnp/pnpbios/core.c
51544+++ b/drivers/pnp/pnpbios/core.c
51545@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51546 return 0;
51547 }
51548
51549-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51550+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51551 { /* PnPBIOS GPF on boot */
51552 .callback = exploding_pnp_bios,
51553 .ident = "Higraded P14H",
51554diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51555index 0c52e2a..3421ab7 100644
51556--- a/drivers/power/pda_power.c
51557+++ b/drivers/power/pda_power.c
51558@@ -37,7 +37,11 @@ static int polling;
51559
51560 #if IS_ENABLED(CONFIG_USB_PHY)
51561 static struct usb_phy *transceiver;
51562-static struct notifier_block otg_nb;
51563+static int otg_handle_notification(struct notifier_block *nb,
51564+ unsigned long event, void *unused);
51565+static struct notifier_block otg_nb = {
51566+ .notifier_call = otg_handle_notification
51567+};
51568 #endif
51569
51570 static struct regulator *ac_draw;
51571@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51572
51573 #if IS_ENABLED(CONFIG_USB_PHY)
51574 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51575- otg_nb.notifier_call = otg_handle_notification;
51576 ret = usb_register_notifier(transceiver, &otg_nb);
51577 if (ret) {
51578 dev_err(dev, "failure to register otg notifier\n");
51579diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51580index cc439fd..8fa30df 100644
51581--- a/drivers/power/power_supply.h
51582+++ b/drivers/power/power_supply.h
51583@@ -16,12 +16,12 @@ struct power_supply;
51584
51585 #ifdef CONFIG_SYSFS
51586
51587-extern void power_supply_init_attrs(struct device_type *dev_type);
51588+extern void power_supply_init_attrs(void);
51589 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51590
51591 #else
51592
51593-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51594+static inline void power_supply_init_attrs(void) {}
51595 #define power_supply_uevent NULL
51596
51597 #endif /* CONFIG_SYSFS */
51598diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51599index 694e8cd..9f03483 100644
51600--- a/drivers/power/power_supply_core.c
51601+++ b/drivers/power/power_supply_core.c
51602@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51603 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51604 EXPORT_SYMBOL_GPL(power_supply_notifier);
51605
51606-static struct device_type power_supply_dev_type;
51607+extern const struct attribute_group *power_supply_attr_groups[];
51608+static struct device_type power_supply_dev_type = {
51609+ .groups = power_supply_attr_groups,
51610+};
51611
51612 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51613 struct power_supply *supply)
51614@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51615 return PTR_ERR(power_supply_class);
51616
51617 power_supply_class->dev_uevent = power_supply_uevent;
51618- power_supply_init_attrs(&power_supply_dev_type);
51619+ power_supply_init_attrs();
51620
51621 return 0;
51622 }
51623diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51624index 62653f5..d0bb485 100644
51625--- a/drivers/power/power_supply_sysfs.c
51626+++ b/drivers/power/power_supply_sysfs.c
51627@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51628 .is_visible = power_supply_attr_is_visible,
51629 };
51630
51631-static const struct attribute_group *power_supply_attr_groups[] = {
51632+const struct attribute_group *power_supply_attr_groups[] = {
51633 &power_supply_attr_group,
51634 NULL,
51635 };
51636
51637-void power_supply_init_attrs(struct device_type *dev_type)
51638+void power_supply_init_attrs(void)
51639 {
51640 int i;
51641
51642- dev_type->groups = power_supply_attr_groups;
51643-
51644 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51645 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51646 }
51647diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51648index 84419af..268ede8 100644
51649--- a/drivers/powercap/powercap_sys.c
51650+++ b/drivers/powercap/powercap_sys.c
51651@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51652 struct device_attribute name_attr;
51653 };
51654
51655+static ssize_t show_constraint_name(struct device *dev,
51656+ struct device_attribute *dev_attr,
51657+ char *buf);
51658+
51659 static struct powercap_constraint_attr
51660- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51661+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51662+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51663+ .power_limit_attr = {
51664+ .attr = {
51665+ .name = NULL,
51666+ .mode = S_IWUSR | S_IRUGO
51667+ },
51668+ .show = show_constraint_power_limit_uw,
51669+ .store = store_constraint_power_limit_uw
51670+ },
51671+
51672+ .time_window_attr = {
51673+ .attr = {
51674+ .name = NULL,
51675+ .mode = S_IWUSR | S_IRUGO
51676+ },
51677+ .show = show_constraint_time_window_us,
51678+ .store = store_constraint_time_window_us
51679+ },
51680+
51681+ .max_power_attr = {
51682+ .attr = {
51683+ .name = NULL,
51684+ .mode = S_IRUGO
51685+ },
51686+ .show = show_constraint_max_power_uw,
51687+ .store = NULL
51688+ },
51689+
51690+ .min_power_attr = {
51691+ .attr = {
51692+ .name = NULL,
51693+ .mode = S_IRUGO
51694+ },
51695+ .show = show_constraint_min_power_uw,
51696+ .store = NULL
51697+ },
51698+
51699+ .max_time_window_attr = {
51700+ .attr = {
51701+ .name = NULL,
51702+ .mode = S_IRUGO
51703+ },
51704+ .show = show_constraint_max_time_window_us,
51705+ .store = NULL
51706+ },
51707+
51708+ .min_time_window_attr = {
51709+ .attr = {
51710+ .name = NULL,
51711+ .mode = S_IRUGO
51712+ },
51713+ .show = show_constraint_min_time_window_us,
51714+ .store = NULL
51715+ },
51716+
51717+ .name_attr = {
51718+ .attr = {
51719+ .name = NULL,
51720+ .mode = S_IRUGO
51721+ },
51722+ .show = show_constraint_name,
51723+ .store = NULL
51724+ }
51725+ }
51726+};
51727
51728 /* A list of powercap control_types */
51729 static LIST_HEAD(powercap_cntrl_list);
51730@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51731 }
51732
51733 static int create_constraint_attribute(int id, const char *name,
51734- int mode,
51735- struct device_attribute *dev_attr,
51736- ssize_t (*show)(struct device *,
51737- struct device_attribute *, char *),
51738- ssize_t (*store)(struct device *,
51739- struct device_attribute *,
51740- const char *, size_t)
51741- )
51742+ struct device_attribute *dev_attr)
51743 {
51744+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51745
51746- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51747- id, name);
51748- if (!dev_attr->attr.name)
51749+ if (!name)
51750 return -ENOMEM;
51751- dev_attr->attr.mode = mode;
51752- dev_attr->show = show;
51753- dev_attr->store = store;
51754+
51755+ pax_open_kernel();
51756+ *(const char **)&dev_attr->attr.name = name;
51757+ pax_close_kernel();
51758
51759 return 0;
51760 }
51761@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51762
51763 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51764 ret = create_constraint_attribute(i, "power_limit_uw",
51765- S_IWUSR | S_IRUGO,
51766- &constraint_attrs[i].power_limit_attr,
51767- show_constraint_power_limit_uw,
51768- store_constraint_power_limit_uw);
51769+ &constraint_attrs[i].power_limit_attr);
51770 if (ret)
51771 goto err_alloc;
51772 ret = create_constraint_attribute(i, "time_window_us",
51773- S_IWUSR | S_IRUGO,
51774- &constraint_attrs[i].time_window_attr,
51775- show_constraint_time_window_us,
51776- store_constraint_time_window_us);
51777+ &constraint_attrs[i].time_window_attr);
51778 if (ret)
51779 goto err_alloc;
51780- ret = create_constraint_attribute(i, "name", S_IRUGO,
51781- &constraint_attrs[i].name_attr,
51782- show_constraint_name,
51783- NULL);
51784+ ret = create_constraint_attribute(i, "name",
51785+ &constraint_attrs[i].name_attr);
51786 if (ret)
51787 goto err_alloc;
51788- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51789- &constraint_attrs[i].max_power_attr,
51790- show_constraint_max_power_uw,
51791- NULL);
51792+ ret = create_constraint_attribute(i, "max_power_uw",
51793+ &constraint_attrs[i].max_power_attr);
51794 if (ret)
51795 goto err_alloc;
51796- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51797- &constraint_attrs[i].min_power_attr,
51798- show_constraint_min_power_uw,
51799- NULL);
51800+ ret = create_constraint_attribute(i, "min_power_uw",
51801+ &constraint_attrs[i].min_power_attr);
51802 if (ret)
51803 goto err_alloc;
51804 ret = create_constraint_attribute(i, "max_time_window_us",
51805- S_IRUGO,
51806- &constraint_attrs[i].max_time_window_attr,
51807- show_constraint_max_time_window_us,
51808- NULL);
51809+ &constraint_attrs[i].max_time_window_attr);
51810 if (ret)
51811 goto err_alloc;
51812 ret = create_constraint_attribute(i, "min_time_window_us",
51813- S_IRUGO,
51814- &constraint_attrs[i].min_time_window_attr,
51815- show_constraint_min_time_window_us,
51816- NULL);
51817+ &constraint_attrs[i].min_time_window_attr);
51818 if (ret)
51819 goto err_alloc;
51820
51821@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51822 power_zone->zone_dev_attrs[count++] =
51823 &dev_attr_max_energy_range_uj.attr;
51824 if (power_zone->ops->get_energy_uj) {
51825+ pax_open_kernel();
51826 if (power_zone->ops->reset_energy_uj)
51827- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51828+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51829 else
51830- dev_attr_energy_uj.attr.mode = S_IRUGO;
51831+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51832+ pax_close_kernel();
51833 power_zone->zone_dev_attrs[count++] =
51834 &dev_attr_energy_uj.attr;
51835 }
51836diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51837index 9c5d414..c7900ce 100644
51838--- a/drivers/ptp/ptp_private.h
51839+++ b/drivers/ptp/ptp_private.h
51840@@ -51,7 +51,7 @@ struct ptp_clock {
51841 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51842 wait_queue_head_t tsev_wq;
51843 int defunct; /* tells readers to go away when clock is being removed */
51844- struct device_attribute *pin_dev_attr;
51845+ device_attribute_no_const *pin_dev_attr;
51846 struct attribute **pin_attr;
51847 struct attribute_group pin_attr_group;
51848 };
51849diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51850index 302e626..12579af 100644
51851--- a/drivers/ptp/ptp_sysfs.c
51852+++ b/drivers/ptp/ptp_sysfs.c
51853@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51854 goto no_pin_attr;
51855
51856 for (i = 0; i < n_pins; i++) {
51857- struct device_attribute *da = &ptp->pin_dev_attr[i];
51858+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51859 sysfs_attr_init(&da->attr);
51860 da->attr.name = info->pin_config[i].name;
51861 da->attr.mode = 0644;
51862diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51863index a4a8a6d..a3456f4 100644
51864--- a/drivers/regulator/core.c
51865+++ b/drivers/regulator/core.c
51866@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51867 const struct regulation_constraints *constraints = NULL;
51868 const struct regulator_init_data *init_data;
51869 struct regulator_config *config = NULL;
51870- static atomic_t regulator_no = ATOMIC_INIT(-1);
51871+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51872 struct regulator_dev *rdev;
51873 struct device *dev;
51874 int ret, i;
51875@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51876 rdev->dev.class = &regulator_class;
51877 rdev->dev.parent = dev;
51878 dev_set_name(&rdev->dev, "regulator.%lu",
51879- (unsigned long) atomic_inc_return(&regulator_no));
51880+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51881 ret = device_register(&rdev->dev);
51882 if (ret != 0) {
51883 put_device(&rdev->dev);
51884diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51885index 7eee2ca..4024513 100644
51886--- a/drivers/regulator/max8660.c
51887+++ b/drivers/regulator/max8660.c
51888@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51889 max8660->shadow_regs[MAX8660_OVER1] = 5;
51890 } else {
51891 /* Otherwise devices can be toggled via software */
51892- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51893- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51894+ pax_open_kernel();
51895+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51896+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51897+ pax_close_kernel();
51898 }
51899
51900 /*
51901diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51902index c3d55c2..0dddfe6 100644
51903--- a/drivers/regulator/max8973-regulator.c
51904+++ b/drivers/regulator/max8973-regulator.c
51905@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51906 if (!pdata || !pdata->enable_ext_control) {
51907 max->desc.enable_reg = MAX8973_VOUT;
51908 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51909- max->ops.enable = regulator_enable_regmap;
51910- max->ops.disable = regulator_disable_regmap;
51911- max->ops.is_enabled = regulator_is_enabled_regmap;
51912+ pax_open_kernel();
51913+ *(void **)&max->ops.enable = regulator_enable_regmap;
51914+ *(void **)&max->ops.disable = regulator_disable_regmap;
51915+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51916+ pax_close_kernel();
51917 }
51918
51919 if (pdata) {
51920diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51921index 0d17c92..a29f627 100644
51922--- a/drivers/regulator/mc13892-regulator.c
51923+++ b/drivers/regulator/mc13892-regulator.c
51924@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51925 mc13xxx_unlock(mc13892);
51926
51927 /* update mc13892_vcam ops */
51928- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51929+ pax_open_kernel();
51930+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51931 sizeof(struct regulator_ops));
51932- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51933- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51934+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51935+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51936+ pax_close_kernel();
51937 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51938
51939 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51940diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51941index 5b2e761..c8c8a4a 100644
51942--- a/drivers/rtc/rtc-cmos.c
51943+++ b/drivers/rtc/rtc-cmos.c
51944@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51945 hpet_rtc_timer_init();
51946
51947 /* export at least the first block of NVRAM */
51948- nvram.size = address_space - NVRAM_OFFSET;
51949+ pax_open_kernel();
51950+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51951+ pax_close_kernel();
51952 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51953 if (retval < 0) {
51954 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51955diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51956index 799c34b..8e9786a 100644
51957--- a/drivers/rtc/rtc-dev.c
51958+++ b/drivers/rtc/rtc-dev.c
51959@@ -16,6 +16,7 @@
51960 #include <linux/module.h>
51961 #include <linux/rtc.h>
51962 #include <linux/sched.h>
51963+#include <linux/grsecurity.h>
51964 #include "rtc-core.h"
51965
51966 static dev_t rtc_devt;
51967@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51968 if (copy_from_user(&tm, uarg, sizeof(tm)))
51969 return -EFAULT;
51970
51971+ gr_log_timechange();
51972+
51973 return rtc_set_time(rtc, &tm);
51974
51975 case RTC_PIE_ON:
51976diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51977index 4ffabb3..1f87fca 100644
51978--- a/drivers/rtc/rtc-ds1307.c
51979+++ b/drivers/rtc/rtc-ds1307.c
51980@@ -107,7 +107,7 @@ struct ds1307 {
51981 u8 offset; /* register's offset */
51982 u8 regs[11];
51983 u16 nvram_offset;
51984- struct bin_attribute *nvram;
51985+ bin_attribute_no_const *nvram;
51986 enum ds_type type;
51987 unsigned long flags;
51988 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51989diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51990index 90abb5b..e0bf6dd 100644
51991--- a/drivers/rtc/rtc-m48t59.c
51992+++ b/drivers/rtc/rtc-m48t59.c
51993@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51994 if (IS_ERR(m48t59->rtc))
51995 return PTR_ERR(m48t59->rtc);
51996
51997- m48t59_nvram_attr.size = pdata->offset;
51998+ pax_open_kernel();
51999+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
52000+ pax_close_kernel();
52001
52002 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
52003 if (ret)
52004diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
52005index e693af6..2e525b6 100644
52006--- a/drivers/scsi/bfa/bfa_fcpim.h
52007+++ b/drivers/scsi/bfa/bfa_fcpim.h
52008@@ -36,7 +36,7 @@ struct bfa_iotag_s {
52009
52010 struct bfa_itn_s {
52011 bfa_isr_func_t isr;
52012-};
52013+} __no_const;
52014
52015 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
52016 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
52017diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
52018index 0f19455..ef7adb5 100644
52019--- a/drivers/scsi/bfa/bfa_fcs.c
52020+++ b/drivers/scsi/bfa/bfa_fcs.c
52021@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
52022 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
52023
52024 static struct bfa_fcs_mod_s fcs_modules[] = {
52025- { bfa_fcs_port_attach, NULL, NULL },
52026- { bfa_fcs_uf_attach, NULL, NULL },
52027- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
52028- bfa_fcs_fabric_modexit },
52029+ {
52030+ .attach = bfa_fcs_port_attach,
52031+ .modinit = NULL,
52032+ .modexit = NULL
52033+ },
52034+ {
52035+ .attach = bfa_fcs_uf_attach,
52036+ .modinit = NULL,
52037+ .modexit = NULL
52038+ },
52039+ {
52040+ .attach = bfa_fcs_fabric_attach,
52041+ .modinit = bfa_fcs_fabric_modinit,
52042+ .modexit = bfa_fcs_fabric_modexit
52043+ },
52044 };
52045
52046 /*
52047diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52048index ff75ef8..2dfe00a 100644
52049--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52050+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52051@@ -89,15 +89,26 @@ static struct {
52052 void (*offline) (struct bfa_fcs_lport_s *port);
52053 } __port_action[] = {
52054 {
52055- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52056- bfa_fcs_lport_unknown_offline}, {
52057- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52058- bfa_fcs_lport_fab_offline}, {
52059- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52060- bfa_fcs_lport_n2n_offline}, {
52061- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52062- bfa_fcs_lport_loop_offline},
52063- };
52064+ .init = bfa_fcs_lport_unknown_init,
52065+ .online = bfa_fcs_lport_unknown_online,
52066+ .offline = bfa_fcs_lport_unknown_offline
52067+ },
52068+ {
52069+ .init = bfa_fcs_lport_fab_init,
52070+ .online = bfa_fcs_lport_fab_online,
52071+ .offline = bfa_fcs_lport_fab_offline
52072+ },
52073+ {
52074+ .init = bfa_fcs_lport_n2n_init,
52075+ .online = bfa_fcs_lport_n2n_online,
52076+ .offline = bfa_fcs_lport_n2n_offline
52077+ },
52078+ {
52079+ .init = bfa_fcs_lport_loop_init,
52080+ .online = bfa_fcs_lport_loop_online,
52081+ .offline = bfa_fcs_lport_loop_offline
52082+ },
52083+};
52084
52085 /*
52086 * fcs_port_sm FCS logical port state machine
52087diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52088index a38aafa0..fe8f03b 100644
52089--- a/drivers/scsi/bfa/bfa_ioc.h
52090+++ b/drivers/scsi/bfa/bfa_ioc.h
52091@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52092 bfa_ioc_disable_cbfn_t disable_cbfn;
52093 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52094 bfa_ioc_reset_cbfn_t reset_cbfn;
52095-};
52096+} __no_const;
52097
52098 /*
52099 * IOC event notification mechanism.
52100@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52101 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52102 enum bfi_ioc_state fwstate);
52103 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52104-};
52105+} __no_const;
52106
52107 /*
52108 * Queue element to wait for room in request queue. FIFO order is
52109diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52110index a14c784..6de6790 100644
52111--- a/drivers/scsi/bfa/bfa_modules.h
52112+++ b/drivers/scsi/bfa/bfa_modules.h
52113@@ -78,12 +78,12 @@ enum {
52114 \
52115 extern struct bfa_module_s hal_mod_ ## __mod; \
52116 struct bfa_module_s hal_mod_ ## __mod = { \
52117- bfa_ ## __mod ## _meminfo, \
52118- bfa_ ## __mod ## _attach, \
52119- bfa_ ## __mod ## _detach, \
52120- bfa_ ## __mod ## _start, \
52121- bfa_ ## __mod ## _stop, \
52122- bfa_ ## __mod ## _iocdisable, \
52123+ .meminfo = bfa_ ## __mod ## _meminfo, \
52124+ .attach = bfa_ ## __mod ## _attach, \
52125+ .detach = bfa_ ## __mod ## _detach, \
52126+ .start = bfa_ ## __mod ## _start, \
52127+ .stop = bfa_ ## __mod ## _stop, \
52128+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52129 }
52130
52131 #define BFA_CACHELINE_SZ (256)
52132diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52133index 045c4e1..13de803 100644
52134--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52135+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52136@@ -33,8 +33,8 @@
52137 */
52138 #include "libfcoe.h"
52139
52140-static atomic_t ctlr_num;
52141-static atomic_t fcf_num;
52142+static atomic_unchecked_t ctlr_num;
52143+static atomic_unchecked_t fcf_num;
52144
52145 /*
52146 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52147@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52148 if (!ctlr)
52149 goto out;
52150
52151- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52152+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52153 ctlr->f = f;
52154 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52155 INIT_LIST_HEAD(&ctlr->fcfs);
52156@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52157 fcf->dev.parent = &ctlr->dev;
52158 fcf->dev.bus = &fcoe_bus_type;
52159 fcf->dev.type = &fcoe_fcf_device_type;
52160- fcf->id = atomic_inc_return(&fcf_num) - 1;
52161+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52162 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52163
52164 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52165@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52166 {
52167 int error;
52168
52169- atomic_set(&ctlr_num, 0);
52170- atomic_set(&fcf_num, 0);
52171+ atomic_set_unchecked(&ctlr_num, 0);
52172+ atomic_set_unchecked(&fcf_num, 0);
52173
52174 error = bus_register(&fcoe_bus_type);
52175 if (error)
52176diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52177index 8bb173e..20236b4 100644
52178--- a/drivers/scsi/hosts.c
52179+++ b/drivers/scsi/hosts.c
52180@@ -42,7 +42,7 @@
52181 #include "scsi_logging.h"
52182
52183
52184-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52185+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52186
52187
52188 static void scsi_host_cls_release(struct device *dev)
52189@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52190 * subtract one because we increment first then return, but we need to
52191 * know what the next host number was before increment
52192 */
52193- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52194+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52195 shost->dma_channel = 0xff;
52196
52197 /* These three are default values which can be overridden */
52198diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52199index a1cfbd3..d7f8ebc 100644
52200--- a/drivers/scsi/hpsa.c
52201+++ b/drivers/scsi/hpsa.c
52202@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52203 struct reply_queue_buffer *rq = &h->reply_queue[q];
52204
52205 if (h->transMethod & CFGTBL_Trans_io_accel1)
52206- return h->access.command_completed(h, q);
52207+ return h->access->command_completed(h, q);
52208
52209 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52210- return h->access.command_completed(h, q);
52211+ return h->access->command_completed(h, q);
52212
52213 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52214 a = rq->head[rq->current_entry];
52215@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52216 break;
52217 default:
52218 set_performant_mode(h, c);
52219- h->access.submit_command(h, c);
52220+ h->access->submit_command(h, c);
52221 }
52222 }
52223
52224@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52225
52226 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52227 {
52228- return h->access.command_completed(h, q);
52229+ return h->access->command_completed(h, q);
52230 }
52231
52232 static inline bool interrupt_pending(struct ctlr_info *h)
52233 {
52234- return h->access.intr_pending(h);
52235+ return h->access->intr_pending(h);
52236 }
52237
52238 static inline long interrupt_not_for_us(struct ctlr_info *h)
52239 {
52240- return (h->access.intr_pending(h) == 0) ||
52241+ return (h->access->intr_pending(h) == 0) ||
52242 (h->interrupts_enabled == 0);
52243 }
52244
52245@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52246 if (prod_index < 0)
52247 return prod_index;
52248 h->product_name = products[prod_index].product_name;
52249- h->access = *(products[prod_index].access);
52250+ h->access = products[prod_index].access;
52251
52252 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52253 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52254@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52255 unsigned long flags;
52256 u32 lockup_detected;
52257
52258- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52259+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52260 spin_lock_irqsave(&h->lock, flags);
52261 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52262 if (!lockup_detected) {
52263@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
52264 }
52265
52266 /* make sure the board interrupts are off */
52267- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52268+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52269
52270 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52271 goto clean2;
52272@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
52273 * fake ones to scoop up any residual completions.
52274 */
52275 spin_lock_irqsave(&h->lock, flags);
52276- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52277+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52278 spin_unlock_irqrestore(&h->lock, flags);
52279 hpsa_free_irqs(h);
52280 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52281@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
52282 dev_info(&h->pdev->dev, "Board READY.\n");
52283 dev_info(&h->pdev->dev,
52284 "Waiting for stale completions to drain.\n");
52285- h->access.set_intr_mask(h, HPSA_INTR_ON);
52286+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52287 msleep(10000);
52288- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52289+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52290
52291 rc = controller_reset_failed(h->cfgtable);
52292 if (rc)
52293@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
52294
52295
52296 /* Turn the interrupts on so we can service requests */
52297- h->access.set_intr_mask(h, HPSA_INTR_ON);
52298+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52299
52300 hpsa_hba_inquiry(h);
52301 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52302@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52303 * To write all data in the battery backed cache to disks
52304 */
52305 hpsa_flush_cache(h);
52306- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52307+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52308 hpsa_free_irqs_and_disable_msix(h);
52309 }
52310
52311@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52312 CFGTBL_Trans_enable_directed_msix |
52313 (trans_support & (CFGTBL_Trans_io_accel1 |
52314 CFGTBL_Trans_io_accel2));
52315- struct access_method access = SA5_performant_access;
52316+ struct access_method *access = &SA5_performant_access;
52317
52318 /* This is a bit complicated. There are 8 registers on
52319 * the controller which we write to to tell it 8 different
52320@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52321 * perform the superfluous readl() after each command submission.
52322 */
52323 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52324- access = SA5_performant_access_no_read;
52325+ access = &SA5_performant_access_no_read;
52326
52327 /* Controller spec: zero out this buffer. */
52328 for (i = 0; i < h->nreply_queues; i++)
52329@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52330 * enable outbound interrupt coalescing in accelerator mode;
52331 */
52332 if (trans_support & CFGTBL_Trans_io_accel1) {
52333- access = SA5_ioaccel_mode1_access;
52334+ access = &SA5_ioaccel_mode1_access;
52335 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52336 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52337 } else {
52338 if (trans_support & CFGTBL_Trans_io_accel2) {
52339- access = SA5_ioaccel_mode2_access;
52340+ access = &SA5_ioaccel_mode2_access;
52341 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52342 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52343 }
52344diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52345index 6577130..955f9a4 100644
52346--- a/drivers/scsi/hpsa.h
52347+++ b/drivers/scsi/hpsa.h
52348@@ -143,7 +143,7 @@ struct ctlr_info {
52349 unsigned int msix_vector;
52350 unsigned int msi_vector;
52351 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52352- struct access_method access;
52353+ struct access_method *access;
52354 char hba_mode_enabled;
52355
52356 /* queue and queue Info */
52357@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52358 }
52359
52360 static struct access_method SA5_access = {
52361- SA5_submit_command,
52362- SA5_intr_mask,
52363- SA5_intr_pending,
52364- SA5_completed,
52365+ .submit_command = SA5_submit_command,
52366+ .set_intr_mask = SA5_intr_mask,
52367+ .intr_pending = SA5_intr_pending,
52368+ .command_completed = SA5_completed,
52369 };
52370
52371 static struct access_method SA5_ioaccel_mode1_access = {
52372- SA5_submit_command,
52373- SA5_performant_intr_mask,
52374- SA5_ioaccel_mode1_intr_pending,
52375- SA5_ioaccel_mode1_completed,
52376+ .submit_command = SA5_submit_command,
52377+ .set_intr_mask = SA5_performant_intr_mask,
52378+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52379+ .command_completed = SA5_ioaccel_mode1_completed,
52380 };
52381
52382 static struct access_method SA5_ioaccel_mode2_access = {
52383- SA5_submit_command_ioaccel2,
52384- SA5_performant_intr_mask,
52385- SA5_performant_intr_pending,
52386- SA5_performant_completed,
52387+ .submit_command = SA5_submit_command_ioaccel2,
52388+ .set_intr_mask = SA5_performant_intr_mask,
52389+ .intr_pending = SA5_performant_intr_pending,
52390+ .command_completed = SA5_performant_completed,
52391 };
52392
52393 static struct access_method SA5_performant_access = {
52394- SA5_submit_command,
52395- SA5_performant_intr_mask,
52396- SA5_performant_intr_pending,
52397- SA5_performant_completed,
52398+ .submit_command = SA5_submit_command,
52399+ .set_intr_mask = SA5_performant_intr_mask,
52400+ .intr_pending = SA5_performant_intr_pending,
52401+ .command_completed = SA5_performant_completed,
52402 };
52403
52404 static struct access_method SA5_performant_access_no_read = {
52405- SA5_submit_command_no_read,
52406- SA5_performant_intr_mask,
52407- SA5_performant_intr_pending,
52408- SA5_performant_completed,
52409+ .submit_command = SA5_submit_command_no_read,
52410+ .set_intr_mask = SA5_performant_intr_mask,
52411+ .intr_pending = SA5_performant_intr_pending,
52412+ .command_completed = SA5_performant_completed,
52413 };
52414
52415 struct board_type {
52416diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52417index 1b3a094..068e683 100644
52418--- a/drivers/scsi/libfc/fc_exch.c
52419+++ b/drivers/scsi/libfc/fc_exch.c
52420@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52421 u16 pool_max_index;
52422
52423 struct {
52424- atomic_t no_free_exch;
52425- atomic_t no_free_exch_xid;
52426- atomic_t xid_not_found;
52427- atomic_t xid_busy;
52428- atomic_t seq_not_found;
52429- atomic_t non_bls_resp;
52430+ atomic_unchecked_t no_free_exch;
52431+ atomic_unchecked_t no_free_exch_xid;
52432+ atomic_unchecked_t xid_not_found;
52433+ atomic_unchecked_t xid_busy;
52434+ atomic_unchecked_t seq_not_found;
52435+ atomic_unchecked_t non_bls_resp;
52436 } stats;
52437 };
52438
52439@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52440 /* allocate memory for exchange */
52441 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52442 if (!ep) {
52443- atomic_inc(&mp->stats.no_free_exch);
52444+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52445 goto out;
52446 }
52447 memset(ep, 0, sizeof(*ep));
52448@@ -874,7 +874,7 @@ out:
52449 return ep;
52450 err:
52451 spin_unlock_bh(&pool->lock);
52452- atomic_inc(&mp->stats.no_free_exch_xid);
52453+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52454 mempool_free(ep, mp->ep_pool);
52455 return NULL;
52456 }
52457@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52458 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52459 ep = fc_exch_find(mp, xid);
52460 if (!ep) {
52461- atomic_inc(&mp->stats.xid_not_found);
52462+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52463 reject = FC_RJT_OX_ID;
52464 goto out;
52465 }
52466@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52467 ep = fc_exch_find(mp, xid);
52468 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52469 if (ep) {
52470- atomic_inc(&mp->stats.xid_busy);
52471+ atomic_inc_unchecked(&mp->stats.xid_busy);
52472 reject = FC_RJT_RX_ID;
52473 goto rel;
52474 }
52475@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52476 }
52477 xid = ep->xid; /* get our XID */
52478 } else if (!ep) {
52479- atomic_inc(&mp->stats.xid_not_found);
52480+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52481 reject = FC_RJT_RX_ID; /* XID not found */
52482 goto out;
52483 }
52484@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52485 } else {
52486 sp = &ep->seq;
52487 if (sp->id != fh->fh_seq_id) {
52488- atomic_inc(&mp->stats.seq_not_found);
52489+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52490 if (f_ctl & FC_FC_END_SEQ) {
52491 /*
52492 * Update sequence_id based on incoming last
52493@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52494
52495 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52496 if (!ep) {
52497- atomic_inc(&mp->stats.xid_not_found);
52498+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52499 goto out;
52500 }
52501 if (ep->esb_stat & ESB_ST_COMPLETE) {
52502- atomic_inc(&mp->stats.xid_not_found);
52503+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52504 goto rel;
52505 }
52506 if (ep->rxid == FC_XID_UNKNOWN)
52507 ep->rxid = ntohs(fh->fh_rx_id);
52508 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52509- atomic_inc(&mp->stats.xid_not_found);
52510+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52511 goto rel;
52512 }
52513 if (ep->did != ntoh24(fh->fh_s_id) &&
52514 ep->did != FC_FID_FLOGI) {
52515- atomic_inc(&mp->stats.xid_not_found);
52516+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52517 goto rel;
52518 }
52519 sof = fr_sof(fp);
52520@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52521 sp->ssb_stat |= SSB_ST_RESP;
52522 sp->id = fh->fh_seq_id;
52523 } else if (sp->id != fh->fh_seq_id) {
52524- atomic_inc(&mp->stats.seq_not_found);
52525+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52526 goto rel;
52527 }
52528
52529@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52530 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52531
52532 if (!sp)
52533- atomic_inc(&mp->stats.xid_not_found);
52534+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52535 else
52536- atomic_inc(&mp->stats.non_bls_resp);
52537+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52538
52539 fc_frame_free(fp);
52540 }
52541@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52542
52543 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52544 mp = ema->mp;
52545- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52546+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52547 st->fc_no_free_exch_xid +=
52548- atomic_read(&mp->stats.no_free_exch_xid);
52549- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52550- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52551- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52552- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52553+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52554+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52555+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52556+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52557+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52558 }
52559 }
52560 EXPORT_SYMBOL(fc_exch_update_stats);
52561diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52562index 9c706d8..d3e3ed2 100644
52563--- a/drivers/scsi/libsas/sas_ata.c
52564+++ b/drivers/scsi/libsas/sas_ata.c
52565@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52566 .postreset = ata_std_postreset,
52567 .error_handler = ata_std_error_handler,
52568 .post_internal_cmd = sas_ata_post_internal,
52569- .qc_defer = ata_std_qc_defer,
52570+ .qc_defer = ata_std_qc_defer,
52571 .qc_prep = ata_noop_qc_prep,
52572 .qc_issue = sas_ata_qc_issue,
52573 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52574diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52575index 434e903..5a4a79b 100644
52576--- a/drivers/scsi/lpfc/lpfc.h
52577+++ b/drivers/scsi/lpfc/lpfc.h
52578@@ -430,7 +430,7 @@ struct lpfc_vport {
52579 struct dentry *debug_nodelist;
52580 struct dentry *vport_debugfs_root;
52581 struct lpfc_debugfs_trc *disc_trc;
52582- atomic_t disc_trc_cnt;
52583+ atomic_unchecked_t disc_trc_cnt;
52584 #endif
52585 uint8_t stat_data_enabled;
52586 uint8_t stat_data_blocked;
52587@@ -880,8 +880,8 @@ struct lpfc_hba {
52588 struct timer_list fabric_block_timer;
52589 unsigned long bit_flags;
52590 #define FABRIC_COMANDS_BLOCKED 0
52591- atomic_t num_rsrc_err;
52592- atomic_t num_cmd_success;
52593+ atomic_unchecked_t num_rsrc_err;
52594+ atomic_unchecked_t num_cmd_success;
52595 unsigned long last_rsrc_error_time;
52596 unsigned long last_ramp_down_time;
52597 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52598@@ -916,7 +916,7 @@ struct lpfc_hba {
52599
52600 struct dentry *debug_slow_ring_trc;
52601 struct lpfc_debugfs_trc *slow_ring_trc;
52602- atomic_t slow_ring_trc_cnt;
52603+ atomic_unchecked_t slow_ring_trc_cnt;
52604 /* iDiag debugfs sub-directory */
52605 struct dentry *idiag_root;
52606 struct dentry *idiag_pci_cfg;
52607diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52608index 5633e7d..8272114 100644
52609--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52610+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52611@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52612
52613 #include <linux/debugfs.h>
52614
52615-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52616+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52617 static unsigned long lpfc_debugfs_start_time = 0L;
52618
52619 /* iDiag */
52620@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52621 lpfc_debugfs_enable = 0;
52622
52623 len = 0;
52624- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52625+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52626 (lpfc_debugfs_max_disc_trc - 1);
52627 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52628 dtp = vport->disc_trc + i;
52629@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52630 lpfc_debugfs_enable = 0;
52631
52632 len = 0;
52633- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52634+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52635 (lpfc_debugfs_max_slow_ring_trc - 1);
52636 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52637 dtp = phba->slow_ring_trc + i;
52638@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52639 !vport || !vport->disc_trc)
52640 return;
52641
52642- index = atomic_inc_return(&vport->disc_trc_cnt) &
52643+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52644 (lpfc_debugfs_max_disc_trc - 1);
52645 dtp = vport->disc_trc + index;
52646 dtp->fmt = fmt;
52647 dtp->data1 = data1;
52648 dtp->data2 = data2;
52649 dtp->data3 = data3;
52650- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52651+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52652 dtp->jif = jiffies;
52653 #endif
52654 return;
52655@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52656 !phba || !phba->slow_ring_trc)
52657 return;
52658
52659- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52660+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52661 (lpfc_debugfs_max_slow_ring_trc - 1);
52662 dtp = phba->slow_ring_trc + index;
52663 dtp->fmt = fmt;
52664 dtp->data1 = data1;
52665 dtp->data2 = data2;
52666 dtp->data3 = data3;
52667- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52668+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52669 dtp->jif = jiffies;
52670 #endif
52671 return;
52672@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52673 "slow_ring buffer\n");
52674 goto debug_failed;
52675 }
52676- atomic_set(&phba->slow_ring_trc_cnt, 0);
52677+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52678 memset(phba->slow_ring_trc, 0,
52679 (sizeof(struct lpfc_debugfs_trc) *
52680 lpfc_debugfs_max_slow_ring_trc));
52681@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52682 "buffer\n");
52683 goto debug_failed;
52684 }
52685- atomic_set(&vport->disc_trc_cnt, 0);
52686+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52687
52688 snprintf(name, sizeof(name), "discovery_trace");
52689 vport->debug_disc_trc =
52690diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52691index 0b2c53a..aec2b45 100644
52692--- a/drivers/scsi/lpfc/lpfc_init.c
52693+++ b/drivers/scsi/lpfc/lpfc_init.c
52694@@ -11290,8 +11290,10 @@ lpfc_init(void)
52695 "misc_register returned with status %d", error);
52696
52697 if (lpfc_enable_npiv) {
52698- lpfc_transport_functions.vport_create = lpfc_vport_create;
52699- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52700+ pax_open_kernel();
52701+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52702+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52703+ pax_close_kernel();
52704 }
52705 lpfc_transport_template =
52706 fc_attach_transport(&lpfc_transport_functions);
52707diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52708index 4f9222e..f1850e3 100644
52709--- a/drivers/scsi/lpfc/lpfc_scsi.c
52710+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52711@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52712 unsigned long expires;
52713
52714 spin_lock_irqsave(&phba->hbalock, flags);
52715- atomic_inc(&phba->num_rsrc_err);
52716+ atomic_inc_unchecked(&phba->num_rsrc_err);
52717 phba->last_rsrc_error_time = jiffies;
52718
52719 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52720@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52721 unsigned long num_rsrc_err, num_cmd_success;
52722 int i;
52723
52724- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52725- num_cmd_success = atomic_read(&phba->num_cmd_success);
52726+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52727+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52728
52729 /*
52730 * The error and success command counters are global per
52731@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52732 }
52733 }
52734 lpfc_destroy_vport_work_array(phba, vports);
52735- atomic_set(&phba->num_rsrc_err, 0);
52736- atomic_set(&phba->num_cmd_success, 0);
52737+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52738+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52739 }
52740
52741 /**
52742diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52743index 3f26147..ee8efd1 100644
52744--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52745+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52746@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52747 {
52748 struct scsi_device *sdev = to_scsi_device(dev);
52749 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52750- static struct _raid_device *raid_device;
52751+ struct _raid_device *raid_device;
52752 unsigned long flags;
52753 Mpi2RaidVolPage0_t vol_pg0;
52754 Mpi2ConfigReply_t mpi_reply;
52755@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52756 {
52757 struct scsi_device *sdev = to_scsi_device(dev);
52758 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52759- static struct _raid_device *raid_device;
52760+ struct _raid_device *raid_device;
52761 unsigned long flags;
52762 Mpi2RaidVolPage0_t vol_pg0;
52763 Mpi2ConfigReply_t mpi_reply;
52764@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52765 Mpi2EventDataIrOperationStatus_t *event_data =
52766 (Mpi2EventDataIrOperationStatus_t *)
52767 fw_event->event_data;
52768- static struct _raid_device *raid_device;
52769+ struct _raid_device *raid_device;
52770 unsigned long flags;
52771 u16 handle;
52772
52773@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52774 u64 sas_address;
52775 struct _sas_device *sas_device;
52776 struct _sas_node *expander_device;
52777- static struct _raid_device *raid_device;
52778+ struct _raid_device *raid_device;
52779 u8 retry_count;
52780 unsigned long flags;
52781
52782diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52783index ed31d8c..ab856b3 100644
52784--- a/drivers/scsi/pmcraid.c
52785+++ b/drivers/scsi/pmcraid.c
52786@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52787 res->scsi_dev = scsi_dev;
52788 scsi_dev->hostdata = res;
52789 res->change_detected = 0;
52790- atomic_set(&res->read_failures, 0);
52791- atomic_set(&res->write_failures, 0);
52792+ atomic_set_unchecked(&res->read_failures, 0);
52793+ atomic_set_unchecked(&res->write_failures, 0);
52794 rc = 0;
52795 }
52796 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52797@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52798
52799 /* If this was a SCSI read/write command keep count of errors */
52800 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52801- atomic_inc(&res->read_failures);
52802+ atomic_inc_unchecked(&res->read_failures);
52803 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52804- atomic_inc(&res->write_failures);
52805+ atomic_inc_unchecked(&res->write_failures);
52806
52807 if (!RES_IS_GSCSI(res->cfg_entry) &&
52808 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52809@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52810 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52811 * hrrq_id assigned here in queuecommand
52812 */
52813- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52814+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52815 pinstance->num_hrrq;
52816 cmd->cmd_done = pmcraid_io_done;
52817
52818@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52819 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52820 * hrrq_id assigned here in queuecommand
52821 */
52822- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52823+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52824 pinstance->num_hrrq;
52825
52826 if (request_size) {
52827@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52828
52829 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52830 /* add resources only after host is added into system */
52831- if (!atomic_read(&pinstance->expose_resources))
52832+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52833 return;
52834
52835 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52836@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52837 init_waitqueue_head(&pinstance->reset_wait_q);
52838
52839 atomic_set(&pinstance->outstanding_cmds, 0);
52840- atomic_set(&pinstance->last_message_id, 0);
52841- atomic_set(&pinstance->expose_resources, 0);
52842+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52843+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52844
52845 INIT_LIST_HEAD(&pinstance->free_res_q);
52846 INIT_LIST_HEAD(&pinstance->used_res_q);
52847@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52848 /* Schedule worker thread to handle CCN and take care of adding and
52849 * removing devices to OS
52850 */
52851- atomic_set(&pinstance->expose_resources, 1);
52852+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52853 schedule_work(&pinstance->worker_q);
52854 return rc;
52855
52856diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52857index e1d150f..6c6df44 100644
52858--- a/drivers/scsi/pmcraid.h
52859+++ b/drivers/scsi/pmcraid.h
52860@@ -748,7 +748,7 @@ struct pmcraid_instance {
52861 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52862
52863 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52864- atomic_t last_message_id;
52865+ atomic_unchecked_t last_message_id;
52866
52867 /* configuration table */
52868 struct pmcraid_config_table *cfg_table;
52869@@ -777,7 +777,7 @@ struct pmcraid_instance {
52870 atomic_t outstanding_cmds;
52871
52872 /* should add/delete resources to mid-layer now ?*/
52873- atomic_t expose_resources;
52874+ atomic_unchecked_t expose_resources;
52875
52876
52877
52878@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52879 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52880 };
52881 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52882- atomic_t read_failures; /* count of failed READ commands */
52883- atomic_t write_failures; /* count of failed WRITE commands */
52884+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52885+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52886
52887 /* To indicate add/delete/modify during CCN */
52888 u8 change_detected;
52889diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52890index 82b92c4..3178171 100644
52891--- a/drivers/scsi/qla2xxx/qla_attr.c
52892+++ b/drivers/scsi/qla2xxx/qla_attr.c
52893@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52894 return 0;
52895 }
52896
52897-struct fc_function_template qla2xxx_transport_functions = {
52898+fc_function_template_no_const qla2xxx_transport_functions = {
52899
52900 .show_host_node_name = 1,
52901 .show_host_port_name = 1,
52902@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52903 .bsg_timeout = qla24xx_bsg_timeout,
52904 };
52905
52906-struct fc_function_template qla2xxx_transport_vport_functions = {
52907+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52908
52909 .show_host_node_name = 1,
52910 .show_host_port_name = 1,
52911diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52912index 7686bfe..4710893 100644
52913--- a/drivers/scsi/qla2xxx/qla_gbl.h
52914+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52915@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52916 struct device_attribute;
52917 extern struct device_attribute *qla2x00_host_attrs[];
52918 struct fc_function_template;
52919-extern struct fc_function_template qla2xxx_transport_functions;
52920-extern struct fc_function_template qla2xxx_transport_vport_functions;
52921+extern fc_function_template_no_const qla2xxx_transport_functions;
52922+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52923 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52924 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52925 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52926diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52927index cce1cbc..5b9f0fe 100644
52928--- a/drivers/scsi/qla2xxx/qla_os.c
52929+++ b/drivers/scsi/qla2xxx/qla_os.c
52930@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52931 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52932 /* Ok, a 64bit DMA mask is applicable. */
52933 ha->flags.enable_64bit_addressing = 1;
52934- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52935- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52936+ pax_open_kernel();
52937+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52938+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52939+ pax_close_kernel();
52940 return;
52941 }
52942 }
52943diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52944index 8f6d0fb..1b21097 100644
52945--- a/drivers/scsi/qla4xxx/ql4_def.h
52946+++ b/drivers/scsi/qla4xxx/ql4_def.h
52947@@ -305,7 +305,7 @@ struct ddb_entry {
52948 * (4000 only) */
52949 atomic_t relogin_timer; /* Max Time to wait for
52950 * relogin to complete */
52951- atomic_t relogin_retry_count; /* Num of times relogin has been
52952+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52953 * retried */
52954 uint32_t default_time2wait; /* Default Min time between
52955 * relogins (+aens) */
52956diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52957index 6d25879..3031a9f 100644
52958--- a/drivers/scsi/qla4xxx/ql4_os.c
52959+++ b/drivers/scsi/qla4xxx/ql4_os.c
52960@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52961 */
52962 if (!iscsi_is_session_online(cls_sess)) {
52963 /* Reset retry relogin timer */
52964- atomic_inc(&ddb_entry->relogin_retry_count);
52965+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52966 DEBUG2(ql4_printk(KERN_INFO, ha,
52967 "%s: index[%d] relogin timed out-retrying"
52968 " relogin (%d), retry (%d)\n", __func__,
52969 ddb_entry->fw_ddb_index,
52970- atomic_read(&ddb_entry->relogin_retry_count),
52971+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52972 ddb_entry->default_time2wait + 4));
52973 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52974 atomic_set(&ddb_entry->retry_relogin_timer,
52975@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52976
52977 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52978 atomic_set(&ddb_entry->relogin_timer, 0);
52979- atomic_set(&ddb_entry->relogin_retry_count, 0);
52980+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52981 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52982 ddb_entry->default_relogin_timeout =
52983 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52984diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52985index c9c3b57..22a8e41 100644
52986--- a/drivers/scsi/scsi.c
52987+++ b/drivers/scsi/scsi.c
52988@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52989
52990 good_bytes = scsi_bufflen(cmd);
52991 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52992- int old_good_bytes = good_bytes;
52993+ unsigned int old_good_bytes = good_bytes;
52994 drv = scsi_cmd_to_driver(cmd);
52995 if (drv->done)
52996 good_bytes = drv->done(cmd);
52997diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52998index b1a2631..5bcd9c8 100644
52999--- a/drivers/scsi/scsi_lib.c
53000+++ b/drivers/scsi/scsi_lib.c
53001@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
53002 shost = sdev->host;
53003 scsi_init_cmd_errh(cmd);
53004 cmd->result = DID_NO_CONNECT << 16;
53005- atomic_inc(&cmd->device->iorequest_cnt);
53006+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53007
53008 /*
53009 * SCSI request completion path will do scsi_device_unbusy(),
53010@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
53011
53012 INIT_LIST_HEAD(&cmd->eh_entry);
53013
53014- atomic_inc(&cmd->device->iodone_cnt);
53015+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
53016 if (cmd->result)
53017- atomic_inc(&cmd->device->ioerr_cnt);
53018+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
53019
53020 disposition = scsi_decide_disposition(cmd);
53021 if (disposition != SUCCESS &&
53022@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
53023 struct Scsi_Host *host = cmd->device->host;
53024 int rtn = 0;
53025
53026- atomic_inc(&cmd->device->iorequest_cnt);
53027+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
53028
53029 /* check if the device is still usable */
53030 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
53031diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
53032index 1ac38e7..6acc656 100644
53033--- a/drivers/scsi/scsi_sysfs.c
53034+++ b/drivers/scsi/scsi_sysfs.c
53035@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
53036 char *buf) \
53037 { \
53038 struct scsi_device *sdev = to_scsi_device(dev); \
53039- unsigned long long count = atomic_read(&sdev->field); \
53040+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
53041 return snprintf(buf, 20, "0x%llx\n", count); \
53042 } \
53043 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53044diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53045index 5d6f348..18778a6b 100644
53046--- a/drivers/scsi/scsi_transport_fc.c
53047+++ b/drivers/scsi/scsi_transport_fc.c
53048@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53049 * Netlink Infrastructure
53050 */
53051
53052-static atomic_t fc_event_seq;
53053+static atomic_unchecked_t fc_event_seq;
53054
53055 /**
53056 * fc_get_event_number - Obtain the next sequential FC event number
53057@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
53058 u32
53059 fc_get_event_number(void)
53060 {
53061- return atomic_add_return(1, &fc_event_seq);
53062+ return atomic_add_return_unchecked(1, &fc_event_seq);
53063 }
53064 EXPORT_SYMBOL(fc_get_event_number);
53065
53066@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
53067 {
53068 int error;
53069
53070- atomic_set(&fc_event_seq, 0);
53071+ atomic_set_unchecked(&fc_event_seq, 0);
53072
53073 error = transport_class_register(&fc_host_class);
53074 if (error)
53075@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53076 char *cp;
53077
53078 *val = simple_strtoul(buf, &cp, 0);
53079- if ((*cp && (*cp != '\n')) || (*val < 0))
53080+ if (*cp && (*cp != '\n'))
53081 return -EINVAL;
53082 /*
53083 * Check for overflow; dev_loss_tmo is u32
53084diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53085index 67d43e3..8cee73c 100644
53086--- a/drivers/scsi/scsi_transport_iscsi.c
53087+++ b/drivers/scsi/scsi_transport_iscsi.c
53088@@ -79,7 +79,7 @@ struct iscsi_internal {
53089 struct transport_container session_cont;
53090 };
53091
53092-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53093+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53094 static struct workqueue_struct *iscsi_eh_timer_workq;
53095
53096 static DEFINE_IDA(iscsi_sess_ida);
53097@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53098 int err;
53099
53100 ihost = shost->shost_data;
53101- session->sid = atomic_add_return(1, &iscsi_session_nr);
53102+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53103
53104 if (target_id == ISCSI_MAX_TARGET) {
53105 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53106@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53107 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53108 ISCSI_TRANSPORT_VERSION);
53109
53110- atomic_set(&iscsi_session_nr, 0);
53111+ atomic_set_unchecked(&iscsi_session_nr, 0);
53112
53113 err = class_register(&iscsi_transport_class);
53114 if (err)
53115diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53116index ae45bd9..c32a586 100644
53117--- a/drivers/scsi/scsi_transport_srp.c
53118+++ b/drivers/scsi/scsi_transport_srp.c
53119@@ -35,7 +35,7 @@
53120 #include "scsi_priv.h"
53121
53122 struct srp_host_attrs {
53123- atomic_t next_port_id;
53124+ atomic_unchecked_t next_port_id;
53125 };
53126 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53127
53128@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53129 struct Scsi_Host *shost = dev_to_shost(dev);
53130 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53131
53132- atomic_set(&srp_host->next_port_id, 0);
53133+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53134 return 0;
53135 }
53136
53137@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53138 rport_fast_io_fail_timedout);
53139 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53140
53141- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53142+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53143 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53144
53145 transport_setup_device(&rport->dev);
53146diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53147index a661d33..1b233fa 100644
53148--- a/drivers/scsi/sd.c
53149+++ b/drivers/scsi/sd.c
53150@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53151 static void sd_rescan(struct device *);
53152 static int sd_init_command(struct scsi_cmnd *SCpnt);
53153 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53154-static int sd_done(struct scsi_cmnd *);
53155+static unsigned int sd_done(struct scsi_cmnd *);
53156 static int sd_eh_action(struct scsi_cmnd *, int);
53157 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53158 static void scsi_disk_release(struct device *cdev);
53159@@ -1670,7 +1670,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53160 *
53161 * Note: potentially run from within an ISR. Must not block.
53162 **/
53163-static int sd_done(struct scsi_cmnd *SCpnt)
53164+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53165 {
53166 int result = SCpnt->result;
53167 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53168@@ -2997,7 +2997,7 @@ static int sd_probe(struct device *dev)
53169 sdkp->disk = gd;
53170 sdkp->index = index;
53171 atomic_set(&sdkp->openers, 0);
53172- atomic_set(&sdkp->device->ioerr_cnt, 0);
53173+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53174
53175 if (!sdp->request_queue->rq_timeout) {
53176 if (sdp->type != TYPE_MOD)
53177diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53178index 2270bd5..98408a5 100644
53179--- a/drivers/scsi/sg.c
53180+++ b/drivers/scsi/sg.c
53181@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53182 sdp->disk->disk_name,
53183 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53184 NULL,
53185- (char *)arg);
53186+ (char __user *)arg);
53187 case BLKTRACESTART:
53188 return blk_trace_startstop(sdp->device->request_queue, 1);
53189 case BLKTRACESTOP:
53190diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53191index c0d660f..24a5854 100644
53192--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53193+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53194@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53195 return i;
53196 }
53197
53198-static struct bin_attribute fuse_bin_attr = {
53199+static bin_attribute_no_const fuse_bin_attr = {
53200 .attr = { .name = "fuse", .mode = S_IRUGO, },
53201 .read = fuse_read,
53202 };
53203diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53204index 57a1950..ae54e21 100644
53205--- a/drivers/spi/spi.c
53206+++ b/drivers/spi/spi.c
53207@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
53208 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53209
53210 /* portable code must never pass more than 32 bytes */
53211-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53212+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53213
53214 static u8 *buf;
53215
53216diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53217index b41429f..2de5373 100644
53218--- a/drivers/staging/android/timed_output.c
53219+++ b/drivers/staging/android/timed_output.c
53220@@ -25,7 +25,7 @@
53221 #include "timed_output.h"
53222
53223 static struct class *timed_output_class;
53224-static atomic_t device_count;
53225+static atomic_unchecked_t device_count;
53226
53227 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53228 char *buf)
53229@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53230 timed_output_class = class_create(THIS_MODULE, "timed_output");
53231 if (IS_ERR(timed_output_class))
53232 return PTR_ERR(timed_output_class);
53233- atomic_set(&device_count, 0);
53234+ atomic_set_unchecked(&device_count, 0);
53235 timed_output_class->dev_groups = timed_output_groups;
53236 }
53237
53238@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53239 if (ret < 0)
53240 return ret;
53241
53242- tdev->index = atomic_inc_return(&device_count);
53243+ tdev->index = atomic_inc_return_unchecked(&device_count);
53244 tdev->dev = device_create(timed_output_class, NULL,
53245 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53246 if (IS_ERR(tdev->dev))
53247diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53248index 727640e..55bf61c 100644
53249--- a/drivers/staging/comedi/comedi_fops.c
53250+++ b/drivers/staging/comedi/comedi_fops.c
53251@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53252 }
53253 cfp->last_attached = dev->attached;
53254 cfp->last_detach_count = dev->detach_count;
53255- ACCESS_ONCE(cfp->read_subdev) = read_s;
53256- ACCESS_ONCE(cfp->write_subdev) = write_s;
53257+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53258+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53259 }
53260
53261 static void comedi_file_check(struct file *file)
53262@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53263 !(s_old->async->cmd.flags & CMDF_WRITE))
53264 return -EBUSY;
53265
53266- ACCESS_ONCE(cfp->read_subdev) = s_new;
53267+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53268 return 0;
53269 }
53270
53271@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53272 (s_old->async->cmd.flags & CMDF_WRITE))
53273 return -EBUSY;
53274
53275- ACCESS_ONCE(cfp->write_subdev) = s_new;
53276+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53277 return 0;
53278 }
53279
53280diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53281index 37dcf7e..f3c2016 100644
53282--- a/drivers/staging/fbtft/fbtft-core.c
53283+++ b/drivers/staging/fbtft/fbtft-core.c
53284@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53285 {
53286 struct fb_info *info;
53287 struct fbtft_par *par;
53288- struct fb_ops *fbops = NULL;
53289+ fb_ops_no_const *fbops = NULL;
53290 struct fb_deferred_io *fbdefio = NULL;
53291 struct fbtft_platform_data *pdata = dev->platform_data;
53292 u8 *vmem = NULL;
53293diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53294index 0dbf3f9..fed0063 100644
53295--- a/drivers/staging/fbtft/fbtft.h
53296+++ b/drivers/staging/fbtft/fbtft.h
53297@@ -106,7 +106,7 @@ struct fbtft_ops {
53298
53299 int (*set_var)(struct fbtft_par *par);
53300 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53301-};
53302+} __no_const;
53303
53304 /**
53305 * struct fbtft_display - Describes the display properties
53306diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53307index 001348c..cfaac8a 100644
53308--- a/drivers/staging/gdm724x/gdm_tty.c
53309+++ b/drivers/staging/gdm724x/gdm_tty.c
53310@@ -44,7 +44,7 @@
53311 #define gdm_tty_send_control(n, r, v, d, l) (\
53312 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53313
53314-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53315+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53316
53317 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53318 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53319diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53320index d23c3c2..eb63c81 100644
53321--- a/drivers/staging/i2o/i2o.h
53322+++ b/drivers/staging/i2o/i2o.h
53323@@ -565,7 +565,7 @@ struct i2o_controller {
53324 struct i2o_device *exec; /* Executive */
53325 #if BITS_PER_LONG == 64
53326 spinlock_t context_list_lock; /* lock for context_list */
53327- atomic_t context_list_counter; /* needed for unique contexts */
53328+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53329 struct list_head context_list; /* list of context id's
53330 and pointers */
53331 #endif
53332diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53333index ad84f33..c5bdf65 100644
53334--- a/drivers/staging/i2o/i2o_proc.c
53335+++ b/drivers/staging/i2o/i2o_proc.c
53336@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
53337 "Array Controller Device"
53338 };
53339
53340-static char *chtostr(char *tmp, u8 *chars, int n)
53341-{
53342- tmp[0] = 0;
53343- return strncat(tmp, (char *)chars, n);
53344-}
53345-
53346 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53347 char *group)
53348 {
53349@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53350 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53351 {
53352 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53353- static u32 work32[5];
53354- static u8 *work8 = (u8 *) work32;
53355- static u16 *work16 = (u16 *) work32;
53356+ u32 work32[5];
53357+ u8 *work8 = (u8 *) work32;
53358+ u16 *work16 = (u16 *) work32;
53359 int token;
53360 u32 hwcap;
53361
53362@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53363 } *result;
53364
53365 i2o_exec_execute_ddm_table ddm_table;
53366- char tmp[28 + 1];
53367
53368 result = kmalloc(sizeof(*result), GFP_KERNEL);
53369 if (!result)
53370@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53371
53372 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53373 seq_printf(seq, "%-#8x", ddm_table.module_id);
53374- seq_printf(seq, "%-29s",
53375- chtostr(tmp, ddm_table.module_name_version, 28));
53376+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53377 seq_printf(seq, "%9d ", ddm_table.data_size);
53378 seq_printf(seq, "%8d", ddm_table.code_size);
53379
53380@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53381
53382 i2o_driver_result_table *result;
53383 i2o_driver_store_table *dst;
53384- char tmp[28 + 1];
53385
53386 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53387 if (result == NULL)
53388@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53389
53390 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53391 seq_printf(seq, "%-#8x", dst->module_id);
53392- seq_printf(seq, "%-29s",
53393- chtostr(tmp, dst->module_name_version, 28));
53394- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53395+ seq_printf(seq, "%-.28s", dst->module_name_version);
53396+ seq_printf(seq, "%-.8s", dst->date);
53397 seq_printf(seq, "%8d ", dst->module_size);
53398 seq_printf(seq, "%8d ", dst->mpb_size);
53399 seq_printf(seq, "0x%04x", dst->module_flags);
53400@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53401 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53402 {
53403 struct i2o_device *d = (struct i2o_device *)seq->private;
53404- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53405+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53406 // == (allow) 512d bytes (max)
53407- static u16 *work16 = (u16 *) work32;
53408+ u16 *work16 = (u16 *) work32;
53409 int token;
53410- char tmp[16 + 1];
53411
53412 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53413
53414@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53415 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53416 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53417 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53418- seq_printf(seq, "Vendor info : %s\n",
53419- chtostr(tmp, (u8 *) (work32 + 2), 16));
53420- seq_printf(seq, "Product info : %s\n",
53421- chtostr(tmp, (u8 *) (work32 + 6), 16));
53422- seq_printf(seq, "Description : %s\n",
53423- chtostr(tmp, (u8 *) (work32 + 10), 16));
53424- seq_printf(seq, "Product rev. : %s\n",
53425- chtostr(tmp, (u8 *) (work32 + 14), 8));
53426+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53427+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53428+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53429+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53430
53431 seq_printf(seq, "Serial number : ");
53432 print_serial_number(seq, (u8 *) (work32 + 16),
53433@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53434 u8 pad[256]; // allow up to 256 byte (max) serial number
53435 } result;
53436
53437- char tmp[24 + 1];
53438-
53439 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53440
53441 if (token < 0) {
53442@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53443 }
53444
53445 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53446- seq_printf(seq, "Module name : %s\n",
53447- chtostr(tmp, result.module_name, 24));
53448- seq_printf(seq, "Module revision : %s\n",
53449- chtostr(tmp, result.module_rev, 8));
53450+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53451+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53452
53453 seq_printf(seq, "Serial number : ");
53454 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53455@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53456 u8 instance_number[4];
53457 } result;
53458
53459- char tmp[64 + 1];
53460-
53461 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53462
53463 if (token < 0) {
53464@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53465 return 0;
53466 }
53467
53468- seq_printf(seq, "Device name : %s\n",
53469- chtostr(tmp, result.device_name, 64));
53470- seq_printf(seq, "Service name : %s\n",
53471- chtostr(tmp, result.service_name, 64));
53472- seq_printf(seq, "Physical name : %s\n",
53473- chtostr(tmp, result.physical_location, 64));
53474- seq_printf(seq, "Instance number : %s\n",
53475- chtostr(tmp, result.instance_number, 4));
53476+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53477+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53478+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53479+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53480
53481 return 0;
53482 }
53483@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53484 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53485 {
53486 struct i2o_device *d = (struct i2o_device *)seq->private;
53487- static u32 work32[12];
53488- static u16 *work16 = (u16 *) work32;
53489- static u8 *work8 = (u8 *) work32;
53490+ u32 work32[12];
53491+ u16 *work16 = (u16 *) work32;
53492+ u8 *work8 = (u8 *) work32;
53493 int token;
53494
53495 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53496diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53497index 52334fc..d7f40b3 100644
53498--- a/drivers/staging/i2o/iop.c
53499+++ b/drivers/staging/i2o/iop.c
53500@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53501
53502 spin_lock_irqsave(&c->context_list_lock, flags);
53503
53504- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53505- atomic_inc(&c->context_list_counter);
53506+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53507+ atomic_inc_unchecked(&c->context_list_counter);
53508
53509- entry->context = atomic_read(&c->context_list_counter);
53510+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53511
53512 list_add(&entry->list, &c->context_list);
53513
53514@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53515
53516 #if BITS_PER_LONG == 64
53517 spin_lock_init(&c->context_list_lock);
53518- atomic_set(&c->context_list_counter, 0);
53519+ atomic_set_unchecked(&c->context_list_counter, 0);
53520 INIT_LIST_HEAD(&c->context_list);
53521 #endif
53522
53523diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53524index 463da07..e791ce9 100644
53525--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53526+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53527@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53528 return 0;
53529 }
53530
53531-sfw_test_client_ops_t brw_test_client;
53532-void brw_init_test_client(void)
53533-{
53534- brw_test_client.tso_init = brw_client_init;
53535- brw_test_client.tso_fini = brw_client_fini;
53536- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53537- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53538+sfw_test_client_ops_t brw_test_client = {
53539+ .tso_init = brw_client_init,
53540+ .tso_fini = brw_client_fini,
53541+ .tso_prep_rpc = brw_client_prep_rpc,
53542+ .tso_done_rpc = brw_client_done_rpc,
53543 };
53544
53545 srpc_service_t brw_test_service;
53546diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53547index 5709148..ccd9e0d 100644
53548--- a/drivers/staging/lustre/lnet/selftest/framework.c
53549+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53550@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53551
53552 extern sfw_test_client_ops_t ping_test_client;
53553 extern srpc_service_t ping_test_service;
53554-extern void ping_init_test_client(void);
53555 extern void ping_init_test_service(void);
53556
53557 extern sfw_test_client_ops_t brw_test_client;
53558 extern srpc_service_t brw_test_service;
53559-extern void brw_init_test_client(void);
53560 extern void brw_init_test_service(void);
53561
53562
53563@@ -1675,12 +1673,10 @@ sfw_startup (void)
53564 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53565 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53566
53567- brw_init_test_client();
53568 brw_init_test_service();
53569 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53570 LASSERT (rc == 0);
53571
53572- ping_init_test_client();
53573 ping_init_test_service();
53574 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53575 LASSERT (rc == 0);
53576diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53577index d8c0df6..5041cbb 100644
53578--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53579+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53580@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53581 return 0;
53582 }
53583
53584-sfw_test_client_ops_t ping_test_client;
53585-void ping_init_test_client(void)
53586-{
53587- ping_test_client.tso_init = ping_client_init;
53588- ping_test_client.tso_fini = ping_client_fini;
53589- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53590- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53591-}
53592+sfw_test_client_ops_t ping_test_client = {
53593+ .tso_init = ping_client_init,
53594+ .tso_fini = ping_client_fini,
53595+ .tso_prep_rpc = ping_client_prep_rpc,
53596+ .tso_done_rpc = ping_client_done_rpc,
53597+};
53598
53599 srpc_service_t ping_test_service;
53600 void ping_init_test_service(void)
53601diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53602index 83bc0a9..12ba00a 100644
53603--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53604+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53605@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53606 ldlm_completion_callback lcs_completion;
53607 ldlm_blocking_callback lcs_blocking;
53608 ldlm_glimpse_callback lcs_glimpse;
53609-};
53610+} __no_const;
53611
53612 /* ldlm_lockd.c */
53613 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53614diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53615index 2a88b80..62e7e5f 100644
53616--- a/drivers/staging/lustre/lustre/include/obd.h
53617+++ b/drivers/staging/lustre/lustre/include/obd.h
53618@@ -1362,7 +1362,7 @@ struct md_ops {
53619 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53620 * wrapper function in include/linux/obd_class.h.
53621 */
53622-};
53623+} __no_const;
53624
53625 struct lsm_operations {
53626 void (*lsm_free)(struct lov_stripe_md *);
53627diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53628index a4c252f..b21acac 100644
53629--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53630+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53631@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53632 int added = (mode == LCK_NL);
53633 int overlaps = 0;
53634 int splitted = 0;
53635- const struct ldlm_callback_suite null_cbs = { NULL };
53636+ const struct ldlm_callback_suite null_cbs = { };
53637
53638 CDEBUG(D_DLMTRACE,
53639 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53640diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53641index c539e37..743b213 100644
53642--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53643+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53644@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53645 loff_t *ppos)
53646 {
53647 int rc, max_delay_cs;
53648- struct ctl_table dummy = *table;
53649+ ctl_table_no_const dummy = *table;
53650 long d;
53651
53652 dummy.data = &max_delay_cs;
53653@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53654 loff_t *ppos)
53655 {
53656 int rc, min_delay_cs;
53657- struct ctl_table dummy = *table;
53658+ ctl_table_no_const dummy = *table;
53659 long d;
53660
53661 dummy.data = &min_delay_cs;
53662@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53663 void __user *buffer, size_t *lenp, loff_t *ppos)
53664 {
53665 int rc, backoff;
53666- struct ctl_table dummy = *table;
53667+ ctl_table_no_const dummy = *table;
53668
53669 dummy.data = &backoff;
53670 dummy.proc_handler = &proc_dointvec;
53671diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53672index 7dc77dd..289d03e 100644
53673--- a/drivers/staging/lustre/lustre/libcfs/module.c
53674+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53675@@ -313,11 +313,11 @@ out:
53676
53677
53678 struct cfs_psdev_ops libcfs_psdev_ops = {
53679- libcfs_psdev_open,
53680- libcfs_psdev_release,
53681- NULL,
53682- NULL,
53683- libcfs_ioctl
53684+ .p_open = libcfs_psdev_open,
53685+ .p_close = libcfs_psdev_release,
53686+ .p_read = NULL,
53687+ .p_write = NULL,
53688+ .p_ioctl = libcfs_ioctl
53689 };
53690
53691 extern int insert_proc(void);
53692diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53693index 22667db..8b703b6 100644
53694--- a/drivers/staging/octeon/ethernet-rx.c
53695+++ b/drivers/staging/octeon/ethernet-rx.c
53696@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53697 /* Increment RX stats for virtual ports */
53698 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53699 #ifdef CONFIG_64BIT
53700- atomic64_add(1,
53701+ atomic64_add_unchecked(1,
53702 (atomic64_t *)&priv->stats.rx_packets);
53703- atomic64_add(skb->len,
53704+ atomic64_add_unchecked(skb->len,
53705 (atomic64_t *)&priv->stats.rx_bytes);
53706 #else
53707- atomic_add(1,
53708+ atomic_add_unchecked(1,
53709 (atomic_t *)&priv->stats.rx_packets);
53710- atomic_add(skb->len,
53711+ atomic_add_unchecked(skb->len,
53712 (atomic_t *)&priv->stats.rx_bytes);
53713 #endif
53714 }
53715@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53716 dev->name);
53717 */
53718 #ifdef CONFIG_64BIT
53719- atomic64_add(1,
53720+ atomic64_add_unchecked(1,
53721 (atomic64_t *)&priv->stats.rx_dropped);
53722 #else
53723- atomic_add(1,
53724+ atomic_add_unchecked(1,
53725 (atomic_t *)&priv->stats.rx_dropped);
53726 #endif
53727 dev_kfree_skb_irq(skb);
53728diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53729index 460e854..f926452 100644
53730--- a/drivers/staging/octeon/ethernet.c
53731+++ b/drivers/staging/octeon/ethernet.c
53732@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53733 * since the RX tasklet also increments it.
53734 */
53735 #ifdef CONFIG_64BIT
53736- atomic64_add(rx_status.dropped_packets,
53737- (atomic64_t *)&priv->stats.rx_dropped);
53738+ atomic64_add_unchecked(rx_status.dropped_packets,
53739+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53740 #else
53741- atomic_add(rx_status.dropped_packets,
53742- (atomic_t *)&priv->stats.rx_dropped);
53743+ atomic_add_unchecked(rx_status.dropped_packets,
53744+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53745 #endif
53746 }
53747
53748diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53749index 3b476d8..f522d68 100644
53750--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53751+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53752@@ -225,7 +225,7 @@ struct hal_ops {
53753
53754 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53755 void (*hal_reset_security_engine)(struct adapter *adapter);
53756-};
53757+} __no_const;
53758
53759 enum rt_eeprom_type {
53760 EEPROM_93C46,
53761diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53762index 070cc03..6806e37 100644
53763--- a/drivers/staging/rtl8712/rtl871x_io.h
53764+++ b/drivers/staging/rtl8712/rtl871x_io.h
53765@@ -108,7 +108,7 @@ struct _io_ops {
53766 u8 *pmem);
53767 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53768 u8 *pmem);
53769-};
53770+} __no_const;
53771
53772 struct io_req {
53773 struct list_head list;
53774diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53775index 98f3ba4..c6a7fce 100644
53776--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53777+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53778@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53779 void (*device_resume)(ulong bus_no, ulong dev_no);
53780 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53781 ulong *max_size);
53782-};
53783+} __no_const;
53784
53785 /* These functions live inside visorchipset, and will be called to indicate
53786 * responses to specific events (by code outside of visorchipset).
53787@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53788 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53789 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53790 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53791-};
53792+} __no_const;
53793
53794 /** Register functions (in the bus driver) to get called by visorchipset
53795 * whenever a bus or device appears for which this service partition is
53796diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53797index 9512af6..045bf5a 100644
53798--- a/drivers/target/sbp/sbp_target.c
53799+++ b/drivers/target/sbp/sbp_target.c
53800@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53801
53802 #define SESSION_MAINTENANCE_INTERVAL HZ
53803
53804-static atomic_t login_id = ATOMIC_INIT(0);
53805+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53806
53807 static void session_maintenance_work(struct work_struct *);
53808 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53809@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53810 login->lun = se_lun;
53811 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53812 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53813- login->login_id = atomic_inc_return(&login_id);
53814+ login->login_id = atomic_inc_return_unchecked(&login_id);
53815
53816 login->tgt_agt = sbp_target_agent_register(login);
53817 if (IS_ERR(login->tgt_agt)) {
53818diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53819index 7faa6ae..ae6c410 100644
53820--- a/drivers/target/target_core_device.c
53821+++ b/drivers/target/target_core_device.c
53822@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53823 spin_lock_init(&dev->se_tmr_lock);
53824 spin_lock_init(&dev->qf_cmd_lock);
53825 sema_init(&dev->caw_sem, 1);
53826- atomic_set(&dev->dev_ordered_id, 0);
53827+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53828 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53829 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53830 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53831diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53832index f786de0..04b643e 100644
53833--- a/drivers/target/target_core_transport.c
53834+++ b/drivers/target/target_core_transport.c
53835@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53836 * Used to determine when ORDERED commands should go from
53837 * Dormant to Active status.
53838 */
53839- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53840+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53841 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53842 cmd->se_ordered_id, cmd->sam_task_attr,
53843 dev->transport->name);
53844diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53845index 031018e..90981a1 100644
53846--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53847+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53848@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53849 platform_set_drvdata(pdev, priv);
53850
53851 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53852- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53853- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53854+ pax_open_kernel();
53855+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53856+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53857+ pax_close_kernel();
53858 }
53859 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53860 priv, &int3400_thermal_ops,
53861diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53862index 668fb1b..2737bbe 100644
53863--- a/drivers/thermal/of-thermal.c
53864+++ b/drivers/thermal/of-thermal.c
53865@@ -31,6 +31,7 @@
53866 #include <linux/export.h>
53867 #include <linux/string.h>
53868 #include <linux/thermal.h>
53869+#include <linux/mm.h>
53870
53871 #include "thermal_core.h"
53872
53873@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53874 tz->ops = ops;
53875 tz->sensor_data = data;
53876
53877- tzd->ops->get_temp = of_thermal_get_temp;
53878- tzd->ops->get_trend = of_thermal_get_trend;
53879- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53880+ pax_open_kernel();
53881+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53882+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53883+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53884+ pax_close_kernel();
53885 mutex_unlock(&tzd->lock);
53886
53887 return tzd;
53888@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53889 return;
53890
53891 mutex_lock(&tzd->lock);
53892- tzd->ops->get_temp = NULL;
53893- tzd->ops->get_trend = NULL;
53894- tzd->ops->set_emul_temp = NULL;
53895+ pax_open_kernel();
53896+ *(void **)&tzd->ops->get_temp = NULL;
53897+ *(void **)&tzd->ops->get_trend = NULL;
53898+ *(void **)&tzd->ops->set_emul_temp = NULL;
53899+ pax_close_kernel();
53900
53901 tz->ops = NULL;
53902 tz->sensor_data = NULL;
53903diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53904index 9ea3d9d..53e8792 100644
53905--- a/drivers/thermal/x86_pkg_temp_thermal.c
53906+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53907@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53908 return NOTIFY_OK;
53909 }
53910
53911-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53912+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53913 .notifier_call = pkg_temp_thermal_cpu_callback,
53914 };
53915
53916diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53917index fd66f57..48e6376 100644
53918--- a/drivers/tty/cyclades.c
53919+++ b/drivers/tty/cyclades.c
53920@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53921 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53922 info->port.count);
53923 #endif
53924- info->port.count++;
53925+ atomic_inc(&info->port.count);
53926 #ifdef CY_DEBUG_COUNT
53927 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53928- current->pid, info->port.count);
53929+ current->pid, atomic_read(&info->port.count));
53930 #endif
53931
53932 /*
53933@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53934 for (j = 0; j < cy_card[i].nports; j++) {
53935 info = &cy_card[i].ports[j];
53936
53937- if (info->port.count) {
53938+ if (atomic_read(&info->port.count)) {
53939 /* XXX is the ldisc num worth this? */
53940 struct tty_struct *tty;
53941 struct tty_ldisc *ld;
53942diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53943index 4fcec1d..5a036f7 100644
53944--- a/drivers/tty/hvc/hvc_console.c
53945+++ b/drivers/tty/hvc/hvc_console.c
53946@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53947
53948 spin_lock_irqsave(&hp->port.lock, flags);
53949 /* Check and then increment for fast path open. */
53950- if (hp->port.count++ > 0) {
53951+ if (atomic_inc_return(&hp->port.count) > 1) {
53952 spin_unlock_irqrestore(&hp->port.lock, flags);
53953 hvc_kick();
53954 return 0;
53955@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53956
53957 spin_lock_irqsave(&hp->port.lock, flags);
53958
53959- if (--hp->port.count == 0) {
53960+ if (atomic_dec_return(&hp->port.count) == 0) {
53961 spin_unlock_irqrestore(&hp->port.lock, flags);
53962 /* We are done with the tty pointer now. */
53963 tty_port_tty_set(&hp->port, NULL);
53964@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53965 */
53966 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53967 } else {
53968- if (hp->port.count < 0)
53969+ if (atomic_read(&hp->port.count) < 0)
53970 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53971- hp->vtermno, hp->port.count);
53972+ hp->vtermno, atomic_read(&hp->port.count));
53973 spin_unlock_irqrestore(&hp->port.lock, flags);
53974 }
53975 }
53976@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53977 * open->hangup case this can be called after the final close so prevent
53978 * that from happening for now.
53979 */
53980- if (hp->port.count <= 0) {
53981+ if (atomic_read(&hp->port.count) <= 0) {
53982 spin_unlock_irqrestore(&hp->port.lock, flags);
53983 return;
53984 }
53985
53986- hp->port.count = 0;
53987+ atomic_set(&hp->port.count, 0);
53988 spin_unlock_irqrestore(&hp->port.lock, flags);
53989 tty_port_tty_set(&hp->port, NULL);
53990
53991@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53992 return -EPIPE;
53993
53994 /* FIXME what's this (unprotected) check for? */
53995- if (hp->port.count <= 0)
53996+ if (atomic_read(&hp->port.count) <= 0)
53997 return -EIO;
53998
53999 spin_lock_irqsave(&hp->lock, flags);
54000diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54001index 81ff7e1..dfb7b71 100644
54002--- a/drivers/tty/hvc/hvcs.c
54003+++ b/drivers/tty/hvc/hvcs.c
54004@@ -83,6 +83,7 @@
54005 #include <asm/hvcserver.h>
54006 #include <asm/uaccess.h>
54007 #include <asm/vio.h>
54008+#include <asm/local.h>
54009
54010 /*
54011 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54012@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54013
54014 spin_lock_irqsave(&hvcsd->lock, flags);
54015
54016- if (hvcsd->port.count > 0) {
54017+ if (atomic_read(&hvcsd->port.count) > 0) {
54018 spin_unlock_irqrestore(&hvcsd->lock, flags);
54019 printk(KERN_INFO "HVCS: vterm state unchanged. "
54020 "The hvcs device node is still in use.\n");
54021@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54022 }
54023 }
54024
54025- hvcsd->port.count = 0;
54026+ atomic_set(&hvcsd->port.count, 0);
54027 hvcsd->port.tty = tty;
54028 tty->driver_data = hvcsd;
54029
54030@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54031 unsigned long flags;
54032
54033 spin_lock_irqsave(&hvcsd->lock, flags);
54034- hvcsd->port.count++;
54035+ atomic_inc(&hvcsd->port.count);
54036 hvcsd->todo_mask |= HVCS_SCHED_READ;
54037 spin_unlock_irqrestore(&hvcsd->lock, flags);
54038
54039@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54040 hvcsd = tty->driver_data;
54041
54042 spin_lock_irqsave(&hvcsd->lock, flags);
54043- if (--hvcsd->port.count == 0) {
54044+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54045
54046 vio_disable_interrupts(hvcsd->vdev);
54047
54048@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54049
54050 free_irq(irq, hvcsd);
54051 return;
54052- } else if (hvcsd->port.count < 0) {
54053+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54054 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54055 " is missmanaged.\n",
54056- hvcsd->vdev->unit_address, hvcsd->port.count);
54057+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54058 }
54059
54060 spin_unlock_irqrestore(&hvcsd->lock, flags);
54061@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54062
54063 spin_lock_irqsave(&hvcsd->lock, flags);
54064 /* Preserve this so that we know how many kref refs to put */
54065- temp_open_count = hvcsd->port.count;
54066+ temp_open_count = atomic_read(&hvcsd->port.count);
54067
54068 /*
54069 * Don't kref put inside the spinlock because the destruction
54070@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54071 tty->driver_data = NULL;
54072 hvcsd->port.tty = NULL;
54073
54074- hvcsd->port.count = 0;
54075+ atomic_set(&hvcsd->port.count, 0);
54076
54077 /* This will drop any buffered data on the floor which is OK in a hangup
54078 * scenario. */
54079@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54080 * the middle of a write operation? This is a crummy place to do this
54081 * but we want to keep it all in the spinlock.
54082 */
54083- if (hvcsd->port.count <= 0) {
54084+ if (atomic_read(&hvcsd->port.count) <= 0) {
54085 spin_unlock_irqrestore(&hvcsd->lock, flags);
54086 return -ENODEV;
54087 }
54088@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54089 {
54090 struct hvcs_struct *hvcsd = tty->driver_data;
54091
54092- if (!hvcsd || hvcsd->port.count <= 0)
54093+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54094 return 0;
54095
54096 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54097diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54098index 4190199..06d5bfa 100644
54099--- a/drivers/tty/hvc/hvsi.c
54100+++ b/drivers/tty/hvc/hvsi.c
54101@@ -85,7 +85,7 @@ struct hvsi_struct {
54102 int n_outbuf;
54103 uint32_t vtermno;
54104 uint32_t virq;
54105- atomic_t seqno; /* HVSI packet sequence number */
54106+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54107 uint16_t mctrl;
54108 uint8_t state; /* HVSI protocol state */
54109 uint8_t flags;
54110@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54111
54112 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54113 packet.hdr.len = sizeof(struct hvsi_query_response);
54114- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54115+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54116 packet.verb = VSV_SEND_VERSION_NUMBER;
54117 packet.u.version = HVSI_VERSION;
54118 packet.query_seqno = query_seqno+1;
54119@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54120
54121 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54122 packet.hdr.len = sizeof(struct hvsi_query);
54123- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54124+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54125 packet.verb = verb;
54126
54127 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54128@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54129 int wrote;
54130
54131 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54132- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54133+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54134 packet.hdr.len = sizeof(struct hvsi_control);
54135 packet.verb = VSV_SET_MODEM_CTL;
54136 packet.mask = HVSI_TSDTR;
54137@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54138 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54139
54140 packet.hdr.type = VS_DATA_PACKET_HEADER;
54141- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54142+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54143 packet.hdr.len = count + sizeof(struct hvsi_header);
54144 memcpy(&packet.data, buf, count);
54145
54146@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54147 struct hvsi_control packet __ALIGNED__;
54148
54149 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54150- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54151+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54152 packet.hdr.len = 6;
54153 packet.verb = VSV_CLOSE_PROTOCOL;
54154
54155@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54156
54157 tty_port_tty_set(&hp->port, tty);
54158 spin_lock_irqsave(&hp->lock, flags);
54159- hp->port.count++;
54160+ atomic_inc(&hp->port.count);
54161 atomic_set(&hp->seqno, 0);
54162 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54163 spin_unlock_irqrestore(&hp->lock, flags);
54164@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54165
54166 spin_lock_irqsave(&hp->lock, flags);
54167
54168- if (--hp->port.count == 0) {
54169+ if (atomic_dec_return(&hp->port.count) == 0) {
54170 tty_port_tty_set(&hp->port, NULL);
54171 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54172
54173@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54174
54175 spin_lock_irqsave(&hp->lock, flags);
54176 }
54177- } else if (hp->port.count < 0)
54178+ } else if (atomic_read(&hp->port.count) < 0)
54179 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54180- hp - hvsi_ports, hp->port.count);
54181+ hp - hvsi_ports, atomic_read(&hp->port.count));
54182
54183 spin_unlock_irqrestore(&hp->lock, flags);
54184 }
54185@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54186 tty_port_tty_set(&hp->port, NULL);
54187
54188 spin_lock_irqsave(&hp->lock, flags);
54189- hp->port.count = 0;
54190+ atomic_set(&hp->port.count, 0);
54191 hp->n_outbuf = 0;
54192 spin_unlock_irqrestore(&hp->lock, flags);
54193 }
54194diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54195index a270f04..7c77b5d 100644
54196--- a/drivers/tty/hvc/hvsi_lib.c
54197+++ b/drivers/tty/hvc/hvsi_lib.c
54198@@ -8,7 +8,7 @@
54199
54200 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54201 {
54202- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54203+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54204
54205 /* Assumes that always succeeds, works in practice */
54206 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54207@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54208
54209 /* Reset state */
54210 pv->established = 0;
54211- atomic_set(&pv->seqno, 0);
54212+ atomic_set_unchecked(&pv->seqno, 0);
54213
54214 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54215
54216diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54217index 345cebb..d5a1e9e 100644
54218--- a/drivers/tty/ipwireless/tty.c
54219+++ b/drivers/tty/ipwireless/tty.c
54220@@ -28,6 +28,7 @@
54221 #include <linux/tty_driver.h>
54222 #include <linux/tty_flip.h>
54223 #include <linux/uaccess.h>
54224+#include <asm/local.h>
54225
54226 #include "tty.h"
54227 #include "network.h"
54228@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54229 return -ENODEV;
54230
54231 mutex_lock(&tty->ipw_tty_mutex);
54232- if (tty->port.count == 0)
54233+ if (atomic_read(&tty->port.count) == 0)
54234 tty->tx_bytes_queued = 0;
54235
54236- tty->port.count++;
54237+ atomic_inc(&tty->port.count);
54238
54239 tty->port.tty = linux_tty;
54240 linux_tty->driver_data = tty;
54241@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54242
54243 static void do_ipw_close(struct ipw_tty *tty)
54244 {
54245- tty->port.count--;
54246-
54247- if (tty->port.count == 0) {
54248+ if (atomic_dec_return(&tty->port.count) == 0) {
54249 struct tty_struct *linux_tty = tty->port.tty;
54250
54251 if (linux_tty != NULL) {
54252@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54253 return;
54254
54255 mutex_lock(&tty->ipw_tty_mutex);
54256- if (tty->port.count == 0) {
54257+ if (atomic_read(&tty->port.count) == 0) {
54258 mutex_unlock(&tty->ipw_tty_mutex);
54259 return;
54260 }
54261@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54262
54263 mutex_lock(&tty->ipw_tty_mutex);
54264
54265- if (!tty->port.count) {
54266+ if (!atomic_read(&tty->port.count)) {
54267 mutex_unlock(&tty->ipw_tty_mutex);
54268 return;
54269 }
54270@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54271 return -ENODEV;
54272
54273 mutex_lock(&tty->ipw_tty_mutex);
54274- if (!tty->port.count) {
54275+ if (!atomic_read(&tty->port.count)) {
54276 mutex_unlock(&tty->ipw_tty_mutex);
54277 return -EINVAL;
54278 }
54279@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54280 if (!tty)
54281 return -ENODEV;
54282
54283- if (!tty->port.count)
54284+ if (!atomic_read(&tty->port.count))
54285 return -EINVAL;
54286
54287 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54288@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54289 if (!tty)
54290 return 0;
54291
54292- if (!tty->port.count)
54293+ if (!atomic_read(&tty->port.count))
54294 return 0;
54295
54296 return tty->tx_bytes_queued;
54297@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54298 if (!tty)
54299 return -ENODEV;
54300
54301- if (!tty->port.count)
54302+ if (!atomic_read(&tty->port.count))
54303 return -EINVAL;
54304
54305 return get_control_lines(tty);
54306@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54307 if (!tty)
54308 return -ENODEV;
54309
54310- if (!tty->port.count)
54311+ if (!atomic_read(&tty->port.count))
54312 return -EINVAL;
54313
54314 return set_control_lines(tty, set, clear);
54315@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54316 if (!tty)
54317 return -ENODEV;
54318
54319- if (!tty->port.count)
54320+ if (!atomic_read(&tty->port.count))
54321 return -EINVAL;
54322
54323 /* FIXME: Exactly how is the tty object locked here .. */
54324@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54325 * are gone */
54326 mutex_lock(&ttyj->ipw_tty_mutex);
54327 }
54328- while (ttyj->port.count)
54329+ while (atomic_read(&ttyj->port.count))
54330 do_ipw_close(ttyj);
54331 ipwireless_disassociate_network_ttys(network,
54332 ttyj->channel_idx);
54333diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54334index 14c54e0..1efd4f2 100644
54335--- a/drivers/tty/moxa.c
54336+++ b/drivers/tty/moxa.c
54337@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54338 }
54339
54340 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54341- ch->port.count++;
54342+ atomic_inc(&ch->port.count);
54343 tty->driver_data = ch;
54344 tty_port_tty_set(&ch->port, tty);
54345 mutex_lock(&ch->port.mutex);
54346diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54347index bce16e4..1120a85 100644
54348--- a/drivers/tty/n_gsm.c
54349+++ b/drivers/tty/n_gsm.c
54350@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54351 spin_lock_init(&dlci->lock);
54352 mutex_init(&dlci->mutex);
54353 dlci->fifo = &dlci->_fifo;
54354- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54355+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54356 kfree(dlci);
54357 return NULL;
54358 }
54359@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54360 struct gsm_dlci *dlci = tty->driver_data;
54361 struct tty_port *port = &dlci->port;
54362
54363- port->count++;
54364+ atomic_inc(&port->count);
54365 tty_port_tty_set(port, tty);
54366
54367 dlci->modem_rx = 0;
54368diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54369index eee40b5..796fb03 100644
54370--- a/drivers/tty/n_tty.c
54371+++ b/drivers/tty/n_tty.c
54372@@ -116,7 +116,7 @@ struct n_tty_data {
54373 int minimum_to_wake;
54374
54375 /* consumer-published */
54376- size_t read_tail;
54377+ size_t read_tail __intentional_overflow(-1);
54378 size_t line_start;
54379
54380 /* protected by output lock */
54381@@ -2572,6 +2572,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54382 {
54383 *ops = tty_ldisc_N_TTY;
54384 ops->owner = NULL;
54385- ops->refcount = ops->flags = 0;
54386+ atomic_set(&ops->refcount, 0);
54387+ ops->flags = 0;
54388 }
54389 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54390diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54391index 4d5e840..a2340a6 100644
54392--- a/drivers/tty/pty.c
54393+++ b/drivers/tty/pty.c
54394@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54395 panic("Couldn't register Unix98 pts driver");
54396
54397 /* Now create the /dev/ptmx special device */
54398+ pax_open_kernel();
54399 tty_default_fops(&ptmx_fops);
54400- ptmx_fops.open = ptmx_open;
54401+ *(void **)&ptmx_fops.open = ptmx_open;
54402+ pax_close_kernel();
54403
54404 cdev_init(&ptmx_cdev, &ptmx_fops);
54405 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54406diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54407index c8dd8dc..dca6cfd 100644
54408--- a/drivers/tty/rocket.c
54409+++ b/drivers/tty/rocket.c
54410@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54411 tty->driver_data = info;
54412 tty_port_tty_set(port, tty);
54413
54414- if (port->count++ == 0) {
54415+ if (atomic_inc_return(&port->count) == 1) {
54416 atomic_inc(&rp_num_ports_open);
54417
54418 #ifdef ROCKET_DEBUG_OPEN
54419@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54420 #endif
54421 }
54422 #ifdef ROCKET_DEBUG_OPEN
54423- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54424+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54425 #endif
54426
54427 /*
54428@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54429 spin_unlock_irqrestore(&info->port.lock, flags);
54430 return;
54431 }
54432- if (info->port.count)
54433+ if (atomic_read(&info->port.count))
54434 atomic_dec(&rp_num_ports_open);
54435 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54436 spin_unlock_irqrestore(&info->port.lock, flags);
54437diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54438index aa28209..e08fb85 100644
54439--- a/drivers/tty/serial/ioc4_serial.c
54440+++ b/drivers/tty/serial/ioc4_serial.c
54441@@ -437,7 +437,7 @@ struct ioc4_soft {
54442 } is_intr_info[MAX_IOC4_INTR_ENTS];
54443
54444 /* Number of entries active in the above array */
54445- atomic_t is_num_intrs;
54446+ atomic_unchecked_t is_num_intrs;
54447 } is_intr_type[IOC4_NUM_INTR_TYPES];
54448
54449 /* is_ir_lock must be held while
54450@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54451 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54452 || (type == IOC4_OTHER_INTR_TYPE)));
54453
54454- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54455+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54456 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54457
54458 /* Save off the lower level interrupt handler */
54459@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54460
54461 soft = arg;
54462 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54463- num_intrs = (int)atomic_read(
54464+ num_intrs = (int)atomic_read_unchecked(
54465 &soft->is_intr_type[intr_type].is_num_intrs);
54466
54467 this_mir = this_ir = pending_intrs(soft, intr_type);
54468diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54469index 129dc5b..1da5bb8 100644
54470--- a/drivers/tty/serial/kgdb_nmi.c
54471+++ b/drivers/tty/serial/kgdb_nmi.c
54472@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54473 * I/O utilities that messages sent to the console will automatically
54474 * be displayed on the dbg_io.
54475 */
54476- dbg_io_ops->is_console = true;
54477+ pax_open_kernel();
54478+ *(int *)&dbg_io_ops->is_console = true;
54479+ pax_close_kernel();
54480
54481 return 0;
54482 }
54483diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54484index a260cde..6b2b5ce 100644
54485--- a/drivers/tty/serial/kgdboc.c
54486+++ b/drivers/tty/serial/kgdboc.c
54487@@ -24,8 +24,9 @@
54488 #define MAX_CONFIG_LEN 40
54489
54490 static struct kgdb_io kgdboc_io_ops;
54491+static struct kgdb_io kgdboc_io_ops_console;
54492
54493-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54494+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54495 static int configured = -1;
54496
54497 static char config[MAX_CONFIG_LEN];
54498@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54499 kgdboc_unregister_kbd();
54500 if (configured == 1)
54501 kgdb_unregister_io_module(&kgdboc_io_ops);
54502+ else if (configured == 2)
54503+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54504 }
54505
54506 static int configure_kgdboc(void)
54507@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54508 int err;
54509 char *cptr = config;
54510 struct console *cons;
54511+ int is_console = 0;
54512
54513 err = kgdboc_option_setup(config);
54514 if (err || !strlen(config) || isspace(config[0]))
54515 goto noconfig;
54516
54517 err = -ENODEV;
54518- kgdboc_io_ops.is_console = 0;
54519 kgdb_tty_driver = NULL;
54520
54521 kgdboc_use_kms = 0;
54522@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54523 int idx;
54524 if (cons->device && cons->device(cons, &idx) == p &&
54525 idx == tty_line) {
54526- kgdboc_io_ops.is_console = 1;
54527+ is_console = 1;
54528 break;
54529 }
54530 cons = cons->next;
54531@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54532 kgdb_tty_line = tty_line;
54533
54534 do_register:
54535- err = kgdb_register_io_module(&kgdboc_io_ops);
54536+ if (is_console) {
54537+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54538+ configured = 2;
54539+ } else {
54540+ err = kgdb_register_io_module(&kgdboc_io_ops);
54541+ configured = 1;
54542+ }
54543 if (err)
54544 goto noconfig;
54545
54546@@ -205,8 +214,6 @@ do_register:
54547 if (err)
54548 goto nmi_con_failed;
54549
54550- configured = 1;
54551-
54552 return 0;
54553
54554 nmi_con_failed:
54555@@ -223,7 +230,7 @@ noconfig:
54556 static int __init init_kgdboc(void)
54557 {
54558 /* Already configured? */
54559- if (configured == 1)
54560+ if (configured >= 1)
54561 return 0;
54562
54563 return configure_kgdboc();
54564@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54565 if (config[len - 1] == '\n')
54566 config[len - 1] = '\0';
54567
54568- if (configured == 1)
54569+ if (configured >= 1)
54570 cleanup_kgdboc();
54571
54572 /* Go and configure with the new params. */
54573@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54574 .post_exception = kgdboc_post_exp_handler,
54575 };
54576
54577+static struct kgdb_io kgdboc_io_ops_console = {
54578+ .name = "kgdboc",
54579+ .read_char = kgdboc_get_char,
54580+ .write_char = kgdboc_put_char,
54581+ .pre_exception = kgdboc_pre_exp_handler,
54582+ .post_exception = kgdboc_post_exp_handler,
54583+ .is_console = 1
54584+};
54585+
54586 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54587 /* This is only available if kgdboc is a built in for early debugging */
54588 static int __init kgdboc_early_init(char *opt)
54589diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54590index b73889c..9f74f0a 100644
54591--- a/drivers/tty/serial/msm_serial.c
54592+++ b/drivers/tty/serial/msm_serial.c
54593@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54594 .cons = MSM_CONSOLE,
54595 };
54596
54597-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54598+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54599
54600 static const struct of_device_id msm_uartdm_table[] = {
54601 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54602@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54603 line = pdev->id;
54604
54605 if (line < 0)
54606- line = atomic_inc_return(&msm_uart_next_id) - 1;
54607+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54608
54609 if (unlikely(line < 0 || line >= UART_NR))
54610 return -ENXIO;
54611diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54612index cf08876..711e0bf 100644
54613--- a/drivers/tty/serial/samsung.c
54614+++ b/drivers/tty/serial/samsung.c
54615@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54616 ourport->tx_in_progress = 0;
54617 }
54618
54619+static int s3c64xx_serial_startup(struct uart_port *port);
54620 static int s3c24xx_serial_startup(struct uart_port *port)
54621 {
54622 struct s3c24xx_uart_port *ourport = to_ourport(port);
54623 int ret;
54624
54625+ /* Startup sequence is different for s3c64xx and higher SoC's */
54626+ if (s3c24xx_serial_has_interrupt_mask(port))
54627+ return s3c64xx_serial_startup(port);
54628+
54629 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54630 port, (unsigned long long)port->mapbase, port->membase);
54631
54632@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54633 /* setup info for port */
54634 port->dev = &platdev->dev;
54635
54636- /* Startup sequence is different for s3c64xx and higher SoC's */
54637- if (s3c24xx_serial_has_interrupt_mask(port))
54638- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54639-
54640 port->uartclk = 1;
54641
54642 if (cfg->uart_flags & UPF_CONS_FLOW) {
54643diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54644index 6a1055a..5ca9ad9 100644
54645--- a/drivers/tty/serial/serial_core.c
54646+++ b/drivers/tty/serial/serial_core.c
54647@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54648 state = drv->state + tty->index;
54649 port = &state->port;
54650 spin_lock_irq(&port->lock);
54651- --port->count;
54652+ atomic_dec(&port->count);
54653 spin_unlock_irq(&port->lock);
54654 return;
54655 }
54656@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54657
54658 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54659
54660- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54661+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54662 return;
54663
54664 /*
54665@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54666 uart_flush_buffer(tty);
54667 uart_shutdown(tty, state);
54668 spin_lock_irqsave(&port->lock, flags);
54669- port->count = 0;
54670+ atomic_set(&port->count, 0);
54671 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54672 spin_unlock_irqrestore(&port->lock, flags);
54673 tty_port_tty_set(port, NULL);
54674@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54675 pr_debug("uart_open(%d) called\n", line);
54676
54677 spin_lock_irq(&port->lock);
54678- ++port->count;
54679+ atomic_inc(&port->count);
54680 spin_unlock_irq(&port->lock);
54681
54682 /*
54683diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54684index b799170..87dafd5 100644
54685--- a/drivers/tty/synclink.c
54686+++ b/drivers/tty/synclink.c
54687@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54688
54689 if (debug_level >= DEBUG_LEVEL_INFO)
54690 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54691- __FILE__,__LINE__, info->device_name, info->port.count);
54692+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54693
54694 if (tty_port_close_start(&info->port, tty, filp) == 0)
54695 goto cleanup;
54696@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54697 cleanup:
54698 if (debug_level >= DEBUG_LEVEL_INFO)
54699 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54700- tty->driver->name, info->port.count);
54701+ tty->driver->name, atomic_read(&info->port.count));
54702
54703 } /* end of mgsl_close() */
54704
54705@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54706
54707 mgsl_flush_buffer(tty);
54708 shutdown(info);
54709-
54710- info->port.count = 0;
54711+
54712+ atomic_set(&info->port.count, 0);
54713 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54714 info->port.tty = NULL;
54715
54716@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54717
54718 if (debug_level >= DEBUG_LEVEL_INFO)
54719 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54720- __FILE__,__LINE__, tty->driver->name, port->count );
54721+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54722
54723 spin_lock_irqsave(&info->irq_spinlock, flags);
54724- port->count--;
54725+ atomic_dec(&port->count);
54726 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54727 port->blocked_open++;
54728
54729@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54730
54731 if (debug_level >= DEBUG_LEVEL_INFO)
54732 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54733- __FILE__,__LINE__, tty->driver->name, port->count );
54734+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54735
54736 tty_unlock(tty);
54737 schedule();
54738@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54739
54740 /* FIXME: Racy on hangup during close wait */
54741 if (!tty_hung_up_p(filp))
54742- port->count++;
54743+ atomic_inc(&port->count);
54744 port->blocked_open--;
54745
54746 if (debug_level >= DEBUG_LEVEL_INFO)
54747 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54748- __FILE__,__LINE__, tty->driver->name, port->count );
54749+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54750
54751 if (!retval)
54752 port->flags |= ASYNC_NORMAL_ACTIVE;
54753@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54754
54755 if (debug_level >= DEBUG_LEVEL_INFO)
54756 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54757- __FILE__,__LINE__,tty->driver->name, info->port.count);
54758+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54759
54760 /* If port is closing, signal caller to try again */
54761 if (info->port.flags & ASYNC_CLOSING){
54762@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54763 spin_unlock_irqrestore(&info->netlock, flags);
54764 goto cleanup;
54765 }
54766- info->port.count++;
54767+ atomic_inc(&info->port.count);
54768 spin_unlock_irqrestore(&info->netlock, flags);
54769
54770- if (info->port.count == 1) {
54771+ if (atomic_read(&info->port.count) == 1) {
54772 /* 1st open on this device, init hardware */
54773 retval = startup(info);
54774 if (retval < 0)
54775@@ -3442,8 +3442,8 @@ cleanup:
54776 if (retval) {
54777 if (tty->count == 1)
54778 info->port.tty = NULL; /* tty layer will release tty struct */
54779- if(info->port.count)
54780- info->port.count--;
54781+ if (atomic_read(&info->port.count))
54782+ atomic_dec(&info->port.count);
54783 }
54784
54785 return retval;
54786@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54787 unsigned short new_crctype;
54788
54789 /* return error if TTY interface open */
54790- if (info->port.count)
54791+ if (atomic_read(&info->port.count))
54792 return -EBUSY;
54793
54794 switch (encoding)
54795@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54796
54797 /* arbitrate between network and tty opens */
54798 spin_lock_irqsave(&info->netlock, flags);
54799- if (info->port.count != 0 || info->netcount != 0) {
54800+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54801 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54802 spin_unlock_irqrestore(&info->netlock, flags);
54803 return -EBUSY;
54804@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54805 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54806
54807 /* return error if TTY interface open */
54808- if (info->port.count)
54809+ if (atomic_read(&info->port.count))
54810 return -EBUSY;
54811
54812 if (cmd != SIOCWANDEV)
54813diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54814index 0e8c39b..e0cb171 100644
54815--- a/drivers/tty/synclink_gt.c
54816+++ b/drivers/tty/synclink_gt.c
54817@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54818 tty->driver_data = info;
54819 info->port.tty = tty;
54820
54821- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54822+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54823
54824 /* If port is closing, signal caller to try again */
54825 if (info->port.flags & ASYNC_CLOSING){
54826@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54827 mutex_unlock(&info->port.mutex);
54828 goto cleanup;
54829 }
54830- info->port.count++;
54831+ atomic_inc(&info->port.count);
54832 spin_unlock_irqrestore(&info->netlock, flags);
54833
54834- if (info->port.count == 1) {
54835+ if (atomic_read(&info->port.count) == 1) {
54836 /* 1st open on this device, init hardware */
54837 retval = startup(info);
54838 if (retval < 0) {
54839@@ -715,8 +715,8 @@ cleanup:
54840 if (retval) {
54841 if (tty->count == 1)
54842 info->port.tty = NULL; /* tty layer will release tty struct */
54843- if(info->port.count)
54844- info->port.count--;
54845+ if(atomic_read(&info->port.count))
54846+ atomic_dec(&info->port.count);
54847 }
54848
54849 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54850@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54851
54852 if (sanity_check(info, tty->name, "close"))
54853 return;
54854- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54855+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54856
54857 if (tty_port_close_start(&info->port, tty, filp) == 0)
54858 goto cleanup;
54859@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54860 tty_port_close_end(&info->port, tty);
54861 info->port.tty = NULL;
54862 cleanup:
54863- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54864+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54865 }
54866
54867 static void hangup(struct tty_struct *tty)
54868@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54869 shutdown(info);
54870
54871 spin_lock_irqsave(&info->port.lock, flags);
54872- info->port.count = 0;
54873+ atomic_set(&info->port.count, 0);
54874 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54875 info->port.tty = NULL;
54876 spin_unlock_irqrestore(&info->port.lock, flags);
54877@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54878 unsigned short new_crctype;
54879
54880 /* return error if TTY interface open */
54881- if (info->port.count)
54882+ if (atomic_read(&info->port.count))
54883 return -EBUSY;
54884
54885 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54886@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54887
54888 /* arbitrate between network and tty opens */
54889 spin_lock_irqsave(&info->netlock, flags);
54890- if (info->port.count != 0 || info->netcount != 0) {
54891+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54892 DBGINFO(("%s hdlc_open busy\n", dev->name));
54893 spin_unlock_irqrestore(&info->netlock, flags);
54894 return -EBUSY;
54895@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54896 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54897
54898 /* return error if TTY interface open */
54899- if (info->port.count)
54900+ if (atomic_read(&info->port.count))
54901 return -EBUSY;
54902
54903 if (cmd != SIOCWANDEV)
54904@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54905 if (port == NULL)
54906 continue;
54907 spin_lock(&port->lock);
54908- if ((port->port.count || port->netcount) &&
54909+ if ((atomic_read(&port->port.count) || port->netcount) &&
54910 port->pending_bh && !port->bh_running &&
54911 !port->bh_requested) {
54912 DBGISR(("%s bh queued\n", port->device_name));
54913@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54914 add_wait_queue(&port->open_wait, &wait);
54915
54916 spin_lock_irqsave(&info->lock, flags);
54917- port->count--;
54918+ atomic_dec(&port->count);
54919 spin_unlock_irqrestore(&info->lock, flags);
54920 port->blocked_open++;
54921
54922@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54923 remove_wait_queue(&port->open_wait, &wait);
54924
54925 if (!tty_hung_up_p(filp))
54926- port->count++;
54927+ atomic_inc(&port->count);
54928 port->blocked_open--;
54929
54930 if (!retval)
54931diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54932index c3f9091..abe4601 100644
54933--- a/drivers/tty/synclinkmp.c
54934+++ b/drivers/tty/synclinkmp.c
54935@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54936
54937 if (debug_level >= DEBUG_LEVEL_INFO)
54938 printk("%s(%d):%s open(), old ref count = %d\n",
54939- __FILE__,__LINE__,tty->driver->name, info->port.count);
54940+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54941
54942 /* If port is closing, signal caller to try again */
54943 if (info->port.flags & ASYNC_CLOSING){
54944@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54945 spin_unlock_irqrestore(&info->netlock, flags);
54946 goto cleanup;
54947 }
54948- info->port.count++;
54949+ atomic_inc(&info->port.count);
54950 spin_unlock_irqrestore(&info->netlock, flags);
54951
54952- if (info->port.count == 1) {
54953+ if (atomic_read(&info->port.count) == 1) {
54954 /* 1st open on this device, init hardware */
54955 retval = startup(info);
54956 if (retval < 0)
54957@@ -796,8 +796,8 @@ cleanup:
54958 if (retval) {
54959 if (tty->count == 1)
54960 info->port.tty = NULL; /* tty layer will release tty struct */
54961- if(info->port.count)
54962- info->port.count--;
54963+ if(atomic_read(&info->port.count))
54964+ atomic_dec(&info->port.count);
54965 }
54966
54967 return retval;
54968@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54969
54970 if (debug_level >= DEBUG_LEVEL_INFO)
54971 printk("%s(%d):%s close() entry, count=%d\n",
54972- __FILE__,__LINE__, info->device_name, info->port.count);
54973+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54974
54975 if (tty_port_close_start(&info->port, tty, filp) == 0)
54976 goto cleanup;
54977@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54978 cleanup:
54979 if (debug_level >= DEBUG_LEVEL_INFO)
54980 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54981- tty->driver->name, info->port.count);
54982+ tty->driver->name, atomic_read(&info->port.count));
54983 }
54984
54985 /* Called by tty_hangup() when a hangup is signaled.
54986@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54987 shutdown(info);
54988
54989 spin_lock_irqsave(&info->port.lock, flags);
54990- info->port.count = 0;
54991+ atomic_set(&info->port.count, 0);
54992 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54993 info->port.tty = NULL;
54994 spin_unlock_irqrestore(&info->port.lock, flags);
54995@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54996 unsigned short new_crctype;
54997
54998 /* return error if TTY interface open */
54999- if (info->port.count)
55000+ if (atomic_read(&info->port.count))
55001 return -EBUSY;
55002
55003 switch (encoding)
55004@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55005
55006 /* arbitrate between network and tty opens */
55007 spin_lock_irqsave(&info->netlock, flags);
55008- if (info->port.count != 0 || info->netcount != 0) {
55009+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55010 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55011 spin_unlock_irqrestore(&info->netlock, flags);
55012 return -EBUSY;
55013@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55014 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55015
55016 /* return error if TTY interface open */
55017- if (info->port.count)
55018+ if (atomic_read(&info->port.count))
55019 return -EBUSY;
55020
55021 if (cmd != SIOCWANDEV)
55022@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55023 * do not request bottom half processing if the
55024 * device is not open in a normal mode.
55025 */
55026- if ( port && (port->port.count || port->netcount) &&
55027+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55028 port->pending_bh && !port->bh_running &&
55029 !port->bh_requested ) {
55030 if ( debug_level >= DEBUG_LEVEL_ISR )
55031@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55032
55033 if (debug_level >= DEBUG_LEVEL_INFO)
55034 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55035- __FILE__,__LINE__, tty->driver->name, port->count );
55036+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55037
55038 spin_lock_irqsave(&info->lock, flags);
55039- port->count--;
55040+ atomic_dec(&port->count);
55041 spin_unlock_irqrestore(&info->lock, flags);
55042 port->blocked_open++;
55043
55044@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55045
55046 if (debug_level >= DEBUG_LEVEL_INFO)
55047 printk("%s(%d):%s block_til_ready() count=%d\n",
55048- __FILE__,__LINE__, tty->driver->name, port->count );
55049+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55050
55051 tty_unlock(tty);
55052 schedule();
55053@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55054 set_current_state(TASK_RUNNING);
55055 remove_wait_queue(&port->open_wait, &wait);
55056 if (!tty_hung_up_p(filp))
55057- port->count++;
55058+ atomic_inc(&port->count);
55059 port->blocked_open--;
55060
55061 if (debug_level >= DEBUG_LEVEL_INFO)
55062 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55063- __FILE__,__LINE__, tty->driver->name, port->count );
55064+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55065
55066 if (!retval)
55067 port->flags |= ASYNC_NORMAL_ACTIVE;
55068diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55069index 259a4d5..9b0c9e7 100644
55070--- a/drivers/tty/sysrq.c
55071+++ b/drivers/tty/sysrq.c
55072@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55073 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55074 size_t count, loff_t *ppos)
55075 {
55076- if (count) {
55077+ if (count && capable(CAP_SYS_ADMIN)) {
55078 char c;
55079
55080 if (get_user(c, buf))
55081diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55082index 2bb4dfc..a7f6e86 100644
55083--- a/drivers/tty/tty_io.c
55084+++ b/drivers/tty/tty_io.c
55085@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
55086
55087 void tty_default_fops(struct file_operations *fops)
55088 {
55089- *fops = tty_fops;
55090+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55091 }
55092
55093 /*
55094diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55095index 3737f55..7cef448 100644
55096--- a/drivers/tty/tty_ldisc.c
55097+++ b/drivers/tty/tty_ldisc.c
55098@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55099 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55100 tty_ldiscs[disc] = new_ldisc;
55101 new_ldisc->num = disc;
55102- new_ldisc->refcount = 0;
55103+ atomic_set(&new_ldisc->refcount, 0);
55104 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55105
55106 return ret;
55107@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55108 return -EINVAL;
55109
55110 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55111- if (tty_ldiscs[disc]->refcount)
55112+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55113 ret = -EBUSY;
55114 else
55115 tty_ldiscs[disc] = NULL;
55116@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55117 if (ldops) {
55118 ret = ERR_PTR(-EAGAIN);
55119 if (try_module_get(ldops->owner)) {
55120- ldops->refcount++;
55121+ atomic_inc(&ldops->refcount);
55122 ret = ldops;
55123 }
55124 }
55125@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55126 unsigned long flags;
55127
55128 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55129- ldops->refcount--;
55130+ atomic_dec(&ldops->refcount);
55131 module_put(ldops->owner);
55132 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55133 }
55134diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55135index 40b31835..94d92ae 100644
55136--- a/drivers/tty/tty_port.c
55137+++ b/drivers/tty/tty_port.c
55138@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55139 unsigned long flags;
55140
55141 spin_lock_irqsave(&port->lock, flags);
55142- port->count = 0;
55143+ atomic_set(&port->count, 0);
55144 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55145 tty = port->tty;
55146 if (tty)
55147@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55148
55149 /* The port lock protects the port counts */
55150 spin_lock_irqsave(&port->lock, flags);
55151- port->count--;
55152+ atomic_dec(&port->count);
55153 port->blocked_open++;
55154 spin_unlock_irqrestore(&port->lock, flags);
55155
55156@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55157 we must not mess that up further */
55158 spin_lock_irqsave(&port->lock, flags);
55159 if (!tty_hung_up_p(filp))
55160- port->count++;
55161+ atomic_inc(&port->count);
55162 port->blocked_open--;
55163 if (retval == 0)
55164 port->flags |= ASYNC_NORMAL_ACTIVE;
55165@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55166 return 0;
55167
55168 spin_lock_irqsave(&port->lock, flags);
55169- if (tty->count == 1 && port->count != 1) {
55170+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55171 printk(KERN_WARNING
55172 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55173- port->count);
55174- port->count = 1;
55175+ atomic_read(&port->count));
55176+ atomic_set(&port->count, 1);
55177 }
55178- if (--port->count < 0) {
55179+ if (atomic_dec_return(&port->count) < 0) {
55180 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55181- port->count);
55182- port->count = 0;
55183+ atomic_read(&port->count));
55184+ atomic_set(&port->count, 0);
55185 }
55186
55187- if (port->count) {
55188+ if (atomic_read(&port->count)) {
55189 spin_unlock_irqrestore(&port->lock, flags);
55190 return 0;
55191 }
55192@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55193 struct file *filp)
55194 {
55195 spin_lock_irq(&port->lock);
55196- ++port->count;
55197+ atomic_inc(&port->count);
55198 spin_unlock_irq(&port->lock);
55199 tty_port_tty_set(port, tty);
55200
55201diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55202index 8a89f6e..50b32af 100644
55203--- a/drivers/tty/vt/keyboard.c
55204+++ b/drivers/tty/vt/keyboard.c
55205@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55206 kbd->kbdmode == VC_OFF) &&
55207 value != KVAL(K_SAK))
55208 return; /* SAK is allowed even in raw mode */
55209+
55210+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55211+ {
55212+ void *func = fn_handler[value];
55213+ if (func == fn_show_state || func == fn_show_ptregs ||
55214+ func == fn_show_mem)
55215+ return;
55216+ }
55217+#endif
55218+
55219 fn_handler[value](vc);
55220 }
55221
55222@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55223 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55224 return -EFAULT;
55225
55226- if (!capable(CAP_SYS_TTY_CONFIG))
55227- perm = 0;
55228-
55229 switch (cmd) {
55230 case KDGKBENT:
55231 /* Ensure another thread doesn't free it under us */
55232@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55233 spin_unlock_irqrestore(&kbd_event_lock, flags);
55234 return put_user(val, &user_kbe->kb_value);
55235 case KDSKBENT:
55236+ if (!capable(CAP_SYS_TTY_CONFIG))
55237+ perm = 0;
55238+
55239 if (!perm)
55240 return -EPERM;
55241 if (!i && v == K_NOSUCHMAP) {
55242@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55243 int i, j, k;
55244 int ret;
55245
55246- if (!capable(CAP_SYS_TTY_CONFIG))
55247- perm = 0;
55248-
55249 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55250 if (!kbs) {
55251 ret = -ENOMEM;
55252@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55253 kfree(kbs);
55254 return ((p && *p) ? -EOVERFLOW : 0);
55255 case KDSKBSENT:
55256+ if (!capable(CAP_SYS_TTY_CONFIG))
55257+ perm = 0;
55258+
55259 if (!perm) {
55260 ret = -EPERM;
55261 goto reterr;
55262diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55263index 6276f13..84f2449 100644
55264--- a/drivers/uio/uio.c
55265+++ b/drivers/uio/uio.c
55266@@ -25,6 +25,7 @@
55267 #include <linux/kobject.h>
55268 #include <linux/cdev.h>
55269 #include <linux/uio_driver.h>
55270+#include <asm/local.h>
55271
55272 #define UIO_MAX_DEVICES (1U << MINORBITS)
55273
55274@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55275 struct device_attribute *attr, char *buf)
55276 {
55277 struct uio_device *idev = dev_get_drvdata(dev);
55278- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55279+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55280 }
55281 static DEVICE_ATTR_RO(event);
55282
55283@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55284 {
55285 struct uio_device *idev = info->uio_dev;
55286
55287- atomic_inc(&idev->event);
55288+ atomic_inc_unchecked(&idev->event);
55289 wake_up_interruptible(&idev->wait);
55290 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55291 }
55292@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55293 }
55294
55295 listener->dev = idev;
55296- listener->event_count = atomic_read(&idev->event);
55297+ listener->event_count = atomic_read_unchecked(&idev->event);
55298 filep->private_data = listener;
55299
55300 if (idev->info->open) {
55301@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55302 return -EIO;
55303
55304 poll_wait(filep, &idev->wait, wait);
55305- if (listener->event_count != atomic_read(&idev->event))
55306+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55307 return POLLIN | POLLRDNORM;
55308 return 0;
55309 }
55310@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55311 do {
55312 set_current_state(TASK_INTERRUPTIBLE);
55313
55314- event_count = atomic_read(&idev->event);
55315+ event_count = atomic_read_unchecked(&idev->event);
55316 if (event_count != listener->event_count) {
55317 if (copy_to_user(buf, &event_count, count))
55318 retval = -EFAULT;
55319@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55320 static int uio_find_mem_index(struct vm_area_struct *vma)
55321 {
55322 struct uio_device *idev = vma->vm_private_data;
55323+ unsigned long size;
55324
55325 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55326- if (idev->info->mem[vma->vm_pgoff].size == 0)
55327+ size = idev->info->mem[vma->vm_pgoff].size;
55328+ if (size == 0)
55329+ return -1;
55330+ if (vma->vm_end - vma->vm_start > size)
55331 return -1;
55332 return (int)vma->vm_pgoff;
55333 }
55334@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55335 idev->owner = owner;
55336 idev->info = info;
55337 init_waitqueue_head(&idev->wait);
55338- atomic_set(&idev->event, 0);
55339+ atomic_set_unchecked(&idev->event, 0);
55340
55341 ret = uio_get_minor(idev);
55342 if (ret)
55343diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55344index 813d4d3..a71934f 100644
55345--- a/drivers/usb/atm/cxacru.c
55346+++ b/drivers/usb/atm/cxacru.c
55347@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55348 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55349 if (ret < 2)
55350 return -EINVAL;
55351- if (index < 0 || index > 0x7f)
55352+ if (index > 0x7f)
55353 return -EINVAL;
55354 pos += tmp;
55355
55356diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55357index dada014..1d0d517 100644
55358--- a/drivers/usb/atm/usbatm.c
55359+++ b/drivers/usb/atm/usbatm.c
55360@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55361 if (printk_ratelimit())
55362 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55363 __func__, vpi, vci);
55364- atomic_inc(&vcc->stats->rx_err);
55365+ atomic_inc_unchecked(&vcc->stats->rx_err);
55366 return;
55367 }
55368
55369@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55370 if (length > ATM_MAX_AAL5_PDU) {
55371 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55372 __func__, length, vcc);
55373- atomic_inc(&vcc->stats->rx_err);
55374+ atomic_inc_unchecked(&vcc->stats->rx_err);
55375 goto out;
55376 }
55377
55378@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55379 if (sarb->len < pdu_length) {
55380 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55381 __func__, pdu_length, sarb->len, vcc);
55382- atomic_inc(&vcc->stats->rx_err);
55383+ atomic_inc_unchecked(&vcc->stats->rx_err);
55384 goto out;
55385 }
55386
55387 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55388 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55389 __func__, vcc);
55390- atomic_inc(&vcc->stats->rx_err);
55391+ atomic_inc_unchecked(&vcc->stats->rx_err);
55392 goto out;
55393 }
55394
55395@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55396 if (printk_ratelimit())
55397 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55398 __func__, length);
55399- atomic_inc(&vcc->stats->rx_drop);
55400+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55401 goto out;
55402 }
55403
55404@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55405
55406 vcc->push(vcc, skb);
55407
55408- atomic_inc(&vcc->stats->rx);
55409+ atomic_inc_unchecked(&vcc->stats->rx);
55410 out:
55411 skb_trim(sarb, 0);
55412 }
55413@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55414 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55415
55416 usbatm_pop(vcc, skb);
55417- atomic_inc(&vcc->stats->tx);
55418+ atomic_inc_unchecked(&vcc->stats->tx);
55419
55420 skb = skb_dequeue(&instance->sndqueue);
55421 }
55422@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55423 if (!left--)
55424 return sprintf(page,
55425 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55426- atomic_read(&atm_dev->stats.aal5.tx),
55427- atomic_read(&atm_dev->stats.aal5.tx_err),
55428- atomic_read(&atm_dev->stats.aal5.rx),
55429- atomic_read(&atm_dev->stats.aal5.rx_err),
55430- atomic_read(&atm_dev->stats.aal5.rx_drop));
55431+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55432+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55433+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55434+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55435+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55436
55437 if (!left--) {
55438 if (instance->disconnected)
55439diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55440index 2a3bbdf..91d72cf 100644
55441--- a/drivers/usb/core/devices.c
55442+++ b/drivers/usb/core/devices.c
55443@@ -126,7 +126,7 @@ static const char format_endpt[] =
55444 * time it gets called.
55445 */
55446 static struct device_connect_event {
55447- atomic_t count;
55448+ atomic_unchecked_t count;
55449 wait_queue_head_t wait;
55450 } device_event = {
55451 .count = ATOMIC_INIT(1),
55452@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55453
55454 void usbfs_conn_disc_event(void)
55455 {
55456- atomic_add(2, &device_event.count);
55457+ atomic_add_unchecked(2, &device_event.count);
55458 wake_up(&device_event.wait);
55459 }
55460
55461@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55462
55463 poll_wait(file, &device_event.wait, wait);
55464
55465- event_count = atomic_read(&device_event.count);
55466+ event_count = atomic_read_unchecked(&device_event.count);
55467 if (file->f_version != event_count) {
55468 file->f_version = event_count;
55469 return POLLIN | POLLRDNORM;
55470diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55471index 1163553..f292679 100644
55472--- a/drivers/usb/core/devio.c
55473+++ b/drivers/usb/core/devio.c
55474@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55475 struct usb_dev_state *ps = file->private_data;
55476 struct usb_device *dev = ps->dev;
55477 ssize_t ret = 0;
55478- unsigned len;
55479+ size_t len;
55480 loff_t pos;
55481 int i;
55482
55483@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55484 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55485 struct usb_config_descriptor *config =
55486 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55487- unsigned int length = le16_to_cpu(config->wTotalLength);
55488+ size_t length = le16_to_cpu(config->wTotalLength);
55489
55490 if (*ppos < pos + length) {
55491
55492 /* The descriptor may claim to be longer than it
55493 * really is. Here is the actual allocated length. */
55494- unsigned alloclen =
55495+ size_t alloclen =
55496 le16_to_cpu(dev->config[i].desc.wTotalLength);
55497
55498- len = length - (*ppos - pos);
55499+ len = length + pos - *ppos;
55500 if (len > nbytes)
55501 len = nbytes;
55502
55503 /* Simply don't write (skip over) unallocated parts */
55504 if (alloclen > (*ppos - pos)) {
55505- alloclen -= (*ppos - pos);
55506+ alloclen = alloclen + pos - *ppos;
55507 if (copy_to_user(buf,
55508 dev->rawdescriptors[i] + (*ppos - pos),
55509 min(len, alloclen))) {
55510diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55511index 45a915c..09f9735 100644
55512--- a/drivers/usb/core/hcd.c
55513+++ b/drivers/usb/core/hcd.c
55514@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55515 */
55516 usb_get_urb(urb);
55517 atomic_inc(&urb->use_count);
55518- atomic_inc(&urb->dev->urbnum);
55519+ atomic_inc_unchecked(&urb->dev->urbnum);
55520 usbmon_urb_submit(&hcd->self, urb);
55521
55522 /* NOTE requirements on root-hub callers (usbfs and the hub
55523@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55524 urb->hcpriv = NULL;
55525 INIT_LIST_HEAD(&urb->urb_list);
55526 atomic_dec(&urb->use_count);
55527- atomic_dec(&urb->dev->urbnum);
55528+ atomic_dec_unchecked(&urb->dev->urbnum);
55529 if (atomic_read(&urb->reject))
55530 wake_up(&usb_kill_urb_queue);
55531 usb_put_urb(urb);
55532diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55533index 3b71516..1f26579 100644
55534--- a/drivers/usb/core/hub.c
55535+++ b/drivers/usb/core/hub.c
55536@@ -26,6 +26,7 @@
55537 #include <linux/mutex.h>
55538 #include <linux/random.h>
55539 #include <linux/pm_qos.h>
55540+#include <linux/grsecurity.h>
55541
55542 #include <asm/uaccess.h>
55543 #include <asm/byteorder.h>
55544@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55545 goto done;
55546 return;
55547 }
55548+
55549+ if (gr_handle_new_usb())
55550+ goto done;
55551+
55552 if (hub_is_superspeed(hub->hdev))
55553 unit_load = 150;
55554 else
55555diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55556index f368d20..0c30ac5 100644
55557--- a/drivers/usb/core/message.c
55558+++ b/drivers/usb/core/message.c
55559@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55560 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55561 * error number.
55562 */
55563-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55564+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55565 __u8 requesttype, __u16 value, __u16 index, void *data,
55566 __u16 size, int timeout)
55567 {
55568@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55569 * If successful, 0. Otherwise a negative error number. The number of actual
55570 * bytes transferred will be stored in the @actual_length parameter.
55571 */
55572-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55573+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55574 void *data, int len, int *actual_length, int timeout)
55575 {
55576 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55577@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55578 * bytes transferred will be stored in the @actual_length parameter.
55579 *
55580 */
55581-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55582+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55583 void *data, int len, int *actual_length, int timeout)
55584 {
55585 struct urb *urb;
55586diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55587index d269738..7340cd7 100644
55588--- a/drivers/usb/core/sysfs.c
55589+++ b/drivers/usb/core/sysfs.c
55590@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55591 struct usb_device *udev;
55592
55593 udev = to_usb_device(dev);
55594- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55595+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55596 }
55597 static DEVICE_ATTR_RO(urbnum);
55598
55599diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55600index b1fb9ae..4224885 100644
55601--- a/drivers/usb/core/usb.c
55602+++ b/drivers/usb/core/usb.c
55603@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55604 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55605 dev->state = USB_STATE_ATTACHED;
55606 dev->lpm_disable_count = 1;
55607- atomic_set(&dev->urbnum, 0);
55608+ atomic_set_unchecked(&dev->urbnum, 0);
55609
55610 INIT_LIST_HEAD(&dev->ep0.urb_list);
55611 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55612diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55613index 8cfc319..4868255 100644
55614--- a/drivers/usb/early/ehci-dbgp.c
55615+++ b/drivers/usb/early/ehci-dbgp.c
55616@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55617
55618 #ifdef CONFIG_KGDB
55619 static struct kgdb_io kgdbdbgp_io_ops;
55620-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55621+static struct kgdb_io kgdbdbgp_io_ops_console;
55622+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55623 #else
55624 #define dbgp_kgdb_mode (0)
55625 #endif
55626@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55627 .write_char = kgdbdbgp_write_char,
55628 };
55629
55630+static struct kgdb_io kgdbdbgp_io_ops_console = {
55631+ .name = "kgdbdbgp",
55632+ .read_char = kgdbdbgp_read_char,
55633+ .write_char = kgdbdbgp_write_char,
55634+ .is_console = 1
55635+};
55636+
55637 static int kgdbdbgp_wait_time;
55638
55639 static int __init kgdbdbgp_parse_config(char *str)
55640@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55641 ptr++;
55642 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55643 }
55644- kgdb_register_io_module(&kgdbdbgp_io_ops);
55645- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55646+ if (early_dbgp_console.index != -1)
55647+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55648+ else
55649+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55650
55651 return 0;
55652 }
55653diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55654index 9719abf..789d5d9 100644
55655--- a/drivers/usb/gadget/function/f_uac1.c
55656+++ b/drivers/usb/gadget/function/f_uac1.c
55657@@ -14,6 +14,7 @@
55658 #include <linux/module.h>
55659 #include <linux/device.h>
55660 #include <linux/atomic.h>
55661+#include <linux/module.h>
55662
55663 #include "u_uac1.h"
55664
55665diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55666index 491082a..dfd7d17 100644
55667--- a/drivers/usb/gadget/function/u_serial.c
55668+++ b/drivers/usb/gadget/function/u_serial.c
55669@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55670 spin_lock_irq(&port->port_lock);
55671
55672 /* already open? Great. */
55673- if (port->port.count) {
55674+ if (atomic_read(&port->port.count)) {
55675 status = 0;
55676- port->port.count++;
55677+ atomic_inc(&port->port.count);
55678
55679 /* currently opening/closing? wait ... */
55680 } else if (port->openclose) {
55681@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55682 tty->driver_data = port;
55683 port->port.tty = tty;
55684
55685- port->port.count = 1;
55686+ atomic_set(&port->port.count, 1);
55687 port->openclose = false;
55688
55689 /* if connected, start the I/O stream */
55690@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55691
55692 spin_lock_irq(&port->port_lock);
55693
55694- if (port->port.count != 1) {
55695- if (port->port.count == 0)
55696+ if (atomic_read(&port->port.count) != 1) {
55697+ if (atomic_read(&port->port.count) == 0)
55698 WARN_ON(1);
55699 else
55700- --port->port.count;
55701+ atomic_dec(&port->port.count);
55702 goto exit;
55703 }
55704
55705@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55706 * and sleep if necessary
55707 */
55708 port->openclose = true;
55709- port->port.count = 0;
55710+ atomic_set(&port->port.count, 0);
55711
55712 gser = port->port_usb;
55713 if (gser && gser->disconnect)
55714@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55715 int cond;
55716
55717 spin_lock_irq(&port->port_lock);
55718- cond = (port->port.count == 0) && !port->openclose;
55719+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55720 spin_unlock_irq(&port->port_lock);
55721 return cond;
55722 }
55723@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55724 /* if it's already open, start I/O ... and notify the serial
55725 * protocol about open/close status (connect/disconnect).
55726 */
55727- if (port->port.count) {
55728+ if (atomic_read(&port->port.count)) {
55729 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55730 gs_start_io(port);
55731 if (gser->connect)
55732@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55733
55734 port->port_usb = NULL;
55735 gser->ioport = NULL;
55736- if (port->port.count > 0 || port->openclose) {
55737+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55738 wake_up_interruptible(&port->drain_wait);
55739 if (port->port.tty)
55740 tty_hangup(port->port.tty);
55741@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55742
55743 /* finally, free any unused/unusable I/O buffers */
55744 spin_lock_irqsave(&port->port_lock, flags);
55745- if (port->port.count == 0 && !port->openclose)
55746+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55747 gs_buf_free(&port->port_write_buf);
55748 gs_free_requests(gser->out, &port->read_pool, NULL);
55749 gs_free_requests(gser->out, &port->read_queue, NULL);
55750diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55751index c78c841..48fd281 100644
55752--- a/drivers/usb/gadget/function/u_uac1.c
55753+++ b/drivers/usb/gadget/function/u_uac1.c
55754@@ -17,6 +17,7 @@
55755 #include <linux/ctype.h>
55756 #include <linux/random.h>
55757 #include <linux/syscalls.h>
55758+#include <linux/module.h>
55759
55760 #include "u_uac1.h"
55761
55762diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55763index 7354d01..299478e 100644
55764--- a/drivers/usb/host/ehci-hub.c
55765+++ b/drivers/usb/host/ehci-hub.c
55766@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55767 urb->transfer_flags = URB_DIR_IN;
55768 usb_get_urb(urb);
55769 atomic_inc(&urb->use_count);
55770- atomic_inc(&urb->dev->urbnum);
55771+ atomic_inc_unchecked(&urb->dev->urbnum);
55772 urb->setup_dma = dma_map_single(
55773 hcd->self.controller,
55774 urb->setup_packet,
55775@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55776 urb->status = -EINPROGRESS;
55777 usb_get_urb(urb);
55778 atomic_inc(&urb->use_count);
55779- atomic_inc(&urb->dev->urbnum);
55780+ atomic_inc_unchecked(&urb->dev->urbnum);
55781 retval = submit_single_step_set_feature(hcd, urb, 0);
55782 if (!retval && !wait_for_completion_timeout(&done,
55783 msecs_to_jiffies(2000))) {
55784diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55785index 1db0626..4948782 100644
55786--- a/drivers/usb/host/hwa-hc.c
55787+++ b/drivers/usb/host/hwa-hc.c
55788@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55789 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55790 struct wahc *wa = &hwahc->wa;
55791 struct device *dev = &wa->usb_iface->dev;
55792- u8 mas_le[UWB_NUM_MAS/8];
55793+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55794+
55795+ if (mas_le == NULL)
55796+ return -ENOMEM;
55797
55798 /* Set the stream index */
55799 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55800@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55801 WUSB_REQ_SET_WUSB_MAS,
55802 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55803 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55804- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55805+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55806 if (result < 0)
55807 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55808 out:
55809+ kfree(mas_le);
55810+
55811 return result;
55812 }
55813
55814diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55815index b3d245e..99549ed 100644
55816--- a/drivers/usb/misc/appledisplay.c
55817+++ b/drivers/usb/misc/appledisplay.c
55818@@ -84,7 +84,7 @@ struct appledisplay {
55819 struct mutex sysfslock; /* concurrent read and write */
55820 };
55821
55822-static atomic_t count_displays = ATOMIC_INIT(0);
55823+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55824 static struct workqueue_struct *wq;
55825
55826 static void appledisplay_complete(struct urb *urb)
55827@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55828
55829 /* Register backlight device */
55830 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55831- atomic_inc_return(&count_displays) - 1);
55832+ atomic_inc_return_unchecked(&count_displays) - 1);
55833 memset(&props, 0, sizeof(struct backlight_properties));
55834 props.type = BACKLIGHT_RAW;
55835 props.max_brightness = 0xff;
55836diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55837index 3806e70..55c508b 100644
55838--- a/drivers/usb/serial/console.c
55839+++ b/drivers/usb/serial/console.c
55840@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55841
55842 info->port = port;
55843
55844- ++port->port.count;
55845+ atomic_inc(&port->port.count);
55846 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55847 if (serial->type->set_termios) {
55848 /*
55849@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55850 }
55851 /* Now that any required fake tty operations are completed restore
55852 * the tty port count */
55853- --port->port.count;
55854+ atomic_dec(&port->port.count);
55855 /* The console is special in terms of closing the device so
55856 * indicate this port is now acting as a system console. */
55857 port->port.console = 1;
55858@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55859 put_tty:
55860 tty_kref_put(tty);
55861 reset_open_count:
55862- port->port.count = 0;
55863+ atomic_set(&port->port.count, 0);
55864 usb_autopm_put_interface(serial->interface);
55865 error_get_interface:
55866 usb_serial_put(serial);
55867@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55868 static void usb_console_write(struct console *co,
55869 const char *buf, unsigned count)
55870 {
55871- static struct usbcons_info *info = &usbcons_info;
55872+ struct usbcons_info *info = &usbcons_info;
55873 struct usb_serial_port *port = info->port;
55874 struct usb_serial *serial;
55875 int retval = -ENODEV;
55876diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55877index 307e339..6aa97cb 100644
55878--- a/drivers/usb/storage/usb.h
55879+++ b/drivers/usb/storage/usb.h
55880@@ -63,7 +63,7 @@ struct us_unusual_dev {
55881 __u8 useProtocol;
55882 __u8 useTransport;
55883 int (*initFunction)(struct us_data *);
55884-};
55885+} __do_const;
55886
55887
55888 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55889diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55890index a863a98..d272795 100644
55891--- a/drivers/usb/usbip/vhci.h
55892+++ b/drivers/usb/usbip/vhci.h
55893@@ -83,7 +83,7 @@ struct vhci_hcd {
55894 unsigned resuming:1;
55895 unsigned long re_timeout;
55896
55897- atomic_t seqnum;
55898+ atomic_unchecked_t seqnum;
55899
55900 /*
55901 * NOTE:
55902diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55903index 11f6f61..1087910 100644
55904--- a/drivers/usb/usbip/vhci_hcd.c
55905+++ b/drivers/usb/usbip/vhci_hcd.c
55906@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55907
55908 spin_lock(&vdev->priv_lock);
55909
55910- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55911+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55912 if (priv->seqnum == 0xffff)
55913 dev_info(&urb->dev->dev, "seqnum max\n");
55914
55915@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55916 return -ENOMEM;
55917 }
55918
55919- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55920+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55921 if (unlink->seqnum == 0xffff)
55922 pr_info("seqnum max\n");
55923
55924@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55925 vdev->rhport = rhport;
55926 }
55927
55928- atomic_set(&vhci->seqnum, 0);
55929+ atomic_set_unchecked(&vhci->seqnum, 0);
55930 spin_lock_init(&vhci->lock);
55931
55932 hcd->power_budget = 0; /* no limit */
55933diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55934index 00e4a54..d676f85 100644
55935--- a/drivers/usb/usbip/vhci_rx.c
55936+++ b/drivers/usb/usbip/vhci_rx.c
55937@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55938 if (!urb) {
55939 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55940 pr_info("max seqnum %d\n",
55941- atomic_read(&the_controller->seqnum));
55942+ atomic_read_unchecked(&the_controller->seqnum));
55943 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55944 return;
55945 }
55946diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55947index edc7267..9f65ce2 100644
55948--- a/drivers/usb/wusbcore/wa-hc.h
55949+++ b/drivers/usb/wusbcore/wa-hc.h
55950@@ -240,7 +240,7 @@ struct wahc {
55951 spinlock_t xfer_list_lock;
55952 struct work_struct xfer_enqueue_work;
55953 struct work_struct xfer_error_work;
55954- atomic_t xfer_id_count;
55955+ atomic_unchecked_t xfer_id_count;
55956
55957 kernel_ulong_t quirks;
55958 };
55959@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
55960 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
55961 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
55962 wa->dto_in_use = 0;
55963- atomic_set(&wa->xfer_id_count, 1);
55964+ atomic_set_unchecked(&wa->xfer_id_count, 1);
55965 /* init the buf in URBs */
55966 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
55967 usb_init_urb(&(wa->buf_in_urbs[index]));
55968diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
55969index 69af4fd..da390d7 100644
55970--- a/drivers/usb/wusbcore/wa-xfer.c
55971+++ b/drivers/usb/wusbcore/wa-xfer.c
55972@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55973 */
55974 static void wa_xfer_id_init(struct wa_xfer *xfer)
55975 {
55976- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55977+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55978 }
55979
55980 /* Return the xfer's ID. */
55981diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
55982index 837d177..170724af 100644
55983--- a/drivers/vfio/vfio.c
55984+++ b/drivers/vfio/vfio.c
55985@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
55986 return 0;
55987
55988 /* TODO Prevent device auto probing */
55989- WARN("Device %s added to live group %d!\n", dev_name(dev),
55990+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55991 iommu_group_id(group->iommu_group));
55992
55993 return 0;
55994diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55995index 3bb02c6..a01ff38 100644
55996--- a/drivers/vhost/vringh.c
55997+++ b/drivers/vhost/vringh.c
55998@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55999 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56000 {
56001 __virtio16 v = 0;
56002- int rc = get_user(v, (__force __virtio16 __user *)p);
56003+ int rc = get_user(v, (__force_user __virtio16 *)p);
56004 *val = vringh16_to_cpu(vrh, v);
56005 return rc;
56006 }
56007@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56008 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56009 {
56010 __virtio16 v = cpu_to_vringh16(vrh, val);
56011- return put_user(v, (__force __virtio16 __user *)p);
56012+ return put_user(v, (__force_user __virtio16 *)p);
56013 }
56014
56015 static inline int copydesc_user(void *dst, const void *src, size_t len)
56016 {
56017- return copy_from_user(dst, (__force void __user *)src, len) ?
56018+ return copy_from_user(dst, (void __force_user *)src, len) ?
56019 -EFAULT : 0;
56020 }
56021
56022@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56023 const struct vring_used_elem *src,
56024 unsigned int num)
56025 {
56026- return copy_to_user((__force void __user *)dst, src,
56027+ return copy_to_user((void __force_user *)dst, src,
56028 sizeof(*dst) * num) ? -EFAULT : 0;
56029 }
56030
56031 static inline int xfer_from_user(void *src, void *dst, size_t len)
56032 {
56033- return copy_from_user(dst, (__force void __user *)src, len) ?
56034+ return copy_from_user(dst, (void __force_user *)src, len) ?
56035 -EFAULT : 0;
56036 }
56037
56038 static inline int xfer_to_user(void *dst, void *src, size_t len)
56039 {
56040- return copy_to_user((__force void __user *)dst, src, len) ?
56041+ return copy_to_user((void __force_user *)dst, src, len) ?
56042 -EFAULT : 0;
56043 }
56044
56045@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56046 vrh->last_used_idx = 0;
56047 vrh->vring.num = num;
56048 /* vring expects kernel addresses, but only used via accessors. */
56049- vrh->vring.desc = (__force struct vring_desc *)desc;
56050- vrh->vring.avail = (__force struct vring_avail *)avail;
56051- vrh->vring.used = (__force struct vring_used *)used;
56052+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56053+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56054+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56055 return 0;
56056 }
56057 EXPORT_SYMBOL(vringh_init_user);
56058@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56059
56060 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56061 {
56062- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56063+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56064 return 0;
56065 }
56066
56067diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56068index 84a110a..96312c3 100644
56069--- a/drivers/video/backlight/kb3886_bl.c
56070+++ b/drivers/video/backlight/kb3886_bl.c
56071@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56072 static unsigned long kb3886bl_flags;
56073 #define KB3886BL_SUSPENDED 0x01
56074
56075-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56076+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56077 {
56078 .ident = "Sahara Touch-iT",
56079 .matches = {
56080diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56081index 1b0b233..6f34c2c 100644
56082--- a/drivers/video/fbdev/arcfb.c
56083+++ b/drivers/video/fbdev/arcfb.c
56084@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56085 return -ENOSPC;
56086
56087 err = 0;
56088- if ((count + p) > fbmemlength) {
56089+ if (count > (fbmemlength - p)) {
56090 count = fbmemlength - p;
56091 err = -ENOSPC;
56092 }
56093diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56094index aedf2fb..47c9aca 100644
56095--- a/drivers/video/fbdev/aty/aty128fb.c
56096+++ b/drivers/video/fbdev/aty/aty128fb.c
56097@@ -149,7 +149,7 @@ enum {
56098 };
56099
56100 /* Must match above enum */
56101-static char * const r128_family[] = {
56102+static const char * const r128_family[] = {
56103 "AGP",
56104 "PCI",
56105 "PRO AGP",
56106diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56107index 8789e48..698fe4c 100644
56108--- a/drivers/video/fbdev/aty/atyfb_base.c
56109+++ b/drivers/video/fbdev/aty/atyfb_base.c
56110@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56111 par->accel_flags = var->accel_flags; /* hack */
56112
56113 if (var->accel_flags) {
56114- info->fbops->fb_sync = atyfb_sync;
56115+ pax_open_kernel();
56116+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56117+ pax_close_kernel();
56118 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56119 } else {
56120- info->fbops->fb_sync = NULL;
56121+ pax_open_kernel();
56122+ *(void **)&info->fbops->fb_sync = NULL;
56123+ pax_close_kernel();
56124 info->flags |= FBINFO_HWACCEL_DISABLED;
56125 }
56126
56127diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56128index 2fa0317..4983f2a 100644
56129--- a/drivers/video/fbdev/aty/mach64_cursor.c
56130+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56131@@ -8,6 +8,7 @@
56132 #include "../core/fb_draw.h"
56133
56134 #include <asm/io.h>
56135+#include <asm/pgtable.h>
56136
56137 #ifdef __sparc__
56138 #include <asm/fbio.h>
56139@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56140 info->sprite.buf_align = 16; /* and 64 lines tall. */
56141 info->sprite.flags = FB_PIXMAP_IO;
56142
56143- info->fbops->fb_cursor = atyfb_cursor;
56144+ pax_open_kernel();
56145+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56146+ pax_close_kernel();
56147
56148 return 0;
56149 }
56150diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56151index d6cab1f..112f680 100644
56152--- a/drivers/video/fbdev/core/fb_defio.c
56153+++ b/drivers/video/fbdev/core/fb_defio.c
56154@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56155
56156 BUG_ON(!fbdefio);
56157 mutex_init(&fbdefio->lock);
56158- info->fbops->fb_mmap = fb_deferred_io_mmap;
56159+ pax_open_kernel();
56160+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56161+ pax_close_kernel();
56162 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56163 INIT_LIST_HEAD(&fbdefio->pagelist);
56164 if (fbdefio->delay == 0) /* set a default of 1 s */
56165@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56166 page->mapping = NULL;
56167 }
56168
56169- info->fbops->fb_mmap = NULL;
56170+ *(void **)&info->fbops->fb_mmap = NULL;
56171 mutex_destroy(&fbdefio->lock);
56172 }
56173 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56174diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56175index 0705d88..d9429bf 100644
56176--- a/drivers/video/fbdev/core/fbmem.c
56177+++ b/drivers/video/fbdev/core/fbmem.c
56178@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56179 __u32 data;
56180 int err;
56181
56182- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56183+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56184
56185 data = (__u32) (unsigned long) fix->smem_start;
56186 err |= put_user(data, &fix32->smem_start);
56187diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56188index 4254336..282567e 100644
56189--- a/drivers/video/fbdev/hyperv_fb.c
56190+++ b/drivers/video/fbdev/hyperv_fb.c
56191@@ -240,7 +240,7 @@ static uint screen_fb_size;
56192 static inline int synthvid_send(struct hv_device *hdev,
56193 struct synthvid_msg *msg)
56194 {
56195- static atomic64_t request_id = ATOMIC64_INIT(0);
56196+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56197 int ret;
56198
56199 msg->pipe_hdr.type = PIPE_MSG_DATA;
56200@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56201
56202 ret = vmbus_sendpacket(hdev->channel, msg,
56203 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56204- atomic64_inc_return(&request_id),
56205+ atomic64_inc_return_unchecked(&request_id),
56206 VM_PKT_DATA_INBAND, 0);
56207
56208 if (ret)
56209diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56210index 7672d2e..b56437f 100644
56211--- a/drivers/video/fbdev/i810/i810_accel.c
56212+++ b/drivers/video/fbdev/i810/i810_accel.c
56213@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56214 }
56215 }
56216 printk("ringbuffer lockup!!!\n");
56217+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56218 i810_report_error(mmio);
56219 par->dev_flags |= LOCKUP;
56220 info->pixmap.scan_align = 1;
56221diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56222index a01147f..5d896f8 100644
56223--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56224+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56225@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56226
56227 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56228 struct matrox_switch matrox_mystique = {
56229- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56230+ .preinit = MGA1064_preinit,
56231+ .reset = MGA1064_reset,
56232+ .init = MGA1064_init,
56233+ .restore = MGA1064_restore,
56234 };
56235 EXPORT_SYMBOL(matrox_mystique);
56236 #endif
56237
56238 #ifdef CONFIG_FB_MATROX_G
56239 struct matrox_switch matrox_G100 = {
56240- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56241+ .preinit = MGAG100_preinit,
56242+ .reset = MGAG100_reset,
56243+ .init = MGAG100_init,
56244+ .restore = MGAG100_restore,
56245 };
56246 EXPORT_SYMBOL(matrox_G100);
56247 #endif
56248diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56249index 195ad7c..09743fc 100644
56250--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56251+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56252@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56253 }
56254
56255 struct matrox_switch matrox_millennium = {
56256- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56257+ .preinit = Ti3026_preinit,
56258+ .reset = Ti3026_reset,
56259+ .init = Ti3026_init,
56260+ .restore = Ti3026_restore
56261 };
56262 EXPORT_SYMBOL(matrox_millennium);
56263 #endif
56264diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56265index fe92eed..106e085 100644
56266--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56267+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56268@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56269 struct mb862xxfb_par *par = info->par;
56270
56271 if (info->var.bits_per_pixel == 32) {
56272- info->fbops->fb_fillrect = cfb_fillrect;
56273- info->fbops->fb_copyarea = cfb_copyarea;
56274- info->fbops->fb_imageblit = cfb_imageblit;
56275+ pax_open_kernel();
56276+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56277+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56278+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56279+ pax_close_kernel();
56280 } else {
56281 outreg(disp, GC_L0EM, 3);
56282- info->fbops->fb_fillrect = mb86290fb_fillrect;
56283- info->fbops->fb_copyarea = mb86290fb_copyarea;
56284- info->fbops->fb_imageblit = mb86290fb_imageblit;
56285+ pax_open_kernel();
56286+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56287+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56288+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56289+ pax_close_kernel();
56290 }
56291 outreg(draw, GDC_REG_DRAW_BASE, 0);
56292 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56293diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56294index def0412..fed6529 100644
56295--- a/drivers/video/fbdev/nvidia/nvidia.c
56296+++ b/drivers/video/fbdev/nvidia/nvidia.c
56297@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56298 info->fix.line_length = (info->var.xres_virtual *
56299 info->var.bits_per_pixel) >> 3;
56300 if (info->var.accel_flags) {
56301- info->fbops->fb_imageblit = nvidiafb_imageblit;
56302- info->fbops->fb_fillrect = nvidiafb_fillrect;
56303- info->fbops->fb_copyarea = nvidiafb_copyarea;
56304- info->fbops->fb_sync = nvidiafb_sync;
56305+ pax_open_kernel();
56306+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56307+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56308+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56309+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56310+ pax_close_kernel();
56311 info->pixmap.scan_align = 4;
56312 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56313 info->flags |= FBINFO_READS_FAST;
56314 NVResetGraphics(info);
56315 } else {
56316- info->fbops->fb_imageblit = cfb_imageblit;
56317- info->fbops->fb_fillrect = cfb_fillrect;
56318- info->fbops->fb_copyarea = cfb_copyarea;
56319- info->fbops->fb_sync = NULL;
56320+ pax_open_kernel();
56321+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56322+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56323+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56324+ *(void **)&info->fbops->fb_sync = NULL;
56325+ pax_close_kernel();
56326 info->pixmap.scan_align = 1;
56327 info->flags |= FBINFO_HWACCEL_DISABLED;
56328 info->flags &= ~FBINFO_READS_FAST;
56329@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56330 info->pixmap.size = 8 * 1024;
56331 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56332
56333- if (!hwcur)
56334- info->fbops->fb_cursor = NULL;
56335+ if (!hwcur) {
56336+ pax_open_kernel();
56337+ *(void **)&info->fbops->fb_cursor = NULL;
56338+ pax_close_kernel();
56339+ }
56340
56341 info->var.accel_flags = (!noaccel);
56342
56343diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56344index 2412a0d..294215b 100644
56345--- a/drivers/video/fbdev/omap2/dss/display.c
56346+++ b/drivers/video/fbdev/omap2/dss/display.c
56347@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56348 if (dssdev->name == NULL)
56349 dssdev->name = dssdev->alias;
56350
56351+ pax_open_kernel();
56352 if (drv && drv->get_resolution == NULL)
56353- drv->get_resolution = omapdss_default_get_resolution;
56354+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56355 if (drv && drv->get_recommended_bpp == NULL)
56356- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56357+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56358 if (drv && drv->get_timings == NULL)
56359- drv->get_timings = omapdss_default_get_timings;
56360+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56361+ pax_close_kernel();
56362
56363 mutex_lock(&panel_list_mutex);
56364 list_add_tail(&dssdev->panel_list, &panel_list);
56365diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56366index 83433cb..71e9b98 100644
56367--- a/drivers/video/fbdev/s1d13xxxfb.c
56368+++ b/drivers/video/fbdev/s1d13xxxfb.c
56369@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56370
56371 switch(prod_id) {
56372 case S1D13506_PROD_ID: /* activate acceleration */
56373- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56374- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56375+ pax_open_kernel();
56376+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56377+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56378+ pax_close_kernel();
56379 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56380 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56381 break;
56382diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56383index d3013cd..95b8285 100644
56384--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56385+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56386@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56387 }
56388
56389 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56390- lcdc_sys_write_index,
56391- lcdc_sys_write_data,
56392- lcdc_sys_read_data,
56393+ .write_index = lcdc_sys_write_index,
56394+ .write_data = lcdc_sys_write_data,
56395+ .read_data = lcdc_sys_read_data,
56396 };
56397
56398 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56399diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56400index 9279e5f..d5f5276 100644
56401--- a/drivers/video/fbdev/smscufx.c
56402+++ b/drivers/video/fbdev/smscufx.c
56403@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56404 fb_deferred_io_cleanup(info);
56405 kfree(info->fbdefio);
56406 info->fbdefio = NULL;
56407- info->fbops->fb_mmap = ufx_ops_mmap;
56408+ pax_open_kernel();
56409+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56410+ pax_close_kernel();
56411 }
56412
56413 pr_debug("released /dev/fb%d user=%d count=%d",
56414diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56415index ff2b873..626a8d5 100644
56416--- a/drivers/video/fbdev/udlfb.c
56417+++ b/drivers/video/fbdev/udlfb.c
56418@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56419 dlfb_urb_completion(urb);
56420
56421 error:
56422- atomic_add(bytes_sent, &dev->bytes_sent);
56423- atomic_add(bytes_identical, &dev->bytes_identical);
56424- atomic_add(width*height*2, &dev->bytes_rendered);
56425+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56426+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56427+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56428 end_cycles = get_cycles();
56429- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56430+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56431 >> 10)), /* Kcycles */
56432 &dev->cpu_kcycles_used);
56433
56434@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56435 dlfb_urb_completion(urb);
56436
56437 error:
56438- atomic_add(bytes_sent, &dev->bytes_sent);
56439- atomic_add(bytes_identical, &dev->bytes_identical);
56440- atomic_add(bytes_rendered, &dev->bytes_rendered);
56441+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56442+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56443+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56444 end_cycles = get_cycles();
56445- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56446+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56447 >> 10)), /* Kcycles */
56448 &dev->cpu_kcycles_used);
56449 }
56450@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56451 fb_deferred_io_cleanup(info);
56452 kfree(info->fbdefio);
56453 info->fbdefio = NULL;
56454- info->fbops->fb_mmap = dlfb_ops_mmap;
56455+ pax_open_kernel();
56456+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56457+ pax_close_kernel();
56458 }
56459
56460 pr_warn("released /dev/fb%d user=%d count=%d\n",
56461@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56462 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56463 struct dlfb_data *dev = fb_info->par;
56464 return snprintf(buf, PAGE_SIZE, "%u\n",
56465- atomic_read(&dev->bytes_rendered));
56466+ atomic_read_unchecked(&dev->bytes_rendered));
56467 }
56468
56469 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56470@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56471 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56472 struct dlfb_data *dev = fb_info->par;
56473 return snprintf(buf, PAGE_SIZE, "%u\n",
56474- atomic_read(&dev->bytes_identical));
56475+ atomic_read_unchecked(&dev->bytes_identical));
56476 }
56477
56478 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56479@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56480 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56481 struct dlfb_data *dev = fb_info->par;
56482 return snprintf(buf, PAGE_SIZE, "%u\n",
56483- atomic_read(&dev->bytes_sent));
56484+ atomic_read_unchecked(&dev->bytes_sent));
56485 }
56486
56487 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56488@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56489 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56490 struct dlfb_data *dev = fb_info->par;
56491 return snprintf(buf, PAGE_SIZE, "%u\n",
56492- atomic_read(&dev->cpu_kcycles_used));
56493+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56494 }
56495
56496 static ssize_t edid_show(
56497@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56498 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56499 struct dlfb_data *dev = fb_info->par;
56500
56501- atomic_set(&dev->bytes_rendered, 0);
56502- atomic_set(&dev->bytes_identical, 0);
56503- atomic_set(&dev->bytes_sent, 0);
56504- atomic_set(&dev->cpu_kcycles_used, 0);
56505+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56506+ atomic_set_unchecked(&dev->bytes_identical, 0);
56507+ atomic_set_unchecked(&dev->bytes_sent, 0);
56508+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56509
56510 return count;
56511 }
56512diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56513index d32d1c4..46722e6 100644
56514--- a/drivers/video/fbdev/uvesafb.c
56515+++ b/drivers/video/fbdev/uvesafb.c
56516@@ -19,6 +19,7 @@
56517 #include <linux/io.h>
56518 #include <linux/mutex.h>
56519 #include <linux/slab.h>
56520+#include <linux/moduleloader.h>
56521 #include <video/edid.h>
56522 #include <video/uvesafb.h>
56523 #ifdef CONFIG_X86
56524@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56525 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56526 par->pmi_setpal = par->ypan = 0;
56527 } else {
56528+
56529+#ifdef CONFIG_PAX_KERNEXEC
56530+#ifdef CONFIG_MODULES
56531+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56532+#endif
56533+ if (!par->pmi_code) {
56534+ par->pmi_setpal = par->ypan = 0;
56535+ return 0;
56536+ }
56537+#endif
56538+
56539 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56540 + task->t.regs.edi);
56541+
56542+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56543+ pax_open_kernel();
56544+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56545+ pax_close_kernel();
56546+
56547+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56548+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56549+#else
56550 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56551 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56552+#endif
56553+
56554 printk(KERN_INFO "uvesafb: protected mode interface info at "
56555 "%04x:%04x\n",
56556 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56557@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56558 par->ypan = ypan;
56559
56560 if (par->pmi_setpal || par->ypan) {
56561+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56562 if (__supported_pte_mask & _PAGE_NX) {
56563 par->pmi_setpal = par->ypan = 0;
56564 printk(KERN_WARNING "uvesafb: NX protection is active, "
56565 "better not use the PMI.\n");
56566- } else {
56567+ } else
56568+#endif
56569 uvesafb_vbe_getpmi(task, par);
56570- }
56571 }
56572 #else
56573 /* The protected mode interface is not available on non-x86. */
56574@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56575 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56576
56577 /* Disable blanking if the user requested so. */
56578- if (!blank)
56579- info->fbops->fb_blank = NULL;
56580+ if (!blank) {
56581+ pax_open_kernel();
56582+ *(void **)&info->fbops->fb_blank = NULL;
56583+ pax_close_kernel();
56584+ }
56585
56586 /*
56587 * Find out how much IO memory is required for the mode with
56588@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56589 info->flags = FBINFO_FLAG_DEFAULT |
56590 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56591
56592- if (!par->ypan)
56593- info->fbops->fb_pan_display = NULL;
56594+ if (!par->ypan) {
56595+ pax_open_kernel();
56596+ *(void **)&info->fbops->fb_pan_display = NULL;
56597+ pax_close_kernel();
56598+ }
56599 }
56600
56601 static void uvesafb_init_mtrr(struct fb_info *info)
56602@@ -1786,6 +1816,11 @@ out_mode:
56603 out:
56604 kfree(par->vbe_modes);
56605
56606+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56607+ if (par->pmi_code)
56608+ module_memfree_exec(par->pmi_code);
56609+#endif
56610+
56611 framebuffer_release(info);
56612 return err;
56613 }
56614@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56615 kfree(par->vbe_state_orig);
56616 kfree(par->vbe_state_saved);
56617
56618+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56619+ if (par->pmi_code)
56620+ module_memfree_exec(par->pmi_code);
56621+#endif
56622+
56623 framebuffer_release(info);
56624 }
56625 return 0;
56626diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56627index d79a0ac..2d0c3d4 100644
56628--- a/drivers/video/fbdev/vesafb.c
56629+++ b/drivers/video/fbdev/vesafb.c
56630@@ -9,6 +9,7 @@
56631 */
56632
56633 #include <linux/module.h>
56634+#include <linux/moduleloader.h>
56635 #include <linux/kernel.h>
56636 #include <linux/errno.h>
56637 #include <linux/string.h>
56638@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56639 static int vram_total; /* Set total amount of memory */
56640 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56641 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56642-static void (*pmi_start)(void) __read_mostly;
56643-static void (*pmi_pal) (void) __read_mostly;
56644+static void (*pmi_start)(void) __read_only;
56645+static void (*pmi_pal) (void) __read_only;
56646 static int depth __read_mostly;
56647 static int vga_compat __read_mostly;
56648 /* --------------------------------------------------------------------- */
56649@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56650 unsigned int size_remap;
56651 unsigned int size_total;
56652 char *option = NULL;
56653+ void *pmi_code = NULL;
56654
56655 /* ignore error return of fb_get_options */
56656 fb_get_options("vesafb", &option);
56657@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56658 size_remap = size_total;
56659 vesafb_fix.smem_len = size_remap;
56660
56661-#ifndef __i386__
56662- screen_info.vesapm_seg = 0;
56663-#endif
56664-
56665 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56666 printk(KERN_WARNING
56667 "vesafb: cannot reserve video memory at 0x%lx\n",
56668@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56669 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56670 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56671
56672+#ifdef __i386__
56673+
56674+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56675+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56676+ if (!pmi_code)
56677+#elif !defined(CONFIG_PAX_KERNEXEC)
56678+ if (0)
56679+#endif
56680+
56681+#endif
56682+ screen_info.vesapm_seg = 0;
56683+
56684 if (screen_info.vesapm_seg) {
56685- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56686- screen_info.vesapm_seg,screen_info.vesapm_off);
56687+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56688+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56689 }
56690
56691 if (screen_info.vesapm_seg < 0xc000)
56692@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56693
56694 if (ypan || pmi_setpal) {
56695 unsigned short *pmi_base;
56696+
56697 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56698- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56699- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56700+
56701+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56702+ pax_open_kernel();
56703+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56704+#else
56705+ pmi_code = pmi_base;
56706+#endif
56707+
56708+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56709+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56710+
56711+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56712+ pmi_start = ktva_ktla(pmi_start);
56713+ pmi_pal = ktva_ktla(pmi_pal);
56714+ pax_close_kernel();
56715+#endif
56716+
56717 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56718 if (pmi_base[3]) {
56719 printk(KERN_INFO "vesafb: pmi: ports = ");
56720@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56721 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56722 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56723
56724- if (!ypan)
56725- info->fbops->fb_pan_display = NULL;
56726+ if (!ypan) {
56727+ pax_open_kernel();
56728+ *(void **)&info->fbops->fb_pan_display = NULL;
56729+ pax_close_kernel();
56730+ }
56731
56732 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56733 err = -ENOMEM;
56734@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56735 fb_info(info, "%s frame buffer device\n", info->fix.id);
56736 return 0;
56737 err:
56738+
56739+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56740+ module_memfree_exec(pmi_code);
56741+#endif
56742+
56743 if (info->screen_base)
56744 iounmap(info->screen_base);
56745 framebuffer_release(info);
56746diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56747index 88714ae..16c2e11 100644
56748--- a/drivers/video/fbdev/via/via_clock.h
56749+++ b/drivers/video/fbdev/via/via_clock.h
56750@@ -56,7 +56,7 @@ struct via_clock {
56751
56752 void (*set_engine_pll_state)(u8 state);
56753 void (*set_engine_pll)(struct via_pll_config config);
56754-};
56755+} __no_const;
56756
56757
56758 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56759diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56760index 3c14e43..2630570 100644
56761--- a/drivers/video/logo/logo_linux_clut224.ppm
56762+++ b/drivers/video/logo/logo_linux_clut224.ppm
56763@@ -2,1603 +2,1123 @@ P3
56764 # Standard 224-color Linux logo
56765 80 80
56766 255
56767- 0 0 0 0 0 0 0 0 0 0 0 0
56768- 0 0 0 0 0 0 0 0 0 0 0 0
56769- 0 0 0 0 0 0 0 0 0 0 0 0
56770- 0 0 0 0 0 0 0 0 0 0 0 0
56771- 0 0 0 0 0 0 0 0 0 0 0 0
56772- 0 0 0 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 0 0 0 0 0 0 0 0 0
56775- 0 0 0 0 0 0 0 0 0 0 0 0
56776- 6 6 6 6 6 6 10 10 10 10 10 10
56777- 10 10 10 6 6 6 6 6 6 6 6 6
56778- 0 0 0 0 0 0 0 0 0 0 0 0
56779- 0 0 0 0 0 0 0 0 0 0 0 0
56780- 0 0 0 0 0 0 0 0 0 0 0 0
56781- 0 0 0 0 0 0 0 0 0 0 0 0
56782- 0 0 0 0 0 0 0 0 0 0 0 0
56783- 0 0 0 0 0 0 0 0 0 0 0 0
56784- 0 0 0 0 0 0 0 0 0 0 0 0
56785- 0 0 0 0 0 0 0 0 0 0 0 0
56786- 0 0 0 0 0 0 0 0 0 0 0 0
56787- 0 0 0 0 0 0 0 0 0 0 0 0
56788- 0 0 0 0 0 0 0 0 0 0 0 0
56789- 0 0 0 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 0 0 0 6 6 6 10 10 10 14 14 14
56796- 22 22 22 26 26 26 30 30 30 34 34 34
56797- 30 30 30 30 30 30 26 26 26 18 18 18
56798- 14 14 14 10 10 10 6 6 6 0 0 0
56799- 0 0 0 0 0 0 0 0 0 0 0 0
56800- 0 0 0 0 0 0 0 0 0 0 0 0
56801- 0 0 0 0 0 0 0 0 0 0 0 0
56802- 0 0 0 0 0 0 0 0 0 0 0 0
56803- 0 0 0 0 0 0 0 0 0 0 0 0
56804- 0 0 0 0 0 0 0 0 0 0 0 0
56805- 0 0 0 0 0 0 0 0 0 0 0 0
56806- 0 0 0 0 0 0 0 0 0 0 0 0
56807- 0 0 0 0 0 0 0 0 0 0 0 0
56808- 0 0 0 0 0 1 0 0 1 0 0 0
56809- 0 0 0 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 0 0 0 0 0 0 0 0 0
56814- 0 0 0 0 0 0 0 0 0 0 0 0
56815- 6 6 6 14 14 14 26 26 26 42 42 42
56816- 54 54 54 66 66 66 78 78 78 78 78 78
56817- 78 78 78 74 74 74 66 66 66 54 54 54
56818- 42 42 42 26 26 26 18 18 18 10 10 10
56819- 6 6 6 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 0 0 0
56823- 0 0 0 0 0 0 0 0 0 0 0 0
56824- 0 0 0 0 0 0 0 0 0 0 0 0
56825- 0 0 0 0 0 0 0 0 0 0 0 0
56826- 0 0 0 0 0 0 0 0 0 0 0 0
56827- 0 0 0 0 0 0 0 0 0 0 0 0
56828- 0 0 1 0 0 0 0 0 0 0 0 0
56829- 0 0 0 0 0 0 0 0 0 0 0 0
56830- 0 0 0 0 0 0 0 0 0 0 0 0
56831- 0 0 0 0 0 0 0 0 0 0 0 0
56832- 0 0 0 0 0 0 0 0 0 0 0 0
56833- 0 0 0 0 0 0 0 0 0 0 0 0
56834- 0 0 0 0 0 0 0 0 0 10 10 10
56835- 22 22 22 42 42 42 66 66 66 86 86 86
56836- 66 66 66 38 38 38 38 38 38 22 22 22
56837- 26 26 26 34 34 34 54 54 54 66 66 66
56838- 86 86 86 70 70 70 46 46 46 26 26 26
56839- 14 14 14 6 6 6 0 0 0 0 0 0
56840- 0 0 0 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 0 0 0 0 0 0 0 0 0 0 0 0
56843- 0 0 0 0 0 0 0 0 0 0 0 0
56844- 0 0 0 0 0 0 0 0 0 0 0 0
56845- 0 0 0 0 0 0 0 0 0 0 0 0
56846- 0 0 0 0 0 0 0 0 0 0 0 0
56847- 0 0 0 0 0 0 0 0 0 0 0 0
56848- 0 0 1 0 0 1 0 0 1 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 0 0 0 0 0 0 0 0 0
56851- 0 0 0 0 0 0 0 0 0 0 0 0
56852- 0 0 0 0 0 0 0 0 0 0 0 0
56853- 0 0 0 0 0 0 0 0 0 0 0 0
56854- 0 0 0 0 0 0 10 10 10 26 26 26
56855- 50 50 50 82 82 82 58 58 58 6 6 6
56856- 2 2 6 2 2 6 2 2 6 2 2 6
56857- 2 2 6 2 2 6 2 2 6 2 2 6
56858- 6 6 6 54 54 54 86 86 86 66 66 66
56859- 38 38 38 18 18 18 6 6 6 0 0 0
56860- 0 0 0 0 0 0 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 0 0 0 0 0 0 0 0 0 0 0 0
56863- 0 0 0 0 0 0 0 0 0 0 0 0
56864- 0 0 0 0 0 0 0 0 0 0 0 0
56865- 0 0 0 0 0 0 0 0 0 0 0 0
56866- 0 0 0 0 0 0 0 0 0 0 0 0
56867- 0 0 0 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 0 0 0 0 0 0 0 0 0
56872- 0 0 0 0 0 0 0 0 0 0 0 0
56873- 0 0 0 0 0 0 0 0 0 0 0 0
56874- 0 0 0 6 6 6 22 22 22 50 50 50
56875- 78 78 78 34 34 34 2 2 6 2 2 6
56876- 2 2 6 2 2 6 2 2 6 2 2 6
56877- 2 2 6 2 2 6 2 2 6 2 2 6
56878- 2 2 6 2 2 6 6 6 6 70 70 70
56879- 78 78 78 46 46 46 22 22 22 6 6 6
56880- 0 0 0 0 0 0 0 0 0 0 0 0
56881- 0 0 0 0 0 0 0 0 0 0 0 0
56882- 0 0 0 0 0 0 0 0 0 0 0 0
56883- 0 0 0 0 0 0 0 0 0 0 0 0
56884- 0 0 0 0 0 0 0 0 0 0 0 0
56885- 0 0 0 0 0 0 0 0 0 0 0 0
56886- 0 0 0 0 0 0 0 0 0 0 0 0
56887- 0 0 0 0 0 0 0 0 0 0 0 0
56888- 0 0 1 0 0 1 0 0 1 0 0 0
56889- 0 0 0 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 0 0 0 0 0 0 0 0 0 0 0 0
56893- 0 0 0 0 0 0 0 0 0 0 0 0
56894- 6 6 6 18 18 18 42 42 42 82 82 82
56895- 26 26 26 2 2 6 2 2 6 2 2 6
56896- 2 2 6 2 2 6 2 2 6 2 2 6
56897- 2 2 6 2 2 6 2 2 6 14 14 14
56898- 46 46 46 34 34 34 6 6 6 2 2 6
56899- 42 42 42 78 78 78 42 42 42 18 18 18
56900- 6 6 6 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 0 0 0 0 0 0
56902- 0 0 0 0 0 0 0 0 0 0 0 0
56903- 0 0 0 0 0 0 0 0 0 0 0 0
56904- 0 0 0 0 0 0 0 0 0 0 0 0
56905- 0 0 0 0 0 0 0 0 0 0 0 0
56906- 0 0 0 0 0 0 0 0 0 0 0 0
56907- 0 0 0 0 0 0 0 0 0 0 0 0
56908- 0 0 1 0 0 0 0 0 1 0 0 0
56909- 0 0 0 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 0 0 0
56913- 0 0 0 0 0 0 0 0 0 0 0 0
56914- 10 10 10 30 30 30 66 66 66 58 58 58
56915- 2 2 6 2 2 6 2 2 6 2 2 6
56916- 2 2 6 2 2 6 2 2 6 2 2 6
56917- 2 2 6 2 2 6 2 2 6 26 26 26
56918- 86 86 86 101 101 101 46 46 46 10 10 10
56919- 2 2 6 58 58 58 70 70 70 34 34 34
56920- 10 10 10 0 0 0 0 0 0 0 0 0
56921- 0 0 0 0 0 0 0 0 0 0 0 0
56922- 0 0 0 0 0 0 0 0 0 0 0 0
56923- 0 0 0 0 0 0 0 0 0 0 0 0
56924- 0 0 0 0 0 0 0 0 0 0 0 0
56925- 0 0 0 0 0 0 0 0 0 0 0 0
56926- 0 0 0 0 0 0 0 0 0 0 0 0
56927- 0 0 0 0 0 0 0 0 0 0 0 0
56928- 0 0 1 0 0 1 0 0 1 0 0 0
56929- 0 0 0 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 14 14 14 42 42 42 86 86 86 10 10 10
56935- 2 2 6 2 2 6 2 2 6 2 2 6
56936- 2 2 6 2 2 6 2 2 6 2 2 6
56937- 2 2 6 2 2 6 2 2 6 30 30 30
56938- 94 94 94 94 94 94 58 58 58 26 26 26
56939- 2 2 6 6 6 6 78 78 78 54 54 54
56940- 22 22 22 6 6 6 0 0 0 0 0 0
56941- 0 0 0 0 0 0 0 0 0 0 0 0
56942- 0 0 0 0 0 0 0 0 0 0 0 0
56943- 0 0 0 0 0 0 0 0 0 0 0 0
56944- 0 0 0 0 0 0 0 0 0 0 0 0
56945- 0 0 0 0 0 0 0 0 0 0 0 0
56946- 0 0 0 0 0 0 0 0 0 0 0 0
56947- 0 0 0 0 0 0 0 0 0 0 0 0
56948- 0 0 0 0 0 0 0 0 0 0 0 0
56949- 0 0 0 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 0 0 0 0 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 6 6 6
56954- 22 22 22 62 62 62 62 62 62 2 2 6
56955- 2 2 6 2 2 6 2 2 6 2 2 6
56956- 2 2 6 2 2 6 2 2 6 2 2 6
56957- 2 2 6 2 2 6 2 2 6 26 26 26
56958- 54 54 54 38 38 38 18 18 18 10 10 10
56959- 2 2 6 2 2 6 34 34 34 82 82 82
56960- 38 38 38 14 14 14 0 0 0 0 0 0
56961- 0 0 0 0 0 0 0 0 0 0 0 0
56962- 0 0 0 0 0 0 0 0 0 0 0 0
56963- 0 0 0 0 0 0 0 0 0 0 0 0
56964- 0 0 0 0 0 0 0 0 0 0 0 0
56965- 0 0 0 0 0 0 0 0 0 0 0 0
56966- 0 0 0 0 0 0 0 0 0 0 0 0
56967- 0 0 0 0 0 0 0 0 0 0 0 0
56968- 0 0 0 0 0 1 0 0 1 0 0 0
56969- 0 0 0 0 0 0 0 0 0 0 0 0
56970- 0 0 0 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 6 6 6
56974- 30 30 30 78 78 78 30 30 30 2 2 6
56975- 2 2 6 2 2 6 2 2 6 2 2 6
56976- 2 2 6 2 2 6 2 2 6 2 2 6
56977- 2 2 6 2 2 6 2 2 6 10 10 10
56978- 10 10 10 2 2 6 2 2 6 2 2 6
56979- 2 2 6 2 2 6 2 2 6 78 78 78
56980- 50 50 50 18 18 18 6 6 6 0 0 0
56981- 0 0 0 0 0 0 0 0 0 0 0 0
56982- 0 0 0 0 0 0 0 0 0 0 0 0
56983- 0 0 0 0 0 0 0 0 0 0 0 0
56984- 0 0 0 0 0 0 0 0 0 0 0 0
56985- 0 0 0 0 0 0 0 0 0 0 0 0
56986- 0 0 0 0 0 0 0 0 0 0 0 0
56987- 0 0 0 0 0 0 0 0 0 0 0 0
56988- 0 0 1 0 0 0 0 0 0 0 0 0
56989- 0 0 0 0 0 0 0 0 0 0 0 0
56990- 0 0 0 0 0 0 0 0 0 0 0 0
56991- 0 0 0 0 0 0 0 0 0 0 0 0
56992- 0 0 0 0 0 0 0 0 0 0 0 0
56993- 0 0 0 0 0 0 0 0 0 10 10 10
56994- 38 38 38 86 86 86 14 14 14 2 2 6
56995- 2 2 6 2 2 6 2 2 6 2 2 6
56996- 2 2 6 2 2 6 2 2 6 2 2 6
56997- 2 2 6 2 2 6 2 2 6 2 2 6
56998- 2 2 6 2 2 6 2 2 6 2 2 6
56999- 2 2 6 2 2 6 2 2 6 54 54 54
57000- 66 66 66 26 26 26 6 6 6 0 0 0
57001- 0 0 0 0 0 0 0 0 0 0 0 0
57002- 0 0 0 0 0 0 0 0 0 0 0 0
57003- 0 0 0 0 0 0 0 0 0 0 0 0
57004- 0 0 0 0 0 0 0 0 0 0 0 0
57005- 0 0 0 0 0 0 0 0 0 0 0 0
57006- 0 0 0 0 0 0 0 0 0 0 0 0
57007- 0 0 0 0 0 0 0 0 0 0 0 0
57008- 0 0 0 0 0 1 0 0 1 0 0 0
57009- 0 0 0 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 14 14 14
57014- 42 42 42 82 82 82 2 2 6 2 2 6
57015- 2 2 6 6 6 6 10 10 10 2 2 6
57016- 2 2 6 2 2 6 2 2 6 2 2 6
57017- 2 2 6 2 2 6 2 2 6 6 6 6
57018- 14 14 14 10 10 10 2 2 6 2 2 6
57019- 2 2 6 2 2 6 2 2 6 18 18 18
57020- 82 82 82 34 34 34 10 10 10 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 1 0 0 0 0 0 0 0 0 0
57029- 0 0 0 0 0 0 0 0 0 0 0 0
57030- 0 0 0 0 0 0 0 0 0 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 14 14 14
57034- 46 46 46 86 86 86 2 2 6 2 2 6
57035- 6 6 6 6 6 6 22 22 22 34 34 34
57036- 6 6 6 2 2 6 2 2 6 2 2 6
57037- 2 2 6 2 2 6 18 18 18 34 34 34
57038- 10 10 10 50 50 50 22 22 22 2 2 6
57039- 2 2 6 2 2 6 2 2 6 10 10 10
57040- 86 86 86 42 42 42 14 14 14 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 1 0 0 1 0 0 1 0 0 0
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 0 0 0 0 0 0 0 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 14 14 14
57054- 46 46 46 86 86 86 2 2 6 2 2 6
57055- 38 38 38 116 116 116 94 94 94 22 22 22
57056- 22 22 22 2 2 6 2 2 6 2 2 6
57057- 14 14 14 86 86 86 138 138 138 162 162 162
57058-154 154 154 38 38 38 26 26 26 6 6 6
57059- 2 2 6 2 2 6 2 2 6 2 2 6
57060- 86 86 86 46 46 46 14 14 14 0 0 0
57061- 0 0 0 0 0 0 0 0 0 0 0 0
57062- 0 0 0 0 0 0 0 0 0 0 0 0
57063- 0 0 0 0 0 0 0 0 0 0 0 0
57064- 0 0 0 0 0 0 0 0 0 0 0 0
57065- 0 0 0 0 0 0 0 0 0 0 0 0
57066- 0 0 0 0 0 0 0 0 0 0 0 0
57067- 0 0 0 0 0 0 0 0 0 0 0 0
57068- 0 0 0 0 0 0 0 0 0 0 0 0
57069- 0 0 0 0 0 0 0 0 0 0 0 0
57070- 0 0 0 0 0 0 0 0 0 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 14 14 14
57074- 46 46 46 86 86 86 2 2 6 14 14 14
57075-134 134 134 198 198 198 195 195 195 116 116 116
57076- 10 10 10 2 2 6 2 2 6 6 6 6
57077-101 98 89 187 187 187 210 210 210 218 218 218
57078-214 214 214 134 134 134 14 14 14 6 6 6
57079- 2 2 6 2 2 6 2 2 6 2 2 6
57080- 86 86 86 50 50 50 18 18 18 6 6 6
57081- 0 0 0 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 1 0 0 0
57088- 0 0 1 0 0 1 0 0 1 0 0 0
57089- 0 0 0 0 0 0 0 0 0 0 0 0
57090- 0 0 0 0 0 0 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 14 14 14
57094- 46 46 46 86 86 86 2 2 6 54 54 54
57095-218 218 218 195 195 195 226 226 226 246 246 246
57096- 58 58 58 2 2 6 2 2 6 30 30 30
57097-210 210 210 253 253 253 174 174 174 123 123 123
57098-221 221 221 234 234 234 74 74 74 2 2 6
57099- 2 2 6 2 2 6 2 2 6 2 2 6
57100- 70 70 70 58 58 58 22 22 22 6 6 6
57101- 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0
57108- 0 0 0 0 0 0 0 0 0 0 0 0
57109- 0 0 0 0 0 0 0 0 0 0 0 0
57110- 0 0 0 0 0 0 0 0 0 0 0 0
57111- 0 0 0 0 0 0 0 0 0 0 0 0
57112- 0 0 0 0 0 0 0 0 0 0 0 0
57113- 0 0 0 0 0 0 0 0 0 14 14 14
57114- 46 46 46 82 82 82 2 2 6 106 106 106
57115-170 170 170 26 26 26 86 86 86 226 226 226
57116-123 123 123 10 10 10 14 14 14 46 46 46
57117-231 231 231 190 190 190 6 6 6 70 70 70
57118- 90 90 90 238 238 238 158 158 158 2 2 6
57119- 2 2 6 2 2 6 2 2 6 2 2 6
57120- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 0 0 0 0 1 0 0 0
57128- 0 0 1 0 0 1 0 0 1 0 0 0
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 0 0 0 0 0 0 0 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 14 14 14
57134- 42 42 42 86 86 86 6 6 6 116 116 116
57135-106 106 106 6 6 6 70 70 70 149 149 149
57136-128 128 128 18 18 18 38 38 38 54 54 54
57137-221 221 221 106 106 106 2 2 6 14 14 14
57138- 46 46 46 190 190 190 198 198 198 2 2 6
57139- 2 2 6 2 2 6 2 2 6 2 2 6
57140- 74 74 74 62 62 62 22 22 22 6 6 6
57141- 0 0 0 0 0 0 0 0 0 0 0 0
57142- 0 0 0 0 0 0 0 0 0 0 0 0
57143- 0 0 0 0 0 0 0 0 0 0 0 0
57144- 0 0 0 0 0 0 0 0 0 0 0 0
57145- 0 0 0 0 0 0 0 0 0 0 0 0
57146- 0 0 0 0 0 0 0 0 0 0 0 0
57147- 0 0 0 0 0 0 0 0 1 0 0 0
57148- 0 0 1 0 0 0 0 0 1 0 0 0
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 0 0 0 0 0 0 0 0 0
57151- 0 0 0 0 0 0 0 0 0 0 0 0
57152- 0 0 0 0 0 0 0 0 0 0 0 0
57153- 0 0 0 0 0 0 0 0 0 14 14 14
57154- 42 42 42 94 94 94 14 14 14 101 101 101
57155-128 128 128 2 2 6 18 18 18 116 116 116
57156-118 98 46 121 92 8 121 92 8 98 78 10
57157-162 162 162 106 106 106 2 2 6 2 2 6
57158- 2 2 6 195 195 195 195 195 195 6 6 6
57159- 2 2 6 2 2 6 2 2 6 2 2 6
57160- 74 74 74 62 62 62 22 22 22 6 6 6
57161- 0 0 0 0 0 0 0 0 0 0 0 0
57162- 0 0 0 0 0 0 0 0 0 0 0 0
57163- 0 0 0 0 0 0 0 0 0 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 0 0 0 0 0 0 0 0 1 0 0 1
57168- 0 0 1 0 0 0 0 0 1 0 0 0
57169- 0 0 0 0 0 0 0 0 0 0 0 0
57170- 0 0 0 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 0 0 0 10 10 10
57174- 38 38 38 90 90 90 14 14 14 58 58 58
57175-210 210 210 26 26 26 54 38 6 154 114 10
57176-226 170 11 236 186 11 225 175 15 184 144 12
57177-215 174 15 175 146 61 37 26 9 2 2 6
57178- 70 70 70 246 246 246 138 138 138 2 2 6
57179- 2 2 6 2 2 6 2 2 6 2 2 6
57180- 70 70 70 66 66 66 26 26 26 6 6 6
57181- 0 0 0 0 0 0 0 0 0 0 0 0
57182- 0 0 0 0 0 0 0 0 0 0 0 0
57183- 0 0 0 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 0 0 0 0 0 0 0 0 0 0 0 0
57188- 0 0 0 0 0 0 0 0 0 0 0 0
57189- 0 0 0 0 0 0 0 0 0 0 0 0
57190- 0 0 0 0 0 0 0 0 0 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 0 0 0 10 10 10
57194- 38 38 38 86 86 86 14 14 14 10 10 10
57195-195 195 195 188 164 115 192 133 9 225 175 15
57196-239 182 13 234 190 10 232 195 16 232 200 30
57197-245 207 45 241 208 19 232 195 16 184 144 12
57198-218 194 134 211 206 186 42 42 42 2 2 6
57199- 2 2 6 2 2 6 2 2 6 2 2 6
57200- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0
57207- 0 0 0 0 0 0 0 0 0 0 0 0
57208- 0 0 0 0 0 0 0 0 0 0 0 0
57209- 0 0 0 0 0 0 0 0 0 0 0 0
57210- 0 0 0 0 0 0 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 0 0 0 10 10 10
57214- 34 34 34 86 86 86 14 14 14 2 2 6
57215-121 87 25 192 133 9 219 162 10 239 182 13
57216-236 186 11 232 195 16 241 208 19 244 214 54
57217-246 218 60 246 218 38 246 215 20 241 208 19
57218-241 208 19 226 184 13 121 87 25 2 2 6
57219- 2 2 6 2 2 6 2 2 6 2 2 6
57220- 50 50 50 82 82 82 34 34 34 10 10 10
57221- 0 0 0 0 0 0 0 0 0 0 0 0
57222- 0 0 0 0 0 0 0 0 0 0 0 0
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 0 0 0
57227- 0 0 0 0 0 0 0 0 0 0 0 0
57228- 0 0 0 0 0 0 0 0 0 0 0 0
57229- 0 0 0 0 0 0 0 0 0 0 0 0
57230- 0 0 0 0 0 0 0 0 0 0 0 0
57231- 0 0 0 0 0 0 0 0 0 0 0 0
57232- 0 0 0 0 0 0 0 0 0 0 0 0
57233- 0 0 0 0 0 0 0 0 0 10 10 10
57234- 34 34 34 82 82 82 30 30 30 61 42 6
57235-180 123 7 206 145 10 230 174 11 239 182 13
57236-234 190 10 238 202 15 241 208 19 246 218 74
57237-246 218 38 246 215 20 246 215 20 246 215 20
57238-226 184 13 215 174 15 184 144 12 6 6 6
57239- 2 2 6 2 2 6 2 2 6 2 2 6
57240- 26 26 26 94 94 94 42 42 42 14 14 14
57241- 0 0 0 0 0 0 0 0 0 0 0 0
57242- 0 0 0 0 0 0 0 0 0 0 0 0
57243- 0 0 0 0 0 0 0 0 0 0 0 0
57244- 0 0 0 0 0 0 0 0 0 0 0 0
57245- 0 0 0 0 0 0 0 0 0 0 0 0
57246- 0 0 0 0 0 0 0 0 0 0 0 0
57247- 0 0 0 0 0 0 0 0 0 0 0 0
57248- 0 0 0 0 0 0 0 0 0 0 0 0
57249- 0 0 0 0 0 0 0 0 0 0 0 0
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 10 10 10
57254- 30 30 30 78 78 78 50 50 50 104 69 6
57255-192 133 9 216 158 10 236 178 12 236 186 11
57256-232 195 16 241 208 19 244 214 54 245 215 43
57257-246 215 20 246 215 20 241 208 19 198 155 10
57258-200 144 11 216 158 10 156 118 10 2 2 6
57259- 2 2 6 2 2 6 2 2 6 2 2 6
57260- 6 6 6 90 90 90 54 54 54 18 18 18
57261- 6 6 6 0 0 0 0 0 0 0 0 0
57262- 0 0 0 0 0 0 0 0 0 0 0 0
57263- 0 0 0 0 0 0 0 0 0 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 0 0 0
57267- 0 0 0 0 0 0 0 0 0 0 0 0
57268- 0 0 0 0 0 0 0 0 0 0 0 0
57269- 0 0 0 0 0 0 0 0 0 0 0 0
57270- 0 0 0 0 0 0 0 0 0 0 0 0
57271- 0 0 0 0 0 0 0 0 0 0 0 0
57272- 0 0 0 0 0 0 0 0 0 0 0 0
57273- 0 0 0 0 0 0 0 0 0 10 10 10
57274- 30 30 30 78 78 78 46 46 46 22 22 22
57275-137 92 6 210 162 10 239 182 13 238 190 10
57276-238 202 15 241 208 19 246 215 20 246 215 20
57277-241 208 19 203 166 17 185 133 11 210 150 10
57278-216 158 10 210 150 10 102 78 10 2 2 6
57279- 6 6 6 54 54 54 14 14 14 2 2 6
57280- 2 2 6 62 62 62 74 74 74 30 30 30
57281- 10 10 10 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 0 0 0
57287- 0 0 0 0 0 0 0 0 0 0 0 0
57288- 0 0 0 0 0 0 0 0 0 0 0 0
57289- 0 0 0 0 0 0 0 0 0 0 0 0
57290- 0 0 0 0 0 0 0 0 0 0 0 0
57291- 0 0 0 0 0 0 0 0 0 0 0 0
57292- 0 0 0 0 0 0 0 0 0 0 0 0
57293- 0 0 0 0 0 0 0 0 0 10 10 10
57294- 34 34 34 78 78 78 50 50 50 6 6 6
57295- 94 70 30 139 102 15 190 146 13 226 184 13
57296-232 200 30 232 195 16 215 174 15 190 146 13
57297-168 122 10 192 133 9 210 150 10 213 154 11
57298-202 150 34 182 157 106 101 98 89 2 2 6
57299- 2 2 6 78 78 78 116 116 116 58 58 58
57300- 2 2 6 22 22 22 90 90 90 46 46 46
57301- 18 18 18 6 6 6 0 0 0 0 0 0
57302- 0 0 0 0 0 0 0 0 0 0 0 0
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 0 0 0
57307- 0 0 0 0 0 0 0 0 0 0 0 0
57308- 0 0 0 0 0 0 0 0 0 0 0 0
57309- 0 0 0 0 0 0 0 0 0 0 0 0
57310- 0 0 0 0 0 0 0 0 0 0 0 0
57311- 0 0 0 0 0 0 0 0 0 0 0 0
57312- 0 0 0 0 0 0 0 0 0 0 0 0
57313- 0 0 0 0 0 0 0 0 0 10 10 10
57314- 38 38 38 86 86 86 50 50 50 6 6 6
57315-128 128 128 174 154 114 156 107 11 168 122 10
57316-198 155 10 184 144 12 197 138 11 200 144 11
57317-206 145 10 206 145 10 197 138 11 188 164 115
57318-195 195 195 198 198 198 174 174 174 14 14 14
57319- 2 2 6 22 22 22 116 116 116 116 116 116
57320- 22 22 22 2 2 6 74 74 74 70 70 70
57321- 30 30 30 10 10 10 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 0 0 0
57327- 0 0 0 0 0 0 0 0 0 0 0 0
57328- 0 0 0 0 0 0 0 0 0 0 0 0
57329- 0 0 0 0 0 0 0 0 0 0 0 0
57330- 0 0 0 0 0 0 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 6 6 6 18 18 18
57334- 50 50 50 101 101 101 26 26 26 10 10 10
57335-138 138 138 190 190 190 174 154 114 156 107 11
57336-197 138 11 200 144 11 197 138 11 192 133 9
57337-180 123 7 190 142 34 190 178 144 187 187 187
57338-202 202 202 221 221 221 214 214 214 66 66 66
57339- 2 2 6 2 2 6 50 50 50 62 62 62
57340- 6 6 6 2 2 6 10 10 10 90 90 90
57341- 50 50 50 18 18 18 6 6 6 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 0 0 0
57347- 0 0 0 0 0 0 0 0 0 0 0 0
57348- 0 0 0 0 0 0 0 0 0 0 0 0
57349- 0 0 0 0 0 0 0 0 0 0 0 0
57350- 0 0 0 0 0 0 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 10 10 10 34 34 34
57354- 74 74 74 74 74 74 2 2 6 6 6 6
57355-144 144 144 198 198 198 190 190 190 178 166 146
57356-154 121 60 156 107 11 156 107 11 168 124 44
57357-174 154 114 187 187 187 190 190 190 210 210 210
57358-246 246 246 253 253 253 253 253 253 182 182 182
57359- 6 6 6 2 2 6 2 2 6 2 2 6
57360- 2 2 6 2 2 6 2 2 6 62 62 62
57361- 74 74 74 34 34 34 14 14 14 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 0 0 0
57367- 0 0 0 0 0 0 0 0 0 0 0 0
57368- 0 0 0 0 0 0 0 0 0 0 0 0
57369- 0 0 0 0 0 0 0 0 0 0 0 0
57370- 0 0 0 0 0 0 0 0 0 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 10 10 10 22 22 22 54 54 54
57374- 94 94 94 18 18 18 2 2 6 46 46 46
57375-234 234 234 221 221 221 190 190 190 190 190 190
57376-190 190 190 187 187 187 187 187 187 190 190 190
57377-190 190 190 195 195 195 214 214 214 242 242 242
57378-253 253 253 253 253 253 253 253 253 253 253 253
57379- 82 82 82 2 2 6 2 2 6 2 2 6
57380- 2 2 6 2 2 6 2 2 6 14 14 14
57381- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0
57387- 0 0 0 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 0 0 0
57389- 0 0 0 0 0 0 0 0 0 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 6 6 6 18 18 18 46 46 46 90 90 90
57394- 46 46 46 18 18 18 6 6 6 182 182 182
57395-253 253 253 246 246 246 206 206 206 190 190 190
57396-190 190 190 190 190 190 190 190 190 190 190 190
57397-206 206 206 231 231 231 250 250 250 253 253 253
57398-253 253 253 253 253 253 253 253 253 253 253 253
57399-202 202 202 14 14 14 2 2 6 2 2 6
57400- 2 2 6 2 2 6 2 2 6 2 2 6
57401- 42 42 42 86 86 86 42 42 42 18 18 18
57402- 6 6 6 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 0 0 0
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 0 0 0
57409- 0 0 0 0 0 0 0 0 0 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 0 0 0 0 0 0 0 0 0
57412- 0 0 0 0 0 0 0 0 0 6 6 6
57413- 14 14 14 38 38 38 74 74 74 66 66 66
57414- 2 2 6 6 6 6 90 90 90 250 250 250
57415-253 253 253 253 253 253 238 238 238 198 198 198
57416-190 190 190 190 190 190 195 195 195 221 221 221
57417-246 246 246 253 253 253 253 253 253 253 253 253
57418-253 253 253 253 253 253 253 253 253 253 253 253
57419-253 253 253 82 82 82 2 2 6 2 2 6
57420- 2 2 6 2 2 6 2 2 6 2 2 6
57421- 2 2 6 78 78 78 70 70 70 34 34 34
57422- 14 14 14 6 6 6 0 0 0 0 0 0
57423- 0 0 0 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 0 0 0
57427- 0 0 0 0 0 0 0 0 0 0 0 0
57428- 0 0 0 0 0 0 0 0 0 0 0 0
57429- 0 0 0 0 0 0 0 0 0 0 0 0
57430- 0 0 0 0 0 0 0 0 0 0 0 0
57431- 0 0 0 0 0 0 0 0 0 0 0 0
57432- 0 0 0 0 0 0 0 0 0 14 14 14
57433- 34 34 34 66 66 66 78 78 78 6 6 6
57434- 2 2 6 18 18 18 218 218 218 253 253 253
57435-253 253 253 253 253 253 253 253 253 246 246 246
57436-226 226 226 231 231 231 246 246 246 253 253 253
57437-253 253 253 253 253 253 253 253 253 253 253 253
57438-253 253 253 253 253 253 253 253 253 253 253 253
57439-253 253 253 178 178 178 2 2 6 2 2 6
57440- 2 2 6 2 2 6 2 2 6 2 2 6
57441- 2 2 6 18 18 18 90 90 90 62 62 62
57442- 30 30 30 10 10 10 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 0 0 0
57447- 0 0 0 0 0 0 0 0 0 0 0 0
57448- 0 0 0 0 0 0 0 0 0 0 0 0
57449- 0 0 0 0 0 0 0 0 0 0 0 0
57450- 0 0 0 0 0 0 0 0 0 0 0 0
57451- 0 0 0 0 0 0 0 0 0 0 0 0
57452- 0 0 0 0 0 0 10 10 10 26 26 26
57453- 58 58 58 90 90 90 18 18 18 2 2 6
57454- 2 2 6 110 110 110 253 253 253 253 253 253
57455-253 253 253 253 253 253 253 253 253 253 253 253
57456-250 250 250 253 253 253 253 253 253 253 253 253
57457-253 253 253 253 253 253 253 253 253 253 253 253
57458-253 253 253 253 253 253 253 253 253 253 253 253
57459-253 253 253 231 231 231 18 18 18 2 2 6
57460- 2 2 6 2 2 6 2 2 6 2 2 6
57461- 2 2 6 2 2 6 18 18 18 94 94 94
57462- 54 54 54 26 26 26 10 10 10 0 0 0
57463- 0 0 0 0 0 0 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 0 0 0
57467- 0 0 0 0 0 0 0 0 0 0 0 0
57468- 0 0 0 0 0 0 0 0 0 0 0 0
57469- 0 0 0 0 0 0 0 0 0 0 0 0
57470- 0 0 0 0 0 0 0 0 0 0 0 0
57471- 0 0 0 0 0 0 0 0 0 0 0 0
57472- 0 0 0 6 6 6 22 22 22 50 50 50
57473- 90 90 90 26 26 26 2 2 6 2 2 6
57474- 14 14 14 195 195 195 250 250 250 253 253 253
57475-253 253 253 253 253 253 253 253 253 253 253 253
57476-253 253 253 253 253 253 253 253 253 253 253 253
57477-253 253 253 253 253 253 253 253 253 253 253 253
57478-253 253 253 253 253 253 253 253 253 253 253 253
57479-250 250 250 242 242 242 54 54 54 2 2 6
57480- 2 2 6 2 2 6 2 2 6 2 2 6
57481- 2 2 6 2 2 6 2 2 6 38 38 38
57482- 86 86 86 50 50 50 22 22 22 6 6 6
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 0 0 0
57487- 0 0 0 0 0 0 0 0 0 0 0 0
57488- 0 0 0 0 0 0 0 0 0 0 0 0
57489- 0 0 0 0 0 0 0 0 0 0 0 0
57490- 0 0 0 0 0 0 0 0 0 0 0 0
57491- 0 0 0 0 0 0 0 0 0 0 0 0
57492- 6 6 6 14 14 14 38 38 38 82 82 82
57493- 34 34 34 2 2 6 2 2 6 2 2 6
57494- 42 42 42 195 195 195 246 246 246 253 253 253
57495-253 253 253 253 253 253 253 253 253 250 250 250
57496-242 242 242 242 242 242 250 250 250 253 253 253
57497-253 253 253 253 253 253 253 253 253 253 253 253
57498-253 253 253 250 250 250 246 246 246 238 238 238
57499-226 226 226 231 231 231 101 101 101 6 6 6
57500- 2 2 6 2 2 6 2 2 6 2 2 6
57501- 2 2 6 2 2 6 2 2 6 2 2 6
57502- 38 38 38 82 82 82 42 42 42 14 14 14
57503- 6 6 6 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 0 0 0
57507- 0 0 0 0 0 0 0 0 0 0 0 0
57508- 0 0 0 0 0 0 0 0 0 0 0 0
57509- 0 0 0 0 0 0 0 0 0 0 0 0
57510- 0 0 0 0 0 0 0 0 0 0 0 0
57511- 0 0 0 0 0 0 0 0 0 0 0 0
57512- 10 10 10 26 26 26 62 62 62 66 66 66
57513- 2 2 6 2 2 6 2 2 6 6 6 6
57514- 70 70 70 170 170 170 206 206 206 234 234 234
57515-246 246 246 250 250 250 250 250 250 238 238 238
57516-226 226 226 231 231 231 238 238 238 250 250 250
57517-250 250 250 250 250 250 246 246 246 231 231 231
57518-214 214 214 206 206 206 202 202 202 202 202 202
57519-198 198 198 202 202 202 182 182 182 18 18 18
57520- 2 2 6 2 2 6 2 2 6 2 2 6
57521- 2 2 6 2 2 6 2 2 6 2 2 6
57522- 2 2 6 62 62 62 66 66 66 30 30 30
57523- 10 10 10 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 0 0 0
57527- 0 0 0 0 0 0 0 0 0 0 0 0
57528- 0 0 0 0 0 0 0 0 0 0 0 0
57529- 0 0 0 0 0 0 0 0 0 0 0 0
57530- 0 0 0 0 0 0 0 0 0 0 0 0
57531- 0 0 0 0 0 0 0 0 0 0 0 0
57532- 14 14 14 42 42 42 82 82 82 18 18 18
57533- 2 2 6 2 2 6 2 2 6 10 10 10
57534- 94 94 94 182 182 182 218 218 218 242 242 242
57535-250 250 250 253 253 253 253 253 253 250 250 250
57536-234 234 234 253 253 253 253 253 253 253 253 253
57537-253 253 253 253 253 253 253 253 253 246 246 246
57538-238 238 238 226 226 226 210 210 210 202 202 202
57539-195 195 195 195 195 195 210 210 210 158 158 158
57540- 6 6 6 14 14 14 50 50 50 14 14 14
57541- 2 2 6 2 2 6 2 2 6 2 2 6
57542- 2 2 6 6 6 6 86 86 86 46 46 46
57543- 18 18 18 6 6 6 0 0 0 0 0 0
57544- 0 0 0 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 0 0 0
57547- 0 0 0 0 0 0 0 0 0 0 0 0
57548- 0 0 0 0 0 0 0 0 0 0 0 0
57549- 0 0 0 0 0 0 0 0 0 0 0 0
57550- 0 0 0 0 0 0 0 0 0 0 0 0
57551- 0 0 0 0 0 0 0 0 0 6 6 6
57552- 22 22 22 54 54 54 70 70 70 2 2 6
57553- 2 2 6 10 10 10 2 2 6 22 22 22
57554-166 166 166 231 231 231 250 250 250 253 253 253
57555-253 253 253 253 253 253 253 253 253 250 250 250
57556-242 242 242 253 253 253 253 253 253 253 253 253
57557-253 253 253 253 253 253 253 253 253 253 253 253
57558-253 253 253 253 253 253 253 253 253 246 246 246
57559-231 231 231 206 206 206 198 198 198 226 226 226
57560- 94 94 94 2 2 6 6 6 6 38 38 38
57561- 30 30 30 2 2 6 2 2 6 2 2 6
57562- 2 2 6 2 2 6 62 62 62 66 66 66
57563- 26 26 26 10 10 10 0 0 0 0 0 0
57564- 0 0 0 0 0 0 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 0 0 0
57567- 0 0 0 0 0 0 0 0 0 0 0 0
57568- 0 0 0 0 0 0 0 0 0 0 0 0
57569- 0 0 0 0 0 0 0 0 0 0 0 0
57570- 0 0 0 0 0 0 0 0 0 0 0 0
57571- 0 0 0 0 0 0 0 0 0 10 10 10
57572- 30 30 30 74 74 74 50 50 50 2 2 6
57573- 26 26 26 26 26 26 2 2 6 106 106 106
57574-238 238 238 253 253 253 253 253 253 253 253 253
57575-253 253 253 253 253 253 253 253 253 253 253 253
57576-253 253 253 253 253 253 253 253 253 253 253 253
57577-253 253 253 253 253 253 253 253 253 253 253 253
57578-253 253 253 253 253 253 253 253 253 253 253 253
57579-253 253 253 246 246 246 218 218 218 202 202 202
57580-210 210 210 14 14 14 2 2 6 2 2 6
57581- 30 30 30 22 22 22 2 2 6 2 2 6
57582- 2 2 6 2 2 6 18 18 18 86 86 86
57583- 42 42 42 14 14 14 0 0 0 0 0 0
57584- 0 0 0 0 0 0 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 0 0 0 0 0 0
57587- 0 0 0 0 0 0 0 0 0 0 0 0
57588- 0 0 0 0 0 0 0 0 0 0 0 0
57589- 0 0 0 0 0 0 0 0 0 0 0 0
57590- 0 0 0 0 0 0 0 0 0 0 0 0
57591- 0 0 0 0 0 0 0 0 0 14 14 14
57592- 42 42 42 90 90 90 22 22 22 2 2 6
57593- 42 42 42 2 2 6 18 18 18 218 218 218
57594-253 253 253 253 253 253 253 253 253 253 253 253
57595-253 253 253 253 253 253 253 253 253 253 253 253
57596-253 253 253 253 253 253 253 253 253 253 253 253
57597-253 253 253 253 253 253 253 253 253 253 253 253
57598-253 253 253 253 253 253 253 253 253 253 253 253
57599-253 253 253 253 253 253 250 250 250 221 221 221
57600-218 218 218 101 101 101 2 2 6 14 14 14
57601- 18 18 18 38 38 38 10 10 10 2 2 6
57602- 2 2 6 2 2 6 2 2 6 78 78 78
57603- 58 58 58 22 22 22 6 6 6 0 0 0
57604- 0 0 0 0 0 0 0 0 0 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 0 0 0 0 0 0
57607- 0 0 0 0 0 0 0 0 0 0 0 0
57608- 0 0 0 0 0 0 0 0 0 0 0 0
57609- 0 0 0 0 0 0 0 0 0 0 0 0
57610- 0 0 0 0 0 0 0 0 0 0 0 0
57611- 0 0 0 0 0 0 6 6 6 18 18 18
57612- 54 54 54 82 82 82 2 2 6 26 26 26
57613- 22 22 22 2 2 6 123 123 123 253 253 253
57614-253 253 253 253 253 253 253 253 253 253 253 253
57615-253 253 253 253 253 253 253 253 253 253 253 253
57616-253 253 253 253 253 253 253 253 253 253 253 253
57617-253 253 253 253 253 253 253 253 253 253 253 253
57618-253 253 253 253 253 253 253 253 253 253 253 253
57619-253 253 253 253 253 253 253 253 253 250 250 250
57620-238 238 238 198 198 198 6 6 6 38 38 38
57621- 58 58 58 26 26 26 38 38 38 2 2 6
57622- 2 2 6 2 2 6 2 2 6 46 46 46
57623- 78 78 78 30 30 30 10 10 10 0 0 0
57624- 0 0 0 0 0 0 0 0 0 0 0 0
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 0 0 0 0 0 0 0 0 0
57627- 0 0 0 0 0 0 0 0 0 0 0 0
57628- 0 0 0 0 0 0 0 0 0 0 0 0
57629- 0 0 0 0 0 0 0 0 0 0 0 0
57630- 0 0 0 0 0 0 0 0 0 0 0 0
57631- 0 0 0 0 0 0 10 10 10 30 30 30
57632- 74 74 74 58 58 58 2 2 6 42 42 42
57633- 2 2 6 22 22 22 231 231 231 253 253 253
57634-253 253 253 253 253 253 253 253 253 253 253 253
57635-253 253 253 253 253 253 253 253 253 250 250 250
57636-253 253 253 253 253 253 253 253 253 253 253 253
57637-253 253 253 253 253 253 253 253 253 253 253 253
57638-253 253 253 253 253 253 253 253 253 253 253 253
57639-253 253 253 253 253 253 253 253 253 253 253 253
57640-253 253 253 246 246 246 46 46 46 38 38 38
57641- 42 42 42 14 14 14 38 38 38 14 14 14
57642- 2 2 6 2 2 6 2 2 6 6 6 6
57643- 86 86 86 46 46 46 14 14 14 0 0 0
57644- 0 0 0 0 0 0 0 0 0 0 0 0
57645- 0 0 0 0 0 0 0 0 0 0 0 0
57646- 0 0 0 0 0 0 0 0 0 0 0 0
57647- 0 0 0 0 0 0 0 0 0 0 0 0
57648- 0 0 0 0 0 0 0 0 0 0 0 0
57649- 0 0 0 0 0 0 0 0 0 0 0 0
57650- 0 0 0 0 0 0 0 0 0 0 0 0
57651- 0 0 0 6 6 6 14 14 14 42 42 42
57652- 90 90 90 18 18 18 18 18 18 26 26 26
57653- 2 2 6 116 116 116 253 253 253 253 253 253
57654-253 253 253 253 253 253 253 253 253 253 253 253
57655-253 253 253 253 253 253 250 250 250 238 238 238
57656-253 253 253 253 253 253 253 253 253 253 253 253
57657-253 253 253 253 253 253 253 253 253 253 253 253
57658-253 253 253 253 253 253 253 253 253 253 253 253
57659-253 253 253 253 253 253 253 253 253 253 253 253
57660-253 253 253 253 253 253 94 94 94 6 6 6
57661- 2 2 6 2 2 6 10 10 10 34 34 34
57662- 2 2 6 2 2 6 2 2 6 2 2 6
57663- 74 74 74 58 58 58 22 22 22 6 6 6
57664- 0 0 0 0 0 0 0 0 0 0 0 0
57665- 0 0 0 0 0 0 0 0 0 0 0 0
57666- 0 0 0 0 0 0 0 0 0 0 0 0
57667- 0 0 0 0 0 0 0 0 0 0 0 0
57668- 0 0 0 0 0 0 0 0 0 0 0 0
57669- 0 0 0 0 0 0 0 0 0 0 0 0
57670- 0 0 0 0 0 0 0 0 0 0 0 0
57671- 0 0 0 10 10 10 26 26 26 66 66 66
57672- 82 82 82 2 2 6 38 38 38 6 6 6
57673- 14 14 14 210 210 210 253 253 253 253 253 253
57674-253 253 253 253 253 253 253 253 253 253 253 253
57675-253 253 253 253 253 253 246 246 246 242 242 242
57676-253 253 253 253 253 253 253 253 253 253 253 253
57677-253 253 253 253 253 253 253 253 253 253 253 253
57678-253 253 253 253 253 253 253 253 253 253 253 253
57679-253 253 253 253 253 253 253 253 253 253 253 253
57680-253 253 253 253 253 253 144 144 144 2 2 6
57681- 2 2 6 2 2 6 2 2 6 46 46 46
57682- 2 2 6 2 2 6 2 2 6 2 2 6
57683- 42 42 42 74 74 74 30 30 30 10 10 10
57684- 0 0 0 0 0 0 0 0 0 0 0 0
57685- 0 0 0 0 0 0 0 0 0 0 0 0
57686- 0 0 0 0 0 0 0 0 0 0 0 0
57687- 0 0 0 0 0 0 0 0 0 0 0 0
57688- 0 0 0 0 0 0 0 0 0 0 0 0
57689- 0 0 0 0 0 0 0 0 0 0 0 0
57690- 0 0 0 0 0 0 0 0 0 0 0 0
57691- 6 6 6 14 14 14 42 42 42 90 90 90
57692- 26 26 26 6 6 6 42 42 42 2 2 6
57693- 74 74 74 250 250 250 253 253 253 253 253 253
57694-253 253 253 253 253 253 253 253 253 253 253 253
57695-253 253 253 253 253 253 242 242 242 242 242 242
57696-253 253 253 253 253 253 253 253 253 253 253 253
57697-253 253 253 253 253 253 253 253 253 253 253 253
57698-253 253 253 253 253 253 253 253 253 253 253 253
57699-253 253 253 253 253 253 253 253 253 253 253 253
57700-253 253 253 253 253 253 182 182 182 2 2 6
57701- 2 2 6 2 2 6 2 2 6 46 46 46
57702- 2 2 6 2 2 6 2 2 6 2 2 6
57703- 10 10 10 86 86 86 38 38 38 10 10 10
57704- 0 0 0 0 0 0 0 0 0 0 0 0
57705- 0 0 0 0 0 0 0 0 0 0 0 0
57706- 0 0 0 0 0 0 0 0 0 0 0 0
57707- 0 0 0 0 0 0 0 0 0 0 0 0
57708- 0 0 0 0 0 0 0 0 0 0 0 0
57709- 0 0 0 0 0 0 0 0 0 0 0 0
57710- 0 0 0 0 0 0 0 0 0 0 0 0
57711- 10 10 10 26 26 26 66 66 66 82 82 82
57712- 2 2 6 22 22 22 18 18 18 2 2 6
57713-149 149 149 253 253 253 253 253 253 253 253 253
57714-253 253 253 253 253 253 253 253 253 253 253 253
57715-253 253 253 253 253 253 234 234 234 242 242 242
57716-253 253 253 253 253 253 253 253 253 253 253 253
57717-253 253 253 253 253 253 253 253 253 253 253 253
57718-253 253 253 253 253 253 253 253 253 253 253 253
57719-253 253 253 253 253 253 253 253 253 253 253 253
57720-253 253 253 253 253 253 206 206 206 2 2 6
57721- 2 2 6 2 2 6 2 2 6 38 38 38
57722- 2 2 6 2 2 6 2 2 6 2 2 6
57723- 6 6 6 86 86 86 46 46 46 14 14 14
57724- 0 0 0 0 0 0 0 0 0 0 0 0
57725- 0 0 0 0 0 0 0 0 0 0 0 0
57726- 0 0 0 0 0 0 0 0 0 0 0 0
57727- 0 0 0 0 0 0 0 0 0 0 0 0
57728- 0 0 0 0 0 0 0 0 0 0 0 0
57729- 0 0 0 0 0 0 0 0 0 0 0 0
57730- 0 0 0 0 0 0 0 0 0 6 6 6
57731- 18 18 18 46 46 46 86 86 86 18 18 18
57732- 2 2 6 34 34 34 10 10 10 6 6 6
57733-210 210 210 253 253 253 253 253 253 253 253 253
57734-253 253 253 253 253 253 253 253 253 253 253 253
57735-253 253 253 253 253 253 234 234 234 242 242 242
57736-253 253 253 253 253 253 253 253 253 253 253 253
57737-253 253 253 253 253 253 253 253 253 253 253 253
57738-253 253 253 253 253 253 253 253 253 253 253 253
57739-253 253 253 253 253 253 253 253 253 253 253 253
57740-253 253 253 253 253 253 221 221 221 6 6 6
57741- 2 2 6 2 2 6 6 6 6 30 30 30
57742- 2 2 6 2 2 6 2 2 6 2 2 6
57743- 2 2 6 82 82 82 54 54 54 18 18 18
57744- 6 6 6 0 0 0 0 0 0 0 0 0
57745- 0 0 0 0 0 0 0 0 0 0 0 0
57746- 0 0 0 0 0 0 0 0 0 0 0 0
57747- 0 0 0 0 0 0 0 0 0 0 0 0
57748- 0 0 0 0 0 0 0 0 0 0 0 0
57749- 0 0 0 0 0 0 0 0 0 0 0 0
57750- 0 0 0 0 0 0 0 0 0 10 10 10
57751- 26 26 26 66 66 66 62 62 62 2 2 6
57752- 2 2 6 38 38 38 10 10 10 26 26 26
57753-238 238 238 253 253 253 253 253 253 253 253 253
57754-253 253 253 253 253 253 253 253 253 253 253 253
57755-253 253 253 253 253 253 231 231 231 238 238 238
57756-253 253 253 253 253 253 253 253 253 253 253 253
57757-253 253 253 253 253 253 253 253 253 253 253 253
57758-253 253 253 253 253 253 253 253 253 253 253 253
57759-253 253 253 253 253 253 253 253 253 253 253 253
57760-253 253 253 253 253 253 231 231 231 6 6 6
57761- 2 2 6 2 2 6 10 10 10 30 30 30
57762- 2 2 6 2 2 6 2 2 6 2 2 6
57763- 2 2 6 66 66 66 58 58 58 22 22 22
57764- 6 6 6 0 0 0 0 0 0 0 0 0
57765- 0 0 0 0 0 0 0 0 0 0 0 0
57766- 0 0 0 0 0 0 0 0 0 0 0 0
57767- 0 0 0 0 0 0 0 0 0 0 0 0
57768- 0 0 0 0 0 0 0 0 0 0 0 0
57769- 0 0 0 0 0 0 0 0 0 0 0 0
57770- 0 0 0 0 0 0 0 0 0 10 10 10
57771- 38 38 38 78 78 78 6 6 6 2 2 6
57772- 2 2 6 46 46 46 14 14 14 42 42 42
57773-246 246 246 253 253 253 253 253 253 253 253 253
57774-253 253 253 253 253 253 253 253 253 253 253 253
57775-253 253 253 253 253 253 231 231 231 242 242 242
57776-253 253 253 253 253 253 253 253 253 253 253 253
57777-253 253 253 253 253 253 253 253 253 253 253 253
57778-253 253 253 253 253 253 253 253 253 253 253 253
57779-253 253 253 253 253 253 253 253 253 253 253 253
57780-253 253 253 253 253 253 234 234 234 10 10 10
57781- 2 2 6 2 2 6 22 22 22 14 14 14
57782- 2 2 6 2 2 6 2 2 6 2 2 6
57783- 2 2 6 66 66 66 62 62 62 22 22 22
57784- 6 6 6 0 0 0 0 0 0 0 0 0
57785- 0 0 0 0 0 0 0 0 0 0 0 0
57786- 0 0 0 0 0 0 0 0 0 0 0 0
57787- 0 0 0 0 0 0 0 0 0 0 0 0
57788- 0 0 0 0 0 0 0 0 0 0 0 0
57789- 0 0 0 0 0 0 0 0 0 0 0 0
57790- 0 0 0 0 0 0 6 6 6 18 18 18
57791- 50 50 50 74 74 74 2 2 6 2 2 6
57792- 14 14 14 70 70 70 34 34 34 62 62 62
57793-250 250 250 253 253 253 253 253 253 253 253 253
57794-253 253 253 253 253 253 253 253 253 253 253 253
57795-253 253 253 253 253 253 231 231 231 246 246 246
57796-253 253 253 253 253 253 253 253 253 253 253 253
57797-253 253 253 253 253 253 253 253 253 253 253 253
57798-253 253 253 253 253 253 253 253 253 253 253 253
57799-253 253 253 253 253 253 253 253 253 253 253 253
57800-253 253 253 253 253 253 234 234 234 14 14 14
57801- 2 2 6 2 2 6 30 30 30 2 2 6
57802- 2 2 6 2 2 6 2 2 6 2 2 6
57803- 2 2 6 66 66 66 62 62 62 22 22 22
57804- 6 6 6 0 0 0 0 0 0 0 0 0
57805- 0 0 0 0 0 0 0 0 0 0 0 0
57806- 0 0 0 0 0 0 0 0 0 0 0 0
57807- 0 0 0 0 0 0 0 0 0 0 0 0
57808- 0 0 0 0 0 0 0 0 0 0 0 0
57809- 0 0 0 0 0 0 0 0 0 0 0 0
57810- 0 0 0 0 0 0 6 6 6 18 18 18
57811- 54 54 54 62 62 62 2 2 6 2 2 6
57812- 2 2 6 30 30 30 46 46 46 70 70 70
57813-250 250 250 253 253 253 253 253 253 253 253 253
57814-253 253 253 253 253 253 253 253 253 253 253 253
57815-253 253 253 253 253 253 231 231 231 246 246 246
57816-253 253 253 253 253 253 253 253 253 253 253 253
57817-253 253 253 253 253 253 253 253 253 253 253 253
57818-253 253 253 253 253 253 253 253 253 253 253 253
57819-253 253 253 253 253 253 253 253 253 253 253 253
57820-253 253 253 253 253 253 226 226 226 10 10 10
57821- 2 2 6 6 6 6 30 30 30 2 2 6
57822- 2 2 6 2 2 6 2 2 6 2 2 6
57823- 2 2 6 66 66 66 58 58 58 22 22 22
57824- 6 6 6 0 0 0 0 0 0 0 0 0
57825- 0 0 0 0 0 0 0 0 0 0 0 0
57826- 0 0 0 0 0 0 0 0 0 0 0 0
57827- 0 0 0 0 0 0 0 0 0 0 0 0
57828- 0 0 0 0 0 0 0 0 0 0 0 0
57829- 0 0 0 0 0 0 0 0 0 0 0 0
57830- 0 0 0 0 0 0 6 6 6 22 22 22
57831- 58 58 58 62 62 62 2 2 6 2 2 6
57832- 2 2 6 2 2 6 30 30 30 78 78 78
57833-250 250 250 253 253 253 253 253 253 253 253 253
57834-253 253 253 253 253 253 253 253 253 253 253 253
57835-253 253 253 253 253 253 231 231 231 246 246 246
57836-253 253 253 253 253 253 253 253 253 253 253 253
57837-253 253 253 253 253 253 253 253 253 253 253 253
57838-253 253 253 253 253 253 253 253 253 253 253 253
57839-253 253 253 253 253 253 253 253 253 253 253 253
57840-253 253 253 253 253 253 206 206 206 2 2 6
57841- 22 22 22 34 34 34 18 14 6 22 22 22
57842- 26 26 26 18 18 18 6 6 6 2 2 6
57843- 2 2 6 82 82 82 54 54 54 18 18 18
57844- 6 6 6 0 0 0 0 0 0 0 0 0
57845- 0 0 0 0 0 0 0 0 0 0 0 0
57846- 0 0 0 0 0 0 0 0 0 0 0 0
57847- 0 0 0 0 0 0 0 0 0 0 0 0
57848- 0 0 0 0 0 0 0 0 0 0 0 0
57849- 0 0 0 0 0 0 0 0 0 0 0 0
57850- 0 0 0 0 0 0 6 6 6 26 26 26
57851- 62 62 62 106 106 106 74 54 14 185 133 11
57852-210 162 10 121 92 8 6 6 6 62 62 62
57853-238 238 238 253 253 253 253 253 253 253 253 253
57854-253 253 253 253 253 253 253 253 253 253 253 253
57855-253 253 253 253 253 253 231 231 231 246 246 246
57856-253 253 253 253 253 253 253 253 253 253 253 253
57857-253 253 253 253 253 253 253 253 253 253 253 253
57858-253 253 253 253 253 253 253 253 253 253 253 253
57859-253 253 253 253 253 253 253 253 253 253 253 253
57860-253 253 253 253 253 253 158 158 158 18 18 18
57861- 14 14 14 2 2 6 2 2 6 2 2 6
57862- 6 6 6 18 18 18 66 66 66 38 38 38
57863- 6 6 6 94 94 94 50 50 50 18 18 18
57864- 6 6 6 0 0 0 0 0 0 0 0 0
57865- 0 0 0 0 0 0 0 0 0 0 0 0
57866- 0 0 0 0 0 0 0 0 0 0 0 0
57867- 0 0 0 0 0 0 0 0 0 0 0 0
57868- 0 0 0 0 0 0 0 0 0 0 0 0
57869- 0 0 0 0 0 0 0 0 0 6 6 6
57870- 10 10 10 10 10 10 18 18 18 38 38 38
57871- 78 78 78 142 134 106 216 158 10 242 186 14
57872-246 190 14 246 190 14 156 118 10 10 10 10
57873- 90 90 90 238 238 238 253 253 253 253 253 253
57874-253 253 253 253 253 253 253 253 253 253 253 253
57875-253 253 253 253 253 253 231 231 231 250 250 250
57876-253 253 253 253 253 253 253 253 253 253 253 253
57877-253 253 253 253 253 253 253 253 253 253 253 253
57878-253 253 253 253 253 253 253 253 253 253 253 253
57879-253 253 253 253 253 253 253 253 253 246 230 190
57880-238 204 91 238 204 91 181 142 44 37 26 9
57881- 2 2 6 2 2 6 2 2 6 2 2 6
57882- 2 2 6 2 2 6 38 38 38 46 46 46
57883- 26 26 26 106 106 106 54 54 54 18 18 18
57884- 6 6 6 0 0 0 0 0 0 0 0 0
57885- 0 0 0 0 0 0 0 0 0 0 0 0
57886- 0 0 0 0 0 0 0 0 0 0 0 0
57887- 0 0 0 0 0 0 0 0 0 0 0 0
57888- 0 0 0 0 0 0 0 0 0 0 0 0
57889- 0 0 0 6 6 6 14 14 14 22 22 22
57890- 30 30 30 38 38 38 50 50 50 70 70 70
57891-106 106 106 190 142 34 226 170 11 242 186 14
57892-246 190 14 246 190 14 246 190 14 154 114 10
57893- 6 6 6 74 74 74 226 226 226 253 253 253
57894-253 253 253 253 253 253 253 253 253 253 253 253
57895-253 253 253 253 253 253 231 231 231 250 250 250
57896-253 253 253 253 253 253 253 253 253 253 253 253
57897-253 253 253 253 253 253 253 253 253 253 253 253
57898-253 253 253 253 253 253 253 253 253 253 253 253
57899-253 253 253 253 253 253 253 253 253 228 184 62
57900-241 196 14 241 208 19 232 195 16 38 30 10
57901- 2 2 6 2 2 6 2 2 6 2 2 6
57902- 2 2 6 6 6 6 30 30 30 26 26 26
57903-203 166 17 154 142 90 66 66 66 26 26 26
57904- 6 6 6 0 0 0 0 0 0 0 0 0
57905- 0 0 0 0 0 0 0 0 0 0 0 0
57906- 0 0 0 0 0 0 0 0 0 0 0 0
57907- 0 0 0 0 0 0 0 0 0 0 0 0
57908- 0 0 0 0 0 0 0 0 0 0 0 0
57909- 6 6 6 18 18 18 38 38 38 58 58 58
57910- 78 78 78 86 86 86 101 101 101 123 123 123
57911-175 146 61 210 150 10 234 174 13 246 186 14
57912-246 190 14 246 190 14 246 190 14 238 190 10
57913-102 78 10 2 2 6 46 46 46 198 198 198
57914-253 253 253 253 253 253 253 253 253 253 253 253
57915-253 253 253 253 253 253 234 234 234 242 242 242
57916-253 253 253 253 253 253 253 253 253 253 253 253
57917-253 253 253 253 253 253 253 253 253 253 253 253
57918-253 253 253 253 253 253 253 253 253 253 253 253
57919-253 253 253 253 253 253 253 253 253 224 178 62
57920-242 186 14 241 196 14 210 166 10 22 18 6
57921- 2 2 6 2 2 6 2 2 6 2 2 6
57922- 2 2 6 2 2 6 6 6 6 121 92 8
57923-238 202 15 232 195 16 82 82 82 34 34 34
57924- 10 10 10 0 0 0 0 0 0 0 0 0
57925- 0 0 0 0 0 0 0 0 0 0 0 0
57926- 0 0 0 0 0 0 0 0 0 0 0 0
57927- 0 0 0 0 0 0 0 0 0 0 0 0
57928- 0 0 0 0 0 0 0 0 0 0 0 0
57929- 14 14 14 38 38 38 70 70 70 154 122 46
57930-190 142 34 200 144 11 197 138 11 197 138 11
57931-213 154 11 226 170 11 242 186 14 246 190 14
57932-246 190 14 246 190 14 246 190 14 246 190 14
57933-225 175 15 46 32 6 2 2 6 22 22 22
57934-158 158 158 250 250 250 253 253 253 253 253 253
57935-253 253 253 253 253 253 253 253 253 253 253 253
57936-253 253 253 253 253 253 253 253 253 253 253 253
57937-253 253 253 253 253 253 253 253 253 253 253 253
57938-253 253 253 253 253 253 253 253 253 253 253 253
57939-253 253 253 250 250 250 242 242 242 224 178 62
57940-239 182 13 236 186 11 213 154 11 46 32 6
57941- 2 2 6 2 2 6 2 2 6 2 2 6
57942- 2 2 6 2 2 6 61 42 6 225 175 15
57943-238 190 10 236 186 11 112 100 78 42 42 42
57944- 14 14 14 0 0 0 0 0 0 0 0 0
57945- 0 0 0 0 0 0 0 0 0 0 0 0
57946- 0 0 0 0 0 0 0 0 0 0 0 0
57947- 0 0 0 0 0 0 0 0 0 0 0 0
57948- 0 0 0 0 0 0 0 0 0 6 6 6
57949- 22 22 22 54 54 54 154 122 46 213 154 11
57950-226 170 11 230 174 11 226 170 11 226 170 11
57951-236 178 12 242 186 14 246 190 14 246 190 14
57952-246 190 14 246 190 14 246 190 14 246 190 14
57953-241 196 14 184 144 12 10 10 10 2 2 6
57954- 6 6 6 116 116 116 242 242 242 253 253 253
57955-253 253 253 253 253 253 253 253 253 253 253 253
57956-253 253 253 253 253 253 253 253 253 253 253 253
57957-253 253 253 253 253 253 253 253 253 253 253 253
57958-253 253 253 253 253 253 253 253 253 253 253 253
57959-253 253 253 231 231 231 198 198 198 214 170 54
57960-236 178 12 236 178 12 210 150 10 137 92 6
57961- 18 14 6 2 2 6 2 2 6 2 2 6
57962- 6 6 6 70 47 6 200 144 11 236 178 12
57963-239 182 13 239 182 13 124 112 88 58 58 58
57964- 22 22 22 6 6 6 0 0 0 0 0 0
57965- 0 0 0 0 0 0 0 0 0 0 0 0
57966- 0 0 0 0 0 0 0 0 0 0 0 0
57967- 0 0 0 0 0 0 0 0 0 0 0 0
57968- 0 0 0 0 0 0 0 0 0 10 10 10
57969- 30 30 30 70 70 70 180 133 36 226 170 11
57970-239 182 13 242 186 14 242 186 14 246 186 14
57971-246 190 14 246 190 14 246 190 14 246 190 14
57972-246 190 14 246 190 14 246 190 14 246 190 14
57973-246 190 14 232 195 16 98 70 6 2 2 6
57974- 2 2 6 2 2 6 66 66 66 221 221 221
57975-253 253 253 253 253 253 253 253 253 253 253 253
57976-253 253 253 253 253 253 253 253 253 253 253 253
57977-253 253 253 253 253 253 253 253 253 253 253 253
57978-253 253 253 253 253 253 253 253 253 253 253 253
57979-253 253 253 206 206 206 198 198 198 214 166 58
57980-230 174 11 230 174 11 216 158 10 192 133 9
57981-163 110 8 116 81 8 102 78 10 116 81 8
57982-167 114 7 197 138 11 226 170 11 239 182 13
57983-242 186 14 242 186 14 162 146 94 78 78 78
57984- 34 34 34 14 14 14 6 6 6 0 0 0
57985- 0 0 0 0 0 0 0 0 0 0 0 0
57986- 0 0 0 0 0 0 0 0 0 0 0 0
57987- 0 0 0 0 0 0 0 0 0 0 0 0
57988- 0 0 0 0 0 0 0 0 0 6 6 6
57989- 30 30 30 78 78 78 190 142 34 226 170 11
57990-239 182 13 246 190 14 246 190 14 246 190 14
57991-246 190 14 246 190 14 246 190 14 246 190 14
57992-246 190 14 246 190 14 246 190 14 246 190 14
57993-246 190 14 241 196 14 203 166 17 22 18 6
57994- 2 2 6 2 2 6 2 2 6 38 38 38
57995-218 218 218 253 253 253 253 253 253 253 253 253
57996-253 253 253 253 253 253 253 253 253 253 253 253
57997-253 253 253 253 253 253 253 253 253 253 253 253
57998-253 253 253 253 253 253 253 253 253 253 253 253
57999-250 250 250 206 206 206 198 198 198 202 162 69
58000-226 170 11 236 178 12 224 166 10 210 150 10
58001-200 144 11 197 138 11 192 133 9 197 138 11
58002-210 150 10 226 170 11 242 186 14 246 190 14
58003-246 190 14 246 186 14 225 175 15 124 112 88
58004- 62 62 62 30 30 30 14 14 14 6 6 6
58005- 0 0 0 0 0 0 0 0 0 0 0 0
58006- 0 0 0 0 0 0 0 0 0 0 0 0
58007- 0 0 0 0 0 0 0 0 0 0 0 0
58008- 0 0 0 0 0 0 0 0 0 10 10 10
58009- 30 30 30 78 78 78 174 135 50 224 166 10
58010-239 182 13 246 190 14 246 190 14 246 190 14
58011-246 190 14 246 190 14 246 190 14 246 190 14
58012-246 190 14 246 190 14 246 190 14 246 190 14
58013-246 190 14 246 190 14 241 196 14 139 102 15
58014- 2 2 6 2 2 6 2 2 6 2 2 6
58015- 78 78 78 250 250 250 253 253 253 253 253 253
58016-253 253 253 253 253 253 253 253 253 253 253 253
58017-253 253 253 253 253 253 253 253 253 253 253 253
58018-253 253 253 253 253 253 253 253 253 253 253 253
58019-250 250 250 214 214 214 198 198 198 190 150 46
58020-219 162 10 236 178 12 234 174 13 224 166 10
58021-216 158 10 213 154 11 213 154 11 216 158 10
58022-226 170 11 239 182 13 246 190 14 246 190 14
58023-246 190 14 246 190 14 242 186 14 206 162 42
58024-101 101 101 58 58 58 30 30 30 14 14 14
58025- 6 6 6 0 0 0 0 0 0 0 0 0
58026- 0 0 0 0 0 0 0 0 0 0 0 0
58027- 0 0 0 0 0 0 0 0 0 0 0 0
58028- 0 0 0 0 0 0 0 0 0 10 10 10
58029- 30 30 30 74 74 74 174 135 50 216 158 10
58030-236 178 12 246 190 14 246 190 14 246 190 14
58031-246 190 14 246 190 14 246 190 14 246 190 14
58032-246 190 14 246 190 14 246 190 14 246 190 14
58033-246 190 14 246 190 14 241 196 14 226 184 13
58034- 61 42 6 2 2 6 2 2 6 2 2 6
58035- 22 22 22 238 238 238 253 253 253 253 253 253
58036-253 253 253 253 253 253 253 253 253 253 253 253
58037-253 253 253 253 253 253 253 253 253 253 253 253
58038-253 253 253 253 253 253 253 253 253 253 253 253
58039-253 253 253 226 226 226 187 187 187 180 133 36
58040-216 158 10 236 178 12 239 182 13 236 178 12
58041-230 174 11 226 170 11 226 170 11 230 174 11
58042-236 178 12 242 186 14 246 190 14 246 190 14
58043-246 190 14 246 190 14 246 186 14 239 182 13
58044-206 162 42 106 106 106 66 66 66 34 34 34
58045- 14 14 14 6 6 6 0 0 0 0 0 0
58046- 0 0 0 0 0 0 0 0 0 0 0 0
58047- 0 0 0 0 0 0 0 0 0 0 0 0
58048- 0 0 0 0 0 0 0 0 0 6 6 6
58049- 26 26 26 70 70 70 163 133 67 213 154 11
58050-236 178 12 246 190 14 246 190 14 246 190 14
58051-246 190 14 246 190 14 246 190 14 246 190 14
58052-246 190 14 246 190 14 246 190 14 246 190 14
58053-246 190 14 246 190 14 246 190 14 241 196 14
58054-190 146 13 18 14 6 2 2 6 2 2 6
58055- 46 46 46 246 246 246 253 253 253 253 253 253
58056-253 253 253 253 253 253 253 253 253 253 253 253
58057-253 253 253 253 253 253 253 253 253 253 253 253
58058-253 253 253 253 253 253 253 253 253 253 253 253
58059-253 253 253 221 221 221 86 86 86 156 107 11
58060-216 158 10 236 178 12 242 186 14 246 186 14
58061-242 186 14 239 182 13 239 182 13 242 186 14
58062-242 186 14 246 186 14 246 190 14 246 190 14
58063-246 190 14 246 190 14 246 190 14 246 190 14
58064-242 186 14 225 175 15 142 122 72 66 66 66
58065- 30 30 30 10 10 10 0 0 0 0 0 0
58066- 0 0 0 0 0 0 0 0 0 0 0 0
58067- 0 0 0 0 0 0 0 0 0 0 0 0
58068- 0 0 0 0 0 0 0 0 0 6 6 6
58069- 26 26 26 70 70 70 163 133 67 210 150 10
58070-236 178 12 246 190 14 246 190 14 246 190 14
58071-246 190 14 246 190 14 246 190 14 246 190 14
58072-246 190 14 246 190 14 246 190 14 246 190 14
58073-246 190 14 246 190 14 246 190 14 246 190 14
58074-232 195 16 121 92 8 34 34 34 106 106 106
58075-221 221 221 253 253 253 253 253 253 253 253 253
58076-253 253 253 253 253 253 253 253 253 253 253 253
58077-253 253 253 253 253 253 253 253 253 253 253 253
58078-253 253 253 253 253 253 253 253 253 253 253 253
58079-242 242 242 82 82 82 18 14 6 163 110 8
58080-216 158 10 236 178 12 242 186 14 246 190 14
58081-246 190 14 246 190 14 246 190 14 246 190 14
58082-246 190 14 246 190 14 246 190 14 246 190 14
58083-246 190 14 246 190 14 246 190 14 246 190 14
58084-246 190 14 246 190 14 242 186 14 163 133 67
58085- 46 46 46 18 18 18 6 6 6 0 0 0
58086- 0 0 0 0 0 0 0 0 0 0 0 0
58087- 0 0 0 0 0 0 0 0 0 0 0 0
58088- 0 0 0 0 0 0 0 0 0 10 10 10
58089- 30 30 30 78 78 78 163 133 67 210 150 10
58090-236 178 12 246 186 14 246 190 14 246 190 14
58091-246 190 14 246 190 14 246 190 14 246 190 14
58092-246 190 14 246 190 14 246 190 14 246 190 14
58093-246 190 14 246 190 14 246 190 14 246 190 14
58094-241 196 14 215 174 15 190 178 144 253 253 253
58095-253 253 253 253 253 253 253 253 253 253 253 253
58096-253 253 253 253 253 253 253 253 253 253 253 253
58097-253 253 253 253 253 253 253 253 253 253 253 253
58098-253 253 253 253 253 253 253 253 253 218 218 218
58099- 58 58 58 2 2 6 22 18 6 167 114 7
58100-216 158 10 236 178 12 246 186 14 246 190 14
58101-246 190 14 246 190 14 246 190 14 246 190 14
58102-246 190 14 246 190 14 246 190 14 246 190 14
58103-246 190 14 246 190 14 246 190 14 246 190 14
58104-246 190 14 246 186 14 242 186 14 190 150 46
58105- 54 54 54 22 22 22 6 6 6 0 0 0
58106- 0 0 0 0 0 0 0 0 0 0 0 0
58107- 0 0 0 0 0 0 0 0 0 0 0 0
58108- 0 0 0 0 0 0 0 0 0 14 14 14
58109- 38 38 38 86 86 86 180 133 36 213 154 11
58110-236 178 12 246 186 14 246 190 14 246 190 14
58111-246 190 14 246 190 14 246 190 14 246 190 14
58112-246 190 14 246 190 14 246 190 14 246 190 14
58113-246 190 14 246 190 14 246 190 14 246 190 14
58114-246 190 14 232 195 16 190 146 13 214 214 214
58115-253 253 253 253 253 253 253 253 253 253 253 253
58116-253 253 253 253 253 253 253 253 253 253 253 253
58117-253 253 253 253 253 253 253 253 253 253 253 253
58118-253 253 253 250 250 250 170 170 170 26 26 26
58119- 2 2 6 2 2 6 37 26 9 163 110 8
58120-219 162 10 239 182 13 246 186 14 246 190 14
58121-246 190 14 246 190 14 246 190 14 246 190 14
58122-246 190 14 246 190 14 246 190 14 246 190 14
58123-246 190 14 246 190 14 246 190 14 246 190 14
58124-246 186 14 236 178 12 224 166 10 142 122 72
58125- 46 46 46 18 18 18 6 6 6 0 0 0
58126- 0 0 0 0 0 0 0 0 0 0 0 0
58127- 0 0 0 0 0 0 0 0 0 0 0 0
58128- 0 0 0 0 0 0 6 6 6 18 18 18
58129- 50 50 50 109 106 95 192 133 9 224 166 10
58130-242 186 14 246 190 14 246 190 14 246 190 14
58131-246 190 14 246 190 14 246 190 14 246 190 14
58132-246 190 14 246 190 14 246 190 14 246 190 14
58133-246 190 14 246 190 14 246 190 14 246 190 14
58134-242 186 14 226 184 13 210 162 10 142 110 46
58135-226 226 226 253 253 253 253 253 253 253 253 253
58136-253 253 253 253 253 253 253 253 253 253 253 253
58137-253 253 253 253 253 253 253 253 253 253 253 253
58138-198 198 198 66 66 66 2 2 6 2 2 6
58139- 2 2 6 2 2 6 50 34 6 156 107 11
58140-219 162 10 239 182 13 246 186 14 246 190 14
58141-246 190 14 246 190 14 246 190 14 246 190 14
58142-246 190 14 246 190 14 246 190 14 246 190 14
58143-246 190 14 246 190 14 246 190 14 242 186 14
58144-234 174 13 213 154 11 154 122 46 66 66 66
58145- 30 30 30 10 10 10 0 0 0 0 0 0
58146- 0 0 0 0 0 0 0 0 0 0 0 0
58147- 0 0 0 0 0 0 0 0 0 0 0 0
58148- 0 0 0 0 0 0 6 6 6 22 22 22
58149- 58 58 58 154 121 60 206 145 10 234 174 13
58150-242 186 14 246 186 14 246 190 14 246 190 14
58151-246 190 14 246 190 14 246 190 14 246 190 14
58152-246 190 14 246 190 14 246 190 14 246 190 14
58153-246 190 14 246 190 14 246 190 14 246 190 14
58154-246 186 14 236 178 12 210 162 10 163 110 8
58155- 61 42 6 138 138 138 218 218 218 250 250 250
58156-253 253 253 253 253 253 253 253 253 250 250 250
58157-242 242 242 210 210 210 144 144 144 66 66 66
58158- 6 6 6 2 2 6 2 2 6 2 2 6
58159- 2 2 6 2 2 6 61 42 6 163 110 8
58160-216 158 10 236 178 12 246 190 14 246 190 14
58161-246 190 14 246 190 14 246 190 14 246 190 14
58162-246 190 14 246 190 14 246 190 14 246 190 14
58163-246 190 14 239 182 13 230 174 11 216 158 10
58164-190 142 34 124 112 88 70 70 70 38 38 38
58165- 18 18 18 6 6 6 0 0 0 0 0 0
58166- 0 0 0 0 0 0 0 0 0 0 0 0
58167- 0 0 0 0 0 0 0 0 0 0 0 0
58168- 0 0 0 0 0 0 6 6 6 22 22 22
58169- 62 62 62 168 124 44 206 145 10 224 166 10
58170-236 178 12 239 182 13 242 186 14 242 186 14
58171-246 186 14 246 190 14 246 190 14 246 190 14
58172-246 190 14 246 190 14 246 190 14 246 190 14
58173-246 190 14 246 190 14 246 190 14 246 190 14
58174-246 190 14 236 178 12 216 158 10 175 118 6
58175- 80 54 7 2 2 6 6 6 6 30 30 30
58176- 54 54 54 62 62 62 50 50 50 38 38 38
58177- 14 14 14 2 2 6 2 2 6 2 2 6
58178- 2 2 6 2 2 6 2 2 6 2 2 6
58179- 2 2 6 6 6 6 80 54 7 167 114 7
58180-213 154 11 236 178 12 246 190 14 246 190 14
58181-246 190 14 246 190 14 246 190 14 246 190 14
58182-246 190 14 242 186 14 239 182 13 239 182 13
58183-230 174 11 210 150 10 174 135 50 124 112 88
58184- 82 82 82 54 54 54 34 34 34 18 18 18
58185- 6 6 6 0 0 0 0 0 0 0 0 0
58186- 0 0 0 0 0 0 0 0 0 0 0 0
58187- 0 0 0 0 0 0 0 0 0 0 0 0
58188- 0 0 0 0 0 0 6 6 6 18 18 18
58189- 50 50 50 158 118 36 192 133 9 200 144 11
58190-216 158 10 219 162 10 224 166 10 226 170 11
58191-230 174 11 236 178 12 239 182 13 239 182 13
58192-242 186 14 246 186 14 246 190 14 246 190 14
58193-246 190 14 246 190 14 246 190 14 246 190 14
58194-246 186 14 230 174 11 210 150 10 163 110 8
58195-104 69 6 10 10 10 2 2 6 2 2 6
58196- 2 2 6 2 2 6 2 2 6 2 2 6
58197- 2 2 6 2 2 6 2 2 6 2 2 6
58198- 2 2 6 2 2 6 2 2 6 2 2 6
58199- 2 2 6 6 6 6 91 60 6 167 114 7
58200-206 145 10 230 174 11 242 186 14 246 190 14
58201-246 190 14 246 190 14 246 186 14 242 186 14
58202-239 182 13 230 174 11 224 166 10 213 154 11
58203-180 133 36 124 112 88 86 86 86 58 58 58
58204- 38 38 38 22 22 22 10 10 10 6 6 6
58205- 0 0 0 0 0 0 0 0 0 0 0 0
58206- 0 0 0 0 0 0 0 0 0 0 0 0
58207- 0 0 0 0 0 0 0 0 0 0 0 0
58208- 0 0 0 0 0 0 0 0 0 14 14 14
58209- 34 34 34 70 70 70 138 110 50 158 118 36
58210-167 114 7 180 123 7 192 133 9 197 138 11
58211-200 144 11 206 145 10 213 154 11 219 162 10
58212-224 166 10 230 174 11 239 182 13 242 186 14
58213-246 186 14 246 186 14 246 186 14 246 186 14
58214-239 182 13 216 158 10 185 133 11 152 99 6
58215-104 69 6 18 14 6 2 2 6 2 2 6
58216- 2 2 6 2 2 6 2 2 6 2 2 6
58217- 2 2 6 2 2 6 2 2 6 2 2 6
58218- 2 2 6 2 2 6 2 2 6 2 2 6
58219- 2 2 6 6 6 6 80 54 7 152 99 6
58220-192 133 9 219 162 10 236 178 12 239 182 13
58221-246 186 14 242 186 14 239 182 13 236 178 12
58222-224 166 10 206 145 10 192 133 9 154 121 60
58223- 94 94 94 62 62 62 42 42 42 22 22 22
58224- 14 14 14 6 6 6 0 0 0 0 0 0
58225- 0 0 0 0 0 0 0 0 0 0 0 0
58226- 0 0 0 0 0 0 0 0 0 0 0 0
58227- 0 0 0 0 0 0 0 0 0 0 0 0
58228- 0 0 0 0 0 0 0 0 0 6 6 6
58229- 18 18 18 34 34 34 58 58 58 78 78 78
58230-101 98 89 124 112 88 142 110 46 156 107 11
58231-163 110 8 167 114 7 175 118 6 180 123 7
58232-185 133 11 197 138 11 210 150 10 219 162 10
58233-226 170 11 236 178 12 236 178 12 234 174 13
58234-219 162 10 197 138 11 163 110 8 130 83 6
58235- 91 60 6 10 10 10 2 2 6 2 2 6
58236- 18 18 18 38 38 38 38 38 38 38 38 38
58237- 38 38 38 38 38 38 38 38 38 38 38 38
58238- 38 38 38 38 38 38 26 26 26 2 2 6
58239- 2 2 6 6 6 6 70 47 6 137 92 6
58240-175 118 6 200 144 11 219 162 10 230 174 11
58241-234 174 13 230 174 11 219 162 10 210 150 10
58242-192 133 9 163 110 8 124 112 88 82 82 82
58243- 50 50 50 30 30 30 14 14 14 6 6 6
58244- 0 0 0 0 0 0 0 0 0 0 0 0
58245- 0 0 0 0 0 0 0 0 0 0 0 0
58246- 0 0 0 0 0 0 0 0 0 0 0 0
58247- 0 0 0 0 0 0 0 0 0 0 0 0
58248- 0 0 0 0 0 0 0 0 0 0 0 0
58249- 6 6 6 14 14 14 22 22 22 34 34 34
58250- 42 42 42 58 58 58 74 74 74 86 86 86
58251-101 98 89 122 102 70 130 98 46 121 87 25
58252-137 92 6 152 99 6 163 110 8 180 123 7
58253-185 133 11 197 138 11 206 145 10 200 144 11
58254-180 123 7 156 107 11 130 83 6 104 69 6
58255- 50 34 6 54 54 54 110 110 110 101 98 89
58256- 86 86 86 82 82 82 78 78 78 78 78 78
58257- 78 78 78 78 78 78 78 78 78 78 78 78
58258- 78 78 78 82 82 82 86 86 86 94 94 94
58259-106 106 106 101 101 101 86 66 34 124 80 6
58260-156 107 11 180 123 7 192 133 9 200 144 11
58261-206 145 10 200 144 11 192 133 9 175 118 6
58262-139 102 15 109 106 95 70 70 70 42 42 42
58263- 22 22 22 10 10 10 0 0 0 0 0 0
58264- 0 0 0 0 0 0 0 0 0 0 0 0
58265- 0 0 0 0 0 0 0 0 0 0 0 0
58266- 0 0 0 0 0 0 0 0 0 0 0 0
58267- 0 0 0 0 0 0 0 0 0 0 0 0
58268- 0 0 0 0 0 0 0 0 0 0 0 0
58269- 0 0 0 0 0 0 6 6 6 10 10 10
58270- 14 14 14 22 22 22 30 30 30 38 38 38
58271- 50 50 50 62 62 62 74 74 74 90 90 90
58272-101 98 89 112 100 78 121 87 25 124 80 6
58273-137 92 6 152 99 6 152 99 6 152 99 6
58274-138 86 6 124 80 6 98 70 6 86 66 30
58275-101 98 89 82 82 82 58 58 58 46 46 46
58276- 38 38 38 34 34 34 34 34 34 34 34 34
58277- 34 34 34 34 34 34 34 34 34 34 34 34
58278- 34 34 34 34 34 34 38 38 38 42 42 42
58279- 54 54 54 82 82 82 94 86 76 91 60 6
58280-134 86 6 156 107 11 167 114 7 175 118 6
58281-175 118 6 167 114 7 152 99 6 121 87 25
58282-101 98 89 62 62 62 34 34 34 18 18 18
58283- 6 6 6 0 0 0 0 0 0 0 0 0
58284- 0 0 0 0 0 0 0 0 0 0 0 0
58285- 0 0 0 0 0 0 0 0 0 0 0 0
58286- 0 0 0 0 0 0 0 0 0 0 0 0
58287- 0 0 0 0 0 0 0 0 0 0 0 0
58288- 0 0 0 0 0 0 0 0 0 0 0 0
58289- 0 0 0 0 0 0 0 0 0 0 0 0
58290- 0 0 0 6 6 6 6 6 6 10 10 10
58291- 18 18 18 22 22 22 30 30 30 42 42 42
58292- 50 50 50 66 66 66 86 86 86 101 98 89
58293-106 86 58 98 70 6 104 69 6 104 69 6
58294-104 69 6 91 60 6 82 62 34 90 90 90
58295- 62 62 62 38 38 38 22 22 22 14 14 14
58296- 10 10 10 10 10 10 10 10 10 10 10 10
58297- 10 10 10 10 10 10 6 6 6 10 10 10
58298- 10 10 10 10 10 10 10 10 10 14 14 14
58299- 22 22 22 42 42 42 70 70 70 89 81 66
58300- 80 54 7 104 69 6 124 80 6 137 92 6
58301-134 86 6 116 81 8 100 82 52 86 86 86
58302- 58 58 58 30 30 30 14 14 14 6 6 6
58303- 0 0 0 0 0 0 0 0 0 0 0 0
58304- 0 0 0 0 0 0 0 0 0 0 0 0
58305- 0 0 0 0 0 0 0 0 0 0 0 0
58306- 0 0 0 0 0 0 0 0 0 0 0 0
58307- 0 0 0 0 0 0 0 0 0 0 0 0
58308- 0 0 0 0 0 0 0 0 0 0 0 0
58309- 0 0 0 0 0 0 0 0 0 0 0 0
58310- 0 0 0 0 0 0 0 0 0 0 0 0
58311- 0 0 0 6 6 6 10 10 10 14 14 14
58312- 18 18 18 26 26 26 38 38 38 54 54 54
58313- 70 70 70 86 86 86 94 86 76 89 81 66
58314- 89 81 66 86 86 86 74 74 74 50 50 50
58315- 30 30 30 14 14 14 6 6 6 0 0 0
58316- 0 0 0 0 0 0 0 0 0 0 0 0
58317- 0 0 0 0 0 0 0 0 0 0 0 0
58318- 0 0 0 0 0 0 0 0 0 0 0 0
58319- 6 6 6 18 18 18 34 34 34 58 58 58
58320- 82 82 82 89 81 66 89 81 66 89 81 66
58321- 94 86 66 94 86 76 74 74 74 50 50 50
58322- 26 26 26 14 14 14 6 6 6 0 0 0
58323- 0 0 0 0 0 0 0 0 0 0 0 0
58324- 0 0 0 0 0 0 0 0 0 0 0 0
58325- 0 0 0 0 0 0 0 0 0 0 0 0
58326- 0 0 0 0 0 0 0 0 0 0 0 0
58327- 0 0 0 0 0 0 0 0 0 0 0 0
58328- 0 0 0 0 0 0 0 0 0 0 0 0
58329- 0 0 0 0 0 0 0 0 0 0 0 0
58330- 0 0 0 0 0 0 0 0 0 0 0 0
58331- 0 0 0 0 0 0 0 0 0 0 0 0
58332- 6 6 6 6 6 6 14 14 14 18 18 18
58333- 30 30 30 38 38 38 46 46 46 54 54 54
58334- 50 50 50 42 42 42 30 30 30 18 18 18
58335- 10 10 10 0 0 0 0 0 0 0 0 0
58336- 0 0 0 0 0 0 0 0 0 0 0 0
58337- 0 0 0 0 0 0 0 0 0 0 0 0
58338- 0 0 0 0 0 0 0 0 0 0 0 0
58339- 0 0 0 6 6 6 14 14 14 26 26 26
58340- 38 38 38 50 50 50 58 58 58 58 58 58
58341- 54 54 54 42 42 42 30 30 30 18 18 18
58342- 10 10 10 0 0 0 0 0 0 0 0 0
58343- 0 0 0 0 0 0 0 0 0 0 0 0
58344- 0 0 0 0 0 0 0 0 0 0 0 0
58345- 0 0 0 0 0 0 0 0 0 0 0 0
58346- 0 0 0 0 0 0 0 0 0 0 0 0
58347- 0 0 0 0 0 0 0 0 0 0 0 0
58348- 0 0 0 0 0 0 0 0 0 0 0 0
58349- 0 0 0 0 0 0 0 0 0 0 0 0
58350- 0 0 0 0 0 0 0 0 0 0 0 0
58351- 0 0 0 0 0 0 0 0 0 0 0 0
58352- 0 0 0 0 0 0 0 0 0 6 6 6
58353- 6 6 6 10 10 10 14 14 14 18 18 18
58354- 18 18 18 14 14 14 10 10 10 6 6 6
58355- 0 0 0 0 0 0 0 0 0 0 0 0
58356- 0 0 0 0 0 0 0 0 0 0 0 0
58357- 0 0 0 0 0 0 0 0 0 0 0 0
58358- 0 0 0 0 0 0 0 0 0 0 0 0
58359- 0 0 0 0 0 0 0 0 0 6 6 6
58360- 14 14 14 18 18 18 22 22 22 22 22 22
58361- 18 18 18 14 14 14 10 10 10 6 6 6
58362- 0 0 0 0 0 0 0 0 0 0 0 0
58363- 0 0 0 0 0 0 0 0 0 0 0 0
58364- 0 0 0 0 0 0 0 0 0 0 0 0
58365- 0 0 0 0 0 0 0 0 0 0 0 0
58366- 0 0 0 0 0 0 0 0 0 0 0 0
58367+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58378+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58379+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58380+4 4 4 4 4 4
58381+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58392+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 4 4 4
58395+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58406+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58408+4 4 4 4 4 4
58409+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58422+4 4 4 4 4 4
58423+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58436+4 4 4 4 4 4
58437+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4
58451+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58455+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
58456+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58460+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58461+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58462+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4
58465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58469+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
58470+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58471+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58474+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58475+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58476+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58477+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4
58479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58483+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58484+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58485+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58488+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58489+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58490+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58491+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4
58493+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58494+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58496+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58497+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58498+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58499+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58501+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58502+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58503+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58504+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58505+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58506+4 4 4 4 4 4
58507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58510+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58511+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58512+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58513+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58514+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58516+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58517+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58518+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58519+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58524+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58525+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58526+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58527+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58528+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58529+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58530+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58531+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58532+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58533+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58534+4 4 4 4 4 4
58535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58537+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58538+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58539+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58540+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58541+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58542+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58543+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58544+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58545+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58546+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58547+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58548+4 4 4 4 4 4
58549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58551+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58552+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58553+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58554+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58555+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58556+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58557+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58558+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58559+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58560+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58561+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58562+4 4 4 4 4 4
58563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58565+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58566+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58567+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58568+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58569+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58570+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58571+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58572+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58573+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58574+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58575+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58576+4 4 4 4 4 4
58577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58579+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58580+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58581+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58582+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58583+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58584+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58585+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58586+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58587+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58588+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58589+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58590+4 4 4 4 4 4
58591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58592+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58593+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58594+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58595+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58596+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58597+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58598+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58599+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58600+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58601+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58602+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58603+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58604+4 4 4 4 4 4
58605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58606+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58607+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58608+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58609+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58610+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58611+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58612+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58613+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58614+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58615+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58616+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58617+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58618+0 0 0 4 4 4
58619+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58620+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58621+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58622+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58623+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58624+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58625+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58626+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58627+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58628+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58629+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58630+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58631+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58632+2 0 0 0 0 0
58633+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58634+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58635+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58636+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58637+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58638+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58639+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58640+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58641+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58642+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58643+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58644+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58645+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58646+37 38 37 0 0 0
58647+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58648+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58649+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58650+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58651+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58652+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58653+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58654+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58655+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58656+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58657+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58658+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58659+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58660+85 115 134 4 0 0
58661+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58662+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58663+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58664+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58665+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58666+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58667+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58668+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58669+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58670+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58671+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58672+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58673+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58674+60 73 81 4 0 0
58675+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58676+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58677+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58678+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58679+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58680+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58681+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58682+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58683+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58684+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58685+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58686+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58687+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58688+16 19 21 4 0 0
58689+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58690+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58691+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58692+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58693+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58694+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58695+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58696+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58697+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58698+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58699+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58700+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58701+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58702+4 0 0 4 3 3
58703+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58704+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58705+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58707+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58708+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58709+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58710+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58711+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58712+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58713+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58714+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58715+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58716+3 2 2 4 4 4
58717+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58718+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58719+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58720+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58721+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58722+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58723+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58724+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58725+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58726+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58727+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58728+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58729+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58730+4 4 4 4 4 4
58731+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58732+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58733+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58734+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58735+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58736+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58737+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58738+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58739+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58740+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58741+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58742+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58743+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58744+4 4 4 4 4 4
58745+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58746+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58747+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58748+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58749+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58750+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58751+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58752+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58753+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58754+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58755+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58756+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58757+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58758+5 5 5 5 5 5
58759+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58760+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58761+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58762+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58763+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58764+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58765+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58766+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58767+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58768+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58769+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58770+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58771+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58772+5 5 5 4 4 4
58773+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58774+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58775+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58776+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58777+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58778+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58779+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58780+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58781+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58782+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58783+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58784+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58786+4 4 4 4 4 4
58787+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58788+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58789+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58790+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58791+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58792+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58793+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58794+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58795+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58796+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58797+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58798+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58800+4 4 4 4 4 4
58801+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58802+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58803+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58804+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58805+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58806+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58807+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58808+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58809+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58810+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58811+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58814+4 4 4 4 4 4
58815+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58816+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58817+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58818+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58819+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58820+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58821+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58822+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58823+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58824+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58825+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58828+4 4 4 4 4 4
58829+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58830+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58831+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58832+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58833+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58834+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58835+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58836+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58837+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58838+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58839+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58842+4 4 4 4 4 4
58843+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58844+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58845+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58846+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58847+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58848+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58849+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58850+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58851+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58852+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58853+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58856+4 4 4 4 4 4
58857+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58858+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58859+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58860+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58861+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58862+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58863+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58864+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58865+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58866+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58867+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58870+4 4 4 4 4 4
58871+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58872+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58873+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58874+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58875+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58876+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58877+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58878+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58879+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58880+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58881+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58884+4 4 4 4 4 4
58885+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58886+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58887+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58888+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58889+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58890+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58891+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58892+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58893+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58894+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58895+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58898+4 4 4 4 4 4
58899+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58900+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58901+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58902+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58903+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58904+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58905+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58906+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58907+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58908+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58909+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58912+4 4 4 4 4 4
58913+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58914+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58915+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58916+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58917+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58918+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58919+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58920+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58921+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58922+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58923+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58924+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58926+4 4 4 4 4 4
58927+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58928+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58929+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58930+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58931+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58932+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58933+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58934+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58935+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58936+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58937+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58938+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58940+4 4 4 4 4 4
58941+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58942+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58943+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58944+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58945+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58946+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58947+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58948+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58949+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58950+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58951+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58954+4 4 4 4 4 4
58955+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58956+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58957+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58958+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58959+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58960+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58961+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58962+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58963+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58964+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58965+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58966+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58968+4 4 4 4 4 4
58969+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58970+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58971+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58972+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58973+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58974+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58975+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58976+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58977+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58978+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58979+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58982+4 4 4 4 4 4
58983+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58984+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58985+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58986+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58987+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58988+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58989+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58990+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58991+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58992+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58993+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58996+4 4 4 4 4 4
58997+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58998+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58999+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59000+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59001+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59002+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59003+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59004+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59005+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59006+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59007+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59010+4 4 4 4 4 4
59011+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59012+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59013+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59014+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59015+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59016+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59017+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59018+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59019+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59020+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59021+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59024+4 4 4 4 4 4
59025+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59026+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59027+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59028+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59029+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59030+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59031+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59032+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59033+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59034+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59035+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59038+4 4 4 4 4 4
59039+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59040+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59041+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59042+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59043+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59044+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59045+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59046+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59047+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59048+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59049+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59052+4 4 4 4 4 4
59053+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59054+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59055+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59056+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59057+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59058+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59059+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59060+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59061+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59062+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59063+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59067+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59068+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59069+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59070+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59071+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59072+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59073+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59074+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59075+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59076+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59077+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59078+4 4 4 4 4 4 4 4 4 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
59081+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59082+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59083+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59084+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59085+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59086+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59087+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59088+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59089+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59090+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59091+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59092+4 4 4 4 4 4 4 4 4 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
59095+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59096+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59097+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59098+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59099+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59100+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59101+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59102+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59103+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59104+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59105+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59106+4 4 4 4 4 4 4 4 4 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
59109+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59110+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59111+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59112+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59113+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59114+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59115+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59116+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59117+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59118+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59119+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59120+4 4 4 4 4 4 4 4 4 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
59123+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59124+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59125+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59126+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59127+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59128+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59129+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59130+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59131+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59132+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59133+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59134+4 4 4 4 4 4 4 4 4 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
59137+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59138+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59139+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59140+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59141+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59142+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59143+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59144+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59145+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59146+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59147+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59148+4 4 4 4 4 4 4 4 4 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
59151+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59152+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59153+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59154+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59155+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59156+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59157+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59158+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59159+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59160+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59161+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59162+4 4 4 4 4 4 4 4 4 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
59165+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59166+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59167+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59168+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59169+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59170+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59171+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59172+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59173+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59174+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59175+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59176+4 4 4 4 4 4 4 4 4 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
59179+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59180+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59181+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59182+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59183+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59184+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59185+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59186+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59187+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59188+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59189+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59190+4 4 4 4 4 4 4 4 4 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
59193+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59194+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59195+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59196+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59197+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59198+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59199+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59200+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59201+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59202+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59203+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59204+4 4 4 4 4 4 4 4 4 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
59207+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59208+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59209+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59210+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59211+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59212+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59213+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59214+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59215+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59216+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59217+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59218+4 4 4 4 4 4 4 4 4 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
59221+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59222+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59223+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59224+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59225+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59226+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59227+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59228+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59229+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59230+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59231+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59232+4 4 4 4 4 4 4 4 4 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
59235+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59236+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59237+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59238+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59239+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59240+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59241+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59242+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59243+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59244+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59245+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59246+4 4 4 4 4 4 4 4 4 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
59249+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59250+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59251+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59252+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59253+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59254+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59255+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59256+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59257+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59258+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59259+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59260+4 4 4 4 4 4 4 4 4 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
59263+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59264+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59265+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59266+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59267+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59268+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59269+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59270+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59271+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59272+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59273+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59274+4 4 4 4 4 4 4 4 4 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
59277+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59278+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59279+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59280+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59281+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59282+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59283+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59284+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59285+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59286+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59287+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59288+4 4 4 4 4 4 4 4 4 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
59291+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59292+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59293+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59294+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59295+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59296+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59297+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59298+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59299+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59300+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59301+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59302+4 4 4 4 4 4 4 4 4 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
59305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59306+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59307+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59308+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59309+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59310+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59311+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59312+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59313+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59314+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59315+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59316+4 4 4 4 4 4 4 4 4 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
59319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59320+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59321+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59322+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59323+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59324+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59325+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59326+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59327+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59328+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59330+4 4 4 4 4 4 4 4 4 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
59333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
59335+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59336+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59337+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59338+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59339+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59340+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59341+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59342+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59344+4 4 4 4 4 4 4 4 4 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
59347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59348+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59349+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59350+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59351+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59352+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59353+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59354+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59355+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59356+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59357+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59358+4 4 4 4 4 4 4 4 4 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
59361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59363+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59364+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59365+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59366+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59367+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59368+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59369+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59370+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59374+4 4 4 4 4 4
59375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59377+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59378+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59379+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59380+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59381+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59382+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59383+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59388+4 4 4 4 4 4
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59391+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59392+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59393+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59394+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59395+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59396+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59397+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59402+4 4 4 4 4 4
59403+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59404+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59405+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59406+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59407+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59408+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59409+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59410+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59411+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59416+4 4 4 4 4 4
59417+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59418+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59419+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59420+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59421+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59422+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59423+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59424+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59430+4 4 4 4 4 4
59431+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59432+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59433+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59434+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59435+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59436+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59437+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59438+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59444+4 4 4 4 4 4
59445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59446+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59448+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59449+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59450+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59451+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59452+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59456+4 4 4 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
59459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59460+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59463+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59464+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59465+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59466+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59470+4 4 4 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
59473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59474+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59475+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59476+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59477+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59478+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59479+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59480+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59484+4 4 4 4 4 4 4 4 4 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
59487diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59488index 3838795..0d48d61 100644
59489--- a/drivers/xen/events/events_base.c
59490+++ b/drivers/xen/events/events_base.c
59491@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59492 restore_pirqs();
59493 }
59494
59495-static struct irq_chip xen_dynamic_chip __read_mostly = {
59496+static struct irq_chip xen_dynamic_chip = {
59497 .name = "xen-dyn",
59498
59499 .irq_disable = disable_dynirq,
59500@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59501 .irq_retrigger = retrigger_dynirq,
59502 };
59503
59504-static struct irq_chip xen_pirq_chip __read_mostly = {
59505+static struct irq_chip xen_pirq_chip = {
59506 .name = "xen-pirq",
59507
59508 .irq_startup = startup_pirq,
59509@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59510 .irq_retrigger = retrigger_dynirq,
59511 };
59512
59513-static struct irq_chip xen_percpu_chip __read_mostly = {
59514+static struct irq_chip xen_percpu_chip = {
59515 .name = "xen-percpu",
59516
59517 .irq_disable = disable_dynirq,
59518diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59519index fef20db..d28b1ab 100644
59520--- a/drivers/xen/xenfs/xenstored.c
59521+++ b/drivers/xen/xenfs/xenstored.c
59522@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59523 static int xsd_kva_open(struct inode *inode, struct file *file)
59524 {
59525 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59526+#ifdef CONFIG_GRKERNSEC_HIDESYM
59527+ NULL);
59528+#else
59529 xen_store_interface);
59530+#endif
59531+
59532 if (!file->private_data)
59533 return -ENOMEM;
59534 return 0;
59535diff --git a/firmware/Makefile b/firmware/Makefile
59536index e297e1b..6900c31 100644
59537--- a/firmware/Makefile
59538+++ b/firmware/Makefile
59539@@ -35,6 +35,7 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59540 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59541 bnx2x/bnx2x-e2-6.2.9.0.fw
59542 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59543+ bnx2/bnx2-mips-09-6.2.1b.fw \
59544 bnx2/bnx2-rv2p-09-6.0.17.fw \
59545 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59546 bnx2/bnx2-mips-06-6.2.1.fw \
59547diff --git a/firmware/WHENCE b/firmware/WHENCE
59548index 0c4d96d..7563083 100644
59549--- a/firmware/WHENCE
59550+++ b/firmware/WHENCE
59551@@ -655,19 +655,20 @@ Driver: BNX2 - Broadcom NetXtremeII
59552 File: bnx2/bnx2-mips-06-6.2.1.fw
59553 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59554 File: bnx2/bnx2-mips-09-6.2.1a.fw
59555+File: bnx2/bnx2-mips-09-6.2.1b.fw
59556 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59557 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59558
59559 Licence:
59560-
59561- This file contains firmware data derived from proprietary unpublished
59562- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59563-
59564- Permission is hereby granted for the distribution of this firmware data
59565- in hexadecimal or equivalent format, provided this copyright notice is
59566- accompanying it.
59567-
59568-Found in hex form in kernel source.
59569+
59570+ This file contains firmware data derived from proprietary unpublished
59571+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59572+
59573+ Permission is hereby granted for the distribution of this firmware data
59574+ in hexadecimal or equivalent format, provided this copyright notice is
59575+ accompanying it.
59576+
59577+Found in hex form in kernel source.
59578
59579 --------------------------------------------------------------------------
59580
59581diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59582new file mode 100644
59583index 0000000..43d7c4f
59584--- /dev/null
59585+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
59586@@ -0,0 +1,6496 @@
59587+:10000000080001180800000000005594000000C816
59588+:1000100000000000000000000000000008005594EF
59589+:10002000000000380000565C080000A00800000036
59590+:100030000000574400005694080059200000008436
59591+:100040000000ADD808005744000001C00000AE5CBD
59592+:100050000800321008000000000092580000B01C98
59593+:10006000000000000000000000000000080092589E
59594+:100070000000033C000142740800049008000400E2
59595+:10008000000012FC000145B000000000000000006C
59596+:1000900000000000080016FC00000004000158AC3D
59597+:1000A000080000A80800000000003D00000158B052
59598+:1000B00000000000000000000000000008003D00FB
59599+:1000C00000000030000195B00A000046000000006A
59600+:1000D000000000000000000D636F6D362E322E31DF
59601+:1000E00062000000060201020000000000000003A0
59602+:1000F000000000C800000032000000030000000003
59603+:1001000000000000000000000000000000000000EF
59604+:1001100000000010000001360000EA600000000549
59605+:1001200000000000000000000000000000000008C7
59606+:1001300000000000000000000000000000000000BF
59607+:1001400000000000000000000000000000000000AF
59608+:10015000000000000000000000000000000000009F
59609+:10016000000000020000000000000000000000008D
59610+:10017000000000000000000000000000000000007F
59611+:10018000000000000000000000000010000000005F
59612+:10019000000000000000000000000000000000005F
59613+:1001A000000000000000000000000000000000004F
59614+:1001B000000000000000000000000000000000003F
59615+:1001C000000000000000000000000000000000002F
59616+:1001D000000000000000000000000000000000001F
59617+:1001E0000000000010000003000000000000000DEF
59618+:1001F0000000000D3C020800244256083C030800A1
59619+:1002000024635754AC4000000043202B1480FFFDB2
59620+:10021000244200043C1D080037BD9FFC03A0F021D0
59621+:100220003C100800261001183C1C0800279C5608AA
59622+:100230000E000256000000000000000D27BDFFB4B4
59623+:10024000AFA10000AFA20004AFA30008AFA4000C50
59624+:10025000AFA50010AFA60014AFA70018AFA8001CF0
59625+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
59626+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
59627+:10028000AFB90040AFBC0044AFBF00480E001544FA
59628+:10029000000000008FBF00488FBC00448FB90040B1
59629+:1002A0008FB8003C8FAF00388FAE00348FAD003078
59630+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
59631+:1002C0008FA8001C8FA700188FA600148FA5001000
59632+:1002D0008FA4000C8FA300088FA200048FA1000040
59633+:1002E00027BD004C3C1B60108F7A5030377B502864
59634+:1002F00003400008AF7A00008F82002427BDFFE092
59635+:10030000AFB00010AFBF0018AFB100148C42000CAA
59636+:100310003C1080008E110100104000348FBF001887
59637+:100320000E000D84000000008F85002024047FFF54
59638+:100330000091202BACB100008E030104960201084D
59639+:1003400000031C003042FFFF00621825ACA300042C
59640+:100350009202010A96030114304200FF3063FFFF4E
59641+:100360000002140000431025ACA200089603010C03
59642+:100370009602010E00031C003042FFFF00621825A8
59643+:10038000ACA3000C960301109602011200031C009E
59644+:100390003042FFFF00621825ACA300108E02011846
59645+:1003A000ACA200148E02011CACA20018148000083C
59646+:1003B0008F820024978200003C0420050044182509
59647+:1003C00024420001ACA3001C0A0000C6A782000062
59648+:1003D0003C0340189442001E00431025ACA2001CB0
59649+:1003E0000E000DB8240400018FBF00188FB1001457
59650+:1003F0008FB000100000102103E0000827BD00208E
59651+:100400003C0780008CE202B834E50100044100089A
59652+:10041000240300013C0208008C42006024420001D9
59653+:100420003C010800AC22006003E0000800601021DD
59654+:100430003C0208008C42005C8CA4002094A30016AF
59655+:100440008CA6000494A5000E24420001ACE40280B6
59656+:100450002463FFFC3C010800AC22005C3C0210005D
59657+:10046000A4E30284A4E5028600001821ACE6028819
59658+:10047000ACE202B803E000080060102127BDFFE0F5
59659+:100480003C028000AFB0001034420100AFBF001C3E
59660+:10049000AFB20018AFB100148C43000094450008BF
59661+:1004A0002462FE002C42038110400003000381C23D
59662+:1004B0000A00010226100004240201001462000553
59663+:1004C0003C1180003C02800890420004305000FF44
59664+:1004D0003C11800036320100964300143202000FB6
59665+:1004E00000021500004310253C0308008C63004403
59666+:1004F00030A40004AE220080246300013C01080007
59667+:10050000AC2300441080000730A200028FBF001C03
59668+:100510008FB200188FB100148FB000100A0000CE07
59669+:1005200027BD00201040002D0000182130A20080BF
59670+:1005300010400005362200708E44001C0E000C672F
59671+:10054000240500A0362200708C4400008F82000C2D
59672+:10055000008210232C43012C10600004AF82001095
59673+:10056000240300010A000145AF84000C8E42000400
59674+:100570003C036020AF84000CAC6200143C02080015
59675+:100580008C42005850400015000018218C62000475
59676+:10059000240301FE304203FF144300100000182121
59677+:1005A0002E020004104000032E0200080A00014041
59678+:1005B0000000802114400003000000000A000140F8
59679+:1005C0002610FFF90000000D2402000202021004B0
59680+:1005D0003C036000AC626914000018218FBF001C4E
59681+:1005E0008FB200188FB100148FB00010006010217E
59682+:1005F00003E0000827BD00203C0480008C8301003C
59683+:1006000024020100506200033C0280080000000D3B
59684+:100610003C02800890430004000010213063000F6A
59685+:1006200000031D0003E00008AC8300800004188074
59686+:100630002782FF9C00621821000410C00044102390
59687+:100640008C640000000210C03C030800246356E4E0
59688+:10065000004310213C038000AC64009003E00008DC
59689+:10066000AF8200243C0208008C42011410400019A3
59690+:100670003084400030A2007F000231C03C02020002
59691+:100680001080001400A218253C026020AC43001426
59692+:100690003C0408008C8456B83C0308008C630110AD
59693+:1006A0003C02800024050900AC4500200086202182
59694+:1006B000246300013C028008AC4400643C01080053
59695+:1006C000AC2301103C010800AC2456B803E000083C
59696+:1006D000000000003C02602003E00008AC4500146C
59697+:1006E00003E000080000102103E0000800001021D2
59698+:1006F00030A2000810400008240201003C0208005B
59699+:100700008C42010C244200013C010800AC22010C87
59700+:1007100003E0000800000000148200080000000050
59701+:100720003C0208008C4200FC244200013C0108000D
59702+:10073000AC2200FC0A0001A330A200203C02080009
59703+:100740008C420084244200013C010800AC22008459
59704+:1007500030A200201040000830A200103C02080027
59705+:100760008C420108244200013C010800AC2201082F
59706+:1007700003E0000800000000104000080000000036
59707+:100780003C0208008C420104244200013C010800A4
59708+:10079000AC22010403E00008000000003C02080055
59709+:1007A0008C420100244200013C010800AC220100FF
59710+:1007B00003E000080000000027BDFFE0AFB1001417
59711+:1007C0003C118000AFB20018AFBF001CAFB00010EA
59712+:1007D0003632010096500008320200041040000733
59713+:1007E000320300028FBF001C8FB200188FB10014BB
59714+:1007F0008FB000100A0000CE27BD00201060000B53
59715+:10080000020028218E2401000E00018A0000000051
59716+:100810003202008010400003240500A10E000C6786
59717+:100820008E44001C0A0001E3240200018E2301040F
59718+:100830008F82000810430006020028218E24010048
59719+:100840000E00018A000000008E220104AF82000821
59720+:10085000000010218FBF001C8FB200188FB1001450
59721+:100860008FB0001003E0000827BD00202C82000498
59722+:1008700014400002000018212483FFFD240200021E
59723+:10088000006210043C03600003E00008AC626914DD
59724+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
59725+:1008A000AFB000103C048000948201083043700017
59726+:1008B000240220001062000A2862200154400052E5
59727+:1008C0008FBF001C24024000106200482402600018
59728+:1008D0001062004A8FBF001C0A0002518FB200183C
59729+:1008E00034820100904300098C5000189451000C90
59730+:1008F000240200091062001C0000902128620009F7
59731+:10090000144000218F8200242402000A5062001249
59732+:10091000323100FF2402000B1062000F00000000C3
59733+:100920002402000C146200188F8200243C0208008C
59734+:100930008C4256B824030900AC83002000501021DB
59735+:100940003C038008AC6200643C010800AC2256B84D
59736+:100950000A0002508FBF001C0E0001E900102602A1
59737+:100960000A0002308F8200240E0001E900102602E6
59738+:100970003C0380089462001A8C72000C3042FFFF26
59739+:10098000020280258F8200248C42000C5040001E01
59740+:100990008FBF001C0E000D84000000003C02800090
59741+:1009A00034420100944300088F82002400031C009D
59742+:1009B0009444001E8F82002000641825AC50000073
59743+:1009C00024040001AC510004AC520008AC40000CFF
59744+:1009D000AC400010AC400014AC4000180E000DB844
59745+:1009E000AC43001C0A0002508FBF001C0E000440E4
59746+:1009F000000000000A0002508FBF001C0E000C9F78
59747+:100A0000000000008FBF001C8FB200188FB10014CF
59748+:100A10008FB000100000102103E0000827BD002067
59749+:100A200027BDFFD8AFB400203C036010AFBF002447
59750+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
59751+:100A40008C6450002402FF7F3C1408002694563822
59752+:100A5000008220243484380CAC6450003C028000B6
59753+:100A6000240300370E0014B0AC4300083C07080014
59754+:100A700024E70618028010212404001D2484FFFFAF
59755+:100A8000AC4700000481FFFD244200043C02080042
59756+:100A9000244207C83C010800AC2256403C02080032
59757+:100AA000244202303C030800246306203C04080072
59758+:100AB000248403B43C05080024A506F03C06080085
59759+:100AC00024C62C9C3C010800AC2256803C02080045
59760+:100AD000244205303C010800AC2756843C01080044
59761+:100AE000AC2656943C010800AC23569C3C010800FF
59762+:100AF000AC2456A03C010800AC2556A43C010800DB
59763+:100B0000AC2256A83C010800AC23563C3C0108002E
59764+:100B1000AC2456443C010800AC2056603C0108005F
59765+:100B2000AC2556643C010800AC2056703C0108001E
59766+:100B3000AC27567C3C010800AC2656903C010800CE
59767+:100B4000AC2356980E00056E00000000AF80000C2C
59768+:100B50003C0280008C5300008F8300043C0208009C
59769+:100B60008C420020106200213262000700008821C0
59770+:100B70002792FF9C3C100800261056E43C02080017
59771+:100B80008C42002024050001022518040043202483
59772+:100B90008F820004004310245044000C26310001D1
59773+:100BA00010800008AF9000248E4300003C028000BB
59774+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
59775+:100BC00026310001AE00000C263100012E22000269
59776+:100BD000261000381440FFE9265200043C020800A9
59777+:100BE0008C420020AF820004326200071040FFD91F
59778+:100BF0003C028000326200011040002D326200028F
59779+:100C00003C0580008CA2010000002021ACA2002045
59780+:100C10008CA301042C42078110400008ACA300A85B
59781+:100C200094A2010824032000304270001443000302
59782+:100C30003C02800890420005304400FF0E0001593C
59783+:100C4000000000003C0280009042010B304300FF96
59784+:100C50002C62001E54400004000310800E00018628
59785+:100C60000A0002EC00000000005410218C42000039
59786+:100C70000040F80900000000104000043C02800021
59787+:100C80008C4301043C026020AC4300143C02080089
59788+:100C90008C4200343C0440003C03800024420001AC
59789+:100CA000AC6401383C010800AC220034326200021E
59790+:100CB00010400010326200043C1080008E0201409F
59791+:100CC000000020210E000159AE0200200E00038317
59792+:100CD000000000003C024000AE0201783C02080027
59793+:100CE0008C420038244200013C010800AC2200384C
59794+:100CF000326200041040FF973C0280003C108000EC
59795+:100D00008E020180000020210E000159AE02002059
59796+:100D10008E03018024020F00546200073C02800809
59797+:100D20008E0201883C0300E03042FFFF00431025A3
59798+:100D30000A000328AE020080344200809042000086
59799+:100D400024030050304200FF14430007000000005D
59800+:100D50000E000362000000001440000300000000C9
59801+:100D60000E000971000000003C0208008C42003CAB
59802+:100D70003C0440003C03800024420001AC6401B804
59803+:100D80003C010800AC22003C0A0002A33C028000A7
59804+:100D90003C02900034420001008220253C02800089
59805+:100DA000AC4400203C0380008C6200200440FFFE25
59806+:100DB0000000000003E00008000000003C0280008A
59807+:100DC000344300010083202503E00008AC440020E8
59808+:100DD00027BDFFE0AFB10014AFB000100080882144
59809+:100DE000AFBF00180E00033230B000FF8F83FF94B6
59810+:100DF000022020219062002502028025A07000259B
59811+:100E00008C7000183C0280000E00033D020280241A
59812+:100E10001600000B8FBF00183C0480008C8201F884
59813+:100E20000440FFFE348201C024030002AC510000E4
59814+:100E3000A04300043C021000AC8201F88FBF0018F0
59815+:100E40008FB100148FB0001003E0000827BD002010
59816+:100E500027BDFFE83C028000AFBF00103442018094
59817+:100E6000944300048C4400083063020010600005C5
59818+:100E7000000028210E00100C000000000A0003787A
59819+:100E8000240500013C02FF000480000700821824B2
59820+:100E90003C02040014620004240500018F82FF94C8
59821+:100EA00090420008240500018FBF001000A010210F
59822+:100EB00003E0000827BD00188F82FF982405000179
59823+:100EC000A040001A3C028000344201400A00034264
59824+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
59825+:100EE000AFB20018AFB10014AFB0001090A2000074
59826+:100EF000304400FF38830020388200300003182B74
59827+:100F00000002102B0062182410600003240200501D
59828+:100F1000148200A88FBF001C90A20005304200017F
59829+:100F2000104000A48FBF001C3C02800034420140EE
59830+:100F3000904200082443FFFF2C6200051040009EF1
59831+:100F40008FB20018000310803C030800246355ACE6
59832+:100F5000004310218C420000004000080000000007
59833+:100F60003C028000345101400E0003328E24000008
59834+:100F70008F92FF948E2200048E50000C1602000205
59835+:100F800024020001AE42000C0E00033D8E2400003E
59836+:100F90008E220004145000068FBF001C8FB2001870
59837+:100FA0008FB100148FB000100A000F7827BD002009
59838+:100FB0008E42000C0A000419000000003C0480006E
59839+:100FC0003482014094A300108C4200043063FFFF80
59840+:100FD0001443001C0000000024020001A4A2001021
59841+:100FE0008C8202380441000F3C0380003C02003F29
59842+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
59843+:1010000000461824004810240002130200031D8229
59844+:10101000106200583C0280008C8202380440FFF7C6
59845+:101020003C038000346201408C44000034620200C2
59846+:10103000AC4400003C021000AC6202380A00043BE1
59847+:101040008FBF001C94A200100A00041900000000C9
59848+:10105000240200201482000F3C0280003C03800028
59849+:1010600094A20012346301408C6300043042FFFFFD
59850+:10107000146200050000000024020001A4A2001276
59851+:101080000A0004028FBF001C94A200120A00041977
59852+:1010900000000000345101400E0003328E24000095
59853+:1010A0008F92FF948E230004964200123050FFFF6F
59854+:1010B0001603000224020001A64200120E00033DA6
59855+:1010C0008E2400008E220004160200068FBF001C32
59856+:1010D0008FB200188FB100148FB000100A00037C8B
59857+:1010E00027BD0020964200120A00041900000000EB
59858+:1010F0003C03800094A20014346301408C6300041C
59859+:101100003042FFFF14620008240200018FBF001C60
59860+:101110008FB200188FB100148FB00010A4A2001479
59861+:101120000A00146327BD002094A20014144000217B
59862+:101130008FBF001C0A000435000000003C03800043
59863+:1011400094A20016346301408C6300043042FFFF18
59864+:101150001462000D240200018FBF001C8FB2001822
59865+:101160008FB100148FB00010A4A200160A000B1457
59866+:1011700027BD00209442007824420004A4A200105D
59867+:101180000A00043B8FBF001C94A200162403000138
59868+:101190003042FFFF144300078FBF001C3C020800D1
59869+:1011A0008C420070244200013C010800AC22007017
59870+:1011B0008FBF001C8FB200188FB100148FB00010C9
59871+:1011C00003E0000827BD002027BDFFD8AFB20018FC
59872+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
59873+:1011E000AFB000103C028000345101008C5001006F
59874+:1011F0009242000092230009304400FF2402001FA5
59875+:10120000106200AB28620020104000192402003850
59876+:101210002862000A1040000D2402000B286200081A
59877+:101220001040002E8F820024046001042862000216
59878+:101230001440002A8F820024240200061062002637
59879+:101240008FBF00200A00055F8FB3001C1062006092
59880+:101250002862000B144000FA8FBF00202402000E09
59881+:10126000106200788F8200240A00055F8FB3001C93
59882+:10127000106200D2286200391040000A2402008067
59883+:1012800024020036106200E528620037104000C3D7
59884+:1012900024020035106200D98FBF00200A00055FCC
59885+:1012A0008FB3001C1062002D2862008110400006E0
59886+:1012B000240200C824020039106200C98FBF002038
59887+:1012C0000A00055F8FB3001C106200A28FBF0020D0
59888+:1012D0000A00055F8FB3001C8F8200248C42000C33
59889+:1012E000104000D78FBF00200E000D8400000000CA
59890+:1012F0003C038000346301008C6200008F85002075
59891+:10130000946700089466000CACA200008C64000492
59892+:101310008F82002400063400ACA400049448001E10
59893+:101320008C62001800073C0000E83825ACA20008D9
59894+:101330008C62001C24040001ACA2000C9062000A24
59895+:1013400000C23025ACA60010ACA00014ACA0001860
59896+:10135000ACA7001C0A00051D8FBF00208F8200244F
59897+:101360008C42000C104000B68FBF00200E000D8490
59898+:10137000000000008F820024962400089625000CAF
59899+:101380009443001E000422029626000E8F82002045
59900+:10139000000426000083202500052C003C0300806B
59901+:1013A00000A6282500832025AC400000AC400004A6
59902+:1013B000AC400008AC40000CAC450010AC40001440
59903+:1013C000AC400018AC44001C0A00051C24040001B9
59904+:1013D0009622000C14400018000000009242000504
59905+:1013E0003042001014400014000000000E000332D0
59906+:1013F0000200202192420005020020213442001008
59907+:101400000E00033DA242000592420000240300208A
59908+:10141000304200FF10430089020020218FBF0020CE
59909+:101420008FB3001C8FB200188FB100148FB0001062
59910+:101430000A00107527BD00280000000D0A00055E97
59911+:101440008FBF00208C42000C1040007D8FBF002019
59912+:101450000E000D84000000008E2200048F84002006
59913+:101460009623000CAC8200003C0280089445002CBE
59914+:101470008F82002400031C0030A5FFFF9446001E4D
59915+:101480003C02400E0065182500C23025AC830004E4
59916+:10149000AC800008AC80000CAC800010AC80001464
59917+:1014A000AC800018AC86001C0A00051C2404000156
59918+:1014B0000E000332020020218F93FF9802002021AA
59919+:1014C0000E00033DA660000C020020210E00034226
59920+:1014D000240500018F8200248C42000C104000582B
59921+:1014E0008FBF00200E000D84000000009622000C2B
59922+:1014F0008F83002000021400AC700000AC62000476
59923+:10150000AC6000088E4400388F820024AC64000C6C
59924+:101510008E46003C9445001E3C02401FAC66001005
59925+:1015200000A228258E62000424040001AC6200148D
59926+:10153000AC600018AC65001C8FBF00208FB3001C8E
59927+:101540008FB200188FB100148FB000100A000DB8D0
59928+:1015500027BD0028240200201082003A8FB3001C0F
59929+:101560000E000F5E00000000104000358FBF00200D
59930+:101570003C0480008C8201F80440FFFE348201C0EC
59931+:1015800024030002AC500000A04300043C02100001
59932+:10159000AC8201F80A00055E8FBF00200200202106
59933+:1015A0008FBF00208FB3001C8FB200188FB10014C2
59934+:1015B0008FB000100A000EA727BD00289625000C4A
59935+:1015C000020020218FBF00208FB3001C8FB20018B3
59936+:1015D0008FB100148FB000100A000ECC27BD002878
59937+:1015E000020020218FB3001C8FB200188FB10014AD
59938+:1015F0008FB000100A000EF727BD00289225000DBD
59939+:10160000020020218FB3001C8FB200188FB100148C
59940+:101610008FB000100A000F4827BD002802002021CB
59941+:101620008FBF00208FB3001C8FB200188FB1001441
59942+:101630008FB000100A000F1F27BD00288FBF0020A9
59943+:101640008FB3001C8FB200188FB100148FB0001040
59944+:1016500003E0000827BD00283C0580008CA202782A
59945+:101660000440FFFE34A2024024030002AC44000008
59946+:10167000A04300043C02100003E00008ACA2027882
59947+:10168000A380001803E00008A38000193C03800039
59948+:101690008C6202780440FFFE8F82001CAC62024024
59949+:1016A00024020002A06202443C02100003E0000891
59950+:1016B000AC6202783C02600003E000088C425404F3
59951+:1016C0009083003024020005008040213063003FF9
59952+:1016D0000000482114620005000050219082004C57
59953+:1016E0009483004E304900FF306AFFFFAD00000CCC
59954+:1016F000AD000010AD000024950200148D05001C03
59955+:101700008D0400183042FFFF004910230002110031
59956+:10171000000237C3004038210086202300A2102B8E
59957+:101720000082202300A72823AD05001CAD0400186B
59958+:10173000A5090014A5090020A50A001603E0000869
59959+:10174000A50A002203E000080000000027BDFFD822
59960+:10175000AFB200183C128008AFB40020AFB3001C39
59961+:10176000AFB10014AFBF0024AFB00010365101007C
59962+:101770003C0260008C4254049222000C3C1408008D
59963+:10178000929400F7304300FF2402000110620032FF
59964+:101790000080982124020002146200353650008037
59965+:1017A0000E00143D000000009202004C2403FF8054
59966+:1017B0003C0480003042007F000211C024420240FD
59967+:1017C0000262102100431824AC8300949245000863
59968+:1017D0009204004C3042007F3C03800614850007D1
59969+:1017E000004380212402FFFFA22200112402FFFFF8
59970+:1017F000A62200120A0005D22402FFFF9602002052
59971+:10180000A222001196020022A62200128E020024BB
59972+:101810003C048008AE2200143485008090A2004C65
59973+:1018200034830100A06200108CA2003CAC6200185E
59974+:101830008C820068AC6200F48C820064AC6200F0C0
59975+:101840008C82006CAC6200F824020001A0A2006847
59976+:101850000A0005EE3C0480080E001456000000004B
59977+:1018600036420080A04000680A0005EE3C04800873
59978+:10187000A2000068A20000690A0006293C02800854
59979+:10188000348300808C62003834850100AC62006CC7
59980+:1018900024020001A062006990A200D59083000894
59981+:1018A000305100FF3072007F12320019001111C058
59982+:1018B00024420240026210212403FF8000431824C6
59983+:1018C0003C048000AC8300943042007F3C038006DF
59984+:1018D000004380218E02000C1040000D02002021E8
59985+:1018E0000E00057E0000000026220001305100FF9E
59986+:1018F0009203003C023410260002102B0002102339
59987+:101900003063007F022288240A0005F8A203003C0D
59988+:101910003C088008350401008C8200E03507008017
59989+:10192000ACE2003C8C8200E0AD02000090E5004C8F
59990+:10193000908600D590E3004C908400D52402FF806F
59991+:1019400000A228243063007F308400FF00A62825F1
59992+:101950000064182A1060000230A500FF38A500803E
59993+:10196000A0E5004CA10500093C0280089043000E50
59994+:10197000344400803C058000A043000A8C8300189A
59995+:101980003C027FFF3442FFFF00621824AC83001842
59996+:101990008CA201F80440FFFE00000000ACB301C0BF
59997+:1019A0008FBF00248FB400208FB3001C8FB20018AB
59998+:1019B0008FB100148FB0001024020002A0A201C455
59999+:1019C00027BD00283C02100003E00008ACA201F88B
60000+:1019D00090A2000024420001A0A200003C030800E5
60001+:1019E0008C6300F4304200FF144300020080302179
60002+:1019F000A0A0000090A200008F84001C000211C073
60003+:101A00002442024024830040008220212402FF80DF
60004+:101A1000008220243063007F3C02800A006218218B
60005+:101A20003C028000AC44002403E00008ACC300008A
60006+:101A300094820006908300058C85000C8C86001033
60007+:101A40008C8700188C88001C8C8400203C010800C6
60008+:101A5000A42256C63C010800A02356C53C0108003C
60009+:101A6000AC2556CC3C010800AC2656D03C01080001
60010+:101A7000AC2756D83C010800AC2856DC3C010800D5
60011+:101A8000AC2456E003E00008000000003C0280089F
60012+:101A9000344201008C4400343C038000346504006F
60013+:101AA000AC6400388C420038AF850028AC62003C42
60014+:101AB0003C020005AC6200300000000000000000A5
60015+:101AC00003E00008000000003C020006308400FF34
60016+:101AD000008220253C028000AC4400300000000061
60017+:101AE00000000000000000003C0380008C62000049
60018+:101AF000304200101040FFFD3462040003E0000893
60019+:101B0000AF82002894C200003C080800950800CA73
60020+:101B100030E7FFFF0080482101021021A4C200002D
60021+:101B200094C200003042FFFF00E2102B544000013D
60022+:101B3000A4C7000094A200003C0308008C6300CC02
60023+:101B400024420001A4A2000094A200003042FFFF42
60024+:101B5000144300073C0280080107102BA4A00000DA
60025+:101B60005440000101003821A4C700003C02800855
60026+:101B7000344601008CC3002894A200003C0480007D
60027+:101B80003042FFFE000210C000621021AC82003C17
60028+:101B90008C82003C006218231860000400000000E2
60029+:101BA0008CC200240A0006BA244200018CC2002420
60030+:101BB000AC8200383C020050344200103C038000EC
60031+:101BC000AC620030000000000000000000000000D7
60032+:101BD0008C620000304200201040FFFD0000000039
60033+:101BE00094A200003C04800030420001000210C0BA
60034+:101BF000004410218C430400AD2300008C420404F7
60035+:101C0000AD2200043C02002003E00008AC8200305A
60036+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
60037+:101C2000AFBF001C94C2000000C080213C1208001D
60038+:101C3000965200C624420001A6020000960300004E
60039+:101C400094E2000000E03021144300058FB1003021
60040+:101C50000E00068F024038210A0006F10000000045
60041+:101C60008C8300048C82000424420040046100073D
60042+:101C7000AC8200048C8200040440000400000000D8
60043+:101C80008C82000024420001AC8200009602000019
60044+:101C90003042FFFF50520001A600000096220000D3
60045+:101CA00024420001A62200003C02800834420100C8
60046+:101CB000962300009442003C144300048FBF001C94
60047+:101CC00024020001A62200008FBF001C8FB2001862
60048+:101CD0008FB100148FB0001003E0000827BD002072
60049+:101CE00027BDFFE03C028008AFBF0018344201006E
60050+:101CF0008C4800343C03800034690400AC68003830
60051+:101D00008C42003830E700FFAF890028AC62003C0D
60052+:101D10003C020005AC620030000000000000000042
60053+:101D200000000000000000000000000000000000B3
60054+:101D30008C82000C8C82000C97830016AD22000070
60055+:101D40008C82001000604021AD2200048C820018BB
60056+:101D5000AD2200088C82001CAD22000C8CA2001465
60057+:101D6000AD2200108C820020AD220014908200056C
60058+:101D7000304200FF00021200AD2200188CA20018B1
60059+:101D8000AD22001C8CA2000CAD2200208CA2001001
60060+:101D9000AD2200248CA2001CAD2200288CA20020C1
60061+:101DA000AD22002C3402FFFFAD260030AD20003400
60062+:101DB000506200013408FFFFAD28003850E00011E8
60063+:101DC0003C0280083C048008348401009482005066
60064+:101DD0003042FFFFAD22003C9483004494850044D0
60065+:101DE000240200013063FFFF000318C200641821C1
60066+:101DF0009064006430A5000700A210040A00075C8C
60067+:101E00000044102534420100AD20003C94430044BE
60068+:101E1000944400443063FFFF000318C2006218219D
60069+:101E200030840007906500642402000100821004E1
60070+:101E30000002102700451024A0620064000000008A
60071+:101E400000000000000000003C0200063442004098
60072+:101E50003C038000AC620030000000000000000085
60073+:101E6000000000008C620000304200101040FFFDB6
60074+:101E70003C06800834C201503463040034C7014A70
60075+:101E800034C4013434C5014034C60144AFA200104B
60076+:101E90000E0006D2AF8300288FBF001803E00008B1
60077+:101EA00027BD00208F8300143C0608008CC600E884
60078+:101EB0008F82001C30633FFF000319800046102111
60079+:101EC000004310212403FF80004318243C068000B7
60080+:101ED000ACC300283042007F3C03800C004330211B
60081+:101EE00090C2000D30A500FF0000382134420010E0
60082+:101EF000A0C2000D8F8900143C028008344201000A
60083+:101F00009443004400091382304800032402000176
60084+:101F1000A4C3000E1102000B2902000210400005AC
60085+:101F2000240200021100000C240300010A0007A48F
60086+:101F30000000182111020006000000000A0007A49A
60087+:101F4000000018218CC2002C0A0007A424430001C1
60088+:101F50008CC20014244300018CC200180043102BD3
60089+:101F60005040000A240700012402002714A20003A5
60090+:101F70003C0380080A0007B1240700013463010014
60091+:101F80009462004C24420001A462004C00091382B8
60092+:101F9000304300032C620002104000090080282119
60093+:101FA000146000040000000094C200340A0007C15D
60094+:101FB0003046FFFF8CC600380A0007C10080282188
60095+:101FC000000030213C040800248456C00A000706A3
60096+:101FD0000000000027BDFF90AFB60068AFB50064F9
60097+:101FE000AFB40060AFB3005CAFB20058AFB1005403
60098+:101FF000AFBF006CAFB000508C9000000080B021EB
60099+:102000003C0208008C4200E8960400328F83001CDA
60100+:102010002414FF8030843FFF0062182100042180D7
60101+:1020200000641821007410243C13800000A090214B
60102+:1020300090A50000AE620028920400323C02800CA1
60103+:102040003063007F00628821308400C02402004099
60104+:10205000148200320000A8218E3500388E2200182C
60105+:102060001440000224020001AE2200189202003C3B
60106+:10207000304200201440000E8F83001C000511C068
60107+:102080002442024000621821306400783C02008043
60108+:102090000082202500741824AE630800AE64081086
60109+:1020A0008E2200188E03000800431021AE22001873
60110+:1020B0008E22002C8E230018244200010062182B6F
60111+:1020C0001060004300000000924200002442000122
60112+:1020D000A24200003C0308008C6300F4304200FF81
60113+:1020E00050430001A2400000924200008F84001C77
60114+:1020F000000211C024420240248300403063007F6C
60115+:10210000008220213C02800A0094202400621821D1
60116+:10211000AE6400240A0008D2AEC30000920300326D
60117+:102120002402FFC000431024304200FF1440000589
60118+:1021300024020001AE220018962200340A00084250
60119+:102140003055FFFF8E22001424420001AE220018F9
60120+:102150009202003000021600000216030441001C27
60121+:10216000000000009602003227A400100080282101
60122+:10217000A7A20016960200320000302124070001B9
60123+:102180003042FFFFAF8200140E000706AFA0001C14
60124+:10219000960200328F83001C3C0408008C8400E807
60125+:1021A00030423FFF000211800064182100621821B4
60126+:1021B00000741024AE62002C3063007F3C02800E5D
60127+:1021C000006218219062000D3042007FA062000D75
60128+:1021D0009222000D304200105040007892420000E0
60129+:1021E0003C028008344401009482004C8EC30000FD
60130+:1021F0003C130800967300C62442FFFFA482004CE3
60131+:10220000946200329623000E3054FFFF3070FFFFBF
60132+:102210003C0308008C6300D000701807A7A30038A7
60133+:102220009482003E3063FFFF3042FFFF14620007DC
60134+:10223000000000008C8200303C038000244200300B
60135+:10224000AC62003C0A00086A8C82002C9482004038
60136+:102250003042FFFF5462000927A400408C820038FE
60137+:102260003C03800024420030AC62003C8C8200348D
60138+:10227000AC6200380A0008793C03800027A50038CA
60139+:1022800027A60048026038210E00068FA7A000484C
60140+:102290008FA300403C02800024630030AC43003830
60141+:1022A0008FA30044AC43003C3C0380003C0200058B
60142+:1022B000AC6200303C028008344401009482004249
60143+:1022C000346304003042FFFF0202102B1440000769
60144+:1022D000AF8300289482004E9483004202021021B2
60145+:1022E000004310230A00088F3043FFFF9483004E01
60146+:1022F00094820042026318210050102300621823C8
60147+:102300003063FFFF3C028008344401009482003CAB
60148+:102310003042FFFF14430003000000000A00089F42
60149+:10232000240300019482003C3042FFFF0062102B26
60150+:10233000144000058F8200289482003C0062102324
60151+:102340003043FFFF8F820028AC550000AC400004F2
60152+:10235000AC540008AC43000C3C02000634420010B0
60153+:102360003C038000AC620030000000000000000070
60154+:10237000000000008C620000304200101040FFFDA1
60155+:102380003C04800834840100001018C20064182145
60156+:102390009065006432020007240600010046100424
60157+:1023A00000451025A0620064948300429622000E2E
60158+:1023B00050430001A386001892420000244200010D
60159+:1023C000A24200003C0308008C6300F4304200FF8E
60160+:1023D00050430001A2400000924200008F84001C84
60161+:1023E000000211C0244202402483004000822021C8
60162+:1023F0002402FF80008220243063007F3C02800A98
60163+:10240000006218213C028000AC440024AEC30000EE
60164+:102410008FBF006C8FB600688FB500648FB400600A
60165+:102420008FB3005C8FB200588FB100548FB0005052
60166+:1024300003E0000827BD007027BDFFD8AFB3001C24
60167+:10244000AFB20018AFB10014AFB00010AFBF0020A2
60168+:102450000080982100E0802130B1FFFF0E000D8444
60169+:1024600030D200FF0000000000000000000000006B
60170+:102470008F8200208F830024AC510000AC520004F6
60171+:10248000AC530008AC40000CAC400010AC40001451
60172+:10249000AC4000189463001E02038025AC50001C61
60173+:1024A0000000000000000000000000002404000103
60174+:1024B0008FBF00208FB3001C8FB200188FB10014A3
60175+:1024C0008FB000100A000DB827BD002830A5FFFF0F
60176+:1024D0000A0008DC30C600FF3C02800834430100DB
60177+:1024E0009462000E3C080800950800C63046FFFFC5
60178+:1024F00014C000043402FFFF946500EA0A000929B1
60179+:102500008F84001C10C20027000000009462004E5F
60180+:102510009464003C3045FFFF00A6102300A6182B52
60181+:102520003087FFFF106000043044FFFF00C5102318
60182+:1025300000E210233044FFFF0088102B1040000EF3
60183+:1025400000E810233C028008344401002403000109
60184+:1025500034420080A44300162402FFFFA482000E30
60185+:10256000948500EA8F84001C0000302130A5FFFF15
60186+:102570000A0009013C0760200044102A10400009AD
60187+:102580003C0280083443008094620016304200010F
60188+:10259000104000043C0280009442007E244200145B
60189+:1025A000A462001603E000080000000027BDFFE061
60190+:1025B0003C028008AFBF001CAFB0001834420100DD
60191+:1025C000944300429442004C104000193068FFFFD1
60192+:1025D0009383001824020001146200298FBF001C9D
60193+:1025E0003C06800834D00100000810C200501021C1
60194+:1025F000904200643103000734C70148304200FFB5
60195+:10260000006210073042000134C9014E34C4012C6D
60196+:1026100034C5013E1040001634C601420E0006D2F9
60197+:10262000AFA90010960200420A0009463048FFFF99
60198+:102630003C028008344401009483004494820042A8
60199+:102640001043000F8FBF001C94820044A4820042FC
60200+:1026500094820050A482004E8C820038AC820030FC
60201+:1026600094820040A482003E9482004AA4820048E2
60202+:102670008FBF001C8FB000180A00090427BD00207E
60203+:102680008FB0001803E0000827BD002027BDFFA081
60204+:10269000AFB1004C3C118000AFBF0058AFB3005445
60205+:1026A000AFB20050AFB000483626018890C2000398
60206+:1026B0003044007FA3A400108E32018090C200003D
60207+:1026C0003043007F240200031062003BAF92001CE5
60208+:1026D00028620004104000062402000424020002C4
60209+:1026E000106200098FBF00580A000B0F8FB300540F
60210+:1026F0001062004D240200051062014E8FBF005889
60211+:102700000A000B0F8FB30054000411C002421021C5
60212+:102710002404FF8024420240004410242643004049
60213+:10272000AE2200243063007F3C02800A0062182140
60214+:102730009062003CAFA3003C00441025A062003C26
60215+:102740008FA3003C9062003C304200401040016C7E
60216+:102750008FBF00583C108008A3800018361001007D
60217+:102760008E0200E08C63003427A4003C27A50010F3
60218+:10277000004310210E0007C3AE0200E093A2001038
60219+:102780003C038000A20200D58C6202780440FFFE68
60220+:102790008F82001CAC62024024020002A06202444C
60221+:1027A0003C021000AC6202780E0009390000000003
60222+:1027B0000A000B0E8FBF00583C05800890C3000133
60223+:1027C00090A2000B1443014E8FBF005834A4008028
60224+:1027D0008C8200189082004C90A200083C0260009D
60225+:1027E0008C4254048C8300183C027FFF3442FFFF6C
60226+:1027F000006218243C0208008C4200B4AC8300182C
60227+:102800003C038000244200013C010800AC2200B4DB
60228+:102810008C6201F80440FFFE8F82001CAC6201C094
60229+:102820000A000AD6240200023C10800890C300016E
60230+:102830009202000B144301328FBF005827A40018E6
60231+:1028400036050110240600033C0260008C4254044B
60232+:102850000E000E470000000027A40028360501F0F6
60233+:102860000E000E47240600038FA200283603010045
60234+:10287000AE0200648FA2002CAE0200688FA200306E
60235+:10288000AE02006C93A40018906300D52402FF8070
60236+:102890000082102400431025304900FF3084007F5F
60237+:1028A0003122007F0082102A544000013929008023
60238+:1028B000000411C0244202402403FF800242102180
60239+:1028C00000431024AE220094264200403042007F94
60240+:1028D0003C038006004340218FA3001C2402FFFF1D
60241+:1028E000AFA800403C130800927300F71062003359
60242+:1028F00093A2001995030014304400FF3063FFFFDA
60243+:102900000064182B106000100000000095040014F3
60244+:102910008D07001C8D0600183084FFFF0044202323
60245+:102920000004210000E438210000102100E4202BE5
60246+:1029300000C2302100C43021AD07001CAD060018D4
60247+:102940000A000A2F93A20019950400148D07001C99
60248+:102950008D0600183084FFFF008220230004210030
60249+:10296000000010210080182100C2302300E4202B39
60250+:1029700000C4302300E33823AD07001CAD06001867
60251+:1029800093A200198FA30040A462001497A2001A1A
60252+:10299000A46200168FA2001CAC6200108FA2001C63
60253+:1029A000AC62000C93A20019A462002097A2001A46
60254+:1029B000A46200228FA2001CAC6200243C048008A8
60255+:1029C000348300808C6200388FA20020012088218F
60256+:1029D000AC62003C8FA20020AC82000093A20018E1
60257+:1029E000A062004C93A20018A0820009A0600068B9
60258+:1029F00093A20018105100512407FF803229007F54
60259+:102A0000000911C024420240024210213046007FDA
60260+:102A10003C03800000471024AC6200943C02800616
60261+:102A200000C2302190C2003CAFA60040000020212F
60262+:102A300000471025A0C2003C8FA80040950200026C
60263+:102A4000950300148D07001C3042FFFF3063FFFF29
60264+:102A50008D060018004310230002110000E2382107
60265+:102A600000E2102B00C4302100C23021AD07001C51
60266+:102A7000AD06001895020002A5020014A50000167C
60267+:102A80008D020008AD0200108D020008AD02000C9E
60268+:102A900095020002A5020020A50000228D02000878
60269+:102AA000AD0200249102003C304200401040001A68
60270+:102AB000262200013C108008A3A90038A38000183A
60271+:102AC000361001008E0200E08D03003427A4004080
60272+:102AD00027A50038004310210E0007C3AE0200E016
60273+:102AE00093A200383C038000A20200D58C620278D9
60274+:102AF0000440FFFE8F82001CAC62024024020002F0
60275+:102B0000A06202443C021000AC6202780E00093957
60276+:102B100000000000262200013043007F14730004EF
60277+:102B2000004020212403FF8002231024004320269C
60278+:102B300093A200180A000A4B309100FF93A40018DA
60279+:102B40008FA3001C2402FFFF1062000A308900FFDF
60280+:102B500024820001248300013042007F14530005C9
60281+:102B6000306900FF2403FF800083102400431026F7
60282+:102B7000304900FF3C028008904200080120882173
60283+:102B8000305000FF123000193222007F000211C0C5
60284+:102B900002421021244202402403FF8000431824F3
60285+:102BA0003C048000AC8300943042007F3C038006EC
60286+:102BB000004310218C43000C004020211060000BCA
60287+:102BC000AFA200400E00057E000000002623000199
60288+:102BD0002405FF803062007F145300020225202468
60289+:102BE000008518260A000AAF307100FF3C048008F7
60290+:102BF000348400808C8300183C027FFF3442FFFF46
60291+:102C000000621824AC8300183C0380008C6201F839
60292+:102C10000440FFFE00000000AC7201C0240200026C
60293+:102C2000A06201C43C021000AC6201F80A000B0E65
60294+:102C30008FBF00583C04800890C300019082000BB5
60295+:102C40001443002F8FBF0058349000809202000878
60296+:102C500030420040104000200000000092020008B6
60297+:102C60000002160000021603044100050240202164
60298+:102C70000E000ECC240500930A000B0E8FBF0058E7
60299+:102C80009202000924030018304200FF1443000D93
60300+:102C900002402021240500390E000E64000030217E
60301+:102CA0000E0003328F84001C8F82FF9424030012D5
60302+:102CB000A04300090E00033D8F84001C0A000B0E88
60303+:102CC0008FBF0058240500360E000E64000030212E
60304+:102CD0000A000B0E8FBF00580E0003320240202165
60305+:102CE000920200058F84001C344200200E00033D38
60306+:102CF000A20200050E0010758F84001C8FBF0058C3
60307+:102D00008FB300548FB200508FB1004C8FB0004889
60308+:102D100003E0000827BD00603C0280083445010044
60309+:102D20003C0280008C42014094A3000E0000302140
60310+:102D300000402021AF82001C3063FFFF3402FFFF00
60311+:102D4000106200063C0760202402FFFFA4A2000ED0
60312+:102D500094A500EA0A00090130A5FFFF03E000087E
60313+:102D60000000000027BDFFC83C0280003C06800830
60314+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
60315+:102D8000AFB30024AFB20020AFB00018345101003F
60316+:102D900034C501008C4301008E2200148CA400E491
60317+:102DA0000000A821AF83001C0044102318400052EB
60318+:102DB000A38000188E22001400005021ACA200E471
60319+:102DC00090C3000890A200D53073007FA3A200102A
60320+:102DD0008CB200E08CB400E4304200FF1053003BA2
60321+:102DE00093A200108F83001C2407FF80000211C0F3
60322+:102DF0000062102124420240246300400047102456
60323+:102E00003063007F3C0980003C08800A006818217C
60324+:102E1000AD2200248C62003427A4001427A50010E2
60325+:102E2000024280210290102304400028AFA3001426
60326+:102E30009062003C00E21024304200FF1440001970
60327+:102E4000020090219062003C34420040A062003CAD
60328+:102E50008F86001C93A3001024C200403042007FE4
60329+:102E6000004828213C0208008C4200F42463000141
60330+:102E7000306400FF14820002A3A30010A3A000107E
60331+:102E800093A20010AFA50014000211C0244202401A
60332+:102E900000C2102100471024AD2200240A000B4577
60333+:102EA00093A200100E0007C3000000003C0280083F
60334+:102EB00034420100AC5000E093A30010240A00014A
60335+:102EC000A04300D50A000B4593A200102402000184
60336+:102ED000154200093C0380008C6202780440FFFE2A
60337+:102EE0008F82001CAC62024024020002A0620244F5
60338+:102EF0003C021000AC6202789222000B2403000214
60339+:102F0000304200FF144300720000000096220008C7
60340+:102F1000304300FF24020082146200402402008437
60341+:102F20003C028000344901008D22000C95230006EC
60342+:102F3000000216023063FFFF3045003F24020027E5
60343+:102F400010A2000FAF83001428A200281040000830
60344+:102F5000240200312402002110A2000924020025CD
60345+:102F600010A20007938200190A000BBD00000000A8
60346+:102F700010A20007938200190A000BBD0000000098
60347+:102F80000E000777012020210A000C3D0000000000
60348+:102F90003C0380008C6202780440FFFE8F82001C9C
60349+:102FA000AC62024024020002A06202443C02100013
60350+:102FB000AC6202780A000C3D000000009523000678
60351+:102FC000912400058D25000C8D2600108D270018FA
60352+:102FD0008D28001C8D290020244200013C0108009E
60353+:102FE000A42356C63C010800A02456C53C01080095
60354+:102FF000AC2556CC3C010800AC2656D03C0108005C
60355+:10300000AC2756D83C010800AC2856DC3C0108002F
60356+:10301000AC2956E00A000C3DA38200191462000A94
60357+:10302000240200813C02800834420100944500EAF9
60358+:10303000922600058F84001C30A5FFFF30C600FFDC
60359+:103040000A000BFE3C0760211462005C00000000D7
60360+:103050009222000A304300FF306200201040000737
60361+:10306000306200403C02800834420100944500EA8E
60362+:103070008F84001C0A000BFC24060040104000074F
60363+:10308000000316003C02800834420100944500EA27
60364+:103090008F84001C0A000BFC24060041000216036A
60365+:1030A000044100463C02800834420100944500EA95
60366+:1030B0008F84001C2406004230A5FFFF3C076019E6
60367+:1030C0000E000901000000000A000C3D0000000095
60368+:1030D0009222000B24040016304200FF1044000628
60369+:1030E0003C0680009222000B24030017304200FFB0
60370+:1030F000144300320000000034C5010090A2000B10
60371+:10310000304200FF1444000B000080218CA20020FC
60372+:103110008CA400202403FF800043102400021140EF
60373+:103120003084007F004410253C032000004310251C
60374+:10313000ACC2083094A2000800021400000214037C
60375+:10314000044200012410000194A2000830420080D3
60376+:103150005040001A0200A82194A20008304220002A
60377+:10316000504000160200A8218CA300183C021C2D20
60378+:10317000344219ED106200110200A8213C0208003F
60379+:103180008C4200D4104000053C0280082403000457
60380+:1031900034420100A04300FC3C028008344201009C
60381+:1031A000944500EA8F84001C2406000630A5FFFF2A
60382+:1031B0000E0009013C0760210200A8210E00093918
60383+:1031C000000000009222000A304200081040000473
60384+:1031D00002A010210E0013790000000002A01021AF
60385+:1031E0008FBF00308FB5002C8FB400288FB3002420
60386+:1031F0008FB200208FB1001C8FB0001803E00008D0
60387+:1032000027BD00382402FF80008220243C02900069
60388+:1032100034420007008220253C028000AC4400209C
60389+:103220003C0380008C6200200440FFFE0000000090
60390+:1032300003E00008000000003C0380002402FF803F
60391+:10324000008220243462000700822025AC64002024
60392+:103250008C6200200440FFFE0000000003E0000834
60393+:103260000000000027BDFFD8AFB3001CAFB10014B1
60394+:10327000AFB00010AFBF0020AFB200183C1180000B
60395+:103280003C0280088E32002034530100AE2400201E
60396+:10329000966300EA000514003C074000004738250B
60397+:1032A00000A08021000030210E0009013065FFFFE1
60398+:1032B000240200A1160200022402FFFFA2620009FC
60399+:1032C000AE3200208FBF00208FB3001C8FB20018D9
60400+:1032D0008FB100148FB0001003E0000827BD002854
60401+:1032E0003C0280082403000527BDFFE834420100AA
60402+:1032F000A04300FCAFBF00103C0280008C420100E4
60403+:10330000240500A1004020210E000C67AF82001CA4
60404+:103310003C0380008C6202780440FFFE8F82001C18
60405+:103320008FBF001027BD0018AC62024024020002CB
60406+:10333000A06202443C021000AC62027803E0000884
60407+:103340000000000027BDFFE83C068000AFBF001072
60408+:1033500034C7010094E20008304400FF3883008243
60409+:10336000388200842C6300012C4200010062182581
60410+:103370001060002D24020083938200195040003B0E
60411+:103380008FBF00103C020800904256CC8CC4010054
60412+:103390003C06080094C656C63045003F38A30032AC
60413+:1033A00038A2003F2C6300012C4200010062182566
60414+:1033B000AF84001CAF860014A380001914600007BE
60415+:1033C00000E020212402002014A2001200000000CE
60416+:1033D0003402FFFF14C2000F00000000240200208E
60417+:1033E00014A2000500E028218CE300142402FFFF52
60418+:1033F0005062000B8FBF00103C040800248456C0AC
60419+:10340000000030210E000706240700010A000CD638
60420+:103410008FBF00100E000777000000008FBF001064
60421+:103420000A00093927BD001814820004240200850F
60422+:103430008CC501040A000CE1000020211482000662
60423+:103440002482FF808CC50104240440008FBF00103B
60424+:103450000A00016727BD0018304200FF2C4200021D
60425+:1034600010400004240200228FBF00100A000B2726
60426+:1034700027BD0018148200048F8200248FBF001023
60427+:103480000A000C8627BD00188C42000C1040001E5C
60428+:1034900000E0282190E300092402001814620003D0
60429+:1034A000240200160A000CFC240300081462000722
60430+:1034B00024020017240300123C02800834420080DA
60431+:1034C000A04300090A000D0994A7000854620007F0
60432+:1034D00094A700088F82FF942404FFFE9043000508
60433+:1034E00000641824A043000594A7000890A6001BC0
60434+:1034F0008CA4000094A500068FBF001000073C00BC
60435+:103500000A0008DC27BD00188FBF001003E0000888
60436+:1035100027BD00188F8500243C04800094A2002A57
60437+:103520008CA30034000230C02402FFF000C210243B
60438+:1035300000621821AC83003C8CA200303C03800068
60439+:10354000AC8200383C02005034420010AC620030C3
60440+:103550000000000000000000000000008C6200007D
60441+:10356000304200201040FFFD30C20008104000062D
60442+:103570003C0280008C620408ACA200208C62040C27
60443+:103580000A000D34ACA200248C430400ACA300203C
60444+:103590008C420404ACA200243C0300203C028000C6
60445+:1035A000AC4300303C0480008C8200300043102487
60446+:1035B0001440FFFD8F8600243C020040AC820030A6
60447+:1035C00094C3002A94C2002894C4002C94C5002EF1
60448+:1035D00024630001004410213064FFFFA4C20028CE
60449+:1035E00014850002A4C3002AA4C0002A03E0000836
60450+:1035F000000000008F84002427BDFFE83C05800404
60451+:1036000024840010AFBF00100E000E472406000AED
60452+:103610008F840024948200129483002E3042000F85
60453+:10362000244200030043180424027FFF0043102BB0
60454+:1036300010400002AC8300000000000D0E000D13CE
60455+:10364000000000008F8300248FBF001027BD0018EA
60456+:10365000946200149463001A3042000F00021500B7
60457+:10366000006218253C02800003E00008AC4300A083
60458+:103670008F8300243C028004944400069462001A64
60459+:103680008C650000A4640016004410233042FFFF44
60460+:103690000045102B03E00008384200018F8400240D
60461+:1036A0003C0780049486001A8C85000094E2000692
60462+:1036B000A482001694E3000600C310233042FFFFEB
60463+:1036C0000045102B384200011440FFF8A483001677
60464+:1036D00003E00008000000008F8400243C02800406
60465+:1036E000944200069483001A8C850000A482001680
60466+:1036F000006210233042FFFF0045102B38420001CA
60467+:103700005040000D8F850024006030213C0780046C
60468+:1037100094E20006A482001694E3000600C310237E
60469+:103720003042FFFF0045102B384200011440FFF8E3
60470+:10373000A48300168F8500243C03800034620400BB
60471+:103740008CA40020AF820020AC6400388CA200243E
60472+:10375000AC62003C3C020005AC62003003E00008B3
60473+:10376000ACA000048F8400243C0300068C8200047B
60474+:1037700000021140004310253C038000AC62003081
60475+:103780000000000000000000000000008C6200004B
60476+:10379000304200101040FFFD34620400AC80000491
60477+:1037A00003E00008AF8200208F86002427BDFFE0E1
60478+:1037B000AFB10014AFB00010AFBF00188CC300044D
60479+:1037C0008CC500248F820020309000FF94C4001A22
60480+:1037D00024630001244200202484000124A7002047
60481+:1037E000ACC30004AF820020A4C4001AACC70024FC
60482+:1037F00004A100060000882104E2000594C2001A1A
60483+:103800008CC2002024420001ACC2002094C2001AE5
60484+:1038100094C300282E040001004310262C4200010E
60485+:10382000004410245040000594C2001A24020001F4
60486+:10383000ACC2000894C2001A94C300280010202BC8
60487+:10384000004310262C4200010044102514400007BC
60488+:10385000000000008CC20008144000042402001084
60489+:103860008CC300041462000F8F8500240E000DA786
60490+:10387000241100018F820024944300289442001AEE
60491+:1038800014430003000000000E000D1300000000B0
60492+:10389000160000048F8500240E000D840000000037
60493+:1038A0008F85002494A2001E94A4001C24420001D1
60494+:1038B0003043FFFF14640002A4A2001EA4A0001E57
60495+:1038C0001200000A3C02800494A2001494A3001A7F
60496+:1038D0003042000F00021500006218253C028000F3
60497+:1038E000AC4300A00A000E1EACA0000894420006E3
60498+:1038F00094A3001A8CA40000A4A200160062102356
60499+:103900003042FFFF0044102B384200011040000DF0
60500+:1039100002201021006030213C07800494E2000660
60501+:10392000A4A2001694E3000600C310233042FFFF58
60502+:103930000044102B384200011440FFF8A4A30016E5
60503+:10394000022010218FBF00188FB100148FB000101B
60504+:1039500003E0000827BD002003E00008000000008D
60505+:103960008F82002C3C03000600021140004310250A
60506+:103970003C038000AC62003000000000000000004A
60507+:10398000000000008C620000304200101040FFFD7B
60508+:1039900034620400AF82002803E00008AF80002CEE
60509+:1039A00003E000080000102103E000080000000010
60510+:1039B0003084FFFF30A5FFFF0000182110800007B2
60511+:1039C000000000003082000110400002000420428C
60512+:1039D000006518210A000E3D0005284003E000089C
60513+:1039E0000060102110C0000624C6FFFF8CA200005A
60514+:1039F00024A50004AC8200000A000E4724840004C1
60515+:103A000003E000080000000010A0000824A3FFFF4E
60516+:103A1000AC86000000000000000000002402FFFF50
60517+:103A20002463FFFF1462FFFA2484000403E000080B
60518+:103A3000000000003C0280083442008024030001A2
60519+:103A4000AC43000CA4430010A4430012A443001490
60520+:103A500003E00008A44300168F82002427BDFFD88E
60521+:103A6000AFB3001CAFB20018AFB10014AFB000107C
60522+:103A7000AFBF00208C47000C248200802409FF8007
60523+:103A80003C08800E3043007F008080213C0A80008B
60524+:103A9000004920240068182130B100FF30D200FF17
60525+:103AA00010E000290000982126020100AD44002CFE
60526+:103AB000004928243042007F004820219062000005
60527+:103AC00024030050304200FF1443000400000000B3
60528+:103AD000AD45002C948200EA3053FFFF0E000D84A8
60529+:103AE000000000008F8200248F83002000112C0032
60530+:103AF0009442001E001224003484000100A22825F4
60531+:103B00003C02400000A22825AC7000008FBF0020BE
60532+:103B1000AC6000048FB20018AC7300088FB10014C1
60533+:103B2000AC60000C8FB3001CAC6400108FB00010B0
60534+:103B3000AC60001424040001AC60001827BD00280C
60535+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
60536+:103B50008FB200188FB100148FB0001003E000087E
60537+:103B600027BD00283C06800034C201009043000FAE
60538+:103B7000240200101062000E2865001110A000073A
60539+:103B800024020012240200082405003A10620006F4
60540+:103B90000000302103E0000800000000240500358B
60541+:103BA0001462FFFC000030210A000E6400000000D7
60542+:103BB0008CC200748F83FF9424420FA003E000089E
60543+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
60544+:103BD000240500013C0480088FBF0010240200016E
60545+:103BE00034830080A462001227BD00182402000163
60546+:103BF00003E00008A080001A27BDFFE0AFB2001864
60547+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
60548+:103C10000E000332008088213C028008345000806E
60549+:103C20009202000924030004304200FF1443000CF8
60550+:103C30003C028008124000082402000A0E000E5BBD
60551+:103C400000000000920200052403FFFE0043102440
60552+:103C5000A202000524020012A20200093C02800810
60553+:103C600034420080022020210E00033DA0400027A6
60554+:103C700016400003022020210E000EBF00000000AD
60555+:103C800002202021324600FF8FBF001C8FB2001897
60556+:103C90008FB100148FB00010240500380A000E64A4
60557+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
60558+:103CB000AFB10014AFB000100E00033200808021BD
60559+:103CC0000E000E5B000000003C02800834450080BE
60560+:103CD00090A2000924120018305100FF1232000394
60561+:103CE0000200202124020012A0A2000990A20005D7
60562+:103CF0002403FFFE004310240E00033DA0A2000594
60563+:103D00000200202124050020163200070000302187
60564+:103D10008FBF001C8FB200188FB100148FB000103D
60565+:103D20000A00034227BD00208FBF001C8FB200187D
60566+:103D30008FB100148FB00010240500390A000E6402
60567+:103D400027BD002027BDFFE83C028000AFB0001077
60568+:103D5000AFBF0014344201009442000C2405003629
60569+:103D60000080802114400012304600FF0E00033214
60570+:103D7000000000003C02800834420080240300124E
60571+:103D8000A043000990430005346300100E000E5B51
60572+:103D9000A04300050E00033D020020210200202167
60573+:103DA0000E000342240500200A000F3C0000000022
60574+:103DB0000E000E64000000000E00033202002021FD
60575+:103DC0003C0280089043001B2405FF9F0200202135
60576+:103DD000006518248FBF00148FB00010A043001B93
60577+:103DE0000A00033D27BD001827BDFFE0AFBF001844
60578+:103DF000AFB10014AFB0001030B100FF0E000332BD
60579+:103E0000008080213C02800824030012344200809C
60580+:103E10000E000E5BA04300090E00033D02002021AE
60581+:103E200002002021022030218FBF00188FB1001422
60582+:103E30008FB00010240500350A000E6427BD002055
60583+:103E40003C0480089083000E9082000A1443000B0B
60584+:103E5000000028218F82FF942403005024050001D4
60585+:103E600090420000304200FF1443000400000000B4
60586+:103E70009082000E24420001A082000E03E00008A0
60587+:103E800000A010213C0380008C6201F80440FFFE7A
60588+:103E900024020002AC6401C0A06201C43C02100014
60589+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
60590+:103EB0003C128008AFB10014AFBF001CAFB00010BF
60591+:103EC00036510080922200092403000A304200FF8C
60592+:103ED0001443003E000000008E4300048E22003890
60593+:103EE000506200808FBF001C92220000240300500B
60594+:103EF000304200FF144300253C0280008C42014008
60595+:103F00008E4300043642010002202821AC43001CED
60596+:103F10009622005C8E2300383042FFFF00021040E2
60597+:103F200000621821AE23001C8E4300048E2400384A
60598+:103F30009622005C006418233042FFFF0003184300
60599+:103F4000000210400043102A10400006000000004C
60600+:103F50008E4200048E230038004310230A000FAA6B
60601+:103F6000000220439622005C3042FFFF0002204006
60602+:103F70003C0280083443010034420080ACA4002C91
60603+:103F8000A040002424020001A062000C0E000F5E7D
60604+:103F900000000000104000538FBF001C3C02800056
60605+:103FA0008C4401403C0380008C6201F80440FFFE19
60606+:103FB00024020002AC6401C0A06201C43C021000F3
60607+:103FC000AC6201F80A0010078FBF001C92220009A2
60608+:103FD00024030010304200FF144300043C02800020
60609+:103FE0008C4401400A000FEE0000282192220009B3
60610+:103FF00024030016304200FF14430006240200147C
60611+:10400000A22200093C0280008C4401400A001001F9
60612+:104010008FBF001C8E2200388E23003C00431023EB
60613+:10402000044100308FBF001C92220027244200016F
60614+:10403000A2220027922200272C42000414400016DE
60615+:104040003C1080009222000924030004304200FF4B
60616+:10405000144300093C0280008C4401408FBF001CC7
60617+:104060008FB200188FB100148FB000102405009398
60618+:104070000A000ECC27BD00208C440140240500938B
60619+:104080008FBF001C8FB200188FB100148FB00010CA
60620+:104090000A000F4827BD00208E0401400E000332A5
60621+:1040A000000000008E4200042442FFFFAE420004E4
60622+:1040B0008E22003C2442FFFFAE22003C0E00033D56
60623+:1040C0008E0401408E0401408FBF001C8FB2001887
60624+:1040D0008FB100148FB00010240500040A000342C1
60625+:1040E00027BD00208FB200188FB100148FB00010D0
60626+:1040F00003E0000827BD00203C0680008CC2018838
60627+:104100003C038008346500809063000E00021402B6
60628+:10411000304400FF306300FF1464000E3C0280084E
60629+:1041200090A20026304200FF104400098F82FF94C5
60630+:10413000A0A400262403005090420000304200FF5B
60631+:1041400014430006000000000A0005A18CC4018091
60632+:104150003C02800834420080A044002603E00008AE
60633+:104160000000000027BDFFE030E700FFAFB20018FD
60634+:10417000AFBF001CAFB10014AFB0001000809021A1
60635+:1041800014E0000630C600FF000000000000000D33
60636+:10419000000000000A001060240001163C038008A3
60637+:1041A0009062000E304200FF14460023346200800B
60638+:1041B00090420026304200FF1446001F000000001D
60639+:1041C0009062000F304200FF1446001B0000000008
60640+:1041D0009062000A304200FF144600038F90FF9463
60641+:1041E0000000000D8F90FF948F82FF983C1180009B
60642+:1041F000AE05003CAC450000A066000A0E0003328C
60643+:104200008E240100A20000240E00033D8E24010034
60644+:104210003C0380008C6201F80440FFFE240200028F
60645+:10422000AC7201C0A06201C43C021000AC6201F893
60646+:104230000A0010618FBF001C000000000000000D8C
60647+:10424000000000002400013F8FBF001C8FB2001847
60648+:104250008FB100148FB0001003E0000827BD0020CC
60649+:104260008F83FF943C0280008C44010034420100A3
60650+:104270008C65003C9046001B0A00102724070001B3
60651+:104280003C0280089043000E9042000A0043102632
60652+:10429000304200FF03E000080002102B27BDFFE0C2
60653+:1042A0003C028008AFB10014AFB00010AFBF0018DF
60654+:1042B0003450008092020005240300303042003068
60655+:1042C00014430085008088218F8200248C42000CDA
60656+:1042D000104000828FBF00180E000D840000000007
60657+:1042E0008F860020ACD100009202000892030009E2
60658+:1042F000304200FF00021200306300FF004310252F
60659+:10430000ACC200049202004D000216000002160327
60660+:1043100004410005000000003C0308008C630048D5
60661+:104320000A00109F3C1080089202000830420040B2
60662+:10433000144000030000182192020027304300FFC0
60663+:104340003C108008361100809222004D00031E00B0
60664+:10435000304200FF0002140000621825ACC30008C0
60665+:104360008E2400308F820024ACC4000C8E250034D3
60666+:104370009443001E3C02C00BACC50010006218251F
60667+:104380008E22003800002021ACC200148E22003C96
60668+:10439000ACC200180E000DB8ACC3001C8E020004A5
60669+:1043A0008F8400203C058000AC8200008E2200201B
60670+:1043B000AC8200048E22001CAC8200088E220058C1
60671+:1043C0008CA3007400431021AC82000C8E22002CC0
60672+:1043D000AC8200108E2200408E23004400021400A4
60673+:1043E00000431025AC8200149222004D240300806B
60674+:1043F000304200FF1443000400000000AC800018AD
60675+:104400000A0010E38F8200248E23000C2402000196
60676+:104410001062000E2402FFFF92220008304200408A
60677+:104420001440000A2402FFFF8E23000C8CA20074AB
60678+:10443000006218233C0208000062102414400002AD
60679+:10444000000028210060282100051043AC820018DC
60680+:104450008F820024000020219443001E3C02C00CE7
60681+:10446000006218258F8200200E000DB8AC43001C9E
60682+:104470003C038008346201008C4200008F850020DC
60683+:10448000346300808FBF0018ACA20000ACA0000411
60684+:104490008C6400488F8200248FB10014ACA4000803
60685+:1044A000ACA0000CACA00010906300059446001E68
60686+:1044B0003C02400D00031E0000C23025ACA30014D6
60687+:1044C0008FB00010ACA0001824040001ACA6001CA2
60688+:1044D0000A000DB827BD00208FBF00188FB100144F
60689+:1044E0008FB0001003E0000827BD00203C028000D0
60690+:1044F0009443007C3C02800834460100308400FF75
60691+:104500003065FFFF2402000524A34650A0C4000C20
60692+:104510005482000C3065FFFF90C2000D2C42000752
60693+:104520001040000724A30A0090C3000D24020014C9
60694+:104530000062100400A210210A00111F3045FFFF85
60695+:104540003065FFFF3C0280083442008003E0000831
60696+:10455000A44500143C03800834680080AD05003891
60697+:10456000346701008CE2001C308400FF00A210239D
60698+:104570001840000330C600FF24A2FFFCACE2001C80
60699+:1045800030820001504000083C0380088D02003C4E
60700+:1045900000A2102304410012240400058C620004D0
60701+:1045A00010A2000F3C0380088C62000414A2001EBD
60702+:1045B000000000003C0208008C4200D8304200207D
60703+:1045C000104000093C0280083462008090630008BB
60704+:1045D0009042004C144300043C0280082404000470
60705+:1045E0000A00110900000000344300803442010039
60706+:1045F000A040000C24020001A462001410C0000AB4
60707+:104600003C0280008C4401003C0380008C6201F875
60708+:104610000440FFFE24020002AC6401C0A06201C499
60709+:104620003C021000AC6201F803E00008000000004A
60710+:1046300027BDFFE800A61823AFBF00101860008058
60711+:10464000308800FF3C02800834470080A0E000244E
60712+:1046500034440100A0E000278C82001C00A210233B
60713+:1046600004400056000000008CE2003C94E3005C33
60714+:104670008CE4002C004530233063FFFF00C3182179
60715+:104680000083202B1080000400E018218CE2002C15
60716+:104690000A00117800A2102194E2005C3042FFFF72
60717+:1046A00000C2102100A21021AC62001C3C02800854
60718+:1046B000344400809482005C8C83001C3042FFFFF5
60719+:1046C0000002104000A210210043102B10400004F3
60720+:1046D000000000008C82001C0A00118B3C06800840
60721+:1046E0009482005C3042FFFF0002104000A21021C3
60722+:1046F0003C06800834C3010034C70080AC82001C33
60723+:10470000A060000CACE500388C62001C00A21023F5
60724+:104710001840000224A2FFFCAC62001C3102000120
60725+:10472000104000083C0380088CE2003C00A21023EB
60726+:1047300004410012240400058CC2000410A20010E1
60727+:104740008FBF00108C62000414A2004F8FBF0010B6
60728+:104750003C0208008C4200D8304200201040000A81
60729+:104760003C02800834620080906300089042004C54
60730+:10477000144300053C028008240400048FBF00108D
60731+:104780000A00110927BD001834430080344201009B
60732+:10479000A040000C24020001A46200143C0280002E
60733+:1047A0008C4401003C0380008C6201F80440FFFE51
60734+:1047B000240200020A0011D8000000008CE2001C54
60735+:1047C000004610230043102B54400001ACE5001CB0
60736+:1047D00094E2005C3042FFFF0062102B144000079F
60737+:1047E0002402000294E2005C8CE3001C3042FFFFD4
60738+:1047F00000621821ACE3001C24020002ACE5003882
60739+:104800000E000F5EA082000C1040001F8FBF001032
60740+:104810003C0280008C4401003C0380008C6201F863
60741+:104820000440FFFE24020002AC6401C0A06201C487
60742+:104830003C021000AC6201F80A0011F08FBF0010BA
60743+:1048400031020010104000108FBF00103C028008A1
60744+:10485000344500808CA3001C94A2005C00661823E1
60745+:104860003042FFFF006218213C023FFF3444FFFF4B
60746+:104870000083102B544000010080182100C3102138
60747+:10488000ACA2001C8FBF001003E0000827BD001879
60748+:1048900027BDFFE800C0402100A63023AFBF0010B5
60749+:1048A00018C00026308A00FF3C028008344900808E
60750+:1048B0008D24001C8D23002C008820230064182BDD
60751+:1048C0001060000F344701008CE2002000461021E8
60752+:1048D000ACE200208CE200200044102B1440000BBE
60753+:1048E0003C023FFF8CE2002000441023ACE2002099
60754+:1048F0009522005C3042FFFF0A0012100082202146
60755+:10490000ACE00020008620213C023FFF3443FFFF43
60756+:104910000064102B54400001006020213C028008FC
60757+:104920003442008000851821AC43001CA0400024C4
60758+:10493000A04000270A0012623C03800831420010A8
60759+:10494000104000433C0380083C06800834C40080CB
60760+:104950008C82003C004810235840003E34660080A2
60761+:104960009082002424420001A0820024908200242E
60762+:104970003C0308008C630024304200FF0043102BEE
60763+:10498000144000688FBF001034C201008C42001C2C
60764+:1049900000A2102318400063000000008CC3000434
60765+:1049A0009482005C006818233042FFFF0003184324
60766+:1049B000000210400043102A1040000500000000D3
60767+:1049C0008CC20004004810230A0012450002104364
60768+:1049D0009482005C3042FFFF000210403C068008D9
60769+:1049E000AC82002C34C5008094A2005C8CA4002C06
60770+:1049F00094A3005C3042FFFF00021040008220219F
60771+:104A00003063FFFF0083202101041021ACA2001CB1
60772+:104A10008CC2000434C60100ACC2001C2402000297
60773+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
60774+:104A30003C0280008C4401003C0380008C6201F841
60775+:104A40000440FFFE240200020A001292000000004F
60776+:104A500034660080ACC50038346401008C82001CD0
60777+:104A600000A210231840000224A2FFFCAC82001C0C
60778+:104A7000314200015040000A3C0380088CC2003CD7
60779+:104A800000A2102304430014240400058C620004D7
60780+:104A900014A200033C0380080A00128424040005C9
60781+:104AA0008C62000414A2001F8FBF00103C0208009B
60782+:104AB0008C4200D8304200201040000A3C0280089E
60783+:104AC00034620080906300089042004C144300055B
60784+:104AD0003C028008240400048FBF00100A00110962
60785+:104AE00027BD00183443008034420100A040000C70
60786+:104AF00024020001A46200143C0280008C440100E6
60787+:104B00003C0380008C6201F80440FFFE2402000296
60788+:104B1000AC6401C0A06201C43C021000AC6201F8A8
60789+:104B20008FBF001003E0000827BD001827BDFFE875
60790+:104B30003C0A8008AFBF0010354900808D22003C40
60791+:104B400000C04021308400FF004610231840009D23
60792+:104B500030E700FF354701002402000100A63023A2
60793+:104B6000A0E0000CA0E0000DA522001418C0002455
60794+:104B7000308200108D23001C8D22002C0068182329
60795+:104B80000043102B1040000F000000008CE20020BA
60796+:104B900000461021ACE200208CE200200043102BE4
60797+:104BA0001440000B3C023FFF8CE200200043102326
60798+:104BB000ACE200209522005C3042FFFF0A0012C1E7
60799+:104BC00000621821ACE00020006618213C023FFF83
60800+:104BD0003446FFFF00C3102B5440000100C01821D1
60801+:104BE0003C0280083442008000651821AC43001C60
60802+:104BF000A0400024A04000270A00130F3C038008B7
60803+:104C0000104000403C0380088D22003C00481023E7
60804+:104C10005840003D34670080912200242442000166
60805+:104C2000A1220024912200243C0308008C6300246C
60806+:104C3000304200FF0043102B1440009A8FBF001039
60807+:104C40008CE2001C00A21023184000960000000017
60808+:104C50008D4300049522005C006818233042FFFF5A
60809+:104C600000031843000210400043102A10400005C2
60810+:104C7000012020218D420004004810230A0012F276
60811+:104C8000000210439522005C3042FFFF00021040FA
60812+:104C90003C068008AC82002C34C5008094A2005CE5
60813+:104CA0008CA4002C94A3005C3042FFFF0002104053
60814+:104CB000008220213063FFFF0083182101031021AF
60815+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
60816+:104CD000240200020E000F5EA0C2000C1040007102
60817+:104CE0008FBF00103C0280008C4401003C03800018
60818+:104CF0008C6201F80440FFFE240200020A0013390E
60819+:104D00000000000034670080ACE500383466010024
60820+:104D10008CC2001C00A210231840000224A2FFFC39
60821+:104D2000ACC2001C30820001504000083C038008E7
60822+:104D30008CE2003C00A2102304430051240400052F
60823+:104D40008C62000410A2003E3C0380088C620004C8
60824+:104D500054A200548FBF00103C0208008C4200D8BF
60825+:104D600030420020104000063C028008346200807F
60826+:104D7000906300089042004C104300403C028008C1
60827+:104D80003443008034420100A040000C24020001A2
60828+:104D9000A46200143C0280008C4401003C038000AB
60829+:104DA0008C6201F80440FFFE24020002AC6401C0E2
60830+:104DB000A06201C43C021000AC6201F80A00137743
60831+:104DC0008FBF001024020005A120002714E2000A72
60832+:104DD0003C038008354301009062000D2C42000620
60833+:104DE000504000053C0380089062000D2442000101
60834+:104DF000A062000D3C03800834670080ACE50038F9
60835+:104E0000346601008CC2001C00A21023184000026E
60836+:104E100024A2FFFCACC2001C308200015040000AFA
60837+:104E20003C0380088CE2003C00A2102304410014E3
60838+:104E3000240400058C62000414A200033C038008D3
60839+:104E40000A00136E240400058C62000414A20015ED
60840+:104E50008FBF00103C0208008C4200D83042002076
60841+:104E60001040000A3C028008346200809063000811
60842+:104E70009042004C144300053C02800824040004C6
60843+:104E80008FBF00100A00110927BD001834430080AD
60844+:104E900034420100A040000C24020001A46200146E
60845+:104EA0008FBF001003E0000827BD00183C0B8008EE
60846+:104EB00027BDFFE83C028000AFBF00103442010074
60847+:104EC000356A00809044000A356901008C45001461
60848+:104ED0008D4800389123000C308400FF0105102319
60849+:104EE0001C4000B3306700FF2CE20006504000B1C8
60850+:104EF0008FBF00102402000100E2300430C2000322
60851+:104F00005440000800A8302330C2000C144000A117
60852+:104F100030C20030144000A38FBF00100A00143BC1
60853+:104F20000000000018C00024308200108D43001CD7
60854+:104F30008D42002C006818230043102B1040000FF6
60855+:104F4000000000008D22002000461021AD2200202C
60856+:104F50008D2200200043102B1440000B3C023FFF29
60857+:104F60008D22002000431023AD2200209542005CDA
60858+:104F70003042FFFF0A0013AF00621821AD2000206D
60859+:104F8000006618213C023FFF3446FFFF00C3102B90
60860+:104F90005440000100C018213C02800834420080C7
60861+:104FA00000651821AC43001CA0400024A04000274D
60862+:104FB0000A0013FD3C038008104000403C038008B9
60863+:104FC0008D42003C004810231840003D34670080AB
60864+:104FD0009142002424420001A14200249142002475
60865+:104FE0003C0308008C630024304200FF0043102B78
60866+:104FF000144000708FBF00108D22001C00A21023EF
60867+:105000001840006C000000008D6300049542005CB5
60868+:10501000006818233042FFFF0003184300021040CD
60869+:105020000043102A10400005014020218D62000439
60870+:10503000004810230A0013E0000210439542005C70
60871+:105040003042FFFF000210403C068008AC82002C7A
60872+:1050500034C5008094A2005C8CA4002C94A3005C56
60873+:105060003042FFFF00021040008220213063FFFF2A
60874+:105070000083182101031021ACA2001C8CC2000483
60875+:1050800034C60100ACC2001C240200020E000F5EF8
60876+:10509000A0C2000C104000478FBF00103C028000EF
60877+:1050A0008C4401003C0380008C6201F80440FFFE48
60878+:1050B000240200020A00142D000000003467008062
60879+:1050C000ACE50038346601008CC2001C00A210233D
60880+:1050D0001840000224A2FFFCACC2001C3082000178
60881+:1050E0005040000A3C0380088CE2003C00A21023E0
60882+:1050F00004430014240400058C62000414A200037D
60883+:105100003C0380080A00141F240400058C6200047C
60884+:1051100014A200288FBF00103C0208008C4200D867
60885+:10512000304200201040000A3C02800834620080B7
60886+:10513000906300089042004C144300053C02800834
60887+:10514000240400048FBF00100A00110927BD0018B5
60888+:105150003443008034420100A040000C24020001CE
60889+:10516000A46200143C0280008C4401003C038000D7
60890+:105170008C6201F80440FFFE24020002AC6401C00E
60891+:10518000A06201C43C021000AC6201F80A00143BAA
60892+:105190008FBF00108FBF0010010030210A00115A8C
60893+:1051A00027BD0018010030210A00129927BD001800
60894+:1051B0008FBF001003E0000827BD00183C038008E3
60895+:1051C0003464010024020003A082000C8C620004FD
60896+:1051D00003E00008AC82001C3C05800834A300807A
60897+:1051E0009062002734A501002406004324420001F8
60898+:1051F000A0620027906300273C0208008C42004810
60899+:10520000306300FF146200043C07602194A500EAAB
60900+:105210000A00090130A5FFFF03E0000800000000BC
60901+:1052200027BDFFE8AFBF00103C0280000E00144411
60902+:105230008C4401803C02800834430100A060000CD3
60903+:105240008C4200048FBF001027BD001803E0000847
60904+:10525000AC62001C27BDFFE03C028008AFBF001815
60905+:10526000AFB10014AFB000103445008034460100E7
60906+:105270003C0880008D09014090C3000C8CA4003CC8
60907+:105280008CA200381482003B306700FF9502007C3E
60908+:1052900090A30027146000093045FFFF2402000599
60909+:1052A00054E200083C04800890C2000D2442000132
60910+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
60911+:1052C0003C048008348201009042000C2403000555
60912+:1052D000304200FF1443000A24A205DC348300801E
60913+:1052E000906200272C4200075040000524A20A00CB
60914+:1052F00090630027240200140062100400A2102111
60915+:105300003C108008361000803045FFFF012020212E
60916+:105310000E001444A60500149602005C8E030038AB
60917+:105320003C1180003042FFFF000210400062182153
60918+:10533000AE03001C0E0003328E24014092020025B1
60919+:1053400034420040A20200250E00033D8E2401409D
60920+:105350008E2401403C0380008C6201F80440FFFE73
60921+:1053600024020002AC6401C0A06201C43C0210002F
60922+:10537000AC6201F88FBF00188FB100148FB000101D
60923+:1053800003E0000827BD00203C0360103C02080039
60924+:1053900024420174AC62502C8C6250003C048000AA
60925+:1053A00034420080AC6250003C0208002442547C2D
60926+:1053B0003C010800AC2256003C020800244254384C
60927+:1053C0003C010800AC2256043C020002AC840008F8
60928+:1053D000AC82000C03E000082402000100A0302190
60929+:1053E0003C1C0800279C56083C0200023C050400B7
60930+:1053F00000852826008220260004102B2CA5000101
60931+:105400002C840001000210803C0308002463560035
60932+:105410000085202500431821108000030000102182
60933+:10542000AC6600002402000103E000080000000058
60934+:105430003C1C0800279C56083C0200023C05040066
60935+:1054400000852826008220260004102B2CA50001B0
60936+:105450002C840001000210803C03080024635600E5
60937+:105460000085202500431821108000050000102130
60938+:105470003C02080024425438AC62000024020001BF
60939+:1054800003E00008000000003C0200023C030400AE
60940+:1054900000821026008318262C4200012C63000194
60941+:1054A000004310251040000B000028213C1C080080
60942+:1054B000279C56083C0380008C62000824050001EC
60943+:1054C00000431025AC6200088C62000C00441025DB
60944+:1054D000AC62000C03E0000800A010213C1C080096
60945+:1054E000279C56083C0580008CA3000C0004202754
60946+:1054F000240200010064182403E00008ACA3000C9F
60947+:105500003C020002148200063C0560008CA208D018
60948+:105510002403FFFE0043102403E00008ACA208D0DF
60949+:105520003C02040014820005000000008CA208D098
60950+:105530002403FFFD00431024ACA208D003E00008C0
60951+:10554000000000003C02601A344200108C430080CE
60952+:1055500027BDFFF88C440084AFA3000093A3000094
60953+:10556000240200041462001AAFA4000493A20001F4
60954+:105570001040000797A300023062FFFC3C0380004C
60955+:10558000004310218C4200000A001536AFA200042F
60956+:105590003062FFFC3C03800000431021AC4400005B
60957+:1055A000A3A000003C0560008CA208D02403FFFEED
60958+:1055B0003C04601A00431024ACA208D08FA300045E
60959+:1055C0008FA2000034840010AC830084AC82008081
60960+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
60961+:1055E0003C1C0800279C56083C0280008C43000CA1
60962+:1055F0008C420004004318243C0200021060001496
60963+:10560000006228243C0204003C04000210A00005B3
60964+:10561000006210243C0208008C4256000A00155B10
60965+:1056200000000000104000073C0404003C02080099
60966+:105630008C4256040040F809000000000A00156082
60967+:10564000000000000000000D3C1C0800279C5608CC
60968+:105650008FBF001003E0000827BD0018800802403B
60969+:1056600080080100800800808008000000000C8095
60970+:105670000000320008000E9808000EF408000F88A1
60971+:1056800008001028080010748008010080080080BD
60972+:10569000800800000A000028000000000000000050
60973+:1056A0000000000D6370362E322E316200000000C3
60974+:1056B00006020104000000000000000000000000DD
60975+:1056C000000000000000000038003C000000000066
60976+:1056D00000000000000000000000000000000020AA
60977+:1056E00000000000000000000000000000000000BA
60978+:1056F00000000000000000000000000000000000AA
60979+:10570000000000000000000021003800000000013F
60980+:105710000000002B000000000000000400030D400A
60981+:105720000000000000000000000000000000000079
60982+:105730000000000000000000100000030000000056
60983+:105740000000000D0000000D3C020800244259AC8E
60984+:105750003C03080024635BF4AC4000000043202BB2
60985+:105760001480FFFD244200043C1D080037BD9FFC4F
60986+:1057700003A0F0213C100800261000A03C1C0800EB
60987+:10578000279C59AC0E0002F6000000000000000D3E
60988+:1057900027BDFFB4AFA10000AFA20004AFA3000873
60989+:1057A000AFA4000CAFA50010AFA60014AFA700185F
60990+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
60991+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
60992+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
60993+:1057E0000E000820000000008FBF00488FBC00445E
60994+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
60995+:105800008FAD00308FAC002C8FAB00288FAA002406
60996+:105810008FA900208FA8001C8FA700188FA6001446
60997+:105820008FA500108FA4000C8FA300088FA2000486
60998+:105830008FA1000027BD004C3C1B60188F7A5030B0
60999+:10584000377B502803400008AF7A000000A01821E1
61000+:1058500000801021008028213C0460003C0760008B
61001+:105860002406000810600006348420788C42000072
61002+:10587000ACE220088C63000003E00008ACE3200CDD
61003+:105880000A000F8100000000240300403C02600079
61004+:1058900003E00008AC4320003C0760008F86000452
61005+:1058A0008CE520740086102100A2182B14600007DC
61006+:1058B000000028218F8AFDA024050001A1440013C7
61007+:1058C0008F89000401244021AF88000403E0000810
61008+:1058D00000A010218F84FDA08F8500049086001306
61009+:1058E00030C300FF00A31023AF82000403E00008D0
61010+:1058F000A08000138F84FDA027BDFFE8AFB000108B
61011+:10590000AFBF001490890011908700112402002875
61012+:10591000312800FF3906002830E300FF2485002CE1
61013+:105920002CD00001106200162484001C0E00006EB2
61014+:10593000000000008F8FFDA03C05600024020204DF
61015+:1059400095EE003E95ED003C000E5C0031ACFFFF93
61016+:10595000016C5025ACAA2010520000012402000462
61017+:10596000ACA22000000000000000000000000000C9
61018+:105970008FBF00148FB0001003E0000827BD00188F
61019+:105980000A0000A6000028218F85FDA027BDFFD8B2
61020+:10599000AFBF0020AFB3001CAFB20018AFB100140E
61021+:1059A000AFB000100080982190A4001124B0001C1A
61022+:1059B00024B1002C308300FF386200280E000090D4
61023+:1059C0002C5200010E00009800000000020020216F
61024+:1059D0001240000202202821000028210E00006E43
61025+:1059E000000000008F8DFDA03C0880003C05600099
61026+:1059F00095AC003E95AB003C02683025000C4C0095
61027+:105A0000316AFFFF012A3825ACA7201024020202C8
61028+:105A1000ACA6201452400001240200028FBF0020D7
61029+:105A20008FB3001C8FB200188FB100148FB000101C
61030+:105A300027BD002803E00008ACA2200027BDFFE03E
61031+:105A4000AFB20018AFB10014AFB00010AFBF001C70
61032+:105A50003C1160008E2320748F82000430D0FFFF41
61033+:105A600030F2FFFF1062000C2406008F0E00006E63
61034+:105A7000000000003C06801F0010440034C5FF00F9
61035+:105A80000112382524040002AE2720100000302126
61036+:105A9000AE252014AE2420008FBF001C8FB200184A
61037+:105AA0008FB100148FB0001000C0102103E0000877
61038+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
61039+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
61040+:105AD00000102400009180253C036000AC70201071
61041+:105AE0008FBF00188FB100148FB000102402000483
61042+:105AF000AC62200027BD002003E000080000102158
61043+:105B000027BDFFE03C046018AFBF0018AFB1001420
61044+:105B1000AFB000108C8850002403FF7F34028071E6
61045+:105B20000103382434E5380C241F00313C1980006F
61046+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
61047+:105B40000E00054CAF9100400E00050A3C116000AC
61048+:105B50000E00007D000000008E3008083C0F570941
61049+:105B60002418FFF00218602435EEE00035EDF00057
61050+:105B7000018E5026018D58262D4600012D69000109
61051+:105B8000AF86004C0E000D09AF8900503C06601630
61052+:105B90008CC700003C0860148D0500A03C03FFFF8B
61053+:105BA00000E320243C02535300052FC2108200550D
61054+:105BB00034D07C00960201F2A780006C10400003F4
61055+:105BC000A780007C384B1E1EA78B006C960201F844
61056+:105BD000104000048F8D0050384C1E1EA78C007C96
61057+:105BE0008F8D005011A000058F83004C240E0020E3
61058+:105BF000A78E007CA78E006C8F83004C1060000580
61059+:105C00009785007C240F0020A78F007CA78F006C55
61060+:105C10009785007C2CB8008153000001240500808A
61061+:105C20009784006C2C91040152200001240404008C
61062+:105C30001060000B3C0260008FBF00188FB1001491
61063+:105C40008FB0001027BD0020A784006CA785007CC2
61064+:105C5000A380007EA780007403E00008A780009264
61065+:105C60008C4704382419103C30FFFFFF13F9000360
61066+:105C700030A8FFFF1100004624030050A380007EDF
61067+:105C80009386007E50C00024A785007CA780007CFE
61068+:105C90009798007CA780006CA7800074A780009272
61069+:105CA0003C010800AC3800800E00078700000000AF
61070+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
61071+:105CC000260C0388356A00100000482100002821B6
61072+:105CD00001AE20243C105709AF8C0010AF8A004859
61073+:105CE000AF89001810900023AF8500148FBF0018F3
61074+:105CF0008FB100148FB0001027BD002003E0000812
61075+:105D0000AF80005400055080014648218D260004D4
61076+:105D10000A00014800D180219798007CA784006C7C
61077+:105D2000A7800074A78000923C010800AC38008076
61078+:105D30000E000787000000003C0F60008DED080892
61079+:105D4000240EFFF03C0B600E260C0388356A001011
61080+:105D5000000048210000282101AE20243C105709F2
61081+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
61082+:105D7000AF85001424110001AF9100548FBF0018AB
61083+:105D80008FB100148FB0001003E0000827BD002081
61084+:105D90000A00017BA383007E3083FFFF8F880040D1
61085+:105DA0008F87003C000321403C0580003C020050EE
61086+:105DB000008248253C0660003C0A010034AC040027
61087+:105DC0008CCD08E001AA58241160000500000000F5
61088+:105DD0008CCF08E024E7000101EA7025ACCE08E092
61089+:105DE0008D19001001805821ACB900388D180014AD
61090+:105DF000ACB8003CACA9003000000000000000007E
61091+:105E00000000000000000000000000000000000092
61092+:105E100000000000000000003C0380008C640000D3
61093+:105E2000308200201040FFFD3C0F60008DED08E047
61094+:105E30003C0E010001AE18241460FFE100000000D8
61095+:105E4000AF87003C03E00008AF8B00588F8500400F
61096+:105E5000240BFFF03C06800094A7001A8CA90024B4
61097+:105E600030ECFFFF000C38C000EB5024012A402129
61098+:105E7000ACC8003C8CA400248CC3003C00831023DD
61099+:105E800018400033000000008CAD002025A2000166
61100+:105E90003C0F0050ACC2003835EE00103C068000CC
61101+:105EA000ACCE003000000000000000000000000048
61102+:105EB00000000000000000000000000000000000E2
61103+:105EC000000000003C0480008C9900003338002062
61104+:105ED0001300FFFD30E20008104000173C0980006D
61105+:105EE0008C880408ACA800108C83040CACA30014AC
61106+:105EF0003C1900203C188000AF19003094AE001807
61107+:105F000094AF001C01CF3021A4A6001894AD001A54
61108+:105F100025A70001A4A7001A94AB001A94AC001E98
61109+:105F2000118B00030000000003E0000800000000E7
61110+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
61111+:105F40008D240404ACA400140A0002183C1900209B
61112+:105F50008CA200200A0002003C0F00500A0001EE53
61113+:105F60000000000027BDFFE8AFBF00100E000232A6
61114+:105F7000000000008F8900408FBF00103C038000AC
61115+:105F8000A520000A9528000A9527000427BD0018BF
61116+:105F90003105FFFF30E6000F0006150000A22025A6
61117+:105FA00003E00008AC6400803C0508008CA50020DC
61118+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
61119+:105FC00010A300100000802124040001020430040A
61120+:105FD00000A6202400C3102450440006261000010F
61121+:105FE000001018802787FDA41480000A006718217C
61122+:105FF000261000012E0900025520FFF38F83000CAC
61123+:10600000AF85000C8FBF00148FB0001003E00008B4
61124+:1060100027BD00188C6800003C058000ACA8002457
61125+:106020000E000234261000013C0508008CA500205B
61126+:106030000A0002592E0900022405000100851804F7
61127+:106040003C0408008C84002027BDFFC8AFBF00348B
61128+:1060500000831024AFBE0030AFB7002CAFB60028CD
61129+:10606000AFB50024AFB40020AFB3001CAFB200182E
61130+:10607000AFB1001410400051AFB000108F84004049
61131+:10608000948700069488000A00E8302330D5FFFF8B
61132+:1060900012A0004B8FBF0034948B0018948C000A20
61133+:1060A000016C50233142FFFF02A2482B1520000251
61134+:1060B00002A02021004020212C8F000515E00002C5
61135+:1060C00000809821241300040E0001C102602021E9
61136+:1060D0008F87004002609021AF80004494F4000A52
61137+:1060E000026080211260004E3291FFFF3C1670006A
61138+:1060F0003C1440003C1E20003C1760008F99005863
61139+:106100008F380000031618241074004F0283F82BF8
61140+:1061100017E0003600000000107E00478F86004424
61141+:1061200014C0003A2403000102031023022320219B
61142+:106130003050FFFF1600FFF13091FFFF8F870040C6
61143+:106140003C1100203C108000AE11003094EB000A9E
61144+:106150003C178000024B5021A4EA000A94E9000A8F
61145+:1061600094E800043123FFFF3106000F00062D00E4
61146+:106170000065F025AEFE008094F3000A94F6001846
61147+:1061800012D30036001221408CFF00148CF4001052
61148+:1061900003E468210000C02101A4782B029870213B
61149+:1061A00001CF6021ACED0014ACEC001002B238233A
61150+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
61151+:1061C0008FBE00308FB7002C8FB600288FB500240B
61152+:1061D0008FB400208FB3001C8FB200188FB1001451
61153+:1061E0008FB0001003E0000827BD00381477FFCC03
61154+:1061F0008F8600440E000EE202002021004018218C
61155+:106200008F86004410C0FFC9020310230270702360
61156+:106210008F87004001C368210A0002E431B2FFFF0A
61157+:106220008F86004414C0FFC93C1100203C10800040
61158+:106230000A0002AEAE1100300E00046602002021FA
61159+:106240000A0002DB00401821020020210E0009395B
61160+:10625000022028210A0002DB004018210E0001EE76
61161+:10626000000000000A0002C702B2382327BDFFC8A1
61162+:10627000AFB7002CAFB60028AFB50024AFB40020F4
61163+:10628000AFB3001CAFB20018AFB10014AFB0001034
61164+:10629000AFBF00300E00011B241300013C047FFF40
61165+:1062A0003C0380083C0220003C010800AC20007048
61166+:1062B0003496FFFF34770080345200033C1512C03F
61167+:1062C000241400013C1080002411FF800E000245C0
61168+:1062D000000000008F8700488F8B00188F89001402
61169+:1062E0008CEA00EC8CE800E8014B302B01092823F4
61170+:1062F00000A6102314400006014B18231440000E82
61171+:106300003C05800002A3602B1180000B0000000000
61172+:106310003C0560008CEE00EC8CED00E88CA4180CC1
61173+:10632000AF8E001804800053AF8D00148F8F0010C3
61174+:10633000ADF400003C0580008CBF00003BF900017B
61175+:10634000333800011700FFE13C0380008C6201003C
61176+:1063500024060C0010460009000000008C680100B3
61177+:106360002D043080548000103C0480008C690100B2
61178+:106370002D2331811060000C3C0480008CAA0100A8
61179+:1063800011460004000020218CA6010024C5FF81D5
61180+:1063900030A400FF8E0B01000E000269AE0B00243A
61181+:1063A0000A00034F3C0480008C8D01002DAC3300AB
61182+:1063B00011800022000000003C0708008CE70098D4
61183+:1063C00024EE00013C010800AC2E00983C04800043
61184+:1063D0008C8201001440000300000000566000148D
61185+:1063E0003C0440008C9F01008C9801000000982123
61186+:1063F00003F1C82400193940330F007F00EF7025E6
61187+:1064000001D26825AC8D08308C8C01008C85010090
61188+:10641000258B0100017130240006514030A3007F1C
61189+:106420000143482501324025AC8808303C04400037
61190+:10643000AE0401380A00030E000000008C99010030
61191+:10644000240F0020AC99002092F80000330300FFD5
61192+:10645000106F000C241F0050547FFFDD3C048000AF
61193+:106460008C8401000E00154E000000000A00034F4E
61194+:106470003C04800000963824ACA7180C0A000327BF
61195+:106480008F8F00108C8501000E0008F72404008017
61196+:106490000A00034F3C04800000A4102B24030001D9
61197+:1064A00010400009000030210005284000A4102BF6
61198+:1064B00004A00003000318405440FFFC00052840DE
61199+:1064C0005060000A0004182B0085382B54E00004AB
61200+:1064D0000003184200C33025008520230003184222
61201+:1064E0001460FFF9000528420004182B03E000089F
61202+:1064F00000C310213084FFFF30C600FF3C0780003E
61203+:106500008CE201B80440FFFE00064C000124302557
61204+:106510003C08200000C820253C031000ACE00180AE
61205+:10652000ACE50184ACE4018803E00008ACE301B809
61206+:106530003C0660008CC5201C2402FFF03083020062
61207+:10654000308601001060000E00A2282434A500014E
61208+:106550003087300010E0000530830C0034A50004C3
61209+:106560003C04600003E00008AC85201C1060FFFDC7
61210+:106570003C04600034A5000803E00008AC85201C42
61211+:1065800054C0FFF334A500020A0003B03087300086
61212+:1065900027BDFFE8AFB00010AFBF00143C0760009C
61213+:1065A000240600021080001100A080218F83005873
61214+:1065B0000E0003A78C6400188F8200580000202171
61215+:1065C000240600018C45000C0E000398000000001A
61216+:1065D0001600000224020003000010218FBF0014E7
61217+:1065E0008FB0001003E0000827BD00188CE8201CC5
61218+:1065F0002409FFF001092824ACE5201C8F870058EE
61219+:106600000A0003CD8CE5000C3C02600E00804021A6
61220+:1066100034460100240900180000000000000000BA
61221+:10662000000000003C0A00503C0380003547020097
61222+:10663000AC68003834640400AC65003CAC670030E2
61223+:106640008C6C0000318B00201160FFFD2407FFFFE0
61224+:106650002403007F8C8D00002463FFFF248400044A
61225+:10666000ACCD00001467FFFB24C60004000000004E
61226+:10667000000000000000000024A402000085282B78
61227+:106680003C0300203C0E80002529FFFF010540212E
61228+:10669000ADC300301520FFE00080282103E0000892
61229+:1066A000000000008F82005827BDFFD8AFB3001C48
61230+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
61231+:1066C00094460002008098218C5200182CC300814F
61232+:1066D0008C4800048C4700088C51000C8C49001039
61233+:1066E000106000078C4A00142CC4000414800013AE
61234+:1066F00030EB000730C5000310A0001000000000C0
61235+:106700002410008B02002021022028210E00039873
61236+:10671000240600031660000224020003000010217A
61237+:106720008FBF00208FB3001C8FB200188FB10014F0
61238+:106730008FB0001003E0000827BD00281560FFF1AE
61239+:106740002410008B3C0C80003C030020241F00011F
61240+:10675000AD830030AF9F0044000000000000000047
61241+:10676000000000002419FFF024D8000F031978243A
61242+:106770003C1000D0AD88003801F0702524CD000316
61243+:106780003C08600EAD87003C35850400AD8E0030BE
61244+:10679000000D38823504003C3C0380008C6B000007
61245+:1067A000316200201040FFFD0000000010E00008F2
61246+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
61247+:1067C00024A50004AC8800001467FFFB24840004A7
61248+:1067D0003C05600EACA60038000000000000000080
61249+:1067E000000000008F8600543C0400203C0780001D
61250+:1067F000ACE4003054C000060120202102402021DA
61251+:106800000E0003A7000080210A00041D02002021C1
61252+:106810000E0003DD01402821024020210E0003A7C5
61253+:10682000000080210A00041D0200202127BDFFE096
61254+:10683000AFB200183092FFFFAFB10014AFBF001C21
61255+:10684000AFB000101640000D000088210A0004932C
61256+:106850000220102124050003508500278CE5000C40
61257+:106860000000000D262800013111FFFF24E2002066
61258+:106870000232802B12000019AF8200588F82004430
61259+:10688000144000168F8700583C0670003C0320001F
61260+:106890008CE5000000A62024148300108F84006083
61261+:1068A000000544023C09800000A980241480FFE90F
61262+:1068B000310600FF2CCA000B5140FFEB26280001D7
61263+:1068C000000668803C0E080025CE575801AE6021B6
61264+:1068D0008D8B0000016000080000000002201021E4
61265+:1068E0008FBF001C8FB200188FB100148FB0001042
61266+:1068F00003E0000827BD00200E0003982404008454
61267+:106900001600FFD88F8700580A000474AF8000601B
61268+:10691000020028210E0003BF240400018F870058C5
61269+:106920000A000474AF820060020028210E0003BF39
61270+:10693000000020210A0004A38F8700580E000404E1
61271+:10694000020020218F8700580A000474AF82006083
61272+:1069500030AFFFFF000F19C03C0480008C9001B8DD
61273+:106960000600FFFE3C1920043C181000AC83018097
61274+:10697000AC800184AC990188AC9801B80A00047518
61275+:106980002628000190E2000390E30002000020218D
61276+:106990000002FE0000033A0000FF2825240600083C
61277+:1069A0000E000398000000001600FFDC2402000324
61278+:1069B0008F870058000010210A000474AF82006025
61279+:1069C00090E8000200002021240600090A0004C308
61280+:1069D00000082E0090E4000C240900FF308500FF21
61281+:1069E00010A900150000302190F9000290F8000372
61282+:1069F000308F00FF94EB000400196E000018740043
61283+:106A0000000F62000186202501AE5025014B28258C
61284+:106A10003084FF8B0A0004C32406000A90E30002BE
61285+:106A200090FF0004000020210003360000DF28252D
61286+:106A30000A0004C32406000B0A0004D52406008BB8
61287+:106A4000000449C23127003F000443423C02800059
61288+:106A500000082040240316802CE60020AC43002CC4
61289+:106A600024EAFFE02482000114C0000330A900FFE3
61290+:106A700000801021314700FF000260803C0D800043
61291+:106A8000240A0001018D20213C0B000E00EA28049D
61292+:106A9000008B302111200005000538278CCE000026
61293+:106AA00001C5382503E00008ACC700008CD8000001
61294+:106AB0000307782403E00008ACCF000027BDFFE007
61295+:106AC000AFB10014AFB00010AFBF00183C076000BA
61296+:106AD0008CE408083402F0003C1160003083F000C0
61297+:106AE000240501C03C04800E000030211062000625
61298+:106AF000241000018CEA08083149F0003928E00030
61299+:106B00000008382B000780403C0D0200AE2D081411
61300+:106B1000240C16803C0B80008E2744000E000F8B47
61301+:106B2000AD6C002C120000043C02169124050001FB
61302+:106B3000120500103C023D2C345800E0AE384408E9
61303+:106B40003C1108008E31007C8FBF00183C066000AD
61304+:106B500000118540360F16808FB100148FB00010E1
61305+:106B60003C0E020027BD0020ACCF442003E000080B
61306+:106B7000ACCE08103C0218DA345800E0AE384408B5
61307+:106B80003C1108008E31007C8FBF00183C0660006D
61308+:106B900000118540360F16808FB100148FB00010A1
61309+:106BA0003C0E020027BD0020ACCF442003E00008CB
61310+:106BB000ACCE08100A0004EB240500010A0004EB27
61311+:106BC0000000282124020400A7820024A780001CC2
61312+:106BD000000020213C06080024C65A582405FFFF67
61313+:106BE00024890001000440803124FFFF01061821A0
61314+:106BF0002C87002014E0FFFAAC6500002404040098
61315+:106C0000A7840026A780001E000020213C06080063
61316+:106C100024C65AD82405FFFF248D0001000460809B
61317+:106C200031A4FFFF018658212C8A00201540FFFA6D
61318+:106C3000AD650000A7800028A7800020A780002263
61319+:106C4000000020213C06080024C65B582405FFFFF5
61320+:106C5000249900010004C0803324FFFF030678213B
61321+:106C60002C8E000415C0FFFAADE500003C05600065
61322+:106C70008CA73D002403E08F00E31024344601403C
61323+:106C800003E00008ACA63D002487007F000731C266
61324+:106C900024C5FFFF000518C2246400013082FFFFF5
61325+:106CA000000238C0A78400303C010800AC27003047
61326+:106CB000AF80002C0000282100002021000030219E
61327+:106CC0002489000100A728213124FFFF2CA81701E7
61328+:106CD000110000032C8300801460FFF924C600011A
61329+:106CE00000C02821AF86002C10C0001DA786002AF6
61330+:106CF00024CAFFFF000A11423C08080025085B581F
61331+:106D00001040000A00002021004030212407FFFF2E
61332+:106D1000248E00010004688031C4FFFF01A86021B7
61333+:106D20000086582B1560FFFAAD87000030A2001FC7
61334+:106D30005040000800043080240300010043C804D0
61335+:106D400000041080004878212738FFFF03E0000886
61336+:106D5000ADF8000000C820212405FFFFAC8500002D
61337+:106D600003E000080000000030A5FFFF30C6FFFF71
61338+:106D700030A8001F0080602130E700FF0005294295
61339+:106D80000000502110C0001D24090001240B000147
61340+:106D900025180001010B2004330800FF0126782686
61341+:106DA000390E00202DED00012DC2000101A2182591
61342+:106DB0001060000D014450250005C880032C4021BF
61343+:106DC0000100182110E0000F000A20278D040000A8
61344+:106DD000008A1825AD03000024AD00010000402109
61345+:106DE0000000502131A5FFFF252E000131C9FFFF12
61346+:106DF00000C9102B1040FFE72518000103E0000830
61347+:106E0000000000008D0A0000014440240A0005D162
61348+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
61349+:106E2000AFB00010AFBF001430E7FFFF00005021EB
61350+:106E30003410FFFF0000602124AF001F00C0482174
61351+:106E4000241800012419002005E0001601E010219B
61352+:106E50000002F943019F682A0009702B01AE40240B
61353+:106E600011000017000C18800064102110E00005CC
61354+:106E70008C4B000000F840040008382301675824B8
61355+:106E800000003821154000410000402155600016E7
61356+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
61357+:106EA00001E0102124A2003E0002F943019F682A5C
61358+:106EB0000009702B01AE40241500FFEB000C188078
61359+:106EC000154600053402FFFF020028210E0005B51B
61360+:106ED00000003821020010218FBF00148FB0001075
61361+:106EE00003E0000827BD00181520000301601821E9
61362+:106EF000000B1C0224080010306A00FF154000053A
61363+:106F0000306E000F250D000800031A0231A800FFA3
61364+:106F1000306E000F15C00005307F000325100004FF
61365+:106F200000031902320800FF307F000317E000055C
61366+:106F3000386900012502000200031882304800FF72
61367+:106F4000386900013123000110600004310300FFA3
61368+:106F5000250A0001314800FF310300FF000C6940A1
61369+:106F600001A34021240A000110CAFFD53110FFFF00
61370+:106F7000246E000131C800FF1119FFC638C9000195
61371+:106F80002D1F002053E0001C258B0001240D000163
61372+:106F90000A000648240E002051460017258B0001E8
61373+:106FA00025090001312800FF2D0900205120001281
61374+:106FB000258B000125430001010D5004014B1024D5
61375+:106FC000250900011440FFF4306AFFFF3127FFFF5D
61376+:106FD00010EE000C2582FFFF304CFFFF0000502117
61377+:106FE0003410FFFF312800FF2D0900205520FFF24B
61378+:106FF00025430001258B0001014648260A000602B0
61379+:10700000316CFFFF00003821000050210A000654B7
61380+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
61381+:10702000AFB10014001039423211FFE000071080A8
61382+:10703000AFB3001C00B1282330D3FFFFAFB200185C
61383+:1070400030A5FFFF00809021026030210044202104
61384+:10705000AFBF00200E0005E03207001F022288218A
61385+:107060003403FFFF0240202102002821026030216A
61386+:1070700000003821104300093231FFFF02201021A7
61387+:107080008FBF00208FB3001C8FB200188FB1001487
61388+:107090008FB0001003E0000827BD00280E0005E0B7
61389+:1070A0000000000000408821022010218FBF002036
61390+:1070B0008FB3001C8FB200188FB100148FB0001076
61391+:1070C00003E0000827BD0028000424003C03600002
61392+:1070D000AC603D0810A00002348210063482101605
61393+:1070E00003E00008AC623D0427BDFFE0AFB0001034
61394+:1070F000309000FF2E020006AFBF001810400008BD
61395+:10710000AFB10014001030803C03080024635784A2
61396+:1071100000C328218CA400000080000800000000AB
61397+:10712000000020218FBF00188FB100148FB0001015
61398+:107130000080102103E0000827BD00209791002A5D
61399+:1071400016200051000020213C020800904200332C
61400+:107150000A0006BB00000000978D002615A0003134
61401+:10716000000020210A0006BB2402000897870024A3
61402+:1071700014E0001A00001821006020212402000100
61403+:107180001080FFE98FBF0018000429C2004530219C
61404+:1071900000A6582B1160FFE43C0880003C0720004B
61405+:1071A000000569C001A76025AD0C00203C038008E4
61406+:1071B0002402001F2442FFFFAC6000000441FFFDD9
61407+:1071C0002463000424A5000100A6702B15C0FFF560
61408+:1071D000000569C00A0006A58FBF00189787001C2C
61409+:1071E0003C04080024845A58240504000E0006605C
61410+:1071F00024060001978B002424440001308AFFFFFD
61411+:107200002569FFFF2D48040000402821150000409B
61412+:10721000A789002424AC3800000C19C00A0006B964
61413+:10722000A780001C9787001E3C04080024845AD8BD
61414+:10723000240504000E00066024060001979900262C
61415+:10724000244400013098FFFF272FFFFF2F0E04007A
61416+:107250000040882115C0002CA78F0026A780001EA3
61417+:107260003A020003262401003084FFFF0E00068D41
61418+:107270002C4500010011F8C027F00100001021C0CA
61419+:107280000A0006BB240200089785002E978700227B
61420+:107290003C04080024845B580E00066024060001AC
61421+:1072A0009787002A8F89002C2445000130A8FFFF12
61422+:1072B00024E3FFFF0109302B0040802114C0001897
61423+:1072C000A783002AA7800022978500300E000F7543
61424+:1072D00002002021244A05003144FFFF0E00068DE4
61425+:1072E000240500013C05080094A500320E000F752E
61426+:1072F00002002021244521003C0208009042003376
61427+:107300000A0006BB000521C00A0006F3A784001E80
61428+:1073100024AC3800000C19C00A0006B9A784001C70
61429+:107320000A00070DA7850022308400FF27BDFFE873
61430+:107330002C820006AFBF0014AFB000101040001543
61431+:1073400000A03821000440803C0308002463579CBF
61432+:10735000010328218CA40000008000080000000028
61433+:1073600024CC007F000751C2000C59C23170FFFFCE
61434+:107370002547C40030E5FFFF2784001C02003021B0
61435+:107380000E0005B52407000197860028020620217B
61436+:10739000A78400288FBF00148FB0001003E00008FE
61437+:1073A00027BD00183C0508008CA50030000779C2F5
61438+:1073B0000E00038125E4DF003045FFFF3C04080098
61439+:1073C00024845B58240600010E0005B52407000143
61440+:1073D000978E002A8FBF00148FB0001025CD0001BA
61441+:1073E00027BD001803E00008A78D002A0007C9C2C6
61442+:1073F0002738FF00001878C231F0FFFF3C04080076
61443+:1074000024845AD802002821240600010E0005B564
61444+:1074100024070001978D0026260E0100000E84002F
61445+:1074200025AC00013C0B6000A78C0026AD603D0838
61446+:1074300036040006000030213C0760008CE23D0469
61447+:10744000305F000617E0FFFD24C9000100061B00A5
61448+:10745000312600FF006440252CC50004ACE83D0443
61449+:1074600014A0FFF68FBF00148FB0001003E00008D7
61450+:1074700027BD0018000751C22549C8002406000195
61451+:10748000240700013C04080024845A580E0005B566
61452+:107490003125FFFF978700248FBF00148FB00010A5
61453+:1074A00024E6000127BD001803E00008A786002499
61454+:1074B0003C0660183C090800252900FCACC9502C8A
61455+:1074C0008CC850003C0580003C020002350700805B
61456+:1074D000ACC750003C04080024841FE03C030800B3
61457+:1074E00024631F98ACA50008ACA2000C3C01080066
61458+:1074F000AC2459A43C010800AC2359A803E00008BF
61459+:107500002402000100A030213C1C0800279C59AC3B
61460+:107510003C0C04003C0B0002008B3826008C4026FB
61461+:107520002CE200010007502B2D050001000A4880C5
61462+:107530003C030800246359A4004520250123182199
61463+:107540001080000300001021AC660000240200013E
61464+:1075500003E00008000000003C1C0800279C59AC18
61465+:107560003C0B04003C0A0002008A3026008B3826BF
61466+:107570002CC200010006482B2CE5000100094080C8
61467+:107580003C030800246359A4004520250103182169
61468+:1075900010800005000010213C0C0800258C1F986D
61469+:1075A000AC6C00002402000103E0000800000000B1
61470+:1075B0003C0900023C080400008830260089382677
61471+:1075C0002CC30001008028212CE400010083102539
61472+:1075D0001040000B000030213C1C0800279C59ACD7
61473+:1075E0003C0A80008D4E00082406000101CA68256F
61474+:1075F000AD4D00088D4C000C01855825AD4B000C9D
61475+:1076000003E0000800C010213C1C0800279C59AC76
61476+:107610003C0580008CA6000C0004202724020001F9
61477+:1076200000C4182403E00008ACA3000C3C020002D4
61478+:107630001082000B3C0560003C070400108700032B
61479+:107640000000000003E00008000000008CA908D042
61480+:10765000240AFFFD012A402403E00008ACA808D05A
61481+:107660008CA408D02406FFFE0086182403E000083E
61482+:10767000ACA308D03C05601A34A600108CC300806F
61483+:1076800027BDFFF88CC50084AFA3000093A40000C1
61484+:107690002402001010820003AFA5000403E00008DC
61485+:1076A00027BD000893A7000114E0001497AC000266
61486+:1076B00097B800023C0F8000330EFFFC01CF682119
61487+:1076C000ADA50000A3A000003C0660008CC708D058
61488+:1076D0002408FFFE3C04601A00E82824ACC508D04A
61489+:1076E0008FA300048FA200003499001027BD00086A
61490+:1076F000AF22008003E00008AF2300843C0B800031
61491+:10770000318AFFFC014B48218D2800000A00080C3B
61492+:10771000AFA8000427BDFFE8AFBF00103C1C080065
61493+:10772000279C59AC3C0580008CA4000C8CA2000462
61494+:107730003C0300020044282410A0000A00A31824DF
61495+:107740003C0604003C0400021460000900A610245A
61496+:107750001440000F3C0404000000000D3C1C080015
61497+:10776000279C59AC8FBF001003E0000827BD00180C
61498+:107770003C0208008C4259A40040F80900000000B7
61499+:107780003C1C0800279C59AC0A0008358FBF00102C
61500+:107790003C0208008C4259A80040F8090000000093
61501+:1077A0000A00083B000000003C0880008D0201B880
61502+:1077B0000440FFFE35090180AD2400003C031000A9
61503+:1077C00024040040AD250004A1240008A1260009DE
61504+:1077D000A527000A03E00008AD0301B83084FFFFCD
61505+:1077E0000080382130A5FFFF000020210A00084555
61506+:1077F000240600803087FFFF8CA400002406003898
61507+:107800000A000845000028218F8300788F860070C9
61508+:107810001066000B008040213C07080024E75B68ED
61509+:10782000000328C000A710218C440000246300013D
61510+:10783000108800053063000F5466FFFA000328C06B
61511+:1078400003E00008000010213C07080024E75B6CFF
61512+:1078500000A7302103E000088CC200003C03900028
61513+:1078600034620001008220253C038000AC640020CB
61514+:107870008C65002004A0FFFE0000000003E000086B
61515+:10788000000000003C0280003443000100832025FA
61516+:1078900003E00008AC44002027BDFFE0AFB10014B6
61517+:1078A0003091FFFFAFB00010AFBF001812200013DF
61518+:1078B00000A080218CA20000240400022406020003
61519+:1078C0001040000F004028210E0007250000000096
61520+:1078D00000001021AE000000022038218FBF0018E8
61521+:1078E0008FB100148FB0001000402021000028212B
61522+:1078F000000030210A00084527BD00208CA20000AE
61523+:10790000022038218FBF00188FB100148FB00010F3
61524+:107910000040202100002821000030210A000845F5
61525+:1079200027BD002000A010213087FFFF8CA5000498
61526+:107930008C4400000A000845240600068F83FD9C45
61527+:1079400027BDFFE8AFBF0014AFB00010906700087C
61528+:10795000008010210080282130E600400000202116
61529+:1079600010C000088C5000000E0000BD0200202155
61530+:10797000020020218FBF00148FB000100A000548BC
61531+:1079800027BD00180E0008A4000000000E0000BD76
61532+:1079900002002021020020218FBF00148FB00010B0
61533+:1079A0000A00054827BD001827BDFFE0AFB0001052
61534+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
61535+:1079C00092060001008088210E00087230D2000467
61536+:1079D00092040005001129C2A6050000348300406E
61537+:1079E000A20300050E00087C022020210E00054A9B
61538+:1079F0000220202124020001AE02000C02202821D6
61539+:107A0000A602001024040002A602001224060200AE
61540+:107A1000A60200140E000725A60200161640000F4D
61541+:107A20008FBF001C978C00743C0B08008D6B007896
61542+:107A30002588FFFF3109FFFF256A0001012A382B45
61543+:107A400010E00006A78800743C0F6006240E0016A4
61544+:107A500035ED0010ADAE00508FBF001C8FB2001886
61545+:107A60008FB100148FB0001003E0000827BD002084
61546+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
61547+:107A80001080000400A088212402008010820007DA
61548+:107A9000000000000000000D8FBF00188FB100141F
61549+:107AA0008FB0001003E0000827BD00200E00087210
61550+:107AB00000A020218F86FD9C0220202190C500057A
61551+:107AC0000E00087C30B000FF2403003E1603FFF1D7
61552+:107AD0003C0680008CC401780480FFFE34C801405D
61553+:107AE000240900073C071000AD11000002202021EE
61554+:107AF000A10900048FBF00188FB100148FB00010CF
61555+:107B0000ACC701780A0008C527BD002027BDFFE0EB
61556+:107B1000AFB00010AFBF0018AFB100143C10800030
61557+:107B20008E110020000000000E00054AAE04002067
61558+:107B3000AE1100208FBF00188FB100148FB000105D
61559+:107B400003E0000827BD00203084FFFF00803821BB
61560+:107B50002406003500A020210A0008450000282145
61561+:107B60003084FFFF008038212406003600A0202149
61562+:107B70000A0008450000282127BDFFD0AFB500242A
61563+:107B80003095FFFFAFB60028AFB40020AFBF002C88
61564+:107B9000AFB3001CAFB20018AFB10014AFB000100B
61565+:107BA00030B6FFFF12A000270000A0218F920058DE
61566+:107BB0008E4300003C0680002402004000033E0289
61567+:107BC00000032C0230E4007F006698241482001D1C
61568+:107BD00030A500FF8F8300682C68000A1100001098
61569+:107BE0008F8D0044000358803C0C0800258C57B84A
61570+:107BF000016C50218D4900000120000800000000A8
61571+:107C000002D4302130C5FFFF0E0008522404008446
61572+:107C1000166000028F920058AF8000688F8D00447C
61573+:107C20002659002026980001032090213314FFFFDD
61574+:107C300015A00004AF9900580295202B1480FFDC9A
61575+:107C400000000000028010218FBF002C8FB600289A
61576+:107C50008FB500248FB400208FB3001C8FB20018A2
61577+:107C60008FB100148FB0001003E0000827BD003072
61578+:107C70002407003414A70149000000009247000EB9
61579+:107C80008F9FFDA08F90FD9C24181600A3E700197C
61580+:107C90009242000D3C0880003C07800CA3E20018D3
61581+:107CA000964A00123C0D60003C117FFFA60A005C62
61582+:107CB000964400103623FFFF240200053099FFFF91
61583+:107CC000AE1900548E46001CAD1800288CEF000041
61584+:107CD0008DAE444801E6482601C93021AE06003881
61585+:107CE0008E05003824CB00013C0E7F00AE05003C21
61586+:107CF0008E0C003CAFEC0004AE0B00208E13002075
61587+:107D0000AE13001CA3E0001BAE03002CA3E2001284
61588+:107D10008E4A001424130050AE0A00348E0400343E
61589+:107D2000AFE400148E590018AE1900489258000CA8
61590+:107D3000A218004E920D000835AF0020A20F0008D7
61591+:107D40008E090018012E282434AC4000AE0C001817
61592+:107D5000920B0000317200FF1253027F2403FF8058
61593+:107D60003C04080024845BE80E0008AA0000000020
61594+:107D70003C1108008E315BE80E00087202202021C1
61595+:107D80002405000424080001A2050025022020216A
61596+:107D90000E00087CA20800053C0580008CB001782C
61597+:107DA0000600FFFE8F92005834AE0140240F0002FF
61598+:107DB0003C091000ADD10000A1CF0004ACA90178AE
61599+:107DC0000A000962AF8000682CAD003751A0FF9413
61600+:107DD0008F8D0044000580803C110800263157E05B
61601+:107DE000021178218DEE000001C0000800000000A3
61602+:107DF0002411000414B1008C3C0780003C080800EA
61603+:107E00008D085BE88F86FD9CACE800208E4500085D
61604+:107E10008F99FDA0240D0050ACC500308E4C000899
61605+:107E2000ACCC00508E4B000CACCB00348E43001019
61606+:107E3000ACC300388E4A0010ACCA00548E42001405
61607+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
61608+:107E5000ACD0002090C40000309800FF130D024AFF
61609+:107E6000000000008CC400348CD00030009030231F
61610+:107E700004C000F12404008C126000EE2402000310
61611+:107E80000A000962AF8200682419000514B900666F
61612+:107E90003C0580003C0808008D085BE88F86FD9C4F
61613+:107EA000ACA800208E4C00048F8AFDA0240720007F
61614+:107EB000ACCC001C924B000824120008A14B001906
61615+:107EC0008F82005890430009A14300188F85005805
61616+:107ED00090BF000A33E400FF1092001028890009C7
61617+:107EE000152000BA240E0002240D0020108D000B76
61618+:107EF000340780002898002117000008240740005C
61619+:107F000024100040109000053C0700012419008057
61620+:107F1000109900023C070002240740008CC20018A0
61621+:107F20003C03FF00004350240147F825ACDF001854
61622+:107F300090B2000BA0D200278F8300589464000CED
61623+:107F4000108001FE000000009467000C3C1F8000C0
61624+:107F50002405FFBFA4C7005C9063000E2407000443
61625+:107F6000A0C300088F820058904A000FA0CA0009E1
61626+:107F70008F8900588D3200108FE400740244C823AA
61627+:107F8000ACD900588D300014ACD0002C95380018B6
61628+:107F9000330DFFFFACCD00409531001A322FFFFFAB
61629+:107FA000ACCF00448D2E001CACCE00489128000EB2
61630+:107FB000A0C8000890CC000801855824126001B6C2
61631+:107FC000A0CB00088F9200580A000962AF870068B2
61632+:107FD0002406000614A600143C0E80003C0F080086
61633+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
61634+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
61635+:1080000024040005ACA800048CCC003C1260008164
61636+:10801000AD6C00000A000962AF84006824110007FB
61637+:1080200010B1004B240400063C05080024A55BE8C1
61638+:108030000E000881240400818F9200580013102B39
61639+:108040000A000962AF820068241F002314BFFFF6F4
61640+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
61641+:10806000AD8500208F91FD9C8E4600042564002084
61642+:1080700026450014AE260028240600030E000F81BA
61643+:10808000257000308F87005802002021240600034D
61644+:108090000E000F8124E500083C04080024845BE8FE
61645+:1080A0000E0008AA0000000092230000240A0050DD
61646+:1080B000306200FF544AFFE18F9200580E000F6CAF
61647+:1080C000000000000A000A6A8F920058240800335A
61648+:1080D00014A800323C0380003C1108008E315BE89C
61649+:1080E0008F8FFDA0AC7100208E420008240D002867
61650+:1080F0008F89FD9CADE200308E4A000C24060009F9
61651+:10810000ADEA00348E5F0010ADFF00388E440014DD
61652+:10811000ADE400208E590018ADF900248E58001CE3
61653+:10812000ADF80028A1ED00118E4E00041260003160
61654+:10813000AD2E00288F9200580A000962AF860068B1
61655+:10814000240D002214ADFFB8000000002404000735
61656+:108150003C1008008E105BE83C188000AF10002037
61657+:108160005660FEAEAF8400683C04080024845BE8DF
61658+:108170000E0008AA241300508F84FD9C90920000EA
61659+:10818000325900FF1333014B000000008F9200585A
61660+:10819000000020210A000962AF8400683C05080045
61661+:1081A00024A55BE80E000858240400810A000A6A2E
61662+:1081B0008F92005802D498213265FFFF0E000852BA
61663+:1081C000240400840A0009628F920058108EFF5325
61664+:1081D000240704002887000310E00179241100041B
61665+:1081E000240F0001548FFF4D240740000A000A228B
61666+:1081F000240701003C05080024A55BE80E0008A444
61667+:10820000240400828F920058000030210A00096285
61668+:10821000AF8600683C04080024845BE88CC2003808
61669+:108220000E0008AA8CC3003C8F9200580A000AC0B6
61670+:1082300000002021240400823C05080024A55BE8FE
61671+:108240000E0008A4000000008F92005800001021CA
61672+:108250000A000962AF8200688E5000048F91FD9C75
61673+:108260003C078000ACF00020922C00050200282181
61674+:10827000318B0002156001562404008A8F92FDA004
61675+:108280002404008D9245001B30A6002014C001502C
61676+:1082900002002821922E00092408001231C900FF93
61677+:1082A0001128014B240400810E00087202002021D5
61678+:1082B0009258001B240F000402002021370D0042B9
61679+:1082C000A24D001B0E00087CA22F00253C0580005B
61680+:1082D0008CA401780480FFFE34B90140241F000201
61681+:1082E000AF300000A33F00048F9200583C101000F4
61682+:1082F000ACB001780A000A6B0013102B8E500004FA
61683+:108300008F91FD9C3C038000AC700020922A0005F8
61684+:108310000200282131420002144000172404008A80
61685+:10832000922C00092412000402002821318B00FF46
61686+:1083300011720011240400810E0008720200202135
61687+:108340008F89FDA0240800122405FFFE912F001B39
61688+:108350000200202135EE0020A12E001BA2280009DA
61689+:108360009226000500C538240E00087CA2270005CF
61690+:1083700002002821000020210E0009330000000027
61691+:108380000A000A6A8F9200588E4C00043C07800055
61692+:108390003C10080026105BE8ACEC00203C01080013
61693+:1083A000AC2C5BE8924B0003317100041220013BBE
61694+:1083B0008F84FD9C24020006A0820009924F001BBE
61695+:1083C000240EFFC031E9003F012E4025A08800089F
61696+:1083D0009245000330A6000114C0013200000000E5
61697+:1083E0008E420008AE0200083C0208008C425BF09E
61698+:1083F000104001318F90FDA0000219C28F8DFD9CAD
61699+:10840000A603000C8E4A000C24180001240400145A
61700+:10841000AE0A002C8E420010AE02001C965F0016C1
61701+:10842000A61F003C96590014A619003EADB8000CDA
61702+:10843000A5B80010A5B80012A5B80014A5B800167C
61703+:1084400012600144A2040011925100033232000272
61704+:108450002E5300018F920058266200080A0009621C
61705+:10846000AF8200688E4400043C1980003C068008FE
61706+:10847000AF2400208E45000890D80000240D005045
61707+:10848000331100FF122D009C2407008824060009E8
61708+:108490000E000845000000000A000A6A8F9200588A
61709+:1084A0008E5000043C0980003C118008AD30002053
61710+:1084B0009228000024050050310400FF10850110AF
61711+:1084C0002407008802002021000028210E00084512
61712+:1084D0002406000E922D00002418FF80020028219F
61713+:1084E00001B8802524040004240600300E0007256E
61714+:1084F000A23000000A000A6A8F9200588E500004D1
61715+:108500008F91FDA03C028000AC500020923F001BE8
61716+:1085100033F900101320006C240700810200202191
61717+:10852000000028212406001F0E000845000000005E
61718+:108530000A000A6A8F9200588E44001C0E00085DE3
61719+:1085400000000000104000E3004048218F880058E0
61720+:1085500024070089012020218D05001C240600012C
61721+:108560000E000845000000000A000A6A8F920058B9
61722+:10857000964900023C10080026105BE831280004F0
61723+:10858000110000973C0460008E4E001C3C0F8000E0
61724+:10859000ADEE00203C010800AC2E5BE896470002DF
61725+:1085A00030E40001148000E6000000008E42000468
61726+:1085B000AE0200083C1008008E105BF0120000ECC8
61727+:1085C0003C0F80008F92FD9C241000018E4E0018FD
61728+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
61729+:1085E000A2400005AE50000C3C0808008D085BF06E
61730+:1085F0008F840058A6500010000839C2A6500012FF
61731+:10860000A6500014A6500016A5A7000C8C8C0008DC
61732+:108610008F8B00588F8A0058ADAC002C8D63000CF6
61733+:1086200024070002ADA3001C91460010A1A6001172
61734+:108630008F82005890450011A3E500088F990058DB
61735+:1086400093380012A258004E8F910058922F0013B9
61736+:10865000A1AF00128F920058964E0014A5AE003CB8
61737+:1086600096490016A5A9003E8E480018ADA8001432
61738+:108670005660FD6AAF8700683C05080024A55BE8EA
61739+:108680000E000881000020218F9200580000382140
61740+:108690000A000962AF8700683C05080024A55BE872
61741+:1086A0000E0008A4240400828F9200580A000A4D8C
61742+:1086B000000038210E000F6C000000008F9200585F
61743+:1086C0000A000AC0000020210E00087202002021CA
61744+:1086D0009223001B02002021346A00100E00087C47
61745+:1086E000A22A001B000038210200202100002821BE
61746+:1086F0000A000BA52406001F9242000C305F000107
61747+:1087000013E0000300000000964A000EA4CA002CEB
61748+:10871000924B000C316300025060000600003821CB
61749+:108720008E470014964C0012ACC7001CA4CC001A53
61750+:10873000000038210A000B7F240600093C050800D0
61751+:1087400024A55BE80E0008A42404008B8F92005837
61752+:108750000A000A4D0013382B3C0C08008D8C5BE896
61753+:1087600024DFFFFE25930100326B007F016790211B
61754+:1087700002638824AD110028AE4600E0AE4000E45C
61755+:108780000A0009B3AE5F001CACC000543C0D0800E9
61756+:108790008DAD5BE83C18800C37090100ACED00287A
61757+:1087A0008E510014AD3100E08E4F0014AD2F00E467
61758+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
61759+:1087C0005491FDD6240740000A000A222407100015
61760+:1087D0000E00092D000000000A000A6A8F9200585E
61761+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
61762+:1087F000AC205BE810710062000000003C196C6264
61763+:1088000037387970147800082404000297850074C2
61764+:108810009782006C2404009200A2F82B13E0001948
61765+:1088200002002821240400020E00069524050200FF
61766+:108830003C068000ACC200203C010800AC225BE892
61767+:108840001040000D8F8C0058240A002824040003D7
61768+:10885000918B0010316300FF546A00012404000171
61769+:108860000E0000810000000010400004240400837A
61770+:108870000A000BC28F920058240400833C050800B4
61771+:1088800024A55BE80E000881000000008F920058CC
61772+:108890000013382B0A000962AF8700680A000B49F1
61773+:1088A000240200128E4400080E00085D0000000043
61774+:1088B0000A000B55AE0200083C05080024A55BE841
61775+:1088C0000E000858240400878F9200580A000B728B
61776+:1088D0000013102B240400040E000695240500301C
61777+:1088E0001440002A004048218F8800582407008344
61778+:1088F000012020218D05001C0A000BB32406000175
61779+:108900008F8300788F8600701066FEEE000038219D
61780+:108910003C07080024E75B6C000320C00087282187
61781+:108920008CAE000011D0005D246F000131E3000F18
61782+:108930005466FFFA000320C00A000B8C00003821A7
61783+:108940008E4400040E00085D000000000A000BC801
61784+:10895000AE0200083C05080024A55BE80E0008A450
61785+:10896000240400828F9200580A000B72000010212C
61786+:108970003C05080024A55BE80A000C7C2404008761
61787+:108980008C83442C0A000C5B3C196C628F88005865
61788+:108990003C0780083C0C8000240B0050240A000196
61789+:1089A000AD820020A0EB0000A0EA000191030004CA
61790+:1089B000A0E3001891040005A0E400199106000648
61791+:1089C0003C04080024845B6CA0E6001A91020007B6
61792+:1089D0003C06080024C65B68A0E2001B9105000865
61793+:1089E000A0E5001C911F0009A0FF001D9119000ABD
61794+:1089F000A0F9001E9118000BA0F8001F9112000CA6
61795+:108A0000A0F200209111000DA0F100219110000EA4
61796+:108A1000A0F00022910F000FA0EF0023910E001094
61797+:108A2000A0EE0024910D0011A0ED0025950C00147E
61798+:108A3000A4EC0028950B00168F8A00708F920078A6
61799+:108A4000A4EB002A95030018000A10C02545000178
61800+:108A5000A4E3002C8D1F001C0044C0210046C82147
61801+:108A600030A5000FAF3F0000AF09000010B20006B4
61802+:108A7000AF850070000038218D05001C01202021E9
61803+:108A80000A000BB32406000124AD000131A7000F3A
61804+:108A9000AF8700780A000CF9000038213C06080076
61805+:108AA00024C65B680086902100003821ACA000003D
61806+:108AB0000A000B8CAE4000003C0482013C036000C5
61807+:108AC00034820E02AC603D68AF80009803E000087D
61808+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
61809+:108AE000001018422C620041AFBF00141440000275
61810+:108AF00024040080240300403C010800AC300060E6
61811+:108B00003C010800AC2300640E000F7500602821B2
61812+:108B1000244802BF2409FF8001092824001039805D
61813+:108B2000001030408FBF00148FB0001000A720212C
61814+:108B300000861821AF8300803C010800AC25005856
61815+:108B40003C010800AC24005C03E0000827BD0018CD
61816+:108B5000308300FF30C6FFFF30E400FF3C08800098
61817+:108B60008D0201B80440FFFE000354000144382583
61818+:108B70003C09600000E920253C031000AD050180A0
61819+:108B8000AD060184AD04018803E00008AD0301B81F
61820+:108B90008F8500583C0A6012354800108CAC0004E8
61821+:108BA0003C0D600E35A60010318B00062D690001CA
61822+:108BB000AD0900C48CA70004ACC731808CA20008AA
61823+:108BC00094A40002ACC231848CA3001C0460000396
61824+:108BD000A784009003E00008000000008CAF00189C
61825+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
61826+:108BF0008F8500588F87FF288F86FF308CAE00044A
61827+:108C00003C0F601235E80010ACEE00788CAD000827
61828+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
61829+:108C2000ACCB004894CA00543C0208008C4200447B
61830+:108C300025490001A4C9005494C400543083FFFFA7
61831+:108C400010620017000000003C0208008C42004047
61832+:108C5000A4C200528CA30018ACE300308CA2001414
61833+:108C6000ACE2002C8CB90018ACF900388CB80014B8
61834+:108C700024050001ACF800348D0600BC50C5001975
61835+:108C80008D0200B48D0200B8A4E2004894E40048CC
61836+:108C9000A4E4004A94E800EA03E000083102FFFF80
61837+:108CA0003C0208008C420024A4C00054A4C200521C
61838+:108CB0008CA30018ACE300308CA20014ACE2002CB2
61839+:108CC0008CB90018ACF900388CB8001424050001E8
61840+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
61841+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
61842+:108CF00094E800EA03E000083102FFFF8F86005885
61843+:108D00003C0480008CC900088CC80008000929C0F8
61844+:108D1000000839C0AC87002090C30007306200040F
61845+:108D20001040003EAF85009490CB0007316A0008E8
61846+:108D30001140003D8F87FF2C8CCD000C8CCE001491
61847+:108D400001AE602B11800036000000008CC2000CC8
61848+:108D5000ACE200708CCB00188F85FF288F88FF3025
61849+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
61850+:108D70008CC9000CAD0900608CC4001CACA400D0F0
61851+:108D800090E3007C0062C824A0F9007C90D8000722
61852+:108D9000330F000811E000040000000090ED007C9B
61853+:108DA00035AC0001A0EC007C90CF000731EE000153
61854+:108DB00011C000060000000090E3007C241800347D
61855+:108DC00034790002A0F9007CACB800DC90C2000746
61856+:108DD0003046000210C000040000000090E8007C53
61857+:108DE00035040004A0E4007C90ED007D3C0B600E97
61858+:108DF000356A001031AC003FA0EC007D8D4931D4C4
61859+:108E00003127000110E00002240E0001A0AE00098D
61860+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
61861+:108E20000A000DAF8CC200140A000DB0ACE0007057
61862+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
61863+:108E4000AFB00010AFBF0020AFB10014918F00157C
61864+:108E50003C13600E3673001031EB000FA38B009CA7
61865+:108E60008D8F00048D8B0008959F0012959900103E
61866+:108E70009584001A9598001E958E001C33EDFFFF17
61867+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
61868+:108E90003C010800AC2D00243C010800AC29004432
61869+:108EA0003C010800AC2A0040AE683178AE67317CE6
61870+:108EB00091850015959100163C12601236520010F3
61871+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
61872+:108ED00091830014959F0018240600010066C804C1
61873+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
61874+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
61875+:108F0000918A00159584000E3C07600A314900FFE4
61876+:108F1000AF8B00883084FFFFAE4900C835110010C8
61877+:108F20000E000D1034F004103C0208008C4200606A
61878+:108F30003C0308008C6300643C0608008CC60058A3
61879+:108F40003C0508008CA5005C8F8400808FBF00204A
61880+:108F5000AE23004CAE65319CAE030054AE4500DC40
61881+:108F6000AE6231A0AE6331A4AE663198AE22004845
61882+:108F70008FB3001CAE0200508FB10014AE4200E06F
61883+:108F8000AE4300E4AE4600D88FB000108FB2001898
61884+:108F90000A00057D27BD0028978500929783007CF5
61885+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
61886+:108FB000240400058F900058104000552409000239
61887+:108FC0000E0006958F850080AF8200942404000374
61888+:108FD0001040004F240900023C0680000E00008172
61889+:108FE000ACC2002024070001240820001040004DDE
61890+:108FF00024040005978E00928F8AFF2C24090050CC
61891+:1090000025C50001A7850092A14900003C0D08007C
61892+:109010008DAD0064240380008F84FF28000D66005E
61893+:10902000AD4C0018A5400006954B000A8F85FF3017
61894+:109030002402FF8001633024A546000A915F000AE4
61895+:109040000000482103E2C825A159000AA0A0000899
61896+:10905000A140004CA08000D5961800029783009094
61897+:109060003C020004A49800EA960F00022418FFBFF7
61898+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
61899+:109080008E0C0008ACAC0040A4A00050A4A000547A
61900+:109090008E0B000C240C0030AC8B00288E060010C8
61901+:1090A000AC860024A480003EA487004EA487005014
61902+:1090B000A483003CAD420074AC8800D8ACA800602A
61903+:1090C000A08700FC909F00D433F9007FA09900D4C2
61904+:1090D000909000D402187824A08F00D4914E007C88
61905+:1090E00035CD0001A14D007C938B009CAD480070F4
61906+:1090F000AC8C00DCA08B00D68F8800888F87008422
61907+:10910000AC8800C4AC8700C8A5400078A540007AB0
61908+:109110008FBF00148FB000100120102103E0000861
61909+:1091200027BD00188F8500940E0007258F860080CC
61910+:109130000A000E9F2409000227BDFFE0AFB0001017
61911+:109140008F900058AFB10014AFBF00188E09000413
61912+:109150000E00054A000921C08E0800048F84FF28F4
61913+:109160008F82FF30000839C03C068000ACC7002069
61914+:10917000948500EA904300131460001C30B1FFFF97
61915+:109180008F8CFF2C918B0008316A00401540000B3A
61916+:10919000000000008E0D0004022030218FBF001857
61917+:1091A0008FB100148FB00010240400220000382179
61918+:1091B000000D29C00A000D2F27BD00200E000098C9
61919+:1091C000000000008E0D0004022030218FBF001827
61920+:1091D0008FB100148FB00010240400220000382149
61921+:1091E000000D29C00A000D2F27BD00200E000090A1
61922+:1091F000000000008E0D0004022030218FBF0018F7
61923+:109200008FB100148FB00010240400220000382118
61924+:10921000000D29C00A000D2F27BD002027BDFFE04B
61925+:10922000AFB200183092FFFFAFB00010AFBF001C0C
61926+:10923000AFB100141240001E000080218F8600583C
61927+:109240008CC500002403000600053F02000514023F
61928+:1092500030E4000714830016304500FF2CA80006F8
61929+:1092600011000040000558803C0C0800258C58BCBB
61930+:10927000016C50218D490000012000080000000011
61931+:109280008F8E0098240D000111CD005024020002A1
61932+:10929000AF820098260900013130FFFF24C800206A
61933+:1092A0000212202B010030211480FFE5AF88005806
61934+:1092B000020010218FBF001C8FB200188FB1001464
61935+:1092C0008FB0001003E0000827BD00209387007EC8
61936+:1092D00054E00034000030210E000DE700000000D3
61937+:1092E0008F8600580A000EFF240200018F87009825
61938+:1092F0002405000210E50031240400130000282199
61939+:1093000000003021240700010E000D2F0000000096
61940+:109310000A000F008F8600588F83009824020002F5
61941+:109320001462FFF6240400120E000D9A00000000E3
61942+:109330008F85009400403021240400120E000D2F70
61943+:10934000000038210A000F008F8600588F83009894
61944+:109350002411000310710029241F0002107FFFCE8A
61945+:1093600026090001240400100000282100003021FB
61946+:109370000A000F1D240700018F91009824060002A7
61947+:109380001626FFF9240400100E000E410000000014
61948+:10939000144000238F9800588F8600580A000EFF53
61949+:1093A00024020003240400140E000D2F00002821C5
61950+:1093B0008F8600580A000EFF240200020E000EA93C
61951+:1093C000000000000A000F008F8600580E000D3FBD
61952+:1093D00000000000241900022404001400002821C9
61953+:1093E0000000302100003821AF9900980E000D2FA9
61954+:1093F000000000000A000F008F8600580E000D5775
61955+:10940000000000008F8500942419000200403021E4
61956+:1094100024040010000038210A000F56AF9900986C
61957+:109420000040382124040010970F0002000028217A
61958+:109430000E000D2F31E6FFFF8F8600580A000F0047
61959+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
61960+:109450008C8500182402000100A61824AC83001893
61961+:1094600003E00008A08200053084FFFF30A5FFFF65
61962+:109470001080000700001821308200011040000217
61963+:1094800000042042006518211480FFFB00052840DD
61964+:1094900003E000080060102110C000070000000079
61965+:1094A0008CA2000024C6FFFF24A50004AC820000AB
61966+:1094B00014C0FFFB2484000403E000080000000047
61967+:1094C00010A0000824A3FFFFAC86000000000000ED
61968+:1094D000000000002402FFFF2463FFFF1462FFFA74
61969+:1094E0002484000403E0000800000000000411C010
61970+:1094F00003E000082442024027BDFFE8AFB000109F
61971+:1095000000808021AFBF00140E000F9600A0202124
61972+:1095100000504821240AFF808FBF00148FB0001034
61973+:10952000012A30243127007F3C08800A3C042100B6
61974+:1095300000E8102100C428253C03800027BD001846
61975+:10954000AC650024AF820038AC400000AC6500245C
61976+:1095500003E00008AC4000403C0D08008DAD005811
61977+:1095600000056180240AFF8001A45821016C482174
61978+:10957000012A30243127007F3C08800C3C04210064
61979+:1095800000E8102100C428253C038000AC650028B9
61980+:10959000AF82003403E00008AC40002430A5FFFF98
61981+:1095A0003C0680008CC201B80440FFFE3C086015F8
61982+:1095B00000A838253C031000ACC40180ACC0018475
61983+:1095C000ACC7018803E00008ACC301B83C0D08003B
61984+:1095D0008DAD005800056180240AFF8001A4582148
61985+:1095E000016C4021010A4824000931403107007F05
61986+:1095F00000C728253C04200000A418253C02800058
61987+:10960000AC43083003E00008AF80003427BDFFE81A
61988+:10961000AFB0001000808021AFBF00140E000F9685
61989+:1096200000A0202100504821240BFF80012B502452
61990+:10963000000A39403128007F3C0620008FBF00140B
61991+:109640008FB0001000E8282534C2000100A21825C0
61992+:109650003C04800027BD0018AC83083003E00008FC
61993+:10966000AF8000383C0580088CA700603C0680086D
61994+:109670000087102B144000112C8340008CA8006040
61995+:109680002D0340001060000F240340008CC90060CF
61996+:109690000089282B14A00002008018218CC30060D0
61997+:1096A00000035A42000B30803C0A0800254A59202A
61998+:1096B00000CA202103E000088C8200001460FFF340
61999+:1096C0002403400000035A42000B30803C0A08008B
62000+:1096D000254A592000CA202103E000088C8200009E
62001+:1096E0003C05800890A60008938400AB24C20001CA
62002+:1096F000304200FF3043007F1064000C0002382726
62003+:10970000A0A200083C0480008C85017804A0FFFE24
62004+:109710008F8A00A0240900023C081000AC8A014096
62005+:10972000A089014403E00008AC8801780A00101BFE
62006+:1097300030E2008027BDFFD8AFB200188F9200A49E
62007+:10974000AFBF0020AFB3001CAFB00010AFB100142A
62008+:109750008F9300348E5900283C1000803C0EFFEFA0
62009+:10976000AE7900008E580024A260000A35CDFFFFBC
62010+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
62011+:10978000A271000C8E6F000C3C080040A271000B0F
62012+:1097900001F06025018D4824012A382400E8302595
62013+:1097A000AE66000C8E450004AE6000183C0400FF5D
62014+:1097B000AE6500148E43002C3482FFFFA6600008C3
62015+:1097C0000062F824AE7F00108E5900088F9000A030
62016+:1097D000964E0012AE7900208E51000C31D83FFF1A
62017+:1097E00000187980AE7100248E4D001401F06021C4
62018+:1097F00031CB0001AE6D00288E4A0018000C41C22A
62019+:10980000000B4B80AE6A002C8E46001C01093821EB
62020+:10981000A667001CAE660030964500028E4400200C
62021+:10982000A665001EAE64003492430033306200042B
62022+:1098300054400006924700003C0280083443010077
62023+:109840008C7F00D0AE7F0030924700008F860038BA
62024+:10985000A0C700309245003330A4000250800007BA
62025+:10986000925100018F880038240BFF80910A00304C
62026+:10987000014B4825A1090030925100018F9000381A
62027+:10988000240CFFBF2404FFDFA21100318F8D0038AC
62028+:109890003C1880083711008091AF003C31EE007F0A
62029+:1098A000A1AE003C8F890038912B003C016C502404
62030+:1098B000A12A003C8F9F00388E68001493E6003C7C
62031+:1098C0002D0700010007114000C4282400A218251C
62032+:1098D000A3E3003C8F87003896590012A4F90032A8
62033+:1098E0008E450004922E007C30B0000300107823D7
62034+:1098F00031ED000300AD102131CC000215800002D3
62035+:1099000024460034244600303C0280083443008062
62036+:10991000907F007C00BFC824333800041700000289
62037+:1099200024C2000400C010218F98003824190002BE
62038+:10993000ACE20034A3190000924F003F8F8E003834
62039+:109940003C0C8008358B0080A1CF00018F9100383E
62040+:10995000924D003F8E440004A62D0002956A005CE3
62041+:109960000E000FF43150FFFF00024B800209382532
62042+:109970003C08420000E82825AE2500048E4400384B
62043+:109980008F850038ACA400188E460034ACA6001CAD
62044+:10999000ACA0000CACA00010A4A00014A4A0001661
62045+:1099A000A4A00020A4A00022ACA000248E62001479
62046+:1099B00050400001240200018FBF00208FB3001C23
62047+:1099C0008FB200188FB100148FB00010ACA2000845
62048+:1099D0000A00101327BD002827BDFFC83C058008DA
62049+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
62050+:1099F000AFB60028AFB50024AFB40020AFB3001C51
62051+:109A0000AFB20018AFB10014AFB00010948300786B
62052+:109A10009482007A104300512405FFFF0080F0215A
62053+:109A20000A0011230080B821108B004D8FBF003435
62054+:109A30008F8600A03C1808008F18005C2411FF805E
62055+:109A40003C1680000306782101F18024AED0002C62
62056+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
62057+:109A6000018D5021000B4840012AA82196A4000036
62058+:109A70003C0808008D0800582405FF8030953FFF02
62059+:109A800001061821001539800067C8210325F82434
62060+:109A90003C02010003E290253338007F3C11800C2A
62061+:109AA000AED20028031190219250000D320F000415
62062+:109AB00011E0003702E0982196E3007A96E8007AF8
62063+:109AC00096E5007A2404800031077FFF24E300013B
62064+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
62065+:109AE00096E6007A3C1408008E94006030D67FFF22
62066+:109AF00012D400C1000000008E5800188F8400A00E
62067+:109B000002A028212713FFFF0E000FCEAE53002C1A
62068+:109B100097D5007897D4007A12950010000028217C
62069+:109B20003C098008352401003C0A8008914800085F
62070+:109B3000908700D53114007F30E400FF0284302B81
62071+:109B400014C0FFB9268B0001938E00AB268C000158
62072+:109B5000008E682115ACFFB78F8600A08FBF003440
62073+:109B60008FBE00308FB7002C8FB600288FB5002431
62074+:109B70008FB400208FB3001C8FB200188FB1001477
62075+:109B80008FB0001000A0102103E0000827BD0038AE
62076+:109B900000C020210E000F99028028218E4B00105A
62077+:109BA0008E4C00308F84003824090002016C502351
62078+:109BB000AE4A0010A089000096E3005C8E4400309D
62079+:109BC0008F9100380E000FF43070FFFF00024380C9
62080+:109BD000020838253C02420000E22825AE25000498
62081+:109BE0008E5F00048F8A00388E590000240B000815
62082+:109BF000AD5F001CAD590018AD40000CAD40001029
62083+:109C00009246000A240400052408C00030D000FF5A
62084+:109C1000A550001496580008A55800169251000A45
62085+:109C20003C188008322F00FFA54F0020964E0008F8
62086+:109C300037110100A54E0022AD400024924D000BCB
62087+:109C400031AC00FFA54C0002A14B00018E49003051
62088+:109C50008F830038240BFFBFAC690008A06400307C
62089+:109C60008F9000382403FFDF9607003200E8282495
62090+:109C700000B51025A6020032921F003233F9003FD2
62091+:109C800037260040A20600328F8C0038AD800034A9
62092+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
62093+:109CA00031CD007FA18D003C8F84003835EEFFFF61
62094+:109CB000908A003C014B4824A089003C8F850038E5
62095+:109CC00090A8003C01033824A0A7003C8E42003439
62096+:109CD0008F9100383C038008AE2200408E59002C42
62097+:109CE0008E5F0030033F3023AE26004492300048A0
62098+:109CF0003218007FA23800488F8800388E4D00301F
62099+:109D00008D0C004801AE582401965024014B482583
62100+:109D1000AD0900489244000AA104004C964700088F
62101+:109D20008F850038A4A7004E8E5000308E4400303E
62102+:109D30000E0003818C65006092F9007C0002F940FE
62103+:109D4000004028210002110003E2302133360002D6
62104+:109D500012C00003020680210005B0800216802197
62105+:109D6000926D007C31B30004126000020005708027
62106+:109D7000020E80218E4B00308F8800382405800031
62107+:109D8000316A0003000A4823312400030204182129
62108+:109D9000AD03003496E4007A96F0007A96F1007AEA
62109+:109DA00032027FFF2447000130FF7FFF0225C824D5
62110+:109DB000033F3025A6E6007A96F8007A3C120800A8
62111+:109DC0008E520060330F7FFF11F200180000000078
62112+:109DD0008F8400A00E000FCE02A028218F8400A047
62113+:109DE0000E000FDE028028210E001013000000007C
62114+:109DF0000A00111F0000000096F1007A022480245E
62115+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
62116+:109E1000000E69C2000D6027000C51C03169007F3F
62117+:109E2000012A20250A001119A2E4007A96E6007A98
62118+:109E300000C5C024A6F8007A92EF007A92F3007A67
62119+:109E400031F200FF001271C2000E6827000DB1C090
62120+:109E5000326C007F01962825A2E5007A0A0011D015
62121+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
62122+:109E7000AC640018AC65001C03E000088C620014A0
62123+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
62124+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
62125+:109EA000AFB30044AFB20040AFB1003CAFB0003838
62126+:109EB00034C80100910500D590C700083084FFFF29
62127+:109EC00030A500FF30E2007F0045182AAFA4001043
62128+:109ED000A7A00018A7A0002610600055AFA000148E
62129+:109EE00090CA00083149007F00A9302324D3FFFF26
62130+:109EF0000013802B8FB400100014902B02128824C2
62131+:109F0000522000888FB300143C03800894790052DB
62132+:109F1000947E00508FB60010033EC0230018BC0092
62133+:109F2000001714030016FC0002C2A82A16A00002A3
62134+:109F3000001F2C030040282100133C0000072403CD
62135+:109F400000A4102A5440000100A020212885000907
62136+:109F500014A000020080A021241400083C0C8008FA
62137+:109F60008D860048001459808D88004C3C03800089
62138+:109F70003169FFFF3C0A0010012A202534710400DA
62139+:109F8000AC660038AF9100A4AC68003CAC64003013
62140+:109F900000000000000000000000000000000000C1
62141+:109FA00000000000000000000000000000000000B1
62142+:109FB0008C6E000031CD002011A0FFFD0014782A26
62143+:109FC00001F01024104000390000A8213C16800840
62144+:109FD00092D700083C1280008E44010032F6007FC8
62145+:109FE0000E000F9902C028218E3900108E44010006
62146+:109FF0000000902133373FFF0E000FB102E028210F
62147+:10A00000923800003302003F2C500008520000102C
62148+:10A0100000008821000210803C030800246358E4FB
62149+:10A020000043F8218FFE000003C00008000000007C
62150+:10A0300090CF0008938C00AB31EE007F00AE682318
62151+:10A04000018D58210A0012172573FFFF0000882197
62152+:10A050003C1E80008FC401000E000FCE02E02821BC
62153+:10A060008FC401000E000FDE02C028211220000F55
62154+:10A070000013802B8F8B00A426A400010004AC00E9
62155+:10A08000027298230015AC032578004002B4B02A70
62156+:10A090000013802B241700010300882102D0102414
62157+:10A0A000AF9800A41440FFC9AFB700143C07800864
62158+:10A0B00094E200508FAE00103C05800002A288217F
62159+:10A0C0003C060020A4F10050ACA6003094F40050EF
62160+:10A0D00094EF005201D51823306CFFFF11F4001EDD
62161+:10A0E000AFAC00108CEF004C001561808CF500487F
62162+:10A0F00001EC28210000202100AC582B02A4C02133
62163+:10A10000030BB021ACE5004CACF600488FB4001056
62164+:10A110000014902B021288241620FF7C3C03800838
62165+:10A120008FB300148FBF005C8FBE00583A620001ED
62166+:10A130008FB700548FB600508FB5004C8FB40048D5
62167+:10A140008FB300448FB200408FB1003C8FB0003815
62168+:10A1500003E0000827BD006094FE00548CF2004428
62169+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
62170+:10A170008CE800448CAD003C010D50231940003B9D
62171+:10A18000000000008CF7004026E20001ACA200387D
62172+:10A190003C05005034A700103C038000AC67003041
62173+:10A1A00000000000000000000000000000000000AF
62174+:10A1B000000000000000000000000000000000009F
62175+:10A1C0008C7800003316002012C0FFFD3C1180087F
62176+:10A1D000962200543C1580003C068008304E000159
62177+:10A1E000000E18C0007578218DEC04003C070800B3
62178+:10A1F0008CE700443C040020ACCC00488DF40404FF
62179+:10A20000240B0001ACD4004C10EB0260AEA4003073
62180+:10A21000963900523C0508008CA5004000B99021F9
62181+:10A22000A6320052963F005427ED0001A62D00549F
62182+:10A230009626005430C4FFFF5487FF2F8FB40010C0
62183+:10A2400030A5FFFF0E0011F4A62000543C070800C3
62184+:10A250008CE70024963E00520047B82303D74823DA
62185+:10A26000A62900520A0012198FB400108CE2004097
62186+:10A270000A0012BE00000000922400012407000121
62187+:10A280003085007F14A7001C97AD00268E2B00148C
62188+:10A29000240CC000316A3FFF01AC48243C06080092
62189+:10A2A0008CC60060012A402531043FFF0086882BC0
62190+:10A2B00012200011A7A800263C0508008CA5005814
62191+:10A2C0008F9100A0000439802402FF8000B1182182
62192+:10A2D0000067F82103E2F02433F8007F3C1280008D
62193+:10A2E0003C19800EAE5E002C0319702191D0000D38
62194+:10A2F000360F0004A1CF000D0E001028241200011B
62195+:10A30000241100013C1E80008FC401000E000FCEFE
62196+:10A3100002E028218FC401000E000FDE02C02821B8
62197+:10A320001620FF558F8B00A40A0012860013802B85
62198+:10A330008F8600A490C80001310400201080019194
62199+:10A34000241000013C048008348B0080916A007C5A
62200+:10A350008F9E0034AFA0002C314900011120000F66
62201+:10A36000AFB000288CCD00148C8E006001AE602B45
62202+:10A370001580000201A038218C8700603C188008FD
62203+:10A38000370300808C70007000F0782B15E000021D
62204+:10A3900000E020218C640070AFA4002C3C028008F7
62205+:10A3A000344500808CD200148CBF0070025FC82B33
62206+:10A3B00017200002024020218CA400708FA7002CDF
62207+:10A3C0000087182310600003AFA3003024050002AB
62208+:10A3D000AFA500288FA400280264882B162000BA9D
62209+:10A3E000000018218CD000388FCE000C3C0F00806C
62210+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
62211+:10A40000AFCD000490CA003F3586FFFF01662024CF
62212+:10A410003C0900203C08FFEFA3CA000B0089382547
62213+:10A420003511FFFF00F118243C0500088F8700A4B8
62214+:10A430000065C825AFD9000C8CE20014AFC000182D
62215+:10A440008FA60030AFC200148CF800188FB0002C1B
62216+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
62217+:10A4600003326824AFCF00248CEC000C020670216C
62218+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
62219+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
62220+:10A49000014B48230126402311000011AFC80010D2
62221+:10A4A00090EB003D8FC900048FC80000000B5100E5
62222+:10A4B000012A28210000102100AA882B010218215E
62223+:10A4C0000071F821AFC50004AFDF000090F2003D3D
62224+:10A4D000A3D2000A8F9900A497380006A7D80008D5
62225+:10A4E0008F910038240800023C038008A228000055
62226+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
62227+:10A500000E000FF48F9200380002CB808F8500A4DC
62228+:10A51000021978253C18420001F87025AE4E00045F
62229+:10A520008F8400388CAD0038AC8D00188CAC0034B2
62230+:10A53000AC8C001CAC80000CAC800010A48000141B
62231+:10A54000A4800016A4800020A4800022AC800024F7
62232+:10A5500090A6003F8FA7002CA486000250E0019235
62233+:10A56000240700018FA200305040000290A2003D5D
62234+:10A5700090A2003E244A0001A08A00018F84003886
62235+:10A580008FA9002CAC8900083C128008364D008051
62236+:10A5900091AC007C3186000214C000022407003414
62237+:10A5A000240700308F8500A43C198008373F0080C5
62238+:10A5B00090B0000093F9007C240E0004A0900030BD
62239+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
62240+:10A5D0003304000301C46023A1B200318F8E003820
62241+:10A5E0008F8600A42402C00095CA003294C90012CC
62242+:10A5F0008FAB002C0142402431233FFF010388250B
62243+:10A60000A5D1003291D000323185000300EBF82152
62244+:10A610003218003F370F0040A1CF00328FA4002C2A
62245+:10A6200003E5382133280004108000028F850038AC
62246+:10A6300000E838213C0A8008ACA700343549010005
62247+:10A640008D2800D08FA3002C2419FFBFACA80038A0
62248+:10A6500090B1003C2C640001240FFFDF3227007F03
62249+:10A66000A0A7003C8F98003800049140931F003C45
62250+:10A6700003F98024A310003C8F8C0038918E003C9D
62251+:10A6800001CF682401B23025A186003C8F8900A447
62252+:10A690008F8800388D2B0020AD0B00408D220024C8
62253+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
62254+:10A6B0000E001013AD03004C8FB1002824070002D8
62255+:10A6C000122700118FA300280003282B00058023E8
62256+:10A6D0000270982400608021006090210A00126FAF
62257+:10A6E0000010882B962900128F8400A00000902172
62258+:10A6F0003125FFFFA7A900180E000FC22411000189
62259+:10A700000A00131D3C1E80003C0B80003C12800898
62260+:10A710008D640100924900088F92FF340E000F995A
62261+:10A720003125007F8F9900388FA700288FA4003033
62262+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
62263+:10A740008F91003800026B80020D80253C0842008A
62264+:10A750008F8D00A402085025AE2A00048DA5003874
62265+:10A760008F8A003800007821000F1100AD450018D5
62266+:10A770008DB800343C047FFF3488FFFFAD58001CC7
62267+:10A7800091A6003E8D4C001C8D4900180006190052
62268+:10A79000000677020183C821004E58250323882B29
62269+:10A7A000012B382100F1F821AD59001CAD5F0018D4
62270+:10A7B000AD40000CAD40001091B0003E8FA40030C1
62271+:10A7C00024090005A550001495A500042419C00013
62272+:10A7D00000884024A545001691B8003EA5580020E9
62273+:10A7E00095AF0004A54F0022AD40002491AE003F7C
62274+:10A7F000A54E000291A6003E91AC003D01861023BB
62275+:10A80000244B0001A14B00018F9100388FA3003031
62276+:10A810003C028008344B0100AE230008A22900301E
62277+:10A820008F8C00388F8700A4959F003294F000121F
62278+:10A830002407FFBF033FC02432053FFF03057825EF
62279+:10A84000A58F0032918E00322418FFDF31CD003FFA
62280+:10A8500035A60040A18600328F910038240DFFFFFD
62281+:10A86000240CFF80AE2000348D6A00D0AE2A003860
62282+:10A870009223003C3069007FA229003C8F90003871
62283+:10A880003C0380009219003C0327F824A21F003CDF
62284+:10A890008F8E003891C5003C00B87824A1CF003CD1
62285+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
62286+:10A8B000AD46004491420048004C5825A14B004849
62287+:10A8C0008F9000388F9900A48E09004801238824B6
62288+:10A8D00002283825AE070048933F003EA21F004CD7
62289+:10A8E0008F9800A48F8F003897050004A5E5004ECF
62290+:10A8F0000E0003818DC500609246007C8FAC003055
62291+:10A9000000026940000291000040282130CB000283
62292+:10A9100001B21021156000AA018230213C0E80088E
62293+:10A9200035C20080904C007C31830004106000032D
62294+:10A930008FB900300005788000CF3021241F00043B
62295+:10A940008F910038332D000303ED8023320800037C
62296+:10A9500000C85021AE2A00343C188000A7C500383A
62297+:10A960003C0680088F04010090DE00080E000FDE18
62298+:10A9700033C5007F0E001013000000000A00140D04
62299+:10A980008FA300288F9800348CC90038241F00033F
62300+:10A99000A7000008AF0900008CC50034A300000A1E
62301+:10A9A0008F9900A4AF0500043C080080932D003F60
62302+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
62303+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
62304+:10A9D00003D170243646FFFF01C61824AF03000CD4
62305+:10A9E0008F2C0014972900128F8400A0AF0C001048
62306+:10A9F0008F2F0014AF000018AF000020AF0F00141D
62307+:10AA0000AF0000248F270018312F3FFF000F59801F
62308+:10AA1000AF0700288F2500080164F821312D0001BF
62309+:10AA2000AF0500308F31000C8F920038001F51C2EB
62310+:10AA3000000D438001481021241E00023C068008BE
62311+:10AA4000A702001CA7000034AF11002CA25E00007A
62312+:10AA500034D20080964E005C8F9900383C0342004F
62313+:10AA600031CCFFFF01833825AF2700048F8B00A472
62314+:10AA7000240500012402C0008D640038240700343E
62315+:10AA8000AF2400188D690034AF29001CAF20000CE2
62316+:10AA9000AF200010A7200014A7200016A720002038
62317+:10AAA000A7200022AF200024A7300002A325000128
62318+:10AAB0008F8800388F9F00A4AD10000893ED000030
62319+:10AAC000A10D00308F8A00A48F98003891510001A9
62320+:10AAD000A31100318F8B0038957E003203C27024A1
62321+:10AAE00001CF6025A56C0032916300323064003FD5
62322+:10AAF000A16400329249007C3125000214A00002BA
62323+:10AB00008F840038240700303C198008AC8700345B
62324+:10AB1000373201008E5F00D0240AFFBF020090216F
62325+:10AB2000AC9F0038908D003C31A8007FA088003C8D
62326+:10AB30008F9E003893C2003C004A8824A3D1003C79
62327+:10AB40008F8300380010882B9066003C34CE0020A4
62328+:10AB5000A06E003C8F8400A48F9800388C8C00205D
62329+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
62330+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
62331+:10AB80003C1E80000A0012700000000094C80052B1
62332+:10AB90003C0A08008D4A002401488821A4D10052B3
62333+:10ABA0000A0012198FB40010A08700018F840038AA
62334+:10ABB000240B0001AC8B00080A0013BE3C12800875
62335+:10ABC000000520800A0014A200C4302127BDFFE048
62336+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
62337+:10ABE000AFB1001435B200808E4C001835A80100BA
62338+:10ABF000964B000695A70050910900FC000C5602E8
62339+:10AC0000016728233143007F312600FF240200031F
62340+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
62341+:10AC2000910600FC2412000530C200FF10520033D0
62342+:10AC300000000000160000098FBF001C8FB2001832
62343+:10AC40008FB100148FB00010240D0C003C0C80005C
62344+:10AC500027BD002003E00008AD8D00240E0011FB8D
62345+:10AC6000020020218FBF001C8FB200188FB100148A
62346+:10AC70008FB00010240D0C003C0C800027BD00207C
62347+:10AC800003E00008AD8D0024965800789651007AB4
62348+:10AC9000924E007D0238782631E8FFFF31C400C0B3
62349+:10ACA000148000092D11000116000037000000007B
62350+:10ACB0005620FFE28FBF001C0E0010D100000000E4
62351+:10ACC0000A00156A8FBF001C1620FFDA0000000082
62352+:10ACD0000E0010D1000000001440FFD88FBF001CF0
62353+:10ACE0001600002200000000925F007D33E2003F6A
62354+:10ACF000A242007D0A00156A8FBF001C950900EA78
62355+:10AD00008F86008000802821240400050E0007257E
62356+:10AD10003130FFFF978300923C0480002465FFFFE1
62357+:10AD2000A78500928C8A01B80540FFFE0000000054
62358+:10AD3000AC8001808FBF001CAC9001848FB20018E2
62359+:10AD40008FB100148FB000103C0760133C0B100053
62360+:10AD5000240D0C003C0C800027BD0020AC8701882E
62361+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
62362+:10AD7000020020215040FFB18FBF001C925F007D78
62363+:10AD80000A00159733E2003F0E0011FB020020215C
62364+:10AD90001440FFAA8FBF001C122000070000000013
62365+:10ADA0009259007D3330003F36020040A242007DC0
62366+:10ADB0000A00156A8FBF001C0E0010D100000000B1
62367+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
62368+:10ADD0000A0015C636020040000000000000001BFB
62369+:10ADE0000000000F0000000A00000008000000063C
62370+:10ADF0000000000500000005000000040000000441
62371+:10AE00000000000300000003000000030000000336
62372+:10AE10000000000300000002000000020000000229
62373+:10AE2000000000020000000200000002000000021A
62374+:10AE3000000000020000000200000002000000020A
62375+:10AE400000000002000000020000000200000002FA
62376+:10AE50000000000100000001000000018008010066
62377+:10AE6000800800808008000000000C000000308096
62378+:10AE7000080011D00800127C08001294080012A8E3
62379+:10AE8000080012BC080011D0080011D0080012F010
62380+:10AE90000800132C080013400800138808001A8CBF
62381+:10AEA00008001A8C08001AC408001AC408001AD82E
62382+:10AEB00008001AA808001D0008001CCC08001D5836
62383+:10AEC00008001D5808001DE008001D108008024001
62384+:10AED000080027340800256C0800275C080027F4C8
62385+:10AEE0000800293C0800298808002AAC080029B479
62386+:10AEF00008002A38080025DC08002EDC08002EA4F3
62387+:10AF000008002588080025880800258808002B20CF
62388+:10AF100008002B20080025880800258808002DD06F
62389+:10AF2000080025880800258808002588080025884D
62390+:10AF300008002E0C080025880800258808002588B0
62391+:10AF4000080025880800258808002588080025882D
62392+:10AF5000080025880800258808002588080025881D
62393+:10AF6000080025880800258808002588080029A8E9
62394+:10AF7000080025880800258808002E680800258814
62395+:10AF800008002588080025880800258808002588ED
62396+:10AF900008002588080025880800258808002588DD
62397+:10AFA00008002588080025880800258808002588CD
62398+:10AFB00008002588080025880800258808002588BD
62399+:10AFC00008002CF4080025880800258808002C6853
62400+:10AFD00008002BC408003CE408003CB808003C848E
62401+:10AFE00008003C5808003C3808003BEC8008010091
62402+:10AFF00080080080800800008008008008004C6401
62403+:10B0000008004C9C08004BE408004C6408004C64A9
62404+:10B01000080049B808004C64080050500A000C842D
62405+:10B0200000000000000000000000000D7278703683
62406+:10B030002E322E31620000000602010300000000E3
62407+:10B0400000000001000000000000000000000000FF
62408+:10B0500000000000000000000000000000000000F0
62409+:10B0600000000000000000000000000000000000E0
62410+:10B0700000000000000000000000000000000000D0
62411+:10B0800000000000000000000000000000000000C0
62412+:10B0900000000000000000000000000000000000B0
62413+:10B0A00000000000000000000000000000000000A0
62414+:10B0B0000000000000000000000000000000000090
62415+:10B0C0000000000000000000000000000000000080
62416+:10B0D0000000000000000000000000000000000070
62417+:10B0E0000000000000000000000000000000000060
62418+:10B0F0000000000000000000000000000000000050
62419+:10B10000000000000000000000000000000000003F
62420+:10B11000000000000000000000000000000000002F
62421+:10B12000000000000000000000000000000000001F
62422+:10B13000000000000000000000000000000000000F
62423+:10B1400000000000000000000000000000000000FF
62424+:10B1500000000000000000000000000000000000EF
62425+:10B1600000000000000000000000000000000000DF
62426+:10B1700000000000000000000000000000000000CF
62427+:10B1800000000000000000000000000000000000BF
62428+:10B1900000000000000000000000000000000000AF
62429+:10B1A000000000000000000000000000000000009F
62430+:10B1B000000000000000000000000000000000008F
62431+:10B1C000000000000000000000000000000000007F
62432+:10B1D000000000000000000000000000000000006F
62433+:10B1E000000000000000000000000000000000005F
62434+:10B1F000000000000000000000000000000000004F
62435+:10B20000000000000000000000000000000000003E
62436+:10B21000000000000000000000000000000000002E
62437+:10B22000000000000000000000000000000000001E
62438+:10B23000000000000000000000000000000000000E
62439+:10B2400000000000000000000000000000000000FE
62440+:10B2500000000000000000000000000000000000EE
62441+:10B2600000000000000000000000000000000000DE
62442+:10B2700000000000000000000000000000000000CE
62443+:10B2800000000000000000000000000000000000BE
62444+:10B2900000000000000000000000000000000000AE
62445+:10B2A000000000000000000000000000000000009E
62446+:10B2B000000000000000000000000000000000008E
62447+:10B2C000000000000000000000000000000000007E
62448+:10B2D000000000000000000000000000000000006E
62449+:10B2E000000000000000000000000000000000005E
62450+:10B2F000000000000000000000000000000000004E
62451+:10B30000000000000000000000000000000000003D
62452+:10B31000000000000000000000000000000000002D
62453+:10B32000000000000000000000000000000000001D
62454+:10B33000000000000000000000000000000000000D
62455+:10B3400000000000000000000000000000000000FD
62456+:10B3500000000000000000000000000000000000ED
62457+:10B3600000000000000000000000000000000000DD
62458+:10B3700000000000000000000000000000000000CD
62459+:10B3800000000000000000000000000000000000BD
62460+:10B3900000000000000000000000000000000000AD
62461+:10B3A000000000000000000000000000000000009D
62462+:10B3B000000000000000000000000000000000008D
62463+:10B3C000000000000000000000000000000000007D
62464+:10B3D000000000000000000000000000000000006D
62465+:10B3E000000000000000000000000000000000005D
62466+:10B3F000000000000000000000000000000000004D
62467+:10B40000000000000000000000000000000000003C
62468+:10B41000000000000000000000000000000000002C
62469+:10B42000000000000000000000000000000000001C
62470+:10B43000000000000000000000000000000000000C
62471+:10B4400000000000000000000000000000000000FC
62472+:10B4500000000000000000000000000000000000EC
62473+:10B4600000000000000000000000000000000000DC
62474+:10B4700000000000000000000000000000000000CC
62475+:10B4800000000000000000000000000000000000BC
62476+:10B4900000000000000000000000000000000000AC
62477+:10B4A000000000000000000000000000000000009C
62478+:10B4B000000000000000000000000000000000008C
62479+:10B4C000000000000000000000000000000000007C
62480+:10B4D000000000000000000000000000000000006C
62481+:10B4E000000000000000000000000000000000005C
62482+:10B4F000000000000000000000000000000000004C
62483+:10B50000000000000000000000000000000000003B
62484+:10B51000000000000000000000000000000000002B
62485+:10B52000000000000000000000000000000000001B
62486+:10B53000000000000000000000000000000000000B
62487+:10B5400000000000000000000000000000000000FB
62488+:10B5500000000000000000000000000000000000EB
62489+:10B5600000000000000000000000000000000000DB
62490+:10B5700000000000000000000000000000000000CB
62491+:10B5800000000000000000000000000000000000BB
62492+:10B5900000000000000000000000000000000000AB
62493+:10B5A000000000000000000000000000000000009B
62494+:10B5B000000000000000000000000000000000008B
62495+:10B5C000000000000000000000000000000000007B
62496+:10B5D000000000000000000000000000000000006B
62497+:10B5E000000000000000000000000000000000005B
62498+:10B5F000000000000000000000000000000000004B
62499+:10B60000000000000000000000000000000000003A
62500+:10B61000000000000000000000000000000000002A
62501+:10B62000000000000000000000000000000000001A
62502+:10B63000000000000000000000000000000000000A
62503+:10B6400000000000000000000000000000000000FA
62504+:10B6500000000000000000000000000000000000EA
62505+:10B6600000000000000000000000000000000000DA
62506+:10B6700000000000000000000000000000000000CA
62507+:10B6800000000000000000000000000000000000BA
62508+:10B6900000000000000000000000000000000000AA
62509+:10B6A000000000000000000000000000000000009A
62510+:10B6B000000000000000000000000000000000008A
62511+:10B6C000000000000000000000000000000000007A
62512+:10B6D000000000000000000000000000000000006A
62513+:10B6E000000000000000000000000000000000005A
62514+:10B6F000000000000000000000000000000000004A
62515+:10B700000000000000000000000000000000000039
62516+:10B710000000000000000000000000000000000029
62517+:10B720000000000000000000000000000000000019
62518+:10B730000000000000000000000000000000000009
62519+:10B7400000000000000000000000000000000000F9
62520+:10B7500000000000000000000000000000000000E9
62521+:10B7600000000000000000000000000000000000D9
62522+:10B7700000000000000000000000000000000000C9
62523+:10B7800000000000000000000000000000000000B9
62524+:10B7900000000000000000000000000000000000A9
62525+:10B7A0000000000000000000000000000000000099
62526+:10B7B0000000000000000000000000000000000089
62527+:10B7C0000000000000000000000000000000000079
62528+:10B7D0000000000000000000000000000000000069
62529+:10B7E0000000000000000000000000000000000059
62530+:10B7F0000000000000000000000000000000000049
62531+:10B800000000000000000000000000000000000038
62532+:10B810000000000000000000000000000000000028
62533+:10B820000000000000000000000000000000000018
62534+:10B830000000000000000000000000000000000008
62535+:10B8400000000000000000000000000000000000F8
62536+:10B8500000000000000000000000000000000000E8
62537+:10B8600000000000000000000000000000000000D8
62538+:10B8700000000000000000000000000000000000C8
62539+:10B8800000000000000000000000000000000000B8
62540+:10B8900000000000000000000000000000000000A8
62541+:10B8A0000000000000000000000000000000000098
62542+:10B8B0000000000000000000000000000000000088
62543+:10B8C0000000000000000000000000000000000078
62544+:10B8D0000000000000000000000000000000000068
62545+:10B8E0000000000000000000000000000000000058
62546+:10B8F0000000000000000000000000000000000048
62547+:10B900000000000000000000000000000000000037
62548+:10B910000000000000000000000000000000000027
62549+:10B920000000000000000000000000000000000017
62550+:10B930000000000000000000000000000000000007
62551+:10B9400000000000000000000000000000000000F7
62552+:10B9500000000000000000000000000000000000E7
62553+:10B9600000000000000000000000000000000000D7
62554+:10B9700000000000000000000000000000000000C7
62555+:10B9800000000000000000000000000000000000B7
62556+:10B9900000000000000000000000000000000000A7
62557+:10B9A0000000000000000000000000000000000097
62558+:10B9B0000000000000000000000000000000000087
62559+:10B9C0000000000000000000000000000000000077
62560+:10B9D0000000000000000000000000000000000067
62561+:10B9E0000000000000000000000000000000000057
62562+:10B9F0000000000000000000000000000000000047
62563+:10BA00000000000000000000000000000000000036
62564+:10BA10000000000000000000000000000000000026
62565+:10BA20000000000000000000000000000000000016
62566+:10BA30000000000000000000000000000000000006
62567+:10BA400000000000000000000000000000000000F6
62568+:10BA500000000000000000000000000000000000E6
62569+:10BA600000000000000000000000000000000000D6
62570+:10BA700000000000000000000000000000000000C6
62571+:10BA800000000000000000000000000000000000B6
62572+:10BA900000000000000000000000000000000000A6
62573+:10BAA0000000000000000000000000000000000096
62574+:10BAB0000000000000000000000000000000000086
62575+:10BAC0000000000000000000000000000000000076
62576+:10BAD0000000000000000000000000000000000066
62577+:10BAE0000000000000000000000000000000000056
62578+:10BAF0000000000000000000000000000000000046
62579+:10BB00000000000000000000000000000000000035
62580+:10BB10000000000000000000000000000000000025
62581+:10BB20000000000000000000000000000000000015
62582+:10BB30000000000000000000000000000000000005
62583+:10BB400000000000000000000000000000000000F5
62584+:10BB500000000000000000000000000000000000E5
62585+:10BB600000000000000000000000000000000000D5
62586+:10BB700000000000000000000000000000000000C5
62587+:10BB800000000000000000000000000000000000B5
62588+:10BB900000000000000000000000000000000000A5
62589+:10BBA0000000000000000000000000000000000095
62590+:10BBB0000000000000000000000000000000000085
62591+:10BBC0000000000000000000000000000000000075
62592+:10BBD0000000000000000000000000000000000065
62593+:10BBE0000000000000000000000000000000000055
62594+:10BBF0000000000000000000000000000000000045
62595+:10BC00000000000000000000000000000000000034
62596+:10BC10000000000000000000000000000000000024
62597+:10BC20000000000000000000000000000000000014
62598+:10BC30000000000000000000000000000000000004
62599+:10BC400000000000000000000000000000000000F4
62600+:10BC500000000000000000000000000000000000E4
62601+:10BC600000000000000000000000000000000000D4
62602+:10BC700000000000000000000000000000000000C4
62603+:10BC800000000000000000000000000000000000B4
62604+:10BC900000000000000000000000000000000000A4
62605+:10BCA0000000000000000000000000000000000094
62606+:10BCB0000000000000000000000000000000000084
62607+:10BCC0000000000000000000000000000000000074
62608+:10BCD0000000000000000000000000000000000064
62609+:10BCE0000000000000000000000000000000000054
62610+:10BCF0000000000000000000000000000000000044
62611+:10BD00000000000000000000000000000000000033
62612+:10BD10000000000000000000000000000000000023
62613+:10BD20000000000000000000000000000000000013
62614+:10BD30000000000000000000000000000000000003
62615+:10BD400000000000000000000000000000000000F3
62616+:10BD500000000000000000000000000000000000E3
62617+:10BD600000000000000000000000000000000000D3
62618+:10BD700000000000000000000000000000000000C3
62619+:10BD800000000000000000000000000000000000B3
62620+:10BD900000000000000000000000000000000000A3
62621+:10BDA0000000000000000000000000000000000093
62622+:10BDB0000000000000000000000000000000000083
62623+:10BDC0000000000000000000000000000000000073
62624+:10BDD0000000000000000000000000000000000063
62625+:10BDE0000000000000000000000000000000000053
62626+:10BDF0000000000000000000000000000000000043
62627+:10BE00000000000000000000000000000000000032
62628+:10BE10000000000000000000000000000000000022
62629+:10BE20000000000000000000000000000000000012
62630+:10BE30000000000000000000000000000000000002
62631+:10BE400000000000000000000000000000000000F2
62632+:10BE500000000000000000000000000000000000E2
62633+:10BE600000000000000000000000000000000000D2
62634+:10BE700000000000000000000000000000000000C2
62635+:10BE800000000000000000000000000000000000B2
62636+:10BE900000000000000000000000000000000000A2
62637+:10BEA0000000000000000000000000000000000092
62638+:10BEB0000000000000000000000000000000000082
62639+:10BEC0000000000000000000000000000000000072
62640+:10BED0000000000000000000000000000000000062
62641+:10BEE0000000000000000000000000000000000052
62642+:10BEF0000000000000000000000000000000000042
62643+:10BF00000000000000000000000000000000000031
62644+:10BF10000000000000000000000000000000000021
62645+:10BF20000000000000000000000000000000000011
62646+:10BF30000000000000000000000000000000000001
62647+:10BF400000000000000000000000000000000000F1
62648+:10BF500000000000000000000000000000000000E1
62649+:10BF600000000000000000000000000000000000D1
62650+:10BF700000000000000000000000000000000000C1
62651+:10BF800000000000000000000000000000000000B1
62652+:10BF900000000000000000000000000000000000A1
62653+:10BFA0000000000000000000000000000000000091
62654+:10BFB0000000000000000000000000000000000081
62655+:10BFC0000000000000000000000000000000000071
62656+:10BFD0000000000000000000000000000000000061
62657+:10BFE0000000000000000000000000000000000051
62658+:10BFF0000000000000000000000000000000000041
62659+:10C000000000000000000000000000000000000030
62660+:10C010000000000000000000000000000000000020
62661+:10C020000000000000000000000000000000000010
62662+:10C030000000000000000000000000000000000000
62663+:10C0400000000000000000000000000000000000F0
62664+:10C0500000000000000000000000000000000000E0
62665+:10C0600000000000000000000000000000000000D0
62666+:10C0700000000000000000000000000000000000C0
62667+:10C0800000000000000000000000000000000000B0
62668+:10C0900000000000000000000000000000000000A0
62669+:10C0A0000000000000000000000000000000000090
62670+:10C0B0000000000000000000000000000000000080
62671+:10C0C0000000000000000000000000000000000070
62672+:10C0D0000000000000000000000000000000000060
62673+:10C0E0000000000000000000000000000000000050
62674+:10C0F0000000000000000000000000000000000040
62675+:10C10000000000000000000000000000000000002F
62676+:10C11000000000000000000000000000000000001F
62677+:10C12000000000000000000000000000000000000F
62678+:10C1300000000000000000000000000000000000FF
62679+:10C1400000000000000000000000000000000000EF
62680+:10C1500000000000000000000000000000000000DF
62681+:10C1600000000000000000000000000000000000CF
62682+:10C1700000000000000000000000000000000000BF
62683+:10C1800000000000000000000000000000000000AF
62684+:10C19000000000000000000000000000000000009F
62685+:10C1A000000000000000000000000000000000008F
62686+:10C1B000000000000000000000000000000000007F
62687+:10C1C000000000000000000000000000000000006F
62688+:10C1D000000000000000000000000000000000005F
62689+:10C1E000000000000000000000000000000000004F
62690+:10C1F000000000000000000000000000000000003F
62691+:10C20000000000000000000000000000000000002E
62692+:10C21000000000000000000000000000000000001E
62693+:10C22000000000000000000000000000000000000E
62694+:10C2300000000000000000000000000000000000FE
62695+:10C2400000000000000000000000000000000000EE
62696+:10C2500000000000000000000000000000000000DE
62697+:10C2600000000000000000000000000000000000CE
62698+:10C2700000000000000000000000000000000000BE
62699+:10C2800000000000000000000000000000000000AE
62700+:10C29000000000000000000000000000000000009E
62701+:10C2A000000000000000000000000000000000008E
62702+:10C2B000000000000000000000000000000000007E
62703+:10C2C000000000000000000000000000000000006E
62704+:10C2D000000000000000000000000000000000005E
62705+:10C2E000000000000000000000000000000000004E
62706+:10C2F000000000000000000000000000000000003E
62707+:10C30000000000000000000000000000000000002D
62708+:10C31000000000000000000000000000000000001D
62709+:10C32000000000000000000000000000000000000D
62710+:10C3300000000000000000000000000000000000FD
62711+:10C3400000000000000000000000000000000000ED
62712+:10C3500000000000000000000000000000000000DD
62713+:10C3600000000000000000000000000000000000CD
62714+:10C3700000000000000000000000000000000000BD
62715+:10C3800000000000000000000000000000000000AD
62716+:10C39000000000000000000000000000000000009D
62717+:10C3A000000000000000000000000000000000008D
62718+:10C3B000000000000000000000000000000000007D
62719+:10C3C000000000000000000000000000000000006D
62720+:10C3D000000000000000000000000000000000005D
62721+:10C3E000000000000000000000000000000000004D
62722+:10C3F000000000000000000000000000000000003D
62723+:10C40000000000000000000000000000000000002C
62724+:10C41000000000000000000000000000000000001C
62725+:10C42000000000000000000000000000000000000C
62726+:10C4300000000000000000000000000000000000FC
62727+:10C4400000000000000000000000000000000000EC
62728+:10C4500000000000000000000000000000000000DC
62729+:10C4600000000000000000000000000000000000CC
62730+:10C4700000000000000000000000000000000000BC
62731+:10C4800000000000000000000000000000000000AC
62732+:10C49000000000000000000000000000000000009C
62733+:10C4A000000000000000000000000000000000008C
62734+:10C4B000000000000000000000000000000000007C
62735+:10C4C000000000000000000000000000000000006C
62736+:10C4D000000000000000000000000000000000005C
62737+:10C4E000000000000000000000000000000000004C
62738+:10C4F000000000000000000000000000000000003C
62739+:10C50000000000000000000000000000000000002B
62740+:10C51000000000000000000000000000000000001B
62741+:10C52000000000000000000000000000000000000B
62742+:10C5300000000000000000000000000000000000FB
62743+:10C5400000000000000000000000000000000000EB
62744+:10C5500000000000000000000000000000000000DB
62745+:10C5600000000000000000000000000000000000CB
62746+:10C5700000000000000000000000000000000000BB
62747+:10C5800000000000000000000000000000000000AB
62748+:10C59000000000000000000000000000000000009B
62749+:10C5A000000000000000000000000000000000008B
62750+:10C5B000000000000000000000000000000000007B
62751+:10C5C000000000000000000000000000000000006B
62752+:10C5D000000000000000000000000000000000005B
62753+:10C5E000000000000000000000000000000000004B
62754+:10C5F000000000000000000000000000000000003B
62755+:10C60000000000000000000000000000000000002A
62756+:10C61000000000000000000000000000000000001A
62757+:10C62000000000000000000000000000000000000A
62758+:10C6300000000000000000000000000000000000FA
62759+:10C6400000000000000000000000000000000000EA
62760+:10C6500000000000000000000000000000000000DA
62761+:10C6600000000000000000000000000000000000CA
62762+:10C6700000000000000000000000000000000000BA
62763+:10C6800000000000000000000000000000000000AA
62764+:10C69000000000000000000000000000000000009A
62765+:10C6A000000000000000000000000000000000008A
62766+:10C6B000000000000000000000000000000000007A
62767+:10C6C000000000000000000000000000000000006A
62768+:10C6D000000000000000000000000000000000005A
62769+:10C6E000000000000000000000000000000000004A
62770+:10C6F000000000000000000000000000000000003A
62771+:10C700000000000000000000000000000000000029
62772+:10C710000000000000000000000000000000000019
62773+:10C720000000000000000000000000000000000009
62774+:10C7300000000000000000000000000000000000F9
62775+:10C7400000000000000000000000000000000000E9
62776+:10C7500000000000000000000000000000000000D9
62777+:10C7600000000000000000000000000000000000C9
62778+:10C7700000000000000000000000000000000000B9
62779+:10C7800000000000000000000000000000000000A9
62780+:10C790000000000000000000000000000000000099
62781+:10C7A0000000000000000000000000000000000089
62782+:10C7B0000000000000000000000000000000000079
62783+:10C7C0000000000000000000000000000000000069
62784+:10C7D0000000000000000000000000000000000059
62785+:10C7E0000000000000000000000000000000000049
62786+:10C7F0000000000000000000000000000000000039
62787+:10C800000000000000000000000000000000000028
62788+:10C810000000000000000000000000000000000018
62789+:10C820000000000000000000000000000000000008
62790+:10C8300000000000000000000000000000000000F8
62791+:10C8400000000000000000000000000000000000E8
62792+:10C8500000000000000000000000000000000000D8
62793+:10C8600000000000000000000000000000000000C8
62794+:10C8700000000000000000000000000000000000B8
62795+:10C8800000000000000000000000000000000000A8
62796+:10C890000000000000000000000000000000000098
62797+:10C8A0000000000000000000000000000000000088
62798+:10C8B0000000000000000000000000000000000078
62799+:10C8C0000000000000000000000000000000000068
62800+:10C8D0000000000000000000000000000000000058
62801+:10C8E0000000000000000000000000000000000048
62802+:10C8F0000000000000000000000000000000000038
62803+:10C900000000000000000000000000000000000027
62804+:10C910000000000000000000000000000000000017
62805+:10C920000000000000000000000000000000000007
62806+:10C9300000000000000000000000000000000000F7
62807+:10C9400000000000000000000000000000000000E7
62808+:10C9500000000000000000000000000000000000D7
62809+:10C9600000000000000000000000000000000000C7
62810+:10C9700000000000000000000000000000000000B7
62811+:10C9800000000000000000000000000000000000A7
62812+:10C990000000000000000000000000000000000097
62813+:10C9A0000000000000000000000000000000000087
62814+:10C9B0000000000000000000000000000000000077
62815+:10C9C0000000000000000000000000000000000067
62816+:10C9D0000000000000000000000000000000000057
62817+:10C9E0000000000000000000000000000000000047
62818+:10C9F0000000000000000000000000000000000037
62819+:10CA00000000000000000000000000000000000026
62820+:10CA10000000000000000000000000000000000016
62821+:10CA20000000000000000000000000000000000006
62822+:10CA300000000000000000000000000000000000F6
62823+:10CA400000000000000000000000000000000000E6
62824+:10CA500000000000000000000000000000000000D6
62825+:10CA600000000000000000000000000000000000C6
62826+:10CA700000000000000000000000000000000000B6
62827+:10CA800000000000000000000000000000000000A6
62828+:10CA90000000000000000000000000000000000096
62829+:10CAA0000000000000000000000000000000000086
62830+:10CAB0000000000000000000000000000000000076
62831+:10CAC0000000000000000000000000000000000066
62832+:10CAD0000000000000000000000000000000000056
62833+:10CAE0000000000000000000000000000000000046
62834+:10CAF0000000000000000000000000000000000036
62835+:10CB00000000000000000000000000000000000025
62836+:10CB10000000000000000000000000000000000015
62837+:10CB20000000000000000000000000000000000005
62838+:10CB300000000000000000000000000000000000F5
62839+:10CB400000000000000000000000000000000000E5
62840+:10CB500000000000000000000000000000000000D5
62841+:10CB600000000000000000000000000000000000C5
62842+:10CB700000000000000000000000000000000000B5
62843+:10CB800000000000000000000000000000000000A5
62844+:10CB90000000000000000000000000000000000095
62845+:10CBA0000000000000000000000000000000000085
62846+:10CBB0000000000000000000000000000000000075
62847+:10CBC0000000000000000000000000000000000065
62848+:10CBD0000000000000000000000000000000000055
62849+:10CBE0000000000000000000000000000000000045
62850+:10CBF0000000000000000000000000000000000035
62851+:10CC00000000000000000000000000000000000024
62852+:10CC10000000000000000000000000000000000014
62853+:10CC20000000000000000000000000000000000004
62854+:10CC300000000000000000000000000000000000F4
62855+:10CC400000000000000000000000000000000000E4
62856+:10CC500000000000000000000000000000000000D4
62857+:10CC600000000000000000000000000000000000C4
62858+:10CC700000000000000000000000000000000000B4
62859+:10CC800000000000000000000000000000000000A4
62860+:10CC90000000000000000000000000000000000094
62861+:10CCA0000000000000000000000000000000000084
62862+:10CCB0000000000000000000000000000000000074
62863+:10CCC0000000000000000000000000000000000064
62864+:10CCD0000000000000000000000000000000000054
62865+:10CCE0000000000000000000000000000000000044
62866+:10CCF0000000000000000000000000000000000034
62867+:10CD00000000000000000000000000000000000023
62868+:10CD10000000000000000000000000000000000013
62869+:10CD20000000000000000000000000000000000003
62870+:10CD300000000000000000000000000000000000F3
62871+:10CD400000000000000000000000000000000000E3
62872+:10CD500000000000000000000000000000000000D3
62873+:10CD600000000000000000000000000000000000C3
62874+:10CD700000000000000000000000000000000000B3
62875+:10CD800000000000000000000000000000000000A3
62876+:10CD90000000000000000000000000000000000093
62877+:10CDA0000000000000000000000000000000000083
62878+:10CDB0000000000000000000000000000000000073
62879+:10CDC0000000000000000000000000000000000063
62880+:10CDD0000000000000000000000000000000000053
62881+:10CDE0000000000000000000000000000000000043
62882+:10CDF0000000000000000000000000000000000033
62883+:10CE00000000000000000000000000000000000022
62884+:10CE10000000000000000000000000000000000012
62885+:10CE20000000000000000000000000000000000002
62886+:10CE300000000000000000000000000000000000F2
62887+:10CE400000000000000000000000000000000000E2
62888+:10CE500000000000000000000000000000000000D2
62889+:10CE600000000000000000000000000000000000C2
62890+:10CE700000000000000000000000000000000000B2
62891+:10CE800000000000000000000000000000000000A2
62892+:10CE90000000000000000000000000000000000092
62893+:10CEA0000000000000000000000000000000000082
62894+:10CEB0000000000000000000000000000000000072
62895+:10CEC0000000000000000000000000000000000062
62896+:10CED0000000000000000000000000000000000052
62897+:10CEE0000000000000000000000000000000000042
62898+:10CEF0000000000000000000000000000000000032
62899+:10CF00000000000000000000000000000000000021
62900+:10CF10000000000000000000000000000000000011
62901+:10CF20000000000000000000000000000000000001
62902+:10CF300000000000000000000000000000000000F1
62903+:10CF400000000000000000000000000000000000E1
62904+:10CF500000000000000000000000000000000000D1
62905+:10CF600000000000000000000000000000000000C1
62906+:10CF700000000000000000000000000000000000B1
62907+:10CF800000000000000000000000000000000000A1
62908+:10CF90000000000000000000000000000000000091
62909+:10CFA0000000000000000000000000000000000081
62910+:10CFB0000000000000000000000000000000000071
62911+:10CFC0000000000000000000000000000000000061
62912+:10CFD0000000000000000000000000000000000051
62913+:10CFE0000000000000000000000000000000000041
62914+:10CFF0000000000000000000000000000000000031
62915+:10D000000000000000000000000000000000000020
62916+:10D010000000000000000000000000000000000010
62917+:10D020000000000000000000000000000000000000
62918+:10D0300000000000000000000000000000000000F0
62919+:10D0400000000000000000000000000000000000E0
62920+:10D0500000000000000000000000000000000000D0
62921+:10D0600000000000000000000000000000000000C0
62922+:10D0700000000000000000000000000000000000B0
62923+:10D0800000000000000000000000000000000000A0
62924+:10D090000000000000000000000000000000000090
62925+:10D0A0000000000000000000000000000000000080
62926+:10D0B0000000000000000000000000000000000070
62927+:10D0C0000000000000000000000000000000000060
62928+:10D0D0000000000000000000000000000000000050
62929+:10D0E0000000000000000000000000000000000040
62930+:10D0F0000000000000000000000000000000000030
62931+:10D10000000000000000000000000000000000001F
62932+:10D11000000000000000000000000000000000000F
62933+:10D1200000000000000000000000000000000000FF
62934+:10D1300000000000000000000000000000000000EF
62935+:10D1400000000000000000000000000000000000DF
62936+:10D1500000000000000000000000000000000000CF
62937+:10D1600000000000000000000000000000000000BF
62938+:10D1700000000000000000000000000000000000AF
62939+:10D18000000000000000000000000000000000009F
62940+:10D19000000000000000000000000000000000008F
62941+:10D1A000000000000000000000000000000000007F
62942+:10D1B000000000000000000000000000000000006F
62943+:10D1C000000000000000000000000000000000005F
62944+:10D1D000000000000000000000000000000000004F
62945+:10D1E000000000000000000000000000000000003F
62946+:10D1F000000000000000000000000000000000002F
62947+:10D20000000000000000000000000000000000001E
62948+:10D21000000000000000000000000000000000000E
62949+:10D2200000000000000000000000000000000000FE
62950+:10D2300000000000000000000000000000000000EE
62951+:10D2400000000000000000000000000000000000DE
62952+:10D2500000000000000000000000000000000000CE
62953+:10D2600000000000000000000000000000000000BE
62954+:10D2700000000000000000000000000000000000AE
62955+:10D28000000000000000000000000000000000009E
62956+:10D29000000000000000000000000000000000008E
62957+:10D2A000000000000000000000000000000000007E
62958+:10D2B000000000000000000000000000000000006E
62959+:10D2C000000000000000000000000000000000005E
62960+:10D2D000000000000000000000000000000000004E
62961+:10D2E000000000000000000000000000000000003E
62962+:10D2F000000000000000000000000000000000002E
62963+:10D30000000000000000000000000000000000001D
62964+:10D31000000000000000000000000000000000000D
62965+:10D3200000000000000000000000000000000000FD
62966+:10D3300000000000000000000000000000000000ED
62967+:10D3400000000000000000000000000000000000DD
62968+:10D3500000000000000000000000000000000000CD
62969+:10D3600000000000000000000000000000000000BD
62970+:10D3700000000000000000000000000000000000AD
62971+:10D38000000000000000000000000000000000009D
62972+:10D39000000000000000000000000000000000008D
62973+:10D3A000000000000000000000000000000000007D
62974+:10D3B000000000000000000000000000000000006D
62975+:10D3C000000000000000000000000000000000005D
62976+:10D3D000000000000000000000000000000000004D
62977+:10D3E000000000000000000000000000000000003D
62978+:10D3F000000000000000000000000000000000002D
62979+:10D40000000000000000000000000000000000001C
62980+:10D41000000000000000000000000000000000000C
62981+:10D4200000000000000000000000000000000000FC
62982+:10D4300000000000000000000000000000000000EC
62983+:10D4400000000000000000000000000000000000DC
62984+:10D4500000000000000000000000000000000000CC
62985+:10D4600000000000000000000000000000000000BC
62986+:10D4700000000000000000000000000000000000AC
62987+:10D48000000000000000000000000000000000009C
62988+:10D49000000000000000000000000000000000008C
62989+:10D4A000000000000000000000000000000000007C
62990+:10D4B000000000000000000000000000000000006C
62991+:10D4C000000000000000000000000000000000005C
62992+:10D4D000000000000000000000000000000000004C
62993+:10D4E000000000000000000000000000000000003C
62994+:10D4F000000000000000000000000000000000002C
62995+:10D50000000000000000000000000000000000001B
62996+:10D51000000000000000000000000000000000000B
62997+:10D5200000000000000000000000000000000000FB
62998+:10D5300000000000000000000000000000000000EB
62999+:10D5400000000000000000000000000000000000DB
63000+:10D5500000000000000000000000000000000000CB
63001+:10D5600000000000000000000000000000000000BB
63002+:10D5700000000000000000000000000000000000AB
63003+:10D58000000000000000000000000000000000009B
63004+:10D59000000000000000000000000000000000008B
63005+:10D5A000000000000000000000000000000000007B
63006+:10D5B000000000000000000000000000000000006B
63007+:10D5C000000000000000000000000000000000005B
63008+:10D5D000000000000000000000000000000000004B
63009+:10D5E000000000000000000000000000000000003B
63010+:10D5F000000000000000000000000000000000002B
63011+:10D60000000000000000000000000000000000001A
63012+:10D61000000000000000000000000000000000000A
63013+:10D6200000000000000000000000000000000000FA
63014+:10D6300000000000000000000000000000000000EA
63015+:10D6400000000000000000000000000000000000DA
63016+:10D6500000000000000000000000000000000000CA
63017+:10D6600000000000000000000000000000000000BA
63018+:10D6700000000000000000000000000000000000AA
63019+:10D68000000000000000000000000000000000009A
63020+:10D69000000000000000000000000000000000008A
63021+:10D6A000000000000000000000000000000000007A
63022+:10D6B000000000000000000000000000000000006A
63023+:10D6C000000000000000000000000000000000005A
63024+:10D6D000000000000000000000000000000000004A
63025+:10D6E000000000000000000000000000000000003A
63026+:10D6F000000000000000000000000000000000002A
63027+:10D700000000000000000000000000000000000019
63028+:10D710000000000000000000000000000000000009
63029+:10D7200000000000000000000000000000000000F9
63030+:10D7300000000000000000000000000000000000E9
63031+:10D7400000000000000000000000000000000000D9
63032+:10D7500000000000000000000000000000000000C9
63033+:10D7600000000000000000000000000000000000B9
63034+:10D7700000000000000000000000000000000000A9
63035+:10D780000000000000000000000000000000000099
63036+:10D790000000000000000000000000000000000089
63037+:10D7A0000000000000000000000000000000000079
63038+:10D7B0000000000000000000000000000000000069
63039+:10D7C0000000000000000000000000000000000059
63040+:10D7D0000000000000000000000000000000000049
63041+:10D7E0000000000000000000000000000000000039
63042+:10D7F0000000000000000000000000000000000029
63043+:10D800000000000000000000000000000000000018
63044+:10D810000000000000000000000000000000000008
63045+:10D8200000000000000000000000000000000000F8
63046+:10D8300000000000000000000000000000000000E8
63047+:10D8400000000000000000000000000000000000D8
63048+:10D8500000000000000000000000000000000000C8
63049+:10D8600000000000000000000000000000000000B8
63050+:10D8700000000000000000000000000000000000A8
63051+:10D880000000000000000000000000000000000098
63052+:10D890000000000000000000000000000000000088
63053+:10D8A0000000000000000000000000000000000078
63054+:10D8B0000000000000000000000000000000000068
63055+:10D8C0000000000000000000000000000000000058
63056+:10D8D0000000000000000000000000000000000048
63057+:10D8E0000000000000000000000000000000000038
63058+:10D8F0000000000000000000000000000000000028
63059+:10D900000000000000000000000000000000000017
63060+:10D910000000000000000000000000000000000007
63061+:10D9200000000000000000000000000000000000F7
63062+:10D9300000000000000000000000000000000000E7
63063+:10D9400000000000000000000000000000000000D7
63064+:10D9500000000000000000000000000000000000C7
63065+:10D9600000000000000000000000000000000000B7
63066+:10D9700000000000000000000000000000000000A7
63067+:10D980000000000000000000000000000000000097
63068+:10D990000000000000000000000000000000000087
63069+:10D9A0000000000000000000000000000000000077
63070+:10D9B0000000000000000000000000000000000067
63071+:10D9C0000000000000000000000000000000000057
63072+:10D9D0000000000000000000000000000000000047
63073+:10D9E0000000000000000000000000000000000037
63074+:10D9F0000000000000000000000000000000000027
63075+:10DA00000000000000000000000000000000000016
63076+:10DA10000000000000000000000000000000000006
63077+:10DA200000000000000000000000000000000000F6
63078+:10DA300000000000000000000000000000000000E6
63079+:10DA400000000000000000000000000000000000D6
63080+:10DA500000000000000000000000000000000000C6
63081+:10DA600000000000000000000000000000000000B6
63082+:10DA700000000000000000000000000000000000A6
63083+:10DA80000000000000000000000000000000000096
63084+:10DA90000000000000000000000000000000000086
63085+:10DAA0000000000000000000000000000000000076
63086+:10DAB0000000000000000000000000000000000066
63087+:10DAC0000000000000000000000000000000000056
63088+:10DAD0000000000000000000000000000000000046
63089+:10DAE0000000000000000000000000000000000036
63090+:10DAF0000000000000000000000000000000000026
63091+:10DB00000000000000000000000000000000000015
63092+:10DB10000000000000000000000000000000000005
63093+:10DB200000000000000000000000000000000000F5
63094+:10DB300000000000000000000000000000000000E5
63095+:10DB400000000000000000000000000000000000D5
63096+:10DB500000000000000000000000000000000000C5
63097+:10DB600000000000000000000000000000000000B5
63098+:10DB700000000000000000000000000000000000A5
63099+:10DB80000000000000000000000000000000000095
63100+:10DB90000000000000000000000000000000000085
63101+:10DBA0000000000000000000000000000000000075
63102+:10DBB0000000000000000000000000000000000065
63103+:10DBC0000000000000000000000000000000000055
63104+:10DBD0000000000000000000000000000000000045
63105+:10DBE0000000000000000000000000000000000035
63106+:10DBF0000000000000000000000000000000000025
63107+:10DC00000000000000000000000000000000000014
63108+:10DC10000000000000000000000000000000000004
63109+:10DC200000000000000000000000000000000000F4
63110+:10DC300000000000000000000000000000000000E4
63111+:10DC400000000000000000000000000000000000D4
63112+:10DC500000000000000000000000000000000000C4
63113+:10DC600000000000000000000000000000000000B4
63114+:10DC700000000000000000000000000000000000A4
63115+:10DC80000000000000000000000000000000000094
63116+:10DC90000000000000000000000000000000000084
63117+:10DCA0000000000000000000000000000000000074
63118+:10DCB0000000000000000000000000000000000064
63119+:10DCC0000000000000000000000000000000000054
63120+:10DCD0000000000000000000000000000000000044
63121+:10DCE0000000000000000000000000000000000034
63122+:10DCF0000000000000000000000000000000000024
63123+:10DD00000000000000000000000000000000000013
63124+:10DD10000000000000000000000000000000000003
63125+:10DD200000000000000000000000000000000000F3
63126+:10DD300000000000000000000000000000000000E3
63127+:10DD400000000000000000000000000000000000D3
63128+:10DD500000000000000000000000000000000000C3
63129+:10DD600000000000000000000000000000000000B3
63130+:10DD700000000000000000000000000000000000A3
63131+:10DD80000000000000000000000000000000000093
63132+:10DD90000000000000000000000000000000000083
63133+:10DDA0000000000000000000000000000000000073
63134+:10DDB0000000000000000000000000000000000063
63135+:10DDC0000000000000000000000000000000000053
63136+:10DDD0000000000000000000000000000000000043
63137+:10DDE0000000000000000000000000000000000033
63138+:10DDF0000000000000000000000000000000000023
63139+:10DE00000000000000000000000000000000000012
63140+:10DE10000000000000000000000000000000000002
63141+:10DE200000000000000000000000000000000000F2
63142+:10DE300000000000000000000000000000000000E2
63143+:10DE400000000000000000000000000000000000D2
63144+:10DE500000000000000000000000000000000000C2
63145+:10DE600000000000000000000000000000000000B2
63146+:10DE700000000000000000000000000000000000A2
63147+:10DE80000000000000000000000000000000000092
63148+:10DE90000000000000000000000000000000000082
63149+:10DEA0000000000000000000000000000000000072
63150+:10DEB0000000000000000000000000000000000062
63151+:10DEC0000000000000000000000000000000000052
63152+:10DED0000000000000000000000000000000000042
63153+:10DEE0000000000000000000000000000000000032
63154+:10DEF0000000000000000000000000000000000022
63155+:10DF00000000000000000000000000000000000011
63156+:10DF10000000000000000000000000000000000001
63157+:10DF200000000000000000000000000000000000F1
63158+:10DF300000000000000000000000000000000000E1
63159+:10DF400000000000000000000000000000000000D1
63160+:10DF500000000000000000000000000000000000C1
63161+:10DF600000000000000000000000000000000000B1
63162+:10DF700000000000000000000000000000000000A1
63163+:10DF80000000000000000000000000000000000091
63164+:10DF90000000000000000000000000000000000081
63165+:10DFA0000000000000000000000000000000000071
63166+:10DFB0000000000000000000000000000000000061
63167+:10DFC0000000000000000000000000000000000051
63168+:10DFD0000000000000000000000000000000000041
63169+:10DFE0000000000000000000000000000000000031
63170+:10DFF0000000000000000000000000000000000021
63171+:10E000000000000000000000000000000000000010
63172+:10E010000000000000000000000000000000000000
63173+:10E0200000000000000000000000000000000000F0
63174+:10E0300000000000000000000000000000000000E0
63175+:10E0400000000000000000000000000000000000D0
63176+:10E0500000000000000000000000000000000000C0
63177+:10E0600000000000000000000000000000000000B0
63178+:10E0700000000000000000000000000000000000A0
63179+:10E080000000000000000000000000000000000090
63180+:10E090000000000000000000000000000000000080
63181+:10E0A0000000000000000000000000000000000070
63182+:10E0B0000000000000000000000000000000000060
63183+:10E0C0000000000000000000000000000000000050
63184+:10E0D0000000000000000000000000000000000040
63185+:10E0E0000000000000000000000000000000000030
63186+:10E0F0000000000000000000000000000000000020
63187+:10E10000000000000000000000000000000000000F
63188+:10E1100000000000000000000000000000000000FF
63189+:10E1200000000000000000000000000000000000EF
63190+:10E1300000000000000000000000000000000000DF
63191+:10E1400000000000000000000000000000000000CF
63192+:10E1500000000000000000000000000000000000BF
63193+:10E1600000000000000000000000000000000000AF
63194+:10E17000000000000000000000000000000000009F
63195+:10E18000000000000000000000000000000000008F
63196+:10E19000000000000000000000000000000000007F
63197+:10E1A000000000000000000000000000000000006F
63198+:10E1B000000000000000000000000000000000005F
63199+:10E1C000000000000000000000000000000000004F
63200+:10E1D000000000000000000000000000000000003F
63201+:10E1E000000000000000000000000000000000002F
63202+:10E1F000000000000000000000000000000000809F
63203+:10E20000000000000000000000000000000000000E
63204+:10E2100000000000000000000000000000000000FE
63205+:10E220000000000A000000000000000000000000E4
63206+:10E2300010000003000000000000000D0000000DB1
63207+:10E240003C020801244295C03C030801246397FC6A
63208+:10E25000AC4000000043202B1480FFFD244200044A
63209+:10E260003C1D080037BD9FFC03A0F0213C100800B6
63210+:10E27000261032103C1C0801279C95C00E0012BECF
63211+:10E28000000000000000000D3C02800030A5FFFFF0
63212+:10E2900030C600FF344301803C0880008D0901B87E
63213+:10E2A0000520FFFE00000000AC6400002404000212
63214+:10E2B000A4650008A066000AA064000BAC67001803
63215+:10E2C0003C03100003E00008AD0301B83C0560000A
63216+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
63217+:10E2E0003C0310003C040200ACA44FC403E000084F
63218+:10E2F000ACA34FF89486000C00A050212488001491
63219+:10E3000000062B0200051080004448210109182B4B
63220+:10E310001060001100000000910300002C6400094F
63221+:10E320005080000991190001000360803C0D080134
63222+:10E3300025AD9258018D58218D67000000E000083E
63223+:10E340000000000091190001011940210109302B42
63224+:10E3500054C0FFF29103000003E000080000102108
63225+:10E360000A000CCC25080001910F0001240E000AC0
63226+:10E3700015EE00400128C8232F38000A1700003D81
63227+:10E38000250D00028D580000250F0006370E0100F4
63228+:10E39000AD4E0000910C000291AB000191A400026F
63229+:10E3A00091A60003000C2E00000B3C0000A71025D6
63230+:10E3B00000041A000043C8250326C025AD580004F8
63231+:10E3C000910E000691ED000191E7000291E5000336
63232+:10E3D000000E5E00000D6400016C30250007220075
63233+:10E3E00000C41025004518252508000A0A000CCC99
63234+:10E3F000AD430008910F000125040002240800022B
63235+:10E4000055E80001012020210A000CCC00804021A9
63236+:10E41000910C0001240B0003158B00160000000076
63237+:10E420008D580000910E000225080003370D0008EA
63238+:10E43000A14E00100A000CCCAD4D00009119000156
63239+:10E44000240F0004172F000B0000000091070002AA
63240+:10E45000910400038D43000000072A0000A410254A
63241+:10E460003466000425080004AD42000C0A000CCC00
63242+:10E47000AD46000003E000082402000127BDFFE8CC
63243+:10E48000AFBF0014AFB000100E00164E0080802108
63244+:10E490003C0480083485008090A600052403FFFE1C
63245+:10E4A0000200202100C310248FBF00148FB0001081
63246+:10E4B000A0A200050A00165827BD001827BDFFE8D6
63247+:10E4C000AFB00010AFBF00140E000FD40080802149
63248+:10E4D0003C06800834C5008090A40000240200504F
63249+:10E4E000308300FF106200073C09800002002021F9
63250+:10E4F0008FBF00148FB00010AD2001800A00108F74
63251+:10E5000027BD0018240801003C07800002002021DC
63252+:10E510008FBF00148FB00010ACE801800A00108F8C
63253+:10E5200027BD001827BDFF783C058008AFBE0080DE
63254+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
63255+:10E54000AFB60078AFB50074AFB40070AFB200687A
63256+:10E55000AFB0006034A600803C0580008CB201287A
63257+:10E5600090C400098CA701043C020001309100FF17
63258+:10E5700000E218240000B8210000F021106000071C
63259+:10E58000000098213C0908008D2931F02413000176
63260+:10E59000252800013C010800AC2831F0ACA0008423
63261+:10E5A00090CC0005000C5827316A0001154000721C
63262+:10E5B000AFA0005090CD00002406002031A400FF41
63263+:10E5C00010860018240E0050108E009300000000EA
63264+:10E5D0003C1008008E1000DC260F00013C010800F2
63265+:10E5E000AC2F00DC0E0016C7000000000040182110
63266+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
63267+:10E600008FB500748FB400708FB3006C8FB2006848
63268+:10E610008FB100648FB000600060102103E000083B
63269+:10E6200027BD00880000000D3C1F8000AFA0003017
63270+:10E6300097E501168FE201043C04002030B9FFFF8A
63271+:10E64000004438240007182B00033140AFA60030E7
63272+:10E650008FF5010437F80C003C1600400338802188
63273+:10E6600002B6A02434C40040128000479215000D69
63274+:10E6700032A800201500000234860080008030217E
63275+:10E6800014C0009FAFA600303C0D800835A6008066
63276+:10E6900090CC0008318B0040516000063C06800899
63277+:10E6A000240E0004122E00A8240F0012122F003294
63278+:10E6B0003C06800834C401003C0280009447011AE3
63279+:10E6C0009619000E909F00088E18000830E3FFFF97
63280+:10E6D00003F9B00432B40004AFB6005CAFA3005835
63281+:10E6E0008E1600041280002EAFB8005434C3008090
63282+:10E6F000906800083105004014A0002500000000CB
63283+:10E700008C70005002D090230640000500000000ED
63284+:10E710008C71003402D1A82306A201678EE20008A2
63285+:10E72000126000063C1280003C1508008EB531F4E2
63286+:10E7300026B600013C010800AC3631F4AE4000447E
63287+:10E74000240300018FBF00848FBE00808FB7007C40
63288+:10E750008FB600788FB500748FB400708FB3006CE3
63289+:10E760008FB200688FB100648FB00060006010212C
63290+:10E7700003E0000827BD00880E000D2800002021BE
63291+:10E780000A000D75004018210A000D9500C02021D7
63292+:10E790000E00171702C020211440FFE10000000006
63293+:10E7A0003C0B8008356400808C8A003402CA482300
63294+:10E7B0000520001D000000003C1E08008FDE310017
63295+:10E7C00027D700013C010800AC3731001260000679
63296+:10E7D000024020213C1408008E9431F42690000160
63297+:10E7E0003C010800AC3031F40E00164E3C1E80088F
63298+:10E7F00037CD008091B700250240202136EE00047D
63299+:10E800000E001658A1AE00250E000CAC02402021CF
63300+:10E810000A000DCA240300013C17080126F796C020
63301+:10E820000A000D843C1F80008C86003002C66023E5
63302+:10E830001980000C2419000C908F004F3C14080024
63303+:10E840008E94310032B500FC35ED0001268E0001BA
63304+:10E850003C010800AC2E3100A08D004FAFA0005845
63305+:10E860002419000CAFB900308C9800300316A02397
63306+:10E870001A80010B8FA300580074F82A17E0FFD309
63307+:10E88000000000001074002A8FA5005802D4B021A7
63308+:10E8900000B410233044FFFFAFA4005832A8000298
63309+:10E8A0001100002E32AB00103C15800836B00080FD
63310+:10E8B0009216000832D30040526000FB8EE200083E
63311+:10E8C0000E00164E02402021240A0018A20A000958
63312+:10E8D000921100052409FFFE024020210229902404
63313+:10E8E0000E001658A2120005240400390000282149
63314+:10E8F0000E0016F2240600180A000DCA24030001B7
63315+:10E9000092FE000C3C0A800835490080001EBB00C6
63316+:10E910008D27003836F10081024020213225F08118
63317+:10E920000E000C9B30C600FF0A000DC10000000065
63318+:10E930003AA7000130E300011460FFA402D4B02123
63319+:10E940000A000E1D00000000024020210E001734B6
63320+:10E95000020028210A000D75004018211160FF7087
63321+:10E960003C0F80083C0D800835EE00808DC40038D7
63322+:10E970008FA300548DA60004006660231D80FF68ED
63323+:10E98000000000000064C02307020001AFA400548F
63324+:10E990003C1F08008FFF31E433F9000113200015FC
63325+:10E9A0008FAC00583C07800094E3011A10600012FD
63326+:10E9B0003C0680080E00216A024020213C03080129
63327+:10E9C000906396F13064000214800145000000005D
63328+:10E9D000306C0004118000078FAC0058306600FBDB
63329+:10E9E0003C010801A02696F132B500FCAFA000580A
63330+:10E9F0008FAC00583C06800834D30080AFB40018B8
63331+:10EA0000AFB60010AFAC00143C088000950B01209D
63332+:10EA10008E6F0030966A005C8FA3005C8FBF003061
63333+:10EA20003169FFFF3144FFFF8FAE005401341021E4
63334+:10EA3000350540000064382B0045C82103E7C02598
63335+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
63336+:10EA5000AFA0002CAFAE0034926D000831B40008B6
63337+:10EA6000168000BB020020218EE200040040F8095D
63338+:10EA700027A400108FAF003031F300025660000170
63339+:10EA800032B500FE3C048008349F008093F90008F2
63340+:10EA900033380040530000138FA400248C850004F9
63341+:10EAA0008FA7005410A700D52404001432B0000131
63342+:10EAB0001200000C8FA400242414000C1234011A3C
63343+:10EAC0002A2D000D11A001022413000E240E000AAD
63344+:10EAD000522E0001241E00088FAF002425E40001FF
63345+:10EAE000AFA400248FAA00143C0B80083565008079
63346+:10EAF000008A48218CB10030ACA9003090A4004EAF
63347+:10EB00008CA700303408FFFF0088180400E3F821C8
63348+:10EB1000ACBF00348FA600308FB900548FB8005CB2
63349+:10EB200030C200081040000B033898218CAC002044
63350+:10EB3000119300D330C600FF92EE000C8FA7003473
63351+:10EB400002402021000E6B0035B400800E000C9BAB
63352+:10EB50003285F0803C028008345000808E0F0030F7
63353+:10EB600001F1302318C00097264800803C070800B8
63354+:10EB70008CE731E42404FF80010418243118007F5D
63355+:10EB80003C1F80003C19800430F10001AFE300908D
63356+:10EB900012200006031928213C030801906396F116
63357+:10EBA00030690008152000C6306A00F73C10800864
63358+:10EBB00036040080908C004F318B000115600042BC
63359+:10EBC000000000003C0608008CC6319830CE0010D2
63360+:10EBD00051C0004230F9000190AF006B55E0003F9A
63361+:10EBE00030F9000124180001A0B8006B3C1180002E
63362+:10EBF0009622007A24470064A48700123C0D800806
63363+:10EC000035A5008090B40008329000401600000442
63364+:10EC10003C03800832AE000115C0008B00000000EC
63365+:10EC2000346400808C86002010D3000A3463010015
63366+:10EC30008C67000002C7782319E000978FBF00544B
63367+:10EC4000AC93002024130001AC760000AFB3005059
63368+:10EC5000AC7F000417C0004E000000008FA90050D8
63369+:10EC60001520000B000000003C030801906396F1A2
63370+:10EC7000306A00011140002E8FAB0058306400FE56
63371+:10EC80003C010801A02496F10A000D75000018212E
63372+:10EC90000E000CAC024020210A000F1300000000FF
63373+:10ECA0000A000E200000A0210040F80924040017EB
63374+:10ECB0000A000DCA240300010040F80924040016CC
63375+:10ECC0000A000DCA240300019094004F240DFFFE9A
63376+:10ECD000028D2824A085004F30F900011320000682
63377+:10ECE0003C0480083C030801906396F1307F0010DB
63378+:10ECF00017E00051306800EF34900080240A0001D2
63379+:10ED0000024020210E00164EA60A00129203002592
63380+:10ED100024090001AFA90050346200010240202103
63381+:10ED20000E001658A20200250A000EF93C0D8008BC
63382+:10ED30001160FE83000018218FA5003030AC000464
63383+:10ED40001180FE2C8FBF00840A000DCB240300012C
63384+:10ED500027A500380E000CB6AFA000385440FF4382
63385+:10ED60008EE200048FB40038329001005200FF3F61
63386+:10ED70008EE200048FA3003C8E6E0058006E682364
63387+:10ED800005A3FF39AE6300580A000E948EE200041A
63388+:10ED90000E00164E024020213C038008346800809B
63389+:10EDA000024020210E001658A11E000903C0302188
63390+:10EDB000240400370E0016F2000028210A000F116B
63391+:10EDC0008FA900508FAB00185960FF8D3C0D800853
63392+:10EDD0000E00164E02402021920C00252405000151
63393+:10EDE000AFA5005035820004024020210E001658C5
63394+:10EDF000A20200250A000EF93C0D800812240059D9
63395+:10EE00002A2300151060004D240900162408000C68
63396+:10EE10005628FF2732B000013C0A8008914C001BA5
63397+:10EE20002406FFBD241E000E01865824A14B001BA2
63398+:10EE30000A000EA532B000013C010801A02896F19D
63399+:10EE40000A000EF93C0D80088CB500308EFE0008DB
63400+:10EE50002404001826B6000103C0F809ACB600303F
63401+:10EE60003C030801906396F13077000116E0FF81C2
63402+:10EE7000306A00018FB200300A000D753243000481
63403+:10EE80003C1080009605011A50A0FF2B34C60010DC
63404+:10EE90000A000EC892EE000C8C6200001456FF6D42
63405+:10EEA000000000008C7800048FB9005403388823D8
63406+:10EEB0000621FF638FBF00540A000F0E0000000000
63407+:10EEC0003C010801A02A96F10A000F3030F9000138
63408+:10EED0001633FF028FAF00240A000EB0241E00106C
63409+:10EEE0000E00164E024020213C0B80083568008041
63410+:10EEF00091090025240A0001AFAA0050353300040F
63411+:10EF0000024020210E001658A11300253C050801DF
63412+:10EF100090A596F130A200FD3C010801A02296F1D7
63413+:10EF20000A000E6D004018212411000E53D1FEEA94
63414+:10EF3000241E00100A000EAF241E00165629FEDC07
63415+:10EF400032B000013C0A8008914C001B2406FFBD32
63416+:10EF5000241E001001865824A14B001B0A000EA598
63417+:10EF600032B000010A000EA4241E00123C038000EF
63418+:10EF70008C6201B80440FFFE24040800AC6401B8B0
63419+:10EF800003E000080000000030A5FFFF30C6FFFFCF
63420+:10EF90003C0780008CE201B80440FFFE34EA0180A7
63421+:10EFA000AD440000ACE400203C0480089483004899
63422+:10EFB0003068FFFF11000016AF88000824AB001274
63423+:10EFC000010B482B512000133C04800034EF01005A
63424+:10EFD00095EE00208F890000240D001A31CCFFFF30
63425+:10EFE00031274000A14D000B10E000362583FFFEC5
63426+:10EFF0000103C02B170000348F9900048F88000490
63427+:10F00000A5430014350700010A001003AF87000470
63428+:10F010003C04800024030003348201808F890000B7
63429+:10F020008F870004A043000B3C088000350C018052
63430+:10F03000A585000EA585001A8F85000C30EB800099
63431+:10F04000A5890010AD850028A58600081160000F75
63432+:10F050008F85001435190100972A00163158FFFCDE
63433+:10F06000270F000401E870218DCD400031A6FFFF7D
63434+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
63435+:10F0800000E83824AF8700048F8500142403BFFFF5
63436+:10F090003C04800000E3582434830180A46B0026E4
63437+:10F0A000AC69002C10A0000300054C02A465001000
63438+:10F0B000A46900263C071000AC8701B803E00008F3
63439+:10F0C000000000008F990004240AFFFE032A382460
63440+:10F0D0000A001003AF87000427BDFFE88FA20028B5
63441+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
63442+:10F0F000AF820014AF8000040E000FDBAF80000071
63443+:10F100008FBF001027BD001803E00008AF80001477
63444+:10F110003C06800034C4007034C701008C8A0000B3
63445+:10F1200090E500128F84000027BDFFF030A300FFA0
63446+:10F13000000318823082400010400037246500032D
63447+:10F140000005C8800326C0218F0E4000246F0004F4
63448+:10F15000000F6880AFAE000001A660218D8B4000DB
63449+:10F16000AFAB000494E900163128FFFC01063821FA
63450+:10F170008CE64000AFA600088FA9000800003021EF
63451+:10F18000000028213C07080024E701000A0010675E
63452+:10F19000240800089059000024A500012CAC000CA4
63453+:10F1A0000079C0210018788001E770218DCD000022
63454+:10F1B0001180000600CD302603A5102114A8FFF50C
63455+:10F1C00000051A005520FFF4905900003C0480000F
63456+:10F1D000348700703C0508008CA531048CE30000E6
63457+:10F1E0002CA2002010400009006A38230005488046
63458+:10F1F0003C0B0800256B3108012B402124AA00019B
63459+:10F20000AD0700003C010800AC2A310400C0102109
63460+:10F2100003E0000827BD0010308220001040000BE2
63461+:10F2200000055880016648218D24400024680004B0
63462+:10F2300000083880AFA4000000E618218C6540006B
63463+:10F24000AFA000080A001057AFA500040000000D91
63464+:10F250000A0010588FA9000827BDFFE03C07800076
63465+:10F2600034E60100AFBF001CAFB20018AFB100140C
63466+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
63467+:10F280002483000430E2400010400010AF830028C7
63468+:10F290003C09002000E940241100000D30EC800002
63469+:10F2A0008F8A0004240BBFFF00EB38243543100085
63470+:10F2B000AF87000030F220001640000B3C1900041C
63471+:10F2C000241FFFBF0A0010B7007F102430EC80001D
63472+:10F2D000158000423C0E002030F220001240FFF862
63473+:10F2E0008F8300043C19000400F9C0241300FFF5CB
63474+:10F2F000241FFFBF34620040AF82000430E20100EF
63475+:10F300001040001130F010008F83002C10600006B8
63476+:10F310003C0F80003C05002000E52024148000C044
63477+:10F320003C0800043C0F800035EE010095CD001E26
63478+:10F3300095CC001C31AAFFFF000C5C00014B482556
63479+:10F34000AF89000C30F010001200000824110001F9
63480+:10F3500030F100201620008B3C18100000F890249B
63481+:10F36000164000823C040C002411000130E801002A
63482+:10F370001500000B3C0900018F85000430A94000F6
63483+:10F38000152000073C0900013C0C1F0100EC58242B
63484+:10F390003C0A1000116A01183C1080003C09000171
63485+:10F3A00000E9302410C000173C0B10003C18080086
63486+:10F3B0008F1800243307000214E0014024030001E9
63487+:10F3C0008FBF001C8FB200188FB100148FB00010D7
63488+:10F3D0000060102103E0000827BD002000EE682433
63489+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
63490+:10F3F00036307FFF00F0382435E380000A0010A685
63491+:10F40000AF87000000EB102450400065AF8000245F
63492+:10F410008F8C002C3C0D0F0000ED18241580008807
63493+:10F42000AF83001030E8010011000086938F0010B8
63494+:10F430003C0A0200106A00833C1280003650010032
63495+:10F44000920500139789002A3626000230AF00FF8C
63496+:10F4500025EE0004000E19C03C0480008C9801B811
63497+:10F460000700FFFE34880180AD0300003C198008CE
63498+:10F47000AC830020973100483225FFFF10A0015CCB
63499+:10F48000AF8500082523001200A3F82B53E0015993
63500+:10F490008F850004348D010095AC00202402001AF1
63501+:10F4A00030E44000318BFFFFA102000B108001927D
63502+:10F4B0002563FFFE00A3502B154001908F8F0004A1
63503+:10F4C000A50300148F88000435050001AF850004F2
63504+:10F4D0003C08800035190180A729000EA729001AD1
63505+:10F4E0008F89000C30B18000A7270010AF290028B9
63506+:10F4F000A72600081220000E3C04800035020100FF
63507+:10F50000944C0016318BFFFC256400040088182100
63508+:10F510008C7F400033E6FFFF14C000053C048000F0
63509+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
63510+:10F53000240EBFFF00AE402434850180A4A800261D
63511+:10F54000ACA7002C3C071000AC8701B800001821C4
63512+:10F550008FBF001C8FB200188FB100148FB0001045
63513+:10F560000060102103E0000827BD00203C020BFFD3
63514+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
63515+:10F58000241100013C0608008CC6002C24C5000193
63516+:10F590003C010800AC25002C0A0010D42411000501
63517+:10F5A0008F85002410A0002FAF80001090A30000D2
63518+:10F5B000146000792419000310A0002A30E601002D
63519+:10F5C00010C000CC8F860010241F000210DF00C97D
63520+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
63521+:10F5E00014E0000201641824000018213C0D0800FA
63522+:10F5F00025AD0038006D1021904C00048F85002847
63523+:10F6000025830004000321C030A5FFFF3626000239
63524+:10F610000E000FDB000000000A00114D0000182151
63525+:10F6200000E8302414C0FF403C0F80000E00103D65
63526+:10F63000000000008F8700000A0010CAAF82000C93
63527+:10F64000938F00103C18080127189640000F90C0B7
63528+:10F6500002588021AF9000248F85002414A0FFD38E
63529+:10F66000AF8F00103C0480008C86400030C5010044
63530+:10F6700010A000BC322300043C0C08008D8C002438
63531+:10F6800024120004106000C23190000D3C04800080
63532+:10F690008C8D40003402FFFF11A201003231FFFBCC
63533+:10F6A0008C884000310A01005540000124110010EF
63534+:10F6B00030EE080011C000BE2419FFFB8F9800280F
63535+:10F6C0002F0F03EF51E000010219802430E90100FF
63536+:10F6D00011200014320800018F87002C14E000FB79
63537+:10F6E0008F8C000C3C05800034AB0100917F00132F
63538+:10F6F00033E300FF246A00042403FFFE0203802496
63539+:10F70000000A21C012000002023230253226FFFF1B
63540+:10F710000E000FDB9785002A1200FF290000182138
63541+:10F72000320800011100000D32180004240E0001FF
63542+:10F73000120E0002023230253226FFFF9785002A82
63543+:10F740000E000FDB00002021240FFFFE020F80249B
63544+:10F750001200FF1B00001821321800045300FF188C
63545+:10F760002403000102323025241200045612000145
63546+:10F770003226FFFF9785002A0E000FDB24040100CC
63547+:10F780002419FFFB021988241220FF0D0000182104
63548+:10F790000A0010E9240300011079009C00003021C8
63549+:10F7A00090AD00012402000211A200BE30EA004028
63550+:10F7B00090B90001241800011338007F30E900409F
63551+:10F7C0008CA600049785002A00C020210E000FDBC4
63552+:10F7D0003626000200004021010018218FBF001CC6
63553+:10F7E0008FB200188FB100148FB00010006010218C
63554+:10F7F00003E0000827BD0020360F010095EE000C45
63555+:10F8000031CD020015A0FEE63C0900013C1880083D
63556+:10F81000971200489789002A362600023248FFFFD7
63557+:10F82000AF8800083C0380008C7101B80620FFFE01
63558+:10F83000346A0180AD4000001100008E3C0F800052
63559+:10F84000253F0012011FC82B1320008B240E00033C
63560+:10F85000346C0100958B00202402001A30E4400033
63561+:10F860003163FFFFA142000B108000A72463FFFE5D
63562+:10F870000103682B15A000A52408FFFE34A5000194
63563+:10F88000A5430014AF8500043C0480002412BFFF90
63564+:10F8900000B2802434850180A4A9000EA4A9001A16
63565+:10F8A000A4A60008A4B00026A4A700103C071000DE
63566+:10F8B000AC8701B80A00114D000018213C038000FC
63567+:10F8C00034640100949F000E3C1908008F3900D861
63568+:10F8D0002404008033E5FFFF273100013C010800CC
63569+:10F8E000AC3100D80E000FDB240600030A00114DD6
63570+:10F8F00000001821240A000210CA00598F85002830
63571+:10F900003C0308008C6300D0240E0001106E005EE2
63572+:10F910002CCF000C24D2FFFC2E5000041600002136
63573+:10F9200000002021241800021078001B2CD9000CA4
63574+:10F9300024DFFFF82FE900041520FF330000202109
63575+:10F9400030EB020051600004000621C054C00022C8
63576+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
63577+:10F96000362600023C0908008D29002431300001B0
63578+:10F970005200FEF7000018219785002A3626000263
63579+:10F980000E000FDB000020210A00114D000018219D
63580+:10F990000A00119C241200021320FFE624DFFFF866
63581+:10F9A0000000202130A5FFFF0A00117D362600024D
63582+:10F9B0000A0011AC021980245120FF828CA6000499
63583+:10F9C0003C05080190A5964110A0FF7E2408000187
63584+:10F9D0000A0011F0010018210E000FDB3226000191
63585+:10F9E0008F8600108F8500280A00124F000621C064
63586+:10F9F0008F8500043C18800024120003371001801A
63587+:10FA0000A212000B0A00112E3C08800090A30001F6
63588+:10FA1000241100011071FF70240800012409000264
63589+:10FA20005069000430E60040240800010A0011F08B
63590+:10FA30000100182150C0FFFD240800013C0C80008B
63591+:10FA4000358B01009563001094A40002307FFFFF06
63592+:10FA5000509FFF62010018210A001284240800014F
63593+:10FA60002CA803EF1100FE56240300010A001239EE
63594+:10FA700000000000240E000335EA0180A14E000BB7
63595+:10FA80000A00121C3C04800011E0FFA2000621C005
63596+:10FA900030A5FFFF0A00117D362600020A0011A5DD
63597+:10FAA000241100201140FFC63C1280003650010096
63598+:10FAB000960F001094AE000231E80FFF15C8FFC08A
63599+:10FAC000000000000A0011E690B900013C060800A1
63600+:10FAD0008CC6003824C4FFFF14C00002018418241F
63601+:10FAE000000018213C0D080025AD0038006D1021E4
63602+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
63603+:10FB00000A00112C01EE28242408FFFE0A00121A14
63604+:10FB100000A8282427BDFFC8AFB00010AFBF003435
63605+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
63606+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
63607+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
63608+:10FB500001CF682435AC380C240B0003AE0C5000E8
63609+:10FB6000ACCB00083C010800AC2000200E001819A6
63610+:10FB7000000000003C0A0010354980513C06601628
63611+:10FB8000AE09537C8CC700003C0860148D0500A0B2
63612+:10FB90003C03FFFF00E320243C02535300051FC237
63613+:10FBA0001482000634C57C000003A08002869821E0
63614+:10FBB0008E7200043C116000025128218CBF007C31
63615+:10FBC0008CA200783C1E600037C420203C05080150
63616+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
63617+:10FBE0002406000A3C190001273996403C01080010
63618+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
63619+:10FC00002418FFF03C15570902F8B02412D502F56C
63620+:10FC100024040001AF80002C3C1480003697018042
63621+:10FC20003C1E080127DE9644369301008E900000AA
63622+:10FC30003205000310A0FFFD3207000110E000882C
63623+:10FC4000320600028E7100283C048000AE91002034
63624+:10FC50008E6500048E66000000A0382100C040219F
63625+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
63626+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
63627+:10FC80009675000E3C1208008E52002030AC4000E9
63628+:10FC900032AFFFFF264E000125ED00043C010800B5
63629+:10FCA000AC2E0020118000E8AF8D00283C18002009
63630+:10FCB00000B8B02412C000E530B980002408BFFFAE
63631+:10FCC00000A8382434C81000AF87000030E62000B8
63632+:10FCD00010C000E92409FFBF3C03000400E328240E
63633+:10FCE00010A00002010910243502004030EA010092
63634+:10FCF00011400010AF8200048F8B002C11600007B0
63635+:10FD00003C0D002000ED6024118000043C0F000435
63636+:10FD100000EF702411C00239000000009668001E38
63637+:10FD20009678001C3115FFFF0018B40002B690252C
63638+:10FD3000AF92000C30F910001320001324150001BD
63639+:10FD400030FF002017E0000A3C04100000E41024FB
63640+:10FD50001040000D3C0A0C003C090BFF00EA18247F
63641+:10FD60003525FFFF00A3302B10C0000830ED010047
63642+:10FD70003C0C08008D8C002C24150005258B0001FF
63643+:10FD80003C010800AC2B002C30ED010015A0000B4D
63644+:10FD90003C0500018F85000430AE400055C00007CF
63645+:10FDA0003C0500013C161F0100F690243C0F10009A
63646+:10FDB000124F01CE000000003C05000100E5302498
63647+:10FDC00010C000AF3C0C10003C1F08008FFF002447
63648+:10FDD00033E90002152000712403000100601021A6
63649+:10FDE000104000083C0680003C08800035180100E7
63650+:10FDF0008F0F00243C056020ACAF00140000000011
63651+:10FE00003C0680003C194000ACD9013800000000DD
63652+:10FE10005220001332060002262B0140262C0080BF
63653+:10FE2000240EFF80016E2024018E6824000D1940ED
63654+:10FE3000318A007F0004A9403172007F3C16200007
63655+:10FE400036C20002006A482502B2382500E2882541
63656+:10FE50000122F825ACDF0830ACD1083032060002B0
63657+:10FE600010C0FF723C188000370501408CA80000CC
63658+:10FE700024100040AF08002090AF000831E300706C
63659+:10FE8000107000D428790041532000082405006038
63660+:10FE9000241100201071000E3C0A40003C09800033
63661+:10FEA000AD2A01780A001304000000001465FFFB6E
63662+:10FEB0003C0A40000E001FFA000000003C0A40000F
63663+:10FEC0003C098000AD2A01780A00130400000000FC
63664+:10FED00090A90009241F00048CA70000312800FF0E
63665+:10FEE000111F01B22503FFFA2C7200061240001404
63666+:10FEF0003C0680008CA9000494A4000A310500FF90
63667+:10FF000000095E022D6A00083086FFFF15400002DE
63668+:10FF10002567000424070003240C000910AC01FA33
63669+:10FF200028AD000A11A001DE2410000A240E0008EA
63670+:10FF300010AE0028000731C000C038213C06800008
63671+:10FF40008CD501B806A0FFFE34D20180AE47000078
63672+:10FF500034CB0140916E0008240300023C0A4000AB
63673+:10FF600031C400FF00046A0001A86025A64C000807
63674+:10FF7000A243000B9562000A3C0810003C09800077
63675+:10FF8000A64200108D670004AE470024ACC801B83B
63676+:10FF9000AD2A01780A001304000000003C0A80002A
63677+:10FFA000354401009483000E3C0208008C4200D8C6
63678+:10FFB000240400803065FFFF245500013C01080047
63679+:10FFC000AC3500D80E000FDB240600030A001370C6
63680+:10FFD000000018210009320230D900FF2418000166
63681+:10FFE0001738FFD5000731C08F910020262200016D
63682+:10FFF000AF8200200A0013C800C0382100CB2024A3
63683+:020000021000EC
63684+:10000000AF85000010800008AF860004240D87FF34
63685+:1000100000CD6024158000083C0E006000AE302446
63686+:1000200010C00005000000000E000D42000000009E
63687+:100030000A001371000000000E0016050000000009
63688+:100040000A0013710000000030B980005320FF1F28
63689+:10005000AF8500003C02002000A2F82453E0FF1B03
63690+:10006000AF8500003C07FFFF34E47FFF00A4382485
63691+:100070000A00132B34C880000A001334010910242D
63692+:1000800000EC58245160005AAF8000248F8D002C62
63693+:100090003C0E0F0000EE182415A00075AF83001071
63694+:1000A00030EF010011E00073939800103C12020041
63695+:1000B000107200703C06800034D9010093280013B0
63696+:1000C0009789002A36A60002311800FF271600047F
63697+:1000D000001619C03C0480008C8501B804A0FFFE06
63698+:1000E00034880180AD0300003C158008AC830020FB
63699+:1000F00096BF004833E5FFFF10A001BCAF850008A4
63700+:100100002523001200A3102B504001B98F85000455
63701+:10011000348D010095AC0020240B001A30E440001F
63702+:10012000318AFFFFA10B000B108001BA2543FFFEAF
63703+:1001300000A3702B15C001B88F9600048F8F0004A8
63704+:10014000A503001435E50001AF8500043C088000DC
63705+:1001500035150180A6A9000EA6A9001A8F89000CEA
63706+:1001600030BF8000A6A70010AEA90028A6A60008F0
63707+:1001700013E0000F3C0F8000350C0100958B00163A
63708+:10018000316AFFFC25440004008818218C6240007D
63709+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
63710+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
63711+:1001B0002416BFFF00B6902435E50180A4B20026C6
63712+:1001C000ACA7002C3C071000ADE701B80A00137083
63713+:1001D000000018210E00165D000000003C0A4000DF
63714+:1001E0003C098000AD2A01780A00130400000000D9
63715+:1001F0008F85002410A00027AF80001090A300007E
63716+:10020000106000742409000310690101000030210E
63717+:1002100090AE0001240D000211CD014230EF0040EC
63718+:1002200090A90001241F0001113F000930E20040A5
63719+:100230008CA600049785002A00C020210E000FDB49
63720+:1002400036A60002000040210A00137001001821A8
63721+:100250005040FFF88CA600043C07080190E7964147
63722+:1002600010E0FFF4240800010A00137001001821B7
63723+:10027000939800103C1F080127FF96400018C8C043
63724+:10028000033F4021AF8800248F85002414A0FFDBAA
63725+:10029000AF9800103C0480008C86400030C50100FF
63726+:1002A00010A0008732AB00043C0C08008D8C0024A9
63727+:1002B00024160004156000033192000D241600027C
63728+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
63729+:1002D00032B5FFFB8C984000330F010055E0000160
63730+:1002E0002415001030E80800110000382409FFFB35
63731+:1002F0008F9F00282FF903EF53200001024990241B
63732+:1003000030E2010010400014325F00018F87002CA2
63733+:1003100014E0010E8F8C000C3C0480003486010038
63734+:1003200090C5001330AA00FF25430004000321C03C
63735+:100330002419FFFE025990241240000202B6302513
63736+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
63737+:1003500000001821325F000113E0000D3247000455
63738+:10036000240900011249000202B6302532A6FFFF1F
63739+:100370009785002A0E000FDB000020212402FFFEDB
63740+:10038000024290241240FE950000182132470004DA
63741+:1003900050E0FE922403000102B63025241600042A
63742+:1003A0005656000132A6FFFF9785002A0E000FDB8C
63743+:1003B000240401002403FFFB0243A82412A0FE87AB
63744+:1003C000000018210A001370240300010A0014B968
63745+:1003D0000249902410A0FFAF30E5010010A00017E3
63746+:1003E0008F8600102403000210C300148F84000CB9
63747+:1003F0003C0608008CC6003824CAFFFF14C0000267
63748+:10040000008A1024000010213C0E080025CE003880
63749+:10041000004E682191AC00048F850028258B0004D4
63750+:10042000000B21C030A5FFFF36A600020E000FDB37
63751+:10043000000000000A00137000001821240F0002C1
63752+:1004400010CF0088241600013C0308008C6300D004
63753+:100450001076008D8F85002824D9FFFC2F280004FA
63754+:100460001500006300002021241F0002107F005DA2
63755+:100470002CC9000C24C3FFF82C6200041440FFE9CF
63756+:100480000000202130EA020051400004000621C093
63757+:1004900054C0000530A5FFFF000621C030A5FFFFB6
63758+:1004A0000A00150436A600020E000FDB32A600017A
63759+:1004B0008F8600108F8500280A001520000621C0B5
63760+:1004C0003C0A08008D4A0024315200015240FE438C
63761+:1004D000000018219785002A36A600020E000FDBC7
63762+:1004E000000020210A001370000018219668000CFB
63763+:1004F000311802005700FE313C0500013C1F800806
63764+:1005000097F900489789002A36A600023328FFFF92
63765+:10051000AF8800083C0380008C7501B806A0FFFE80
63766+:100520003C04800034820180AC400000110000B621
63767+:1005300024180003252A0012010A182B106000B2AB
63768+:1005400000000000966F00203C0E8000240D001A71
63769+:1005500031ECFFFF35CA018030EB4000A14D000BAC
63770+:10056000116000B02583FFFE0103902B164000AE02
63771+:100570002416FFFE34A50001A5430014AF85000436
63772+:100580002419BFFF00B94024A6E9000EA6E9001A0D
63773+:10059000A6E60008A6E80026A6E700103C07100023
63774+:1005A000AE8701B80A001370000018213C048000D7
63775+:1005B0008C8201B80440FFFE349601802415001C93
63776+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
63777+:1005D0003C0A40003C098000AD2A01780A0013045F
63778+:1005E000000000005120FFA424C3FFF800002021D8
63779+:1005F00030A5FFFF0A00150436A600020E00103DCC
63780+:10060000000000008F8700000A001346AF82000C34
63781+:1006100090A30001241500011075FF0B24080001B0
63782+:10062000240600021066000430E2004024080001A5
63783+:100630000A001370010018215040FFFD240800013A
63784+:100640003C0C8000358B0100956A001094A40002D8
63785+:100650003143FFFF5083FDE1010018210A00158599
63786+:10066000240800018F8500282CB203EF1240FDDB27
63787+:10067000240300013C0308008C6300D02416000111
63788+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
63789+:10069000000621C030A5FFFF0A00150436A600029F
63790+:1006A00010B00037240F000B14AFFE23000731C039
63791+:1006B000312600FF00065600000A4E0305220047BF
63792+:1006C00030C6007F0006F8C03C16080126D69640CA
63793+:1006D00003F68021A2000001A20000003C0F600090
63794+:1006E0008DF918202405000100C588040011302769
63795+:1006F0000326C024000731C000C03821ADF81820FF
63796+:100700000A0013C8A60000028F850020000731C030
63797+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
63798+:100720002415002011E0FECC3C1980003728010080
63799+:100730009518001094B6000233120FFF16D2FEC6B1
63800+:10074000000000000A00148290A900013C0B080080
63801+:100750008D6B0038256DFFFF15600002018D1024A0
63802+:10076000000010213C080800250800380048C0217E
63803+:10077000930F000425EE00040A0014C5000E21C0EA
63804+:1007800000065202241F00FF115FFDEB000731C07D
63805+:10079000000A20C03C0E080125CE9640008EA821FC
63806+:1007A000009E602100095C02240D00013C076000EE
63807+:1007B000A2AD0000AD860000A2AB00018CF21820B3
63808+:1007C00024030001014310040242B025ACF61820B6
63809+:1007D00000C038210A0013C8A6A900020A0015AA01
63810+:1007E000AF8000200A0012FFAF84002C8F85000428
63811+:1007F0003C1980002408000337380180A308000B4F
63812+:100800000A00144D3C088000A2F8000B0A00155A9B
63813+:100810002419BFFF8F9600042412FFFE0A00144B18
63814+:1008200002D228242416FFFE0A00155800B62824F8
63815+:100830003C038000346401008C85000030A2003E3F
63816+:100840001440000800000000AC6000488C870000E5
63817+:1008500030E607C010C0000500000000AC60004C8E
63818+:10086000AC60005003E0000824020001AC600054BA
63819+:10087000AC6000408C880000310438001080FFF923
63820+:10088000000000002402000103E00008AC60004406
63821+:100890003C0380008C6201B80440FFFE3467018095
63822+:1008A000ACE4000024080001ACE00004A4E500086A
63823+:1008B00024050002A0E8000A34640140A0E5000B12
63824+:1008C0009483000A14C00008A4E30010ACE00024E4
63825+:1008D0003C07800034E901803C041000AD20002872
63826+:1008E00003E00008ACE401B88C8600043C0410006E
63827+:1008F000ACE600243C07800034E90180AD200028EC
63828+:1009000003E00008ACE401B83C0680008CC201B8EA
63829+:100910000440FFFE34C7018024090002ACE400005B
63830+:10092000ACE40004A4E50008A0E9000A34C50140D5
63831+:10093000A0E9000B94A8000A3C041000A4E80010F1
63832+:10094000ACE000248CA30004ACE3002803E0000822
63833+:10095000ACC401B83C039000346200010082202541
63834+:100960003C038000AC6400208C65002004A0FFFEE6
63835+:100970000000000003E00008000000003C028000CE
63836+:10098000344300010083202503E00008AC4400202C
63837+:1009900027BDFFE03C098000AFBF0018AFB10014D5
63838+:1009A000AFB00010352801408D10000091040009FF
63839+:1009B0009107000891050008308400FF30E600FF31
63840+:1009C00000061A002C820081008330251040002A86
63841+:1009D00030A50080000460803C0D080125AD92B078
63842+:1009E000018D58218D6A00000140000800000000C0
63843+:1009F0003C038000346201409445000A14A0001EAC
63844+:100A00008F91FCC09227000530E6000414C0001A44
63845+:100A1000000000000E00164E02002021922A000560
63846+:100A200002002021354900040E001658A2290005B5
63847+:100A30009228000531040004148000020000000028
63848+:100A40000000000D922D0000240B002031AC00FFAF
63849+:100A5000158B00093C0580008CAE01B805C0FFFE77
63850+:100A600034B10180AE3000003C0F100024100005AE
63851+:100A7000A230000BACAF01B80000000D8FBF001812
63852+:100A80008FB100148FB0001003E0000827BD0020D4
63853+:100A90000200202100C028218FBF00188FB1001450
63854+:100AA0008FB00010240600010A00161D27BD00208B
63855+:100AB0000000000D0200202100C028218FBF001877
63856+:100AC0008FB100148FB00010000030210A00161DF5
63857+:100AD00027BD002014A0FFE8000000000200202134
63858+:100AE0008FBF00188FB100148FB0001000C02821F4
63859+:100AF0000A00163B27BD00203C0780008CEE01B8A1
63860+:100B000005C0FFFE34F00180241F0002A21F000B6D
63861+:100B100034F80140A60600089719000A3C0F10009F
63862+:100B2000A61900108F110004A6110012ACEF01B835
63863+:100B30000A0016998FBF001827BDFFE8AFBF00104D
63864+:100B40000E000FD4000000003C0280008FBF001098
63865+:100B500000002021AC4001800A00108F27BD001842
63866+:100B60003084FFFF30A5FFFF108000070000182130
63867+:100B7000308200011040000200042042006518216C
63868+:100B80001480FFFB0005284003E0000800601021EE
63869+:100B900010C00007000000008CA2000024C6FFFF68
63870+:100BA00024A50004AC82000014C0FFFB24840004D0
63871+:100BB00003E000080000000010A0000824A3FFFFCD
63872+:100BC000AC86000000000000000000002402FFFFCF
63873+:100BD0002463FFFF1462FFFA2484000403E000088A
63874+:100BE000000000003C03800027BDFFF83462018054
63875+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
63876+:100C00003C0B80008D6401B80480FFFE00000000F2
63877+:100C10008FA900008D6801288FAA00008FA700000F
63878+:100C20008FA400002405000124020002A085000A10
63879+:100C30008FA30000359940003C051000A062000B16
63880+:100C40008FB800008FAC00008FA600008FAF0000AF
63881+:100C500027BD0008AD280000AD400004AD80002491
63882+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
63883+:100C700003E00008AD6501B83C06800827BDFFE829
63884+:100C800034C50080AFBF001090A7000924020012F5
63885+:100C900030E300FF1062000B008030218CA8005070
63886+:100CA00000882023048000088FBF00108CAA003425
63887+:100CB000240400390000282100CA4823052000052B
63888+:100CC000240600128FBF00102402000103E0000878
63889+:100CD00027BD00180E0016F2000000008FBF0010A4
63890+:100CE0002402000103E0000827BD001827BDFFC84B
63891+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
63892+:100D000000A0802190A5000D30A6001010C000109A
63893+:100D1000008090213C0280088C4400048E0300086F
63894+:100D20001064000C30A7000530A6000510C0009329
63895+:100D3000240400018FBF00348FB200308FB1002C2B
63896+:100D40008FB000280080102103E0000827BD003884
63897+:100D500030A7000510E0000F30AB001210C00006F5
63898+:100D6000240400013C0980088E0800088D25000439
63899+:100D70005105009C240400388FBF00348FB200302E
63900+:100D80008FB1002C8FB000280080102103E00008F4
63901+:100D900027BD0038240A0012156AFFE6240400016A
63902+:100DA0000200202127A500100E000CB6AFA00010F5
63903+:100DB0001440007C3C19800837240080909800087B
63904+:100DC000331100081220000A8FA7001030FF010025
63905+:100DD00013E000A48FA300148C8600580066102333
63906+:100DE000044000043C0A8008AC8300588FA7001020
63907+:100DF0003C0A800835480080910900083124000829
63908+:100E00001480000224080003000040213C1F8008D9
63909+:100E100093F1001193F9001237E600808CCC005456
63910+:100E2000333800FF03087821322D00FF000F708057
63911+:100E300001AE282100AC582B1160006F00000000AB
63912+:100E400094CA005C8CC900543144FFFF0125102373
63913+:100E50000082182B14600068000000008CCB005446
63914+:100E60000165182330EC00041180006C000830800C
63915+:100E70008FA8001C0068102B1040006230ED0004A9
63916+:100E8000006610232C46008010C00002004088211C
63917+:100E9000241100800E00164E024020213C0D8008D7
63918+:100EA00035A6008024070001ACC7000C90C80008DC
63919+:100EB0000011484035A70100310C007FA0CC00088C
63920+:100EC0008E05000424AB0001ACCB0030A4D1005C43
63921+:100ED0008CCA003C9602000E01422021ACC40020C6
63922+:100EE0008CC3003C0069F821ACDF001C8E190004A3
63923+:100EF000ACF900008E180008ACF800048FB10010A7
63924+:100F0000322F000855E0004793A60020A0C0004EF5
63925+:100F100090D8004E2411FFDFA0F8000890CF000801
63926+:100F200001F17024A0CE00088E0500083C0B80085B
63927+:100F300035690080AD2500388D6A00148D2200309F
63928+:100F40002419005001422021AD24003491230000D7
63929+:100F5000307F00FF13F90036264F01000E001658AF
63930+:100F60000240202124040038000028210E0016F23F
63931+:100F70002406000A0A001757240400010E000D2859
63932+:100F8000000020218FBF00348FB200308FB1002CC1
63933+:100F90008FB00028004020210080102103E00008CD
63934+:100FA00027BD00388E0E00083C0F800835F0008009
63935+:100FB000AE0E005402402021AE0000300E00164E4E
63936+:100FC00000000000920D00250240202135AC0020D9
63937+:100FD0000E001658A20C00250E000CAC0240202179
63938+:100FE000240400382405008D0E0016F22406001299
63939+:100FF0000A0017572404000194C5005C0A001792E8
63940+:1010000030A3FFFF2407021811A0FF9E00E6102363
63941+:101010008FAE001C0A00179A01C610230A0017970A
63942+:101020002C620218A0E600080A0017C48E0500080A
63943+:101030002406FF8001E6C0243C118000AE38002861
63944+:101040008E0D000831E7007F3C0E800C00EE602121
63945+:10105000AD8D00E08E080008AF8C00380A0017D074
63946+:10106000AD8800E4AC800058908500082403FFF7A9
63947+:1010700000A33824A08700080A0017758FA7001066
63948+:101080003C05080024A560A83C04080024846FF4F3
63949+:101090003C020800244260B0240300063C01080121
63950+:1010A000AC2596C03C010801AC2496C43C01080163
63951+:1010B000AC2296C83C010801A02396CC03E00008AE
63952+:1010C0000000000003E00008240200013C02800050
63953+:1010D000308800FF344701803C0680008CC301B893
63954+:1010E0000460FFFE000000008CC501282418FF806A
63955+:1010F0003C0D800A24AF010001F8702431EC007F20
63956+:10110000ACCE0024018D2021ACE50000948B00EAD8
63957+:101110003509600024080002316AFFFFACEA0004D0
63958+:1011200024020001A4E90008A0E8000BACE00024C0
63959+:101130003C071000ACC701B8AF84003803E00008DA
63960+:10114000AF85006C938800488F8900608F820038DB
63961+:1011500030C600FF0109382330E900FF01221821C1
63962+:1011600030A500FF2468008810C000020124382147
63963+:101170000080382130E400031480000330AA00030B
63964+:101180001140000D312B000310A0000900001021B8
63965+:1011900090ED0000244E000131C200FF0045602B9D
63966+:1011A000A10D000024E700011580FFF925080001CA
63967+:1011B00003E00008000000001560FFF300000000DD
63968+:1011C00010A0FFFB000010218CF80000245900043F
63969+:1011D000332200FF0045782BAD18000024E70004FF
63970+:1011E00015E0FFF92508000403E0000800000000F6
63971+:1011F00093850048938800588F8700600004320070
63972+:101200003103007F00E5102B30C47F001040000F39
63973+:10121000006428258F8400383C0980008C8A00EC0B
63974+:10122000AD2A00A43C03800000A35825AC6B00A0AD
63975+:101230008C6C00A00580FFFE000000008C6D00ACEF
63976+:10124000AC8D00EC03E000088C6200A80A00188254
63977+:101250008F840038938800593C0280000080502120
63978+:10126000310300FEA383005930ABFFFF30CC00FFF9
63979+:1012700030E7FFFF344801803C0980008D2401B82D
63980+:101280000480FFFE8F8D006C24180016AD0D000049
63981+:101290008D2201248F8D0038AD0200048D5900206D
63982+:1012A000A5070008240201C4A119000AA118000B17
63983+:1012B000952F01208D4E00088D4700049783005C18
63984+:1012C0008D59002401CF302100C7282100A32023FD
63985+:1012D0002418FFFFA504000CA50B000EA5020010AA
63986+:1012E000A50C0012AD190018AD18002495AF00E848
63987+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
63988+:101300008DAC0084AD0C002CAD2B01B88D460020B7
63989+:1013100000C7282403E00008AD4500208F8800386E
63990+:101320000080582130E7FFFF910900D63C02800081
63991+:1013300030A5FFFF312400FF00041A00006750258C
63992+:1013400030C600FF344701803C0980008D2C01B875
63993+:101350000580FFFE8F82006C240F0017ACE20000B6
63994+:101360008D390124ACF900048D780020A4EA00082E
63995+:10137000241901C4A0F8000AA0EF000B9523012056
63996+:101380008D6E00088D6D00049784005C01C35021B0
63997+:10139000014D602101841023A4E2000CA4E5000E9D
63998+:1013A000A4F90010A4E60012ACE000148D7800242B
63999+:1013B000240DFFFFACF800188D0F007CACEF001C73
64000+:1013C0008D0E00783C0F1000ACEE0020ACED002438
64001+:1013D000950A00BE240DFFF73146FFFFACE600285A
64002+:1013E000950C00809504008231837FFF0003CA00C2
64003+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
64004+:10140000950E00828D6A002000AE3021014D282407
64005+:10141000A506008203E00008AD6500203C028000C4
64006+:10142000344501803C0480008C8301B80460FFFED9
64007+:101430008F8A0044240600199549001C3128FFFFBB
64008+:10144000000839C0ACA70000A0A6000B3C051000A6
64009+:1014500003E00008AC8501B88F87004C0080402174
64010+:1014600030C400FF3C0680008CC201B80440FFFE7F
64011+:101470008F89006C9383006834996000ACA90000E8
64012+:10148000A0A300058CE20010240F00022403FFF744
64013+:10149000A4A20006A4B900088D180020A0B8000A74
64014+:1014A000A0AF000B8CEE0000ACAE00108CED000481
64015+:1014B000ACAD00148CEC001CACAC00248CEB002018
64016+:1014C000ACAB00288CEA002C3C071000ACAA002C26
64017+:1014D0008D090024ACA90018ACC701B88D05002007
64018+:1014E00000A3202403E00008AD0400208F8600380C
64019+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
64020+:1015000090C300D430A500FF3062002010400008D6
64021+:10151000008088218CCB00D02409FFDF256A0001E0
64022+:10152000ACCA00D090C800D401093824A0C700D4A8
64023+:1015300014A000403C0C80008F840038908700D4B9
64024+:101540002418FFBF2406FFEF30E3007FA08300D400
64025+:10155000979F005C8F8200608F8D003803E2C82364
64026+:10156000A799005CA5A000BC91AF00D401F870243D
64027+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
64028+:10158000A5400082AD4000EC914500D400A658244F
64029+:10159000A14B00D48F9000348F8400609786005C4C
64030+:1015A0000204282110C0000FAF850034A38000582A
64031+:1015B0003C0780008E2C000894ED01208E2B000447
64032+:1015C000018D5021014B8021020620233086FFFF30
64033+:1015D00030C8000F3909000131310001162000091F
64034+:1015E000A3880058938600488FBF00188FB100145D
64035+:1015F0008FB0001027BD0020AF85006403E0000815
64036+:10160000AF86006000C870238FBF00189386004823
64037+:101610008FB100148FB0001034EF0C00010F28219F
64038+:1016200027BD0020ACEE0084AF85006403E0000815
64039+:10163000AF86006035900180020028210E00190F4E
64040+:10164000240600828F840038908600D430C5004084
64041+:1016500050A0FFBAA38000688F85004C3C06800034
64042+:101660008CCD01B805A0FFFE8F89006C2408608234
64043+:1016700024070002AE090000A6080008A207000B1C
64044+:101680008CA300083C0E1000AE0300108CA2000CCE
64045+:10169000AE0200148CBF0014AE1F00188CB90018E5
64046+:1016A000AE1900248CB80024AE1800288CAF002896
64047+:1016B000AE0F002CACCE01B80A001948A380006818
64048+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
64049+:1016D0008F880060AFBF00189389003C954200BC22
64050+:1016E00030D100FF0109182B0080802130AC00FFB1
64051+:1016F0003047FFFF0000582114600003310600FF4F
64052+:1017000001203021010958239783005C0068202BB9
64053+:101710001480002700000000106800562419000102
64054+:101720001199006334E708803165FFFF0E0018C08F
64055+:10173000020020218F83006C3C07800034E601808A
64056+:101740003C0580008CAB01B80560FFFE240A001840
64057+:101750008F840038ACC30000A0CA000B948900BE7F
64058+:101760003C081000A4C90010ACC00030ACA801B8FF
64059+:101770009482008024430001A4830080949F008011
64060+:101780003C0608008CC6318833EC7FFF1186005E72
64061+:101790000000000002002021022028218FBF001835
64062+:1017A0008FB100148FB000100A00193427BD00203B
64063+:1017B000914400D42403FF8000838825A15100D4E4
64064+:1017C0009784005C3088FFFF51000023938C003C1D
64065+:1017D0008F8500382402EFFF008B782394AE00BC85
64066+:1017E0000168502B31E900FF01C26824A4AD00BCA0
64067+:1017F00051400039010058213C1F800037E60100AC
64068+:101800008CD800043C190001031940245500000144
64069+:1018100034E740008E0A00202403FFFB241100015E
64070+:1018200001432024AE0400201191002D34E78000F4
64071+:1018300002002021012030210E0018C03165FFFF79
64072+:101840009787005C8F890060A780005C0127802358
64073+:10185000AF900060938C003C8F8B00388FBF0018D6
64074+:101860008FB100148FB0001027BD002003E00008E6
64075+:10187000A16C00D73C0D800035AA01008D48000402
64076+:101880003C0900010109282454A0000134E740006C
64077+:101890008E0F00202418FFFB34E7800001F870242D
64078+:1018A00024190001AE0E00201599FF9F34E708802F
64079+:1018B000020020210E00188E3165FFFF020020215A
64080+:1018C000022028218FBF00188FB100148FB00010A4
64081+:1018D0000A00193427BD00200A0019F7000048212A
64082+:1018E00002002021012030210E00188E3165FFFFFB
64083+:1018F0009787005C8F890060A780005C01278023A8
64084+:101900000A001A0EAF900060948C0080241F8000A3
64085+:10191000019F3024A4860080908B0080908F0080EF
64086+:10192000316700FF0007C9C20019C027001871C045
64087+:1019300031ED007F01AE2825A08500800A0019DF67
64088+:1019400002002021938500682403000127BDFFE8E1
64089+:1019500000A330042CA20020AFB00010AFBF0014D1
64090+:1019600000C01821104000132410FFFE3C0708009F
64091+:101970008CE7319000E610243C088000350501809A
64092+:1019800014400005240600848F890038240A0004CE
64093+:101990002410FFFFA12A00FC0E00190F0000000018
64094+:1019A000020010218FBF00148FB0001003E0000868
64095+:1019B00027BD00183C0608008CC631940A001A574F
64096+:1019C00000C310248F87004427BDFFE0AFB200188A
64097+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
64098+:1019E00090E6000D00A088210080902130C5007F86
64099+:1019F000A0E5000D8F8500388E2300188CA200D042
64100+:101A00001062002E240A000E0E001A4AA38A0068F3
64101+:101A10002409FFFF104900222404FFFF5200002088
64102+:101A2000000020218E2600003C0C001000CC582421
64103+:101A3000156000393C0E000800CE682455A0003F18
64104+:101A4000024020213C18000200D880241200001F10
64105+:101A50003C0A00048F8700448CE200148CE30010E1
64106+:101A60008CE500140043F82303E5C82B1320000580
64107+:101A7000024020218E24002C8CF1001010910031A6
64108+:101A80000240202124020012A38200680E001A4A9C
64109+:101A90002412FFFF105200022404FFFF0000202147
64110+:101AA0008FBF001C8FB200188FB100148FB00010D0
64111+:101AB0000080102103E0000827BD002090A800D47A
64112+:101AC000350400200A001A80A0A400D400CA4824CB
64113+:101AD0001520000B8F8B00448F8D00448DAC0010BF
64114+:101AE0001580000B024020218E2E002C51C0FFECEF
64115+:101AF00000002021024020210A001A9B2402001726
64116+:101B00008D66001050C0FFE6000020210240202119
64117+:101B10000A001A9B24020011024020212402001511
64118+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
64119+:101B30002404FFFF0A001A8A8E2600000A001AC138
64120+:101B4000240200143C08000400C8382450E0FFD4EC
64121+:101B500000002021024020210A001A9B24020013C9
64122+:101B60008F85003827BDFFD8AFB3001CAFB2001877
64123+:101B7000AFB10014AFB00010AFBF002090A700D4E9
64124+:101B80008F90004C2412FFFF34E2004092060000C8
64125+:101B9000A0A200D48E0300100080982110720006CD
64126+:101BA00030D1003F2408000D0E001A4AA3880068B7
64127+:101BB000105200252404FFFF8F8A00388E09001878
64128+:101BC0008D4400D01124000702602021240C000E57
64129+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
64130+:101BE0002404FFFF24040020122400048F8D0038F9
64131+:101BF00091AF00D435EE0020A1AE00D48F85005403
64132+:101C000010A00019000000001224004A8F9800382C
64133+:101C10008F92FCC0971000809651000A5230004805
64134+:101C20008F9300403C1F08008FFF318C03E5C82BC9
64135+:101C30001720001E02602021000028210E0019A993
64136+:101C400024060001000020218FBF00208FB3001C5C
64137+:101C50008FB200188FB100148FB0001000801021D7
64138+:101C600003E0000827BD00285224002A8E05001436
64139+:101C70008F840038948A008025490001A48900805F
64140+:101C8000948800803C0208008C42318831077FFF35
64141+:101C900010E2000E00000000026020210E00193446
64142+:101CA000240500010A001B0B000020212402002D46
64143+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
64144+:101CC0002404FFFF0A001B0C8FBF002094990080A2
64145+:101CD000241F800024050001033FC024A498008035
64146+:101CE00090920080908E0080325100FF001181C2DE
64147+:101CF00000107827000F69C031CC007F018D582576
64148+:101D0000A08B00800E001934026020210A001B0BFA
64149+:101D1000000020212406FFFF54A6FFD68F84003840
64150+:101D2000026020210E001934240500010A001B0B5B
64151+:101D300000002021026020210A001B252402000A45
64152+:101D40002404FFFD0A001B0BAF9300608F8800384E
64153+:101D500027BDFFE8AFB00010AFBF0014910A00D458
64154+:101D60008F87004C00808021354900408CE60010B0
64155+:101D7000A10900D43C0208008C4231B030C53FFFBD
64156+:101D800000A2182B106000078F850050240DFF80E3
64157+:101D900090AE000D01AE6024318B00FF156000088D
64158+:101DA0000006C382020020212403000D8FBF00140F
64159+:101DB0008FB0001027BD00180A001A4AA3830068DC
64160+:101DC00033060003240F000254CFFFF70200202146
64161+:101DD00094A2001C8F85003824190023A4A200E8D7
64162+:101DE0008CE8000000081E02307F003F13F9003528
64163+:101DF0003C0A00838CE800188CA600D0110600086D
64164+:101E0000000000002405000E0E001A4AA385006899
64165+:101E10002407FFFF104700182404FFFF8F850038B8
64166+:101E200090A900D435240020A0A400D48F8C0044B5
64167+:101E3000918E000D31CD007FA18D000D8F83005458
64168+:101E40001060001C020020218F8400508C9800102C
64169+:101E50000303782B11E0000D241900180200202143
64170+:101E6000A39900680E001A4A2410FFFF10500002C8
64171+:101E70002404FFFF000020218FBF00148FB000104A
64172+:101E80000080102103E0000827BD00188C86001098
64173+:101E90008F9F00440200202100C31023AFE20010F6
64174+:101EA000240500010E0019A9240600010A001B9751
64175+:101EB000000020210E001934240500010A001B97A0
64176+:101EC00000002021010A5824156AFFD98F8C004494
64177+:101ED000A0A600FC0A001B84A386005A30A500FFC0
64178+:101EE0002406000124A9000100C9102B1040000C99
64179+:101EF00000004021240A000100A61823308B0001B5
64180+:101F000024C60001006A3804000420421160000267
64181+:101F100000C9182B010740251460FFF800A61823FC
64182+:101F200003E000080100102127BDFFD8AFB0001862
64183+:101F30008F90004CAFB1001CAFBF00202403FFFF07
64184+:101F40002411002FAFA30010920600002405000802
64185+:101F500026100001006620260E001BB0308400FF12
64186+:101F600000021E003C021EDC34466F410A001BD8F2
64187+:101F70000000102110A00009008018212445000154
64188+:101F800030A2FFFF2C4500080461FFFA0003204047
64189+:101F90000086202614A0FFF9008018210E001BB037
64190+:101FA000240500208FA300102629FFFF313100FFF8
64191+:101FB00000034202240700FF1627FFE20102182651
64192+:101FC00000035027AFAA0014AFAA00100000302170
64193+:101FD00027A8001027A7001400E6782391ED00033E
64194+:101FE00024CE000100C8602131C600FF2CCB0004C4
64195+:101FF0001560FFF9A18D00008FA200108FBF002097
64196+:102000008FB1001C8FB0001803E0000827BD002826
64197+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
64198+:10202000AFB50024AFB40020AFB20018AFB10014B8
64199+:102030003C0C80008D880128240FFF803C06800A1C
64200+:1020400025100100250B0080020F68243205007F57
64201+:10205000016F7024AD8E009000A62821AD8D002464
64202+:1020600090A600FC3169007F3C0A8004012A1821F7
64203+:10207000A386005A9067007C00809821AF830030CF
64204+:1020800030E20002AF88006CAF85003800A0182154
64205+:10209000144000022404003424040030A3840048C7
64206+:1020A0008C7200DC30D100FF24040004AF92006089
64207+:1020B00012240004A38000688E7400041680001EA1
64208+:1020C0003C0880009386005930C7000110E0000FE3
64209+:1020D0008F9300608CB000848CA800842404FF805F
64210+:1020E000020410240002F940310A007F03EA482567
64211+:1020F0003C0C2000012C902530CD00FE3C038000DC
64212+:10210000AC720830A38D00598F9300608FBF0028F8
64213+:102110008FB50024ACB300DC8FB400208FB3001C5B
64214+:102120008FB200188FB100148FB00010240200018C
64215+:1021300003E0000827BD00308E7F000895020120D3
64216+:102140008E67001003E2C8213326FFFF30D8000F4E
64217+:1021500033150001AF87003416A00058A39800582B
64218+:1021600035090C000309382100D81823AD03008479
64219+:10217000AF8700648E6A00043148FFFF1100007EC3
64220+:10218000A78A005C90AC00D42407FF8000EC3024C8
64221+:1021900030CB00FF1560004B9786005C938E005A91
64222+:1021A000240D000230D5FFFF11CD02A20000A021B6
64223+:1021B0008F85006002A5802B160000BC9388004824
64224+:1021C0003C11800096240120310400FF1485008812
64225+:1021D0008F8400648F9800343312000356400085CA
64226+:1021E00030A500FF8F900064310C00FF24060034FE
64227+:1021F00011860095AF90004C9204000414800118E1
64228+:102200008F8E0038A380003C8E0D00048DC800D84E
64229+:102210003C0600FF34CCFFFF01AC30240106182B34
64230+:1022200014600120AF8600548F8700609798005C8F
64231+:10223000AF8700400307402310C000C7A788005C99
64232+:102240008F91003030C3000300035823922A007C92
64233+:102250003171000302261021000A20823092000111
64234+:102260000012488000492821311FFFFF03E5C82BD9
64235+:10227000132001208F8800388F8500348F880064F8
64236+:102280001105025A3C0E3F018E0600003C0C250051
64237+:1022900000CE682411AC01638F84004C30E500FF50
64238+:1022A0000E00184A000030218F8800388F870060A8
64239+:1022B0008F8500340A001DB78F8600540A001C5613
64240+:1022C000AF87006490A400D400E48024320200FFB1
64241+:1022D000104000169386005990A6008890AE00D753
64242+:1022E00024A8008830D4003F2686FFE02CD10020AF
64243+:1022F000A38E003C1220000CAF88004C240B000180
64244+:1023000000CB20043095001916A0012B3C0680005C
64245+:1023100034CF0002008FC0241700022E3099002015
64246+:1023200017200234000000009386005930CB0001D2
64247+:102330001160000F9788005C8CBF00848CA900841A
64248+:10234000240AFF8003EA6024000C19403132007F28
64249+:10235000007238253C0D200000EDC82530D800FE65
64250+:102360003C0F8000ADF90830A39800599788005CB5
64251+:102370001500FF84000000008E630020306200041E
64252+:102380001040FF51938600592404FFFB0064802411
64253+:102390003C038000AE700020346601808C7301B86D
64254+:1023A0000660FFFE8F98006C347501003C1400013C
64255+:1023B000ACD800008C6B012424076085ACCB0004F2
64256+:1023C0008EAE000401D488245220000124076083CB
64257+:1023D00024190002A4C700083C0F1000A0D9000B6C
64258+:1023E0003C068000ACCF01B80A001C2B9386005934
64259+:1023F00030A500FF0E00184A240600018F88006CEB
64260+:102400003C05800034A90900250201889388004812
64261+:10241000304A0007304B00783C0340802407FF809F
64262+:102420000163C825014980210047F824310C00FFD1
64263+:1024300024060034ACBF0800AF90004CACB90810C3
64264+:102440005586FF6E920400048F8400388E11003090
64265+:10245000908E00D431CD001015A000108F83006045
64266+:102460002C6F000515E000E400000000909800D4F7
64267+:102470002465FFFC331200101640000830A400FF52
64268+:102480008F9F00648F99003413F90004388700018E
64269+:1024900030E20001144001C8000000000E001BC320
64270+:1024A000000000000A001DF8000000008F84006496
64271+:1024B00030C500FF0E00184A24060001939800481A
64272+:1024C000240B0034130B00A08F8500388F8600602A
64273+:1024D0009783005C306EFFFF00CE8823AF910060D1
64274+:1024E000A780005C1280FF90028018212414FFFD59
64275+:1024F0005474FFA28E6300208E6A00042403FFBF81
64276+:102500002408FFEF0155F823AE7F000490AC00D4FF
64277+:102510003189007FA0A900D48E7200208F8F0038EF
64278+:10252000A780005C364D0002AE6D0020A5E000BC27
64279+:1025300091E500D400A3C824A1F900D48F950038F8
64280+:10254000AEA000EC92B800D403085824A2AB00D48B
64281+:102550000A001CD78F8500388F910034AF8000604F
64282+:1025600002275821AF8B0034000020212403FFFFF5
64283+:10257000108301B48F8500388E0C00103C0D0800CC
64284+:102580008DAD31B09208000031843FFF008D802B6B
64285+:1025900012000023310D003F3C1908008F3931A88B
64286+:1025A0008F9F006C000479802408FF80033F202166
64287+:1025B000008FC821938500590328F8243C06008029
64288+:1025C0003C0F800034D80001001F91403331007F60
64289+:1025D0008F8600380251502535EE0940332B0078A4
64290+:1025E000333000073C0310003C02800C017890253A
64291+:1025F000020E48210143C0250222382134AE0001D9
64292+:10260000ADFF0804AF890050ADF20814AF87004455
64293+:10261000ADFF0028ACD90084ADF80830A38E005976
64294+:102620009383005A24070003106700272407000142
64295+:102630001467FFAC8F8500382411002311B1008589
64296+:1026400000000000240E000B026020210E001A4A38
64297+:10265000A38E00680040A0210A001D328F8500383B
64298+:1026600002602021240B000C0E001A4AA38B006884
64299+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
64300+:10268000A380003C8E0D00048DC800D83C0600FFDE
64301+:1026900034CCFFFF01AC30240106182B1060FEE2A1
64302+:1026A000AF86005402602021241200190E001A4A3D
64303+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
64304+:1026C0000A001C838F86005425A3FFE02C74002091
64305+:1026D0001280FFDD240E000B000328803C1108014E
64306+:1026E000263194B400B148218D2D000001A00008CE
64307+:1026F000000000008F85003400A710219385003C66
64308+:10270000AF82003402251821A383003C951F00BC32
64309+:102710000226282137F91000A51900BC5240FF926B
64310+:10272000AF850060246A0004A38A003C950900BCC0
64311+:1027300024A40004AF84006035322000A51200BC40
64312+:102740000A001D54000020218F8600602CC800055F
64313+:102750001500FF609783005C3065FFFF00C5C8234C
64314+:102760002F2F000511E00003306400FF24CDFFFC93
64315+:1027700031A400FF8F8900648F920034113200046D
64316+:10278000389F000133EC0001158001380000000083
64317+:102790008F840038908700D434E60010A08600D4DF
64318+:1027A0008F8500388F8600609783005CACA000ECBA
64319+:1027B0000A001D2F306EFFFF8CB500848CB400849E
64320+:1027C0003C04100002A7302400068940328E007FAE
64321+:1027D000022E8025020410253C08800024050001FB
64322+:1027E00002602021240600010E0019A9AD02083064
64323+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
64324+:102800000260202124090005A38900680E001A4AED
64325+:102810002411FFFF1451FE782404FFFF0A001D5508
64326+:102820002403FFFF8F8F004C8F8800388DF8000045
64327+:10283000AD1800888DE70010AD0700988F87006005
64328+:102840000A001DB78F8600542406FFFF118600057D
64329+:10285000000000000E001B4C026020210A001D8FAA
64330+:102860000040A0210E001AD1026020210A001D8F15
64331+:102870000040A0218F90004C3C0208008C4231B0F7
64332+:102880008E110010322C3FFF0182282B10A0000C6B
64333+:10289000240BFF808F85005090A3000D01637024EE
64334+:1028A00031CA00FF1140000702602021001143825D
64335+:1028B000310600032418000110D8010600000000B2
64336+:1028C000026020212403000D0E001A4AA383006831
64337+:1028D000004020218F8500380A001D320080A02191
64338+:1028E0008F90004C3C0A08008D4A31B08F85005013
64339+:1028F0008E0400100000A0218CB1001430823FFF34
64340+:10290000004A602B8CB200205180FFEE0260202133
64341+:1029100090B8000D240BFF800178702431C300FFB4
64342+:102920005060FFE80260202100044382310600036A
64343+:1029300014C0FFE40260202194BF001C8F9900386E
64344+:102940008E060028A73F00E88CAF0010022F20233E
64345+:1029500014C4013A026020218F83005400C368210F
64346+:10296000022D382B14E00136240200188F8A00440F
64347+:102970008F820030024390218D4B00100163702341
64348+:10298000AD4E0010AD5200208C4C00740192282BEB
64349+:1029900014A0015F026020218F8400508E08002463
64350+:1029A0008C86002411060007026020212419001CD7
64351+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
64352+:1029C0002404FFFF8F8400448C87002424FF00012F
64353+:1029D000AC9F00241251012F8F8D00308DB10074F7
64354+:1029E0001232012C3C0B00808E0E000001CB5024D3
64355+:1029F00015400075000000008E0300142411FFFF35
64356+:102A0000107100073C0808003C0608008CC6319095
64357+:102A100000C8C0241300015202602021A380006876
64358+:102A20008E0300003C19000100792024108000135F
64359+:102A30003C1F0080007FA02416800009020028218E
64360+:102A4000026020212411001A0E001A4AA391006886
64361+:102A50002407FFFF1047FF9F2404FFFF02002821E7
64362+:102A6000026020210E001A6A240600012410FFFFD4
64363+:102A70001050FF982404FFFF241400018F8D0044A0
64364+:102A8000026020210280302195A900342405000134
64365+:102A9000253200010E0019A9A5B200340000202142
64366+:102AA0008F8500380A001D320080A0218F90004CD5
64367+:102AB0003C1408008E9431B08E07001030E53FFFC3
64368+:102AC00000B4C82B132000618F8600502412FF80B1
64369+:102AD00090C9000D0249682431A400FF5080005CB9
64370+:102AE000026020218F8C00541180000700078B8228
64371+:102AF0008F8500388F82FCC094BF0080944A000A02
64372+:102B0000515F00F78F8600403227000314E0006415
64373+:102B100000000000920E000211C000D8000000006A
64374+:102B20008E0B0024156000D902602021920400035E
64375+:102B300024190002308500FF14B90005308900FF18
64376+:102B40008F940054128000EA240D002C308900FF7D
64377+:102B5000392C00102D8400012D3200010244302553
64378+:102B6000020028210E001A6A026020212410FFFFB3
64379+:102B7000105000BF8F8500388F830054106000D341
64380+:102B8000240500013C0A08008D4A318C0143F82BD2
64381+:102B900017E000B22402002D02602021000028214D
64382+:102BA0000E0019A9240600018F85003800001821A5
64383+:102BB0000A001D320060A0210E0018750000000000
64384+:102BC0000A001DF800000000AC8000200A001E78FA
64385+:102BD0008E03001400002821026020210E0019A994
64386+:102BE000240600010A001CC38F8500380A001DB7A7
64387+:102BF0008F8800388CAA00848CAC00843C031000C1
64388+:102C00000147F824001F91403189007F024968255F
64389+:102C100001A32825ACC50830910700012405000157
64390+:102C2000026020210E0019A930E600010A001CC331
64391+:102C30008F850038938F00482403FFFD0A001D3460
64392+:102C4000AF8F00600A001D342403FFFF02602021C3
64393+:102C50002410000D0E001A4AA390006800401821AD
64394+:102C60008F8500380A001D320060A0210E00187503
64395+:102C7000000000009783005C8F86006000402021E8
64396+:102C80003070FFFF00D010232C4A00051140FE11C8
64397+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
64398+:102CA00090CF000D31E300085460FFA192040003AF
64399+:102CB00002602021240200100E001A4AA38200683C
64400+:102CC0002403FFFF5443FF9A920400030A001F12DB
64401+:102CD0008F85003890A4000D308F000811E000951A
64402+:102CE0008F990054572000A6026020218E1F000CEF
64403+:102CF0008CB4002057F40005026020218E0D0008DE
64404+:102D00008CA7002411A7003A026020212402002091
64405+:102D1000A38200680E001A4A2412FFFF1052FEED33
64406+:102D20002404FFFF8F9F00442402FFF73C14800E11
64407+:102D300093EA000D2419FF803C03800001423824EF
64408+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
64409+:102D50008F8C006C97F200788F870044012C302113
64410+:102D6000324D7FFF000D204000C4782131E5007F07
64411+:102D700000B4C02101F94024AC68002CA711000068
64412+:102D80008CEB0028256E0001ACEE00288CEA002CAC
64413+:102D90008E02002C01426021ACEC002C8E09002C2C
64414+:102DA000ACE900308E120014ACF2003494ED003A1D
64415+:102DB00025A40001A4E4003A97E600783C1108003D
64416+:102DC0008E3131B024C3000130707FFF1211005CDE
64417+:102DD000006030218F8F0030026020212405000127
64418+:102DE0000E001934A5E600780A001EA1000020217B
64419+:102DF0008E0900142412FFFF1132006B8F8A0038F5
64420+:102E00008E0200188D4C00D0144C00650260202109
64421+:102E10008E0B00248CAE0028116E005B2402002172
64422+:102E20000E001A4AA38200681452FFBE2404FFFF5A
64423+:102E30008F8500380A001D320080A0212402001F67
64424+:102E40000E001A4AA38200682409FFFF1049FEA160
64425+:102E50002404FFFF0A001E548F83005402602021C7
64426+:102E60000E001A4AA38200681450FF508F85003864
64427+:102E70002403FFFF0A001D320060A0218CD800242B
64428+:102E80008E0800241118FF29026020210A001F2744
64429+:102E90002402000F8E0900003C05008001259024CB
64430+:102EA0001640FF492402001A026020210E001A4A2F
64431+:102EB000A3820068240CFFFF144CFECF2404FFFF04
64432+:102EC0008F8500380A001D320080A0210E001934C1
64433+:102ED000026020218F8500380A001EE500001821BD
64434+:102EE0002403FFFD0060A0210A001D32AF860060B0
64435+:102EF000026020210E001A4AA38D00682403FFFF00
64436+:102F00001043FF588F8500380A001ECC920400033E
64437+:102F10002418001D0E001A4AA39800682403FFFF1E
64438+:102F20001443FE9D2404FFFF8F8500380A001D32E4
64439+:102F30000080A021026020210A001F3D24020024FD
64440+:102F4000240880000068C024330BFFFF000B73C20D
64441+:102F500031D000FF001088270A001F6E001133C017
64442+:102F6000240F001B0E001A4AA38F00681451FEACF8
64443+:102F70002404FFFF8F8500380A001D320080A02145
64444+:102F80000A001F3D240200278E0600288CA3002C77
64445+:102F900010C30008026020210A001F812402001FC4
64446+:102FA0000A001F812402000E026020210A001F81F6
64447+:102FB000240200258E04002C1080000D8F8F00301D
64448+:102FC0008DE800740104C02B5700000C0260202122
64449+:102FD0008CB900140086A0210334282B10A0FF52C6
64450+:102FE0008F9F0044026020210A001F8124020022DA
64451+:102FF000026020210A001F81240200230A001F8191
64452+:103000002402002627BDFFD8AFB3001CAFB10014C7
64453+:10301000AFBF0020AFB20018AFB000103C0280007C
64454+:103020008C5201408C4B01483C048000000B8C0208
64455+:10303000322300FF317300FF8C8501B804A0FFFE2E
64456+:1030400034900180AE1200008C8701442464FFF0AC
64457+:10305000240600022C830013AE070004A61100080A
64458+:10306000A206000BAE1300241060004F8FBF00209B
64459+:10307000000448803C0A0801254A9534012A402171
64460+:103080008D04000000800008000000003C030800E0
64461+:103090008C6331A831693FFF00099980007280215B
64462+:1030A000021370212405FF80264D0100264C00806C
64463+:1030B0003C02800031B1007F3198007F31CA007F2F
64464+:1030C0003C1F800A3C1980043C0F800C01C5202461
64465+:1030D00001A5302401853824014F1821AC46002475
64466+:1030E000023F402103194821AC470090AC4400281E
64467+:1030F000AF830044AF880038AF8900300E0019005C
64468+:10310000016080213C0380008C6B01B80560FFFEEC
64469+:103110008F8700448F8600383465018090E8000D69
64470+:10312000ACB20000A4B0000600082600000416039C
64471+:1031300000029027001227C21080008124C200885C
64472+:10314000241F6082A4BF0008A0A000052402000282
64473+:10315000A0A2000B8F8B0030000424003C08270045
64474+:1031600000889025ACB20010ACA00014ACA00024E4
64475+:10317000ACA00028ACA0002C8D6900382413FF807F
64476+:10318000ACA9001890E3000D02638024320500FF13
64477+:1031900010A000058FBF002090ED000D31AC007F26
64478+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
64479+:1031B0008FB100148FB000103C0A10003C0E80004C
64480+:1031C00027BD002803E00008ADCA01B8265F010052
64481+:1031D0002405FF8033F8007F3C06800003E5782457
64482+:1031E0003C19800A03192021ACCF0024908E00D412
64483+:1031F00000AE682431AC00FF11800024AF84003899
64484+:10320000248E008895CD00123C0C08008D8C31A8CE
64485+:1032100031AB3FFF01924821000B5180012A402130
64486+:1032200001052024ACC400283107007F3C06800C37
64487+:1032300000E620219083000D00A31024304500FFFC
64488+:1032400010A0FFD8AF8400449098000D330F0010F9
64489+:1032500015E0FFD58FBF00200E0019000000000010
64490+:103260003C0380008C7901B80720FFFE00000000BD
64491+:10327000AE1200008C7F0144AE1F0004A6110008AE
64492+:1032800024110002A211000BAE1300243C1308010C
64493+:10329000927396F0327000015200FFC38FBF00207E
64494+:1032A0000E002146024020210A0020638FBF00202B
64495+:1032B0003C1260008E452C083C03F0033462FFFF93
64496+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
64497+:1032D00003199825AE532C080A0020638FBF0020E5
64498+:1032E000264D010031AF007F3C10800A240EFF8084
64499+:1032F00001F0282101AE60243C0B8000AD6C00245D
64500+:103300001660FFA8AF85003824110003A0B100FCAF
64501+:103310000A0020638FBF002026480100310A007F89
64502+:103320003C0B800A2409FF80014B30210109202435
64503+:103330003C078000ACE400240A002062AF8600381D
64504+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
64505+:10335000241F608290D900D42418FF800319782498
64506+:1033600031EA00FF1140FF7700000000240700044D
64507+:10337000A0C700FC8F870044241160842406000D40
64508+:10338000A4B10008A0A600050A00204D24020002F6
64509+:103390003C040001248496DC24030014240200FE73
64510+:1033A0003C010800AC2431EC3C010800AC2331E8BE
64511+:1033B0003C010801A42296F83C040801248496F8F4
64512+:1033C0000000182100643021A0C300042463000120
64513+:1033D0002C6500FF54A0FFFC006430213C0708006E
64514+:1033E00024E7010003E00008AF87007800A058211F
64515+:1033F000008048210000102114A00012000050217C
64516+:103400000A002142000000003C010801A42096F8B7
64517+:103410003C05080194A596F88F8200783C0C0801C1
64518+:10342000258C96F800E2182100AC2021014B302BAE
64519+:10343000A089000400001021A460000810C0003919
64520+:10344000010048218F8600780009384000E94021BA
64521+:103450000008388000E6282190A8000B90B9000AE7
64522+:103460000008204000881021000218800066C0215A
64523+:10347000A319000A8F85007800E5782191EE000AF3
64524+:1034800091E6000B000E684001AE6021000C208028
64525+:1034900000851021A046000B3C030801906396F2C2
64526+:1034A000106000222462FFFF8F8300383C01080176
64527+:1034B000A02296F2906C00FF118000040000000032
64528+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
64529+:1034D000973996F8272300013078FFFF2F0F00FF60
64530+:1034E00011E0FFC9254A00013C010801A42396F818
64531+:1034F0003C05080194A596F88F8200783C0C0801E1
64532+:10350000258C96F800E2182100AC2021014B302BCD
64533+:10351000A089000400001021A460000814C0FFC9A5
64534+:103520000100482103E000080000000003E000085B
64535+:103530002402000227BDFFE0248501002407FF804C
64536+:10354000AFB00010AFBF0018AFB1001400A718242F
64537+:103550003C10800030A4007F3C06800A00862821B1
64538+:103560008E110024AE03002490A200FF1440000836
64539+:10357000AF850038A0A000098FBF0018AE1100244D
64540+:103580008FB100148FB0001003E0000827BD0020A9
64541+:1035900090A900FD90A800FF312400FF0E0020F448
64542+:1035A000310500FF8F8500388FBF0018A0A00009EB
64543+:1035B000AE1100248FB100148FB0001003E000089A
64544+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
64545+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
64546+:1035E0003C0980009533011635320C00952F011AE5
64547+:1035F0003271FFFF023280218E08000431EEFFFF9E
64548+:10360000248B0100010E6821240CFF8025A5FFFFFB
64549+:10361000016C50243166007F3C07800AAD2A0024EB
64550+:1036200000C73021AF850074AF8800703C010801ED
64551+:10363000A02096F190C300090200D02100809821BB
64552+:10364000306300FF2862000510400048AF86003854
64553+:10365000286400021480008E24140001240D00054B
64554+:103660003C010801A02D96D590CC00FD3C0108013D
64555+:10367000A02096D63C010801A02096D790CB000A46
64556+:10368000240AFF80318500FF014B4824312700FFC9
64557+:1036900010E0000C000058213C12800836510080D8
64558+:1036A0008E2F00308CD0005C01F0702305C0018E9D
64559+:1036B0008F87007090D4000A3284007FA0C4000A73
64560+:1036C0008F8600383C118008363000808E0F003025
64561+:1036D0008F87007000EF702319C000EE000000001B
64562+:1036E00090D4000924120002328400FF1092024795
64563+:1036F000000000008CC2005800E2F82327F9FFFF09
64564+:103700001B2001300000000090C5000924080004BF
64565+:1037100030A300FF10680057240A00013C01080193
64566+:10372000A02A96D590C900FF252700013C01080179
64567+:10373000A02796D43C030801906396D52406000583
64568+:103740001066006A2C780005130000C40000902168
64569+:103750000003F8803C0408012484958003E4C82118
64570+:103760008F25000000A0000800000000241800FFC2
64571+:103770001078005C0000000090CC000A90CA00099C
64572+:103780003C080801910896F13187008000EA48253D
64573+:103790003C010801A02996DC90C500FD3C140801FD
64574+:1037A000929496F2311100013C010801A02596DDAA
64575+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
64576+:1037C0003C010801A03296DF8CD900543C0108016D
64577+:1037D000AC3996E08CD000583C010801AC3096E43E
64578+:1037E0008CC3005C3C010801AC3496EC3C01080140
64579+:1037F000AC2396E8162000088FBF002C8FB4002859
64580+:103800008FB300248FB200208FB1001C8FB000183E
64581+:1038100003E0000827BD00303C1180009624010E13
64582+:103820000E000FD43094FFFF3C0B08018D6B96F413
64583+:103830000260382102802821AE2B01803C13080150
64584+:103840008E7396D401602021240600830E00102F71
64585+:10385000AFB300108FBF002C8FB400288FB30024AB
64586+:103860008FB200208FB1001C8FB0001803E0000859
64587+:1038700027BD00303C1808008F1831FC270F0001CD
64588+:103880003C010800AC2F31FC0A0021D700000000E9
64589+:103890001474FFB900000000A0C000FF3C05080040
64590+:1038A0008CA531E43C0308008C6331E03C02080045
64591+:1038B0008C4232048F99003834A80001241F000282
64592+:1038C0003C010801AC2396F43C010801A02896F0C5
64593+:1038D0003C010801A02296F3A33F00090A002190B1
64594+:1038E0008F8600380E002146000000000A0021D714
64595+:1038F0008F8600383C1F080193FF96D424190001DD
64596+:1039000013F902298F8700703C100801921096D895
64597+:103910003C06080190C696D610C000050200A02102
64598+:103920003C040801908496D9109001E48F870078B8
64599+:10393000001088408F9F0078023048210009C8801D
64600+:10394000033F702195D80008270F0001A5CF00087C
64601+:103950003C040801908496D93C05080190A596D6B0
64602+:103960000E0020F4000000008F8700780230202134
64603+:103970000004308000C720218C8500048F820074F1
64604+:1039800000A2402305020006AC8200048C8A0000DD
64605+:103990008F830070014310235C400001AC83000062
64606+:1039A0008F86003890CB00FF2D6C00025580002DD3
64607+:1039B000241400010230F821001F40800107282153
64608+:1039C00090B9000B8CAE00040019C0400319782197
64609+:1039D000000F1880006710218C4D000001AE882375
64610+:1039E0002630FFFF5E00001F241400018C440004F9
64611+:1039F0008CAA0000008A482319200019240E000414
64612+:103A00003C010801A02E96D590AD000B8CAB0004B4
64613+:103A1000000D8840022D80210010108000471021E9
64614+:103A20008C44000401646023058202009443000872
64615+:103A300090DF00FE90B9000B33E500FF54B900049D
64616+:103A40000107A021A0D400FE8F8700780107A021E4
64617+:103A50009284000B0E0020F4240500018F860038AC
64618+:103A600024140001125400962E500001160000424A
64619+:103A70003C08FFFF241900021659FF3F0000000018
64620+:103A8000A0C000FF8F860038A0D200090A0021D70D
64621+:103A90008F86003890C700092404000230E300FF3D
64622+:103AA0001064016F24090004106901528F880074AA
64623+:103AB0008CCE0054010E682325B10001062001754B
64624+:103AC000241800043C010801A03896D53C010801E7
64625+:103AD000A02096D490D400FD90D200FF2E4F00027B
64626+:103AE00015E0FF14328400FF000438408F8900780D
64627+:103AF00090DF00FF00E41021000220800089C8212F
64628+:103B00002FE500029324000B14A0FF0A24070002F3
64629+:103B100000041840006480210010588001692821A9
64630+:103B20008CAC0004010C50230540FF020000000093
64631+:103B30003C030801906396D614600005246F0001D1
64632+:103B40003C010801A02496D93C010801A02796D782
64633+:103B50003C010801A02F96D690CE00FF24E700017B
64634+:103B600031CD00FF01A7882B1220FFE990A4000BA4
64635+:103B70000A0021C6000000003C0508018CA596D46F
64636+:103B80003C12000400A8F82413F2000624020005E9
64637+:103B90003C090801912996D5152000022402000352
64638+:103BA000240200053C010801A02296F190C700FF05
64639+:103BB00014E0012024020002A0C200090A0021D75B
64640+:103BC0008F86003890CC00FF1180FEDA240A0001B5
64641+:103BD0008F8C00748F890078240F00030180682186
64642+:103BE0001160001E240E0002000540400105A021C6
64643+:103BF00000142080008990218E51000401918023BF
64644+:103C00000600FECC000000003C020801904296D65F
64645+:103C100014400005245800013C010801A02A96D751
64646+:103C20003C010801A02596D93C010801A03896D690
64647+:103C300090DF00FF010510210002C88033E500FF7E
64648+:103C4000254A00010329202100AA402B1500FEB9B6
64649+:103C50009085000B1560FFE50005404000054040E1
64650+:103C600001051821000310803C010801A02A96D408
64651+:103C70003C010801A02596D8004918218C64000455
64652+:103C800000E4F82327F9FFFF1F20FFE900000000F0
64653+:103C90008C63000000E358230560013A01A38823E8
64654+:103CA00010E301170184C0231B00FEA200000000E6
64655+:103CB0003C010801A02E96D50A002305240B000123
64656+:103CC000240E0004A0CE00093C0D08008DAD31F893
64657+:103CD0008F86003825A200013C010800AC2231F893
64658+:103CE0000A0021D7000000008CD9005C00F9C02335
64659+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
64660+:103D00008F8400748CC3005C008340232502000173
64661+:103D10001C40FF60000000008CC9005C248700018B
64662+:103D200000E9282B10A0FE943C0D80008DAB01040F
64663+:103D30003C0C0001016C50241140FE8F2402001045
64664+:103D40003C010801A02296F10A0021D700000000E2
64665+:103D50008F9100748F86003826220001ACC2005C6F
64666+:103D60000A002292241400018F8700382404FF8067
64667+:103D70000000882190E9000A241400010124302564
64668+:103D8000A0E6000A3C05080190A596D63C0408016F
64669+:103D9000908496D90E0020F4000000008F86003831
64670+:103DA0008F85007890C800FD310700FF0007404074
64671+:103DB0000107F821001FC0800305C8219323000BD1
64672+:103DC000A0C300FD8F8500788F8600380305602131
64673+:103DD000918F000B000F704001CF6821000D808093
64674+:103DE000020510218C4B0000ACCB00548D840004E4
64675+:103DF0008F83007400645023194000022482000164
64676+:103E00002462000101074821ACC2005C0009308037
64677+:103E100000C5402100E02021240500010E0020F40F
64678+:103E20009110000B8F86003890C500FF10A0FF0C8A
64679+:103E3000001070408F85007801D06821000D10803F
64680+:103E4000004558218D6400008F8C0074018450233C
64681+:103E50002547000104E0FF02263100013C03080170
64682+:103E6000906396D62E2F0002247800013C010801B1
64683+:103E7000A03896D63C010801A03496D711E0FEF890
64684+:103E8000020038210A002365000740408F84003873
64685+:103E90008F8300748C85005800A340230502FE9A8E
64686+:103EA000AC8300580A00223B000000003C070801D8
64687+:103EB00090E796F2240200FF10E200BE8F860038E1
64688+:103EC0003C110801963196FA3C030801246396F8E8
64689+:103ED000262500013230FFFF30ABFFFF02036021D7
64690+:103EE0002D6A00FF1540008D918700043C010801F8
64691+:103EF000A42096FA8F88003800074840012728211F
64692+:103F0000911800FF000530802405000127140001EE
64693+:103F1000A11400FF3C120801925296F28F8800789B
64694+:103F20008F8E0070264F000100C820213C0108013F
64695+:103F3000A02F96F2AC8E00008F8D0074A48500082F
64696+:103F4000AC8D00043C030801906396D414600077A4
64697+:103F5000000090213C010801A02596D4A087000B09
64698+:103F60008F8C007800CC5021A147000A8F82003846
64699+:103F7000A04700FD8F840038A08700FE8F860038A0
64700+:103F80008F9F0070ACDF00548F990074ACD900583B
64701+:103F90008F8D00780127C02100185880016DA02165
64702+:103FA000928F000A000F704001CF18210003888013
64703+:103FB000022D8021A207000B8F8600780166602108
64704+:103FC000918A000B000A1040004A2021000428803A
64705+:103FD00000A64021A107000A3C07800834E90080C0
64706+:103FE0008D2200308F860038ACC2005C0A0022921D
64707+:103FF0002414000190CA00FF1540FEAD8F880074A4
64708+:10400000A0C400090A0021D78F860038A0C000FD97
64709+:104010008F98003824060001A30000FE3C0108012F
64710+:10402000A02696D53C010801A02096D40A0021C6FE
64711+:104030000000000090CB00FF3C040801908496F340
64712+:10404000316C00FF0184502B1540000F2402000347
64713+:1040500024020004A0C200090A0021D78F8600387C
64714+:1040600090C3000A2410FF8002035824316C00FF23
64715+:104070001180FDC1000000003C010801A02096D580
64716+:104080000A0021C600000000A0C200090A0021D7D2
64717+:104090008F86003890D4000A2412FF8002544824EE
64718+:1040A000312800FF1500FFF4240200083C0108013C
64719+:1040B000A02296F10A0021D70000000000108840DD
64720+:1040C0008F8B0070023018210003688001A7202127
64721+:1040D000AC8B00008F8A0074240C0001A48C0008B3
64722+:1040E000AC8A00043C05080190A596D62402000184
64723+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
64724+:104100000184A0231A80FD8B000000003C010801FF
64725+:10411000A02E96D50A002305240B00013C010801BE
64726+:10412000A42596FA0A0023B78F880038240B0001D3
64727+:10413000106B00228F9800388F85003890BF00FFE9
64728+:1041400033F900FF1079002B000000003C1F08012C
64729+:1041500093FF96D8001FC840033FC0210018A080DD
64730+:104160000288782191EE000AA08E000A8F8D0078D7
64731+:104170003C030801906396D800CD88210A0023DD16
64732+:10418000A223000B263000010600003101A4902379
64733+:104190000640002B240200033C010801A02F96D505
64734+:1041A0000A002305240B00018F8900380A00223BF6
64735+:1041B000AD2700540A00229124120001931400FD3F
64736+:1041C000A094000B8F8800388F8F0078910E00FE2E
64737+:1041D00000CF6821A1AE000A8F910038A22700FD10
64738+:1041E0008F8300708F900038AE0300540A0023DEE6
64739+:1041F0008F8D007890B000FEA090000A8F8B003861
64740+:104200008F8C0078916A00FD00CC1021A04A000B31
64741+:104210008F840038A08700FE8F8600748F85003859
64742+:10422000ACA600580A0023DE8F8D007894B80008F1
64743+:10423000ACA40004030378210A002285A4AF00087F
64744+:104240003C010801A02296D50A0021C6000000000A
64745+:1042500090CF0009240D000431EE00FF11CDFD8543
64746+:10426000240200013C010801A02296D50A0021C6C3
64747+:1042700000000000080033440800334408003420E4
64748+:10428000080033F4080033D8080033280800332826
64749+:10429000080033280800334C8008010080080080A3
64750+:1042A000800800005F865437E4AC62CC50103A4579
64751+:1042B00036621985BF14C0E81BC27A1E84F4B55655
64752+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
64753+:1042D00008005AB808005A5C08005A5C08005A5C8A
64754+:1042E00008005A5C08005A7408005A5C08005A5CBE
64755+:1042F00008005AC008005A5C080059D408005A5CEB
64756+:1043000008005A5C08005AC008005A5C08005A5C51
64757+:1043100008005A5C08005A5C08005A5C08005A5CA5
64758+:1043200008005A5C08005A5C08005A5C08005A5C95
64759+:1043300008005A9408005A5C08005A9408005A5C15
64760+:1043400008005A5C08005A5C08005A9808005A9401
64761+:1043500008005A5C08005A5C08005A5C08005A5C65
64762+:1043600008005A5C08005A5C08005A5C08005A5C55
64763+:1043700008005A5C08005A5C08005A5C08005A5C45
64764+:1043800008005A5C08005A5C08005A5C08005A5C35
64765+:1043900008005A5C08005A5C08005A5C08005A5C25
64766+:1043A00008005A9808005A9808005A5C08005A9861
64767+:1043B00008005A5C08005A5C08005A5C08005A5C05
64768+:1043C00008005A5C08005A5C08005A5C08005A5CF5
64769+:1043D00008005A5C08005A5C08005A5C08005A5CE5
64770+:1043E00008005A5C08005A5C08005A5C08005A5CD5
64771+:1043F00008005A5C08005A5C08005A5C08005A5CC5
64772+:1044000008005A5C08005A5C08005A5C08005A5CB4
64773+:1044100008005A5C08005A5C08005A5C08005A5CA4
64774+:1044200008005A5C08005A5C08005A5C08005A5C94
64775+:1044300008005A5C08005A5C08005A5C08005A5C84
64776+:1044400008005A5C08005A5C08005A5C08005A5C74
64777+:1044500008005A5C08005A5C08005A5C08005A5C64
64778+:1044600008005A5C08005A5C08005A5C08005A5C54
64779+:1044700008005A5C08005A5C08005A5C08005A5C44
64780+:1044800008005A5C08005A5C08005A5C08005A5C34
64781+:1044900008005A5C08005A5C08005A5C08005A5C24
64782+:1044A00008005A5C08005A5C08005A5C08005A5C14
64783+:1044B00008005A5C08005A5C08005A5C08005A5C04
64784+:1044C00008005A5C08005A5C08005A5C08005ADC74
64785+:1044D0000800782C08007A900800783808007628C0
64786+:1044E00008007838080078C4080078380800762872
64787+:1044F0000800762808007628080076280800762824
64788+:104500000800762808007628080076280800762813
64789+:1045100008007628080078580800784808007628AF
64790+:1045200008007628080076280800762808007628F3
64791+:1045300008007628080076280800762808007628E3
64792+:1045400008007628080076280800762808007848B1
64793+:10455000080082FC08008188080082C40800818865
64794+:104560000800829408008070080081880800818813
64795+:1045700008008188080081880800818808008188F7
64796+:1045800008008188080081880800818808008188E7
64797+:104590000800818808008188080081B008008D34F7
64798+:1045A00008008E9008008E70080088D808008D4C96
64799+:1045B0000A00012400000000000000000000000DBF
64800+:1045C000747061362E322E31620000000602010145
64801+:1045D00000000000000000000000000000000000DB
64802+:1045E00000000000000000000000000000000000CB
64803+:1045F00000000000000000000000000000000000BB
64804+:1046000000000000000000000000000000000000AA
64805+:10461000000000000000000000000000000000009A
64806+:10462000000000000000000000000000000000008A
64807+:10463000000000000000000000000000000000007A
64808+:104640000000000010000003000000000000000D4A
64809+:104650000000000D3C020800244217203C03080023
64810+:1046600024632A10AC4000000043202B1480FFFD7F
64811+:10467000244200043C1D080037BD2FFC03A0F0219C
64812+:104680003C100800261004903C1C0800279C1720B2
64813+:104690000E000262000000000000000D2402FF80F6
64814+:1046A00027BDFFE000821024AFB00010AF42002011
64815+:1046B000AFBF0018AFB10014936500043084007FD1
64816+:1046C000034418213C0200080062182130A5002094
64817+:1046D000036080213C080111277B000814A0000220
64818+:1046E0002466005C2466005892020004974301048B
64819+:1046F000920400043047000F3063FFFF3084004015
64820+:10470000006728231080000900004821920200055C
64821+:1047100030420004104000050000000010A000031B
64822+:104720000000000024A5FFFC2409000492020005FB
64823+:1047300030420004104000120000000010A00010E1
64824+:10474000000000009602000200A72021010440257D
64825+:104750002442FFFEA7421016920300042402FF80A9
64826+:1047600000431024304200FF104000033C020400CC
64827+:104770000A000174010240258CC20000AF421018EB
64828+:104780008F4201780440FFFE2402000AA742014044
64829+:1047900096020002240400093042000700021023A0
64830+:1047A00030420007A7420142960200022442FFFE67
64831+:1047B000A7420144A740014697420104A74201488D
64832+:1047C0008F420108304200205040000124040001C3
64833+:1047D00092020004304200101440000234830010A2
64834+:1047E00000801821A743014A0000000000000000DB
64835+:1047F0000000000000000000AF48100000000000B2
64836+:104800000000000000000000000000008F421000C7
64837+:104810000441FFFE3102FFFF1040000700000000CE
64838+:1048200092020004304200401440000300000000E7
64839+:104830008F421018ACC20000960200063042FFFF03
64840+:10484000244200020002104300021040036288214B
64841+:10485000962200001120000D3044FFFF00A7102118
64842+:104860008F8300388F45101C0002108200021080D8
64843+:1048700000431021AC45000030A6FFFF0E00058D5F
64844+:1048800000052C0200402021A62200009203000413
64845+:104890002402FF8000431024304200FF1040001F1C
64846+:1048A0000000000092020005304200021040001B90
64847+:1048B000000000009742100C2442FFFEA742101691
64848+:1048C000000000003C02040034420030AF421000FF
64849+:1048D00000000000000000000000000000000000D8
64850+:1048E0008F4210000441FFFE000000009742100CB0
64851+:1048F0008F45101C3042FFFF24420030000210821E
64852+:1049000000021080005B1021AC45000030A6FFFFC4
64853+:104910000E00058D00052C02A62200009604000260
64854+:10492000248400080E0001E93084FFFF974401044D
64855+:104930000E0001F73084FFFF8FBF00188FB1001405
64856+:104940008FB000103C02100027BD002003E00008DB
64857+:10495000AF4201783084FFFF308200078F8500244A
64858+:1049600010400002248300073064FFF800A41021E7
64859+:1049700030421FFF03421821247B4000AF850028EE
64860+:10498000AF82002403E00008AF4200843084FFFFC0
64861+:104990003082000F8F85002C8F860034104000027B
64862+:1049A0002483000F3064FFF000A410210046182B70
64863+:1049B000AF8500300046202314600002AF82002C37
64864+:1049C000AF84002C8F82002C340480000342182115
64865+:1049D00000641821AF83003803E00008AF42008074
64866+:1049E0008F820014104000088F8200048F82FFDC49
64867+:1049F000144000058F8200043C02FFBF3442FFFFD9
64868+:104A0000008220248F82000430430006240200022A
64869+:104A10001062000F3C0201012C62000350400005AF
64870+:104A2000240200041060000F3C0200010A00023062
64871+:104A30000000000010620005240200061462000C51
64872+:104A40003C0201110A000229008210253C020011DB
64873+:104A500000821025AF421000240200010A0002303B
64874+:104A6000AF82000C00821025AF421000AF80000C16
64875+:104A700000000000000000000000000003E000084B
64876+:104A8000000000008F82000C1040000400000000B5
64877+:104A90008F4210000441FFFE0000000003E0000808
64878+:104AA000000000008F8200102443F800000231C291
64879+:104AB00024C2FFF02C6303011060000300021042C7
64880+:104AC0000A000257AC8200008F85001800C5102B29
64881+:104AD0001440000B0000182100C5102324470001DA
64882+:104AE0008F82001C00A210212442FFFF0046102BE1
64883+:104AF000544000042402FFFF0A000257AC87000064
64884+:104B00002402FFFF0A000260AC8200008C820000D9
64885+:104B10000002194000621821000318800062182169
64886+:104B2000000318803C0208002442175C0062182130
64887+:104B300003E000080060102127BDFFD8AFBF0020B0
64888+:104B4000AFB1001CAFB000183C0460088C8250006C
64889+:104B50002403FF7F3C066000004310243442380CDD
64890+:104B6000AC8250008CC24C1C3C1A80000002160221
64891+:104B70003042000F10400007AF82001C8CC34C1C59
64892+:104B80003C02001F3442FC0000621824000319C2DA
64893+:104B9000AF8300188F420008275B400034420001B9
64894+:104BA000AF420008AF8000243C02601CAF40008090
64895+:104BB000AF4000848C4500088CC308083402800094
64896+:104BC000034220212402FFF0006218243C020080EE
64897+:104BD0003C010800AC2204203C025709AF84003895
64898+:104BE00014620004AF850034240200010A0002921E
64899+:104BF000AF820014AF8000148F42000038420001E1
64900+:104C0000304200011440FFFC8F8200141040001657
64901+:104C10000000000097420104104000058F8300004F
64902+:104C2000146000072462FFFF0A0002A72C62000A3A
64903+:104C30002C620010504000048F83000024620001A9
64904+:104C4000AF8200008F8300002C62000A1440000332
64905+:104C50002C6200070A0002AEAF80FFDC10400002A9
64906+:104C600024020001AF82FFDC8F4301088F44010062
64907+:104C700030622000AF83000410400008AF840010B1
64908+:104C80003C0208008C42042C244200013C01080034
64909+:104C9000AC22042C0A00058A3C0240003065020068
64910+:104CA00014A0000324020F001482026024020D00ED
64911+:104CB00097420104104002C83C02400030624000AC
64912+:104CC000144000AD8F8200388C4400088F42017878
64913+:104CD0000440FFFE24020800AF42017824020008CD
64914+:104CE000A7420140A7400142974201048F8400047B
64915+:104CF0003051FFFF30820001104000070220802168
64916+:104D00002623FFFE240200023070FFFFA742014667
64917+:104D10000A0002DBA7430148A74001463C02080005
64918+:104D20008C42043C1440000D8F8300103082002020
64919+:104D30001440000224030009240300010060202124
64920+:104D40008F830010240209005062000134840004A3
64921+:104D5000A744014A0A0002F60000000024020F00E6
64922+:104D60001462000530820020144000062403000D68
64923+:104D70000A0002F524030005144000022403000980
64924+:104D800024030001A743014A3C0208008C4204208E
64925+:104D90003C0400480E00020C004420250E000235A1
64926+:104DA000000000008F82000C1040003E0000000058
64927+:104DB0008F4210003C0300200043102410400039B3
64928+:104DC0008F820004304200021040003600000000D4
64929+:104DD000974210141440003300000000974210085E
64930+:104DE0008F8800383042FFFF2442000600021882FC
64931+:104DF0000003388000E83021304300018CC40000FB
64932+:104E000010600004304200030000000D0A00033768
64933+:104E100000E81021544000103084FFFF3C05FFFFE4
64934+:104E200000852024008518260003182B0004102B71
64935+:104E300000431024104000050000000000000000A6
64936+:104E40000000000D00000000240002228CC20000BF
64937+:104E50000A000336004520253883FFFF0003182B86
64938+:104E60000004102B00431024104000050000000037
64939+:104E7000000000000000000D000000002400022BD4
64940+:104E80008CC200003444FFFF00E81021AC44000055
64941+:104E90003C0208008C420430244200013C0108001E
64942+:104EA000AC2204308F6200008F840038AF8200088B
64943+:104EB0008C8300003402FFFF1462000F00001021F9
64944+:104EC0003C0508008CA504543C0408008C84045064
64945+:104ED00000B0282100B0302B008220210086202144
64946+:104EE0003C010800AC2504543C010800AC240450EB
64947+:104EF0000A000580240400088C8200003042010072
64948+:104F00001040000F000010213C0508008CA5044C47
64949+:104F10003C0408008C84044800B0282100B0302BE9
64950+:104F200000822021008620213C010800AC25044C91
64951+:104F30003C010800AC2404480A0005802404000851
64952+:104F40003C0508008CA504443C0408008C84044003
64953+:104F500000B0282100B0302B0082202100862021C3
64954+:104F60003C010800AC2504443C010800AC2404408A
64955+:104F70000A000580240400088F6200088F62000088
64956+:104F800000021602304300F02402003010620005D7
64957+:104F900024020040106200E08F8200200A00058891
64958+:104FA0002442000114A000050000000000000000E1
64959+:104FB0000000000D00000000240002568F4201781E
64960+:104FC0000440FFFE000000000E00023D27A4001078
64961+:104FD0001440000500408021000000000000000D8A
64962+:104FE000000000002400025D8E0200001040000559
64963+:104FF00000000000000000000000000D00000000A4
64964+:10500000240002608F62000C0443000324020001AC
64965+:105010000A00042EAE000000AE0200008F820038AD
64966+:105020008C480008A20000078F65000C8F64000404
64967+:1050300030A3FFFF0004240200852023308200FFFC
64968+:105040000043102124420005000230832CC200815D
64969+:10505000A605000A14400005A20400040000000098
64970+:105060000000000D00000000240002788F85003849
64971+:105070000E0005AB260400148F6200048F43010864
64972+:10508000A60200083C02100000621824106000080C
64973+:105090000000000097420104920300072442FFEC45
64974+:1050A000346300023045FFFF0A0003C3A203000778
64975+:1050B000974201042442FFF03045FFFF96060008A6
64976+:1050C0002CC200135440000592030007920200070F
64977+:1050D00034420001A20200079203000724020001EB
64978+:1050E00010620005240200031062000B8F8200385A
64979+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
64980+:105100008C43000C0064182400651825AC43000C87
64981+:105110000A0003E030C6FFFF3C04FFFF8C43001091
64982+:105120000064182400651825AC43001030C6FFFF4A
64983+:1051300024C2000200021083A20200058F830038FF
64984+:10514000304200FF00021080004328218CA800009C
64985+:105150008CA2000024030004000217021443001272
64986+:1051600000000000974201043C03FFFF01031824E4
64987+:105170003042FFFF004610232442FFFE006240251C
64988+:10518000ACA8000092030005306200FF000210800E
64989+:1051900000501021904200143042000F00431021B3
64990+:1051A0000A000415A20200068CA400049742010420
64991+:1051B0009603000A3088FFFF3042FFFF00461023AD
64992+:1051C0002442FFD60002140001024025ACA80004CE
64993+:1051D000920200079204000524630028000318834C
64994+:1051E0000064182134420004A2030006A202000752
64995+:1051F0008F8200042403FFFB34420002004310248A
64996+:10520000AF820004920300068F87003800031880E5
64997+:10521000007010218C4400203C02FFF63442FFFF56
64998+:105220000082402400671821AE04000CAC68000C1A
64999+:10523000920500063C03FF7F8E02000C00052880CB
65000+:1052400000B020213463FFFF01033024948800263E
65001+:1052500000A7282100431024AE02000CAC860020D9
65002+:10526000AC880024ACA8001024020010A742014022
65003+:1052700024020002A7400142A7400144A742014680
65004+:10528000974201043C0400082442FFFEA742014863
65005+:10529000240200010E00020CA742014A9603000AF4
65006+:1052A0009202000400431021244200023042000711
65007+:1052B00000021023304200070E000235AE0200103B
65008+:1052C0008F6200003C0308008C6304442404001037
65009+:1052D000AF820008974201043042FFFF2442FFFEE4
65010+:1052E00000403821000237C33C0208008C420440D1
65011+:1052F000006718210067282B004610210045102167
65012+:105300003C010800AC2304443C010800AC220440EA
65013+:105310000A0005150000000014A0000500000000B0
65014+:10532000000000000000000D000000002400030A3F
65015+:105330008F4201780440FFFE000000000E00023D95
65016+:1053400027A4001414400005004080210000000044
65017+:105350000000000D00000000240003118E02000078
65018+:105360005440000692020007000000000000000DFB
65019+:10537000000000002400031C9202000730420004D9
65020+:10538000104000058F8200042403FFFB344200021A
65021+:1053900000431024AF8200048F620004044300081D
65022+:1053A00092020007920200068E03000CAE0000007D
65023+:1053B0000002108000501021AC4300209202000730
65024+:1053C00030420004544000099602000A920200058F
65025+:1053D0003C03000100021080005010218C46001890
65026+:1053E00000C33021AC4600189602000A9206000461
65027+:1053F000277100080220202100C2302124C60005A8
65028+:10540000260500140E0005AB00063082920400064B
65029+:105410008F6500043C027FFF000420800091202162
65030+:105420008C8300043442FFFF00A228240065182169
65031+:10543000AC8300049202000792040005920300046A
65032+:10544000304200041040001496070008308400FF2A
65033+:1054500000042080009120218C86000497420104E2
65034+:105460009605000A306300FF3042FFFF0043102121
65035+:105470000045102130E3FFFF004310232442FFD8F2
65036+:1054800030C6FFFF0002140000C23025AC860004C5
65037+:105490000A0004C992030007308500FF0005288038
65038+:1054A00000B128218CA4000097420104306300FF62
65039+:1054B0003042FFFF00431021004710233C03FFFF51
65040+:1054C000008320243042FFFF00822025ACA400008E
65041+:1054D0009203000724020001106200060000000091
65042+:1054E0002402000310620011000000000A0004EC16
65043+:1054F0008E03001097420104920300049605000AEF
65044+:105500008E24000C00431021004510212442FFF29C
65045+:105510003C03FFFF008320243042FFFF0082202550
65046+:10552000AE24000C0A0004EC8E0300109742010424
65047+:10553000920300049605000A8E24001000431021F7
65048+:10554000004510212442FFEE3C03FFFF008320248E
65049+:105550003042FFFF00822025AE2400108E03001091
65050+:105560002402000AA7420140A74301429603000A11
65051+:10557000920200043C04004000431021A742014471
65052+:10558000A740014697420104A742014824020001B6
65053+:105590000E00020CA742014A0E0002350000000076
65054+:1055A0008F6200009203000400002021AF820008F7
65055+:1055B000974201049606000A3042FFFF006218215C
65056+:1055C000006028213C0308008C6304443C0208006E
65057+:1055D0008C42044000651821004410210065382BDE
65058+:1055E000004710213C010800AC2304443C010800A2
65059+:1055F000AC22044092040004008620212484000A86
65060+:105600003084FFFF0E0001E9000000009744010410
65061+:105610003084FFFF0E0001F7000000003C02100084
65062+:10562000AF4201780A0005878F820020148200278C
65063+:105630003062000697420104104000673C024000BF
65064+:105640003062400010400005000000000000000033
65065+:105650000000000D00000000240004208F420178AB
65066+:105660000440FFFE24020800AF4201782402000833
65067+:10567000A7420140A74001428F82000497430104E2
65068+:1056800030420001104000073070FFFF2603FFFE8C
65069+:1056900024020002A7420146A74301480A00053F31
65070+:1056A0002402000DA74001462402000DA742014A32
65071+:1056B0008F62000024040008AF8200080E0001E998
65072+:1056C000000000000A0005190200202110400042DD
65073+:1056D0003C02400093620000304300F024020010BE
65074+:1056E0001062000524020070106200358F820020D5
65075+:1056F0000A000588244200018F62000097430104DC
65076+:105700003050FFFF3071FFFF8F4201780440FFFEF1
65077+:105710003202000700021023304200072403000A6F
65078+:105720002604FFFEA7430140A7420142A7440144CB
65079+:10573000A7400146A75101488F420108304200208E
65080+:10574000144000022403000924030001A743014A76
65081+:105750000E00020C3C0400400E0002350000000068
65082+:105760003C0708008CE70444021110212442FFFE8C
65083+:105770003C0608008CC604400040182100E3382194
65084+:10578000000010218F65000000E3402B00C2302193
65085+:105790002604000800C830213084FFFFAF850008D0
65086+:1057A0003C010800AC2704443C010800AC2604403E
65087+:1057B0000E0001E9000000000A0005190220202166
65088+:1057C0000E00013B000000008F82002024420001F7
65089+:1057D000AF8200203C024000AF4201380A00029232
65090+:1057E000000000003084FFFF30C6FFFF00052C00E2
65091+:1057F00000A628253882FFFF004510210045282BF0
65092+:105800000045102100021C023042FFFF004310211E
65093+:1058100000021C023042FFFF004310213842FFFF0C
65094+:1058200003E000083042FFFF3084FFFF30A5FFFF98
65095+:1058300000001821108000070000000030820001E5
65096+:105840001040000200042042006518210A0005A152
65097+:105850000005284003E000080060102110C0000689
65098+:1058600024C6FFFF8CA2000024A50004AC82000027
65099+:105870000A0005AB2484000403E0000800000000D7
65100+:1058800010A0000824A3FFFFAC8600000000000069
65101+:10589000000000002402FFFF2463FFFF1462FFFAF0
65102+:1058A0002484000403E00008000000000000000160
65103+:1058B0000A00002A00000000000000000000000DA7
65104+:1058C000747870362E322E3162000000060201001C
65105+:1058D00000000000000001360000EA600000000047
65106+:1058E00000000000000000000000000000000000B8
65107+:1058F00000000000000000000000000000000000A8
65108+:105900000000000000000000000000000000000097
65109+:105910000000001600000000000000000000000071
65110+:105920000000000000000000000000000000000077
65111+:105930000000000000000000000000000000000067
65112+:1059400000000000000000000000138800000000BC
65113+:10595000000005DC00000000000000001000000353
65114+:10596000000000000000000D0000000D3C020800D7
65115+:1059700024423D683C0308002463401CAC40000006
65116+:105980000043202B1480FFFD244200043C1D08002E
65117+:1059900037BD7FFC03A0F0213C100800261000A8B2
65118+:1059A0003C1C0800279C3D680E00044E00000000CF
65119+:1059B0000000000D27BDFFB4AFA10000AFA200049E
65120+:1059C000AFA30008AFA4000CAFA50010AFA6001451
65121+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
65122+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
65123+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
65124+:105A0000AFBF00480E000591000000008FBF0048A6
65125+:105A10008FBC00448FB900408FB8003C8FAF003876
65126+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
65127+:105A30008FAA00248FA900208FA8001C8FA7001810
65128+:105A40008FA600148FA500108FA4000C8FA3000850
65129+:105A50008FA200048FA1000027BD004C3C1B6004F6
65130+:105A60008F7A5030377B502803400008AF7A00000F
65131+:105A70008F86003C3C0390003C0280000086282575
65132+:105A800000A32025AC4400203C0380008C6700204C
65133+:105A900004E0FFFE0000000003E00008000000003A
65134+:105AA0000A000070240400018F85003C3C04800043
65135+:105AB0003483000100A3102503E00008AC8200201D
65136+:105AC00003E00008000010213084FFFF30A5FFFF35
65137+:105AD00010800007000018213082000110400002F1
65138+:105AE00000042042006518211480FFFB00052840B7
65139+:105AF00003E000080060102110C000070000000053
65140+:105B00008CA2000024C6FFFF24A50004AC82000084
65141+:105B100014C0FFFB2484000403E000080000000020
65142+:105B200010A0000824A3FFFFAC86000000000000C6
65143+:105B3000000000002402FFFF2463FFFF1462FFFA4D
65144+:105B40002484000403E000080000000090AA003153
65145+:105B50008FAB00108CAC00403C0300FF8D6800044C
65146+:105B6000AD6C00208CAD004400E060213462FFFF8A
65147+:105B7000AD6D00248CA700483C09FF000109C0243A
65148+:105B8000AD6700288CAE004C0182C824031978252B
65149+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
65150+:105BA000AD6D001C94A900323128FFFFAD680010D4
65151+:105BB00090A70030A5600002A1600004A16700006A
65152+:105BC00090A30032306200FF0002198210600005CD
65153+:105BD000240500011065000E0000000003E000082D
65154+:105BE000A16A00018CD80028354A0080AD780018E1
65155+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
65156+:105C00008CC4002CA16A000103E00008AD64000C04
65157+:105C10008CCD001CAD6D00188CC90014AD6900144A
65158+:105C20008CC80024AD6800088CC70020AD67000C4C
65159+:105C30008CC200148C8300700043C82B1320000713
65160+:105C4000000000008CC20014144CFFE400000000AF
65161+:105C5000354A008003E00008A16A00018C820070D0
65162+:105C60000A0000E6000000009089003027BDFFF820
65163+:105C70008FA8001CA3A900008FA300003C0DFF808B
65164+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
65165+:105C9000A100000400C05821A7A000028D06000446
65166+:105CA00000A048210167C8218FA500000080502175
65167+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
65168+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
65169+:105CD00000EDC02400C27824000C1DC003236825F9
65170+:105CE00001F87025AD0D0000AD0E00048D240024D8
65171+:105CF000AFAD0000AD0400088D2C00202404FFFF90
65172+:105D0000AD0C000C9547003230E6FFFFAD060010E9
65173+:105D10009145004830A200FF000219C25060000106
65174+:105D20008D240034AD0400148D4700388FAA00186C
65175+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
65176+:105D4000AD00002CAD00001803E00008AD000020FD
65177+:105D500027BDFFE0AFB20018AFB10014AFB0001024
65178+:105D6000AFBF001C9098003000C088213C0D00FFA0
65179+:105D7000330F007FA0CF0000908E003135ACFFFFC5
65180+:105D80003C0AFF00A0CE000194A6001EA220000441
65181+:105D90008CAB00148E29000400A08021016C282403
65182+:105DA000012A40240080902101052025A62600021A
65183+:105DB000AE24000426050020262400080E000092D0
65184+:105DC00024060002924700302605002826240014ED
65185+:105DD00000071E000003160324060004044000030D
65186+:105DE0002403FFFF965900323323FFFF0E00009279
65187+:105DF000AE230010262400248FBF001C8FB2001891
65188+:105E00008FB100148FB00010240500030000302172
65189+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
65190+:105E2000AFB00018AFBF002090A9003024020001DD
65191+:105E300000E050213123003F00A040218FB00040FE
65192+:105E40000080882100C04821106200148FA700380C
65193+:105E5000240B000500A0202100C02821106B001396
65194+:105E6000020030210E000128000000009225007C75
65195+:105E700030A400021080000326030030AE00003082
65196+:105E8000260300348FBF00208FB1001C8FB0001894
65197+:105E90000060102103E0000827BD00280E0000A7C5
65198+:105EA000AFB000100A00016F000000008FA3003C9B
65199+:105EB000010020210120282101403021AFA3001042
65200+:105EC0000E0000EEAFB000140A00016F00000000E9
65201+:105ED0003C06800034C20E008C4400108F850044C4
65202+:105EE000ACA400208C43001803E00008ACA30024FD
65203+:105EF0003C06800034C20E008C4400148F850044A0
65204+:105F0000ACA400208C43001C03E00008ACA30024D8
65205+:105F10009382000C1040001B2483000F2404FFF028
65206+:105F20000064382410E00019978B00109784000E4D
65207+:105F30009389000D3C0A601C0A0001AC01644023F7
65208+:105F400001037021006428231126000231C2FFFFE3
65209+:105F500030A2FFFF0047302B50C0000E00E4482164
65210+:105F60008D4D000C31A3FFFF00036400000C2C03D7
65211+:105F700004A1FFF30000302130637FFF0A0001A479
65212+:105F80002406000103E00008000000009784000ED2
65213+:105F900000E448213123FFFF3168FFFF0068382B00
65214+:105FA00054E0FFF8A783000E938A000D114000050E
65215+:105FB000240F0001006BC023A380000D03E0000844
65216+:105FC000A798000E006BC023A38F000D03E000080C
65217+:105FD000A798000E03E000080000000027BDFFE8BE
65218+:105FE000AFB000103C10800036030140308BFFFF43
65219+:105FF00093AA002BAFBF0014A46B000436040E005C
65220+:106000009488001630C600FF8FA90030A4680006EF
65221+:10601000AC650008A0660012A46A001AAC670020F4
65222+:106020008FA5002CA4690018012020210E000198E2
65223+:10603000AC6500143C021000AE0201788FBF001462
65224+:106040008FB0001003E0000827BD00188F85000006
65225+:106050002484000727BDFFF83084FFF83C06800049
65226+:1060600094CB008A316AFFFFAFAA00008FA900001D
65227+:10607000012540232507FFFF30E31FFF0064102B9D
65228+:106080001440FFF700056882000D288034CC4000E2
65229+:1060900000AC102103E0000827BD00088F8200003B
65230+:1060A0002486000730C5FFF800A2182130641FFFC6
65231+:1060B00003E00008AF8400008F87003C8F84004419
65232+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
65233+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
65234+:1060E000AFB20030AFB000283C0B80008C8600249B
65235+:1060F000AD6700808C8A002035670E00356901008D
65236+:10610000ACEA00108C8800248D2500040000B82122
65237+:10611000ACE800188CE3001000A688230000A02142
65238+:10612000ACE300148CE20018ACE2001C122000FE6C
65239+:1061300000E0B021936C0008118000F40000000022
65240+:10614000976F001031EEFFFF022E682B15A000EFB5
65241+:1061500000000000977200103250FFFFAED0000028
65242+:106160003C0380008C740000329300081260FFFD35
65243+:106170000000000096D800088EC700043305FFFF1A
65244+:1061800030B5000112A000E4000000000000000D86
65245+:1061900030BFA0402419004013F9011B30B4A00007
65246+:1061A000128000DF000000009373000812600008F6
65247+:1061B00000000000976D001031ACFFFF00EC202BB9
65248+:1061C0001080000330AE004011C000D50000000078
65249+:1061D000A7850040AF87003893630008022028217C
65250+:1061E000AFB10020146000F527B40020AF60000CB0
65251+:1061F000978F004031F14000162000022403001662
65252+:106200002403000E24054007A363000AAF650014B1
65253+:10621000938A00428F70001431550001001512401E
65254+:1062200002024825AF690014979F00408F78001440
65255+:1062300033F9001003194025AF680014979200400D
65256+:106240003247000810E0016E000000008F67001464
65257+:106250003C1210003C11800000F27825AF6F001452
65258+:1062600036230E00946E000A3C0D81002406000EB9
65259+:1062700031CCFFFF018D2025AF640004A36600022E
65260+:106280009373000A3406FFFC266B0004A36B000A1C
65261+:1062900097980040330820001100015F00000000C3
65262+:1062A0003C05800034A90E00979900409538000CF9
65263+:1062B00097870040001940423312C00031030003A9
65264+:1062C00000127B0330F11000006F6825001172038B
65265+:1062D00001AE6025000C20C0A76400129793004017
65266+:1062E000936A000A001359823175003C02AA1021FA
65267+:1062F0002450003CA3700009953F000C33F93FFF88
65268+:10630000A779001097700012936900090130F821F5
65269+:1063100027E5000230B900070019C0233308000741
65270+:10632000A368000B9371000997720012976F001019
65271+:10633000322700FF8F910038978D004000F218211E
65272+:10634000006F702101C6602131A6004010C0000519
65273+:106350003185FFFF00B1102B3C1280001040001768
65274+:10636000000098210225A82B56A0013E8FA50020F1
65275+:106370003C048000348A0E008D5300143C068000DB
65276+:10638000AD5300108D4B001CAD4B0018AD45000007
65277+:106390008CCD000031AC00081180FFFD34CE0E0022
65278+:1063A00095C3000800A0882100009021A783004029
65279+:1063B0008DC6000424130001AF860038976F0010CB
65280+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
65281+:1063D000AE85000093620008144000DD000000005C
65282+:1063E0000E0001E7240400108F900048004028218F
65283+:1063F0003C023200320600FF000654000142F8253C
65284+:1064000026090001AF890048ACBF0000937900095C
65285+:1064100097780012936F000A332800FF3303FFFFC1
65286+:106420000103382100076C0031EE00FF01AE60254A
65287+:10643000ACAC00048F840048978B0040316A200088
65288+:106440001140010AACA4000897640012308BFFFFD2
65289+:1064500006400108ACAB000C978E004031C5000827
65290+:1064600014A0000226280006262800023C1F8000F7
65291+:1064700037E70E0094F900148CE5001C8F670004C8
65292+:10648000937800023324FFFF330300FFAFA3001013
65293+:106490008F6F0014AFA800180E0001CBAFAF00142F
65294+:1064A000240400100E0001FB000000008E9200008A
65295+:1064B00016400005000000008F7800142403FFBF81
65296+:1064C0000303A024AF7400148F67000C00F5C821EB
65297+:1064D000AF79000C9375000816A0000800000000BA
65298+:1064E00012600006000000008F6800143C0AEFFFF5
65299+:1064F0003549FFFE0109F824AF7F0014A37300089B
65300+:106500008FA500200A00034F02202021AED10000F9
65301+:106510000A00022D3C03800014E0FF1E30BFA040A3
65302+:106520000E0001900000A0212E9100010237B0253D
65303+:1065300012C000188FBF00488F87003C24170F003F
65304+:1065400010F700D43C0680008CD901780720FFFEAC
65305+:10655000241F0F0010FF00F634CA0E008D560014E1
65306+:1065600034C7014024080240ACF600048D49001CE9
65307+:106570003C141000ACE90008A0E00012A4E0001AEE
65308+:10658000ACE00020A4E00018ACE80014ACD4017822
65309+:106590008FBF00488FB700448FB600408FB5003CD6
65310+:1065A0008FB400388FB300348FB200308FB1002C1D
65311+:1065B0008FB0002803E0000827BD00508F910038FD
65312+:1065C000978800403C1280000220A821310700403B
65313+:1065D00014E0FF7C00009821977900108F9200381A
65314+:1065E0003338FFFF131200A8000020210080A021F3
65315+:1065F000108000F300A088211620FECE00000000CD
65316+:106600000A00031F2E9100013C0380008C62017878
65317+:106610000440FFFE240808008F860000AC68017863
65318+:106620003C038000946D008A31ACFFFF0186582343
65319+:10663000256AFFFF31441FFF2C8900081520FFF950
65320+:10664000000000008F8F0048347040008F83003CB2
65321+:1066500000E0A021240E0F0025E70001AF870048CD
65322+:1066600000D03021023488233C08800031F500FF3F
65323+:10667000106E0005240700019398004233130001B7
65324+:106680000013924036470001001524003C0A010027
65325+:10669000008A4825ACC900008F82004830BF003610
65326+:1066A00030B90008ACC200041320009900FF9825FF
65327+:1066B00035120E009650000A8F8700003C0F8100B3
65328+:1066C0003203FFFF24ED000835060140006F60250E
65329+:1066D0003C0E100031AB1FFF269200062405000E71
65330+:1066E000ACCC0020026E9825A4C5001AAF8B000028
65331+:1066F000A4D20018162000083C1080008F89003CAE
65332+:1067000024020F00512200022417000136730040BA
65333+:106710000E0001883C10800036060E008CCB001461
65334+:10672000360A014002402021AD4B00048CC5001CFC
65335+:10673000AD450008A1550012AD5300140E0001989C
65336+:106740003C151000AE1501780A000352000000004D
65337+:10675000936F0009976E0012936D000B31E500FFF7
65338+:1067600000AE202131AC00FF008C80212602000AFF
65339+:106770003050FFFF0E0001E7020020218F86004805
65340+:106780003C0341003C05800024CB0001AF8B004856
65341+:10679000936A00099769001230C600FF315F00FF5D
65342+:1067A0003128FFFF03E8382124F900020006C40065
65343+:1067B0000319782501E37025AC4E00008F6D000CA5
65344+:1067C00034A40E00948B001401B26025AC4C00047C
65345+:1067D0008C85001C8F670004936A00023164FFFF00
65346+:1067E000314900FFAFA900108F680014AFB1001845
65347+:1067F0000E0001CBAFA800140A0002FD0200202108
65348+:10680000AF600004A36000029798004033082000A6
65349+:106810001500FEA300003021A760001297840040FD
65350+:10682000936B000A3C10800030931F0000135183CB
65351+:10683000014BA82126A20028A362000936090E00F8
65352+:10684000953F000C0A000295A77F00108F7000147E
65353+:10685000360900400E000188AF6900140A0002C921
65354+:10686000000000000A00034F000020210641FEFA4C
65355+:10687000ACA0000C8CAC000C3C0D8000018D902570
65356+:106880000A0002EAACB2000C000090210A0002C526
65357+:1068900024130001128000073C028000344B0E00DC
65358+:1068A0009566000830D300401260004900000000E7
65359+:1068B0003C0680008CD001780600FFFE34C50E0037
65360+:1068C00094B500103C03050034CC014032B8FFFF02
65361+:1068D00003039025AD92000C8CAF0014240D200012
65362+:1068E0003C041000AD8F00048CAE001CAD8E00087F
65363+:1068F000A1800012A580001AAD800020A58000189C
65364+:10690000AD8D0014ACC401780A0003263C0680005B
65365+:106910008F9F0000351801402692000227F90008D9
65366+:1069200033281FFFA71200180A000391AF88000048
65367+:106930003C02800034450140ACA0000C1280001BDA
65368+:1069400034530E0034510E008E370010ACB70004E3
65369+:106950008E2400183C0B8000ACA400083570014068
65370+:1069600024040040A20000128FBF0048A600001AB5
65371+:106970008FB70044AE0000208FB60040A60000187C
65372+:106980008FB5003CAE0400148FB400388FB30034D0
65373+:106990008FB200308FB1002C8FB000283C02100065
65374+:1069A00027BD005003E00008AD6201788E66001438
65375+:1069B000ACA600048E64001C0A00042A3C0B800074
65376+:1069C0000E0001902E9100010A0003200237B0252D
65377+:1069D000000000000000000D00000000240003691A
65378+:1069E0000A0004013C06800027BDFFD8AFBF00208D
65379+:1069F0003C0980003C1F20FFAFB200183C0760003C
65380+:106A000035320E002402001037F9FFFDACE23008E9
65381+:106A1000AFB3001CAFB10014AFB00010AE5900000E
65382+:106A20000000000000000000000000000000000066
65383+:106A3000000000003C1800FF3713FFFDAE530000BC
65384+:106A40003C0B60048D7050002411FF7F3C0E00024F
65385+:106A50000211782435EC380C35CD0109ACED4C1819
65386+:106A6000240A0009AD6C50008CE80438AD2A0008F7
65387+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
65388+:106A800000051E023062000F2486C0B310400007CC
65389+:106A9000AF8200088CE54C1C3C09001F3528FC0027
65390+:106AA00000A81824000321C2AF8400048CF1080858
65391+:106AB0003C0F57092412F0000232702435F0001008
65392+:106AC00001D0602601CF68262DAA00012D8B000180
65393+:106AD000014B382550E00009A380000C3C1F601CCE
65394+:106AE0008FF8000824190001A399000C33137C00CF
65395+:106AF000A7930010A780000EA380000DAF80004870
65396+:106B000014C00003AF8000003C066000ACC0442C01
65397+:106B10000E0005B93C1080000E000F1A361101005E
65398+:106B20003C12080026523DD03C13080026733E500C
65399+:106B30008E03000038640001308200011440FFFC25
65400+:106B40003C0B800A8E2600002407FF8024C90240E7
65401+:106B5000312A007F014B402101272824AE06002066
65402+:106B6000AF880044AE0500243C048000AF86003CA2
65403+:106B70008C8C01780580FFFE24180800922F0008F5
65404+:106B8000AC980178A38F0042938E004231CD000172
65405+:106B900011A0000F24050D0024DFF8002FF90301D8
65406+:106BA0001320001C000629C224A4FFF00004104298
65407+:106BB000000231400E00020200D2D8213C02400007
65408+:106BC0003C068000ACC201380A0004A000000000AE
65409+:106BD00010C50023240D0F0010CD00273C1F800896
65410+:106BE00037F9008093380000240E0050330F00FF67
65411+:106BF00015EEFFF33C0240000E000A3600000000D4
65412+:106C00003C0240003C068000ACC201380A0004A0EF
65413+:106C1000000000008F83000400A3402B1500000B30
65414+:106C20008F8B0008006B50212547FFFF00E5482BA4
65415+:106C30001520000600A36023000C19400E0002027C
65416+:106C40000073D8210A0004C43C0240000000000D7B
65417+:106C50000E000202000000000A0004C43C024000D2
65418+:106C60003C1B0800277B3F500E0002020000000082
65419+:106C70000A0004C43C0240003C1B0800277B3F7014
65420+:106C80000E000202000000000A0004C43C024000A2
65421+:106C90003C0660043C09080025290104ACC9502CBD
65422+:106CA0008CC850003C0580003C0200023507008083
65423+:106CB000ACC750003C040800248415A43C03080021
65424+:106CC0002463155CACA50008ACA2000C3C010800D4
65425+:106CD000AC243D603C010800AC233D6403E00008A7
65426+:106CE0002402000100A030213C1C0800279C3D68C4
65427+:106CF0003C0C04003C0B0002008B3826008C402624
65428+:106D00002CE200010007502B2D050001000A4880ED
65429+:106D10003C03080024633D60004520250123182121
65430+:106D20001080000300001021AC6600002402000166
65431+:106D300003E00008000000003C1C0800279C3D68A0
65432+:106D40003C0B04003C0A0002008A3026008B3826E7
65433+:106D50002CC200010006482B2CE5000100094080F0
65434+:106D60003C03080024633D600045202501031821F1
65435+:106D700010800005000010213C0C0800258C155CDB
65436+:106D8000AC6C00002402000103E0000800000000D9
65437+:106D90003C0900023C08040000883026008938269F
65438+:106DA0002CC30001008028212CE400010083102561
65439+:106DB0001040000B000030213C1C0800279C3D685F
65440+:106DC0003C0A80008D4E00082406000101CA682597
65441+:106DD000AD4D00088D4C000C01855825AD4B000CC5
65442+:106DE00003E0000800C010213C1C0800279C3D68FF
65443+:106DF0003C0580008CA6000C000420272402000122
65444+:106E000000C4182403E00008ACA3000C3C020002FC
65445+:106E10001082000B3C0560003C0704001087000353
65446+:106E20000000000003E00008000000008CA908D06A
65447+:106E3000240AFFFD012A402403E00008ACA808D082
65448+:106E40008CA408D02406FFFE0086182403E0000866
65449+:106E5000ACA308D03C05601A34A600108CC3008097
65450+:106E600027BDFFF88CC50084AFA3000093A40000E9
65451+:106E70002402000110820003AFA5000403E0000813
65452+:106E800027BD000893A7000114E0001497AC00028E
65453+:106E900097B800023C0F8000330EFFFC01CF682141
65454+:106EA000ADA50000A3A000003C0660008CC708D080
65455+:106EB0002408FFFE3C04601A00E82824ACC508D072
65456+:106EC0008FA300048FA200003499001027BD000892
65457+:106ED000AF22008003E00008AF2300843C0B800059
65458+:106EE000318AFFFC014B48218D2800000A00057DF6
65459+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
65460+:106F0000279C3D683C0580008CA4000C8CA20004EA
65461+:106F10003C0300020044282410A0000A00A3182407
65462+:106F20003C0604003C0400021460000900A6102482
65463+:106F30001440000F3C0404000000000D3C1C08003D
65464+:106F4000279C3D688FBF001003E0000827BD001894
65465+:106F50003C0208008C423D600040F809000000003F
65466+:106F60003C1C0800279C3D680A0005A68FBF001046
65467+:106F70003C0208008C423D640040F809000000001B
65468+:106F80000A0005AC00000000000411C003E0000886
65469+:106F9000244202403C04080024843FB42405001A23
65470+:106FA0000A00009C0000302127BDFFE0AFB00010B8
65471+:106FB0003C108000AFBF0018AFB1001436110100C3
65472+:106FC000922200090E0005B63044007F8E3F00007B
65473+:106FD0008F89003C3C0F008003E26021258800403F
65474+:106FE0000049F821240DFF80310E00783198007897
65475+:106FF00035F9000135F100020319382501D1482582
65476+:10700000010D302403ED5824018D2824240A00406A
65477+:1070100024040080240300C0AE0B0024AE0008103E
65478+:10702000AE0A0814AE040818AE03081CAE05080426
65479+:10703000AE070820AE060808AE0908243609090084
65480+:107040009539000C3605098033ED007F3338FFFF9A
65481+:10705000001889C0AE110800AE0F0828952C000C4E
65482+:107060008FBF00188FB10014318BFFFF000B51C090
65483+:10707000AE0A002C8CA400508FB000108CA3003CF2
65484+:107080008D2700048CA8001C8CA600383C0E800ABA
65485+:1070900001AE102127BD0020AF820044AF84005014
65486+:1070A000AF830054AF87004CAF88005C03E000085A
65487+:1070B000AF8600603C09080091293FD924A800024E
65488+:1070C0003C05110000093C0000E8302500C51825EA
65489+:1070D00024820008AC83000003E00008AC800004B8
65490+:1070E0003C098000352309009128010B906A0011AA
65491+:1070F0002402002800804821314700FF00A07021B1
65492+:1071000000C068213108004010E20002340C86DD26
65493+:10711000240C08003C0A800035420A9A944700007B
65494+:10712000354B0A9C35460AA030F9FFFFAD39000007
65495+:107130008D780000354B0A8024040001AD3800042E
65496+:107140008CCF0000AD2F00089165001930A300031B
65497+:107150001064009028640002148000AF240500022F
65498+:107160001065009E240F0003106F00B435450AA47B
65499+:10717000240A0800118A0048000000005100003D68
65500+:107180003C0B80003C0480003483090090670012AF
65501+:1071900030E200FF004D7821000FC8802724000155
65502+:1071A0003C0A8000354F090091E50019354C0980F3
65503+:1071B0008D87002830A300FF0003150000475825E5
65504+:1071C0000004C4003C19600001793025370806FF2F
65505+:1071D000AD260000AD2800048DEA002C25280028EB
65506+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
65507+:1071F000AD2500108DE400383C05800034AC093C1E
65508+:10720000AD2400148DE3001CAD2300188DE7002091
65509+:10721000AD27001C8DE20024AD2200208DF900284E
65510+:1072200034A20100AD3900248D830000AD0E0004AE
65511+:1072300034B90900AD0300008C47000C250200148E
65512+:10724000AD070008932B00123C04080090843FD83F
65513+:10725000AD000010317800FF030D302100064F0013
65514+:1072600000047C00012F702535CDFFFC03E00008F1
65515+:10727000AD0D000C35780900930600123C0508009E
65516+:1072800094A53FC830C800FF010D5021000A60805E
65517+:107290000A00063C018520211500005B000000006B
65518+:1072A0003C08080095083FCE3C06080094C63FC83D
65519+:1072B000010610213C0B800035790900933800113C
65520+:1072C000932A001935660A80330800FF94CF002AFC
65521+:1072D00000086082314500FF978A0058000C1E00AC
65522+:1072E000000524003047FFFF006410250047C0253B
65523+:1072F00001EA30213C0B4000030B402500066400EE
65524+:10730000AD280000AD2C0004932500183C030006B6
65525+:107310002528001400053E0000E31025AD220008DA
65526+:107320008F24002C3C05800034AC093CAD24000CBB
65527+:107330008F38001C34A20100254F0001AD38001029
65528+:107340008D830000AD0E000431EB7FFFAD03000024
65529+:107350008C47000C34B90900A78B0058AD07000812
65530+:10736000932B00123C04080090843FD8250200149F
65531+:10737000317800FF030D302100064F0000047C002F
65532+:10738000012F702535CDFFFCAD00001003E0000893
65533+:10739000AD0D000C3C02080094423FD23C050800B1
65534+:1073A00094A53FC835440AA43C07080094E73FC4AD
65535+:1073B000948B00000045C8210327C023000B1C004C
65536+:1073C0002706FFF200665025AD2A000CAD20001004
65537+:1073D000AD2C00140A00063025290018354F0AA4E8
65538+:1073E00095E50000956400280005140000043C00A9
65539+:1073F0003459810000EC5825AD39000CAD2B00103C
65540+:107400000A000630252900143C0C0800958C3FCE5C
65541+:107410000A000681258200015460FF56240A0800F4
65542+:1074200035580AA49706000000061C00006C502581
65543+:10743000AD2A000C0A000630252900103C03080084
65544+:1074400094633FD23C07080094E73FC83C0F080014
65545+:1074500095EF3FC494A4000095790028006710219F
65546+:10746000004F582300041C00001934002578FFEE5B
65547+:1074700000D87825346A8100AD2A000CAD2F0010A9
65548+:10748000AD200014AD2C00180A0006302529001C80
65549+:1074900003E00008240207D027BDFFE0AFB20018C8
65550+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
65551+:1074B000008088218F8800548F87004C3C0580080D
65552+:1074C00034B20080011128213C1080002402008089
65553+:1074D000240300C000A72023AE0208183C06800841
65554+:1074E000AE03081C18800004AF850054ACC500042E
65555+:1074F0008CC90004AF89004C1220000936040980B1
65556+:107500000E0006F800000000924C00278E0B00745D
65557+:1075100001825004014B3021AE46000C3604098034
65558+:107520008C8E001C8F8F005C01CF682319A0000493
65559+:107530008FBF001C8C90001CAF90005C8FBF001CA4
65560+:107540008FB200188FB100148FB000100A00007EB7
65561+:1075500027BD00208F8600508F8300548F82004CFF
65562+:107560003C05800834A40080AC860050AC83003C0D
65563+:1075700003E00008ACA200043C0308008C63005444
65564+:1075800027BDFFF8308400FF2462000130A500FF12
65565+:107590003C010800AC22005430C600FF3C078000CC
65566+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
65567+:1075B0008FAA0000358BFFFF014B4824000627C02F
65568+:1075C00001244025AFA8000034E201009043000AE6
65569+:1075D000A3A000023C1980FFA3A300018FAF00000D
65570+:1075E00030AE007F3738FFFF01F86024000E6E00D8
65571+:1075F0003C0A002034E50140018D58253549200022
65572+:107600002406FF803C04100027BD0008ACAB000C32
65573+:10761000ACA90014A4A00018A0A6001203E0000862
65574+:10762000ACE40178308800FF30A700FF3C03800005
65575+:107630008C6201780440FFFE3C0C8000358A0A0011
65576+:107640008D4B00203584014035850980AC8B0004CA
65577+:107650008D4900240007302B00061540AC89000836
65578+:10766000A088001090A3004CA083002D03E0000828
65579+:10767000A480001827BDFFE8308400FFAFBF0010D2
65580+:107680000E00075D30A500FF8F8300548FBF0010F0
65581+:107690003C06800034C50140344700402404FF907C
65582+:1076A0003C02100027BD0018ACA3000CA0A40012DF
65583+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
65584+:1076C0003C088008AFBF001CAFB20018AFB1001477
65585+:1076D000AFB00010351000808E0600183C07800007
65586+:1076E000309200FF00C72025AE0400180E00007C79
65587+:1076F00030B100FF92030005346200080E00007EE6
65588+:10770000A2020005024020210E000771022028215C
65589+:10771000024020218FBF001C8FB200188FB10014CF
65590+:107720008FB0001024050005240600010A0007326E
65591+:1077300027BD00203C05800034A309809066000826
65592+:1077400030C200081040000F3C0A01013549080A08
65593+:10775000AC8900008CA80074AC8800043C070800C9
65594+:1077600090E73FD830E5001050A00008AC8000083A
65595+:107770003C0D800835AC00808D8B0058AC8B000828
65596+:107780002484000C03E00008008010210A0007B5E3
65597+:107790002484000C27BDFFE83C098000AFB0001036
65598+:1077A000AFBF00143526098090C8000924020006E6
65599+:1077B00000A05821310300FF3527090000808021F7
65600+:1077C000240500041062007B2408000294CF005CB2
65601+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
65602+:1077E00090CA00083144002010800008000000000A
65603+:1077F00090C2004E3C1F010337F90300305800FFD0
65604+:107800000319302524050008AE06000490F9001184
65605+:1078100090E6001290E40011333800FF00187082E7
65606+:1078200030CF00FF01CF5021014B6821308900FF8C
65607+:1078300031AAFFFF39230028000A60801460002C61
65608+:10784000020C482390E400123C198000372F0100FD
65609+:10785000308C00FF018B1821000310800045F821B7
65610+:10786000001F8400360706FFAD270004373F0900DC
65611+:1078700093EC001193EE0012372609800005C082B8
65612+:107880008DE4000C8CC5003431CD00FF01AB10211C
65613+:107890000058182100A4F8230008840000033F00CA
65614+:1078A00000F0302533F9FFFF318F00FC00D970253F
65615+:1078B0000158202101E9682100045080ADAE000C80
65616+:1078C0000E00007C012A80213C088008240B000463
65617+:1078D000350500800E00007EA0AB000902001021DB
65618+:1078E0008FBF00148FB0001003E0000827BD001800
65619+:1078F00090EC001190E300193C18080097183FCE57
65620+:10790000318200FF0002F882307000FF001FCE00BD
65621+:1079100000103C000327302500D870253C0F4000A4
65622+:1079200001CF68253C198000AD2D0000373F0900CC
65623+:1079300093EC001193EE0012372F010037260980D7
65624+:107940000005C0828DE4000C8CC5003431CD00FFF1
65625+:1079500001AB10210058182100A4F823000884006E
65626+:1079600000033F0000F0302533F9FFFF318F00FCAA
65627+:1079700000D970250158202101E9682100045080B8
65628+:10798000ADAE000C0E00007C012A80213C0880086E
65629+:10799000240B0004350500800E00007EA0AB00091A
65630+:1079A000020010218FBF00148FB0001003E0000808
65631+:1079B00027BD00180A0007C72408001227BDFFD002
65632+:1079C0003C038000AFB60028AFB50024AFB4002060
65633+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
65634+:1079E000AFB000103467010090E6000B309400FF48
65635+:1079F00030B500FF30C200300000B02110400099C7
65636+:107A000000008821346409809088000800082E0056
65637+:107A100000051E03046000C0240400048F86005487
65638+:107A20003C010800A0243FD83C0C8000AD800048F9
65639+:107A30003C048000348E010091CD000B31A5002064
65640+:107A400010A000073C078000349309809272000860
65641+:107A50000012860000107E0305E000C43C1F800871
65642+:107A600034EC0100918A000B34EB09809169000825
65643+:107A7000314400400004402B3123000800C8982303
65644+:107A80001460000224120003000090213C108000CA
65645+:107A900036180A8036040900970E002C90830011D6
65646+:107AA0009089001293050018307F00FF312800FFF5
65647+:107AB000024810210002C880930D0018033F78216E
65648+:107AC00001F1302130B100FF00D11821A78E0058FC
65649+:107AD0003C010800A4263FCE3C010800A4233FD06F
65650+:107AE00015A00002000000000000000D920B010B29
65651+:107AF0003065FFFF3C010800A4233FD2316A0040FB
65652+:107B00003C010800A4203FC83C010800A4203FC459
65653+:107B10001140000224A4000A24A4000B3091FFFFAE
65654+:107B20000E0001E7022020219206010B3C0C080008
65655+:107B3000958C3FD2004020210006698231A70001C8
65656+:107B40000E00060101872821004020210260282123
65657+:107B50000E00060C024030210E0007A1004020213B
65658+:107B600016C00069004020219212010B32560040DD
65659+:107B700012C000053C0500FF8C93000034AEFFFFEF
65660+:107B8000026E8024AC9000000E0001FB0220202138
65661+:107B90003C0F080091EF3FD831F10003122000168E
65662+:107BA0003C1380088F8200543C09800835280080EF
65663+:107BB000245F0001AD1F003C3C0580088CB9000427
65664+:107BC00003E02021033FC0231B000002AF9F0054AD
65665+:107BD0008CA400040E0006F8ACA400043C0780004E
65666+:107BE0008CEB00743C04800834830080004B5021EF
65667+:107BF000AC6A000C3C1380083670008002802021A3
65668+:107C000002A02821A200006B0E00075D3C1480003A
65669+:107C10008F920054368C0140AD92000C8F86004844
65670+:107C20003C151000344D000624D60001AF960048E4
65671+:107C30008FBF002CA18600128FB60028AD8D0014D6
65672+:107C40008FB3001CAE9501788FB200188FB5002459
65673+:107C50008FB400208FB100148FB0001003E0000833
65674+:107C600027BD003034640980908F0008000F760033
65675+:107C7000000E6E0305A00033347F090093F8001B4B
65676+:107C8000241900103C010800A0393FD8331300022A
65677+:107C90001260FF678F8600548F8200601446FF6574
65678+:107CA0003C0480000E00007C000000003C048008C2
65679+:107CB0003485008090A8000924060016310300FFD7
65680+:107CC0001066000D0000000090AB00093C070800A2
65681+:107CD00090E73FD824090008316400FF34EA00012E
65682+:107CE0003C010800A02A3FD81089002F240C000A6C
65683+:107CF000108C00282402000C0E00007E0000000002
65684+:107D00000A0008608F8600540E0007B9024028213F
65685+:107D10000A0008AE004020213C0B8008356A008034
65686+:107D20008D4600548CE9000C1120FF3DAF860054B5
65687+:107D3000240700143C010800A0273FD80A00085F70
65688+:107D40003C0C800090910008241200023C010800C5
65689+:107D5000A0323FD8323000201200000B2416000160
65690+:107D60008F8600540A0008602411000837F800804C
65691+:107D70008F020038AFE200048FF90004AF19003C15
65692+:107D80000A00086C3C0780008F8600540A000860D7
65693+:107D900024110004A0A200090E00007E00000000D3
65694+:107DA0000A0008608F860054240200140A00093A71
65695+:107DB000A0A2000927BDFFE8AFB000103C10800072
65696+:107DC000AFBF001436020100904400090E00075DA9
65697+:107DD000240500013C0480089099000E3483008043
65698+:107DE000909F000F906F00269089000A33F800FFE3
65699+:107DF00000196E000018740031EC00FF01AE502530
65700+:107E0000000C5A00014B3825312800FF3603014091
65701+:107E10003445600000E830252402FF813C04100056
65702+:107E2000AC66000C8FBF0014AC650014A062001299
65703+:107E3000AE0401788FB0001003E0000827BD0018E1
65704+:107E400027BDFFE8308400FFAFBF00100E00075DC4
65705+:107E500030A500FF3C05800034A4014034470040B9
65706+:107E60002406FF92AC870014A08600128F83005472
65707+:107E70008FBF00103C02100027BD0018AC83000C1F
65708+:107E800003E00008ACA2017827BDFFD8AFB0001016
65709+:107E9000308400FF30B000FF3C058000AFB100141B
65710+:107EA000AFBF0020AFB3001CAFB20018000410C277
65711+:107EB00034A60100320300023051000114600007B3
65712+:107EC00090D200093C098008353300809268000593
65713+:107ED0003107000810E0000C308A00100240202119
65714+:107EE0000E00078302202821240200018FBF0020FA
65715+:107EF0008FB3001C8FB200188FB100148FB0001028
65716+:107F000003E0000827BD00281540003434A50A000E
65717+:107F10008CB800248CAF0008130F004B00003821F0
65718+:107F20003C0D800835B30080926C00682406000286
65719+:107F3000318B00FF116600843C06800034C20100D2
65720+:107F40009263004C90590009307F00FF53F9000400
65721+:107F50003213007C10E00069000000003213007C46
65722+:107F60005660005C0240202116200009320D0001FD
65723+:107F70003C0C800035840100358B0A008D6500249F
65724+:107F80008C86000414A6FFD900001021320D0001D8
65725+:107F900011A0000E024020213C1880003710010083
65726+:107FA0008E0F000C8F8E005011EE000800000000B4
65727+:107FB0000E000843022028218E19000C3C1F800867
65728+:107FC00037F00080AE190050024020210E000771EA
65729+:107FD000022028210A00098F240200013C05080024
65730+:107FE0008CA5006424A400013C010800AC240064BA
65731+:107FF0001600000D00000000022028210E0007716D
65732+:1080000002402021926E0068240C000231CD00FF56
65733+:1080100011AC0022024020210E00094100000000A6
65734+:108020000A00098F240200010E00007024040001E0
65735+:10803000926B0025020B30250E00007EA266002503
65736+:108040000A0009D3022028218E6200188CDF000468
65737+:108050008CB9002400021E0217F9FFB13065007FC1
65738+:108060009268004C264400013093007F1265004066
65739+:10807000310300FF1464FFAB3C0D8008264700016C
65740+:1080800030F1007F30E200FF1225000B24070001D1
65741+:10809000004090210A00099C2411000124050004DD
65742+:1080A0000E000732240600010E0009410000000006
65743+:1080B0000A00098F240200012405FF8002452024C4
65744+:1080C00000859026324200FF004090210A00099C62
65745+:1080D000241100010E00084302202821320700303D
65746+:1080E00010E0FFA132100082024020210E00078321
65747+:1080F000022028210A00098F240200018E6900183D
65748+:108100000240202102202821012640250E0009647A
65749+:10811000AE6800189264004C240500032406000198
65750+:108120000E000732308400FF0E00007024040001AE
65751+:1081300092710025021150250E00007EA26A0025D2
65752+:108140000A00098F240200018E6F00183C1880007D
65753+:108150000240202101F87025022028210E0007711D
65754+:10816000AE6E00189264004C0A000A1B240500043D
65755+:10817000324A0080394900801469FF6A3C0D80084A
65756+:108180000A0009F42647000127BDFFC0AFB0001860
65757+:108190003C108000AFBF0038AFB70034AFB600303E
65758+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
65759+:1081B0000E0005BEAFB1001C360201009045000B59
65760+:1081C0000E00097690440008144000E78FBF003885
65761+:1081D0003C08800835070080A0E0006B3606098067
65762+:1081E00090C50000240300503C17080026F73F907C
65763+:1081F00030A400FF3C13080026733FA01083000347
65764+:108200003C1080000000B82100009821241F0010BD
65765+:108210003611010036120A00361509808E580024E6
65766+:108220008E3400048EAF00208F8C00543C01080077
65767+:10823000A03F3FD836190A80972B002C8EF60000FD
65768+:10824000932A00180298702301EC68233C0108006F
65769+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
65770+:10826000AC2C3FDCA78B005802C0F809315400FF4A
65771+:1082700030490002152000E930420001504000C49E
65772+:108280009227000992A90008312800081500000271
65773+:10829000241500030000A8213C0A80003543090092
65774+:1082A00035440A008C8D00249072001190700012E9
65775+:1082B000907F0011325900FF321100FF02B11021EE
65776+:1082C0000002C08033EF00FF0319B021028F70213C
65777+:1082D00002D4602125CB00103C010800A4363FCE1B
65778+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
65779+:1082F0003C010800A42B3FCC3556010035540980C1
65780+:1083000035510E008F8700548F89005C8E850020C8
65781+:1083100024080006012730233C010800AC283FD484
65782+:1083200000A7282304C000B50000902104A000B3DA
65783+:1083300000C5502B114000B5000000003C010800B2
65784+:10834000AC263FB88E6200000040F8090000000033
65785+:108350003046000214C0007400408021304B000100
65786+:10836000556000118E6200043C0D08008DAD3FBCCD
65787+:108370003C0EC0003C04800001AE6025AE2C000025
65788+:108380008C980000330F000811E0FFFD0000000092
65789+:10839000963F000824120001A79F00408E39000478
65790+:1083A000AF9900388E6200040040F8090000000018
65791+:1083B0000202802532030002146000B300000000B6
65792+:1083C0003C09080095293FC43C06080094C63FD0EC
65793+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
65794+:1083E000012670213C0308008C633FE03C08080034
65795+:1083F00095083FDA01CA20218ED9000C00E9282116
65796+:10840000249F000200A878210067C02133E4FFFF09
65797+:10841000AF9900503C010800AC383FE03C01080037
65798+:10842000A42F3FC83C010800A42E3FD20E0001E754
65799+:10843000000000008F8D0048004020213C01080012
65800+:10844000A02D3FD98E62000825AC0001AF8C0048FA
65801+:108450000040F809000000008F85005402A0302180
65802+:108460000E00060C004020210E0007A10040202134
65803+:108470008E6B000C0160F809004020213C0A0800C6
65804+:10848000954A3FD23C06080094C63FC601464821A3
65805+:10849000252800020E0001FB3104FFFF3C05080007
65806+:1084A0008CA53FB43C0708008CE73FBC00A7202305
65807+:1084B0003C010800AC243FB414800006000000001A
65808+:1084C0003C0208008C423FD4344B00403C01080081
65809+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
65810+:1084E0008F920044AE4D00208E2C0018AE4C00241C
65811+:1084F0003C04080094843FC80E0006FA0000000007
65812+:108500008F9F00548E6700103C010800AC3F3FDC99
65813+:1085100000E0F809000000003C1908008F393FB462
65814+:108520001720FF798F870054979300583C11800ED5
65815+:10853000321601000E000729A633002C16C0004594
65816+:10854000320300105460004C8EE5000432080040F5
65817+:108550005500001D8EF000088EE4000C0080F80924
65818+:10856000000000008FBF00388FB700348FB6003096
65819+:108570008FB5002C8FB400288FB300248FB2002059
65820+:108580008FB1001C8FB0001803E0000827BD004029
65821+:108590008F86003C36110E0000072E0000A6202515
65822+:1085A000AE0400808E4300208E500024AFA3001044
65823+:1085B000AE2300148FB20010AE320010AE30001C9B
65824+:1085C0000A000A75AE3000180200F8090000000029
65825+:1085D0008EE4000C0080F809000000000A000B2E59
65826+:1085E0008FBF003824180001240F0001A5C000200F
65827+:1085F000A5D800220A000B10ADCF00243C010800D2
65828+:10860000AC203FB80A000AA68E6200003C010800B8
65829+:10861000AC253FB80A000AA68E6200009224000929
65830+:108620000E000771000028218FBF00388FB700347B
65831+:108630008FB600308FB5002C8FB400288FB3002484
65832+:108640008FB200208FB1001C8FB0001803E000082B
65833+:1086500027BD00403C1480009295010900002821AC
65834+:108660000E00084332A400FF320300105060FFB830
65835+:10867000320800408EE5000400A0F8090000000068
65836+:108680000A000B28320800405240FFA89793005878
65837+:108690008E3400148F930044AE7400208E35001C7D
65838+:1086A000AE7500240A000B1F979300588F820014A8
65839+:1086B0000004218003E00008008210213C078008AC
65840+:1086C00034E200809043006900804021106000097E
65841+:1086D0003C0401003C0708008CE73FDC8F8300303E
65842+:1086E00000E32023048000089389001C14E30003A6
65843+:1086F0000100202103E00008008010213C0401005B
65844+:1087000003E00008008010211120000B00673823CF
65845+:108710003C0D800035AC0980918B007C316A0002F1
65846+:10872000114000202409003400E9702B15C0FFF12E
65847+:108730000100202100E938232403FFFC00A3C82402
65848+:1087400000E3C02400F9782B15E0FFEA030820219C
65849+:1087500030C400030004102314C000143049000387
65850+:108760000000302100A9782101E6702100EE682B7D
65851+:1087700011A0FFE03C0401002D3800010006C82BC9
65852+:10878000010548210319382414E0FFDA2524FFFCF1
65853+:108790002402FFFC00A218240068202103E0000846
65854+:1087A000008010210A000B9E240900303C0C800040
65855+:1087B0003586098090CB007C316A00041540FFE9C2
65856+:1087C000240600040A000BAD000030213C03080021
65857+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
65858+:1087E000AFB1001410620005AFB00010000329C043
65859+:1087F00024A40280AF840014AF8300183C108000D2
65860+:1088000036020A0094450032361101000E000B7F3B
65861+:1088100030A43FFF8E240000241FFF803C11008005
65862+:108820000082C021031F60243309007F000CC9406F
65863+:1088300003294025330E0078362F00033C0D10002D
65864+:10884000010D502501CF5825AE0C002836080980AF
65865+:10885000AE0C080CAE0B082CAE0A08309103006970
65866+:108860003C06800C0126382110600006AF870034DA
65867+:108870008D09003C8D03006C0123382318E0008231
65868+:10888000000000003C0B8008356A00803C1080002E
65869+:10889000A1400069360609808CC200383C06800081
65870+:1088A00034C50A0090A8003C310C00201180001A49
65871+:1088B000AF820030240D00013C0E800035D10A004B
65872+:1088C000A38D001CAF8000248E2400248F850024FB
65873+:1088D000240D0008AF800020AF8000283C01080074
65874+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
65875+:1088F000000030219228003C8FBF00188FB1001477
65876+:108900008FB0001000086142AF82002C27BD00200C
65877+:1089100003E000083182000190B80032240E00010B
65878+:10892000330F00FF000F2182108E00412419000236
65879+:108930001099006434C40AC03C03800034640A0007
65880+:108940008C8F002415E0001E34660900909F0030D3
65881+:108950002418000533F9003F1338004E24030001AA
65882+:108960008F860020A383001CAF860028AF860024DA
65883+:108970003C0E800035D10A008E2400248F8500240F
65884+:10898000240D00083C010800A42D3FC63C0108004E
65885+:10899000A4203FDA0E000B83000000009228003C68
65886+:1089A0008FBF00188FB100148FB000100008614213
65887+:1089B000AF82002C27BD002003E0000831820001B7
65888+:1089C0008C8A00088C8B00248CD000643C0E8000C4
65889+:1089D00035D10A00014B2823AF900024A380001C4E
65890+:1089E000AF8500288E2400248F8600208F850024E8
65891+:1089F000240D00083C010800A42D3FC63C010800DE
65892+:108A0000A4203FDA0E000B83000000009228003CF7
65893+:108A10008FBF00188FB100148FB0001000086142A2
65894+:108A2000AF82002C27BD002003E000083182000146
65895+:108A300090A200303051003F5224002834C50AC0B3
65896+:108A40008CB000241600002234CB09008CA600480C
65897+:108A50003C0A7FFF3545FFFF00C510243C0E800017
65898+:108A6000AF82002035C509008F8800208CAD0060E2
65899+:108A7000010D602B15800002010020218CA40060F4
65900+:108A80000A000C22AF8400208D02006C0A000BFC4F
65901+:108A90003C0680008C8200488F8600203C097FFFC6
65902+:108AA0003527FFFF004788243C0480082403000189
65903+:108AB000AF910028AC80006CA383001C0A000C302E
65904+:108AC000AF8600248C9F00140A000C22AF9F002068
65905+:108AD0008D6200680A000C6C3C0E800034C4098072
65906+:108AE0008C8900708CA300140123382B10E0000443
65907+:108AF000000000008C8200700A000C6C3C0E8000AC
65908+:108B00008CA200140A000C6C3C0E80008F8500249F
65909+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
65910+:108B2000AFB000103C04800034870A0090E60030AB
65911+:108B30002402000530C3003F106200B934840900EC
65912+:108B40008F91002000A080213C048000348E0A0018
65913+:108B50008DCD00043C0608008CC63FB831A73FFF0E
65914+:108B600000E6602B5580000100E03021938F001C4F
65915+:108B700011E0007800D0282B349F098093F9007C05
65916+:108B800033380002130000792403003400C3102B93
65917+:108B9000144000D90000000000C3302300D0282B6F
65918+:108BA0003C010800A4233FC414A0006E0200182159
65919+:108BB0003C0408008C843FB40064402B5500000145
65920+:108BC000006020213C05800034A90A00912A003C65
65921+:108BD0003C010800AC243FBC31430020146000037A
65922+:108BE0000000482134AB0E008D6900188F88002CDE
65923+:108BF0000128202B1080005F000000003C050800C9
65924+:108C00008CA53FBC00A96821010D602B1180005C80
65925+:108C100000B0702B0109382300E028213C01080036
65926+:108C2000AC273FBC12000003240AFFFC10B0008DEB
65927+:108C30003224000300AA18243C010800A4203FDAD3
65928+:108C40003C010800AC233FBC006028218F84002435
65929+:108C5000120400063C0B80088D6C006C0200202181
65930+:108C6000AF91002025900001AD70006C8F8D002821
65931+:108C700000858823AF91002401A52023AF8400281C
65932+:108C80001220000224070018240700103C18800856
65933+:108C90003706008090CF00683C010800A0273FD82D
65934+:108CA0002407000131EE00FF11C70047000000005B
65935+:108CB00014800018000028213C06800034D109806F
65936+:108CC00034CD010091A600098E2C001824C40001A7
65937+:108CD000000C86023205007F308B007F1165007F1B
65938+:108CE0002407FF803C19800837290080A124004C0C
65939+:108CF0003C0808008D083FD4241800023C010800FD
65940+:108D0000A0384019350F00083C010800AC2F3FD4B3
65941+:108D1000240500103C02800034440A009083003C8B
65942+:108D2000307F002013E0000500A02021240A00016C
65943+:108D30003C010800AC2A3FBC34A400018FBF0018DE
65944+:108D40008FB100148FB000100080102103E00008E4
65945+:108D500027BD00203C010800A4203FC410A0FF94C0
65946+:108D6000020018210A000CC000C018210A000CB72C
65947+:108D7000240300303C0508008CA53FBC00B0702BDC
65948+:108D800011C0FFA8000000003C19080097393FC43B
65949+:108D90000325C0210307782B11E000072CAA00044B
65950+:108DA0003C0360008C625404305F003F17E0FFE337
65951+:108DB000240400422CAA00041140FF9A240400421B
65952+:108DC0000A000D248FBF00181528FFB9000000000D
65953+:108DD0008CCA00183C1F800024020002015F182585
65954+:108DE000ACC3001837F90A00A0C200689329003C00
65955+:108DF0002404000400A01021312800203C010800B8
65956+:108E0000A0244019110000022405001024020001D2
65957+:108E10003C010800AC223FB40A000D1A3C0280005D
65958+:108E20008F8800288C8900600109282B14A000027B
65959+:108E3000010088218C9100603C048000348B0E007E
65960+:108E40008D640018240A000102202821022030210C
65961+:108E5000A38A001C0E000B83022080210A000CA6AE
65962+:108E6000AF82002C00045823122000073164000355
65963+:108E70003C0E800035C7098090ED007C31AC0004C9
65964+:108E800015800019248F00043C010800A4243FDA57
65965+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
65966+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
65967+:108EB0002404004230A200031440000200A2182340
65968+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
65969+:108ED000A4203FDA0A000CE70060282100C77024B4
65970+:108EE0000A000D0D01C720263C010800A42F3FDA1F
65971+:108EF0000A000D78000000003C010800AC203FBCD7
65972+:108F00000A000D23240400428F8300283C058000C2
65973+:108F100034AA0A00146000060000102191470030B6
65974+:108F20002406000530E400FF108600030000000066
65975+:108F300003E0000800000000914B0048316900FF89
65976+:108F4000000941C21500FFFA3C0680083C040800F5
65977+:108F500094843FC43C0308008C633FDC3C19080048
65978+:108F60008F393FBC3C0F080095EF3FDA0064C02109
65979+:108F70008CCD00040319702101CF602134AB0E00A9
65980+:108F8000018D282318A0001D00000000914F004C07
65981+:108F90008F8C0034956D001031EE00FF8D89000438
65982+:108FA00001AE30238D8A000030CEFFFF000E290075
65983+:108FB0000125C82100003821014720210325182B55
65984+:108FC0000083C021AD990004AD980000918F000A84
65985+:108FD00001CF6821A18D000A956500128F8A0034A7
65986+:108FE000A5450008954B003825690001A5490038C2
65987+:108FF0009148000D35070008A147000D03E0000867
65988+:109000000000000027BDFFD8AFB000189388001CF7
65989+:109010008FB000143C0A80003C197FFF8F8700242A
65990+:109020003738FFFFAFBF0020AFB1001C355F0A002B
65991+:109030000218182493EB003C00087FC03C02BFFFDD
65992+:10904000006F60252CF000013449FFFF3C1F080031
65993+:109050008FFF3FDC8F9900303C18080097183FD2F3
65994+:1090600001897824001047803C07EFFF3C05F0FFA2
65995+:1090700001E818253C1180003169002034E2FFFF2F
65996+:1090800034ADFFFF362E098027A50010240600020C
65997+:1090900003F96023270B0002354A0E0000621824F2
65998+:1090A0000080802115200002000040218D48001C16
65999+:1090B000A7AB0012058000392407000030E800FF4C
66000+:1090C00000083F00006758253C028008AFAB001441
66001+:1090D000344F008091EA00683C08080091083FD9AD
66002+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
66003+:1090F00094423FCCA3A80011016CC024001FCF40B4
66004+:10910000031918258FA70010AFA300143C0C08000A
66005+:10911000918C3FDBA7A200168FAB001400ED482412
66006+:109120003C0F01003C0A0FFF012FC82531980003B6
66007+:10913000355FFFFF016D40243C027000033F38247F
66008+:1091400000181E0000E2482501037825AFAF001487
66009+:10915000AFA9001091CC007C0E000092A3AC0015CA
66010+:10916000362D0A0091A6003C30C400201080000675
66011+:10917000260200083C11080096313FC8262EFFFF4A
66012+:109180003C010800A42E3FC88FBF00208FB1001CF7
66013+:109190008FB0001803E0000827BD00288F8B002C3B
66014+:1091A000010B502B5540FFC5240700010A000E0497
66015+:1091B00030E800FF9383001C3C02800027BDFFD8ED
66016+:1091C00034480A0000805021AFBF002034460AC056
66017+:1091D000010028211060000E3444098091070030FE
66018+:1091E000240B00058F89002030EC003F118B000B11
66019+:1091F00000003821AFA900103C0B80088D69006C7D
66020+:10920000AFAA00180E00015AAFA90014A380001CD9
66021+:109210008FBF002003E0000827BD00288D1F0048F5
66022+:109220003C1808008F183FBC8F9900283C027FFF34
66023+:109230008D0800443443FFFFAFA900103C0B8008A9
66024+:109240008D69006C03E370240319782101CF682332
66025+:1092500001A83821AFAA00180E00015AAFA90014C6
66026+:109260000A000E58A380001C3C05800034A60A00AA
66027+:1092700090C7003C3C06080094C63FDA3C02080058
66028+:109280008C423FD430E30020000624001060001E12
66029+:10929000004438253C0880083505008090A300680C
66030+:1092A00000004821240800010000282124040001B6
66031+:1092B0003C0680008CCD017805A0FFFE34CF014034
66032+:1092C000ADE800083C0208008C423FDCA5E5000444
66033+:1092D000A5E40006ADE2000C3C04080090843FD9F0
66034+:1092E0003C03800834790080A1E40012ADE700144B
66035+:1092F000A5E900189338004C3C0E1000A1F8002D91
66036+:1093000003E00008ACCE017834A90E008D28001CC3
66037+:109310003C0C08008D8C3FBC952B0016952A001440
66038+:10932000018648213164FFFF0A000E803145FFFFAE
66039+:109330003C04800034830A009065003C30A2002089
66040+:109340001040001934870E00000040210000382131
66041+:10935000000020213C0680008CC901780520FFFE1A
66042+:1093600034CA014034CF010091EB0009AD48000838
66043+:109370003C0E08008DCE3FDC240DFF91240C0040F4
66044+:109380003C081000A5440004A5470006AD4E000CA3
66045+:10939000A14D0012AD4C0014A5400018A14B002DAA
66046+:1093A00003E00008ACC801788CE8001894E60012CD
66047+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
66048+:1093C0003C04800034830A009065003C30A20020F9
66049+:1093D0001040002727BDFFF82409000100003821B4
66050+:1093E000240800013C0680008CCA01780540FFFE7D
66051+:1093F0003C0280FF34C40100908D00093C0C080041
66052+:10940000918C4019A3AD00038FAB00003185007F24
66053+:109410003459FFFF01665025AFAA00009083000A6F
66054+:10942000A3A0000200057E00A3A300018FB80000E6
66055+:1094300034CB0140240C30000319702401CF68257F
66056+:10944000AD6D000C27BD0008AD6C0014A5600018C0
66057+:10945000AD690008A56700042409FF80A56800061F
66058+:109460003C081000A169001203E00008ACC80178B4
66059+:1094700034870E008CE9001894E6001294E4001082
66060+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
66061+:10949000AFB100143C118000AFB00010AFBF001896
66062+:1094A00036380A00970F0032363001000E000B7F6D
66063+:1094B00031E43FFF8E0E0000240DFF803C042000AD
66064+:1094C00001C25821016D6024000C4940316A007FBF
66065+:1094D000012A4025010438253C048008AE270830C5
66066+:1094E0003486008090C500682403000230A200FF8B
66067+:1094F000104300048F9F00208F990024AC9F0068C8
66068+:10950000AC9900648FBF00188FB100148FB00010A9
66069+:1095100003E0000827BD00203C0A0800254A3A80E5
66070+:109520003C09080025293B103C08080025082F1C91
66071+:109530003C07080024E73BDC3C06080024C639044D
66072+:109540003C05080024A536583C0408002484325CFD
66073+:109550003C030800246339B83C0208002442375415
66074+:109560003C010800AC2A3F983C010800AC293F941C
66075+:109570003C010800AC283F903C010800AC273F9C10
66076+:109580003C010800AC263FAC3C010800AC253FA4E0
66077+:109590003C010800AC243FA03C010800AC233FB0D4
66078+:1095A0003C010800AC223FA803E0000800000000D6
66079+:1095B00080000940800009008008010080080080C8
66080+:1095C00080080000800E00008008008080080000F5
66081+:1095D00080000A8080000A00800009808000090065
66082+:00000001FF
66083diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
66084index eb14e05..5156de7 100644
66085--- a/fs/9p/vfs_addr.c
66086+++ b/fs/9p/vfs_addr.c
66087@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
66088
66089 retval = v9fs_file_write_internal(inode,
66090 v9inode->writeback_fid,
66091- (__force const char __user *)buffer,
66092+ (const char __force_user *)buffer,
66093 len, &offset, 0);
66094 if (retval > 0)
66095 retval = 0;
66096diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
66097index 3662f1d..90558b5 100644
66098--- a/fs/9p/vfs_inode.c
66099+++ b/fs/9p/vfs_inode.c
66100@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
66101 void
66102 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
66103 {
66104- char *s = nd_get_link(nd);
66105+ const char *s = nd_get_link(nd);
66106
66107 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
66108 dentry, IS_ERR(s) ? "<error>" : s);
66109diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
66110index 270c481..0d8a962 100644
66111--- a/fs/Kconfig.binfmt
66112+++ b/fs/Kconfig.binfmt
66113@@ -106,7 +106,7 @@ config HAVE_AOUT
66114
66115 config BINFMT_AOUT
66116 tristate "Kernel support for a.out and ECOFF binaries"
66117- depends on HAVE_AOUT
66118+ depends on HAVE_AOUT && BROKEN
66119 ---help---
66120 A.out (Assembler.OUTput) is a set of formats for libraries and
66121 executables used in the earliest versions of UNIX. Linux used
66122diff --git a/fs/afs/inode.c b/fs/afs/inode.c
66123index 8a1d38e..300a14e 100644
66124--- a/fs/afs/inode.c
66125+++ b/fs/afs/inode.c
66126@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66127 struct afs_vnode *vnode;
66128 struct super_block *sb;
66129 struct inode *inode;
66130- static atomic_t afs_autocell_ino;
66131+ static atomic_unchecked_t afs_autocell_ino;
66132
66133 _enter("{%x:%u},%*.*s,",
66134 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
66135@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
66136 data.fid.unique = 0;
66137 data.fid.vnode = 0;
66138
66139- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
66140+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
66141 afs_iget5_autocell_test, afs_iget5_set,
66142 &data);
66143 if (!inode) {
66144diff --git a/fs/aio.c b/fs/aio.c
66145index a1736e9..c80a8ac 100644
66146--- a/fs/aio.c
66147+++ b/fs/aio.c
66148@@ -409,7 +409,7 @@ static int aio_setup_ring(struct kioctx *ctx)
66149 size += sizeof(struct io_event) * nr_events;
66150
66151 nr_pages = PFN_UP(size);
66152- if (nr_pages < 0)
66153+ if (nr_pages <= 0)
66154 return -EINVAL;
66155
66156 file = aio_private_file(ctx, nr_pages);
66157diff --git a/fs/attr.c b/fs/attr.c
66158index 6530ced..4a827e2 100644
66159--- a/fs/attr.c
66160+++ b/fs/attr.c
66161@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
66162 unsigned long limit;
66163
66164 limit = rlimit(RLIMIT_FSIZE);
66165+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
66166 if (limit != RLIM_INFINITY && offset > limit)
66167 goto out_sig;
66168 if (offset > inode->i_sb->s_maxbytes)
66169diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
66170index 116fd38..c04182da 100644
66171--- a/fs/autofs4/waitq.c
66172+++ b/fs/autofs4/waitq.c
66173@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
66174 {
66175 unsigned long sigpipe, flags;
66176 mm_segment_t fs;
66177- const char *data = (const char *)addr;
66178+ const char __user *data = (const char __force_user *)addr;
66179 ssize_t wr = 0;
66180
66181 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
66182@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
66183 return 1;
66184 }
66185
66186+#ifdef CONFIG_GRKERNSEC_HIDESYM
66187+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
66188+#endif
66189+
66190 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66191 enum autofs_notify notify)
66192 {
66193@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
66194
66195 /* If this is a direct mount request create a dummy name */
66196 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
66197+#ifdef CONFIG_GRKERNSEC_HIDESYM
66198+ /* this name does get written to userland via autofs4_write() */
66199+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
66200+#else
66201 qstr.len = sprintf(name, "%p", dentry);
66202+#endif
66203 else {
66204 qstr.len = autofs4_getpath(sbi, dentry, &name);
66205 if (!qstr.len) {
66206diff --git a/fs/befs/endian.h b/fs/befs/endian.h
66207index 2722387..56059b5 100644
66208--- a/fs/befs/endian.h
66209+++ b/fs/befs/endian.h
66210@@ -11,7 +11,7 @@
66211
66212 #include <asm/byteorder.h>
66213
66214-static inline u64
66215+static inline u64 __intentional_overflow(-1)
66216 fs64_to_cpu(const struct super_block *sb, fs64 n)
66217 {
66218 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66219@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
66220 return (__force fs64)cpu_to_be64(n);
66221 }
66222
66223-static inline u32
66224+static inline u32 __intentional_overflow(-1)
66225 fs32_to_cpu(const struct super_block *sb, fs32 n)
66226 {
66227 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66228@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
66229 return (__force fs32)cpu_to_be32(n);
66230 }
66231
66232-static inline u16
66233+static inline u16 __intentional_overflow(-1)
66234 fs16_to_cpu(const struct super_block *sb, fs16 n)
66235 {
66236 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
66237diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
66238index 4c55668..eeae150 100644
66239--- a/fs/binfmt_aout.c
66240+++ b/fs/binfmt_aout.c
66241@@ -16,6 +16,7 @@
66242 #include <linux/string.h>
66243 #include <linux/fs.h>
66244 #include <linux/file.h>
66245+#include <linux/security.h>
66246 #include <linux/stat.h>
66247 #include <linux/fcntl.h>
66248 #include <linux/ptrace.h>
66249@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
66250 #endif
66251 # define START_STACK(u) ((void __user *)u.start_stack)
66252
66253+ memset(&dump, 0, sizeof(dump));
66254+
66255 fs = get_fs();
66256 set_fs(KERNEL_DS);
66257 has_dumped = 1;
66258@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
66259
66260 /* If the size of the dump file exceeds the rlimit, then see what would happen
66261 if we wrote the stack, but not the data area. */
66262+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
66263 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
66264 dump.u_dsize = 0;
66265
66266 /* Make sure we have enough room to write the stack and data areas. */
66267+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
66268 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
66269 dump.u_ssize = 0;
66270
66271@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
66272 rlim = rlimit(RLIMIT_DATA);
66273 if (rlim >= RLIM_INFINITY)
66274 rlim = ~0;
66275+
66276+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
66277 if (ex.a_data + ex.a_bss > rlim)
66278 return -ENOMEM;
66279
66280@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
66281
66282 install_exec_creds(bprm);
66283
66284+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66285+ current->mm->pax_flags = 0UL;
66286+#endif
66287+
66288+#ifdef CONFIG_PAX_PAGEEXEC
66289+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
66290+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
66291+
66292+#ifdef CONFIG_PAX_EMUTRAMP
66293+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
66294+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
66295+#endif
66296+
66297+#ifdef CONFIG_PAX_MPROTECT
66298+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
66299+ current->mm->pax_flags |= MF_PAX_MPROTECT;
66300+#endif
66301+
66302+ }
66303+#endif
66304+
66305 if (N_MAGIC(ex) == OMAGIC) {
66306 unsigned long text_addr, map_size;
66307 loff_t pos;
66308@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
66309 return error;
66310
66311 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
66312- PROT_READ | PROT_WRITE | PROT_EXEC,
66313+ PROT_READ | PROT_WRITE,
66314 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
66315 fd_offset + ex.a_text);
66316 if (error != N_DATADDR(ex))
66317diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
66318index 8081aba..90a7bdd 100644
66319--- a/fs/binfmt_elf.c
66320+++ b/fs/binfmt_elf.c
66321@@ -34,6 +34,7 @@
66322 #include <linux/utsname.h>
66323 #include <linux/coredump.h>
66324 #include <linux/sched.h>
66325+#include <linux/xattr.h>
66326 #include <asm/uaccess.h>
66327 #include <asm/param.h>
66328 #include <asm/page.h>
66329@@ -47,7 +48,7 @@
66330
66331 static int load_elf_binary(struct linux_binprm *bprm);
66332 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
66333- int, int, unsigned long);
66334+ int, int, unsigned long) __intentional_overflow(-1);
66335
66336 #ifdef CONFIG_USELIB
66337 static int load_elf_library(struct file *);
66338@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
66339 #define elf_core_dump NULL
66340 #endif
66341
66342+#ifdef CONFIG_PAX_MPROTECT
66343+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
66344+#endif
66345+
66346+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66347+static void elf_handle_mmap(struct file *file);
66348+#endif
66349+
66350 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
66351 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
66352 #else
66353@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
66354 .load_binary = load_elf_binary,
66355 .load_shlib = load_elf_library,
66356 .core_dump = elf_core_dump,
66357+
66358+#ifdef CONFIG_PAX_MPROTECT
66359+ .handle_mprotect= elf_handle_mprotect,
66360+#endif
66361+
66362+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
66363+ .handle_mmap = elf_handle_mmap,
66364+#endif
66365+
66366 .min_coredump = ELF_EXEC_PAGESIZE,
66367 };
66368
66369@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
66370
66371 static int set_brk(unsigned long start, unsigned long end)
66372 {
66373+ unsigned long e = end;
66374+
66375 start = ELF_PAGEALIGN(start);
66376 end = ELF_PAGEALIGN(end);
66377 if (end > start) {
66378@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
66379 if (BAD_ADDR(addr))
66380 return addr;
66381 }
66382- current->mm->start_brk = current->mm->brk = end;
66383+ current->mm->start_brk = current->mm->brk = e;
66384 return 0;
66385 }
66386
66387@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66388 elf_addr_t __user *u_rand_bytes;
66389 const char *k_platform = ELF_PLATFORM;
66390 const char *k_base_platform = ELF_BASE_PLATFORM;
66391- unsigned char k_rand_bytes[16];
66392+ u32 k_rand_bytes[4];
66393 int items;
66394 elf_addr_t *elf_info;
66395 int ei_index = 0;
66396 const struct cred *cred = current_cred();
66397 struct vm_area_struct *vma;
66398+ unsigned long saved_auxv[AT_VECTOR_SIZE];
66399
66400 /*
66401 * In some cases (e.g. Hyper-Threading), we want to avoid L1
66402@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66403 * Generate 16 random bytes for userspace PRNG seeding.
66404 */
66405 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
66406- u_rand_bytes = (elf_addr_t __user *)
66407- STACK_ALLOC(p, sizeof(k_rand_bytes));
66408+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
66409+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
66410+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
66411+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
66412+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
66413+ u_rand_bytes = (elf_addr_t __user *) p;
66414 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
66415 return -EFAULT;
66416
66417@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
66418 return -EFAULT;
66419 current->mm->env_end = p;
66420
66421+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
66422+
66423 /* Put the elf_info on the stack in the right place. */
66424 sp = (elf_addr_t __user *)envp + 1;
66425- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
66426+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
66427 return -EFAULT;
66428 return 0;
66429 }
66430@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
66431 an ELF header */
66432
66433 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66434- struct file *interpreter, unsigned long *interp_map_addr,
66435+ struct file *interpreter,
66436 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
66437 {
66438 struct elf_phdr *eppnt;
66439- unsigned long load_addr = 0;
66440+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
66441 int load_addr_set = 0;
66442 unsigned long last_bss = 0, elf_bss = 0;
66443- unsigned long error = ~0UL;
66444+ unsigned long error = -EINVAL;
66445 unsigned long total_size;
66446 int i;
66447
66448@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66449 goto out;
66450 }
66451
66452+#ifdef CONFIG_PAX_SEGMEXEC
66453+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
66454+ pax_task_size = SEGMEXEC_TASK_SIZE;
66455+#endif
66456+
66457 eppnt = interp_elf_phdata;
66458 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
66459 if (eppnt->p_type == PT_LOAD) {
66460@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66461 map_addr = elf_map(interpreter, load_addr + vaddr,
66462 eppnt, elf_prot, elf_type, total_size);
66463 total_size = 0;
66464- if (!*interp_map_addr)
66465- *interp_map_addr = map_addr;
66466 error = map_addr;
66467 if (BAD_ADDR(map_addr))
66468 goto out;
66469@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66470 k = load_addr + eppnt->p_vaddr;
66471 if (BAD_ADDR(k) ||
66472 eppnt->p_filesz > eppnt->p_memsz ||
66473- eppnt->p_memsz > TASK_SIZE ||
66474- TASK_SIZE - eppnt->p_memsz < k) {
66475+ eppnt->p_memsz > pax_task_size ||
66476+ pax_task_size - eppnt->p_memsz < k) {
66477 error = -ENOMEM;
66478 goto out;
66479 }
66480@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
66481 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
66482
66483 /* Map the last of the bss segment */
66484- error = vm_brk(elf_bss, last_bss - elf_bss);
66485- if (BAD_ADDR(error))
66486- goto out;
66487+ if (last_bss > elf_bss) {
66488+ error = vm_brk(elf_bss, last_bss - elf_bss);
66489+ if (BAD_ADDR(error))
66490+ goto out;
66491+ }
66492 }
66493
66494 error = load_addr;
66495@@ -634,6 +666,336 @@ out:
66496 return error;
66497 }
66498
66499+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66500+#ifdef CONFIG_PAX_SOFTMODE
66501+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
66502+{
66503+ unsigned long pax_flags = 0UL;
66504+
66505+#ifdef CONFIG_PAX_PAGEEXEC
66506+ if (elf_phdata->p_flags & PF_PAGEEXEC)
66507+ pax_flags |= MF_PAX_PAGEEXEC;
66508+#endif
66509+
66510+#ifdef CONFIG_PAX_SEGMEXEC
66511+ if (elf_phdata->p_flags & PF_SEGMEXEC)
66512+ pax_flags |= MF_PAX_SEGMEXEC;
66513+#endif
66514+
66515+#ifdef CONFIG_PAX_EMUTRAMP
66516+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66517+ pax_flags |= MF_PAX_EMUTRAMP;
66518+#endif
66519+
66520+#ifdef CONFIG_PAX_MPROTECT
66521+ if (elf_phdata->p_flags & PF_MPROTECT)
66522+ pax_flags |= MF_PAX_MPROTECT;
66523+#endif
66524+
66525+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66526+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
66527+ pax_flags |= MF_PAX_RANDMMAP;
66528+#endif
66529+
66530+ return pax_flags;
66531+}
66532+#endif
66533+
66534+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
66535+{
66536+ unsigned long pax_flags = 0UL;
66537+
66538+#ifdef CONFIG_PAX_PAGEEXEC
66539+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
66540+ pax_flags |= MF_PAX_PAGEEXEC;
66541+#endif
66542+
66543+#ifdef CONFIG_PAX_SEGMEXEC
66544+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
66545+ pax_flags |= MF_PAX_SEGMEXEC;
66546+#endif
66547+
66548+#ifdef CONFIG_PAX_EMUTRAMP
66549+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
66550+ pax_flags |= MF_PAX_EMUTRAMP;
66551+#endif
66552+
66553+#ifdef CONFIG_PAX_MPROTECT
66554+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
66555+ pax_flags |= MF_PAX_MPROTECT;
66556+#endif
66557+
66558+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66559+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
66560+ pax_flags |= MF_PAX_RANDMMAP;
66561+#endif
66562+
66563+ return pax_flags;
66564+}
66565+#endif
66566+
66567+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66568+#ifdef CONFIG_PAX_SOFTMODE
66569+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
66570+{
66571+ unsigned long pax_flags = 0UL;
66572+
66573+#ifdef CONFIG_PAX_PAGEEXEC
66574+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
66575+ pax_flags |= MF_PAX_PAGEEXEC;
66576+#endif
66577+
66578+#ifdef CONFIG_PAX_SEGMEXEC
66579+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
66580+ pax_flags |= MF_PAX_SEGMEXEC;
66581+#endif
66582+
66583+#ifdef CONFIG_PAX_EMUTRAMP
66584+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
66585+ pax_flags |= MF_PAX_EMUTRAMP;
66586+#endif
66587+
66588+#ifdef CONFIG_PAX_MPROTECT
66589+ if (pax_flags_softmode & MF_PAX_MPROTECT)
66590+ pax_flags |= MF_PAX_MPROTECT;
66591+#endif
66592+
66593+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66594+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
66595+ pax_flags |= MF_PAX_RANDMMAP;
66596+#endif
66597+
66598+ return pax_flags;
66599+}
66600+#endif
66601+
66602+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
66603+{
66604+ unsigned long pax_flags = 0UL;
66605+
66606+#ifdef CONFIG_PAX_PAGEEXEC
66607+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
66608+ pax_flags |= MF_PAX_PAGEEXEC;
66609+#endif
66610+
66611+#ifdef CONFIG_PAX_SEGMEXEC
66612+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
66613+ pax_flags |= MF_PAX_SEGMEXEC;
66614+#endif
66615+
66616+#ifdef CONFIG_PAX_EMUTRAMP
66617+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
66618+ pax_flags |= MF_PAX_EMUTRAMP;
66619+#endif
66620+
66621+#ifdef CONFIG_PAX_MPROTECT
66622+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
66623+ pax_flags |= MF_PAX_MPROTECT;
66624+#endif
66625+
66626+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
66627+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
66628+ pax_flags |= MF_PAX_RANDMMAP;
66629+#endif
66630+
66631+ return pax_flags;
66632+}
66633+#endif
66634+
66635+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66636+static unsigned long pax_parse_defaults(void)
66637+{
66638+ unsigned long pax_flags = 0UL;
66639+
66640+#ifdef CONFIG_PAX_SOFTMODE
66641+ if (pax_softmode)
66642+ return pax_flags;
66643+#endif
66644+
66645+#ifdef CONFIG_PAX_PAGEEXEC
66646+ pax_flags |= MF_PAX_PAGEEXEC;
66647+#endif
66648+
66649+#ifdef CONFIG_PAX_SEGMEXEC
66650+ pax_flags |= MF_PAX_SEGMEXEC;
66651+#endif
66652+
66653+#ifdef CONFIG_PAX_MPROTECT
66654+ pax_flags |= MF_PAX_MPROTECT;
66655+#endif
66656+
66657+#ifdef CONFIG_PAX_RANDMMAP
66658+ if (randomize_va_space)
66659+ pax_flags |= MF_PAX_RANDMMAP;
66660+#endif
66661+
66662+ return pax_flags;
66663+}
66664+
66665+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
66666+{
66667+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
66668+
66669+#ifdef CONFIG_PAX_EI_PAX
66670+
66671+#ifdef CONFIG_PAX_SOFTMODE
66672+ if (pax_softmode)
66673+ return pax_flags;
66674+#endif
66675+
66676+ pax_flags = 0UL;
66677+
66678+#ifdef CONFIG_PAX_PAGEEXEC
66679+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
66680+ pax_flags |= MF_PAX_PAGEEXEC;
66681+#endif
66682+
66683+#ifdef CONFIG_PAX_SEGMEXEC
66684+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
66685+ pax_flags |= MF_PAX_SEGMEXEC;
66686+#endif
66687+
66688+#ifdef CONFIG_PAX_EMUTRAMP
66689+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
66690+ pax_flags |= MF_PAX_EMUTRAMP;
66691+#endif
66692+
66693+#ifdef CONFIG_PAX_MPROTECT
66694+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
66695+ pax_flags |= MF_PAX_MPROTECT;
66696+#endif
66697+
66698+#ifdef CONFIG_PAX_ASLR
66699+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
66700+ pax_flags |= MF_PAX_RANDMMAP;
66701+#endif
66702+
66703+#endif
66704+
66705+ return pax_flags;
66706+
66707+}
66708+
66709+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
66710+{
66711+
66712+#ifdef CONFIG_PAX_PT_PAX_FLAGS
66713+ unsigned long i;
66714+
66715+ for (i = 0UL; i < elf_ex->e_phnum; i++)
66716+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
66717+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
66718+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
66719+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
66720+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
66721+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
66722+ return PAX_PARSE_FLAGS_FALLBACK;
66723+
66724+#ifdef CONFIG_PAX_SOFTMODE
66725+ if (pax_softmode)
66726+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
66727+ else
66728+#endif
66729+
66730+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
66731+ break;
66732+ }
66733+#endif
66734+
66735+ return PAX_PARSE_FLAGS_FALLBACK;
66736+}
66737+
66738+static unsigned long pax_parse_xattr_pax(struct file * const file)
66739+{
66740+
66741+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
66742+ ssize_t xattr_size, i;
66743+ unsigned char xattr_value[sizeof("pemrs") - 1];
66744+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
66745+
66746+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
66747+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
66748+ return PAX_PARSE_FLAGS_FALLBACK;
66749+
66750+ for (i = 0; i < xattr_size; i++)
66751+ switch (xattr_value[i]) {
66752+ default:
66753+ return PAX_PARSE_FLAGS_FALLBACK;
66754+
66755+#define parse_flag(option1, option2, flag) \
66756+ case option1: \
66757+ if (pax_flags_hardmode & MF_PAX_##flag) \
66758+ return PAX_PARSE_FLAGS_FALLBACK;\
66759+ pax_flags_hardmode |= MF_PAX_##flag; \
66760+ break; \
66761+ case option2: \
66762+ if (pax_flags_softmode & MF_PAX_##flag) \
66763+ return PAX_PARSE_FLAGS_FALLBACK;\
66764+ pax_flags_softmode |= MF_PAX_##flag; \
66765+ break;
66766+
66767+ parse_flag('p', 'P', PAGEEXEC);
66768+ parse_flag('e', 'E', EMUTRAMP);
66769+ parse_flag('m', 'M', MPROTECT);
66770+ parse_flag('r', 'R', RANDMMAP);
66771+ parse_flag('s', 'S', SEGMEXEC);
66772+
66773+#undef parse_flag
66774+ }
66775+
66776+ if (pax_flags_hardmode & pax_flags_softmode)
66777+ return PAX_PARSE_FLAGS_FALLBACK;
66778+
66779+#ifdef CONFIG_PAX_SOFTMODE
66780+ if (pax_softmode)
66781+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
66782+ else
66783+#endif
66784+
66785+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
66786+#else
66787+ return PAX_PARSE_FLAGS_FALLBACK;
66788+#endif
66789+
66790+}
66791+
66792+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
66793+{
66794+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
66795+
66796+ pax_flags = pax_parse_defaults();
66797+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
66798+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
66799+ xattr_pax_flags = pax_parse_xattr_pax(file);
66800+
66801+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66802+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
66803+ pt_pax_flags != xattr_pax_flags)
66804+ return -EINVAL;
66805+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66806+ pax_flags = xattr_pax_flags;
66807+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66808+ pax_flags = pt_pax_flags;
66809+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
66810+ pax_flags = ei_pax_flags;
66811+
66812+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
66813+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66814+ if ((__supported_pte_mask & _PAGE_NX))
66815+ pax_flags &= ~MF_PAX_SEGMEXEC;
66816+ else
66817+ pax_flags &= ~MF_PAX_PAGEEXEC;
66818+ }
66819+#endif
66820+
66821+ if (0 > pax_check_flags(&pax_flags))
66822+ return -EINVAL;
66823+
66824+ current->mm->pax_flags = pax_flags;
66825+ return 0;
66826+}
66827+#endif
66828+
66829 /*
66830 * These are the functions used to load ELF style executables and shared
66831 * libraries. There is no binary dependent code anywhere else.
66832@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
66833 {
66834 unsigned long random_variable = 0;
66835
66836+#ifdef CONFIG_PAX_RANDUSTACK
66837+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
66838+ return stack_top - current->mm->delta_stack;
66839+#endif
66840+
66841 if ((current->flags & PF_RANDOMIZE) &&
66842 !(current->personality & ADDR_NO_RANDOMIZE)) {
66843 random_variable = (unsigned long) get_random_int();
66844@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66845 unsigned long load_addr = 0, load_bias = 0;
66846 int load_addr_set = 0;
66847 char * elf_interpreter = NULL;
66848- unsigned long error;
66849+ unsigned long error = 0;
66850 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
66851 unsigned long elf_bss, elf_brk;
66852 int retval, i;
66853@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
66854 struct elfhdr interp_elf_ex;
66855 } *loc;
66856 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
66857+ unsigned long pax_task_size;
66858
66859 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
66860 if (!loc) {
66861@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
66862 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
66863 may depend on the personality. */
66864 SET_PERSONALITY2(loc->elf_ex, &arch_state);
66865+
66866+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66867+ current->mm->pax_flags = 0UL;
66868+#endif
66869+
66870+#ifdef CONFIG_PAX_DLRESOLVE
66871+ current->mm->call_dl_resolve = 0UL;
66872+#endif
66873+
66874+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
66875+ current->mm->call_syscall = 0UL;
66876+#endif
66877+
66878+#ifdef CONFIG_PAX_ASLR
66879+ current->mm->delta_mmap = 0UL;
66880+ current->mm->delta_stack = 0UL;
66881+#endif
66882+
66883+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66884+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
66885+ send_sig(SIGKILL, current, 0);
66886+ goto out_free_dentry;
66887+ }
66888+#endif
66889+
66890+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
66891+ pax_set_initial_flags(bprm);
66892+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
66893+ if (pax_set_initial_flags_func)
66894+ (pax_set_initial_flags_func)(bprm);
66895+#endif
66896+
66897+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66898+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
66899+ current->mm->context.user_cs_limit = PAGE_SIZE;
66900+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
66901+ }
66902+#endif
66903+
66904+#ifdef CONFIG_PAX_SEGMEXEC
66905+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
66906+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
66907+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
66908+ pax_task_size = SEGMEXEC_TASK_SIZE;
66909+ current->mm->def_flags |= VM_NOHUGEPAGE;
66910+ } else
66911+#endif
66912+
66913+ pax_task_size = TASK_SIZE;
66914+
66915+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
66916+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66917+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
66918+ put_cpu();
66919+ }
66920+#endif
66921+
66922+#ifdef CONFIG_PAX_ASLR
66923+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66924+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
66925+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
66926+ }
66927+#endif
66928+
66929+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
66930+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
66931+ executable_stack = EXSTACK_DISABLE_X;
66932+ current->personality &= ~READ_IMPLIES_EXEC;
66933+ } else
66934+#endif
66935+
66936 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
66937 current->personality |= READ_IMPLIES_EXEC;
66938
66939@@ -925,8 +1364,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
66940 #else
66941 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
66942 #endif
66943- total_size = total_mapping_size(elf_phdata,
66944- loc->elf_ex.e_phnum);
66945+
66946+#ifdef CONFIG_PAX_RANDMMAP
66947+ /* PaX: randomize base address at the default exe base if requested */
66948+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
66949+#ifdef CONFIG_SPARC64
66950+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
66951+#else
66952+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
66953+#endif
66954+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
66955+ elf_flags |= MAP_FIXED;
66956+ }
66957+#endif
66958+
66959+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
66960 if (!total_size) {
66961 retval = -EINVAL;
66962 goto out_free_dentry;
66963@@ -962,9 +1414,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
66964 * allowed task size. Note that p_filesz must always be
66965 * <= p_memsz so it is only necessary to check p_memsz.
66966 */
66967- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66968- elf_ppnt->p_memsz > TASK_SIZE ||
66969- TASK_SIZE - elf_ppnt->p_memsz < k) {
66970+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
66971+ elf_ppnt->p_memsz > pax_task_size ||
66972+ pax_task_size - elf_ppnt->p_memsz < k) {
66973 /* set_brk can never work. Avoid overflows. */
66974 retval = -EINVAL;
66975 goto out_free_dentry;
66976@@ -1000,16 +1452,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
66977 if (retval)
66978 goto out_free_dentry;
66979 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
66980- retval = -EFAULT; /* Nobody gets to see this, but.. */
66981- goto out_free_dentry;
66982+ /*
66983+ * This bss-zeroing can fail if the ELF
66984+ * file specifies odd protections. So
66985+ * we don't check the return value
66986+ */
66987 }
66988
66989+#ifdef CONFIG_PAX_RANDMMAP
66990+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
66991+ unsigned long start, size, flags;
66992+ vm_flags_t vm_flags;
66993+
66994+ start = ELF_PAGEALIGN(elf_brk);
66995+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
66996+ flags = MAP_FIXED | MAP_PRIVATE;
66997+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
66998+
66999+ down_write(&current->mm->mmap_sem);
67000+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
67001+ retval = -ENOMEM;
67002+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
67003+// if (current->personality & ADDR_NO_RANDOMIZE)
67004+// vm_flags |= VM_READ | VM_MAYREAD;
67005+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
67006+ retval = IS_ERR_VALUE(start) ? start : 0;
67007+ }
67008+ up_write(&current->mm->mmap_sem);
67009+ if (retval == 0)
67010+ retval = set_brk(start + size, start + size + PAGE_SIZE);
67011+ if (retval < 0)
67012+ goto out_free_dentry;
67013+ }
67014+#endif
67015+
67016 if (elf_interpreter) {
67017- unsigned long interp_map_addr = 0;
67018-
67019 elf_entry = load_elf_interp(&loc->interp_elf_ex,
67020 interpreter,
67021- &interp_map_addr,
67022 load_bias, interp_elf_phdata);
67023 if (!IS_ERR((void *)elf_entry)) {
67024 /*
67025@@ -1237,7 +1716,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
67026 * Decide what to dump of a segment, part, all or none.
67027 */
67028 static unsigned long vma_dump_size(struct vm_area_struct *vma,
67029- unsigned long mm_flags)
67030+ unsigned long mm_flags, long signr)
67031 {
67032 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
67033
67034@@ -1275,7 +1754,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
67035 if (vma->vm_file == NULL)
67036 return 0;
67037
67038- if (FILTER(MAPPED_PRIVATE))
67039+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
67040 goto whole;
67041
67042 /*
67043@@ -1482,9 +1961,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
67044 {
67045 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
67046 int i = 0;
67047- do
67048+ do {
67049 i += 2;
67050- while (auxv[i - 2] != AT_NULL);
67051+ } while (auxv[i - 2] != AT_NULL);
67052 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
67053 }
67054
67055@@ -1493,7 +1972,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
67056 {
67057 mm_segment_t old_fs = get_fs();
67058 set_fs(KERNEL_DS);
67059- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
67060+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
67061 set_fs(old_fs);
67062 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
67063 }
67064@@ -2213,7 +2692,7 @@ static int elf_core_dump(struct coredump_params *cprm)
67065 vma = next_vma(vma, gate_vma)) {
67066 unsigned long dump_size;
67067
67068- dump_size = vma_dump_size(vma, cprm->mm_flags);
67069+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
67070 vma_filesz[i++] = dump_size;
67071 vma_data_size += dump_size;
67072 }
67073@@ -2321,6 +2800,167 @@ out:
67074
67075 #endif /* CONFIG_ELF_CORE */
67076
67077+#ifdef CONFIG_PAX_MPROTECT
67078+/* PaX: non-PIC ELF libraries need relocations on their executable segments
67079+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
67080+ * we'll remove VM_MAYWRITE for good on RELRO segments.
67081+ *
67082+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
67083+ * basis because we want to allow the common case and not the special ones.
67084+ */
67085+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
67086+{
67087+ struct elfhdr elf_h;
67088+ struct elf_phdr elf_p;
67089+ unsigned long i;
67090+ unsigned long oldflags;
67091+ bool is_textrel_rw, is_textrel_rx, is_relro;
67092+
67093+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
67094+ return;
67095+
67096+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
67097+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
67098+
67099+#ifdef CONFIG_PAX_ELFRELOCS
67100+ /* possible TEXTREL */
67101+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
67102+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
67103+#else
67104+ is_textrel_rw = false;
67105+ is_textrel_rx = false;
67106+#endif
67107+
67108+ /* possible RELRO */
67109+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
67110+
67111+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
67112+ return;
67113+
67114+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67115+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67116+
67117+#ifdef CONFIG_PAX_ETEXECRELOCS
67118+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67119+#else
67120+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
67121+#endif
67122+
67123+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
67124+ !elf_check_arch(&elf_h) ||
67125+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67126+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67127+ return;
67128+
67129+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67130+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67131+ return;
67132+ switch (elf_p.p_type) {
67133+ case PT_DYNAMIC:
67134+ if (!is_textrel_rw && !is_textrel_rx)
67135+ continue;
67136+ i = 0UL;
67137+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
67138+ elf_dyn dyn;
67139+
67140+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
67141+ break;
67142+ if (dyn.d_tag == DT_NULL)
67143+ break;
67144+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
67145+ gr_log_textrel(vma);
67146+ if (is_textrel_rw)
67147+ vma->vm_flags |= VM_MAYWRITE;
67148+ else
67149+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
67150+ vma->vm_flags &= ~VM_MAYWRITE;
67151+ break;
67152+ }
67153+ i++;
67154+ }
67155+ is_textrel_rw = false;
67156+ is_textrel_rx = false;
67157+ continue;
67158+
67159+ case PT_GNU_RELRO:
67160+ if (!is_relro)
67161+ continue;
67162+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
67163+ vma->vm_flags &= ~VM_MAYWRITE;
67164+ is_relro = false;
67165+ continue;
67166+
67167+#ifdef CONFIG_PAX_PT_PAX_FLAGS
67168+ case PT_PAX_FLAGS: {
67169+ const char *msg_mprotect = "", *msg_emutramp = "";
67170+ char *buffer_lib, *buffer_exe;
67171+
67172+ if (elf_p.p_flags & PF_NOMPROTECT)
67173+ msg_mprotect = "MPROTECT disabled";
67174+
67175+#ifdef CONFIG_PAX_EMUTRAMP
67176+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
67177+ msg_emutramp = "EMUTRAMP enabled";
67178+#endif
67179+
67180+ if (!msg_mprotect[0] && !msg_emutramp[0])
67181+ continue;
67182+
67183+ if (!printk_ratelimit())
67184+ continue;
67185+
67186+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
67187+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
67188+ if (buffer_lib && buffer_exe) {
67189+ char *path_lib, *path_exe;
67190+
67191+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
67192+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
67193+
67194+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
67195+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
67196+
67197+ }
67198+ free_page((unsigned long)buffer_exe);
67199+ free_page((unsigned long)buffer_lib);
67200+ continue;
67201+ }
67202+#endif
67203+
67204+ }
67205+ }
67206+}
67207+#endif
67208+
67209+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
67210+
67211+extern int grsec_enable_log_rwxmaps;
67212+
67213+static void elf_handle_mmap(struct file *file)
67214+{
67215+ struct elfhdr elf_h;
67216+ struct elf_phdr elf_p;
67217+ unsigned long i;
67218+
67219+ if (!grsec_enable_log_rwxmaps)
67220+ return;
67221+
67222+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
67223+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
67224+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
67225+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
67226+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
67227+ return;
67228+
67229+ for (i = 0UL; i < elf_h.e_phnum; i++) {
67230+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
67231+ return;
67232+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
67233+ gr_log_ptgnustack(file);
67234+ }
67235+}
67236+#endif
67237+
67238 static int __init init_elf_binfmt(void)
67239 {
67240 register_binfmt(&elf_format);
67241diff --git a/fs/block_dev.c b/fs/block_dev.c
67242index 975266b..c3d1856 100644
67243--- a/fs/block_dev.c
67244+++ b/fs/block_dev.c
67245@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
67246 else if (bdev->bd_contains == bdev)
67247 return true; /* is a whole device which isn't held */
67248
67249- else if (whole->bd_holder == bd_may_claim)
67250+ else if (whole->bd_holder == (void *)bd_may_claim)
67251 return true; /* is a partition of a device that is being partitioned */
67252 else if (whole->bd_holder != NULL)
67253 return false; /* is a partition of a held device */
67254diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
67255index 6d67f32..8f33187 100644
67256--- a/fs/btrfs/ctree.c
67257+++ b/fs/btrfs/ctree.c
67258@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
67259 free_extent_buffer(buf);
67260 add_root_to_dirty_list(root);
67261 } else {
67262- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
67263- parent_start = parent->start;
67264- else
67265+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
67266+ if (parent)
67267+ parent_start = parent->start;
67268+ else
67269+ parent_start = 0;
67270+ } else
67271 parent_start = 0;
67272
67273 WARN_ON(trans->transid != btrfs_header_generation(parent));
67274diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
67275index 82f0c7c..dff78a8 100644
67276--- a/fs/btrfs/delayed-inode.c
67277+++ b/fs/btrfs/delayed-inode.c
67278@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
67279
67280 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
67281 {
67282- int seq = atomic_inc_return(&delayed_root->items_seq);
67283+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
67284 if ((atomic_dec_return(&delayed_root->items) <
67285 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
67286 waitqueue_active(&delayed_root->wait))
67287@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
67288
67289 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
67290 {
67291- int val = atomic_read(&delayed_root->items_seq);
67292+ int val = atomic_read_unchecked(&delayed_root->items_seq);
67293
67294 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
67295 return 1;
67296@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
67297 int seq;
67298 int ret;
67299
67300- seq = atomic_read(&delayed_root->items_seq);
67301+ seq = atomic_read_unchecked(&delayed_root->items_seq);
67302
67303 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
67304 if (ret)
67305diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
67306index f70119f..ab5894d 100644
67307--- a/fs/btrfs/delayed-inode.h
67308+++ b/fs/btrfs/delayed-inode.h
67309@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
67310 */
67311 struct list_head prepare_list;
67312 atomic_t items; /* for delayed items */
67313- atomic_t items_seq; /* for delayed items */
67314+ atomic_unchecked_t items_seq; /* for delayed items */
67315 int nodes; /* for delayed nodes */
67316 wait_queue_head_t wait;
67317 };
67318@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
67319 struct btrfs_delayed_root *delayed_root)
67320 {
67321 atomic_set(&delayed_root->items, 0);
67322- atomic_set(&delayed_root->items_seq, 0);
67323+ atomic_set_unchecked(&delayed_root->items_seq, 0);
67324 delayed_root->nodes = 0;
67325 spin_lock_init(&delayed_root->lock);
67326 init_waitqueue_head(&delayed_root->wait);
67327diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
67328index e477ed6..480c0db 100644
67329--- a/fs/btrfs/super.c
67330+++ b/fs/btrfs/super.c
67331@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
67332 function, line, errstr);
67333 return;
67334 }
67335- ACCESS_ONCE(trans->transaction->aborted) = errno;
67336+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
67337 /* Wake up anybody who may be waiting on this transaction */
67338 wake_up(&root->fs_info->transaction_wait);
67339 wake_up(&root->fs_info->transaction_blocked_wait);
67340diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
67341index 94edb0a..e94dc93 100644
67342--- a/fs/btrfs/sysfs.c
67343+++ b/fs/btrfs/sysfs.c
67344@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
67345 for (set = 0; set < FEAT_MAX; set++) {
67346 int i;
67347 struct attribute *attrs[2];
67348- struct attribute_group agroup = {
67349+ attribute_group_no_const agroup = {
67350 .name = "features",
67351 .attrs = attrs,
67352 };
67353diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
67354index 2299bfd..4098e72 100644
67355--- a/fs/btrfs/tests/free-space-tests.c
67356+++ b/fs/btrfs/tests/free-space-tests.c
67357@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67358 * extent entry.
67359 */
67360 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
67361- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67362+ pax_open_kernel();
67363+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
67364+ pax_close_kernel();
67365
67366 /*
67367 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
67368@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
67369 if (ret)
67370 return ret;
67371
67372- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67373+ pax_open_kernel();
67374+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
67375+ pax_close_kernel();
67376 __btrfs_remove_free_space_cache(cache->free_space_ctl);
67377
67378 return 0;
67379diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
67380index 154990c..d0cf699 100644
67381--- a/fs/btrfs/tree-log.h
67382+++ b/fs/btrfs/tree-log.h
67383@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
67384 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
67385 struct btrfs_trans_handle *trans)
67386 {
67387- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
67388+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
67389 }
67390
67391 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
67392diff --git a/fs/buffer.c b/fs/buffer.c
67393index 20805db..2e8fc69 100644
67394--- a/fs/buffer.c
67395+++ b/fs/buffer.c
67396@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
67397 bh_cachep = kmem_cache_create("buffer_head",
67398 sizeof(struct buffer_head), 0,
67399 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
67400- SLAB_MEM_SPREAD),
67401+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
67402 NULL);
67403
67404 /*
67405diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
67406index fbb08e9..0fda764 100644
67407--- a/fs/cachefiles/bind.c
67408+++ b/fs/cachefiles/bind.c
67409@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
67410 args);
67411
67412 /* start by checking things over */
67413- ASSERT(cache->fstop_percent >= 0 &&
67414- cache->fstop_percent < cache->fcull_percent &&
67415+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
67416 cache->fcull_percent < cache->frun_percent &&
67417 cache->frun_percent < 100);
67418
67419- ASSERT(cache->bstop_percent >= 0 &&
67420- cache->bstop_percent < cache->bcull_percent &&
67421+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
67422 cache->bcull_percent < cache->brun_percent &&
67423 cache->brun_percent < 100);
67424
67425diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
67426index f601def..b2cf704 100644
67427--- a/fs/cachefiles/daemon.c
67428+++ b/fs/cachefiles/daemon.c
67429@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
67430 if (n > buflen)
67431 return -EMSGSIZE;
67432
67433- if (copy_to_user(_buffer, buffer, n) != 0)
67434+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
67435 return -EFAULT;
67436
67437 return n;
67438@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
67439 if (test_bit(CACHEFILES_DEAD, &cache->flags))
67440 return -EIO;
67441
67442- if (datalen < 0 || datalen > PAGE_SIZE - 1)
67443+ if (datalen > PAGE_SIZE - 1)
67444 return -EOPNOTSUPP;
67445
67446 /* drag the command string into the kernel so we can parse it */
67447@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
67448 if (args[0] != '%' || args[1] != '\0')
67449 return -EINVAL;
67450
67451- if (fstop < 0 || fstop >= cache->fcull_percent)
67452+ if (fstop >= cache->fcull_percent)
67453 return cachefiles_daemon_range_error(cache, args);
67454
67455 cache->fstop_percent = fstop;
67456@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
67457 if (args[0] != '%' || args[1] != '\0')
67458 return -EINVAL;
67459
67460- if (bstop < 0 || bstop >= cache->bcull_percent)
67461+ if (bstop >= cache->bcull_percent)
67462 return cachefiles_daemon_range_error(cache, args);
67463
67464 cache->bstop_percent = bstop;
67465diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
67466index 8c52472..c4e3a69 100644
67467--- a/fs/cachefiles/internal.h
67468+++ b/fs/cachefiles/internal.h
67469@@ -66,7 +66,7 @@ struct cachefiles_cache {
67470 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
67471 struct rb_root active_nodes; /* active nodes (can't be culled) */
67472 rwlock_t active_lock; /* lock for active_nodes */
67473- atomic_t gravecounter; /* graveyard uniquifier */
67474+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
67475 unsigned frun_percent; /* when to stop culling (% files) */
67476 unsigned fcull_percent; /* when to start culling (% files) */
67477 unsigned fstop_percent; /* when to stop allocating (% files) */
67478@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
67479 * proc.c
67480 */
67481 #ifdef CONFIG_CACHEFILES_HISTOGRAM
67482-extern atomic_t cachefiles_lookup_histogram[HZ];
67483-extern atomic_t cachefiles_mkdir_histogram[HZ];
67484-extern atomic_t cachefiles_create_histogram[HZ];
67485+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67486+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67487+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
67488
67489 extern int __init cachefiles_proc_init(void);
67490 extern void cachefiles_proc_cleanup(void);
67491 static inline
67492-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
67493+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
67494 {
67495 unsigned long jif = jiffies - start_jif;
67496 if (jif >= HZ)
67497 jif = HZ - 1;
67498- atomic_inc(&histogram[jif]);
67499+ atomic_inc_unchecked(&histogram[jif]);
67500 }
67501
67502 #else
67503diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
67504index 1e51714..411eded 100644
67505--- a/fs/cachefiles/namei.c
67506+++ b/fs/cachefiles/namei.c
67507@@ -309,7 +309,7 @@ try_again:
67508 /* first step is to make up a grave dentry in the graveyard */
67509 sprintf(nbuffer, "%08x%08x",
67510 (uint32_t) get_seconds(),
67511- (uint32_t) atomic_inc_return(&cache->gravecounter));
67512+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
67513
67514 /* do the multiway lock magic */
67515 trap = lock_rename(cache->graveyard, dir);
67516diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
67517index eccd339..4c1d995 100644
67518--- a/fs/cachefiles/proc.c
67519+++ b/fs/cachefiles/proc.c
67520@@ -14,9 +14,9 @@
67521 #include <linux/seq_file.h>
67522 #include "internal.h"
67523
67524-atomic_t cachefiles_lookup_histogram[HZ];
67525-atomic_t cachefiles_mkdir_histogram[HZ];
67526-atomic_t cachefiles_create_histogram[HZ];
67527+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
67528+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
67529+atomic_unchecked_t cachefiles_create_histogram[HZ];
67530
67531 /*
67532 * display the latency histogram
67533@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
67534 return 0;
67535 default:
67536 index = (unsigned long) v - 3;
67537- x = atomic_read(&cachefiles_lookup_histogram[index]);
67538- y = atomic_read(&cachefiles_mkdir_histogram[index]);
67539- z = atomic_read(&cachefiles_create_histogram[index]);
67540+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
67541+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
67542+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
67543 if (x == 0 && y == 0 && z == 0)
67544 return 0;
67545
67546diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
67547index 83e9976..bfd1eee 100644
67548--- a/fs/ceph/dir.c
67549+++ b/fs/ceph/dir.c
67550@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
67551 struct dentry *dentry, *last;
67552 struct ceph_dentry_info *di;
67553 int err = 0;
67554+ char d_name[DNAME_INLINE_LEN];
67555+ const unsigned char *name;
67556
67557 /* claim ref on last dentry we returned */
67558 last = fi->dentry;
67559@@ -190,7 +192,12 @@ more:
67560
67561 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
67562 dentry, dentry, dentry->d_inode);
67563- if (!dir_emit(ctx, dentry->d_name.name,
67564+ name = dentry->d_name.name;
67565+ if (name == dentry->d_iname) {
67566+ memcpy(d_name, name, dentry->d_name.len);
67567+ name = d_name;
67568+ }
67569+ if (!dir_emit(ctx, name,
67570 dentry->d_name.len,
67571 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
67572 dentry->d_inode->i_mode >> 12)) {
67573@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
67574 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
67575 struct ceph_mds_client *mdsc = fsc->mdsc;
67576 unsigned frag = fpos_frag(ctx->pos);
67577- int off = fpos_off(ctx->pos);
67578+ unsigned int off = fpos_off(ctx->pos);
67579 int err;
67580 u32 ftype;
67581 struct ceph_mds_reply_info_parsed *rinfo;
67582diff --git a/fs/ceph/super.c b/fs/ceph/super.c
67583index a63997b..ddc0577 100644
67584--- a/fs/ceph/super.c
67585+++ b/fs/ceph/super.c
67586@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
67587 /*
67588 * construct our own bdi so we can control readahead, etc.
67589 */
67590-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
67591+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
67592
67593 static int ceph_register_bdi(struct super_block *sb,
67594 struct ceph_fs_client *fsc)
67595@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
67596 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
67597
67598 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
67599- atomic_long_inc_return(&bdi_seq));
67600+ atomic_long_inc_return_unchecked(&bdi_seq));
67601 if (!err)
67602 sb->s_bdi = &fsc->backing_dev_info;
67603 return err;
67604diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
67605index 7febcf2..62a5721 100644
67606--- a/fs/cifs/cifs_debug.c
67607+++ b/fs/cifs/cifs_debug.c
67608@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67609
67610 if (strtobool(&c, &bv) == 0) {
67611 #ifdef CONFIG_CIFS_STATS2
67612- atomic_set(&totBufAllocCount, 0);
67613- atomic_set(&totSmBufAllocCount, 0);
67614+ atomic_set_unchecked(&totBufAllocCount, 0);
67615+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67616 #endif /* CONFIG_CIFS_STATS2 */
67617 spin_lock(&cifs_tcp_ses_lock);
67618 list_for_each(tmp1, &cifs_tcp_ses_list) {
67619@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
67620 tcon = list_entry(tmp3,
67621 struct cifs_tcon,
67622 tcon_list);
67623- atomic_set(&tcon->num_smbs_sent, 0);
67624+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
67625 if (server->ops->clear_stats)
67626 server->ops->clear_stats(tcon);
67627 }
67628@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67629 smBufAllocCount.counter, cifs_min_small);
67630 #ifdef CONFIG_CIFS_STATS2
67631 seq_printf(m, "Total Large %d Small %d Allocations\n",
67632- atomic_read(&totBufAllocCount),
67633- atomic_read(&totSmBufAllocCount));
67634+ atomic_read_unchecked(&totBufAllocCount),
67635+ atomic_read_unchecked(&totSmBufAllocCount));
67636 #endif /* CONFIG_CIFS_STATS2 */
67637
67638 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
67639@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
67640 if (tcon->need_reconnect)
67641 seq_puts(m, "\tDISCONNECTED ");
67642 seq_printf(m, "\nSMBs: %d",
67643- atomic_read(&tcon->num_smbs_sent));
67644+ atomic_read_unchecked(&tcon->num_smbs_sent));
67645 if (server->ops->print_stats)
67646 server->ops->print_stats(m, tcon);
67647 }
67648diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
67649index d72fe37..ded5511 100644
67650--- a/fs/cifs/cifsfs.c
67651+++ b/fs/cifs/cifsfs.c
67652@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
67653 */
67654 cifs_req_cachep = kmem_cache_create("cifs_request",
67655 CIFSMaxBufSize + max_hdr_size, 0,
67656- SLAB_HWCACHE_ALIGN, NULL);
67657+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
67658 if (cifs_req_cachep == NULL)
67659 return -ENOMEM;
67660
67661@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
67662 efficient to alloc 1 per page off the slab compared to 17K (5page)
67663 alloc of large cifs buffers even when page debugging is on */
67664 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
67665- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
67666+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
67667 NULL);
67668 if (cifs_sm_req_cachep == NULL) {
67669 mempool_destroy(cifs_req_poolp);
67670@@ -1204,8 +1204,8 @@ init_cifs(void)
67671 atomic_set(&bufAllocCount, 0);
67672 atomic_set(&smBufAllocCount, 0);
67673 #ifdef CONFIG_CIFS_STATS2
67674- atomic_set(&totBufAllocCount, 0);
67675- atomic_set(&totSmBufAllocCount, 0);
67676+ atomic_set_unchecked(&totBufAllocCount, 0);
67677+ atomic_set_unchecked(&totSmBufAllocCount, 0);
67678 #endif /* CONFIG_CIFS_STATS2 */
67679
67680 atomic_set(&midCount, 0);
67681diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
67682index 22b289a..bbbba082 100644
67683--- a/fs/cifs/cifsglob.h
67684+++ b/fs/cifs/cifsglob.h
67685@@ -823,35 +823,35 @@ struct cifs_tcon {
67686 __u16 Flags; /* optional support bits */
67687 enum statusEnum tidStatus;
67688 #ifdef CONFIG_CIFS_STATS
67689- atomic_t num_smbs_sent;
67690+ atomic_unchecked_t num_smbs_sent;
67691 union {
67692 struct {
67693- atomic_t num_writes;
67694- atomic_t num_reads;
67695- atomic_t num_flushes;
67696- atomic_t num_oplock_brks;
67697- atomic_t num_opens;
67698- atomic_t num_closes;
67699- atomic_t num_deletes;
67700- atomic_t num_mkdirs;
67701- atomic_t num_posixopens;
67702- atomic_t num_posixmkdirs;
67703- atomic_t num_rmdirs;
67704- atomic_t num_renames;
67705- atomic_t num_t2renames;
67706- atomic_t num_ffirst;
67707- atomic_t num_fnext;
67708- atomic_t num_fclose;
67709- atomic_t num_hardlinks;
67710- atomic_t num_symlinks;
67711- atomic_t num_locks;
67712- atomic_t num_acl_get;
67713- atomic_t num_acl_set;
67714+ atomic_unchecked_t num_writes;
67715+ atomic_unchecked_t num_reads;
67716+ atomic_unchecked_t num_flushes;
67717+ atomic_unchecked_t num_oplock_brks;
67718+ atomic_unchecked_t num_opens;
67719+ atomic_unchecked_t num_closes;
67720+ atomic_unchecked_t num_deletes;
67721+ atomic_unchecked_t num_mkdirs;
67722+ atomic_unchecked_t num_posixopens;
67723+ atomic_unchecked_t num_posixmkdirs;
67724+ atomic_unchecked_t num_rmdirs;
67725+ atomic_unchecked_t num_renames;
67726+ atomic_unchecked_t num_t2renames;
67727+ atomic_unchecked_t num_ffirst;
67728+ atomic_unchecked_t num_fnext;
67729+ atomic_unchecked_t num_fclose;
67730+ atomic_unchecked_t num_hardlinks;
67731+ atomic_unchecked_t num_symlinks;
67732+ atomic_unchecked_t num_locks;
67733+ atomic_unchecked_t num_acl_get;
67734+ atomic_unchecked_t num_acl_set;
67735 } cifs_stats;
67736 #ifdef CONFIG_CIFS_SMB2
67737 struct {
67738- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67739- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67740+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
67741+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
67742 } smb2_stats;
67743 #endif /* CONFIG_CIFS_SMB2 */
67744 } stats;
67745@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
67746 }
67747
67748 #ifdef CONFIG_CIFS_STATS
67749-#define cifs_stats_inc atomic_inc
67750+#define cifs_stats_inc atomic_inc_unchecked
67751
67752 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
67753 unsigned int bytes)
67754@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
67755 /* Various Debug counters */
67756 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
67757 #ifdef CONFIG_CIFS_STATS2
67758-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
67759-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
67760+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
67761+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
67762 #endif
67763 GLOBAL_EXTERN atomic_t smBufAllocCount;
67764 GLOBAL_EXTERN atomic_t midCount;
67765diff --git a/fs/cifs/file.c b/fs/cifs/file.c
67766index ca30c39..570fb94 100644
67767--- a/fs/cifs/file.c
67768+++ b/fs/cifs/file.c
67769@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
67770 index = mapping->writeback_index; /* Start from prev offset */
67771 end = -1;
67772 } else {
67773- index = wbc->range_start >> PAGE_CACHE_SHIFT;
67774- end = wbc->range_end >> PAGE_CACHE_SHIFT;
67775- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
67776+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
67777 range_whole = true;
67778+ index = 0;
67779+ end = ULONG_MAX;
67780+ } else {
67781+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
67782+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
67783+ }
67784 scanned = true;
67785 }
67786 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
67787diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
67788index 3379463..3af418a 100644
67789--- a/fs/cifs/misc.c
67790+++ b/fs/cifs/misc.c
67791@@ -170,7 +170,7 @@ cifs_buf_get(void)
67792 memset(ret_buf, 0, buf_size + 3);
67793 atomic_inc(&bufAllocCount);
67794 #ifdef CONFIG_CIFS_STATS2
67795- atomic_inc(&totBufAllocCount);
67796+ atomic_inc_unchecked(&totBufAllocCount);
67797 #endif /* CONFIG_CIFS_STATS2 */
67798 }
67799
67800@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
67801 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
67802 atomic_inc(&smBufAllocCount);
67803 #ifdef CONFIG_CIFS_STATS2
67804- atomic_inc(&totSmBufAllocCount);
67805+ atomic_inc_unchecked(&totSmBufAllocCount);
67806 #endif /* CONFIG_CIFS_STATS2 */
67807
67808 }
67809diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
67810index d297903..1cb7516 100644
67811--- a/fs/cifs/smb1ops.c
67812+++ b/fs/cifs/smb1ops.c
67813@@ -622,27 +622,27 @@ static void
67814 cifs_clear_stats(struct cifs_tcon *tcon)
67815 {
67816 #ifdef CONFIG_CIFS_STATS
67817- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
67818- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
67819- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
67820- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67821- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
67822- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
67823- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67824- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
67825- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
67826- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
67827- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
67828- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
67829- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
67830- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
67831- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
67832- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
67833- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
67834- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
67835- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
67836- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
67837- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
67838+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
67839+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
67840+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
67841+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
67842+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
67843+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
67844+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
67845+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
67846+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
67847+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
67848+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
67849+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
67850+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
67851+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
67852+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
67853+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
67854+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
67855+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
67856+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
67857+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
67858+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
67859 #endif
67860 }
67861
67862@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67863 {
67864 #ifdef CONFIG_CIFS_STATS
67865 seq_printf(m, " Oplocks breaks: %d",
67866- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
67867+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
67868 seq_printf(m, "\nReads: %d Bytes: %llu",
67869- atomic_read(&tcon->stats.cifs_stats.num_reads),
67870+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
67871 (long long)(tcon->bytes_read));
67872 seq_printf(m, "\nWrites: %d Bytes: %llu",
67873- atomic_read(&tcon->stats.cifs_stats.num_writes),
67874+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
67875 (long long)(tcon->bytes_written));
67876 seq_printf(m, "\nFlushes: %d",
67877- atomic_read(&tcon->stats.cifs_stats.num_flushes));
67878+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
67879 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
67880- atomic_read(&tcon->stats.cifs_stats.num_locks),
67881- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
67882- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
67883+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
67884+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
67885+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
67886 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
67887- atomic_read(&tcon->stats.cifs_stats.num_opens),
67888- atomic_read(&tcon->stats.cifs_stats.num_closes),
67889- atomic_read(&tcon->stats.cifs_stats.num_deletes));
67890+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
67891+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
67892+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
67893 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
67894- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
67895- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
67896+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
67897+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
67898 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
67899- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
67900- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
67901+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
67902+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
67903 seq_printf(m, "\nRenames: %d T2 Renames %d",
67904- atomic_read(&tcon->stats.cifs_stats.num_renames),
67905- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
67906+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
67907+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
67908 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
67909- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
67910- atomic_read(&tcon->stats.cifs_stats.num_fnext),
67911- atomic_read(&tcon->stats.cifs_stats.num_fclose));
67912+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
67913+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
67914+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
67915 #endif
67916 }
67917
67918diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
67919index eab05e1..ffe5ea4 100644
67920--- a/fs/cifs/smb2ops.c
67921+++ b/fs/cifs/smb2ops.c
67922@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
67923 #ifdef CONFIG_CIFS_STATS
67924 int i;
67925 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
67926- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67927- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67928+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
67929+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
67930 }
67931 #endif
67932 }
67933@@ -459,65 +459,65 @@ static void
67934 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
67935 {
67936 #ifdef CONFIG_CIFS_STATS
67937- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67938- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67939+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
67940+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
67941 seq_printf(m, "\nNegotiates: %d sent %d failed",
67942- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
67943- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
67944+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
67945+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
67946 seq_printf(m, "\nSessionSetups: %d sent %d failed",
67947- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
67948- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
67949+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
67950+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
67951 seq_printf(m, "\nLogoffs: %d sent %d failed",
67952- atomic_read(&sent[SMB2_LOGOFF_HE]),
67953- atomic_read(&failed[SMB2_LOGOFF_HE]));
67954+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
67955+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
67956 seq_printf(m, "\nTreeConnects: %d sent %d failed",
67957- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
67958- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
67959+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
67960+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
67961 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
67962- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
67963- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
67964+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
67965+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
67966 seq_printf(m, "\nCreates: %d sent %d failed",
67967- atomic_read(&sent[SMB2_CREATE_HE]),
67968- atomic_read(&failed[SMB2_CREATE_HE]));
67969+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
67970+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
67971 seq_printf(m, "\nCloses: %d sent %d failed",
67972- atomic_read(&sent[SMB2_CLOSE_HE]),
67973- atomic_read(&failed[SMB2_CLOSE_HE]));
67974+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
67975+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
67976 seq_printf(m, "\nFlushes: %d sent %d failed",
67977- atomic_read(&sent[SMB2_FLUSH_HE]),
67978- atomic_read(&failed[SMB2_FLUSH_HE]));
67979+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
67980+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
67981 seq_printf(m, "\nReads: %d sent %d failed",
67982- atomic_read(&sent[SMB2_READ_HE]),
67983- atomic_read(&failed[SMB2_READ_HE]));
67984+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
67985+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
67986 seq_printf(m, "\nWrites: %d sent %d failed",
67987- atomic_read(&sent[SMB2_WRITE_HE]),
67988- atomic_read(&failed[SMB2_WRITE_HE]));
67989+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
67990+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
67991 seq_printf(m, "\nLocks: %d sent %d failed",
67992- atomic_read(&sent[SMB2_LOCK_HE]),
67993- atomic_read(&failed[SMB2_LOCK_HE]));
67994+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
67995+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
67996 seq_printf(m, "\nIOCTLs: %d sent %d failed",
67997- atomic_read(&sent[SMB2_IOCTL_HE]),
67998- atomic_read(&failed[SMB2_IOCTL_HE]));
67999+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
68000+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
68001 seq_printf(m, "\nCancels: %d sent %d failed",
68002- atomic_read(&sent[SMB2_CANCEL_HE]),
68003- atomic_read(&failed[SMB2_CANCEL_HE]));
68004+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
68005+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
68006 seq_printf(m, "\nEchos: %d sent %d failed",
68007- atomic_read(&sent[SMB2_ECHO_HE]),
68008- atomic_read(&failed[SMB2_ECHO_HE]));
68009+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
68010+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
68011 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
68012- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
68013- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
68014+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
68015+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
68016 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
68017- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
68018- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
68019+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
68020+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
68021 seq_printf(m, "\nQueryInfos: %d sent %d failed",
68022- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
68023- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
68024+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
68025+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
68026 seq_printf(m, "\nSetInfos: %d sent %d failed",
68027- atomic_read(&sent[SMB2_SET_INFO_HE]),
68028- atomic_read(&failed[SMB2_SET_INFO_HE]));
68029+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
68030+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
68031 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
68032- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
68033- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
68034+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
68035+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
68036 #endif
68037 }
68038
68039diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
68040index 65cd7a8..3518676 100644
68041--- a/fs/cifs/smb2pdu.c
68042+++ b/fs/cifs/smb2pdu.c
68043@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
68044 default:
68045 cifs_dbg(VFS, "info level %u isn't supported\n",
68046 srch_inf->info_level);
68047- rc = -EINVAL;
68048- goto qdir_exit;
68049+ return -EINVAL;
68050 }
68051
68052 req->FileIndex = cpu_to_le32(index);
68053diff --git a/fs/coda/cache.c b/fs/coda/cache.c
68054index 46ee6f2..89a9e7f 100644
68055--- a/fs/coda/cache.c
68056+++ b/fs/coda/cache.c
68057@@ -24,7 +24,7 @@
68058 #include "coda_linux.h"
68059 #include "coda_cache.h"
68060
68061-static atomic_t permission_epoch = ATOMIC_INIT(0);
68062+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
68063
68064 /* replace or extend an acl cache hit */
68065 void coda_cache_enter(struct inode *inode, int mask)
68066@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
68067 struct coda_inode_info *cii = ITOC(inode);
68068
68069 spin_lock(&cii->c_lock);
68070- cii->c_cached_epoch = atomic_read(&permission_epoch);
68071+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
68072 if (!uid_eq(cii->c_uid, current_fsuid())) {
68073 cii->c_uid = current_fsuid();
68074 cii->c_cached_perm = mask;
68075@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
68076 {
68077 struct coda_inode_info *cii = ITOC(inode);
68078 spin_lock(&cii->c_lock);
68079- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
68080+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
68081 spin_unlock(&cii->c_lock);
68082 }
68083
68084 /* remove all acl caches */
68085 void coda_cache_clear_all(struct super_block *sb)
68086 {
68087- atomic_inc(&permission_epoch);
68088+ atomic_inc_unchecked(&permission_epoch);
68089 }
68090
68091
68092@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
68093 spin_lock(&cii->c_lock);
68094 hit = (mask & cii->c_cached_perm) == mask &&
68095 uid_eq(cii->c_uid, current_fsuid()) &&
68096- cii->c_cached_epoch == atomic_read(&permission_epoch);
68097+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
68098 spin_unlock(&cii->c_lock);
68099
68100 return hit;
68101diff --git a/fs/compat.c b/fs/compat.c
68102index 6fd272d..dd34ba2 100644
68103--- a/fs/compat.c
68104+++ b/fs/compat.c
68105@@ -54,7 +54,7 @@
68106 #include <asm/ioctls.h>
68107 #include "internal.h"
68108
68109-int compat_log = 1;
68110+int compat_log = 0;
68111
68112 int compat_printk(const char *fmt, ...)
68113 {
68114@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
68115
68116 set_fs(KERNEL_DS);
68117 /* The __user pointer cast is valid because of the set_fs() */
68118- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
68119+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
68120 set_fs(oldfs);
68121 /* truncating is ok because it's a user address */
68122 if (!ret)
68123@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
68124 goto out;
68125
68126 ret = -EINVAL;
68127- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
68128+ if (nr_segs > UIO_MAXIOV)
68129 goto out;
68130 if (nr_segs > fast_segs) {
68131 ret = -ENOMEM;
68132@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
68133 struct compat_readdir_callback {
68134 struct dir_context ctx;
68135 struct compat_old_linux_dirent __user *dirent;
68136+ struct file * file;
68137 int result;
68138 };
68139
68140@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
68141 buf->result = -EOVERFLOW;
68142 return -EOVERFLOW;
68143 }
68144+
68145+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68146+ return 0;
68147+
68148 buf->result++;
68149 dirent = buf->dirent;
68150 if (!access_ok(VERIFY_WRITE, dirent,
68151@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68152 if (!f.file)
68153 return -EBADF;
68154
68155+ buf.file = f.file;
68156 error = iterate_dir(f.file, &buf.ctx);
68157 if (buf.result)
68158 error = buf.result;
68159@@ -913,6 +919,7 @@ struct compat_getdents_callback {
68160 struct dir_context ctx;
68161 struct compat_linux_dirent __user *current_dir;
68162 struct compat_linux_dirent __user *previous;
68163+ struct file * file;
68164 int count;
68165 int error;
68166 };
68167@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
68168 buf->error = -EOVERFLOW;
68169 return -EOVERFLOW;
68170 }
68171+
68172+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68173+ return 0;
68174+
68175 dirent = buf->previous;
68176 if (dirent) {
68177 if (__put_user(offset, &dirent->d_off))
68178@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
68179 if (!f.file)
68180 return -EBADF;
68181
68182+ buf.file = f.file;
68183 error = iterate_dir(f.file, &buf.ctx);
68184 if (error >= 0)
68185 error = buf.error;
68186@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
68187 struct dir_context ctx;
68188 struct linux_dirent64 __user *current_dir;
68189 struct linux_dirent64 __user *previous;
68190+ struct file * file;
68191 int count;
68192 int error;
68193 };
68194@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
68195 buf->error = -EINVAL; /* only used if we fail.. */
68196 if (reclen > buf->count)
68197 return -EINVAL;
68198+
68199+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68200+ return 0;
68201+
68202 dirent = buf->previous;
68203
68204 if (dirent) {
68205@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68206 if (!f.file)
68207 return -EBADF;
68208
68209+ buf.file = f.file;
68210 error = iterate_dir(f.file, &buf.ctx);
68211 if (error >= 0)
68212 error = buf.error;
68213diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
68214index 4d24d17..4f8c09e 100644
68215--- a/fs/compat_binfmt_elf.c
68216+++ b/fs/compat_binfmt_elf.c
68217@@ -30,11 +30,13 @@
68218 #undef elf_phdr
68219 #undef elf_shdr
68220 #undef elf_note
68221+#undef elf_dyn
68222 #undef elf_addr_t
68223 #define elfhdr elf32_hdr
68224 #define elf_phdr elf32_phdr
68225 #define elf_shdr elf32_shdr
68226 #define elf_note elf32_note
68227+#define elf_dyn Elf32_Dyn
68228 #define elf_addr_t Elf32_Addr
68229
68230 /*
68231diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
68232index afec645..9c65620 100644
68233--- a/fs/compat_ioctl.c
68234+++ b/fs/compat_ioctl.c
68235@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
68236 return -EFAULT;
68237 if (__get_user(udata, &ss32->iomem_base))
68238 return -EFAULT;
68239- ss.iomem_base = compat_ptr(udata);
68240+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
68241 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
68242 __get_user(ss.port_high, &ss32->port_high))
68243 return -EFAULT;
68244@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
68245 for (i = 0; i < nmsgs; i++) {
68246 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
68247 return -EFAULT;
68248- if (get_user(datap, &umsgs[i].buf) ||
68249- put_user(compat_ptr(datap), &tmsgs[i].buf))
68250+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
68251+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
68252 return -EFAULT;
68253 }
68254 return sys_ioctl(fd, cmd, (unsigned long)tdata);
68255@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
68256 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
68257 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
68258 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
68259- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
68260+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
68261 return -EFAULT;
68262
68263 return ioctl_preallocate(file, p);
68264@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
68265 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
68266 {
68267 unsigned int a, b;
68268- a = *(unsigned int *)p;
68269- b = *(unsigned int *)q;
68270+ a = *(const unsigned int *)p;
68271+ b = *(const unsigned int *)q;
68272 if (a > b)
68273 return 1;
68274 if (a < b)
68275diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
68276index cf0db00..c7f70e8 100644
68277--- a/fs/configfs/dir.c
68278+++ b/fs/configfs/dir.c
68279@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68280 }
68281 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
68282 struct configfs_dirent *next;
68283- const char *name;
68284+ const unsigned char * name;
68285+ char d_name[sizeof(next->s_dentry->d_iname)];
68286 int len;
68287 struct inode *inode = NULL;
68288
68289@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
68290 continue;
68291
68292 name = configfs_get_name(next);
68293- len = strlen(name);
68294+ if (next->s_dentry && name == next->s_dentry->d_iname) {
68295+ len = next->s_dentry->d_name.len;
68296+ memcpy(d_name, name, len);
68297+ name = d_name;
68298+ } else
68299+ len = strlen(name);
68300
68301 /*
68302 * We'll have a dentry and an inode for
68303diff --git a/fs/coredump.c b/fs/coredump.c
68304index bbbe139..b76fae5 100644
68305--- a/fs/coredump.c
68306+++ b/fs/coredump.c
68307@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
68308 struct pipe_inode_info *pipe = file->private_data;
68309
68310 pipe_lock(pipe);
68311- pipe->readers++;
68312- pipe->writers--;
68313+ atomic_inc(&pipe->readers);
68314+ atomic_dec(&pipe->writers);
68315 wake_up_interruptible_sync(&pipe->wait);
68316 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
68317 pipe_unlock(pipe);
68318@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
68319 * We actually want wait_event_freezable() but then we need
68320 * to clear TIF_SIGPENDING and improve dump_interrupted().
68321 */
68322- wait_event_interruptible(pipe->wait, pipe->readers == 1);
68323+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
68324
68325 pipe_lock(pipe);
68326- pipe->readers--;
68327- pipe->writers++;
68328+ atomic_dec(&pipe->readers);
68329+ atomic_inc(&pipe->writers);
68330 pipe_unlock(pipe);
68331 }
68332
68333@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
68334 struct files_struct *displaced;
68335 bool need_nonrelative = false;
68336 bool core_dumped = false;
68337- static atomic_t core_dump_count = ATOMIC_INIT(0);
68338+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
68339+ long signr = siginfo->si_signo;
68340+ int dumpable;
68341 struct coredump_params cprm = {
68342 .siginfo = siginfo,
68343 .regs = signal_pt_regs(),
68344@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
68345 .mm_flags = mm->flags,
68346 };
68347
68348- audit_core_dumps(siginfo->si_signo);
68349+ audit_core_dumps(signr);
68350+
68351+ dumpable = __get_dumpable(cprm.mm_flags);
68352+
68353+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
68354+ gr_handle_brute_attach(dumpable);
68355
68356 binfmt = mm->binfmt;
68357 if (!binfmt || !binfmt->core_dump)
68358 goto fail;
68359- if (!__get_dumpable(cprm.mm_flags))
68360+ if (!dumpable)
68361 goto fail;
68362
68363 cred = prepare_creds();
68364@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
68365 need_nonrelative = true;
68366 }
68367
68368- retval = coredump_wait(siginfo->si_signo, &core_state);
68369+ retval = coredump_wait(signr, &core_state);
68370 if (retval < 0)
68371 goto fail_creds;
68372
68373@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
68374 }
68375 cprm.limit = RLIM_INFINITY;
68376
68377- dump_count = atomic_inc_return(&core_dump_count);
68378+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
68379 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
68380 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
68381 task_tgid_vnr(current), current->comm);
68382@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
68383 } else {
68384 struct inode *inode;
68385
68386+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
68387+
68388 if (cprm.limit < binfmt->min_coredump)
68389 goto fail_unlock;
68390
68391@@ -681,7 +690,7 @@ close_fail:
68392 filp_close(cprm.file, NULL);
68393 fail_dropcount:
68394 if (ispipe)
68395- atomic_dec(&core_dump_count);
68396+ atomic_dec_unchecked(&core_dump_count);
68397 fail_unlock:
68398 kfree(cn.corename);
68399 coredump_finish(mm, core_dumped);
68400@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
68401 struct file *file = cprm->file;
68402 loff_t pos = file->f_pos;
68403 ssize_t n;
68404+
68405+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
68406 if (cprm->written + nr > cprm->limit)
68407 return 0;
68408 while (nr) {
68409diff --git a/fs/dcache.c b/fs/dcache.c
68410index 922f23e..05e38ae 100644
68411--- a/fs/dcache.c
68412+++ b/fs/dcache.c
68413@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
68414 * dentry_iput drops the locks, at which point nobody (except
68415 * transient RCU lookups) can reach this dentry.
68416 */
68417- BUG_ON(dentry->d_lockref.count > 0);
68418+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
68419 this_cpu_dec(nr_dentry);
68420 if (dentry->d_op && dentry->d_op->d_release)
68421 dentry->d_op->d_release(dentry);
68422@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
68423 struct dentry *parent = dentry->d_parent;
68424 if (IS_ROOT(dentry))
68425 return NULL;
68426- if (unlikely(dentry->d_lockref.count < 0))
68427+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
68428 return NULL;
68429 if (likely(spin_trylock(&parent->d_lock)))
68430 return parent;
68431@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
68432 */
68433 if (unlikely(ret < 0)) {
68434 spin_lock(&dentry->d_lock);
68435- if (dentry->d_lockref.count > 1) {
68436- dentry->d_lockref.count--;
68437+ if (__lockref_read(&dentry->d_lockref) > 1) {
68438+ __lockref_dec(&dentry->d_lockref);
68439 spin_unlock(&dentry->d_lock);
68440 return 1;
68441 }
68442@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
68443 * else could have killed it and marked it dead. Either way, we
68444 * don't need to do anything else.
68445 */
68446- if (dentry->d_lockref.count) {
68447+ if (__lockref_read(&dentry->d_lockref)) {
68448 spin_unlock(&dentry->d_lock);
68449 return 1;
68450 }
68451@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
68452 * lock, and we just tested that it was zero, so we can just
68453 * set it to 1.
68454 */
68455- dentry->d_lockref.count = 1;
68456+ __lockref_set(&dentry->d_lockref, 1);
68457 return 0;
68458 }
68459
68460@@ -751,7 +751,7 @@ repeat:
68461 dentry->d_flags |= DCACHE_REFERENCED;
68462 dentry_lru_add(dentry);
68463
68464- dentry->d_lockref.count--;
68465+ __lockref_dec(&dentry->d_lockref);
68466 spin_unlock(&dentry->d_lock);
68467 return;
68468
68469@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
68470 /* This must be called with d_lock held */
68471 static inline void __dget_dlock(struct dentry *dentry)
68472 {
68473- dentry->d_lockref.count++;
68474+ __lockref_inc(&dentry->d_lockref);
68475 }
68476
68477 static inline void __dget(struct dentry *dentry)
68478@@ -807,8 +807,8 @@ repeat:
68479 goto repeat;
68480 }
68481 rcu_read_unlock();
68482- BUG_ON(!ret->d_lockref.count);
68483- ret->d_lockref.count++;
68484+ BUG_ON(!__lockref_read(&ret->d_lockref));
68485+ __lockref_inc(&ret->d_lockref);
68486 spin_unlock(&ret->d_lock);
68487 return ret;
68488 }
68489@@ -886,9 +886,9 @@ restart:
68490 spin_lock(&inode->i_lock);
68491 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
68492 spin_lock(&dentry->d_lock);
68493- if (!dentry->d_lockref.count) {
68494+ if (!__lockref_read(&dentry->d_lockref)) {
68495 struct dentry *parent = lock_parent(dentry);
68496- if (likely(!dentry->d_lockref.count)) {
68497+ if (likely(!__lockref_read(&dentry->d_lockref))) {
68498 __dentry_kill(dentry);
68499 dput(parent);
68500 goto restart;
68501@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
68502 * We found an inuse dentry which was not removed from
68503 * the LRU because of laziness during lookup. Do not free it.
68504 */
68505- if (dentry->d_lockref.count > 0) {
68506+ if (__lockref_read(&dentry->d_lockref) > 0) {
68507 spin_unlock(&dentry->d_lock);
68508 if (parent)
68509 spin_unlock(&parent->d_lock);
68510@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
68511 dentry = parent;
68512 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
68513 parent = lock_parent(dentry);
68514- if (dentry->d_lockref.count != 1) {
68515- dentry->d_lockref.count--;
68516+ if (__lockref_read(&dentry->d_lockref) != 1) {
68517+ __lockref_inc(&dentry->d_lockref);
68518 spin_unlock(&dentry->d_lock);
68519 if (parent)
68520 spin_unlock(&parent->d_lock);
68521@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
68522 * counts, just remove them from the LRU. Otherwise give them
68523 * another pass through the LRU.
68524 */
68525- if (dentry->d_lockref.count) {
68526+ if (__lockref_read(&dentry->d_lockref)) {
68527 d_lru_isolate(lru, dentry);
68528 spin_unlock(&dentry->d_lock);
68529 return LRU_REMOVED;
68530@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
68531 } else {
68532 if (dentry->d_flags & DCACHE_LRU_LIST)
68533 d_lru_del(dentry);
68534- if (!dentry->d_lockref.count) {
68535+ if (!__lockref_read(&dentry->d_lockref)) {
68536 d_shrink_add(dentry, &data->dispose);
68537 data->found++;
68538 }
68539@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68540 return D_WALK_CONTINUE;
68541
68542 /* root with refcount 1 is fine */
68543- if (dentry == _data && dentry->d_lockref.count == 1)
68544+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
68545 return D_WALK_CONTINUE;
68546
68547 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
68548@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
68549 dentry->d_inode ?
68550 dentry->d_inode->i_ino : 0UL,
68551 dentry,
68552- dentry->d_lockref.count,
68553+ __lockref_read(&dentry->d_lockref),
68554 dentry->d_sb->s_type->name,
68555 dentry->d_sb->s_id);
68556 WARN_ON(1);
68557@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68558 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
68559 if (name->len > DNAME_INLINE_LEN-1) {
68560 size_t size = offsetof(struct external_name, name[1]);
68561- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
68562+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
68563 if (!p) {
68564 kmem_cache_free(dentry_cache, dentry);
68565 return NULL;
68566@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68567 smp_wmb();
68568 dentry->d_name.name = dname;
68569
68570- dentry->d_lockref.count = 1;
68571+ __lockref_set(&dentry->d_lockref, 1);
68572 dentry->d_flags = 0;
68573 spin_lock_init(&dentry->d_lock);
68574 seqcount_init(&dentry->d_seq);
68575@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
68576 dentry->d_sb = sb;
68577 dentry->d_op = NULL;
68578 dentry->d_fsdata = NULL;
68579+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
68580+ atomic_set(&dentry->chroot_refcnt, 0);
68581+#endif
68582 INIT_HLIST_BL_NODE(&dentry->d_hash);
68583 INIT_LIST_HEAD(&dentry->d_lru);
68584 INIT_LIST_HEAD(&dentry->d_subdirs);
68585@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
68586 goto next;
68587 }
68588
68589- dentry->d_lockref.count++;
68590+ __lockref_inc(&dentry->d_lockref);
68591 found = dentry;
68592 spin_unlock(&dentry->d_lock);
68593 break;
68594@@ -2358,7 +2361,7 @@ again:
68595 spin_lock(&dentry->d_lock);
68596 inode = dentry->d_inode;
68597 isdir = S_ISDIR(inode->i_mode);
68598- if (dentry->d_lockref.count == 1) {
68599+ if (__lockref_read(&dentry->d_lockref) == 1) {
68600 if (!spin_trylock(&inode->i_lock)) {
68601 spin_unlock(&dentry->d_lock);
68602 cpu_relax();
68603@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
68604
68605 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
68606 dentry->d_flags |= DCACHE_GENOCIDE;
68607- dentry->d_lockref.count--;
68608+ __lockref_dec(&dentry->d_lockref);
68609 }
68610 }
68611 return D_WALK_CONTINUE;
68612@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
68613 mempages -= reserve;
68614
68615 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
68616- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
68617+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
68618+ SLAB_NO_SANITIZE, NULL);
68619
68620 dcache_init();
68621 inode_init();
68622diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
68623index 96400ab..906103d 100644
68624--- a/fs/debugfs/inode.c
68625+++ b/fs/debugfs/inode.c
68626@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
68627 }
68628 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68629
68630+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68631+extern int grsec_enable_sysfs_restrict;
68632+#endif
68633+
68634 /**
68635 * debugfs_create_dir - create a directory in the debugfs filesystem
68636 * @name: a pointer to a string containing the name of the directory to
68637@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
68638 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
68639 * returned.
68640 */
68641+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68642+extern int grsec_enable_sysfs_restrict;
68643+#endif
68644+
68645 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68646 {
68647 struct dentry *dentry = start_creating(name, parent);
68648@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
68649 if (unlikely(!inode))
68650 return failed_creating(dentry);
68651
68652- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68653+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68654+ if (grsec_enable_sysfs_restrict)
68655+ inode->i_mode = S_IFDIR | S_IRWXU;
68656+ else
68657+#endif
68658+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
68659 inode->i_op = &simple_dir_inode_operations;
68660 inode->i_fop = &simple_dir_operations;
68661
68662diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
68663index b08b518..d6acffa 100644
68664--- a/fs/ecryptfs/inode.c
68665+++ b/fs/ecryptfs/inode.c
68666@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
68667 old_fs = get_fs();
68668 set_fs(get_ds());
68669 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
68670- (char __user *)lower_buf,
68671+ (char __force_user *)lower_buf,
68672 PATH_MAX);
68673 set_fs(old_fs);
68674 if (rc < 0)
68675diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
68676index e4141f2..d8263e8 100644
68677--- a/fs/ecryptfs/miscdev.c
68678+++ b/fs/ecryptfs/miscdev.c
68679@@ -304,7 +304,7 @@ check_list:
68680 goto out_unlock_msg_ctx;
68681 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
68682 if (msg_ctx->msg) {
68683- if (copy_to_user(&buf[i], packet_length, packet_length_size))
68684+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
68685 goto out_unlock_msg_ctx;
68686 i += packet_length_size;
68687 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
68688diff --git a/fs/exec.c b/fs/exec.c
68689index 1202445..7a6fde9 100644
68690--- a/fs/exec.c
68691+++ b/fs/exec.c
68692@@ -56,8 +56,20 @@
68693 #include <linux/pipe_fs_i.h>
68694 #include <linux/oom.h>
68695 #include <linux/compat.h>
68696+#include <linux/random.h>
68697+#include <linux/seq_file.h>
68698+#include <linux/coredump.h>
68699+#include <linux/mman.h>
68700+
68701+#ifdef CONFIG_PAX_REFCOUNT
68702+#include <linux/kallsyms.h>
68703+#include <linux/kdebug.h>
68704+#endif
68705+
68706+#include <trace/events/fs.h>
68707
68708 #include <asm/uaccess.h>
68709+#include <asm/sections.h>
68710 #include <asm/mmu_context.h>
68711 #include <asm/tlb.h>
68712
68713@@ -66,19 +78,34 @@
68714
68715 #include <trace/events/sched.h>
68716
68717+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68718+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
68719+{
68720+ 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");
68721+}
68722+#endif
68723+
68724+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
68725+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68726+EXPORT_SYMBOL(pax_set_initial_flags_func);
68727+#endif
68728+
68729 int suid_dumpable = 0;
68730
68731 static LIST_HEAD(formats);
68732 static DEFINE_RWLOCK(binfmt_lock);
68733
68734+extern int gr_process_kernel_exec_ban(void);
68735+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
68736+
68737 void __register_binfmt(struct linux_binfmt * fmt, int insert)
68738 {
68739 BUG_ON(!fmt);
68740 if (WARN_ON(!fmt->load_binary))
68741 return;
68742 write_lock(&binfmt_lock);
68743- insert ? list_add(&fmt->lh, &formats) :
68744- list_add_tail(&fmt->lh, &formats);
68745+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
68746+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
68747 write_unlock(&binfmt_lock);
68748 }
68749
68750@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
68751 void unregister_binfmt(struct linux_binfmt * fmt)
68752 {
68753 write_lock(&binfmt_lock);
68754- list_del(&fmt->lh);
68755+ pax_list_del((struct list_head *)&fmt->lh);
68756 write_unlock(&binfmt_lock);
68757 }
68758
68759@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68760 int write)
68761 {
68762 struct page *page;
68763- int ret;
68764
68765-#ifdef CONFIG_STACK_GROWSUP
68766- if (write) {
68767- ret = expand_downwards(bprm->vma, pos);
68768- if (ret < 0)
68769- return NULL;
68770- }
68771-#endif
68772- ret = get_user_pages(current, bprm->mm, pos,
68773- 1, write, 1, &page, NULL);
68774- if (ret <= 0)
68775+ if (0 > expand_downwards(bprm->vma, pos))
68776+ return NULL;
68777+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
68778 return NULL;
68779
68780 if (write) {
68781@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
68782 if (size <= ARG_MAX)
68783 return page;
68784
68785+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68786+ // only allow 512KB for argv+env on suid/sgid binaries
68787+ // to prevent easy ASLR exhaustion
68788+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
68789+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
68790+ (size > (512 * 1024))) {
68791+ put_page(page);
68792+ return NULL;
68793+ }
68794+#endif
68795+
68796 /*
68797 * Limit to 1/4-th the stack size for the argv+env strings.
68798 * This ensures that:
68799@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68800 vma->vm_end = STACK_TOP_MAX;
68801 vma->vm_start = vma->vm_end - PAGE_SIZE;
68802 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
68803+
68804+#ifdef CONFIG_PAX_SEGMEXEC
68805+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
68806+#endif
68807+
68808 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
68809 INIT_LIST_HEAD(&vma->anon_vma_chain);
68810
68811@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
68812 arch_bprm_mm_init(mm, vma);
68813 up_write(&mm->mmap_sem);
68814 bprm->p = vma->vm_end - sizeof(void *);
68815+
68816+#ifdef CONFIG_PAX_RANDUSTACK
68817+ if (randomize_va_space)
68818+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
68819+#endif
68820+
68821 return 0;
68822 err:
68823 up_write(&mm->mmap_sem);
68824@@ -396,7 +437,7 @@ struct user_arg_ptr {
68825 } ptr;
68826 };
68827
68828-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68829+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68830 {
68831 const char __user *native;
68832
68833@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
68834 compat_uptr_t compat;
68835
68836 if (get_user(compat, argv.ptr.compat + nr))
68837- return ERR_PTR(-EFAULT);
68838+ return (const char __force_user *)ERR_PTR(-EFAULT);
68839
68840 return compat_ptr(compat);
68841 }
68842 #endif
68843
68844 if (get_user(native, argv.ptr.native + nr))
68845- return ERR_PTR(-EFAULT);
68846+ return (const char __force_user *)ERR_PTR(-EFAULT);
68847
68848 return native;
68849 }
68850@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
68851 if (!p)
68852 break;
68853
68854- if (IS_ERR(p))
68855+ if (IS_ERR((const char __force_kernel *)p))
68856 return -EFAULT;
68857
68858 if (i >= max)
68859@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
68860
68861 ret = -EFAULT;
68862 str = get_user_arg_ptr(argv, argc);
68863- if (IS_ERR(str))
68864+ if (IS_ERR((const char __force_kernel *)str))
68865 goto out;
68866
68867 len = strnlen_user(str, MAX_ARG_STRLEN);
68868@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
68869 int r;
68870 mm_segment_t oldfs = get_fs();
68871 struct user_arg_ptr argv = {
68872- .ptr.native = (const char __user *const __user *)__argv,
68873+ .ptr.native = (const char __user * const __force_user *)__argv,
68874 };
68875
68876 set_fs(KERNEL_DS);
68877@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68878 unsigned long new_end = old_end - shift;
68879 struct mmu_gather tlb;
68880
68881- BUG_ON(new_start > new_end);
68882+ if (new_start >= new_end || new_start < mmap_min_addr)
68883+ return -ENOMEM;
68884
68885 /*
68886 * ensure there are no vmas between where we want to go
68887@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
68888 if (vma != find_vma(mm, new_start))
68889 return -EFAULT;
68890
68891+#ifdef CONFIG_PAX_SEGMEXEC
68892+ BUG_ON(pax_find_mirror_vma(vma));
68893+#endif
68894+
68895 /*
68896 * cover the whole range: [new_start, old_end)
68897 */
68898@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68899 stack_top = arch_align_stack(stack_top);
68900 stack_top = PAGE_ALIGN(stack_top);
68901
68902- if (unlikely(stack_top < mmap_min_addr) ||
68903- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
68904- return -ENOMEM;
68905-
68906 stack_shift = vma->vm_end - stack_top;
68907
68908 bprm->p -= stack_shift;
68909@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
68910 bprm->exec -= stack_shift;
68911
68912 down_write(&mm->mmap_sem);
68913+
68914+ /* Move stack pages down in memory. */
68915+ if (stack_shift) {
68916+ ret = shift_arg_pages(vma, stack_shift);
68917+ if (ret)
68918+ goto out_unlock;
68919+ }
68920+
68921 vm_flags = VM_STACK_FLAGS;
68922
68923+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
68924+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
68925+ vm_flags &= ~VM_EXEC;
68926+
68927+#ifdef CONFIG_PAX_MPROTECT
68928+ if (mm->pax_flags & MF_PAX_MPROTECT)
68929+ vm_flags &= ~VM_MAYEXEC;
68930+#endif
68931+
68932+ }
68933+#endif
68934+
68935 /*
68936 * Adjust stack execute permissions; explicitly enable for
68937 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
68938@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
68939 goto out_unlock;
68940 BUG_ON(prev != vma);
68941
68942- /* Move stack pages down in memory. */
68943- if (stack_shift) {
68944- ret = shift_arg_pages(vma, stack_shift);
68945- if (ret)
68946- goto out_unlock;
68947- }
68948-
68949 /* mprotect_fixup is overkill to remove the temporary stack flags */
68950 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
68951
68952@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
68953 #endif
68954 current->mm->start_stack = bprm->p;
68955 ret = expand_stack(vma, stack_base);
68956+
68957+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
68958+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
68959+ unsigned long size;
68960+ vm_flags_t vm_flags;
68961+
68962+ size = STACK_TOP - vma->vm_end;
68963+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
68964+
68965+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
68966+
68967+#ifdef CONFIG_X86
68968+ if (!ret) {
68969+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
68970+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
68971+ }
68972+#endif
68973+
68974+ }
68975+#endif
68976+
68977 if (ret)
68978 ret = -EFAULT;
68979
68980@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
68981 if (err)
68982 goto exit;
68983
68984- if (name->name[0] != '\0')
68985+ if (name->name[0] != '\0') {
68986 fsnotify_open(file);
68987+ trace_open_exec(name->name);
68988+ }
68989
68990 out:
68991 return file;
68992@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
68993 old_fs = get_fs();
68994 set_fs(get_ds());
68995 /* The cast to a user pointer is valid due to the set_fs() */
68996- result = vfs_read(file, (void __user *)addr, count, &pos);
68997+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
68998 set_fs(old_fs);
68999 return result;
69000 }
69001@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
69002 tsk->mm = mm;
69003 tsk->active_mm = mm;
69004 activate_mm(active_mm, mm);
69005+ populate_stack();
69006 tsk->mm->vmacache_seqnum = 0;
69007 vmacache_flush(tsk);
69008 task_unlock(tsk);
69009@@ -929,10 +1008,14 @@ static int de_thread(struct task_struct *tsk)
69010 if (!thread_group_leader(tsk)) {
69011 struct task_struct *leader = tsk->group_leader;
69012
69013- sig->notify_count = -1; /* for exit_notify() */
69014 for (;;) {
69015 threadgroup_change_begin(tsk);
69016 write_lock_irq(&tasklist_lock);
69017+ /*
69018+ * Do this under tasklist_lock to ensure that
69019+ * exit_notify() can't miss ->group_exit_task
69020+ */
69021+ sig->notify_count = -1;
69022 if (likely(leader->exit_state))
69023 break;
69024 __set_current_state(TASK_KILLABLE);
69025@@ -1261,7 +1344,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
69026 }
69027 rcu_read_unlock();
69028
69029- if (p->fs->users > n_fs)
69030+ if (atomic_read(&p->fs->users) > n_fs)
69031 bprm->unsafe |= LSM_UNSAFE_SHARE;
69032 else
69033 p->fs->in_exec = 1;
69034@@ -1462,6 +1545,31 @@ static int exec_binprm(struct linux_binprm *bprm)
69035 return ret;
69036 }
69037
69038+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69039+static DEFINE_PER_CPU(u64, exec_counter);
69040+static int __init init_exec_counters(void)
69041+{
69042+ unsigned int cpu;
69043+
69044+ for_each_possible_cpu(cpu) {
69045+ per_cpu(exec_counter, cpu) = (u64)cpu;
69046+ }
69047+
69048+ return 0;
69049+}
69050+early_initcall(init_exec_counters);
69051+static inline void increment_exec_counter(void)
69052+{
69053+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
69054+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
69055+}
69056+#else
69057+static inline void increment_exec_counter(void) {}
69058+#endif
69059+
69060+extern void gr_handle_exec_args(struct linux_binprm *bprm,
69061+ struct user_arg_ptr argv);
69062+
69063 /*
69064 * sys_execve() executes a new program.
69065 */
69066@@ -1470,6 +1578,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69067 struct user_arg_ptr envp,
69068 int flags)
69069 {
69070+#ifdef CONFIG_GRKERNSEC
69071+ struct file *old_exec_file;
69072+ struct acl_subject_label *old_acl;
69073+ struct rlimit old_rlim[RLIM_NLIMITS];
69074+#endif
69075 char *pathbuf = NULL;
69076 struct linux_binprm *bprm;
69077 struct file *file;
69078@@ -1479,6 +1592,8 @@ static int do_execveat_common(int fd, struct filename *filename,
69079 if (IS_ERR(filename))
69080 return PTR_ERR(filename);
69081
69082+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
69083+
69084 /*
69085 * We move the actual failure in case of RLIMIT_NPROC excess from
69086 * set*uid() to execve() because too many poorly written programs
69087@@ -1516,6 +1631,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69088 if (IS_ERR(file))
69089 goto out_unmark;
69090
69091+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
69092+ retval = -EPERM;
69093+ goto out_unmark;
69094+ }
69095+
69096 sched_exec();
69097
69098 bprm->file = file;
69099@@ -1542,6 +1662,11 @@ static int do_execveat_common(int fd, struct filename *filename,
69100 }
69101 bprm->interp = bprm->filename;
69102
69103+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
69104+ retval = -EACCES;
69105+ goto out_unmark;
69106+ }
69107+
69108 retval = bprm_mm_init(bprm);
69109 if (retval)
69110 goto out_unmark;
69111@@ -1558,24 +1683,70 @@ static int do_execveat_common(int fd, struct filename *filename,
69112 if (retval < 0)
69113 goto out;
69114
69115+#ifdef CONFIG_GRKERNSEC
69116+ old_acl = current->acl;
69117+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
69118+ old_exec_file = current->exec_file;
69119+ get_file(file);
69120+ current->exec_file = file;
69121+#endif
69122+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
69123+ /* limit suid stack to 8MB
69124+ * we saved the old limits above and will restore them if this exec fails
69125+ */
69126+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
69127+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
69128+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
69129+#endif
69130+
69131+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
69132+ retval = -EPERM;
69133+ goto out_fail;
69134+ }
69135+
69136+ if (!gr_tpe_allow(file)) {
69137+ retval = -EACCES;
69138+ goto out_fail;
69139+ }
69140+
69141+ if (gr_check_crash_exec(file)) {
69142+ retval = -EACCES;
69143+ goto out_fail;
69144+ }
69145+
69146+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
69147+ bprm->unsafe);
69148+ if (retval < 0)
69149+ goto out_fail;
69150+
69151 retval = copy_strings_kernel(1, &bprm->filename, bprm);
69152 if (retval < 0)
69153- goto out;
69154+ goto out_fail;
69155
69156 bprm->exec = bprm->p;
69157 retval = copy_strings(bprm->envc, envp, bprm);
69158 if (retval < 0)
69159- goto out;
69160+ goto out_fail;
69161
69162 retval = copy_strings(bprm->argc, argv, bprm);
69163 if (retval < 0)
69164- goto out;
69165+ goto out_fail;
69166+
69167+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
69168+
69169+ gr_handle_exec_args(bprm, argv);
69170
69171 retval = exec_binprm(bprm);
69172 if (retval < 0)
69173- goto out;
69174+ goto out_fail;
69175+#ifdef CONFIG_GRKERNSEC
69176+ if (old_exec_file)
69177+ fput(old_exec_file);
69178+#endif
69179
69180 /* execve succeeded */
69181+
69182+ increment_exec_counter();
69183 current->fs->in_exec = 0;
69184 current->in_execve = 0;
69185 acct_update_integrals(current);
69186@@ -1587,6 +1758,14 @@ static int do_execveat_common(int fd, struct filename *filename,
69187 put_files_struct(displaced);
69188 return retval;
69189
69190+out_fail:
69191+#ifdef CONFIG_GRKERNSEC
69192+ current->acl = old_acl;
69193+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
69194+ fput(current->exec_file);
69195+ current->exec_file = old_exec_file;
69196+#endif
69197+
69198 out:
69199 if (bprm->mm) {
69200 acct_arg_size(bprm, 0);
69201@@ -1733,3 +1912,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
69202 argv, envp, flags);
69203 }
69204 #endif
69205+
69206+int pax_check_flags(unsigned long *flags)
69207+{
69208+ int retval = 0;
69209+
69210+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
69211+ if (*flags & MF_PAX_SEGMEXEC)
69212+ {
69213+ *flags &= ~MF_PAX_SEGMEXEC;
69214+ retval = -EINVAL;
69215+ }
69216+#endif
69217+
69218+ if ((*flags & MF_PAX_PAGEEXEC)
69219+
69220+#ifdef CONFIG_PAX_PAGEEXEC
69221+ && (*flags & MF_PAX_SEGMEXEC)
69222+#endif
69223+
69224+ )
69225+ {
69226+ *flags &= ~MF_PAX_PAGEEXEC;
69227+ retval = -EINVAL;
69228+ }
69229+
69230+ if ((*flags & MF_PAX_MPROTECT)
69231+
69232+#ifdef CONFIG_PAX_MPROTECT
69233+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69234+#endif
69235+
69236+ )
69237+ {
69238+ *flags &= ~MF_PAX_MPROTECT;
69239+ retval = -EINVAL;
69240+ }
69241+
69242+ if ((*flags & MF_PAX_EMUTRAMP)
69243+
69244+#ifdef CONFIG_PAX_EMUTRAMP
69245+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
69246+#endif
69247+
69248+ )
69249+ {
69250+ *flags &= ~MF_PAX_EMUTRAMP;
69251+ retval = -EINVAL;
69252+ }
69253+
69254+ return retval;
69255+}
69256+
69257+EXPORT_SYMBOL(pax_check_flags);
69258+
69259+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
69260+char *pax_get_path(const struct path *path, char *buf, int buflen)
69261+{
69262+ char *pathname = d_path(path, buf, buflen);
69263+
69264+ if (IS_ERR(pathname))
69265+ goto toolong;
69266+
69267+ pathname = mangle_path(buf, pathname, "\t\n\\");
69268+ if (!pathname)
69269+ goto toolong;
69270+
69271+ *pathname = 0;
69272+ return buf;
69273+
69274+toolong:
69275+ return "<path too long>";
69276+}
69277+EXPORT_SYMBOL(pax_get_path);
69278+
69279+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
69280+{
69281+ struct task_struct *tsk = current;
69282+ struct mm_struct *mm = current->mm;
69283+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
69284+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
69285+ char *path_exec = NULL;
69286+ char *path_fault = NULL;
69287+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
69288+ siginfo_t info = { };
69289+
69290+ if (buffer_exec && buffer_fault) {
69291+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
69292+
69293+ down_read(&mm->mmap_sem);
69294+ vma = mm->mmap;
69295+ while (vma && (!vma_exec || !vma_fault)) {
69296+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
69297+ vma_exec = vma;
69298+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
69299+ vma_fault = vma;
69300+ vma = vma->vm_next;
69301+ }
69302+ if (vma_exec)
69303+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
69304+ if (vma_fault) {
69305+ start = vma_fault->vm_start;
69306+ end = vma_fault->vm_end;
69307+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
69308+ if (vma_fault->vm_file)
69309+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
69310+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
69311+ path_fault = "<heap>";
69312+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
69313+ path_fault = "<stack>";
69314+ else
69315+ path_fault = "<anonymous mapping>";
69316+ }
69317+ up_read(&mm->mmap_sem);
69318+ }
69319+ if (tsk->signal->curr_ip)
69320+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
69321+ else
69322+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
69323+ 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),
69324+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
69325+ free_page((unsigned long)buffer_exec);
69326+ free_page((unsigned long)buffer_fault);
69327+ pax_report_insns(regs, pc, sp);
69328+ info.si_signo = SIGKILL;
69329+ info.si_errno = 0;
69330+ info.si_code = SI_KERNEL;
69331+ info.si_pid = 0;
69332+ info.si_uid = 0;
69333+ do_coredump(&info);
69334+}
69335+#endif
69336+
69337+#ifdef CONFIG_PAX_REFCOUNT
69338+void pax_report_refcount_overflow(struct pt_regs *regs)
69339+{
69340+ if (current->signal->curr_ip)
69341+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
69342+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
69343+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69344+ else
69345+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
69346+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
69347+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
69348+ preempt_disable();
69349+ show_regs(regs);
69350+ preempt_enable();
69351+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
69352+}
69353+#endif
69354+
69355+#ifdef CONFIG_PAX_USERCOPY
69356+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
69357+static noinline int check_stack_object(const void *obj, unsigned long len)
69358+{
69359+ const void * const stack = task_stack_page(current);
69360+ const void * const stackend = stack + THREAD_SIZE;
69361+
69362+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69363+ const void *frame = NULL;
69364+ const void *oldframe;
69365+#endif
69366+
69367+ if (obj + len < obj)
69368+ return -1;
69369+
69370+ if (obj + len <= stack || stackend <= obj)
69371+ return 0;
69372+
69373+ if (obj < stack || stackend < obj + len)
69374+ return -1;
69375+
69376+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
69377+ oldframe = __builtin_frame_address(1);
69378+ if (oldframe)
69379+ frame = __builtin_frame_address(2);
69380+ /*
69381+ low ----------------------------------------------> high
69382+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
69383+ ^----------------^
69384+ allow copies only within here
69385+ */
69386+ while (stack <= frame && frame < stackend) {
69387+ /* if obj + len extends past the last frame, this
69388+ check won't pass and the next frame will be 0,
69389+ causing us to bail out and correctly report
69390+ the copy as invalid
69391+ */
69392+ if (obj + len <= frame)
69393+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
69394+ oldframe = frame;
69395+ frame = *(const void * const *)frame;
69396+ }
69397+ return -1;
69398+#else
69399+ return 1;
69400+#endif
69401+}
69402+
69403+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
69404+{
69405+ if (current->signal->curr_ip)
69406+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69407+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69408+ else
69409+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
69410+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
69411+ dump_stack();
69412+ gr_handle_kernel_exploit();
69413+ do_group_exit(SIGKILL);
69414+}
69415+#endif
69416+
69417+#ifdef CONFIG_PAX_USERCOPY
69418+
69419+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
69420+{
69421+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
69422+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
69423+#ifdef CONFIG_MODULES
69424+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
69425+#else
69426+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
69427+#endif
69428+
69429+#else
69430+ unsigned long textlow = (unsigned long)_stext;
69431+ unsigned long texthigh = (unsigned long)_etext;
69432+
69433+#ifdef CONFIG_X86_64
69434+ /* check against linear mapping as well */
69435+ if (high > (unsigned long)__va(__pa(textlow)) &&
69436+ low < (unsigned long)__va(__pa(texthigh)))
69437+ return true;
69438+#endif
69439+
69440+#endif
69441+
69442+ if (high <= textlow || low >= texthigh)
69443+ return false;
69444+ else
69445+ return true;
69446+}
69447+#endif
69448+
69449+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
69450+{
69451+#ifdef CONFIG_PAX_USERCOPY
69452+ const char *type;
69453+#endif
69454+
69455+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
69456+ unsigned long stackstart = (unsigned long)task_stack_page(current);
69457+ unsigned long currentsp = (unsigned long)&stackstart;
69458+ if (unlikely((currentsp < stackstart + 512 ||
69459+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
69460+ BUG();
69461+#endif
69462+
69463+#ifndef CONFIG_PAX_USERCOPY_DEBUG
69464+ if (const_size)
69465+ return;
69466+#endif
69467+
69468+#ifdef CONFIG_PAX_USERCOPY
69469+ if (!n)
69470+ return;
69471+
69472+ type = check_heap_object(ptr, n);
69473+ if (!type) {
69474+ int ret = check_stack_object(ptr, n);
69475+ if (ret == 1 || ret == 2)
69476+ return;
69477+ if (ret == 0) {
69478+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
69479+ type = "<kernel text>";
69480+ else
69481+ return;
69482+ } else
69483+ type = "<process stack>";
69484+ }
69485+
69486+ pax_report_usercopy(ptr, n, to_user, type);
69487+#endif
69488+
69489+}
69490+EXPORT_SYMBOL(__check_object_size);
69491+
69492+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
69493+void pax_track_stack(void)
69494+{
69495+ unsigned long sp = (unsigned long)&sp;
69496+ if (sp < current_thread_info()->lowest_stack &&
69497+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
69498+ current_thread_info()->lowest_stack = sp;
69499+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
69500+ BUG();
69501+}
69502+EXPORT_SYMBOL(pax_track_stack);
69503+#endif
69504+
69505+#ifdef CONFIG_PAX_SIZE_OVERFLOW
69506+void __nocapture(1, 3, 4) report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
69507+{
69508+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
69509+ dump_stack();
69510+ do_group_exit(SIGKILL);
69511+}
69512+EXPORT_SYMBOL(report_size_overflow);
69513+#endif
69514diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
69515index 9f9992b..8b59411 100644
69516--- a/fs/ext2/balloc.c
69517+++ b/fs/ext2/balloc.c
69518@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
69519
69520 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69521 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69522- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69523+ if (free_blocks < root_blocks + 1 &&
69524 !uid_eq(sbi->s_resuid, current_fsuid()) &&
69525 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69526- !in_group_p (sbi->s_resgid))) {
69527+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69528 return 0;
69529 }
69530 return 1;
69531diff --git a/fs/ext2/super.c b/fs/ext2/super.c
69532index d0e746e..82e06f0 100644
69533--- a/fs/ext2/super.c
69534+++ b/fs/ext2/super.c
69535@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
69536 #ifdef CONFIG_EXT2_FS_XATTR
69537 if (test_opt(sb, XATTR_USER))
69538 seq_puts(seq, ",user_xattr");
69539- if (!test_opt(sb, XATTR_USER) &&
69540- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
69541+ if (!test_opt(sb, XATTR_USER))
69542 seq_puts(seq, ",nouser_xattr");
69543- }
69544 #endif
69545
69546 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69547@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
69548 if (def_mount_opts & EXT2_DEFM_UID16)
69549 set_opt(sbi->s_mount_opt, NO_UID32);
69550 #ifdef CONFIG_EXT2_FS_XATTR
69551- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
69552- set_opt(sbi->s_mount_opt, XATTR_USER);
69553+ /* always enable user xattrs */
69554+ set_opt(sbi->s_mount_opt, XATTR_USER);
69555 #endif
69556 #ifdef CONFIG_EXT2_FS_POSIX_ACL
69557 if (def_mount_opts & EXT2_DEFM_ACL)
69558diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
69559index 9142614..97484fa 100644
69560--- a/fs/ext2/xattr.c
69561+++ b/fs/ext2/xattr.c
69562@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
69563 struct buffer_head *bh = NULL;
69564 struct ext2_xattr_entry *entry;
69565 char *end;
69566- size_t rest = buffer_size;
69567+ size_t rest = buffer_size, total_size = 0;
69568 int error;
69569
69570 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
69571@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
69572 buffer += size;
69573 }
69574 rest -= size;
69575+ total_size += size;
69576 }
69577 }
69578- error = buffer_size - rest; /* total size */
69579+ error = total_size;
69580
69581 cleanup:
69582 brelse(bh);
69583diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
69584index 158b5d4..2432610 100644
69585--- a/fs/ext3/balloc.c
69586+++ b/fs/ext3/balloc.c
69587@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
69588
69589 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
69590 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
69591- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
69592+ if (free_blocks < root_blocks + 1 &&
69593 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
69594 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
69595- !in_group_p (sbi->s_resgid))) {
69596+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
69597 return 0;
69598 }
69599 return 1;
69600diff --git a/fs/ext3/super.c b/fs/ext3/super.c
69601index d4dbf3c..906a6fb 100644
69602--- a/fs/ext3/super.c
69603+++ b/fs/ext3/super.c
69604@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
69605 #ifdef CONFIG_EXT3_FS_XATTR
69606 if (test_opt(sb, XATTR_USER))
69607 seq_puts(seq, ",user_xattr");
69608- if (!test_opt(sb, XATTR_USER) &&
69609- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
69610+ if (!test_opt(sb, XATTR_USER))
69611 seq_puts(seq, ",nouser_xattr");
69612- }
69613 #endif
69614 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69615 if (test_opt(sb, POSIX_ACL))
69616@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
69617 if (def_mount_opts & EXT3_DEFM_UID16)
69618 set_opt(sbi->s_mount_opt, NO_UID32);
69619 #ifdef CONFIG_EXT3_FS_XATTR
69620- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
69621- set_opt(sbi->s_mount_opt, XATTR_USER);
69622+ /* always enable user xattrs */
69623+ set_opt(sbi->s_mount_opt, XATTR_USER);
69624 #endif
69625 #ifdef CONFIG_EXT3_FS_POSIX_ACL
69626 if (def_mount_opts & EXT3_DEFM_ACL)
69627diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
69628index c6874be..f8a6ae8 100644
69629--- a/fs/ext3/xattr.c
69630+++ b/fs/ext3/xattr.c
69631@@ -330,7 +330,7 @@ static int
69632 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69633 char *buffer, size_t buffer_size)
69634 {
69635- size_t rest = buffer_size;
69636+ size_t rest = buffer_size, total_size = 0;
69637
69638 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
69639 const struct xattr_handler *handler =
69640@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
69641 buffer += size;
69642 }
69643 rest -= size;
69644+ total_size += size;
69645 }
69646 }
69647- return buffer_size - rest;
69648+ return total_size;
69649 }
69650
69651 static int
69652diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
69653index 83a6f49..d4e4d03 100644
69654--- a/fs/ext4/balloc.c
69655+++ b/fs/ext4/balloc.c
69656@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
69657 /* Hm, nope. Are (enough) root reserved clusters available? */
69658 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
69659 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
69660- capable(CAP_SYS_RESOURCE) ||
69661- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
69662+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
69663+ capable_nolog(CAP_SYS_RESOURCE)) {
69664
69665 if (free_clusters >= (nclusters + dirty_clusters +
69666 resv_clusters))
69667diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
69668index f63c3d5..3c1a033 100644
69669--- a/fs/ext4/ext4.h
69670+++ b/fs/ext4/ext4.h
69671@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
69672 unsigned long s_mb_last_start;
69673
69674 /* stats for buddy allocator */
69675- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
69676- atomic_t s_bal_success; /* we found long enough chunks */
69677- atomic_t s_bal_allocated; /* in blocks */
69678- atomic_t s_bal_ex_scanned; /* total extents scanned */
69679- atomic_t s_bal_goals; /* goal hits */
69680- atomic_t s_bal_breaks; /* too long searches */
69681- atomic_t s_bal_2orders; /* 2^order hits */
69682+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
69683+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
69684+ atomic_unchecked_t s_bal_allocated; /* in blocks */
69685+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
69686+ atomic_unchecked_t s_bal_goals; /* goal hits */
69687+ atomic_unchecked_t s_bal_breaks; /* too long searches */
69688+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
69689 spinlock_t s_bal_lock;
69690 unsigned long s_mb_buddies_generated;
69691 unsigned long long s_mb_generation_time;
69692- atomic_t s_mb_lost_chunks;
69693- atomic_t s_mb_preallocated;
69694- atomic_t s_mb_discarded;
69695+ atomic_unchecked_t s_mb_lost_chunks;
69696+ atomic_unchecked_t s_mb_preallocated;
69697+ atomic_unchecked_t s_mb_discarded;
69698 atomic_t s_lock_busy;
69699
69700 /* locality groups */
69701diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
69702index 8d1e602..abf497b 100644
69703--- a/fs/ext4/mballoc.c
69704+++ b/fs/ext4/mballoc.c
69705@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
69706 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
69707
69708 if (EXT4_SB(sb)->s_mb_stats)
69709- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
69710+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
69711
69712 break;
69713 }
69714@@ -2211,7 +2211,7 @@ repeat:
69715 ac->ac_status = AC_STATUS_CONTINUE;
69716 ac->ac_flags |= EXT4_MB_HINT_FIRST;
69717 cr = 3;
69718- atomic_inc(&sbi->s_mb_lost_chunks);
69719+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
69720 goto repeat;
69721 }
69722 }
69723@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
69724 if (sbi->s_mb_stats) {
69725 ext4_msg(sb, KERN_INFO,
69726 "mballoc: %u blocks %u reqs (%u success)",
69727- atomic_read(&sbi->s_bal_allocated),
69728- atomic_read(&sbi->s_bal_reqs),
69729- atomic_read(&sbi->s_bal_success));
69730+ atomic_read_unchecked(&sbi->s_bal_allocated),
69731+ atomic_read_unchecked(&sbi->s_bal_reqs),
69732+ atomic_read_unchecked(&sbi->s_bal_success));
69733 ext4_msg(sb, KERN_INFO,
69734 "mballoc: %u extents scanned, %u goal hits, "
69735 "%u 2^N hits, %u breaks, %u lost",
69736- atomic_read(&sbi->s_bal_ex_scanned),
69737- atomic_read(&sbi->s_bal_goals),
69738- atomic_read(&sbi->s_bal_2orders),
69739- atomic_read(&sbi->s_bal_breaks),
69740- atomic_read(&sbi->s_mb_lost_chunks));
69741+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
69742+ atomic_read_unchecked(&sbi->s_bal_goals),
69743+ atomic_read_unchecked(&sbi->s_bal_2orders),
69744+ atomic_read_unchecked(&sbi->s_bal_breaks),
69745+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
69746 ext4_msg(sb, KERN_INFO,
69747 "mballoc: %lu generated and it took %Lu",
69748 sbi->s_mb_buddies_generated,
69749 sbi->s_mb_generation_time);
69750 ext4_msg(sb, KERN_INFO,
69751 "mballoc: %u preallocated, %u discarded",
69752- atomic_read(&sbi->s_mb_preallocated),
69753- atomic_read(&sbi->s_mb_discarded));
69754+ atomic_read_unchecked(&sbi->s_mb_preallocated),
69755+ atomic_read_unchecked(&sbi->s_mb_discarded));
69756 }
69757
69758 free_percpu(sbi->s_locality_groups);
69759@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
69760 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
69761
69762 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
69763- atomic_inc(&sbi->s_bal_reqs);
69764- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69765+ atomic_inc_unchecked(&sbi->s_bal_reqs);
69766+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
69767 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
69768- atomic_inc(&sbi->s_bal_success);
69769- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
69770+ atomic_inc_unchecked(&sbi->s_bal_success);
69771+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
69772 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
69773 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
69774- atomic_inc(&sbi->s_bal_goals);
69775+ atomic_inc_unchecked(&sbi->s_bal_goals);
69776 if (ac->ac_found > sbi->s_mb_max_to_scan)
69777- atomic_inc(&sbi->s_bal_breaks);
69778+ atomic_inc_unchecked(&sbi->s_bal_breaks);
69779 }
69780
69781 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
69782@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
69783 trace_ext4_mb_new_inode_pa(ac, pa);
69784
69785 ext4_mb_use_inode_pa(ac, pa);
69786- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
69787+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
69788
69789 ei = EXT4_I(ac->ac_inode);
69790 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69791@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
69792 trace_ext4_mb_new_group_pa(ac, pa);
69793
69794 ext4_mb_use_group_pa(ac, pa);
69795- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69796+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
69797
69798 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
69799 lg = ac->ac_lg;
69800@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
69801 * from the bitmap and continue.
69802 */
69803 }
69804- atomic_add(free, &sbi->s_mb_discarded);
69805+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
69806
69807 return err;
69808 }
69809@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
69810 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
69811 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
69812 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
69813- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69814+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
69815 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
69816
69817 return 0;
69818diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
69819index 8313ca3..8a37d08 100644
69820--- a/fs/ext4/mmp.c
69821+++ b/fs/ext4/mmp.c
69822@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
69823 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
69824 const char *function, unsigned int line, const char *msg)
69825 {
69826- __ext4_warning(sb, function, line, msg);
69827+ __ext4_warning(sb, function, line, "%s", msg);
69828 __ext4_warning(sb, function, line,
69829 "MMP failure info: last update time: %llu, last update "
69830 "node: %s, last update device: %s\n",
69831diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
69832index 8a8ec62..1b02de5 100644
69833--- a/fs/ext4/resize.c
69834+++ b/fs/ext4/resize.c
69835@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69836
69837 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
69838 for (count2 = count; count > 0; count -= count2, block += count2) {
69839- ext4_fsblk_t start;
69840+ ext4_fsblk_t start, diff;
69841 struct buffer_head *bh;
69842 ext4_group_t group;
69843 int err;
69844@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69845 start = ext4_group_first_block_no(sb, group);
69846 group -= flex_gd->groups[0].group;
69847
69848- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
69849- if (count2 > count)
69850- count2 = count;
69851-
69852 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
69853 BUG_ON(flex_gd->count > 1);
69854 continue;
69855@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
69856 err = ext4_journal_get_write_access(handle, bh);
69857 if (err)
69858 return err;
69859+
69860+ diff = block - start;
69861+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
69862+ if (count2 > count)
69863+ count2 = count;
69864+
69865 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
69866- block - start, count2);
69867- ext4_set_bits(bh->b_data, block - start, count2);
69868+ diff, count2);
69869+ ext4_set_bits(bh->b_data, diff, count2);
69870
69871 err = ext4_handle_dirty_metadata(handle, NULL, bh);
69872 if (unlikely(err))
69873diff --git a/fs/ext4/super.c b/fs/ext4/super.c
69874index e061e66..87bc092 100644
69875--- a/fs/ext4/super.c
69876+++ b/fs/ext4/super.c
69877@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
69878 }
69879
69880 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
69881-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69882+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
69883 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
69884
69885 #ifdef CONFIG_QUOTA
69886@@ -2443,7 +2443,7 @@ struct ext4_attr {
69887 int offset;
69888 int deprecated_val;
69889 } u;
69890-};
69891+} __do_const;
69892
69893 static int parse_strtoull(const char *buf,
69894 unsigned long long max, unsigned long long *value)
69895diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
69896index 1e09fc7..0400dd4 100644
69897--- a/fs/ext4/xattr.c
69898+++ b/fs/ext4/xattr.c
69899@@ -399,7 +399,7 @@ static int
69900 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69901 char *buffer, size_t buffer_size)
69902 {
69903- size_t rest = buffer_size;
69904+ size_t rest = buffer_size, total_size = 0;
69905
69906 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
69907 const struct xattr_handler *handler =
69908@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
69909 buffer += size;
69910 }
69911 rest -= size;
69912+ total_size += size;
69913 }
69914 }
69915- return buffer_size - rest;
69916+ return total_size;
69917 }
69918
69919 static int
69920diff --git a/fs/fcntl.c b/fs/fcntl.c
69921index ee85cd4..9dd0d20 100644
69922--- a/fs/fcntl.c
69923+++ b/fs/fcntl.c
69924@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
69925 int force)
69926 {
69927 security_file_set_fowner(filp);
69928+ if (gr_handle_chroot_fowner(pid, type))
69929+ return;
69930+ if (gr_check_protected_task_fowner(pid, type))
69931+ return;
69932 f_modown(filp, pid, type, force);
69933 }
69934 EXPORT_SYMBOL(__f_setown);
69935diff --git a/fs/fhandle.c b/fs/fhandle.c
69936index d59712d..2281df9 100644
69937--- a/fs/fhandle.c
69938+++ b/fs/fhandle.c
69939@@ -8,6 +8,7 @@
69940 #include <linux/fs_struct.h>
69941 #include <linux/fsnotify.h>
69942 #include <linux/personality.h>
69943+#include <linux/grsecurity.h>
69944 #include <asm/uaccess.h>
69945 #include "internal.h"
69946 #include "mount.h"
69947@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
69948 } else
69949 retval = 0;
69950 /* copy the mount id */
69951- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
69952- sizeof(*mnt_id)) ||
69953+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
69954 copy_to_user(ufh, handle,
69955 sizeof(struct file_handle) + handle_bytes))
69956 retval = -EFAULT;
69957@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
69958 * the directory. Ideally we would like CAP_DAC_SEARCH.
69959 * But we don't have that
69960 */
69961- if (!capable(CAP_DAC_READ_SEARCH)) {
69962+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
69963 retval = -EPERM;
69964 goto out_err;
69965 }
69966diff --git a/fs/file.c b/fs/file.c
69967index ee738ea..f6c15629 100644
69968--- a/fs/file.c
69969+++ b/fs/file.c
69970@@ -16,6 +16,7 @@
69971 #include <linux/slab.h>
69972 #include <linux/vmalloc.h>
69973 #include <linux/file.h>
69974+#include <linux/security.h>
69975 #include <linux/fdtable.h>
69976 #include <linux/bitops.h>
69977 #include <linux/interrupt.h>
69978@@ -139,7 +140,7 @@ out:
69979 * Return <0 error code on error; 1 on successful completion.
69980 * The files->file_lock should be held on entry, and will be held on exit.
69981 */
69982-static int expand_fdtable(struct files_struct *files, int nr)
69983+static int expand_fdtable(struct files_struct *files, unsigned int nr)
69984 __releases(files->file_lock)
69985 __acquires(files->file_lock)
69986 {
69987@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
69988 * expanded and execution may have blocked.
69989 * The files->file_lock should be held on entry, and will be held on exit.
69990 */
69991-static int expand_files(struct files_struct *files, int nr)
69992+static int expand_files(struct files_struct *files, unsigned int nr)
69993 {
69994 struct fdtable *fdt;
69995
69996@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
69997 if (!file)
69998 return __close_fd(files, fd);
69999
70000+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
70001 if (fd >= rlimit(RLIMIT_NOFILE))
70002 return -EBADF;
70003
70004@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
70005 if (unlikely(oldfd == newfd))
70006 return -EINVAL;
70007
70008+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
70009 if (newfd >= rlimit(RLIMIT_NOFILE))
70010 return -EBADF;
70011
70012@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
70013 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
70014 {
70015 int err;
70016+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
70017 if (from >= rlimit(RLIMIT_NOFILE))
70018 return -EINVAL;
70019 err = alloc_fd(from, flags);
70020diff --git a/fs/filesystems.c b/fs/filesystems.c
70021index 5797d45..7d7d79a 100644
70022--- a/fs/filesystems.c
70023+++ b/fs/filesystems.c
70024@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
70025 int len = dot ? dot - name : strlen(name);
70026
70027 fs = __get_fs_type(name, len);
70028+#ifdef CONFIG_GRKERNSEC_MODHARDEN
70029+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
70030+#else
70031 if (!fs && (request_module("fs-%.*s", len, name) == 0))
70032+#endif
70033 fs = __get_fs_type(name, len);
70034
70035 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
70036diff --git a/fs/fs_struct.c b/fs/fs_struct.c
70037index 7dca743..1ff87ae 100644
70038--- a/fs/fs_struct.c
70039+++ b/fs/fs_struct.c
70040@@ -4,6 +4,7 @@
70041 #include <linux/path.h>
70042 #include <linux/slab.h>
70043 #include <linux/fs_struct.h>
70044+#include <linux/grsecurity.h>
70045 #include "internal.h"
70046
70047 /*
70048@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
70049 struct path old_root;
70050
70051 path_get(path);
70052+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
70053 spin_lock(&fs->lock);
70054 write_seqcount_begin(&fs->seq);
70055 old_root = fs->root;
70056 fs->root = *path;
70057+ gr_set_chroot_entries(current, path);
70058 write_seqcount_end(&fs->seq);
70059 spin_unlock(&fs->lock);
70060- if (old_root.dentry)
70061+ if (old_root.dentry) {
70062+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
70063 path_put(&old_root);
70064+ }
70065 }
70066
70067 /*
70068@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70069 int hits = 0;
70070 spin_lock(&fs->lock);
70071 write_seqcount_begin(&fs->seq);
70072+ /* this root replacement is only done by pivot_root,
70073+ leave grsec's chroot tagging alone for this task
70074+ so that a pivoted root isn't treated as a chroot
70075+ */
70076 hits += replace_path(&fs->root, old_root, new_root);
70077 hits += replace_path(&fs->pwd, old_root, new_root);
70078 write_seqcount_end(&fs->seq);
70079@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
70080
70081 void free_fs_struct(struct fs_struct *fs)
70082 {
70083+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70084 path_put(&fs->root);
70085 path_put(&fs->pwd);
70086 kmem_cache_free(fs_cachep, fs);
70087@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
70088 task_lock(tsk);
70089 spin_lock(&fs->lock);
70090 tsk->fs = NULL;
70091- kill = !--fs->users;
70092+ gr_clear_chroot_entries(tsk);
70093+ kill = !atomic_dec_return(&fs->users);
70094 spin_unlock(&fs->lock);
70095 task_unlock(tsk);
70096 if (kill)
70097@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70098 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
70099 /* We don't need to lock fs - think why ;-) */
70100 if (fs) {
70101- fs->users = 1;
70102+ atomic_set(&fs->users, 1);
70103 fs->in_exec = 0;
70104 spin_lock_init(&fs->lock);
70105 seqcount_init(&fs->seq);
70106@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
70107 spin_lock(&old->lock);
70108 fs->root = old->root;
70109 path_get(&fs->root);
70110+ /* instead of calling gr_set_chroot_entries here,
70111+ we call it from every caller of this function
70112+ */
70113 fs->pwd = old->pwd;
70114 path_get(&fs->pwd);
70115 spin_unlock(&old->lock);
70116+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
70117 }
70118 return fs;
70119 }
70120@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
70121
70122 task_lock(current);
70123 spin_lock(&fs->lock);
70124- kill = !--fs->users;
70125+ kill = !atomic_dec_return(&fs->users);
70126 current->fs = new_fs;
70127+ gr_set_chroot_entries(current, &new_fs->root);
70128 spin_unlock(&fs->lock);
70129 task_unlock(current);
70130
70131@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
70132
70133 int current_umask(void)
70134 {
70135- return current->fs->umask;
70136+ return current->fs->umask | gr_acl_umask();
70137 }
70138 EXPORT_SYMBOL(current_umask);
70139
70140 /* to be mentioned only in INIT_TASK */
70141 struct fs_struct init_fs = {
70142- .users = 1,
70143+ .users = ATOMIC_INIT(1),
70144 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
70145 .seq = SEQCNT_ZERO(init_fs.seq),
70146 .umask = 0022,
70147diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
70148index 89acec7..a575262 100644
70149--- a/fs/fscache/cookie.c
70150+++ b/fs/fscache/cookie.c
70151@@ -19,7 +19,7 @@
70152
70153 struct kmem_cache *fscache_cookie_jar;
70154
70155-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
70156+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
70157
70158 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
70159 static int fscache_alloc_object(struct fscache_cache *cache,
70160@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
70161 parent ? (char *) parent->def->name : "<no-parent>",
70162 def->name, netfs_data, enable);
70163
70164- fscache_stat(&fscache_n_acquires);
70165+ fscache_stat_unchecked(&fscache_n_acquires);
70166
70167 /* if there's no parent cookie, then we don't create one here either */
70168 if (!parent) {
70169- fscache_stat(&fscache_n_acquires_null);
70170+ fscache_stat_unchecked(&fscache_n_acquires_null);
70171 _leave(" [no parent]");
70172 return NULL;
70173 }
70174@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70175 /* allocate and initialise a cookie */
70176 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
70177 if (!cookie) {
70178- fscache_stat(&fscache_n_acquires_oom);
70179+ fscache_stat_unchecked(&fscache_n_acquires_oom);
70180 _leave(" [ENOMEM]");
70181 return NULL;
70182 }
70183@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
70184
70185 switch (cookie->def->type) {
70186 case FSCACHE_COOKIE_TYPE_INDEX:
70187- fscache_stat(&fscache_n_cookie_index);
70188+ fscache_stat_unchecked(&fscache_n_cookie_index);
70189 break;
70190 case FSCACHE_COOKIE_TYPE_DATAFILE:
70191- fscache_stat(&fscache_n_cookie_data);
70192+ fscache_stat_unchecked(&fscache_n_cookie_data);
70193 break;
70194 default:
70195- fscache_stat(&fscache_n_cookie_special);
70196+ fscache_stat_unchecked(&fscache_n_cookie_special);
70197 break;
70198 }
70199
70200@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70201 } else {
70202 atomic_dec(&parent->n_children);
70203 __fscache_cookie_put(cookie);
70204- fscache_stat(&fscache_n_acquires_nobufs);
70205+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
70206 _leave(" = NULL");
70207 return NULL;
70208 }
70209@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
70210 }
70211 }
70212
70213- fscache_stat(&fscache_n_acquires_ok);
70214+ fscache_stat_unchecked(&fscache_n_acquires_ok);
70215 _leave(" = %p", cookie);
70216 return cookie;
70217 }
70218@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
70219 cache = fscache_select_cache_for_object(cookie->parent);
70220 if (!cache) {
70221 up_read(&fscache_addremove_sem);
70222- fscache_stat(&fscache_n_acquires_no_cache);
70223+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
70224 _leave(" = -ENOMEDIUM [no cache]");
70225 return -ENOMEDIUM;
70226 }
70227@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
70228 object = cache->ops->alloc_object(cache, cookie);
70229 fscache_stat_d(&fscache_n_cop_alloc_object);
70230 if (IS_ERR(object)) {
70231- fscache_stat(&fscache_n_object_no_alloc);
70232+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
70233 ret = PTR_ERR(object);
70234 goto error;
70235 }
70236
70237- fscache_stat(&fscache_n_object_alloc);
70238+ fscache_stat_unchecked(&fscache_n_object_alloc);
70239
70240- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
70241+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
70242
70243 _debug("ALLOC OBJ%x: %s {%lx}",
70244 object->debug_id, cookie->def->name, object->events);
70245@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
70246
70247 _enter("{%s}", cookie->def->name);
70248
70249- fscache_stat(&fscache_n_invalidates);
70250+ fscache_stat_unchecked(&fscache_n_invalidates);
70251
70252 /* Only permit invalidation of data files. Invalidating an index will
70253 * require the caller to release all its attachments to the tree rooted
70254@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
70255 {
70256 struct fscache_object *object;
70257
70258- fscache_stat(&fscache_n_updates);
70259+ fscache_stat_unchecked(&fscache_n_updates);
70260
70261 if (!cookie) {
70262- fscache_stat(&fscache_n_updates_null);
70263+ fscache_stat_unchecked(&fscache_n_updates_null);
70264 _leave(" [no cookie]");
70265 return;
70266 }
70267@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
70268 */
70269 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
70270 {
70271- fscache_stat(&fscache_n_relinquishes);
70272+ fscache_stat_unchecked(&fscache_n_relinquishes);
70273 if (retire)
70274- fscache_stat(&fscache_n_relinquishes_retire);
70275+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
70276
70277 if (!cookie) {
70278- fscache_stat(&fscache_n_relinquishes_null);
70279+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
70280 _leave(" [no cookie]");
70281 return;
70282 }
70283@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
70284 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
70285 goto inconsistent;
70286
70287- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
70288+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
70289
70290 __fscache_use_cookie(cookie);
70291 if (fscache_submit_op(object, op) < 0)
70292diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
70293index 7872a62..d91b19f 100644
70294--- a/fs/fscache/internal.h
70295+++ b/fs/fscache/internal.h
70296@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
70297 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
70298 extern int fscache_wait_for_operation_activation(struct fscache_object *,
70299 struct fscache_operation *,
70300- atomic_t *,
70301- atomic_t *,
70302+ atomic_unchecked_t *,
70303+ atomic_unchecked_t *,
70304 void (*)(struct fscache_operation *));
70305 extern void fscache_invalidate_writes(struct fscache_cookie *);
70306
70307@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
70308 * stats.c
70309 */
70310 #ifdef CONFIG_FSCACHE_STATS
70311-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70312-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70313+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
70314+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
70315
70316-extern atomic_t fscache_n_op_pend;
70317-extern atomic_t fscache_n_op_run;
70318-extern atomic_t fscache_n_op_enqueue;
70319-extern atomic_t fscache_n_op_deferred_release;
70320-extern atomic_t fscache_n_op_release;
70321-extern atomic_t fscache_n_op_gc;
70322-extern atomic_t fscache_n_op_cancelled;
70323-extern atomic_t fscache_n_op_rejected;
70324+extern atomic_unchecked_t fscache_n_op_pend;
70325+extern atomic_unchecked_t fscache_n_op_run;
70326+extern atomic_unchecked_t fscache_n_op_enqueue;
70327+extern atomic_unchecked_t fscache_n_op_deferred_release;
70328+extern atomic_unchecked_t fscache_n_op_release;
70329+extern atomic_unchecked_t fscache_n_op_gc;
70330+extern atomic_unchecked_t fscache_n_op_cancelled;
70331+extern atomic_unchecked_t fscache_n_op_rejected;
70332
70333-extern atomic_t fscache_n_attr_changed;
70334-extern atomic_t fscache_n_attr_changed_ok;
70335-extern atomic_t fscache_n_attr_changed_nobufs;
70336-extern atomic_t fscache_n_attr_changed_nomem;
70337-extern atomic_t fscache_n_attr_changed_calls;
70338+extern atomic_unchecked_t fscache_n_attr_changed;
70339+extern atomic_unchecked_t fscache_n_attr_changed_ok;
70340+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
70341+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
70342+extern atomic_unchecked_t fscache_n_attr_changed_calls;
70343
70344-extern atomic_t fscache_n_allocs;
70345-extern atomic_t fscache_n_allocs_ok;
70346-extern atomic_t fscache_n_allocs_wait;
70347-extern atomic_t fscache_n_allocs_nobufs;
70348-extern atomic_t fscache_n_allocs_intr;
70349-extern atomic_t fscache_n_allocs_object_dead;
70350-extern atomic_t fscache_n_alloc_ops;
70351-extern atomic_t fscache_n_alloc_op_waits;
70352+extern atomic_unchecked_t fscache_n_allocs;
70353+extern atomic_unchecked_t fscache_n_allocs_ok;
70354+extern atomic_unchecked_t fscache_n_allocs_wait;
70355+extern atomic_unchecked_t fscache_n_allocs_nobufs;
70356+extern atomic_unchecked_t fscache_n_allocs_intr;
70357+extern atomic_unchecked_t fscache_n_allocs_object_dead;
70358+extern atomic_unchecked_t fscache_n_alloc_ops;
70359+extern atomic_unchecked_t fscache_n_alloc_op_waits;
70360
70361-extern atomic_t fscache_n_retrievals;
70362-extern atomic_t fscache_n_retrievals_ok;
70363-extern atomic_t fscache_n_retrievals_wait;
70364-extern atomic_t fscache_n_retrievals_nodata;
70365-extern atomic_t fscache_n_retrievals_nobufs;
70366-extern atomic_t fscache_n_retrievals_intr;
70367-extern atomic_t fscache_n_retrievals_nomem;
70368-extern atomic_t fscache_n_retrievals_object_dead;
70369-extern atomic_t fscache_n_retrieval_ops;
70370-extern atomic_t fscache_n_retrieval_op_waits;
70371+extern atomic_unchecked_t fscache_n_retrievals;
70372+extern atomic_unchecked_t fscache_n_retrievals_ok;
70373+extern atomic_unchecked_t fscache_n_retrievals_wait;
70374+extern atomic_unchecked_t fscache_n_retrievals_nodata;
70375+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
70376+extern atomic_unchecked_t fscache_n_retrievals_intr;
70377+extern atomic_unchecked_t fscache_n_retrievals_nomem;
70378+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
70379+extern atomic_unchecked_t fscache_n_retrieval_ops;
70380+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
70381
70382-extern atomic_t fscache_n_stores;
70383-extern atomic_t fscache_n_stores_ok;
70384-extern atomic_t fscache_n_stores_again;
70385-extern atomic_t fscache_n_stores_nobufs;
70386-extern atomic_t fscache_n_stores_oom;
70387-extern atomic_t fscache_n_store_ops;
70388-extern atomic_t fscache_n_store_calls;
70389-extern atomic_t fscache_n_store_pages;
70390-extern atomic_t fscache_n_store_radix_deletes;
70391-extern atomic_t fscache_n_store_pages_over_limit;
70392+extern atomic_unchecked_t fscache_n_stores;
70393+extern atomic_unchecked_t fscache_n_stores_ok;
70394+extern atomic_unchecked_t fscache_n_stores_again;
70395+extern atomic_unchecked_t fscache_n_stores_nobufs;
70396+extern atomic_unchecked_t fscache_n_stores_oom;
70397+extern atomic_unchecked_t fscache_n_store_ops;
70398+extern atomic_unchecked_t fscache_n_store_calls;
70399+extern atomic_unchecked_t fscache_n_store_pages;
70400+extern atomic_unchecked_t fscache_n_store_radix_deletes;
70401+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
70402
70403-extern atomic_t fscache_n_store_vmscan_not_storing;
70404-extern atomic_t fscache_n_store_vmscan_gone;
70405-extern atomic_t fscache_n_store_vmscan_busy;
70406-extern atomic_t fscache_n_store_vmscan_cancelled;
70407-extern atomic_t fscache_n_store_vmscan_wait;
70408+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
70409+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
70410+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
70411+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
70412+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
70413
70414-extern atomic_t fscache_n_marks;
70415-extern atomic_t fscache_n_uncaches;
70416+extern atomic_unchecked_t fscache_n_marks;
70417+extern atomic_unchecked_t fscache_n_uncaches;
70418
70419-extern atomic_t fscache_n_acquires;
70420-extern atomic_t fscache_n_acquires_null;
70421-extern atomic_t fscache_n_acquires_no_cache;
70422-extern atomic_t fscache_n_acquires_ok;
70423-extern atomic_t fscache_n_acquires_nobufs;
70424-extern atomic_t fscache_n_acquires_oom;
70425+extern atomic_unchecked_t fscache_n_acquires;
70426+extern atomic_unchecked_t fscache_n_acquires_null;
70427+extern atomic_unchecked_t fscache_n_acquires_no_cache;
70428+extern atomic_unchecked_t fscache_n_acquires_ok;
70429+extern atomic_unchecked_t fscache_n_acquires_nobufs;
70430+extern atomic_unchecked_t fscache_n_acquires_oom;
70431
70432-extern atomic_t fscache_n_invalidates;
70433-extern atomic_t fscache_n_invalidates_run;
70434+extern atomic_unchecked_t fscache_n_invalidates;
70435+extern atomic_unchecked_t fscache_n_invalidates_run;
70436
70437-extern atomic_t fscache_n_updates;
70438-extern atomic_t fscache_n_updates_null;
70439-extern atomic_t fscache_n_updates_run;
70440+extern atomic_unchecked_t fscache_n_updates;
70441+extern atomic_unchecked_t fscache_n_updates_null;
70442+extern atomic_unchecked_t fscache_n_updates_run;
70443
70444-extern atomic_t fscache_n_relinquishes;
70445-extern atomic_t fscache_n_relinquishes_null;
70446-extern atomic_t fscache_n_relinquishes_waitcrt;
70447-extern atomic_t fscache_n_relinquishes_retire;
70448+extern atomic_unchecked_t fscache_n_relinquishes;
70449+extern atomic_unchecked_t fscache_n_relinquishes_null;
70450+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
70451+extern atomic_unchecked_t fscache_n_relinquishes_retire;
70452
70453-extern atomic_t fscache_n_cookie_index;
70454-extern atomic_t fscache_n_cookie_data;
70455-extern atomic_t fscache_n_cookie_special;
70456+extern atomic_unchecked_t fscache_n_cookie_index;
70457+extern atomic_unchecked_t fscache_n_cookie_data;
70458+extern atomic_unchecked_t fscache_n_cookie_special;
70459
70460-extern atomic_t fscache_n_object_alloc;
70461-extern atomic_t fscache_n_object_no_alloc;
70462-extern atomic_t fscache_n_object_lookups;
70463-extern atomic_t fscache_n_object_lookups_negative;
70464-extern atomic_t fscache_n_object_lookups_positive;
70465-extern atomic_t fscache_n_object_lookups_timed_out;
70466-extern atomic_t fscache_n_object_created;
70467-extern atomic_t fscache_n_object_avail;
70468-extern atomic_t fscache_n_object_dead;
70469+extern atomic_unchecked_t fscache_n_object_alloc;
70470+extern atomic_unchecked_t fscache_n_object_no_alloc;
70471+extern atomic_unchecked_t fscache_n_object_lookups;
70472+extern atomic_unchecked_t fscache_n_object_lookups_negative;
70473+extern atomic_unchecked_t fscache_n_object_lookups_positive;
70474+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
70475+extern atomic_unchecked_t fscache_n_object_created;
70476+extern atomic_unchecked_t fscache_n_object_avail;
70477+extern atomic_unchecked_t fscache_n_object_dead;
70478
70479-extern atomic_t fscache_n_checkaux_none;
70480-extern atomic_t fscache_n_checkaux_okay;
70481-extern atomic_t fscache_n_checkaux_update;
70482-extern atomic_t fscache_n_checkaux_obsolete;
70483+extern atomic_unchecked_t fscache_n_checkaux_none;
70484+extern atomic_unchecked_t fscache_n_checkaux_okay;
70485+extern atomic_unchecked_t fscache_n_checkaux_update;
70486+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
70487
70488 extern atomic_t fscache_n_cop_alloc_object;
70489 extern atomic_t fscache_n_cop_lookup_object;
70490@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
70491 atomic_inc(stat);
70492 }
70493
70494+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
70495+{
70496+ atomic_inc_unchecked(stat);
70497+}
70498+
70499 static inline void fscache_stat_d(atomic_t *stat)
70500 {
70501 atomic_dec(stat);
70502@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
70503
70504 #define __fscache_stat(stat) (NULL)
70505 #define fscache_stat(stat) do {} while (0)
70506+#define fscache_stat_unchecked(stat) do {} while (0)
70507 #define fscache_stat_d(stat) do {} while (0)
70508 #endif
70509
70510diff --git a/fs/fscache/object.c b/fs/fscache/object.c
70511index da032da..0076ce7 100644
70512--- a/fs/fscache/object.c
70513+++ b/fs/fscache/object.c
70514@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70515 _debug("LOOKUP \"%s\" in \"%s\"",
70516 cookie->def->name, object->cache->tag->name);
70517
70518- fscache_stat(&fscache_n_object_lookups);
70519+ fscache_stat_unchecked(&fscache_n_object_lookups);
70520 fscache_stat(&fscache_n_cop_lookup_object);
70521 ret = object->cache->ops->lookup_object(object);
70522 fscache_stat_d(&fscache_n_cop_lookup_object);
70523@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
70524 if (ret == -ETIMEDOUT) {
70525 /* probably stuck behind another object, so move this one to
70526 * the back of the queue */
70527- fscache_stat(&fscache_n_object_lookups_timed_out);
70528+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
70529 _leave(" [timeout]");
70530 return NO_TRANSIT;
70531 }
70532@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
70533 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
70534
70535 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70536- fscache_stat(&fscache_n_object_lookups_negative);
70537+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
70538
70539 /* Allow write requests to begin stacking up and read requests to begin
70540 * returning ENODATA.
70541@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
70542 /* if we were still looking up, then we must have a positive lookup
70543 * result, in which case there may be data available */
70544 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
70545- fscache_stat(&fscache_n_object_lookups_positive);
70546+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
70547
70548 /* We do (presumably) have data */
70549 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
70550@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
70551 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
70552 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
70553 } else {
70554- fscache_stat(&fscache_n_object_created);
70555+ fscache_stat_unchecked(&fscache_n_object_created);
70556 }
70557
70558 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
70559@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
70560 fscache_stat_d(&fscache_n_cop_lookup_complete);
70561
70562 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
70563- fscache_stat(&fscache_n_object_avail);
70564+ fscache_stat_unchecked(&fscache_n_object_avail);
70565
70566 _leave("");
70567 return transit_to(JUMPSTART_DEPS);
70568@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
70569
70570 /* this just shifts the object release to the work processor */
70571 fscache_put_object(object);
70572- fscache_stat(&fscache_n_object_dead);
70573+ fscache_stat_unchecked(&fscache_n_object_dead);
70574
70575 _leave("");
70576 return transit_to(OBJECT_DEAD);
70577@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70578 enum fscache_checkaux result;
70579
70580 if (!object->cookie->def->check_aux) {
70581- fscache_stat(&fscache_n_checkaux_none);
70582+ fscache_stat_unchecked(&fscache_n_checkaux_none);
70583 return FSCACHE_CHECKAUX_OKAY;
70584 }
70585
70586@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
70587 switch (result) {
70588 /* entry okay as is */
70589 case FSCACHE_CHECKAUX_OKAY:
70590- fscache_stat(&fscache_n_checkaux_okay);
70591+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
70592 break;
70593
70594 /* entry requires update */
70595 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
70596- fscache_stat(&fscache_n_checkaux_update);
70597+ fscache_stat_unchecked(&fscache_n_checkaux_update);
70598 break;
70599
70600 /* entry requires deletion */
70601 case FSCACHE_CHECKAUX_OBSOLETE:
70602- fscache_stat(&fscache_n_checkaux_obsolete);
70603+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
70604 break;
70605
70606 default:
70607@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
70608 {
70609 const struct fscache_state *s;
70610
70611- fscache_stat(&fscache_n_invalidates_run);
70612+ fscache_stat_unchecked(&fscache_n_invalidates_run);
70613 fscache_stat(&fscache_n_cop_invalidate_object);
70614 s = _fscache_invalidate_object(object, event);
70615 fscache_stat_d(&fscache_n_cop_invalidate_object);
70616@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
70617 {
70618 _enter("{OBJ%x},%d", object->debug_id, event);
70619
70620- fscache_stat(&fscache_n_updates_run);
70621+ fscache_stat_unchecked(&fscache_n_updates_run);
70622 fscache_stat(&fscache_n_cop_update_object);
70623 object->cache->ops->update_object(object);
70624 fscache_stat_d(&fscache_n_cop_update_object);
70625diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
70626index e7b87a0..a85d47a 100644
70627--- a/fs/fscache/operation.c
70628+++ b/fs/fscache/operation.c
70629@@ -17,7 +17,7 @@
70630 #include <linux/slab.h>
70631 #include "internal.h"
70632
70633-atomic_t fscache_op_debug_id;
70634+atomic_unchecked_t fscache_op_debug_id;
70635 EXPORT_SYMBOL(fscache_op_debug_id);
70636
70637 /**
70638@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
70639 ASSERTCMP(atomic_read(&op->usage), >, 0);
70640 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
70641
70642- fscache_stat(&fscache_n_op_enqueue);
70643+ fscache_stat_unchecked(&fscache_n_op_enqueue);
70644 switch (op->flags & FSCACHE_OP_TYPE) {
70645 case FSCACHE_OP_ASYNC:
70646 _debug("queue async");
70647@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
70648 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
70649 if (op->processor)
70650 fscache_enqueue_operation(op);
70651- fscache_stat(&fscache_n_op_run);
70652+ fscache_stat_unchecked(&fscache_n_op_run);
70653 }
70654
70655 /*
70656@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70657 if (object->n_in_progress > 0) {
70658 atomic_inc(&op->usage);
70659 list_add_tail(&op->pend_link, &object->pending_ops);
70660- fscache_stat(&fscache_n_op_pend);
70661+ fscache_stat_unchecked(&fscache_n_op_pend);
70662 } else if (!list_empty(&object->pending_ops)) {
70663 atomic_inc(&op->usage);
70664 list_add_tail(&op->pend_link, &object->pending_ops);
70665- fscache_stat(&fscache_n_op_pend);
70666+ fscache_stat_unchecked(&fscache_n_op_pend);
70667 fscache_start_operations(object);
70668 } else {
70669 ASSERTCMP(object->n_in_progress, ==, 0);
70670@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
70671 object->n_exclusive++; /* reads and writes must wait */
70672 atomic_inc(&op->usage);
70673 list_add_tail(&op->pend_link, &object->pending_ops);
70674- fscache_stat(&fscache_n_op_pend);
70675+ fscache_stat_unchecked(&fscache_n_op_pend);
70676 ret = 0;
70677 } else {
70678 /* If we're in any other state, there must have been an I/O
70679@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
70680 if (object->n_exclusive > 0) {
70681 atomic_inc(&op->usage);
70682 list_add_tail(&op->pend_link, &object->pending_ops);
70683- fscache_stat(&fscache_n_op_pend);
70684+ fscache_stat_unchecked(&fscache_n_op_pend);
70685 } else if (!list_empty(&object->pending_ops)) {
70686 atomic_inc(&op->usage);
70687 list_add_tail(&op->pend_link, &object->pending_ops);
70688- fscache_stat(&fscache_n_op_pend);
70689+ fscache_stat_unchecked(&fscache_n_op_pend);
70690 fscache_start_operations(object);
70691 } else {
70692 ASSERTCMP(object->n_exclusive, ==, 0);
70693@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
70694 object->n_ops++;
70695 atomic_inc(&op->usage);
70696 list_add_tail(&op->pend_link, &object->pending_ops);
70697- fscache_stat(&fscache_n_op_pend);
70698+ fscache_stat_unchecked(&fscache_n_op_pend);
70699 ret = 0;
70700 } else if (fscache_object_is_dying(object)) {
70701- fscache_stat(&fscache_n_op_rejected);
70702+ fscache_stat_unchecked(&fscache_n_op_rejected);
70703 op->state = FSCACHE_OP_ST_CANCELLED;
70704 ret = -ENOBUFS;
70705 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
70706@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
70707 ret = -EBUSY;
70708 if (op->state == FSCACHE_OP_ST_PENDING) {
70709 ASSERT(!list_empty(&op->pend_link));
70710- fscache_stat(&fscache_n_op_cancelled);
70711+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70712 list_del_init(&op->pend_link);
70713 if (do_cancel)
70714 do_cancel(op);
70715@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
70716 while (!list_empty(&object->pending_ops)) {
70717 op = list_entry(object->pending_ops.next,
70718 struct fscache_operation, pend_link);
70719- fscache_stat(&fscache_n_op_cancelled);
70720+ fscache_stat_unchecked(&fscache_n_op_cancelled);
70721 list_del_init(&op->pend_link);
70722
70723 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
70724@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
70725 op->state, ==, FSCACHE_OP_ST_CANCELLED);
70726 op->state = FSCACHE_OP_ST_DEAD;
70727
70728- fscache_stat(&fscache_n_op_release);
70729+ fscache_stat_unchecked(&fscache_n_op_release);
70730
70731 if (op->release) {
70732 op->release(op);
70733@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
70734 * lock, and defer it otherwise */
70735 if (!spin_trylock(&object->lock)) {
70736 _debug("defer put");
70737- fscache_stat(&fscache_n_op_deferred_release);
70738+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
70739
70740 cache = object->cache;
70741 spin_lock(&cache->op_gc_list_lock);
70742@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
70743
70744 _debug("GC DEFERRED REL OBJ%x OP%x",
70745 object->debug_id, op->debug_id);
70746- fscache_stat(&fscache_n_op_gc);
70747+ fscache_stat_unchecked(&fscache_n_op_gc);
70748
70749 ASSERTCMP(atomic_read(&op->usage), ==, 0);
70750 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
70751diff --git a/fs/fscache/page.c b/fs/fscache/page.c
70752index de33b3f..8be4d29 100644
70753--- a/fs/fscache/page.c
70754+++ b/fs/fscache/page.c
70755@@ -74,7 +74,7 @@ try_again:
70756 val = radix_tree_lookup(&cookie->stores, page->index);
70757 if (!val) {
70758 rcu_read_unlock();
70759- fscache_stat(&fscache_n_store_vmscan_not_storing);
70760+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
70761 __fscache_uncache_page(cookie, page);
70762 return true;
70763 }
70764@@ -104,11 +104,11 @@ try_again:
70765 spin_unlock(&cookie->stores_lock);
70766
70767 if (xpage) {
70768- fscache_stat(&fscache_n_store_vmscan_cancelled);
70769- fscache_stat(&fscache_n_store_radix_deletes);
70770+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
70771+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70772 ASSERTCMP(xpage, ==, page);
70773 } else {
70774- fscache_stat(&fscache_n_store_vmscan_gone);
70775+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
70776 }
70777
70778 wake_up_bit(&cookie->flags, 0);
70779@@ -123,11 +123,11 @@ page_busy:
70780 * sleeping on memory allocation, so we may need to impose a timeout
70781 * too. */
70782 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
70783- fscache_stat(&fscache_n_store_vmscan_busy);
70784+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
70785 return false;
70786 }
70787
70788- fscache_stat(&fscache_n_store_vmscan_wait);
70789+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
70790 if (!release_page_wait_timeout(cookie, page))
70791 _debug("fscache writeout timeout page: %p{%lx}",
70792 page, page->index);
70793@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
70794 FSCACHE_COOKIE_STORING_TAG);
70795 if (!radix_tree_tag_get(&cookie->stores, page->index,
70796 FSCACHE_COOKIE_PENDING_TAG)) {
70797- fscache_stat(&fscache_n_store_radix_deletes);
70798+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
70799 xpage = radix_tree_delete(&cookie->stores, page->index);
70800 }
70801 spin_unlock(&cookie->stores_lock);
70802@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
70803
70804 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
70805
70806- fscache_stat(&fscache_n_attr_changed_calls);
70807+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
70808
70809 if (fscache_object_is_active(object)) {
70810 fscache_stat(&fscache_n_cop_attr_changed);
70811@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70812
70813 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
70814
70815- fscache_stat(&fscache_n_attr_changed);
70816+ fscache_stat_unchecked(&fscache_n_attr_changed);
70817
70818 op = kzalloc(sizeof(*op), GFP_KERNEL);
70819 if (!op) {
70820- fscache_stat(&fscache_n_attr_changed_nomem);
70821+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
70822 _leave(" = -ENOMEM");
70823 return -ENOMEM;
70824 }
70825@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
70826 if (fscache_submit_exclusive_op(object, op) < 0)
70827 goto nobufs_dec;
70828 spin_unlock(&cookie->lock);
70829- fscache_stat(&fscache_n_attr_changed_ok);
70830+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
70831 fscache_put_operation(op);
70832 _leave(" = 0");
70833 return 0;
70834@@ -242,7 +242,7 @@ nobufs:
70835 kfree(op);
70836 if (wake_cookie)
70837 __fscache_wake_unused_cookie(cookie);
70838- fscache_stat(&fscache_n_attr_changed_nobufs);
70839+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
70840 _leave(" = %d", -ENOBUFS);
70841 return -ENOBUFS;
70842 }
70843@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
70844 /* allocate a retrieval operation and attempt to submit it */
70845 op = kzalloc(sizeof(*op), GFP_NOIO);
70846 if (!op) {
70847- fscache_stat(&fscache_n_retrievals_nomem);
70848+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70849 return NULL;
70850 }
70851
70852@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
70853 return 0;
70854 }
70855
70856- fscache_stat(&fscache_n_retrievals_wait);
70857+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
70858
70859 jif = jiffies;
70860 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
70861 TASK_INTERRUPTIBLE) != 0) {
70862- fscache_stat(&fscache_n_retrievals_intr);
70863+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70864 _leave(" = -ERESTARTSYS");
70865 return -ERESTARTSYS;
70866 }
70867@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
70868 */
70869 int fscache_wait_for_operation_activation(struct fscache_object *object,
70870 struct fscache_operation *op,
70871- atomic_t *stat_op_waits,
70872- atomic_t *stat_object_dead,
70873+ atomic_unchecked_t *stat_op_waits,
70874+ atomic_unchecked_t *stat_object_dead,
70875 void (*do_cancel)(struct fscache_operation *))
70876 {
70877 int ret;
70878@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70879
70880 _debug(">>> WT");
70881 if (stat_op_waits)
70882- fscache_stat(stat_op_waits);
70883+ fscache_stat_unchecked(stat_op_waits);
70884 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
70885 TASK_INTERRUPTIBLE) != 0) {
70886 ret = fscache_cancel_op(op, do_cancel);
70887@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
70888 check_if_dead:
70889 if (op->state == FSCACHE_OP_ST_CANCELLED) {
70890 if (stat_object_dead)
70891- fscache_stat(stat_object_dead);
70892+ fscache_stat_unchecked(stat_object_dead);
70893 _leave(" = -ENOBUFS [cancelled]");
70894 return -ENOBUFS;
70895 }
70896@@ -381,7 +381,7 @@ check_if_dead:
70897 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
70898 fscache_cancel_op(op, do_cancel);
70899 if (stat_object_dead)
70900- fscache_stat(stat_object_dead);
70901+ fscache_stat_unchecked(stat_object_dead);
70902 return -ENOBUFS;
70903 }
70904 return 0;
70905@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70906
70907 _enter("%p,%p,,,", cookie, page);
70908
70909- fscache_stat(&fscache_n_retrievals);
70910+ fscache_stat_unchecked(&fscache_n_retrievals);
70911
70912 if (hlist_empty(&cookie->backing_objects))
70913 goto nobufs;
70914@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70915 goto nobufs_unlock_dec;
70916 spin_unlock(&cookie->lock);
70917
70918- fscache_stat(&fscache_n_retrieval_ops);
70919+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70920
70921 /* pin the netfs read context in case we need to do the actual netfs
70922 * read because we've encountered a cache read failure */
70923@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
70924
70925 error:
70926 if (ret == -ENOMEM)
70927- fscache_stat(&fscache_n_retrievals_nomem);
70928+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70929 else if (ret == -ERESTARTSYS)
70930- fscache_stat(&fscache_n_retrievals_intr);
70931+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70932 else if (ret == -ENODATA)
70933- fscache_stat(&fscache_n_retrievals_nodata);
70934+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70935 else if (ret < 0)
70936- fscache_stat(&fscache_n_retrievals_nobufs);
70937+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70938 else
70939- fscache_stat(&fscache_n_retrievals_ok);
70940+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70941
70942 fscache_put_retrieval(op);
70943 _leave(" = %d", ret);
70944@@ -505,7 +505,7 @@ nobufs_unlock:
70945 __fscache_wake_unused_cookie(cookie);
70946 kfree(op);
70947 nobufs:
70948- fscache_stat(&fscache_n_retrievals_nobufs);
70949+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70950 _leave(" = -ENOBUFS");
70951 return -ENOBUFS;
70952 }
70953@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70954
70955 _enter("%p,,%d,,,", cookie, *nr_pages);
70956
70957- fscache_stat(&fscache_n_retrievals);
70958+ fscache_stat_unchecked(&fscache_n_retrievals);
70959
70960 if (hlist_empty(&cookie->backing_objects))
70961 goto nobufs;
70962@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70963 goto nobufs_unlock_dec;
70964 spin_unlock(&cookie->lock);
70965
70966- fscache_stat(&fscache_n_retrieval_ops);
70967+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
70968
70969 /* pin the netfs read context in case we need to do the actual netfs
70970 * read because we've encountered a cache read failure */
70971@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
70972
70973 error:
70974 if (ret == -ENOMEM)
70975- fscache_stat(&fscache_n_retrievals_nomem);
70976+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
70977 else if (ret == -ERESTARTSYS)
70978- fscache_stat(&fscache_n_retrievals_intr);
70979+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
70980 else if (ret == -ENODATA)
70981- fscache_stat(&fscache_n_retrievals_nodata);
70982+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
70983 else if (ret < 0)
70984- fscache_stat(&fscache_n_retrievals_nobufs);
70985+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70986 else
70987- fscache_stat(&fscache_n_retrievals_ok);
70988+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
70989
70990 fscache_put_retrieval(op);
70991 _leave(" = %d", ret);
70992@@ -636,7 +636,7 @@ nobufs_unlock:
70993 if (wake_cookie)
70994 __fscache_wake_unused_cookie(cookie);
70995 nobufs:
70996- fscache_stat(&fscache_n_retrievals_nobufs);
70997+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
70998 _leave(" = -ENOBUFS");
70999 return -ENOBUFS;
71000 }
71001@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71002
71003 _enter("%p,%p,,,", cookie, page);
71004
71005- fscache_stat(&fscache_n_allocs);
71006+ fscache_stat_unchecked(&fscache_n_allocs);
71007
71008 if (hlist_empty(&cookie->backing_objects))
71009 goto nobufs;
71010@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71011 goto nobufs_unlock_dec;
71012 spin_unlock(&cookie->lock);
71013
71014- fscache_stat(&fscache_n_alloc_ops);
71015+ fscache_stat_unchecked(&fscache_n_alloc_ops);
71016
71017 ret = fscache_wait_for_operation_activation(
71018 object, &op->op,
71019@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
71020
71021 error:
71022 if (ret == -ERESTARTSYS)
71023- fscache_stat(&fscache_n_allocs_intr);
71024+ fscache_stat_unchecked(&fscache_n_allocs_intr);
71025 else if (ret < 0)
71026- fscache_stat(&fscache_n_allocs_nobufs);
71027+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71028 else
71029- fscache_stat(&fscache_n_allocs_ok);
71030+ fscache_stat_unchecked(&fscache_n_allocs_ok);
71031
71032 fscache_put_retrieval(op);
71033 _leave(" = %d", ret);
71034@@ -730,7 +730,7 @@ nobufs_unlock:
71035 if (wake_cookie)
71036 __fscache_wake_unused_cookie(cookie);
71037 nobufs:
71038- fscache_stat(&fscache_n_allocs_nobufs);
71039+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
71040 _leave(" = -ENOBUFS");
71041 return -ENOBUFS;
71042 }
71043@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71044
71045 spin_lock(&cookie->stores_lock);
71046
71047- fscache_stat(&fscache_n_store_calls);
71048+ fscache_stat_unchecked(&fscache_n_store_calls);
71049
71050 /* find a page to store */
71051 page = NULL;
71052@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71053 page = results[0];
71054 _debug("gang %d [%lx]", n, page->index);
71055 if (page->index > op->store_limit) {
71056- fscache_stat(&fscache_n_store_pages_over_limit);
71057+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
71058 goto superseded;
71059 }
71060
71061@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
71062 spin_unlock(&cookie->stores_lock);
71063 spin_unlock(&object->lock);
71064
71065- fscache_stat(&fscache_n_store_pages);
71066+ fscache_stat_unchecked(&fscache_n_store_pages);
71067 fscache_stat(&fscache_n_cop_write_page);
71068 ret = object->cache->ops->write_page(op, page);
71069 fscache_stat_d(&fscache_n_cop_write_page);
71070@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71071 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71072 ASSERT(PageFsCache(page));
71073
71074- fscache_stat(&fscache_n_stores);
71075+ fscache_stat_unchecked(&fscache_n_stores);
71076
71077 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
71078 _leave(" = -ENOBUFS [invalidating]");
71079@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71080 spin_unlock(&cookie->stores_lock);
71081 spin_unlock(&object->lock);
71082
71083- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
71084+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
71085 op->store_limit = object->store_limit;
71086
71087 __fscache_use_cookie(cookie);
71088@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71089
71090 spin_unlock(&cookie->lock);
71091 radix_tree_preload_end();
71092- fscache_stat(&fscache_n_store_ops);
71093- fscache_stat(&fscache_n_stores_ok);
71094+ fscache_stat_unchecked(&fscache_n_store_ops);
71095+ fscache_stat_unchecked(&fscache_n_stores_ok);
71096
71097 /* the work queue now carries its own ref on the object */
71098 fscache_put_operation(&op->op);
71099@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
71100 return 0;
71101
71102 already_queued:
71103- fscache_stat(&fscache_n_stores_again);
71104+ fscache_stat_unchecked(&fscache_n_stores_again);
71105 already_pending:
71106 spin_unlock(&cookie->stores_lock);
71107 spin_unlock(&object->lock);
71108 spin_unlock(&cookie->lock);
71109 radix_tree_preload_end();
71110 kfree(op);
71111- fscache_stat(&fscache_n_stores_ok);
71112+ fscache_stat_unchecked(&fscache_n_stores_ok);
71113 _leave(" = 0");
71114 return 0;
71115
71116@@ -1039,14 +1039,14 @@ nobufs:
71117 kfree(op);
71118 if (wake_cookie)
71119 __fscache_wake_unused_cookie(cookie);
71120- fscache_stat(&fscache_n_stores_nobufs);
71121+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
71122 _leave(" = -ENOBUFS");
71123 return -ENOBUFS;
71124
71125 nomem_free:
71126 kfree(op);
71127 nomem:
71128- fscache_stat(&fscache_n_stores_oom);
71129+ fscache_stat_unchecked(&fscache_n_stores_oom);
71130 _leave(" = -ENOMEM");
71131 return -ENOMEM;
71132 }
71133@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
71134 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
71135 ASSERTCMP(page, !=, NULL);
71136
71137- fscache_stat(&fscache_n_uncaches);
71138+ fscache_stat_unchecked(&fscache_n_uncaches);
71139
71140 /* cache withdrawal may beat us to it */
71141 if (!PageFsCache(page))
71142@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
71143 struct fscache_cookie *cookie = op->op.object->cookie;
71144
71145 #ifdef CONFIG_FSCACHE_STATS
71146- atomic_inc(&fscache_n_marks);
71147+ atomic_inc_unchecked(&fscache_n_marks);
71148 #endif
71149
71150 _debug("- mark %p{%lx}", page, page->index);
71151diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
71152index 40d13c7..ddf52b9 100644
71153--- a/fs/fscache/stats.c
71154+++ b/fs/fscache/stats.c
71155@@ -18,99 +18,99 @@
71156 /*
71157 * operation counters
71158 */
71159-atomic_t fscache_n_op_pend;
71160-atomic_t fscache_n_op_run;
71161-atomic_t fscache_n_op_enqueue;
71162-atomic_t fscache_n_op_requeue;
71163-atomic_t fscache_n_op_deferred_release;
71164-atomic_t fscache_n_op_release;
71165-atomic_t fscache_n_op_gc;
71166-atomic_t fscache_n_op_cancelled;
71167-atomic_t fscache_n_op_rejected;
71168+atomic_unchecked_t fscache_n_op_pend;
71169+atomic_unchecked_t fscache_n_op_run;
71170+atomic_unchecked_t fscache_n_op_enqueue;
71171+atomic_unchecked_t fscache_n_op_requeue;
71172+atomic_unchecked_t fscache_n_op_deferred_release;
71173+atomic_unchecked_t fscache_n_op_release;
71174+atomic_unchecked_t fscache_n_op_gc;
71175+atomic_unchecked_t fscache_n_op_cancelled;
71176+atomic_unchecked_t fscache_n_op_rejected;
71177
71178-atomic_t fscache_n_attr_changed;
71179-atomic_t fscache_n_attr_changed_ok;
71180-atomic_t fscache_n_attr_changed_nobufs;
71181-atomic_t fscache_n_attr_changed_nomem;
71182-atomic_t fscache_n_attr_changed_calls;
71183+atomic_unchecked_t fscache_n_attr_changed;
71184+atomic_unchecked_t fscache_n_attr_changed_ok;
71185+atomic_unchecked_t fscache_n_attr_changed_nobufs;
71186+atomic_unchecked_t fscache_n_attr_changed_nomem;
71187+atomic_unchecked_t fscache_n_attr_changed_calls;
71188
71189-atomic_t fscache_n_allocs;
71190-atomic_t fscache_n_allocs_ok;
71191-atomic_t fscache_n_allocs_wait;
71192-atomic_t fscache_n_allocs_nobufs;
71193-atomic_t fscache_n_allocs_intr;
71194-atomic_t fscache_n_allocs_object_dead;
71195-atomic_t fscache_n_alloc_ops;
71196-atomic_t fscache_n_alloc_op_waits;
71197+atomic_unchecked_t fscache_n_allocs;
71198+atomic_unchecked_t fscache_n_allocs_ok;
71199+atomic_unchecked_t fscache_n_allocs_wait;
71200+atomic_unchecked_t fscache_n_allocs_nobufs;
71201+atomic_unchecked_t fscache_n_allocs_intr;
71202+atomic_unchecked_t fscache_n_allocs_object_dead;
71203+atomic_unchecked_t fscache_n_alloc_ops;
71204+atomic_unchecked_t fscache_n_alloc_op_waits;
71205
71206-atomic_t fscache_n_retrievals;
71207-atomic_t fscache_n_retrievals_ok;
71208-atomic_t fscache_n_retrievals_wait;
71209-atomic_t fscache_n_retrievals_nodata;
71210-atomic_t fscache_n_retrievals_nobufs;
71211-atomic_t fscache_n_retrievals_intr;
71212-atomic_t fscache_n_retrievals_nomem;
71213-atomic_t fscache_n_retrievals_object_dead;
71214-atomic_t fscache_n_retrieval_ops;
71215-atomic_t fscache_n_retrieval_op_waits;
71216+atomic_unchecked_t fscache_n_retrievals;
71217+atomic_unchecked_t fscache_n_retrievals_ok;
71218+atomic_unchecked_t fscache_n_retrievals_wait;
71219+atomic_unchecked_t fscache_n_retrievals_nodata;
71220+atomic_unchecked_t fscache_n_retrievals_nobufs;
71221+atomic_unchecked_t fscache_n_retrievals_intr;
71222+atomic_unchecked_t fscache_n_retrievals_nomem;
71223+atomic_unchecked_t fscache_n_retrievals_object_dead;
71224+atomic_unchecked_t fscache_n_retrieval_ops;
71225+atomic_unchecked_t fscache_n_retrieval_op_waits;
71226
71227-atomic_t fscache_n_stores;
71228-atomic_t fscache_n_stores_ok;
71229-atomic_t fscache_n_stores_again;
71230-atomic_t fscache_n_stores_nobufs;
71231-atomic_t fscache_n_stores_oom;
71232-atomic_t fscache_n_store_ops;
71233-atomic_t fscache_n_store_calls;
71234-atomic_t fscache_n_store_pages;
71235-atomic_t fscache_n_store_radix_deletes;
71236-atomic_t fscache_n_store_pages_over_limit;
71237+atomic_unchecked_t fscache_n_stores;
71238+atomic_unchecked_t fscache_n_stores_ok;
71239+atomic_unchecked_t fscache_n_stores_again;
71240+atomic_unchecked_t fscache_n_stores_nobufs;
71241+atomic_unchecked_t fscache_n_stores_oom;
71242+atomic_unchecked_t fscache_n_store_ops;
71243+atomic_unchecked_t fscache_n_store_calls;
71244+atomic_unchecked_t fscache_n_store_pages;
71245+atomic_unchecked_t fscache_n_store_radix_deletes;
71246+atomic_unchecked_t fscache_n_store_pages_over_limit;
71247
71248-atomic_t fscache_n_store_vmscan_not_storing;
71249-atomic_t fscache_n_store_vmscan_gone;
71250-atomic_t fscache_n_store_vmscan_busy;
71251-atomic_t fscache_n_store_vmscan_cancelled;
71252-atomic_t fscache_n_store_vmscan_wait;
71253+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
71254+atomic_unchecked_t fscache_n_store_vmscan_gone;
71255+atomic_unchecked_t fscache_n_store_vmscan_busy;
71256+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
71257+atomic_unchecked_t fscache_n_store_vmscan_wait;
71258
71259-atomic_t fscache_n_marks;
71260-atomic_t fscache_n_uncaches;
71261+atomic_unchecked_t fscache_n_marks;
71262+atomic_unchecked_t fscache_n_uncaches;
71263
71264-atomic_t fscache_n_acquires;
71265-atomic_t fscache_n_acquires_null;
71266-atomic_t fscache_n_acquires_no_cache;
71267-atomic_t fscache_n_acquires_ok;
71268-atomic_t fscache_n_acquires_nobufs;
71269-atomic_t fscache_n_acquires_oom;
71270+atomic_unchecked_t fscache_n_acquires;
71271+atomic_unchecked_t fscache_n_acquires_null;
71272+atomic_unchecked_t fscache_n_acquires_no_cache;
71273+atomic_unchecked_t fscache_n_acquires_ok;
71274+atomic_unchecked_t fscache_n_acquires_nobufs;
71275+atomic_unchecked_t fscache_n_acquires_oom;
71276
71277-atomic_t fscache_n_invalidates;
71278-atomic_t fscache_n_invalidates_run;
71279+atomic_unchecked_t fscache_n_invalidates;
71280+atomic_unchecked_t fscache_n_invalidates_run;
71281
71282-atomic_t fscache_n_updates;
71283-atomic_t fscache_n_updates_null;
71284-atomic_t fscache_n_updates_run;
71285+atomic_unchecked_t fscache_n_updates;
71286+atomic_unchecked_t fscache_n_updates_null;
71287+atomic_unchecked_t fscache_n_updates_run;
71288
71289-atomic_t fscache_n_relinquishes;
71290-atomic_t fscache_n_relinquishes_null;
71291-atomic_t fscache_n_relinquishes_waitcrt;
71292-atomic_t fscache_n_relinquishes_retire;
71293+atomic_unchecked_t fscache_n_relinquishes;
71294+atomic_unchecked_t fscache_n_relinquishes_null;
71295+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
71296+atomic_unchecked_t fscache_n_relinquishes_retire;
71297
71298-atomic_t fscache_n_cookie_index;
71299-atomic_t fscache_n_cookie_data;
71300-atomic_t fscache_n_cookie_special;
71301+atomic_unchecked_t fscache_n_cookie_index;
71302+atomic_unchecked_t fscache_n_cookie_data;
71303+atomic_unchecked_t fscache_n_cookie_special;
71304
71305-atomic_t fscache_n_object_alloc;
71306-atomic_t fscache_n_object_no_alloc;
71307-atomic_t fscache_n_object_lookups;
71308-atomic_t fscache_n_object_lookups_negative;
71309-atomic_t fscache_n_object_lookups_positive;
71310-atomic_t fscache_n_object_lookups_timed_out;
71311-atomic_t fscache_n_object_created;
71312-atomic_t fscache_n_object_avail;
71313-atomic_t fscache_n_object_dead;
71314+atomic_unchecked_t fscache_n_object_alloc;
71315+atomic_unchecked_t fscache_n_object_no_alloc;
71316+atomic_unchecked_t fscache_n_object_lookups;
71317+atomic_unchecked_t fscache_n_object_lookups_negative;
71318+atomic_unchecked_t fscache_n_object_lookups_positive;
71319+atomic_unchecked_t fscache_n_object_lookups_timed_out;
71320+atomic_unchecked_t fscache_n_object_created;
71321+atomic_unchecked_t fscache_n_object_avail;
71322+atomic_unchecked_t fscache_n_object_dead;
71323
71324-atomic_t fscache_n_checkaux_none;
71325-atomic_t fscache_n_checkaux_okay;
71326-atomic_t fscache_n_checkaux_update;
71327-atomic_t fscache_n_checkaux_obsolete;
71328+atomic_unchecked_t fscache_n_checkaux_none;
71329+atomic_unchecked_t fscache_n_checkaux_okay;
71330+atomic_unchecked_t fscache_n_checkaux_update;
71331+atomic_unchecked_t fscache_n_checkaux_obsolete;
71332
71333 atomic_t fscache_n_cop_alloc_object;
71334 atomic_t fscache_n_cop_lookup_object;
71335@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
71336 seq_puts(m, "FS-Cache statistics\n");
71337
71338 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
71339- atomic_read(&fscache_n_cookie_index),
71340- atomic_read(&fscache_n_cookie_data),
71341- atomic_read(&fscache_n_cookie_special));
71342+ atomic_read_unchecked(&fscache_n_cookie_index),
71343+ atomic_read_unchecked(&fscache_n_cookie_data),
71344+ atomic_read_unchecked(&fscache_n_cookie_special));
71345
71346 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
71347- atomic_read(&fscache_n_object_alloc),
71348- atomic_read(&fscache_n_object_no_alloc),
71349- atomic_read(&fscache_n_object_avail),
71350- atomic_read(&fscache_n_object_dead));
71351+ atomic_read_unchecked(&fscache_n_object_alloc),
71352+ atomic_read_unchecked(&fscache_n_object_no_alloc),
71353+ atomic_read_unchecked(&fscache_n_object_avail),
71354+ atomic_read_unchecked(&fscache_n_object_dead));
71355 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
71356- atomic_read(&fscache_n_checkaux_none),
71357- atomic_read(&fscache_n_checkaux_okay),
71358- atomic_read(&fscache_n_checkaux_update),
71359- atomic_read(&fscache_n_checkaux_obsolete));
71360+ atomic_read_unchecked(&fscache_n_checkaux_none),
71361+ atomic_read_unchecked(&fscache_n_checkaux_okay),
71362+ atomic_read_unchecked(&fscache_n_checkaux_update),
71363+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
71364
71365 seq_printf(m, "Pages : mrk=%u unc=%u\n",
71366- atomic_read(&fscache_n_marks),
71367- atomic_read(&fscache_n_uncaches));
71368+ atomic_read_unchecked(&fscache_n_marks),
71369+ atomic_read_unchecked(&fscache_n_uncaches));
71370
71371 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
71372 " oom=%u\n",
71373- atomic_read(&fscache_n_acquires),
71374- atomic_read(&fscache_n_acquires_null),
71375- atomic_read(&fscache_n_acquires_no_cache),
71376- atomic_read(&fscache_n_acquires_ok),
71377- atomic_read(&fscache_n_acquires_nobufs),
71378- atomic_read(&fscache_n_acquires_oom));
71379+ atomic_read_unchecked(&fscache_n_acquires),
71380+ atomic_read_unchecked(&fscache_n_acquires_null),
71381+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
71382+ atomic_read_unchecked(&fscache_n_acquires_ok),
71383+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
71384+ atomic_read_unchecked(&fscache_n_acquires_oom));
71385
71386 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
71387- atomic_read(&fscache_n_object_lookups),
71388- atomic_read(&fscache_n_object_lookups_negative),
71389- atomic_read(&fscache_n_object_lookups_positive),
71390- atomic_read(&fscache_n_object_created),
71391- atomic_read(&fscache_n_object_lookups_timed_out));
71392+ atomic_read_unchecked(&fscache_n_object_lookups),
71393+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
71394+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
71395+ atomic_read_unchecked(&fscache_n_object_created),
71396+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
71397
71398 seq_printf(m, "Invals : n=%u run=%u\n",
71399- atomic_read(&fscache_n_invalidates),
71400- atomic_read(&fscache_n_invalidates_run));
71401+ atomic_read_unchecked(&fscache_n_invalidates),
71402+ atomic_read_unchecked(&fscache_n_invalidates_run));
71403
71404 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
71405- atomic_read(&fscache_n_updates),
71406- atomic_read(&fscache_n_updates_null),
71407- atomic_read(&fscache_n_updates_run));
71408+ atomic_read_unchecked(&fscache_n_updates),
71409+ atomic_read_unchecked(&fscache_n_updates_null),
71410+ atomic_read_unchecked(&fscache_n_updates_run));
71411
71412 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
71413- atomic_read(&fscache_n_relinquishes),
71414- atomic_read(&fscache_n_relinquishes_null),
71415- atomic_read(&fscache_n_relinquishes_waitcrt),
71416- atomic_read(&fscache_n_relinquishes_retire));
71417+ atomic_read_unchecked(&fscache_n_relinquishes),
71418+ atomic_read_unchecked(&fscache_n_relinquishes_null),
71419+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
71420+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
71421
71422 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
71423- atomic_read(&fscache_n_attr_changed),
71424- atomic_read(&fscache_n_attr_changed_ok),
71425- atomic_read(&fscache_n_attr_changed_nobufs),
71426- atomic_read(&fscache_n_attr_changed_nomem),
71427- atomic_read(&fscache_n_attr_changed_calls));
71428+ atomic_read_unchecked(&fscache_n_attr_changed),
71429+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
71430+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
71431+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
71432+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
71433
71434 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
71435- atomic_read(&fscache_n_allocs),
71436- atomic_read(&fscache_n_allocs_ok),
71437- atomic_read(&fscache_n_allocs_wait),
71438- atomic_read(&fscache_n_allocs_nobufs),
71439- atomic_read(&fscache_n_allocs_intr));
71440+ atomic_read_unchecked(&fscache_n_allocs),
71441+ atomic_read_unchecked(&fscache_n_allocs_ok),
71442+ atomic_read_unchecked(&fscache_n_allocs_wait),
71443+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
71444+ atomic_read_unchecked(&fscache_n_allocs_intr));
71445 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
71446- atomic_read(&fscache_n_alloc_ops),
71447- atomic_read(&fscache_n_alloc_op_waits),
71448- atomic_read(&fscache_n_allocs_object_dead));
71449+ atomic_read_unchecked(&fscache_n_alloc_ops),
71450+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
71451+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
71452
71453 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
71454 " int=%u oom=%u\n",
71455- atomic_read(&fscache_n_retrievals),
71456- atomic_read(&fscache_n_retrievals_ok),
71457- atomic_read(&fscache_n_retrievals_wait),
71458- atomic_read(&fscache_n_retrievals_nodata),
71459- atomic_read(&fscache_n_retrievals_nobufs),
71460- atomic_read(&fscache_n_retrievals_intr),
71461- atomic_read(&fscache_n_retrievals_nomem));
71462+ atomic_read_unchecked(&fscache_n_retrievals),
71463+ atomic_read_unchecked(&fscache_n_retrievals_ok),
71464+ atomic_read_unchecked(&fscache_n_retrievals_wait),
71465+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
71466+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
71467+ atomic_read_unchecked(&fscache_n_retrievals_intr),
71468+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
71469 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
71470- atomic_read(&fscache_n_retrieval_ops),
71471- atomic_read(&fscache_n_retrieval_op_waits),
71472- atomic_read(&fscache_n_retrievals_object_dead));
71473+ atomic_read_unchecked(&fscache_n_retrieval_ops),
71474+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
71475+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
71476
71477 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
71478- atomic_read(&fscache_n_stores),
71479- atomic_read(&fscache_n_stores_ok),
71480- atomic_read(&fscache_n_stores_again),
71481- atomic_read(&fscache_n_stores_nobufs),
71482- atomic_read(&fscache_n_stores_oom));
71483+ atomic_read_unchecked(&fscache_n_stores),
71484+ atomic_read_unchecked(&fscache_n_stores_ok),
71485+ atomic_read_unchecked(&fscache_n_stores_again),
71486+ atomic_read_unchecked(&fscache_n_stores_nobufs),
71487+ atomic_read_unchecked(&fscache_n_stores_oom));
71488 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
71489- atomic_read(&fscache_n_store_ops),
71490- atomic_read(&fscache_n_store_calls),
71491- atomic_read(&fscache_n_store_pages),
71492- atomic_read(&fscache_n_store_radix_deletes),
71493- atomic_read(&fscache_n_store_pages_over_limit));
71494+ atomic_read_unchecked(&fscache_n_store_ops),
71495+ atomic_read_unchecked(&fscache_n_store_calls),
71496+ atomic_read_unchecked(&fscache_n_store_pages),
71497+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
71498+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
71499
71500 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
71501- atomic_read(&fscache_n_store_vmscan_not_storing),
71502- atomic_read(&fscache_n_store_vmscan_gone),
71503- atomic_read(&fscache_n_store_vmscan_busy),
71504- atomic_read(&fscache_n_store_vmscan_cancelled),
71505- atomic_read(&fscache_n_store_vmscan_wait));
71506+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
71507+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
71508+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
71509+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
71510+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
71511
71512 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
71513- atomic_read(&fscache_n_op_pend),
71514- atomic_read(&fscache_n_op_run),
71515- atomic_read(&fscache_n_op_enqueue),
71516- atomic_read(&fscache_n_op_cancelled),
71517- atomic_read(&fscache_n_op_rejected));
71518+ atomic_read_unchecked(&fscache_n_op_pend),
71519+ atomic_read_unchecked(&fscache_n_op_run),
71520+ atomic_read_unchecked(&fscache_n_op_enqueue),
71521+ atomic_read_unchecked(&fscache_n_op_cancelled),
71522+ atomic_read_unchecked(&fscache_n_op_rejected));
71523 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
71524- atomic_read(&fscache_n_op_deferred_release),
71525- atomic_read(&fscache_n_op_release),
71526- atomic_read(&fscache_n_op_gc));
71527+ atomic_read_unchecked(&fscache_n_op_deferred_release),
71528+ atomic_read_unchecked(&fscache_n_op_release),
71529+ atomic_read_unchecked(&fscache_n_op_gc));
71530
71531 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
71532 atomic_read(&fscache_n_cop_alloc_object),
71533diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
71534index 28d0c7a..04816b7 100644
71535--- a/fs/fuse/cuse.c
71536+++ b/fs/fuse/cuse.c
71537@@ -611,10 +611,12 @@ static int __init cuse_init(void)
71538 INIT_LIST_HEAD(&cuse_conntbl[i]);
71539
71540 /* inherit and extend fuse_dev_operations */
71541- cuse_channel_fops = fuse_dev_operations;
71542- cuse_channel_fops.owner = THIS_MODULE;
71543- cuse_channel_fops.open = cuse_channel_open;
71544- cuse_channel_fops.release = cuse_channel_release;
71545+ pax_open_kernel();
71546+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
71547+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
71548+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
71549+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
71550+ pax_close_kernel();
71551
71552 cuse_class = class_create(THIS_MODULE, "cuse");
71553 if (IS_ERR(cuse_class))
71554diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
71555index 39706c5..a803c71 100644
71556--- a/fs/fuse/dev.c
71557+++ b/fs/fuse/dev.c
71558@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71559 ret = 0;
71560 pipe_lock(pipe);
71561
71562- if (!pipe->readers) {
71563+ if (!atomic_read(&pipe->readers)) {
71564 send_sig(SIGPIPE, current, 0);
71565 if (!ret)
71566 ret = -EPIPE;
71567@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
71568 page_nr++;
71569 ret += buf->len;
71570
71571- if (pipe->files)
71572+ if (atomic_read(&pipe->files))
71573 do_wakeup = 1;
71574 }
71575
71576diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
71577index 1545b71..7fabe47 100644
71578--- a/fs/fuse/dir.c
71579+++ b/fs/fuse/dir.c
71580@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
71581 return link;
71582 }
71583
71584-static void free_link(char *link)
71585+static void free_link(const char *link)
71586 {
71587 if (!IS_ERR(link))
71588 free_page((unsigned long) link);
71589diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
71590index f42dffb..4a4c435 100644
71591--- a/fs/gfs2/glock.c
71592+++ b/fs/gfs2/glock.c
71593@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
71594 if (held1 != held2) {
71595 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
71596 if (held2)
71597- gl->gl_lockref.count++;
71598+ __lockref_inc(&gl->gl_lockref);
71599 else
71600- gl->gl_lockref.count--;
71601+ __lockref_dec(&gl->gl_lockref);
71602 }
71603 if (held1 && held2 && list_empty(&gl->gl_holders))
71604 clear_bit(GLF_QUEUED, &gl->gl_flags);
71605@@ -614,9 +614,9 @@ out:
71606 out_sched:
71607 clear_bit(GLF_LOCK, &gl->gl_flags);
71608 smp_mb__after_atomic();
71609- gl->gl_lockref.count++;
71610+ __lockref_inc(&gl->gl_lockref);
71611 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71612- gl->gl_lockref.count--;
71613+ __lockref_dec(&gl->gl_lockref);
71614 return;
71615
71616 out_unlock:
71617@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
71618 gl->gl_sbd = sdp;
71619 gl->gl_flags = 0;
71620 gl->gl_name = name;
71621- gl->gl_lockref.count = 1;
71622+ __lockref_set(&gl->gl_lockref, 1);
71623 gl->gl_state = LM_ST_UNLOCKED;
71624 gl->gl_target = LM_ST_UNLOCKED;
71625 gl->gl_demote_state = LM_ST_EXCLUSIVE;
71626@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
71627 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
71628 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
71629 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71630- gl->gl_lockref.count++;
71631+ __lockref_inc(&gl->gl_lockref);
71632 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71633- gl->gl_lockref.count--;
71634+ __lockref_dec(&gl->gl_lockref);
71635 }
71636 run_queue(gl, 1);
71637 spin_unlock(&gl->gl_spin);
71638@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
71639 }
71640 }
71641
71642- gl->gl_lockref.count++;
71643+ __lockref_inc(&gl->gl_lockref);
71644 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
71645 spin_unlock(&gl->gl_spin);
71646
71647@@ -1384,12 +1384,12 @@ add_back_to_lru:
71648 goto add_back_to_lru;
71649 }
71650 clear_bit(GLF_LRU, &gl->gl_flags);
71651- gl->gl_lockref.count++;
71652+ __lockref_inc(&gl->gl_lockref);
71653 if (demote_ok(gl))
71654 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
71655 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
71656 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
71657- gl->gl_lockref.count--;
71658+ __lockref_dec(&gl->gl_lockref);
71659 spin_unlock(&gl->gl_spin);
71660 cond_resched_lock(&lru_lock);
71661 }
71662@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
71663 state2str(gl->gl_demote_state), dtime,
71664 atomic_read(&gl->gl_ail_count),
71665 atomic_read(&gl->gl_revokes),
71666- (int)gl->gl_lockref.count, gl->gl_hold_time);
71667+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
71668
71669 list_for_each_entry(gh, &gl->gl_holders, gh_list)
71670 dump_holder(seq, gh);
71671diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
71672index fe91951..ce38a6e 100644
71673--- a/fs/gfs2/glops.c
71674+++ b/fs/gfs2/glops.c
71675@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
71676
71677 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
71678 gl->gl_state == LM_ST_SHARED && ip) {
71679- gl->gl_lockref.count++;
71680+ __lockref_inc(&gl->gl_lockref);
71681 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
71682- gl->gl_lockref.count--;
71683+ __lockref_dec(&gl->gl_lockref);
71684 }
71685 }
71686
71687diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
71688index 3aa17d4..b338075 100644
71689--- a/fs/gfs2/quota.c
71690+++ b/fs/gfs2/quota.c
71691@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
71692 if (!spin_trylock(&qd->qd_lockref.lock))
71693 return LRU_SKIP;
71694
71695- if (qd->qd_lockref.count == 0) {
71696+ if (__lockref_read(&qd->qd_lockref) == 0) {
71697 lockref_mark_dead(&qd->qd_lockref);
71698 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
71699 }
71700@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
71701 return NULL;
71702
71703 qd->qd_sbd = sdp;
71704- qd->qd_lockref.count = 1;
71705+ __lockref_set(&qd->qd_lockref, 1);
71706 spin_lock_init(&qd->qd_lockref.lock);
71707 qd->qd_id = qid;
71708 qd->qd_slot = -1;
71709@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
71710 if (lockref_put_or_lock(&qd->qd_lockref))
71711 return;
71712
71713- qd->qd_lockref.count = 0;
71714+ __lockref_set(&qd->qd_lockref, 0);
71715 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
71716 spin_unlock(&qd->qd_lockref.lock);
71717
71718diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
71719index fd62cae..3494dfa 100644
71720--- a/fs/hostfs/hostfs_kern.c
71721+++ b/fs/hostfs/hostfs_kern.c
71722@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
71723
71724 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
71725 {
71726- char *s = nd_get_link(nd);
71727+ const char *s = nd_get_link(nd);
71728 if (!IS_ERR(s))
71729 __putname(s);
71730 }
71731diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
71732index c274aca..772fa5e 100644
71733--- a/fs/hugetlbfs/inode.c
71734+++ b/fs/hugetlbfs/inode.c
71735@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71736 struct mm_struct *mm = current->mm;
71737 struct vm_area_struct *vma;
71738 struct hstate *h = hstate_file(file);
71739+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
71740 struct vm_unmapped_area_info info;
71741
71742 if (len & ~huge_page_mask(h))
71743@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
71744 return addr;
71745 }
71746
71747+#ifdef CONFIG_PAX_RANDMMAP
71748+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
71749+#endif
71750+
71751 if (addr) {
71752 addr = ALIGN(addr, huge_page_size(h));
71753 vma = find_vma(mm, addr);
71754- if (TASK_SIZE - len >= addr &&
71755- (!vma || addr + len <= vma->vm_start))
71756+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
71757 return addr;
71758 }
71759
71760 info.flags = 0;
71761 info.length = len;
71762 info.low_limit = TASK_UNMAPPED_BASE;
71763+
71764+#ifdef CONFIG_PAX_RANDMMAP
71765+ if (mm->pax_flags & MF_PAX_RANDMMAP)
71766+ info.low_limit += mm->delta_mmap;
71767+#endif
71768+
71769 info.high_limit = TASK_SIZE;
71770 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
71771 info.align_offset = 0;
71772@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
71773 };
71774 MODULE_ALIAS_FS("hugetlbfs");
71775
71776-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71777+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
71778
71779 static int can_do_hugetlb_shm(void)
71780 {
71781diff --git a/fs/inode.c b/fs/inode.c
71782index f00b16f..b653fea 100644
71783--- a/fs/inode.c
71784+++ b/fs/inode.c
71785@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
71786 unsigned int *p = &get_cpu_var(last_ino);
71787 unsigned int res = *p;
71788
71789+start:
71790+
71791 #ifdef CONFIG_SMP
71792 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
71793- static atomic_t shared_last_ino;
71794- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
71795+ static atomic_unchecked_t shared_last_ino;
71796+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
71797
71798 res = next - LAST_INO_BATCH;
71799 }
71800 #endif
71801
71802- *p = ++res;
71803+ if (unlikely(!++res))
71804+ goto start; /* never zero */
71805+ *p = res;
71806 put_cpu_var(last_ino);
71807 return res;
71808 }
71809diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
71810index 4a6cf28..d3a29d3 100644
71811--- a/fs/jffs2/erase.c
71812+++ b/fs/jffs2/erase.c
71813@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
71814 struct jffs2_unknown_node marker = {
71815 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
71816 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71817- .totlen = cpu_to_je32(c->cleanmarker_size)
71818+ .totlen = cpu_to_je32(c->cleanmarker_size),
71819+ .hdr_crc = cpu_to_je32(0)
71820 };
71821
71822 jffs2_prealloc_raw_node_refs(c, jeb, 1);
71823diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
71824index 09ed551..45684f8 100644
71825--- a/fs/jffs2/wbuf.c
71826+++ b/fs/jffs2/wbuf.c
71827@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
71828 {
71829 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
71830 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
71831- .totlen = constant_cpu_to_je32(8)
71832+ .totlen = constant_cpu_to_je32(8),
71833+ .hdr_crc = constant_cpu_to_je32(0)
71834 };
71835
71836 /*
71837diff --git a/fs/jfs/super.c b/fs/jfs/super.c
71838index 5d30c56..8c45372 100644
71839--- a/fs/jfs/super.c
71840+++ b/fs/jfs/super.c
71841@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
71842
71843 jfs_inode_cachep =
71844 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
71845- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
71846+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
71847 init_once);
71848 if (jfs_inode_cachep == NULL)
71849 return -ENOMEM;
71850diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
71851index 345b35f..da7e0da 100644
71852--- a/fs/kernfs/dir.c
71853+++ b/fs/kernfs/dir.c
71854@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
71855 *
71856 * Returns 31 bit hash of ns + name (so it fits in an off_t )
71857 */
71858-static unsigned int kernfs_name_hash(const char *name, const void *ns)
71859+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
71860 {
71861 unsigned long hash = init_name_hash();
71862 unsigned int len = strlen(name);
71863@@ -838,6 +838,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
71864 ret = scops->mkdir(parent, dentry->d_name.name, mode);
71865
71866 kernfs_put_active(parent);
71867+
71868+ if (!ret) {
71869+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
71870+ ret = PTR_ERR_OR_ZERO(dentry_ret);
71871+ }
71872+
71873 return ret;
71874 }
71875
71876diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
71877index 2bacb99..f745182 100644
71878--- a/fs/kernfs/file.c
71879+++ b/fs/kernfs/file.c
71880@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
71881
71882 struct kernfs_open_node {
71883 atomic_t refcnt;
71884- atomic_t event;
71885+ atomic_unchecked_t event;
71886 wait_queue_head_t poll;
71887 struct list_head files; /* goes through kernfs_open_file.list */
71888 };
71889@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
71890 {
71891 struct kernfs_open_file *of = sf->private;
71892
71893- of->event = atomic_read(&of->kn->attr.open->event);
71894+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71895
71896 return of->kn->attr.ops->seq_show(sf, v);
71897 }
71898@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
71899 goto out_free;
71900 }
71901
71902- of->event = atomic_read(&of->kn->attr.open->event);
71903+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
71904 ops = kernfs_ops(of->kn);
71905 if (ops->read)
71906 len = ops->read(of, buf, len, *ppos);
71907@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
71908 {
71909 struct kernfs_open_file *of = kernfs_of(file);
71910 const struct kernfs_ops *ops;
71911- size_t len;
71912+ ssize_t len;
71913 char *buf;
71914
71915 if (of->atomic_write_len) {
71916@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
71917 return ret;
71918 }
71919
71920-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71921- void *buf, int len, int write)
71922+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
71923+ void *buf, size_t len, int write)
71924 {
71925 struct file *file = vma->vm_file;
71926 struct kernfs_open_file *of = kernfs_of(file);
71927- int ret;
71928+ ssize_t ret;
71929
71930 if (!of->vm_ops)
71931 return -EINVAL;
71932@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
71933 return -ENOMEM;
71934
71935 atomic_set(&new_on->refcnt, 0);
71936- atomic_set(&new_on->event, 1);
71937+ atomic_set_unchecked(&new_on->event, 1);
71938 init_waitqueue_head(&new_on->poll);
71939 INIT_LIST_HEAD(&new_on->files);
71940 goto retry;
71941@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
71942
71943 kernfs_put_active(kn);
71944
71945- if (of->event != atomic_read(&on->event))
71946+ if (of->event != atomic_read_unchecked(&on->event))
71947 goto trigger;
71948
71949 return DEFAULT_POLLMASK;
71950@@ -824,7 +824,7 @@ repeat:
71951
71952 on = kn->attr.open;
71953 if (on) {
71954- atomic_inc(&on->event);
71955+ atomic_inc_unchecked(&on->event);
71956 wake_up_interruptible(&on->poll);
71957 }
71958
71959diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
71960index 8a19889..4c3069a 100644
71961--- a/fs/kernfs/symlink.c
71962+++ b/fs/kernfs/symlink.c
71963@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
71964 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
71965 void *cookie)
71966 {
71967- char *page = nd_get_link(nd);
71968+ const char *page = nd_get_link(nd);
71969 if (!IS_ERR(page))
71970 free_page((unsigned long)page);
71971 }
71972diff --git a/fs/libfs.c b/fs/libfs.c
71973index 0ab6512..cd9982d 100644
71974--- a/fs/libfs.c
71975+++ b/fs/libfs.c
71976@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71977
71978 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
71979 struct dentry *next = list_entry(p, struct dentry, d_child);
71980+ char d_name[sizeof(next->d_iname)];
71981+ const unsigned char *name;
71982+
71983 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
71984 if (!simple_positive(next)) {
71985 spin_unlock(&next->d_lock);
71986@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
71987
71988 spin_unlock(&next->d_lock);
71989 spin_unlock(&dentry->d_lock);
71990- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
71991+ name = next->d_name.name;
71992+ if (name == next->d_iname) {
71993+ memcpy(d_name, name, next->d_name.len);
71994+ name = d_name;
71995+ }
71996+ if (!dir_emit(ctx, name, next->d_name.len,
71997 next->d_inode->i_ino, dt_type(next->d_inode)))
71998 return 0;
71999 spin_lock(&dentry->d_lock);
72000@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
72001 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
72002 void *cookie)
72003 {
72004- char *s = nd_get_link(nd);
72005+ const char *s = nd_get_link(nd);
72006 if (!IS_ERR(s))
72007 kfree(s);
72008 }
72009diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
72010index acd3947..1f896e2 100644
72011--- a/fs/lockd/clntproc.c
72012+++ b/fs/lockd/clntproc.c
72013@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
72014 /*
72015 * Cookie counter for NLM requests
72016 */
72017-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
72018+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
72019
72020 void nlmclnt_next_cookie(struct nlm_cookie *c)
72021 {
72022- u32 cookie = atomic_inc_return(&nlm_cookie);
72023+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
72024
72025 memcpy(c->data, &cookie, 4);
72026 c->len=4;
72027diff --git a/fs/mount.h b/fs/mount.h
72028index 6a61c2b..bd79179 100644
72029--- a/fs/mount.h
72030+++ b/fs/mount.h
72031@@ -13,7 +13,7 @@ struct mnt_namespace {
72032 u64 seq; /* Sequence number to prevent loops */
72033 wait_queue_head_t poll;
72034 u64 event;
72035-};
72036+} __randomize_layout;
72037
72038 struct mnt_pcp {
72039 int mnt_count;
72040@@ -65,7 +65,7 @@ struct mount {
72041 struct hlist_head mnt_pins;
72042 struct fs_pin mnt_umount;
72043 struct dentry *mnt_ex_mountpoint;
72044-};
72045+} __randomize_layout;
72046
72047 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
72048
72049diff --git a/fs/namei.c b/fs/namei.c
72050index 50a8583..44c470a 100644
72051--- a/fs/namei.c
72052+++ b/fs/namei.c
72053@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
72054 if (ret != -EACCES)
72055 return ret;
72056
72057+#ifdef CONFIG_GRKERNSEC
72058+ /* we'll block if we have to log due to a denied capability use */
72059+ if (mask & MAY_NOT_BLOCK)
72060+ return -ECHILD;
72061+#endif
72062+
72063 if (S_ISDIR(inode->i_mode)) {
72064 /* DACs are overridable for directories */
72065- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72066- return 0;
72067 if (!(mask & MAY_WRITE))
72068- if (capable_wrt_inode_uidgid(inode,
72069- CAP_DAC_READ_SEARCH))
72070+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72071+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72072 return 0;
72073+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72074+ return 0;
72075 return -EACCES;
72076 }
72077 /*
72078+ * Searching includes executable on directories, else just read.
72079+ */
72080+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72081+ if (mask == MAY_READ)
72082+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
72083+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72084+ return 0;
72085+
72086+ /*
72087 * Read/write DACs are always overridable.
72088 * Executable DACs are overridable when there is
72089 * at least one exec bit set.
72090@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
72091 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
72092 return 0;
72093
72094- /*
72095- * Searching includes executable on directories, else just read.
72096- */
72097- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
72098- if (mask == MAY_READ)
72099- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
72100- return 0;
72101-
72102 return -EACCES;
72103 }
72104 EXPORT_SYMBOL(generic_permission);
72105@@ -503,7 +510,7 @@ struct nameidata {
72106 int last_type;
72107 unsigned depth;
72108 struct file *base;
72109- char *saved_names[MAX_NESTED_LINKS + 1];
72110+ const char *saved_names[MAX_NESTED_LINKS + 1];
72111 };
72112
72113 /*
72114@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
72115 nd->flags |= LOOKUP_JUMPED;
72116 }
72117
72118-void nd_set_link(struct nameidata *nd, char *path)
72119+void nd_set_link(struct nameidata *nd, const char *path)
72120 {
72121 nd->saved_names[nd->depth] = path;
72122 }
72123 EXPORT_SYMBOL(nd_set_link);
72124
72125-char *nd_get_link(struct nameidata *nd)
72126+const char *nd_get_link(const struct nameidata *nd)
72127 {
72128 return nd->saved_names[nd->depth];
72129 }
72130@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72131 {
72132 struct dentry *dentry = link->dentry;
72133 int error;
72134- char *s;
72135+ const char *s;
72136
72137 BUG_ON(nd->flags & LOOKUP_RCU);
72138
72139@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
72140 if (error)
72141 goto out_put_nd_path;
72142
72143+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
72144+ dentry->d_inode, dentry, nd->path.mnt)) {
72145+ error = -EACCES;
72146+ goto out_put_nd_path;
72147+ }
72148+
72149 nd->last_type = LAST_BIND;
72150 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
72151 error = PTR_ERR(*p);
72152@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
72153 if (res)
72154 break;
72155 res = walk_component(nd, path, LOOKUP_FOLLOW);
72156+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
72157+ res = -EACCES;
72158 put_link(nd, &link, cookie);
72159 } while (res > 0);
72160
72161@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
72162 static inline u64 hash_name(const char *name)
72163 {
72164 unsigned long a, b, adata, bdata, mask, hash, len;
72165- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72166+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
72167
72168 hash = a = 0;
72169 len = -sizeof(unsigned long);
72170@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
72171 if (err)
72172 break;
72173 err = lookup_last(nd, &path);
72174+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
72175+ err = -EACCES;
72176 put_link(nd, &link, cookie);
72177 }
72178 }
72179@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
72180 if (!err)
72181 err = complete_walk(nd);
72182
72183+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
72184+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72185+ path_put(&nd->path);
72186+ err = -ENOENT;
72187+ }
72188+ }
72189+
72190 if (!err && nd->flags & LOOKUP_DIRECTORY) {
72191 if (!d_can_lookup(nd->path.dentry)) {
72192 path_put(&nd->path);
72193@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
72194 retval = path_lookupat(dfd, name->name,
72195 flags | LOOKUP_REVAL, nd);
72196
72197- if (likely(!retval))
72198+ if (likely(!retval)) {
72199 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
72200+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
72201+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
72202+ path_put(&nd->path);
72203+ return -ENOENT;
72204+ }
72205+ }
72206+ }
72207 return retval;
72208 }
72209
72210@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
72211 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
72212 return -EPERM;
72213
72214+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
72215+ return -EPERM;
72216+ if (gr_handle_rawio(inode))
72217+ return -EPERM;
72218+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
72219+ return -EACCES;
72220+
72221 return 0;
72222 }
72223
72224@@ -2846,7 +2884,7 @@ looked_up:
72225 * cleared otherwise prior to returning.
72226 */
72227 static int lookup_open(struct nameidata *nd, struct path *path,
72228- struct file *file,
72229+ struct path *link, struct file *file,
72230 const struct open_flags *op,
72231 bool got_write, int *opened)
72232 {
72233@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72234 /* Negative dentry, just create the file */
72235 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
72236 umode_t mode = op->mode;
72237+
72238+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
72239+ error = -EACCES;
72240+ goto out_dput;
72241+ }
72242+
72243+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
72244+ error = -EACCES;
72245+ goto out_dput;
72246+ }
72247+
72248 if (!IS_POSIXACL(dir->d_inode))
72249 mode &= ~current_umask();
72250 /*
72251@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
72252 nd->flags & LOOKUP_EXCL);
72253 if (error)
72254 goto out_dput;
72255+ else
72256+ gr_handle_create(dentry, nd->path.mnt);
72257 }
72258 out_no_open:
72259 path->dentry = dentry;
72260@@ -2916,7 +2967,7 @@ out_dput:
72261 /*
72262 * Handle the last step of open()
72263 */
72264-static int do_last(struct nameidata *nd, struct path *path,
72265+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
72266 struct file *file, const struct open_flags *op,
72267 int *opened, struct filename *name)
72268 {
72269@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
72270 if (error)
72271 return error;
72272
72273+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
72274+ error = -ENOENT;
72275+ goto out;
72276+ }
72277+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72278+ error = -EACCES;
72279+ goto out;
72280+ }
72281+
72282 audit_inode(name, dir, LOOKUP_PARENT);
72283 error = -EISDIR;
72284 /* trailing slashes? */
72285@@ -2985,7 +3045,7 @@ retry_lookup:
72286 */
72287 }
72288 mutex_lock(&dir->d_inode->i_mutex);
72289- error = lookup_open(nd, path, file, op, got_write, opened);
72290+ error = lookup_open(nd, path, link, file, op, got_write, opened);
72291 mutex_unlock(&dir->d_inode->i_mutex);
72292
72293 if (error <= 0) {
72294@@ -3009,11 +3069,28 @@ retry_lookup:
72295 goto finish_open_created;
72296 }
72297
72298+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
72299+ error = -ENOENT;
72300+ goto exit_dput;
72301+ }
72302+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
72303+ error = -EACCES;
72304+ goto exit_dput;
72305+ }
72306+
72307 /*
72308 * create/update audit record if it already exists.
72309 */
72310- if (d_is_positive(path->dentry))
72311+ if (d_is_positive(path->dentry)) {
72312+ /* only check if O_CREAT is specified, all other checks need to go
72313+ into may_open */
72314+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
72315+ error = -EACCES;
72316+ goto exit_dput;
72317+ }
72318+
72319 audit_inode(name, path->dentry, 0);
72320+ }
72321
72322 /*
72323 * If atomic_open() acquired write access it is dropped now due to
72324@@ -3055,6 +3132,11 @@ finish_lookup:
72325 }
72326 }
72327 BUG_ON(inode != path->dentry->d_inode);
72328+ /* if we're resolving a symlink to another symlink */
72329+ if (link && gr_handle_symlink_owner(link, inode)) {
72330+ error = -EACCES;
72331+ goto out;
72332+ }
72333 return 1;
72334 }
72335
72336@@ -3074,7 +3156,18 @@ finish_open:
72337 path_put(&save_parent);
72338 return error;
72339 }
72340+
72341+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
72342+ error = -ENOENT;
72343+ goto out;
72344+ }
72345+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
72346+ error = -EACCES;
72347+ goto out;
72348+ }
72349+
72350 audit_inode(name, nd->path.dentry, 0);
72351+
72352 error = -EISDIR;
72353 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
72354 goto out;
72355@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72356 if (unlikely(error))
72357 goto out;
72358
72359- error = do_last(nd, &path, file, op, &opened, pathname);
72360+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
72361 while (unlikely(error > 0)) { /* trailing symlink */
72362 struct path link = path;
72363 void *cookie;
72364@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
72365 error = follow_link(&link, nd, &cookie);
72366 if (unlikely(error))
72367 break;
72368- error = do_last(nd, &path, file, op, &opened, pathname);
72369+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
72370 put_link(nd, &link, cookie);
72371 }
72372 out:
72373@@ -3356,9 +3449,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
72374 goto unlock;
72375
72376 error = -EEXIST;
72377- if (d_is_positive(dentry))
72378+ if (d_is_positive(dentry)) {
72379+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
72380+ error = -ENOENT;
72381 goto fail;
72382-
72383+ }
72384 /*
72385 * Special case - lookup gave negative, but... we had foo/bar/
72386 * From the vfs_mknod() POV we just have a negative dentry -
72387@@ -3423,6 +3518,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
72388 }
72389 EXPORT_SYMBOL(user_path_create);
72390
72391+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
72392+{
72393+ struct filename *tmp = getname(pathname);
72394+ struct dentry *res;
72395+ if (IS_ERR(tmp))
72396+ return ERR_CAST(tmp);
72397+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
72398+ if (IS_ERR(res))
72399+ putname(tmp);
72400+ else
72401+ *to = tmp;
72402+ return res;
72403+}
72404+
72405 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
72406 {
72407 int error = may_create(dir, dentry);
72408@@ -3486,6 +3595,17 @@ retry:
72409
72410 if (!IS_POSIXACL(path.dentry->d_inode))
72411 mode &= ~current_umask();
72412+
72413+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
72414+ error = -EPERM;
72415+ goto out;
72416+ }
72417+
72418+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
72419+ error = -EACCES;
72420+ goto out;
72421+ }
72422+
72423 error = security_path_mknod(&path, dentry, mode, dev);
72424 if (error)
72425 goto out;
72426@@ -3501,6 +3621,8 @@ retry:
72427 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
72428 break;
72429 }
72430+ if (!error)
72431+ gr_handle_create(dentry, path.mnt);
72432 out:
72433 done_path_create(&path, dentry);
72434 if (retry_estale(error, lookup_flags)) {
72435@@ -3555,9 +3677,16 @@ retry:
72436
72437 if (!IS_POSIXACL(path.dentry->d_inode))
72438 mode &= ~current_umask();
72439+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
72440+ error = -EACCES;
72441+ goto out;
72442+ }
72443 error = security_path_mkdir(&path, dentry, mode);
72444 if (!error)
72445 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
72446+ if (!error)
72447+ gr_handle_create(dentry, path.mnt);
72448+out:
72449 done_path_create(&path, dentry);
72450 if (retry_estale(error, lookup_flags)) {
72451 lookup_flags |= LOOKUP_REVAL;
72452@@ -3590,7 +3719,7 @@ void dentry_unhash(struct dentry *dentry)
72453 {
72454 shrink_dcache_parent(dentry);
72455 spin_lock(&dentry->d_lock);
72456- if (dentry->d_lockref.count == 1)
72457+ if (__lockref_read(&dentry->d_lockref) == 1)
72458 __d_drop(dentry);
72459 spin_unlock(&dentry->d_lock);
72460 }
72461@@ -3641,6 +3770,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
72462 struct filename *name;
72463 struct dentry *dentry;
72464 struct nameidata nd;
72465+ u64 saved_ino = 0;
72466+ dev_t saved_dev = 0;
72467 unsigned int lookup_flags = 0;
72468 retry:
72469 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72470@@ -3673,10 +3804,21 @@ retry:
72471 error = -ENOENT;
72472 goto exit3;
72473 }
72474+
72475+ saved_ino = gr_get_ino_from_dentry(dentry);
72476+ saved_dev = gr_get_dev_from_dentry(dentry);
72477+
72478+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
72479+ error = -EACCES;
72480+ goto exit3;
72481+ }
72482+
72483 error = security_path_rmdir(&nd.path, dentry);
72484 if (error)
72485 goto exit3;
72486 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
72487+ if (!error && (saved_dev || saved_ino))
72488+ gr_handle_delete(saved_ino, saved_dev);
72489 exit3:
72490 dput(dentry);
72491 exit2:
72492@@ -3769,6 +3911,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
72493 struct nameidata nd;
72494 struct inode *inode = NULL;
72495 struct inode *delegated_inode = NULL;
72496+ u64 saved_ino = 0;
72497+ dev_t saved_dev = 0;
72498 unsigned int lookup_flags = 0;
72499 retry:
72500 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
72501@@ -3795,10 +3939,22 @@ retry_deleg:
72502 if (d_is_negative(dentry))
72503 goto slashes;
72504 ihold(inode);
72505+
72506+ if (inode->i_nlink <= 1) {
72507+ saved_ino = gr_get_ino_from_dentry(dentry);
72508+ saved_dev = gr_get_dev_from_dentry(dentry);
72509+ }
72510+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
72511+ error = -EACCES;
72512+ goto exit2;
72513+ }
72514+
72515 error = security_path_unlink(&nd.path, dentry);
72516 if (error)
72517 goto exit2;
72518 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
72519+ if (!error && (saved_ino || saved_dev))
72520+ gr_handle_delete(saved_ino, saved_dev);
72521 exit2:
72522 dput(dentry);
72523 }
72524@@ -3887,9 +4043,17 @@ retry:
72525 if (IS_ERR(dentry))
72526 goto out_putname;
72527
72528+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
72529+ error = -EACCES;
72530+ goto out;
72531+ }
72532+
72533 error = security_path_symlink(&path, dentry, from->name);
72534 if (!error)
72535 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
72536+ if (!error)
72537+ gr_handle_create(dentry, path.mnt);
72538+out:
72539 done_path_create(&path, dentry);
72540 if (retry_estale(error, lookup_flags)) {
72541 lookup_flags |= LOOKUP_REVAL;
72542@@ -3993,6 +4157,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
72543 struct dentry *new_dentry;
72544 struct path old_path, new_path;
72545 struct inode *delegated_inode = NULL;
72546+ struct filename *to = NULL;
72547 int how = 0;
72548 int error;
72549
72550@@ -4016,7 +4181,7 @@ retry:
72551 if (error)
72552 return error;
72553
72554- new_dentry = user_path_create(newdfd, newname, &new_path,
72555+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
72556 (how & LOOKUP_REVAL));
72557 error = PTR_ERR(new_dentry);
72558 if (IS_ERR(new_dentry))
72559@@ -4028,11 +4193,28 @@ retry:
72560 error = may_linkat(&old_path);
72561 if (unlikely(error))
72562 goto out_dput;
72563+
72564+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
72565+ old_path.dentry->d_inode,
72566+ old_path.dentry->d_inode->i_mode, to)) {
72567+ error = -EACCES;
72568+ goto out_dput;
72569+ }
72570+
72571+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
72572+ old_path.dentry, old_path.mnt, to)) {
72573+ error = -EACCES;
72574+ goto out_dput;
72575+ }
72576+
72577 error = security_path_link(old_path.dentry, &new_path, new_dentry);
72578 if (error)
72579 goto out_dput;
72580 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
72581+ if (!error)
72582+ gr_handle_create(new_dentry, new_path.mnt);
72583 out_dput:
72584+ putname(to);
72585 done_path_create(&new_path, new_dentry);
72586 if (delegated_inode) {
72587 error = break_deleg_wait(&delegated_inode);
72588@@ -4348,6 +4530,20 @@ retry_deleg:
72589 if (new_dentry == trap)
72590 goto exit5;
72591
72592+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
72593+ /* use EXDEV error to cause 'mv' to switch to an alternative
72594+ * method for usability
72595+ */
72596+ error = -EXDEV;
72597+ goto exit5;
72598+ }
72599+
72600+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
72601+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
72602+ to, flags);
72603+ if (error)
72604+ goto exit5;
72605+
72606 error = security_path_rename(&oldnd.path, old_dentry,
72607 &newnd.path, new_dentry, flags);
72608 if (error)
72609@@ -4355,6 +4551,9 @@ retry_deleg:
72610 error = vfs_rename(old_dir->d_inode, old_dentry,
72611 new_dir->d_inode, new_dentry,
72612 &delegated_inode, flags);
72613+ if (!error)
72614+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
72615+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
72616 exit5:
72617 dput(new_dentry);
72618 exit4:
72619@@ -4411,14 +4610,24 @@ EXPORT_SYMBOL(vfs_whiteout);
72620
72621 int readlink_copy(char __user *buffer, int buflen, const char *link)
72622 {
72623+ char tmpbuf[64];
72624+ const char *newlink;
72625 int len = PTR_ERR(link);
72626+
72627 if (IS_ERR(link))
72628 goto out;
72629
72630 len = strlen(link);
72631 if (len > (unsigned) buflen)
72632 len = buflen;
72633- if (copy_to_user(buffer, link, len))
72634+
72635+ if (len < sizeof(tmpbuf)) {
72636+ memcpy(tmpbuf, link, len);
72637+ newlink = tmpbuf;
72638+ } else
72639+ newlink = link;
72640+
72641+ if (copy_to_user(buffer, newlink, len))
72642 len = -EFAULT;
72643 out:
72644 return len;
72645diff --git a/fs/namespace.c b/fs/namespace.c
72646index 13b0f7b..1ee96e7 100644
72647--- a/fs/namespace.c
72648+++ b/fs/namespace.c
72649@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
72650 if (!(sb->s_flags & MS_RDONLY))
72651 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
72652 up_write(&sb->s_umount);
72653+
72654+ gr_log_remount(mnt->mnt_devname, retval);
72655+
72656 return retval;
72657 }
72658
72659@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
72660 }
72661 unlock_mount_hash();
72662 namespace_unlock();
72663+
72664+ gr_log_unmount(mnt->mnt_devname, retval);
72665+
72666 return retval;
72667 }
72668
72669@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
72670 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
72671 */
72672
72673-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
72674+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
72675 {
72676 struct path path;
72677 struct mount *mnt;
72678@@ -1604,7 +1610,7 @@ out:
72679 /*
72680 * The 2.0 compatible umount. No flags.
72681 */
72682-SYSCALL_DEFINE1(oldumount, char __user *, name)
72683+SYSCALL_DEFINE1(oldumount, const char __user *, name)
72684 {
72685 return sys_umount(name, 0);
72686 }
72687@@ -2673,6 +2679,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72688 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
72689 MS_STRICTATIME);
72690
72691+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
72692+ retval = -EPERM;
72693+ goto dput_out;
72694+ }
72695+
72696+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
72697+ retval = -EPERM;
72698+ goto dput_out;
72699+ }
72700+
72701 if (flags & MS_REMOUNT)
72702 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
72703 data_page);
72704@@ -2686,7 +2702,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
72705 retval = do_new_mount(&path, type_page, flags, mnt_flags,
72706 dev_name, data_page);
72707 dput_out:
72708+ gr_log_mount(dev_name, &path, retval);
72709+
72710 path_put(&path);
72711+
72712 return retval;
72713 }
72714
72715@@ -2704,7 +2723,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
72716 * number incrementing at 10Ghz will take 12,427 years to wrap which
72717 * is effectively never, so we can ignore the possibility.
72718 */
72719-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
72720+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
72721
72722 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72723 {
72724@@ -2720,7 +2739,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72725 return ERR_PTR(ret);
72726 }
72727 new_ns->ns.ops = &mntns_operations;
72728- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
72729+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
72730 atomic_set(&new_ns->count, 1);
72731 new_ns->root = NULL;
72732 INIT_LIST_HEAD(&new_ns->list);
72733@@ -2730,7 +2749,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
72734 return new_ns;
72735 }
72736
72737-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72738+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
72739 struct user_namespace *user_ns, struct fs_struct *new_fs)
72740 {
72741 struct mnt_namespace *new_ns;
72742@@ -2851,8 +2870,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
72743 }
72744 EXPORT_SYMBOL(mount_subtree);
72745
72746-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
72747- char __user *, type, unsigned long, flags, void __user *, data)
72748+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
72749+ const char __user *, type, unsigned long, flags, void __user *, data)
72750 {
72751 int ret;
72752 char *kernel_type;
72753@@ -2958,6 +2977,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
72754 if (error)
72755 goto out2;
72756
72757+ if (gr_handle_chroot_pivot()) {
72758+ error = -EPERM;
72759+ goto out2;
72760+ }
72761+
72762 get_fs_root(current->fs, &root);
72763 old_mp = lock_mount(&old);
72764 error = PTR_ERR(old_mp);
72765@@ -3238,7 +3262,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
72766 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
72767 return -EPERM;
72768
72769- if (fs->users != 1)
72770+ if (atomic_read(&fs->users) != 1)
72771 return -EINVAL;
72772
72773 get_mnt_ns(mnt_ns);
72774diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
72775index 19ca95c..b28702c 100644
72776--- a/fs/nfs/callback_xdr.c
72777+++ b/fs/nfs/callback_xdr.c
72778@@ -51,7 +51,7 @@ struct callback_op {
72779 callback_decode_arg_t decode_args;
72780 callback_encode_res_t encode_res;
72781 long res_maxsize;
72782-};
72783+} __do_const;
72784
72785 static struct callback_op callback_ops[];
72786
72787diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
72788index d42dff6..ecbdf42 100644
72789--- a/fs/nfs/inode.c
72790+++ b/fs/nfs/inode.c
72791@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
72792 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
72793 }
72794
72795-static atomic_long_t nfs_attr_generation_counter;
72796+static atomic_long_unchecked_t nfs_attr_generation_counter;
72797
72798 static unsigned long nfs_read_attr_generation_counter(void)
72799 {
72800- return atomic_long_read(&nfs_attr_generation_counter);
72801+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
72802 }
72803
72804 unsigned long nfs_inc_attr_generation_counter(void)
72805 {
72806- return atomic_long_inc_return(&nfs_attr_generation_counter);
72807+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
72808 }
72809 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
72810
72811diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
72812index 5416968..0942042 100644
72813--- a/fs/nfsd/nfs4proc.c
72814+++ b/fs/nfsd/nfs4proc.c
72815@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
72816 nfsd4op_rsize op_rsize_bop;
72817 stateid_getter op_get_currentstateid;
72818 stateid_setter op_set_currentstateid;
72819-};
72820+} __do_const;
72821
72822 static struct nfsd4_operation nfsd4_ops[];
72823
72824diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
72825index 5b33ce1..c2a92aa 100644
72826--- a/fs/nfsd/nfs4xdr.c
72827+++ b/fs/nfsd/nfs4xdr.c
72828@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
72829
72830 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
72831
72832-static nfsd4_dec nfsd4_dec_ops[] = {
72833+static const nfsd4_dec nfsd4_dec_ops[] = {
72834 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
72835 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
72836 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
72837diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
72838index 46ec934..f384e41 100644
72839--- a/fs/nfsd/nfscache.c
72840+++ b/fs/nfsd/nfscache.c
72841@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72842 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
72843 u32 hash;
72844 struct nfsd_drc_bucket *b;
72845- int len;
72846+ long len;
72847 size_t bufsize = 0;
72848
72849 if (!rp)
72850@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72851 hash = nfsd_cache_hash(rp->c_xid);
72852 b = &drc_hashtbl[hash];
72853
72854- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
72855- len >>= 2;
72856+ if (statp) {
72857+ len = (char*)statp - (char*)resv->iov_base;
72858+ len = resv->iov_len - len;
72859+ len >>= 2;
72860+ }
72861
72862 /* Don't cache excessive amounts of data and XDR failures */
72863- if (!statp || len > (256 >> 2)) {
72864+ if (!statp || len > (256 >> 2) || len < 0) {
72865 nfsd_reply_cache_free(b, rp);
72866 return;
72867 }
72868@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
72869 switch (cachetype) {
72870 case RC_REPLSTAT:
72871 if (len != 1)
72872- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
72873+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
72874 rp->c_replstat = *statp;
72875 break;
72876 case RC_REPLBUFF:
72877diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
72878index 3685265..e77261e 100644
72879--- a/fs/nfsd/vfs.c
72880+++ b/fs/nfsd/vfs.c
72881@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
72882
72883 oldfs = get_fs();
72884 set_fs(KERNEL_DS);
72885- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
72886+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
72887 set_fs(oldfs);
72888 return nfsd_finish_read(file, count, host_err);
72889 }
72890@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
72891
72892 /* Write the data. */
72893 oldfs = get_fs(); set_fs(KERNEL_DS);
72894- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
72895+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
72896 set_fs(oldfs);
72897 if (host_err < 0)
72898 goto out_nfserr;
72899@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
72900 */
72901
72902 oldfs = get_fs(); set_fs(KERNEL_DS);
72903- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
72904+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
72905 set_fs(oldfs);
72906
72907 if (host_err < 0)
72908diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
72909index 52ccd34..7a6b202 100644
72910--- a/fs/nls/nls_base.c
72911+++ b/fs/nls/nls_base.c
72912@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
72913
72914 int __register_nls(struct nls_table *nls, struct module *owner)
72915 {
72916- struct nls_table ** tmp = &tables;
72917+ struct nls_table *tmp = tables;
72918
72919 if (nls->next)
72920 return -EBUSY;
72921
72922- nls->owner = owner;
72923+ pax_open_kernel();
72924+ *(void **)&nls->owner = owner;
72925+ pax_close_kernel();
72926 spin_lock(&nls_lock);
72927- while (*tmp) {
72928- if (nls == *tmp) {
72929+ while (tmp) {
72930+ if (nls == tmp) {
72931 spin_unlock(&nls_lock);
72932 return -EBUSY;
72933 }
72934- tmp = &(*tmp)->next;
72935+ tmp = tmp->next;
72936 }
72937- nls->next = tables;
72938+ pax_open_kernel();
72939+ *(struct nls_table **)&nls->next = tables;
72940+ pax_close_kernel();
72941 tables = nls;
72942 spin_unlock(&nls_lock);
72943 return 0;
72944@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
72945
72946 int unregister_nls(struct nls_table * nls)
72947 {
72948- struct nls_table ** tmp = &tables;
72949+ struct nls_table * const * tmp = &tables;
72950
72951 spin_lock(&nls_lock);
72952 while (*tmp) {
72953 if (nls == *tmp) {
72954- *tmp = nls->next;
72955+ pax_open_kernel();
72956+ *(struct nls_table **)tmp = nls->next;
72957+ pax_close_kernel();
72958 spin_unlock(&nls_lock);
72959 return 0;
72960 }
72961@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
72962 return -EINVAL;
72963 }
72964
72965-static struct nls_table *find_nls(char *charset)
72966+static struct nls_table *find_nls(const char *charset)
72967 {
72968 struct nls_table *nls;
72969 spin_lock(&nls_lock);
72970@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
72971 return nls;
72972 }
72973
72974-struct nls_table *load_nls(char *charset)
72975+struct nls_table *load_nls(const char *charset)
72976 {
72977 return try_then_request_module(find_nls(charset), "nls_%s", charset);
72978 }
72979diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
72980index 162b3f1..6076a7c 100644
72981--- a/fs/nls/nls_euc-jp.c
72982+++ b/fs/nls/nls_euc-jp.c
72983@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
72984 p_nls = load_nls("cp932");
72985
72986 if (p_nls) {
72987- table.charset2upper = p_nls->charset2upper;
72988- table.charset2lower = p_nls->charset2lower;
72989+ pax_open_kernel();
72990+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
72991+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
72992+ pax_close_kernel();
72993 return register_nls(&table);
72994 }
72995
72996diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
72997index a80a741..7b96e1b 100644
72998--- a/fs/nls/nls_koi8-ru.c
72999+++ b/fs/nls/nls_koi8-ru.c
73000@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
73001 p_nls = load_nls("koi8-u");
73002
73003 if (p_nls) {
73004- table.charset2upper = p_nls->charset2upper;
73005- table.charset2lower = p_nls->charset2lower;
73006+ pax_open_kernel();
73007+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
73008+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
73009+ pax_close_kernel();
73010 return register_nls(&table);
73011 }
73012
73013diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
73014index cf27550..6c70f29d 100644
73015--- a/fs/notify/fanotify/fanotify_user.c
73016+++ b/fs/notify/fanotify/fanotify_user.c
73017@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
73018
73019 fd = fanotify_event_metadata.fd;
73020 ret = -EFAULT;
73021- if (copy_to_user(buf, &fanotify_event_metadata,
73022- fanotify_event_metadata.event_len))
73023+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
73024+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
73025 goto out_close_fd;
73026
73027 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
73028diff --git a/fs/notify/notification.c b/fs/notify/notification.c
73029index a95d8e0..a91a5fd 100644
73030--- a/fs/notify/notification.c
73031+++ b/fs/notify/notification.c
73032@@ -48,7 +48,7 @@
73033 #include <linux/fsnotify_backend.h>
73034 #include "fsnotify.h"
73035
73036-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73037+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73038
73039 /**
73040 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
73041@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
73042 */
73043 u32 fsnotify_get_cookie(void)
73044 {
73045- return atomic_inc_return(&fsnotify_sync_cookie);
73046+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
73047 }
73048 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
73049
73050diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
73051index 9e38daf..5727cae 100644
73052--- a/fs/ntfs/dir.c
73053+++ b/fs/ntfs/dir.c
73054@@ -1310,7 +1310,7 @@ find_next_index_buffer:
73055 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
73056 ~(s64)(ndir->itype.index.block_size - 1)));
73057 /* Bounds checks. */
73058- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73059+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
73060 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
73061 "inode 0x%lx or driver bug.", vdir->i_ino);
73062 goto err_out;
73063diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
73064index 1da9b2d..9cca092a 100644
73065--- a/fs/ntfs/file.c
73066+++ b/fs/ntfs/file.c
73067@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
73068 char *addr;
73069 size_t total = 0;
73070 unsigned len;
73071- int left;
73072+ unsigned left;
73073
73074 do {
73075 len = PAGE_CACHE_SIZE - ofs;
73076diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
73077index 9e1e112..241a52a 100644
73078--- a/fs/ntfs/super.c
73079+++ b/fs/ntfs/super.c
73080@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73081 if (!silent)
73082 ntfs_error(sb, "Primary boot sector is invalid.");
73083 } else if (!silent)
73084- ntfs_error(sb, read_err_str, "primary");
73085+ ntfs_error(sb, read_err_str, "%s", "primary");
73086 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
73087 if (bh_primary)
73088 brelse(bh_primary);
73089@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73090 goto hotfix_primary_boot_sector;
73091 brelse(bh_backup);
73092 } else if (!silent)
73093- ntfs_error(sb, read_err_str, "backup");
73094+ ntfs_error(sb, read_err_str, "%s", "backup");
73095 /* Try to read NT3.51- backup boot sector. */
73096 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
73097 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
73098@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
73099 "sector.");
73100 brelse(bh_backup);
73101 } else if (!silent)
73102- ntfs_error(sb, read_err_str, "backup");
73103+ ntfs_error(sb, read_err_str, "%s", "backup");
73104 /* We failed. Cleanup and return. */
73105 if (bh_primary)
73106 brelse(bh_primary);
73107diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
73108index 0440134..d52c93a 100644
73109--- a/fs/ocfs2/localalloc.c
73110+++ b/fs/ocfs2/localalloc.c
73111@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
73112 goto bail;
73113 }
73114
73115- atomic_inc(&osb->alloc_stats.moves);
73116+ atomic_inc_unchecked(&osb->alloc_stats.moves);
73117
73118 bail:
73119 if (handle)
73120diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
73121index 460c6c3..b4ef513 100644
73122--- a/fs/ocfs2/ocfs2.h
73123+++ b/fs/ocfs2/ocfs2.h
73124@@ -247,11 +247,11 @@ enum ocfs2_vol_state
73125
73126 struct ocfs2_alloc_stats
73127 {
73128- atomic_t moves;
73129- atomic_t local_data;
73130- atomic_t bitmap_data;
73131- atomic_t bg_allocs;
73132- atomic_t bg_extends;
73133+ atomic_unchecked_t moves;
73134+ atomic_unchecked_t local_data;
73135+ atomic_unchecked_t bitmap_data;
73136+ atomic_unchecked_t bg_allocs;
73137+ atomic_unchecked_t bg_extends;
73138 };
73139
73140 enum ocfs2_local_alloc_state
73141diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
73142index ee541f9..df3a500 100644
73143--- a/fs/ocfs2/refcounttree.c
73144+++ b/fs/ocfs2/refcounttree.c
73145@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
73146 error = posix_acl_create(dir, &mode, &default_acl, &acl);
73147 if (error) {
73148 mlog_errno(error);
73149- goto out;
73150+ return error;
73151 }
73152
73153 error = ocfs2_create_inode_in_orphan(dir, mode,
73154diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
73155index 0cb889a..6a26b24 100644
73156--- a/fs/ocfs2/suballoc.c
73157+++ b/fs/ocfs2/suballoc.c
73158@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
73159 mlog_errno(status);
73160 goto bail;
73161 }
73162- atomic_inc(&osb->alloc_stats.bg_extends);
73163+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
73164
73165 /* You should never ask for this much metadata */
73166 BUG_ON(bits_wanted >
73167@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
73168 mlog_errno(status);
73169 goto bail;
73170 }
73171- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73172+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73173
73174 *suballoc_loc = res.sr_bg_blkno;
73175 *suballoc_bit_start = res.sr_bit_offset;
73176@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
73177 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
73178 res->sr_bits);
73179
73180- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73181+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73182
73183 BUG_ON(res->sr_bits != 1);
73184
73185@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
73186 mlog_errno(status);
73187 goto bail;
73188 }
73189- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73190+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
73191
73192 BUG_ON(res.sr_bits != 1);
73193
73194@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73195 cluster_start,
73196 num_clusters);
73197 if (!status)
73198- atomic_inc(&osb->alloc_stats.local_data);
73199+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
73200 } else {
73201 if (min_clusters > (osb->bitmap_cpg - 1)) {
73202 /* The only paths asking for contiguousness
73203@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
73204 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
73205 res.sr_bg_blkno,
73206 res.sr_bit_offset);
73207- atomic_inc(&osb->alloc_stats.bitmap_data);
73208+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
73209 *num_clusters = res.sr_bits;
73210 }
73211 }
73212diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
73213index 2667518..24bcf79 100644
73214--- a/fs/ocfs2/super.c
73215+++ b/fs/ocfs2/super.c
73216@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
73217 "%10s => GlobalAllocs: %d LocalAllocs: %d "
73218 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
73219 "Stats",
73220- atomic_read(&osb->alloc_stats.bitmap_data),
73221- atomic_read(&osb->alloc_stats.local_data),
73222- atomic_read(&osb->alloc_stats.bg_allocs),
73223- atomic_read(&osb->alloc_stats.moves),
73224- atomic_read(&osb->alloc_stats.bg_extends));
73225+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
73226+ atomic_read_unchecked(&osb->alloc_stats.local_data),
73227+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
73228+ atomic_read_unchecked(&osb->alloc_stats.moves),
73229+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
73230
73231 out += snprintf(buf + out, len - out,
73232 "%10s => State: %u Descriptor: %llu Size: %u bits "
73233@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
73234
73235 mutex_init(&osb->system_file_mutex);
73236
73237- atomic_set(&osb->alloc_stats.moves, 0);
73238- atomic_set(&osb->alloc_stats.local_data, 0);
73239- atomic_set(&osb->alloc_stats.bitmap_data, 0);
73240- atomic_set(&osb->alloc_stats.bg_allocs, 0);
73241- atomic_set(&osb->alloc_stats.bg_extends, 0);
73242+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
73243+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
73244+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
73245+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
73246+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
73247
73248 /* Copy the blockcheck stats from the superblock probe */
73249 osb->osb_ecc_stats = *stats;
73250diff --git a/fs/open.c b/fs/open.c
73251index 44a3be1..5e97aa1 100644
73252--- a/fs/open.c
73253+++ b/fs/open.c
73254@@ -32,6 +32,8 @@
73255 #include <linux/dnotify.h>
73256 #include <linux/compat.h>
73257
73258+#define CREATE_TRACE_POINTS
73259+#include <trace/events/fs.h>
73260 #include "internal.h"
73261
73262 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
73263@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
73264 error = locks_verify_truncate(inode, NULL, length);
73265 if (!error)
73266 error = security_path_truncate(path);
73267+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
73268+ error = -EACCES;
73269 if (!error)
73270 error = do_truncate(path->dentry, length, 0, NULL);
73271
73272@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
73273 error = locks_verify_truncate(inode, f.file, length);
73274 if (!error)
73275 error = security_path_truncate(&f.file->f_path);
73276+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
73277+ error = -EACCES;
73278 if (!error)
73279 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
73280 sb_end_write(inode->i_sb);
73281@@ -392,6 +398,9 @@ retry:
73282 if (__mnt_is_readonly(path.mnt))
73283 res = -EROFS;
73284
73285+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
73286+ res = -EACCES;
73287+
73288 out_path_release:
73289 path_put(&path);
73290 if (retry_estale(res, lookup_flags)) {
73291@@ -423,6 +432,8 @@ retry:
73292 if (error)
73293 goto dput_and_out;
73294
73295+ gr_log_chdir(path.dentry, path.mnt);
73296+
73297 set_fs_pwd(current->fs, &path);
73298
73299 dput_and_out:
73300@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
73301 goto out_putf;
73302
73303 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
73304+
73305+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
73306+ error = -EPERM;
73307+
73308+ if (!error)
73309+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
73310+
73311 if (!error)
73312 set_fs_pwd(current->fs, &f.file->f_path);
73313 out_putf:
73314@@ -481,7 +499,13 @@ retry:
73315 if (error)
73316 goto dput_and_out;
73317
73318+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
73319+ goto dput_and_out;
73320+
73321 set_fs_root(current->fs, &path);
73322+
73323+ gr_handle_chroot_chdir(&path);
73324+
73325 error = 0;
73326 dput_and_out:
73327 path_put(&path);
73328@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
73329 return error;
73330 retry_deleg:
73331 mutex_lock(&inode->i_mutex);
73332+
73333+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
73334+ error = -EACCES;
73335+ goto out_unlock;
73336+ }
73337+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
73338+ error = -EACCES;
73339+ goto out_unlock;
73340+ }
73341+
73342 error = security_path_chmod(path, mode);
73343 if (error)
73344 goto out_unlock;
73345@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
73346 uid = make_kuid(current_user_ns(), user);
73347 gid = make_kgid(current_user_ns(), group);
73348
73349+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
73350+ return -EACCES;
73351+
73352 retry_deleg:
73353 newattrs.ia_valid = ATTR_CTIME;
73354 if (user != (uid_t) -1) {
73355@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
73356 } else {
73357 fsnotify_open(f);
73358 fd_install(fd, f);
73359+ trace_do_sys_open(tmp->name, flags, mode);
73360 }
73361 }
73362 putname(tmp);
73363diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
73364index bf8537c..c16ef7d 100644
73365--- a/fs/overlayfs/super.c
73366+++ b/fs/overlayfs/super.c
73367@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
73368 {
73369 struct ovl_entry *oe = dentry->d_fsdata;
73370
73371- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
73372+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
73373 }
73374
73375 int ovl_want_write(struct dentry *dentry)
73376@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
73377
73378 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
73379 {
73380- struct path upperpath = { NULL, NULL };
73381- struct path workpath = { NULL, NULL };
73382+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
73383+ struct path workpath = { .dentry = NULL, .mnt = NULL };
73384 struct dentry *root_dentry;
73385 struct ovl_entry *oe;
73386 struct ovl_fs *ufs;
73387diff --git a/fs/pipe.c b/fs/pipe.c
73388index 21981e5..2c0bffb 100644
73389--- a/fs/pipe.c
73390+++ b/fs/pipe.c
73391@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
73392 /*
73393 * Minimum pipe size, as required by POSIX
73394 */
73395-unsigned int pipe_min_size = PAGE_SIZE;
73396+unsigned int pipe_min_size __read_only = PAGE_SIZE;
73397
73398 /*
73399 * We use a start+len construction, which provides full use of the
73400@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
73401
73402 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
73403 {
73404- if (pipe->files)
73405+ if (atomic_read(&pipe->files))
73406 mutex_lock_nested(&pipe->mutex, subclass);
73407 }
73408
73409@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
73410
73411 void pipe_unlock(struct pipe_inode_info *pipe)
73412 {
73413- if (pipe->files)
73414+ if (atomic_read(&pipe->files))
73415 mutex_unlock(&pipe->mutex);
73416 }
73417 EXPORT_SYMBOL(pipe_unlock);
73418@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
73419 }
73420 if (bufs) /* More to do? */
73421 continue;
73422- if (!pipe->writers)
73423+ if (!atomic_read(&pipe->writers))
73424 break;
73425- if (!pipe->waiting_writers) {
73426+ if (!atomic_read(&pipe->waiting_writers)) {
73427 /* syscall merging: Usually we must not sleep
73428 * if O_NONBLOCK is set, or if we got some data.
73429 * But if a writer sleeps in kernel space, then
73430@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73431
73432 __pipe_lock(pipe);
73433
73434- if (!pipe->readers) {
73435+ if (!atomic_read(&pipe->readers)) {
73436 send_sig(SIGPIPE, current, 0);
73437 ret = -EPIPE;
73438 goto out;
73439@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73440 for (;;) {
73441 int bufs;
73442
73443- if (!pipe->readers) {
73444+ if (!atomic_read(&pipe->readers)) {
73445 send_sig(SIGPIPE, current, 0);
73446 if (!ret)
73447 ret = -EPIPE;
73448@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
73449 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73450 do_wakeup = 0;
73451 }
73452- pipe->waiting_writers++;
73453+ atomic_inc(&pipe->waiting_writers);
73454 pipe_wait(pipe);
73455- pipe->waiting_writers--;
73456+ atomic_dec(&pipe->waiting_writers);
73457 }
73458 out:
73459 __pipe_unlock(pipe);
73460@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73461 mask = 0;
73462 if (filp->f_mode & FMODE_READ) {
73463 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
73464- if (!pipe->writers && filp->f_version != pipe->w_counter)
73465+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
73466 mask |= POLLHUP;
73467 }
73468
73469@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
73470 * Most Unices do not set POLLERR for FIFOs but on Linux they
73471 * behave exactly like pipes for poll().
73472 */
73473- if (!pipe->readers)
73474+ if (!atomic_read(&pipe->readers))
73475 mask |= POLLERR;
73476 }
73477
73478@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
73479 int kill = 0;
73480
73481 spin_lock(&inode->i_lock);
73482- if (!--pipe->files) {
73483+ if (atomic_dec_and_test(&pipe->files)) {
73484 inode->i_pipe = NULL;
73485 kill = 1;
73486 }
73487@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
73488
73489 __pipe_lock(pipe);
73490 if (file->f_mode & FMODE_READ)
73491- pipe->readers--;
73492+ atomic_dec(&pipe->readers);
73493 if (file->f_mode & FMODE_WRITE)
73494- pipe->writers--;
73495+ atomic_dec(&pipe->writers);
73496
73497- if (pipe->readers || pipe->writers) {
73498+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
73499 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
73500 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
73501 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
73502@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
73503 kfree(pipe);
73504 }
73505
73506-static struct vfsmount *pipe_mnt __read_mostly;
73507+struct vfsmount *pipe_mnt __read_mostly;
73508
73509 /*
73510 * pipefs_dname() is called from d_path().
73511@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
73512 goto fail_iput;
73513
73514 inode->i_pipe = pipe;
73515- pipe->files = 2;
73516- pipe->readers = pipe->writers = 1;
73517+ atomic_set(&pipe->files, 2);
73518+ atomic_set(&pipe->readers, 1);
73519+ atomic_set(&pipe->writers, 1);
73520 inode->i_fop = &pipefifo_fops;
73521
73522 /*
73523@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
73524 spin_lock(&inode->i_lock);
73525 if (inode->i_pipe) {
73526 pipe = inode->i_pipe;
73527- pipe->files++;
73528+ atomic_inc(&pipe->files);
73529 spin_unlock(&inode->i_lock);
73530 } else {
73531 spin_unlock(&inode->i_lock);
73532 pipe = alloc_pipe_info();
73533 if (!pipe)
73534 return -ENOMEM;
73535- pipe->files = 1;
73536+ atomic_set(&pipe->files, 1);
73537 spin_lock(&inode->i_lock);
73538 if (unlikely(inode->i_pipe)) {
73539- inode->i_pipe->files++;
73540+ atomic_inc(&inode->i_pipe->files);
73541 spin_unlock(&inode->i_lock);
73542 free_pipe_info(pipe);
73543 pipe = inode->i_pipe;
73544@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
73545 * opened, even when there is no process writing the FIFO.
73546 */
73547 pipe->r_counter++;
73548- if (pipe->readers++ == 0)
73549+ if (atomic_inc_return(&pipe->readers) == 1)
73550 wake_up_partner(pipe);
73551
73552- if (!is_pipe && !pipe->writers) {
73553+ if (!is_pipe && !atomic_read(&pipe->writers)) {
73554 if ((filp->f_flags & O_NONBLOCK)) {
73555 /* suppress POLLHUP until we have
73556 * seen a writer */
73557@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
73558 * errno=ENXIO when there is no process reading the FIFO.
73559 */
73560 ret = -ENXIO;
73561- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
73562+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
73563 goto err;
73564
73565 pipe->w_counter++;
73566- if (!pipe->writers++)
73567+ if (atomic_inc_return(&pipe->writers) == 1)
73568 wake_up_partner(pipe);
73569
73570- if (!is_pipe && !pipe->readers) {
73571+ if (!is_pipe && !atomic_read(&pipe->readers)) {
73572 if (wait_for_partner(pipe, &pipe->r_counter))
73573 goto err_wr;
73574 }
73575@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
73576 * the process can at least talk to itself.
73577 */
73578
73579- pipe->readers++;
73580- pipe->writers++;
73581+ atomic_inc(&pipe->readers);
73582+ atomic_inc(&pipe->writers);
73583 pipe->r_counter++;
73584 pipe->w_counter++;
73585- if (pipe->readers == 1 || pipe->writers == 1)
73586+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
73587 wake_up_partner(pipe);
73588 break;
73589
73590@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
73591 return 0;
73592
73593 err_rd:
73594- if (!--pipe->readers)
73595+ if (atomic_dec_and_test(&pipe->readers))
73596 wake_up_interruptible(&pipe->wait);
73597 ret = -ERESTARTSYS;
73598 goto err;
73599
73600 err_wr:
73601- if (!--pipe->writers)
73602+ if (atomic_dec_and_test(&pipe->writers))
73603 wake_up_interruptible(&pipe->wait);
73604 ret = -ERESTARTSYS;
73605 goto err;
73606@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
73607 * Currently we rely on the pipe array holding a power-of-2 number
73608 * of pages.
73609 */
73610-static inline unsigned int round_pipe_size(unsigned int size)
73611+static inline unsigned long round_pipe_size(unsigned long size)
73612 {
73613 unsigned long nr_pages;
73614
73615@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
73616
73617 switch (cmd) {
73618 case F_SETPIPE_SZ: {
73619- unsigned int size, nr_pages;
73620+ unsigned long size, nr_pages;
73621+
73622+ ret = -EINVAL;
73623+ if (arg < pipe_min_size)
73624+ goto out;
73625
73626 size = round_pipe_size(arg);
73627 nr_pages = size >> PAGE_SHIFT;
73628
73629- ret = -EINVAL;
73630- if (!nr_pages)
73631+ if (size < pipe_min_size)
73632 goto out;
73633
73634 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
73635diff --git a/fs/posix_acl.c b/fs/posix_acl.c
73636index 3a48bb7..403067b 100644
73637--- a/fs/posix_acl.c
73638+++ b/fs/posix_acl.c
73639@@ -20,6 +20,7 @@
73640 #include <linux/xattr.h>
73641 #include <linux/export.h>
73642 #include <linux/user_namespace.h>
73643+#include <linux/grsecurity.h>
73644
73645 struct posix_acl **acl_by_type(struct inode *inode, int type)
73646 {
73647@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
73648 }
73649 }
73650 if (mode_p)
73651- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73652+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73653 return not_equiv;
73654 }
73655 EXPORT_SYMBOL(posix_acl_equiv_mode);
73656@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
73657 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
73658 }
73659
73660- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
73661+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
73662 return not_equiv;
73663 }
73664
73665@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
73666 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
73667 int err = -ENOMEM;
73668 if (clone) {
73669+ *mode_p &= ~gr_acl_umask();
73670+
73671 err = posix_acl_create_masq(clone, mode_p);
73672 if (err < 0) {
73673 posix_acl_release(clone);
73674@@ -663,11 +666,12 @@ struct posix_acl *
73675 posix_acl_from_xattr(struct user_namespace *user_ns,
73676 const void *value, size_t size)
73677 {
73678- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
73679- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
73680+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
73681+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
73682 int count;
73683 struct posix_acl *acl;
73684 struct posix_acl_entry *acl_e;
73685+ umode_t umask = gr_acl_umask();
73686
73687 if (!value)
73688 return NULL;
73689@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73690
73691 switch(acl_e->e_tag) {
73692 case ACL_USER_OBJ:
73693+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73694+ break;
73695 case ACL_GROUP_OBJ:
73696 case ACL_MASK:
73697+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73698+ break;
73699 case ACL_OTHER:
73700+ acl_e->e_perm &= ~(umask & S_IRWXO);
73701 break;
73702
73703 case ACL_USER:
73704+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
73705 acl_e->e_uid =
73706 make_kuid(user_ns,
73707 le32_to_cpu(entry->e_id));
73708@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
73709 goto fail;
73710 break;
73711 case ACL_GROUP:
73712+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
73713 acl_e->e_gid =
73714 make_kgid(user_ns,
73715 le32_to_cpu(entry->e_id));
73716diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
73717index 2183fcf..3c32a98 100644
73718--- a/fs/proc/Kconfig
73719+++ b/fs/proc/Kconfig
73720@@ -30,7 +30,7 @@ config PROC_FS
73721
73722 config PROC_KCORE
73723 bool "/proc/kcore support" if !ARM
73724- depends on PROC_FS && MMU
73725+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
73726 help
73727 Provides a virtual ELF core file of the live kernel. This can
73728 be read with gdb and other ELF tools. No modifications can be
73729@@ -38,8 +38,8 @@ config PROC_KCORE
73730
73731 config PROC_VMCORE
73732 bool "/proc/vmcore support"
73733- depends on PROC_FS && CRASH_DUMP
73734- default y
73735+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
73736+ default n
73737 help
73738 Exports the dump image of crashed kernel in ELF format.
73739
73740@@ -63,8 +63,8 @@ config PROC_SYSCTL
73741 limited in memory.
73742
73743 config PROC_PAGE_MONITOR
73744- default y
73745- depends on PROC_FS && MMU
73746+ default n
73747+ depends on PROC_FS && MMU && !GRKERNSEC
73748 bool "Enable /proc page monitoring" if EXPERT
73749 help
73750 Various /proc files exist to monitor process memory utilization:
73751diff --git a/fs/proc/array.c b/fs/proc/array.c
73752index 1295a00..4c91a6b 100644
73753--- a/fs/proc/array.c
73754+++ b/fs/proc/array.c
73755@@ -60,6 +60,7 @@
73756 #include <linux/tty.h>
73757 #include <linux/string.h>
73758 #include <linux/mman.h>
73759+#include <linux/grsecurity.h>
73760 #include <linux/proc_fs.h>
73761 #include <linux/ioport.h>
73762 #include <linux/uaccess.h>
73763@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
73764 cpumask_pr_args(&task->cpus_allowed));
73765 }
73766
73767+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73768+static inline void task_pax(struct seq_file *m, struct task_struct *p)
73769+{
73770+ if (p->mm)
73771+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
73772+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
73773+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
73774+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
73775+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
73776+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
73777+ else
73778+ seq_printf(m, "PaX:\t-----\n");
73779+}
73780+#endif
73781+
73782 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73783 struct pid *pid, struct task_struct *task)
73784 {
73785@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
73786 task_cpus_allowed(m, task);
73787 cpuset_task_status_allowed(m, task);
73788 task_context_switch_counts(m, task);
73789+
73790+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
73791+ task_pax(m, task);
73792+#endif
73793+
73794+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
73795+ task_grsec_rbac(m, task);
73796+#endif
73797+
73798 return 0;
73799 }
73800
73801+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73802+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73803+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73804+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73805+#endif
73806+
73807 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73808 struct pid *pid, struct task_struct *task, int whole)
73809 {
73810@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73811 char tcomm[sizeof(task->comm)];
73812 unsigned long flags;
73813
73814+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73815+ if (current->exec_id != m->exec_id) {
73816+ gr_log_badprocpid("stat");
73817+ return 0;
73818+ }
73819+#endif
73820+
73821 state = *get_task_state(task);
73822 vsize = eip = esp = 0;
73823 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
73824@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73825 gtime = task_gtime(task);
73826 }
73827
73828+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73829+ if (PAX_RAND_FLAGS(mm)) {
73830+ eip = 0;
73831+ esp = 0;
73832+ wchan = 0;
73833+ }
73834+#endif
73835+#ifdef CONFIG_GRKERNSEC_HIDESYM
73836+ wchan = 0;
73837+ eip =0;
73838+ esp =0;
73839+#endif
73840+
73841 /* scale priority and nice values from timeslices to -20..20 */
73842 /* to make it look like a "normal" Unix priority/nice value */
73843 priority = task_prio(task);
73844@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73845 seq_put_decimal_ull(m, ' ', vsize);
73846 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
73847 seq_put_decimal_ull(m, ' ', rsslim);
73848+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73849+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
73850+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
73851+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
73852+#else
73853 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
73854 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
73855 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
73856+#endif
73857 seq_put_decimal_ull(m, ' ', esp);
73858 seq_put_decimal_ull(m, ' ', eip);
73859 /* The signal information here is obsolete.
73860@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
73861 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
73862 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
73863
73864- if (mm && permitted) {
73865+ if (mm && permitted
73866+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73867+ && !PAX_RAND_FLAGS(mm)
73868+#endif
73869+ ) {
73870 seq_put_decimal_ull(m, ' ', mm->start_data);
73871 seq_put_decimal_ull(m, ' ', mm->end_data);
73872 seq_put_decimal_ull(m, ' ', mm->start_brk);
73873@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73874 struct pid *pid, struct task_struct *task)
73875 {
73876 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
73877- struct mm_struct *mm = get_task_mm(task);
73878+ struct mm_struct *mm;
73879
73880+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73881+ if (current->exec_id != m->exec_id) {
73882+ gr_log_badprocpid("statm");
73883+ return 0;
73884+ }
73885+#endif
73886+ mm = get_task_mm(task);
73887 if (mm) {
73888 size = task_statm(mm, &shared, &text, &data, &resident);
73889 mmput(mm);
73890@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
73891 return 0;
73892 }
73893
73894+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
73895+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
73896+{
73897+ unsigned long flags;
73898+ u32 curr_ip = 0;
73899+
73900+ if (lock_task_sighand(task, &flags)) {
73901+ curr_ip = task->signal->curr_ip;
73902+ unlock_task_sighand(task, &flags);
73903+ }
73904+ return seq_printf(m, "%pI4\n", &curr_ip);
73905+}
73906+#endif
73907+
73908 #ifdef CONFIG_CHECKPOINT_RESTORE
73909 static struct pid *
73910 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
73911diff --git a/fs/proc/base.c b/fs/proc/base.c
73912index 3f3d7ae..68de109 100644
73913--- a/fs/proc/base.c
73914+++ b/fs/proc/base.c
73915@@ -113,6 +113,14 @@ struct pid_entry {
73916 union proc_op op;
73917 };
73918
73919+struct getdents_callback {
73920+ struct linux_dirent __user * current_dir;
73921+ struct linux_dirent __user * previous;
73922+ struct file * file;
73923+ int count;
73924+ int error;
73925+};
73926+
73927 #define NOD(NAME, MODE, IOP, FOP, OP) { \
73928 .name = (NAME), \
73929 .len = sizeof(NAME) - 1, \
73930@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
73931 return 0;
73932 }
73933
73934+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73935+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
73936+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
73937+ _mm->pax_flags & MF_PAX_SEGMEXEC))
73938+#endif
73939+
73940 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73941 struct pid *pid, struct task_struct *task)
73942 {
73943 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
73944 if (mm && !IS_ERR(mm)) {
73945 unsigned int nwords = 0;
73946+
73947+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73948+ /* allow if we're currently ptracing this task */
73949+ if (PAX_RAND_FLAGS(mm) &&
73950+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
73951+ mmput(mm);
73952+ return 0;
73953+ }
73954+#endif
73955+
73956 do {
73957 nwords += 2;
73958 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
73959@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
73960 }
73961
73962
73963-#ifdef CONFIG_KALLSYMS
73964+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73965 /*
73966 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
73967 * Returns the resolved symbol. If that fails, simply return the address.
73968@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
73969 mutex_unlock(&task->signal->cred_guard_mutex);
73970 }
73971
73972-#ifdef CONFIG_STACKTRACE
73973+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
73974
73975 #define MAX_STACK_TRACE_DEPTH 64
73976
73977@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
73978 return 0;
73979 }
73980
73981-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
73982+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
73983 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73984 struct pid *pid, struct task_struct *task)
73985 {
73986@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
73987 /************************************************************************/
73988
73989 /* permission checks */
73990-static int proc_fd_access_allowed(struct inode *inode)
73991+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
73992 {
73993 struct task_struct *task;
73994 int allowed = 0;
73995@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
73996 */
73997 task = get_proc_task(inode);
73998 if (task) {
73999- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74000+ if (log)
74001+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
74002+ else
74003+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
74004 put_task_struct(task);
74005 }
74006 return allowed;
74007@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
74008 struct task_struct *task,
74009 int hide_pid_min)
74010 {
74011+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74012+ return false;
74013+
74014+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74015+ rcu_read_lock();
74016+ {
74017+ const struct cred *tmpcred = current_cred();
74018+ const struct cred *cred = __task_cred(task);
74019+
74020+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
74021+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74022+ || in_group_p(grsec_proc_gid)
74023+#endif
74024+ ) {
74025+ rcu_read_unlock();
74026+ return true;
74027+ }
74028+ }
74029+ rcu_read_unlock();
74030+
74031+ if (!pid->hide_pid)
74032+ return false;
74033+#endif
74034+
74035 if (pid->hide_pid < hide_pid_min)
74036 return true;
74037 if (in_group_p(pid->pid_gid))
74038 return true;
74039+
74040 return ptrace_may_access(task, PTRACE_MODE_READ);
74041 }
74042
74043@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
74044 put_task_struct(task);
74045
74046 if (!has_perms) {
74047+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74048+ {
74049+#else
74050 if (pid->hide_pid == 2) {
74051+#endif
74052 /*
74053 * Let's make getdents(), stat(), and open()
74054 * consistent with each other. If a process
74055@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
74056
74057 if (task) {
74058 mm = mm_access(task, mode);
74059+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
74060+ mmput(mm);
74061+ mm = ERR_PTR(-EPERM);
74062+ }
74063 put_task_struct(task);
74064
74065 if (!IS_ERR_OR_NULL(mm)) {
74066@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
74067 return PTR_ERR(mm);
74068
74069 file->private_data = mm;
74070+
74071+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74072+ file->f_version = current->exec_id;
74073+#endif
74074+
74075 return 0;
74076 }
74077
74078@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74079 ssize_t copied;
74080 char *page;
74081
74082+#ifdef CONFIG_GRKERNSEC
74083+ if (write)
74084+ return -EPERM;
74085+#endif
74086+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74087+ if (file->f_version != current->exec_id) {
74088+ gr_log_badprocpid("mem");
74089+ return 0;
74090+ }
74091+#endif
74092+
74093 if (!mm)
74094 return 0;
74095
74096@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
74097 goto free;
74098
74099 while (count > 0) {
74100- int this_len = min_t(int, count, PAGE_SIZE);
74101+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
74102
74103 if (write && copy_from_user(page, buf, this_len)) {
74104 copied = -EFAULT;
74105@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74106 if (!mm)
74107 return 0;
74108
74109+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74110+ if (file->f_version != current->exec_id) {
74111+ gr_log_badprocpid("environ");
74112+ return 0;
74113+ }
74114+#endif
74115+
74116 page = (char *)__get_free_page(GFP_TEMPORARY);
74117 if (!page)
74118 return -ENOMEM;
74119@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
74120 goto free;
74121 while (count > 0) {
74122 size_t this_len, max_len;
74123- int retval;
74124+ ssize_t retval;
74125
74126 if (src >= (mm->env_end - mm->env_start))
74127 break;
74128@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
74129 int error = -EACCES;
74130
74131 /* Are we allowed to snoop on the tasks file descriptors? */
74132- if (!proc_fd_access_allowed(inode))
74133+ if (!proc_fd_access_allowed(inode, 0))
74134 goto out;
74135
74136 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74137@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
74138 struct path path;
74139
74140 /* Are we allowed to snoop on the tasks file descriptors? */
74141- if (!proc_fd_access_allowed(inode))
74142- goto out;
74143+ /* logging this is needed for learning on chromium to work properly,
74144+ but we don't want to flood the logs from 'ps' which does a readlink
74145+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
74146+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
74147+ */
74148+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
74149+ if (!proc_fd_access_allowed(inode,0))
74150+ goto out;
74151+ } else {
74152+ if (!proc_fd_access_allowed(inode,1))
74153+ goto out;
74154+ }
74155
74156 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
74157 if (error)
74158@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
74159 rcu_read_lock();
74160 cred = __task_cred(task);
74161 inode->i_uid = cred->euid;
74162+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74163+ inode->i_gid = grsec_proc_gid;
74164+#else
74165 inode->i_gid = cred->egid;
74166+#endif
74167 rcu_read_unlock();
74168 }
74169 security_task_to_inode(task, inode);
74170@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
74171 return -ENOENT;
74172 }
74173 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74174+#ifdef CONFIG_GRKERNSEC_PROC_USER
74175+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74176+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74177+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74178+#endif
74179 task_dumpable(task)) {
74180 cred = __task_cred(task);
74181 stat->uid = cred->euid;
74182+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74183+ stat->gid = grsec_proc_gid;
74184+#else
74185 stat->gid = cred->egid;
74186+#endif
74187 }
74188 }
74189 rcu_read_unlock();
74190@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
74191
74192 if (task) {
74193 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
74194+#ifdef CONFIG_GRKERNSEC_PROC_USER
74195+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
74196+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74197+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
74198+#endif
74199 task_dumpable(task)) {
74200 rcu_read_lock();
74201 cred = __task_cred(task);
74202 inode->i_uid = cred->euid;
74203+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74204+ inode->i_gid = grsec_proc_gid;
74205+#else
74206 inode->i_gid = cred->egid;
74207+#endif
74208 rcu_read_unlock();
74209 } else {
74210 inode->i_uid = GLOBAL_ROOT_UID;
74211@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
74212 if (!task)
74213 goto out_no_task;
74214
74215+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74216+ goto out;
74217+
74218 /*
74219 * Yes, it does not scale. And it should not. Don't add
74220 * new entries into /proc/<tgid>/ without very good reasons.
74221@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
74222 if (!task)
74223 return -ENOENT;
74224
74225+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74226+ goto out;
74227+
74228 if (!dir_emit_dots(file, ctx))
74229 goto out;
74230
74231@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
74232 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
74233 #endif
74234 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74235-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74236+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74237 ONE("syscall", S_IRUSR, proc_pid_syscall),
74238 #endif
74239 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74240@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
74241 #ifdef CONFIG_SECURITY
74242 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74243 #endif
74244-#ifdef CONFIG_KALLSYMS
74245+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74246 ONE("wchan", S_IRUGO, proc_pid_wchan),
74247 #endif
74248-#ifdef CONFIG_STACKTRACE
74249+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74250 ONE("stack", S_IRUSR, proc_pid_stack),
74251 #endif
74252 #ifdef CONFIG_SCHEDSTATS
74253@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
74254 #ifdef CONFIG_HARDWALL
74255 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
74256 #endif
74257+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74258+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
74259+#endif
74260 #ifdef CONFIG_USER_NS
74261 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
74262 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
74263@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
74264 if (!inode)
74265 goto out;
74266
74267+#ifdef CONFIG_GRKERNSEC_PROC_USER
74268+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
74269+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74270+ inode->i_gid = grsec_proc_gid;
74271+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
74272+#else
74273 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
74274+#endif
74275 inode->i_op = &proc_tgid_base_inode_operations;
74276 inode->i_fop = &proc_tgid_base_operations;
74277 inode->i_flags|=S_IMMUTABLE;
74278@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
74279 if (!task)
74280 goto out;
74281
74282+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
74283+ goto out_put_task;
74284+
74285 result = proc_pid_instantiate(dir, dentry, task, NULL);
74286+out_put_task:
74287 put_task_struct(task);
74288 out:
74289 return ERR_PTR(result);
74290@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
74291 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
74292 #endif
74293 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
74294-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
74295+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
74296 ONE("syscall", S_IRUSR, proc_pid_syscall),
74297 #endif
74298 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
74299@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
74300 #ifdef CONFIG_SECURITY
74301 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
74302 #endif
74303-#ifdef CONFIG_KALLSYMS
74304+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74305 ONE("wchan", S_IRUGO, proc_pid_wchan),
74306 #endif
74307-#ifdef CONFIG_STACKTRACE
74308+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
74309 ONE("stack", S_IRUSR, proc_pid_stack),
74310 #endif
74311 #ifdef CONFIG_SCHEDSTATS
74312diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
74313index cbd82df..c0407d2 100644
74314--- a/fs/proc/cmdline.c
74315+++ b/fs/proc/cmdline.c
74316@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
74317
74318 static int __init proc_cmdline_init(void)
74319 {
74320+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74321+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
74322+#else
74323 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
74324+#endif
74325 return 0;
74326 }
74327 fs_initcall(proc_cmdline_init);
74328diff --git a/fs/proc/devices.c b/fs/proc/devices.c
74329index 50493ed..248166b 100644
74330--- a/fs/proc/devices.c
74331+++ b/fs/proc/devices.c
74332@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
74333
74334 static int __init proc_devices_init(void)
74335 {
74336+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74337+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
74338+#else
74339 proc_create("devices", 0, NULL, &proc_devinfo_operations);
74340+#endif
74341 return 0;
74342 }
74343 fs_initcall(proc_devices_init);
74344diff --git a/fs/proc/fd.c b/fs/proc/fd.c
74345index 8e5ad83..1f07a8c 100644
74346--- a/fs/proc/fd.c
74347+++ b/fs/proc/fd.c
74348@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
74349 if (!task)
74350 return -ENOENT;
74351
74352- files = get_files_struct(task);
74353+ if (!gr_acl_handle_procpidmem(task))
74354+ files = get_files_struct(task);
74355 put_task_struct(task);
74356
74357 if (files) {
74358@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
74359 */
74360 int proc_fd_permission(struct inode *inode, int mask)
74361 {
74362+ struct task_struct *task;
74363 int rv = generic_permission(inode, mask);
74364- if (rv == 0)
74365- return 0;
74366+
74367 if (task_tgid(current) == proc_pid(inode))
74368 rv = 0;
74369+
74370+ task = get_proc_task(inode);
74371+ if (task == NULL)
74372+ return rv;
74373+
74374+ if (gr_acl_handle_procpidmem(task))
74375+ rv = -EACCES;
74376+
74377+ put_task_struct(task);
74378+
74379 return rv;
74380 }
74381
74382diff --git a/fs/proc/generic.c b/fs/proc/generic.c
74383index be65b20..2998ba8 100644
74384--- a/fs/proc/generic.c
74385+++ b/fs/proc/generic.c
74386@@ -22,6 +22,7 @@
74387 #include <linux/bitops.h>
74388 #include <linux/spinlock.h>
74389 #include <linux/completion.h>
74390+#include <linux/grsecurity.h>
74391 #include <asm/uaccess.h>
74392
74393 #include "internal.h"
74394@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
74395 return proc_lookup_de(PDE(dir), dir, dentry);
74396 }
74397
74398+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
74399+ unsigned int flags)
74400+{
74401+ if (gr_proc_is_restricted())
74402+ return ERR_PTR(-EACCES);
74403+
74404+ return proc_lookup_de(PDE(dir), dir, dentry);
74405+}
74406+
74407 /*
74408 * This returns non-zero if at EOF, so that the /proc
74409 * root directory can use this and check if it should
74410@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
74411 return proc_readdir_de(PDE(inode), file, ctx);
74412 }
74413
74414+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
74415+{
74416+ struct inode *inode = file_inode(file);
74417+
74418+ if (gr_proc_is_restricted())
74419+ return -EACCES;
74420+
74421+ return proc_readdir_de(PDE(inode), file, ctx);
74422+}
74423+
74424 /*
74425 * These are the generic /proc directory operations. They
74426 * use the in-memory "struct proc_dir_entry" tree to parse
74427@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
74428 .iterate = proc_readdir,
74429 };
74430
74431+static const struct file_operations proc_dir_restricted_operations = {
74432+ .llseek = generic_file_llseek,
74433+ .read = generic_read_dir,
74434+ .iterate = proc_readdir_restrict,
74435+};
74436+
74437 /*
74438 * proc directories can do almost nothing..
74439 */
74440@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
74441 .setattr = proc_notify_change,
74442 };
74443
74444+static const struct inode_operations proc_dir_restricted_inode_operations = {
74445+ .lookup = proc_lookup_restrict,
74446+ .getattr = proc_getattr,
74447+ .setattr = proc_notify_change,
74448+};
74449+
74450 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
74451 {
74452 int ret;
74453@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
74454 }
74455 EXPORT_SYMBOL_GPL(proc_mkdir_data);
74456
74457+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
74458+ struct proc_dir_entry *parent, void *data)
74459+{
74460+ struct proc_dir_entry *ent;
74461+
74462+ if (mode == 0)
74463+ mode = S_IRUGO | S_IXUGO;
74464+
74465+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
74466+ if (ent) {
74467+ ent->data = data;
74468+ ent->restricted = 1;
74469+ ent->proc_fops = &proc_dir_restricted_operations;
74470+ ent->proc_iops = &proc_dir_restricted_inode_operations;
74471+ parent->nlink++;
74472+ if (proc_register(parent, ent) < 0) {
74473+ kfree(ent);
74474+ parent->nlink--;
74475+ ent = NULL;
74476+ }
74477+ }
74478+ return ent;
74479+}
74480+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
74481+
74482 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
74483 struct proc_dir_entry *parent)
74484 {
74485@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
74486 }
74487 EXPORT_SYMBOL(proc_mkdir);
74488
74489+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
74490+ struct proc_dir_entry *parent)
74491+{
74492+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
74493+}
74494+EXPORT_SYMBOL(proc_mkdir_restrict);
74495+
74496 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
74497 struct proc_dir_entry *parent,
74498 const struct file_operations *proc_fops,
74499diff --git a/fs/proc/inode.c b/fs/proc/inode.c
74500index 7697b66..8d8e541 100644
74501--- a/fs/proc/inode.c
74502+++ b/fs/proc/inode.c
74503@@ -24,11 +24,17 @@
74504 #include <linux/mount.h>
74505 #include <linux/magic.h>
74506 #include <linux/namei.h>
74507+#include <linux/grsecurity.h>
74508
74509 #include <asm/uaccess.h>
74510
74511 #include "internal.h"
74512
74513+#ifdef CONFIG_PROC_SYSCTL
74514+extern const struct inode_operations proc_sys_inode_operations;
74515+extern const struct inode_operations proc_sys_dir_operations;
74516+#endif
74517+
74518 static void proc_evict_inode(struct inode *inode)
74519 {
74520 struct proc_dir_entry *de;
74521@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
74522 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
74523 sysctl_head_put(head);
74524 }
74525+
74526+#ifdef CONFIG_PROC_SYSCTL
74527+ if (inode->i_op == &proc_sys_inode_operations ||
74528+ inode->i_op == &proc_sys_dir_operations)
74529+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
74530+#endif
74531+
74532 }
74533
74534 static struct kmem_cache * proc_inode_cachep;
74535@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
74536 if (de->mode) {
74537 inode->i_mode = de->mode;
74538 inode->i_uid = de->uid;
74539+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74540+ inode->i_gid = grsec_proc_gid;
74541+#else
74542 inode->i_gid = de->gid;
74543+#endif
74544 }
74545 if (de->size)
74546 inode->i_size = de->size;
74547diff --git a/fs/proc/internal.h b/fs/proc/internal.h
74548index c835b94..c9e01a3 100644
74549--- a/fs/proc/internal.h
74550+++ b/fs/proc/internal.h
74551@@ -47,9 +47,10 @@ struct proc_dir_entry {
74552 struct completion *pde_unload_completion;
74553 struct list_head pde_openers; /* who did ->open, but not ->release */
74554 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
74555+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
74556 u8 namelen;
74557 char name[];
74558-};
74559+} __randomize_layout;
74560
74561 union proc_op {
74562 int (*proc_get_link)(struct dentry *, struct path *);
74563@@ -67,7 +68,7 @@ struct proc_inode {
74564 struct ctl_table *sysctl_entry;
74565 const struct proc_ns_operations *ns_ops;
74566 struct inode vfs_inode;
74567-};
74568+} __randomize_layout;
74569
74570 /*
74571 * General functions
74572@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
74573 struct pid *, struct task_struct *);
74574 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
74575 struct pid *, struct task_struct *);
74576+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
74577+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
74578+ struct pid *, struct task_struct *);
74579+#endif
74580
74581 /*
74582 * base.c
74583@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
74584 * generic.c
74585 */
74586 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
74587+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
74588 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
74589 struct dentry *);
74590 extern int proc_readdir(struct file *, struct dir_context *);
74591+extern int proc_readdir_restrict(struct file *, struct dir_context *);
74592 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
74593
74594 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
74595diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
74596index a352d57..cb94a5c 100644
74597--- a/fs/proc/interrupts.c
74598+++ b/fs/proc/interrupts.c
74599@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
74600
74601 static int __init proc_interrupts_init(void)
74602 {
74603+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74604+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
74605+#else
74606 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
74607+#endif
74608 return 0;
74609 }
74610 fs_initcall(proc_interrupts_init);
74611diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
74612index 91a4e64..14bf8fa 100644
74613--- a/fs/proc/kcore.c
74614+++ b/fs/proc/kcore.c
74615@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74616 * the addresses in the elf_phdr on our list.
74617 */
74618 start = kc_offset_to_vaddr(*fpos - elf_buflen);
74619- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
74620+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
74621+ if (tsz > buflen)
74622 tsz = buflen;
74623-
74624+
74625 while (buflen) {
74626 struct kcore_list *m;
74627
74628@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74629 } else {
74630 if (kern_addr_valid(start)) {
74631 unsigned long n;
74632+ char *elf_buf;
74633+ mm_segment_t oldfs;
74634
74635- n = copy_to_user(buffer, (char *)start, tsz);
74636- /*
74637- * We cannot distinguish between fault on source
74638- * and fault on destination. When this happens
74639- * we clear too and hope it will trigger the
74640- * EFAULT again.
74641- */
74642- if (n) {
74643- if (clear_user(buffer + tsz - n,
74644- n))
74645- return -EFAULT;
74646- }
74647+ elf_buf = kzalloc(tsz, GFP_KERNEL);
74648+ if (!elf_buf)
74649+ return -ENOMEM;
74650+ oldfs = get_fs();
74651+ set_fs(KERNEL_DS);
74652+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
74653+ set_fs(oldfs);
74654+ n = copy_to_user(buffer, elf_buf, tsz);
74655+ kfree(elf_buf);
74656+ if (n)
74657+ return -EFAULT;
74658 } else {
74659 if (clear_user(buffer, tsz))
74660 return -EFAULT;
74661@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
74662
74663 static int open_kcore(struct inode *inode, struct file *filp)
74664 {
74665+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
74666+ return -EPERM;
74667+#endif
74668 if (!capable(CAP_SYS_RAWIO))
74669 return -EPERM;
74670 if (kcore_need_update)
74671@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
74672 return NOTIFY_OK;
74673 }
74674
74675-static struct notifier_block kcore_callback_nb __meminitdata = {
74676+static struct notifier_block kcore_callback_nb __meminitconst = {
74677 .notifier_call = kcore_callback,
74678 .priority = 0,
74679 };
74680diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
74681index d3ebf2e..6ad42d1 100644
74682--- a/fs/proc/meminfo.c
74683+++ b/fs/proc/meminfo.c
74684@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
74685 vmi.used >> 10,
74686 vmi.largest_chunk >> 10
74687 #ifdef CONFIG_MEMORY_FAILURE
74688- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74689+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
74690 #endif
74691 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
74692 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
74693diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
74694index d4a3574..b421ce9 100644
74695--- a/fs/proc/nommu.c
74696+++ b/fs/proc/nommu.c
74697@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
74698
74699 if (file) {
74700 seq_pad(m, ' ');
74701- seq_path(m, &file->f_path, "");
74702+ seq_path(m, &file->f_path, "\n\\");
74703 }
74704
74705 seq_putc(m, '\n');
74706diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
74707index 1bde894..22ac7eb 100644
74708--- a/fs/proc/proc_net.c
74709+++ b/fs/proc/proc_net.c
74710@@ -23,9 +23,27 @@
74711 #include <linux/nsproxy.h>
74712 #include <net/net_namespace.h>
74713 #include <linux/seq_file.h>
74714+#include <linux/grsecurity.h>
74715
74716 #include "internal.h"
74717
74718+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74719+static struct seq_operations *ipv6_seq_ops_addr;
74720+
74721+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
74722+{
74723+ ipv6_seq_ops_addr = addr;
74724+}
74725+
74726+void unregister_ipv6_seq_ops_addr(void)
74727+{
74728+ ipv6_seq_ops_addr = NULL;
74729+}
74730+
74731+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
74732+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
74733+#endif
74734+
74735 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
74736 {
74737 return pde->parent->data;
74738@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
74739 return maybe_get_net(PDE_NET(PDE(inode)));
74740 }
74741
74742+extern const struct seq_operations dev_seq_ops;
74743+
74744 int seq_open_net(struct inode *ino, struct file *f,
74745 const struct seq_operations *ops, int size)
74746 {
74747@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
74748
74749 BUG_ON(size < sizeof(*p));
74750
74751+ /* only permit access to /proc/net/dev */
74752+ if (
74753+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
74754+ ops != ipv6_seq_ops_addr &&
74755+#endif
74756+ ops != &dev_seq_ops && gr_proc_is_restricted())
74757+ return -EACCES;
74758+
74759 net = get_proc_net(ino);
74760 if (net == NULL)
74761 return -ENXIO;
74762@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
74763 int err;
74764 struct net *net;
74765
74766+ if (gr_proc_is_restricted())
74767+ return -EACCES;
74768+
74769 err = -ENXIO;
74770 net = get_proc_net(inode);
74771 if (net == NULL)
74772diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
74773index f92d5dd..26398ac 100644
74774--- a/fs/proc/proc_sysctl.c
74775+++ b/fs/proc/proc_sysctl.c
74776@@ -11,13 +11,21 @@
74777 #include <linux/namei.h>
74778 #include <linux/mm.h>
74779 #include <linux/module.h>
74780+#include <linux/nsproxy.h>
74781+#ifdef CONFIG_GRKERNSEC
74782+#include <net/net_namespace.h>
74783+#endif
74784 #include "internal.h"
74785
74786+extern int gr_handle_chroot_sysctl(const int op);
74787+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74788+ const int op);
74789+
74790 static const struct dentry_operations proc_sys_dentry_operations;
74791 static const struct file_operations proc_sys_file_operations;
74792-static const struct inode_operations proc_sys_inode_operations;
74793+const struct inode_operations proc_sys_inode_operations;
74794 static const struct file_operations proc_sys_dir_file_operations;
74795-static const struct inode_operations proc_sys_dir_operations;
74796+const struct inode_operations proc_sys_dir_operations;
74797
74798 void proc_sys_poll_notify(struct ctl_table_poll *poll)
74799 {
74800@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
74801
74802 err = NULL;
74803 d_set_d_op(dentry, &proc_sys_dentry_operations);
74804+
74805+ gr_handle_proc_create(dentry, inode);
74806+
74807 d_add(dentry, inode);
74808
74809 out:
74810@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74811 struct inode *inode = file_inode(filp);
74812 struct ctl_table_header *head = grab_header(inode);
74813 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
74814+ int op = write ? MAY_WRITE : MAY_READ;
74815 ssize_t error;
74816 size_t res;
74817
74818@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74819 * and won't be until we finish.
74820 */
74821 error = -EPERM;
74822- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
74823+ if (sysctl_perm(head, table, op))
74824 goto out;
74825
74826 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
74827@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
74828 if (!table->proc_handler)
74829 goto out;
74830
74831+#ifdef CONFIG_GRKERNSEC
74832+ error = -EPERM;
74833+ if (gr_handle_chroot_sysctl(op))
74834+ goto out;
74835+ dget(filp->f_path.dentry);
74836+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
74837+ dput(filp->f_path.dentry);
74838+ goto out;
74839+ }
74840+ dput(filp->f_path.dentry);
74841+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
74842+ goto out;
74843+ if (write) {
74844+ if (current->nsproxy->net_ns != table->extra2) {
74845+ if (!capable(CAP_SYS_ADMIN))
74846+ goto out;
74847+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
74848+ goto out;
74849+ }
74850+#endif
74851+
74852 /* careful: calling conventions are nasty here */
74853 res = count;
74854 error = table->proc_handler(table, write, buf, &res, ppos);
74855@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
74856 return false;
74857 } else {
74858 d_set_d_op(child, &proc_sys_dentry_operations);
74859+
74860+ gr_handle_proc_create(child, inode);
74861+
74862 d_add(child, inode);
74863 }
74864 } else {
74865@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
74866 if ((*pos)++ < ctx->pos)
74867 return true;
74868
74869+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
74870+ return 0;
74871+
74872 if (unlikely(S_ISLNK(table->mode)))
74873 res = proc_sys_link_fill_cache(file, ctx, head, table);
74874 else
74875@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
74876 if (IS_ERR(head))
74877 return PTR_ERR(head);
74878
74879+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
74880+ return -ENOENT;
74881+
74882 generic_fillattr(inode, stat);
74883 if (table)
74884 stat->mode = (stat->mode & S_IFMT) | table->mode;
74885@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
74886 .llseek = generic_file_llseek,
74887 };
74888
74889-static const struct inode_operations proc_sys_inode_operations = {
74890+const struct inode_operations proc_sys_inode_operations = {
74891 .permission = proc_sys_permission,
74892 .setattr = proc_sys_setattr,
74893 .getattr = proc_sys_getattr,
74894 };
74895
74896-static const struct inode_operations proc_sys_dir_operations = {
74897+const struct inode_operations proc_sys_dir_operations = {
74898 .lookup = proc_sys_lookup,
74899 .permission = proc_sys_permission,
74900 .setattr = proc_sys_setattr,
74901@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
74902 static struct ctl_dir *new_dir(struct ctl_table_set *set,
74903 const char *name, int namelen)
74904 {
74905- struct ctl_table *table;
74906+ ctl_table_no_const *table;
74907 struct ctl_dir *new;
74908 struct ctl_node *node;
74909 char *new_name;
74910@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
74911 return NULL;
74912
74913 node = (struct ctl_node *)(new + 1);
74914- table = (struct ctl_table *)(node + 1);
74915+ table = (ctl_table_no_const *)(node + 1);
74916 new_name = (char *)(table + 2);
74917 memcpy(new_name, name, namelen);
74918 new_name[namelen] = '\0';
74919@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
74920 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
74921 struct ctl_table_root *link_root)
74922 {
74923- struct ctl_table *link_table, *entry, *link;
74924+ ctl_table_no_const *link_table, *link;
74925+ struct ctl_table *entry;
74926 struct ctl_table_header *links;
74927 struct ctl_node *node;
74928 char *link_name;
74929@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
74930 return NULL;
74931
74932 node = (struct ctl_node *)(links + 1);
74933- link_table = (struct ctl_table *)(node + nr_entries);
74934+ link_table = (ctl_table_no_const *)(node + nr_entries);
74935 link_name = (char *)&link_table[nr_entries + 1];
74936
74937 for (link = link_table, entry = table; entry->procname; link++, entry++) {
74938@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74939 struct ctl_table_header ***subheader, struct ctl_table_set *set,
74940 struct ctl_table *table)
74941 {
74942- struct ctl_table *ctl_table_arg = NULL;
74943- struct ctl_table *entry, *files;
74944+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
74945+ struct ctl_table *entry;
74946 int nr_files = 0;
74947 int nr_dirs = 0;
74948 int err = -ENOMEM;
74949@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74950 nr_files++;
74951 }
74952
74953- files = table;
74954 /* If there are mixed files and directories we need a new table */
74955 if (nr_dirs && nr_files) {
74956- struct ctl_table *new;
74957+ ctl_table_no_const *new;
74958 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
74959 GFP_KERNEL);
74960 if (!files)
74961@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
74962 /* Register everything except a directory full of subdirectories */
74963 if (nr_files || !nr_dirs) {
74964 struct ctl_table_header *header;
74965- header = __register_sysctl_table(set, path, files);
74966+ header = __register_sysctl_table(set, path, files ? files : table);
74967 if (!header) {
74968 kfree(ctl_table_arg);
74969 goto out;
74970diff --git a/fs/proc/root.c b/fs/proc/root.c
74971index e74ac9f..35e89f4 100644
74972--- a/fs/proc/root.c
74973+++ b/fs/proc/root.c
74974@@ -188,7 +188,15 @@ void __init proc_root_init(void)
74975 proc_mkdir("openprom", NULL);
74976 #endif
74977 proc_tty_init();
74978+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74979+#ifdef CONFIG_GRKERNSEC_PROC_USER
74980+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
74981+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74982+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
74983+#endif
74984+#else
74985 proc_mkdir("bus", NULL);
74986+#endif
74987 proc_sys_init();
74988 }
74989
74990diff --git a/fs/proc/stat.c b/fs/proc/stat.c
74991index 510413eb..34d9a8c 100644
74992--- a/fs/proc/stat.c
74993+++ b/fs/proc/stat.c
74994@@ -11,6 +11,7 @@
74995 #include <linux/irqnr.h>
74996 #include <linux/cputime.h>
74997 #include <linux/tick.h>
74998+#include <linux/grsecurity.h>
74999
75000 #ifndef arch_irq_stat_cpu
75001 #define arch_irq_stat_cpu(cpu) 0
75002@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
75003 u64 sum_softirq = 0;
75004 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
75005 struct timespec boottime;
75006+ int unrestricted = 1;
75007+
75008+#ifdef CONFIG_GRKERNSEC_PROC_ADD
75009+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
75010+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
75011+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
75012+ && !in_group_p(grsec_proc_gid)
75013+#endif
75014+ )
75015+ unrestricted = 0;
75016+#endif
75017+#endif
75018
75019 user = nice = system = idle = iowait =
75020 irq = softirq = steal = 0;
75021@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
75022 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75023 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75024 idle += get_idle_time(i);
75025- iowait += get_iowait_time(i);
75026- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75027- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75028- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75029- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75030- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75031- sum += kstat_cpu_irqs_sum(i);
75032- sum += arch_irq_stat_cpu(i);
75033+ if (unrestricted) {
75034+ iowait += get_iowait_time(i);
75035+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75036+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75037+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75038+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75039+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75040+ sum += kstat_cpu_irqs_sum(i);
75041+ sum += arch_irq_stat_cpu(i);
75042+ for (j = 0; j < NR_SOFTIRQS; j++) {
75043+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75044
75045- for (j = 0; j < NR_SOFTIRQS; j++) {
75046- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
75047-
75048- per_softirq_sums[j] += softirq_stat;
75049- sum_softirq += softirq_stat;
75050+ per_softirq_sums[j] += softirq_stat;
75051+ sum_softirq += softirq_stat;
75052+ }
75053 }
75054 }
75055- sum += arch_irq_stat();
75056+ if (unrestricted)
75057+ sum += arch_irq_stat();
75058
75059 seq_puts(p, "cpu ");
75060 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75061@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
75062 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
75063 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
75064 idle = get_idle_time(i);
75065- iowait = get_iowait_time(i);
75066- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75067- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75068- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75069- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75070- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75071+ if (unrestricted) {
75072+ iowait = get_iowait_time(i);
75073+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
75074+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
75075+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
75076+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
75077+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
75078+ }
75079 seq_printf(p, "cpu%d", i);
75080 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
75081 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
75082@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
75083
75084 /* sum again ? it could be updated? */
75085 for_each_irq_nr(j)
75086- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
75087+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
75088
75089 seq_printf(p,
75090 "\nctxt %llu\n"
75091@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
75092 "processes %lu\n"
75093 "procs_running %lu\n"
75094 "procs_blocked %lu\n",
75095- nr_context_switches(),
75096+ unrestricted ? nr_context_switches() : 0ULL,
75097 (unsigned long)jif,
75098- total_forks,
75099- nr_running(),
75100- nr_iowait());
75101+ unrestricted ? total_forks : 0UL,
75102+ unrestricted ? nr_running() : 0UL,
75103+ unrestricted ? nr_iowait() : 0UL);
75104
75105 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
75106
75107diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
75108index 6dee68d..1b4add0 100644
75109--- a/fs/proc/task_mmu.c
75110+++ b/fs/proc/task_mmu.c
75111@@ -13,12 +13,19 @@
75112 #include <linux/swap.h>
75113 #include <linux/swapops.h>
75114 #include <linux/mmu_notifier.h>
75115+#include <linux/grsecurity.h>
75116
75117 #include <asm/elf.h>
75118 #include <asm/uaccess.h>
75119 #include <asm/tlbflush.h>
75120 #include "internal.h"
75121
75122+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75123+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
75124+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
75125+ _mm->pax_flags & MF_PAX_SEGMEXEC))
75126+#endif
75127+
75128 void task_mem(struct seq_file *m, struct mm_struct *mm)
75129 {
75130 unsigned long data, text, lib, swap, ptes, pmds;
75131@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75132 "VmLib:\t%8lu kB\n"
75133 "VmPTE:\t%8lu kB\n"
75134 "VmPMD:\t%8lu kB\n"
75135- "VmSwap:\t%8lu kB\n",
75136- hiwater_vm << (PAGE_SHIFT-10),
75137+ "VmSwap:\t%8lu kB\n"
75138+
75139+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75140+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
75141+#endif
75142+
75143+ ,hiwater_vm << (PAGE_SHIFT-10),
75144 total_vm << (PAGE_SHIFT-10),
75145 mm->locked_vm << (PAGE_SHIFT-10),
75146 mm->pinned_vm << (PAGE_SHIFT-10),
75147@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75148 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
75149 ptes >> 10,
75150 pmds >> 10,
75151- swap << (PAGE_SHIFT-10));
75152+ swap << (PAGE_SHIFT-10)
75153+
75154+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
75155+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75156+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
75157+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
75158+#else
75159+ , mm->context.user_cs_base
75160+ , mm->context.user_cs_limit
75161+#endif
75162+#endif
75163+
75164+ );
75165 }
75166
75167 unsigned long task_vsize(struct mm_struct *mm)
75168@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75169 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
75170 }
75171
75172- /* We don't show the stack guard page in /proc/maps */
75173+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75174+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
75175+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
75176+#else
75177 start = vma->vm_start;
75178- if (stack_guard_page_start(vma, start))
75179- start += PAGE_SIZE;
75180 end = vma->vm_end;
75181- if (stack_guard_page_end(vma, end))
75182- end -= PAGE_SIZE;
75183+#endif
75184
75185 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
75186 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
75187@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75188 flags & VM_WRITE ? 'w' : '-',
75189 flags & VM_EXEC ? 'x' : '-',
75190 flags & VM_MAYSHARE ? 's' : 'p',
75191+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75192+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
75193+#else
75194 pgoff,
75195+#endif
75196 MAJOR(dev), MINOR(dev), ino);
75197
75198 /*
75199@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75200 */
75201 if (file) {
75202 seq_pad(m, ' ');
75203- seq_path(m, &file->f_path, "\n");
75204+ seq_path(m, &file->f_path, "\n\\");
75205 goto done;
75206 }
75207
75208@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
75209 * Thread stack in /proc/PID/task/TID/maps or
75210 * the main process stack.
75211 */
75212- if (!is_pid || (vma->vm_start <= mm->start_stack &&
75213- vma->vm_end >= mm->start_stack)) {
75214+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
75215+ (vma->vm_start <= mm->start_stack &&
75216+ vma->vm_end >= mm->start_stack)) {
75217 name = "[stack]";
75218 } else {
75219 /* Thread stack in /proc/PID/maps */
75220@@ -362,6 +391,12 @@ done:
75221
75222 static int show_map(struct seq_file *m, void *v, int is_pid)
75223 {
75224+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75225+ if (current->exec_id != m->exec_id) {
75226+ gr_log_badprocpid("maps");
75227+ return 0;
75228+ }
75229+#endif
75230 show_map_vma(m, v, is_pid);
75231 m_cache_vma(m, v);
75232 return 0;
75233@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75234 .private = &mss,
75235 };
75236
75237+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75238+ if (current->exec_id != m->exec_id) {
75239+ gr_log_badprocpid("smaps");
75240+ return 0;
75241+ }
75242+#endif
75243 memset(&mss, 0, sizeof mss);
75244- /* mmap_sem is held in m_start */
75245- walk_page_vma(vma, &smaps_walk);
75246+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75247+ if (!PAX_RAND_FLAGS(vma->vm_mm))
75248+#endif
75249+ /* mmap_sem is held in m_start */
75250+ walk_page_vma(vma, &smaps_walk);
75251
75252 show_map_vma(m, vma, is_pid);
75253
75254@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
75255 "KernelPageSize: %8lu kB\n"
75256 "MMUPageSize: %8lu kB\n"
75257 "Locked: %8lu kB\n",
75258+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75259+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
75260+#else
75261 (vma->vm_end - vma->vm_start) >> 10,
75262+#endif
75263 mss.resident >> 10,
75264 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
75265 mss.shared_clean >> 10,
75266@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75267 char buffer[64];
75268 int nid;
75269
75270+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75271+ if (current->exec_id != m->exec_id) {
75272+ gr_log_badprocpid("numa_maps");
75273+ return 0;
75274+ }
75275+#endif
75276+
75277 if (!mm)
75278 return 0;
75279
75280@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
75281 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
75282 }
75283
75284+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75285+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
75286+#else
75287 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
75288+#endif
75289
75290 if (file) {
75291 seq_puts(m, " file=");
75292- seq_path(m, &file->f_path, "\n\t= ");
75293+ seq_path(m, &file->f_path, "\n\t\\= ");
75294 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
75295 seq_puts(m, " heap");
75296 } else {
75297diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
75298index 599ec2e..f1413ae 100644
75299--- a/fs/proc/task_nommu.c
75300+++ b/fs/proc/task_nommu.c
75301@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
75302 else
75303 bytes += kobjsize(mm);
75304
75305- if (current->fs && current->fs->users > 1)
75306+ if (current->fs && atomic_read(&current->fs->users) > 1)
75307 sbytes += kobjsize(current->fs);
75308 else
75309 bytes += kobjsize(current->fs);
75310@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
75311
75312 if (file) {
75313 seq_pad(m, ' ');
75314- seq_path(m, &file->f_path, "");
75315+ seq_path(m, &file->f_path, "\n\\");
75316 } else if (mm) {
75317 pid_t tid = pid_of_stack(priv, vma, is_pid);
75318
75319diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
75320index 4e61388..1a2523d 100644
75321--- a/fs/proc/vmcore.c
75322+++ b/fs/proc/vmcore.c
75323@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
75324 nr_bytes = count;
75325
75326 /* If pfn is not ram, return zeros for sparse dump files */
75327- if (pfn_is_ram(pfn) == 0)
75328- memset(buf, 0, nr_bytes);
75329- else {
75330+ if (pfn_is_ram(pfn) == 0) {
75331+ if (userbuf) {
75332+ if (clear_user((char __force_user *)buf, nr_bytes))
75333+ return -EFAULT;
75334+ } else
75335+ memset(buf, 0, nr_bytes);
75336+ } else {
75337 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
75338 offset, userbuf);
75339 if (tmp < 0)
75340@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
75341 static int copy_to(void *target, void *src, size_t size, int userbuf)
75342 {
75343 if (userbuf) {
75344- if (copy_to_user((char __user *) target, src, size))
75345+ if (copy_to_user((char __force_user *) target, src, size))
75346 return -EFAULT;
75347 } else {
75348 memcpy(target, src, size);
75349@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75350 if (*fpos < m->offset + m->size) {
75351 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
75352 start = m->paddr + *fpos - m->offset;
75353- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
75354+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
75355 if (tmp < 0)
75356 return tmp;
75357 buflen -= tsz;
75358@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
75359 static ssize_t read_vmcore(struct file *file, char __user *buffer,
75360 size_t buflen, loff_t *fpos)
75361 {
75362- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
75363+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
75364 }
75365
75366 /*
75367diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
75368index d3fb2b6..43a8140 100644
75369--- a/fs/qnx6/qnx6.h
75370+++ b/fs/qnx6/qnx6.h
75371@@ -74,7 +74,7 @@ enum {
75372 BYTESEX_BE,
75373 };
75374
75375-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75376+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
75377 {
75378 if (sbi->s_bytesex == BYTESEX_LE)
75379 return le64_to_cpu((__force __le64)n);
75380@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
75381 return (__force __fs64)cpu_to_be64(n);
75382 }
75383
75384-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75385+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
75386 {
75387 if (sbi->s_bytesex == BYTESEX_LE)
75388 return le32_to_cpu((__force __le32)n);
75389diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
75390index bb2869f..d34ada8 100644
75391--- a/fs/quota/netlink.c
75392+++ b/fs/quota/netlink.c
75393@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
75394 void quota_send_warning(struct kqid qid, dev_t dev,
75395 const char warntype)
75396 {
75397- static atomic_t seq;
75398+ static atomic_unchecked_t seq;
75399 struct sk_buff *skb;
75400 void *msg_head;
75401 int ret;
75402@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
75403 "VFS: Not enough memory to send quota warning.\n");
75404 return;
75405 }
75406- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
75407+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
75408 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
75409 if (!msg_head) {
75410 printk(KERN_ERR
75411diff --git a/fs/read_write.c b/fs/read_write.c
75412index 8e1b687..bad2eec 100644
75413--- a/fs/read_write.c
75414+++ b/fs/read_write.c
75415@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
75416
75417 old_fs = get_fs();
75418 set_fs(get_ds());
75419- p = (__force const char __user *)buf;
75420+ p = (const char __force_user *)buf;
75421 if (count > MAX_RW_COUNT)
75422 count = MAX_RW_COUNT;
75423 if (file->f_op->write)
75424diff --git a/fs/readdir.c b/fs/readdir.c
75425index ced6791..936687b 100644
75426--- a/fs/readdir.c
75427+++ b/fs/readdir.c
75428@@ -18,6 +18,7 @@
75429 #include <linux/security.h>
75430 #include <linux/syscalls.h>
75431 #include <linux/unistd.h>
75432+#include <linux/namei.h>
75433
75434 #include <asm/uaccess.h>
75435
75436@@ -71,6 +72,7 @@ struct old_linux_dirent {
75437 struct readdir_callback {
75438 struct dir_context ctx;
75439 struct old_linux_dirent __user * dirent;
75440+ struct file * file;
75441 int result;
75442 };
75443
75444@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
75445 buf->result = -EOVERFLOW;
75446 return -EOVERFLOW;
75447 }
75448+
75449+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75450+ return 0;
75451+
75452 buf->result++;
75453 dirent = buf->dirent;
75454 if (!access_ok(VERIFY_WRITE, dirent,
75455@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
75456 if (!f.file)
75457 return -EBADF;
75458
75459+ buf.file = f.file;
75460 error = iterate_dir(f.file, &buf.ctx);
75461 if (buf.result)
75462 error = buf.result;
75463@@ -145,6 +152,7 @@ struct getdents_callback {
75464 struct dir_context ctx;
75465 struct linux_dirent __user * current_dir;
75466 struct linux_dirent __user * previous;
75467+ struct file * file;
75468 int count;
75469 int error;
75470 };
75471@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
75472 buf->error = -EOVERFLOW;
75473 return -EOVERFLOW;
75474 }
75475+
75476+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75477+ return 0;
75478+
75479 dirent = buf->previous;
75480 if (dirent) {
75481 if (__put_user(offset, &dirent->d_off))
75482@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
75483 if (!f.file)
75484 return -EBADF;
75485
75486+ buf.file = f.file;
75487 error = iterate_dir(f.file, &buf.ctx);
75488 if (error >= 0)
75489 error = buf.error;
75490@@ -230,6 +243,7 @@ struct getdents_callback64 {
75491 struct dir_context ctx;
75492 struct linux_dirent64 __user * current_dir;
75493 struct linux_dirent64 __user * previous;
75494+ struct file *file;
75495 int count;
75496 int error;
75497 };
75498@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
75499 buf->error = -EINVAL; /* only used if we fail.. */
75500 if (reclen > buf->count)
75501 return -EINVAL;
75502+
75503+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
75504+ return 0;
75505+
75506 dirent = buf->previous;
75507 if (dirent) {
75508 if (__put_user(offset, &dirent->d_off))
75509@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
75510 if (!f.file)
75511 return -EBADF;
75512
75513+ buf.file = f.file;
75514 error = iterate_dir(f.file, &buf.ctx);
75515 if (error >= 0)
75516 error = buf.error;
75517diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
75518index 9c02d96..6562c10 100644
75519--- a/fs/reiserfs/do_balan.c
75520+++ b/fs/reiserfs/do_balan.c
75521@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
75522 return;
75523 }
75524
75525- atomic_inc(&fs_generation(tb->tb_sb));
75526+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
75527 do_balance_starts(tb);
75528
75529 /*
75530diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
75531index aca73dd..e3c558d 100644
75532--- a/fs/reiserfs/item_ops.c
75533+++ b/fs/reiserfs/item_ops.c
75534@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
75535 }
75536
75537 static struct item_operations errcatch_ops = {
75538- errcatch_bytes_number,
75539- errcatch_decrement_key,
75540- errcatch_is_left_mergeable,
75541- errcatch_print_item,
75542- errcatch_check_item,
75543+ .bytes_number = errcatch_bytes_number,
75544+ .decrement_key = errcatch_decrement_key,
75545+ .is_left_mergeable = errcatch_is_left_mergeable,
75546+ .print_item = errcatch_print_item,
75547+ .check_item = errcatch_check_item,
75548
75549- errcatch_create_vi,
75550- errcatch_check_left,
75551- errcatch_check_right,
75552- errcatch_part_size,
75553- errcatch_unit_num,
75554- errcatch_print_vi
75555+ .create_vi = errcatch_create_vi,
75556+ .check_left = errcatch_check_left,
75557+ .check_right = errcatch_check_right,
75558+ .part_size = errcatch_part_size,
75559+ .unit_num = errcatch_unit_num,
75560+ .print_vi = errcatch_print_vi
75561 };
75562
75563 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
75564diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
75565index 621b9f3..af527fd 100644
75566--- a/fs/reiserfs/procfs.c
75567+++ b/fs/reiserfs/procfs.c
75568@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
75569 "SMALL_TAILS " : "NO_TAILS ",
75570 replay_only(sb) ? "REPLAY_ONLY " : "",
75571 convert_reiserfs(sb) ? "CONV " : "",
75572- atomic_read(&r->s_generation_counter),
75573+ atomic_read_unchecked(&r->s_generation_counter),
75574 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
75575 SF(s_do_balance), SF(s_unneeded_left_neighbor),
75576 SF(s_good_search_by_key_reada), SF(s_bmaps),
75577diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
75578index bb79cdd..fcf49ef 100644
75579--- a/fs/reiserfs/reiserfs.h
75580+++ b/fs/reiserfs/reiserfs.h
75581@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
75582 /* Comment? -Hans */
75583 wait_queue_head_t s_wait;
75584 /* increased by one every time the tree gets re-balanced */
75585- atomic_t s_generation_counter;
75586+ atomic_unchecked_t s_generation_counter;
75587
75588 /* File system properties. Currently holds on-disk FS format */
75589 unsigned long s_properties;
75590@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
75591 #define REISERFS_USER_MEM 1 /* user memory mode */
75592
75593 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
75594-#define get_generation(s) atomic_read (&fs_generation(s))
75595+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
75596 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
75597 #define __fs_changed(gen,s) (gen != get_generation (s))
75598 #define fs_changed(gen,s) \
75599diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
75600index 71fbbe3..eff29ba 100644
75601--- a/fs/reiserfs/super.c
75602+++ b/fs/reiserfs/super.c
75603@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
75604 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
75605 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
75606 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
75607+#ifdef CONFIG_REISERFS_FS_XATTR
75608+ /* turn on user xattrs by default */
75609+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
75610+#endif
75611 /* no preallocation minimum, be smart in reiserfs_file_write instead */
75612 sbi->s_alloc_options.preallocmin = 0;
75613 /* Preallocate by 16 blocks (17-1) at once */
75614diff --git a/fs/select.c b/fs/select.c
75615index f684c75..4117611 100644
75616--- a/fs/select.c
75617+++ b/fs/select.c
75618@@ -20,6 +20,7 @@
75619 #include <linux/export.h>
75620 #include <linux/slab.h>
75621 #include <linux/poll.h>
75622+#include <linux/security.h>
75623 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
75624 #include <linux/file.h>
75625 #include <linux/fdtable.h>
75626@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
75627 struct poll_list *walk = head;
75628 unsigned long todo = nfds;
75629
75630+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
75631 if (nfds > rlimit(RLIMIT_NOFILE))
75632 return -EINVAL;
75633
75634diff --git a/fs/seq_file.c b/fs/seq_file.c
75635index 555f821..34684d7 100644
75636--- a/fs/seq_file.c
75637+++ b/fs/seq_file.c
75638@@ -12,6 +12,8 @@
75639 #include <linux/slab.h>
75640 #include <linux/cred.h>
75641 #include <linux/mm.h>
75642+#include <linux/sched.h>
75643+#include <linux/grsecurity.h>
75644
75645 #include <asm/uaccess.h>
75646 #include <asm/page.h>
75647@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
75648
75649 static void *seq_buf_alloc(unsigned long size)
75650 {
75651- void *buf;
75652-
75653- /*
75654- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
75655- * it's better to fall back to vmalloc() than to kill things.
75656- */
75657- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
75658- if (!buf && size > PAGE_SIZE)
75659- buf = vmalloc(size);
75660- return buf;
75661+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
75662 }
75663
75664 /**
75665@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
75666 #ifdef CONFIG_USER_NS
75667 p->user_ns = file->f_cred->user_ns;
75668 #endif
75669+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75670+ p->exec_id = current->exec_id;
75671+#endif
75672
75673 /*
75674 * Wrappers around seq_open(e.g. swaps_open) need to be
75675@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
75676 }
75677 EXPORT_SYMBOL(seq_open);
75678
75679+
75680+int seq_open_restrict(struct file *file, const struct seq_operations *op)
75681+{
75682+ if (gr_proc_is_restricted())
75683+ return -EACCES;
75684+
75685+ return seq_open(file, op);
75686+}
75687+EXPORT_SYMBOL(seq_open_restrict);
75688+
75689 static int traverse(struct seq_file *m, loff_t offset)
75690 {
75691 loff_t pos = 0, index;
75692@@ -158,7 +164,7 @@ Eoverflow:
75693 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
75694 {
75695 struct seq_file *m = file->private_data;
75696- size_t copied = 0;
75697+ ssize_t copied = 0;
75698 loff_t pos;
75699 size_t n;
75700 void *p;
75701@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
75702 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
75703 void *data)
75704 {
75705- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
75706+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
75707 int res = -ENOMEM;
75708
75709 if (op) {
75710@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
75711 }
75712 EXPORT_SYMBOL(single_open_size);
75713
75714+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
75715+ void *data)
75716+{
75717+ if (gr_proc_is_restricted())
75718+ return -EACCES;
75719+
75720+ return single_open(file, show, data);
75721+}
75722+EXPORT_SYMBOL(single_open_restrict);
75723+
75724+
75725 int single_release(struct inode *inode, struct file *file)
75726 {
75727 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
75728diff --git a/fs/splice.c b/fs/splice.c
75729index 7968da9..4ce985b 100644
75730--- a/fs/splice.c
75731+++ b/fs/splice.c
75732@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75733 pipe_lock(pipe);
75734
75735 for (;;) {
75736- if (!pipe->readers) {
75737+ if (!atomic_read(&pipe->readers)) {
75738 send_sig(SIGPIPE, current, 0);
75739 if (!ret)
75740 ret = -EPIPE;
75741@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75742 page_nr++;
75743 ret += buf->len;
75744
75745- if (pipe->files)
75746+ if (atomic_read(&pipe->files))
75747 do_wakeup = 1;
75748
75749 if (!--spd->nr_pages)
75750@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
75751 do_wakeup = 0;
75752 }
75753
75754- pipe->waiting_writers++;
75755+ atomic_inc(&pipe->waiting_writers);
75756 pipe_wait(pipe);
75757- pipe->waiting_writers--;
75758+ atomic_dec(&pipe->waiting_writers);
75759 }
75760
75761 pipe_unlock(pipe);
75762@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
75763 old_fs = get_fs();
75764 set_fs(get_ds());
75765 /* The cast to a user pointer is valid due to the set_fs() */
75766- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
75767+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
75768 set_fs(old_fs);
75769
75770 return res;
75771@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
75772 old_fs = get_fs();
75773 set_fs(get_ds());
75774 /* The cast to a user pointer is valid due to the set_fs() */
75775- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
75776+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
75777 set_fs(old_fs);
75778
75779 return res;
75780@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
75781 goto err;
75782
75783 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
75784- vec[i].iov_base = (void __user *) page_address(page);
75785+ vec[i].iov_base = (void __force_user *) page_address(page);
75786 vec[i].iov_len = this_len;
75787 spd.pages[i] = page;
75788 spd.nr_pages++;
75789@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75790 ops->release(pipe, buf);
75791 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75792 pipe->nrbufs--;
75793- if (pipe->files)
75794+ if (atomic_read(&pipe->files))
75795 sd->need_wakeup = true;
75796 }
75797
75798@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
75799 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
75800 {
75801 while (!pipe->nrbufs) {
75802- if (!pipe->writers)
75803+ if (!atomic_read(&pipe->writers))
75804 return 0;
75805
75806- if (!pipe->waiting_writers && sd->num_spliced)
75807+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
75808 return 0;
75809
75810 if (sd->flags & SPLICE_F_NONBLOCK)
75811@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
75812 ops->release(pipe, buf);
75813 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
75814 pipe->nrbufs--;
75815- if (pipe->files)
75816+ if (atomic_read(&pipe->files))
75817 sd.need_wakeup = true;
75818 } else {
75819 buf->offset += ret;
75820@@ -1159,7 +1159,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75821 long ret, bytes;
75822 umode_t i_mode;
75823 size_t len;
75824- int i, flags;
75825+ int i, flags, more;
75826
75827 /*
75828 * We require the input being a regular file, as we don't want to
75829@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75830 * out of the pipe right after the splice_to_pipe(). So set
75831 * PIPE_READERS appropriately.
75832 */
75833- pipe->readers = 1;
75834+ atomic_set(&pipe->readers, 1);
75835
75836 current->splice_pipe = pipe;
75837 }
75838@@ -1202,6 +1202,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75839 * Don't block on output, we have to drain the direct pipe.
75840 */
75841 sd->flags &= ~SPLICE_F_NONBLOCK;
75842+ more = sd->flags & SPLICE_F_MORE;
75843
75844 while (len) {
75845 size_t read_len;
75846@@ -1215,6 +1216,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
75847 sd->total_len = read_len;
75848
75849 /*
75850+ * If more data is pending, set SPLICE_F_MORE
75851+ * If this is the last data and SPLICE_F_MORE was not set
75852+ * initially, clears it.
75853+ */
75854+ if (read_len < len)
75855+ sd->flags |= SPLICE_F_MORE;
75856+ else if (!more)
75857+ sd->flags &= ~SPLICE_F_MORE;
75858+ /*
75859 * NOTE: nonblocking mode only applies to the input. We
75860 * must not do the output in nonblocking mode as then we
75861 * could get stuck data in the internal pipe:
75862@@ -1482,6 +1492,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
75863
75864 partial[buffers].offset = off;
75865 partial[buffers].len = plen;
75866+ partial[buffers].private = 0;
75867
75868 off = 0;
75869 len -= plen;
75870@@ -1718,9 +1729,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75871 ret = -ERESTARTSYS;
75872 break;
75873 }
75874- if (!pipe->writers)
75875+ if (!atomic_read(&pipe->writers))
75876 break;
75877- if (!pipe->waiting_writers) {
75878+ if (!atomic_read(&pipe->waiting_writers)) {
75879 if (flags & SPLICE_F_NONBLOCK) {
75880 ret = -EAGAIN;
75881 break;
75882@@ -1752,7 +1763,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75883 pipe_lock(pipe);
75884
75885 while (pipe->nrbufs >= pipe->buffers) {
75886- if (!pipe->readers) {
75887+ if (!atomic_read(&pipe->readers)) {
75888 send_sig(SIGPIPE, current, 0);
75889 ret = -EPIPE;
75890 break;
75891@@ -1765,9 +1776,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
75892 ret = -ERESTARTSYS;
75893 break;
75894 }
75895- pipe->waiting_writers++;
75896+ atomic_inc(&pipe->waiting_writers);
75897 pipe_wait(pipe);
75898- pipe->waiting_writers--;
75899+ atomic_dec(&pipe->waiting_writers);
75900 }
75901
75902 pipe_unlock(pipe);
75903@@ -1803,14 +1814,14 @@ retry:
75904 pipe_double_lock(ipipe, opipe);
75905
75906 do {
75907- if (!opipe->readers) {
75908+ if (!atomic_read(&opipe->readers)) {
75909 send_sig(SIGPIPE, current, 0);
75910 if (!ret)
75911 ret = -EPIPE;
75912 break;
75913 }
75914
75915- if (!ipipe->nrbufs && !ipipe->writers)
75916+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
75917 break;
75918
75919 /*
75920@@ -1907,7 +1918,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75921 pipe_double_lock(ipipe, opipe);
75922
75923 do {
75924- if (!opipe->readers) {
75925+ if (!atomic_read(&opipe->readers)) {
75926 send_sig(SIGPIPE, current, 0);
75927 if (!ret)
75928 ret = -EPIPE;
75929@@ -1952,7 +1963,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
75930 * return EAGAIN if we have the potential of some data in the
75931 * future, otherwise just return 0
75932 */
75933- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
75934+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
75935 ret = -EAGAIN;
75936
75937 pipe_unlock(ipipe);
75938diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
75939index 92fcde7..1687329 100644
75940--- a/fs/squashfs/xattr.c
75941+++ b/fs/squashfs/xattr.c
75942@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75943 + msblk->xattr_table;
75944 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
75945 int count = squashfs_i(inode)->xattr_count;
75946- size_t rest = buffer_size;
75947- int err;
75948+ size_t used = 0;
75949+ ssize_t err;
75950
75951 /* check that the file system has xattrs */
75952 if (msblk->xattr_id_table == NULL)
75953@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75954 name_size = le16_to_cpu(entry.size);
75955 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
75956 if (handler)
75957- prefix_size = handler->list(d, buffer, rest, NULL,
75958+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
75959 name_size, handler->flags);
75960 if (prefix_size) {
75961 if (buffer) {
75962- if (prefix_size + name_size + 1 > rest) {
75963+ if (prefix_size + name_size + 1 > buffer_size - used) {
75964 err = -ERANGE;
75965 goto failed;
75966 }
75967@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75968 buffer[name_size] = '\0';
75969 buffer += name_size + 1;
75970 }
75971- rest -= prefix_size + name_size + 1;
75972+ used += prefix_size + name_size + 1;
75973 } else {
75974 /* no handler or insuffficient privileges, so skip */
75975 err = squashfs_read_metadata(sb, NULL, &start,
75976@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
75977 if (err < 0)
75978 goto failed;
75979 }
75980- err = buffer_size - rest;
75981+ err = used;
75982
75983 failed:
75984 return err;
75985diff --git a/fs/stat.c b/fs/stat.c
75986index ae0c3ce..9ee641c 100644
75987--- a/fs/stat.c
75988+++ b/fs/stat.c
75989@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
75990 stat->gid = inode->i_gid;
75991 stat->rdev = inode->i_rdev;
75992 stat->size = i_size_read(inode);
75993- stat->atime = inode->i_atime;
75994- stat->mtime = inode->i_mtime;
75995+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
75996+ stat->atime = inode->i_ctime;
75997+ stat->mtime = inode->i_ctime;
75998+ } else {
75999+ stat->atime = inode->i_atime;
76000+ stat->mtime = inode->i_mtime;
76001+ }
76002 stat->ctime = inode->i_ctime;
76003 stat->blksize = (1 << inode->i_blkbits);
76004 stat->blocks = inode->i_blocks;
76005@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
76006 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
76007 {
76008 struct inode *inode = path->dentry->d_inode;
76009+ int retval;
76010
76011- if (inode->i_op->getattr)
76012- return inode->i_op->getattr(path->mnt, path->dentry, stat);
76013+ if (inode->i_op->getattr) {
76014+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
76015+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
76016+ stat->atime = stat->ctime;
76017+ stat->mtime = stat->ctime;
76018+ }
76019+ return retval;
76020+ }
76021
76022 generic_fillattr(inode, stat);
76023 return 0;
76024diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
76025index 0b45ff4..edf9d3a 100644
76026--- a/fs/sysfs/dir.c
76027+++ b/fs/sysfs/dir.c
76028@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76029 kfree(buf);
76030 }
76031
76032+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76033+extern int grsec_enable_sysfs_restrict;
76034+#endif
76035+
76036 /**
76037 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
76038 * @kobj: object we're creating directory for
76039@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
76040 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76041 {
76042 struct kernfs_node *parent, *kn;
76043+ const char *name;
76044+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
76045+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76046+ const char *parent_name;
76047+#endif
76048
76049 BUG_ON(!kobj);
76050
76051+ name = kobject_name(kobj);
76052+
76053 if (kobj->parent)
76054 parent = kobj->parent->sd;
76055 else
76056@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
76057 if (!parent)
76058 return -ENOENT;
76059
76060- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
76061- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
76062+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
76063+ parent_name = parent->name;
76064+ mode = S_IRWXU;
76065+
76066+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
76067+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
76068+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
76069+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
76070+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76071+ if (!grsec_enable_sysfs_restrict)
76072+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
76073+#endif
76074+
76075+ kn = kernfs_create_dir_ns(parent, name,
76076+ mode, kobj, ns);
76077 if (IS_ERR(kn)) {
76078 if (PTR_ERR(kn) == -EEXIST)
76079- sysfs_warn_dup(parent, kobject_name(kobj));
76080+ sysfs_warn_dup(parent, name);
76081 return PTR_ERR(kn);
76082 }
76083
76084diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
76085index 69d4889..a810bd4 100644
76086--- a/fs/sysv/sysv.h
76087+++ b/fs/sysv/sysv.h
76088@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
76089 #endif
76090 }
76091
76092-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76093+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
76094 {
76095 if (sbi->s_bytesex == BYTESEX_PDP)
76096 return PDP_swab((__force __u32)n);
76097diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
76098index fb08b0c..65fcc7e 100644
76099--- a/fs/ubifs/io.c
76100+++ b/fs/ubifs/io.c
76101@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
76102 return err;
76103 }
76104
76105-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76106+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
76107 {
76108 int err;
76109
76110diff --git a/fs/udf/misc.c b/fs/udf/misc.c
76111index c175b4d..8f36a16 100644
76112--- a/fs/udf/misc.c
76113+++ b/fs/udf/misc.c
76114@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
76115
76116 u8 udf_tag_checksum(const struct tag *t)
76117 {
76118- u8 *data = (u8 *)t;
76119+ const u8 *data = (const u8 *)t;
76120 u8 checksum = 0;
76121 int i;
76122 for (i = 0; i < sizeof(struct tag); ++i)
76123diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
76124index 8d974c4..b82f6ec 100644
76125--- a/fs/ufs/swab.h
76126+++ b/fs/ufs/swab.h
76127@@ -22,7 +22,7 @@ enum {
76128 BYTESEX_BE
76129 };
76130
76131-static inline u64
76132+static inline u64 __intentional_overflow(-1)
76133 fs64_to_cpu(struct super_block *sbp, __fs64 n)
76134 {
76135 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76136@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
76137 return (__force __fs64)cpu_to_be64(n);
76138 }
76139
76140-static inline u32
76141+static inline u32 __intentional_overflow(-1)
76142 fs32_to_cpu(struct super_block *sbp, __fs32 n)
76143 {
76144 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
76145diff --git a/fs/utimes.c b/fs/utimes.c
76146index aa138d6..5f3a811 100644
76147--- a/fs/utimes.c
76148+++ b/fs/utimes.c
76149@@ -1,6 +1,7 @@
76150 #include <linux/compiler.h>
76151 #include <linux/file.h>
76152 #include <linux/fs.h>
76153+#include <linux/security.h>
76154 #include <linux/linkage.h>
76155 #include <linux/mount.h>
76156 #include <linux/namei.h>
76157@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
76158 }
76159 }
76160 retry_deleg:
76161+
76162+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
76163+ error = -EACCES;
76164+ goto mnt_drop_write_and_out;
76165+ }
76166+
76167 mutex_lock(&inode->i_mutex);
76168 error = notify_change(path->dentry, &newattrs, &delegated_inode);
76169 mutex_unlock(&inode->i_mutex);
76170diff --git a/fs/xattr.c b/fs/xattr.c
76171index 4ef6985..a6cd6567 100644
76172--- a/fs/xattr.c
76173+++ b/fs/xattr.c
76174@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
76175 return rc;
76176 }
76177
76178+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
76179+ssize_t
76180+pax_getxattr(struct dentry *dentry, void *value, size_t size)
76181+{
76182+ struct inode *inode = dentry->d_inode;
76183+ ssize_t error;
76184+
76185+ error = inode_permission(inode, MAY_EXEC);
76186+ if (error)
76187+ return error;
76188+
76189+ if (inode->i_op->getxattr)
76190+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
76191+ else
76192+ error = -EOPNOTSUPP;
76193+
76194+ return error;
76195+}
76196+EXPORT_SYMBOL(pax_getxattr);
76197+#endif
76198+
76199 ssize_t
76200 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
76201 {
76202@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
76203 * Extended attribute SET operations
76204 */
76205 static long
76206-setxattr(struct dentry *d, const char __user *name, const void __user *value,
76207+setxattr(struct path *path, const char __user *name, const void __user *value,
76208 size_t size, int flags)
76209 {
76210 int error;
76211@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
76212 posix_acl_fix_xattr_from_user(kvalue, size);
76213 }
76214
76215- error = vfs_setxattr(d, kname, kvalue, size, flags);
76216+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
76217+ error = -EACCES;
76218+ goto out;
76219+ }
76220+
76221+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
76222 out:
76223 if (vvalue)
76224 vfree(vvalue);
76225@@ -376,7 +402,7 @@ retry:
76226 return error;
76227 error = mnt_want_write(path.mnt);
76228 if (!error) {
76229- error = setxattr(path.dentry, name, value, size, flags);
76230+ error = setxattr(&path, name, value, size, flags);
76231 mnt_drop_write(path.mnt);
76232 }
76233 path_put(&path);
76234@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
76235 audit_file(f.file);
76236 error = mnt_want_write_file(f.file);
76237 if (!error) {
76238- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
76239+ error = setxattr(&f.file->f_path, name, value, size, flags);
76240 mnt_drop_write_file(f.file);
76241 }
76242 fdput(f);
76243@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
76244 * Extended attribute REMOVE operations
76245 */
76246 static long
76247-removexattr(struct dentry *d, const char __user *name)
76248+removexattr(struct path *path, const char __user *name)
76249 {
76250 int error;
76251 char kname[XATTR_NAME_MAX + 1];
76252@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
76253 if (error < 0)
76254 return error;
76255
76256- return vfs_removexattr(d, kname);
76257+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
76258+ return -EACCES;
76259+
76260+ return vfs_removexattr(path->dentry, kname);
76261 }
76262
76263 static int path_removexattr(const char __user *pathname,
76264@@ -623,7 +652,7 @@ retry:
76265 return error;
76266 error = mnt_want_write(path.mnt);
76267 if (!error) {
76268- error = removexattr(path.dentry, name);
76269+ error = removexattr(&path, name);
76270 mnt_drop_write(path.mnt);
76271 }
76272 path_put(&path);
76273@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
76274 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
76275 {
76276 struct fd f = fdget(fd);
76277+ struct path *path;
76278 int error = -EBADF;
76279
76280 if (!f.file)
76281 return error;
76282+ path = &f.file->f_path;
76283 audit_file(f.file);
76284 error = mnt_want_write_file(f.file);
76285 if (!error) {
76286- error = removexattr(f.file->f_path.dentry, name);
76287+ error = removexattr(path, name);
76288 mnt_drop_write_file(f.file);
76289 }
76290 fdput(f);
76291diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
76292index 61ec015..7c18807 100644
76293--- a/fs/xfs/libxfs/xfs_bmap.c
76294+++ b/fs/xfs/libxfs/xfs_bmap.c
76295@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
76296
76297 #else
76298 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
76299-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
76300+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
76301 #endif /* DEBUG */
76302
76303 /*
76304diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
76305index 098cd78..724d3f8 100644
76306--- a/fs/xfs/xfs_dir2_readdir.c
76307+++ b/fs/xfs/xfs_dir2_readdir.c
76308@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
76309 ino = dp->d_ops->sf_get_ino(sfp, sfep);
76310 filetype = dp->d_ops->sf_get_ftype(sfep);
76311 ctx->pos = off & 0x7fffffff;
76312- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76313+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
76314+ char name[sfep->namelen];
76315+ memcpy(name, sfep->name, sfep->namelen);
76316+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
76317+ return 0;
76318+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
76319 xfs_dir3_get_dtype(dp->i_mount, filetype)))
76320 return 0;
76321 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
76322diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
76323index ac4feae..386d551 100644
76324--- a/fs/xfs/xfs_ioctl.c
76325+++ b/fs/xfs/xfs_ioctl.c
76326@@ -120,7 +120,7 @@ xfs_find_handle(
76327 }
76328
76329 error = -EFAULT;
76330- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
76331+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
76332 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
76333 goto out_put;
76334
76335diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
76336index c31d2c2..6ec8f62 100644
76337--- a/fs/xfs/xfs_linux.h
76338+++ b/fs/xfs/xfs_linux.h
76339@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
76340 * of the compiler which do not like us using do_div in the middle
76341 * of large functions.
76342 */
76343-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76344+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76345 {
76346 __u32 mod;
76347
76348@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
76349 return 0;
76350 }
76351 #else
76352-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
76353+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
76354 {
76355 __u32 mod;
76356
76357diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
76358new file mode 100644
76359index 0000000..31f8fe4
76360--- /dev/null
76361+++ b/grsecurity/Kconfig
76362@@ -0,0 +1,1182 @@
76363+#
76364+# grecurity configuration
76365+#
76366+menu "Memory Protections"
76367+depends on GRKERNSEC
76368+
76369+config GRKERNSEC_KMEM
76370+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
76371+ default y if GRKERNSEC_CONFIG_AUTO
76372+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
76373+ help
76374+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
76375+ be written to or read from to modify or leak the contents of the running
76376+ kernel. /dev/port will also not be allowed to be opened, writing to
76377+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
76378+ If you have module support disabled, enabling this will close up several
76379+ ways that are currently used to insert malicious code into the running
76380+ kernel.
76381+
76382+ Even with this feature enabled, we still highly recommend that
76383+ you use the RBAC system, as it is still possible for an attacker to
76384+ modify the running kernel through other more obscure methods.
76385+
76386+ It is highly recommended that you say Y here if you meet all the
76387+ conditions above.
76388+
76389+config GRKERNSEC_VM86
76390+ bool "Restrict VM86 mode"
76391+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76392+ depends on X86_32
76393+
76394+ help
76395+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
76396+ make use of a special execution mode on 32bit x86 processors called
76397+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
76398+ video cards and will still work with this option enabled. The purpose
76399+ of the option is to prevent exploitation of emulation errors in
76400+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
76401+ Nearly all users should be able to enable this option.
76402+
76403+config GRKERNSEC_IO
76404+ bool "Disable privileged I/O"
76405+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76406+ depends on X86
76407+ select RTC_CLASS
76408+ select RTC_INTF_DEV
76409+ select RTC_DRV_CMOS
76410+
76411+ help
76412+ If you say Y here, all ioperm and iopl calls will return an error.
76413+ Ioperm and iopl can be used to modify the running kernel.
76414+ Unfortunately, some programs need this access to operate properly,
76415+ the most notable of which are XFree86 and hwclock. hwclock can be
76416+ remedied by having RTC support in the kernel, so real-time
76417+ clock support is enabled if this option is enabled, to ensure
76418+ that hwclock operates correctly. If hwclock still does not work,
76419+ either update udev or symlink /dev/rtc to /dev/rtc0.
76420+
76421+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
76422+ you may not be able to boot into a graphical environment with this
76423+ option enabled. In this case, you should use the RBAC system instead.
76424+
76425+config GRKERNSEC_BPF_HARDEN
76426+ bool "Harden BPF interpreter"
76427+ default y if GRKERNSEC_CONFIG_AUTO
76428+ help
76429+ Unlike previous versions of grsecurity that hardened both the BPF
76430+ interpreted code against corruption at rest as well as the JIT code
76431+ against JIT-spray attacks and attacker-controlled immediate values
76432+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
76433+ and will ensure the interpreted code is read-only at rest. This feature
76434+ may be removed at a later time when eBPF stabilizes to entirely revert
76435+ back to the more secure pre-3.16 BPF interpreter/JIT.
76436+
76437+ If you're using KERNEXEC, it's recommended that you enable this option
76438+ to supplement the hardening of the kernel.
76439+
76440+config GRKERNSEC_PERF_HARDEN
76441+ bool "Disable unprivileged PERF_EVENTS usage by default"
76442+ default y if GRKERNSEC_CONFIG_AUTO
76443+ depends on PERF_EVENTS
76444+ help
76445+ If you say Y here, the range of acceptable values for the
76446+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
76447+ default to a new value: 3. When the sysctl is set to this value, no
76448+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
76449+
76450+ Though PERF_EVENTS can be used legitimately for performance monitoring
76451+ and low-level application profiling, it is forced on regardless of
76452+ configuration, has been at fault for several vulnerabilities, and
76453+ creates new opportunities for side channels and other information leaks.
76454+
76455+ This feature puts PERF_EVENTS into a secure default state and permits
76456+ the administrator to change out of it temporarily if unprivileged
76457+ application profiling is needed.
76458+
76459+config GRKERNSEC_RAND_THREADSTACK
76460+ bool "Insert random gaps between thread stacks"
76461+ default y if GRKERNSEC_CONFIG_AUTO
76462+ depends on PAX_RANDMMAP && !PPC
76463+ help
76464+ If you say Y here, a random-sized gap will be enforced between allocated
76465+ thread stacks. Glibc's NPTL and other threading libraries that
76466+ pass MAP_STACK to the kernel for thread stack allocation are supported.
76467+ The implementation currently provides 8 bits of entropy for the gap.
76468+
76469+ Many distributions do not compile threaded remote services with the
76470+ -fstack-check argument to GCC, causing the variable-sized stack-based
76471+ allocator, alloca(), to not probe the stack on allocation. This
76472+ permits an unbounded alloca() to skip over any guard page and potentially
76473+ modify another thread's stack reliably. An enforced random gap
76474+ reduces the reliability of such an attack and increases the chance
76475+ that such a read/write to another thread's stack instead lands in
76476+ an unmapped area, causing a crash and triggering grsecurity's
76477+ anti-bruteforcing logic.
76478+
76479+config GRKERNSEC_PROC_MEMMAP
76480+ bool "Harden ASLR against information leaks and entropy reduction"
76481+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
76482+ depends on PAX_NOEXEC || PAX_ASLR
76483+ help
76484+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
76485+ give no information about the addresses of its mappings if
76486+ PaX features that rely on random addresses are enabled on the task.
76487+ In addition to sanitizing this information and disabling other
76488+ dangerous sources of information, this option causes reads of sensitive
76489+ /proc/<pid> entries where the file descriptor was opened in a different
76490+ task than the one performing the read. Such attempts are logged.
76491+ This option also limits argv/env strings for suid/sgid binaries
76492+ to 512KB to prevent a complete exhaustion of the stack entropy provided
76493+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
76494+ binaries to prevent alternative mmap layouts from being abused.
76495+
76496+ If you use PaX it is essential that you say Y here as it closes up
76497+ several holes that make full ASLR useless locally.
76498+
76499+
76500+config GRKERNSEC_KSTACKOVERFLOW
76501+ bool "Prevent kernel stack overflows"
76502+ default y if GRKERNSEC_CONFIG_AUTO
76503+ depends on !IA64 && 64BIT
76504+ help
76505+ If you say Y here, the kernel's process stacks will be allocated
76506+ with vmalloc instead of the kernel's default allocator. This
76507+ introduces guard pages that in combination with the alloca checking
76508+ of the STACKLEAK feature prevents all forms of kernel process stack
76509+ overflow abuse. Note that this is different from kernel stack
76510+ buffer overflows.
76511+
76512+config GRKERNSEC_BRUTE
76513+ bool "Deter exploit bruteforcing"
76514+ default y if GRKERNSEC_CONFIG_AUTO
76515+ help
76516+ If you say Y here, attempts to bruteforce exploits against forking
76517+ daemons such as apache or sshd, as well as against suid/sgid binaries
76518+ will be deterred. When a child of a forking daemon is killed by PaX
76519+ or crashes due to an illegal instruction or other suspicious signal,
76520+ the parent process will be delayed 30 seconds upon every subsequent
76521+ fork until the administrator is able to assess the situation and
76522+ restart the daemon.
76523+ In the suid/sgid case, the attempt is logged, the user has all their
76524+ existing instances of the suid/sgid binary terminated and will
76525+ be unable to execute any suid/sgid binaries for 15 minutes.
76526+
76527+ It is recommended that you also enable signal logging in the auditing
76528+ section so that logs are generated when a process triggers a suspicious
76529+ signal.
76530+ If the sysctl option is enabled, a sysctl option with name
76531+ "deter_bruteforce" is created.
76532+
76533+config GRKERNSEC_MODHARDEN
76534+ bool "Harden module auto-loading"
76535+ default y if GRKERNSEC_CONFIG_AUTO
76536+ depends on MODULES
76537+ help
76538+ If you say Y here, module auto-loading in response to use of some
76539+ feature implemented by an unloaded module will be restricted to
76540+ root users. Enabling this option helps defend against attacks
76541+ by unprivileged users who abuse the auto-loading behavior to
76542+ cause a vulnerable module to load that is then exploited.
76543+
76544+ If this option prevents a legitimate use of auto-loading for a
76545+ non-root user, the administrator can execute modprobe manually
76546+ with the exact name of the module mentioned in the alert log.
76547+ Alternatively, the administrator can add the module to the list
76548+ of modules loaded at boot by modifying init scripts.
76549+
76550+ Modification of init scripts will most likely be needed on
76551+ Ubuntu servers with encrypted home directory support enabled,
76552+ as the first non-root user logging in will cause the ecb(aes),
76553+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
76554+
76555+config GRKERNSEC_HIDESYM
76556+ bool "Hide kernel symbols"
76557+ default y if GRKERNSEC_CONFIG_AUTO
76558+ select PAX_USERCOPY_SLABS
76559+ help
76560+ If you say Y here, getting information on loaded modules, and
76561+ displaying all kernel symbols through a syscall will be restricted
76562+ to users with CAP_SYS_MODULE. For software compatibility reasons,
76563+ /proc/kallsyms will be restricted to the root user. The RBAC
76564+ system can hide that entry even from root.
76565+
76566+ This option also prevents leaking of kernel addresses through
76567+ several /proc entries.
76568+
76569+ Note that this option is only effective provided the following
76570+ conditions are met:
76571+ 1) The kernel using grsecurity is not precompiled by some distribution
76572+ 2) You have also enabled GRKERNSEC_DMESG
76573+ 3) You are using the RBAC system and hiding other files such as your
76574+ kernel image and System.map. Alternatively, enabling this option
76575+ causes the permissions on /boot, /lib/modules, and the kernel
76576+ source directory to change at compile time to prevent
76577+ reading by non-root users.
76578+ If the above conditions are met, this option will aid in providing a
76579+ useful protection against local kernel exploitation of overflows
76580+ and arbitrary read/write vulnerabilities.
76581+
76582+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
76583+ in addition to this feature.
76584+
76585+config GRKERNSEC_RANDSTRUCT
76586+ bool "Randomize layout of sensitive kernel structures"
76587+ default y if GRKERNSEC_CONFIG_AUTO
76588+ select GRKERNSEC_HIDESYM
76589+ select MODVERSIONS if MODULES
76590+ help
76591+ If you say Y here, the layouts of a number of sensitive kernel
76592+ structures (task, fs, cred, etc) and all structures composed entirely
76593+ of function pointers (aka "ops" structs) will be randomized at compile-time.
76594+ This can introduce the requirement of an additional infoleak
76595+ vulnerability for exploits targeting these structure types.
76596+
76597+ Enabling this feature will introduce some performance impact, slightly
76598+ increase memory usage, and prevent the use of forensic tools like
76599+ Volatility against the system (unless the kernel source tree isn't
76600+ cleaned after kernel installation).
76601+
76602+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
76603+ It remains after a make clean to allow for external modules to be compiled
76604+ with the existing seed and will be removed by a make mrproper or
76605+ make distclean.
76606+
76607+ Note that the implementation requires gcc 4.6.4. or newer. You may need
76608+ to install the supporting headers explicitly in addition to the normal
76609+ gcc package.
76610+
76611+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
76612+ bool "Use cacheline-aware structure randomization"
76613+ depends on GRKERNSEC_RANDSTRUCT
76614+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
76615+ help
76616+ If you say Y here, the RANDSTRUCT randomization will make a best effort
76617+ at restricting randomization to cacheline-sized groups of elements. It
76618+ will further not randomize bitfields in structures. This reduces the
76619+ performance hit of RANDSTRUCT at the cost of weakened randomization.
76620+
76621+config GRKERNSEC_KERN_LOCKOUT
76622+ bool "Active kernel exploit response"
76623+ default y if GRKERNSEC_CONFIG_AUTO
76624+ depends on X86 || ARM || PPC || SPARC
76625+ help
76626+ If you say Y here, when a PaX alert is triggered due to suspicious
76627+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
76628+ or an OOPS occurs due to bad memory accesses, instead of just
76629+ terminating the offending process (and potentially allowing
76630+ a subsequent exploit from the same user), we will take one of two
76631+ actions:
76632+ If the user was root, we will panic the system
76633+ If the user was non-root, we will log the attempt, terminate
76634+ all processes owned by the user, then prevent them from creating
76635+ any new processes until the system is restarted
76636+ This deters repeated kernel exploitation/bruteforcing attempts
76637+ and is useful for later forensics.
76638+
76639+config GRKERNSEC_OLD_ARM_USERLAND
76640+ bool "Old ARM userland compatibility"
76641+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
76642+ help
76643+ If you say Y here, stubs of executable code to perform such operations
76644+ as "compare-exchange" will be placed at fixed locations in the ARM vector
76645+ table. This is unfortunately needed for old ARM userland meant to run
76646+ across a wide range of processors. Without this option enabled,
76647+ the get_tls and data memory barrier stubs will be emulated by the kernel,
76648+ which is enough for Linaro userlands or other userlands designed for v6
76649+ and newer ARM CPUs. It's recommended that you try without this option enabled
76650+ first, and only enable it if your userland does not boot (it will likely fail
76651+ at init time).
76652+
76653+endmenu
76654+menu "Role Based Access Control Options"
76655+depends on GRKERNSEC
76656+
76657+config GRKERNSEC_RBAC_DEBUG
76658+ bool
76659+
76660+config GRKERNSEC_NO_RBAC
76661+ bool "Disable RBAC system"
76662+ help
76663+ If you say Y here, the /dev/grsec device will be removed from the kernel,
76664+ preventing the RBAC system from being enabled. You should only say Y
76665+ here if you have no intention of using the RBAC system, so as to prevent
76666+ an attacker with root access from misusing the RBAC system to hide files
76667+ and processes when loadable module support and /dev/[k]mem have been
76668+ locked down.
76669+
76670+config GRKERNSEC_ACL_HIDEKERN
76671+ bool "Hide kernel processes"
76672+ help
76673+ If you say Y here, all kernel threads will be hidden to all
76674+ processes but those whose subject has the "view hidden processes"
76675+ flag.
76676+
76677+config GRKERNSEC_ACL_MAXTRIES
76678+ int "Maximum tries before password lockout"
76679+ default 3
76680+ help
76681+ This option enforces the maximum number of times a user can attempt
76682+ to authorize themselves with the grsecurity RBAC system before being
76683+ denied the ability to attempt authorization again for a specified time.
76684+ The lower the number, the harder it will be to brute-force a password.
76685+
76686+config GRKERNSEC_ACL_TIMEOUT
76687+ int "Time to wait after max password tries, in seconds"
76688+ default 30
76689+ help
76690+ This option specifies the time the user must wait after attempting to
76691+ authorize to the RBAC system with the maximum number of invalid
76692+ passwords. The higher the number, the harder it will be to brute-force
76693+ a password.
76694+
76695+endmenu
76696+menu "Filesystem Protections"
76697+depends on GRKERNSEC
76698+
76699+config GRKERNSEC_PROC
76700+ bool "Proc restrictions"
76701+ default y if GRKERNSEC_CONFIG_AUTO
76702+ help
76703+ If you say Y here, the permissions of the /proc filesystem
76704+ will be altered to enhance system security and privacy. You MUST
76705+ choose either a user only restriction or a user and group restriction.
76706+ Depending upon the option you choose, you can either restrict users to
76707+ see only the processes they themselves run, or choose a group that can
76708+ view all processes and files normally restricted to root if you choose
76709+ the "restrict to user only" option. NOTE: If you're running identd or
76710+ ntpd as a non-root user, you will have to run it as the group you
76711+ specify here.
76712+
76713+config GRKERNSEC_PROC_USER
76714+ bool "Restrict /proc to user only"
76715+ depends on GRKERNSEC_PROC
76716+ help
76717+ If you say Y here, non-root users will only be able to view their own
76718+ processes, and restricts them from viewing network-related information,
76719+ and viewing kernel symbol and module information.
76720+
76721+config GRKERNSEC_PROC_USERGROUP
76722+ bool "Allow special group"
76723+ default y if GRKERNSEC_CONFIG_AUTO
76724+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
76725+ help
76726+ If you say Y here, you will be able to select a group that will be
76727+ able to view all processes and network-related information. If you've
76728+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
76729+ remain hidden. This option is useful if you want to run identd as
76730+ a non-root user. The group you select may also be chosen at boot time
76731+ via "grsec_proc_gid=" on the kernel commandline.
76732+
76733+config GRKERNSEC_PROC_GID
76734+ int "GID for special group"
76735+ depends on GRKERNSEC_PROC_USERGROUP
76736+ default 1001
76737+
76738+config GRKERNSEC_PROC_ADD
76739+ bool "Additional restrictions"
76740+ default y if GRKERNSEC_CONFIG_AUTO
76741+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
76742+ help
76743+ If you say Y here, additional restrictions will be placed on
76744+ /proc that keep normal users from viewing device information and
76745+ slabinfo information that could be useful for exploits.
76746+
76747+config GRKERNSEC_LINK
76748+ bool "Linking restrictions"
76749+ default y if GRKERNSEC_CONFIG_AUTO
76750+ help
76751+ If you say Y here, /tmp race exploits will be prevented, since users
76752+ will no longer be able to follow symlinks owned by other users in
76753+ world-writable +t directories (e.g. /tmp), unless the owner of the
76754+ symlink is the owner of the directory. users will also not be
76755+ able to hardlink to files they do not own. If the sysctl option is
76756+ enabled, a sysctl option with name "linking_restrictions" is created.
76757+
76758+config GRKERNSEC_SYMLINKOWN
76759+ bool "Kernel-enforced SymlinksIfOwnerMatch"
76760+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
76761+ help
76762+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
76763+ that prevents it from being used as a security feature. As Apache
76764+ verifies the symlink by performing a stat() against the target of
76765+ the symlink before it is followed, an attacker can setup a symlink
76766+ to point to a same-owned file, then replace the symlink with one
76767+ that targets another user's file just after Apache "validates" the
76768+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
76769+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
76770+ will be in place for the group you specify. If the sysctl option
76771+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
76772+ created.
76773+
76774+config GRKERNSEC_SYMLINKOWN_GID
76775+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
76776+ depends on GRKERNSEC_SYMLINKOWN
76777+ default 1006
76778+ help
76779+ Setting this GID determines what group kernel-enforced
76780+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
76781+ is enabled, a sysctl option with name "symlinkown_gid" is created.
76782+
76783+config GRKERNSEC_FIFO
76784+ bool "FIFO restrictions"
76785+ default y if GRKERNSEC_CONFIG_AUTO
76786+ help
76787+ If you say Y here, users will not be able to write to FIFOs they don't
76788+ own in world-writable +t directories (e.g. /tmp), unless the owner of
76789+ the FIFO is the same owner of the directory it's held in. If the sysctl
76790+ option is enabled, a sysctl option with name "fifo_restrictions" is
76791+ created.
76792+
76793+config GRKERNSEC_SYSFS_RESTRICT
76794+ bool "Sysfs/debugfs restriction"
76795+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
76796+ depends on SYSFS
76797+ help
76798+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
76799+ any filesystem normally mounted under it (e.g. debugfs) will be
76800+ mostly accessible only by root. These filesystems generally provide access
76801+ to hardware and debug information that isn't appropriate for unprivileged
76802+ users of the system. Sysfs and debugfs have also become a large source
76803+ of new vulnerabilities, ranging from infoleaks to local compromise.
76804+ There has been very little oversight with an eye toward security involved
76805+ in adding new exporters of information to these filesystems, so their
76806+ use is discouraged.
76807+ For reasons of compatibility, a few directories have been whitelisted
76808+ for access by non-root users:
76809+ /sys/fs/selinux
76810+ /sys/fs/fuse
76811+ /sys/devices/system/cpu
76812+
76813+config GRKERNSEC_ROFS
76814+ bool "Runtime read-only mount protection"
76815+ depends on SYSCTL
76816+ help
76817+ If you say Y here, a sysctl option with name "romount_protect" will
76818+ be created. By setting this option to 1 at runtime, filesystems
76819+ will be protected in the following ways:
76820+ * No new writable mounts will be allowed
76821+ * Existing read-only mounts won't be able to be remounted read/write
76822+ * Write operations will be denied on all block devices
76823+ This option acts independently of grsec_lock: once it is set to 1,
76824+ it cannot be turned off. Therefore, please be mindful of the resulting
76825+ behavior if this option is enabled in an init script on a read-only
76826+ filesystem.
76827+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
76828+ and GRKERNSEC_IO should be enabled and module loading disabled via
76829+ config or at runtime.
76830+ This feature is mainly intended for secure embedded systems.
76831+
76832+
76833+config GRKERNSEC_DEVICE_SIDECHANNEL
76834+ bool "Eliminate stat/notify-based device sidechannels"
76835+ default y if GRKERNSEC_CONFIG_AUTO
76836+ help
76837+ If you say Y here, timing analyses on block or character
76838+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
76839+ will be thwarted for unprivileged users. If a process without
76840+ CAP_MKNOD stats such a device, the last access and last modify times
76841+ will match the device's create time. No access or modify events
76842+ will be triggered through inotify/dnotify/fanotify for such devices.
76843+ This feature will prevent attacks that may at a minimum
76844+ allow an attacker to determine the administrator's password length.
76845+
76846+config GRKERNSEC_CHROOT
76847+ bool "Chroot jail restrictions"
76848+ default y if GRKERNSEC_CONFIG_AUTO
76849+ help
76850+ If you say Y here, you will be able to choose several options that will
76851+ make breaking out of a chrooted jail much more difficult. If you
76852+ encounter no software incompatibilities with the following options, it
76853+ is recommended that you enable each one.
76854+
76855+ Note that the chroot restrictions are not intended to apply to "chroots"
76856+ to directories that are simple bind mounts of the global root filesystem.
76857+ For several other reasons, a user shouldn't expect any significant
76858+ security by performing such a chroot.
76859+
76860+config GRKERNSEC_CHROOT_MOUNT
76861+ bool "Deny mounts"
76862+ default y if GRKERNSEC_CONFIG_AUTO
76863+ depends on GRKERNSEC_CHROOT
76864+ help
76865+ If you say Y here, processes inside a chroot will not be able to
76866+ mount or remount filesystems. If the sysctl option is enabled, a
76867+ sysctl option with name "chroot_deny_mount" is created.
76868+
76869+config GRKERNSEC_CHROOT_DOUBLE
76870+ bool "Deny double-chroots"
76871+ default y if GRKERNSEC_CONFIG_AUTO
76872+ depends on GRKERNSEC_CHROOT
76873+ help
76874+ If you say Y here, processes inside a chroot will not be able to chroot
76875+ again outside the chroot. This is a widely used method of breaking
76876+ out of a chroot jail and should not be allowed. If the sysctl
76877+ option is enabled, a sysctl option with name
76878+ "chroot_deny_chroot" is created.
76879+
76880+config GRKERNSEC_CHROOT_PIVOT
76881+ bool "Deny pivot_root in chroot"
76882+ default y if GRKERNSEC_CONFIG_AUTO
76883+ depends on GRKERNSEC_CHROOT
76884+ help
76885+ If you say Y here, processes inside a chroot will not be able to use
76886+ a function called pivot_root() that was introduced in Linux 2.3.41. It
76887+ works similar to chroot in that it changes the root filesystem. This
76888+ function could be misused in a chrooted process to attempt to break out
76889+ of the chroot, and therefore should not be allowed. If the sysctl
76890+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
76891+ created.
76892+
76893+config GRKERNSEC_CHROOT_CHDIR
76894+ bool "Enforce chdir(\"/\") on all chroots"
76895+ default y if GRKERNSEC_CONFIG_AUTO
76896+ depends on GRKERNSEC_CHROOT
76897+ help
76898+ If you say Y here, the current working directory of all newly-chrooted
76899+ applications will be set to the the root directory of the chroot.
76900+ The man page on chroot(2) states:
76901+ Note that this call does not change the current working
76902+ directory, so that `.' can be outside the tree rooted at
76903+ `/'. In particular, the super-user can escape from a
76904+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
76905+
76906+ It is recommended that you say Y here, since it's not known to break
76907+ any software. If the sysctl option is enabled, a sysctl option with
76908+ name "chroot_enforce_chdir" is created.
76909+
76910+config GRKERNSEC_CHROOT_CHMOD
76911+ bool "Deny (f)chmod +s"
76912+ default y if GRKERNSEC_CONFIG_AUTO
76913+ depends on GRKERNSEC_CHROOT
76914+ help
76915+ If you say Y here, processes inside a chroot will not be able to chmod
76916+ or fchmod files to make them have suid or sgid bits. This protects
76917+ against another published method of breaking a chroot. If the sysctl
76918+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
76919+ created.
76920+
76921+config GRKERNSEC_CHROOT_FCHDIR
76922+ bool "Deny fchdir and fhandle out of chroot"
76923+ default y if GRKERNSEC_CONFIG_AUTO
76924+ depends on GRKERNSEC_CHROOT
76925+ help
76926+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
76927+ to a file descriptor of the chrooting process that points to a directory
76928+ outside the filesystem will be stopped. Additionally, this option prevents
76929+ use of the recently-created syscall for opening files by a guessable "file
76930+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
76931+ with name "chroot_deny_fchdir" is created.
76932+
76933+config GRKERNSEC_CHROOT_MKNOD
76934+ bool "Deny mknod"
76935+ default y if GRKERNSEC_CONFIG_AUTO
76936+ depends on GRKERNSEC_CHROOT
76937+ help
76938+ If you say Y here, processes inside a chroot will not be allowed to
76939+ mknod. The problem with using mknod inside a chroot is that it
76940+ would allow an attacker to create a device entry that is the same
76941+ as one on the physical root of your system, which could range from
76942+ anything from the console device to a device for your harddrive (which
76943+ they could then use to wipe the drive or steal data). It is recommended
76944+ that you say Y here, unless you run into software incompatibilities.
76945+ If the sysctl option is enabled, a sysctl option with name
76946+ "chroot_deny_mknod" is created.
76947+
76948+config GRKERNSEC_CHROOT_SHMAT
76949+ bool "Deny shmat() out of chroot"
76950+ default y if GRKERNSEC_CONFIG_AUTO
76951+ depends on GRKERNSEC_CHROOT
76952+ help
76953+ If you say Y here, processes inside a chroot will not be able to attach
76954+ to shared memory segments that were created outside of the chroot jail.
76955+ It is recommended that you say Y here. If the sysctl option is enabled,
76956+ a sysctl option with name "chroot_deny_shmat" is created.
76957+
76958+config GRKERNSEC_CHROOT_UNIX
76959+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
76960+ default y if GRKERNSEC_CONFIG_AUTO
76961+ depends on GRKERNSEC_CHROOT
76962+ help
76963+ If you say Y here, processes inside a chroot will not be able to
76964+ connect to abstract (meaning not belonging to a filesystem) Unix
76965+ domain sockets that were bound outside of a chroot. It is recommended
76966+ that you say Y here. If the sysctl option is enabled, a sysctl option
76967+ with name "chroot_deny_unix" is created.
76968+
76969+config GRKERNSEC_CHROOT_FINDTASK
76970+ bool "Protect outside processes"
76971+ default y if GRKERNSEC_CONFIG_AUTO
76972+ depends on GRKERNSEC_CHROOT
76973+ help
76974+ If you say Y here, processes inside a chroot will not be able to
76975+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
76976+ getsid, or view any process outside of the chroot. If the sysctl
76977+ option is enabled, a sysctl option with name "chroot_findtask" is
76978+ created.
76979+
76980+config GRKERNSEC_CHROOT_NICE
76981+ bool "Restrict priority changes"
76982+ default y if GRKERNSEC_CONFIG_AUTO
76983+ depends on GRKERNSEC_CHROOT
76984+ help
76985+ If you say Y here, processes inside a chroot will not be able to raise
76986+ the priority of processes in the chroot, or alter the priority of
76987+ processes outside the chroot. This provides more security than simply
76988+ removing CAP_SYS_NICE from the process' capability set. If the
76989+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
76990+ is created.
76991+
76992+config GRKERNSEC_CHROOT_SYSCTL
76993+ bool "Deny sysctl writes"
76994+ default y if GRKERNSEC_CONFIG_AUTO
76995+ depends on GRKERNSEC_CHROOT
76996+ help
76997+ If you say Y here, an attacker in a chroot will not be able to
76998+ write to sysctl entries, either by sysctl(2) or through a /proc
76999+ interface. It is strongly recommended that you say Y here. If the
77000+ sysctl option is enabled, a sysctl option with name
77001+ "chroot_deny_sysctl" is created.
77002+
77003+config GRKERNSEC_CHROOT_RENAME
77004+ bool "Deny bad renames"
77005+ default y if GRKERNSEC_CONFIG_AUTO
77006+ depends on GRKERNSEC_CHROOT
77007+ help
77008+ If you say Y here, an attacker in a chroot will not be able to
77009+ abuse the ability to create double chroots to break out of the
77010+ chroot by exploiting a race condition between a rename of a directory
77011+ within a chroot against an open of a symlink with relative path
77012+ components. This feature will likewise prevent an accomplice outside
77013+ a chroot from enabling a user inside the chroot to break out and make
77014+ use of their credentials on the global filesystem. Enabling this
77015+ feature is essential to prevent root users from breaking out of a
77016+ chroot. If the sysctl option is enabled, a sysctl option with name
77017+ "chroot_deny_bad_rename" is created.
77018+
77019+config GRKERNSEC_CHROOT_CAPS
77020+ bool "Capability restrictions"
77021+ default y if GRKERNSEC_CONFIG_AUTO
77022+ depends on GRKERNSEC_CHROOT
77023+ help
77024+ If you say Y here, the capabilities on all processes within a
77025+ chroot jail will be lowered to stop module insertion, raw i/o,
77026+ system and net admin tasks, rebooting the system, modifying immutable
77027+ files, modifying IPC owned by another, and changing the system time.
77028+ This is left an option because it can break some apps. Disable this
77029+ if your chrooted apps are having problems performing those kinds of
77030+ tasks. If the sysctl option is enabled, a sysctl option with
77031+ name "chroot_caps" is created.
77032+
77033+config GRKERNSEC_CHROOT_INITRD
77034+ bool "Exempt initrd tasks from restrictions"
77035+ default y if GRKERNSEC_CONFIG_AUTO
77036+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
77037+ help
77038+ If you say Y here, tasks started prior to init will be exempted from
77039+ grsecurity's chroot restrictions. This option is mainly meant to
77040+ resolve Plymouth's performing privileged operations unnecessarily
77041+ in a chroot.
77042+
77043+endmenu
77044+menu "Kernel Auditing"
77045+depends on GRKERNSEC
77046+
77047+config GRKERNSEC_AUDIT_GROUP
77048+ bool "Single group for auditing"
77049+ help
77050+ If you say Y here, the exec and chdir logging features will only operate
77051+ on a group you specify. This option is recommended if you only want to
77052+ watch certain users instead of having a large amount of logs from the
77053+ entire system. If the sysctl option is enabled, a sysctl option with
77054+ name "audit_group" is created.
77055+
77056+config GRKERNSEC_AUDIT_GID
77057+ int "GID for auditing"
77058+ depends on GRKERNSEC_AUDIT_GROUP
77059+ default 1007
77060+
77061+config GRKERNSEC_EXECLOG
77062+ bool "Exec logging"
77063+ help
77064+ If you say Y here, all execve() calls will be logged (since the
77065+ other exec*() calls are frontends to execve(), all execution
77066+ will be logged). Useful for shell-servers that like to keep track
77067+ of their users. If the sysctl option is enabled, a sysctl option with
77068+ name "exec_logging" is created.
77069+ WARNING: This option when enabled will produce a LOT of logs, especially
77070+ on an active system.
77071+
77072+config GRKERNSEC_RESLOG
77073+ bool "Resource logging"
77074+ default y if GRKERNSEC_CONFIG_AUTO
77075+ help
77076+ If you say Y here, all attempts to overstep resource limits will
77077+ be logged with the resource name, the requested size, and the current
77078+ limit. It is highly recommended that you say Y here. If the sysctl
77079+ option is enabled, a sysctl option with name "resource_logging" is
77080+ created. If the RBAC system is enabled, the sysctl value is ignored.
77081+
77082+config GRKERNSEC_CHROOT_EXECLOG
77083+ bool "Log execs within chroot"
77084+ help
77085+ If you say Y here, all executions inside a chroot jail will be logged
77086+ to syslog. This can cause a large amount of logs if certain
77087+ applications (eg. djb's daemontools) are installed on the system, and
77088+ is therefore left as an option. If the sysctl option is enabled, a
77089+ sysctl option with name "chroot_execlog" is created.
77090+
77091+config GRKERNSEC_AUDIT_PTRACE
77092+ bool "Ptrace logging"
77093+ help
77094+ If you say Y here, all attempts to attach to a process via ptrace
77095+ will be logged. If the sysctl option is enabled, a sysctl option
77096+ with name "audit_ptrace" is created.
77097+
77098+config GRKERNSEC_AUDIT_CHDIR
77099+ bool "Chdir logging"
77100+ help
77101+ If you say Y here, all chdir() calls will be logged. If the sysctl
77102+ option is enabled, a sysctl option with name "audit_chdir" is created.
77103+
77104+config GRKERNSEC_AUDIT_MOUNT
77105+ bool "(Un)Mount logging"
77106+ help
77107+ If you say Y here, all mounts and unmounts will be logged. If the
77108+ sysctl option is enabled, a sysctl option with name "audit_mount" is
77109+ created.
77110+
77111+config GRKERNSEC_SIGNAL
77112+ bool "Signal logging"
77113+ default y if GRKERNSEC_CONFIG_AUTO
77114+ help
77115+ If you say Y here, certain important signals will be logged, such as
77116+ SIGSEGV, which will as a result inform you of when a error in a program
77117+ occurred, which in some cases could mean a possible exploit attempt.
77118+ If the sysctl option is enabled, a sysctl option with name
77119+ "signal_logging" is created.
77120+
77121+config GRKERNSEC_FORKFAIL
77122+ bool "Fork failure logging"
77123+ help
77124+ If you say Y here, all failed fork() attempts will be logged.
77125+ This could suggest a fork bomb, or someone attempting to overstep
77126+ their process limit. If the sysctl option is enabled, a sysctl option
77127+ with name "forkfail_logging" is created.
77128+
77129+config GRKERNSEC_TIME
77130+ bool "Time change logging"
77131+ default y if GRKERNSEC_CONFIG_AUTO
77132+ help
77133+ If you say Y here, any changes of the system clock will be logged.
77134+ If the sysctl option is enabled, a sysctl option with name
77135+ "timechange_logging" is created.
77136+
77137+config GRKERNSEC_PROC_IPADDR
77138+ bool "/proc/<pid>/ipaddr support"
77139+ default y if GRKERNSEC_CONFIG_AUTO
77140+ help
77141+ If you say Y here, a new entry will be added to each /proc/<pid>
77142+ directory that contains the IP address of the person using the task.
77143+ The IP is carried across local TCP and AF_UNIX stream sockets.
77144+ This information can be useful for IDS/IPSes to perform remote response
77145+ to a local attack. The entry is readable by only the owner of the
77146+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
77147+ the RBAC system), and thus does not create privacy concerns.
77148+
77149+config GRKERNSEC_RWXMAP_LOG
77150+ bool 'Denied RWX mmap/mprotect logging'
77151+ default y if GRKERNSEC_CONFIG_AUTO
77152+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
77153+ help
77154+ If you say Y here, calls to mmap() and mprotect() with explicit
77155+ usage of PROT_WRITE and PROT_EXEC together will be logged when
77156+ denied by the PAX_MPROTECT feature. This feature will also
77157+ log other problematic scenarios that can occur when PAX_MPROTECT
77158+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
77159+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
77160+ is created.
77161+
77162+endmenu
77163+
77164+menu "Executable Protections"
77165+depends on GRKERNSEC
77166+
77167+config GRKERNSEC_DMESG
77168+ bool "Dmesg(8) restriction"
77169+ default y if GRKERNSEC_CONFIG_AUTO
77170+ help
77171+ If you say Y here, non-root users will not be able to use dmesg(8)
77172+ to view the contents of the kernel's circular log buffer.
77173+ The kernel's log buffer often contains kernel addresses and other
77174+ identifying information useful to an attacker in fingerprinting a
77175+ system for a targeted exploit.
77176+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
77177+ created.
77178+
77179+config GRKERNSEC_HARDEN_PTRACE
77180+ bool "Deter ptrace-based process snooping"
77181+ default y if GRKERNSEC_CONFIG_AUTO
77182+ help
77183+ If you say Y here, TTY sniffers and other malicious monitoring
77184+ programs implemented through ptrace will be defeated. If you
77185+ have been using the RBAC system, this option has already been
77186+ enabled for several years for all users, with the ability to make
77187+ fine-grained exceptions.
77188+
77189+ This option only affects the ability of non-root users to ptrace
77190+ processes that are not a descendent of the ptracing process.
77191+ This means that strace ./binary and gdb ./binary will still work,
77192+ but attaching to arbitrary processes will not. If the sysctl
77193+ option is enabled, a sysctl option with name "harden_ptrace" is
77194+ created.
77195+
77196+config GRKERNSEC_PTRACE_READEXEC
77197+ bool "Require read access to ptrace sensitive binaries"
77198+ default y if GRKERNSEC_CONFIG_AUTO
77199+ help
77200+ If you say Y here, unprivileged users will not be able to ptrace unreadable
77201+ binaries. This option is useful in environments that
77202+ remove the read bits (e.g. file mode 4711) from suid binaries to
77203+ prevent infoleaking of their contents. This option adds
77204+ consistency to the use of that file mode, as the binary could normally
77205+ be read out when run without privileges while ptracing.
77206+
77207+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
77208+ is created.
77209+
77210+config GRKERNSEC_SETXID
77211+ bool "Enforce consistent multithreaded privileges"
77212+ default y if GRKERNSEC_CONFIG_AUTO
77213+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
77214+ help
77215+ If you say Y here, a change from a root uid to a non-root uid
77216+ in a multithreaded application will cause the resulting uids,
77217+ gids, supplementary groups, and capabilities in that thread
77218+ to be propagated to the other threads of the process. In most
77219+ cases this is unnecessary, as glibc will emulate this behavior
77220+ on behalf of the application. Other libcs do not act in the
77221+ same way, allowing the other threads of the process to continue
77222+ running with root privileges. If the sysctl option is enabled,
77223+ a sysctl option with name "consistent_setxid" is created.
77224+
77225+config GRKERNSEC_HARDEN_IPC
77226+ bool "Disallow access to overly-permissive IPC objects"
77227+ default y if GRKERNSEC_CONFIG_AUTO
77228+ depends on SYSVIPC
77229+ help
77230+ If you say Y here, access to overly-permissive IPC objects (shared
77231+ memory, message queues, and semaphores) will be denied for processes
77232+ given the following criteria beyond normal permission checks:
77233+ 1) If the IPC object is world-accessible and the euid doesn't match
77234+ that of the creator or current uid for the IPC object
77235+ 2) If the IPC object is group-accessible and the egid doesn't
77236+ match that of the creator or current gid for the IPC object
77237+ It's a common error to grant too much permission to these objects,
77238+ with impact ranging from denial of service and information leaking to
77239+ privilege escalation. This feature was developed in response to
77240+ research by Tim Brown:
77241+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
77242+ who found hundreds of such insecure usages. Processes with
77243+ CAP_IPC_OWNER are still permitted to access these IPC objects.
77244+ If the sysctl option is enabled, a sysctl option with name
77245+ "harden_ipc" is created.
77246+
77247+config GRKERNSEC_TPE
77248+ bool "Trusted Path Execution (TPE)"
77249+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
77250+ help
77251+ If you say Y here, you will be able to choose a gid to add to the
77252+ supplementary groups of users you want to mark as "untrusted."
77253+ These users will not be able to execute any files that are not in
77254+ root-owned directories writable only by root. If the sysctl option
77255+ is enabled, a sysctl option with name "tpe" is created.
77256+
77257+config GRKERNSEC_TPE_ALL
77258+ bool "Partially restrict all non-root users"
77259+ depends on GRKERNSEC_TPE
77260+ help
77261+ If you say Y here, all non-root users will be covered under
77262+ a weaker TPE restriction. This is separate from, and in addition to,
77263+ the main TPE options that you have selected elsewhere. Thus, if a
77264+ "trusted" GID is chosen, this restriction applies to even that GID.
77265+ Under this restriction, all non-root users will only be allowed to
77266+ execute files in directories they own that are not group or
77267+ world-writable, or in directories owned by root and writable only by
77268+ root. If the sysctl option is enabled, a sysctl option with name
77269+ "tpe_restrict_all" is created.
77270+
77271+config GRKERNSEC_TPE_INVERT
77272+ bool "Invert GID option"
77273+ depends on GRKERNSEC_TPE
77274+ help
77275+ If you say Y here, the group you specify in the TPE configuration will
77276+ decide what group TPE restrictions will be *disabled* for. This
77277+ option is useful if you want TPE restrictions to be applied to most
77278+ users on the system. If the sysctl option is enabled, a sysctl option
77279+ with name "tpe_invert" is created. Unlike other sysctl options, this
77280+ entry will default to on for backward-compatibility.
77281+
77282+config GRKERNSEC_TPE_GID
77283+ int
77284+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
77285+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
77286+
77287+config GRKERNSEC_TPE_UNTRUSTED_GID
77288+ int "GID for TPE-untrusted users"
77289+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
77290+ default 1005
77291+ help
77292+ Setting this GID determines what group TPE restrictions will be
77293+ *enabled* for. If the sysctl option is enabled, a sysctl option
77294+ with name "tpe_gid" is created.
77295+
77296+config GRKERNSEC_TPE_TRUSTED_GID
77297+ int "GID for TPE-trusted users"
77298+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
77299+ default 1005
77300+ help
77301+ Setting this GID determines what group TPE restrictions will be
77302+ *disabled* for. If the sysctl option is enabled, a sysctl option
77303+ with name "tpe_gid" is created.
77304+
77305+endmenu
77306+menu "Network Protections"
77307+depends on GRKERNSEC
77308+
77309+config GRKERNSEC_BLACKHOLE
77310+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
77311+ default y if GRKERNSEC_CONFIG_AUTO
77312+ depends on NET
77313+ help
77314+ If you say Y here, neither TCP resets nor ICMP
77315+ destination-unreachable packets will be sent in response to packets
77316+ sent to ports for which no associated listening process exists.
77317+ It will also prevent the sending of ICMP protocol unreachable packets
77318+ in response to packets with unknown protocols.
77319+ This feature supports both IPV4 and IPV6 and exempts the
77320+ loopback interface from blackholing. Enabling this feature
77321+ makes a host more resilient to DoS attacks and reduces network
77322+ visibility against scanners.
77323+
77324+ The blackhole feature as-implemented is equivalent to the FreeBSD
77325+ blackhole feature, as it prevents RST responses to all packets, not
77326+ just SYNs. Under most application behavior this causes no
77327+ problems, but applications (like haproxy) may not close certain
77328+ connections in a way that cleanly terminates them on the remote
77329+ end, leaving the remote host in LAST_ACK state. Because of this
77330+ side-effect and to prevent intentional LAST_ACK DoSes, this
77331+ feature also adds automatic mitigation against such attacks.
77332+ The mitigation drastically reduces the amount of time a socket
77333+ can spend in LAST_ACK state. If you're using haproxy and not
77334+ all servers it connects to have this option enabled, consider
77335+ disabling this feature on the haproxy host.
77336+
77337+ If the sysctl option is enabled, two sysctl options with names
77338+ "ip_blackhole" and "lastack_retries" will be created.
77339+ While "ip_blackhole" takes the standard zero/non-zero on/off
77340+ toggle, "lastack_retries" uses the same kinds of values as
77341+ "tcp_retries1" and "tcp_retries2". The default value of 4
77342+ prevents a socket from lasting more than 45 seconds in LAST_ACK
77343+ state.
77344+
77345+config GRKERNSEC_NO_SIMULT_CONNECT
77346+ bool "Disable TCP Simultaneous Connect"
77347+ default y if GRKERNSEC_CONFIG_AUTO
77348+ depends on NET
77349+ help
77350+ If you say Y here, a feature by Willy Tarreau will be enabled that
77351+ removes a weakness in Linux's strict implementation of TCP that
77352+ allows two clients to connect to each other without either entering
77353+ a listening state. The weakness allows an attacker to easily prevent
77354+ a client from connecting to a known server provided the source port
77355+ for the connection is guessed correctly.
77356+
77357+ As the weakness could be used to prevent an antivirus or IPS from
77358+ fetching updates, or prevent an SSL gateway from fetching a CRL,
77359+ it should be eliminated by enabling this option. Though Linux is
77360+ one of few operating systems supporting simultaneous connect, it
77361+ has no legitimate use in practice and is rarely supported by firewalls.
77362+
77363+config GRKERNSEC_SOCKET
77364+ bool "Socket restrictions"
77365+ depends on NET
77366+ help
77367+ If you say Y here, you will be able to choose from several options.
77368+ If you assign a GID on your system and add it to the supplementary
77369+ groups of users you want to restrict socket access to, this patch
77370+ will perform up to three things, based on the option(s) you choose.
77371+
77372+config GRKERNSEC_SOCKET_ALL
77373+ bool "Deny any sockets to group"
77374+ depends on GRKERNSEC_SOCKET
77375+ help
77376+ If you say Y here, you will be able to choose a GID of whose users will
77377+ be unable to connect to other hosts from your machine or run server
77378+ applications from your machine. If the sysctl option is enabled, a
77379+ sysctl option with name "socket_all" is created.
77380+
77381+config GRKERNSEC_SOCKET_ALL_GID
77382+ int "GID to deny all sockets for"
77383+ depends on GRKERNSEC_SOCKET_ALL
77384+ default 1004
77385+ help
77386+ Here you can choose the GID to disable socket access for. Remember to
77387+ add the users you want socket access disabled for to the GID
77388+ specified here. If the sysctl option is enabled, a sysctl option
77389+ with name "socket_all_gid" is created.
77390+
77391+config GRKERNSEC_SOCKET_CLIENT
77392+ bool "Deny client sockets to group"
77393+ depends on GRKERNSEC_SOCKET
77394+ help
77395+ If you say Y here, you will be able to choose a GID of whose users will
77396+ be unable to connect to other hosts from your machine, but will be
77397+ able to run servers. If this option is enabled, all users in the group
77398+ you specify will have to use passive mode when initiating ftp transfers
77399+ from the shell on your machine. If the sysctl option is enabled, a
77400+ sysctl option with name "socket_client" is created.
77401+
77402+config GRKERNSEC_SOCKET_CLIENT_GID
77403+ int "GID to deny client sockets for"
77404+ depends on GRKERNSEC_SOCKET_CLIENT
77405+ default 1003
77406+ help
77407+ Here you can choose the GID to disable client socket access for.
77408+ Remember to add the users you want client socket access disabled for to
77409+ the GID specified here. If the sysctl option is enabled, a sysctl
77410+ option with name "socket_client_gid" is created.
77411+
77412+config GRKERNSEC_SOCKET_SERVER
77413+ bool "Deny server sockets to group"
77414+ depends on GRKERNSEC_SOCKET
77415+ help
77416+ If you say Y here, you will be able to choose a GID of whose users will
77417+ be unable to run server applications from your machine. If the sysctl
77418+ option is enabled, a sysctl option with name "socket_server" is created.
77419+
77420+config GRKERNSEC_SOCKET_SERVER_GID
77421+ int "GID to deny server sockets for"
77422+ depends on GRKERNSEC_SOCKET_SERVER
77423+ default 1002
77424+ help
77425+ Here you can choose the GID to disable server socket access for.
77426+ Remember to add the users you want server socket access disabled for to
77427+ the GID specified here. If the sysctl option is enabled, a sysctl
77428+ option with name "socket_server_gid" is created.
77429+
77430+endmenu
77431+
77432+menu "Physical Protections"
77433+depends on GRKERNSEC
77434+
77435+config GRKERNSEC_DENYUSB
77436+ bool "Deny new USB connections after toggle"
77437+ default y if GRKERNSEC_CONFIG_AUTO
77438+ depends on SYSCTL && USB_SUPPORT
77439+ help
77440+ If you say Y here, a new sysctl option with name "deny_new_usb"
77441+ will be created. Setting its value to 1 will prevent any new
77442+ USB devices from being recognized by the OS. Any attempted USB
77443+ device insertion will be logged. This option is intended to be
77444+ used against custom USB devices designed to exploit vulnerabilities
77445+ in various USB device drivers.
77446+
77447+ For greatest effectiveness, this sysctl should be set after any
77448+ relevant init scripts. This option is safe to enable in distros
77449+ as each user can choose whether or not to toggle the sysctl.
77450+
77451+config GRKERNSEC_DENYUSB_FORCE
77452+ bool "Reject all USB devices not connected at boot"
77453+ select USB
77454+ depends on GRKERNSEC_DENYUSB
77455+ help
77456+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
77457+ that doesn't involve a sysctl entry. This option should only be
77458+ enabled if you're sure you want to deny all new USB connections
77459+ at runtime and don't want to modify init scripts. This should not
77460+ be enabled by distros. It forces the core USB code to be built
77461+ into the kernel image so that all devices connected at boot time
77462+ can be recognized and new USB device connections can be prevented
77463+ prior to init running.
77464+
77465+endmenu
77466+
77467+menu "Sysctl Support"
77468+depends on GRKERNSEC && SYSCTL
77469+
77470+config GRKERNSEC_SYSCTL
77471+ bool "Sysctl support"
77472+ default y if GRKERNSEC_CONFIG_AUTO
77473+ help
77474+ If you say Y here, you will be able to change the options that
77475+ grsecurity runs with at bootup, without having to recompile your
77476+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
77477+ to enable (1) or disable (0) various features. All the sysctl entries
77478+ are mutable until the "grsec_lock" entry is set to a non-zero value.
77479+ All features enabled in the kernel configuration are disabled at boot
77480+ if you do not say Y to the "Turn on features by default" option.
77481+ All options should be set at startup, and the grsec_lock entry should
77482+ be set to a non-zero value after all the options are set.
77483+ *THIS IS EXTREMELY IMPORTANT*
77484+
77485+config GRKERNSEC_SYSCTL_DISTRO
77486+ bool "Extra sysctl support for distro makers (READ HELP)"
77487+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
77488+ help
77489+ If you say Y here, additional sysctl options will be created
77490+ for features that affect processes running as root. Therefore,
77491+ it is critical when using this option that the grsec_lock entry be
77492+ enabled after boot. Only distros with prebuilt kernel packages
77493+ with this option enabled that can ensure grsec_lock is enabled
77494+ after boot should use this option.
77495+ *Failure to set grsec_lock after boot makes all grsec features
77496+ this option covers useless*
77497+
77498+ Currently this option creates the following sysctl entries:
77499+ "Disable Privileged I/O": "disable_priv_io"
77500+
77501+config GRKERNSEC_SYSCTL_ON
77502+ bool "Turn on features by default"
77503+ default y if GRKERNSEC_CONFIG_AUTO
77504+ depends on GRKERNSEC_SYSCTL
77505+ help
77506+ If you say Y here, instead of having all features enabled in the
77507+ kernel configuration disabled at boot time, the features will be
77508+ enabled at boot time. It is recommended you say Y here unless
77509+ there is some reason you would want all sysctl-tunable features to
77510+ be disabled by default. As mentioned elsewhere, it is important
77511+ to enable the grsec_lock entry once you have finished modifying
77512+ the sysctl entries.
77513+
77514+endmenu
77515+menu "Logging Options"
77516+depends on GRKERNSEC
77517+
77518+config GRKERNSEC_FLOODTIME
77519+ int "Seconds in between log messages (minimum)"
77520+ default 10
77521+ help
77522+ This option allows you to enforce the number of seconds between
77523+ grsecurity log messages. The default should be suitable for most
77524+ people, however, if you choose to change it, choose a value small enough
77525+ to allow informative logs to be produced, but large enough to
77526+ prevent flooding.
77527+
77528+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
77529+ any rate limiting on grsecurity log messages.
77530+
77531+config GRKERNSEC_FLOODBURST
77532+ int "Number of messages in a burst (maximum)"
77533+ default 6
77534+ help
77535+ This option allows you to choose the maximum number of messages allowed
77536+ within the flood time interval you chose in a separate option. The
77537+ default should be suitable for most people, however if you find that
77538+ many of your logs are being interpreted as flooding, you may want to
77539+ raise this value.
77540+
77541+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
77542+ any rate limiting on grsecurity log messages.
77543+
77544+endmenu
77545diff --git a/grsecurity/Makefile b/grsecurity/Makefile
77546new file mode 100644
77547index 0000000..30ababb
77548--- /dev/null
77549+++ b/grsecurity/Makefile
77550@@ -0,0 +1,54 @@
77551+# grsecurity – access control and security hardening for Linux
77552+# All code in this directory and various hooks located throughout the Linux kernel are
77553+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
77554+# http://www.grsecurity.net spender@grsecurity.net
77555+#
77556+# This program is free software; you can redistribute it and/or
77557+# modify it under the terms of the GNU General Public License version 2
77558+# as published by the Free Software Foundation.
77559+#
77560+# This program is distributed in the hope that it will be useful,
77561+# but WITHOUT ANY WARRANTY; without even the implied warranty of
77562+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
77563+# GNU General Public License for more details.
77564+#
77565+# You should have received a copy of the GNU General Public License
77566+# along with this program; if not, write to the Free Software
77567+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
77568+
77569+KBUILD_CFLAGS += -Werror
77570+
77571+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
77572+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
77573+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
77574+ grsec_usb.o grsec_ipc.o grsec_proc.o
77575+
77576+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
77577+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
77578+ gracl_learn.o grsec_log.o gracl_policy.o
77579+ifdef CONFIG_COMPAT
77580+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
77581+endif
77582+
77583+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
77584+
77585+ifdef CONFIG_NET
77586+obj-y += grsec_sock.o
77587+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
77588+endif
77589+
77590+ifndef CONFIG_GRKERNSEC
77591+obj-y += grsec_disabled.o
77592+endif
77593+
77594+ifdef CONFIG_GRKERNSEC_HIDESYM
77595+extra-y := grsec_hidesym.o
77596+$(obj)/grsec_hidesym.o:
77597+ @-chmod -f 500 /boot
77598+ @-chmod -f 500 /lib/modules
77599+ @-chmod -f 500 /lib64/modules
77600+ @-chmod -f 500 /lib32/modules
77601+ @-chmod -f 700 .
77602+ @-chmod -f 700 $(objtree)
77603+ @echo ' grsec: protected kernel image paths'
77604+endif
77605diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
77606new file mode 100644
77607index 0000000..811af1f
77608--- /dev/null
77609+++ b/grsecurity/gracl.c
77610@@ -0,0 +1,2749 @@
77611+#include <linux/kernel.h>
77612+#include <linux/module.h>
77613+#include <linux/sched.h>
77614+#include <linux/mm.h>
77615+#include <linux/file.h>
77616+#include <linux/fs.h>
77617+#include <linux/namei.h>
77618+#include <linux/mount.h>
77619+#include <linux/tty.h>
77620+#include <linux/proc_fs.h>
77621+#include <linux/lglock.h>
77622+#include <linux/slab.h>
77623+#include <linux/vmalloc.h>
77624+#include <linux/types.h>
77625+#include <linux/sysctl.h>
77626+#include <linux/netdevice.h>
77627+#include <linux/ptrace.h>
77628+#include <linux/gracl.h>
77629+#include <linux/gralloc.h>
77630+#include <linux/security.h>
77631+#include <linux/grinternal.h>
77632+#include <linux/pid_namespace.h>
77633+#include <linux/stop_machine.h>
77634+#include <linux/fdtable.h>
77635+#include <linux/percpu.h>
77636+#include <linux/lglock.h>
77637+#include <linux/hugetlb.h>
77638+#include <linux/posix-timers.h>
77639+#include <linux/prefetch.h>
77640+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77641+#include <linux/magic.h>
77642+#include <linux/pagemap.h>
77643+#include "../fs/btrfs/async-thread.h"
77644+#include "../fs/btrfs/ctree.h"
77645+#include "../fs/btrfs/btrfs_inode.h"
77646+#endif
77647+#include "../fs/mount.h"
77648+
77649+#include <asm/uaccess.h>
77650+#include <asm/errno.h>
77651+#include <asm/mman.h>
77652+
77653+#define FOR_EACH_ROLE_START(role) \
77654+ role = running_polstate.role_list; \
77655+ while (role) {
77656+
77657+#define FOR_EACH_ROLE_END(role) \
77658+ role = role->prev; \
77659+ }
77660+
77661+extern struct path gr_real_root;
77662+
77663+static struct gr_policy_state running_polstate;
77664+struct gr_policy_state *polstate = &running_polstate;
77665+extern struct gr_alloc_state *current_alloc_state;
77666+
77667+extern char *gr_shared_page[4];
77668+DEFINE_RWLOCK(gr_inode_lock);
77669+
77670+static unsigned int gr_status __read_only = GR_STATUS_INIT;
77671+
77672+#ifdef CONFIG_NET
77673+extern struct vfsmount *sock_mnt;
77674+#endif
77675+
77676+extern struct vfsmount *pipe_mnt;
77677+extern struct vfsmount *shm_mnt;
77678+
77679+#ifdef CONFIG_HUGETLBFS
77680+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77681+#endif
77682+
77683+extern u16 acl_sp_role_value;
77684+extern struct acl_object_label *fakefs_obj_rw;
77685+extern struct acl_object_label *fakefs_obj_rwx;
77686+
77687+int gr_acl_is_enabled(void)
77688+{
77689+ return (gr_status & GR_READY);
77690+}
77691+
77692+void gr_enable_rbac_system(void)
77693+{
77694+ pax_open_kernel();
77695+ gr_status |= GR_READY;
77696+ pax_close_kernel();
77697+}
77698+
77699+int gr_rbac_disable(void *unused)
77700+{
77701+ pax_open_kernel();
77702+ gr_status &= ~GR_READY;
77703+ pax_close_kernel();
77704+
77705+ return 0;
77706+}
77707+
77708+static inline dev_t __get_dev(const struct dentry *dentry)
77709+{
77710+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77711+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77712+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
77713+ else
77714+#endif
77715+ return dentry->d_sb->s_dev;
77716+}
77717+
77718+static inline u64 __get_ino(const struct dentry *dentry)
77719+{
77720+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
77721+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
77722+ return btrfs_ino(dentry->d_inode);
77723+ else
77724+#endif
77725+ return dentry->d_inode->i_ino;
77726+}
77727+
77728+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77729+{
77730+ return __get_dev(dentry);
77731+}
77732+
77733+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77734+{
77735+ return __get_ino(dentry);
77736+}
77737+
77738+static char gr_task_roletype_to_char(struct task_struct *task)
77739+{
77740+ switch (task->role->roletype &
77741+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
77742+ GR_ROLE_SPECIAL)) {
77743+ case GR_ROLE_DEFAULT:
77744+ return 'D';
77745+ case GR_ROLE_USER:
77746+ return 'U';
77747+ case GR_ROLE_GROUP:
77748+ return 'G';
77749+ case GR_ROLE_SPECIAL:
77750+ return 'S';
77751+ }
77752+
77753+ return 'X';
77754+}
77755+
77756+char gr_roletype_to_char(void)
77757+{
77758+ return gr_task_roletype_to_char(current);
77759+}
77760+
77761+int
77762+gr_acl_tpe_check(void)
77763+{
77764+ if (unlikely(!(gr_status & GR_READY)))
77765+ return 0;
77766+ if (current->role->roletype & GR_ROLE_TPE)
77767+ return 1;
77768+ else
77769+ return 0;
77770+}
77771+
77772+int
77773+gr_handle_rawio(const struct inode *inode)
77774+{
77775+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77776+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
77777+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
77778+ !capable(CAP_SYS_RAWIO))
77779+ return 1;
77780+#endif
77781+ return 0;
77782+}
77783+
77784+int
77785+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
77786+{
77787+ if (likely(lena != lenb))
77788+ return 0;
77789+
77790+ return !memcmp(a, b, lena);
77791+}
77792+
77793+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
77794+{
77795+ *buflen -= namelen;
77796+ if (*buflen < 0)
77797+ return -ENAMETOOLONG;
77798+ *buffer -= namelen;
77799+ memcpy(*buffer, str, namelen);
77800+ return 0;
77801+}
77802+
77803+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
77804+{
77805+ return prepend(buffer, buflen, name->name, name->len);
77806+}
77807+
77808+static int prepend_path(const struct path *path, struct path *root,
77809+ char **buffer, int *buflen)
77810+{
77811+ struct dentry *dentry = path->dentry;
77812+ struct vfsmount *vfsmnt = path->mnt;
77813+ struct mount *mnt = real_mount(vfsmnt);
77814+ bool slash = false;
77815+ int error = 0;
77816+
77817+ while (dentry != root->dentry || vfsmnt != root->mnt) {
77818+ struct dentry * parent;
77819+
77820+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
77821+ /* Global root? */
77822+ if (!mnt_has_parent(mnt)) {
77823+ goto out;
77824+ }
77825+ dentry = mnt->mnt_mountpoint;
77826+ mnt = mnt->mnt_parent;
77827+ vfsmnt = &mnt->mnt;
77828+ continue;
77829+ }
77830+ parent = dentry->d_parent;
77831+ prefetch(parent);
77832+ spin_lock(&dentry->d_lock);
77833+ error = prepend_name(buffer, buflen, &dentry->d_name);
77834+ spin_unlock(&dentry->d_lock);
77835+ if (!error)
77836+ error = prepend(buffer, buflen, "/", 1);
77837+ if (error)
77838+ break;
77839+
77840+ slash = true;
77841+ dentry = parent;
77842+ }
77843+
77844+out:
77845+ if (!error && !slash)
77846+ error = prepend(buffer, buflen, "/", 1);
77847+
77848+ return error;
77849+}
77850+
77851+/* this must be called with mount_lock and rename_lock held */
77852+
77853+static char *__our_d_path(const struct path *path, struct path *root,
77854+ char *buf, int buflen)
77855+{
77856+ char *res = buf + buflen;
77857+ int error;
77858+
77859+ prepend(&res, &buflen, "\0", 1);
77860+ error = prepend_path(path, root, &res, &buflen);
77861+ if (error)
77862+ return ERR_PTR(error);
77863+
77864+ return res;
77865+}
77866+
77867+static char *
77868+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
77869+{
77870+ char *retval;
77871+
77872+ retval = __our_d_path(path, root, buf, buflen);
77873+ if (unlikely(IS_ERR(retval)))
77874+ retval = strcpy(buf, "<path too long>");
77875+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
77876+ retval[1] = '\0';
77877+
77878+ return retval;
77879+}
77880+
77881+static char *
77882+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77883+ char *buf, int buflen)
77884+{
77885+ struct path path;
77886+ char *res;
77887+
77888+ path.dentry = (struct dentry *)dentry;
77889+ path.mnt = (struct vfsmount *)vfsmnt;
77890+
77891+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
77892+ by the RBAC system */
77893+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
77894+
77895+ return res;
77896+}
77897+
77898+static char *
77899+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
77900+ char *buf, int buflen)
77901+{
77902+ char *res;
77903+ struct path path;
77904+ struct path root;
77905+ struct task_struct *reaper = init_pid_ns.child_reaper;
77906+
77907+ path.dentry = (struct dentry *)dentry;
77908+ path.mnt = (struct vfsmount *)vfsmnt;
77909+
77910+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
77911+ get_fs_root(reaper->fs, &root);
77912+
77913+ read_seqlock_excl(&mount_lock);
77914+ write_seqlock(&rename_lock);
77915+ res = gen_full_path(&path, &root, buf, buflen);
77916+ write_sequnlock(&rename_lock);
77917+ read_sequnlock_excl(&mount_lock);
77918+
77919+ path_put(&root);
77920+ return res;
77921+}
77922+
77923+char *
77924+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77925+{
77926+ char *ret;
77927+ read_seqlock_excl(&mount_lock);
77928+ write_seqlock(&rename_lock);
77929+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77930+ PAGE_SIZE);
77931+ write_sequnlock(&rename_lock);
77932+ read_sequnlock_excl(&mount_lock);
77933+ return ret;
77934+}
77935+
77936+static char *
77937+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
77938+{
77939+ char *ret;
77940+ char *buf;
77941+ int buflen;
77942+
77943+ read_seqlock_excl(&mount_lock);
77944+ write_seqlock(&rename_lock);
77945+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
77946+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
77947+ buflen = (int)(ret - buf);
77948+ if (buflen >= 5)
77949+ prepend(&ret, &buflen, "/proc", 5);
77950+ else
77951+ ret = strcpy(buf, "<path too long>");
77952+ write_sequnlock(&rename_lock);
77953+ read_sequnlock_excl(&mount_lock);
77954+ return ret;
77955+}
77956+
77957+char *
77958+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
77959+{
77960+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
77961+ PAGE_SIZE);
77962+}
77963+
77964+char *
77965+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
77966+{
77967+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
77968+ PAGE_SIZE);
77969+}
77970+
77971+char *
77972+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
77973+{
77974+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
77975+ PAGE_SIZE);
77976+}
77977+
77978+char *
77979+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
77980+{
77981+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
77982+ PAGE_SIZE);
77983+}
77984+
77985+char *
77986+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
77987+{
77988+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
77989+ PAGE_SIZE);
77990+}
77991+
77992+__u32
77993+to_gr_audit(const __u32 reqmode)
77994+{
77995+ /* masks off auditable permission flags, then shifts them to create
77996+ auditing flags, and adds the special case of append auditing if
77997+ we're requesting write */
77998+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
77999+}
78000+
78001+struct acl_role_label *
78002+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
78003+ const gid_t gid)
78004+{
78005+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
78006+ struct acl_role_label *match;
78007+ struct role_allowed_ip *ipp;
78008+ unsigned int x;
78009+ u32 curr_ip = task->signal->saved_ip;
78010+
78011+ match = state->acl_role_set.r_hash[index];
78012+
78013+ while (match) {
78014+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
78015+ for (x = 0; x < match->domain_child_num; x++) {
78016+ if (match->domain_children[x] == uid)
78017+ goto found;
78018+ }
78019+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
78020+ break;
78021+ match = match->next;
78022+ }
78023+found:
78024+ if (match == NULL) {
78025+ try_group:
78026+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
78027+ match = state->acl_role_set.r_hash[index];
78028+
78029+ while (match) {
78030+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
78031+ for (x = 0; x < match->domain_child_num; x++) {
78032+ if (match->domain_children[x] == gid)
78033+ goto found2;
78034+ }
78035+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
78036+ break;
78037+ match = match->next;
78038+ }
78039+found2:
78040+ if (match == NULL)
78041+ match = state->default_role;
78042+ if (match->allowed_ips == NULL)
78043+ return match;
78044+ else {
78045+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78046+ if (likely
78047+ ((ntohl(curr_ip) & ipp->netmask) ==
78048+ (ntohl(ipp->addr) & ipp->netmask)))
78049+ return match;
78050+ }
78051+ match = state->default_role;
78052+ }
78053+ } else if (match->allowed_ips == NULL) {
78054+ return match;
78055+ } else {
78056+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
78057+ if (likely
78058+ ((ntohl(curr_ip) & ipp->netmask) ==
78059+ (ntohl(ipp->addr) & ipp->netmask)))
78060+ return match;
78061+ }
78062+ goto try_group;
78063+ }
78064+
78065+ return match;
78066+}
78067+
78068+static struct acl_role_label *
78069+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
78070+ const gid_t gid)
78071+{
78072+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
78073+}
78074+
78075+struct acl_subject_label *
78076+lookup_acl_subj_label(const u64 ino, const dev_t dev,
78077+ const struct acl_role_label *role)
78078+{
78079+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78080+ struct acl_subject_label *match;
78081+
78082+ match = role->subj_hash[index];
78083+
78084+ while (match && (match->inode != ino || match->device != dev ||
78085+ (match->mode & GR_DELETED))) {
78086+ match = match->next;
78087+ }
78088+
78089+ if (match && !(match->mode & GR_DELETED))
78090+ return match;
78091+ else
78092+ return NULL;
78093+}
78094+
78095+struct acl_subject_label *
78096+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
78097+ const struct acl_role_label *role)
78098+{
78099+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
78100+ struct acl_subject_label *match;
78101+
78102+ match = role->subj_hash[index];
78103+
78104+ while (match && (match->inode != ino || match->device != dev ||
78105+ !(match->mode & GR_DELETED))) {
78106+ match = match->next;
78107+ }
78108+
78109+ if (match && (match->mode & GR_DELETED))
78110+ return match;
78111+ else
78112+ return NULL;
78113+}
78114+
78115+static struct acl_object_label *
78116+lookup_acl_obj_label(const u64 ino, const dev_t dev,
78117+ const struct acl_subject_label *subj)
78118+{
78119+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78120+ struct acl_object_label *match;
78121+
78122+ match = subj->obj_hash[index];
78123+
78124+ while (match && (match->inode != ino || match->device != dev ||
78125+ (match->mode & GR_DELETED))) {
78126+ match = match->next;
78127+ }
78128+
78129+ if (match && !(match->mode & GR_DELETED))
78130+ return match;
78131+ else
78132+ return NULL;
78133+}
78134+
78135+static struct acl_object_label *
78136+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
78137+ const struct acl_subject_label *subj)
78138+{
78139+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
78140+ struct acl_object_label *match;
78141+
78142+ match = subj->obj_hash[index];
78143+
78144+ while (match && (match->inode != ino || match->device != dev ||
78145+ !(match->mode & GR_DELETED))) {
78146+ match = match->next;
78147+ }
78148+
78149+ if (match && (match->mode & GR_DELETED))
78150+ return match;
78151+
78152+ match = subj->obj_hash[index];
78153+
78154+ while (match && (match->inode != ino || match->device != dev ||
78155+ (match->mode & GR_DELETED))) {
78156+ match = match->next;
78157+ }
78158+
78159+ if (match && !(match->mode & GR_DELETED))
78160+ return match;
78161+ else
78162+ return NULL;
78163+}
78164+
78165+struct name_entry *
78166+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
78167+{
78168+ unsigned int len = strlen(name);
78169+ unsigned int key = full_name_hash(name, len);
78170+ unsigned int index = key % state->name_set.n_size;
78171+ struct name_entry *match;
78172+
78173+ match = state->name_set.n_hash[index];
78174+
78175+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
78176+ match = match->next;
78177+
78178+ return match;
78179+}
78180+
78181+static struct name_entry *
78182+lookup_name_entry(const char *name)
78183+{
78184+ return __lookup_name_entry(&running_polstate, name);
78185+}
78186+
78187+static struct name_entry *
78188+lookup_name_entry_create(const char *name)
78189+{
78190+ unsigned int len = strlen(name);
78191+ unsigned int key = full_name_hash(name, len);
78192+ unsigned int index = key % running_polstate.name_set.n_size;
78193+ struct name_entry *match;
78194+
78195+ match = running_polstate.name_set.n_hash[index];
78196+
78197+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78198+ !match->deleted))
78199+ match = match->next;
78200+
78201+ if (match && match->deleted)
78202+ return match;
78203+
78204+ match = running_polstate.name_set.n_hash[index];
78205+
78206+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
78207+ match->deleted))
78208+ match = match->next;
78209+
78210+ if (match && !match->deleted)
78211+ return match;
78212+ else
78213+ return NULL;
78214+}
78215+
78216+static struct inodev_entry *
78217+lookup_inodev_entry(const u64 ino, const dev_t dev)
78218+{
78219+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
78220+ struct inodev_entry *match;
78221+
78222+ match = running_polstate.inodev_set.i_hash[index];
78223+
78224+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
78225+ match = match->next;
78226+
78227+ return match;
78228+}
78229+
78230+void
78231+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
78232+{
78233+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
78234+ state->inodev_set.i_size);
78235+ struct inodev_entry **curr;
78236+
78237+ entry->prev = NULL;
78238+
78239+ curr = &state->inodev_set.i_hash[index];
78240+ if (*curr != NULL)
78241+ (*curr)->prev = entry;
78242+
78243+ entry->next = *curr;
78244+ *curr = entry;
78245+
78246+ return;
78247+}
78248+
78249+static void
78250+insert_inodev_entry(struct inodev_entry *entry)
78251+{
78252+ __insert_inodev_entry(&running_polstate, entry);
78253+}
78254+
78255+void
78256+insert_acl_obj_label(struct acl_object_label *obj,
78257+ struct acl_subject_label *subj)
78258+{
78259+ unsigned int index =
78260+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
78261+ struct acl_object_label **curr;
78262+
78263+ obj->prev = NULL;
78264+
78265+ curr = &subj->obj_hash[index];
78266+ if (*curr != NULL)
78267+ (*curr)->prev = obj;
78268+
78269+ obj->next = *curr;
78270+ *curr = obj;
78271+
78272+ return;
78273+}
78274+
78275+void
78276+insert_acl_subj_label(struct acl_subject_label *obj,
78277+ struct acl_role_label *role)
78278+{
78279+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
78280+ struct acl_subject_label **curr;
78281+
78282+ obj->prev = NULL;
78283+
78284+ curr = &role->subj_hash[index];
78285+ if (*curr != NULL)
78286+ (*curr)->prev = obj;
78287+
78288+ obj->next = *curr;
78289+ *curr = obj;
78290+
78291+ return;
78292+}
78293+
78294+/* derived from glibc fnmatch() 0: match, 1: no match*/
78295+
78296+static int
78297+glob_match(const char *p, const char *n)
78298+{
78299+ char c;
78300+
78301+ while ((c = *p++) != '\0') {
78302+ switch (c) {
78303+ case '?':
78304+ if (*n == '\0')
78305+ return 1;
78306+ else if (*n == '/')
78307+ return 1;
78308+ break;
78309+ case '\\':
78310+ if (*n != c)
78311+ return 1;
78312+ break;
78313+ case '*':
78314+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
78315+ if (*n == '/')
78316+ return 1;
78317+ else if (c == '?') {
78318+ if (*n == '\0')
78319+ return 1;
78320+ else
78321+ ++n;
78322+ }
78323+ }
78324+ if (c == '\0') {
78325+ return 0;
78326+ } else {
78327+ const char *endp;
78328+
78329+ if ((endp = strchr(n, '/')) == NULL)
78330+ endp = n + strlen(n);
78331+
78332+ if (c == '[') {
78333+ for (--p; n < endp; ++n)
78334+ if (!glob_match(p, n))
78335+ return 0;
78336+ } else if (c == '/') {
78337+ while (*n != '\0' && *n != '/')
78338+ ++n;
78339+ if (*n == '/' && !glob_match(p, n + 1))
78340+ return 0;
78341+ } else {
78342+ for (--p; n < endp; ++n)
78343+ if (*n == c && !glob_match(p, n))
78344+ return 0;
78345+ }
78346+
78347+ return 1;
78348+ }
78349+ case '[':
78350+ {
78351+ int not;
78352+ char cold;
78353+
78354+ if (*n == '\0' || *n == '/')
78355+ return 1;
78356+
78357+ not = (*p == '!' || *p == '^');
78358+ if (not)
78359+ ++p;
78360+
78361+ c = *p++;
78362+ for (;;) {
78363+ unsigned char fn = (unsigned char)*n;
78364+
78365+ if (c == '\0')
78366+ return 1;
78367+ else {
78368+ if (c == fn)
78369+ goto matched;
78370+ cold = c;
78371+ c = *p++;
78372+
78373+ if (c == '-' && *p != ']') {
78374+ unsigned char cend = *p++;
78375+
78376+ if (cend == '\0')
78377+ return 1;
78378+
78379+ if (cold <= fn && fn <= cend)
78380+ goto matched;
78381+
78382+ c = *p++;
78383+ }
78384+ }
78385+
78386+ if (c == ']')
78387+ break;
78388+ }
78389+ if (!not)
78390+ return 1;
78391+ break;
78392+ matched:
78393+ while (c != ']') {
78394+ if (c == '\0')
78395+ return 1;
78396+
78397+ c = *p++;
78398+ }
78399+ if (not)
78400+ return 1;
78401+ }
78402+ break;
78403+ default:
78404+ if (c != *n)
78405+ return 1;
78406+ }
78407+
78408+ ++n;
78409+ }
78410+
78411+ if (*n == '\0')
78412+ return 0;
78413+
78414+ if (*n == '/')
78415+ return 0;
78416+
78417+ return 1;
78418+}
78419+
78420+static struct acl_object_label *
78421+chk_glob_label(struct acl_object_label *globbed,
78422+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
78423+{
78424+ struct acl_object_label *tmp;
78425+
78426+ if (*path == NULL)
78427+ *path = gr_to_filename_nolock(dentry, mnt);
78428+
78429+ tmp = globbed;
78430+
78431+ while (tmp) {
78432+ if (!glob_match(tmp->filename, *path))
78433+ return tmp;
78434+ tmp = tmp->next;
78435+ }
78436+
78437+ return NULL;
78438+}
78439+
78440+static struct acl_object_label *
78441+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78442+ const u64 curr_ino, const dev_t curr_dev,
78443+ const struct acl_subject_label *subj, char **path, const int checkglob)
78444+{
78445+ struct acl_subject_label *tmpsubj;
78446+ struct acl_object_label *retval;
78447+ struct acl_object_label *retval2;
78448+
78449+ tmpsubj = (struct acl_subject_label *) subj;
78450+ read_lock(&gr_inode_lock);
78451+ do {
78452+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
78453+ if (retval) {
78454+ if (checkglob && retval->globbed) {
78455+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
78456+ if (retval2)
78457+ retval = retval2;
78458+ }
78459+ break;
78460+ }
78461+ } while ((tmpsubj = tmpsubj->parent_subject));
78462+ read_unlock(&gr_inode_lock);
78463+
78464+ return retval;
78465+}
78466+
78467+static struct acl_object_label *
78468+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
78469+ struct dentry *curr_dentry,
78470+ const struct acl_subject_label *subj, char **path, const int checkglob)
78471+{
78472+ int newglob = checkglob;
78473+ u64 inode;
78474+ dev_t device;
78475+
78476+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
78477+ as we don't want a / * rule to match instead of the / object
78478+ don't do this for create lookups that call this function though, since they're looking up
78479+ on the parent and thus need globbing checks on all paths
78480+ */
78481+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
78482+ newglob = GR_NO_GLOB;
78483+
78484+ spin_lock(&curr_dentry->d_lock);
78485+ inode = __get_ino(curr_dentry);
78486+ device = __get_dev(curr_dentry);
78487+ spin_unlock(&curr_dentry->d_lock);
78488+
78489+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
78490+}
78491+
78492+#ifdef CONFIG_HUGETLBFS
78493+static inline bool
78494+is_hugetlbfs_mnt(const struct vfsmount *mnt)
78495+{
78496+ int i;
78497+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
78498+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
78499+ return true;
78500+ }
78501+
78502+ return false;
78503+}
78504+#endif
78505+
78506+static struct acl_object_label *
78507+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78508+ const struct acl_subject_label *subj, char *path, const int checkglob)
78509+{
78510+ struct dentry *dentry = (struct dentry *) l_dentry;
78511+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78512+ struct mount *real_mnt = real_mount(mnt);
78513+ struct acl_object_label *retval;
78514+ struct dentry *parent;
78515+
78516+ read_seqlock_excl(&mount_lock);
78517+ write_seqlock(&rename_lock);
78518+
78519+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
78520+#ifdef CONFIG_NET
78521+ mnt == sock_mnt ||
78522+#endif
78523+#ifdef CONFIG_HUGETLBFS
78524+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
78525+#endif
78526+ /* ignore Eric Biederman */
78527+ IS_PRIVATE(l_dentry->d_inode))) {
78528+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
78529+ goto out;
78530+ }
78531+
78532+ for (;;) {
78533+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78534+ break;
78535+
78536+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78537+ if (!mnt_has_parent(real_mnt))
78538+ break;
78539+
78540+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78541+ if (retval != NULL)
78542+ goto out;
78543+
78544+ dentry = real_mnt->mnt_mountpoint;
78545+ real_mnt = real_mnt->mnt_parent;
78546+ mnt = &real_mnt->mnt;
78547+ continue;
78548+ }
78549+
78550+ parent = dentry->d_parent;
78551+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78552+ if (retval != NULL)
78553+ goto out;
78554+
78555+ dentry = parent;
78556+ }
78557+
78558+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
78559+
78560+ /* gr_real_root is pinned so we don't have to hold a reference */
78561+ if (retval == NULL)
78562+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
78563+out:
78564+ write_sequnlock(&rename_lock);
78565+ read_sequnlock_excl(&mount_lock);
78566+
78567+ BUG_ON(retval == NULL);
78568+
78569+ return retval;
78570+}
78571+
78572+static struct acl_object_label *
78573+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78574+ const struct acl_subject_label *subj)
78575+{
78576+ char *path = NULL;
78577+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
78578+}
78579+
78580+static struct acl_object_label *
78581+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78582+ const struct acl_subject_label *subj)
78583+{
78584+ char *path = NULL;
78585+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
78586+}
78587+
78588+static struct acl_object_label *
78589+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78590+ const struct acl_subject_label *subj, char *path)
78591+{
78592+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
78593+}
78594+
78595+struct acl_subject_label *
78596+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
78597+ const struct acl_role_label *role)
78598+{
78599+ struct dentry *dentry = (struct dentry *) l_dentry;
78600+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
78601+ struct mount *real_mnt = real_mount(mnt);
78602+ struct acl_subject_label *retval;
78603+ struct dentry *parent;
78604+
78605+ read_seqlock_excl(&mount_lock);
78606+ write_seqlock(&rename_lock);
78607+
78608+ for (;;) {
78609+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
78610+ break;
78611+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
78612+ if (!mnt_has_parent(real_mnt))
78613+ break;
78614+
78615+ spin_lock(&dentry->d_lock);
78616+ read_lock(&gr_inode_lock);
78617+ retval =
78618+ lookup_acl_subj_label(__get_ino(dentry),
78619+ __get_dev(dentry), role);
78620+ read_unlock(&gr_inode_lock);
78621+ spin_unlock(&dentry->d_lock);
78622+ if (retval != NULL)
78623+ goto out;
78624+
78625+ dentry = real_mnt->mnt_mountpoint;
78626+ real_mnt = real_mnt->mnt_parent;
78627+ mnt = &real_mnt->mnt;
78628+ continue;
78629+ }
78630+
78631+ spin_lock(&dentry->d_lock);
78632+ read_lock(&gr_inode_lock);
78633+ retval = lookup_acl_subj_label(__get_ino(dentry),
78634+ __get_dev(dentry), role);
78635+ read_unlock(&gr_inode_lock);
78636+ parent = dentry->d_parent;
78637+ spin_unlock(&dentry->d_lock);
78638+
78639+ if (retval != NULL)
78640+ goto out;
78641+
78642+ dentry = parent;
78643+ }
78644+
78645+ spin_lock(&dentry->d_lock);
78646+ read_lock(&gr_inode_lock);
78647+ retval = lookup_acl_subj_label(__get_ino(dentry),
78648+ __get_dev(dentry), role);
78649+ read_unlock(&gr_inode_lock);
78650+ spin_unlock(&dentry->d_lock);
78651+
78652+ if (unlikely(retval == NULL)) {
78653+ /* gr_real_root is pinned, we don't need to hold a reference */
78654+ read_lock(&gr_inode_lock);
78655+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
78656+ __get_dev(gr_real_root.dentry), role);
78657+ read_unlock(&gr_inode_lock);
78658+ }
78659+out:
78660+ write_sequnlock(&rename_lock);
78661+ read_sequnlock_excl(&mount_lock);
78662+
78663+ BUG_ON(retval == NULL);
78664+
78665+ return retval;
78666+}
78667+
78668+void
78669+assign_special_role(const char *rolename)
78670+{
78671+ struct acl_object_label *obj;
78672+ struct acl_role_label *r;
78673+ struct acl_role_label *assigned = NULL;
78674+ struct task_struct *tsk;
78675+ struct file *filp;
78676+
78677+ FOR_EACH_ROLE_START(r)
78678+ if (!strcmp(rolename, r->rolename) &&
78679+ (r->roletype & GR_ROLE_SPECIAL)) {
78680+ assigned = r;
78681+ break;
78682+ }
78683+ FOR_EACH_ROLE_END(r)
78684+
78685+ if (!assigned)
78686+ return;
78687+
78688+ read_lock(&tasklist_lock);
78689+ read_lock(&grsec_exec_file_lock);
78690+
78691+ tsk = current->real_parent;
78692+ if (tsk == NULL)
78693+ goto out_unlock;
78694+
78695+ filp = tsk->exec_file;
78696+ if (filp == NULL)
78697+ goto out_unlock;
78698+
78699+ tsk->is_writable = 0;
78700+ tsk->inherited = 0;
78701+
78702+ tsk->acl_sp_role = 1;
78703+ tsk->acl_role_id = ++acl_sp_role_value;
78704+ tsk->role = assigned;
78705+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
78706+
78707+ /* ignore additional mmap checks for processes that are writable
78708+ by the default ACL */
78709+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
78710+ if (unlikely(obj->mode & GR_WRITE))
78711+ tsk->is_writable = 1;
78712+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
78713+ if (unlikely(obj->mode & GR_WRITE))
78714+ tsk->is_writable = 1;
78715+
78716+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78717+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
78718+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
78719+#endif
78720+
78721+out_unlock:
78722+ read_unlock(&grsec_exec_file_lock);
78723+ read_unlock(&tasklist_lock);
78724+ return;
78725+}
78726+
78727+
78728+static void
78729+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
78730+{
78731+ struct task_struct *task = current;
78732+ const struct cred *cred = current_cred();
78733+
78734+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
78735+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78736+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78737+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
78738+
78739+ return;
78740+}
78741+
78742+static void
78743+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
78744+{
78745+ struct task_struct *task = current;
78746+ const struct cred *cred = current_cred();
78747+
78748+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78749+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78750+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78751+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
78752+
78753+ return;
78754+}
78755+
78756+static void
78757+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
78758+{
78759+ struct task_struct *task = current;
78760+ const struct cred *cred = current_cred();
78761+
78762+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
78763+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
78764+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
78765+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
78766+
78767+ return;
78768+}
78769+
78770+static void
78771+gr_set_proc_res(struct task_struct *task)
78772+{
78773+ struct acl_subject_label *proc;
78774+ unsigned short i;
78775+
78776+ proc = task->acl;
78777+
78778+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
78779+ return;
78780+
78781+ for (i = 0; i < RLIM_NLIMITS; i++) {
78782+ unsigned long rlim_cur, rlim_max;
78783+
78784+ if (!(proc->resmask & (1U << i)))
78785+ continue;
78786+
78787+ rlim_cur = proc->res[i].rlim_cur;
78788+ rlim_max = proc->res[i].rlim_max;
78789+
78790+ if (i == RLIMIT_NOFILE) {
78791+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
78792+ if (rlim_cur > saved_sysctl_nr_open)
78793+ rlim_cur = saved_sysctl_nr_open;
78794+ if (rlim_max > saved_sysctl_nr_open)
78795+ rlim_max = saved_sysctl_nr_open;
78796+ }
78797+
78798+ task->signal->rlim[i].rlim_cur = rlim_cur;
78799+ task->signal->rlim[i].rlim_max = rlim_max;
78800+
78801+ if (i == RLIMIT_CPU)
78802+ update_rlimit_cpu(task, rlim_cur);
78803+ }
78804+
78805+ return;
78806+}
78807+
78808+/* both of the below must be called with
78809+ rcu_read_lock();
78810+ read_lock(&tasklist_lock);
78811+ read_lock(&grsec_exec_file_lock);
78812+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
78813+*/
78814+
78815+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
78816+{
78817+ char *tmpname;
78818+ struct acl_subject_label *tmpsubj;
78819+ struct file *filp;
78820+ struct name_entry *nmatch;
78821+
78822+ filp = task->exec_file;
78823+ if (filp == NULL)
78824+ return NULL;
78825+
78826+ /* the following is to apply the correct subject
78827+ on binaries running when the RBAC system
78828+ is enabled, when the binaries have been
78829+ replaced or deleted since their execution
78830+ -----
78831+ when the RBAC system starts, the inode/dev
78832+ from exec_file will be one the RBAC system
78833+ is unaware of. It only knows the inode/dev
78834+ of the present file on disk, or the absence
78835+ of it.
78836+ */
78837+
78838+ if (filename)
78839+ nmatch = __lookup_name_entry(state, filename);
78840+ else {
78841+ preempt_disable();
78842+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
78843+
78844+ nmatch = __lookup_name_entry(state, tmpname);
78845+ preempt_enable();
78846+ }
78847+ tmpsubj = NULL;
78848+ if (nmatch) {
78849+ if (nmatch->deleted)
78850+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
78851+ else
78852+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
78853+ }
78854+ /* this also works for the reload case -- if we don't match a potentially inherited subject
78855+ then we fall back to a normal lookup based on the binary's ino/dev
78856+ */
78857+ if (tmpsubj == NULL && fallback)
78858+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
78859+
78860+ return tmpsubj;
78861+}
78862+
78863+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
78864+{
78865+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
78866+}
78867+
78868+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
78869+{
78870+ struct acl_object_label *obj;
78871+ struct file *filp;
78872+
78873+ filp = task->exec_file;
78874+
78875+ task->acl = subj;
78876+ task->is_writable = 0;
78877+ /* ignore additional mmap checks for processes that are writable
78878+ by the default ACL */
78879+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
78880+ if (unlikely(obj->mode & GR_WRITE))
78881+ task->is_writable = 1;
78882+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
78883+ if (unlikely(obj->mode & GR_WRITE))
78884+ task->is_writable = 1;
78885+
78886+ gr_set_proc_res(task);
78887+
78888+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
78889+ 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);
78890+#endif
78891+}
78892+
78893+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
78894+{
78895+ __gr_apply_subject_to_task(&running_polstate, task, subj);
78896+}
78897+
78898+__u32
78899+gr_search_file(const struct dentry * dentry, const __u32 mode,
78900+ const struct vfsmount * mnt)
78901+{
78902+ __u32 retval = mode;
78903+ struct acl_subject_label *curracl;
78904+ struct acl_object_label *currobj;
78905+
78906+ if (unlikely(!(gr_status & GR_READY)))
78907+ return (mode & ~GR_AUDITS);
78908+
78909+ curracl = current->acl;
78910+
78911+ currobj = chk_obj_label(dentry, mnt, curracl);
78912+ retval = currobj->mode & mode;
78913+
78914+ /* if we're opening a specified transfer file for writing
78915+ (e.g. /dev/initctl), then transfer our role to init
78916+ */
78917+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
78918+ current->role->roletype & GR_ROLE_PERSIST)) {
78919+ struct task_struct *task = init_pid_ns.child_reaper;
78920+
78921+ if (task->role != current->role) {
78922+ struct acl_subject_label *subj;
78923+
78924+ task->acl_sp_role = 0;
78925+ task->acl_role_id = current->acl_role_id;
78926+ task->role = current->role;
78927+ rcu_read_lock();
78928+ read_lock(&grsec_exec_file_lock);
78929+ subj = gr_get_subject_for_task(task, NULL, 1);
78930+ gr_apply_subject_to_task(task, subj);
78931+ read_unlock(&grsec_exec_file_lock);
78932+ rcu_read_unlock();
78933+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
78934+ }
78935+ }
78936+
78937+ if (unlikely
78938+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
78939+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
78940+ __u32 new_mode = mode;
78941+
78942+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
78943+
78944+ retval = new_mode;
78945+
78946+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
78947+ new_mode |= GR_INHERIT;
78948+
78949+ if (!(mode & GR_NOLEARN))
78950+ gr_log_learn(dentry, mnt, new_mode);
78951+ }
78952+
78953+ return retval;
78954+}
78955+
78956+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
78957+ const struct dentry *parent,
78958+ const struct vfsmount *mnt)
78959+{
78960+ struct name_entry *match;
78961+ struct acl_object_label *matchpo;
78962+ struct acl_subject_label *curracl;
78963+ char *path;
78964+
78965+ if (unlikely(!(gr_status & GR_READY)))
78966+ return NULL;
78967+
78968+ preempt_disable();
78969+ path = gr_to_filename_rbac(new_dentry, mnt);
78970+ match = lookup_name_entry_create(path);
78971+
78972+ curracl = current->acl;
78973+
78974+ if (match) {
78975+ read_lock(&gr_inode_lock);
78976+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
78977+ read_unlock(&gr_inode_lock);
78978+
78979+ if (matchpo) {
78980+ preempt_enable();
78981+ return matchpo;
78982+ }
78983+ }
78984+
78985+ // lookup parent
78986+
78987+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
78988+
78989+ preempt_enable();
78990+ return matchpo;
78991+}
78992+
78993+__u32
78994+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
78995+ const struct vfsmount * mnt, const __u32 mode)
78996+{
78997+ struct acl_object_label *matchpo;
78998+ __u32 retval;
78999+
79000+ if (unlikely(!(gr_status & GR_READY)))
79001+ return (mode & ~GR_AUDITS);
79002+
79003+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
79004+
79005+ retval = matchpo->mode & mode;
79006+
79007+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
79008+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79009+ __u32 new_mode = mode;
79010+
79011+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
79012+
79013+ gr_log_learn(new_dentry, mnt, new_mode);
79014+ return new_mode;
79015+ }
79016+
79017+ return retval;
79018+}
79019+
79020+__u32
79021+gr_check_link(const struct dentry * new_dentry,
79022+ const struct dentry * parent_dentry,
79023+ const struct vfsmount * parent_mnt,
79024+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
79025+{
79026+ struct acl_object_label *obj;
79027+ __u32 oldmode, newmode;
79028+ __u32 needmode;
79029+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
79030+ GR_DELETE | GR_INHERIT;
79031+
79032+ if (unlikely(!(gr_status & GR_READY)))
79033+ return (GR_CREATE | GR_LINK);
79034+
79035+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
79036+ oldmode = obj->mode;
79037+
79038+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
79039+ newmode = obj->mode;
79040+
79041+ needmode = newmode & checkmodes;
79042+
79043+ // old name for hardlink must have at least the permissions of the new name
79044+ if ((oldmode & needmode) != needmode)
79045+ goto bad;
79046+
79047+ // if old name had restrictions/auditing, make sure the new name does as well
79048+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
79049+
79050+ // don't allow hardlinking of suid/sgid/fcapped files without permission
79051+ if (is_privileged_binary(old_dentry))
79052+ needmode |= GR_SETID;
79053+
79054+ if ((newmode & needmode) != needmode)
79055+ goto bad;
79056+
79057+ // enforce minimum permissions
79058+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
79059+ return newmode;
79060+bad:
79061+ needmode = oldmode;
79062+ if (is_privileged_binary(old_dentry))
79063+ needmode |= GR_SETID;
79064+
79065+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
79066+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
79067+ return (GR_CREATE | GR_LINK);
79068+ } else if (newmode & GR_SUPPRESS)
79069+ return GR_SUPPRESS;
79070+ else
79071+ return 0;
79072+}
79073+
79074+int
79075+gr_check_hidden_task(const struct task_struct *task)
79076+{
79077+ if (unlikely(!(gr_status & GR_READY)))
79078+ return 0;
79079+
79080+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
79081+ return 1;
79082+
79083+ return 0;
79084+}
79085+
79086+int
79087+gr_check_protected_task(const struct task_struct *task)
79088+{
79089+ if (unlikely(!(gr_status & GR_READY) || !task))
79090+ return 0;
79091+
79092+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79093+ task->acl != current->acl)
79094+ return 1;
79095+
79096+ return 0;
79097+}
79098+
79099+int
79100+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
79101+{
79102+ struct task_struct *p;
79103+ int ret = 0;
79104+
79105+ if (unlikely(!(gr_status & GR_READY) || !pid))
79106+ return ret;
79107+
79108+ read_lock(&tasklist_lock);
79109+ do_each_pid_task(pid, type, p) {
79110+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
79111+ p->acl != current->acl) {
79112+ ret = 1;
79113+ goto out;
79114+ }
79115+ } while_each_pid_task(pid, type, p);
79116+out:
79117+ read_unlock(&tasklist_lock);
79118+
79119+ return ret;
79120+}
79121+
79122+void
79123+gr_copy_label(struct task_struct *tsk)
79124+{
79125+ struct task_struct *p = current;
79126+
79127+ tsk->inherited = p->inherited;
79128+ tsk->acl_sp_role = 0;
79129+ tsk->acl_role_id = p->acl_role_id;
79130+ tsk->acl = p->acl;
79131+ tsk->role = p->role;
79132+ tsk->signal->used_accept = 0;
79133+ tsk->signal->curr_ip = p->signal->curr_ip;
79134+ tsk->signal->saved_ip = p->signal->saved_ip;
79135+ if (p->exec_file)
79136+ get_file(p->exec_file);
79137+ tsk->exec_file = p->exec_file;
79138+ tsk->is_writable = p->is_writable;
79139+ if (unlikely(p->signal->used_accept)) {
79140+ p->signal->curr_ip = 0;
79141+ p->signal->saved_ip = 0;
79142+ }
79143+
79144+ return;
79145+}
79146+
79147+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
79148+
79149+int
79150+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
79151+{
79152+ unsigned int i;
79153+ __u16 num;
79154+ uid_t *uidlist;
79155+ uid_t curuid;
79156+ int realok = 0;
79157+ int effectiveok = 0;
79158+ int fsok = 0;
79159+ uid_t globalreal, globaleffective, globalfs;
79160+
79161+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
79162+ struct user_struct *user;
79163+
79164+ if (!uid_valid(real))
79165+ goto skipit;
79166+
79167+ /* find user based on global namespace */
79168+
79169+ globalreal = GR_GLOBAL_UID(real);
79170+
79171+ user = find_user(make_kuid(&init_user_ns, globalreal));
79172+ if (user == NULL)
79173+ goto skipit;
79174+
79175+ if (gr_process_kernel_setuid_ban(user)) {
79176+ /* for find_user */
79177+ free_uid(user);
79178+ return 1;
79179+ }
79180+
79181+ /* for find_user */
79182+ free_uid(user);
79183+
79184+skipit:
79185+#endif
79186+
79187+ if (unlikely(!(gr_status & GR_READY)))
79188+ return 0;
79189+
79190+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79191+ gr_log_learn_uid_change(real, effective, fs);
79192+
79193+ num = current->acl->user_trans_num;
79194+ uidlist = current->acl->user_transitions;
79195+
79196+ if (uidlist == NULL)
79197+ return 0;
79198+
79199+ if (!uid_valid(real)) {
79200+ realok = 1;
79201+ globalreal = (uid_t)-1;
79202+ } else {
79203+ globalreal = GR_GLOBAL_UID(real);
79204+ }
79205+ if (!uid_valid(effective)) {
79206+ effectiveok = 1;
79207+ globaleffective = (uid_t)-1;
79208+ } else {
79209+ globaleffective = GR_GLOBAL_UID(effective);
79210+ }
79211+ if (!uid_valid(fs)) {
79212+ fsok = 1;
79213+ globalfs = (uid_t)-1;
79214+ } else {
79215+ globalfs = GR_GLOBAL_UID(fs);
79216+ }
79217+
79218+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
79219+ for (i = 0; i < num; i++) {
79220+ curuid = uidlist[i];
79221+ if (globalreal == curuid)
79222+ realok = 1;
79223+ if (globaleffective == curuid)
79224+ effectiveok = 1;
79225+ if (globalfs == curuid)
79226+ fsok = 1;
79227+ }
79228+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
79229+ for (i = 0; i < num; i++) {
79230+ curuid = uidlist[i];
79231+ if (globalreal == curuid)
79232+ break;
79233+ if (globaleffective == curuid)
79234+ break;
79235+ if (globalfs == curuid)
79236+ break;
79237+ }
79238+ /* not in deny list */
79239+ if (i == num) {
79240+ realok = 1;
79241+ effectiveok = 1;
79242+ fsok = 1;
79243+ }
79244+ }
79245+
79246+ if (realok && effectiveok && fsok)
79247+ return 0;
79248+ else {
79249+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79250+ return 1;
79251+ }
79252+}
79253+
79254+int
79255+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
79256+{
79257+ unsigned int i;
79258+ __u16 num;
79259+ gid_t *gidlist;
79260+ gid_t curgid;
79261+ int realok = 0;
79262+ int effectiveok = 0;
79263+ int fsok = 0;
79264+ gid_t globalreal, globaleffective, globalfs;
79265+
79266+ if (unlikely(!(gr_status & GR_READY)))
79267+ return 0;
79268+
79269+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
79270+ gr_log_learn_gid_change(real, effective, fs);
79271+
79272+ num = current->acl->group_trans_num;
79273+ gidlist = current->acl->group_transitions;
79274+
79275+ if (gidlist == NULL)
79276+ return 0;
79277+
79278+ if (!gid_valid(real)) {
79279+ realok = 1;
79280+ globalreal = (gid_t)-1;
79281+ } else {
79282+ globalreal = GR_GLOBAL_GID(real);
79283+ }
79284+ if (!gid_valid(effective)) {
79285+ effectiveok = 1;
79286+ globaleffective = (gid_t)-1;
79287+ } else {
79288+ globaleffective = GR_GLOBAL_GID(effective);
79289+ }
79290+ if (!gid_valid(fs)) {
79291+ fsok = 1;
79292+ globalfs = (gid_t)-1;
79293+ } else {
79294+ globalfs = GR_GLOBAL_GID(fs);
79295+ }
79296+
79297+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
79298+ for (i = 0; i < num; i++) {
79299+ curgid = gidlist[i];
79300+ if (globalreal == curgid)
79301+ realok = 1;
79302+ if (globaleffective == curgid)
79303+ effectiveok = 1;
79304+ if (globalfs == curgid)
79305+ fsok = 1;
79306+ }
79307+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
79308+ for (i = 0; i < num; i++) {
79309+ curgid = gidlist[i];
79310+ if (globalreal == curgid)
79311+ break;
79312+ if (globaleffective == curgid)
79313+ break;
79314+ if (globalfs == curgid)
79315+ break;
79316+ }
79317+ /* not in deny list */
79318+ if (i == num) {
79319+ realok = 1;
79320+ effectiveok = 1;
79321+ fsok = 1;
79322+ }
79323+ }
79324+
79325+ if (realok && effectiveok && fsok)
79326+ return 0;
79327+ else {
79328+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
79329+ return 1;
79330+ }
79331+}
79332+
79333+extern int gr_acl_is_capable(const int cap);
79334+
79335+void
79336+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
79337+{
79338+ struct acl_role_label *role = task->role;
79339+ struct acl_role_label *origrole = role;
79340+ struct acl_subject_label *subj = NULL;
79341+ struct acl_object_label *obj;
79342+ struct file *filp;
79343+ uid_t uid;
79344+ gid_t gid;
79345+
79346+ if (unlikely(!(gr_status & GR_READY)))
79347+ return;
79348+
79349+ uid = GR_GLOBAL_UID(kuid);
79350+ gid = GR_GLOBAL_GID(kgid);
79351+
79352+ filp = task->exec_file;
79353+
79354+ /* kernel process, we'll give them the kernel role */
79355+ if (unlikely(!filp)) {
79356+ task->role = running_polstate.kernel_role;
79357+ task->acl = running_polstate.kernel_role->root_label;
79358+ return;
79359+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
79360+ /* save the current ip at time of role lookup so that the proper
79361+ IP will be learned for role_allowed_ip */
79362+ task->signal->saved_ip = task->signal->curr_ip;
79363+ role = lookup_acl_role_label(task, uid, gid);
79364+ }
79365+
79366+ /* don't change the role if we're not a privileged process */
79367+ if (role && task->role != role &&
79368+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
79369+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
79370+ return;
79371+
79372+ task->role = role;
79373+
79374+ if (task->inherited) {
79375+ /* if we reached our subject through inheritance, then first see
79376+ if there's a subject of the same name in the new role that has
79377+ an object that would result in the same inherited subject
79378+ */
79379+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
79380+ if (subj) {
79381+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
79382+ if (!(obj->mode & GR_INHERIT))
79383+ subj = NULL;
79384+ }
79385+
79386+ }
79387+ if (subj == NULL) {
79388+ /* otherwise:
79389+ perform subject lookup in possibly new role
79390+ we can use this result below in the case where role == task->role
79391+ */
79392+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
79393+ }
79394+
79395+ /* if we changed uid/gid, but result in the same role
79396+ and are using inheritance, don't lose the inherited subject
79397+ if current subject is other than what normal lookup
79398+ would result in, we arrived via inheritance, don't
79399+ lose subject
79400+ */
79401+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
79402+ (subj == task->acl)))
79403+ task->acl = subj;
79404+
79405+ /* leave task->inherited unaffected */
79406+
79407+ task->is_writable = 0;
79408+
79409+ /* ignore additional mmap checks for processes that are writable
79410+ by the default ACL */
79411+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
79412+ if (unlikely(obj->mode & GR_WRITE))
79413+ task->is_writable = 1;
79414+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
79415+ if (unlikely(obj->mode & GR_WRITE))
79416+ task->is_writable = 1;
79417+
79418+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79419+ 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);
79420+#endif
79421+
79422+ gr_set_proc_res(task);
79423+
79424+ return;
79425+}
79426+
79427+int
79428+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
79429+ const int unsafe_flags)
79430+{
79431+ struct task_struct *task = current;
79432+ struct acl_subject_label *newacl;
79433+ struct acl_object_label *obj;
79434+ __u32 retmode;
79435+
79436+ if (unlikely(!(gr_status & GR_READY)))
79437+ return 0;
79438+
79439+ newacl = chk_subj_label(dentry, mnt, task->role);
79440+
79441+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
79442+ did an exec
79443+ */
79444+ rcu_read_lock();
79445+ read_lock(&tasklist_lock);
79446+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
79447+ (task->parent->acl->mode & GR_POVERRIDE))) {
79448+ read_unlock(&tasklist_lock);
79449+ rcu_read_unlock();
79450+ goto skip_check;
79451+ }
79452+ read_unlock(&tasklist_lock);
79453+ rcu_read_unlock();
79454+
79455+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
79456+ !(task->role->roletype & GR_ROLE_GOD) &&
79457+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
79458+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
79459+ if (unsafe_flags & LSM_UNSAFE_SHARE)
79460+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
79461+ else
79462+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
79463+ return -EACCES;
79464+ }
79465+
79466+skip_check:
79467+
79468+ obj = chk_obj_label(dentry, mnt, task->acl);
79469+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
79470+
79471+ if (!(task->acl->mode & GR_INHERITLEARN) &&
79472+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
79473+ if (obj->nested)
79474+ task->acl = obj->nested;
79475+ else
79476+ task->acl = newacl;
79477+ task->inherited = 0;
79478+ } else {
79479+ task->inherited = 1;
79480+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
79481+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
79482+ }
79483+
79484+ task->is_writable = 0;
79485+
79486+ /* ignore additional mmap checks for processes that are writable
79487+ by the default ACL */
79488+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
79489+ if (unlikely(obj->mode & GR_WRITE))
79490+ task->is_writable = 1;
79491+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
79492+ if (unlikely(obj->mode & GR_WRITE))
79493+ task->is_writable = 1;
79494+
79495+ gr_set_proc_res(task);
79496+
79497+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
79498+ 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);
79499+#endif
79500+ return 0;
79501+}
79502+
79503+/* always called with valid inodev ptr */
79504+static void
79505+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
79506+{
79507+ struct acl_object_label *matchpo;
79508+ struct acl_subject_label *matchps;
79509+ struct acl_subject_label *subj;
79510+ struct acl_role_label *role;
79511+ unsigned int x;
79512+
79513+ FOR_EACH_ROLE_START(role)
79514+ FOR_EACH_SUBJECT_START(role, subj, x)
79515+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79516+ matchpo->mode |= GR_DELETED;
79517+ FOR_EACH_SUBJECT_END(subj,x)
79518+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79519+ /* nested subjects aren't in the role's subj_hash table */
79520+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
79521+ matchpo->mode |= GR_DELETED;
79522+ FOR_EACH_NESTED_SUBJECT_END(subj)
79523+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
79524+ matchps->mode |= GR_DELETED;
79525+ FOR_EACH_ROLE_END(role)
79526+
79527+ inodev->nentry->deleted = 1;
79528+
79529+ return;
79530+}
79531+
79532+void
79533+gr_handle_delete(const u64 ino, const dev_t dev)
79534+{
79535+ struct inodev_entry *inodev;
79536+
79537+ if (unlikely(!(gr_status & GR_READY)))
79538+ return;
79539+
79540+ write_lock(&gr_inode_lock);
79541+ inodev = lookup_inodev_entry(ino, dev);
79542+ if (inodev != NULL)
79543+ do_handle_delete(inodev, ino, dev);
79544+ write_unlock(&gr_inode_lock);
79545+
79546+ return;
79547+}
79548+
79549+static void
79550+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
79551+ const u64 newinode, const dev_t newdevice,
79552+ struct acl_subject_label *subj)
79553+{
79554+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
79555+ struct acl_object_label *match;
79556+
79557+ match = subj->obj_hash[index];
79558+
79559+ while (match && (match->inode != oldinode ||
79560+ match->device != olddevice ||
79561+ !(match->mode & GR_DELETED)))
79562+ match = match->next;
79563+
79564+ if (match && (match->inode == oldinode)
79565+ && (match->device == olddevice)
79566+ && (match->mode & GR_DELETED)) {
79567+ if (match->prev == NULL) {
79568+ subj->obj_hash[index] = match->next;
79569+ if (match->next != NULL)
79570+ match->next->prev = NULL;
79571+ } else {
79572+ match->prev->next = match->next;
79573+ if (match->next != NULL)
79574+ match->next->prev = match->prev;
79575+ }
79576+ match->prev = NULL;
79577+ match->next = NULL;
79578+ match->inode = newinode;
79579+ match->device = newdevice;
79580+ match->mode &= ~GR_DELETED;
79581+
79582+ insert_acl_obj_label(match, subj);
79583+ }
79584+
79585+ return;
79586+}
79587+
79588+static void
79589+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
79590+ const u64 newinode, const dev_t newdevice,
79591+ struct acl_role_label *role)
79592+{
79593+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
79594+ struct acl_subject_label *match;
79595+
79596+ match = role->subj_hash[index];
79597+
79598+ while (match && (match->inode != oldinode ||
79599+ match->device != olddevice ||
79600+ !(match->mode & GR_DELETED)))
79601+ match = match->next;
79602+
79603+ if (match && (match->inode == oldinode)
79604+ && (match->device == olddevice)
79605+ && (match->mode & GR_DELETED)) {
79606+ if (match->prev == NULL) {
79607+ role->subj_hash[index] = match->next;
79608+ if (match->next != NULL)
79609+ match->next->prev = NULL;
79610+ } else {
79611+ match->prev->next = match->next;
79612+ if (match->next != NULL)
79613+ match->next->prev = match->prev;
79614+ }
79615+ match->prev = NULL;
79616+ match->next = NULL;
79617+ match->inode = newinode;
79618+ match->device = newdevice;
79619+ match->mode &= ~GR_DELETED;
79620+
79621+ insert_acl_subj_label(match, role);
79622+ }
79623+
79624+ return;
79625+}
79626+
79627+static void
79628+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
79629+ const u64 newinode, const dev_t newdevice)
79630+{
79631+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
79632+ struct inodev_entry *match;
79633+
79634+ match = running_polstate.inodev_set.i_hash[index];
79635+
79636+ while (match && (match->nentry->inode != oldinode ||
79637+ match->nentry->device != olddevice || !match->nentry->deleted))
79638+ match = match->next;
79639+
79640+ if (match && (match->nentry->inode == oldinode)
79641+ && (match->nentry->device == olddevice) &&
79642+ match->nentry->deleted) {
79643+ if (match->prev == NULL) {
79644+ running_polstate.inodev_set.i_hash[index] = match->next;
79645+ if (match->next != NULL)
79646+ match->next->prev = NULL;
79647+ } else {
79648+ match->prev->next = match->next;
79649+ if (match->next != NULL)
79650+ match->next->prev = match->prev;
79651+ }
79652+ match->prev = NULL;
79653+ match->next = NULL;
79654+ match->nentry->inode = newinode;
79655+ match->nentry->device = newdevice;
79656+ match->nentry->deleted = 0;
79657+
79658+ insert_inodev_entry(match);
79659+ }
79660+
79661+ return;
79662+}
79663+
79664+static void
79665+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
79666+{
79667+ struct acl_subject_label *subj;
79668+ struct acl_role_label *role;
79669+ unsigned int x;
79670+
79671+ FOR_EACH_ROLE_START(role)
79672+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
79673+
79674+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
79675+ if ((subj->inode == ino) && (subj->device == dev)) {
79676+ subj->inode = ino;
79677+ subj->device = dev;
79678+ }
79679+ /* nested subjects aren't in the role's subj_hash table */
79680+ update_acl_obj_label(matchn->inode, matchn->device,
79681+ ino, dev, subj);
79682+ FOR_EACH_NESTED_SUBJECT_END(subj)
79683+ FOR_EACH_SUBJECT_START(role, subj, x)
79684+ update_acl_obj_label(matchn->inode, matchn->device,
79685+ ino, dev, subj);
79686+ FOR_EACH_SUBJECT_END(subj,x)
79687+ FOR_EACH_ROLE_END(role)
79688+
79689+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
79690+
79691+ return;
79692+}
79693+
79694+static void
79695+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
79696+ const struct vfsmount *mnt)
79697+{
79698+ u64 ino = __get_ino(dentry);
79699+ dev_t dev = __get_dev(dentry);
79700+
79701+ __do_handle_create(matchn, ino, dev);
79702+
79703+ return;
79704+}
79705+
79706+void
79707+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
79708+{
79709+ struct name_entry *matchn;
79710+
79711+ if (unlikely(!(gr_status & GR_READY)))
79712+ return;
79713+
79714+ preempt_disable();
79715+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
79716+
79717+ if (unlikely((unsigned long)matchn)) {
79718+ write_lock(&gr_inode_lock);
79719+ do_handle_create(matchn, dentry, mnt);
79720+ write_unlock(&gr_inode_lock);
79721+ }
79722+ preempt_enable();
79723+
79724+ return;
79725+}
79726+
79727+void
79728+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
79729+{
79730+ struct name_entry *matchn;
79731+
79732+ if (unlikely(!(gr_status & GR_READY)))
79733+ return;
79734+
79735+ preempt_disable();
79736+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
79737+
79738+ if (unlikely((unsigned long)matchn)) {
79739+ write_lock(&gr_inode_lock);
79740+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
79741+ write_unlock(&gr_inode_lock);
79742+ }
79743+ preempt_enable();
79744+
79745+ return;
79746+}
79747+
79748+void
79749+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
79750+ struct dentry *old_dentry,
79751+ struct dentry *new_dentry,
79752+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
79753+{
79754+ struct name_entry *matchn;
79755+ struct name_entry *matchn2 = NULL;
79756+ struct inodev_entry *inodev;
79757+ struct inode *inode = new_dentry->d_inode;
79758+ u64 old_ino = __get_ino(old_dentry);
79759+ dev_t old_dev = __get_dev(old_dentry);
79760+ unsigned int exchange = flags & RENAME_EXCHANGE;
79761+
79762+ /* vfs_rename swaps the name and parent link for old_dentry and
79763+ new_dentry
79764+ at this point, old_dentry has the new name, parent link, and inode
79765+ for the renamed file
79766+ if a file is being replaced by a rename, new_dentry has the inode
79767+ and name for the replaced file
79768+ */
79769+
79770+ if (unlikely(!(gr_status & GR_READY)))
79771+ return;
79772+
79773+ preempt_disable();
79774+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
79775+
79776+ /* exchange cases:
79777+ a filename exists for the source, but not dest
79778+ do a recreate on source
79779+ a filename exists for the dest, but not source
79780+ do a recreate on dest
79781+ a filename exists for both source and dest
79782+ delete source and dest, then create source and dest
79783+ a filename exists for neither source nor dest
79784+ no updates needed
79785+
79786+ the name entry lookups get us the old inode/dev associated with
79787+ each name, so do the deletes first (if possible) so that when
79788+ we do the create, we pick up on the right entries
79789+ */
79790+
79791+ if (exchange)
79792+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
79793+
79794+ /* we wouldn't have to check d_inode if it weren't for
79795+ NFS silly-renaming
79796+ */
79797+
79798+ write_lock(&gr_inode_lock);
79799+ if (unlikely((replace || exchange) && inode)) {
79800+ u64 new_ino = __get_ino(new_dentry);
79801+ dev_t new_dev = __get_dev(new_dentry);
79802+
79803+ inodev = lookup_inodev_entry(new_ino, new_dev);
79804+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
79805+ do_handle_delete(inodev, new_ino, new_dev);
79806+ }
79807+
79808+ inodev = lookup_inodev_entry(old_ino, old_dev);
79809+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
79810+ do_handle_delete(inodev, old_ino, old_dev);
79811+
79812+ if (unlikely(matchn != NULL))
79813+ do_handle_create(matchn, old_dentry, mnt);
79814+
79815+ if (unlikely(matchn2 != NULL))
79816+ do_handle_create(matchn2, new_dentry, mnt);
79817+
79818+ write_unlock(&gr_inode_lock);
79819+ preempt_enable();
79820+
79821+ return;
79822+}
79823+
79824+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
79825+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
79826+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
79827+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
79828+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
79829+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
79830+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
79831+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
79832+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
79833+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
79834+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
79835+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
79836+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
79837+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
79838+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
79839+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
79840+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
79841+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
79842+};
79843+
79844+void
79845+gr_learn_resource(const struct task_struct *task,
79846+ const int res, const unsigned long wanted, const int gt)
79847+{
79848+ struct acl_subject_label *acl;
79849+ const struct cred *cred;
79850+
79851+ if (unlikely((gr_status & GR_READY) &&
79852+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
79853+ goto skip_reslog;
79854+
79855+ gr_log_resource(task, res, wanted, gt);
79856+skip_reslog:
79857+
79858+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
79859+ return;
79860+
79861+ acl = task->acl;
79862+
79863+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
79864+ !(acl->resmask & (1U << (unsigned short) res))))
79865+ return;
79866+
79867+ if (wanted >= acl->res[res].rlim_cur) {
79868+ unsigned long res_add;
79869+
79870+ res_add = wanted + res_learn_bumps[res];
79871+
79872+ acl->res[res].rlim_cur = res_add;
79873+
79874+ if (wanted > acl->res[res].rlim_max)
79875+ acl->res[res].rlim_max = res_add;
79876+
79877+ /* only log the subject filename, since resource logging is supported for
79878+ single-subject learning only */
79879+ rcu_read_lock();
79880+ cred = __task_cred(task);
79881+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
79882+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
79883+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
79884+ "", (unsigned long) res, &task->signal->saved_ip);
79885+ rcu_read_unlock();
79886+ }
79887+
79888+ return;
79889+}
79890+EXPORT_SYMBOL_GPL(gr_learn_resource);
79891+#endif
79892+
79893+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
79894+void
79895+pax_set_initial_flags(struct linux_binprm *bprm)
79896+{
79897+ struct task_struct *task = current;
79898+ struct acl_subject_label *proc;
79899+ unsigned long flags;
79900+
79901+ if (unlikely(!(gr_status & GR_READY)))
79902+ return;
79903+
79904+ flags = pax_get_flags(task);
79905+
79906+ proc = task->acl;
79907+
79908+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
79909+ flags &= ~MF_PAX_PAGEEXEC;
79910+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
79911+ flags &= ~MF_PAX_SEGMEXEC;
79912+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
79913+ flags &= ~MF_PAX_RANDMMAP;
79914+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
79915+ flags &= ~MF_PAX_EMUTRAMP;
79916+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
79917+ flags &= ~MF_PAX_MPROTECT;
79918+
79919+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
79920+ flags |= MF_PAX_PAGEEXEC;
79921+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
79922+ flags |= MF_PAX_SEGMEXEC;
79923+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
79924+ flags |= MF_PAX_RANDMMAP;
79925+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
79926+ flags |= MF_PAX_EMUTRAMP;
79927+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
79928+ flags |= MF_PAX_MPROTECT;
79929+
79930+ pax_set_flags(task, flags);
79931+
79932+ return;
79933+}
79934+#endif
79935+
79936+int
79937+gr_handle_proc_ptrace(struct task_struct *task)
79938+{
79939+ struct file *filp;
79940+ struct task_struct *tmp = task;
79941+ struct task_struct *curtemp = current;
79942+ __u32 retmode;
79943+
79944+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
79945+ if (unlikely(!(gr_status & GR_READY)))
79946+ return 0;
79947+#endif
79948+
79949+ read_lock(&tasklist_lock);
79950+ read_lock(&grsec_exec_file_lock);
79951+ filp = task->exec_file;
79952+
79953+ while (task_pid_nr(tmp) > 0) {
79954+ if (tmp == curtemp)
79955+ break;
79956+ tmp = tmp->real_parent;
79957+ }
79958+
79959+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
79960+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
79961+ read_unlock(&grsec_exec_file_lock);
79962+ read_unlock(&tasklist_lock);
79963+ return 1;
79964+ }
79965+
79966+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
79967+ if (!(gr_status & GR_READY)) {
79968+ read_unlock(&grsec_exec_file_lock);
79969+ read_unlock(&tasklist_lock);
79970+ return 0;
79971+ }
79972+#endif
79973+
79974+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
79975+ read_unlock(&grsec_exec_file_lock);
79976+ read_unlock(&tasklist_lock);
79977+
79978+ if (retmode & GR_NOPTRACE)
79979+ return 1;
79980+
79981+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
79982+ && (current->acl != task->acl || (current->acl != current->role->root_label
79983+ && task_pid_nr(current) != task_pid_nr(task))))
79984+ return 1;
79985+
79986+ return 0;
79987+}
79988+
79989+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
79990+{
79991+ if (unlikely(!(gr_status & GR_READY)))
79992+ return;
79993+
79994+ if (!(current->role->roletype & GR_ROLE_GOD))
79995+ return;
79996+
79997+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
79998+ p->role->rolename, gr_task_roletype_to_char(p),
79999+ p->acl->filename);
80000+}
80001+
80002+int
80003+gr_handle_ptrace(struct task_struct *task, const long request)
80004+{
80005+ struct task_struct *tmp = task;
80006+ struct task_struct *curtemp = current;
80007+ __u32 retmode;
80008+
80009+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
80010+ if (unlikely(!(gr_status & GR_READY)))
80011+ return 0;
80012+#endif
80013+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
80014+ read_lock(&tasklist_lock);
80015+ while (task_pid_nr(tmp) > 0) {
80016+ if (tmp == curtemp)
80017+ break;
80018+ tmp = tmp->real_parent;
80019+ }
80020+
80021+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
80022+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
80023+ read_unlock(&tasklist_lock);
80024+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80025+ return 1;
80026+ }
80027+ read_unlock(&tasklist_lock);
80028+ }
80029+
80030+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80031+ if (!(gr_status & GR_READY))
80032+ return 0;
80033+#endif
80034+
80035+ read_lock(&grsec_exec_file_lock);
80036+ if (unlikely(!task->exec_file)) {
80037+ read_unlock(&grsec_exec_file_lock);
80038+ return 0;
80039+ }
80040+
80041+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
80042+ read_unlock(&grsec_exec_file_lock);
80043+
80044+ if (retmode & GR_NOPTRACE) {
80045+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80046+ return 1;
80047+ }
80048+
80049+ if (retmode & GR_PTRACERD) {
80050+ switch (request) {
80051+ case PTRACE_SEIZE:
80052+ case PTRACE_POKETEXT:
80053+ case PTRACE_POKEDATA:
80054+ case PTRACE_POKEUSR:
80055+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
80056+ case PTRACE_SETREGS:
80057+ case PTRACE_SETFPREGS:
80058+#endif
80059+#ifdef CONFIG_X86
80060+ case PTRACE_SETFPXREGS:
80061+#endif
80062+#ifdef CONFIG_ALTIVEC
80063+ case PTRACE_SETVRREGS:
80064+#endif
80065+ return 1;
80066+ default:
80067+ return 0;
80068+ }
80069+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
80070+ !(current->role->roletype & GR_ROLE_GOD) &&
80071+ (current->acl != task->acl)) {
80072+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
80073+ return 1;
80074+ }
80075+
80076+ return 0;
80077+}
80078+
80079+static int is_writable_mmap(const struct file *filp)
80080+{
80081+ struct task_struct *task = current;
80082+ struct acl_object_label *obj, *obj2;
80083+
80084+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
80085+ !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && (filp->f_path.mnt != shm_mnt || (filp->f_path.dentry->d_inode->i_nlink > 0))) {
80086+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
80087+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
80088+ task->role->root_label);
80089+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
80090+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
80091+ return 1;
80092+ }
80093+ }
80094+ return 0;
80095+}
80096+
80097+int
80098+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
80099+{
80100+ __u32 mode;
80101+
80102+ if (unlikely(!file || !(prot & PROT_EXEC)))
80103+ return 1;
80104+
80105+ if (is_writable_mmap(file))
80106+ return 0;
80107+
80108+ mode =
80109+ gr_search_file(file->f_path.dentry,
80110+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80111+ file->f_path.mnt);
80112+
80113+ if (!gr_tpe_allow(file))
80114+ return 0;
80115+
80116+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80117+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80118+ return 0;
80119+ } else if (unlikely(!(mode & GR_EXEC))) {
80120+ return 0;
80121+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80122+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80123+ return 1;
80124+ }
80125+
80126+ return 1;
80127+}
80128+
80129+int
80130+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
80131+{
80132+ __u32 mode;
80133+
80134+ if (unlikely(!file || !(prot & PROT_EXEC)))
80135+ return 1;
80136+
80137+ if (is_writable_mmap(file))
80138+ return 0;
80139+
80140+ mode =
80141+ gr_search_file(file->f_path.dentry,
80142+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
80143+ file->f_path.mnt);
80144+
80145+ if (!gr_tpe_allow(file))
80146+ return 0;
80147+
80148+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
80149+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80150+ return 0;
80151+ } else if (unlikely(!(mode & GR_EXEC))) {
80152+ return 0;
80153+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
80154+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
80155+ return 1;
80156+ }
80157+
80158+ return 1;
80159+}
80160+
80161+void
80162+gr_acl_handle_psacct(struct task_struct *task, const long code)
80163+{
80164+ unsigned long runtime, cputime;
80165+ cputime_t utime, stime;
80166+ unsigned int wday, cday;
80167+ __u8 whr, chr;
80168+ __u8 wmin, cmin;
80169+ __u8 wsec, csec;
80170+ struct timespec curtime, starttime;
80171+
80172+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
80173+ !(task->acl->mode & GR_PROCACCT)))
80174+ return;
80175+
80176+ curtime = ns_to_timespec(ktime_get_ns());
80177+ starttime = ns_to_timespec(task->start_time);
80178+ runtime = curtime.tv_sec - starttime.tv_sec;
80179+ wday = runtime / (60 * 60 * 24);
80180+ runtime -= wday * (60 * 60 * 24);
80181+ whr = runtime / (60 * 60);
80182+ runtime -= whr * (60 * 60);
80183+ wmin = runtime / 60;
80184+ runtime -= wmin * 60;
80185+ wsec = runtime;
80186+
80187+ task_cputime(task, &utime, &stime);
80188+ cputime = cputime_to_secs(utime + stime);
80189+ cday = cputime / (60 * 60 * 24);
80190+ cputime -= cday * (60 * 60 * 24);
80191+ chr = cputime / (60 * 60);
80192+ cputime -= chr * (60 * 60);
80193+ cmin = cputime / 60;
80194+ cputime -= cmin * 60;
80195+ csec = cputime;
80196+
80197+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
80198+
80199+ return;
80200+}
80201+
80202+#ifdef CONFIG_TASKSTATS
80203+int gr_is_taskstats_denied(int pid)
80204+{
80205+ struct task_struct *task;
80206+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80207+ const struct cred *cred;
80208+#endif
80209+ int ret = 0;
80210+
80211+ /* restrict taskstats viewing to un-chrooted root users
80212+ who have the 'view' subject flag if the RBAC system is enabled
80213+ */
80214+
80215+ rcu_read_lock();
80216+ read_lock(&tasklist_lock);
80217+ task = find_task_by_vpid(pid);
80218+ if (task) {
80219+#ifdef CONFIG_GRKERNSEC_CHROOT
80220+ if (proc_is_chrooted(task))
80221+ ret = -EACCES;
80222+#endif
80223+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80224+ cred = __task_cred(task);
80225+#ifdef CONFIG_GRKERNSEC_PROC_USER
80226+ if (gr_is_global_nonroot(cred->uid))
80227+ ret = -EACCES;
80228+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80229+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
80230+ ret = -EACCES;
80231+#endif
80232+#endif
80233+ if (gr_status & GR_READY) {
80234+ if (!(task->acl->mode & GR_VIEW))
80235+ ret = -EACCES;
80236+ }
80237+ } else
80238+ ret = -ENOENT;
80239+
80240+ read_unlock(&tasklist_lock);
80241+ rcu_read_unlock();
80242+
80243+ return ret;
80244+}
80245+#endif
80246+
80247+/* AUXV entries are filled via a descendant of search_binary_handler
80248+ after we've already applied the subject for the target
80249+*/
80250+int gr_acl_enable_at_secure(void)
80251+{
80252+ if (unlikely(!(gr_status & GR_READY)))
80253+ return 0;
80254+
80255+ if (current->acl->mode & GR_ATSECURE)
80256+ return 1;
80257+
80258+ return 0;
80259+}
80260+
80261+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
80262+{
80263+ struct task_struct *task = current;
80264+ struct dentry *dentry = file->f_path.dentry;
80265+ struct vfsmount *mnt = file->f_path.mnt;
80266+ struct acl_object_label *obj, *tmp;
80267+ struct acl_subject_label *subj;
80268+ unsigned int bufsize;
80269+ int is_not_root;
80270+ char *path;
80271+ dev_t dev = __get_dev(dentry);
80272+
80273+ if (unlikely(!(gr_status & GR_READY)))
80274+ return 1;
80275+
80276+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
80277+ return 1;
80278+
80279+ /* ignore Eric Biederman */
80280+ if (IS_PRIVATE(dentry->d_inode))
80281+ return 1;
80282+
80283+ subj = task->acl;
80284+ read_lock(&gr_inode_lock);
80285+ do {
80286+ obj = lookup_acl_obj_label(ino, dev, subj);
80287+ if (obj != NULL) {
80288+ read_unlock(&gr_inode_lock);
80289+ return (obj->mode & GR_FIND) ? 1 : 0;
80290+ }
80291+ } while ((subj = subj->parent_subject));
80292+ read_unlock(&gr_inode_lock);
80293+
80294+ /* this is purely an optimization since we're looking for an object
80295+ for the directory we're doing a readdir on
80296+ if it's possible for any globbed object to match the entry we're
80297+ filling into the directory, then the object we find here will be
80298+ an anchor point with attached globbed objects
80299+ */
80300+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
80301+ if (obj->globbed == NULL)
80302+ return (obj->mode & GR_FIND) ? 1 : 0;
80303+
80304+ is_not_root = ((obj->filename[0] == '/') &&
80305+ (obj->filename[1] == '\0')) ? 0 : 1;
80306+ bufsize = PAGE_SIZE - namelen - is_not_root;
80307+
80308+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
80309+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
80310+ return 1;
80311+
80312+ preempt_disable();
80313+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
80314+ bufsize);
80315+
80316+ bufsize = strlen(path);
80317+
80318+ /* if base is "/", don't append an additional slash */
80319+ if (is_not_root)
80320+ *(path + bufsize) = '/';
80321+ memcpy(path + bufsize + is_not_root, name, namelen);
80322+ *(path + bufsize + namelen + is_not_root) = '\0';
80323+
80324+ tmp = obj->globbed;
80325+ while (tmp) {
80326+ if (!glob_match(tmp->filename, path)) {
80327+ preempt_enable();
80328+ return (tmp->mode & GR_FIND) ? 1 : 0;
80329+ }
80330+ tmp = tmp->next;
80331+ }
80332+ preempt_enable();
80333+ return (obj->mode & GR_FIND) ? 1 : 0;
80334+}
80335+
80336+void gr_put_exec_file(struct task_struct *task)
80337+{
80338+ struct file *filp;
80339+
80340+ write_lock(&grsec_exec_file_lock);
80341+ filp = task->exec_file;
80342+ task->exec_file = NULL;
80343+ write_unlock(&grsec_exec_file_lock);
80344+
80345+ if (filp)
80346+ fput(filp);
80347+
80348+ return;
80349+}
80350+
80351+
80352+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
80353+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
80354+#endif
80355+#ifdef CONFIG_SECURITY
80356+EXPORT_SYMBOL_GPL(gr_check_user_change);
80357+EXPORT_SYMBOL_GPL(gr_check_group_change);
80358+#endif
80359+
80360diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
80361new file mode 100644
80362index 0000000..9adc75c
80363--- /dev/null
80364+++ b/grsecurity/gracl_alloc.c
80365@@ -0,0 +1,105 @@
80366+#include <linux/kernel.h>
80367+#include <linux/mm.h>
80368+#include <linux/slab.h>
80369+#include <linux/vmalloc.h>
80370+#include <linux/gracl.h>
80371+#include <linux/grsecurity.h>
80372+
80373+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
80374+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
80375+
80376+static int
80377+alloc_pop(void)
80378+{
80379+ if (current_alloc_state->alloc_stack_next == 1)
80380+ return 0;
80381+
80382+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
80383+
80384+ current_alloc_state->alloc_stack_next--;
80385+
80386+ return 1;
80387+}
80388+
80389+static int
80390+alloc_push(void *buf)
80391+{
80392+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
80393+ return 1;
80394+
80395+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
80396+
80397+ current_alloc_state->alloc_stack_next++;
80398+
80399+ return 0;
80400+}
80401+
80402+void *
80403+acl_alloc(unsigned long len)
80404+{
80405+ void *ret = NULL;
80406+
80407+ if (!len || len > PAGE_SIZE)
80408+ goto out;
80409+
80410+ ret = kmalloc(len, GFP_KERNEL);
80411+
80412+ if (ret) {
80413+ if (alloc_push(ret)) {
80414+ kfree(ret);
80415+ ret = NULL;
80416+ }
80417+ }
80418+
80419+out:
80420+ return ret;
80421+}
80422+
80423+void *
80424+acl_alloc_num(unsigned long num, unsigned long len)
80425+{
80426+ if (!len || (num > (PAGE_SIZE / len)))
80427+ return NULL;
80428+
80429+ return acl_alloc(num * len);
80430+}
80431+
80432+void
80433+acl_free_all(void)
80434+{
80435+ if (!current_alloc_state->alloc_stack)
80436+ return;
80437+
80438+ while (alloc_pop()) ;
80439+
80440+ if (current_alloc_state->alloc_stack) {
80441+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
80442+ kfree(current_alloc_state->alloc_stack);
80443+ else
80444+ vfree(current_alloc_state->alloc_stack);
80445+ }
80446+
80447+ current_alloc_state->alloc_stack = NULL;
80448+ current_alloc_state->alloc_stack_size = 1;
80449+ current_alloc_state->alloc_stack_next = 1;
80450+
80451+ return;
80452+}
80453+
80454+int
80455+acl_alloc_stack_init(unsigned long size)
80456+{
80457+ if ((size * sizeof (void *)) <= PAGE_SIZE)
80458+ current_alloc_state->alloc_stack =
80459+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
80460+ else
80461+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
80462+
80463+ current_alloc_state->alloc_stack_size = size;
80464+ current_alloc_state->alloc_stack_next = 1;
80465+
80466+ if (!current_alloc_state->alloc_stack)
80467+ return 0;
80468+ else
80469+ return 1;
80470+}
80471diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
80472new file mode 100644
80473index 0000000..1a94c11
80474--- /dev/null
80475+++ b/grsecurity/gracl_cap.c
80476@@ -0,0 +1,127 @@
80477+#include <linux/kernel.h>
80478+#include <linux/module.h>
80479+#include <linux/sched.h>
80480+#include <linux/gracl.h>
80481+#include <linux/grsecurity.h>
80482+#include <linux/grinternal.h>
80483+
80484+extern const char *captab_log[];
80485+extern int captab_log_entries;
80486+
80487+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
80488+{
80489+ struct acl_subject_label *curracl;
80490+
80491+ if (!gr_acl_is_enabled())
80492+ return 1;
80493+
80494+ curracl = task->acl;
80495+
80496+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
80497+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
80498+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
80499+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
80500+ gr_to_filename(task->exec_file->f_path.dentry,
80501+ task->exec_file->f_path.mnt) : curracl->filename,
80502+ curracl->filename, 0UL,
80503+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
80504+ return 1;
80505+ }
80506+
80507+ return 0;
80508+}
80509+
80510+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
80511+{
80512+ struct acl_subject_label *curracl;
80513+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80514+ kernel_cap_t cap_audit = __cap_empty_set;
80515+
80516+ if (!gr_acl_is_enabled())
80517+ return 1;
80518+
80519+ curracl = task->acl;
80520+
80521+ cap_drop = curracl->cap_lower;
80522+ cap_mask = curracl->cap_mask;
80523+ cap_audit = curracl->cap_invert_audit;
80524+
80525+ while ((curracl = curracl->parent_subject)) {
80526+ /* if the cap isn't specified in the current computed mask but is specified in the
80527+ current level subject, and is lowered in the current level subject, then add
80528+ it to the set of dropped capabilities
80529+ otherwise, add the current level subject's mask to the current computed mask
80530+ */
80531+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80532+ cap_raise(cap_mask, cap);
80533+ if (cap_raised(curracl->cap_lower, cap))
80534+ cap_raise(cap_drop, cap);
80535+ if (cap_raised(curracl->cap_invert_audit, cap))
80536+ cap_raise(cap_audit, cap);
80537+ }
80538+ }
80539+
80540+ if (!cap_raised(cap_drop, cap)) {
80541+ if (cap_raised(cap_audit, cap))
80542+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
80543+ return 1;
80544+ }
80545+
80546+ /* only learn the capability use if the process has the capability in the
80547+ general case, the two uses in sys.c of gr_learn_cap are an exception
80548+ to this rule to ensure any role transition involves what the full-learned
80549+ policy believes in a privileged process
80550+ */
80551+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
80552+ return 1;
80553+
80554+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
80555+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
80556+
80557+ return 0;
80558+}
80559+
80560+int
80561+gr_acl_is_capable(const int cap)
80562+{
80563+ return gr_task_acl_is_capable(current, current_cred(), cap);
80564+}
80565+
80566+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
80567+{
80568+ struct acl_subject_label *curracl;
80569+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
80570+
80571+ if (!gr_acl_is_enabled())
80572+ return 1;
80573+
80574+ curracl = task->acl;
80575+
80576+ cap_drop = curracl->cap_lower;
80577+ cap_mask = curracl->cap_mask;
80578+
80579+ while ((curracl = curracl->parent_subject)) {
80580+ /* if the cap isn't specified in the current computed mask but is specified in the
80581+ current level subject, and is lowered in the current level subject, then add
80582+ it to the set of dropped capabilities
80583+ otherwise, add the current level subject's mask to the current computed mask
80584+ */
80585+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
80586+ cap_raise(cap_mask, cap);
80587+ if (cap_raised(curracl->cap_lower, cap))
80588+ cap_raise(cap_drop, cap);
80589+ }
80590+ }
80591+
80592+ if (!cap_raised(cap_drop, cap))
80593+ return 1;
80594+
80595+ return 0;
80596+}
80597+
80598+int
80599+gr_acl_is_capable_nolog(const int cap)
80600+{
80601+ return gr_task_acl_is_capable_nolog(current, cap);
80602+}
80603+
80604diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
80605new file mode 100644
80606index 0000000..a43dd06
80607--- /dev/null
80608+++ b/grsecurity/gracl_compat.c
80609@@ -0,0 +1,269 @@
80610+#include <linux/kernel.h>
80611+#include <linux/gracl.h>
80612+#include <linux/compat.h>
80613+#include <linux/gracl_compat.h>
80614+
80615+#include <asm/uaccess.h>
80616+
80617+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
80618+{
80619+ struct gr_arg_wrapper_compat uwrapcompat;
80620+
80621+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
80622+ return -EFAULT;
80623+
80624+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
80625+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
80626+ return -EINVAL;
80627+
80628+ uwrap->arg = compat_ptr(uwrapcompat.arg);
80629+ uwrap->version = uwrapcompat.version;
80630+ uwrap->size = sizeof(struct gr_arg);
80631+
80632+ return 0;
80633+}
80634+
80635+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
80636+{
80637+ struct gr_arg_compat argcompat;
80638+
80639+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
80640+ return -EFAULT;
80641+
80642+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
80643+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
80644+ arg->role_db.num_roles = argcompat.role_db.num_roles;
80645+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
80646+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
80647+ arg->role_db.num_objects = argcompat.role_db.num_objects;
80648+
80649+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
80650+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
80651+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
80652+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
80653+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
80654+ arg->segv_device = argcompat.segv_device;
80655+ arg->segv_inode = argcompat.segv_inode;
80656+ arg->segv_uid = argcompat.segv_uid;
80657+ arg->num_sprole_pws = argcompat.num_sprole_pws;
80658+ arg->mode = argcompat.mode;
80659+
80660+ return 0;
80661+}
80662+
80663+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
80664+{
80665+ struct acl_object_label_compat objcompat;
80666+
80667+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
80668+ return -EFAULT;
80669+
80670+ obj->filename = compat_ptr(objcompat.filename);
80671+ obj->inode = objcompat.inode;
80672+ obj->device = objcompat.device;
80673+ obj->mode = objcompat.mode;
80674+
80675+ obj->nested = compat_ptr(objcompat.nested);
80676+ obj->globbed = compat_ptr(objcompat.globbed);
80677+
80678+ obj->prev = compat_ptr(objcompat.prev);
80679+ obj->next = compat_ptr(objcompat.next);
80680+
80681+ return 0;
80682+}
80683+
80684+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
80685+{
80686+ unsigned int i;
80687+ struct acl_subject_label_compat subjcompat;
80688+
80689+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
80690+ return -EFAULT;
80691+
80692+ subj->filename = compat_ptr(subjcompat.filename);
80693+ subj->inode = subjcompat.inode;
80694+ subj->device = subjcompat.device;
80695+ subj->mode = subjcompat.mode;
80696+ subj->cap_mask = subjcompat.cap_mask;
80697+ subj->cap_lower = subjcompat.cap_lower;
80698+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
80699+
80700+ for (i = 0; i < GR_NLIMITS; i++) {
80701+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
80702+ subj->res[i].rlim_cur = RLIM_INFINITY;
80703+ else
80704+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
80705+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
80706+ subj->res[i].rlim_max = RLIM_INFINITY;
80707+ else
80708+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
80709+ }
80710+ subj->resmask = subjcompat.resmask;
80711+
80712+ subj->user_trans_type = subjcompat.user_trans_type;
80713+ subj->group_trans_type = subjcompat.group_trans_type;
80714+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
80715+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
80716+ subj->user_trans_num = subjcompat.user_trans_num;
80717+ subj->group_trans_num = subjcompat.group_trans_num;
80718+
80719+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
80720+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
80721+ subj->ip_type = subjcompat.ip_type;
80722+ subj->ips = compat_ptr(subjcompat.ips);
80723+ subj->ip_num = subjcompat.ip_num;
80724+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
80725+
80726+ subj->crashes = subjcompat.crashes;
80727+ subj->expires = subjcompat.expires;
80728+
80729+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
80730+ subj->hash = compat_ptr(subjcompat.hash);
80731+ subj->prev = compat_ptr(subjcompat.prev);
80732+ subj->next = compat_ptr(subjcompat.next);
80733+
80734+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
80735+ subj->obj_hash_size = subjcompat.obj_hash_size;
80736+ subj->pax_flags = subjcompat.pax_flags;
80737+
80738+ return 0;
80739+}
80740+
80741+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
80742+{
80743+ struct acl_role_label_compat rolecompat;
80744+
80745+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
80746+ return -EFAULT;
80747+
80748+ role->rolename = compat_ptr(rolecompat.rolename);
80749+ role->uidgid = rolecompat.uidgid;
80750+ role->roletype = rolecompat.roletype;
80751+
80752+ role->auth_attempts = rolecompat.auth_attempts;
80753+ role->expires = rolecompat.expires;
80754+
80755+ role->root_label = compat_ptr(rolecompat.root_label);
80756+ role->hash = compat_ptr(rolecompat.hash);
80757+
80758+ role->prev = compat_ptr(rolecompat.prev);
80759+ role->next = compat_ptr(rolecompat.next);
80760+
80761+ role->transitions = compat_ptr(rolecompat.transitions);
80762+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
80763+ role->domain_children = compat_ptr(rolecompat.domain_children);
80764+ role->domain_child_num = rolecompat.domain_child_num;
80765+
80766+ role->umask = rolecompat.umask;
80767+
80768+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
80769+ role->subj_hash_size = rolecompat.subj_hash_size;
80770+
80771+ return 0;
80772+}
80773+
80774+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
80775+{
80776+ struct role_allowed_ip_compat roleip_compat;
80777+
80778+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
80779+ return -EFAULT;
80780+
80781+ roleip->addr = roleip_compat.addr;
80782+ roleip->netmask = roleip_compat.netmask;
80783+
80784+ roleip->prev = compat_ptr(roleip_compat.prev);
80785+ roleip->next = compat_ptr(roleip_compat.next);
80786+
80787+ return 0;
80788+}
80789+
80790+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
80791+{
80792+ struct role_transition_compat trans_compat;
80793+
80794+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
80795+ return -EFAULT;
80796+
80797+ trans->rolename = compat_ptr(trans_compat.rolename);
80798+
80799+ trans->prev = compat_ptr(trans_compat.prev);
80800+ trans->next = compat_ptr(trans_compat.next);
80801+
80802+ return 0;
80803+
80804+}
80805+
80806+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
80807+{
80808+ struct gr_hash_struct_compat hash_compat;
80809+
80810+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
80811+ return -EFAULT;
80812+
80813+ hash->table = compat_ptr(hash_compat.table);
80814+ hash->nametable = compat_ptr(hash_compat.nametable);
80815+ hash->first = compat_ptr(hash_compat.first);
80816+
80817+ hash->table_size = hash_compat.table_size;
80818+ hash->used_size = hash_compat.used_size;
80819+
80820+ hash->type = hash_compat.type;
80821+
80822+ return 0;
80823+}
80824+
80825+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
80826+{
80827+ compat_uptr_t ptrcompat;
80828+
80829+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
80830+ return -EFAULT;
80831+
80832+ *(void **)ptr = compat_ptr(ptrcompat);
80833+
80834+ return 0;
80835+}
80836+
80837+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
80838+{
80839+ struct acl_ip_label_compat ip_compat;
80840+
80841+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
80842+ return -EFAULT;
80843+
80844+ ip->iface = compat_ptr(ip_compat.iface);
80845+ ip->addr = ip_compat.addr;
80846+ ip->netmask = ip_compat.netmask;
80847+ ip->low = ip_compat.low;
80848+ ip->high = ip_compat.high;
80849+ ip->mode = ip_compat.mode;
80850+ ip->type = ip_compat.type;
80851+
80852+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
80853+
80854+ ip->prev = compat_ptr(ip_compat.prev);
80855+ ip->next = compat_ptr(ip_compat.next);
80856+
80857+ return 0;
80858+}
80859+
80860+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
80861+{
80862+ struct sprole_pw_compat pw_compat;
80863+
80864+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
80865+ return -EFAULT;
80866+
80867+ pw->rolename = compat_ptr(pw_compat.rolename);
80868+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
80869+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
80870+
80871+ return 0;
80872+}
80873+
80874+size_t get_gr_arg_wrapper_size_compat(void)
80875+{
80876+ return sizeof(struct gr_arg_wrapper_compat);
80877+}
80878+
80879diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
80880new file mode 100644
80881index 0000000..8ee8e4f
80882--- /dev/null
80883+++ b/grsecurity/gracl_fs.c
80884@@ -0,0 +1,447 @@
80885+#include <linux/kernel.h>
80886+#include <linux/sched.h>
80887+#include <linux/types.h>
80888+#include <linux/fs.h>
80889+#include <linux/file.h>
80890+#include <linux/stat.h>
80891+#include <linux/grsecurity.h>
80892+#include <linux/grinternal.h>
80893+#include <linux/gracl.h>
80894+
80895+umode_t
80896+gr_acl_umask(void)
80897+{
80898+ if (unlikely(!gr_acl_is_enabled()))
80899+ return 0;
80900+
80901+ return current->role->umask;
80902+}
80903+
80904+__u32
80905+gr_acl_handle_hidden_file(const struct dentry * dentry,
80906+ const struct vfsmount * mnt)
80907+{
80908+ __u32 mode;
80909+
80910+ if (unlikely(d_is_negative(dentry)))
80911+ return GR_FIND;
80912+
80913+ mode =
80914+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
80915+
80916+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
80917+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80918+ return mode;
80919+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
80920+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
80921+ return 0;
80922+ } else if (unlikely(!(mode & GR_FIND)))
80923+ return 0;
80924+
80925+ return GR_FIND;
80926+}
80927+
80928+__u32
80929+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
80930+ int acc_mode)
80931+{
80932+ __u32 reqmode = GR_FIND;
80933+ __u32 mode;
80934+
80935+ if (unlikely(d_is_negative(dentry)))
80936+ return reqmode;
80937+
80938+ if (acc_mode & MAY_APPEND)
80939+ reqmode |= GR_APPEND;
80940+ else if (acc_mode & MAY_WRITE)
80941+ reqmode |= GR_WRITE;
80942+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
80943+ reqmode |= GR_READ;
80944+
80945+ mode =
80946+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
80947+ mnt);
80948+
80949+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80950+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80951+ reqmode & GR_READ ? " reading" : "",
80952+ reqmode & GR_WRITE ? " writing" : reqmode &
80953+ GR_APPEND ? " appending" : "");
80954+ return reqmode;
80955+ } else
80956+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
80957+ {
80958+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
80959+ reqmode & GR_READ ? " reading" : "",
80960+ reqmode & GR_WRITE ? " writing" : reqmode &
80961+ GR_APPEND ? " appending" : "");
80962+ return 0;
80963+ } else if (unlikely((mode & reqmode) != reqmode))
80964+ return 0;
80965+
80966+ return reqmode;
80967+}
80968+
80969+__u32
80970+gr_acl_handle_creat(const struct dentry * dentry,
80971+ const struct dentry * p_dentry,
80972+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
80973+ const int imode)
80974+{
80975+ __u32 reqmode = GR_WRITE | GR_CREATE;
80976+ __u32 mode;
80977+
80978+ if (acc_mode & MAY_APPEND)
80979+ reqmode |= GR_APPEND;
80980+ // if a directory was required or the directory already exists, then
80981+ // don't count this open as a read
80982+ if ((acc_mode & MAY_READ) &&
80983+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
80984+ reqmode |= GR_READ;
80985+ if ((open_flags & O_CREAT) &&
80986+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
80987+ reqmode |= GR_SETID;
80988+
80989+ mode =
80990+ gr_check_create(dentry, p_dentry, p_mnt,
80991+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
80992+
80993+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
80994+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
80995+ reqmode & GR_READ ? " reading" : "",
80996+ reqmode & GR_WRITE ? " writing" : reqmode &
80997+ GR_APPEND ? " appending" : "");
80998+ return reqmode;
80999+ } else
81000+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81001+ {
81002+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
81003+ reqmode & GR_READ ? " reading" : "",
81004+ reqmode & GR_WRITE ? " writing" : reqmode &
81005+ GR_APPEND ? " appending" : "");
81006+ return 0;
81007+ } else if (unlikely((mode & reqmode) != reqmode))
81008+ return 0;
81009+
81010+ return reqmode;
81011+}
81012+
81013+__u32
81014+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
81015+ const int fmode)
81016+{
81017+ __u32 mode, reqmode = GR_FIND;
81018+
81019+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
81020+ reqmode |= GR_EXEC;
81021+ if (fmode & S_IWOTH)
81022+ reqmode |= GR_WRITE;
81023+ if (fmode & S_IROTH)
81024+ reqmode |= GR_READ;
81025+
81026+ mode =
81027+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
81028+ mnt);
81029+
81030+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
81031+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81032+ reqmode & GR_READ ? " reading" : "",
81033+ reqmode & GR_WRITE ? " writing" : "",
81034+ reqmode & GR_EXEC ? " executing" : "");
81035+ return reqmode;
81036+ } else
81037+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
81038+ {
81039+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
81040+ reqmode & GR_READ ? " reading" : "",
81041+ reqmode & GR_WRITE ? " writing" : "",
81042+ reqmode & GR_EXEC ? " executing" : "");
81043+ return 0;
81044+ } else if (unlikely((mode & reqmode) != reqmode))
81045+ return 0;
81046+
81047+ return reqmode;
81048+}
81049+
81050+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
81051+{
81052+ __u32 mode;
81053+
81054+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
81055+
81056+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81057+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
81058+ return mode;
81059+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81060+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
81061+ return 0;
81062+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81063+ return 0;
81064+
81065+ return (reqmode);
81066+}
81067+
81068+__u32
81069+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
81070+{
81071+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
81072+}
81073+
81074+__u32
81075+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
81076+{
81077+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
81078+}
81079+
81080+__u32
81081+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
81082+{
81083+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
81084+}
81085+
81086+__u32
81087+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
81088+{
81089+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
81090+}
81091+
81092+__u32
81093+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
81094+ umode_t *modeptr)
81095+{
81096+ umode_t mode;
81097+
81098+ *modeptr &= ~gr_acl_umask();
81099+ mode = *modeptr;
81100+
81101+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
81102+ return 1;
81103+
81104+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
81105+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
81106+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
81107+ GR_CHMOD_ACL_MSG);
81108+ } else {
81109+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
81110+ }
81111+}
81112+
81113+__u32
81114+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
81115+{
81116+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
81117+}
81118+
81119+__u32
81120+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
81121+{
81122+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
81123+}
81124+
81125+__u32
81126+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
81127+{
81128+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
81129+}
81130+
81131+__u32
81132+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
81133+{
81134+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
81135+}
81136+
81137+__u32
81138+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
81139+{
81140+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
81141+ GR_UNIXCONNECT_ACL_MSG);
81142+}
81143+
81144+/* hardlinks require at minimum create and link permission,
81145+ any additional privilege required is based on the
81146+ privilege of the file being linked to
81147+*/
81148+__u32
81149+gr_acl_handle_link(const struct dentry * new_dentry,
81150+ const struct dentry * parent_dentry,
81151+ const struct vfsmount * parent_mnt,
81152+ const struct dentry * old_dentry,
81153+ const struct vfsmount * old_mnt, const struct filename *to)
81154+{
81155+ __u32 mode;
81156+ __u32 needmode = GR_CREATE | GR_LINK;
81157+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
81158+
81159+ mode =
81160+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
81161+ old_mnt);
81162+
81163+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
81164+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81165+ return mode;
81166+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81167+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
81168+ return 0;
81169+ } else if (unlikely((mode & needmode) != needmode))
81170+ return 0;
81171+
81172+ return 1;
81173+}
81174+
81175+__u32
81176+gr_acl_handle_symlink(const struct dentry * new_dentry,
81177+ const struct dentry * parent_dentry,
81178+ const struct vfsmount * parent_mnt, const struct filename *from)
81179+{
81180+ __u32 needmode = GR_WRITE | GR_CREATE;
81181+ __u32 mode;
81182+
81183+ mode =
81184+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
81185+ GR_CREATE | GR_AUDIT_CREATE |
81186+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
81187+
81188+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
81189+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81190+ return mode;
81191+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
81192+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
81193+ return 0;
81194+ } else if (unlikely((mode & needmode) != needmode))
81195+ return 0;
81196+
81197+ return (GR_WRITE | GR_CREATE);
81198+}
81199+
81200+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)
81201+{
81202+ __u32 mode;
81203+
81204+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
81205+
81206+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
81207+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
81208+ return mode;
81209+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
81210+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
81211+ return 0;
81212+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
81213+ return 0;
81214+
81215+ return (reqmode);
81216+}
81217+
81218+__u32
81219+gr_acl_handle_mknod(const struct dentry * new_dentry,
81220+ const struct dentry * parent_dentry,
81221+ const struct vfsmount * parent_mnt,
81222+ const int mode)
81223+{
81224+ __u32 reqmode = GR_WRITE | GR_CREATE;
81225+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
81226+ reqmode |= GR_SETID;
81227+
81228+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81229+ reqmode, GR_MKNOD_ACL_MSG);
81230+}
81231+
81232+__u32
81233+gr_acl_handle_mkdir(const struct dentry *new_dentry,
81234+ const struct dentry *parent_dentry,
81235+ const struct vfsmount *parent_mnt)
81236+{
81237+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
81238+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
81239+}
81240+
81241+#define RENAME_CHECK_SUCCESS(old, new) \
81242+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
81243+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
81244+
81245+int
81246+gr_acl_handle_rename(struct dentry *new_dentry,
81247+ struct dentry *parent_dentry,
81248+ const struct vfsmount *parent_mnt,
81249+ struct dentry *old_dentry,
81250+ struct inode *old_parent_inode,
81251+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
81252+{
81253+ __u32 comp1, comp2;
81254+ int error = 0;
81255+
81256+ if (unlikely(!gr_acl_is_enabled()))
81257+ return 0;
81258+
81259+ if (flags & RENAME_EXCHANGE) {
81260+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81261+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81262+ GR_SUPPRESS, parent_mnt);
81263+ comp2 =
81264+ gr_search_file(old_dentry,
81265+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81266+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81267+ } else if (d_is_negative(new_dentry)) {
81268+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
81269+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
81270+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
81271+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
81272+ GR_DELETE | GR_AUDIT_DELETE |
81273+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81274+ GR_SUPPRESS, old_mnt);
81275+ } else {
81276+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
81277+ GR_CREATE | GR_DELETE |
81278+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
81279+ GR_AUDIT_READ | GR_AUDIT_WRITE |
81280+ GR_SUPPRESS, parent_mnt);
81281+ comp2 =
81282+ gr_search_file(old_dentry,
81283+ GR_READ | GR_WRITE | GR_AUDIT_READ |
81284+ GR_DELETE | GR_AUDIT_DELETE |
81285+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
81286+ }
81287+
81288+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
81289+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
81290+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81291+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
81292+ && !(comp2 & GR_SUPPRESS)) {
81293+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
81294+ error = -EACCES;
81295+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
81296+ error = -EACCES;
81297+
81298+ return error;
81299+}
81300+
81301+void
81302+gr_acl_handle_exit(void)
81303+{
81304+ u16 id;
81305+ char *rolename;
81306+
81307+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
81308+ !(current->role->roletype & GR_ROLE_PERSIST))) {
81309+ id = current->acl_role_id;
81310+ rolename = current->role->rolename;
81311+ gr_set_acls(1);
81312+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
81313+ }
81314+
81315+ gr_put_exec_file(current);
81316+ return;
81317+}
81318+
81319+int
81320+gr_acl_handle_procpidmem(const struct task_struct *task)
81321+{
81322+ if (unlikely(!gr_acl_is_enabled()))
81323+ return 0;
81324+
81325+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
81326+ !(current->acl->mode & GR_POVERRIDE) &&
81327+ !(current->role->roletype & GR_ROLE_GOD))
81328+ return -EACCES;
81329+
81330+ return 0;
81331+}
81332diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
81333new file mode 100644
81334index 0000000..f056b81
81335--- /dev/null
81336+++ b/grsecurity/gracl_ip.c
81337@@ -0,0 +1,386 @@
81338+#include <linux/kernel.h>
81339+#include <asm/uaccess.h>
81340+#include <asm/errno.h>
81341+#include <net/sock.h>
81342+#include <linux/file.h>
81343+#include <linux/fs.h>
81344+#include <linux/net.h>
81345+#include <linux/in.h>
81346+#include <linux/skbuff.h>
81347+#include <linux/ip.h>
81348+#include <linux/udp.h>
81349+#include <linux/types.h>
81350+#include <linux/sched.h>
81351+#include <linux/netdevice.h>
81352+#include <linux/inetdevice.h>
81353+#include <linux/gracl.h>
81354+#include <linux/grsecurity.h>
81355+#include <linux/grinternal.h>
81356+
81357+#define GR_BIND 0x01
81358+#define GR_CONNECT 0x02
81359+#define GR_INVERT 0x04
81360+#define GR_BINDOVERRIDE 0x08
81361+#define GR_CONNECTOVERRIDE 0x10
81362+#define GR_SOCK_FAMILY 0x20
81363+
81364+static const char * gr_protocols[IPPROTO_MAX] = {
81365+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
81366+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
81367+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
81368+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
81369+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
81370+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
81371+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
81372+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
81373+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
81374+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
81375+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
81376+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
81377+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
81378+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
81379+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
81380+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
81381+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
81382+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
81383+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
81384+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
81385+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
81386+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
81387+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
81388+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
81389+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
81390+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
81391+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
81392+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
81393+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
81394+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
81395+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
81396+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
81397+ };
81398+
81399+static const char * gr_socktypes[SOCK_MAX] = {
81400+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
81401+ "unknown:7", "unknown:8", "unknown:9", "packet"
81402+ };
81403+
81404+static const char * gr_sockfamilies[AF_MAX+1] = {
81405+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
81406+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
81407+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
81408+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
81409+ };
81410+
81411+const char *
81412+gr_proto_to_name(unsigned char proto)
81413+{
81414+ return gr_protocols[proto];
81415+}
81416+
81417+const char *
81418+gr_socktype_to_name(unsigned char type)
81419+{
81420+ return gr_socktypes[type];
81421+}
81422+
81423+const char *
81424+gr_sockfamily_to_name(unsigned char family)
81425+{
81426+ return gr_sockfamilies[family];
81427+}
81428+
81429+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
81430+
81431+int
81432+gr_search_socket(const int domain, const int type, const int protocol)
81433+{
81434+ struct acl_subject_label *curr;
81435+ const struct cred *cred = current_cred();
81436+
81437+ if (unlikely(!gr_acl_is_enabled()))
81438+ goto exit;
81439+
81440+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
81441+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
81442+ goto exit; // let the kernel handle it
81443+
81444+ curr = current->acl;
81445+
81446+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
81447+ /* the family is allowed, if this is PF_INET allow it only if
81448+ the extra sock type/protocol checks pass */
81449+ if (domain == PF_INET)
81450+ goto inet_check;
81451+ goto exit;
81452+ } else {
81453+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81454+ __u32 fakeip = 0;
81455+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81456+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81457+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81458+ gr_to_filename(current->exec_file->f_path.dentry,
81459+ current->exec_file->f_path.mnt) :
81460+ curr->filename, curr->filename,
81461+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
81462+ &current->signal->saved_ip);
81463+ goto exit;
81464+ }
81465+ goto exit_fail;
81466+ }
81467+
81468+inet_check:
81469+ /* the rest of this checking is for IPv4 only */
81470+ if (!curr->ips)
81471+ goto exit;
81472+
81473+ if ((curr->ip_type & (1U << type)) &&
81474+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
81475+ goto exit;
81476+
81477+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81478+ /* we don't place acls on raw sockets , and sometimes
81479+ dgram/ip sockets are opened for ioctl and not
81480+ bind/connect, so we'll fake a bind learn log */
81481+ if (type == SOCK_RAW || type == SOCK_PACKET) {
81482+ __u32 fakeip = 0;
81483+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81484+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81485+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81486+ gr_to_filename(current->exec_file->f_path.dentry,
81487+ current->exec_file->f_path.mnt) :
81488+ curr->filename, curr->filename,
81489+ &fakeip, 0, type,
81490+ protocol, GR_CONNECT, &current->signal->saved_ip);
81491+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
81492+ __u32 fakeip = 0;
81493+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81494+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81495+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81496+ gr_to_filename(current->exec_file->f_path.dentry,
81497+ current->exec_file->f_path.mnt) :
81498+ curr->filename, curr->filename,
81499+ &fakeip, 0, type,
81500+ protocol, GR_BIND, &current->signal->saved_ip);
81501+ }
81502+ /* we'll log when they use connect or bind */
81503+ goto exit;
81504+ }
81505+
81506+exit_fail:
81507+ if (domain == PF_INET)
81508+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
81509+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
81510+ else if (rcu_access_pointer(net_families[domain]) != NULL)
81511+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
81512+ gr_socktype_to_name(type), protocol);
81513+
81514+ return 0;
81515+exit:
81516+ return 1;
81517+}
81518+
81519+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)
81520+{
81521+ if ((ip->mode & mode) &&
81522+ (ip_port >= ip->low) &&
81523+ (ip_port <= ip->high) &&
81524+ ((ntohl(ip_addr) & our_netmask) ==
81525+ (ntohl(our_addr) & our_netmask))
81526+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
81527+ && (ip->type & (1U << type))) {
81528+ if (ip->mode & GR_INVERT)
81529+ return 2; // specifically denied
81530+ else
81531+ return 1; // allowed
81532+ }
81533+
81534+ return 0; // not specifically allowed, may continue parsing
81535+}
81536+
81537+static int
81538+gr_search_connectbind(const int full_mode, struct sock *sk,
81539+ struct sockaddr_in *addr, const int type)
81540+{
81541+ char iface[IFNAMSIZ] = {0};
81542+ struct acl_subject_label *curr;
81543+ struct acl_ip_label *ip;
81544+ struct inet_sock *isk;
81545+ struct net_device *dev;
81546+ struct in_device *idev;
81547+ unsigned long i;
81548+ int ret;
81549+ int mode = full_mode & (GR_BIND | GR_CONNECT);
81550+ __u32 ip_addr = 0;
81551+ __u32 our_addr;
81552+ __u32 our_netmask;
81553+ char *p;
81554+ __u16 ip_port = 0;
81555+ const struct cred *cred = current_cred();
81556+
81557+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
81558+ return 0;
81559+
81560+ curr = current->acl;
81561+ isk = inet_sk(sk);
81562+
81563+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
81564+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
81565+ addr->sin_addr.s_addr = curr->inaddr_any_override;
81566+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
81567+ struct sockaddr_in saddr;
81568+ int err;
81569+
81570+ saddr.sin_family = AF_INET;
81571+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
81572+ saddr.sin_port = isk->inet_sport;
81573+
81574+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81575+ if (err)
81576+ return err;
81577+
81578+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
81579+ if (err)
81580+ return err;
81581+ }
81582+
81583+ if (!curr->ips)
81584+ return 0;
81585+
81586+ ip_addr = addr->sin_addr.s_addr;
81587+ ip_port = ntohs(addr->sin_port);
81588+
81589+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
81590+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
81591+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
81592+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
81593+ gr_to_filename(current->exec_file->f_path.dentry,
81594+ current->exec_file->f_path.mnt) :
81595+ curr->filename, curr->filename,
81596+ &ip_addr, ip_port, type,
81597+ sk->sk_protocol, mode, &current->signal->saved_ip);
81598+ return 0;
81599+ }
81600+
81601+ for (i = 0; i < curr->ip_num; i++) {
81602+ ip = *(curr->ips + i);
81603+ if (ip->iface != NULL) {
81604+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
81605+ p = strchr(iface, ':');
81606+ if (p != NULL)
81607+ *p = '\0';
81608+ dev = dev_get_by_name(sock_net(sk), iface);
81609+ if (dev == NULL)
81610+ continue;
81611+ idev = in_dev_get(dev);
81612+ if (idev == NULL) {
81613+ dev_put(dev);
81614+ continue;
81615+ }
81616+ rcu_read_lock();
81617+ for_ifa(idev) {
81618+ if (!strcmp(ip->iface, ifa->ifa_label)) {
81619+ our_addr = ifa->ifa_address;
81620+ our_netmask = 0xffffffff;
81621+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81622+ if (ret == 1) {
81623+ rcu_read_unlock();
81624+ in_dev_put(idev);
81625+ dev_put(dev);
81626+ return 0;
81627+ } else if (ret == 2) {
81628+ rcu_read_unlock();
81629+ in_dev_put(idev);
81630+ dev_put(dev);
81631+ goto denied;
81632+ }
81633+ }
81634+ } endfor_ifa(idev);
81635+ rcu_read_unlock();
81636+ in_dev_put(idev);
81637+ dev_put(dev);
81638+ } else {
81639+ our_addr = ip->addr;
81640+ our_netmask = ip->netmask;
81641+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
81642+ if (ret == 1)
81643+ return 0;
81644+ else if (ret == 2)
81645+ goto denied;
81646+ }
81647+ }
81648+
81649+denied:
81650+ if (mode == GR_BIND)
81651+ 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));
81652+ else if (mode == GR_CONNECT)
81653+ 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));
81654+
81655+ return -EACCES;
81656+}
81657+
81658+int
81659+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
81660+{
81661+ /* always allow disconnection of dgram sockets with connect */
81662+ if (addr->sin_family == AF_UNSPEC)
81663+ return 0;
81664+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
81665+}
81666+
81667+int
81668+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
81669+{
81670+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
81671+}
81672+
81673+int gr_search_listen(struct socket *sock)
81674+{
81675+ struct sock *sk = sock->sk;
81676+ struct sockaddr_in addr;
81677+
81678+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81679+ addr.sin_port = inet_sk(sk)->inet_sport;
81680+
81681+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81682+}
81683+
81684+int gr_search_accept(struct socket *sock)
81685+{
81686+ struct sock *sk = sock->sk;
81687+ struct sockaddr_in addr;
81688+
81689+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
81690+ addr.sin_port = inet_sk(sk)->inet_sport;
81691+
81692+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
81693+}
81694+
81695+int
81696+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
81697+{
81698+ if (addr)
81699+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
81700+ else {
81701+ struct sockaddr_in sin;
81702+ const struct inet_sock *inet = inet_sk(sk);
81703+
81704+ sin.sin_addr.s_addr = inet->inet_daddr;
81705+ sin.sin_port = inet->inet_dport;
81706+
81707+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81708+ }
81709+}
81710+
81711+int
81712+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
81713+{
81714+ struct sockaddr_in sin;
81715+
81716+ if (unlikely(skb->len < sizeof (struct udphdr)))
81717+ return 0; // skip this packet
81718+
81719+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
81720+ sin.sin_port = udp_hdr(skb)->source;
81721+
81722+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
81723+}
81724diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
81725new file mode 100644
81726index 0000000..25f54ef
81727--- /dev/null
81728+++ b/grsecurity/gracl_learn.c
81729@@ -0,0 +1,207 @@
81730+#include <linux/kernel.h>
81731+#include <linux/mm.h>
81732+#include <linux/sched.h>
81733+#include <linux/poll.h>
81734+#include <linux/string.h>
81735+#include <linux/file.h>
81736+#include <linux/types.h>
81737+#include <linux/vmalloc.h>
81738+#include <linux/grinternal.h>
81739+
81740+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
81741+ size_t count, loff_t *ppos);
81742+extern int gr_acl_is_enabled(void);
81743+
81744+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
81745+static int gr_learn_attached;
81746+
81747+/* use a 512k buffer */
81748+#define LEARN_BUFFER_SIZE (512 * 1024)
81749+
81750+static DEFINE_SPINLOCK(gr_learn_lock);
81751+static DEFINE_MUTEX(gr_learn_user_mutex);
81752+
81753+/* we need to maintain two buffers, so that the kernel context of grlearn
81754+ uses a semaphore around the userspace copying, and the other kernel contexts
81755+ use a spinlock when copying into the buffer, since they cannot sleep
81756+*/
81757+static char *learn_buffer;
81758+static char *learn_buffer_user;
81759+static int learn_buffer_len;
81760+static int learn_buffer_user_len;
81761+
81762+static ssize_t
81763+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
81764+{
81765+ DECLARE_WAITQUEUE(wait, current);
81766+ ssize_t retval = 0;
81767+
81768+ add_wait_queue(&learn_wait, &wait);
81769+ set_current_state(TASK_INTERRUPTIBLE);
81770+ do {
81771+ mutex_lock(&gr_learn_user_mutex);
81772+ spin_lock(&gr_learn_lock);
81773+ if (learn_buffer_len)
81774+ break;
81775+ spin_unlock(&gr_learn_lock);
81776+ mutex_unlock(&gr_learn_user_mutex);
81777+ if (file->f_flags & O_NONBLOCK) {
81778+ retval = -EAGAIN;
81779+ goto out;
81780+ }
81781+ if (signal_pending(current)) {
81782+ retval = -ERESTARTSYS;
81783+ goto out;
81784+ }
81785+
81786+ schedule();
81787+ } while (1);
81788+
81789+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
81790+ learn_buffer_user_len = learn_buffer_len;
81791+ retval = learn_buffer_len;
81792+ learn_buffer_len = 0;
81793+
81794+ spin_unlock(&gr_learn_lock);
81795+
81796+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
81797+ retval = -EFAULT;
81798+
81799+ mutex_unlock(&gr_learn_user_mutex);
81800+out:
81801+ set_current_state(TASK_RUNNING);
81802+ remove_wait_queue(&learn_wait, &wait);
81803+ return retval;
81804+}
81805+
81806+static unsigned int
81807+poll_learn(struct file * file, poll_table * wait)
81808+{
81809+ poll_wait(file, &learn_wait, wait);
81810+
81811+ if (learn_buffer_len)
81812+ return (POLLIN | POLLRDNORM);
81813+
81814+ return 0;
81815+}
81816+
81817+void
81818+gr_clear_learn_entries(void)
81819+{
81820+ char *tmp;
81821+
81822+ mutex_lock(&gr_learn_user_mutex);
81823+ spin_lock(&gr_learn_lock);
81824+ tmp = learn_buffer;
81825+ learn_buffer = NULL;
81826+ spin_unlock(&gr_learn_lock);
81827+ if (tmp)
81828+ vfree(tmp);
81829+ if (learn_buffer_user != NULL) {
81830+ vfree(learn_buffer_user);
81831+ learn_buffer_user = NULL;
81832+ }
81833+ learn_buffer_len = 0;
81834+ mutex_unlock(&gr_learn_user_mutex);
81835+
81836+ return;
81837+}
81838+
81839+void
81840+gr_add_learn_entry(const char *fmt, ...)
81841+{
81842+ va_list args;
81843+ unsigned int len;
81844+
81845+ if (!gr_learn_attached)
81846+ return;
81847+
81848+ spin_lock(&gr_learn_lock);
81849+
81850+ /* leave a gap at the end so we know when it's "full" but don't have to
81851+ compute the exact length of the string we're trying to append
81852+ */
81853+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
81854+ spin_unlock(&gr_learn_lock);
81855+ wake_up_interruptible(&learn_wait);
81856+ return;
81857+ }
81858+ if (learn_buffer == NULL) {
81859+ spin_unlock(&gr_learn_lock);
81860+ return;
81861+ }
81862+
81863+ va_start(args, fmt);
81864+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
81865+ va_end(args);
81866+
81867+ learn_buffer_len += len + 1;
81868+
81869+ spin_unlock(&gr_learn_lock);
81870+ wake_up_interruptible(&learn_wait);
81871+
81872+ return;
81873+}
81874+
81875+static int
81876+open_learn(struct inode *inode, struct file *file)
81877+{
81878+ if (file->f_mode & FMODE_READ && gr_learn_attached)
81879+ return -EBUSY;
81880+ if (file->f_mode & FMODE_READ) {
81881+ int retval = 0;
81882+ mutex_lock(&gr_learn_user_mutex);
81883+ if (learn_buffer == NULL)
81884+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
81885+ if (learn_buffer_user == NULL)
81886+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
81887+ if (learn_buffer == NULL) {
81888+ retval = -ENOMEM;
81889+ goto out_error;
81890+ }
81891+ if (learn_buffer_user == NULL) {
81892+ retval = -ENOMEM;
81893+ goto out_error;
81894+ }
81895+ learn_buffer_len = 0;
81896+ learn_buffer_user_len = 0;
81897+ gr_learn_attached = 1;
81898+out_error:
81899+ mutex_unlock(&gr_learn_user_mutex);
81900+ return retval;
81901+ }
81902+ return 0;
81903+}
81904+
81905+static int
81906+close_learn(struct inode *inode, struct file *file)
81907+{
81908+ if (file->f_mode & FMODE_READ) {
81909+ char *tmp = NULL;
81910+ mutex_lock(&gr_learn_user_mutex);
81911+ spin_lock(&gr_learn_lock);
81912+ tmp = learn_buffer;
81913+ learn_buffer = NULL;
81914+ spin_unlock(&gr_learn_lock);
81915+ if (tmp)
81916+ vfree(tmp);
81917+ if (learn_buffer_user != NULL) {
81918+ vfree(learn_buffer_user);
81919+ learn_buffer_user = NULL;
81920+ }
81921+ learn_buffer_len = 0;
81922+ learn_buffer_user_len = 0;
81923+ gr_learn_attached = 0;
81924+ mutex_unlock(&gr_learn_user_mutex);
81925+ }
81926+
81927+ return 0;
81928+}
81929+
81930+const struct file_operations grsec_fops = {
81931+ .read = read_learn,
81932+ .write = write_grsec_handler,
81933+ .open = open_learn,
81934+ .release = close_learn,
81935+ .poll = poll_learn,
81936+};
81937diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
81938new file mode 100644
81939index 0000000..fd26052
81940--- /dev/null
81941+++ b/grsecurity/gracl_policy.c
81942@@ -0,0 +1,1781 @@
81943+#include <linux/kernel.h>
81944+#include <linux/module.h>
81945+#include <linux/sched.h>
81946+#include <linux/mm.h>
81947+#include <linux/file.h>
81948+#include <linux/fs.h>
81949+#include <linux/namei.h>
81950+#include <linux/mount.h>
81951+#include <linux/tty.h>
81952+#include <linux/proc_fs.h>
81953+#include <linux/lglock.h>
81954+#include <linux/slab.h>
81955+#include <linux/vmalloc.h>
81956+#include <linux/types.h>
81957+#include <linux/sysctl.h>
81958+#include <linux/netdevice.h>
81959+#include <linux/ptrace.h>
81960+#include <linux/gracl.h>
81961+#include <linux/gralloc.h>
81962+#include <linux/security.h>
81963+#include <linux/grinternal.h>
81964+#include <linux/pid_namespace.h>
81965+#include <linux/stop_machine.h>
81966+#include <linux/fdtable.h>
81967+#include <linux/percpu.h>
81968+#include <linux/lglock.h>
81969+#include <linux/hugetlb.h>
81970+#include <linux/posix-timers.h>
81971+#include "../fs/mount.h"
81972+
81973+#include <asm/uaccess.h>
81974+#include <asm/errno.h>
81975+#include <asm/mman.h>
81976+
81977+extern struct gr_policy_state *polstate;
81978+
81979+#define FOR_EACH_ROLE_START(role) \
81980+ role = polstate->role_list; \
81981+ while (role) {
81982+
81983+#define FOR_EACH_ROLE_END(role) \
81984+ role = role->prev; \
81985+ }
81986+
81987+struct path gr_real_root;
81988+
81989+extern struct gr_alloc_state *current_alloc_state;
81990+
81991+u16 acl_sp_role_value;
81992+
81993+static DEFINE_MUTEX(gr_dev_mutex);
81994+
81995+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
81996+extern void gr_clear_learn_entries(void);
81997+
81998+struct gr_arg *gr_usermode __read_only;
81999+unsigned char *gr_system_salt __read_only;
82000+unsigned char *gr_system_sum __read_only;
82001+
82002+static unsigned int gr_auth_attempts = 0;
82003+static unsigned long gr_auth_expires = 0UL;
82004+
82005+struct acl_object_label *fakefs_obj_rw;
82006+struct acl_object_label *fakefs_obj_rwx;
82007+
82008+extern int gr_init_uidset(void);
82009+extern void gr_free_uidset(void);
82010+extern void gr_remove_uid(uid_t uid);
82011+extern int gr_find_uid(uid_t uid);
82012+
82013+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);
82014+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
82015+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
82016+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
82017+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);
82018+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
82019+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
82020+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
82021+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
82022+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82023+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
82024+extern void assign_special_role(const char *rolename);
82025+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
82026+extern int gr_rbac_disable(void *unused);
82027+extern void gr_enable_rbac_system(void);
82028+
82029+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
82030+{
82031+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
82032+ return -EFAULT;
82033+
82034+ return 0;
82035+}
82036+
82037+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
82038+{
82039+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
82040+ return -EFAULT;
82041+
82042+ return 0;
82043+}
82044+
82045+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
82046+{
82047+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
82048+ return -EFAULT;
82049+
82050+ return 0;
82051+}
82052+
82053+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
82054+{
82055+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
82056+ return -EFAULT;
82057+
82058+ return 0;
82059+}
82060+
82061+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
82062+{
82063+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
82064+ return -EFAULT;
82065+
82066+ return 0;
82067+}
82068+
82069+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
82070+{
82071+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
82072+ return -EFAULT;
82073+
82074+ return 0;
82075+}
82076+
82077+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
82078+{
82079+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
82080+ return -EFAULT;
82081+
82082+ return 0;
82083+}
82084+
82085+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
82086+{
82087+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
82088+ return -EFAULT;
82089+
82090+ return 0;
82091+}
82092+
82093+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
82094+{
82095+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
82096+ return -EFAULT;
82097+
82098+ return 0;
82099+}
82100+
82101+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
82102+{
82103+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
82104+ return -EFAULT;
82105+
82106+ if ((uwrap->version != GRSECURITY_VERSION) ||
82107+ (uwrap->size != sizeof(struct gr_arg)))
82108+ return -EINVAL;
82109+
82110+ return 0;
82111+}
82112+
82113+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
82114+{
82115+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
82116+ return -EFAULT;
82117+
82118+ return 0;
82119+}
82120+
82121+static size_t get_gr_arg_wrapper_size_normal(void)
82122+{
82123+ return sizeof(struct gr_arg_wrapper);
82124+}
82125+
82126+#ifdef CONFIG_COMPAT
82127+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
82128+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
82129+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
82130+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
82131+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
82132+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
82133+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
82134+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
82135+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
82136+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
82137+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
82138+extern size_t get_gr_arg_wrapper_size_compat(void);
82139+
82140+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
82141+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
82142+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
82143+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
82144+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
82145+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
82146+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
82147+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
82148+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
82149+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
82150+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
82151+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
82152+
82153+#else
82154+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
82155+#define copy_gr_arg copy_gr_arg_normal
82156+#define copy_gr_hash_struct copy_gr_hash_struct_normal
82157+#define copy_acl_object_label copy_acl_object_label_normal
82158+#define copy_acl_subject_label copy_acl_subject_label_normal
82159+#define copy_acl_role_label copy_acl_role_label_normal
82160+#define copy_acl_ip_label copy_acl_ip_label_normal
82161+#define copy_pointer_from_array copy_pointer_from_array_normal
82162+#define copy_sprole_pw copy_sprole_pw_normal
82163+#define copy_role_transition copy_role_transition_normal
82164+#define copy_role_allowed_ip copy_role_allowed_ip_normal
82165+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
82166+#endif
82167+
82168+static struct acl_subject_label *
82169+lookup_subject_map(const struct acl_subject_label *userp)
82170+{
82171+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
82172+ struct subject_map *match;
82173+
82174+ match = polstate->subj_map_set.s_hash[index];
82175+
82176+ while (match && match->user != userp)
82177+ match = match->next;
82178+
82179+ if (match != NULL)
82180+ return match->kernel;
82181+ else
82182+ return NULL;
82183+}
82184+
82185+static void
82186+insert_subj_map_entry(struct subject_map *subjmap)
82187+{
82188+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
82189+ struct subject_map **curr;
82190+
82191+ subjmap->prev = NULL;
82192+
82193+ curr = &polstate->subj_map_set.s_hash[index];
82194+ if (*curr != NULL)
82195+ (*curr)->prev = subjmap;
82196+
82197+ subjmap->next = *curr;
82198+ *curr = subjmap;
82199+
82200+ return;
82201+}
82202+
82203+static void
82204+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
82205+{
82206+ unsigned int index =
82207+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
82208+ struct acl_role_label **curr;
82209+ struct acl_role_label *tmp, *tmp2;
82210+
82211+ curr = &polstate->acl_role_set.r_hash[index];
82212+
82213+ /* simple case, slot is empty, just set it to our role */
82214+ if (*curr == NULL) {
82215+ *curr = role;
82216+ } else {
82217+ /* example:
82218+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
82219+ 2 -> 3
82220+ */
82221+ /* first check to see if we can already be reached via this slot */
82222+ tmp = *curr;
82223+ while (tmp && tmp != role)
82224+ tmp = tmp->next;
82225+ if (tmp == role) {
82226+ /* we don't need to add ourselves to this slot's chain */
82227+ return;
82228+ }
82229+ /* we need to add ourselves to this chain, two cases */
82230+ if (role->next == NULL) {
82231+ /* simple case, append the current chain to our role */
82232+ role->next = *curr;
82233+ *curr = role;
82234+ } else {
82235+ /* 1 -> 2 -> 3 -> 4
82236+ 2 -> 3 -> 4
82237+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
82238+ */
82239+ /* trickier case: walk our role's chain until we find
82240+ the role for the start of the current slot's chain */
82241+ tmp = role;
82242+ tmp2 = *curr;
82243+ while (tmp->next && tmp->next != tmp2)
82244+ tmp = tmp->next;
82245+ if (tmp->next == tmp2) {
82246+ /* from example above, we found 3, so just
82247+ replace this slot's chain with ours */
82248+ *curr = role;
82249+ } else {
82250+ /* we didn't find a subset of our role's chain
82251+ in the current slot's chain, so append their
82252+ chain to ours, and set us as the first role in
82253+ the slot's chain
82254+
82255+ we could fold this case with the case above,
82256+ but making it explicit for clarity
82257+ */
82258+ tmp->next = tmp2;
82259+ *curr = role;
82260+ }
82261+ }
82262+ }
82263+
82264+ return;
82265+}
82266+
82267+static void
82268+insert_acl_role_label(struct acl_role_label *role)
82269+{
82270+ int i;
82271+
82272+ if (polstate->role_list == NULL) {
82273+ polstate->role_list = role;
82274+ role->prev = NULL;
82275+ } else {
82276+ role->prev = polstate->role_list;
82277+ polstate->role_list = role;
82278+ }
82279+
82280+ /* used for hash chains */
82281+ role->next = NULL;
82282+
82283+ if (role->roletype & GR_ROLE_DOMAIN) {
82284+ for (i = 0; i < role->domain_child_num; i++)
82285+ __insert_acl_role_label(role, role->domain_children[i]);
82286+ } else
82287+ __insert_acl_role_label(role, role->uidgid);
82288+}
82289+
82290+static int
82291+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
82292+{
82293+ struct name_entry **curr, *nentry;
82294+ struct inodev_entry *ientry;
82295+ unsigned int len = strlen(name);
82296+ unsigned int key = full_name_hash(name, len);
82297+ unsigned int index = key % polstate->name_set.n_size;
82298+
82299+ curr = &polstate->name_set.n_hash[index];
82300+
82301+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
82302+ curr = &((*curr)->next);
82303+
82304+ if (*curr != NULL)
82305+ return 1;
82306+
82307+ nentry = acl_alloc(sizeof (struct name_entry));
82308+ if (nentry == NULL)
82309+ return 0;
82310+ ientry = acl_alloc(sizeof (struct inodev_entry));
82311+ if (ientry == NULL)
82312+ return 0;
82313+ ientry->nentry = nentry;
82314+
82315+ nentry->key = key;
82316+ nentry->name = name;
82317+ nentry->inode = inode;
82318+ nentry->device = device;
82319+ nentry->len = len;
82320+ nentry->deleted = deleted;
82321+
82322+ nentry->prev = NULL;
82323+ curr = &polstate->name_set.n_hash[index];
82324+ if (*curr != NULL)
82325+ (*curr)->prev = nentry;
82326+ nentry->next = *curr;
82327+ *curr = nentry;
82328+
82329+ /* insert us into the table searchable by inode/dev */
82330+ __insert_inodev_entry(polstate, ientry);
82331+
82332+ return 1;
82333+}
82334+
82335+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
82336+
82337+static void *
82338+create_table(__u32 * len, int elementsize)
82339+{
82340+ unsigned int table_sizes[] = {
82341+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
82342+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
82343+ 4194301, 8388593, 16777213, 33554393, 67108859
82344+ };
82345+ void *newtable = NULL;
82346+ unsigned int pwr = 0;
82347+
82348+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
82349+ table_sizes[pwr] <= *len)
82350+ pwr++;
82351+
82352+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
82353+ return newtable;
82354+
82355+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
82356+ newtable =
82357+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
82358+ else
82359+ newtable = vmalloc(table_sizes[pwr] * elementsize);
82360+
82361+ *len = table_sizes[pwr];
82362+
82363+ return newtable;
82364+}
82365+
82366+static int
82367+init_variables(const struct gr_arg *arg, bool reload)
82368+{
82369+ struct task_struct *reaper = init_pid_ns.child_reaper;
82370+ unsigned int stacksize;
82371+
82372+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
82373+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
82374+ polstate->name_set.n_size = arg->role_db.num_objects;
82375+ polstate->inodev_set.i_size = arg->role_db.num_objects;
82376+
82377+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
82378+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
82379+ return 1;
82380+
82381+ if (!reload) {
82382+ if (!gr_init_uidset())
82383+ return 1;
82384+ }
82385+
82386+ /* set up the stack that holds allocation info */
82387+
82388+ stacksize = arg->role_db.num_pointers + 5;
82389+
82390+ if (!acl_alloc_stack_init(stacksize))
82391+ return 1;
82392+
82393+ if (!reload) {
82394+ /* grab reference for the real root dentry and vfsmount */
82395+ get_fs_root(reaper->fs, &gr_real_root);
82396+
82397+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82398+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(gr_real_root.dentry), gr_real_root.dentry->d_inode->i_ino);
82399+#endif
82400+
82401+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82402+ if (fakefs_obj_rw == NULL)
82403+ return 1;
82404+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
82405+
82406+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
82407+ if (fakefs_obj_rwx == NULL)
82408+ return 1;
82409+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
82410+ }
82411+
82412+ polstate->subj_map_set.s_hash =
82413+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
82414+ polstate->acl_role_set.r_hash =
82415+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
82416+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
82417+ polstate->inodev_set.i_hash =
82418+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
82419+
82420+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
82421+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
82422+ return 1;
82423+
82424+ memset(polstate->subj_map_set.s_hash, 0,
82425+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
82426+ memset(polstate->acl_role_set.r_hash, 0,
82427+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
82428+ memset(polstate->name_set.n_hash, 0,
82429+ sizeof (struct name_entry *) * polstate->name_set.n_size);
82430+ memset(polstate->inodev_set.i_hash, 0,
82431+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
82432+
82433+ return 0;
82434+}
82435+
82436+/* free information not needed after startup
82437+ currently contains user->kernel pointer mappings for subjects
82438+*/
82439+
82440+static void
82441+free_init_variables(void)
82442+{
82443+ __u32 i;
82444+
82445+ if (polstate->subj_map_set.s_hash) {
82446+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
82447+ if (polstate->subj_map_set.s_hash[i]) {
82448+ kfree(polstate->subj_map_set.s_hash[i]);
82449+ polstate->subj_map_set.s_hash[i] = NULL;
82450+ }
82451+ }
82452+
82453+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
82454+ PAGE_SIZE)
82455+ kfree(polstate->subj_map_set.s_hash);
82456+ else
82457+ vfree(polstate->subj_map_set.s_hash);
82458+ }
82459+
82460+ return;
82461+}
82462+
82463+static void
82464+free_variables(bool reload)
82465+{
82466+ struct acl_subject_label *s;
82467+ struct acl_role_label *r;
82468+ struct task_struct *task, *task2;
82469+ unsigned int x;
82470+
82471+ if (!reload) {
82472+ gr_clear_learn_entries();
82473+
82474+ read_lock(&tasklist_lock);
82475+ do_each_thread(task2, task) {
82476+ task->acl_sp_role = 0;
82477+ task->acl_role_id = 0;
82478+ task->inherited = 0;
82479+ task->acl = NULL;
82480+ task->role = NULL;
82481+ } while_each_thread(task2, task);
82482+ read_unlock(&tasklist_lock);
82483+
82484+ kfree(fakefs_obj_rw);
82485+ fakefs_obj_rw = NULL;
82486+ kfree(fakefs_obj_rwx);
82487+ fakefs_obj_rwx = NULL;
82488+
82489+ /* release the reference to the real root dentry and vfsmount */
82490+ path_put(&gr_real_root);
82491+ memset(&gr_real_root, 0, sizeof(gr_real_root));
82492+ }
82493+
82494+ /* free all object hash tables */
82495+
82496+ FOR_EACH_ROLE_START(r)
82497+ if (r->subj_hash == NULL)
82498+ goto next_role;
82499+ FOR_EACH_SUBJECT_START(r, s, x)
82500+ if (s->obj_hash == NULL)
82501+ break;
82502+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82503+ kfree(s->obj_hash);
82504+ else
82505+ vfree(s->obj_hash);
82506+ FOR_EACH_SUBJECT_END(s, x)
82507+ FOR_EACH_NESTED_SUBJECT_START(r, s)
82508+ if (s->obj_hash == NULL)
82509+ break;
82510+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
82511+ kfree(s->obj_hash);
82512+ else
82513+ vfree(s->obj_hash);
82514+ FOR_EACH_NESTED_SUBJECT_END(s)
82515+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
82516+ kfree(r->subj_hash);
82517+ else
82518+ vfree(r->subj_hash);
82519+ r->subj_hash = NULL;
82520+next_role:
82521+ FOR_EACH_ROLE_END(r)
82522+
82523+ acl_free_all();
82524+
82525+ if (polstate->acl_role_set.r_hash) {
82526+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
82527+ PAGE_SIZE)
82528+ kfree(polstate->acl_role_set.r_hash);
82529+ else
82530+ vfree(polstate->acl_role_set.r_hash);
82531+ }
82532+ if (polstate->name_set.n_hash) {
82533+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
82534+ PAGE_SIZE)
82535+ kfree(polstate->name_set.n_hash);
82536+ else
82537+ vfree(polstate->name_set.n_hash);
82538+ }
82539+
82540+ if (polstate->inodev_set.i_hash) {
82541+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
82542+ PAGE_SIZE)
82543+ kfree(polstate->inodev_set.i_hash);
82544+ else
82545+ vfree(polstate->inodev_set.i_hash);
82546+ }
82547+
82548+ if (!reload)
82549+ gr_free_uidset();
82550+
82551+ memset(&polstate->name_set, 0, sizeof (struct name_db));
82552+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
82553+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
82554+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
82555+
82556+ polstate->default_role = NULL;
82557+ polstate->kernel_role = NULL;
82558+ polstate->role_list = NULL;
82559+
82560+ return;
82561+}
82562+
82563+static struct acl_subject_label *
82564+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
82565+
82566+static int alloc_and_copy_string(char **name, unsigned int maxlen)
82567+{
82568+ unsigned int len = strnlen_user(*name, maxlen);
82569+ char *tmp;
82570+
82571+ if (!len || len >= maxlen)
82572+ return -EINVAL;
82573+
82574+ if ((tmp = (char *) acl_alloc(len)) == NULL)
82575+ return -ENOMEM;
82576+
82577+ if (copy_from_user(tmp, *name, len))
82578+ return -EFAULT;
82579+
82580+ tmp[len-1] = '\0';
82581+ *name = tmp;
82582+
82583+ return 0;
82584+}
82585+
82586+static int
82587+copy_user_glob(struct acl_object_label *obj)
82588+{
82589+ struct acl_object_label *g_tmp, **guser;
82590+ int error;
82591+
82592+ if (obj->globbed == NULL)
82593+ return 0;
82594+
82595+ guser = &obj->globbed;
82596+ while (*guser) {
82597+ g_tmp = (struct acl_object_label *)
82598+ acl_alloc(sizeof (struct acl_object_label));
82599+ if (g_tmp == NULL)
82600+ return -ENOMEM;
82601+
82602+ if (copy_acl_object_label(g_tmp, *guser))
82603+ return -EFAULT;
82604+
82605+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
82606+ if (error)
82607+ return error;
82608+
82609+ *guser = g_tmp;
82610+ guser = &(g_tmp->next);
82611+ }
82612+
82613+ return 0;
82614+}
82615+
82616+static int
82617+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
82618+ struct acl_role_label *role)
82619+{
82620+ struct acl_object_label *o_tmp;
82621+ int ret;
82622+
82623+ while (userp) {
82624+ if ((o_tmp = (struct acl_object_label *)
82625+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
82626+ return -ENOMEM;
82627+
82628+ if (copy_acl_object_label(o_tmp, userp))
82629+ return -EFAULT;
82630+
82631+ userp = o_tmp->prev;
82632+
82633+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
82634+ if (ret)
82635+ return ret;
82636+
82637+ insert_acl_obj_label(o_tmp, subj);
82638+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
82639+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
82640+ return -ENOMEM;
82641+
82642+ ret = copy_user_glob(o_tmp);
82643+ if (ret)
82644+ return ret;
82645+
82646+ if (o_tmp->nested) {
82647+ int already_copied;
82648+
82649+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
82650+ if (IS_ERR(o_tmp->nested))
82651+ return PTR_ERR(o_tmp->nested);
82652+
82653+ /* insert into nested subject list if we haven't copied this one yet
82654+ to prevent duplicate entries */
82655+ if (!already_copied) {
82656+ o_tmp->nested->next = role->hash->first;
82657+ role->hash->first = o_tmp->nested;
82658+ }
82659+ }
82660+ }
82661+
82662+ return 0;
82663+}
82664+
82665+static __u32
82666+count_user_subjs(struct acl_subject_label *userp)
82667+{
82668+ struct acl_subject_label s_tmp;
82669+ __u32 num = 0;
82670+
82671+ while (userp) {
82672+ if (copy_acl_subject_label(&s_tmp, userp))
82673+ break;
82674+
82675+ userp = s_tmp.prev;
82676+ }
82677+
82678+ return num;
82679+}
82680+
82681+static int
82682+copy_user_allowedips(struct acl_role_label *rolep)
82683+{
82684+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
82685+
82686+ ruserip = rolep->allowed_ips;
82687+
82688+ while (ruserip) {
82689+ rlast = rtmp;
82690+
82691+ if ((rtmp = (struct role_allowed_ip *)
82692+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
82693+ return -ENOMEM;
82694+
82695+ if (copy_role_allowed_ip(rtmp, ruserip))
82696+ return -EFAULT;
82697+
82698+ ruserip = rtmp->prev;
82699+
82700+ if (!rlast) {
82701+ rtmp->prev = NULL;
82702+ rolep->allowed_ips = rtmp;
82703+ } else {
82704+ rlast->next = rtmp;
82705+ rtmp->prev = rlast;
82706+ }
82707+
82708+ if (!ruserip)
82709+ rtmp->next = NULL;
82710+ }
82711+
82712+ return 0;
82713+}
82714+
82715+static int
82716+copy_user_transitions(struct acl_role_label *rolep)
82717+{
82718+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
82719+ int error;
82720+
82721+ rusertp = rolep->transitions;
82722+
82723+ while (rusertp) {
82724+ rlast = rtmp;
82725+
82726+ if ((rtmp = (struct role_transition *)
82727+ acl_alloc(sizeof (struct role_transition))) == NULL)
82728+ return -ENOMEM;
82729+
82730+ if (copy_role_transition(rtmp, rusertp))
82731+ return -EFAULT;
82732+
82733+ rusertp = rtmp->prev;
82734+
82735+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
82736+ if (error)
82737+ return error;
82738+
82739+ if (!rlast) {
82740+ rtmp->prev = NULL;
82741+ rolep->transitions = rtmp;
82742+ } else {
82743+ rlast->next = rtmp;
82744+ rtmp->prev = rlast;
82745+ }
82746+
82747+ if (!rusertp)
82748+ rtmp->next = NULL;
82749+ }
82750+
82751+ return 0;
82752+}
82753+
82754+static __u32 count_user_objs(const struct acl_object_label __user *userp)
82755+{
82756+ struct acl_object_label o_tmp;
82757+ __u32 num = 0;
82758+
82759+ while (userp) {
82760+ if (copy_acl_object_label(&o_tmp, userp))
82761+ break;
82762+
82763+ userp = o_tmp.prev;
82764+ num++;
82765+ }
82766+
82767+ return num;
82768+}
82769+
82770+static struct acl_subject_label *
82771+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
82772+{
82773+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
82774+ __u32 num_objs;
82775+ struct acl_ip_label **i_tmp, *i_utmp2;
82776+ struct gr_hash_struct ghash;
82777+ struct subject_map *subjmap;
82778+ unsigned int i_num;
82779+ int err;
82780+
82781+ if (already_copied != NULL)
82782+ *already_copied = 0;
82783+
82784+ s_tmp = lookup_subject_map(userp);
82785+
82786+ /* we've already copied this subject into the kernel, just return
82787+ the reference to it, and don't copy it over again
82788+ */
82789+ if (s_tmp) {
82790+ if (already_copied != NULL)
82791+ *already_copied = 1;
82792+ return(s_tmp);
82793+ }
82794+
82795+ if ((s_tmp = (struct acl_subject_label *)
82796+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
82797+ return ERR_PTR(-ENOMEM);
82798+
82799+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
82800+ if (subjmap == NULL)
82801+ return ERR_PTR(-ENOMEM);
82802+
82803+ subjmap->user = userp;
82804+ subjmap->kernel = s_tmp;
82805+ insert_subj_map_entry(subjmap);
82806+
82807+ if (copy_acl_subject_label(s_tmp, userp))
82808+ return ERR_PTR(-EFAULT);
82809+
82810+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
82811+ if (err)
82812+ return ERR_PTR(err);
82813+
82814+ if (!strcmp(s_tmp->filename, "/"))
82815+ role->root_label = s_tmp;
82816+
82817+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
82818+ return ERR_PTR(-EFAULT);
82819+
82820+ /* copy user and group transition tables */
82821+
82822+ if (s_tmp->user_trans_num) {
82823+ uid_t *uidlist;
82824+
82825+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
82826+ if (uidlist == NULL)
82827+ return ERR_PTR(-ENOMEM);
82828+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
82829+ return ERR_PTR(-EFAULT);
82830+
82831+ s_tmp->user_transitions = uidlist;
82832+ }
82833+
82834+ if (s_tmp->group_trans_num) {
82835+ gid_t *gidlist;
82836+
82837+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
82838+ if (gidlist == NULL)
82839+ return ERR_PTR(-ENOMEM);
82840+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
82841+ return ERR_PTR(-EFAULT);
82842+
82843+ s_tmp->group_transitions = gidlist;
82844+ }
82845+
82846+ /* set up object hash table */
82847+ num_objs = count_user_objs(ghash.first);
82848+
82849+ s_tmp->obj_hash_size = num_objs;
82850+ s_tmp->obj_hash =
82851+ (struct acl_object_label **)
82852+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
82853+
82854+ if (!s_tmp->obj_hash)
82855+ return ERR_PTR(-ENOMEM);
82856+
82857+ memset(s_tmp->obj_hash, 0,
82858+ s_tmp->obj_hash_size *
82859+ sizeof (struct acl_object_label *));
82860+
82861+ /* add in objects */
82862+ err = copy_user_objs(ghash.first, s_tmp, role);
82863+
82864+ if (err)
82865+ return ERR_PTR(err);
82866+
82867+ /* set pointer for parent subject */
82868+ if (s_tmp->parent_subject) {
82869+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
82870+
82871+ if (IS_ERR(s_tmp2))
82872+ return s_tmp2;
82873+
82874+ s_tmp->parent_subject = s_tmp2;
82875+ }
82876+
82877+ /* add in ip acls */
82878+
82879+ if (!s_tmp->ip_num) {
82880+ s_tmp->ips = NULL;
82881+ goto insert;
82882+ }
82883+
82884+ i_tmp =
82885+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
82886+ sizeof (struct acl_ip_label *));
82887+
82888+ if (!i_tmp)
82889+ return ERR_PTR(-ENOMEM);
82890+
82891+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
82892+ *(i_tmp + i_num) =
82893+ (struct acl_ip_label *)
82894+ acl_alloc(sizeof (struct acl_ip_label));
82895+ if (!*(i_tmp + i_num))
82896+ return ERR_PTR(-ENOMEM);
82897+
82898+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
82899+ return ERR_PTR(-EFAULT);
82900+
82901+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
82902+ return ERR_PTR(-EFAULT);
82903+
82904+ if ((*(i_tmp + i_num))->iface == NULL)
82905+ continue;
82906+
82907+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
82908+ if (err)
82909+ return ERR_PTR(err);
82910+ }
82911+
82912+ s_tmp->ips = i_tmp;
82913+
82914+insert:
82915+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
82916+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
82917+ return ERR_PTR(-ENOMEM);
82918+
82919+ return s_tmp;
82920+}
82921+
82922+static int
82923+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
82924+{
82925+ struct acl_subject_label s_pre;
82926+ struct acl_subject_label * ret;
82927+ int err;
82928+
82929+ while (userp) {
82930+ if (copy_acl_subject_label(&s_pre, userp))
82931+ return -EFAULT;
82932+
82933+ ret = do_copy_user_subj(userp, role, NULL);
82934+
82935+ err = PTR_ERR(ret);
82936+ if (IS_ERR(ret))
82937+ return err;
82938+
82939+ insert_acl_subj_label(ret, role);
82940+
82941+ userp = s_pre.prev;
82942+ }
82943+
82944+ return 0;
82945+}
82946+
82947+static int
82948+copy_user_acl(struct gr_arg *arg)
82949+{
82950+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
82951+ struct acl_subject_label *subj_list;
82952+ struct sprole_pw *sptmp;
82953+ struct gr_hash_struct *ghash;
82954+ uid_t *domainlist;
82955+ unsigned int r_num;
82956+ int err = 0;
82957+ __u16 i;
82958+ __u32 num_subjs;
82959+
82960+ /* we need a default and kernel role */
82961+ if (arg->role_db.num_roles < 2)
82962+ return -EINVAL;
82963+
82964+ /* copy special role authentication info from userspace */
82965+
82966+ polstate->num_sprole_pws = arg->num_sprole_pws;
82967+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
82968+
82969+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
82970+ return -ENOMEM;
82971+
82972+ for (i = 0; i < polstate->num_sprole_pws; i++) {
82973+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
82974+ if (!sptmp)
82975+ return -ENOMEM;
82976+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
82977+ return -EFAULT;
82978+
82979+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
82980+ if (err)
82981+ return err;
82982+
82983+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
82984+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
82985+#endif
82986+
82987+ polstate->acl_special_roles[i] = sptmp;
82988+ }
82989+
82990+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
82991+
82992+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
82993+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
82994+
82995+ if (!r_tmp)
82996+ return -ENOMEM;
82997+
82998+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
82999+ return -EFAULT;
83000+
83001+ if (copy_acl_role_label(r_tmp, r_utmp2))
83002+ return -EFAULT;
83003+
83004+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
83005+ if (err)
83006+ return err;
83007+
83008+ if (!strcmp(r_tmp->rolename, "default")
83009+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
83010+ polstate->default_role = r_tmp;
83011+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
83012+ polstate->kernel_role = r_tmp;
83013+ }
83014+
83015+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
83016+ return -ENOMEM;
83017+
83018+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
83019+ return -EFAULT;
83020+
83021+ r_tmp->hash = ghash;
83022+
83023+ num_subjs = count_user_subjs(r_tmp->hash->first);
83024+
83025+ r_tmp->subj_hash_size = num_subjs;
83026+ r_tmp->subj_hash =
83027+ (struct acl_subject_label **)
83028+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
83029+
83030+ if (!r_tmp->subj_hash)
83031+ return -ENOMEM;
83032+
83033+ err = copy_user_allowedips(r_tmp);
83034+ if (err)
83035+ return err;
83036+
83037+ /* copy domain info */
83038+ if (r_tmp->domain_children != NULL) {
83039+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
83040+ if (domainlist == NULL)
83041+ return -ENOMEM;
83042+
83043+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
83044+ return -EFAULT;
83045+
83046+ r_tmp->domain_children = domainlist;
83047+ }
83048+
83049+ err = copy_user_transitions(r_tmp);
83050+ if (err)
83051+ return err;
83052+
83053+ memset(r_tmp->subj_hash, 0,
83054+ r_tmp->subj_hash_size *
83055+ sizeof (struct acl_subject_label *));
83056+
83057+ /* acquire the list of subjects, then NULL out
83058+ the list prior to parsing the subjects for this role,
83059+ as during this parsing the list is replaced with a list
83060+ of *nested* subjects for the role
83061+ */
83062+ subj_list = r_tmp->hash->first;
83063+
83064+ /* set nested subject list to null */
83065+ r_tmp->hash->first = NULL;
83066+
83067+ err = copy_user_subjs(subj_list, r_tmp);
83068+
83069+ if (err)
83070+ return err;
83071+
83072+ insert_acl_role_label(r_tmp);
83073+ }
83074+
83075+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
83076+ return -EINVAL;
83077+
83078+ return err;
83079+}
83080+
83081+static int gracl_reload_apply_policies(void *reload)
83082+{
83083+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
83084+ struct task_struct *task, *task2;
83085+ struct acl_role_label *role, *rtmp;
83086+ struct acl_subject_label *subj;
83087+ const struct cred *cred;
83088+ int role_applied;
83089+ int ret = 0;
83090+
83091+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
83092+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
83093+
83094+ /* first make sure we'll be able to apply the new policy cleanly */
83095+ do_each_thread(task2, task) {
83096+ if (task->exec_file == NULL)
83097+ continue;
83098+ role_applied = 0;
83099+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83100+ /* preserve special roles */
83101+ FOR_EACH_ROLE_START(role)
83102+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83103+ rtmp = task->role;
83104+ task->role = role;
83105+ role_applied = 1;
83106+ break;
83107+ }
83108+ FOR_EACH_ROLE_END(role)
83109+ }
83110+ if (!role_applied) {
83111+ cred = __task_cred(task);
83112+ rtmp = task->role;
83113+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83114+ }
83115+ /* this handles non-nested inherited subjects, nested subjects will still
83116+ be dropped currently */
83117+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83118+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
83119+ /* change the role back so that we've made no modifications to the policy */
83120+ task->role = rtmp;
83121+
83122+ if (subj == NULL || task->tmpacl == NULL) {
83123+ ret = -EINVAL;
83124+ goto out;
83125+ }
83126+ } while_each_thread(task2, task);
83127+
83128+ /* now actually apply the policy */
83129+
83130+ do_each_thread(task2, task) {
83131+ if (task->exec_file) {
83132+ role_applied = 0;
83133+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
83134+ /* preserve special roles */
83135+ FOR_EACH_ROLE_START(role)
83136+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
83137+ task->role = role;
83138+ role_applied = 1;
83139+ break;
83140+ }
83141+ FOR_EACH_ROLE_END(role)
83142+ }
83143+ if (!role_applied) {
83144+ cred = __task_cred(task);
83145+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83146+ }
83147+ /* this handles non-nested inherited subjects, nested subjects will still
83148+ be dropped currently */
83149+ if (!reload_state->oldmode && task->inherited)
83150+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
83151+ else {
83152+ /* looked up and tagged to the task previously */
83153+ subj = task->tmpacl;
83154+ }
83155+ /* subj will be non-null */
83156+ __gr_apply_subject_to_task(polstate, task, subj);
83157+ if (reload_state->oldmode) {
83158+ task->acl_role_id = 0;
83159+ task->acl_sp_role = 0;
83160+ task->inherited = 0;
83161+ }
83162+ } else {
83163+ // it's a kernel process
83164+ task->role = polstate->kernel_role;
83165+ task->acl = polstate->kernel_role->root_label;
83166+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83167+ task->acl->mode &= ~GR_PROCFIND;
83168+#endif
83169+ }
83170+ } while_each_thread(task2, task);
83171+
83172+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
83173+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
83174+
83175+out:
83176+
83177+ return ret;
83178+}
83179+
83180+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
83181+{
83182+ struct gr_reload_state new_reload_state = { };
83183+ int err;
83184+
83185+ new_reload_state.oldpolicy_ptr = polstate;
83186+ new_reload_state.oldalloc_ptr = current_alloc_state;
83187+ new_reload_state.oldmode = oldmode;
83188+
83189+ current_alloc_state = &new_reload_state.newalloc;
83190+ polstate = &new_reload_state.newpolicy;
83191+
83192+ /* everything relevant is now saved off, copy in the new policy */
83193+ if (init_variables(args, true)) {
83194+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83195+ err = -ENOMEM;
83196+ goto error;
83197+ }
83198+
83199+ err = copy_user_acl(args);
83200+ free_init_variables();
83201+ if (err)
83202+ goto error;
83203+ /* the new policy is copied in, with the old policy available via saved_state
83204+ first go through applying roles, making sure to preserve special roles
83205+ then apply new subjects, making sure to preserve inherited and nested subjects,
83206+ though currently only inherited subjects will be preserved
83207+ */
83208+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
83209+ if (err)
83210+ goto error;
83211+
83212+ /* we've now applied the new policy, so restore the old policy state to free it */
83213+ polstate = &new_reload_state.oldpolicy;
83214+ current_alloc_state = &new_reload_state.oldalloc;
83215+ free_variables(true);
83216+
83217+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
83218+ to running_polstate/current_alloc_state inside stop_machine
83219+ */
83220+ err = 0;
83221+ goto out;
83222+error:
83223+ /* on error of loading the new policy, we'll just keep the previous
83224+ policy set around
83225+ */
83226+ free_variables(true);
83227+
83228+ /* doesn't affect runtime, but maintains consistent state */
83229+out:
83230+ polstate = new_reload_state.oldpolicy_ptr;
83231+ current_alloc_state = new_reload_state.oldalloc_ptr;
83232+
83233+ return err;
83234+}
83235+
83236+static int
83237+gracl_init(struct gr_arg *args)
83238+{
83239+ int error = 0;
83240+
83241+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
83242+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
83243+
83244+ if (init_variables(args, false)) {
83245+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
83246+ error = -ENOMEM;
83247+ goto out;
83248+ }
83249+
83250+ error = copy_user_acl(args);
83251+ free_init_variables();
83252+ if (error)
83253+ goto out;
83254+
83255+ error = gr_set_acls(0);
83256+ if (error)
83257+ goto out;
83258+
83259+ gr_enable_rbac_system();
83260+
83261+ return 0;
83262+
83263+out:
83264+ free_variables(false);
83265+ return error;
83266+}
83267+
83268+static int
83269+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
83270+ unsigned char **sum)
83271+{
83272+ struct acl_role_label *r;
83273+ struct role_allowed_ip *ipp;
83274+ struct role_transition *trans;
83275+ unsigned int i;
83276+ int found = 0;
83277+ u32 curr_ip = current->signal->curr_ip;
83278+
83279+ current->signal->saved_ip = curr_ip;
83280+
83281+ /* check transition table */
83282+
83283+ for (trans = current->role->transitions; trans; trans = trans->next) {
83284+ if (!strcmp(rolename, trans->rolename)) {
83285+ found = 1;
83286+ break;
83287+ }
83288+ }
83289+
83290+ if (!found)
83291+ return 0;
83292+
83293+ /* handle special roles that do not require authentication
83294+ and check ip */
83295+
83296+ FOR_EACH_ROLE_START(r)
83297+ if (!strcmp(rolename, r->rolename) &&
83298+ (r->roletype & GR_ROLE_SPECIAL)) {
83299+ found = 0;
83300+ if (r->allowed_ips != NULL) {
83301+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
83302+ if ((ntohl(curr_ip) & ipp->netmask) ==
83303+ (ntohl(ipp->addr) & ipp->netmask))
83304+ found = 1;
83305+ }
83306+ } else
83307+ found = 2;
83308+ if (!found)
83309+ return 0;
83310+
83311+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
83312+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
83313+ *salt = NULL;
83314+ *sum = NULL;
83315+ return 1;
83316+ }
83317+ }
83318+ FOR_EACH_ROLE_END(r)
83319+
83320+ for (i = 0; i < polstate->num_sprole_pws; i++) {
83321+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
83322+ *salt = polstate->acl_special_roles[i]->salt;
83323+ *sum = polstate->acl_special_roles[i]->sum;
83324+ return 1;
83325+ }
83326+ }
83327+
83328+ return 0;
83329+}
83330+
83331+int gr_check_secure_terminal(struct task_struct *task)
83332+{
83333+ struct task_struct *p, *p2, *p3;
83334+ struct files_struct *files;
83335+ struct fdtable *fdt;
83336+ struct file *our_file = NULL, *file;
83337+ int i;
83338+
83339+ if (task->signal->tty == NULL)
83340+ return 1;
83341+
83342+ files = get_files_struct(task);
83343+ if (files != NULL) {
83344+ rcu_read_lock();
83345+ fdt = files_fdtable(files);
83346+ for (i=0; i < fdt->max_fds; i++) {
83347+ file = fcheck_files(files, i);
83348+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
83349+ get_file(file);
83350+ our_file = file;
83351+ }
83352+ }
83353+ rcu_read_unlock();
83354+ put_files_struct(files);
83355+ }
83356+
83357+ if (our_file == NULL)
83358+ return 1;
83359+
83360+ read_lock(&tasklist_lock);
83361+ do_each_thread(p2, p) {
83362+ files = get_files_struct(p);
83363+ if (files == NULL ||
83364+ (p->signal && p->signal->tty == task->signal->tty)) {
83365+ if (files != NULL)
83366+ put_files_struct(files);
83367+ continue;
83368+ }
83369+ rcu_read_lock();
83370+ fdt = files_fdtable(files);
83371+ for (i=0; i < fdt->max_fds; i++) {
83372+ file = fcheck_files(files, i);
83373+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
83374+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
83375+ p3 = task;
83376+ while (task_pid_nr(p3) > 0) {
83377+ if (p3 == p)
83378+ break;
83379+ p3 = p3->real_parent;
83380+ }
83381+ if (p3 == p)
83382+ break;
83383+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
83384+ gr_handle_alertkill(p);
83385+ rcu_read_unlock();
83386+ put_files_struct(files);
83387+ read_unlock(&tasklist_lock);
83388+ fput(our_file);
83389+ return 0;
83390+ }
83391+ }
83392+ rcu_read_unlock();
83393+ put_files_struct(files);
83394+ } while_each_thread(p2, p);
83395+ read_unlock(&tasklist_lock);
83396+
83397+ fput(our_file);
83398+ return 1;
83399+}
83400+
83401+ssize_t
83402+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
83403+{
83404+ struct gr_arg_wrapper uwrap;
83405+ unsigned char *sprole_salt = NULL;
83406+ unsigned char *sprole_sum = NULL;
83407+ int error = 0;
83408+ int error2 = 0;
83409+ size_t req_count = 0;
83410+ unsigned char oldmode = 0;
83411+
83412+ mutex_lock(&gr_dev_mutex);
83413+
83414+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
83415+ error = -EPERM;
83416+ goto out;
83417+ }
83418+
83419+#ifdef CONFIG_COMPAT
83420+ pax_open_kernel();
83421+ if (is_compat_task()) {
83422+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
83423+ copy_gr_arg = &copy_gr_arg_compat;
83424+ copy_acl_object_label = &copy_acl_object_label_compat;
83425+ copy_acl_subject_label = &copy_acl_subject_label_compat;
83426+ copy_acl_role_label = &copy_acl_role_label_compat;
83427+ copy_acl_ip_label = &copy_acl_ip_label_compat;
83428+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
83429+ copy_role_transition = &copy_role_transition_compat;
83430+ copy_sprole_pw = &copy_sprole_pw_compat;
83431+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
83432+ copy_pointer_from_array = &copy_pointer_from_array_compat;
83433+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
83434+ } else {
83435+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
83436+ copy_gr_arg = &copy_gr_arg_normal;
83437+ copy_acl_object_label = &copy_acl_object_label_normal;
83438+ copy_acl_subject_label = &copy_acl_subject_label_normal;
83439+ copy_acl_role_label = &copy_acl_role_label_normal;
83440+ copy_acl_ip_label = &copy_acl_ip_label_normal;
83441+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
83442+ copy_role_transition = &copy_role_transition_normal;
83443+ copy_sprole_pw = &copy_sprole_pw_normal;
83444+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
83445+ copy_pointer_from_array = &copy_pointer_from_array_normal;
83446+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
83447+ }
83448+ pax_close_kernel();
83449+#endif
83450+
83451+ req_count = get_gr_arg_wrapper_size();
83452+
83453+ if (count != req_count) {
83454+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
83455+ error = -EINVAL;
83456+ goto out;
83457+ }
83458+
83459+
83460+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
83461+ gr_auth_expires = 0;
83462+ gr_auth_attempts = 0;
83463+ }
83464+
83465+ error = copy_gr_arg_wrapper(buf, &uwrap);
83466+ if (error)
83467+ goto out;
83468+
83469+ error = copy_gr_arg(uwrap.arg, gr_usermode);
83470+ if (error)
83471+ goto out;
83472+
83473+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83474+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83475+ time_after(gr_auth_expires, get_seconds())) {
83476+ error = -EBUSY;
83477+ goto out;
83478+ }
83479+
83480+ /* if non-root trying to do anything other than use a special role,
83481+ do not attempt authentication, do not count towards authentication
83482+ locking
83483+ */
83484+
83485+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
83486+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
83487+ gr_is_global_nonroot(current_uid())) {
83488+ error = -EPERM;
83489+ goto out;
83490+ }
83491+
83492+ /* ensure pw and special role name are null terminated */
83493+
83494+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
83495+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
83496+
83497+ /* Okay.
83498+ * We have our enough of the argument structure..(we have yet
83499+ * to copy_from_user the tables themselves) . Copy the tables
83500+ * only if we need them, i.e. for loading operations. */
83501+
83502+ switch (gr_usermode->mode) {
83503+ case GR_STATUS:
83504+ if (gr_acl_is_enabled()) {
83505+ error = 1;
83506+ if (!gr_check_secure_terminal(current))
83507+ error = 3;
83508+ } else
83509+ error = 2;
83510+ goto out;
83511+ case GR_SHUTDOWN:
83512+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83513+ stop_machine(gr_rbac_disable, NULL, NULL);
83514+ free_variables(false);
83515+ memset(gr_usermode, 0, sizeof(struct gr_arg));
83516+ memset(gr_system_salt, 0, GR_SALT_LEN);
83517+ memset(gr_system_sum, 0, GR_SHA_LEN);
83518+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
83519+ } else if (gr_acl_is_enabled()) {
83520+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
83521+ error = -EPERM;
83522+ } else {
83523+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
83524+ error = -EAGAIN;
83525+ }
83526+ break;
83527+ case GR_ENABLE:
83528+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
83529+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
83530+ else {
83531+ if (gr_acl_is_enabled())
83532+ error = -EAGAIN;
83533+ else
83534+ error = error2;
83535+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
83536+ }
83537+ break;
83538+ case GR_OLDRELOAD:
83539+ oldmode = 1;
83540+ case GR_RELOAD:
83541+ if (!gr_acl_is_enabled()) {
83542+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
83543+ error = -EAGAIN;
83544+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83545+ error2 = gracl_reload(gr_usermode, oldmode);
83546+ if (!error2)
83547+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
83548+ else {
83549+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83550+ error = error2;
83551+ }
83552+ } else {
83553+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
83554+ error = -EPERM;
83555+ }
83556+ break;
83557+ case GR_SEGVMOD:
83558+ if (unlikely(!gr_acl_is_enabled())) {
83559+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
83560+ error = -EAGAIN;
83561+ break;
83562+ }
83563+
83564+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
83565+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
83566+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
83567+ struct acl_subject_label *segvacl;
83568+ segvacl =
83569+ lookup_acl_subj_label(gr_usermode->segv_inode,
83570+ gr_usermode->segv_device,
83571+ current->role);
83572+ if (segvacl) {
83573+ segvacl->crashes = 0;
83574+ segvacl->expires = 0;
83575+ }
83576+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
83577+ gr_remove_uid(gr_usermode->segv_uid);
83578+ }
83579+ } else {
83580+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
83581+ error = -EPERM;
83582+ }
83583+ break;
83584+ case GR_SPROLE:
83585+ case GR_SPROLEPAM:
83586+ if (unlikely(!gr_acl_is_enabled())) {
83587+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
83588+ error = -EAGAIN;
83589+ break;
83590+ }
83591+
83592+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
83593+ current->role->expires = 0;
83594+ current->role->auth_attempts = 0;
83595+ }
83596+
83597+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
83598+ time_after(current->role->expires, get_seconds())) {
83599+ error = -EBUSY;
83600+ goto out;
83601+ }
83602+
83603+ if (lookup_special_role_auth
83604+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
83605+ && ((!sprole_salt && !sprole_sum)
83606+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
83607+ char *p = "";
83608+ assign_special_role(gr_usermode->sp_role);
83609+ read_lock(&tasklist_lock);
83610+ if (current->real_parent)
83611+ p = current->real_parent->role->rolename;
83612+ read_unlock(&tasklist_lock);
83613+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
83614+ p, acl_sp_role_value);
83615+ } else {
83616+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
83617+ error = -EPERM;
83618+ if(!(current->role->auth_attempts++))
83619+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83620+
83621+ goto out;
83622+ }
83623+ break;
83624+ case GR_UNSPROLE:
83625+ if (unlikely(!gr_acl_is_enabled())) {
83626+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
83627+ error = -EAGAIN;
83628+ break;
83629+ }
83630+
83631+ if (current->role->roletype & GR_ROLE_SPECIAL) {
83632+ char *p = "";
83633+ int i = 0;
83634+
83635+ read_lock(&tasklist_lock);
83636+ if (current->real_parent) {
83637+ p = current->real_parent->role->rolename;
83638+ i = current->real_parent->acl_role_id;
83639+ }
83640+ read_unlock(&tasklist_lock);
83641+
83642+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
83643+ gr_set_acls(1);
83644+ } else {
83645+ error = -EPERM;
83646+ goto out;
83647+ }
83648+ break;
83649+ default:
83650+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
83651+ error = -EINVAL;
83652+ break;
83653+ }
83654+
83655+ if (error != -EPERM)
83656+ goto out;
83657+
83658+ if(!(gr_auth_attempts++))
83659+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
83660+
83661+ out:
83662+ mutex_unlock(&gr_dev_mutex);
83663+
83664+ if (!error)
83665+ error = req_count;
83666+
83667+ return error;
83668+}
83669+
83670+int
83671+gr_set_acls(const int type)
83672+{
83673+ struct task_struct *task, *task2;
83674+ struct acl_role_label *role = current->role;
83675+ struct acl_subject_label *subj;
83676+ __u16 acl_role_id = current->acl_role_id;
83677+ const struct cred *cred;
83678+ int ret;
83679+
83680+ rcu_read_lock();
83681+ read_lock(&tasklist_lock);
83682+ read_lock(&grsec_exec_file_lock);
83683+ do_each_thread(task2, task) {
83684+ /* check to see if we're called from the exit handler,
83685+ if so, only replace ACLs that have inherited the admin
83686+ ACL */
83687+
83688+ if (type && (task->role != role ||
83689+ task->acl_role_id != acl_role_id))
83690+ continue;
83691+
83692+ task->acl_role_id = 0;
83693+ task->acl_sp_role = 0;
83694+ task->inherited = 0;
83695+
83696+ if (task->exec_file) {
83697+ cred = __task_cred(task);
83698+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
83699+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
83700+ if (subj == NULL) {
83701+ ret = -EINVAL;
83702+ read_unlock(&grsec_exec_file_lock);
83703+ read_unlock(&tasklist_lock);
83704+ rcu_read_unlock();
83705+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
83706+ return ret;
83707+ }
83708+ __gr_apply_subject_to_task(polstate, task, subj);
83709+ } else {
83710+ // it's a kernel process
83711+ task->role = polstate->kernel_role;
83712+ task->acl = polstate->kernel_role->root_label;
83713+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
83714+ task->acl->mode &= ~GR_PROCFIND;
83715+#endif
83716+ }
83717+ } while_each_thread(task2, task);
83718+ read_unlock(&grsec_exec_file_lock);
83719+ read_unlock(&tasklist_lock);
83720+ rcu_read_unlock();
83721+
83722+ return 0;
83723+}
83724diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
83725new file mode 100644
83726index 0000000..39645c9
83727--- /dev/null
83728+++ b/grsecurity/gracl_res.c
83729@@ -0,0 +1,68 @@
83730+#include <linux/kernel.h>
83731+#include <linux/sched.h>
83732+#include <linux/gracl.h>
83733+#include <linux/grinternal.h>
83734+
83735+static const char *restab_log[] = {
83736+ [RLIMIT_CPU] = "RLIMIT_CPU",
83737+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
83738+ [RLIMIT_DATA] = "RLIMIT_DATA",
83739+ [RLIMIT_STACK] = "RLIMIT_STACK",
83740+ [RLIMIT_CORE] = "RLIMIT_CORE",
83741+ [RLIMIT_RSS] = "RLIMIT_RSS",
83742+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
83743+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
83744+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
83745+ [RLIMIT_AS] = "RLIMIT_AS",
83746+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
83747+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
83748+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
83749+ [RLIMIT_NICE] = "RLIMIT_NICE",
83750+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
83751+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
83752+ [GR_CRASH_RES] = "RLIMIT_CRASH"
83753+};
83754+
83755+void
83756+gr_log_resource(const struct task_struct *task,
83757+ const int res, const unsigned long wanted, const int gt)
83758+{
83759+ const struct cred *cred;
83760+ unsigned long rlim;
83761+
83762+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
83763+ return;
83764+
83765+ // not yet supported resource
83766+ if (unlikely(!restab_log[res]))
83767+ return;
83768+
83769+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
83770+ rlim = task_rlimit_max(task, res);
83771+ else
83772+ rlim = task_rlimit(task, res);
83773+
83774+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
83775+ return;
83776+
83777+ rcu_read_lock();
83778+ cred = __task_cred(task);
83779+
83780+ if (res == RLIMIT_NPROC &&
83781+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
83782+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
83783+ goto out_rcu_unlock;
83784+ else if (res == RLIMIT_MEMLOCK &&
83785+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
83786+ goto out_rcu_unlock;
83787+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
83788+ goto out_rcu_unlock;
83789+ rcu_read_unlock();
83790+
83791+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
83792+
83793+ return;
83794+out_rcu_unlock:
83795+ rcu_read_unlock();
83796+ return;
83797+}
83798diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
83799new file mode 100644
83800index 0000000..35d9e65
83801--- /dev/null
83802+++ b/grsecurity/gracl_segv.c
83803@@ -0,0 +1,324 @@
83804+#include <linux/kernel.h>
83805+#include <linux/mm.h>
83806+#include <asm/uaccess.h>
83807+#include <asm/errno.h>
83808+#include <asm/mman.h>
83809+#include <net/sock.h>
83810+#include <linux/file.h>
83811+#include <linux/fs.h>
83812+#include <linux/net.h>
83813+#include <linux/in.h>
83814+#include <linux/slab.h>
83815+#include <linux/types.h>
83816+#include <linux/sched.h>
83817+#include <linux/timer.h>
83818+#include <linux/gracl.h>
83819+#include <linux/grsecurity.h>
83820+#include <linux/grinternal.h>
83821+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83822+#include <linux/magic.h>
83823+#include <linux/pagemap.h>
83824+#include "../fs/btrfs/async-thread.h"
83825+#include "../fs/btrfs/ctree.h"
83826+#include "../fs/btrfs/btrfs_inode.h"
83827+#endif
83828+
83829+static struct crash_uid *uid_set;
83830+static unsigned short uid_used;
83831+static DEFINE_SPINLOCK(gr_uid_lock);
83832+extern rwlock_t gr_inode_lock;
83833+extern struct acl_subject_label *
83834+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
83835+ struct acl_role_label *role);
83836+
83837+static inline dev_t __get_dev(const struct dentry *dentry)
83838+{
83839+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83840+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83841+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
83842+ else
83843+#endif
83844+ return dentry->d_sb->s_dev;
83845+}
83846+
83847+static inline u64 __get_ino(const struct dentry *dentry)
83848+{
83849+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83850+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83851+ return btrfs_ino(dentry->d_inode);
83852+ else
83853+#endif
83854+ return dentry->d_inode->i_ino;
83855+}
83856+
83857+int
83858+gr_init_uidset(void)
83859+{
83860+ uid_set =
83861+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
83862+ uid_used = 0;
83863+
83864+ return uid_set ? 1 : 0;
83865+}
83866+
83867+void
83868+gr_free_uidset(void)
83869+{
83870+ if (uid_set) {
83871+ struct crash_uid *tmpset;
83872+ spin_lock(&gr_uid_lock);
83873+ tmpset = uid_set;
83874+ uid_set = NULL;
83875+ uid_used = 0;
83876+ spin_unlock(&gr_uid_lock);
83877+ if (tmpset)
83878+ kfree(tmpset);
83879+ }
83880+
83881+ return;
83882+}
83883+
83884+int
83885+gr_find_uid(const uid_t uid)
83886+{
83887+ struct crash_uid *tmp = uid_set;
83888+ uid_t buid;
83889+ int low = 0, high = uid_used - 1, mid;
83890+
83891+ while (high >= low) {
83892+ mid = (low + high) >> 1;
83893+ buid = tmp[mid].uid;
83894+ if (buid == uid)
83895+ return mid;
83896+ if (buid > uid)
83897+ high = mid - 1;
83898+ if (buid < uid)
83899+ low = mid + 1;
83900+ }
83901+
83902+ return -1;
83903+}
83904+
83905+static void
83906+gr_insertsort(void)
83907+{
83908+ unsigned short i, j;
83909+ struct crash_uid index;
83910+
83911+ for (i = 1; i < uid_used; i++) {
83912+ index = uid_set[i];
83913+ j = i;
83914+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
83915+ uid_set[j] = uid_set[j - 1];
83916+ j--;
83917+ }
83918+ uid_set[j] = index;
83919+ }
83920+
83921+ return;
83922+}
83923+
83924+static void
83925+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
83926+{
83927+ int loc;
83928+ uid_t uid = GR_GLOBAL_UID(kuid);
83929+
83930+ if (uid_used == GR_UIDTABLE_MAX)
83931+ return;
83932+
83933+ loc = gr_find_uid(uid);
83934+
83935+ if (loc >= 0) {
83936+ uid_set[loc].expires = expires;
83937+ return;
83938+ }
83939+
83940+ uid_set[uid_used].uid = uid;
83941+ uid_set[uid_used].expires = expires;
83942+ uid_used++;
83943+
83944+ gr_insertsort();
83945+
83946+ return;
83947+}
83948+
83949+void
83950+gr_remove_uid(const unsigned short loc)
83951+{
83952+ unsigned short i;
83953+
83954+ for (i = loc + 1; i < uid_used; i++)
83955+ uid_set[i - 1] = uid_set[i];
83956+
83957+ uid_used--;
83958+
83959+ return;
83960+}
83961+
83962+int
83963+gr_check_crash_uid(const kuid_t kuid)
83964+{
83965+ int loc;
83966+ int ret = 0;
83967+ uid_t uid;
83968+
83969+ if (unlikely(!gr_acl_is_enabled()))
83970+ return 0;
83971+
83972+ uid = GR_GLOBAL_UID(kuid);
83973+
83974+ spin_lock(&gr_uid_lock);
83975+ loc = gr_find_uid(uid);
83976+
83977+ if (loc < 0)
83978+ goto out_unlock;
83979+
83980+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
83981+ gr_remove_uid(loc);
83982+ else
83983+ ret = 1;
83984+
83985+out_unlock:
83986+ spin_unlock(&gr_uid_lock);
83987+ return ret;
83988+}
83989+
83990+static int
83991+proc_is_setxid(const struct cred *cred)
83992+{
83993+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
83994+ !uid_eq(cred->uid, cred->fsuid))
83995+ return 1;
83996+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
83997+ !gid_eq(cred->gid, cred->fsgid))
83998+ return 1;
83999+
84000+ return 0;
84001+}
84002+
84003+extern int gr_fake_force_sig(int sig, struct task_struct *t);
84004+
84005+void
84006+gr_handle_crash(struct task_struct *task, const int sig)
84007+{
84008+ struct acl_subject_label *curr;
84009+ struct task_struct *tsk, *tsk2;
84010+ const struct cred *cred;
84011+ const struct cred *cred2;
84012+
84013+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
84014+ return;
84015+
84016+ if (unlikely(!gr_acl_is_enabled()))
84017+ return;
84018+
84019+ curr = task->acl;
84020+
84021+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
84022+ return;
84023+
84024+ if (time_before_eq(curr->expires, get_seconds())) {
84025+ curr->expires = 0;
84026+ curr->crashes = 0;
84027+ }
84028+
84029+ curr->crashes++;
84030+
84031+ if (!curr->expires)
84032+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
84033+
84034+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84035+ time_after(curr->expires, get_seconds())) {
84036+ rcu_read_lock();
84037+ cred = __task_cred(task);
84038+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
84039+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84040+ spin_lock(&gr_uid_lock);
84041+ gr_insert_uid(cred->uid, curr->expires);
84042+ spin_unlock(&gr_uid_lock);
84043+ curr->expires = 0;
84044+ curr->crashes = 0;
84045+ read_lock(&tasklist_lock);
84046+ do_each_thread(tsk2, tsk) {
84047+ cred2 = __task_cred(tsk);
84048+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
84049+ gr_fake_force_sig(SIGKILL, tsk);
84050+ } while_each_thread(tsk2, tsk);
84051+ read_unlock(&tasklist_lock);
84052+ } else {
84053+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
84054+ read_lock(&tasklist_lock);
84055+ read_lock(&grsec_exec_file_lock);
84056+ do_each_thread(tsk2, tsk) {
84057+ if (likely(tsk != task)) {
84058+ // if this thread has the same subject as the one that triggered
84059+ // RES_CRASH and it's the same binary, kill it
84060+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
84061+ gr_fake_force_sig(SIGKILL, tsk);
84062+ }
84063+ } while_each_thread(tsk2, tsk);
84064+ read_unlock(&grsec_exec_file_lock);
84065+ read_unlock(&tasklist_lock);
84066+ }
84067+ rcu_read_unlock();
84068+ }
84069+
84070+ return;
84071+}
84072+
84073+int
84074+gr_check_crash_exec(const struct file *filp)
84075+{
84076+ struct acl_subject_label *curr;
84077+ struct dentry *dentry;
84078+
84079+ if (unlikely(!gr_acl_is_enabled()))
84080+ return 0;
84081+
84082+ read_lock(&gr_inode_lock);
84083+ dentry = filp->f_path.dentry;
84084+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
84085+ current->role);
84086+ read_unlock(&gr_inode_lock);
84087+
84088+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
84089+ (!curr->crashes && !curr->expires))
84090+ return 0;
84091+
84092+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
84093+ time_after(curr->expires, get_seconds()))
84094+ return 1;
84095+ else if (time_before_eq(curr->expires, get_seconds())) {
84096+ curr->crashes = 0;
84097+ curr->expires = 0;
84098+ }
84099+
84100+ return 0;
84101+}
84102+
84103+void
84104+gr_handle_alertkill(struct task_struct *task)
84105+{
84106+ struct acl_subject_label *curracl;
84107+ __u32 curr_ip;
84108+ struct task_struct *p, *p2;
84109+
84110+ if (unlikely(!gr_acl_is_enabled()))
84111+ return;
84112+
84113+ curracl = task->acl;
84114+ curr_ip = task->signal->curr_ip;
84115+
84116+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
84117+ read_lock(&tasklist_lock);
84118+ do_each_thread(p2, p) {
84119+ if (p->signal->curr_ip == curr_ip)
84120+ gr_fake_force_sig(SIGKILL, p);
84121+ } while_each_thread(p2, p);
84122+ read_unlock(&tasklist_lock);
84123+ } else if (curracl->mode & GR_KILLPROC)
84124+ gr_fake_force_sig(SIGKILL, task);
84125+
84126+ return;
84127+}
84128diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
84129new file mode 100644
84130index 0000000..6b0c9cc
84131--- /dev/null
84132+++ b/grsecurity/gracl_shm.c
84133@@ -0,0 +1,40 @@
84134+#include <linux/kernel.h>
84135+#include <linux/mm.h>
84136+#include <linux/sched.h>
84137+#include <linux/file.h>
84138+#include <linux/ipc.h>
84139+#include <linux/gracl.h>
84140+#include <linux/grsecurity.h>
84141+#include <linux/grinternal.h>
84142+
84143+int
84144+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84145+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
84146+{
84147+ struct task_struct *task;
84148+
84149+ if (!gr_acl_is_enabled())
84150+ return 1;
84151+
84152+ rcu_read_lock();
84153+ read_lock(&tasklist_lock);
84154+
84155+ task = find_task_by_vpid(shm_cprid);
84156+
84157+ if (unlikely(!task))
84158+ task = find_task_by_vpid(shm_lapid);
84159+
84160+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
84161+ (task_pid_nr(task) == shm_lapid)) &&
84162+ (task->acl->mode & GR_PROTSHM) &&
84163+ (task->acl != current->acl))) {
84164+ read_unlock(&tasklist_lock);
84165+ rcu_read_unlock();
84166+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
84167+ return 0;
84168+ }
84169+ read_unlock(&tasklist_lock);
84170+ rcu_read_unlock();
84171+
84172+ return 1;
84173+}
84174diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
84175new file mode 100644
84176index 0000000..bc0be01
84177--- /dev/null
84178+++ b/grsecurity/grsec_chdir.c
84179@@ -0,0 +1,19 @@
84180+#include <linux/kernel.h>
84181+#include <linux/sched.h>
84182+#include <linux/fs.h>
84183+#include <linux/file.h>
84184+#include <linux/grsecurity.h>
84185+#include <linux/grinternal.h>
84186+
84187+void
84188+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
84189+{
84190+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
84191+ if ((grsec_enable_chdir && grsec_enable_group &&
84192+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
84193+ !grsec_enable_group)) {
84194+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
84195+ }
84196+#endif
84197+ return;
84198+}
84199diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
84200new file mode 100644
84201index 0000000..114ea4f
84202--- /dev/null
84203+++ b/grsecurity/grsec_chroot.c
84204@@ -0,0 +1,467 @@
84205+#include <linux/kernel.h>
84206+#include <linux/module.h>
84207+#include <linux/sched.h>
84208+#include <linux/file.h>
84209+#include <linux/fs.h>
84210+#include <linux/mount.h>
84211+#include <linux/types.h>
84212+#include "../fs/mount.h"
84213+#include <linux/grsecurity.h>
84214+#include <linux/grinternal.h>
84215+
84216+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84217+int gr_init_ran;
84218+#endif
84219+
84220+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84221+{
84222+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84223+ struct dentry *tmpd = dentry;
84224+
84225+ read_seqlock_excl(&mount_lock);
84226+ write_seqlock(&rename_lock);
84227+
84228+ while (tmpd != mnt->mnt_root) {
84229+ atomic_inc(&tmpd->chroot_refcnt);
84230+ tmpd = tmpd->d_parent;
84231+ }
84232+ atomic_inc(&tmpd->chroot_refcnt);
84233+
84234+ write_sequnlock(&rename_lock);
84235+ read_sequnlock_excl(&mount_lock);
84236+#endif
84237+}
84238+
84239+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
84240+{
84241+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84242+ struct dentry *tmpd = dentry;
84243+
84244+ read_seqlock_excl(&mount_lock);
84245+ write_seqlock(&rename_lock);
84246+
84247+ while (tmpd != mnt->mnt_root) {
84248+ atomic_dec(&tmpd->chroot_refcnt);
84249+ tmpd = tmpd->d_parent;
84250+ }
84251+ atomic_dec(&tmpd->chroot_refcnt);
84252+
84253+ write_sequnlock(&rename_lock);
84254+ read_sequnlock_excl(&mount_lock);
84255+#endif
84256+}
84257+
84258+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84259+static struct dentry *get_closest_chroot(struct dentry *dentry)
84260+{
84261+ write_seqlock(&rename_lock);
84262+ do {
84263+ if (atomic_read(&dentry->chroot_refcnt)) {
84264+ write_sequnlock(&rename_lock);
84265+ return dentry;
84266+ }
84267+ dentry = dentry->d_parent;
84268+ } while (!IS_ROOT(dentry));
84269+ write_sequnlock(&rename_lock);
84270+ return NULL;
84271+}
84272+#endif
84273+
84274+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
84275+ struct dentry *newdentry, struct vfsmount *newmnt)
84276+{
84277+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
84278+ struct dentry *chroot;
84279+
84280+ if (unlikely(!grsec_enable_chroot_rename))
84281+ return 0;
84282+
84283+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
84284+ return 0;
84285+
84286+ chroot = get_closest_chroot(olddentry);
84287+
84288+ if (chroot == NULL)
84289+ return 0;
84290+
84291+ if (is_subdir(newdentry, chroot))
84292+ return 0;
84293+
84294+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
84295+
84296+ return 1;
84297+#else
84298+ return 0;
84299+#endif
84300+}
84301+
84302+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
84303+{
84304+#ifdef CONFIG_GRKERNSEC
84305+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
84306+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
84307+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84308+ && gr_init_ran
84309+#endif
84310+ )
84311+ task->gr_is_chrooted = 1;
84312+ else {
84313+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
84314+ if (task_pid_nr(task) == 1 && !gr_init_ran)
84315+ gr_init_ran = 1;
84316+#endif
84317+ task->gr_is_chrooted = 0;
84318+ }
84319+
84320+ task->gr_chroot_dentry = path->dentry;
84321+#endif
84322+ return;
84323+}
84324+
84325+void gr_clear_chroot_entries(struct task_struct *task)
84326+{
84327+#ifdef CONFIG_GRKERNSEC
84328+ task->gr_is_chrooted = 0;
84329+ task->gr_chroot_dentry = NULL;
84330+#endif
84331+ return;
84332+}
84333+
84334+int
84335+gr_handle_chroot_unix(const pid_t pid)
84336+{
84337+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
84338+ struct task_struct *p;
84339+
84340+ if (unlikely(!grsec_enable_chroot_unix))
84341+ return 1;
84342+
84343+ if (likely(!proc_is_chrooted(current)))
84344+ return 1;
84345+
84346+ rcu_read_lock();
84347+ read_lock(&tasklist_lock);
84348+ p = find_task_by_vpid_unrestricted(pid);
84349+ if (unlikely(p && !have_same_root(current, p))) {
84350+ read_unlock(&tasklist_lock);
84351+ rcu_read_unlock();
84352+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
84353+ return 0;
84354+ }
84355+ read_unlock(&tasklist_lock);
84356+ rcu_read_unlock();
84357+#endif
84358+ return 1;
84359+}
84360+
84361+int
84362+gr_handle_chroot_nice(void)
84363+{
84364+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84365+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
84366+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
84367+ return -EPERM;
84368+ }
84369+#endif
84370+ return 0;
84371+}
84372+
84373+int
84374+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
84375+{
84376+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
84377+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
84378+ && proc_is_chrooted(current)) {
84379+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
84380+ return -EACCES;
84381+ }
84382+#endif
84383+ return 0;
84384+}
84385+
84386+int
84387+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
84388+{
84389+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84390+ struct task_struct *p;
84391+ int ret = 0;
84392+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
84393+ return ret;
84394+
84395+ read_lock(&tasklist_lock);
84396+ do_each_pid_task(pid, type, p) {
84397+ if (!have_same_root(current, p)) {
84398+ ret = 1;
84399+ goto out;
84400+ }
84401+ } while_each_pid_task(pid, type, p);
84402+out:
84403+ read_unlock(&tasklist_lock);
84404+ return ret;
84405+#endif
84406+ return 0;
84407+}
84408+
84409+int
84410+gr_pid_is_chrooted(struct task_struct *p)
84411+{
84412+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
84413+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
84414+ return 0;
84415+
84416+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
84417+ !have_same_root(current, p)) {
84418+ return 1;
84419+ }
84420+#endif
84421+ return 0;
84422+}
84423+
84424+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
84425+
84426+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
84427+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
84428+{
84429+ struct path path, currentroot;
84430+ int ret = 0;
84431+
84432+ path.dentry = (struct dentry *)u_dentry;
84433+ path.mnt = (struct vfsmount *)u_mnt;
84434+ get_fs_root(current->fs, &currentroot);
84435+ if (path_is_under(&path, &currentroot))
84436+ ret = 1;
84437+ path_put(&currentroot);
84438+
84439+ return ret;
84440+}
84441+#endif
84442+
84443+int
84444+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
84445+{
84446+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84447+ if (!grsec_enable_chroot_fchdir)
84448+ return 1;
84449+
84450+ if (!proc_is_chrooted(current))
84451+ return 1;
84452+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
84453+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
84454+ return 0;
84455+ }
84456+#endif
84457+ return 1;
84458+}
84459+
84460+int
84461+gr_chroot_fhandle(void)
84462+{
84463+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
84464+ if (!grsec_enable_chroot_fchdir)
84465+ return 1;
84466+
84467+ if (!proc_is_chrooted(current))
84468+ return 1;
84469+ else {
84470+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
84471+ return 0;
84472+ }
84473+#endif
84474+ return 1;
84475+}
84476+
84477+int
84478+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
84479+ const u64 shm_createtime)
84480+{
84481+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
84482+ struct task_struct *p;
84483+
84484+ if (unlikely(!grsec_enable_chroot_shmat))
84485+ return 1;
84486+
84487+ if (likely(!proc_is_chrooted(current)))
84488+ return 1;
84489+
84490+ rcu_read_lock();
84491+ read_lock(&tasklist_lock);
84492+
84493+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
84494+ if (time_before_eq64(p->start_time, shm_createtime)) {
84495+ if (have_same_root(current, p)) {
84496+ goto allow;
84497+ } else {
84498+ read_unlock(&tasklist_lock);
84499+ rcu_read_unlock();
84500+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84501+ return 0;
84502+ }
84503+ }
84504+ /* creator exited, pid reuse, fall through to next check */
84505+ }
84506+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
84507+ if (unlikely(!have_same_root(current, p))) {
84508+ read_unlock(&tasklist_lock);
84509+ rcu_read_unlock();
84510+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
84511+ return 0;
84512+ }
84513+ }
84514+
84515+allow:
84516+ read_unlock(&tasklist_lock);
84517+ rcu_read_unlock();
84518+#endif
84519+ return 1;
84520+}
84521+
84522+void
84523+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
84524+{
84525+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
84526+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
84527+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
84528+#endif
84529+ return;
84530+}
84531+
84532+int
84533+gr_handle_chroot_mknod(const struct dentry *dentry,
84534+ const struct vfsmount *mnt, const int mode)
84535+{
84536+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
84537+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
84538+ proc_is_chrooted(current)) {
84539+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
84540+ return -EPERM;
84541+ }
84542+#endif
84543+ return 0;
84544+}
84545+
84546+int
84547+gr_handle_chroot_mount(const struct dentry *dentry,
84548+ const struct vfsmount *mnt, const char *dev_name)
84549+{
84550+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
84551+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
84552+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
84553+ return -EPERM;
84554+ }
84555+#endif
84556+ return 0;
84557+}
84558+
84559+int
84560+gr_handle_chroot_pivot(void)
84561+{
84562+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
84563+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
84564+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
84565+ return -EPERM;
84566+ }
84567+#endif
84568+ return 0;
84569+}
84570+
84571+int
84572+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
84573+{
84574+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
84575+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
84576+ !gr_is_outside_chroot(dentry, mnt)) {
84577+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
84578+ return -EPERM;
84579+ }
84580+#endif
84581+ return 0;
84582+}
84583+
84584+extern const char *captab_log[];
84585+extern int captab_log_entries;
84586+
84587+int
84588+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
84589+{
84590+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84591+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84592+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84593+ if (cap_raised(chroot_caps, cap)) {
84594+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
84595+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
84596+ }
84597+ return 0;
84598+ }
84599+ }
84600+#endif
84601+ return 1;
84602+}
84603+
84604+int
84605+gr_chroot_is_capable(const int cap)
84606+{
84607+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84608+ return gr_task_chroot_is_capable(current, current_cred(), cap);
84609+#endif
84610+ return 1;
84611+}
84612+
84613+int
84614+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
84615+{
84616+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84617+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
84618+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
84619+ if (cap_raised(chroot_caps, cap)) {
84620+ return 0;
84621+ }
84622+ }
84623+#endif
84624+ return 1;
84625+}
84626+
84627+int
84628+gr_chroot_is_capable_nolog(const int cap)
84629+{
84630+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
84631+ return gr_task_chroot_is_capable_nolog(current, cap);
84632+#endif
84633+ return 1;
84634+}
84635+
84636+int
84637+gr_handle_chroot_sysctl(const int op)
84638+{
84639+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
84640+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
84641+ proc_is_chrooted(current))
84642+ return -EACCES;
84643+#endif
84644+ return 0;
84645+}
84646+
84647+void
84648+gr_handle_chroot_chdir(const struct path *path)
84649+{
84650+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
84651+ if (grsec_enable_chroot_chdir)
84652+ set_fs_pwd(current->fs, path);
84653+#endif
84654+ return;
84655+}
84656+
84657+int
84658+gr_handle_chroot_chmod(const struct dentry *dentry,
84659+ const struct vfsmount *mnt, const int mode)
84660+{
84661+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
84662+ /* allow chmod +s on directories, but not files */
84663+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
84664+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
84665+ proc_is_chrooted(current)) {
84666+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
84667+ return -EPERM;
84668+ }
84669+#endif
84670+ return 0;
84671+}
84672diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
84673new file mode 100644
84674index 0000000..946f750
84675--- /dev/null
84676+++ b/grsecurity/grsec_disabled.c
84677@@ -0,0 +1,445 @@
84678+#include <linux/kernel.h>
84679+#include <linux/module.h>
84680+#include <linux/sched.h>
84681+#include <linux/file.h>
84682+#include <linux/fs.h>
84683+#include <linux/kdev_t.h>
84684+#include <linux/net.h>
84685+#include <linux/in.h>
84686+#include <linux/ip.h>
84687+#include <linux/skbuff.h>
84688+#include <linux/sysctl.h>
84689+
84690+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84691+void
84692+pax_set_initial_flags(struct linux_binprm *bprm)
84693+{
84694+ return;
84695+}
84696+#endif
84697+
84698+#ifdef CONFIG_SYSCTL
84699+__u32
84700+gr_handle_sysctl(const struct ctl_table * table, const int op)
84701+{
84702+ return 0;
84703+}
84704+#endif
84705+
84706+#ifdef CONFIG_TASKSTATS
84707+int gr_is_taskstats_denied(int pid)
84708+{
84709+ return 0;
84710+}
84711+#endif
84712+
84713+int
84714+gr_acl_is_enabled(void)
84715+{
84716+ return 0;
84717+}
84718+
84719+int
84720+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
84721+{
84722+ return 0;
84723+}
84724+
84725+void
84726+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
84727+{
84728+ return;
84729+}
84730+
84731+int
84732+gr_handle_rawio(const struct inode *inode)
84733+{
84734+ return 0;
84735+}
84736+
84737+void
84738+gr_acl_handle_psacct(struct task_struct *task, const long code)
84739+{
84740+ return;
84741+}
84742+
84743+int
84744+gr_handle_ptrace(struct task_struct *task, const long request)
84745+{
84746+ return 0;
84747+}
84748+
84749+int
84750+gr_handle_proc_ptrace(struct task_struct *task)
84751+{
84752+ return 0;
84753+}
84754+
84755+int
84756+gr_set_acls(const int type)
84757+{
84758+ return 0;
84759+}
84760+
84761+int
84762+gr_check_hidden_task(const struct task_struct *tsk)
84763+{
84764+ return 0;
84765+}
84766+
84767+int
84768+gr_check_protected_task(const struct task_struct *task)
84769+{
84770+ return 0;
84771+}
84772+
84773+int
84774+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
84775+{
84776+ return 0;
84777+}
84778+
84779+void
84780+gr_copy_label(struct task_struct *tsk)
84781+{
84782+ return;
84783+}
84784+
84785+void
84786+gr_set_pax_flags(struct task_struct *task)
84787+{
84788+ return;
84789+}
84790+
84791+int
84792+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
84793+ const int unsafe_share)
84794+{
84795+ return 0;
84796+}
84797+
84798+void
84799+gr_handle_delete(const u64 ino, const dev_t dev)
84800+{
84801+ return;
84802+}
84803+
84804+void
84805+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
84806+{
84807+ return;
84808+}
84809+
84810+void
84811+gr_handle_crash(struct task_struct *task, const int sig)
84812+{
84813+ return;
84814+}
84815+
84816+int
84817+gr_check_crash_exec(const struct file *filp)
84818+{
84819+ return 0;
84820+}
84821+
84822+int
84823+gr_check_crash_uid(const kuid_t uid)
84824+{
84825+ return 0;
84826+}
84827+
84828+void
84829+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
84830+ struct dentry *old_dentry,
84831+ struct dentry *new_dentry,
84832+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
84833+{
84834+ return;
84835+}
84836+
84837+int
84838+gr_search_socket(const int family, const int type, const int protocol)
84839+{
84840+ return 1;
84841+}
84842+
84843+int
84844+gr_search_connectbind(const int mode, const struct socket *sock,
84845+ const struct sockaddr_in *addr)
84846+{
84847+ return 0;
84848+}
84849+
84850+void
84851+gr_handle_alertkill(struct task_struct *task)
84852+{
84853+ return;
84854+}
84855+
84856+__u32
84857+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
84858+{
84859+ return 1;
84860+}
84861+
84862+__u32
84863+gr_acl_handle_hidden_file(const struct dentry * dentry,
84864+ const struct vfsmount * mnt)
84865+{
84866+ return 1;
84867+}
84868+
84869+__u32
84870+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
84871+ int acc_mode)
84872+{
84873+ return 1;
84874+}
84875+
84876+__u32
84877+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
84878+{
84879+ return 1;
84880+}
84881+
84882+__u32
84883+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
84884+{
84885+ return 1;
84886+}
84887+
84888+int
84889+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
84890+ unsigned int *vm_flags)
84891+{
84892+ return 1;
84893+}
84894+
84895+__u32
84896+gr_acl_handle_truncate(const struct dentry * dentry,
84897+ const struct vfsmount * mnt)
84898+{
84899+ return 1;
84900+}
84901+
84902+__u32
84903+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
84904+{
84905+ return 1;
84906+}
84907+
84908+__u32
84909+gr_acl_handle_access(const struct dentry * dentry,
84910+ const struct vfsmount * mnt, const int fmode)
84911+{
84912+ return 1;
84913+}
84914+
84915+__u32
84916+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
84917+ umode_t *mode)
84918+{
84919+ return 1;
84920+}
84921+
84922+__u32
84923+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
84924+{
84925+ return 1;
84926+}
84927+
84928+__u32
84929+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
84930+{
84931+ return 1;
84932+}
84933+
84934+__u32
84935+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
84936+{
84937+ return 1;
84938+}
84939+
84940+void
84941+grsecurity_init(void)
84942+{
84943+ return;
84944+}
84945+
84946+umode_t gr_acl_umask(void)
84947+{
84948+ return 0;
84949+}
84950+
84951+__u32
84952+gr_acl_handle_mknod(const struct dentry * new_dentry,
84953+ const struct dentry * parent_dentry,
84954+ const struct vfsmount * parent_mnt,
84955+ const int mode)
84956+{
84957+ return 1;
84958+}
84959+
84960+__u32
84961+gr_acl_handle_mkdir(const struct dentry * new_dentry,
84962+ const struct dentry * parent_dentry,
84963+ const struct vfsmount * parent_mnt)
84964+{
84965+ return 1;
84966+}
84967+
84968+__u32
84969+gr_acl_handle_symlink(const struct dentry * new_dentry,
84970+ const struct dentry * parent_dentry,
84971+ const struct vfsmount * parent_mnt, const struct filename *from)
84972+{
84973+ return 1;
84974+}
84975+
84976+__u32
84977+gr_acl_handle_link(const struct dentry * new_dentry,
84978+ const struct dentry * parent_dentry,
84979+ const struct vfsmount * parent_mnt,
84980+ const struct dentry * old_dentry,
84981+ const struct vfsmount * old_mnt, const struct filename *to)
84982+{
84983+ return 1;
84984+}
84985+
84986+int
84987+gr_acl_handle_rename(const struct dentry *new_dentry,
84988+ const struct dentry *parent_dentry,
84989+ const struct vfsmount *parent_mnt,
84990+ const struct dentry *old_dentry,
84991+ const struct inode *old_parent_inode,
84992+ const struct vfsmount *old_mnt, const struct filename *newname,
84993+ unsigned int flags)
84994+{
84995+ return 0;
84996+}
84997+
84998+int
84999+gr_acl_handle_filldir(const struct file *file, const char *name,
85000+ const int namelen, const u64 ino)
85001+{
85002+ return 1;
85003+}
85004+
85005+int
85006+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
85007+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
85008+{
85009+ return 1;
85010+}
85011+
85012+int
85013+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
85014+{
85015+ return 0;
85016+}
85017+
85018+int
85019+gr_search_accept(const struct socket *sock)
85020+{
85021+ return 0;
85022+}
85023+
85024+int
85025+gr_search_listen(const struct socket *sock)
85026+{
85027+ return 0;
85028+}
85029+
85030+int
85031+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
85032+{
85033+ return 0;
85034+}
85035+
85036+__u32
85037+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
85038+{
85039+ return 1;
85040+}
85041+
85042+__u32
85043+gr_acl_handle_creat(const struct dentry * dentry,
85044+ const struct dentry * p_dentry,
85045+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
85046+ const int imode)
85047+{
85048+ return 1;
85049+}
85050+
85051+void
85052+gr_acl_handle_exit(void)
85053+{
85054+ return;
85055+}
85056+
85057+int
85058+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
85059+{
85060+ return 1;
85061+}
85062+
85063+void
85064+gr_set_role_label(const kuid_t uid, const kgid_t gid)
85065+{
85066+ return;
85067+}
85068+
85069+int
85070+gr_acl_handle_procpidmem(const struct task_struct *task)
85071+{
85072+ return 0;
85073+}
85074+
85075+int
85076+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
85077+{
85078+ return 0;
85079+}
85080+
85081+int
85082+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
85083+{
85084+ return 0;
85085+}
85086+
85087+int
85088+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85089+{
85090+ return 0;
85091+}
85092+
85093+int
85094+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85095+{
85096+ return 0;
85097+}
85098+
85099+int gr_acl_enable_at_secure(void)
85100+{
85101+ return 0;
85102+}
85103+
85104+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
85105+{
85106+ return dentry->d_sb->s_dev;
85107+}
85108+
85109+u64 gr_get_ino_from_dentry(struct dentry *dentry)
85110+{
85111+ return dentry->d_inode->i_ino;
85112+}
85113+
85114+void gr_put_exec_file(struct task_struct *task)
85115+{
85116+ return;
85117+}
85118+
85119+#ifdef CONFIG_SECURITY
85120+EXPORT_SYMBOL_GPL(gr_check_user_change);
85121+EXPORT_SYMBOL_GPL(gr_check_group_change);
85122+#endif
85123diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
85124new file mode 100644
85125index 0000000..fb7531e
85126--- /dev/null
85127+++ b/grsecurity/grsec_exec.c
85128@@ -0,0 +1,189 @@
85129+#include <linux/kernel.h>
85130+#include <linux/sched.h>
85131+#include <linux/file.h>
85132+#include <linux/binfmts.h>
85133+#include <linux/fs.h>
85134+#include <linux/types.h>
85135+#include <linux/grdefs.h>
85136+#include <linux/grsecurity.h>
85137+#include <linux/grinternal.h>
85138+#include <linux/capability.h>
85139+#include <linux/module.h>
85140+#include <linux/compat.h>
85141+
85142+#include <asm/uaccess.h>
85143+
85144+#ifdef CONFIG_GRKERNSEC_EXECLOG
85145+static char gr_exec_arg_buf[132];
85146+static DEFINE_MUTEX(gr_exec_arg_mutex);
85147+#endif
85148+
85149+struct user_arg_ptr {
85150+#ifdef CONFIG_COMPAT
85151+ bool is_compat;
85152+#endif
85153+ union {
85154+ const char __user *const __user *native;
85155+#ifdef CONFIG_COMPAT
85156+ const compat_uptr_t __user *compat;
85157+#endif
85158+ } ptr;
85159+};
85160+
85161+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
85162+
85163+void
85164+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
85165+{
85166+#ifdef CONFIG_GRKERNSEC_EXECLOG
85167+ char *grarg = gr_exec_arg_buf;
85168+ unsigned int i, x, execlen = 0;
85169+ char c;
85170+
85171+ if (!((grsec_enable_execlog && grsec_enable_group &&
85172+ in_group_p(grsec_audit_gid))
85173+ || (grsec_enable_execlog && !grsec_enable_group)))
85174+ return;
85175+
85176+ mutex_lock(&gr_exec_arg_mutex);
85177+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
85178+
85179+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
85180+ const char __user *p;
85181+ unsigned int len;
85182+
85183+ p = get_user_arg_ptr(argv, i);
85184+ if (IS_ERR(p))
85185+ goto log;
85186+
85187+ len = strnlen_user(p, 128 - execlen);
85188+ if (len > 128 - execlen)
85189+ len = 128 - execlen;
85190+ else if (len > 0)
85191+ len--;
85192+ if (copy_from_user(grarg + execlen, p, len))
85193+ goto log;
85194+
85195+ /* rewrite unprintable characters */
85196+ for (x = 0; x < len; x++) {
85197+ c = *(grarg + execlen + x);
85198+ if (c < 32 || c > 126)
85199+ *(grarg + execlen + x) = ' ';
85200+ }
85201+
85202+ execlen += len;
85203+ *(grarg + execlen) = ' ';
85204+ *(grarg + execlen + 1) = '\0';
85205+ execlen++;
85206+ }
85207+
85208+ log:
85209+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
85210+ bprm->file->f_path.mnt, grarg);
85211+ mutex_unlock(&gr_exec_arg_mutex);
85212+#endif
85213+ return;
85214+}
85215+
85216+#ifdef CONFIG_GRKERNSEC
85217+extern int gr_acl_is_capable(const int cap);
85218+extern int gr_acl_is_capable_nolog(const int cap);
85219+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85220+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
85221+extern int gr_chroot_is_capable(const int cap);
85222+extern int gr_chroot_is_capable_nolog(const int cap);
85223+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
85224+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
85225+#endif
85226+
85227+const char *captab_log[] = {
85228+ "CAP_CHOWN",
85229+ "CAP_DAC_OVERRIDE",
85230+ "CAP_DAC_READ_SEARCH",
85231+ "CAP_FOWNER",
85232+ "CAP_FSETID",
85233+ "CAP_KILL",
85234+ "CAP_SETGID",
85235+ "CAP_SETUID",
85236+ "CAP_SETPCAP",
85237+ "CAP_LINUX_IMMUTABLE",
85238+ "CAP_NET_BIND_SERVICE",
85239+ "CAP_NET_BROADCAST",
85240+ "CAP_NET_ADMIN",
85241+ "CAP_NET_RAW",
85242+ "CAP_IPC_LOCK",
85243+ "CAP_IPC_OWNER",
85244+ "CAP_SYS_MODULE",
85245+ "CAP_SYS_RAWIO",
85246+ "CAP_SYS_CHROOT",
85247+ "CAP_SYS_PTRACE",
85248+ "CAP_SYS_PACCT",
85249+ "CAP_SYS_ADMIN",
85250+ "CAP_SYS_BOOT",
85251+ "CAP_SYS_NICE",
85252+ "CAP_SYS_RESOURCE",
85253+ "CAP_SYS_TIME",
85254+ "CAP_SYS_TTY_CONFIG",
85255+ "CAP_MKNOD",
85256+ "CAP_LEASE",
85257+ "CAP_AUDIT_WRITE",
85258+ "CAP_AUDIT_CONTROL",
85259+ "CAP_SETFCAP",
85260+ "CAP_MAC_OVERRIDE",
85261+ "CAP_MAC_ADMIN",
85262+ "CAP_SYSLOG",
85263+ "CAP_WAKE_ALARM",
85264+ "CAP_BLOCK_SUSPEND",
85265+ "CAP_AUDIT_READ"
85266+};
85267+
85268+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
85269+
85270+int gr_is_capable(const int cap)
85271+{
85272+#ifdef CONFIG_GRKERNSEC
85273+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
85274+ return 1;
85275+ return 0;
85276+#else
85277+ return 1;
85278+#endif
85279+}
85280+
85281+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
85282+{
85283+#ifdef CONFIG_GRKERNSEC
85284+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
85285+ return 1;
85286+ return 0;
85287+#else
85288+ return 1;
85289+#endif
85290+}
85291+
85292+int gr_is_capable_nolog(const int cap)
85293+{
85294+#ifdef CONFIG_GRKERNSEC
85295+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
85296+ return 1;
85297+ return 0;
85298+#else
85299+ return 1;
85300+#endif
85301+}
85302+
85303+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
85304+{
85305+#ifdef CONFIG_GRKERNSEC
85306+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
85307+ return 1;
85308+ return 0;
85309+#else
85310+ return 1;
85311+#endif
85312+}
85313+
85314+EXPORT_SYMBOL_GPL(gr_is_capable);
85315+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
85316+EXPORT_SYMBOL_GPL(gr_task_is_capable);
85317+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
85318diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
85319new file mode 100644
85320index 0000000..06cc6ea
85321--- /dev/null
85322+++ b/grsecurity/grsec_fifo.c
85323@@ -0,0 +1,24 @@
85324+#include <linux/kernel.h>
85325+#include <linux/sched.h>
85326+#include <linux/fs.h>
85327+#include <linux/file.h>
85328+#include <linux/grinternal.h>
85329+
85330+int
85331+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
85332+ const struct dentry *dir, const int flag, const int acc_mode)
85333+{
85334+#ifdef CONFIG_GRKERNSEC_FIFO
85335+ const struct cred *cred = current_cred();
85336+
85337+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
85338+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
85339+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
85340+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
85341+ if (!inode_permission(dentry->d_inode, acc_mode))
85342+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(dentry->d_inode->i_uid), GR_GLOBAL_GID(dentry->d_inode->i_gid));
85343+ return -EACCES;
85344+ }
85345+#endif
85346+ return 0;
85347+}
85348diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
85349new file mode 100644
85350index 0000000..8ca18bf
85351--- /dev/null
85352+++ b/grsecurity/grsec_fork.c
85353@@ -0,0 +1,23 @@
85354+#include <linux/kernel.h>
85355+#include <linux/sched.h>
85356+#include <linux/grsecurity.h>
85357+#include <linux/grinternal.h>
85358+#include <linux/errno.h>
85359+
85360+void
85361+gr_log_forkfail(const int retval)
85362+{
85363+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85364+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
85365+ switch (retval) {
85366+ case -EAGAIN:
85367+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
85368+ break;
85369+ case -ENOMEM:
85370+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
85371+ break;
85372+ }
85373+ }
85374+#endif
85375+ return;
85376+}
85377diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
85378new file mode 100644
85379index 0000000..4ed9e7d
85380--- /dev/null
85381+++ b/grsecurity/grsec_init.c
85382@@ -0,0 +1,290 @@
85383+#include <linux/kernel.h>
85384+#include <linux/sched.h>
85385+#include <linux/mm.h>
85386+#include <linux/gracl.h>
85387+#include <linux/slab.h>
85388+#include <linux/vmalloc.h>
85389+#include <linux/percpu.h>
85390+#include <linux/module.h>
85391+
85392+int grsec_enable_ptrace_readexec;
85393+int grsec_enable_setxid;
85394+int grsec_enable_symlinkown;
85395+kgid_t grsec_symlinkown_gid;
85396+int grsec_enable_brute;
85397+int grsec_enable_link;
85398+int grsec_enable_dmesg;
85399+int grsec_enable_harden_ptrace;
85400+int grsec_enable_harden_ipc;
85401+int grsec_enable_fifo;
85402+int grsec_enable_execlog;
85403+int grsec_enable_signal;
85404+int grsec_enable_forkfail;
85405+int grsec_enable_audit_ptrace;
85406+int grsec_enable_time;
85407+int grsec_enable_group;
85408+kgid_t grsec_audit_gid;
85409+int grsec_enable_chdir;
85410+int grsec_enable_mount;
85411+int grsec_enable_rofs;
85412+int grsec_deny_new_usb;
85413+int grsec_enable_chroot_findtask;
85414+int grsec_enable_chroot_mount;
85415+int grsec_enable_chroot_shmat;
85416+int grsec_enable_chroot_fchdir;
85417+int grsec_enable_chroot_double;
85418+int grsec_enable_chroot_pivot;
85419+int grsec_enable_chroot_chdir;
85420+int grsec_enable_chroot_chmod;
85421+int grsec_enable_chroot_mknod;
85422+int grsec_enable_chroot_nice;
85423+int grsec_enable_chroot_execlog;
85424+int grsec_enable_chroot_caps;
85425+int grsec_enable_chroot_rename;
85426+int grsec_enable_chroot_sysctl;
85427+int grsec_enable_chroot_unix;
85428+int grsec_enable_tpe;
85429+kgid_t grsec_tpe_gid;
85430+int grsec_enable_blackhole;
85431+#ifdef CONFIG_IPV6_MODULE
85432+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
85433+#endif
85434+int grsec_lastack_retries;
85435+int grsec_enable_tpe_all;
85436+int grsec_enable_tpe_invert;
85437+int grsec_enable_socket_all;
85438+kgid_t grsec_socket_all_gid;
85439+int grsec_enable_socket_client;
85440+kgid_t grsec_socket_client_gid;
85441+int grsec_enable_socket_server;
85442+kgid_t grsec_socket_server_gid;
85443+int grsec_resource_logging;
85444+int grsec_disable_privio;
85445+int grsec_enable_log_rwxmaps;
85446+int grsec_lock;
85447+
85448+DEFINE_SPINLOCK(grsec_alert_lock);
85449+unsigned long grsec_alert_wtime = 0;
85450+unsigned long grsec_alert_fyet = 0;
85451+
85452+DEFINE_SPINLOCK(grsec_audit_lock);
85453+
85454+DEFINE_RWLOCK(grsec_exec_file_lock);
85455+
85456+char *gr_shared_page[4];
85457+
85458+char *gr_alert_log_fmt;
85459+char *gr_audit_log_fmt;
85460+char *gr_alert_log_buf;
85461+char *gr_audit_log_buf;
85462+
85463+extern struct gr_arg *gr_usermode;
85464+extern unsigned char *gr_system_salt;
85465+extern unsigned char *gr_system_sum;
85466+
85467+void __init
85468+grsecurity_init(void)
85469+{
85470+ int j;
85471+ /* create the per-cpu shared pages */
85472+
85473+#ifdef CONFIG_X86
85474+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
85475+#endif
85476+
85477+ for (j = 0; j < 4; j++) {
85478+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
85479+ if (gr_shared_page[j] == NULL) {
85480+ panic("Unable to allocate grsecurity shared page");
85481+ return;
85482+ }
85483+ }
85484+
85485+ /* allocate log buffers */
85486+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
85487+ if (!gr_alert_log_fmt) {
85488+ panic("Unable to allocate grsecurity alert log format buffer");
85489+ return;
85490+ }
85491+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
85492+ if (!gr_audit_log_fmt) {
85493+ panic("Unable to allocate grsecurity audit log format buffer");
85494+ return;
85495+ }
85496+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85497+ if (!gr_alert_log_buf) {
85498+ panic("Unable to allocate grsecurity alert log buffer");
85499+ return;
85500+ }
85501+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
85502+ if (!gr_audit_log_buf) {
85503+ panic("Unable to allocate grsecurity audit log buffer");
85504+ return;
85505+ }
85506+
85507+ /* allocate memory for authentication structure */
85508+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
85509+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
85510+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
85511+
85512+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
85513+ panic("Unable to allocate grsecurity authentication structure");
85514+ return;
85515+ }
85516+
85517+#ifdef CONFIG_GRKERNSEC_IO
85518+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
85519+ grsec_disable_privio = 1;
85520+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85521+ grsec_disable_privio = 1;
85522+#else
85523+ grsec_disable_privio = 0;
85524+#endif
85525+#endif
85526+
85527+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
85528+ /* for backward compatibility, tpe_invert always defaults to on if
85529+ enabled in the kernel
85530+ */
85531+ grsec_enable_tpe_invert = 1;
85532+#endif
85533+
85534+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
85535+#ifndef CONFIG_GRKERNSEC_SYSCTL
85536+ grsec_lock = 1;
85537+#endif
85538+
85539+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
85540+ grsec_enable_log_rwxmaps = 1;
85541+#endif
85542+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
85543+ grsec_enable_group = 1;
85544+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
85545+#endif
85546+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
85547+ grsec_enable_ptrace_readexec = 1;
85548+#endif
85549+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
85550+ grsec_enable_chdir = 1;
85551+#endif
85552+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
85553+ grsec_enable_harden_ptrace = 1;
85554+#endif
85555+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85556+ grsec_enable_harden_ipc = 1;
85557+#endif
85558+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
85559+ grsec_enable_mount = 1;
85560+#endif
85561+#ifdef CONFIG_GRKERNSEC_LINK
85562+ grsec_enable_link = 1;
85563+#endif
85564+#ifdef CONFIG_GRKERNSEC_BRUTE
85565+ grsec_enable_brute = 1;
85566+#endif
85567+#ifdef CONFIG_GRKERNSEC_DMESG
85568+ grsec_enable_dmesg = 1;
85569+#endif
85570+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
85571+ grsec_enable_blackhole = 1;
85572+ grsec_lastack_retries = 4;
85573+#endif
85574+#ifdef CONFIG_GRKERNSEC_FIFO
85575+ grsec_enable_fifo = 1;
85576+#endif
85577+#ifdef CONFIG_GRKERNSEC_EXECLOG
85578+ grsec_enable_execlog = 1;
85579+#endif
85580+#ifdef CONFIG_GRKERNSEC_SETXID
85581+ grsec_enable_setxid = 1;
85582+#endif
85583+#ifdef CONFIG_GRKERNSEC_SIGNAL
85584+ grsec_enable_signal = 1;
85585+#endif
85586+#ifdef CONFIG_GRKERNSEC_FORKFAIL
85587+ grsec_enable_forkfail = 1;
85588+#endif
85589+#ifdef CONFIG_GRKERNSEC_TIME
85590+ grsec_enable_time = 1;
85591+#endif
85592+#ifdef CONFIG_GRKERNSEC_RESLOG
85593+ grsec_resource_logging = 1;
85594+#endif
85595+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
85596+ grsec_enable_chroot_findtask = 1;
85597+#endif
85598+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
85599+ grsec_enable_chroot_unix = 1;
85600+#endif
85601+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
85602+ grsec_enable_chroot_mount = 1;
85603+#endif
85604+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
85605+ grsec_enable_chroot_fchdir = 1;
85606+#endif
85607+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
85608+ grsec_enable_chroot_shmat = 1;
85609+#endif
85610+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
85611+ grsec_enable_audit_ptrace = 1;
85612+#endif
85613+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
85614+ grsec_enable_chroot_double = 1;
85615+#endif
85616+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
85617+ grsec_enable_chroot_pivot = 1;
85618+#endif
85619+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
85620+ grsec_enable_chroot_chdir = 1;
85621+#endif
85622+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
85623+ grsec_enable_chroot_chmod = 1;
85624+#endif
85625+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
85626+ grsec_enable_chroot_mknod = 1;
85627+#endif
85628+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
85629+ grsec_enable_chroot_nice = 1;
85630+#endif
85631+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
85632+ grsec_enable_chroot_execlog = 1;
85633+#endif
85634+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
85635+ grsec_enable_chroot_caps = 1;
85636+#endif
85637+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
85638+ grsec_enable_chroot_rename = 1;
85639+#endif
85640+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
85641+ grsec_enable_chroot_sysctl = 1;
85642+#endif
85643+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85644+ grsec_enable_symlinkown = 1;
85645+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
85646+#endif
85647+#ifdef CONFIG_GRKERNSEC_TPE
85648+ grsec_enable_tpe = 1;
85649+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
85650+#ifdef CONFIG_GRKERNSEC_TPE_ALL
85651+ grsec_enable_tpe_all = 1;
85652+#endif
85653+#endif
85654+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
85655+ grsec_enable_socket_all = 1;
85656+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
85657+#endif
85658+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
85659+ grsec_enable_socket_client = 1;
85660+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
85661+#endif
85662+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
85663+ grsec_enable_socket_server = 1;
85664+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
85665+#endif
85666+#endif
85667+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
85668+ grsec_deny_new_usb = 1;
85669+#endif
85670+
85671+ return;
85672+}
85673diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
85674new file mode 100644
85675index 0000000..1773300
85676--- /dev/null
85677+++ b/grsecurity/grsec_ipc.c
85678@@ -0,0 +1,48 @@
85679+#include <linux/kernel.h>
85680+#include <linux/mm.h>
85681+#include <linux/sched.h>
85682+#include <linux/file.h>
85683+#include <linux/ipc.h>
85684+#include <linux/ipc_namespace.h>
85685+#include <linux/grsecurity.h>
85686+#include <linux/grinternal.h>
85687+
85688+int
85689+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
85690+{
85691+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
85692+ int write;
85693+ int orig_granted_mode;
85694+ kuid_t euid;
85695+ kgid_t egid;
85696+
85697+ if (!grsec_enable_harden_ipc)
85698+ return 1;
85699+
85700+ euid = current_euid();
85701+ egid = current_egid();
85702+
85703+ write = requested_mode & 00002;
85704+ orig_granted_mode = ipcp->mode;
85705+
85706+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
85707+ orig_granted_mode >>= 6;
85708+ else {
85709+ /* if likely wrong permissions, lock to user */
85710+ if (orig_granted_mode & 0007)
85711+ orig_granted_mode = 0;
85712+ /* otherwise do a egid-only check */
85713+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
85714+ orig_granted_mode >>= 3;
85715+ /* otherwise, no access */
85716+ else
85717+ orig_granted_mode = 0;
85718+ }
85719+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
85720+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
85721+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
85722+ return 0;
85723+ }
85724+#endif
85725+ return 1;
85726+}
85727diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
85728new file mode 100644
85729index 0000000..5e05e20
85730--- /dev/null
85731+++ b/grsecurity/grsec_link.c
85732@@ -0,0 +1,58 @@
85733+#include <linux/kernel.h>
85734+#include <linux/sched.h>
85735+#include <linux/fs.h>
85736+#include <linux/file.h>
85737+#include <linux/grinternal.h>
85738+
85739+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
85740+{
85741+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
85742+ const struct inode *link_inode = link->dentry->d_inode;
85743+
85744+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
85745+ /* ignore root-owned links, e.g. /proc/self */
85746+ gr_is_global_nonroot(link_inode->i_uid) && target &&
85747+ !uid_eq(link_inode->i_uid, target->i_uid)) {
85748+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
85749+ return 1;
85750+ }
85751+#endif
85752+ return 0;
85753+}
85754+
85755+int
85756+gr_handle_follow_link(const struct inode *parent,
85757+ const struct inode *inode,
85758+ const struct dentry *dentry, const struct vfsmount *mnt)
85759+{
85760+#ifdef CONFIG_GRKERNSEC_LINK
85761+ const struct cred *cred = current_cred();
85762+
85763+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
85764+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
85765+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
85766+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
85767+ return -EACCES;
85768+ }
85769+#endif
85770+ return 0;
85771+}
85772+
85773+int
85774+gr_handle_hardlink(const struct dentry *dentry,
85775+ const struct vfsmount *mnt,
85776+ struct inode *inode, const int mode, const struct filename *to)
85777+{
85778+#ifdef CONFIG_GRKERNSEC_LINK
85779+ const struct cred *cred = current_cred();
85780+
85781+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
85782+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
85783+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
85784+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
85785+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
85786+ return -EPERM;
85787+ }
85788+#endif
85789+ return 0;
85790+}
85791diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
85792new file mode 100644
85793index 0000000..dbe0a6b
85794--- /dev/null
85795+++ b/grsecurity/grsec_log.c
85796@@ -0,0 +1,341 @@
85797+#include <linux/kernel.h>
85798+#include <linux/sched.h>
85799+#include <linux/file.h>
85800+#include <linux/tty.h>
85801+#include <linux/fs.h>
85802+#include <linux/mm.h>
85803+#include <linux/grinternal.h>
85804+
85805+#ifdef CONFIG_TREE_PREEMPT_RCU
85806+#define DISABLE_PREEMPT() preempt_disable()
85807+#define ENABLE_PREEMPT() preempt_enable()
85808+#else
85809+#define DISABLE_PREEMPT()
85810+#define ENABLE_PREEMPT()
85811+#endif
85812+
85813+#define BEGIN_LOCKS(x) \
85814+ DISABLE_PREEMPT(); \
85815+ rcu_read_lock(); \
85816+ read_lock(&tasklist_lock); \
85817+ read_lock(&grsec_exec_file_lock); \
85818+ if (x != GR_DO_AUDIT) \
85819+ spin_lock(&grsec_alert_lock); \
85820+ else \
85821+ spin_lock(&grsec_audit_lock)
85822+
85823+#define END_LOCKS(x) \
85824+ if (x != GR_DO_AUDIT) \
85825+ spin_unlock(&grsec_alert_lock); \
85826+ else \
85827+ spin_unlock(&grsec_audit_lock); \
85828+ read_unlock(&grsec_exec_file_lock); \
85829+ read_unlock(&tasklist_lock); \
85830+ rcu_read_unlock(); \
85831+ ENABLE_PREEMPT(); \
85832+ if (x == GR_DONT_AUDIT) \
85833+ gr_handle_alertkill(current)
85834+
85835+enum {
85836+ FLOODING,
85837+ NO_FLOODING
85838+};
85839+
85840+extern char *gr_alert_log_fmt;
85841+extern char *gr_audit_log_fmt;
85842+extern char *gr_alert_log_buf;
85843+extern char *gr_audit_log_buf;
85844+
85845+static int gr_log_start(int audit)
85846+{
85847+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
85848+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
85849+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85850+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
85851+ unsigned long curr_secs = get_seconds();
85852+
85853+ if (audit == GR_DO_AUDIT)
85854+ goto set_fmt;
85855+
85856+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
85857+ grsec_alert_wtime = curr_secs;
85858+ grsec_alert_fyet = 0;
85859+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
85860+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
85861+ grsec_alert_fyet++;
85862+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
85863+ grsec_alert_wtime = curr_secs;
85864+ grsec_alert_fyet++;
85865+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
85866+ return FLOODING;
85867+ }
85868+ else return FLOODING;
85869+
85870+set_fmt:
85871+#endif
85872+ memset(buf, 0, PAGE_SIZE);
85873+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
85874+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
85875+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85876+ } else if (current->signal->curr_ip) {
85877+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
85878+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
85879+ } else if (gr_acl_is_enabled()) {
85880+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
85881+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
85882+ } else {
85883+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
85884+ strcpy(buf, fmt);
85885+ }
85886+
85887+ return NO_FLOODING;
85888+}
85889+
85890+static void gr_log_middle(int audit, const char *msg, va_list ap)
85891+ __attribute__ ((format (printf, 2, 0)));
85892+
85893+static void gr_log_middle(int audit, const char *msg, va_list ap)
85894+{
85895+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85896+ unsigned int len = strlen(buf);
85897+
85898+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85899+
85900+ return;
85901+}
85902+
85903+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85904+ __attribute__ ((format (printf, 2, 3)));
85905+
85906+static void gr_log_middle_varargs(int audit, const char *msg, ...)
85907+{
85908+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85909+ unsigned int len = strlen(buf);
85910+ va_list ap;
85911+
85912+ va_start(ap, msg);
85913+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
85914+ va_end(ap);
85915+
85916+ return;
85917+}
85918+
85919+static void gr_log_end(int audit, int append_default)
85920+{
85921+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
85922+ if (append_default) {
85923+ struct task_struct *task = current;
85924+ struct task_struct *parent = task->real_parent;
85925+ const struct cred *cred = __task_cred(task);
85926+ const struct cred *pcred = __task_cred(parent);
85927+ unsigned int len = strlen(buf);
85928+
85929+ 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));
85930+ }
85931+
85932+ printk("%s\n", buf);
85933+
85934+ return;
85935+}
85936+
85937+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
85938+{
85939+ int logtype;
85940+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
85941+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
85942+ void *voidptr = NULL;
85943+ int num1 = 0, num2 = 0;
85944+ unsigned long ulong1 = 0, ulong2 = 0;
85945+ struct dentry *dentry = NULL;
85946+ struct vfsmount *mnt = NULL;
85947+ struct file *file = NULL;
85948+ struct task_struct *task = NULL;
85949+ struct vm_area_struct *vma = NULL;
85950+ const struct cred *cred, *pcred;
85951+ va_list ap;
85952+
85953+ BEGIN_LOCKS(audit);
85954+ logtype = gr_log_start(audit);
85955+ if (logtype == FLOODING) {
85956+ END_LOCKS(audit);
85957+ return;
85958+ }
85959+ va_start(ap, argtypes);
85960+ switch (argtypes) {
85961+ case GR_TTYSNIFF:
85962+ task = va_arg(ap, struct task_struct *);
85963+ 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));
85964+ break;
85965+ case GR_SYSCTL_HIDDEN:
85966+ str1 = va_arg(ap, char *);
85967+ gr_log_middle_varargs(audit, msg, result, str1);
85968+ break;
85969+ case GR_RBAC:
85970+ dentry = va_arg(ap, struct dentry *);
85971+ mnt = va_arg(ap, struct vfsmount *);
85972+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
85973+ break;
85974+ case GR_RBAC_STR:
85975+ dentry = va_arg(ap, struct dentry *);
85976+ mnt = va_arg(ap, struct vfsmount *);
85977+ str1 = va_arg(ap, char *);
85978+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
85979+ break;
85980+ case GR_STR_RBAC:
85981+ str1 = va_arg(ap, char *);
85982+ dentry = va_arg(ap, struct dentry *);
85983+ mnt = va_arg(ap, struct vfsmount *);
85984+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
85985+ break;
85986+ case GR_RBAC_MODE2:
85987+ dentry = va_arg(ap, struct dentry *);
85988+ mnt = va_arg(ap, struct vfsmount *);
85989+ str1 = va_arg(ap, char *);
85990+ str2 = va_arg(ap, char *);
85991+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
85992+ break;
85993+ case GR_RBAC_MODE3:
85994+ dentry = va_arg(ap, struct dentry *);
85995+ mnt = va_arg(ap, struct vfsmount *);
85996+ str1 = va_arg(ap, char *);
85997+ str2 = va_arg(ap, char *);
85998+ str3 = va_arg(ap, char *);
85999+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
86000+ break;
86001+ case GR_FILENAME:
86002+ dentry = va_arg(ap, struct dentry *);
86003+ mnt = va_arg(ap, struct vfsmount *);
86004+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
86005+ break;
86006+ case GR_STR_FILENAME:
86007+ str1 = va_arg(ap, char *);
86008+ dentry = va_arg(ap, struct dentry *);
86009+ mnt = va_arg(ap, struct vfsmount *);
86010+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
86011+ break;
86012+ case GR_FILENAME_STR:
86013+ dentry = va_arg(ap, struct dentry *);
86014+ mnt = va_arg(ap, struct vfsmount *);
86015+ str1 = va_arg(ap, char *);
86016+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
86017+ break;
86018+ case GR_FILENAME_TWO_INT:
86019+ dentry = va_arg(ap, struct dentry *);
86020+ mnt = va_arg(ap, struct vfsmount *);
86021+ num1 = va_arg(ap, int);
86022+ num2 = va_arg(ap, int);
86023+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
86024+ break;
86025+ case GR_FILENAME_TWO_INT_STR:
86026+ dentry = va_arg(ap, struct dentry *);
86027+ mnt = va_arg(ap, struct vfsmount *);
86028+ num1 = va_arg(ap, int);
86029+ num2 = va_arg(ap, int);
86030+ str1 = va_arg(ap, char *);
86031+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
86032+ break;
86033+ case GR_TEXTREL:
86034+ file = va_arg(ap, struct file *);
86035+ ulong1 = va_arg(ap, unsigned long);
86036+ ulong2 = va_arg(ap, unsigned long);
86037+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
86038+ break;
86039+ case GR_PTRACE:
86040+ task = va_arg(ap, struct task_struct *);
86041+ 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));
86042+ break;
86043+ case GR_RESOURCE:
86044+ task = va_arg(ap, struct task_struct *);
86045+ cred = __task_cred(task);
86046+ pcred = __task_cred(task->real_parent);
86047+ ulong1 = va_arg(ap, unsigned long);
86048+ str1 = va_arg(ap, char *);
86049+ ulong2 = va_arg(ap, unsigned long);
86050+ 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));
86051+ break;
86052+ case GR_CAP:
86053+ task = va_arg(ap, struct task_struct *);
86054+ cred = __task_cred(task);
86055+ pcred = __task_cred(task->real_parent);
86056+ str1 = va_arg(ap, char *);
86057+ 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));
86058+ break;
86059+ case GR_SIG:
86060+ str1 = va_arg(ap, char *);
86061+ voidptr = va_arg(ap, void *);
86062+ gr_log_middle_varargs(audit, msg, str1, voidptr);
86063+ break;
86064+ case GR_SIG2:
86065+ task = va_arg(ap, struct task_struct *);
86066+ cred = __task_cred(task);
86067+ pcred = __task_cred(task->real_parent);
86068+ num1 = va_arg(ap, int);
86069+ 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));
86070+ break;
86071+ case GR_CRASH1:
86072+ task = va_arg(ap, struct task_struct *);
86073+ cred = __task_cred(task);
86074+ pcred = __task_cred(task->real_parent);
86075+ ulong1 = va_arg(ap, unsigned long);
86076+ 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);
86077+ break;
86078+ case GR_CRASH2:
86079+ task = va_arg(ap, struct task_struct *);
86080+ cred = __task_cred(task);
86081+ pcred = __task_cred(task->real_parent);
86082+ ulong1 = va_arg(ap, unsigned long);
86083+ 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);
86084+ break;
86085+ case GR_RWXMAP:
86086+ file = va_arg(ap, struct file *);
86087+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
86088+ break;
86089+ case GR_RWXMAPVMA:
86090+ vma = va_arg(ap, struct vm_area_struct *);
86091+ if (vma->vm_file)
86092+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
86093+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
86094+ str1 = "<stack>";
86095+ else if (vma->vm_start <= current->mm->brk &&
86096+ vma->vm_end >= current->mm->start_brk)
86097+ str1 = "<heap>";
86098+ else
86099+ str1 = "<anonymous mapping>";
86100+ gr_log_middle_varargs(audit, msg, str1);
86101+ break;
86102+ case GR_PSACCT:
86103+ {
86104+ unsigned int wday, cday;
86105+ __u8 whr, chr;
86106+ __u8 wmin, cmin;
86107+ __u8 wsec, csec;
86108+ char cur_tty[64] = { 0 };
86109+ char parent_tty[64] = { 0 };
86110+
86111+ task = va_arg(ap, struct task_struct *);
86112+ wday = va_arg(ap, unsigned int);
86113+ cday = va_arg(ap, unsigned int);
86114+ whr = va_arg(ap, int);
86115+ chr = va_arg(ap, int);
86116+ wmin = va_arg(ap, int);
86117+ cmin = va_arg(ap, int);
86118+ wsec = va_arg(ap, int);
86119+ csec = va_arg(ap, int);
86120+ ulong1 = va_arg(ap, unsigned long);
86121+ cred = __task_cred(task);
86122+ pcred = __task_cred(task->real_parent);
86123+
86124+ 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));
86125+ }
86126+ break;
86127+ default:
86128+ gr_log_middle(audit, msg, ap);
86129+ }
86130+ va_end(ap);
86131+ // these don't need DEFAULTSECARGS printed on the end
86132+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
86133+ gr_log_end(audit, 0);
86134+ else
86135+ gr_log_end(audit, 1);
86136+ END_LOCKS(audit);
86137+}
86138diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
86139new file mode 100644
86140index 0000000..0e39d8c
86141--- /dev/null
86142+++ b/grsecurity/grsec_mem.c
86143@@ -0,0 +1,48 @@
86144+#include <linux/kernel.h>
86145+#include <linux/sched.h>
86146+#include <linux/mm.h>
86147+#include <linux/mman.h>
86148+#include <linux/module.h>
86149+#include <linux/grinternal.h>
86150+
86151+void gr_handle_msr_write(void)
86152+{
86153+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
86154+ return;
86155+}
86156+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
86157+
86158+void
86159+gr_handle_ioperm(void)
86160+{
86161+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
86162+ return;
86163+}
86164+
86165+void
86166+gr_handle_iopl(void)
86167+{
86168+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
86169+ return;
86170+}
86171+
86172+void
86173+gr_handle_mem_readwrite(u64 from, u64 to)
86174+{
86175+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
86176+ return;
86177+}
86178+
86179+void
86180+gr_handle_vm86(void)
86181+{
86182+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
86183+ return;
86184+}
86185+
86186+void
86187+gr_log_badprocpid(const char *entry)
86188+{
86189+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
86190+ return;
86191+}
86192diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
86193new file mode 100644
86194index 0000000..6f9eb73
86195--- /dev/null
86196+++ b/grsecurity/grsec_mount.c
86197@@ -0,0 +1,65 @@
86198+#include <linux/kernel.h>
86199+#include <linux/sched.h>
86200+#include <linux/mount.h>
86201+#include <linux/major.h>
86202+#include <linux/grsecurity.h>
86203+#include <linux/grinternal.h>
86204+
86205+void
86206+gr_log_remount(const char *devname, const int retval)
86207+{
86208+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86209+ if (grsec_enable_mount && (retval >= 0))
86210+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
86211+#endif
86212+ return;
86213+}
86214+
86215+void
86216+gr_log_unmount(const char *devname, const int retval)
86217+{
86218+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86219+ if (grsec_enable_mount && (retval >= 0))
86220+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
86221+#endif
86222+ return;
86223+}
86224+
86225+void
86226+gr_log_mount(const char *from, struct path *to, const int retval)
86227+{
86228+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
86229+ if (grsec_enable_mount && (retval >= 0))
86230+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
86231+#endif
86232+ return;
86233+}
86234+
86235+int
86236+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
86237+{
86238+#ifdef CONFIG_GRKERNSEC_ROFS
86239+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
86240+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
86241+ return -EPERM;
86242+ } else
86243+ return 0;
86244+#endif
86245+ return 0;
86246+}
86247+
86248+int
86249+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
86250+{
86251+#ifdef CONFIG_GRKERNSEC_ROFS
86252+ struct inode *inode = dentry->d_inode;
86253+
86254+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
86255+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
86256+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
86257+ return -EPERM;
86258+ } else
86259+ return 0;
86260+#endif
86261+ return 0;
86262+}
86263diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
86264new file mode 100644
86265index 0000000..6ee9d50
86266--- /dev/null
86267+++ b/grsecurity/grsec_pax.c
86268@@ -0,0 +1,45 @@
86269+#include <linux/kernel.h>
86270+#include <linux/sched.h>
86271+#include <linux/mm.h>
86272+#include <linux/file.h>
86273+#include <linux/grinternal.h>
86274+#include <linux/grsecurity.h>
86275+
86276+void
86277+gr_log_textrel(struct vm_area_struct * vma)
86278+{
86279+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86280+ if (grsec_enable_log_rwxmaps)
86281+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
86282+#endif
86283+ return;
86284+}
86285+
86286+void gr_log_ptgnustack(struct file *file)
86287+{
86288+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86289+ if (grsec_enable_log_rwxmaps)
86290+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
86291+#endif
86292+ return;
86293+}
86294+
86295+void
86296+gr_log_rwxmmap(struct file *file)
86297+{
86298+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86299+ if (grsec_enable_log_rwxmaps)
86300+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
86301+#endif
86302+ return;
86303+}
86304+
86305+void
86306+gr_log_rwxmprotect(struct vm_area_struct *vma)
86307+{
86308+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
86309+ if (grsec_enable_log_rwxmaps)
86310+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
86311+#endif
86312+ return;
86313+}
86314diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
86315new file mode 100644
86316index 0000000..2005a3a
86317--- /dev/null
86318+++ b/grsecurity/grsec_proc.c
86319@@ -0,0 +1,20 @@
86320+#include <linux/kernel.h>
86321+#include <linux/sched.h>
86322+#include <linux/grsecurity.h>
86323+#include <linux/grinternal.h>
86324+
86325+int gr_proc_is_restricted(void)
86326+{
86327+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86328+ const struct cred *cred = current_cred();
86329+#endif
86330+
86331+#ifdef CONFIG_GRKERNSEC_PROC_USER
86332+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
86333+ return -EACCES;
86334+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86335+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
86336+ return -EACCES;
86337+#endif
86338+ return 0;
86339+}
86340diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
86341new file mode 100644
86342index 0000000..f7f29aa
86343--- /dev/null
86344+++ b/grsecurity/grsec_ptrace.c
86345@@ -0,0 +1,30 @@
86346+#include <linux/kernel.h>
86347+#include <linux/sched.h>
86348+#include <linux/grinternal.h>
86349+#include <linux/security.h>
86350+
86351+void
86352+gr_audit_ptrace(struct task_struct *task)
86353+{
86354+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
86355+ if (grsec_enable_audit_ptrace)
86356+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
86357+#endif
86358+ return;
86359+}
86360+
86361+int
86362+gr_ptrace_readexec(struct file *file, int unsafe_flags)
86363+{
86364+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86365+ const struct dentry *dentry = file->f_path.dentry;
86366+ const struct vfsmount *mnt = file->f_path.mnt;
86367+
86368+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
86369+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
86370+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
86371+ return -EACCES;
86372+ }
86373+#endif
86374+ return 0;
86375+}
86376diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
86377new file mode 100644
86378index 0000000..3860c7e
86379--- /dev/null
86380+++ b/grsecurity/grsec_sig.c
86381@@ -0,0 +1,236 @@
86382+#include <linux/kernel.h>
86383+#include <linux/sched.h>
86384+#include <linux/fs.h>
86385+#include <linux/delay.h>
86386+#include <linux/grsecurity.h>
86387+#include <linux/grinternal.h>
86388+#include <linux/hardirq.h>
86389+
86390+char *signames[] = {
86391+ [SIGSEGV] = "Segmentation fault",
86392+ [SIGILL] = "Illegal instruction",
86393+ [SIGABRT] = "Abort",
86394+ [SIGBUS] = "Invalid alignment/Bus error"
86395+};
86396+
86397+void
86398+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
86399+{
86400+#ifdef CONFIG_GRKERNSEC_SIGNAL
86401+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
86402+ (sig == SIGABRT) || (sig == SIGBUS))) {
86403+ if (task_pid_nr(t) == task_pid_nr(current)) {
86404+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
86405+ } else {
86406+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
86407+ }
86408+ }
86409+#endif
86410+ return;
86411+}
86412+
86413+int
86414+gr_handle_signal(const struct task_struct *p, const int sig)
86415+{
86416+#ifdef CONFIG_GRKERNSEC
86417+ /* ignore the 0 signal for protected task checks */
86418+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
86419+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
86420+ return -EPERM;
86421+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
86422+ return -EPERM;
86423+ }
86424+#endif
86425+ return 0;
86426+}
86427+
86428+#ifdef CONFIG_GRKERNSEC
86429+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
86430+
86431+int gr_fake_force_sig(int sig, struct task_struct *t)
86432+{
86433+ unsigned long int flags;
86434+ int ret, blocked, ignored;
86435+ struct k_sigaction *action;
86436+
86437+ spin_lock_irqsave(&t->sighand->siglock, flags);
86438+ action = &t->sighand->action[sig-1];
86439+ ignored = action->sa.sa_handler == SIG_IGN;
86440+ blocked = sigismember(&t->blocked, sig);
86441+ if (blocked || ignored) {
86442+ action->sa.sa_handler = SIG_DFL;
86443+ if (blocked) {
86444+ sigdelset(&t->blocked, sig);
86445+ recalc_sigpending_and_wake(t);
86446+ }
86447+ }
86448+ if (action->sa.sa_handler == SIG_DFL)
86449+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
86450+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
86451+
86452+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
86453+
86454+ return ret;
86455+}
86456+#endif
86457+
86458+#define GR_USER_BAN_TIME (15 * 60)
86459+#define GR_DAEMON_BRUTE_TIME (30 * 60)
86460+
86461+void gr_handle_brute_attach(int dumpable)
86462+{
86463+#ifdef CONFIG_GRKERNSEC_BRUTE
86464+ struct task_struct *p = current;
86465+ kuid_t uid = GLOBAL_ROOT_UID;
86466+ int daemon = 0;
86467+
86468+ if (!grsec_enable_brute)
86469+ return;
86470+
86471+ rcu_read_lock();
86472+ read_lock(&tasklist_lock);
86473+ read_lock(&grsec_exec_file_lock);
86474+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
86475+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
86476+ p->real_parent->brute = 1;
86477+ daemon = 1;
86478+ } else {
86479+ const struct cred *cred = __task_cred(p), *cred2;
86480+ struct task_struct *tsk, *tsk2;
86481+
86482+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
86483+ struct user_struct *user;
86484+
86485+ uid = cred->uid;
86486+
86487+ /* this is put upon execution past expiration */
86488+ user = find_user(uid);
86489+ if (user == NULL)
86490+ goto unlock;
86491+ user->suid_banned = 1;
86492+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
86493+ if (user->suid_ban_expires == ~0UL)
86494+ user->suid_ban_expires--;
86495+
86496+ /* only kill other threads of the same binary, from the same user */
86497+ do_each_thread(tsk2, tsk) {
86498+ cred2 = __task_cred(tsk);
86499+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
86500+ gr_fake_force_sig(SIGKILL, tsk);
86501+ } while_each_thread(tsk2, tsk);
86502+ }
86503+ }
86504+unlock:
86505+ read_unlock(&grsec_exec_file_lock);
86506+ read_unlock(&tasklist_lock);
86507+ rcu_read_unlock();
86508+
86509+ if (gr_is_global_nonroot(uid))
86510+ 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);
86511+ else if (daemon)
86512+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
86513+
86514+#endif
86515+ return;
86516+}
86517+
86518+void gr_handle_brute_check(void)
86519+{
86520+#ifdef CONFIG_GRKERNSEC_BRUTE
86521+ struct task_struct *p = current;
86522+
86523+ if (unlikely(p->brute)) {
86524+ if (!grsec_enable_brute)
86525+ p->brute = 0;
86526+ else if (time_before(get_seconds(), p->brute_expires))
86527+ msleep(30 * 1000);
86528+ }
86529+#endif
86530+ return;
86531+}
86532+
86533+void gr_handle_kernel_exploit(void)
86534+{
86535+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86536+ const struct cred *cred;
86537+ struct task_struct *tsk, *tsk2;
86538+ struct user_struct *user;
86539+ kuid_t uid;
86540+
86541+ if (in_irq() || in_serving_softirq() || in_nmi())
86542+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
86543+
86544+ uid = current_uid();
86545+
86546+ if (gr_is_global_root(uid))
86547+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
86548+ else {
86549+ /* kill all the processes of this user, hold a reference
86550+ to their creds struct, and prevent them from creating
86551+ another process until system reset
86552+ */
86553+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
86554+ GR_GLOBAL_UID(uid));
86555+ /* we intentionally leak this ref */
86556+ user = get_uid(current->cred->user);
86557+ if (user)
86558+ user->kernel_banned = 1;
86559+
86560+ /* kill all processes of this user */
86561+ read_lock(&tasklist_lock);
86562+ do_each_thread(tsk2, tsk) {
86563+ cred = __task_cred(tsk);
86564+ if (uid_eq(cred->uid, uid))
86565+ gr_fake_force_sig(SIGKILL, tsk);
86566+ } while_each_thread(tsk2, tsk);
86567+ read_unlock(&tasklist_lock);
86568+ }
86569+#endif
86570+}
86571+
86572+#ifdef CONFIG_GRKERNSEC_BRUTE
86573+static bool suid_ban_expired(struct user_struct *user)
86574+{
86575+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
86576+ user->suid_banned = 0;
86577+ user->suid_ban_expires = 0;
86578+ free_uid(user);
86579+ return true;
86580+ }
86581+
86582+ return false;
86583+}
86584+#endif
86585+
86586+int gr_process_kernel_exec_ban(void)
86587+{
86588+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86589+ if (unlikely(current->cred->user->kernel_banned))
86590+ return -EPERM;
86591+#endif
86592+ return 0;
86593+}
86594+
86595+int gr_process_kernel_setuid_ban(struct user_struct *user)
86596+{
86597+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
86598+ if (unlikely(user->kernel_banned))
86599+ gr_fake_force_sig(SIGKILL, current);
86600+#endif
86601+ return 0;
86602+}
86603+
86604+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
86605+{
86606+#ifdef CONFIG_GRKERNSEC_BRUTE
86607+ struct user_struct *user = current->cred->user;
86608+ if (unlikely(user->suid_banned)) {
86609+ if (suid_ban_expired(user))
86610+ return 0;
86611+ /* disallow execution of suid binaries only */
86612+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
86613+ return -EPERM;
86614+ }
86615+#endif
86616+ return 0;
86617+}
86618diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
86619new file mode 100644
86620index 0000000..a523bd2
86621--- /dev/null
86622+++ b/grsecurity/grsec_sock.c
86623@@ -0,0 +1,244 @@
86624+#include <linux/kernel.h>
86625+#include <linux/module.h>
86626+#include <linux/sched.h>
86627+#include <linux/file.h>
86628+#include <linux/net.h>
86629+#include <linux/in.h>
86630+#include <linux/ip.h>
86631+#include <net/sock.h>
86632+#include <net/inet_sock.h>
86633+#include <linux/grsecurity.h>
86634+#include <linux/grinternal.h>
86635+#include <linux/gracl.h>
86636+
86637+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
86638+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
86639+
86640+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
86641+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
86642+
86643+#ifdef CONFIG_UNIX_MODULE
86644+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
86645+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
86646+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
86647+EXPORT_SYMBOL_GPL(gr_handle_create);
86648+#endif
86649+
86650+#ifdef CONFIG_GRKERNSEC
86651+#define gr_conn_table_size 32749
86652+struct conn_table_entry {
86653+ struct conn_table_entry *next;
86654+ struct signal_struct *sig;
86655+};
86656+
86657+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
86658+DEFINE_SPINLOCK(gr_conn_table_lock);
86659+
86660+extern const char * gr_socktype_to_name(unsigned char type);
86661+extern const char * gr_proto_to_name(unsigned char proto);
86662+extern const char * gr_sockfamily_to_name(unsigned char family);
86663+
86664+static int
86665+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
86666+{
86667+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
86668+}
86669+
86670+static int
86671+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
86672+ __u16 sport, __u16 dport)
86673+{
86674+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
86675+ sig->gr_sport == sport && sig->gr_dport == dport))
86676+ return 1;
86677+ else
86678+ return 0;
86679+}
86680+
86681+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
86682+{
86683+ struct conn_table_entry **match;
86684+ unsigned int index;
86685+
86686+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86687+ sig->gr_sport, sig->gr_dport,
86688+ gr_conn_table_size);
86689+
86690+ newent->sig = sig;
86691+
86692+ match = &gr_conn_table[index];
86693+ newent->next = *match;
86694+ *match = newent;
86695+
86696+ return;
86697+}
86698+
86699+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
86700+{
86701+ struct conn_table_entry *match, *last = NULL;
86702+ unsigned int index;
86703+
86704+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
86705+ sig->gr_sport, sig->gr_dport,
86706+ gr_conn_table_size);
86707+
86708+ match = gr_conn_table[index];
86709+ while (match && !conn_match(match->sig,
86710+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
86711+ sig->gr_dport)) {
86712+ last = match;
86713+ match = match->next;
86714+ }
86715+
86716+ if (match) {
86717+ if (last)
86718+ last->next = match->next;
86719+ else
86720+ gr_conn_table[index] = NULL;
86721+ kfree(match);
86722+ }
86723+
86724+ return;
86725+}
86726+
86727+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
86728+ __u16 sport, __u16 dport)
86729+{
86730+ struct conn_table_entry *match;
86731+ unsigned int index;
86732+
86733+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
86734+
86735+ match = gr_conn_table[index];
86736+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
86737+ match = match->next;
86738+
86739+ if (match)
86740+ return match->sig;
86741+ else
86742+ return NULL;
86743+}
86744+
86745+#endif
86746+
86747+void gr_update_task_in_ip_table(const struct inet_sock *inet)
86748+{
86749+#ifdef CONFIG_GRKERNSEC
86750+ struct signal_struct *sig = current->signal;
86751+ struct conn_table_entry *newent;
86752+
86753+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
86754+ if (newent == NULL)
86755+ return;
86756+ /* no bh lock needed since we are called with bh disabled */
86757+ spin_lock(&gr_conn_table_lock);
86758+ gr_del_task_from_ip_table_nolock(sig);
86759+ sig->gr_saddr = inet->inet_rcv_saddr;
86760+ sig->gr_daddr = inet->inet_daddr;
86761+ sig->gr_sport = inet->inet_sport;
86762+ sig->gr_dport = inet->inet_dport;
86763+ gr_add_to_task_ip_table_nolock(sig, newent);
86764+ spin_unlock(&gr_conn_table_lock);
86765+#endif
86766+ return;
86767+}
86768+
86769+void gr_del_task_from_ip_table(struct task_struct *task)
86770+{
86771+#ifdef CONFIG_GRKERNSEC
86772+ spin_lock_bh(&gr_conn_table_lock);
86773+ gr_del_task_from_ip_table_nolock(task->signal);
86774+ spin_unlock_bh(&gr_conn_table_lock);
86775+#endif
86776+ return;
86777+}
86778+
86779+void
86780+gr_attach_curr_ip(const struct sock *sk)
86781+{
86782+#ifdef CONFIG_GRKERNSEC
86783+ struct signal_struct *p, *set;
86784+ const struct inet_sock *inet = inet_sk(sk);
86785+
86786+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
86787+ return;
86788+
86789+ set = current->signal;
86790+
86791+ spin_lock_bh(&gr_conn_table_lock);
86792+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
86793+ inet->inet_dport, inet->inet_sport);
86794+ if (unlikely(p != NULL)) {
86795+ set->curr_ip = p->curr_ip;
86796+ set->used_accept = 1;
86797+ gr_del_task_from_ip_table_nolock(p);
86798+ spin_unlock_bh(&gr_conn_table_lock);
86799+ return;
86800+ }
86801+ spin_unlock_bh(&gr_conn_table_lock);
86802+
86803+ set->curr_ip = inet->inet_daddr;
86804+ set->used_accept = 1;
86805+#endif
86806+ return;
86807+}
86808+
86809+int
86810+gr_handle_sock_all(const int family, const int type, const int protocol)
86811+{
86812+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
86813+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
86814+ (family != AF_UNIX)) {
86815+ if (family == AF_INET)
86816+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
86817+ else
86818+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
86819+ return -EACCES;
86820+ }
86821+#endif
86822+ return 0;
86823+}
86824+
86825+int
86826+gr_handle_sock_server(const struct sockaddr *sck)
86827+{
86828+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86829+ if (grsec_enable_socket_server &&
86830+ in_group_p(grsec_socket_server_gid) &&
86831+ sck && (sck->sa_family != AF_UNIX) &&
86832+ (sck->sa_family != AF_LOCAL)) {
86833+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86834+ return -EACCES;
86835+ }
86836+#endif
86837+ return 0;
86838+}
86839+
86840+int
86841+gr_handle_sock_server_other(const struct sock *sck)
86842+{
86843+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
86844+ if (grsec_enable_socket_server &&
86845+ in_group_p(grsec_socket_server_gid) &&
86846+ sck && (sck->sk_family != AF_UNIX) &&
86847+ (sck->sk_family != AF_LOCAL)) {
86848+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
86849+ return -EACCES;
86850+ }
86851+#endif
86852+ return 0;
86853+}
86854+
86855+int
86856+gr_handle_sock_client(const struct sockaddr *sck)
86857+{
86858+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
86859+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
86860+ sck && (sck->sa_family != AF_UNIX) &&
86861+ (sck->sa_family != AF_LOCAL)) {
86862+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
86863+ return -EACCES;
86864+ }
86865+#endif
86866+ return 0;
86867+}
86868diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
86869new file mode 100644
86870index 0000000..cce889e
86871--- /dev/null
86872+++ b/grsecurity/grsec_sysctl.c
86873@@ -0,0 +1,488 @@
86874+#include <linux/kernel.h>
86875+#include <linux/sched.h>
86876+#include <linux/sysctl.h>
86877+#include <linux/grsecurity.h>
86878+#include <linux/grinternal.h>
86879+
86880+int
86881+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
86882+{
86883+#ifdef CONFIG_GRKERNSEC_SYSCTL
86884+ if (dirname == NULL || name == NULL)
86885+ return 0;
86886+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
86887+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
86888+ return -EACCES;
86889+ }
86890+#endif
86891+ return 0;
86892+}
86893+
86894+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
86895+static int __maybe_unused __read_only one = 1;
86896+#endif
86897+
86898+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
86899+ defined(CONFIG_GRKERNSEC_DENYUSB)
86900+struct ctl_table grsecurity_table[] = {
86901+#ifdef CONFIG_GRKERNSEC_SYSCTL
86902+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
86903+#ifdef CONFIG_GRKERNSEC_IO
86904+ {
86905+ .procname = "disable_priv_io",
86906+ .data = &grsec_disable_privio,
86907+ .maxlen = sizeof(int),
86908+ .mode = 0600,
86909+ .proc_handler = &proc_dointvec,
86910+ },
86911+#endif
86912+#endif
86913+#ifdef CONFIG_GRKERNSEC_LINK
86914+ {
86915+ .procname = "linking_restrictions",
86916+ .data = &grsec_enable_link,
86917+ .maxlen = sizeof(int),
86918+ .mode = 0600,
86919+ .proc_handler = &proc_dointvec,
86920+ },
86921+#endif
86922+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
86923+ {
86924+ .procname = "enforce_symlinksifowner",
86925+ .data = &grsec_enable_symlinkown,
86926+ .maxlen = sizeof(int),
86927+ .mode = 0600,
86928+ .proc_handler = &proc_dointvec,
86929+ },
86930+ {
86931+ .procname = "symlinkown_gid",
86932+ .data = &grsec_symlinkown_gid,
86933+ .maxlen = sizeof(int),
86934+ .mode = 0600,
86935+ .proc_handler = &proc_dointvec,
86936+ },
86937+#endif
86938+#ifdef CONFIG_GRKERNSEC_BRUTE
86939+ {
86940+ .procname = "deter_bruteforce",
86941+ .data = &grsec_enable_brute,
86942+ .maxlen = sizeof(int),
86943+ .mode = 0600,
86944+ .proc_handler = &proc_dointvec,
86945+ },
86946+#endif
86947+#ifdef CONFIG_GRKERNSEC_FIFO
86948+ {
86949+ .procname = "fifo_restrictions",
86950+ .data = &grsec_enable_fifo,
86951+ .maxlen = sizeof(int),
86952+ .mode = 0600,
86953+ .proc_handler = &proc_dointvec,
86954+ },
86955+#endif
86956+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
86957+ {
86958+ .procname = "ptrace_readexec",
86959+ .data = &grsec_enable_ptrace_readexec,
86960+ .maxlen = sizeof(int),
86961+ .mode = 0600,
86962+ .proc_handler = &proc_dointvec,
86963+ },
86964+#endif
86965+#ifdef CONFIG_GRKERNSEC_SETXID
86966+ {
86967+ .procname = "consistent_setxid",
86968+ .data = &grsec_enable_setxid,
86969+ .maxlen = sizeof(int),
86970+ .mode = 0600,
86971+ .proc_handler = &proc_dointvec,
86972+ },
86973+#endif
86974+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
86975+ {
86976+ .procname = "ip_blackhole",
86977+ .data = &grsec_enable_blackhole,
86978+ .maxlen = sizeof(int),
86979+ .mode = 0600,
86980+ .proc_handler = &proc_dointvec,
86981+ },
86982+ {
86983+ .procname = "lastack_retries",
86984+ .data = &grsec_lastack_retries,
86985+ .maxlen = sizeof(int),
86986+ .mode = 0600,
86987+ .proc_handler = &proc_dointvec,
86988+ },
86989+#endif
86990+#ifdef CONFIG_GRKERNSEC_EXECLOG
86991+ {
86992+ .procname = "exec_logging",
86993+ .data = &grsec_enable_execlog,
86994+ .maxlen = sizeof(int),
86995+ .mode = 0600,
86996+ .proc_handler = &proc_dointvec,
86997+ },
86998+#endif
86999+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
87000+ {
87001+ .procname = "rwxmap_logging",
87002+ .data = &grsec_enable_log_rwxmaps,
87003+ .maxlen = sizeof(int),
87004+ .mode = 0600,
87005+ .proc_handler = &proc_dointvec,
87006+ },
87007+#endif
87008+#ifdef CONFIG_GRKERNSEC_SIGNAL
87009+ {
87010+ .procname = "signal_logging",
87011+ .data = &grsec_enable_signal,
87012+ .maxlen = sizeof(int),
87013+ .mode = 0600,
87014+ .proc_handler = &proc_dointvec,
87015+ },
87016+#endif
87017+#ifdef CONFIG_GRKERNSEC_FORKFAIL
87018+ {
87019+ .procname = "forkfail_logging",
87020+ .data = &grsec_enable_forkfail,
87021+ .maxlen = sizeof(int),
87022+ .mode = 0600,
87023+ .proc_handler = &proc_dointvec,
87024+ },
87025+#endif
87026+#ifdef CONFIG_GRKERNSEC_TIME
87027+ {
87028+ .procname = "timechange_logging",
87029+ .data = &grsec_enable_time,
87030+ .maxlen = sizeof(int),
87031+ .mode = 0600,
87032+ .proc_handler = &proc_dointvec,
87033+ },
87034+#endif
87035+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
87036+ {
87037+ .procname = "chroot_deny_shmat",
87038+ .data = &grsec_enable_chroot_shmat,
87039+ .maxlen = sizeof(int),
87040+ .mode = 0600,
87041+ .proc_handler = &proc_dointvec,
87042+ },
87043+#endif
87044+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
87045+ {
87046+ .procname = "chroot_deny_unix",
87047+ .data = &grsec_enable_chroot_unix,
87048+ .maxlen = sizeof(int),
87049+ .mode = 0600,
87050+ .proc_handler = &proc_dointvec,
87051+ },
87052+#endif
87053+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
87054+ {
87055+ .procname = "chroot_deny_mount",
87056+ .data = &grsec_enable_chroot_mount,
87057+ .maxlen = sizeof(int),
87058+ .mode = 0600,
87059+ .proc_handler = &proc_dointvec,
87060+ },
87061+#endif
87062+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
87063+ {
87064+ .procname = "chroot_deny_fchdir",
87065+ .data = &grsec_enable_chroot_fchdir,
87066+ .maxlen = sizeof(int),
87067+ .mode = 0600,
87068+ .proc_handler = &proc_dointvec,
87069+ },
87070+#endif
87071+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
87072+ {
87073+ .procname = "chroot_deny_chroot",
87074+ .data = &grsec_enable_chroot_double,
87075+ .maxlen = sizeof(int),
87076+ .mode = 0600,
87077+ .proc_handler = &proc_dointvec,
87078+ },
87079+#endif
87080+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
87081+ {
87082+ .procname = "chroot_deny_pivot",
87083+ .data = &grsec_enable_chroot_pivot,
87084+ .maxlen = sizeof(int),
87085+ .mode = 0600,
87086+ .proc_handler = &proc_dointvec,
87087+ },
87088+#endif
87089+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
87090+ {
87091+ .procname = "chroot_enforce_chdir",
87092+ .data = &grsec_enable_chroot_chdir,
87093+ .maxlen = sizeof(int),
87094+ .mode = 0600,
87095+ .proc_handler = &proc_dointvec,
87096+ },
87097+#endif
87098+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
87099+ {
87100+ .procname = "chroot_deny_chmod",
87101+ .data = &grsec_enable_chroot_chmod,
87102+ .maxlen = sizeof(int),
87103+ .mode = 0600,
87104+ .proc_handler = &proc_dointvec,
87105+ },
87106+#endif
87107+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
87108+ {
87109+ .procname = "chroot_deny_mknod",
87110+ .data = &grsec_enable_chroot_mknod,
87111+ .maxlen = sizeof(int),
87112+ .mode = 0600,
87113+ .proc_handler = &proc_dointvec,
87114+ },
87115+#endif
87116+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
87117+ {
87118+ .procname = "chroot_restrict_nice",
87119+ .data = &grsec_enable_chroot_nice,
87120+ .maxlen = sizeof(int),
87121+ .mode = 0600,
87122+ .proc_handler = &proc_dointvec,
87123+ },
87124+#endif
87125+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
87126+ {
87127+ .procname = "chroot_execlog",
87128+ .data = &grsec_enable_chroot_execlog,
87129+ .maxlen = sizeof(int),
87130+ .mode = 0600,
87131+ .proc_handler = &proc_dointvec,
87132+ },
87133+#endif
87134+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
87135+ {
87136+ .procname = "chroot_caps",
87137+ .data = &grsec_enable_chroot_caps,
87138+ .maxlen = sizeof(int),
87139+ .mode = 0600,
87140+ .proc_handler = &proc_dointvec,
87141+ },
87142+#endif
87143+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
87144+ {
87145+ .procname = "chroot_deny_bad_rename",
87146+ .data = &grsec_enable_chroot_rename,
87147+ .maxlen = sizeof(int),
87148+ .mode = 0600,
87149+ .proc_handler = &proc_dointvec,
87150+ },
87151+#endif
87152+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
87153+ {
87154+ .procname = "chroot_deny_sysctl",
87155+ .data = &grsec_enable_chroot_sysctl,
87156+ .maxlen = sizeof(int),
87157+ .mode = 0600,
87158+ .proc_handler = &proc_dointvec,
87159+ },
87160+#endif
87161+#ifdef CONFIG_GRKERNSEC_TPE
87162+ {
87163+ .procname = "tpe",
87164+ .data = &grsec_enable_tpe,
87165+ .maxlen = sizeof(int),
87166+ .mode = 0600,
87167+ .proc_handler = &proc_dointvec,
87168+ },
87169+ {
87170+ .procname = "tpe_gid",
87171+ .data = &grsec_tpe_gid,
87172+ .maxlen = sizeof(int),
87173+ .mode = 0600,
87174+ .proc_handler = &proc_dointvec,
87175+ },
87176+#endif
87177+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87178+ {
87179+ .procname = "tpe_invert",
87180+ .data = &grsec_enable_tpe_invert,
87181+ .maxlen = sizeof(int),
87182+ .mode = 0600,
87183+ .proc_handler = &proc_dointvec,
87184+ },
87185+#endif
87186+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87187+ {
87188+ .procname = "tpe_restrict_all",
87189+ .data = &grsec_enable_tpe_all,
87190+ .maxlen = sizeof(int),
87191+ .mode = 0600,
87192+ .proc_handler = &proc_dointvec,
87193+ },
87194+#endif
87195+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
87196+ {
87197+ .procname = "socket_all",
87198+ .data = &grsec_enable_socket_all,
87199+ .maxlen = sizeof(int),
87200+ .mode = 0600,
87201+ .proc_handler = &proc_dointvec,
87202+ },
87203+ {
87204+ .procname = "socket_all_gid",
87205+ .data = &grsec_socket_all_gid,
87206+ .maxlen = sizeof(int),
87207+ .mode = 0600,
87208+ .proc_handler = &proc_dointvec,
87209+ },
87210+#endif
87211+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
87212+ {
87213+ .procname = "socket_client",
87214+ .data = &grsec_enable_socket_client,
87215+ .maxlen = sizeof(int),
87216+ .mode = 0600,
87217+ .proc_handler = &proc_dointvec,
87218+ },
87219+ {
87220+ .procname = "socket_client_gid",
87221+ .data = &grsec_socket_client_gid,
87222+ .maxlen = sizeof(int),
87223+ .mode = 0600,
87224+ .proc_handler = &proc_dointvec,
87225+ },
87226+#endif
87227+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
87228+ {
87229+ .procname = "socket_server",
87230+ .data = &grsec_enable_socket_server,
87231+ .maxlen = sizeof(int),
87232+ .mode = 0600,
87233+ .proc_handler = &proc_dointvec,
87234+ },
87235+ {
87236+ .procname = "socket_server_gid",
87237+ .data = &grsec_socket_server_gid,
87238+ .maxlen = sizeof(int),
87239+ .mode = 0600,
87240+ .proc_handler = &proc_dointvec,
87241+ },
87242+#endif
87243+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
87244+ {
87245+ .procname = "audit_group",
87246+ .data = &grsec_enable_group,
87247+ .maxlen = sizeof(int),
87248+ .mode = 0600,
87249+ .proc_handler = &proc_dointvec,
87250+ },
87251+ {
87252+ .procname = "audit_gid",
87253+ .data = &grsec_audit_gid,
87254+ .maxlen = sizeof(int),
87255+ .mode = 0600,
87256+ .proc_handler = &proc_dointvec,
87257+ },
87258+#endif
87259+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
87260+ {
87261+ .procname = "audit_chdir",
87262+ .data = &grsec_enable_chdir,
87263+ .maxlen = sizeof(int),
87264+ .mode = 0600,
87265+ .proc_handler = &proc_dointvec,
87266+ },
87267+#endif
87268+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
87269+ {
87270+ .procname = "audit_mount",
87271+ .data = &grsec_enable_mount,
87272+ .maxlen = sizeof(int),
87273+ .mode = 0600,
87274+ .proc_handler = &proc_dointvec,
87275+ },
87276+#endif
87277+#ifdef CONFIG_GRKERNSEC_DMESG
87278+ {
87279+ .procname = "dmesg",
87280+ .data = &grsec_enable_dmesg,
87281+ .maxlen = sizeof(int),
87282+ .mode = 0600,
87283+ .proc_handler = &proc_dointvec,
87284+ },
87285+#endif
87286+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
87287+ {
87288+ .procname = "chroot_findtask",
87289+ .data = &grsec_enable_chroot_findtask,
87290+ .maxlen = sizeof(int),
87291+ .mode = 0600,
87292+ .proc_handler = &proc_dointvec,
87293+ },
87294+#endif
87295+#ifdef CONFIG_GRKERNSEC_RESLOG
87296+ {
87297+ .procname = "resource_logging",
87298+ .data = &grsec_resource_logging,
87299+ .maxlen = sizeof(int),
87300+ .mode = 0600,
87301+ .proc_handler = &proc_dointvec,
87302+ },
87303+#endif
87304+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
87305+ {
87306+ .procname = "audit_ptrace",
87307+ .data = &grsec_enable_audit_ptrace,
87308+ .maxlen = sizeof(int),
87309+ .mode = 0600,
87310+ .proc_handler = &proc_dointvec,
87311+ },
87312+#endif
87313+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
87314+ {
87315+ .procname = "harden_ptrace",
87316+ .data = &grsec_enable_harden_ptrace,
87317+ .maxlen = sizeof(int),
87318+ .mode = 0600,
87319+ .proc_handler = &proc_dointvec,
87320+ },
87321+#endif
87322+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
87323+ {
87324+ .procname = "harden_ipc",
87325+ .data = &grsec_enable_harden_ipc,
87326+ .maxlen = sizeof(int),
87327+ .mode = 0600,
87328+ .proc_handler = &proc_dointvec,
87329+ },
87330+#endif
87331+ {
87332+ .procname = "grsec_lock",
87333+ .data = &grsec_lock,
87334+ .maxlen = sizeof(int),
87335+ .mode = 0600,
87336+ .proc_handler = &proc_dointvec,
87337+ },
87338+#endif
87339+#ifdef CONFIG_GRKERNSEC_ROFS
87340+ {
87341+ .procname = "romount_protect",
87342+ .data = &grsec_enable_rofs,
87343+ .maxlen = sizeof(int),
87344+ .mode = 0600,
87345+ .proc_handler = &proc_dointvec_minmax,
87346+ .extra1 = &one,
87347+ .extra2 = &one,
87348+ },
87349+#endif
87350+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
87351+ {
87352+ .procname = "deny_new_usb",
87353+ .data = &grsec_deny_new_usb,
87354+ .maxlen = sizeof(int),
87355+ .mode = 0600,
87356+ .proc_handler = &proc_dointvec,
87357+ },
87358+#endif
87359+ { }
87360+};
87361+#endif
87362diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
87363new file mode 100644
87364index 0000000..61b514e
87365--- /dev/null
87366+++ b/grsecurity/grsec_time.c
87367@@ -0,0 +1,16 @@
87368+#include <linux/kernel.h>
87369+#include <linux/sched.h>
87370+#include <linux/grinternal.h>
87371+#include <linux/module.h>
87372+
87373+void
87374+gr_log_timechange(void)
87375+{
87376+#ifdef CONFIG_GRKERNSEC_TIME
87377+ if (grsec_enable_time)
87378+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
87379+#endif
87380+ return;
87381+}
87382+
87383+EXPORT_SYMBOL_GPL(gr_log_timechange);
87384diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
87385new file mode 100644
87386index 0000000..d1953de
87387--- /dev/null
87388+++ b/grsecurity/grsec_tpe.c
87389@@ -0,0 +1,78 @@
87390+#include <linux/kernel.h>
87391+#include <linux/sched.h>
87392+#include <linux/file.h>
87393+#include <linux/fs.h>
87394+#include <linux/grinternal.h>
87395+
87396+extern int gr_acl_tpe_check(void);
87397+
87398+int
87399+gr_tpe_allow(const struct file *file)
87400+{
87401+#ifdef CONFIG_GRKERNSEC
87402+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
87403+ struct inode *file_inode = file->f_path.dentry->d_inode;
87404+ const struct cred *cred = current_cred();
87405+ char *msg = NULL;
87406+ char *msg2 = NULL;
87407+
87408+ // never restrict root
87409+ if (gr_is_global_root(cred->uid))
87410+ return 1;
87411+
87412+ if (grsec_enable_tpe) {
87413+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
87414+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
87415+ msg = "not being in trusted group";
87416+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
87417+ msg = "being in untrusted group";
87418+#else
87419+ if (in_group_p(grsec_tpe_gid))
87420+ msg = "being in untrusted group";
87421+#endif
87422+ }
87423+ if (!msg && gr_acl_tpe_check())
87424+ msg = "being in untrusted role";
87425+
87426+ // not in any affected group/role
87427+ if (!msg)
87428+ goto next_check;
87429+
87430+ if (gr_is_global_nonroot(inode->i_uid))
87431+ msg2 = "file in non-root-owned directory";
87432+ else if (inode->i_mode & S_IWOTH)
87433+ msg2 = "file in world-writable directory";
87434+ else if (inode->i_mode & S_IWGRP)
87435+ msg2 = "file in group-writable directory";
87436+ else if (file_inode->i_mode & S_IWOTH)
87437+ msg2 = "file is world-writable";
87438+
87439+ if (msg && msg2) {
87440+ char fullmsg[70] = {0};
87441+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
87442+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
87443+ return 0;
87444+ }
87445+ msg = NULL;
87446+next_check:
87447+#ifdef CONFIG_GRKERNSEC_TPE_ALL
87448+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
87449+ return 1;
87450+
87451+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
87452+ msg = "directory not owned by user";
87453+ else if (inode->i_mode & S_IWOTH)
87454+ msg = "file in world-writable directory";
87455+ else if (inode->i_mode & S_IWGRP)
87456+ msg = "file in group-writable directory";
87457+ else if (file_inode->i_mode & S_IWOTH)
87458+ msg = "file is world-writable";
87459+
87460+ if (msg) {
87461+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
87462+ return 0;
87463+ }
87464+#endif
87465+#endif
87466+ return 1;
87467+}
87468diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
87469new file mode 100644
87470index 0000000..ae02d8e
87471--- /dev/null
87472+++ b/grsecurity/grsec_usb.c
87473@@ -0,0 +1,15 @@
87474+#include <linux/kernel.h>
87475+#include <linux/grinternal.h>
87476+#include <linux/module.h>
87477+
87478+int gr_handle_new_usb(void)
87479+{
87480+#ifdef CONFIG_GRKERNSEC_DENYUSB
87481+ if (grsec_deny_new_usb) {
87482+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
87483+ return 1;
87484+ }
87485+#endif
87486+ return 0;
87487+}
87488+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
87489diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
87490new file mode 100644
87491index 0000000..158b330
87492--- /dev/null
87493+++ b/grsecurity/grsum.c
87494@@ -0,0 +1,64 @@
87495+#include <linux/err.h>
87496+#include <linux/kernel.h>
87497+#include <linux/sched.h>
87498+#include <linux/mm.h>
87499+#include <linux/scatterlist.h>
87500+#include <linux/crypto.h>
87501+#include <linux/gracl.h>
87502+
87503+
87504+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
87505+#error "crypto and sha256 must be built into the kernel"
87506+#endif
87507+
87508+int
87509+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
87510+{
87511+ struct crypto_hash *tfm;
87512+ struct hash_desc desc;
87513+ struct scatterlist sg[2];
87514+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
87515+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
87516+ unsigned long *sumptr = (unsigned long *)sum;
87517+ int cryptres;
87518+ int retval = 1;
87519+ volatile int mismatched = 0;
87520+ volatile int dummy = 0;
87521+ unsigned int i;
87522+
87523+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
87524+ if (IS_ERR(tfm)) {
87525+ /* should never happen, since sha256 should be built in */
87526+ memset(entry->pw, 0, GR_PW_LEN);
87527+ return 1;
87528+ }
87529+
87530+ sg_init_table(sg, 2);
87531+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
87532+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
87533+
87534+ desc.tfm = tfm;
87535+ desc.flags = 0;
87536+
87537+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
87538+ temp_sum);
87539+
87540+ memset(entry->pw, 0, GR_PW_LEN);
87541+
87542+ if (cryptres)
87543+ goto out;
87544+
87545+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
87546+ if (sumptr[i] != tmpsumptr[i])
87547+ mismatched = 1;
87548+ else
87549+ dummy = 1; // waste a cycle
87550+
87551+ if (!mismatched)
87552+ retval = dummy - 1;
87553+
87554+out:
87555+ crypto_free_hash(tfm);
87556+
87557+ return retval;
87558+}
87559diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
87560index 5bdab6b..9ae82fe 100644
87561--- a/include/asm-generic/4level-fixup.h
87562+++ b/include/asm-generic/4level-fixup.h
87563@@ -14,8 +14,10 @@
87564 #define pmd_alloc(mm, pud, address) \
87565 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
87566 NULL: pmd_offset(pud, address))
87567+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
87568
87569 #define pud_alloc(mm, pgd, address) (pgd)
87570+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
87571 #define pud_offset(pgd, start) (pgd)
87572 #define pud_none(pud) 0
87573 #define pud_bad(pud) 0
87574diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
87575index b7babf0..1e4b4f1 100644
87576--- a/include/asm-generic/atomic-long.h
87577+++ b/include/asm-generic/atomic-long.h
87578@@ -22,6 +22,12 @@
87579
87580 typedef atomic64_t atomic_long_t;
87581
87582+#ifdef CONFIG_PAX_REFCOUNT
87583+typedef atomic64_unchecked_t atomic_long_unchecked_t;
87584+#else
87585+typedef atomic64_t atomic_long_unchecked_t;
87586+#endif
87587+
87588 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
87589
87590 static inline long atomic_long_read(atomic_long_t *l)
87591@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87592 return (long)atomic64_read(v);
87593 }
87594
87595+#ifdef CONFIG_PAX_REFCOUNT
87596+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87597+{
87598+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87599+
87600+ return (long)atomic64_read_unchecked(v);
87601+}
87602+#endif
87603+
87604 static inline void atomic_long_set(atomic_long_t *l, long i)
87605 {
87606 atomic64_t *v = (atomic64_t *)l;
87607@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87608 atomic64_set(v, i);
87609 }
87610
87611+#ifdef CONFIG_PAX_REFCOUNT
87612+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87613+{
87614+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87615+
87616+ atomic64_set_unchecked(v, i);
87617+}
87618+#endif
87619+
87620 static inline void atomic_long_inc(atomic_long_t *l)
87621 {
87622 atomic64_t *v = (atomic64_t *)l;
87623@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87624 atomic64_inc(v);
87625 }
87626
87627+#ifdef CONFIG_PAX_REFCOUNT
87628+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87629+{
87630+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87631+
87632+ atomic64_inc_unchecked(v);
87633+}
87634+#endif
87635+
87636 static inline void atomic_long_dec(atomic_long_t *l)
87637 {
87638 atomic64_t *v = (atomic64_t *)l;
87639@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87640 atomic64_dec(v);
87641 }
87642
87643+#ifdef CONFIG_PAX_REFCOUNT
87644+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87645+{
87646+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87647+
87648+ atomic64_dec_unchecked(v);
87649+}
87650+#endif
87651+
87652 static inline void atomic_long_add(long i, atomic_long_t *l)
87653 {
87654 atomic64_t *v = (atomic64_t *)l;
87655@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87656 atomic64_add(i, v);
87657 }
87658
87659+#ifdef CONFIG_PAX_REFCOUNT
87660+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87661+{
87662+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87663+
87664+ atomic64_add_unchecked(i, v);
87665+}
87666+#endif
87667+
87668 static inline void atomic_long_sub(long i, atomic_long_t *l)
87669 {
87670 atomic64_t *v = (atomic64_t *)l;
87671@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87672 atomic64_sub(i, v);
87673 }
87674
87675+#ifdef CONFIG_PAX_REFCOUNT
87676+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87677+{
87678+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87679+
87680+ atomic64_sub_unchecked(i, v);
87681+}
87682+#endif
87683+
87684 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87685 {
87686 atomic64_t *v = (atomic64_t *)l;
87687@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87688 return atomic64_add_negative(i, v);
87689 }
87690
87691-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87692+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87693 {
87694 atomic64_t *v = (atomic64_t *)l;
87695
87696 return (long)atomic64_add_return(i, v);
87697 }
87698
87699+#ifdef CONFIG_PAX_REFCOUNT
87700+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87701+{
87702+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87703+
87704+ return (long)atomic64_add_return_unchecked(i, v);
87705+}
87706+#endif
87707+
87708 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87709 {
87710 atomic64_t *v = (atomic64_t *)l;
87711@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87712 return (long)atomic64_inc_return(v);
87713 }
87714
87715+#ifdef CONFIG_PAX_REFCOUNT
87716+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87717+{
87718+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
87719+
87720+ return (long)atomic64_inc_return_unchecked(v);
87721+}
87722+#endif
87723+
87724 static inline long atomic_long_dec_return(atomic_long_t *l)
87725 {
87726 atomic64_t *v = (atomic64_t *)l;
87727@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87728
87729 typedef atomic_t atomic_long_t;
87730
87731+#ifdef CONFIG_PAX_REFCOUNT
87732+typedef atomic_unchecked_t atomic_long_unchecked_t;
87733+#else
87734+typedef atomic_t atomic_long_unchecked_t;
87735+#endif
87736+
87737 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
87738 static inline long atomic_long_read(atomic_long_t *l)
87739 {
87740@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
87741 return (long)atomic_read(v);
87742 }
87743
87744+#ifdef CONFIG_PAX_REFCOUNT
87745+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
87746+{
87747+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87748+
87749+ return (long)atomic_read_unchecked(v);
87750+}
87751+#endif
87752+
87753 static inline void atomic_long_set(atomic_long_t *l, long i)
87754 {
87755 atomic_t *v = (atomic_t *)l;
87756@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
87757 atomic_set(v, i);
87758 }
87759
87760+#ifdef CONFIG_PAX_REFCOUNT
87761+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
87762+{
87763+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87764+
87765+ atomic_set_unchecked(v, i);
87766+}
87767+#endif
87768+
87769 static inline void atomic_long_inc(atomic_long_t *l)
87770 {
87771 atomic_t *v = (atomic_t *)l;
87772@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
87773 atomic_inc(v);
87774 }
87775
87776+#ifdef CONFIG_PAX_REFCOUNT
87777+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
87778+{
87779+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87780+
87781+ atomic_inc_unchecked(v);
87782+}
87783+#endif
87784+
87785 static inline void atomic_long_dec(atomic_long_t *l)
87786 {
87787 atomic_t *v = (atomic_t *)l;
87788@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
87789 atomic_dec(v);
87790 }
87791
87792+#ifdef CONFIG_PAX_REFCOUNT
87793+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
87794+{
87795+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87796+
87797+ atomic_dec_unchecked(v);
87798+}
87799+#endif
87800+
87801 static inline void atomic_long_add(long i, atomic_long_t *l)
87802 {
87803 atomic_t *v = (atomic_t *)l;
87804@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
87805 atomic_add(i, v);
87806 }
87807
87808+#ifdef CONFIG_PAX_REFCOUNT
87809+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
87810+{
87811+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87812+
87813+ atomic_add_unchecked(i, v);
87814+}
87815+#endif
87816+
87817 static inline void atomic_long_sub(long i, atomic_long_t *l)
87818 {
87819 atomic_t *v = (atomic_t *)l;
87820@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
87821 atomic_sub(i, v);
87822 }
87823
87824+#ifdef CONFIG_PAX_REFCOUNT
87825+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
87826+{
87827+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87828+
87829+ atomic_sub_unchecked(i, v);
87830+}
87831+#endif
87832+
87833 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
87834 {
87835 atomic_t *v = (atomic_t *)l;
87836@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
87837 return atomic_add_negative(i, v);
87838 }
87839
87840-static inline long atomic_long_add_return(long i, atomic_long_t *l)
87841+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
87842 {
87843 atomic_t *v = (atomic_t *)l;
87844
87845 return (long)atomic_add_return(i, v);
87846 }
87847
87848+#ifdef CONFIG_PAX_REFCOUNT
87849+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
87850+{
87851+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87852+
87853+ return (long)atomic_add_return_unchecked(i, v);
87854+}
87855+
87856+#endif
87857+
87858 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
87859 {
87860 atomic_t *v = (atomic_t *)l;
87861@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
87862 return (long)atomic_inc_return(v);
87863 }
87864
87865+#ifdef CONFIG_PAX_REFCOUNT
87866+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
87867+{
87868+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
87869+
87870+ return (long)atomic_inc_return_unchecked(v);
87871+}
87872+#endif
87873+
87874 static inline long atomic_long_dec_return(atomic_long_t *l)
87875 {
87876 atomic_t *v = (atomic_t *)l;
87877@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
87878
87879 #endif /* BITS_PER_LONG == 64 */
87880
87881+#ifdef CONFIG_PAX_REFCOUNT
87882+static inline void pax_refcount_needs_these_functions(void)
87883+{
87884+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
87885+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
87886+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
87887+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
87888+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
87889+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
87890+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
87891+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
87892+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
87893+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
87894+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
87895+#ifdef CONFIG_X86
87896+ atomic_clear_mask_unchecked(0, NULL);
87897+ atomic_set_mask_unchecked(0, NULL);
87898+#endif
87899+
87900+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
87901+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
87902+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
87903+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
87904+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
87905+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
87906+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
87907+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
87908+}
87909+#else
87910+#define atomic_read_unchecked(v) atomic_read(v)
87911+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
87912+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
87913+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
87914+#define atomic_inc_unchecked(v) atomic_inc(v)
87915+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
87916+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
87917+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
87918+#define atomic_dec_unchecked(v) atomic_dec(v)
87919+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
87920+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
87921+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
87922+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
87923+
87924+#define atomic_long_read_unchecked(v) atomic_long_read(v)
87925+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
87926+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
87927+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
87928+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
87929+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
87930+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
87931+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
87932+#endif
87933+
87934 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
87935diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
87936index 30ad9c8..c70c170 100644
87937--- a/include/asm-generic/atomic64.h
87938+++ b/include/asm-generic/atomic64.h
87939@@ -16,6 +16,8 @@ typedef struct {
87940 long long counter;
87941 } atomic64_t;
87942
87943+typedef atomic64_t atomic64_unchecked_t;
87944+
87945 #define ATOMIC64_INIT(i) { (i) }
87946
87947 extern long long atomic64_read(const atomic64_t *v);
87948@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
87949 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
87950 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
87951
87952+#define atomic64_read_unchecked(v) atomic64_read(v)
87953+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
87954+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
87955+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
87956+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
87957+#define atomic64_inc_unchecked(v) atomic64_inc(v)
87958+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
87959+#define atomic64_dec_unchecked(v) atomic64_dec(v)
87960+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
87961+
87962 #endif /* _ASM_GENERIC_ATOMIC64_H */
87963diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
87964index f5c40b0..e902f9d 100644
87965--- a/include/asm-generic/barrier.h
87966+++ b/include/asm-generic/barrier.h
87967@@ -82,7 +82,7 @@
87968 do { \
87969 compiletime_assert_atomic_type(*p); \
87970 smp_mb(); \
87971- ACCESS_ONCE(*p) = (v); \
87972+ ACCESS_ONCE_RW(*p) = (v); \
87973 } while (0)
87974
87975 #define smp_load_acquire(p) \
87976diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
87977index a60a7cc..0fe12f2 100644
87978--- a/include/asm-generic/bitops/__fls.h
87979+++ b/include/asm-generic/bitops/__fls.h
87980@@ -9,7 +9,7 @@
87981 *
87982 * Undefined if no set bit exists, so code should check against 0 first.
87983 */
87984-static __always_inline unsigned long __fls(unsigned long word)
87985+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
87986 {
87987 int num = BITS_PER_LONG - 1;
87988
87989diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
87990index 0576d1f..dad6c71 100644
87991--- a/include/asm-generic/bitops/fls.h
87992+++ b/include/asm-generic/bitops/fls.h
87993@@ -9,7 +9,7 @@
87994 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
87995 */
87996
87997-static __always_inline int fls(int x)
87998+static __always_inline int __intentional_overflow(-1) fls(int x)
87999 {
88000 int r = 32;
88001
88002diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
88003index b097cf8..3d40e14 100644
88004--- a/include/asm-generic/bitops/fls64.h
88005+++ b/include/asm-generic/bitops/fls64.h
88006@@ -15,7 +15,7 @@
88007 * at position 64.
88008 */
88009 #if BITS_PER_LONG == 32
88010-static __always_inline int fls64(__u64 x)
88011+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88012 {
88013 __u32 h = x >> 32;
88014 if (h)
88015@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
88016 return fls(x);
88017 }
88018 #elif BITS_PER_LONG == 64
88019-static __always_inline int fls64(__u64 x)
88020+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
88021 {
88022 if (x == 0)
88023 return 0;
88024diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
88025index 630dd23..8c1dcb6b 100644
88026--- a/include/asm-generic/bug.h
88027+++ b/include/asm-generic/bug.h
88028@@ -62,13 +62,13 @@ struct bug_entry {
88029 * to provide better diagnostics.
88030 */
88031 #ifndef __WARN_TAINT
88032-extern __printf(3, 4)
88033+extern __printf(3, 4) __nocapture(1, 3, 4)
88034 void warn_slowpath_fmt(const char *file, const int line,
88035 const char *fmt, ...);
88036-extern __printf(4, 5)
88037+extern __printf(4, 5) __nocapture(1, 4, 5)
88038 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
88039 const char *fmt, ...);
88040-extern void warn_slowpath_null(const char *file, const int line);
88041+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
88042 #define WANT_WARN_ON_SLOWPATH
88043 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
88044 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
88045diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
88046index 1bfcfe5..e04c5c9 100644
88047--- a/include/asm-generic/cache.h
88048+++ b/include/asm-generic/cache.h
88049@@ -6,7 +6,7 @@
88050 * cache lines need to provide their own cache.h.
88051 */
88052
88053-#define L1_CACHE_SHIFT 5
88054-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
88055+#define L1_CACHE_SHIFT 5UL
88056+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
88057
88058 #endif /* __ASM_GENERIC_CACHE_H */
88059diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
88060index 0d68a1e..b74a761 100644
88061--- a/include/asm-generic/emergency-restart.h
88062+++ b/include/asm-generic/emergency-restart.h
88063@@ -1,7 +1,7 @@
88064 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
88065 #define _ASM_GENERIC_EMERGENCY_RESTART_H
88066
88067-static inline void machine_emergency_restart(void)
88068+static inline __noreturn void machine_emergency_restart(void)
88069 {
88070 machine_restart(NULL);
88071 }
88072diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
88073index 90f99c7..00ce236 100644
88074--- a/include/asm-generic/kmap_types.h
88075+++ b/include/asm-generic/kmap_types.h
88076@@ -2,9 +2,9 @@
88077 #define _ASM_GENERIC_KMAP_TYPES_H
88078
88079 #ifdef __WITH_KM_FENCE
88080-# define KM_TYPE_NR 41
88081+# define KM_TYPE_NR 42
88082 #else
88083-# define KM_TYPE_NR 20
88084+# define KM_TYPE_NR 21
88085 #endif
88086
88087 #endif
88088diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
88089index 9ceb03b..62b0b8f 100644
88090--- a/include/asm-generic/local.h
88091+++ b/include/asm-generic/local.h
88092@@ -23,24 +23,37 @@ typedef struct
88093 atomic_long_t a;
88094 } local_t;
88095
88096+typedef struct {
88097+ atomic_long_unchecked_t a;
88098+} local_unchecked_t;
88099+
88100 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
88101
88102 #define local_read(l) atomic_long_read(&(l)->a)
88103+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
88104 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
88105+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
88106 #define local_inc(l) atomic_long_inc(&(l)->a)
88107+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
88108 #define local_dec(l) atomic_long_dec(&(l)->a)
88109+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
88110 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
88111+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
88112 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
88113+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
88114
88115 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
88116 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
88117 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
88118 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
88119 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
88120+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
88121 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
88122 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
88123+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
88124
88125 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88126+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
88127 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
88128 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
88129 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
88130diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
88131index 725612b..9cc513a 100644
88132--- a/include/asm-generic/pgtable-nopmd.h
88133+++ b/include/asm-generic/pgtable-nopmd.h
88134@@ -1,14 +1,19 @@
88135 #ifndef _PGTABLE_NOPMD_H
88136 #define _PGTABLE_NOPMD_H
88137
88138-#ifndef __ASSEMBLY__
88139-
88140 #include <asm-generic/pgtable-nopud.h>
88141
88142-struct mm_struct;
88143-
88144 #define __PAGETABLE_PMD_FOLDED
88145
88146+#define PMD_SHIFT PUD_SHIFT
88147+#define PTRS_PER_PMD 1
88148+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
88149+#define PMD_MASK (~(PMD_SIZE-1))
88150+
88151+#ifndef __ASSEMBLY__
88152+
88153+struct mm_struct;
88154+
88155 /*
88156 * Having the pmd type consist of a pud gets the size right, and allows
88157 * us to conceptually access the pud entry that this pmd is folded into
88158@@ -16,11 +21,6 @@ struct mm_struct;
88159 */
88160 typedef struct { pud_t pud; } pmd_t;
88161
88162-#define PMD_SHIFT PUD_SHIFT
88163-#define PTRS_PER_PMD 1
88164-#define PMD_SIZE (1UL << PMD_SHIFT)
88165-#define PMD_MASK (~(PMD_SIZE-1))
88166-
88167 /*
88168 * The "pud_xxx()" functions here are trivial for a folded two-level
88169 * setup: the pmd is never bad, and a pmd always exists (as it's folded
88170diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
88171index 810431d..0ec4804f 100644
88172--- a/include/asm-generic/pgtable-nopud.h
88173+++ b/include/asm-generic/pgtable-nopud.h
88174@@ -1,10 +1,15 @@
88175 #ifndef _PGTABLE_NOPUD_H
88176 #define _PGTABLE_NOPUD_H
88177
88178-#ifndef __ASSEMBLY__
88179-
88180 #define __PAGETABLE_PUD_FOLDED
88181
88182+#define PUD_SHIFT PGDIR_SHIFT
88183+#define PTRS_PER_PUD 1
88184+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
88185+#define PUD_MASK (~(PUD_SIZE-1))
88186+
88187+#ifndef __ASSEMBLY__
88188+
88189 /*
88190 * Having the pud type consist of a pgd gets the size right, and allows
88191 * us to conceptually access the pgd entry that this pud is folded into
88192@@ -12,11 +17,6 @@
88193 */
88194 typedef struct { pgd_t pgd; } pud_t;
88195
88196-#define PUD_SHIFT PGDIR_SHIFT
88197-#define PTRS_PER_PUD 1
88198-#define PUD_SIZE (1UL << PUD_SHIFT)
88199-#define PUD_MASK (~(PUD_SIZE-1))
88200-
88201 /*
88202 * The "pgd_xxx()" functions here are trivial for a folded two-level
88203 * setup: the pud is never bad, and a pud always exists (as it's folded
88204@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
88205 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
88206
88207 #define pgd_populate(mm, pgd, pud) do { } while (0)
88208+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
88209 /*
88210 * (puds are folded into pgds so this doesn't get actually called,
88211 * but the define is needed for a generic inline function.)
88212diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
88213index 4d46085..f4e92ef 100644
88214--- a/include/asm-generic/pgtable.h
88215+++ b/include/asm-generic/pgtable.h
88216@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
88217 }
88218 #endif /* CONFIG_NUMA_BALANCING */
88219
88220+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
88221+#ifdef CONFIG_PAX_KERNEXEC
88222+#error KERNEXEC requires pax_open_kernel
88223+#else
88224+static inline unsigned long pax_open_kernel(void) { return 0; }
88225+#endif
88226+#endif
88227+
88228+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
88229+#ifdef CONFIG_PAX_KERNEXEC
88230+#error KERNEXEC requires pax_close_kernel
88231+#else
88232+static inline unsigned long pax_close_kernel(void) { return 0; }
88233+#endif
88234+#endif
88235+
88236 #endif /* CONFIG_MMU */
88237
88238 #endif /* !__ASSEMBLY__ */
88239diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
88240index 72d8803..cb9749c 100644
88241--- a/include/asm-generic/uaccess.h
88242+++ b/include/asm-generic/uaccess.h
88243@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
88244 return __clear_user(to, n);
88245 }
88246
88247+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
88248+#ifdef CONFIG_PAX_MEMORY_UDEREF
88249+#error UDEREF requires pax_open_userland
88250+#else
88251+static inline unsigned long pax_open_userland(void) { return 0; }
88252+#endif
88253+#endif
88254+
88255+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
88256+#ifdef CONFIG_PAX_MEMORY_UDEREF
88257+#error UDEREF requires pax_close_userland
88258+#else
88259+static inline unsigned long pax_close_userland(void) { return 0; }
88260+#endif
88261+#endif
88262+
88263 #endif /* __ASM_GENERIC_UACCESS_H */
88264diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
88265index ac78910..8b5f068 100644
88266--- a/include/asm-generic/vmlinux.lds.h
88267+++ b/include/asm-generic/vmlinux.lds.h
88268@@ -234,6 +234,7 @@
88269 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
88270 VMLINUX_SYMBOL(__start_rodata) = .; \
88271 *(.rodata) *(.rodata.*) \
88272+ *(.data..read_only) \
88273 *(__vermagic) /* Kernel version magic */ \
88274 . = ALIGN(8); \
88275 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
88276@@ -492,6 +493,7 @@
88277 KERNEL_CTORS() \
88278 MCOUNT_REC() \
88279 *(.init.rodata) \
88280+ *(.init.rodata.*) \
88281 FTRACE_EVENTS() \
88282 TRACE_SYSCALLS() \
88283 KPROBE_BLACKLIST() \
88284@@ -511,6 +513,8 @@
88285
88286 #define EXIT_DATA \
88287 *(.exit.data) \
88288+ *(.exit.rodata) \
88289+ *(.exit.rodata.*) \
88290 MEM_DISCARD(exit.data) \
88291 MEM_DISCARD(exit.rodata)
88292
88293@@ -727,17 +731,18 @@
88294 * section in the linker script will go there too. @phdr should have
88295 * a leading colon.
88296 *
88297- * Note that this macros defines __per_cpu_load as an absolute symbol.
88298+ * Note that this macros defines per_cpu_load as an absolute symbol.
88299 * If there is no need to put the percpu section at a predetermined
88300 * address, use PERCPU_SECTION.
88301 */
88302 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
88303- VMLINUX_SYMBOL(__per_cpu_load) = .; \
88304- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
88305+ per_cpu_load = .; \
88306+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
88307 - LOAD_OFFSET) { \
88308+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
88309 PERCPU_INPUT(cacheline) \
88310 } phdr \
88311- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
88312+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
88313
88314 /**
88315 * PERCPU_SECTION - define output section for percpu area, simple version
88316diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
88317index 623a59c..1e79ab9 100644
88318--- a/include/crypto/algapi.h
88319+++ b/include/crypto/algapi.h
88320@@ -34,7 +34,7 @@ struct crypto_type {
88321 unsigned int maskclear;
88322 unsigned int maskset;
88323 unsigned int tfmsize;
88324-};
88325+} __do_const;
88326
88327 struct crypto_instance {
88328 struct crypto_alg alg;
88329diff --git a/include/drm/drmP.h b/include/drm/drmP.h
88330index e928625..ff97886 100644
88331--- a/include/drm/drmP.h
88332+++ b/include/drm/drmP.h
88333@@ -59,6 +59,7 @@
88334
88335 #include <asm/mman.h>
88336 #include <asm/pgalloc.h>
88337+#include <asm/local.h>
88338 #include <asm/uaccess.h>
88339
88340 #include <uapi/drm/drm.h>
88341@@ -133,17 +134,18 @@ void drm_err(const char *format, ...);
88342 /*@{*/
88343
88344 /* driver capabilities and requirements mask */
88345-#define DRIVER_USE_AGP 0x1
88346-#define DRIVER_PCI_DMA 0x8
88347-#define DRIVER_SG 0x10
88348-#define DRIVER_HAVE_DMA 0x20
88349-#define DRIVER_HAVE_IRQ 0x40
88350-#define DRIVER_IRQ_SHARED 0x80
88351-#define DRIVER_GEM 0x1000
88352-#define DRIVER_MODESET 0x2000
88353-#define DRIVER_PRIME 0x4000
88354-#define DRIVER_RENDER 0x8000
88355-#define DRIVER_ATOMIC 0x10000
88356+#define DRIVER_USE_AGP 0x1
88357+#define DRIVER_PCI_DMA 0x8
88358+#define DRIVER_SG 0x10
88359+#define DRIVER_HAVE_DMA 0x20
88360+#define DRIVER_HAVE_IRQ 0x40
88361+#define DRIVER_IRQ_SHARED 0x80
88362+#define DRIVER_GEM 0x1000
88363+#define DRIVER_MODESET 0x2000
88364+#define DRIVER_PRIME 0x4000
88365+#define DRIVER_RENDER 0x8000
88366+#define DRIVER_ATOMIC 0x10000
88367+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
88368
88369 /***********************************************************************/
88370 /** \name Macros to make printk easier */
88371@@ -224,10 +226,12 @@ void drm_err(const char *format, ...);
88372 * \param cmd command.
88373 * \param arg argument.
88374 */
88375-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
88376+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
88377+ struct drm_file *file_priv);
88378+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
88379 struct drm_file *file_priv);
88380
88381-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88382+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
88383 unsigned long arg);
88384
88385 #define DRM_IOCTL_NR(n) _IOC_NR(n)
88386@@ -243,10 +247,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
88387 struct drm_ioctl_desc {
88388 unsigned int cmd;
88389 int flags;
88390- drm_ioctl_t *func;
88391+ drm_ioctl_t func;
88392 unsigned int cmd_drv;
88393 const char *name;
88394-};
88395+} __do_const;
88396
88397 /**
88398 * Creates a driver or general drm_ioctl_desc array entry for the given
88399@@ -632,7 +636,8 @@ struct drm_info_list {
88400 int (*show)(struct seq_file*, void*); /** show callback */
88401 u32 driver_features; /**< Required driver features for this entry */
88402 void *data;
88403-};
88404+} __do_const;
88405+typedef struct drm_info_list __no_const drm_info_list_no_const;
88406
88407 /**
88408 * debugfs node structure. This structure represents a debugfs file.
88409@@ -716,7 +721,7 @@ struct drm_device {
88410
88411 /** \name Usage Counters */
88412 /*@{ */
88413- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88414+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
88415 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
88416 int buf_use; /**< Buffers in use -- cannot alloc */
88417 atomic_t buf_alloc; /**< Buffer allocation in progress */
88418diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
88419index c250a22..59d2094 100644
88420--- a/include/drm/drm_crtc_helper.h
88421+++ b/include/drm/drm_crtc_helper.h
88422@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
88423 int (*atomic_check)(struct drm_encoder *encoder,
88424 struct drm_crtc_state *crtc_state,
88425 struct drm_connector_state *conn_state);
88426-};
88427+} __no_const;
88428
88429 /**
88430 * struct drm_connector_helper_funcs - helper operations for connectors
88431diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
88432index d016dc5..3951fe0 100644
88433--- a/include/drm/i915_pciids.h
88434+++ b/include/drm/i915_pciids.h
88435@@ -37,7 +37,7 @@
88436 */
88437 #define INTEL_VGA_DEVICE(id, info) { \
88438 0x8086, id, \
88439- ~0, ~0, \
88440+ PCI_ANY_ID, PCI_ANY_ID, \
88441 0x030000, 0xff0000, \
88442 (unsigned long) info }
88443
88444diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
88445index 72dcbe8..8db58d7 100644
88446--- a/include/drm/ttm/ttm_memory.h
88447+++ b/include/drm/ttm/ttm_memory.h
88448@@ -48,7 +48,7 @@
88449
88450 struct ttm_mem_shrink {
88451 int (*do_shrink) (struct ttm_mem_shrink *);
88452-};
88453+} __no_const;
88454
88455 /**
88456 * struct ttm_mem_global - Global memory accounting structure.
88457diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
88458index 49a8284..9643967 100644
88459--- a/include/drm/ttm/ttm_page_alloc.h
88460+++ b/include/drm/ttm/ttm_page_alloc.h
88461@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
88462 */
88463 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
88464
88465+struct device;
88466 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88467 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
88468
88469diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
88470index 4b840e8..155d235 100644
88471--- a/include/keys/asymmetric-subtype.h
88472+++ b/include/keys/asymmetric-subtype.h
88473@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
88474 /* Verify the signature on a key of this subtype (optional) */
88475 int (*verify_signature)(const struct key *key,
88476 const struct public_key_signature *sig);
88477-};
88478+} __do_const;
88479
88480 /**
88481 * asymmetric_key_subtype - Get the subtype from an asymmetric key
88482diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
88483index c1da539..1dcec55 100644
88484--- a/include/linux/atmdev.h
88485+++ b/include/linux/atmdev.h
88486@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
88487 #endif
88488
88489 struct k_atm_aal_stats {
88490-#define __HANDLE_ITEM(i) atomic_t i
88491+#define __HANDLE_ITEM(i) atomic_unchecked_t i
88492 __AAL_STAT_ITEMS
88493 #undef __HANDLE_ITEM
88494 };
88495@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
88496 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
88497 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
88498 struct module *owner;
88499-};
88500+} __do_const ;
88501
88502 struct atmphy_ops {
88503 int (*start)(struct atm_dev *dev);
88504diff --git a/include/linux/atomic.h b/include/linux/atomic.h
88505index 5b08a85..60922fb 100644
88506--- a/include/linux/atomic.h
88507+++ b/include/linux/atomic.h
88508@@ -12,7 +12,7 @@
88509 * Atomically adds @a to @v, so long as @v was not already @u.
88510 * Returns non-zero if @v was not @u, and zero otherwise.
88511 */
88512-static inline int atomic_add_unless(atomic_t *v, int a, int u)
88513+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
88514 {
88515 return __atomic_add_unless(v, a, u) != u;
88516 }
88517diff --git a/include/linux/audit.h b/include/linux/audit.h
88518index c2e7e3a..8bfc0e1 100644
88519--- a/include/linux/audit.h
88520+++ b/include/linux/audit.h
88521@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
88522 extern unsigned int audit_serial(void);
88523 extern int auditsc_get_stamp(struct audit_context *ctx,
88524 struct timespec *t, unsigned int *serial);
88525-extern int audit_set_loginuid(kuid_t loginuid);
88526+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
88527
88528 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
88529 {
88530diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
88531index 576e463..28fd926 100644
88532--- a/include/linux/binfmts.h
88533+++ b/include/linux/binfmts.h
88534@@ -44,7 +44,7 @@ struct linux_binprm {
88535 unsigned interp_flags;
88536 unsigned interp_data;
88537 unsigned long loader, exec;
88538-};
88539+} __randomize_layout;
88540
88541 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
88542 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
88543@@ -77,8 +77,10 @@ struct linux_binfmt {
88544 int (*load_binary)(struct linux_binprm *);
88545 int (*load_shlib)(struct file *);
88546 int (*core_dump)(struct coredump_params *cprm);
88547+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
88548+ void (*handle_mmap)(struct file *);
88549 unsigned long min_coredump; /* minimal dump size */
88550-};
88551+} __do_const __randomize_layout;
88552
88553 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
88554
88555diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
88556index dbfbf49..10be372 100644
88557--- a/include/linux/bitmap.h
88558+++ b/include/linux/bitmap.h
88559@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
88560 return __bitmap_full(src, nbits);
88561 }
88562
88563-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
88564+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
88565 {
88566 if (small_const_nbits(nbits))
88567 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
88568diff --git a/include/linux/bitops.h b/include/linux/bitops.h
88569index 5d858e0..336c1d9 100644
88570--- a/include/linux/bitops.h
88571+++ b/include/linux/bitops.h
88572@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
88573 * @word: value to rotate
88574 * @shift: bits to roll
88575 */
88576-static inline __u32 rol32(__u32 word, unsigned int shift)
88577+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
88578 {
88579 return (word << shift) | (word >> (32 - shift));
88580 }
88581@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
88582 * @word: value to rotate
88583 * @shift: bits to roll
88584 */
88585-static inline __u32 ror32(__u32 word, unsigned int shift)
88586+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
88587 {
88588 return (word >> shift) | (word << (32 - shift));
88589 }
88590@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
88591 return (__s32)(value << shift) >> shift;
88592 }
88593
88594-static inline unsigned fls_long(unsigned long l)
88595+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
88596 {
88597 if (sizeof(l) == 4)
88598 return fls(l);
88599diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
88600index 7f9a516..8889453 100644
88601--- a/include/linux/blkdev.h
88602+++ b/include/linux/blkdev.h
88603@@ -1616,7 +1616,7 @@ struct block_device_operations {
88604 /* this callback is with swap_lock and sometimes page table lock held */
88605 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
88606 struct module *owner;
88607-};
88608+} __do_const;
88609
88610 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
88611 unsigned long);
88612diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
88613index afc1343..9735539 100644
88614--- a/include/linux/blktrace_api.h
88615+++ b/include/linux/blktrace_api.h
88616@@ -25,7 +25,7 @@ struct blk_trace {
88617 struct dentry *dropped_file;
88618 struct dentry *msg_file;
88619 struct list_head running_list;
88620- atomic_t dropped;
88621+ atomic_unchecked_t dropped;
88622 };
88623
88624 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
88625diff --git a/include/linux/cache.h b/include/linux/cache.h
88626index 17e7e82..1d7da26 100644
88627--- a/include/linux/cache.h
88628+++ b/include/linux/cache.h
88629@@ -16,6 +16,14 @@
88630 #define __read_mostly
88631 #endif
88632
88633+#ifndef __read_only
88634+#ifdef CONFIG_PAX_KERNEXEC
88635+#error KERNEXEC requires __read_only
88636+#else
88637+#define __read_only __read_mostly
88638+#endif
88639+#endif
88640+
88641 #ifndef ____cacheline_aligned
88642 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
88643 #endif
88644diff --git a/include/linux/capability.h b/include/linux/capability.h
88645index aa93e5e..985a1b0 100644
88646--- a/include/linux/capability.h
88647+++ b/include/linux/capability.h
88648@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
88649 extern bool capable(int cap);
88650 extern bool ns_capable(struct user_namespace *ns, int cap);
88651 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
88652+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
88653 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
88654+extern bool capable_nolog(int cap);
88655+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
88656
88657 /* audit system wants to get cap info from files as well */
88658 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
88659
88660+extern int is_privileged_binary(const struct dentry *dentry);
88661+
88662 #endif /* !_LINUX_CAPABILITY_H */
88663diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
88664index 8609d57..86e4d79 100644
88665--- a/include/linux/cdrom.h
88666+++ b/include/linux/cdrom.h
88667@@ -87,7 +87,6 @@ struct cdrom_device_ops {
88668
88669 /* driver specifications */
88670 const int capability; /* capability flags */
88671- int n_minors; /* number of active minor devices */
88672 /* handle uniform packets for scsi type devices (scsi,atapi) */
88673 int (*generic_packet) (struct cdrom_device_info *,
88674 struct packet_command *);
88675diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
88676index 4ce9056..86caac6 100644
88677--- a/include/linux/cleancache.h
88678+++ b/include/linux/cleancache.h
88679@@ -31,7 +31,7 @@ struct cleancache_ops {
88680 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
88681 void (*invalidate_inode)(int, struct cleancache_filekey);
88682 void (*invalidate_fs)(int);
88683-};
88684+} __no_const;
88685
88686 extern struct cleancache_ops *
88687 cleancache_register_ops(struct cleancache_ops *ops);
88688diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
88689index 5591ea7..61b77ce 100644
88690--- a/include/linux/clk-provider.h
88691+++ b/include/linux/clk-provider.h
88692@@ -195,6 +195,7 @@ struct clk_ops {
88693 void (*init)(struct clk_hw *hw);
88694 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
88695 };
88696+typedef struct clk_ops __no_const clk_ops_no_const;
88697
88698 /**
88699 * struct clk_init_data - holds init data that's common to all clocks and is
88700diff --git a/include/linux/compat.h b/include/linux/compat.h
88701index ab25814..d1540d1 100644
88702--- a/include/linux/compat.h
88703+++ b/include/linux/compat.h
88704@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
88705 compat_size_t __user *len_ptr);
88706
88707 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
88708-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
88709+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
88710 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
88711 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
88712 compat_ssize_t msgsz, int msgflg);
88713@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
88714 long compat_sys_msgctl(int first, int second, void __user *uptr);
88715 long compat_sys_shmctl(int first, int second, void __user *uptr);
88716 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
88717- unsigned nsems, const struct compat_timespec __user *timeout);
88718+ compat_long_t nsems, const struct compat_timespec __user *timeout);
88719 asmlinkage long compat_sys_keyctl(u32 option,
88720 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
88721 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
88722@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
88723 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
88724 compat_ulong_t addr, compat_ulong_t data);
88725 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
88726- compat_long_t addr, compat_long_t data);
88727+ compat_ulong_t addr, compat_ulong_t data);
88728
88729 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
88730 /*
88731diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
88732index cdf13ca..ba5e086 100644
88733--- a/include/linux/compiler-gcc.h
88734+++ b/include/linux/compiler-gcc.h
88735@@ -94,8 +94,8 @@
88736 */
88737 #define __pure __attribute__((pure))
88738 #define __aligned(x) __attribute__((aligned(x)))
88739-#define __printf(a, b) __attribute__((format(printf, a, b)))
88740-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
88741+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
88742+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
88743 #define noinline __attribute__((noinline))
88744 #define __attribute_const__ __attribute__((__const__))
88745 #define __maybe_unused __attribute__((unused))
88746diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
88747index 769e198..7ee7cb5 100644
88748--- a/include/linux/compiler-gcc4.h
88749+++ b/include/linux/compiler-gcc4.h
88750@@ -39,9 +39,38 @@
88751 # define __compiletime_warning(message) __attribute__((warning(message)))
88752 # define __compiletime_error(message) __attribute__((error(message)))
88753 #endif /* __CHECKER__ */
88754+
88755+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88756+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88757+#define __bos0(ptr) __bos((ptr), 0)
88758+#define __bos1(ptr) __bos((ptr), 1)
88759 #endif /* GCC_VERSION >= 40300 */
88760
88761 #if GCC_VERSION >= 40500
88762+
88763+#ifdef RANDSTRUCT_PLUGIN
88764+#define __randomize_layout __attribute__((randomize_layout))
88765+#define __no_randomize_layout __attribute__((no_randomize_layout))
88766+#endif
88767+
88768+#ifdef CONSTIFY_PLUGIN
88769+#define __no_const __attribute__((no_const))
88770+#define __do_const __attribute__((do_const))
88771+#endif
88772+
88773+#ifdef SIZE_OVERFLOW_PLUGIN
88774+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88775+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88776+#endif
88777+
88778+#ifdef LATENT_ENTROPY_PLUGIN
88779+#define __latent_entropy __attribute__((latent_entropy))
88780+#endif
88781+
88782+#ifdef INITIFY_PLUGIN
88783+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88784+#endif
88785+
88786 /*
88787 * Mark a position in code as unreachable. This can be used to
88788 * suppress control flow warnings after asm blocks that transfer
88789diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
88790index efee493..8aa8f6b 100644
88791--- a/include/linux/compiler-gcc5.h
88792+++ b/include/linux/compiler-gcc5.h
88793@@ -28,6 +28,34 @@
88794 # define __compiletime_error(message) __attribute__((error(message)))
88795 #endif /* __CHECKER__ */
88796
88797+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
88798+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
88799+#define __bos0(ptr) __bos((ptr), 0)
88800+#define __bos1(ptr) __bos((ptr), 1)
88801+
88802+#ifdef RANDSTRUCT_PLUGIN
88803+#define __randomize_layout __attribute__((randomize_layout))
88804+#define __no_randomize_layout __attribute__((no_randomize_layout))
88805+#endif
88806+
88807+#ifdef CONSTIFY_PLUGIN
88808+#define __no_const __attribute__((no_const))
88809+#define __do_const __attribute__((do_const))
88810+#endif
88811+
88812+#ifdef SIZE_OVERFLOW_PLUGIN
88813+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
88814+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
88815+#endif
88816+
88817+#ifdef LATENT_ENTROPY_PLUGIN
88818+#define __latent_entropy __attribute__((latent_entropy))
88819+#endif
88820+
88821+#ifdef INITIFY_PLUGIN
88822+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
88823+#endif
88824+
88825 /*
88826 * Mark a position in code as unreachable. This can be used to
88827 * suppress control flow warnings after asm blocks that transfer
88828diff --git a/include/linux/compiler.h b/include/linux/compiler.h
88829index 1b45e4a..eff29a7 100644
88830--- a/include/linux/compiler.h
88831+++ b/include/linux/compiler.h
88832@@ -5,11 +5,14 @@
88833
88834 #ifdef __CHECKER__
88835 # define __user __attribute__((noderef, address_space(1)))
88836+# define __force_user __force __user
88837 # define __kernel __attribute__((address_space(0)))
88838+# define __force_kernel __force __kernel
88839 # define __safe __attribute__((safe))
88840 # define __force __attribute__((force))
88841 # define __nocast __attribute__((nocast))
88842 # define __iomem __attribute__((noderef, address_space(2)))
88843+# define __force_iomem __force __iomem
88844 # define __must_hold(x) __attribute__((context(x,1,1)))
88845 # define __acquires(x) __attribute__((context(x,0,1)))
88846 # define __releases(x) __attribute__((context(x,1,0)))
88847@@ -17,20 +20,37 @@
88848 # define __release(x) __context__(x,-1)
88849 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
88850 # define __percpu __attribute__((noderef, address_space(3)))
88851+# define __force_percpu __force __percpu
88852 #ifdef CONFIG_SPARSE_RCU_POINTER
88853 # define __rcu __attribute__((noderef, address_space(4)))
88854+# define __force_rcu __force __rcu
88855 #else
88856 # define __rcu
88857+# define __force_rcu
88858 #endif
88859 extern void __chk_user_ptr(const volatile void __user *);
88860 extern void __chk_io_ptr(const volatile void __iomem *);
88861 #else
88862-# define __user
88863-# define __kernel
88864+# ifdef CHECKER_PLUGIN
88865+//# define __user
88866+//# define __force_user
88867+//# define __kernel
88868+//# define __force_kernel
88869+# else
88870+# ifdef STRUCTLEAK_PLUGIN
88871+# define __user __attribute__((user))
88872+# else
88873+# define __user
88874+# endif
88875+# define __force_user
88876+# define __kernel
88877+# define __force_kernel
88878+# endif
88879 # define __safe
88880 # define __force
88881 # define __nocast
88882 # define __iomem
88883+# define __force_iomem
88884 # define __chk_user_ptr(x) (void)0
88885 # define __chk_io_ptr(x) (void)0
88886 # define __builtin_warning(x, y...) (1)
88887@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
88888 # define __release(x) (void)0
88889 # define __cond_lock(x,c) (c)
88890 # define __percpu
88891+# define __force_percpu
88892 # define __rcu
88893+# define __force_rcu
88894 #endif
88895
88896 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
88897@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
88898 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
88899 {
88900 switch (size) {
88901- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
88902- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
88903- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
88904+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
88905+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
88906+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
88907 #ifdef CONFIG_64BIT
88908- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
88909+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
88910 #endif
88911 default:
88912 barrier();
88913- __builtin_memcpy((void *)res, (const void *)p, size);
88914+ __builtin_memcpy(res, (const void *)p, size);
88915 data_access_exceeds_word_size();
88916 barrier();
88917 }
88918 }
88919
88920-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
88921+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
88922 {
88923 switch (size) {
88924- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
88925- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
88926- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
88927+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
88928+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
88929+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
88930 #ifdef CONFIG_64BIT
88931- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
88932+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
88933 #endif
88934 default:
88935 barrier();
88936- __builtin_memcpy((void *)p, (const void *)res, size);
88937+ __builtin_memcpy((void *)p, res, size);
88938 data_access_exceeds_word_size();
88939 barrier();
88940 }
88941@@ -364,6 +386,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88942 # define __attribute_const__ /* unimplemented */
88943 #endif
88944
88945+#ifndef __randomize_layout
88946+# define __randomize_layout
88947+#endif
88948+
88949+#ifndef __no_randomize_layout
88950+# define __no_randomize_layout
88951+#endif
88952+
88953+#ifndef __no_const
88954+# define __no_const
88955+#endif
88956+
88957+#ifndef __do_const
88958+# define __do_const
88959+#endif
88960+
88961+#ifndef __size_overflow
88962+# define __size_overflow(...)
88963+#endif
88964+
88965+#ifndef __intentional_overflow
88966+# define __intentional_overflow(...)
88967+#endif
88968+
88969+#ifndef __latent_entropy
88970+# define __latent_entropy
88971+#endif
88972+
88973+#ifndef __nocapture
88974+# define __nocapture(...)
88975+#endif
88976+
88977 /*
88978 * Tell gcc if a function is cold. The compiler will assume any path
88979 * directly leading to the call is unlikely.
88980@@ -373,6 +427,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
88981 #define __cold
88982 #endif
88983
88984+#ifndef __alloc_size
88985+#define __alloc_size(...)
88986+#endif
88987+
88988+#ifndef __bos
88989+#define __bos(ptr, arg)
88990+#endif
88991+
88992+#ifndef __bos0
88993+#define __bos0(ptr)
88994+#endif
88995+
88996+#ifndef __bos1
88997+#define __bos1(ptr)
88998+#endif
88999+
89000 /* Simple shorthand for a section definition */
89001 #ifndef __section
89002 # define __section(S) __attribute__ ((__section__(#S)))
89003@@ -387,6 +457,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89004 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
89005 #endif
89006
89007+#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))
89008+
89009 /* Is this type a native word size -- useful for atomic operations */
89010 #ifndef __native_word
89011 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
89012@@ -466,8 +538,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
89013 */
89014 #define __ACCESS_ONCE(x) ({ \
89015 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
89016- (volatile typeof(x) *)&(x); })
89017+ (volatile const typeof(x) *)&(x); })
89018 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
89019+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
89020
89021 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
89022 #ifdef CONFIG_KPROBES
89023diff --git a/include/linux/completion.h b/include/linux/completion.h
89024index 5d5aaae..0ea9b84 100644
89025--- a/include/linux/completion.h
89026+++ b/include/linux/completion.h
89027@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
89028
89029 extern void wait_for_completion(struct completion *);
89030 extern void wait_for_completion_io(struct completion *);
89031-extern int wait_for_completion_interruptible(struct completion *x);
89032-extern int wait_for_completion_killable(struct completion *x);
89033+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
89034+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
89035 extern unsigned long wait_for_completion_timeout(struct completion *x,
89036- unsigned long timeout);
89037+ unsigned long timeout) __intentional_overflow(-1);
89038 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
89039- unsigned long timeout);
89040+ unsigned long timeout) __intentional_overflow(-1);
89041 extern long wait_for_completion_interruptible_timeout(
89042- struct completion *x, unsigned long timeout);
89043+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89044 extern long wait_for_completion_killable_timeout(
89045- struct completion *x, unsigned long timeout);
89046+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
89047 extern bool try_wait_for_completion(struct completion *x);
89048 extern bool completion_done(struct completion *x);
89049
89050diff --git a/include/linux/configfs.h b/include/linux/configfs.h
89051index 34025df..d94bbbc 100644
89052--- a/include/linux/configfs.h
89053+++ b/include/linux/configfs.h
89054@@ -125,7 +125,7 @@ struct configfs_attribute {
89055 const char *ca_name;
89056 struct module *ca_owner;
89057 umode_t ca_mode;
89058-};
89059+} __do_const;
89060
89061 /*
89062 * Users often need to create attribute structures for their configurable
89063diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
89064index 2ee4888..0451f5e 100644
89065--- a/include/linux/cpufreq.h
89066+++ b/include/linux/cpufreq.h
89067@@ -207,6 +207,7 @@ struct global_attr {
89068 ssize_t (*store)(struct kobject *a, struct attribute *b,
89069 const char *c, size_t count);
89070 };
89071+typedef struct global_attr __no_const global_attr_no_const;
89072
89073 #define define_one_global_ro(_name) \
89074 static struct global_attr _name = \
89075@@ -278,7 +279,7 @@ struct cpufreq_driver {
89076 bool boost_supported;
89077 bool boost_enabled;
89078 int (*set_boost)(int state);
89079-};
89080+} __do_const;
89081
89082 /* flags */
89083 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
89084diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
89085index 9c5e892..feb34e0 100644
89086--- a/include/linux/cpuidle.h
89087+++ b/include/linux/cpuidle.h
89088@@ -59,7 +59,8 @@ struct cpuidle_state {
89089 void (*enter_freeze) (struct cpuidle_device *dev,
89090 struct cpuidle_driver *drv,
89091 int index);
89092-};
89093+} __do_const;
89094+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
89095
89096 /* Idle State Flags */
89097 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
89098@@ -227,7 +228,7 @@ struct cpuidle_governor {
89099 void (*reflect) (struct cpuidle_device *dev, int index);
89100
89101 struct module *owner;
89102-};
89103+} __do_const;
89104
89105 #ifdef CONFIG_CPU_IDLE
89106 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
89107diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
89108index 086549a..a572d94 100644
89109--- a/include/linux/cpumask.h
89110+++ b/include/linux/cpumask.h
89111@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89112 }
89113
89114 /* Valid inputs for n are -1 and 0. */
89115-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89116+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89117 {
89118 return n+1;
89119 }
89120
89121-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89122+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89123 {
89124 return n+1;
89125 }
89126
89127-static inline unsigned int cpumask_next_and(int n,
89128+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
89129 const struct cpumask *srcp,
89130 const struct cpumask *andp)
89131 {
89132@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
89133 *
89134 * Returns >= nr_cpu_ids if no further cpus set.
89135 */
89136-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89137+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
89138 {
89139 /* -1 is a legal arg here. */
89140 if (n != -1)
89141@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
89142 *
89143 * Returns >= nr_cpu_ids if no further cpus unset.
89144 */
89145-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89146+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
89147 {
89148 /* -1 is a legal arg here. */
89149 if (n != -1)
89150@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
89151 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
89152 }
89153
89154-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
89155+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
89156 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
89157 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
89158
89159@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
89160 * cpumask_weight - Count of bits in *srcp
89161 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
89162 */
89163-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
89164+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
89165 {
89166 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
89167 }
89168diff --git a/include/linux/cred.h b/include/linux/cred.h
89169index 2fb2ca2..d6a3340 100644
89170--- a/include/linux/cred.h
89171+++ b/include/linux/cred.h
89172@@ -35,7 +35,7 @@ struct group_info {
89173 int nblocks;
89174 kgid_t small_block[NGROUPS_SMALL];
89175 kgid_t *blocks[0];
89176-};
89177+} __randomize_layout;
89178
89179 /**
89180 * get_group_info - Get a reference to a group info structure
89181@@ -137,7 +137,7 @@ struct cred {
89182 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
89183 struct group_info *group_info; /* supplementary groups for euid/fsgid */
89184 struct rcu_head rcu; /* RCU deletion hook */
89185-};
89186+} __randomize_layout;
89187
89188 extern void __put_cred(struct cred *);
89189 extern void exit_creds(struct task_struct *);
89190@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
89191 static inline void validate_process_creds(void)
89192 {
89193 }
89194+static inline void validate_task_creds(struct task_struct *task)
89195+{
89196+}
89197 #endif
89198
89199 /**
89200@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
89201
89202 #define task_uid(task) (task_cred_xxx((task), uid))
89203 #define task_euid(task) (task_cred_xxx((task), euid))
89204+#define task_securebits(task) (task_cred_xxx((task), securebits))
89205
89206 #define current_cred_xxx(xxx) \
89207 ({ \
89208diff --git a/include/linux/crypto.h b/include/linux/crypto.h
89209index fb5ef16..05d1e59 100644
89210--- a/include/linux/crypto.h
89211+++ b/include/linux/crypto.h
89212@@ -626,7 +626,7 @@ struct cipher_tfm {
89213 const u8 *key, unsigned int keylen);
89214 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89215 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
89216-};
89217+} __no_const;
89218
89219 struct hash_tfm {
89220 int (*init)(struct hash_desc *desc);
89221@@ -647,13 +647,13 @@ struct compress_tfm {
89222 int (*cot_decompress)(struct crypto_tfm *tfm,
89223 const u8 *src, unsigned int slen,
89224 u8 *dst, unsigned int *dlen);
89225-};
89226+} __no_const;
89227
89228 struct rng_tfm {
89229 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
89230 unsigned int dlen);
89231 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
89232-};
89233+} __no_const;
89234
89235 #define crt_ablkcipher crt_u.ablkcipher
89236 #define crt_aead crt_u.aead
89237diff --git a/include/linux/ctype.h b/include/linux/ctype.h
89238index 653589e..4ef254a 100644
89239--- a/include/linux/ctype.h
89240+++ b/include/linux/ctype.h
89241@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
89242 * Fast implementation of tolower() for internal usage. Do not use in your
89243 * code.
89244 */
89245-static inline char _tolower(const char c)
89246+static inline unsigned char _tolower(const unsigned char c)
89247 {
89248 return c | 0x20;
89249 }
89250diff --git a/include/linux/dcache.h b/include/linux/dcache.h
89251index d835879..c8e5b92 100644
89252--- a/include/linux/dcache.h
89253+++ b/include/linux/dcache.h
89254@@ -123,6 +123,9 @@ struct dentry {
89255 unsigned long d_time; /* used by d_revalidate */
89256 void *d_fsdata; /* fs-specific data */
89257
89258+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
89259+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
89260+#endif
89261 struct list_head d_lru; /* LRU list */
89262 struct list_head d_child; /* child of parent list */
89263 struct list_head d_subdirs; /* our children */
89264@@ -133,7 +136,7 @@ struct dentry {
89265 struct hlist_node d_alias; /* inode alias list */
89266 struct rcu_head d_rcu;
89267 } d_u;
89268-};
89269+} __randomize_layout;
89270
89271 /*
89272 * dentry->d_lock spinlock nesting subclasses:
89273@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
89274
89275 static inline unsigned d_count(const struct dentry *dentry)
89276 {
89277- return dentry->d_lockref.count;
89278+ return __lockref_read(&dentry->d_lockref);
89279 }
89280
89281 /*
89282@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
89283 static inline struct dentry *dget_dlock(struct dentry *dentry)
89284 {
89285 if (dentry)
89286- dentry->d_lockref.count++;
89287+ __lockref_inc(&dentry->d_lockref);
89288 return dentry;
89289 }
89290
89291diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
89292index 7925bf0..d5143d2 100644
89293--- a/include/linux/decompress/mm.h
89294+++ b/include/linux/decompress/mm.h
89295@@ -77,7 +77,7 @@ static void free(void *where)
89296 * warnings when not needed (indeed large_malloc / large_free are not
89297 * needed by inflate */
89298
89299-#define malloc(a) kmalloc(a, GFP_KERNEL)
89300+#define malloc(a) kmalloc((a), GFP_KERNEL)
89301 #define free(a) kfree(a)
89302
89303 #define large_malloc(a) vmalloc(a)
89304diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
89305index ce447f0..83c66bd 100644
89306--- a/include/linux/devfreq.h
89307+++ b/include/linux/devfreq.h
89308@@ -114,7 +114,7 @@ struct devfreq_governor {
89309 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
89310 int (*event_handler)(struct devfreq *devfreq,
89311 unsigned int event, void *data);
89312-};
89313+} __do_const;
89314
89315 /**
89316 * struct devfreq - Device devfreq structure
89317diff --git a/include/linux/device.h b/include/linux/device.h
89318index 0eb8ee2..c603b6a 100644
89319--- a/include/linux/device.h
89320+++ b/include/linux/device.h
89321@@ -311,7 +311,7 @@ struct subsys_interface {
89322 struct list_head node;
89323 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
89324 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
89325-};
89326+} __do_const;
89327
89328 int subsys_interface_register(struct subsys_interface *sif);
89329 void subsys_interface_unregister(struct subsys_interface *sif);
89330@@ -507,7 +507,7 @@ struct device_type {
89331 void (*release)(struct device *dev);
89332
89333 const struct dev_pm_ops *pm;
89334-};
89335+} __do_const;
89336
89337 /* interface for exporting device attributes */
89338 struct device_attribute {
89339@@ -517,11 +517,12 @@ struct device_attribute {
89340 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
89341 const char *buf, size_t count);
89342 };
89343+typedef struct device_attribute __no_const device_attribute_no_const;
89344
89345 struct dev_ext_attribute {
89346 struct device_attribute attr;
89347 void *var;
89348-};
89349+} __do_const;
89350
89351 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
89352 char *buf);
89353diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
89354index c3007cb..43efc8c 100644
89355--- a/include/linux/dma-mapping.h
89356+++ b/include/linux/dma-mapping.h
89357@@ -60,7 +60,7 @@ struct dma_map_ops {
89358 u64 (*get_required_mask)(struct device *dev);
89359 #endif
89360 int is_phys;
89361-};
89362+} __do_const;
89363
89364 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
89365
89366diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
89367index b6997a0..108be6c 100644
89368--- a/include/linux/dmaengine.h
89369+++ b/include/linux/dmaengine.h
89370@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
89371 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
89372 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
89373
89374-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89375+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
89376 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
89377-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89378+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
89379 struct dma_pinned_list *pinned_list, struct page *page,
89380 unsigned int offset, size_t len);
89381
89382diff --git a/include/linux/efi.h b/include/linux/efi.h
89383index cf7e431..d239dce 100644
89384--- a/include/linux/efi.h
89385+++ b/include/linux/efi.h
89386@@ -1056,6 +1056,7 @@ struct efivar_operations {
89387 efi_set_variable_nonblocking_t *set_variable_nonblocking;
89388 efi_query_variable_store_t *query_variable_store;
89389 };
89390+typedef struct efivar_operations __no_const efivar_operations_no_const;
89391
89392 struct efivars {
89393 /*
89394diff --git a/include/linux/elf.h b/include/linux/elf.h
89395index 20fa8d8..3d0dd18 100644
89396--- a/include/linux/elf.h
89397+++ b/include/linux/elf.h
89398@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
89399 #define elf_note elf32_note
89400 #define elf_addr_t Elf32_Off
89401 #define Elf_Half Elf32_Half
89402+#define elf_dyn Elf32_Dyn
89403
89404 #else
89405
89406@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
89407 #define elf_note elf64_note
89408 #define elf_addr_t Elf64_Off
89409 #define Elf_Half Elf64_Half
89410+#define elf_dyn Elf64_Dyn
89411
89412 #endif
89413
89414diff --git a/include/linux/err.h b/include/linux/err.h
89415index a729120..6ede2c9 100644
89416--- a/include/linux/err.h
89417+++ b/include/linux/err.h
89418@@ -20,12 +20,12 @@
89419
89420 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
89421
89422-static inline void * __must_check ERR_PTR(long error)
89423+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
89424 {
89425 return (void *) error;
89426 }
89427
89428-static inline long __must_check PTR_ERR(__force const void *ptr)
89429+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
89430 {
89431 return (long) ptr;
89432 }
89433diff --git a/include/linux/extcon.h b/include/linux/extcon.h
89434index 36f49c4..a2a1f4c 100644
89435--- a/include/linux/extcon.h
89436+++ b/include/linux/extcon.h
89437@@ -135,7 +135,7 @@ struct extcon_dev {
89438 /* /sys/class/extcon/.../mutually_exclusive/... */
89439 struct attribute_group attr_g_muex;
89440 struct attribute **attrs_muex;
89441- struct device_attribute *d_attrs_muex;
89442+ device_attribute_no_const *d_attrs_muex;
89443 };
89444
89445 /**
89446diff --git a/include/linux/fb.h b/include/linux/fb.h
89447index 043f328..180ccbf 100644
89448--- a/include/linux/fb.h
89449+++ b/include/linux/fb.h
89450@@ -305,7 +305,8 @@ struct fb_ops {
89451 /* called at KDB enter and leave time to prepare the console */
89452 int (*fb_debug_enter)(struct fb_info *info);
89453 int (*fb_debug_leave)(struct fb_info *info);
89454-};
89455+} __do_const;
89456+typedef struct fb_ops __no_const fb_ops_no_const;
89457
89458 #ifdef CONFIG_FB_TILEBLITTING
89459 #define FB_TILE_CURSOR_NONE 0
89460diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
89461index 230f87b..1fd0485 100644
89462--- a/include/linux/fdtable.h
89463+++ b/include/linux/fdtable.h
89464@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
89465 void put_files_struct(struct files_struct *fs);
89466 void reset_files_struct(struct files_struct *);
89467 int unshare_files(struct files_struct **);
89468-struct files_struct *dup_fd(struct files_struct *, int *);
89469+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
89470 void do_close_on_exec(struct files_struct *);
89471 int iterate_fd(struct files_struct *, unsigned,
89472 int (*)(const void *, struct file *, unsigned),
89473diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
89474index 8293262..2b3b8bd 100644
89475--- a/include/linux/frontswap.h
89476+++ b/include/linux/frontswap.h
89477@@ -11,7 +11,7 @@ struct frontswap_ops {
89478 int (*load)(unsigned, pgoff_t, struct page *);
89479 void (*invalidate_page)(unsigned, pgoff_t);
89480 void (*invalidate_area)(unsigned);
89481-};
89482+} __no_const;
89483
89484 extern bool frontswap_enabled;
89485 extern struct frontswap_ops *
89486diff --git a/include/linux/fs.h b/include/linux/fs.h
89487index 52cc449..31f35cb 100644
89488--- a/include/linux/fs.h
89489+++ b/include/linux/fs.h
89490@@ -410,7 +410,7 @@ struct address_space {
89491 spinlock_t private_lock; /* for use by the address_space */
89492 struct list_head private_list; /* ditto */
89493 void *private_data; /* ditto */
89494-} __attribute__((aligned(sizeof(long))));
89495+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
89496 /*
89497 * On most architectures that alignment is already the case; but
89498 * must be enforced here for CRIS, to let the least significant bit
89499@@ -453,7 +453,7 @@ struct block_device {
89500 int bd_fsfreeze_count;
89501 /* Mutex for freeze */
89502 struct mutex bd_fsfreeze_mutex;
89503-};
89504+} __randomize_layout;
89505
89506 /*
89507 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
89508@@ -639,7 +639,7 @@ struct inode {
89509 #endif
89510
89511 void *i_private; /* fs or device private pointer */
89512-};
89513+} __randomize_layout;
89514
89515 static inline int inode_unhashed(struct inode *inode)
89516 {
89517@@ -834,7 +834,7 @@ struct file {
89518 struct list_head f_tfile_llink;
89519 #endif /* #ifdef CONFIG_EPOLL */
89520 struct address_space *f_mapping;
89521-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
89522+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
89523
89524 struct file_handle {
89525 __u32 handle_bytes;
89526@@ -962,7 +962,7 @@ struct file_lock {
89527 int state; /* state of grant or error if -ve */
89528 } afs;
89529 } fl_u;
89530-};
89531+} __randomize_layout;
89532
89533 struct file_lock_context {
89534 spinlock_t flc_lock;
89535@@ -1316,7 +1316,7 @@ struct super_block {
89536 * Indicates how deep in a filesystem stack this SB is
89537 */
89538 int s_stack_depth;
89539-};
89540+} __randomize_layout;
89541
89542 extern struct timespec current_fs_time(struct super_block *sb);
89543
89544@@ -1570,7 +1570,8 @@ struct file_operations {
89545 #ifndef CONFIG_MMU
89546 unsigned (*mmap_capabilities)(struct file *);
89547 #endif
89548-};
89549+} __do_const __randomize_layout;
89550+typedef struct file_operations __no_const file_operations_no_const;
89551
89552 struct inode_operations {
89553 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
89554@@ -2269,7 +2270,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
89555 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
89556 unsigned int count, const char *name,
89557 const struct file_operations *fops);
89558-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89559+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
89560 unsigned int count, const char *name);
89561 extern void unregister_chrdev_region(dev_t, unsigned);
89562 extern void chrdev_show(struct seq_file *,off_t);
89563@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
89564 return !IS_DEADDIR(inode);
89565 }
89566
89567+static inline bool is_sidechannel_device(const struct inode *inode)
89568+{
89569+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
89570+ umode_t mode = inode->i_mode;
89571+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
89572+#else
89573+ return false;
89574+#endif
89575+}
89576+
89577 #endif /* _LINUX_FS_H */
89578diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
89579index 0efc3e6..fd23610 100644
89580--- a/include/linux/fs_struct.h
89581+++ b/include/linux/fs_struct.h
89582@@ -6,13 +6,13 @@
89583 #include <linux/seqlock.h>
89584
89585 struct fs_struct {
89586- int users;
89587+ atomic_t users;
89588 spinlock_t lock;
89589 seqcount_t seq;
89590 int umask;
89591 int in_exec;
89592 struct path root, pwd;
89593-};
89594+} __randomize_layout;
89595
89596 extern struct kmem_cache *fs_cachep;
89597
89598diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
89599index 7714849..a4a5c7a 100644
89600--- a/include/linux/fscache-cache.h
89601+++ b/include/linux/fscache-cache.h
89602@@ -113,7 +113,7 @@ struct fscache_operation {
89603 fscache_operation_release_t release;
89604 };
89605
89606-extern atomic_t fscache_op_debug_id;
89607+extern atomic_unchecked_t fscache_op_debug_id;
89608 extern void fscache_op_work_func(struct work_struct *work);
89609
89610 extern void fscache_enqueue_operation(struct fscache_operation *);
89611@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
89612 INIT_WORK(&op->work, fscache_op_work_func);
89613 atomic_set(&op->usage, 1);
89614 op->state = FSCACHE_OP_ST_INITIALISED;
89615- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
89616+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
89617 op->processor = processor;
89618 op->release = release;
89619 INIT_LIST_HEAD(&op->pend_link);
89620diff --git a/include/linux/fscache.h b/include/linux/fscache.h
89621index 115bb81..e7b812b 100644
89622--- a/include/linux/fscache.h
89623+++ b/include/linux/fscache.h
89624@@ -152,7 +152,7 @@ struct fscache_cookie_def {
89625 * - this is mandatory for any object that may have data
89626 */
89627 void (*now_uncached)(void *cookie_netfs_data);
89628-};
89629+} __do_const;
89630
89631 /*
89632 * fscache cached network filesystem type
89633diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
89634index 7ee1774..72505b8 100644
89635--- a/include/linux/fsnotify.h
89636+++ b/include/linux/fsnotify.h
89637@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
89638 struct inode *inode = file_inode(file);
89639 __u32 mask = FS_ACCESS;
89640
89641+ if (is_sidechannel_device(inode))
89642+ return;
89643+
89644 if (S_ISDIR(inode->i_mode))
89645 mask |= FS_ISDIR;
89646
89647@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
89648 struct inode *inode = file_inode(file);
89649 __u32 mask = FS_MODIFY;
89650
89651+ if (is_sidechannel_device(inode))
89652+ return;
89653+
89654 if (S_ISDIR(inode->i_mode))
89655 mask |= FS_ISDIR;
89656
89657@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
89658 */
89659 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
89660 {
89661- return kstrdup(name, GFP_KERNEL);
89662+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
89663 }
89664
89665 /*
89666diff --git a/include/linux/genhd.h b/include/linux/genhd.h
89667index ec274e0..e678159 100644
89668--- a/include/linux/genhd.h
89669+++ b/include/linux/genhd.h
89670@@ -194,7 +194,7 @@ struct gendisk {
89671 struct kobject *slave_dir;
89672
89673 struct timer_rand_state *random;
89674- atomic_t sync_io; /* RAID */
89675+ atomic_unchecked_t sync_io; /* RAID */
89676 struct disk_events *ev;
89677 #ifdef CONFIG_BLK_DEV_INTEGRITY
89678 struct blk_integrity *integrity;
89679@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
89680 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
89681
89682 /* drivers/char/random.c */
89683-extern void add_disk_randomness(struct gendisk *disk);
89684+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
89685 extern void rand_initialize_disk(struct gendisk *disk);
89686
89687 static inline sector_t get_start_sect(struct block_device *bdev)
89688diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
89689index 667c311..abac2a7 100644
89690--- a/include/linux/genl_magic_func.h
89691+++ b/include/linux/genl_magic_func.h
89692@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
89693 },
89694
89695 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
89696-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
89697+static struct genl_ops ZZZ_genl_ops[] = {
89698 #include GENL_MAGIC_INCLUDE_FILE
89699 };
89700
89701diff --git a/include/linux/gfp.h b/include/linux/gfp.h
89702index eb6fafe..9360779 100644
89703--- a/include/linux/gfp.h
89704+++ b/include/linux/gfp.h
89705@@ -35,6 +35,13 @@ struct vm_area_struct;
89706 #define ___GFP_NO_KSWAPD 0x400000u
89707 #define ___GFP_OTHER_NODE 0x800000u
89708 #define ___GFP_WRITE 0x1000000u
89709+
89710+#ifdef CONFIG_PAX_USERCOPY_SLABS
89711+#define ___GFP_USERCOPY 0x2000000u
89712+#else
89713+#define ___GFP_USERCOPY 0
89714+#endif
89715+
89716 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
89717
89718 /*
89719@@ -92,6 +99,7 @@ struct vm_area_struct;
89720 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
89721 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
89722 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
89723+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
89724
89725 /*
89726 * This may seem redundant, but it's a way of annotating false positives vs.
89727@@ -99,7 +107,7 @@ struct vm_area_struct;
89728 */
89729 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
89730
89731-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
89732+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
89733 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
89734
89735 /* This equals 0, but use constants in case they ever change */
89736@@ -154,6 +162,8 @@ struct vm_area_struct;
89737 /* 4GB DMA on some platforms */
89738 #define GFP_DMA32 __GFP_DMA32
89739
89740+#define GFP_USERCOPY __GFP_USERCOPY
89741+
89742 /* Convert GFP flags to their corresponding migrate type */
89743 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
89744 {
89745diff --git a/include/linux/gracl.h b/include/linux/gracl.h
89746new file mode 100644
89747index 0000000..91858e4
89748--- /dev/null
89749+++ b/include/linux/gracl.h
89750@@ -0,0 +1,342 @@
89751+#ifndef GR_ACL_H
89752+#define GR_ACL_H
89753+
89754+#include <linux/grdefs.h>
89755+#include <linux/resource.h>
89756+#include <linux/capability.h>
89757+#include <linux/dcache.h>
89758+#include <asm/resource.h>
89759+
89760+/* Major status information */
89761+
89762+#define GR_VERSION "grsecurity 3.1"
89763+#define GRSECURITY_VERSION 0x3100
89764+
89765+enum {
89766+ GR_SHUTDOWN = 0,
89767+ GR_ENABLE = 1,
89768+ GR_SPROLE = 2,
89769+ GR_OLDRELOAD = 3,
89770+ GR_SEGVMOD = 4,
89771+ GR_STATUS = 5,
89772+ GR_UNSPROLE = 6,
89773+ GR_PASSSET = 7,
89774+ GR_SPROLEPAM = 8,
89775+ GR_RELOAD = 9,
89776+};
89777+
89778+/* Password setup definitions
89779+ * kernel/grhash.c */
89780+enum {
89781+ GR_PW_LEN = 128,
89782+ GR_SALT_LEN = 16,
89783+ GR_SHA_LEN = 32,
89784+};
89785+
89786+enum {
89787+ GR_SPROLE_LEN = 64,
89788+};
89789+
89790+enum {
89791+ GR_NO_GLOB = 0,
89792+ GR_REG_GLOB,
89793+ GR_CREATE_GLOB
89794+};
89795+
89796+#define GR_NLIMITS 32
89797+
89798+/* Begin Data Structures */
89799+
89800+struct sprole_pw {
89801+ unsigned char *rolename;
89802+ unsigned char salt[GR_SALT_LEN];
89803+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
89804+};
89805+
89806+struct name_entry {
89807+ __u32 key;
89808+ u64 inode;
89809+ dev_t device;
89810+ char *name;
89811+ __u16 len;
89812+ __u8 deleted;
89813+ struct name_entry *prev;
89814+ struct name_entry *next;
89815+};
89816+
89817+struct inodev_entry {
89818+ struct name_entry *nentry;
89819+ struct inodev_entry *prev;
89820+ struct inodev_entry *next;
89821+};
89822+
89823+struct acl_role_db {
89824+ struct acl_role_label **r_hash;
89825+ __u32 r_size;
89826+};
89827+
89828+struct inodev_db {
89829+ struct inodev_entry **i_hash;
89830+ __u32 i_size;
89831+};
89832+
89833+struct name_db {
89834+ struct name_entry **n_hash;
89835+ __u32 n_size;
89836+};
89837+
89838+struct crash_uid {
89839+ uid_t uid;
89840+ unsigned long expires;
89841+};
89842+
89843+struct gr_hash_struct {
89844+ void **table;
89845+ void **nametable;
89846+ void *first;
89847+ __u32 table_size;
89848+ __u32 used_size;
89849+ int type;
89850+};
89851+
89852+/* Userspace Grsecurity ACL data structures */
89853+
89854+struct acl_subject_label {
89855+ char *filename;
89856+ u64 inode;
89857+ dev_t device;
89858+ __u32 mode;
89859+ kernel_cap_t cap_mask;
89860+ kernel_cap_t cap_lower;
89861+ kernel_cap_t cap_invert_audit;
89862+
89863+ struct rlimit res[GR_NLIMITS];
89864+ __u32 resmask;
89865+
89866+ __u8 user_trans_type;
89867+ __u8 group_trans_type;
89868+ uid_t *user_transitions;
89869+ gid_t *group_transitions;
89870+ __u16 user_trans_num;
89871+ __u16 group_trans_num;
89872+
89873+ __u32 sock_families[2];
89874+ __u32 ip_proto[8];
89875+ __u32 ip_type;
89876+ struct acl_ip_label **ips;
89877+ __u32 ip_num;
89878+ __u32 inaddr_any_override;
89879+
89880+ __u32 crashes;
89881+ unsigned long expires;
89882+
89883+ struct acl_subject_label *parent_subject;
89884+ struct gr_hash_struct *hash;
89885+ struct acl_subject_label *prev;
89886+ struct acl_subject_label *next;
89887+
89888+ struct acl_object_label **obj_hash;
89889+ __u32 obj_hash_size;
89890+ __u16 pax_flags;
89891+};
89892+
89893+struct role_allowed_ip {
89894+ __u32 addr;
89895+ __u32 netmask;
89896+
89897+ struct role_allowed_ip *prev;
89898+ struct role_allowed_ip *next;
89899+};
89900+
89901+struct role_transition {
89902+ char *rolename;
89903+
89904+ struct role_transition *prev;
89905+ struct role_transition *next;
89906+};
89907+
89908+struct acl_role_label {
89909+ char *rolename;
89910+ uid_t uidgid;
89911+ __u16 roletype;
89912+
89913+ __u16 auth_attempts;
89914+ unsigned long expires;
89915+
89916+ struct acl_subject_label *root_label;
89917+ struct gr_hash_struct *hash;
89918+
89919+ struct acl_role_label *prev;
89920+ struct acl_role_label *next;
89921+
89922+ struct role_transition *transitions;
89923+ struct role_allowed_ip *allowed_ips;
89924+ uid_t *domain_children;
89925+ __u16 domain_child_num;
89926+
89927+ umode_t umask;
89928+
89929+ struct acl_subject_label **subj_hash;
89930+ __u32 subj_hash_size;
89931+};
89932+
89933+struct user_acl_role_db {
89934+ struct acl_role_label **r_table;
89935+ __u32 num_pointers; /* Number of allocations to track */
89936+ __u32 num_roles; /* Number of roles */
89937+ __u32 num_domain_children; /* Number of domain children */
89938+ __u32 num_subjects; /* Number of subjects */
89939+ __u32 num_objects; /* Number of objects */
89940+};
89941+
89942+struct acl_object_label {
89943+ char *filename;
89944+ u64 inode;
89945+ dev_t device;
89946+ __u32 mode;
89947+
89948+ struct acl_subject_label *nested;
89949+ struct acl_object_label *globbed;
89950+
89951+ /* next two structures not used */
89952+
89953+ struct acl_object_label *prev;
89954+ struct acl_object_label *next;
89955+};
89956+
89957+struct acl_ip_label {
89958+ char *iface;
89959+ __u32 addr;
89960+ __u32 netmask;
89961+ __u16 low, high;
89962+ __u8 mode;
89963+ __u32 type;
89964+ __u32 proto[8];
89965+
89966+ /* next two structures not used */
89967+
89968+ struct acl_ip_label *prev;
89969+ struct acl_ip_label *next;
89970+};
89971+
89972+struct gr_arg {
89973+ struct user_acl_role_db role_db;
89974+ unsigned char pw[GR_PW_LEN];
89975+ unsigned char salt[GR_SALT_LEN];
89976+ unsigned char sum[GR_SHA_LEN];
89977+ unsigned char sp_role[GR_SPROLE_LEN];
89978+ struct sprole_pw *sprole_pws;
89979+ dev_t segv_device;
89980+ u64 segv_inode;
89981+ uid_t segv_uid;
89982+ __u16 num_sprole_pws;
89983+ __u16 mode;
89984+};
89985+
89986+struct gr_arg_wrapper {
89987+ struct gr_arg *arg;
89988+ __u32 version;
89989+ __u32 size;
89990+};
89991+
89992+struct subject_map {
89993+ struct acl_subject_label *user;
89994+ struct acl_subject_label *kernel;
89995+ struct subject_map *prev;
89996+ struct subject_map *next;
89997+};
89998+
89999+struct acl_subj_map_db {
90000+ struct subject_map **s_hash;
90001+ __u32 s_size;
90002+};
90003+
90004+struct gr_policy_state {
90005+ struct sprole_pw **acl_special_roles;
90006+ __u16 num_sprole_pws;
90007+ struct acl_role_label *kernel_role;
90008+ struct acl_role_label *role_list;
90009+ struct acl_role_label *default_role;
90010+ struct acl_role_db acl_role_set;
90011+ struct acl_subj_map_db subj_map_set;
90012+ struct name_db name_set;
90013+ struct inodev_db inodev_set;
90014+};
90015+
90016+struct gr_alloc_state {
90017+ unsigned long alloc_stack_next;
90018+ unsigned long alloc_stack_size;
90019+ void **alloc_stack;
90020+};
90021+
90022+struct gr_reload_state {
90023+ struct gr_policy_state oldpolicy;
90024+ struct gr_alloc_state oldalloc;
90025+ struct gr_policy_state newpolicy;
90026+ struct gr_alloc_state newalloc;
90027+ struct gr_policy_state *oldpolicy_ptr;
90028+ struct gr_alloc_state *oldalloc_ptr;
90029+ unsigned char oldmode;
90030+};
90031+
90032+/* End Data Structures Section */
90033+
90034+/* Hash functions generated by empirical testing by Brad Spengler
90035+ Makes good use of the low bits of the inode. Generally 0-1 times
90036+ in loop for successful match. 0-3 for unsuccessful match.
90037+ Shift/add algorithm with modulus of table size and an XOR*/
90038+
90039+static __inline__ unsigned int
90040+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
90041+{
90042+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
90043+}
90044+
90045+ static __inline__ unsigned int
90046+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
90047+{
90048+ return ((const unsigned long)userp % sz);
90049+}
90050+
90051+static __inline__ unsigned int
90052+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
90053+{
90054+ unsigned int rem;
90055+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
90056+ return rem;
90057+}
90058+
90059+static __inline__ unsigned int
90060+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
90061+{
90062+ return full_name_hash((const unsigned char *)name, len) % sz;
90063+}
90064+
90065+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
90066+ subj = NULL; \
90067+ iter = 0; \
90068+ while (iter < role->subj_hash_size) { \
90069+ if (subj == NULL) \
90070+ subj = role->subj_hash[iter]; \
90071+ if (subj == NULL) { \
90072+ iter++; \
90073+ continue; \
90074+ }
90075+
90076+#define FOR_EACH_SUBJECT_END(subj,iter) \
90077+ subj = subj->next; \
90078+ if (subj == NULL) \
90079+ iter++; \
90080+ }
90081+
90082+
90083+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
90084+ subj = role->hash->first; \
90085+ while (subj != NULL) {
90086+
90087+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
90088+ subj = subj->next; \
90089+ }
90090+
90091+#endif
90092+
90093diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
90094new file mode 100644
90095index 0000000..af64092
90096--- /dev/null
90097+++ b/include/linux/gracl_compat.h
90098@@ -0,0 +1,156 @@
90099+#ifndef GR_ACL_COMPAT_H
90100+#define GR_ACL_COMPAT_H
90101+
90102+#include <linux/resource.h>
90103+#include <asm/resource.h>
90104+
90105+struct sprole_pw_compat {
90106+ compat_uptr_t rolename;
90107+ unsigned char salt[GR_SALT_LEN];
90108+ unsigned char sum[GR_SHA_LEN];
90109+};
90110+
90111+struct gr_hash_struct_compat {
90112+ compat_uptr_t table;
90113+ compat_uptr_t nametable;
90114+ compat_uptr_t first;
90115+ __u32 table_size;
90116+ __u32 used_size;
90117+ int type;
90118+};
90119+
90120+struct acl_subject_label_compat {
90121+ compat_uptr_t filename;
90122+ compat_u64 inode;
90123+ __u32 device;
90124+ __u32 mode;
90125+ kernel_cap_t cap_mask;
90126+ kernel_cap_t cap_lower;
90127+ kernel_cap_t cap_invert_audit;
90128+
90129+ struct compat_rlimit res[GR_NLIMITS];
90130+ __u32 resmask;
90131+
90132+ __u8 user_trans_type;
90133+ __u8 group_trans_type;
90134+ compat_uptr_t user_transitions;
90135+ compat_uptr_t group_transitions;
90136+ __u16 user_trans_num;
90137+ __u16 group_trans_num;
90138+
90139+ __u32 sock_families[2];
90140+ __u32 ip_proto[8];
90141+ __u32 ip_type;
90142+ compat_uptr_t ips;
90143+ __u32 ip_num;
90144+ __u32 inaddr_any_override;
90145+
90146+ __u32 crashes;
90147+ compat_ulong_t expires;
90148+
90149+ compat_uptr_t parent_subject;
90150+ compat_uptr_t hash;
90151+ compat_uptr_t prev;
90152+ compat_uptr_t next;
90153+
90154+ compat_uptr_t obj_hash;
90155+ __u32 obj_hash_size;
90156+ __u16 pax_flags;
90157+};
90158+
90159+struct role_allowed_ip_compat {
90160+ __u32 addr;
90161+ __u32 netmask;
90162+
90163+ compat_uptr_t prev;
90164+ compat_uptr_t next;
90165+};
90166+
90167+struct role_transition_compat {
90168+ compat_uptr_t rolename;
90169+
90170+ compat_uptr_t prev;
90171+ compat_uptr_t next;
90172+};
90173+
90174+struct acl_role_label_compat {
90175+ compat_uptr_t rolename;
90176+ uid_t uidgid;
90177+ __u16 roletype;
90178+
90179+ __u16 auth_attempts;
90180+ compat_ulong_t expires;
90181+
90182+ compat_uptr_t root_label;
90183+ compat_uptr_t hash;
90184+
90185+ compat_uptr_t prev;
90186+ compat_uptr_t next;
90187+
90188+ compat_uptr_t transitions;
90189+ compat_uptr_t allowed_ips;
90190+ compat_uptr_t domain_children;
90191+ __u16 domain_child_num;
90192+
90193+ umode_t umask;
90194+
90195+ compat_uptr_t subj_hash;
90196+ __u32 subj_hash_size;
90197+};
90198+
90199+struct user_acl_role_db_compat {
90200+ compat_uptr_t r_table;
90201+ __u32 num_pointers;
90202+ __u32 num_roles;
90203+ __u32 num_domain_children;
90204+ __u32 num_subjects;
90205+ __u32 num_objects;
90206+};
90207+
90208+struct acl_object_label_compat {
90209+ compat_uptr_t filename;
90210+ compat_u64 inode;
90211+ __u32 device;
90212+ __u32 mode;
90213+
90214+ compat_uptr_t nested;
90215+ compat_uptr_t globbed;
90216+
90217+ compat_uptr_t prev;
90218+ compat_uptr_t next;
90219+};
90220+
90221+struct acl_ip_label_compat {
90222+ compat_uptr_t iface;
90223+ __u32 addr;
90224+ __u32 netmask;
90225+ __u16 low, high;
90226+ __u8 mode;
90227+ __u32 type;
90228+ __u32 proto[8];
90229+
90230+ compat_uptr_t prev;
90231+ compat_uptr_t next;
90232+};
90233+
90234+struct gr_arg_compat {
90235+ struct user_acl_role_db_compat role_db;
90236+ unsigned char pw[GR_PW_LEN];
90237+ unsigned char salt[GR_SALT_LEN];
90238+ unsigned char sum[GR_SHA_LEN];
90239+ unsigned char sp_role[GR_SPROLE_LEN];
90240+ compat_uptr_t sprole_pws;
90241+ __u32 segv_device;
90242+ compat_u64 segv_inode;
90243+ uid_t segv_uid;
90244+ __u16 num_sprole_pws;
90245+ __u16 mode;
90246+};
90247+
90248+struct gr_arg_wrapper_compat {
90249+ compat_uptr_t arg;
90250+ __u32 version;
90251+ __u32 size;
90252+};
90253+
90254+#endif
90255diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
90256new file mode 100644
90257index 0000000..323ecf2
90258--- /dev/null
90259+++ b/include/linux/gralloc.h
90260@@ -0,0 +1,9 @@
90261+#ifndef __GRALLOC_H
90262+#define __GRALLOC_H
90263+
90264+void acl_free_all(void);
90265+int acl_alloc_stack_init(unsigned long size);
90266+void *acl_alloc(unsigned long len);
90267+void *acl_alloc_num(unsigned long num, unsigned long len);
90268+
90269+#endif
90270diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
90271new file mode 100644
90272index 0000000..be66033
90273--- /dev/null
90274+++ b/include/linux/grdefs.h
90275@@ -0,0 +1,140 @@
90276+#ifndef GRDEFS_H
90277+#define GRDEFS_H
90278+
90279+/* Begin grsecurity status declarations */
90280+
90281+enum {
90282+ GR_READY = 0x01,
90283+ GR_STATUS_INIT = 0x00 // disabled state
90284+};
90285+
90286+/* Begin ACL declarations */
90287+
90288+/* Role flags */
90289+
90290+enum {
90291+ GR_ROLE_USER = 0x0001,
90292+ GR_ROLE_GROUP = 0x0002,
90293+ GR_ROLE_DEFAULT = 0x0004,
90294+ GR_ROLE_SPECIAL = 0x0008,
90295+ GR_ROLE_AUTH = 0x0010,
90296+ GR_ROLE_NOPW = 0x0020,
90297+ GR_ROLE_GOD = 0x0040,
90298+ GR_ROLE_LEARN = 0x0080,
90299+ GR_ROLE_TPE = 0x0100,
90300+ GR_ROLE_DOMAIN = 0x0200,
90301+ GR_ROLE_PAM = 0x0400,
90302+ GR_ROLE_PERSIST = 0x0800
90303+};
90304+
90305+/* ACL Subject and Object mode flags */
90306+enum {
90307+ GR_DELETED = 0x80000000
90308+};
90309+
90310+/* ACL Object-only mode flags */
90311+enum {
90312+ GR_READ = 0x00000001,
90313+ GR_APPEND = 0x00000002,
90314+ GR_WRITE = 0x00000004,
90315+ GR_EXEC = 0x00000008,
90316+ GR_FIND = 0x00000010,
90317+ GR_INHERIT = 0x00000020,
90318+ GR_SETID = 0x00000040,
90319+ GR_CREATE = 0x00000080,
90320+ GR_DELETE = 0x00000100,
90321+ GR_LINK = 0x00000200,
90322+ GR_AUDIT_READ = 0x00000400,
90323+ GR_AUDIT_APPEND = 0x00000800,
90324+ GR_AUDIT_WRITE = 0x00001000,
90325+ GR_AUDIT_EXEC = 0x00002000,
90326+ GR_AUDIT_FIND = 0x00004000,
90327+ GR_AUDIT_INHERIT= 0x00008000,
90328+ GR_AUDIT_SETID = 0x00010000,
90329+ GR_AUDIT_CREATE = 0x00020000,
90330+ GR_AUDIT_DELETE = 0x00040000,
90331+ GR_AUDIT_LINK = 0x00080000,
90332+ GR_PTRACERD = 0x00100000,
90333+ GR_NOPTRACE = 0x00200000,
90334+ GR_SUPPRESS = 0x00400000,
90335+ GR_NOLEARN = 0x00800000,
90336+ GR_INIT_TRANSFER= 0x01000000
90337+};
90338+
90339+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
90340+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
90341+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
90342+
90343+/* ACL subject-only mode flags */
90344+enum {
90345+ GR_KILL = 0x00000001,
90346+ GR_VIEW = 0x00000002,
90347+ GR_PROTECTED = 0x00000004,
90348+ GR_LEARN = 0x00000008,
90349+ GR_OVERRIDE = 0x00000010,
90350+ /* just a placeholder, this mode is only used in userspace */
90351+ GR_DUMMY = 0x00000020,
90352+ GR_PROTSHM = 0x00000040,
90353+ GR_KILLPROC = 0x00000080,
90354+ GR_KILLIPPROC = 0x00000100,
90355+ /* just a placeholder, this mode is only used in userspace */
90356+ GR_NOTROJAN = 0x00000200,
90357+ GR_PROTPROCFD = 0x00000400,
90358+ GR_PROCACCT = 0x00000800,
90359+ GR_RELAXPTRACE = 0x00001000,
90360+ //GR_NESTED = 0x00002000,
90361+ GR_INHERITLEARN = 0x00004000,
90362+ GR_PROCFIND = 0x00008000,
90363+ GR_POVERRIDE = 0x00010000,
90364+ GR_KERNELAUTH = 0x00020000,
90365+ GR_ATSECURE = 0x00040000,
90366+ GR_SHMEXEC = 0x00080000
90367+};
90368+
90369+enum {
90370+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
90371+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
90372+ GR_PAX_ENABLE_MPROTECT = 0x0004,
90373+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
90374+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
90375+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
90376+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
90377+ GR_PAX_DISABLE_MPROTECT = 0x0400,
90378+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
90379+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
90380+};
90381+
90382+enum {
90383+ GR_ID_USER = 0x01,
90384+ GR_ID_GROUP = 0x02,
90385+};
90386+
90387+enum {
90388+ GR_ID_ALLOW = 0x01,
90389+ GR_ID_DENY = 0x02,
90390+};
90391+
90392+#define GR_CRASH_RES 31
90393+#define GR_UIDTABLE_MAX 500
90394+
90395+/* begin resource learning section */
90396+enum {
90397+ GR_RLIM_CPU_BUMP = 60,
90398+ GR_RLIM_FSIZE_BUMP = 50000,
90399+ GR_RLIM_DATA_BUMP = 10000,
90400+ GR_RLIM_STACK_BUMP = 1000,
90401+ GR_RLIM_CORE_BUMP = 10000,
90402+ GR_RLIM_RSS_BUMP = 500000,
90403+ GR_RLIM_NPROC_BUMP = 1,
90404+ GR_RLIM_NOFILE_BUMP = 5,
90405+ GR_RLIM_MEMLOCK_BUMP = 50000,
90406+ GR_RLIM_AS_BUMP = 500000,
90407+ GR_RLIM_LOCKS_BUMP = 2,
90408+ GR_RLIM_SIGPENDING_BUMP = 5,
90409+ GR_RLIM_MSGQUEUE_BUMP = 10000,
90410+ GR_RLIM_NICE_BUMP = 1,
90411+ GR_RLIM_RTPRIO_BUMP = 1,
90412+ GR_RLIM_RTTIME_BUMP = 1000000
90413+};
90414+
90415+#endif
90416diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
90417new file mode 100644
90418index 0000000..fb1de5d
90419--- /dev/null
90420+++ b/include/linux/grinternal.h
90421@@ -0,0 +1,230 @@
90422+#ifndef __GRINTERNAL_H
90423+#define __GRINTERNAL_H
90424+
90425+#ifdef CONFIG_GRKERNSEC
90426+
90427+#include <linux/fs.h>
90428+#include <linux/mnt_namespace.h>
90429+#include <linux/nsproxy.h>
90430+#include <linux/gracl.h>
90431+#include <linux/grdefs.h>
90432+#include <linux/grmsg.h>
90433+
90434+void gr_add_learn_entry(const char *fmt, ...)
90435+ __attribute__ ((format (printf, 1, 2)));
90436+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
90437+ const struct vfsmount *mnt);
90438+__u32 gr_check_create(const struct dentry *new_dentry,
90439+ const struct dentry *parent,
90440+ const struct vfsmount *mnt, const __u32 mode);
90441+int gr_check_protected_task(const struct task_struct *task);
90442+__u32 to_gr_audit(const __u32 reqmode);
90443+int gr_set_acls(const int type);
90444+int gr_acl_is_enabled(void);
90445+char gr_roletype_to_char(void);
90446+
90447+void gr_handle_alertkill(struct task_struct *task);
90448+char *gr_to_filename(const struct dentry *dentry,
90449+ const struct vfsmount *mnt);
90450+char *gr_to_filename1(const struct dentry *dentry,
90451+ const struct vfsmount *mnt);
90452+char *gr_to_filename2(const struct dentry *dentry,
90453+ const struct vfsmount *mnt);
90454+char *gr_to_filename3(const struct dentry *dentry,
90455+ const struct vfsmount *mnt);
90456+
90457+extern int grsec_enable_ptrace_readexec;
90458+extern int grsec_enable_harden_ptrace;
90459+extern int grsec_enable_link;
90460+extern int grsec_enable_fifo;
90461+extern int grsec_enable_execve;
90462+extern int grsec_enable_shm;
90463+extern int grsec_enable_execlog;
90464+extern int grsec_enable_signal;
90465+extern int grsec_enable_audit_ptrace;
90466+extern int grsec_enable_forkfail;
90467+extern int grsec_enable_time;
90468+extern int grsec_enable_rofs;
90469+extern int grsec_deny_new_usb;
90470+extern int grsec_enable_chroot_shmat;
90471+extern int grsec_enable_chroot_mount;
90472+extern int grsec_enable_chroot_double;
90473+extern int grsec_enable_chroot_pivot;
90474+extern int grsec_enable_chroot_chdir;
90475+extern int grsec_enable_chroot_chmod;
90476+extern int grsec_enable_chroot_mknod;
90477+extern int grsec_enable_chroot_fchdir;
90478+extern int grsec_enable_chroot_nice;
90479+extern int grsec_enable_chroot_execlog;
90480+extern int grsec_enable_chroot_caps;
90481+extern int grsec_enable_chroot_rename;
90482+extern int grsec_enable_chroot_sysctl;
90483+extern int grsec_enable_chroot_unix;
90484+extern int grsec_enable_symlinkown;
90485+extern kgid_t grsec_symlinkown_gid;
90486+extern int grsec_enable_tpe;
90487+extern kgid_t grsec_tpe_gid;
90488+extern int grsec_enable_tpe_all;
90489+extern int grsec_enable_tpe_invert;
90490+extern int grsec_enable_socket_all;
90491+extern kgid_t grsec_socket_all_gid;
90492+extern int grsec_enable_socket_client;
90493+extern kgid_t grsec_socket_client_gid;
90494+extern int grsec_enable_socket_server;
90495+extern kgid_t grsec_socket_server_gid;
90496+extern kgid_t grsec_audit_gid;
90497+extern int grsec_enable_group;
90498+extern int grsec_enable_log_rwxmaps;
90499+extern int grsec_enable_mount;
90500+extern int grsec_enable_chdir;
90501+extern int grsec_resource_logging;
90502+extern int grsec_enable_blackhole;
90503+extern int grsec_lastack_retries;
90504+extern int grsec_enable_brute;
90505+extern int grsec_enable_harden_ipc;
90506+extern int grsec_lock;
90507+
90508+extern spinlock_t grsec_alert_lock;
90509+extern unsigned long grsec_alert_wtime;
90510+extern unsigned long grsec_alert_fyet;
90511+
90512+extern spinlock_t grsec_audit_lock;
90513+
90514+extern rwlock_t grsec_exec_file_lock;
90515+
90516+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
90517+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
90518+ (tsk)->exec_file->f_path.mnt) : "/")
90519+
90520+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
90521+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
90522+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90523+
90524+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
90525+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
90526+ (tsk)->exec_file->f_path.mnt) : "/")
90527+
90528+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
90529+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
90530+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
90531+
90532+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
90533+
90534+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
90535+
90536+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
90537+{
90538+ if (file1 && file2) {
90539+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
90540+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
90541+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
90542+ return true;
90543+ }
90544+
90545+ return false;
90546+}
90547+
90548+#define GR_CHROOT_CAPS {{ \
90549+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
90550+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
90551+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
90552+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
90553+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
90554+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
90555+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
90556+
90557+#define security_learn(normal_msg,args...) \
90558+({ \
90559+ read_lock(&grsec_exec_file_lock); \
90560+ gr_add_learn_entry(normal_msg "\n", ## args); \
90561+ read_unlock(&grsec_exec_file_lock); \
90562+})
90563+
90564+enum {
90565+ GR_DO_AUDIT,
90566+ GR_DONT_AUDIT,
90567+ /* used for non-audit messages that we shouldn't kill the task on */
90568+ GR_DONT_AUDIT_GOOD
90569+};
90570+
90571+enum {
90572+ GR_TTYSNIFF,
90573+ GR_RBAC,
90574+ GR_RBAC_STR,
90575+ GR_STR_RBAC,
90576+ GR_RBAC_MODE2,
90577+ GR_RBAC_MODE3,
90578+ GR_FILENAME,
90579+ GR_SYSCTL_HIDDEN,
90580+ GR_NOARGS,
90581+ GR_ONE_INT,
90582+ GR_ONE_INT_TWO_STR,
90583+ GR_ONE_STR,
90584+ GR_STR_INT,
90585+ GR_TWO_STR_INT,
90586+ GR_TWO_INT,
90587+ GR_TWO_U64,
90588+ GR_THREE_INT,
90589+ GR_FIVE_INT_TWO_STR,
90590+ GR_TWO_STR,
90591+ GR_THREE_STR,
90592+ GR_FOUR_STR,
90593+ GR_STR_FILENAME,
90594+ GR_FILENAME_STR,
90595+ GR_FILENAME_TWO_INT,
90596+ GR_FILENAME_TWO_INT_STR,
90597+ GR_TEXTREL,
90598+ GR_PTRACE,
90599+ GR_RESOURCE,
90600+ GR_CAP,
90601+ GR_SIG,
90602+ GR_SIG2,
90603+ GR_CRASH1,
90604+ GR_CRASH2,
90605+ GR_PSACCT,
90606+ GR_RWXMAP,
90607+ GR_RWXMAPVMA
90608+};
90609+
90610+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
90611+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
90612+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
90613+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
90614+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
90615+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
90616+#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)
90617+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
90618+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
90619+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
90620+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
90621+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
90622+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
90623+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
90624+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
90625+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
90626+#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)
90627+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
90628+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
90629+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
90630+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
90631+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
90632+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
90633+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
90634+#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)
90635+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
90636+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
90637+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
90638+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
90639+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
90640+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
90641+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
90642+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
90643+#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)
90644+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
90645+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
90646+
90647+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
90648+
90649+#endif
90650+
90651+#endif
90652diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
90653new file mode 100644
90654index 0000000..26ef560
90655--- /dev/null
90656+++ b/include/linux/grmsg.h
90657@@ -0,0 +1,118 @@
90658+#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"
90659+#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"
90660+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
90661+#define GR_STOPMOD_MSG "denied modification of module state by "
90662+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
90663+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
90664+#define GR_IOPERM_MSG "denied use of ioperm() by "
90665+#define GR_IOPL_MSG "denied use of iopl() by "
90666+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
90667+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
90668+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
90669+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
90670+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
90671+#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"
90672+#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"
90673+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
90674+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
90675+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
90676+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
90677+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
90678+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
90679+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
90680+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
90681+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
90682+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
90683+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
90684+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
90685+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
90686+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
90687+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
90688+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
90689+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
90690+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
90691+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
90692+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
90693+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
90694+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
90695+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
90696+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
90697+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
90698+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
90699+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
90700+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
90701+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
90702+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
90703+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
90704+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
90705+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
90706+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
90707+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
90708+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
90709+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
90710+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
90711+#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"
90712+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
90713+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
90714+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
90715+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
90716+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
90717+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
90718+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
90719+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
90720+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
90721+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
90722+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
90723+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
90724+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
90725+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
90726+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
90727+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
90728+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
90729+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
90730+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
90731+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
90732+#define GR_FAILFORK_MSG "failed fork with errno %s by "
90733+#define GR_NICE_CHROOT_MSG "denied priority change by "
90734+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
90735+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
90736+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
90737+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
90738+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
90739+#define GR_TIME_MSG "time set by "
90740+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
90741+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
90742+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
90743+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
90744+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
90745+#define GR_BIND_MSG "denied bind() by "
90746+#define GR_CONNECT_MSG "denied connect() by "
90747+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
90748+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
90749+#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"
90750+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
90751+#define GR_CAP_ACL_MSG "use of %s denied for "
90752+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
90753+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
90754+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
90755+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
90756+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
90757+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
90758+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
90759+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
90760+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
90761+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
90762+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
90763+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
90764+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
90765+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
90766+#define GR_VM86_MSG "denied use of vm86 by "
90767+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
90768+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
90769+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
90770+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
90771+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
90772+#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 "
90773+#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 "
90774+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
90775+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
90776diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
90777new file mode 100644
90778index 0000000..63c1850
90779--- /dev/null
90780+++ b/include/linux/grsecurity.h
90781@@ -0,0 +1,250 @@
90782+#ifndef GR_SECURITY_H
90783+#define GR_SECURITY_H
90784+#include <linux/fs.h>
90785+#include <linux/fs_struct.h>
90786+#include <linux/binfmts.h>
90787+#include <linux/gracl.h>
90788+
90789+/* notify of brain-dead configs */
90790+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90791+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
90792+#endif
90793+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90794+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
90795+#endif
90796+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
90797+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
90798+#endif
90799+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
90800+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
90801+#endif
90802+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
90803+#error "CONFIG_PAX enabled, but no PaX options are enabled."
90804+#endif
90805+
90806+int gr_handle_new_usb(void);
90807+
90808+void gr_handle_brute_attach(int dumpable);
90809+void gr_handle_brute_check(void);
90810+void gr_handle_kernel_exploit(void);
90811+
90812+char gr_roletype_to_char(void);
90813+
90814+int gr_proc_is_restricted(void);
90815+
90816+int gr_acl_enable_at_secure(void);
90817+
90818+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
90819+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
90820+
90821+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
90822+
90823+void gr_del_task_from_ip_table(struct task_struct *p);
90824+
90825+int gr_pid_is_chrooted(struct task_struct *p);
90826+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
90827+int gr_handle_chroot_nice(void);
90828+int gr_handle_chroot_sysctl(const int op);
90829+int gr_handle_chroot_setpriority(struct task_struct *p,
90830+ const int niceval);
90831+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
90832+int gr_chroot_fhandle(void);
90833+int gr_handle_chroot_chroot(const struct dentry *dentry,
90834+ const struct vfsmount *mnt);
90835+void gr_handle_chroot_chdir(const struct path *path);
90836+int gr_handle_chroot_chmod(const struct dentry *dentry,
90837+ const struct vfsmount *mnt, const int mode);
90838+int gr_handle_chroot_mknod(const struct dentry *dentry,
90839+ const struct vfsmount *mnt, const int mode);
90840+int gr_handle_chroot_mount(const struct dentry *dentry,
90841+ const struct vfsmount *mnt,
90842+ const char *dev_name);
90843+int gr_handle_chroot_pivot(void);
90844+int gr_handle_chroot_unix(const pid_t pid);
90845+
90846+int gr_handle_rawio(const struct inode *inode);
90847+
90848+void gr_handle_ioperm(void);
90849+void gr_handle_iopl(void);
90850+void gr_handle_msr_write(void);
90851+
90852+umode_t gr_acl_umask(void);
90853+
90854+int gr_tpe_allow(const struct file *file);
90855+
90856+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
90857+void gr_clear_chroot_entries(struct task_struct *task);
90858+
90859+void gr_log_forkfail(const int retval);
90860+void gr_log_timechange(void);
90861+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
90862+void gr_log_chdir(const struct dentry *dentry,
90863+ const struct vfsmount *mnt);
90864+void gr_log_chroot_exec(const struct dentry *dentry,
90865+ const struct vfsmount *mnt);
90866+void gr_log_remount(const char *devname, const int retval);
90867+void gr_log_unmount(const char *devname, const int retval);
90868+void gr_log_mount(const char *from, struct path *to, const int retval);
90869+void gr_log_textrel(struct vm_area_struct *vma);
90870+void gr_log_ptgnustack(struct file *file);
90871+void gr_log_rwxmmap(struct file *file);
90872+void gr_log_rwxmprotect(struct vm_area_struct *vma);
90873+
90874+int gr_handle_follow_link(const struct inode *parent,
90875+ const struct inode *inode,
90876+ const struct dentry *dentry,
90877+ const struct vfsmount *mnt);
90878+int gr_handle_fifo(const struct dentry *dentry,
90879+ const struct vfsmount *mnt,
90880+ const struct dentry *dir, const int flag,
90881+ const int acc_mode);
90882+int gr_handle_hardlink(const struct dentry *dentry,
90883+ const struct vfsmount *mnt,
90884+ struct inode *inode,
90885+ const int mode, const struct filename *to);
90886+
90887+int gr_is_capable(const int cap);
90888+int gr_is_capable_nolog(const int cap);
90889+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
90890+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
90891+
90892+void gr_copy_label(struct task_struct *tsk);
90893+void gr_handle_crash(struct task_struct *task, const int sig);
90894+int gr_handle_signal(const struct task_struct *p, const int sig);
90895+int gr_check_crash_uid(const kuid_t uid);
90896+int gr_check_protected_task(const struct task_struct *task);
90897+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
90898+int gr_acl_handle_mmap(const struct file *file,
90899+ const unsigned long prot);
90900+int gr_acl_handle_mprotect(const struct file *file,
90901+ const unsigned long prot);
90902+int gr_check_hidden_task(const struct task_struct *tsk);
90903+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
90904+ const struct vfsmount *mnt);
90905+__u32 gr_acl_handle_utime(const struct dentry *dentry,
90906+ const struct vfsmount *mnt);
90907+__u32 gr_acl_handle_access(const struct dentry *dentry,
90908+ const struct vfsmount *mnt, const int fmode);
90909+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
90910+ const struct vfsmount *mnt, umode_t *mode);
90911+__u32 gr_acl_handle_chown(const struct dentry *dentry,
90912+ const struct vfsmount *mnt);
90913+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
90914+ const struct vfsmount *mnt);
90915+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
90916+ const struct vfsmount *mnt);
90917+int gr_handle_ptrace(struct task_struct *task, const long request);
90918+int gr_handle_proc_ptrace(struct task_struct *task);
90919+__u32 gr_acl_handle_execve(const struct dentry *dentry,
90920+ const struct vfsmount *mnt);
90921+int gr_check_crash_exec(const struct file *filp);
90922+int gr_acl_is_enabled(void);
90923+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
90924+ const kgid_t gid);
90925+int gr_set_proc_label(const struct dentry *dentry,
90926+ const struct vfsmount *mnt,
90927+ const int unsafe_flags);
90928+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
90929+ const struct vfsmount *mnt);
90930+__u32 gr_acl_handle_open(const struct dentry *dentry,
90931+ const struct vfsmount *mnt, int acc_mode);
90932+__u32 gr_acl_handle_creat(const struct dentry *dentry,
90933+ const struct dentry *p_dentry,
90934+ const struct vfsmount *p_mnt,
90935+ int open_flags, int acc_mode, const int imode);
90936+void gr_handle_create(const struct dentry *dentry,
90937+ const struct vfsmount *mnt);
90938+void gr_handle_proc_create(const struct dentry *dentry,
90939+ const struct inode *inode);
90940+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
90941+ const struct dentry *parent_dentry,
90942+ const struct vfsmount *parent_mnt,
90943+ const int mode);
90944+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
90945+ const struct dentry *parent_dentry,
90946+ const struct vfsmount *parent_mnt);
90947+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
90948+ const struct vfsmount *mnt);
90949+void gr_handle_delete(const u64 ino, const dev_t dev);
90950+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
90951+ const struct vfsmount *mnt);
90952+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
90953+ const struct dentry *parent_dentry,
90954+ const struct vfsmount *parent_mnt,
90955+ const struct filename *from);
90956+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
90957+ const struct dentry *parent_dentry,
90958+ const struct vfsmount *parent_mnt,
90959+ const struct dentry *old_dentry,
90960+ const struct vfsmount *old_mnt, const struct filename *to);
90961+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
90962+int gr_acl_handle_rename(struct dentry *new_dentry,
90963+ struct dentry *parent_dentry,
90964+ const struct vfsmount *parent_mnt,
90965+ struct dentry *old_dentry,
90966+ struct inode *old_parent_inode,
90967+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
90968+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90969+ struct dentry *old_dentry,
90970+ struct dentry *new_dentry,
90971+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
90972+__u32 gr_check_link(const struct dentry *new_dentry,
90973+ const struct dentry *parent_dentry,
90974+ const struct vfsmount *parent_mnt,
90975+ const struct dentry *old_dentry,
90976+ const struct vfsmount *old_mnt);
90977+int gr_acl_handle_filldir(const struct file *file, const char *name,
90978+ const unsigned int namelen, const u64 ino);
90979+
90980+__u32 gr_acl_handle_unix(const struct dentry *dentry,
90981+ const struct vfsmount *mnt);
90982+void gr_acl_handle_exit(void);
90983+void gr_acl_handle_psacct(struct task_struct *task, const long code);
90984+int gr_acl_handle_procpidmem(const struct task_struct *task);
90985+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
90986+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
90987+void gr_audit_ptrace(struct task_struct *task);
90988+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
90989+u64 gr_get_ino_from_dentry(struct dentry *dentry);
90990+void gr_put_exec_file(struct task_struct *task);
90991+
90992+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
90993+
90994+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90995+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
90996+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90997+ struct dentry *newdentry, struct vfsmount *newmnt);
90998+
90999+#ifdef CONFIG_GRKERNSEC_RESLOG
91000+extern void gr_log_resource(const struct task_struct *task, const int res,
91001+ const unsigned long wanted, const int gt);
91002+#else
91003+static inline void gr_log_resource(const struct task_struct *task, const int res,
91004+ const unsigned long wanted, const int gt)
91005+{
91006+}
91007+#endif
91008+
91009+#ifdef CONFIG_GRKERNSEC
91010+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
91011+void gr_handle_vm86(void);
91012+void gr_handle_mem_readwrite(u64 from, u64 to);
91013+
91014+void gr_log_badprocpid(const char *entry);
91015+
91016+extern int grsec_enable_dmesg;
91017+extern int grsec_disable_privio;
91018+
91019+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
91020+extern kgid_t grsec_proc_gid;
91021+#endif
91022+
91023+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91024+extern int grsec_enable_chroot_findtask;
91025+#endif
91026+#ifdef CONFIG_GRKERNSEC_SETXID
91027+extern int grsec_enable_setxid;
91028+#endif
91029+#endif
91030+
91031+#endif
91032diff --git a/include/linux/grsock.h b/include/linux/grsock.h
91033new file mode 100644
91034index 0000000..e7ffaaf
91035--- /dev/null
91036+++ b/include/linux/grsock.h
91037@@ -0,0 +1,19 @@
91038+#ifndef __GRSOCK_H
91039+#define __GRSOCK_H
91040+
91041+extern void gr_attach_curr_ip(const struct sock *sk);
91042+extern int gr_handle_sock_all(const int family, const int type,
91043+ const int protocol);
91044+extern int gr_handle_sock_server(const struct sockaddr *sck);
91045+extern int gr_handle_sock_server_other(const struct sock *sck);
91046+extern int gr_handle_sock_client(const struct sockaddr *sck);
91047+extern int gr_search_connect(struct socket * sock,
91048+ struct sockaddr_in * addr);
91049+extern int gr_search_bind(struct socket * sock,
91050+ struct sockaddr_in * addr);
91051+extern int gr_search_listen(struct socket * sock);
91052+extern int gr_search_accept(struct socket * sock);
91053+extern int gr_search_socket(const int domain, const int type,
91054+ const int protocol);
91055+
91056+#endif
91057diff --git a/include/linux/highmem.h b/include/linux/highmem.h
91058index 9286a46..373f27f 100644
91059--- a/include/linux/highmem.h
91060+++ b/include/linux/highmem.h
91061@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
91062 kunmap_atomic(kaddr);
91063 }
91064
91065+static inline void sanitize_highpage(struct page *page)
91066+{
91067+ void *kaddr;
91068+ unsigned long flags;
91069+
91070+ local_irq_save(flags);
91071+ kaddr = kmap_atomic(page);
91072+ clear_page(kaddr);
91073+ kunmap_atomic(kaddr);
91074+ local_irq_restore(flags);
91075+}
91076+
91077 static inline void zero_user_segments(struct page *page,
91078 unsigned start1, unsigned end1,
91079 unsigned start2, unsigned end2)
91080diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
91081index 1c7b89a..7dda400 100644
91082--- a/include/linux/hwmon-sysfs.h
91083+++ b/include/linux/hwmon-sysfs.h
91084@@ -25,7 +25,8 @@
91085 struct sensor_device_attribute{
91086 struct device_attribute dev_attr;
91087 int index;
91088-};
91089+} __do_const;
91090+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
91091 #define to_sensor_dev_attr(_dev_attr) \
91092 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
91093
91094@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
91095 struct device_attribute dev_attr;
91096 u8 index;
91097 u8 nr;
91098-};
91099+} __do_const;
91100+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
91101 #define to_sensor_dev_attr_2(_dev_attr) \
91102 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
91103
91104diff --git a/include/linux/i2c.h b/include/linux/i2c.h
91105index f17da50..2f8b203 100644
91106--- a/include/linux/i2c.h
91107+++ b/include/linux/i2c.h
91108@@ -409,6 +409,7 @@ struct i2c_algorithm {
91109 int (*unreg_slave)(struct i2c_client *client);
91110 #endif
91111 };
91112+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
91113
91114 /**
91115 * struct i2c_bus_recovery_info - I2C bus recovery information
91116diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
91117index aff7ad8..3942bbd 100644
91118--- a/include/linux/if_pppox.h
91119+++ b/include/linux/if_pppox.h
91120@@ -76,7 +76,7 @@ struct pppox_proto {
91121 int (*ioctl)(struct socket *sock, unsigned int cmd,
91122 unsigned long arg);
91123 struct module *owner;
91124-};
91125+} __do_const;
91126
91127 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
91128 extern void unregister_pppox_proto(int proto_num);
91129diff --git a/include/linux/init.h b/include/linux/init.h
91130index 2df8e8d..3e1280d 100644
91131--- a/include/linux/init.h
91132+++ b/include/linux/init.h
91133@@ -37,9 +37,17 @@
91134 * section.
91135 */
91136
91137+#define add_init_latent_entropy __latent_entropy
91138+
91139+#ifdef CONFIG_MEMORY_HOTPLUG
91140+#define add_meminit_latent_entropy
91141+#else
91142+#define add_meminit_latent_entropy __latent_entropy
91143+#endif
91144+
91145 /* These are for everybody (although not all archs will actually
91146 discard it in modules) */
91147-#define __init __section(.init.text) __cold notrace
91148+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
91149 #define __initdata __section(.init.data)
91150 #define __initconst __constsection(.init.rodata)
91151 #define __exitdata __section(.exit.data)
91152@@ -100,7 +108,7 @@
91153 #define __cpuexitconst
91154
91155 /* Used for MEMORY_HOTPLUG */
91156-#define __meminit __section(.meminit.text) __cold notrace
91157+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
91158 #define __meminitdata __section(.meminit.data)
91159 #define __meminitconst __constsection(.meminit.rodata)
91160 #define __memexit __section(.memexit.text) __exitused __cold notrace
91161diff --git a/include/linux/init_task.h b/include/linux/init_task.h
91162index 696d223..6d6b39f 100644
91163--- a/include/linux/init_task.h
91164+++ b/include/linux/init_task.h
91165@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
91166
91167 #define INIT_TASK_COMM "swapper"
91168
91169+#ifdef CONFIG_X86
91170+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
91171+#else
91172+#define INIT_TASK_THREAD_INFO
91173+#endif
91174+
91175 #ifdef CONFIG_RT_MUTEXES
91176 # define INIT_RT_MUTEXES(tsk) \
91177 .pi_waiters = RB_ROOT, \
91178@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
91179 RCU_POINTER_INITIALIZER(cred, &init_cred), \
91180 .comm = INIT_TASK_COMM, \
91181 .thread = INIT_THREAD, \
91182+ INIT_TASK_THREAD_INFO \
91183 .fs = &init_fs, \
91184 .files = &init_files, \
91185 .signal = &init_signals, \
91186diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
91187index 2e88580..f6a99a0 100644
91188--- a/include/linux/interrupt.h
91189+++ b/include/linux/interrupt.h
91190@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
91191
91192 struct softirq_action
91193 {
91194- void (*action)(struct softirq_action *);
91195-};
91196+ void (*action)(void);
91197+} __no_const;
91198
91199 asmlinkage void do_softirq(void);
91200 asmlinkage void __do_softirq(void);
91201@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
91202 }
91203 #endif
91204
91205-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
91206+extern void open_softirq(int nr, void (*action)(void));
91207 extern void softirq_init(void);
91208 extern void __raise_softirq_irqoff(unsigned int nr);
91209
91210diff --git a/include/linux/iommu.h b/include/linux/iommu.h
91211index 38daa45..4de4317 100644
91212--- a/include/linux/iommu.h
91213+++ b/include/linux/iommu.h
91214@@ -147,7 +147,7 @@ struct iommu_ops {
91215
91216 unsigned long pgsize_bitmap;
91217 void *priv;
91218-};
91219+} __do_const;
91220
91221 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
91222 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
91223diff --git a/include/linux/ioport.h b/include/linux/ioport.h
91224index 2c525022..345b106 100644
91225--- a/include/linux/ioport.h
91226+++ b/include/linux/ioport.h
91227@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
91228 int adjust_resource(struct resource *res, resource_size_t start,
91229 resource_size_t size);
91230 resource_size_t resource_alignment(struct resource *res);
91231-static inline resource_size_t resource_size(const struct resource *res)
91232+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
91233 {
91234 return res->end - res->start + 1;
91235 }
91236diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
91237index 1eee6bc..9cf4912 100644
91238--- a/include/linux/ipc_namespace.h
91239+++ b/include/linux/ipc_namespace.h
91240@@ -60,7 +60,7 @@ struct ipc_namespace {
91241 struct user_namespace *user_ns;
91242
91243 struct ns_common ns;
91244-};
91245+} __randomize_layout;
91246
91247 extern struct ipc_namespace init_ipc_ns;
91248 extern atomic_t nr_ipc_ns;
91249diff --git a/include/linux/irq.h b/include/linux/irq.h
91250index d09ec7a..f373eb5 100644
91251--- a/include/linux/irq.h
91252+++ b/include/linux/irq.h
91253@@ -364,7 +364,8 @@ struct irq_chip {
91254 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
91255
91256 unsigned long flags;
91257-};
91258+} __do_const;
91259+typedef struct irq_chip __no_const irq_chip_no_const;
91260
91261 /*
91262 * irq_chip specific flags
91263diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
91264index 71d706d..817cdec 100644
91265--- a/include/linux/irqchip/arm-gic.h
91266+++ b/include/linux/irqchip/arm-gic.h
91267@@ -95,7 +95,7 @@
91268
91269 struct device_node;
91270
91271-extern struct irq_chip gic_arch_extn;
91272+extern irq_chip_no_const gic_arch_extn;
91273
91274 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
91275 u32 offset, struct device_node *);
91276diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
91277index dd1109f..4f4fdda 100644
91278--- a/include/linux/irqdesc.h
91279+++ b/include/linux/irqdesc.h
91280@@ -61,7 +61,7 @@ struct irq_desc {
91281 unsigned int irq_count; /* For detecting broken IRQs */
91282 unsigned long last_unhandled; /* Aging timer for unhandled count */
91283 unsigned int irqs_unhandled;
91284- atomic_t threads_handled;
91285+ atomic_unchecked_t threads_handled;
91286 int threads_handled_last;
91287 raw_spinlock_t lock;
91288 struct cpumask *percpu_enabled;
91289diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
91290index 676d730..8d3a1ad 100644
91291--- a/include/linux/irqdomain.h
91292+++ b/include/linux/irqdomain.h
91293@@ -40,6 +40,7 @@ struct device_node;
91294 struct irq_domain;
91295 struct of_device_id;
91296 struct irq_chip;
91297+typedef struct irq_chip __no_const irq_chip_no_const;
91298 struct irq_data;
91299
91300 /* Number of irqs reserved for a legacy isa controller */
91301diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
91302index c367cbd..c9b79e6 100644
91303--- a/include/linux/jiffies.h
91304+++ b/include/linux/jiffies.h
91305@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
91306 /*
91307 * Convert various time units to each other:
91308 */
91309-extern unsigned int jiffies_to_msecs(const unsigned long j);
91310-extern unsigned int jiffies_to_usecs(const unsigned long j);
91311+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
91312+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
91313
91314-static inline u64 jiffies_to_nsecs(const unsigned long j)
91315+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
91316 {
91317 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
91318 }
91319
91320-extern unsigned long msecs_to_jiffies(const unsigned int m);
91321-extern unsigned long usecs_to_jiffies(const unsigned int u);
91322+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
91323+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
91324 extern unsigned long timespec_to_jiffies(const struct timespec *value);
91325 extern void jiffies_to_timespec(const unsigned long jiffies,
91326- struct timespec *value);
91327-extern unsigned long timeval_to_jiffies(const struct timeval *value);
91328+ struct timespec *value) __intentional_overflow(-1);
91329+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
91330 extern void jiffies_to_timeval(const unsigned long jiffies,
91331 struct timeval *value);
91332
91333diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
91334index 6883e19..e854fcb 100644
91335--- a/include/linux/kallsyms.h
91336+++ b/include/linux/kallsyms.h
91337@@ -15,7 +15,8 @@
91338
91339 struct module;
91340
91341-#ifdef CONFIG_KALLSYMS
91342+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
91343+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91344 /* Lookup the address for a symbol. Returns 0 if not found. */
91345 unsigned long kallsyms_lookup_name(const char *name);
91346
91347@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
91348 /* Stupid that this does nothing, but I didn't create this mess. */
91349 #define __print_symbol(fmt, addr)
91350 #endif /*CONFIG_KALLSYMS*/
91351+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
91352+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
91353+extern unsigned long kallsyms_lookup_name(const char *name);
91354+extern void __print_symbol(const char *fmt, unsigned long address);
91355+extern int sprint_backtrace(char *buffer, unsigned long address);
91356+extern int sprint_symbol(char *buffer, unsigned long address);
91357+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
91358+const char *kallsyms_lookup(unsigned long addr,
91359+ unsigned long *symbolsize,
91360+ unsigned long *offset,
91361+ char **modname, char *namebuf);
91362+extern int kallsyms_lookup_size_offset(unsigned long addr,
91363+ unsigned long *symbolsize,
91364+ unsigned long *offset);
91365+#endif
91366
91367 /* This macro allows us to keep printk typechecking */
91368 static __printf(1, 2)
91369diff --git a/include/linux/kernel.h b/include/linux/kernel.h
91370index d6d630d..feea1f5 100644
91371--- a/include/linux/kernel.h
91372+++ b/include/linux/kernel.h
91373@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
91374 /* Obsolete, do not use. Use kstrto<foo> instead */
91375
91376 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
91377-extern long simple_strtol(const char *,char **,unsigned int);
91378+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
91379 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
91380 extern long long simple_strtoll(const char *,char **,unsigned int);
91381
91382diff --git a/include/linux/key-type.h b/include/linux/key-type.h
91383index ff9f1d3..6712be5 100644
91384--- a/include/linux/key-type.h
91385+++ b/include/linux/key-type.h
91386@@ -152,7 +152,7 @@ struct key_type {
91387 /* internal fields */
91388 struct list_head link; /* link in types list */
91389 struct lock_class_key lock_class; /* key->sem lock class */
91390-};
91391+} __do_const;
91392
91393 extern struct key_type key_type_keyring;
91394
91395diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
91396index e465bb1..19f605fd 100644
91397--- a/include/linux/kgdb.h
91398+++ b/include/linux/kgdb.h
91399@@ -52,7 +52,7 @@ extern int kgdb_connected;
91400 extern int kgdb_io_module_registered;
91401
91402 extern atomic_t kgdb_setting_breakpoint;
91403-extern atomic_t kgdb_cpu_doing_single_step;
91404+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
91405
91406 extern struct task_struct *kgdb_usethread;
91407 extern struct task_struct *kgdb_contthread;
91408@@ -254,7 +254,7 @@ struct kgdb_arch {
91409 void (*correct_hw_break)(void);
91410
91411 void (*enable_nmi)(bool on);
91412-};
91413+} __do_const;
91414
91415 /**
91416 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
91417@@ -279,7 +279,7 @@ struct kgdb_io {
91418 void (*pre_exception) (void);
91419 void (*post_exception) (void);
91420 int is_console;
91421-};
91422+} __do_const;
91423
91424 extern struct kgdb_arch arch_kgdb_ops;
91425
91426diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
91427index e705467..a92471d 100644
91428--- a/include/linux/kmemleak.h
91429+++ b/include/linux/kmemleak.h
91430@@ -27,7 +27,7 @@
91431
91432 extern void kmemleak_init(void) __ref;
91433 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91434- gfp_t gfp) __ref;
91435+ gfp_t gfp) __ref __size_overflow(2);
91436 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
91437 extern void kmemleak_free(const void *ptr) __ref;
91438 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
91439@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
91440 static inline void kmemleak_init(void)
91441 {
91442 }
91443-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
91444+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
91445 gfp_t gfp)
91446 {
91447 }
91448diff --git a/include/linux/kmod.h b/include/linux/kmod.h
91449index 0555cc6..40116ce 100644
91450--- a/include/linux/kmod.h
91451+++ b/include/linux/kmod.h
91452@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
91453 * usually useless though. */
91454 extern __printf(2, 3)
91455 int __request_module(bool wait, const char *name, ...);
91456+extern __printf(3, 4)
91457+int ___request_module(bool wait, char *param_name, const char *name, ...);
91458 #define request_module(mod...) __request_module(true, mod)
91459 #define request_module_nowait(mod...) __request_module(false, mod)
91460 #define try_then_request_module(x, mod...) \
91461@@ -57,6 +59,9 @@ struct subprocess_info {
91462 struct work_struct work;
91463 struct completion *complete;
91464 char *path;
91465+#ifdef CONFIG_GRKERNSEC
91466+ char *origpath;
91467+#endif
91468 char **argv;
91469 char **envp;
91470 int wait;
91471diff --git a/include/linux/kobject.h b/include/linux/kobject.h
91472index 2d61b90..a1d0a13 100644
91473--- a/include/linux/kobject.h
91474+++ b/include/linux/kobject.h
91475@@ -118,7 +118,7 @@ struct kobj_type {
91476 struct attribute **default_attrs;
91477 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
91478 const void *(*namespace)(struct kobject *kobj);
91479-};
91480+} __do_const;
91481
91482 struct kobj_uevent_env {
91483 char *argv[3];
91484@@ -142,6 +142,7 @@ struct kobj_attribute {
91485 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
91486 const char *buf, size_t count);
91487 };
91488+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
91489
91490 extern const struct sysfs_ops kobj_sysfs_ops;
91491
91492@@ -169,7 +170,7 @@ struct kset {
91493 spinlock_t list_lock;
91494 struct kobject kobj;
91495 const struct kset_uevent_ops *uevent_ops;
91496-};
91497+} __randomize_layout;
91498
91499 extern void kset_init(struct kset *kset);
91500 extern int __must_check kset_register(struct kset *kset);
91501diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
91502index df32d25..fb52e27 100644
91503--- a/include/linux/kobject_ns.h
91504+++ b/include/linux/kobject_ns.h
91505@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
91506 const void *(*netlink_ns)(struct sock *sk);
91507 const void *(*initial_ns)(void);
91508 void (*drop_ns)(void *);
91509-};
91510+} __do_const;
91511
91512 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
91513 int kobj_ns_type_registered(enum kobj_ns_type type);
91514diff --git a/include/linux/kref.h b/include/linux/kref.h
91515index 484604d..0f6c5b6 100644
91516--- a/include/linux/kref.h
91517+++ b/include/linux/kref.h
91518@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
91519 static inline int kref_sub(struct kref *kref, unsigned int count,
91520 void (*release)(struct kref *kref))
91521 {
91522- WARN_ON(release == NULL);
91523+ BUG_ON(release == NULL);
91524
91525 if (atomic_sub_and_test((int) count, &kref->refcount)) {
91526 release(kref);
91527diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
91528index d12b210..d91fd76 100644
91529--- a/include/linux/kvm_host.h
91530+++ b/include/linux/kvm_host.h
91531@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
91532 {
91533 }
91534 #endif
91535-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91536+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
91537 struct module *module);
91538 void kvm_exit(void);
91539
91540@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
91541 struct kvm_guest_debug *dbg);
91542 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
91543
91544-int kvm_arch_init(void *opaque);
91545+int kvm_arch_init(const void *opaque);
91546 void kvm_arch_exit(void);
91547
91548 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
91549diff --git a/include/linux/libata.h b/include/linux/libata.h
91550index f8994b4..c1dec7a 100644
91551--- a/include/linux/libata.h
91552+++ b/include/linux/libata.h
91553@@ -989,7 +989,7 @@ struct ata_port_operations {
91554 * fields must be pointers.
91555 */
91556 const struct ata_port_operations *inherits;
91557-};
91558+} __do_const;
91559
91560 struct ata_port_info {
91561 unsigned long flags;
91562diff --git a/include/linux/linkage.h b/include/linux/linkage.h
91563index a6a42dd..6c5ebce 100644
91564--- a/include/linux/linkage.h
91565+++ b/include/linux/linkage.h
91566@@ -36,6 +36,7 @@
91567 #endif
91568
91569 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
91570+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
91571 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
91572
91573 /*
91574diff --git a/include/linux/list.h b/include/linux/list.h
91575index feb773c..98f3075 100644
91576--- a/include/linux/list.h
91577+++ b/include/linux/list.h
91578@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
91579 extern void list_del(struct list_head *entry);
91580 #endif
91581
91582+extern void __pax_list_add(struct list_head *new,
91583+ struct list_head *prev,
91584+ struct list_head *next);
91585+static inline void pax_list_add(struct list_head *new, struct list_head *head)
91586+{
91587+ __pax_list_add(new, head, head->next);
91588+}
91589+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
91590+{
91591+ __pax_list_add(new, head->prev, head);
91592+}
91593+extern void pax_list_del(struct list_head *entry);
91594+
91595 /**
91596 * list_replace - replace old entry by new one
91597 * @old : the element to be replaced
91598@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
91599 INIT_LIST_HEAD(entry);
91600 }
91601
91602+extern void pax_list_del_init(struct list_head *entry);
91603+
91604 /**
91605 * list_move - delete from one list and add as another's head
91606 * @list: the entry to move
91607diff --git a/include/linux/lockref.h b/include/linux/lockref.h
91608index b10b122..d37b3de 100644
91609--- a/include/linux/lockref.h
91610+++ b/include/linux/lockref.h
91611@@ -28,7 +28,7 @@ struct lockref {
91612 #endif
91613 struct {
91614 spinlock_t lock;
91615- int count;
91616+ atomic_t count;
91617 };
91618 };
91619 };
91620@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
91621 extern int lockref_get_not_dead(struct lockref *);
91622
91623 /* Must be called under spinlock for reliable results */
91624-static inline int __lockref_is_dead(const struct lockref *l)
91625+static inline int __lockref_is_dead(const struct lockref *lockref)
91626 {
91627- return ((int)l->count < 0);
91628+ return atomic_read(&lockref->count) < 0;
91629+}
91630+
91631+static inline int __lockref_read(const struct lockref *lockref)
91632+{
91633+ return atomic_read(&lockref->count);
91634+}
91635+
91636+static inline void __lockref_set(struct lockref *lockref, int count)
91637+{
91638+ atomic_set(&lockref->count, count);
91639+}
91640+
91641+static inline void __lockref_inc(struct lockref *lockref)
91642+{
91643+ atomic_inc(&lockref->count);
91644+}
91645+
91646+static inline void __lockref_dec(struct lockref *lockref)
91647+{
91648+ atomic_dec(&lockref->count);
91649 }
91650
91651 #endif /* __LINUX_LOCKREF_H */
91652diff --git a/include/linux/math64.h b/include/linux/math64.h
91653index c45c089..298841c 100644
91654--- a/include/linux/math64.h
91655+++ b/include/linux/math64.h
91656@@ -15,7 +15,7 @@
91657 * This is commonly provided by 32bit archs to provide an optimized 64bit
91658 * divide.
91659 */
91660-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91661+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91662 {
91663 *remainder = dividend % divisor;
91664 return dividend / divisor;
91665@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
91666 /**
91667 * div64_u64 - unsigned 64bit divide with 64bit divisor
91668 */
91669-static inline u64 div64_u64(u64 dividend, u64 divisor)
91670+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
91671 {
91672 return dividend / divisor;
91673 }
91674@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
91675 #define div64_ul(x, y) div_u64((x), (y))
91676
91677 #ifndef div_u64_rem
91678-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91679+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
91680 {
91681 *remainder = do_div(dividend, divisor);
91682 return dividend;
91683@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
91684 #endif
91685
91686 #ifndef div64_u64
91687-extern u64 div64_u64(u64 dividend, u64 divisor);
91688+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
91689 #endif
91690
91691 #ifndef div64_s64
91692@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
91693 * divide.
91694 */
91695 #ifndef div_u64
91696-static inline u64 div_u64(u64 dividend, u32 divisor)
91697+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
91698 {
91699 u32 remainder;
91700 return div_u64_rem(dividend, divisor, &remainder);
91701diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
91702index 3d385c8..deacb6a 100644
91703--- a/include/linux/mempolicy.h
91704+++ b/include/linux/mempolicy.h
91705@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
91706 }
91707
91708 #define vma_policy(vma) ((vma)->vm_policy)
91709+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91710+{
91711+ vma->vm_policy = pol;
91712+}
91713
91714 static inline void mpol_get(struct mempolicy *pol)
91715 {
91716@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
91717 }
91718
91719 #define vma_policy(vma) NULL
91720+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
91721+{
91722+}
91723
91724 static inline int
91725 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
91726diff --git a/include/linux/mm.h b/include/linux/mm.h
91727index 47a9392..ef645bc 100644
91728--- a/include/linux/mm.h
91729+++ b/include/linux/mm.h
91730@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
91731
91732 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
91733 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
91734+
91735+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
91736+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
91737+#endif
91738+
91739 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
91740 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
91741 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
91742@@ -254,8 +259,8 @@ struct vm_operations_struct {
91743 /* called by access_process_vm when get_user_pages() fails, typically
91744 * for use by special VMAs that can switch between memory and hardware
91745 */
91746- int (*access)(struct vm_area_struct *vma, unsigned long addr,
91747- void *buf, int len, int write);
91748+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
91749+ void *buf, size_t len, int write);
91750
91751 /* Called by the /proc/PID/maps code to ask the vma whether it
91752 * has a special name. Returning non-NULL will also cause this
91753@@ -293,6 +298,7 @@ struct vm_operations_struct {
91754 struct page *(*find_special_page)(struct vm_area_struct *vma,
91755 unsigned long addr);
91756 };
91757+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
91758
91759 struct mmu_gather;
91760 struct inode;
91761@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
91762 unsigned long *pfn);
91763 int follow_phys(struct vm_area_struct *vma, unsigned long address,
91764 unsigned int flags, unsigned long *prot, resource_size_t *phys);
91765-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91766- void *buf, int len, int write);
91767+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
91768+ void *buf, size_t len, int write);
91769
91770 static inline void unmap_shared_mapping_range(struct address_space *mapping,
91771 loff_t const holebegin, loff_t const holelen)
91772@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
91773 }
91774 #endif
91775
91776-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
91777-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
91778- void *buf, int len, int write);
91779+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
91780+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
91781+ void *buf, size_t len, int write);
91782
91783 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
91784 unsigned long start, unsigned long nr_pages,
91785@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
91786 int clear_page_dirty_for_io(struct page *page);
91787 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
91788
91789-/* Is the vma a continuation of the stack vma above it? */
91790-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
91791-{
91792- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
91793-}
91794-
91795-static inline int stack_guard_page_start(struct vm_area_struct *vma,
91796- unsigned long addr)
91797-{
91798- return (vma->vm_flags & VM_GROWSDOWN) &&
91799- (vma->vm_start == addr) &&
91800- !vma_growsdown(vma->vm_prev, addr);
91801-}
91802-
91803-/* Is the vma a continuation of the stack vma below it? */
91804-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
91805-{
91806- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
91807-}
91808-
91809-static inline int stack_guard_page_end(struct vm_area_struct *vma,
91810- unsigned long addr)
91811-{
91812- return (vma->vm_flags & VM_GROWSUP) &&
91813- (vma->vm_end == addr) &&
91814- !vma_growsup(vma->vm_next, addr);
91815-}
91816-
91817 extern struct task_struct *task_of_stack(struct task_struct *task,
91818 struct vm_area_struct *vma, bool in_group);
91819
91820@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
91821 {
91822 return 0;
91823 }
91824+
91825+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
91826+ unsigned long address)
91827+{
91828+ return 0;
91829+}
91830 #else
91831 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91832+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
91833 #endif
91834
91835 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
91836@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
91837 return 0;
91838 }
91839
91840+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
91841+ unsigned long address)
91842+{
91843+ return 0;
91844+}
91845+
91846 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
91847
91848 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
91849@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
91850
91851 #else
91852 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
91853+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
91854
91855 static inline void mm_nr_pmds_init(struct mm_struct *mm)
91856 {
91857@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
91858 NULL: pud_offset(pgd, address);
91859 }
91860
91861+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
91862+{
91863+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
91864+ NULL: pud_offset(pgd, address);
91865+}
91866+
91867 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
91868 {
91869 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
91870 NULL: pmd_offset(pud, address);
91871 }
91872+
91873+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
91874+{
91875+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
91876+ NULL: pmd_offset(pud, address);
91877+}
91878 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
91879
91880 #if USE_SPLIT_PTE_PTLOCKS
91881@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
91882 bool *need_rmap_locks);
91883 extern void exit_mmap(struct mm_struct *);
91884
91885+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
91886+extern void gr_learn_resource(const struct task_struct *task, const int res,
91887+ const unsigned long wanted, const int gt);
91888+#else
91889+static inline void gr_learn_resource(const struct task_struct *task, const int res,
91890+ const unsigned long wanted, const int gt)
91891+{
91892+}
91893+#endif
91894+
91895 static inline int check_data_rlimit(unsigned long rlim,
91896 unsigned long new,
91897 unsigned long start,
91898 unsigned long end_data,
91899 unsigned long start_data)
91900 {
91901+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
91902 if (rlim < RLIM_INFINITY) {
91903 if (((new - start) + (end_data - start_data)) > rlim)
91904 return -ENOSPC;
91905@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
91906 unsigned long addr, unsigned long len,
91907 unsigned long flags, struct page **pages);
91908
91909-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
91910+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
91911
91912 extern unsigned long mmap_region(struct file *file, unsigned long addr,
91913 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
91914@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
91915 unsigned long len, unsigned long prot, unsigned long flags,
91916 unsigned long pgoff, unsigned long *populate);
91917 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
91918+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
91919
91920 #ifdef CONFIG_MMU
91921 extern int __mm_populate(unsigned long addr, unsigned long len,
91922@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
91923 unsigned long high_limit;
91924 unsigned long align_mask;
91925 unsigned long align_offset;
91926+ unsigned long threadstack_offset;
91927 };
91928
91929-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
91930-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91931+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
91932+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
91933
91934 /*
91935 * Search for an unmapped address range.
91936@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
91937 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
91938 */
91939 static inline unsigned long
91940-vm_unmapped_area(struct vm_unmapped_area_info *info)
91941+vm_unmapped_area(const struct vm_unmapped_area_info *info)
91942 {
91943 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
91944 return unmapped_area(info);
91945@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
91946 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
91947 struct vm_area_struct **pprev);
91948
91949+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
91950+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
91951+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
91952+
91953 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
91954 NULL if none. Assume start_addr < end_addr. */
91955 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
91956@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
91957 }
91958
91959 #ifdef CONFIG_MMU
91960-pgprot_t vm_get_page_prot(unsigned long vm_flags);
91961+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
91962 void vma_set_page_prot(struct vm_area_struct *vma);
91963 #else
91964-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
91965+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
91966 {
91967 return __pgprot(0);
91968 }
91969@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
91970 static inline void vm_stat_account(struct mm_struct *mm,
91971 unsigned long flags, struct file *file, long pages)
91972 {
91973+
91974+#ifdef CONFIG_PAX_RANDMMAP
91975+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
91976+#endif
91977+
91978 mm->total_vm += pages;
91979 }
91980 #endif /* CONFIG_PROC_FS */
91981@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
91982 extern int sysctl_memory_failure_early_kill;
91983 extern int sysctl_memory_failure_recovery;
91984 extern void shake_page(struct page *p, int access);
91985-extern atomic_long_t num_poisoned_pages;
91986+extern atomic_long_unchecked_t num_poisoned_pages;
91987 extern int soft_offline_page(struct page *page, int flags);
91988
91989 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
91990@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
91991 static inline void setup_nr_node_ids(void) {}
91992 #endif
91993
91994+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
91995+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
91996+#else
91997+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
91998+#endif
91999+
92000 #endif /* __KERNEL__ */
92001 #endif /* _LINUX_MM_H */
92002diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
92003index 199a03a..7328440 100644
92004--- a/include/linux/mm_types.h
92005+++ b/include/linux/mm_types.h
92006@@ -313,7 +313,9 @@ struct vm_area_struct {
92007 #ifdef CONFIG_NUMA
92008 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
92009 #endif
92010-};
92011+
92012+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
92013+} __randomize_layout;
92014
92015 struct core_thread {
92016 struct task_struct *task;
92017@@ -464,7 +466,25 @@ struct mm_struct {
92018 /* address of the bounds directory */
92019 void __user *bd_addr;
92020 #endif
92021-};
92022+
92023+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
92024+ unsigned long pax_flags;
92025+#endif
92026+
92027+#ifdef CONFIG_PAX_DLRESOLVE
92028+ unsigned long call_dl_resolve;
92029+#endif
92030+
92031+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
92032+ unsigned long call_syscall;
92033+#endif
92034+
92035+#ifdef CONFIG_PAX_ASLR
92036+ unsigned long delta_mmap; /* randomized offset */
92037+ unsigned long delta_stack; /* randomized offset */
92038+#endif
92039+
92040+} __randomize_layout;
92041
92042 static inline void mm_init_cpumask(struct mm_struct *mm)
92043 {
92044diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
92045index 160448f..7b332b7 100644
92046--- a/include/linux/mmc/core.h
92047+++ b/include/linux/mmc/core.h
92048@@ -79,7 +79,7 @@ struct mmc_command {
92049 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
92050
92051 unsigned int retries; /* max number of retries */
92052- unsigned int error; /* command error */
92053+ int error; /* command error */
92054
92055 /*
92056 * Standard errno values are used for errors, but some have specific
92057diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
92058index c5d5278..f0b68c8 100644
92059--- a/include/linux/mmiotrace.h
92060+++ b/include/linux/mmiotrace.h
92061@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
92062 /* Called from ioremap.c */
92063 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
92064 void __iomem *addr);
92065-extern void mmiotrace_iounmap(volatile void __iomem *addr);
92066+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
92067
92068 /* For anyone to insert markers. Remember trailing newline. */
92069 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
92070@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
92071 {
92072 }
92073
92074-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
92075+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
92076 {
92077 }
92078
92079diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
92080index 2782df4..abe756e 100644
92081--- a/include/linux/mmzone.h
92082+++ b/include/linux/mmzone.h
92083@@ -526,7 +526,7 @@ struct zone {
92084
92085 ZONE_PADDING(_pad3_)
92086 /* Zone statistics */
92087- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92088+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
92089 } ____cacheline_internodealigned_in_smp;
92090
92091 enum zone_flags {
92092diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
92093index e530533..c9620c7 100644
92094--- a/include/linux/mod_devicetable.h
92095+++ b/include/linux/mod_devicetable.h
92096@@ -139,7 +139,7 @@ struct usb_device_id {
92097 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
92098 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
92099
92100-#define HID_ANY_ID (~0)
92101+#define HID_ANY_ID (~0U)
92102 #define HID_BUS_ANY 0xffff
92103 #define HID_GROUP_ANY 0x0000
92104
92105@@ -470,7 +470,7 @@ struct dmi_system_id {
92106 const char *ident;
92107 struct dmi_strmatch matches[4];
92108 void *driver_data;
92109-};
92110+} __do_const;
92111 /*
92112 * struct dmi_device_id appears during expansion of
92113 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
92114diff --git a/include/linux/module.h b/include/linux/module.h
92115index b03485b..a26974f 100644
92116--- a/include/linux/module.h
92117+++ b/include/linux/module.h
92118@@ -17,9 +17,11 @@
92119 #include <linux/moduleparam.h>
92120 #include <linux/jump_label.h>
92121 #include <linux/export.h>
92122+#include <linux/fs.h>
92123
92124 #include <linux/percpu.h>
92125 #include <asm/module.h>
92126+#include <asm/pgtable.h>
92127
92128 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
92129 #define MODULE_SIG_STRING "~Module signature appended~\n"
92130@@ -42,7 +44,7 @@ struct module_kobject {
92131 struct kobject *drivers_dir;
92132 struct module_param_attrs *mp;
92133 struct completion *kobj_completion;
92134-};
92135+} __randomize_layout;
92136
92137 struct module_attribute {
92138 struct attribute attr;
92139@@ -54,12 +56,13 @@ struct module_attribute {
92140 int (*test)(struct module *);
92141 void (*free)(struct module *);
92142 };
92143+typedef struct module_attribute __no_const module_attribute_no_const;
92144
92145 struct module_version_attribute {
92146 struct module_attribute mattr;
92147 const char *module_name;
92148 const char *version;
92149-} __attribute__ ((__aligned__(sizeof(void *))));
92150+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
92151
92152 extern ssize_t __modver_version_show(struct module_attribute *,
92153 struct module_kobject *, char *);
92154@@ -221,7 +224,7 @@ struct module {
92155
92156 /* Sysfs stuff. */
92157 struct module_kobject mkobj;
92158- struct module_attribute *modinfo_attrs;
92159+ module_attribute_no_const *modinfo_attrs;
92160 const char *version;
92161 const char *srcversion;
92162 struct kobject *holders_dir;
92163@@ -270,19 +273,16 @@ struct module {
92164 int (*init)(void);
92165
92166 /* If this is non-NULL, vfree after init() returns */
92167- void *module_init;
92168+ void *module_init_rx, *module_init_rw;
92169
92170 /* Here is the actual code + data, vfree'd on unload. */
92171- void *module_core;
92172+ void *module_core_rx, *module_core_rw;
92173
92174 /* Here are the sizes of the init and core sections */
92175- unsigned int init_size, core_size;
92176+ unsigned int init_size_rw, core_size_rw;
92177
92178 /* The size of the executable code in each section. */
92179- unsigned int init_text_size, core_text_size;
92180-
92181- /* Size of RO sections of the module (text+rodata) */
92182- unsigned int init_ro_size, core_ro_size;
92183+ unsigned int init_size_rx, core_size_rx;
92184
92185 /* Arch-specific module values */
92186 struct mod_arch_specific arch;
92187@@ -338,6 +338,10 @@ struct module {
92188 #ifdef CONFIG_EVENT_TRACING
92189 struct ftrace_event_call **trace_events;
92190 unsigned int num_trace_events;
92191+ struct file_operations trace_id;
92192+ struct file_operations trace_enable;
92193+ struct file_operations trace_format;
92194+ struct file_operations trace_filter;
92195 #endif
92196 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
92197 unsigned int num_ftrace_callsites;
92198@@ -365,7 +369,7 @@ struct module {
92199 ctor_fn_t *ctors;
92200 unsigned int num_ctors;
92201 #endif
92202-};
92203+} __randomize_layout;
92204 #ifndef MODULE_ARCH_INIT
92205 #define MODULE_ARCH_INIT {}
92206 #endif
92207@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
92208 bool is_module_percpu_address(unsigned long addr);
92209 bool is_module_text_address(unsigned long addr);
92210
92211+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
92212+{
92213+
92214+#ifdef CONFIG_PAX_KERNEXEC
92215+ if (ktla_ktva(addr) >= (unsigned long)start &&
92216+ ktla_ktva(addr) < (unsigned long)start + size)
92217+ return 1;
92218+#endif
92219+
92220+ return ((void *)addr >= start && (void *)addr < start + size);
92221+}
92222+
92223+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
92224+{
92225+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
92226+}
92227+
92228+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
92229+{
92230+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
92231+}
92232+
92233+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
92234+{
92235+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
92236+}
92237+
92238+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
92239+{
92240+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
92241+}
92242+
92243 static inline bool within_module_core(unsigned long addr,
92244 const struct module *mod)
92245 {
92246- return (unsigned long)mod->module_core <= addr &&
92247- addr < (unsigned long)mod->module_core + mod->core_size;
92248+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
92249 }
92250
92251 static inline bool within_module_init(unsigned long addr,
92252 const struct module *mod)
92253 {
92254- return (unsigned long)mod->module_init <= addr &&
92255- addr < (unsigned long)mod->module_init + mod->init_size;
92256+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
92257 }
92258
92259 static inline bool within_module(unsigned long addr, const struct module *mod)
92260diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
92261index 4d0cb9b..3169ac7 100644
92262--- a/include/linux/moduleloader.h
92263+++ b/include/linux/moduleloader.h
92264@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
92265 sections. Returns NULL on failure. */
92266 void *module_alloc(unsigned long size);
92267
92268+#ifdef CONFIG_PAX_KERNEXEC
92269+void *module_alloc_exec(unsigned long size);
92270+#else
92271+#define module_alloc_exec(x) module_alloc(x)
92272+#endif
92273+
92274 /* Free memory returned from module_alloc. */
92275 void module_memfree(void *module_region);
92276
92277+#ifdef CONFIG_PAX_KERNEXEC
92278+void module_memfree_exec(void *module_region);
92279+#else
92280+#define module_memfree_exec(x) module_memfree((x))
92281+#endif
92282+
92283 /*
92284 * Apply the given relocation to the (simplified) ELF. Return -error
92285 * or 0.
92286@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
92287 unsigned int relsec,
92288 struct module *me)
92289 {
92290+#ifdef CONFIG_MODULES
92291 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92292 module_name(me));
92293+#endif
92294 return -ENOEXEC;
92295 }
92296 #endif
92297@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
92298 unsigned int relsec,
92299 struct module *me)
92300 {
92301+#ifdef CONFIG_MODULES
92302 printk(KERN_ERR "module %s: REL relocation unsupported\n",
92303 module_name(me));
92304+#endif
92305 return -ENOEXEC;
92306 }
92307 #endif
92308diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
92309index 1c9effa..1160bdd 100644
92310--- a/include/linux/moduleparam.h
92311+++ b/include/linux/moduleparam.h
92312@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
92313 * @len is usually just sizeof(string).
92314 */
92315 #define module_param_string(name, string, len, perm) \
92316- static const struct kparam_string __param_string_##name \
92317+ static const struct kparam_string __param_string_##name __used \
92318 = { len, string }; \
92319 __module_param_call(MODULE_PARAM_PREFIX, name, \
92320 &param_ops_string, \
92321@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
92322 */
92323 #define module_param_array_named(name, array, type, nump, perm) \
92324 param_check_##type(name, &(array)[0]); \
92325- static const struct kparam_array __param_arr_##name \
92326+ static const struct kparam_array __param_arr_##name __used \
92327 = { .max = ARRAY_SIZE(array), .num = nump, \
92328 .ops = &param_ops_##type, \
92329 .elemsize = sizeof(array[0]), .elem = array }; \
92330diff --git a/include/linux/mount.h b/include/linux/mount.h
92331index 564beee..653be6f 100644
92332--- a/include/linux/mount.h
92333+++ b/include/linux/mount.h
92334@@ -67,7 +67,7 @@ struct vfsmount {
92335 struct dentry *mnt_root; /* root of the mounted tree */
92336 struct super_block *mnt_sb; /* pointer to superblock */
92337 int mnt_flags;
92338-};
92339+} __randomize_layout;
92340
92341 struct file; /* forward dec */
92342 struct path;
92343diff --git a/include/linux/namei.h b/include/linux/namei.h
92344index c899077..b9a2010 100644
92345--- a/include/linux/namei.h
92346+++ b/include/linux/namei.h
92347@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
92348 extern void unlock_rename(struct dentry *, struct dentry *);
92349
92350 extern void nd_jump_link(struct nameidata *nd, struct path *path);
92351-extern void nd_set_link(struct nameidata *nd, char *path);
92352-extern char *nd_get_link(struct nameidata *nd);
92353+extern void nd_set_link(struct nameidata *nd, const char *path);
92354+extern const char *nd_get_link(const struct nameidata *nd);
92355
92356 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
92357 {
92358diff --git a/include/linux/net.h b/include/linux/net.h
92359index 17d8339..81656c0 100644
92360--- a/include/linux/net.h
92361+++ b/include/linux/net.h
92362@@ -192,7 +192,7 @@ struct net_proto_family {
92363 int (*create)(struct net *net, struct socket *sock,
92364 int protocol, int kern);
92365 struct module *owner;
92366-};
92367+} __do_const;
92368
92369 struct iovec;
92370 struct kvec;
92371diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
92372index 2787388..1dd8e88 100644
92373--- a/include/linux/netdevice.h
92374+++ b/include/linux/netdevice.h
92375@@ -1198,6 +1198,7 @@ struct net_device_ops {
92376 u8 state);
92377 #endif
92378 };
92379+typedef struct net_device_ops __no_const net_device_ops_no_const;
92380
92381 /**
92382 * enum net_device_priv_flags - &struct net_device priv_flags
92383@@ -1546,10 +1547,10 @@ struct net_device {
92384
92385 struct net_device_stats stats;
92386
92387- atomic_long_t rx_dropped;
92388- atomic_long_t tx_dropped;
92389+ atomic_long_unchecked_t rx_dropped;
92390+ atomic_long_unchecked_t tx_dropped;
92391
92392- atomic_t carrier_changes;
92393+ atomic_unchecked_t carrier_changes;
92394
92395 #ifdef CONFIG_WIRELESS_EXT
92396 const struct iw_handler_def * wireless_handlers;
92397diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
92398index 2517ece..0bbfcfb 100644
92399--- a/include/linux/netfilter.h
92400+++ b/include/linux/netfilter.h
92401@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
92402 #endif
92403 /* Use the module struct to lock set/get code in place */
92404 struct module *owner;
92405-};
92406+} __do_const;
92407
92408 /* Function to register/unregister hook points. */
92409 int nf_register_hook(struct nf_hook_ops *reg);
92410diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
92411index e955d47..04a5338 100644
92412--- a/include/linux/netfilter/nfnetlink.h
92413+++ b/include/linux/netfilter/nfnetlink.h
92414@@ -19,7 +19,7 @@ struct nfnl_callback {
92415 const struct nlattr * const cda[]);
92416 const struct nla_policy *policy; /* netlink attribute policy */
92417 const u_int16_t attr_count; /* number of nlattr's */
92418-};
92419+} __do_const;
92420
92421 struct nfnetlink_subsystem {
92422 const char *name;
92423diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
92424new file mode 100644
92425index 0000000..33f4af8
92426--- /dev/null
92427+++ b/include/linux/netfilter/xt_gradm.h
92428@@ -0,0 +1,9 @@
92429+#ifndef _LINUX_NETFILTER_XT_GRADM_H
92430+#define _LINUX_NETFILTER_XT_GRADM_H 1
92431+
92432+struct xt_gradm_mtinfo {
92433+ __u16 flags;
92434+ __u16 invflags;
92435+};
92436+
92437+#endif
92438diff --git a/include/linux/nls.h b/include/linux/nls.h
92439index 520681b..2b7fabb 100644
92440--- a/include/linux/nls.h
92441+++ b/include/linux/nls.h
92442@@ -31,7 +31,7 @@ struct nls_table {
92443 const unsigned char *charset2upper;
92444 struct module *owner;
92445 struct nls_table *next;
92446-};
92447+} __do_const;
92448
92449 /* this value hold the maximum octet of charset */
92450 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
92451@@ -46,7 +46,7 @@ enum utf16_endian {
92452 /* nls_base.c */
92453 extern int __register_nls(struct nls_table *, struct module *);
92454 extern int unregister_nls(struct nls_table *);
92455-extern struct nls_table *load_nls(char *);
92456+extern struct nls_table *load_nls(const char *);
92457 extern void unload_nls(struct nls_table *);
92458 extern struct nls_table *load_nls_default(void);
92459 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
92460diff --git a/include/linux/notifier.h b/include/linux/notifier.h
92461index d14a4c3..a078786 100644
92462--- a/include/linux/notifier.h
92463+++ b/include/linux/notifier.h
92464@@ -54,7 +54,8 @@ struct notifier_block {
92465 notifier_fn_t notifier_call;
92466 struct notifier_block __rcu *next;
92467 int priority;
92468-};
92469+} __do_const;
92470+typedef struct notifier_block __no_const notifier_block_no_const;
92471
92472 struct atomic_notifier_head {
92473 spinlock_t lock;
92474diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
92475index b2a0f15..4d7da32 100644
92476--- a/include/linux/oprofile.h
92477+++ b/include/linux/oprofile.h
92478@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
92479 int oprofilefs_create_ro_ulong(struct dentry * root,
92480 char const * name, ulong * val);
92481
92482-/** Create a file for read-only access to an atomic_t. */
92483+/** Create a file for read-only access to an atomic_unchecked_t. */
92484 int oprofilefs_create_ro_atomic(struct dentry * root,
92485- char const * name, atomic_t * val);
92486+ char const * name, atomic_unchecked_t * val);
92487
92488 /** create a directory */
92489 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
92490diff --git a/include/linux/padata.h b/include/linux/padata.h
92491index 4386946..f50c615 100644
92492--- a/include/linux/padata.h
92493+++ b/include/linux/padata.h
92494@@ -129,7 +129,7 @@ struct parallel_data {
92495 struct padata_serial_queue __percpu *squeue;
92496 atomic_t reorder_objects;
92497 atomic_t refcnt;
92498- atomic_t seq_nr;
92499+ atomic_unchecked_t seq_nr;
92500 struct padata_cpumask cpumask;
92501 spinlock_t lock ____cacheline_aligned;
92502 unsigned int processed;
92503diff --git a/include/linux/path.h b/include/linux/path.h
92504index d137218..be0c176 100644
92505--- a/include/linux/path.h
92506+++ b/include/linux/path.h
92507@@ -1,13 +1,15 @@
92508 #ifndef _LINUX_PATH_H
92509 #define _LINUX_PATH_H
92510
92511+#include <linux/compiler.h>
92512+
92513 struct dentry;
92514 struct vfsmount;
92515
92516 struct path {
92517 struct vfsmount *mnt;
92518 struct dentry *dentry;
92519-};
92520+} __randomize_layout;
92521
92522 extern void path_get(const struct path *);
92523 extern void path_put(const struct path *);
92524diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
92525index 8c78950..0d74ed9 100644
92526--- a/include/linux/pci_hotplug.h
92527+++ b/include/linux/pci_hotplug.h
92528@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
92529 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
92530 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
92531 int (*reset_slot) (struct hotplug_slot *slot, int probe);
92532-};
92533+} __do_const;
92534+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
92535
92536 /**
92537 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
92538diff --git a/include/linux/percpu.h b/include/linux/percpu.h
92539index caebf2a..4c3ae9d 100644
92540--- a/include/linux/percpu.h
92541+++ b/include/linux/percpu.h
92542@@ -34,7 +34,7 @@
92543 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
92544 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
92545 */
92546-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
92547+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
92548 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
92549
92550 /*
92551diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
92552index 2b62198..2b74233 100644
92553--- a/include/linux/perf_event.h
92554+++ b/include/linux/perf_event.h
92555@@ -343,8 +343,8 @@ struct perf_event {
92556
92557 enum perf_event_active_state state;
92558 unsigned int attach_state;
92559- local64_t count;
92560- atomic64_t child_count;
92561+ local64_t count; /* PaX: fix it one day */
92562+ atomic64_unchecked_t child_count;
92563
92564 /*
92565 * These are the total time in nanoseconds that the event
92566@@ -395,8 +395,8 @@ struct perf_event {
92567 * These accumulate total time (in nanoseconds) that children
92568 * events have been enabled and running, respectively.
92569 */
92570- atomic64_t child_total_time_enabled;
92571- atomic64_t child_total_time_running;
92572+ atomic64_unchecked_t child_total_time_enabled;
92573+ atomic64_unchecked_t child_total_time_running;
92574
92575 /*
92576 * Protect attach/detach and child_list:
92577@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
92578 entry->ip[entry->nr++] = ip;
92579 }
92580
92581-extern int sysctl_perf_event_paranoid;
92582+extern int sysctl_perf_event_legitimately_concerned;
92583 extern int sysctl_perf_event_mlock;
92584 extern int sysctl_perf_event_sample_rate;
92585 extern int sysctl_perf_cpu_time_max_percent;
92586@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
92587 loff_t *ppos);
92588
92589
92590+static inline bool perf_paranoid_any(void)
92591+{
92592+ return sysctl_perf_event_legitimately_concerned > 2;
92593+}
92594+
92595 static inline bool perf_paranoid_tracepoint_raw(void)
92596 {
92597- return sysctl_perf_event_paranoid > -1;
92598+ return sysctl_perf_event_legitimately_concerned > -1;
92599 }
92600
92601 static inline bool perf_paranoid_cpu(void)
92602 {
92603- return sysctl_perf_event_paranoid > 0;
92604+ return sysctl_perf_event_legitimately_concerned > 0;
92605 }
92606
92607 static inline bool perf_paranoid_kernel(void)
92608 {
92609- return sysctl_perf_event_paranoid > 1;
92610+ return sysctl_perf_event_legitimately_concerned > 1;
92611 }
92612
92613 extern void perf_event_init(void);
92614@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
92615 struct device_attribute attr;
92616 u64 id;
92617 const char *event_str;
92618-};
92619+} __do_const;
92620
92621 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
92622 char *page);
92623diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
92624index 918b117..7af374b7 100644
92625--- a/include/linux/pid_namespace.h
92626+++ b/include/linux/pid_namespace.h
92627@@ -45,7 +45,7 @@ struct pid_namespace {
92628 int hide_pid;
92629 int reboot; /* group exit code if this pidns was rebooted */
92630 struct ns_common ns;
92631-};
92632+} __randomize_layout;
92633
92634 extern struct pid_namespace init_pid_ns;
92635
92636diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
92637index eb8b8ac..62649e1 100644
92638--- a/include/linux/pipe_fs_i.h
92639+++ b/include/linux/pipe_fs_i.h
92640@@ -47,10 +47,10 @@ struct pipe_inode_info {
92641 struct mutex mutex;
92642 wait_queue_head_t wait;
92643 unsigned int nrbufs, curbuf, buffers;
92644- unsigned int readers;
92645- unsigned int writers;
92646- unsigned int files;
92647- unsigned int waiting_writers;
92648+ atomic_t readers;
92649+ atomic_t writers;
92650+ atomic_t files;
92651+ atomic_t waiting_writers;
92652 unsigned int r_counter;
92653 unsigned int w_counter;
92654 struct page *tmp_page;
92655diff --git a/include/linux/pm.h b/include/linux/pm.h
92656index e2f1be6..78a0506 100644
92657--- a/include/linux/pm.h
92658+++ b/include/linux/pm.h
92659@@ -608,6 +608,7 @@ struct dev_pm_domain {
92660 struct dev_pm_ops ops;
92661 void (*detach)(struct device *dev, bool power_off);
92662 };
92663+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
92664
92665 /*
92666 * The PM_EVENT_ messages are also used by drivers implementing the legacy
92667diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
92668index 080e778..cbdaef7 100644
92669--- a/include/linux/pm_domain.h
92670+++ b/include/linux/pm_domain.h
92671@@ -39,11 +39,11 @@ struct gpd_dev_ops {
92672 int (*save_state)(struct device *dev);
92673 int (*restore_state)(struct device *dev);
92674 bool (*active_wakeup)(struct device *dev);
92675-};
92676+} __no_const;
92677
92678 struct gpd_cpuidle_data {
92679 unsigned int saved_exit_latency;
92680- struct cpuidle_state *idle_state;
92681+ cpuidle_state_no_const *idle_state;
92682 };
92683
92684 struct generic_pm_domain {
92685diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
92686index 30e84d4..22278b4 100644
92687--- a/include/linux/pm_runtime.h
92688+++ b/include/linux/pm_runtime.h
92689@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
92690
92691 static inline void pm_runtime_mark_last_busy(struct device *dev)
92692 {
92693- ACCESS_ONCE(dev->power.last_busy) = jiffies;
92694+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
92695 }
92696
92697 static inline bool pm_runtime_is_irq_safe(struct device *dev)
92698diff --git a/include/linux/pnp.h b/include/linux/pnp.h
92699index 6512e9c..ec27fa2 100644
92700--- a/include/linux/pnp.h
92701+++ b/include/linux/pnp.h
92702@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
92703 struct pnp_fixup {
92704 char id[7];
92705 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
92706-};
92707+} __do_const;
92708
92709 /* config parameters */
92710 #define PNP_CONFIG_NORMAL 0x0001
92711diff --git a/include/linux/poison.h b/include/linux/poison.h
92712index 2110a81..13a11bb 100644
92713--- a/include/linux/poison.h
92714+++ b/include/linux/poison.h
92715@@ -19,8 +19,8 @@
92716 * under normal circumstances, used to verify that nobody uses
92717 * non-initialized list entries.
92718 */
92719-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
92720-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
92721+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
92722+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
92723
92724 /********** include/linux/timer.h **********/
92725 /*
92726diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
92727index d8b187c3..9a9257a 100644
92728--- a/include/linux/power/smartreflex.h
92729+++ b/include/linux/power/smartreflex.h
92730@@ -238,7 +238,7 @@ struct omap_sr_class_data {
92731 int (*notify)(struct omap_sr *sr, u32 status);
92732 u8 notify_flags;
92733 u8 class_type;
92734-};
92735+} __do_const;
92736
92737 /**
92738 * struct omap_sr_nvalue_table - Smartreflex n-target value info
92739diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
92740index 4ea1d37..80f4b33 100644
92741--- a/include/linux/ppp-comp.h
92742+++ b/include/linux/ppp-comp.h
92743@@ -84,7 +84,7 @@ struct compressor {
92744 struct module *owner;
92745 /* Extra skb space needed by the compressor algorithm */
92746 unsigned int comp_extra;
92747-};
92748+} __do_const;
92749
92750 /*
92751 * The return value from decompress routine is the length of the
92752diff --git a/include/linux/preempt.h b/include/linux/preempt.h
92753index de83b4e..c4b997d 100644
92754--- a/include/linux/preempt.h
92755+++ b/include/linux/preempt.h
92756@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
92757 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
92758 #endif
92759
92760+#define raw_preempt_count_add(val) __preempt_count_add(val)
92761+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
92762+
92763 #define __preempt_count_inc() __preempt_count_add(1)
92764 #define __preempt_count_dec() __preempt_count_sub(1)
92765
92766 #define preempt_count_inc() preempt_count_add(1)
92767+#define raw_preempt_count_inc() raw_preempt_count_add(1)
92768 #define preempt_count_dec() preempt_count_sub(1)
92769+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
92770
92771 #ifdef CONFIG_PREEMPT_COUNT
92772
92773@@ -41,6 +46,12 @@ do { \
92774 barrier(); \
92775 } while (0)
92776
92777+#define raw_preempt_disable() \
92778+do { \
92779+ raw_preempt_count_inc(); \
92780+ barrier(); \
92781+} while (0)
92782+
92783 #define sched_preempt_enable_no_resched() \
92784 do { \
92785 barrier(); \
92786@@ -49,6 +60,12 @@ do { \
92787
92788 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
92789
92790+#define raw_preempt_enable_no_resched() \
92791+do { \
92792+ barrier(); \
92793+ raw_preempt_count_dec(); \
92794+} while (0)
92795+
92796 #ifdef CONFIG_PREEMPT
92797 #define preempt_enable() \
92798 do { \
92799@@ -113,8 +130,10 @@ do { \
92800 * region.
92801 */
92802 #define preempt_disable() barrier()
92803+#define raw_preempt_disable() barrier()
92804 #define sched_preempt_enable_no_resched() barrier()
92805 #define preempt_enable_no_resched() barrier()
92806+#define raw_preempt_enable_no_resched() barrier()
92807 #define preempt_enable() barrier()
92808 #define preempt_check_resched() do { } while (0)
92809
92810@@ -128,11 +147,13 @@ do { \
92811 /*
92812 * Modules have no business playing preemption tricks.
92813 */
92814+#ifndef CONFIG_PAX_KERNEXEC
92815 #undef sched_preempt_enable_no_resched
92816 #undef preempt_enable_no_resched
92817 #undef preempt_enable_no_resched_notrace
92818 #undef preempt_check_resched
92819 #endif
92820+#endif
92821
92822 #define preempt_set_need_resched() \
92823 do { \
92824diff --git a/include/linux/printk.h b/include/linux/printk.h
92825index baa3f97..168cff1 100644
92826--- a/include/linux/printk.h
92827+++ b/include/linux/printk.h
92828@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
92829 #endif
92830
92831 typedef int(*printk_func_t)(const char *fmt, va_list args);
92832+extern int kptr_restrict;
92833
92834 #ifdef CONFIG_PRINTK
92835 asmlinkage __printf(5, 0)
92836@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
92837
92838 extern int printk_delay_msec;
92839 extern int dmesg_restrict;
92840-extern int kptr_restrict;
92841
92842 extern void wake_up_klogd(void);
92843
92844diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
92845index b97bf2e..f14c92d4 100644
92846--- a/include/linux/proc_fs.h
92847+++ b/include/linux/proc_fs.h
92848@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
92849 extern struct proc_dir_entry *proc_symlink(const char *,
92850 struct proc_dir_entry *, const char *);
92851 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
92852+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
92853 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
92854 struct proc_dir_entry *, void *);
92855+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
92856+ struct proc_dir_entry *, void *);
92857 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
92858 struct proc_dir_entry *);
92859
92860@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
92861 return proc_create_data(name, mode, parent, proc_fops, NULL);
92862 }
92863
92864+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
92865+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
92866+{
92867+#ifdef CONFIG_GRKERNSEC_PROC_USER
92868+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
92869+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92870+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
92871+#else
92872+ return proc_create_data(name, mode, parent, proc_fops, NULL);
92873+#endif
92874+}
92875+
92876+
92877 extern void proc_set_size(struct proc_dir_entry *, loff_t);
92878 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
92879 extern void *PDE_DATA(const struct inode *);
92880@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
92881 struct proc_dir_entry *parent,const char *dest) { return NULL;}
92882 static inline struct proc_dir_entry *proc_mkdir(const char *name,
92883 struct proc_dir_entry *parent) {return NULL;}
92884+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
92885+ struct proc_dir_entry *parent) { return NULL; }
92886 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
92887 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92888+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
92889+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
92890 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
92891 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
92892 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
92893@@ -79,7 +99,7 @@ struct net;
92894 static inline struct proc_dir_entry *proc_net_mkdir(
92895 struct net *net, const char *name, struct proc_dir_entry *parent)
92896 {
92897- return proc_mkdir_data(name, 0, parent, net);
92898+ return proc_mkdir_data_restrict(name, 0, parent, net);
92899 }
92900
92901 #endif /* _LINUX_PROC_FS_H */
92902diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
92903index 42dfc61..8113a99 100644
92904--- a/include/linux/proc_ns.h
92905+++ b/include/linux/proc_ns.h
92906@@ -16,7 +16,7 @@ struct proc_ns_operations {
92907 struct ns_common *(*get)(struct task_struct *task);
92908 void (*put)(struct ns_common *ns);
92909 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
92910-};
92911+} __do_const __randomize_layout;
92912
92913 extern const struct proc_ns_operations netns_operations;
92914 extern const struct proc_ns_operations utsns_operations;
92915diff --git a/include/linux/quota.h b/include/linux/quota.h
92916index d534e8e..782e604 100644
92917--- a/include/linux/quota.h
92918+++ b/include/linux/quota.h
92919@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
92920
92921 extern bool qid_eq(struct kqid left, struct kqid right);
92922 extern bool qid_lt(struct kqid left, struct kqid right);
92923-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
92924+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
92925 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
92926 extern bool qid_valid(struct kqid qid);
92927
92928diff --git a/include/linux/random.h b/include/linux/random.h
92929index b05856e..0a9f14e 100644
92930--- a/include/linux/random.h
92931+++ b/include/linux/random.h
92932@@ -9,9 +9,19 @@
92933 #include <uapi/linux/random.h>
92934
92935 extern void add_device_randomness(const void *, unsigned int);
92936+
92937+static inline void add_latent_entropy(void)
92938+{
92939+
92940+#ifdef LATENT_ENTROPY_PLUGIN
92941+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
92942+#endif
92943+
92944+}
92945+
92946 extern void add_input_randomness(unsigned int type, unsigned int code,
92947- unsigned int value);
92948-extern void add_interrupt_randomness(int irq, int irq_flags);
92949+ unsigned int value) __latent_entropy;
92950+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
92951
92952 extern void get_random_bytes(void *buf, int nbytes);
92953 extern void get_random_bytes_arch(void *buf, int nbytes);
92954@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
92955 extern const struct file_operations random_fops, urandom_fops;
92956 #endif
92957
92958-unsigned int get_random_int(void);
92959+unsigned int __intentional_overflow(-1) get_random_int(void);
92960 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
92961
92962-u32 prandom_u32(void);
92963+u32 prandom_u32(void) __intentional_overflow(-1);
92964 void prandom_bytes(void *buf, size_t nbytes);
92965 void prandom_seed(u32 seed);
92966 void prandom_reseed_late(void);
92967@@ -37,6 +47,11 @@ struct rnd_state {
92968 u32 prandom_u32_state(struct rnd_state *state);
92969 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92970
92971+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
92972+{
92973+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
92974+}
92975+
92976 /**
92977 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
92978 * @ep_ro: right open interval endpoint
92979@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
92980 *
92981 * Returns: pseudo-random number in interval [0, ep_ro)
92982 */
92983-static inline u32 prandom_u32_max(u32 ep_ro)
92984+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
92985 {
92986 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
92987 }
92988diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
92989index 378c5ee..aa84a47 100644
92990--- a/include/linux/rbtree_augmented.h
92991+++ b/include/linux/rbtree_augmented.h
92992@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
92993 old->rbaugmented = rbcompute(old); \
92994 } \
92995 rbstatic const struct rb_augment_callbacks rbname = { \
92996- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
92997+ .propagate = rbname ## _propagate, \
92998+ .copy = rbname ## _copy, \
92999+ .rotate = rbname ## _rotate \
93000 };
93001
93002
93003diff --git a/include/linux/rculist.h b/include/linux/rculist.h
93004index a18b16f..2683096 100644
93005--- a/include/linux/rculist.h
93006+++ b/include/linux/rculist.h
93007@@ -29,8 +29,8 @@
93008 */
93009 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
93010 {
93011- ACCESS_ONCE(list->next) = list;
93012- ACCESS_ONCE(list->prev) = list;
93013+ ACCESS_ONCE_RW(list->next) = list;
93014+ ACCESS_ONCE_RW(list->prev) = list;
93015 }
93016
93017 /*
93018@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
93019 struct list_head *prev, struct list_head *next);
93020 #endif
93021
93022+void __pax_list_add_rcu(struct list_head *new,
93023+ struct list_head *prev, struct list_head *next);
93024+
93025 /**
93026 * list_add_rcu - add a new entry to rcu-protected list
93027 * @new: new entry to be added
93028@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
93029 __list_add_rcu(new, head, head->next);
93030 }
93031
93032+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
93033+{
93034+ __pax_list_add_rcu(new, head, head->next);
93035+}
93036+
93037 /**
93038 * list_add_tail_rcu - add a new entry to rcu-protected list
93039 * @new: new entry to be added
93040@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
93041 __list_add_rcu(new, head->prev, head);
93042 }
93043
93044+static inline void pax_list_add_tail_rcu(struct list_head *new,
93045+ struct list_head *head)
93046+{
93047+ __pax_list_add_rcu(new, head->prev, head);
93048+}
93049+
93050 /**
93051 * list_del_rcu - deletes entry from list without re-initialization
93052 * @entry: the element to delete from the list.
93053@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
93054 entry->prev = LIST_POISON2;
93055 }
93056
93057+extern void pax_list_del_rcu(struct list_head *entry);
93058+
93059 /**
93060 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
93061 * @n: the element to delete from the hash list.
93062diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
93063index 7809749..1cd9315 100644
93064--- a/include/linux/rcupdate.h
93065+++ b/include/linux/rcupdate.h
93066@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
93067 do { \
93068 rcu_all_qs(); \
93069 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
93070- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
93071+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
93072 } while (0)
93073 #else /* #ifdef CONFIG_TASKS_RCU */
93074 #define TASKS_RCU(x) do { } while (0)
93075diff --git a/include/linux/reboot.h b/include/linux/reboot.h
93076index 67fc8fc..a90f7d8 100644
93077--- a/include/linux/reboot.h
93078+++ b/include/linux/reboot.h
93079@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
93080 */
93081
93082 extern void migrate_to_reboot_cpu(void);
93083-extern void machine_restart(char *cmd);
93084-extern void machine_halt(void);
93085-extern void machine_power_off(void);
93086+extern void machine_restart(char *cmd) __noreturn;
93087+extern void machine_halt(void) __noreturn;
93088+extern void machine_power_off(void) __noreturn;
93089
93090 extern void machine_shutdown(void);
93091 struct pt_regs;
93092@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
93093 */
93094
93095 extern void kernel_restart_prepare(char *cmd);
93096-extern void kernel_restart(char *cmd);
93097-extern void kernel_halt(void);
93098-extern void kernel_power_off(void);
93099+extern void kernel_restart(char *cmd) __noreturn;
93100+extern void kernel_halt(void) __noreturn;
93101+extern void kernel_power_off(void) __noreturn;
93102
93103 extern int C_A_D; /* for sysctl */
93104 void ctrl_alt_del(void);
93105@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
93106 * Emergency restart, callable from an interrupt handler.
93107 */
93108
93109-extern void emergency_restart(void);
93110+extern void emergency_restart(void) __noreturn;
93111 #include <asm/emergency-restart.h>
93112
93113 #endif /* _LINUX_REBOOT_H */
93114diff --git a/include/linux/regset.h b/include/linux/regset.h
93115index 8e0c9fe..ac4d221 100644
93116--- a/include/linux/regset.h
93117+++ b/include/linux/regset.h
93118@@ -161,7 +161,8 @@ struct user_regset {
93119 unsigned int align;
93120 unsigned int bias;
93121 unsigned int core_note_type;
93122-};
93123+} __do_const;
93124+typedef struct user_regset __no_const user_regset_no_const;
93125
93126 /**
93127 * struct user_regset_view - available regsets
93128diff --git a/include/linux/relay.h b/include/linux/relay.h
93129index d7c8359..818daf5 100644
93130--- a/include/linux/relay.h
93131+++ b/include/linux/relay.h
93132@@ -157,7 +157,7 @@ struct rchan_callbacks
93133 * The callback should return 0 if successful, negative if not.
93134 */
93135 int (*remove_buf_file)(struct dentry *dentry);
93136-};
93137+} __no_const;
93138
93139 /*
93140 * CONFIG_RELAY kernel API, kernel/relay.c
93141diff --git a/include/linux/rio.h b/include/linux/rio.h
93142index 6bda06f..bf39a9b 100644
93143--- a/include/linux/rio.h
93144+++ b/include/linux/rio.h
93145@@ -358,7 +358,7 @@ struct rio_ops {
93146 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
93147 u64 rstart, u32 size, u32 flags);
93148 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
93149-};
93150+} __no_const;
93151
93152 #define RIO_RESOURCE_MEM 0x00000100
93153 #define RIO_RESOURCE_DOORBELL 0x00000200
93154diff --git a/include/linux/rmap.h b/include/linux/rmap.h
93155index c4c559a..6ba9a26 100644
93156--- a/include/linux/rmap.h
93157+++ b/include/linux/rmap.h
93158@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
93159 void anon_vma_init(void); /* create anon_vma_cachep */
93160 int anon_vma_prepare(struct vm_area_struct *);
93161 void unlink_anon_vmas(struct vm_area_struct *);
93162-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
93163-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
93164+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
93165+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
93166
93167 static inline void anon_vma_merge(struct vm_area_struct *vma,
93168 struct vm_area_struct *next)
93169diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
93170index ed8f9e70..999bc96 100644
93171--- a/include/linux/scatterlist.h
93172+++ b/include/linux/scatterlist.h
93173@@ -1,6 +1,7 @@
93174 #ifndef _LINUX_SCATTERLIST_H
93175 #define _LINUX_SCATTERLIST_H
93176
93177+#include <linux/sched.h>
93178 #include <linux/string.h>
93179 #include <linux/bug.h>
93180 #include <linux/mm.h>
93181@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
93182 #ifdef CONFIG_DEBUG_SG
93183 BUG_ON(!virt_addr_valid(buf));
93184 #endif
93185+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93186+ if (object_starts_on_stack(buf)) {
93187+ void *adjbuf = buf - current->stack + current->lowmem_stack;
93188+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
93189+ } else
93190+#endif
93191 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
93192 }
93193
93194diff --git a/include/linux/sched.h b/include/linux/sched.h
93195index 51348f7..8c8b0ba 100644
93196--- a/include/linux/sched.h
93197+++ b/include/linux/sched.h
93198@@ -133,6 +133,7 @@ struct fs_struct;
93199 struct perf_event_context;
93200 struct blk_plug;
93201 struct filename;
93202+struct linux_binprm;
93203
93204 #define VMACACHE_BITS 2
93205 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
93206@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
93207 extern int in_sched_functions(unsigned long addr);
93208
93209 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
93210-extern signed long schedule_timeout(signed long timeout);
93211+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
93212 extern signed long schedule_timeout_interruptible(signed long timeout);
93213 extern signed long schedule_timeout_killable(signed long timeout);
93214 extern signed long schedule_timeout_uninterruptible(signed long timeout);
93215@@ -438,6 +439,19 @@ struct nsproxy;
93216 struct user_namespace;
93217
93218 #ifdef CONFIG_MMU
93219+
93220+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
93221+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
93222+#else
93223+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
93224+{
93225+ return 0;
93226+}
93227+#endif
93228+
93229+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
93230+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
93231+
93232 extern void arch_pick_mmap_layout(struct mm_struct *mm);
93233 extern unsigned long
93234 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
93235@@ -736,6 +750,17 @@ struct signal_struct {
93236 #ifdef CONFIG_TASKSTATS
93237 struct taskstats *stats;
93238 #endif
93239+
93240+#ifdef CONFIG_GRKERNSEC
93241+ u32 curr_ip;
93242+ u32 saved_ip;
93243+ u32 gr_saddr;
93244+ u32 gr_daddr;
93245+ u16 gr_sport;
93246+ u16 gr_dport;
93247+ u8 used_accept:1;
93248+#endif
93249+
93250 #ifdef CONFIG_AUDIT
93251 unsigned audit_tty;
93252 unsigned audit_tty_log_passwd;
93253@@ -762,7 +787,7 @@ struct signal_struct {
93254 struct mutex cred_guard_mutex; /* guard against foreign influences on
93255 * credential calculations
93256 * (notably. ptrace) */
93257-};
93258+} __randomize_layout;
93259
93260 /*
93261 * Bits in flags field of signal_struct.
93262@@ -815,6 +840,14 @@ struct user_struct {
93263 struct key *session_keyring; /* UID's default session keyring */
93264 #endif
93265
93266+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
93267+ unsigned char kernel_banned;
93268+#endif
93269+#ifdef CONFIG_GRKERNSEC_BRUTE
93270+ unsigned char suid_banned;
93271+ unsigned long suid_ban_expires;
93272+#endif
93273+
93274 /* Hash table maintenance information */
93275 struct hlist_node uidhash_node;
93276 kuid_t uid;
93277@@ -822,7 +855,7 @@ struct user_struct {
93278 #ifdef CONFIG_PERF_EVENTS
93279 atomic_long_t locked_vm;
93280 #endif
93281-};
93282+} __randomize_layout;
93283
93284 extern int uids_sysfs_init(void);
93285
93286@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
93287 struct task_struct {
93288 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
93289 void *stack;
93290+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93291+ void *lowmem_stack;
93292+#endif
93293 atomic_t usage;
93294 unsigned int flags; /* per process flags, defined below */
93295 unsigned int ptrace;
93296@@ -1419,8 +1455,8 @@ struct task_struct {
93297 struct list_head thread_node;
93298
93299 struct completion *vfork_done; /* for vfork() */
93300- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
93301- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93302+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
93303+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
93304
93305 cputime_t utime, stime, utimescaled, stimescaled;
93306 cputime_t gtime;
93307@@ -1445,11 +1481,6 @@ struct task_struct {
93308 struct task_cputime cputime_expires;
93309 struct list_head cpu_timers[3];
93310
93311-/* process credentials */
93312- const struct cred __rcu *real_cred; /* objective and real subjective task
93313- * credentials (COW) */
93314- const struct cred __rcu *cred; /* effective (overridable) subjective task
93315- * credentials (COW) */
93316 char comm[TASK_COMM_LEN]; /* executable name excluding path
93317 - access with [gs]et_task_comm (which lock
93318 it with task_lock())
93319@@ -1467,6 +1498,10 @@ struct task_struct {
93320 #endif
93321 /* CPU-specific state of this task */
93322 struct thread_struct thread;
93323+/* thread_info moved to task_struct */
93324+#ifdef CONFIG_X86
93325+ struct thread_info tinfo;
93326+#endif
93327 /* filesystem information */
93328 struct fs_struct *fs;
93329 /* open file information */
93330@@ -1541,6 +1576,10 @@ struct task_struct {
93331 gfp_t lockdep_reclaim_gfp;
93332 #endif
93333
93334+/* process credentials */
93335+ const struct cred __rcu *real_cred; /* objective and real subjective task
93336+ * credentials (COW) */
93337+
93338 /* journalling filesystem info */
93339 void *journal_info;
93340
93341@@ -1579,6 +1618,10 @@ struct task_struct {
93342 /* cg_list protected by css_set_lock and tsk->alloc_lock */
93343 struct list_head cg_list;
93344 #endif
93345+
93346+ const struct cred __rcu *cred; /* effective (overridable) subjective task
93347+ * credentials (COW) */
93348+
93349 #ifdef CONFIG_FUTEX
93350 struct robust_list_head __user *robust_list;
93351 #ifdef CONFIG_COMPAT
93352@@ -1690,7 +1733,7 @@ struct task_struct {
93353 * Number of functions that haven't been traced
93354 * because of depth overrun.
93355 */
93356- atomic_t trace_overrun;
93357+ atomic_unchecked_t trace_overrun;
93358 /* Pause for the tracing */
93359 atomic_t tracing_graph_pause;
93360 #endif
93361@@ -1718,7 +1761,78 @@ struct task_struct {
93362 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
93363 unsigned long task_state_change;
93364 #endif
93365-};
93366+
93367+#ifdef CONFIG_GRKERNSEC
93368+ /* grsecurity */
93369+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93370+ u64 exec_id;
93371+#endif
93372+#ifdef CONFIG_GRKERNSEC_SETXID
93373+ const struct cred *delayed_cred;
93374+#endif
93375+ struct dentry *gr_chroot_dentry;
93376+ struct acl_subject_label *acl;
93377+ struct acl_subject_label *tmpacl;
93378+ struct acl_role_label *role;
93379+ struct file *exec_file;
93380+ unsigned long brute_expires;
93381+ u16 acl_role_id;
93382+ u8 inherited;
93383+ /* is this the task that authenticated to the special role */
93384+ u8 acl_sp_role;
93385+ u8 is_writable;
93386+ u8 brute;
93387+ u8 gr_is_chrooted;
93388+#endif
93389+
93390+} __randomize_layout;
93391+
93392+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
93393+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
93394+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
93395+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
93396+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
93397+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
93398+
93399+#ifdef CONFIG_PAX_SOFTMODE
93400+extern int pax_softmode;
93401+#endif
93402+
93403+extern int pax_check_flags(unsigned long *);
93404+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
93405+
93406+/* if tsk != current then task_lock must be held on it */
93407+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
93408+static inline unsigned long pax_get_flags(struct task_struct *tsk)
93409+{
93410+ if (likely(tsk->mm))
93411+ return tsk->mm->pax_flags;
93412+ else
93413+ return 0UL;
93414+}
93415+
93416+/* if tsk != current then task_lock must be held on it */
93417+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
93418+{
93419+ if (likely(tsk->mm)) {
93420+ tsk->mm->pax_flags = flags;
93421+ return 0;
93422+ }
93423+ return -EINVAL;
93424+}
93425+#endif
93426+
93427+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
93428+extern void pax_set_initial_flags(struct linux_binprm *bprm);
93429+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
93430+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
93431+#endif
93432+
93433+struct path;
93434+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
93435+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
93436+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
93437+extern void pax_report_refcount_overflow(struct pt_regs *regs);
93438
93439 /* Future-safe accessor for struct task_struct's cpus_allowed. */
93440 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
93441@@ -1801,7 +1915,7 @@ struct pid_namespace;
93442 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
93443 struct pid_namespace *ns);
93444
93445-static inline pid_t task_pid_nr(struct task_struct *tsk)
93446+static inline pid_t task_pid_nr(const struct task_struct *tsk)
93447 {
93448 return tsk->pid;
93449 }
93450@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
93451
93452 extern void sched_clock_init(void);
93453
93454+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
93455+static inline void populate_stack(void)
93456+{
93457+ struct task_struct *curtask = current;
93458+ int c;
93459+ int *ptr = curtask->stack;
93460+ int *end = curtask->stack + THREAD_SIZE;
93461+
93462+ while (ptr < end) {
93463+ c = *(volatile int *)ptr;
93464+ ptr += PAGE_SIZE/sizeof(int);
93465+ }
93466+}
93467+#else
93468+static inline void populate_stack(void)
93469+{
93470+}
93471+#endif
93472+
93473 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
93474 static inline void sched_clock_tick(void)
93475 {
93476@@ -2302,7 +2435,9 @@ void yield(void);
93477 extern struct exec_domain default_exec_domain;
93478
93479 union thread_union {
93480+#ifndef CONFIG_X86
93481 struct thread_info thread_info;
93482+#endif
93483 unsigned long stack[THREAD_SIZE/sizeof(long)];
93484 };
93485
93486@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
93487 */
93488
93489 extern struct task_struct *find_task_by_vpid(pid_t nr);
93490+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
93491 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
93492 struct pid_namespace *ns);
93493
93494@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
93495 extern void exit_itimers(struct signal_struct *);
93496 extern void flush_itimer_signals(void);
93497
93498-extern void do_group_exit(int);
93499+extern __noreturn void do_group_exit(int);
93500
93501 extern int do_execve(struct filename *,
93502 const char __user * const __user *,
93503@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
93504 #define task_stack_end_corrupted(task) \
93505 (*(end_of_stack(task)) != STACK_END_MAGIC)
93506
93507-static inline int object_is_on_stack(void *obj)
93508+static inline int object_starts_on_stack(const void *obj)
93509 {
93510- void *stack = task_stack_page(current);
93511+ const void *stack = task_stack_page(current);
93512
93513 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
93514 }
93515diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
93516index 596a0e0..bea77ec 100644
93517--- a/include/linux/sched/sysctl.h
93518+++ b/include/linux/sched/sysctl.h
93519@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
93520 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
93521
93522 extern int sysctl_max_map_count;
93523+extern unsigned long sysctl_heap_stack_gap;
93524
93525 extern unsigned int sysctl_sched_latency;
93526 extern unsigned int sysctl_sched_min_granularity;
93527diff --git a/include/linux/security.h b/include/linux/security.h
93528index a1b7dbd..036f47f 100644
93529--- a/include/linux/security.h
93530+++ b/include/linux/security.h
93531@@ -27,6 +27,7 @@
93532 #include <linux/slab.h>
93533 #include <linux/err.h>
93534 #include <linux/string.h>
93535+#include <linux/grsecurity.h>
93536
93537 struct linux_binprm;
93538 struct cred;
93539@@ -116,8 +117,6 @@ struct seq_file;
93540
93541 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
93542
93543-void reset_security_ops(void);
93544-
93545 #ifdef CONFIG_MMU
93546 extern unsigned long mmap_min_addr;
93547 extern unsigned long dac_mmap_min_addr;
93548@@ -1756,7 +1755,7 @@ struct security_operations {
93549 struct audit_context *actx);
93550 void (*audit_rule_free) (void *lsmrule);
93551 #endif /* CONFIG_AUDIT */
93552-};
93553+} __randomize_layout;
93554
93555 /* prototypes */
93556 extern int security_init(void);
93557diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
93558index dc368b8..e895209 100644
93559--- a/include/linux/semaphore.h
93560+++ b/include/linux/semaphore.h
93561@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
93562 }
93563
93564 extern void down(struct semaphore *sem);
93565-extern int __must_check down_interruptible(struct semaphore *sem);
93566+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
93567 extern int __must_check down_killable(struct semaphore *sem);
93568 extern int __must_check down_trylock(struct semaphore *sem);
93569 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
93570diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
93571index afbb1fd..e1d205d 100644
93572--- a/include/linux/seq_file.h
93573+++ b/include/linux/seq_file.h
93574@@ -27,6 +27,9 @@ struct seq_file {
93575 struct mutex lock;
93576 const struct seq_operations *op;
93577 int poll_event;
93578+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
93579+ u64 exec_id;
93580+#endif
93581 #ifdef CONFIG_USER_NS
93582 struct user_namespace *user_ns;
93583 #endif
93584@@ -39,6 +42,7 @@ struct seq_operations {
93585 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
93586 int (*show) (struct seq_file *m, void *v);
93587 };
93588+typedef struct seq_operations __no_const seq_operations_no_const;
93589
93590 #define SEQ_SKIP 1
93591
93592@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
93593
93594 char *mangle_path(char *s, const char *p, const char *esc);
93595 int seq_open(struct file *, const struct seq_operations *);
93596+int seq_open_restrict(struct file *, const struct seq_operations *);
93597 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
93598 loff_t seq_lseek(struct file *, loff_t, int);
93599 int seq_release(struct inode *, struct file *);
93600@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
93601 const struct path *root, const char *esc);
93602
93603 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
93604+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
93605 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
93606 int single_release(struct inode *, struct file *);
93607 void *__seq_open_private(struct file *, const struct seq_operations *, int);
93608diff --git a/include/linux/shm.h b/include/linux/shm.h
93609index 6fb8016..ab4465e 100644
93610--- a/include/linux/shm.h
93611+++ b/include/linux/shm.h
93612@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
93613 /* The task created the shm object. NULL if the task is dead. */
93614 struct task_struct *shm_creator;
93615 struct list_head shm_clist; /* list by creator */
93616+#ifdef CONFIG_GRKERNSEC
93617+ u64 shm_createtime;
93618+ pid_t shm_lapid;
93619+#endif
93620 };
93621
93622 /* shm_mode upper byte flags */
93623diff --git a/include/linux/signal.h b/include/linux/signal.h
93624index ab1e039..ad4229e 100644
93625--- a/include/linux/signal.h
93626+++ b/include/linux/signal.h
93627@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
93628 * know it'll be handled, so that they don't get converted to
93629 * SIGKILL or just silently dropped.
93630 */
93631- kernel_sigaction(sig, (__force __sighandler_t)2);
93632+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
93633 }
93634
93635 static inline void disallow_signal(int sig)
93636diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
93637index bdccc4b..e9f8670 100644
93638--- a/include/linux/skbuff.h
93639+++ b/include/linux/skbuff.h
93640@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
93641 int node);
93642 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
93643 struct sk_buff *build_skb(void *data, unsigned int frag_size);
93644-static inline struct sk_buff *alloc_skb(unsigned int size,
93645+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
93646 gfp_t priority)
93647 {
93648 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
93649@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
93650 return skb->inner_transport_header - skb->inner_network_header;
93651 }
93652
93653-static inline int skb_network_offset(const struct sk_buff *skb)
93654+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
93655 {
93656 return skb_network_header(skb) - skb->data;
93657 }
93658@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
93659 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
93660 */
93661 #ifndef NET_SKB_PAD
93662-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
93663+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
93664 #endif
93665
93666 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
93667@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
93668 int *err);
93669 unsigned int datagram_poll(struct file *file, struct socket *sock,
93670 struct poll_table_struct *wait);
93671-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93672+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
93673 struct iov_iter *to, int size);
93674-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93675+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
93676 struct msghdr *msg, int size)
93677 {
93678 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
93679@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
93680 nf_bridge_put(skb->nf_bridge);
93681 skb->nf_bridge = NULL;
93682 #endif
93683+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
93684+ skb->nf_trace = 0;
93685+#endif
93686 }
93687
93688 static inline void nf_reset_trace(struct sk_buff *skb)
93689diff --git a/include/linux/slab.h b/include/linux/slab.h
93690index 76f1fee..d95e6d2 100644
93691--- a/include/linux/slab.h
93692+++ b/include/linux/slab.h
93693@@ -14,15 +14,29 @@
93694 #include <linux/gfp.h>
93695 #include <linux/types.h>
93696 #include <linux/workqueue.h>
93697-
93698+#include <linux/err.h>
93699
93700 /*
93701 * Flags to pass to kmem_cache_create().
93702 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
93703 */
93704 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
93705+
93706+#ifdef CONFIG_PAX_USERCOPY_SLABS
93707+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
93708+#else
93709+#define SLAB_USERCOPY 0x00000000UL
93710+#endif
93711+
93712 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
93713 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
93714+
93715+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93716+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
93717+#else
93718+#define SLAB_NO_SANITIZE 0x00000000UL
93719+#endif
93720+
93721 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
93722 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
93723 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
93724@@ -98,10 +112,13 @@
93725 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
93726 * Both make kfree a no-op.
93727 */
93728-#define ZERO_SIZE_PTR ((void *)16)
93729+#define ZERO_SIZE_PTR \
93730+({ \
93731+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
93732+ (void *)(-MAX_ERRNO-1L); \
93733+})
93734
93735-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
93736- (unsigned long)ZERO_SIZE_PTR)
93737+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
93738
93739 #include <linux/kmemleak.h>
93740 #include <linux/kasan.h>
93741@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
93742 void kfree(const void *);
93743 void kzfree(const void *);
93744 size_t ksize(const void *);
93745+const char *check_heap_object(const void *ptr, unsigned long n);
93746+bool is_usercopy_object(const void *ptr);
93747
93748 /*
93749 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
93750@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
93751 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93752 #endif
93753
93754+#ifdef CONFIG_PAX_USERCOPY_SLABS
93755+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
93756+#endif
93757+
93758 /*
93759 * Figure out which kmalloc slab an allocation of a certain size
93760 * belongs to.
93761@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
93762 * 2 = 120 .. 192 bytes
93763 * n = 2^(n-1) .. 2^n -1
93764 */
93765-static __always_inline int kmalloc_index(size_t size)
93766+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
93767 {
93768 if (!size)
93769 return 0;
93770@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
93771 }
93772 #endif /* !CONFIG_SLOB */
93773
93774-void *__kmalloc(size_t size, gfp_t flags);
93775+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
93776 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
93777 void kmem_cache_free(struct kmem_cache *, void *);
93778
93779 #ifdef CONFIG_NUMA
93780-void *__kmalloc_node(size_t size, gfp_t flags, int node);
93781+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
93782 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
93783 #else
93784-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
93785+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
93786 {
93787 return __kmalloc(size, flags);
93788 }
93789diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
93790index 33d0490..70a6313 100644
93791--- a/include/linux/slab_def.h
93792+++ b/include/linux/slab_def.h
93793@@ -40,7 +40,7 @@ struct kmem_cache {
93794 /* 4) cache creation/removal */
93795 const char *name;
93796 struct list_head list;
93797- int refcount;
93798+ atomic_t refcount;
93799 int object_size;
93800 int align;
93801
93802@@ -56,10 +56,14 @@ struct kmem_cache {
93803 unsigned long node_allocs;
93804 unsigned long node_frees;
93805 unsigned long node_overflow;
93806- atomic_t allochit;
93807- atomic_t allocmiss;
93808- atomic_t freehit;
93809- atomic_t freemiss;
93810+ atomic_unchecked_t allochit;
93811+ atomic_unchecked_t allocmiss;
93812+ atomic_unchecked_t freehit;
93813+ atomic_unchecked_t freemiss;
93814+#ifdef CONFIG_PAX_MEMORY_SANITIZE
93815+ atomic_unchecked_t sanitized;
93816+ atomic_unchecked_t not_sanitized;
93817+#endif
93818
93819 /*
93820 * If debugging is enabled, then the allocator can add additional
93821diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
93822index 3388511..6252f90 100644
93823--- a/include/linux/slub_def.h
93824+++ b/include/linux/slub_def.h
93825@@ -74,7 +74,7 @@ struct kmem_cache {
93826 struct kmem_cache_order_objects max;
93827 struct kmem_cache_order_objects min;
93828 gfp_t allocflags; /* gfp flags to use on each alloc */
93829- int refcount; /* Refcount for slab cache destroy */
93830+ atomic_t refcount; /* Refcount for slab cache destroy */
93831 void (*ctor)(void *);
93832 int inuse; /* Offset to metadata */
93833 int align; /* Alignment */
93834diff --git a/include/linux/smp.h b/include/linux/smp.h
93835index be91db2..3f23232 100644
93836--- a/include/linux/smp.h
93837+++ b/include/linux/smp.h
93838@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
93839 #endif
93840
93841 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
93842+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
93843 #define put_cpu() preempt_enable()
93844+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
93845
93846 /*
93847 * Callback to arch code if there's nosmp or maxcpus=0 on the
93848diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
93849index 46cca4c..3323536 100644
93850--- a/include/linux/sock_diag.h
93851+++ b/include/linux/sock_diag.h
93852@@ -11,7 +11,7 @@ struct sock;
93853 struct sock_diag_handler {
93854 __u8 family;
93855 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
93856-};
93857+} __do_const;
93858
93859 int sock_diag_register(const struct sock_diag_handler *h);
93860 void sock_diag_unregister(const struct sock_diag_handler *h);
93861diff --git a/include/linux/sonet.h b/include/linux/sonet.h
93862index 680f9a3..f13aeb0 100644
93863--- a/include/linux/sonet.h
93864+++ b/include/linux/sonet.h
93865@@ -7,7 +7,7 @@
93866 #include <uapi/linux/sonet.h>
93867
93868 struct k_sonet_stats {
93869-#define __HANDLE_ITEM(i) atomic_t i
93870+#define __HANDLE_ITEM(i) atomic_unchecked_t i
93871 __SONET_ITEMS
93872 #undef __HANDLE_ITEM
93873 };
93874diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
93875index 07d8e53..dc934c9 100644
93876--- a/include/linux/sunrpc/addr.h
93877+++ b/include/linux/sunrpc/addr.h
93878@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
93879 {
93880 switch (sap->sa_family) {
93881 case AF_INET:
93882- return ntohs(((struct sockaddr_in *)sap)->sin_port);
93883+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
93884 case AF_INET6:
93885- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
93886+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
93887 }
93888 return 0;
93889 }
93890@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
93891 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
93892 const struct sockaddr *src)
93893 {
93894- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
93895+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
93896 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
93897
93898 dsin->sin_family = ssin->sin_family;
93899@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
93900 if (sa->sa_family != AF_INET6)
93901 return 0;
93902
93903- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
93904+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
93905 }
93906
93907 #endif /* _LINUX_SUNRPC_ADDR_H */
93908diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
93909index 598ba80..d90cba6 100644
93910--- a/include/linux/sunrpc/clnt.h
93911+++ b/include/linux/sunrpc/clnt.h
93912@@ -100,7 +100,7 @@ struct rpc_procinfo {
93913 unsigned int p_timer; /* Which RTT timer to use */
93914 u32 p_statidx; /* Which procedure to account */
93915 const char * p_name; /* name of procedure */
93916-};
93917+} __do_const;
93918
93919 #ifdef __KERNEL__
93920
93921diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
93922index fae6fb9..023fbcd 100644
93923--- a/include/linux/sunrpc/svc.h
93924+++ b/include/linux/sunrpc/svc.h
93925@@ -420,7 +420,7 @@ struct svc_procedure {
93926 unsigned int pc_count; /* call count */
93927 unsigned int pc_cachetype; /* cache info (NFS) */
93928 unsigned int pc_xdrressize; /* maximum size of XDR reply */
93929-};
93930+} __do_const;
93931
93932 /*
93933 * Function prototypes.
93934diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
93935index df8edf8..d140fec 100644
93936--- a/include/linux/sunrpc/svc_rdma.h
93937+++ b/include/linux/sunrpc/svc_rdma.h
93938@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
93939 extern unsigned int svcrdma_max_requests;
93940 extern unsigned int svcrdma_max_req_size;
93941
93942-extern atomic_t rdma_stat_recv;
93943-extern atomic_t rdma_stat_read;
93944-extern atomic_t rdma_stat_write;
93945-extern atomic_t rdma_stat_sq_starve;
93946-extern atomic_t rdma_stat_rq_starve;
93947-extern atomic_t rdma_stat_rq_poll;
93948-extern atomic_t rdma_stat_rq_prod;
93949-extern atomic_t rdma_stat_sq_poll;
93950-extern atomic_t rdma_stat_sq_prod;
93951+extern atomic_unchecked_t rdma_stat_recv;
93952+extern atomic_unchecked_t rdma_stat_read;
93953+extern atomic_unchecked_t rdma_stat_write;
93954+extern atomic_unchecked_t rdma_stat_sq_starve;
93955+extern atomic_unchecked_t rdma_stat_rq_starve;
93956+extern atomic_unchecked_t rdma_stat_rq_poll;
93957+extern atomic_unchecked_t rdma_stat_rq_prod;
93958+extern atomic_unchecked_t rdma_stat_sq_poll;
93959+extern atomic_unchecked_t rdma_stat_sq_prod;
93960
93961 /*
93962 * Contexts are built when an RDMA request is created and are a
93963diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
93964index 8d71d65..f79586e 100644
93965--- a/include/linux/sunrpc/svcauth.h
93966+++ b/include/linux/sunrpc/svcauth.h
93967@@ -120,7 +120,7 @@ struct auth_ops {
93968 int (*release)(struct svc_rqst *rq);
93969 void (*domain_release)(struct auth_domain *);
93970 int (*set_client)(struct svc_rqst *rq);
93971-};
93972+} __do_const;
93973
93974 #define SVC_GARBAGE 1
93975 #define SVC_SYSERR 2
93976diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
93977index e7a018e..49f8b17 100644
93978--- a/include/linux/swiotlb.h
93979+++ b/include/linux/swiotlb.h
93980@@ -60,7 +60,8 @@ extern void
93981
93982 extern void
93983 swiotlb_free_coherent(struct device *hwdev, size_t size,
93984- void *vaddr, dma_addr_t dma_handle);
93985+ void *vaddr, dma_addr_t dma_handle,
93986+ struct dma_attrs *attrs);
93987
93988 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
93989 unsigned long offset, size_t size,
93990diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
93991index 76d1e38..200776e 100644
93992--- a/include/linux/syscalls.h
93993+++ b/include/linux/syscalls.h
93994@@ -102,7 +102,12 @@ union bpf_attr;
93995 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
93996 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
93997 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
93998-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
93999+#define __SC_LONG(t, a) __typeof__( \
94000+ __builtin_choose_expr( \
94001+ sizeof(t) > sizeof(int), \
94002+ (t) 0, \
94003+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
94004+ )) a
94005 #define __SC_CAST(t, a) (t) a
94006 #define __SC_ARGS(t, a) a
94007 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
94008@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
94009 asmlinkage long sys_fsync(unsigned int fd);
94010 asmlinkage long sys_fdatasync(unsigned int fd);
94011 asmlinkage long sys_bdflush(int func, long data);
94012-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
94013- char __user *type, unsigned long flags,
94014+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
94015+ const char __user *type, unsigned long flags,
94016 void __user *data);
94017-asmlinkage long sys_umount(char __user *name, int flags);
94018-asmlinkage long sys_oldumount(char __user *name);
94019+asmlinkage long sys_umount(const char __user *name, int flags);
94020+asmlinkage long sys_oldumount(const char __user *name);
94021 asmlinkage long sys_truncate(const char __user *path, long length);
94022 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
94023 asmlinkage long sys_stat(const char __user *filename,
94024@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
94025 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
94026 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
94027 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
94028- struct sockaddr __user *, int);
94029+ struct sockaddr __user *, int) __intentional_overflow(0);
94030 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
94031 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
94032 unsigned int vlen, unsigned flags);
94033@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
94034
94035 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
94036 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
94037- unsigned nsops);
94038+ long nsops);
94039 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
94040 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
94041- unsigned nsops,
94042+ long nsops,
94043 const struct timespec __user *timeout);
94044 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
94045 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
94046diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
94047index 27b3b0b..e093dd9 100644
94048--- a/include/linux/syscore_ops.h
94049+++ b/include/linux/syscore_ops.h
94050@@ -16,7 +16,7 @@ struct syscore_ops {
94051 int (*suspend)(void);
94052 void (*resume)(void);
94053 void (*shutdown)(void);
94054-};
94055+} __do_const;
94056
94057 extern void register_syscore_ops(struct syscore_ops *ops);
94058 extern void unregister_syscore_ops(struct syscore_ops *ops);
94059diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
94060index b7361f8..341a15a 100644
94061--- a/include/linux/sysctl.h
94062+++ b/include/linux/sysctl.h
94063@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
94064
94065 extern int proc_dostring(struct ctl_table *, int,
94066 void __user *, size_t *, loff_t *);
94067+extern int proc_dostring_modpriv(struct ctl_table *, int,
94068+ void __user *, size_t *, loff_t *);
94069 extern int proc_dointvec(struct ctl_table *, int,
94070 void __user *, size_t *, loff_t *);
94071 extern int proc_dointvec_minmax(struct ctl_table *, int,
94072@@ -113,7 +115,8 @@ struct ctl_table
94073 struct ctl_table_poll *poll;
94074 void *extra1;
94075 void *extra2;
94076-};
94077+} __do_const __randomize_layout;
94078+typedef struct ctl_table __no_const ctl_table_no_const;
94079
94080 struct ctl_node {
94081 struct rb_node node;
94082diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
94083index ddad161..a3efd26 100644
94084--- a/include/linux/sysfs.h
94085+++ b/include/linux/sysfs.h
94086@@ -34,7 +34,8 @@ struct attribute {
94087 struct lock_class_key *key;
94088 struct lock_class_key skey;
94089 #endif
94090-};
94091+} __do_const;
94092+typedef struct attribute __no_const attribute_no_const;
94093
94094 /**
94095 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
94096@@ -63,7 +64,8 @@ struct attribute_group {
94097 struct attribute *, int);
94098 struct attribute **attrs;
94099 struct bin_attribute **bin_attrs;
94100-};
94101+} __do_const;
94102+typedef struct attribute_group __no_const attribute_group_no_const;
94103
94104 /**
94105 * Use these macros to make defining attributes easier. See include/linux/device.h
94106@@ -137,7 +139,8 @@ struct bin_attribute {
94107 char *, loff_t, size_t);
94108 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
94109 struct vm_area_struct *vma);
94110-};
94111+} __do_const;
94112+typedef struct bin_attribute __no_const bin_attribute_no_const;
94113
94114 /**
94115 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
94116diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
94117index 387fa7d..3fcde6b 100644
94118--- a/include/linux/sysrq.h
94119+++ b/include/linux/sysrq.h
94120@@ -16,6 +16,7 @@
94121
94122 #include <linux/errno.h>
94123 #include <linux/types.h>
94124+#include <linux/compiler.h>
94125
94126 /* Possible values of bitmask for enabling sysrq functions */
94127 /* 0x0001 is reserved for enable everything */
94128@@ -33,7 +34,7 @@ struct sysrq_key_op {
94129 char *help_msg;
94130 char *action_msg;
94131 int enable_mask;
94132-};
94133+} __do_const;
94134
94135 #ifdef CONFIG_MAGIC_SYSRQ
94136
94137diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
94138index ff307b5..f1a4468 100644
94139--- a/include/linux/thread_info.h
94140+++ b/include/linux/thread_info.h
94141@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
94142 #error "no set_restore_sigmask() provided and default one won't work"
94143 #endif
94144
94145+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
94146+
94147+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
94148+{
94149+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
94150+}
94151+
94152 #endif /* __KERNEL__ */
94153
94154 #endif /* _LINUX_THREAD_INFO_H */
94155diff --git a/include/linux/tty.h b/include/linux/tty.h
94156index 790752a..36d9b54 100644
94157--- a/include/linux/tty.h
94158+++ b/include/linux/tty.h
94159@@ -225,7 +225,7 @@ struct tty_port {
94160 const struct tty_port_operations *ops; /* Port operations */
94161 spinlock_t lock; /* Lock protecting tty field */
94162 int blocked_open; /* Waiting to open */
94163- int count; /* Usage count */
94164+ atomic_t count; /* Usage count */
94165 wait_queue_head_t open_wait; /* Open waiters */
94166 wait_queue_head_t close_wait; /* Close waiters */
94167 wait_queue_head_t delta_msr_wait; /* Modem status change */
94168@@ -313,7 +313,7 @@ struct tty_struct {
94169 /* If the tty has a pending do_SAK, queue it here - akpm */
94170 struct work_struct SAK_work;
94171 struct tty_port *port;
94172-};
94173+} __randomize_layout;
94174
94175 /* Each of a tty's open files has private_data pointing to tty_file_private */
94176 struct tty_file_private {
94177@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
94178 struct tty_struct *tty, struct file *filp);
94179 static inline int tty_port_users(struct tty_port *port)
94180 {
94181- return port->count + port->blocked_open;
94182+ return atomic_read(&port->count) + port->blocked_open;
94183 }
94184
94185 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
94186diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
94187index 92e337c..f46757b 100644
94188--- a/include/linux/tty_driver.h
94189+++ b/include/linux/tty_driver.h
94190@@ -291,7 +291,7 @@ struct tty_operations {
94191 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
94192 #endif
94193 const struct file_operations *proc_fops;
94194-};
94195+} __do_const __randomize_layout;
94196
94197 struct tty_driver {
94198 int magic; /* magic number for this structure */
94199@@ -325,7 +325,7 @@ struct tty_driver {
94200
94201 const struct tty_operations *ops;
94202 struct list_head tty_drivers;
94203-};
94204+} __randomize_layout;
94205
94206 extern struct list_head tty_drivers;
94207
94208diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
94209index 00c9d68..bc0188b 100644
94210--- a/include/linux/tty_ldisc.h
94211+++ b/include/linux/tty_ldisc.h
94212@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
94213
94214 struct module *owner;
94215
94216- int refcount;
94217+ atomic_t refcount;
94218 };
94219
94220 struct tty_ldisc {
94221diff --git a/include/linux/types.h b/include/linux/types.h
94222index 6747247..fc7ec8b 100644
94223--- a/include/linux/types.h
94224+++ b/include/linux/types.h
94225@@ -174,10 +174,26 @@ typedef struct {
94226 int counter;
94227 } atomic_t;
94228
94229+#ifdef CONFIG_PAX_REFCOUNT
94230+typedef struct {
94231+ int counter;
94232+} atomic_unchecked_t;
94233+#else
94234+typedef atomic_t atomic_unchecked_t;
94235+#endif
94236+
94237 #ifdef CONFIG_64BIT
94238 typedef struct {
94239 long counter;
94240 } atomic64_t;
94241+
94242+#ifdef CONFIG_PAX_REFCOUNT
94243+typedef struct {
94244+ long counter;
94245+} atomic64_unchecked_t;
94246+#else
94247+typedef atomic64_t atomic64_unchecked_t;
94248+#endif
94249 #endif
94250
94251 struct list_head {
94252diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
94253index ecd3319..8a36ded 100644
94254--- a/include/linux/uaccess.h
94255+++ b/include/linux/uaccess.h
94256@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
94257 long ret; \
94258 mm_segment_t old_fs = get_fs(); \
94259 \
94260- set_fs(KERNEL_DS); \
94261 pagefault_disable(); \
94262- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
94263- pagefault_enable(); \
94264+ set_fs(KERNEL_DS); \
94265+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
94266 set_fs(old_fs); \
94267+ pagefault_enable(); \
94268 ret; \
94269 })
94270
94271diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
94272index 2d1f9b6..d7a9fce 100644
94273--- a/include/linux/uidgid.h
94274+++ b/include/linux/uidgid.h
94275@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
94276
94277 #endif /* CONFIG_USER_NS */
94278
94279+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
94280+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
94281+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
94282+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
94283+
94284 #endif /* _LINUX_UIDGID_H */
94285diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
94286index 32c0e83..671eb35 100644
94287--- a/include/linux/uio_driver.h
94288+++ b/include/linux/uio_driver.h
94289@@ -67,7 +67,7 @@ struct uio_device {
94290 struct module *owner;
94291 struct device *dev;
94292 int minor;
94293- atomic_t event;
94294+ atomic_unchecked_t event;
94295 struct fasync_struct *async_queue;
94296 wait_queue_head_t wait;
94297 struct uio_info *info;
94298diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
94299index 99c1b4d..562e6f3 100644
94300--- a/include/linux/unaligned/access_ok.h
94301+++ b/include/linux/unaligned/access_ok.h
94302@@ -4,34 +4,34 @@
94303 #include <linux/kernel.h>
94304 #include <asm/byteorder.h>
94305
94306-static inline u16 get_unaligned_le16(const void *p)
94307+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
94308 {
94309- return le16_to_cpup((__le16 *)p);
94310+ return le16_to_cpup((const __le16 *)p);
94311 }
94312
94313-static inline u32 get_unaligned_le32(const void *p)
94314+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
94315 {
94316- return le32_to_cpup((__le32 *)p);
94317+ return le32_to_cpup((const __le32 *)p);
94318 }
94319
94320-static inline u64 get_unaligned_le64(const void *p)
94321+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
94322 {
94323- return le64_to_cpup((__le64 *)p);
94324+ return le64_to_cpup((const __le64 *)p);
94325 }
94326
94327-static inline u16 get_unaligned_be16(const void *p)
94328+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
94329 {
94330- return be16_to_cpup((__be16 *)p);
94331+ return be16_to_cpup((const __be16 *)p);
94332 }
94333
94334-static inline u32 get_unaligned_be32(const void *p)
94335+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
94336 {
94337- return be32_to_cpup((__be32 *)p);
94338+ return be32_to_cpup((const __be32 *)p);
94339 }
94340
94341-static inline u64 get_unaligned_be64(const void *p)
94342+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
94343 {
94344- return be64_to_cpup((__be64 *)p);
94345+ return be64_to_cpup((const __be64 *)p);
94346 }
94347
94348 static inline void put_unaligned_le16(u16 val, void *p)
94349diff --git a/include/linux/usb.h b/include/linux/usb.h
94350index 447fe29..9fc875f 100644
94351--- a/include/linux/usb.h
94352+++ b/include/linux/usb.h
94353@@ -592,7 +592,7 @@ struct usb_device {
94354 int maxchild;
94355
94356 u32 quirks;
94357- atomic_t urbnum;
94358+ atomic_unchecked_t urbnum;
94359
94360 unsigned long active_duration;
94361
94362@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
94363
94364 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
94365 __u8 request, __u8 requesttype, __u16 value, __u16 index,
94366- void *data, __u16 size, int timeout);
94367+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
94368 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
94369 void *data, int len, int *actual_length, int timeout);
94370 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
94371diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
94372index 9fd9e48..e2c5f35 100644
94373--- a/include/linux/usb/renesas_usbhs.h
94374+++ b/include/linux/usb/renesas_usbhs.h
94375@@ -39,7 +39,7 @@ enum {
94376 */
94377 struct renesas_usbhs_driver_callback {
94378 int (*notify_hotplug)(struct platform_device *pdev);
94379-};
94380+} __no_const;
94381
94382 /*
94383 * callback functions for platform
94384diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
94385index 8297e5b..0dfae27 100644
94386--- a/include/linux/user_namespace.h
94387+++ b/include/linux/user_namespace.h
94388@@ -39,7 +39,7 @@ struct user_namespace {
94389 struct key *persistent_keyring_register;
94390 struct rw_semaphore persistent_keyring_register_sem;
94391 #endif
94392-};
94393+} __randomize_layout;
94394
94395 extern struct user_namespace init_user_ns;
94396
94397diff --git a/include/linux/utsname.h b/include/linux/utsname.h
94398index 5093f58..c103e58 100644
94399--- a/include/linux/utsname.h
94400+++ b/include/linux/utsname.h
94401@@ -25,7 +25,7 @@ struct uts_namespace {
94402 struct new_utsname name;
94403 struct user_namespace *user_ns;
94404 struct ns_common ns;
94405-};
94406+} __randomize_layout;
94407 extern struct uts_namespace init_uts_ns;
94408
94409 #ifdef CONFIG_UTS_NS
94410diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
94411index 6f8fbcf..4efc177 100644
94412--- a/include/linux/vermagic.h
94413+++ b/include/linux/vermagic.h
94414@@ -25,9 +25,42 @@
94415 #define MODULE_ARCH_VERMAGIC ""
94416 #endif
94417
94418+#ifdef CONFIG_PAX_REFCOUNT
94419+#define MODULE_PAX_REFCOUNT "REFCOUNT "
94420+#else
94421+#define MODULE_PAX_REFCOUNT ""
94422+#endif
94423+
94424+#ifdef CONSTIFY_PLUGIN
94425+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
94426+#else
94427+#define MODULE_CONSTIFY_PLUGIN ""
94428+#endif
94429+
94430+#ifdef STACKLEAK_PLUGIN
94431+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
94432+#else
94433+#define MODULE_STACKLEAK_PLUGIN ""
94434+#endif
94435+
94436+#ifdef RANDSTRUCT_PLUGIN
94437+#include <generated/randomize_layout_hash.h>
94438+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
94439+#else
94440+#define MODULE_RANDSTRUCT_PLUGIN
94441+#endif
94442+
94443+#ifdef CONFIG_GRKERNSEC
94444+#define MODULE_GRSEC "GRSEC "
94445+#else
94446+#define MODULE_GRSEC ""
94447+#endif
94448+
94449 #define VERMAGIC_STRING \
94450 UTS_RELEASE " " \
94451 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
94452 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
94453- MODULE_ARCH_VERMAGIC
94454+ MODULE_ARCH_VERMAGIC \
94455+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
94456+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
94457
94458diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
94459index b483abd..af305ad 100644
94460--- a/include/linux/vga_switcheroo.h
94461+++ b/include/linux/vga_switcheroo.h
94462@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
94463
94464 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
94465
94466-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
94467+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
94468 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
94469-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
94470+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
94471 #else
94472
94473 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
94474@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
94475
94476 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
94477
94478-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94479+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94480 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
94481-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
94482+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
94483
94484 #endif
94485 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
94486diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
94487index 0ec5983..cc61051 100644
94488--- a/include/linux/vmalloc.h
94489+++ b/include/linux/vmalloc.h
94490@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
94491 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
94492 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
94493 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
94494+
94495+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
94496+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
94497+#endif
94498+
94499 /* bits [20..32] reserved for arch specific ioremap internals */
94500
94501 /*
94502@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
94503 unsigned long flags, pgprot_t prot);
94504 extern void vunmap(const void *addr);
94505
94506+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
94507+extern void unmap_process_stacks(struct task_struct *task);
94508+#endif
94509+
94510 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
94511 unsigned long uaddr, void *kaddr,
94512 unsigned long size);
94513@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
94514
94515 /* for /dev/kmem */
94516 extern long vread(char *buf, char *addr, unsigned long count);
94517-extern long vwrite(char *buf, char *addr, unsigned long count);
94518+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
94519
94520 /*
94521 * Internals. Dont't use..
94522diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
94523index 82e7db7..f8ce3d0 100644
94524--- a/include/linux/vmstat.h
94525+++ b/include/linux/vmstat.h
94526@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
94527 /*
94528 * Zone based page accounting with per cpu differentials.
94529 */
94530-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94531+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
94532
94533 static inline void zone_page_state_add(long x, struct zone *zone,
94534 enum zone_stat_item item)
94535 {
94536- atomic_long_add(x, &zone->vm_stat[item]);
94537- atomic_long_add(x, &vm_stat[item]);
94538+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
94539+ atomic_long_add_unchecked(x, &vm_stat[item]);
94540 }
94541
94542-static inline unsigned long global_page_state(enum zone_stat_item item)
94543+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
94544 {
94545- long x = atomic_long_read(&vm_stat[item]);
94546+ long x = atomic_long_read_unchecked(&vm_stat[item]);
94547 #ifdef CONFIG_SMP
94548 if (x < 0)
94549 x = 0;
94550@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
94551 return x;
94552 }
94553
94554-static inline unsigned long zone_page_state(struct zone *zone,
94555+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
94556 enum zone_stat_item item)
94557 {
94558- long x = atomic_long_read(&zone->vm_stat[item]);
94559+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94560 #ifdef CONFIG_SMP
94561 if (x < 0)
94562 x = 0;
94563@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
94564 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
94565 enum zone_stat_item item)
94566 {
94567- long x = atomic_long_read(&zone->vm_stat[item]);
94568+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
94569
94570 #ifdef CONFIG_SMP
94571 int cpu;
94572@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
94573
94574 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
94575 {
94576- atomic_long_inc(&zone->vm_stat[item]);
94577- atomic_long_inc(&vm_stat[item]);
94578+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
94579+ atomic_long_inc_unchecked(&vm_stat[item]);
94580 }
94581
94582 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
94583 {
94584- atomic_long_dec(&zone->vm_stat[item]);
94585- atomic_long_dec(&vm_stat[item]);
94586+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
94587+ atomic_long_dec_unchecked(&vm_stat[item]);
94588 }
94589
94590 static inline void __inc_zone_page_state(struct page *page,
94591diff --git a/include/linux/xattr.h b/include/linux/xattr.h
94592index 91b0a68..0e9adf6 100644
94593--- a/include/linux/xattr.h
94594+++ b/include/linux/xattr.h
94595@@ -28,7 +28,7 @@ struct xattr_handler {
94596 size_t size, int handler_flags);
94597 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
94598 size_t size, int flags, int handler_flags);
94599-};
94600+} __do_const;
94601
94602 struct xattr {
94603 const char *name;
94604@@ -37,6 +37,9 @@ struct xattr {
94605 };
94606
94607 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
94608+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
94609+ssize_t pax_getxattr(struct dentry *, void *, size_t);
94610+#endif
94611 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
94612 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
94613 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
94614diff --git a/include/linux/zlib.h b/include/linux/zlib.h
94615index 92dbbd3..13ab0b3 100644
94616--- a/include/linux/zlib.h
94617+++ b/include/linux/zlib.h
94618@@ -31,6 +31,7 @@
94619 #define _ZLIB_H
94620
94621 #include <linux/zconf.h>
94622+#include <linux/compiler.h>
94623
94624 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
94625 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
94626@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
94627
94628 /* basic functions */
94629
94630-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
94631+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
94632 /*
94633 Returns the number of bytes that needs to be allocated for a per-
94634 stream workspace with the specified parameters. A pointer to this
94635diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
94636index 3e4fddf..5ec9104 100644
94637--- a/include/media/v4l2-dev.h
94638+++ b/include/media/v4l2-dev.h
94639@@ -75,7 +75,7 @@ struct v4l2_file_operations {
94640 int (*mmap) (struct file *, struct vm_area_struct *);
94641 int (*open) (struct file *);
94642 int (*release) (struct file *);
94643-};
94644+} __do_const;
94645
94646 /*
94647 * Newer version of video_device, handled by videodev2.c
94648diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
94649index ffb69da..040393e 100644
94650--- a/include/media/v4l2-device.h
94651+++ b/include/media/v4l2-device.h
94652@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
94653 this function returns 0. If the name ends with a digit (e.g. cx18),
94654 then the name will be set to cx18-0 since cx180 looks really odd. */
94655 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
94656- atomic_t *instance);
94657+ atomic_unchecked_t *instance);
94658
94659 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
94660 Since the parent disappears this ensures that v4l2_dev doesn't have an
94661diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
94662index 2a25dec..bf6dd8a 100644
94663--- a/include/net/9p/transport.h
94664+++ b/include/net/9p/transport.h
94665@@ -62,7 +62,7 @@ struct p9_trans_module {
94666 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
94667 int (*zc_request)(struct p9_client *, struct p9_req_t *,
94668 char *, char *, int , int, int, int);
94669-};
94670+} __do_const;
94671
94672 void v9fs_register_trans(struct p9_trans_module *m);
94673 void v9fs_unregister_trans(struct p9_trans_module *m);
94674diff --git a/include/net/af_unix.h b/include/net/af_unix.h
94675index a175ba4..196eb8242 100644
94676--- a/include/net/af_unix.h
94677+++ b/include/net/af_unix.h
94678@@ -36,7 +36,7 @@ struct unix_skb_parms {
94679 u32 secid; /* Security ID */
94680 #endif
94681 u32 consumed;
94682-};
94683+} __randomize_layout;
94684
94685 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
94686 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
94687diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
94688index 2239a37..a83461f 100644
94689--- a/include/net/bluetooth/l2cap.h
94690+++ b/include/net/bluetooth/l2cap.h
94691@@ -609,7 +609,7 @@ struct l2cap_ops {
94692 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
94693 unsigned long hdr_len,
94694 unsigned long len, int nb);
94695-};
94696+} __do_const;
94697
94698 struct l2cap_conn {
94699 struct hci_conn *hcon;
94700diff --git a/include/net/bonding.h b/include/net/bonding.h
94701index fda6fee..dbdf83c 100644
94702--- a/include/net/bonding.h
94703+++ b/include/net/bonding.h
94704@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
94705
94706 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
94707 {
94708- atomic_long_inc(&dev->tx_dropped);
94709+ atomic_long_inc_unchecked(&dev->tx_dropped);
94710 dev_kfree_skb_any(skb);
94711 }
94712
94713diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
94714index f2ae33d..c457cf0 100644
94715--- a/include/net/caif/cfctrl.h
94716+++ b/include/net/caif/cfctrl.h
94717@@ -52,7 +52,7 @@ struct cfctrl_rsp {
94718 void (*radioset_rsp)(void);
94719 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
94720 struct cflayer *client_layer);
94721-};
94722+} __no_const;
94723
94724 /* Link Setup Parameters for CAIF-Links. */
94725 struct cfctrl_link_param {
94726@@ -101,8 +101,8 @@ struct cfctrl_request_info {
94727 struct cfctrl {
94728 struct cfsrvl serv;
94729 struct cfctrl_rsp res;
94730- atomic_t req_seq_no;
94731- atomic_t rsp_seq_no;
94732+ atomic_unchecked_t req_seq_no;
94733+ atomic_unchecked_t rsp_seq_no;
94734 struct list_head list;
94735 /* Protects from simultaneous access to first_req list */
94736 spinlock_t info_list_lock;
94737diff --git a/include/net/flow.h b/include/net/flow.h
94738index 8109a15..504466d 100644
94739--- a/include/net/flow.h
94740+++ b/include/net/flow.h
94741@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
94742
94743 void flow_cache_flush(struct net *net);
94744 void flow_cache_flush_deferred(struct net *net);
94745-extern atomic_t flow_cache_genid;
94746+extern atomic_unchecked_t flow_cache_genid;
94747
94748 #endif
94749diff --git a/include/net/genetlink.h b/include/net/genetlink.h
94750index 0574abd..0f16881 100644
94751--- a/include/net/genetlink.h
94752+++ b/include/net/genetlink.h
94753@@ -130,7 +130,7 @@ struct genl_ops {
94754 u8 cmd;
94755 u8 internal_flags;
94756 u8 flags;
94757-};
94758+} __do_const;
94759
94760 int __genl_register_family(struct genl_family *family);
94761
94762diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
94763index 0f712c0..cd762c4 100644
94764--- a/include/net/gro_cells.h
94765+++ b/include/net/gro_cells.h
94766@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
94767 cell = this_cpu_ptr(gcells->cells);
94768
94769 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
94770- atomic_long_inc(&dev->rx_dropped);
94771+ atomic_long_inc_unchecked(&dev->rx_dropped);
94772 kfree_skb(skb);
94773 return;
94774 }
94775diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
94776index 9fe865c..43735aa 100644
94777--- a/include/net/inet_connection_sock.h
94778+++ b/include/net/inet_connection_sock.h
94779@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
94780 int (*bind_conflict)(const struct sock *sk,
94781 const struct inet_bind_bucket *tb, bool relax);
94782 void (*mtu_reduced)(struct sock *sk);
94783-};
94784+} __do_const;
94785
94786 /** inet_connection_sock - INET connection oriented sock
94787 *
94788diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
94789index 80479ab..0c3f647 100644
94790--- a/include/net/inetpeer.h
94791+++ b/include/net/inetpeer.h
94792@@ -47,7 +47,7 @@ struct inet_peer {
94793 */
94794 union {
94795 struct {
94796- atomic_t rid; /* Frag reception counter */
94797+ atomic_unchecked_t rid; /* Frag reception counter */
94798 };
94799 struct rcu_head rcu;
94800 struct inet_peer *gc_next;
94801diff --git a/include/net/ip.h b/include/net/ip.h
94802index 6cc1eaf..14059b0 100644
94803--- a/include/net/ip.h
94804+++ b/include/net/ip.h
94805@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
94806 }
94807 }
94808
94809-u32 ip_idents_reserve(u32 hash, int segs);
94810+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
94811 void __ip_select_ident(struct iphdr *iph, int segs);
94812
94813 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
94814diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
94815index 5bd120e4..03fb812 100644
94816--- a/include/net/ip_fib.h
94817+++ b/include/net/ip_fib.h
94818@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
94819
94820 #define FIB_RES_SADDR(net, res) \
94821 ((FIB_RES_NH(res).nh_saddr_genid == \
94822- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
94823+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
94824 FIB_RES_NH(res).nh_saddr : \
94825 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
94826 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
94827diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
94828index 615b20b..fd4cbd8 100644
94829--- a/include/net/ip_vs.h
94830+++ b/include/net/ip_vs.h
94831@@ -534,7 +534,7 @@ struct ip_vs_conn {
94832 struct ip_vs_conn *control; /* Master control connection */
94833 atomic_t n_control; /* Number of controlled ones */
94834 struct ip_vs_dest *dest; /* real server */
94835- atomic_t in_pkts; /* incoming packet counter */
94836+ atomic_unchecked_t in_pkts; /* incoming packet counter */
94837
94838 /* Packet transmitter for different forwarding methods. If it
94839 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
94840@@ -682,7 +682,7 @@ struct ip_vs_dest {
94841 __be16 port; /* port number of the server */
94842 union nf_inet_addr addr; /* IP address of the server */
94843 volatile unsigned int flags; /* dest status flags */
94844- atomic_t conn_flags; /* flags to copy to conn */
94845+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
94846 atomic_t weight; /* server weight */
94847
94848 atomic_t refcnt; /* reference counter */
94849@@ -928,11 +928,11 @@ struct netns_ipvs {
94850 /* ip_vs_lblc */
94851 int sysctl_lblc_expiration;
94852 struct ctl_table_header *lblc_ctl_header;
94853- struct ctl_table *lblc_ctl_table;
94854+ ctl_table_no_const *lblc_ctl_table;
94855 /* ip_vs_lblcr */
94856 int sysctl_lblcr_expiration;
94857 struct ctl_table_header *lblcr_ctl_header;
94858- struct ctl_table *lblcr_ctl_table;
94859+ ctl_table_no_const *lblcr_ctl_table;
94860 /* ip_vs_est */
94861 struct list_head est_list; /* estimator list */
94862 spinlock_t est_lock;
94863diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
94864index 8d4f588..2e37ad2 100644
94865--- a/include/net/irda/ircomm_tty.h
94866+++ b/include/net/irda/ircomm_tty.h
94867@@ -33,6 +33,7 @@
94868 #include <linux/termios.h>
94869 #include <linux/timer.h>
94870 #include <linux/tty.h> /* struct tty_struct */
94871+#include <asm/local.h>
94872
94873 #include <net/irda/irias_object.h>
94874 #include <net/irda/ircomm_core.h>
94875diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
94876index 714cc9a..ea05f3e 100644
94877--- a/include/net/iucv/af_iucv.h
94878+++ b/include/net/iucv/af_iucv.h
94879@@ -149,7 +149,7 @@ struct iucv_skb_cb {
94880 struct iucv_sock_list {
94881 struct hlist_head head;
94882 rwlock_t lock;
94883- atomic_t autobind_name;
94884+ atomic_unchecked_t autobind_name;
94885 };
94886
94887 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
94888diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
94889index f3be818..bf46196 100644
94890--- a/include/net/llc_c_ac.h
94891+++ b/include/net/llc_c_ac.h
94892@@ -87,7 +87,7 @@
94893 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
94894 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
94895
94896-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94897+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
94898
94899 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
94900 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
94901diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
94902index 3948cf1..83b28c4 100644
94903--- a/include/net/llc_c_ev.h
94904+++ b/include/net/llc_c_ev.h
94905@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
94906 return (struct llc_conn_state_ev *)skb->cb;
94907 }
94908
94909-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94910-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94911+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
94912+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
94913
94914 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
94915 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
94916diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
94917index 48f3f89..0e92c50 100644
94918--- a/include/net/llc_c_st.h
94919+++ b/include/net/llc_c_st.h
94920@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
94921 u8 next_state;
94922 const llc_conn_ev_qfyr_t *ev_qualifiers;
94923 const llc_conn_action_t *ev_actions;
94924-};
94925+} __do_const;
94926
94927 struct llc_conn_state {
94928 u8 current_state;
94929diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
94930index a61b98c..aade1eb 100644
94931--- a/include/net/llc_s_ac.h
94932+++ b/include/net/llc_s_ac.h
94933@@ -23,7 +23,7 @@
94934 #define SAP_ACT_TEST_IND 9
94935
94936 /* All action functions must look like this */
94937-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94938+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
94939
94940 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
94941 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
94942diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
94943index c4359e2..76dbc4a 100644
94944--- a/include/net/llc_s_st.h
94945+++ b/include/net/llc_s_st.h
94946@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
94947 llc_sap_ev_t ev;
94948 u8 next_state;
94949 const llc_sap_action_t *ev_actions;
94950-};
94951+} __do_const;
94952
94953 struct llc_sap_state {
94954 u8 curr_state;
94955diff --git a/include/net/mac80211.h b/include/net/mac80211.h
94956index d52914b..2b13cec 100644
94957--- a/include/net/mac80211.h
94958+++ b/include/net/mac80211.h
94959@@ -4915,7 +4915,7 @@ struct rate_control_ops {
94960 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
94961
94962 u32 (*get_expected_throughput)(void *priv_sta);
94963-};
94964+} __do_const;
94965
94966 static inline int rate_supported(struct ieee80211_sta *sta,
94967 enum ieee80211_band band,
94968diff --git a/include/net/neighbour.h b/include/net/neighbour.h
94969index 76f7084..8f36e39 100644
94970--- a/include/net/neighbour.h
94971+++ b/include/net/neighbour.h
94972@@ -163,7 +163,7 @@ struct neigh_ops {
94973 void (*error_report)(struct neighbour *, struct sk_buff *);
94974 int (*output)(struct neighbour *, struct sk_buff *);
94975 int (*connected_output)(struct neighbour *, struct sk_buff *);
94976-};
94977+} __do_const;
94978
94979 struct pneigh_entry {
94980 struct pneigh_entry *next;
94981@@ -217,7 +217,7 @@ struct neigh_table {
94982 struct neigh_statistics __percpu *stats;
94983 struct neigh_hash_table __rcu *nht;
94984 struct pneigh_entry **phash_buckets;
94985-};
94986+} __randomize_layout;
94987
94988 enum {
94989 NEIGH_ARP_TABLE = 0,
94990diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
94991index 36faf49..6927638 100644
94992--- a/include/net/net_namespace.h
94993+++ b/include/net/net_namespace.h
94994@@ -131,8 +131,8 @@ struct net {
94995 struct netns_ipvs *ipvs;
94996 #endif
94997 struct sock *diag_nlsk;
94998- atomic_t fnhe_genid;
94999-};
95000+ atomic_unchecked_t fnhe_genid;
95001+} __randomize_layout;
95002
95003 #include <linux/seq_file_net.h>
95004
95005@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
95006 #define __net_init __init
95007 #define __net_exit __exit_refok
95008 #define __net_initdata __initdata
95009+#ifdef CONSTIFY_PLUGIN
95010 #define __net_initconst __initconst
95011+#else
95012+#define __net_initconst __initdata
95013+#endif
95014 #endif
95015
95016 int peernet2id(struct net *net, struct net *peer);
95017@@ -301,7 +305,7 @@ struct pernet_operations {
95018 void (*exit_batch)(struct list_head *net_exit_list);
95019 int *id;
95020 size_t size;
95021-};
95022+} __do_const;
95023
95024 /*
95025 * Use these carefully. If you implement a network device and it
95026@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
95027
95028 static inline int rt_genid_ipv4(struct net *net)
95029 {
95030- return atomic_read(&net->ipv4.rt_genid);
95031+ return atomic_read_unchecked(&net->ipv4.rt_genid);
95032 }
95033
95034 static inline void rt_genid_bump_ipv4(struct net *net)
95035 {
95036- atomic_inc(&net->ipv4.rt_genid);
95037+ atomic_inc_unchecked(&net->ipv4.rt_genid);
95038 }
95039
95040 extern void (*__fib6_flush_trees)(struct net *net);
95041@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
95042
95043 static inline int fnhe_genid(struct net *net)
95044 {
95045- return atomic_read(&net->fnhe_genid);
95046+ return atomic_read_unchecked(&net->fnhe_genid);
95047 }
95048
95049 static inline void fnhe_genid_bump(struct net *net)
95050 {
95051- atomic_inc(&net->fnhe_genid);
95052+ atomic_inc_unchecked(&net->fnhe_genid);
95053 }
95054
95055 #endif /* __NET_NET_NAMESPACE_H */
95056diff --git a/include/net/netlink.h b/include/net/netlink.h
95057index e010ee8..405b9f4 100644
95058--- a/include/net/netlink.h
95059+++ b/include/net/netlink.h
95060@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
95061 {
95062 if (mark) {
95063 WARN_ON((unsigned char *) mark < skb->data);
95064- skb_trim(skb, (unsigned char *) mark - skb->data);
95065+ skb_trim(skb, (const unsigned char *) mark - skb->data);
95066 }
95067 }
95068
95069diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
95070index 29d6a94..235d3d84 100644
95071--- a/include/net/netns/conntrack.h
95072+++ b/include/net/netns/conntrack.h
95073@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
95074 struct nf_proto_net {
95075 #ifdef CONFIG_SYSCTL
95076 struct ctl_table_header *ctl_table_header;
95077- struct ctl_table *ctl_table;
95078+ ctl_table_no_const *ctl_table;
95079 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
95080 struct ctl_table_header *ctl_compat_header;
95081- struct ctl_table *ctl_compat_table;
95082+ ctl_table_no_const *ctl_compat_table;
95083 #endif
95084 #endif
95085 unsigned int users;
95086@@ -60,7 +60,7 @@ struct nf_ip_net {
95087 struct nf_icmp_net icmpv6;
95088 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
95089 struct ctl_table_header *ctl_table_header;
95090- struct ctl_table *ctl_table;
95091+ ctl_table_no_const *ctl_table;
95092 #endif
95093 };
95094
95095diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
95096index dbe2254..ed0c151 100644
95097--- a/include/net/netns/ipv4.h
95098+++ b/include/net/netns/ipv4.h
95099@@ -87,7 +87,7 @@ struct netns_ipv4 {
95100
95101 struct ping_group_range ping_group_range;
95102
95103- atomic_t dev_addr_genid;
95104+ atomic_unchecked_t dev_addr_genid;
95105
95106 #ifdef CONFIG_SYSCTL
95107 unsigned long *sysctl_local_reserved_ports;
95108@@ -101,6 +101,6 @@ struct netns_ipv4 {
95109 struct fib_rules_ops *mr_rules_ops;
95110 #endif
95111 #endif
95112- atomic_t rt_genid;
95113+ atomic_unchecked_t rt_genid;
95114 };
95115 #endif
95116diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
95117index 69ae41f..4f94868 100644
95118--- a/include/net/netns/ipv6.h
95119+++ b/include/net/netns/ipv6.h
95120@@ -75,8 +75,8 @@ struct netns_ipv6 {
95121 struct fib_rules_ops *mr6_rules_ops;
95122 #endif
95123 #endif
95124- atomic_t dev_addr_genid;
95125- atomic_t fib6_sernum;
95126+ atomic_unchecked_t dev_addr_genid;
95127+ atomic_unchecked_t fib6_sernum;
95128 };
95129
95130 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
95131diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
95132index 730d82a..045f2c4 100644
95133--- a/include/net/netns/xfrm.h
95134+++ b/include/net/netns/xfrm.h
95135@@ -78,7 +78,7 @@ struct netns_xfrm {
95136
95137 /* flow cache part */
95138 struct flow_cache flow_cache_global;
95139- atomic_t flow_cache_genid;
95140+ atomic_unchecked_t flow_cache_genid;
95141 struct list_head flow_cache_gc_list;
95142 spinlock_t flow_cache_gc_lock;
95143 struct work_struct flow_cache_gc_work;
95144diff --git a/include/net/ping.h b/include/net/ping.h
95145index cc16d41..664f40b 100644
95146--- a/include/net/ping.h
95147+++ b/include/net/ping.h
95148@@ -54,7 +54,7 @@ struct ping_iter_state {
95149
95150 extern struct proto ping_prot;
95151 #if IS_ENABLED(CONFIG_IPV6)
95152-extern struct pingv6_ops pingv6_ops;
95153+extern struct pingv6_ops *pingv6_ops;
95154 #endif
95155
95156 struct pingfakehdr {
95157diff --git a/include/net/protocol.h b/include/net/protocol.h
95158index d6fcc1f..ca277058 100644
95159--- a/include/net/protocol.h
95160+++ b/include/net/protocol.h
95161@@ -49,7 +49,7 @@ struct net_protocol {
95162 * socket lookup?
95163 */
95164 icmp_strict_tag_validation:1;
95165-};
95166+} __do_const;
95167
95168 #if IS_ENABLED(CONFIG_IPV6)
95169 struct inet6_protocol {
95170@@ -62,7 +62,7 @@ struct inet6_protocol {
95171 u8 type, u8 code, int offset,
95172 __be32 info);
95173 unsigned int flags; /* INET6_PROTO_xxx */
95174-};
95175+} __do_const;
95176
95177 #define INET6_PROTO_NOPOLICY 0x1
95178 #define INET6_PROTO_FINAL 0x2
95179diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
95180index 6c6d539..af70817 100644
95181--- a/include/net/rtnetlink.h
95182+++ b/include/net/rtnetlink.h
95183@@ -95,7 +95,7 @@ struct rtnl_link_ops {
95184 const struct net_device *dev,
95185 const struct net_device *slave_dev);
95186 struct net *(*get_link_net)(const struct net_device *dev);
95187-};
95188+} __do_const;
95189
95190 int __rtnl_link_register(struct rtnl_link_ops *ops);
95191 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
95192diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
95193index 4a5b9a3..ca27d73 100644
95194--- a/include/net/sctp/checksum.h
95195+++ b/include/net/sctp/checksum.h
95196@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
95197 unsigned int offset)
95198 {
95199 struct sctphdr *sh = sctp_hdr(skb);
95200- __le32 ret, old = sh->checksum;
95201- const struct skb_checksum_ops ops = {
95202+ __le32 ret, old = sh->checksum;
95203+ static const struct skb_checksum_ops ops = {
95204 .update = sctp_csum_update,
95205 .combine = sctp_csum_combine,
95206 };
95207diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
95208index 487ef34..d457f98 100644
95209--- a/include/net/sctp/sm.h
95210+++ b/include/net/sctp/sm.h
95211@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
95212 typedef struct {
95213 sctp_state_fn_t *fn;
95214 const char *name;
95215-} sctp_sm_table_entry_t;
95216+} __do_const sctp_sm_table_entry_t;
95217
95218 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
95219 * currently in use.
95220@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
95221 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
95222
95223 /* Extern declarations for major data structures. */
95224-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95225+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
95226
95227
95228 /* Get the size of a DATA chunk payload. */
95229diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
95230index 2bb2fcf..d17c291 100644
95231--- a/include/net/sctp/structs.h
95232+++ b/include/net/sctp/structs.h
95233@@ -509,7 +509,7 @@ struct sctp_pf {
95234 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
95235 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
95236 struct sctp_af *af;
95237-};
95238+} __do_const;
95239
95240
95241 /* Structure to track chunk fragments that have been acked, but peer
95242diff --git a/include/net/sock.h b/include/net/sock.h
95243index e4079c2..79c5d3a 100644
95244--- a/include/net/sock.h
95245+++ b/include/net/sock.h
95246@@ -362,7 +362,7 @@ struct sock {
95247 unsigned int sk_napi_id;
95248 unsigned int sk_ll_usec;
95249 #endif
95250- atomic_t sk_drops;
95251+ atomic_unchecked_t sk_drops;
95252 int sk_rcvbuf;
95253
95254 struct sk_filter __rcu *sk_filter;
95255@@ -1039,7 +1039,7 @@ struct proto {
95256 void (*destroy_cgroup)(struct mem_cgroup *memcg);
95257 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
95258 #endif
95259-};
95260+} __randomize_layout;
95261
95262 /*
95263 * Bits in struct cg_proto.flags
95264@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
95265 page_counter_uncharge(&prot->memory_allocated, amt);
95266 }
95267
95268-static inline long
95269+static inline long __intentional_overflow(-1)
95270 sk_memory_allocated(const struct sock *sk)
95271 {
95272 struct proto *prot = sk->sk_prot;
95273@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
95274 }
95275
95276 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
95277- struct iov_iter *from, char *to,
95278+ struct iov_iter *from, unsigned char *to,
95279 int copy, int offset)
95280 {
95281 if (skb->ip_summed == CHECKSUM_NONE) {
95282@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
95283 }
95284 }
95285
95286-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95287+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
95288
95289 /**
95290 * sk_page_frag - return an appropriate page_frag
95291diff --git a/include/net/tcp.h b/include/net/tcp.h
95292index 8d6b983..5813205 100644
95293--- a/include/net/tcp.h
95294+++ b/include/net/tcp.h
95295@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
95296 void tcp_xmit_retransmit_queue(struct sock *);
95297 void tcp_simple_retransmit(struct sock *);
95298 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
95299-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95300+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
95301
95302 void tcp_send_probe0(struct sock *);
95303 void tcp_send_partial(struct sock *);
95304@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
95305 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
95306 */
95307 struct tcp_skb_cb {
95308- __u32 seq; /* Starting sequence number */
95309- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
95310+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
95311+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
95312 union {
95313 /* Note : tcp_tw_isn is used in input path only
95314 * (isn chosen by tcp_timewait_state_process())
95315@@ -720,7 +720,7 @@ struct tcp_skb_cb {
95316
95317 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
95318 /* 1 byte hole */
95319- __u32 ack_seq; /* Sequence number ACK'd */
95320+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
95321 union {
95322 struct inet_skb_parm h4;
95323 #if IS_ENABLED(CONFIG_IPV6)
95324diff --git a/include/net/xfrm.h b/include/net/xfrm.h
95325index dc4865e..152ee4c 100644
95326--- a/include/net/xfrm.h
95327+++ b/include/net/xfrm.h
95328@@ -285,7 +285,6 @@ struct xfrm_dst;
95329 struct xfrm_policy_afinfo {
95330 unsigned short family;
95331 struct dst_ops *dst_ops;
95332- void (*garbage_collect)(struct net *net);
95333 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
95334 const xfrm_address_t *saddr,
95335 const xfrm_address_t *daddr);
95336@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
95337 struct net_device *dev,
95338 const struct flowi *fl);
95339 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
95340-};
95341+} __do_const;
95342
95343 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
95344 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
95345@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
95346 int (*transport_finish)(struct sk_buff *skb,
95347 int async);
95348 void (*local_error)(struct sk_buff *skb, u32 mtu);
95349-};
95350+} __do_const;
95351
95352 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
95353 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
95354@@ -437,7 +436,7 @@ struct xfrm_mode {
95355 struct module *owner;
95356 unsigned int encap;
95357 int flags;
95358-};
95359+} __do_const;
95360
95361 /* Flags for xfrm_mode. */
95362 enum {
95363@@ -534,7 +533,7 @@ struct xfrm_policy {
95364 struct timer_list timer;
95365
95366 struct flow_cache_object flo;
95367- atomic_t genid;
95368+ atomic_unchecked_t genid;
95369 u32 priority;
95370 u32 index;
95371 struct xfrm_mark mark;
95372@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
95373 }
95374
95375 void xfrm_garbage_collect(struct net *net);
95376+void xfrm_garbage_collect_deferred(struct net *net);
95377
95378 #else
95379
95380@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
95381 static inline void xfrm_garbage_collect(struct net *net)
95382 {
95383 }
95384+static inline void xfrm_garbage_collect_deferred(struct net *net)
95385+{
95386+}
95387 #endif
95388
95389 static __inline__
95390diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
95391index 1017e0b..227aa4d 100644
95392--- a/include/rdma/iw_cm.h
95393+++ b/include/rdma/iw_cm.h
95394@@ -122,7 +122,7 @@ struct iw_cm_verbs {
95395 int backlog);
95396
95397 int (*destroy_listen)(struct iw_cm_id *cm_id);
95398-};
95399+} __no_const;
95400
95401 /**
95402 * iw_create_cm_id - Create an IW CM identifier.
95403diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
95404index 93d14da..734b3d8 100644
95405--- a/include/scsi/libfc.h
95406+++ b/include/scsi/libfc.h
95407@@ -771,6 +771,7 @@ struct libfc_function_template {
95408 */
95409 void (*disc_stop_final) (struct fc_lport *);
95410 };
95411+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
95412
95413 /**
95414 * struct fc_disc - Discovery context
95415@@ -875,7 +876,7 @@ struct fc_lport {
95416 struct fc_vport *vport;
95417
95418 /* Operational Information */
95419- struct libfc_function_template tt;
95420+ libfc_function_template_no_const tt;
95421 u8 link_up;
95422 u8 qfull;
95423 enum fc_lport_state state;
95424diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
95425index a4c9336..d6f8f34 100644
95426--- a/include/scsi/scsi_device.h
95427+++ b/include/scsi/scsi_device.h
95428@@ -185,9 +185,9 @@ struct scsi_device {
95429 unsigned int max_device_blocked; /* what device_blocked counts down from */
95430 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
95431
95432- atomic_t iorequest_cnt;
95433- atomic_t iodone_cnt;
95434- atomic_t ioerr_cnt;
95435+ atomic_unchecked_t iorequest_cnt;
95436+ atomic_unchecked_t iodone_cnt;
95437+ atomic_unchecked_t ioerr_cnt;
95438
95439 struct device sdev_gendev,
95440 sdev_dev;
95441diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
95442index 007a0bc..7188db8 100644
95443--- a/include/scsi/scsi_transport_fc.h
95444+++ b/include/scsi/scsi_transport_fc.h
95445@@ -756,7 +756,8 @@ struct fc_function_template {
95446 unsigned long show_host_system_hostname:1;
95447
95448 unsigned long disable_target_scan:1;
95449-};
95450+} __do_const;
95451+typedef struct fc_function_template __no_const fc_function_template_no_const;
95452
95453
95454 /**
95455diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
95456index f48089d..73abe48 100644
95457--- a/include/sound/compress_driver.h
95458+++ b/include/sound/compress_driver.h
95459@@ -130,7 +130,7 @@ struct snd_compr_ops {
95460 struct snd_compr_caps *caps);
95461 int (*get_codec_caps) (struct snd_compr_stream *stream,
95462 struct snd_compr_codec_caps *codec);
95463-};
95464+} __no_const;
95465
95466 /**
95467 * struct snd_compr: Compressed device
95468diff --git a/include/sound/soc.h b/include/sound/soc.h
95469index 0d1ade1..34e77d3 100644
95470--- a/include/sound/soc.h
95471+++ b/include/sound/soc.h
95472@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
95473 enum snd_soc_dapm_type, int);
95474
95475 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
95476-};
95477+} __do_const;
95478
95479 /* SoC platform interface */
95480 struct snd_soc_platform_driver {
95481@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
95482 const struct snd_compr_ops *compr_ops;
95483
95484 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
95485-};
95486+} __do_const;
95487
95488 struct snd_soc_dai_link_component {
95489 const char *name;
95490diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
95491index 985ca4c..b55b54a 100644
95492--- a/include/target/target_core_base.h
95493+++ b/include/target/target_core_base.h
95494@@ -767,7 +767,7 @@ struct se_device {
95495 atomic_long_t write_bytes;
95496 /* Active commands on this virtual SE device */
95497 atomic_t simple_cmds;
95498- atomic_t dev_ordered_id;
95499+ atomic_unchecked_t dev_ordered_id;
95500 atomic_t dev_ordered_sync;
95501 atomic_t dev_qf_count;
95502 int export_count;
95503diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
95504new file mode 100644
95505index 0000000..fb634b7
95506--- /dev/null
95507+++ b/include/trace/events/fs.h
95508@@ -0,0 +1,53 @@
95509+#undef TRACE_SYSTEM
95510+#define TRACE_SYSTEM fs
95511+
95512+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
95513+#define _TRACE_FS_H
95514+
95515+#include <linux/fs.h>
95516+#include <linux/tracepoint.h>
95517+
95518+TRACE_EVENT(do_sys_open,
95519+
95520+ TP_PROTO(const char *filename, int flags, int mode),
95521+
95522+ TP_ARGS(filename, flags, mode),
95523+
95524+ TP_STRUCT__entry(
95525+ __string( filename, filename )
95526+ __field( int, flags )
95527+ __field( int, mode )
95528+ ),
95529+
95530+ TP_fast_assign(
95531+ __assign_str(filename, filename);
95532+ __entry->flags = flags;
95533+ __entry->mode = mode;
95534+ ),
95535+
95536+ TP_printk("\"%s\" %x %o",
95537+ __get_str(filename), __entry->flags, __entry->mode)
95538+);
95539+
95540+TRACE_EVENT(open_exec,
95541+
95542+ TP_PROTO(const char *filename),
95543+
95544+ TP_ARGS(filename),
95545+
95546+ TP_STRUCT__entry(
95547+ __string( filename, filename )
95548+ ),
95549+
95550+ TP_fast_assign(
95551+ __assign_str(filename, filename);
95552+ ),
95553+
95554+ TP_printk("\"%s\"",
95555+ __get_str(filename))
95556+);
95557+
95558+#endif /* _TRACE_FS_H */
95559+
95560+/* This part must be outside protection */
95561+#include <trace/define_trace.h>
95562diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
95563index 3608beb..df39d8a 100644
95564--- a/include/trace/events/irq.h
95565+++ b/include/trace/events/irq.h
95566@@ -36,7 +36,7 @@ struct softirq_action;
95567 */
95568 TRACE_EVENT(irq_handler_entry,
95569
95570- TP_PROTO(int irq, struct irqaction *action),
95571+ TP_PROTO(int irq, const struct irqaction *action),
95572
95573 TP_ARGS(irq, action),
95574
95575@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
95576 */
95577 TRACE_EVENT(irq_handler_exit,
95578
95579- TP_PROTO(int irq, struct irqaction *action, int ret),
95580+ TP_PROTO(int irq, const struct irqaction *action, int ret),
95581
95582 TP_ARGS(irq, action, ret),
95583
95584diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
95585index 6eed16b..3e05750 100644
95586--- a/include/uapi/drm/i915_drm.h
95587+++ b/include/uapi/drm/i915_drm.h
95588@@ -347,6 +347,7 @@ typedef struct drm_i915_irq_wait {
95589 #define I915_PARAM_HAS_COHERENT_PHYS_GTT 29
95590 #define I915_PARAM_MMAP_VERSION 30
95591 #define I915_PARAM_HAS_BSD2 31
95592+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
95593
95594 typedef struct drm_i915_getparam {
95595 int param;
95596diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
95597index 7caf44c..23c6f27 100644
95598--- a/include/uapi/linux/a.out.h
95599+++ b/include/uapi/linux/a.out.h
95600@@ -39,6 +39,14 @@ enum machine_type {
95601 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
95602 };
95603
95604+/* Constants for the N_FLAGS field */
95605+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95606+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
95607+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
95608+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
95609+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95610+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95611+
95612 #if !defined (N_MAGIC)
95613 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
95614 #endif
95615diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
95616index 22b6ad3..aeba37e 100644
95617--- a/include/uapi/linux/bcache.h
95618+++ b/include/uapi/linux/bcache.h
95619@@ -5,6 +5,7 @@
95620 * Bcache on disk data structures
95621 */
95622
95623+#include <linux/compiler.h>
95624 #include <asm/types.h>
95625
95626 #define BITMASK(name, type, field, offset, size) \
95627@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
95628 /* Btree keys - all units are in sectors */
95629
95630 struct bkey {
95631- __u64 high;
95632- __u64 low;
95633+ __u64 high __intentional_overflow(-1);
95634+ __u64 low __intentional_overflow(-1);
95635 __u64 ptr[];
95636 };
95637
95638diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
95639index d876736..ccce5c0 100644
95640--- a/include/uapi/linux/byteorder/little_endian.h
95641+++ b/include/uapi/linux/byteorder/little_endian.h
95642@@ -42,51 +42,51 @@
95643
95644 static inline __le64 __cpu_to_le64p(const __u64 *p)
95645 {
95646- return (__force __le64)*p;
95647+ return (__force const __le64)*p;
95648 }
95649-static inline __u64 __le64_to_cpup(const __le64 *p)
95650+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
95651 {
95652- return (__force __u64)*p;
95653+ return (__force const __u64)*p;
95654 }
95655 static inline __le32 __cpu_to_le32p(const __u32 *p)
95656 {
95657- return (__force __le32)*p;
95658+ return (__force const __le32)*p;
95659 }
95660 static inline __u32 __le32_to_cpup(const __le32 *p)
95661 {
95662- return (__force __u32)*p;
95663+ return (__force const __u32)*p;
95664 }
95665 static inline __le16 __cpu_to_le16p(const __u16 *p)
95666 {
95667- return (__force __le16)*p;
95668+ return (__force const __le16)*p;
95669 }
95670 static inline __u16 __le16_to_cpup(const __le16 *p)
95671 {
95672- return (__force __u16)*p;
95673+ return (__force const __u16)*p;
95674 }
95675 static inline __be64 __cpu_to_be64p(const __u64 *p)
95676 {
95677- return (__force __be64)__swab64p(p);
95678+ return (__force const __be64)__swab64p(p);
95679 }
95680 static inline __u64 __be64_to_cpup(const __be64 *p)
95681 {
95682- return __swab64p((__u64 *)p);
95683+ return __swab64p((const __u64 *)p);
95684 }
95685 static inline __be32 __cpu_to_be32p(const __u32 *p)
95686 {
95687- return (__force __be32)__swab32p(p);
95688+ return (__force const __be32)__swab32p(p);
95689 }
95690-static inline __u32 __be32_to_cpup(const __be32 *p)
95691+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
95692 {
95693- return __swab32p((__u32 *)p);
95694+ return __swab32p((const __u32 *)p);
95695 }
95696 static inline __be16 __cpu_to_be16p(const __u16 *p)
95697 {
95698- return (__force __be16)__swab16p(p);
95699+ return (__force const __be16)__swab16p(p);
95700 }
95701 static inline __u16 __be16_to_cpup(const __be16 *p)
95702 {
95703- return __swab16p((__u16 *)p);
95704+ return __swab16p((const __u16 *)p);
95705 }
95706 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
95707 #define __le64_to_cpus(x) do { (void)(x); } while (0)
95708diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
95709index 71e1d0e..6cc9caf 100644
95710--- a/include/uapi/linux/elf.h
95711+++ b/include/uapi/linux/elf.h
95712@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
95713 #define PT_GNU_EH_FRAME 0x6474e550
95714
95715 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
95716+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
95717+
95718+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
95719+
95720+/* Constants for the e_flags field */
95721+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
95722+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
95723+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
95724+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
95725+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
95726+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
95727
95728 /*
95729 * Extended Numbering
95730@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
95731 #define DT_DEBUG 21
95732 #define DT_TEXTREL 22
95733 #define DT_JMPREL 23
95734+#define DT_FLAGS 30
95735+ #define DF_TEXTREL 0x00000004
95736 #define DT_ENCODING 32
95737 #define OLD_DT_LOOS 0x60000000
95738 #define DT_LOOS 0x6000000d
95739@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
95740 #define PF_W 0x2
95741 #define PF_X 0x1
95742
95743+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
95744+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
95745+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
95746+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
95747+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
95748+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
95749+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
95750+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
95751+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
95752+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
95753+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
95754+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
95755+
95756 typedef struct elf32_phdr{
95757 Elf32_Word p_type;
95758 Elf32_Off p_offset;
95759@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
95760 #define EI_OSABI 7
95761 #define EI_PAD 8
95762
95763+#define EI_PAX 14
95764+
95765 #define ELFMAG0 0x7f /* EI_MAG */
95766 #define ELFMAG1 'E'
95767 #define ELFMAG2 'L'
95768diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
95769index aa169c4..6a2771d 100644
95770--- a/include/uapi/linux/personality.h
95771+++ b/include/uapi/linux/personality.h
95772@@ -30,6 +30,7 @@ enum {
95773 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
95774 ADDR_NO_RANDOMIZE | \
95775 ADDR_COMPAT_LAYOUT | \
95776+ ADDR_LIMIT_3GB | \
95777 MMAP_PAGE_ZERO)
95778
95779 /*
95780diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
95781index 7530e74..e714828 100644
95782--- a/include/uapi/linux/screen_info.h
95783+++ b/include/uapi/linux/screen_info.h
95784@@ -43,7 +43,8 @@ struct screen_info {
95785 __u16 pages; /* 0x32 */
95786 __u16 vesa_attributes; /* 0x34 */
95787 __u32 capabilities; /* 0x36 */
95788- __u8 _reserved[6]; /* 0x3a */
95789+ __u16 vesapm_size; /* 0x3a */
95790+ __u8 _reserved[4]; /* 0x3c */
95791 } __attribute__((packed));
95792
95793 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
95794diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
95795index 0e011eb..82681b1 100644
95796--- a/include/uapi/linux/swab.h
95797+++ b/include/uapi/linux/swab.h
95798@@ -43,7 +43,7 @@
95799 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
95800 */
95801
95802-static inline __attribute_const__ __u16 __fswab16(__u16 val)
95803+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
95804 {
95805 #ifdef __HAVE_BUILTIN_BSWAP16__
95806 return __builtin_bswap16(val);
95807@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
95808 #endif
95809 }
95810
95811-static inline __attribute_const__ __u32 __fswab32(__u32 val)
95812+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
95813 {
95814 #ifdef __HAVE_BUILTIN_BSWAP32__
95815 return __builtin_bswap32(val);
95816@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
95817 #endif
95818 }
95819
95820-static inline __attribute_const__ __u64 __fswab64(__u64 val)
95821+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
95822 {
95823 #ifdef __HAVE_BUILTIN_BSWAP64__
95824 return __builtin_bswap64(val);
95825diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
95826index 1590c49..5eab462 100644
95827--- a/include/uapi/linux/xattr.h
95828+++ b/include/uapi/linux/xattr.h
95829@@ -73,5 +73,9 @@
95830 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
95831 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
95832
95833+/* User namespace */
95834+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
95835+#define XATTR_PAX_FLAGS_SUFFIX "flags"
95836+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
95837
95838 #endif /* _UAPI_LINUX_XATTR_H */
95839diff --git a/include/video/udlfb.h b/include/video/udlfb.h
95840index f9466fa..f4e2b81 100644
95841--- a/include/video/udlfb.h
95842+++ b/include/video/udlfb.h
95843@@ -53,10 +53,10 @@ struct dlfb_data {
95844 u32 pseudo_palette[256];
95845 int blank_mode; /*one of FB_BLANK_ */
95846 /* blit-only rendering path metrics, exposed through sysfs */
95847- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95848- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
95849- atomic_t bytes_sent; /* to usb, after compression including overhead */
95850- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
95851+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
95852+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
95853+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
95854+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
95855 };
95856
95857 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
95858diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
95859index 30f5362..8ed8ac9 100644
95860--- a/include/video/uvesafb.h
95861+++ b/include/video/uvesafb.h
95862@@ -122,6 +122,7 @@ struct uvesafb_par {
95863 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
95864 u8 pmi_setpal; /* PMI for palette changes */
95865 u16 *pmi_base; /* protected mode interface location */
95866+ u8 *pmi_code; /* protected mode code location */
95867 void *pmi_start;
95868 void *pmi_pal;
95869 u8 *vbe_state_orig; /*
95870diff --git a/init/Kconfig b/init/Kconfig
95871index f5dbc6d..8259396 100644
95872--- a/init/Kconfig
95873+++ b/init/Kconfig
95874@@ -1136,6 +1136,7 @@ endif # CGROUPS
95875
95876 config CHECKPOINT_RESTORE
95877 bool "Checkpoint/restore support" if EXPERT
95878+ depends on !GRKERNSEC
95879 default n
95880 help
95881 Enables additional kernel features in a sake of checkpoint/restore.
95882@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
95883
95884 config COMPAT_BRK
95885 bool "Disable heap randomization"
95886- default y
95887+ default n
95888 help
95889 Randomizing heap placement makes heap exploits harder, but it
95890 also breaks ancient binaries (including anything libc5 based).
95891@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
95892 config STOP_MACHINE
95893 bool
95894 default y
95895- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
95896+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
95897 help
95898 Need stop_machine() primitive.
95899
95900diff --git a/init/Makefile b/init/Makefile
95901index 7bc47ee..6da2dc7 100644
95902--- a/init/Makefile
95903+++ b/init/Makefile
95904@@ -2,6 +2,9 @@
95905 # Makefile for the linux kernel.
95906 #
95907
95908+ccflags-y := $(GCC_PLUGINS_CFLAGS)
95909+asflags-y := $(GCC_PLUGINS_AFLAGS)
95910+
95911 obj-y := main.o version.o mounts.o
95912 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
95913 obj-y += noinitramfs.o
95914diff --git a/init/do_mounts.c b/init/do_mounts.c
95915index eb41008..f5dbbf9 100644
95916--- a/init/do_mounts.c
95917+++ b/init/do_mounts.c
95918@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
95919 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
95920 {
95921 struct super_block *s;
95922- int err = sys_mount(name, "/root", fs, flags, data);
95923+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
95924 if (err)
95925 return err;
95926
95927- sys_chdir("/root");
95928+ sys_chdir((const char __force_user *)"/root");
95929 s = current->fs->pwd.dentry->d_sb;
95930 ROOT_DEV = s->s_dev;
95931 printk(KERN_INFO
95932@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
95933 va_start(args, fmt);
95934 vsprintf(buf, fmt, args);
95935 va_end(args);
95936- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
95937+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
95938 if (fd >= 0) {
95939 sys_ioctl(fd, FDEJECT, 0);
95940 sys_close(fd);
95941 }
95942 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
95943- fd = sys_open("/dev/console", O_RDWR, 0);
95944+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
95945 if (fd >= 0) {
95946 sys_ioctl(fd, TCGETS, (long)&termios);
95947 termios.c_lflag &= ~ICANON;
95948 sys_ioctl(fd, TCSETSF, (long)&termios);
95949- sys_read(fd, &c, 1);
95950+ sys_read(fd, (char __user *)&c, 1);
95951 termios.c_lflag |= ICANON;
95952 sys_ioctl(fd, TCSETSF, (long)&termios);
95953 sys_close(fd);
95954@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
95955 mount_root();
95956 out:
95957 devtmpfs_mount("dev");
95958- sys_mount(".", "/", NULL, MS_MOVE, NULL);
95959- sys_chroot(".");
95960+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
95961+ sys_chroot((const char __force_user *)".");
95962 }
95963
95964 static bool is_tmpfs;
95965diff --git a/init/do_mounts.h b/init/do_mounts.h
95966index f5b978a..69dbfe8 100644
95967--- a/init/do_mounts.h
95968+++ b/init/do_mounts.h
95969@@ -15,15 +15,15 @@ extern int root_mountflags;
95970
95971 static inline int create_dev(char *name, dev_t dev)
95972 {
95973- sys_unlink(name);
95974- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
95975+ sys_unlink((char __force_user *)name);
95976+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
95977 }
95978
95979 #if BITS_PER_LONG == 32
95980 static inline u32 bstat(char *name)
95981 {
95982 struct stat64 stat;
95983- if (sys_stat64(name, &stat) != 0)
95984+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
95985 return 0;
95986 if (!S_ISBLK(stat.st_mode))
95987 return 0;
95988@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
95989 static inline u32 bstat(char *name)
95990 {
95991 struct stat stat;
95992- if (sys_newstat(name, &stat) != 0)
95993+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
95994 return 0;
95995 if (!S_ISBLK(stat.st_mode))
95996 return 0;
95997diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
95998index 3e0878e..8a9d7a0 100644
95999--- a/init/do_mounts_initrd.c
96000+++ b/init/do_mounts_initrd.c
96001@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
96002 {
96003 sys_unshare(CLONE_FS | CLONE_FILES);
96004 /* stdin/stdout/stderr for /linuxrc */
96005- sys_open("/dev/console", O_RDWR, 0);
96006+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
96007 sys_dup(0);
96008 sys_dup(0);
96009 /* move initrd over / and chdir/chroot in initrd root */
96010- sys_chdir("/root");
96011- sys_mount(".", "/", NULL, MS_MOVE, NULL);
96012- sys_chroot(".");
96013+ sys_chdir((const char __force_user *)"/root");
96014+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
96015+ sys_chroot((const char __force_user *)".");
96016 sys_setsid();
96017 return 0;
96018 }
96019@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
96020 create_dev("/dev/root.old", Root_RAM0);
96021 /* mount initrd on rootfs' /root */
96022 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
96023- sys_mkdir("/old", 0700);
96024- sys_chdir("/old");
96025+ sys_mkdir((const char __force_user *)"/old", 0700);
96026+ sys_chdir((const char __force_user *)"/old");
96027
96028 /* try loading default modules from initrd */
96029 load_default_modules();
96030@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
96031 current->flags &= ~PF_FREEZER_SKIP;
96032
96033 /* move initrd to rootfs' /old */
96034- sys_mount("..", ".", NULL, MS_MOVE, NULL);
96035+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
96036 /* switch root and cwd back to / of rootfs */
96037- sys_chroot("..");
96038+ sys_chroot((const char __force_user *)"..");
96039
96040 if (new_decode_dev(real_root_dev) == Root_RAM0) {
96041- sys_chdir("/old");
96042+ sys_chdir((const char __force_user *)"/old");
96043 return;
96044 }
96045
96046- sys_chdir("/");
96047+ sys_chdir((const char __force_user *)"/");
96048 ROOT_DEV = new_decode_dev(real_root_dev);
96049 mount_root();
96050
96051 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
96052- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
96053+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
96054 if (!error)
96055 printk("okay\n");
96056 else {
96057- int fd = sys_open("/dev/root.old", O_RDWR, 0);
96058+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
96059 if (error == -ENOENT)
96060 printk("/initrd does not exist. Ignored.\n");
96061 else
96062 printk("failed\n");
96063 printk(KERN_NOTICE "Unmounting old root\n");
96064- sys_umount("/old", MNT_DETACH);
96065+ sys_umount((char __force_user *)"/old", MNT_DETACH);
96066 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
96067 if (fd < 0) {
96068 error = fd;
96069@@ -127,11 +127,11 @@ int __init initrd_load(void)
96070 * mounted in the normal path.
96071 */
96072 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
96073- sys_unlink("/initrd.image");
96074+ sys_unlink((const char __force_user *)"/initrd.image");
96075 handle_initrd();
96076 return 1;
96077 }
96078 }
96079- sys_unlink("/initrd.image");
96080+ sys_unlink((const char __force_user *)"/initrd.image");
96081 return 0;
96082 }
96083diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
96084index 8cb6db5..d729f50 100644
96085--- a/init/do_mounts_md.c
96086+++ b/init/do_mounts_md.c
96087@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
96088 partitioned ? "_d" : "", minor,
96089 md_setup_args[ent].device_names);
96090
96091- fd = sys_open(name, 0, 0);
96092+ fd = sys_open((char __force_user *)name, 0, 0);
96093 if (fd < 0) {
96094 printk(KERN_ERR "md: open failed - cannot start "
96095 "array %s\n", name);
96096@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
96097 * array without it
96098 */
96099 sys_close(fd);
96100- fd = sys_open(name, 0, 0);
96101+ fd = sys_open((char __force_user *)name, 0, 0);
96102 sys_ioctl(fd, BLKRRPART, 0);
96103 }
96104 sys_close(fd);
96105@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
96106
96107 wait_for_device_probe();
96108
96109- fd = sys_open("/dev/md0", 0, 0);
96110+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
96111 if (fd >= 0) {
96112 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
96113 sys_close(fd);
96114diff --git a/init/init_task.c b/init/init_task.c
96115index ba0a7f36..2bcf1d5 100644
96116--- a/init/init_task.c
96117+++ b/init/init_task.c
96118@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
96119 * Initial thread structure. Alignment of this is handled by a special
96120 * linker map entry.
96121 */
96122+#ifdef CONFIG_X86
96123+union thread_union init_thread_union __init_task_data;
96124+#else
96125 union thread_union init_thread_union __init_task_data =
96126 { INIT_THREAD_INFO(init_task) };
96127+#endif
96128diff --git a/init/initramfs.c b/init/initramfs.c
96129index ad1bd77..dca2c1b 100644
96130--- a/init/initramfs.c
96131+++ b/init/initramfs.c
96132@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
96133
96134 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
96135 while (count) {
96136- ssize_t rv = sys_write(fd, p, count);
96137+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
96138
96139 if (rv < 0) {
96140 if (rv == -EINTR || rv == -EAGAIN)
96141@@ -107,7 +107,7 @@ static void __init free_hash(void)
96142 }
96143 }
96144
96145-static long __init do_utime(char *filename, time_t mtime)
96146+static long __init do_utime(char __force_user *filename, time_t mtime)
96147 {
96148 struct timespec t[2];
96149
96150@@ -142,7 +142,7 @@ static void __init dir_utime(void)
96151 struct dir_entry *de, *tmp;
96152 list_for_each_entry_safe(de, tmp, &dir_list, list) {
96153 list_del(&de->list);
96154- do_utime(de->name, de->mtime);
96155+ do_utime((char __force_user *)de->name, de->mtime);
96156 kfree(de->name);
96157 kfree(de);
96158 }
96159@@ -304,7 +304,7 @@ static int __init maybe_link(void)
96160 if (nlink >= 2) {
96161 char *old = find_link(major, minor, ino, mode, collected);
96162 if (old)
96163- return (sys_link(old, collected) < 0) ? -1 : 1;
96164+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
96165 }
96166 return 0;
96167 }
96168@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
96169 {
96170 struct stat st;
96171
96172- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
96173+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
96174 if (S_ISDIR(st.st_mode))
96175- sys_rmdir(path);
96176+ sys_rmdir((char __force_user *)path);
96177 else
96178- sys_unlink(path);
96179+ sys_unlink((char __force_user *)path);
96180 }
96181 }
96182
96183@@ -338,7 +338,7 @@ static int __init do_name(void)
96184 int openflags = O_WRONLY|O_CREAT;
96185 if (ml != 1)
96186 openflags |= O_TRUNC;
96187- wfd = sys_open(collected, openflags, mode);
96188+ wfd = sys_open((char __force_user *)collected, openflags, mode);
96189
96190 if (wfd >= 0) {
96191 sys_fchown(wfd, uid, gid);
96192@@ -350,17 +350,17 @@ static int __init do_name(void)
96193 }
96194 }
96195 } else if (S_ISDIR(mode)) {
96196- sys_mkdir(collected, mode);
96197- sys_chown(collected, uid, gid);
96198- sys_chmod(collected, mode);
96199+ sys_mkdir((char __force_user *)collected, mode);
96200+ sys_chown((char __force_user *)collected, uid, gid);
96201+ sys_chmod((char __force_user *)collected, mode);
96202 dir_add(collected, mtime);
96203 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
96204 S_ISFIFO(mode) || S_ISSOCK(mode)) {
96205 if (maybe_link() == 0) {
96206- sys_mknod(collected, mode, rdev);
96207- sys_chown(collected, uid, gid);
96208- sys_chmod(collected, mode);
96209- do_utime(collected, mtime);
96210+ sys_mknod((char __force_user *)collected, mode, rdev);
96211+ sys_chown((char __force_user *)collected, uid, gid);
96212+ sys_chmod((char __force_user *)collected, mode);
96213+ do_utime((char __force_user *)collected, mtime);
96214 }
96215 }
96216 return 0;
96217@@ -372,7 +372,7 @@ static int __init do_copy(void)
96218 if (xwrite(wfd, victim, body_len) != body_len)
96219 error("write error");
96220 sys_close(wfd);
96221- do_utime(vcollected, mtime);
96222+ do_utime((char __force_user *)vcollected, mtime);
96223 kfree(vcollected);
96224 eat(body_len);
96225 state = SkipIt;
96226@@ -390,9 +390,9 @@ static int __init do_symlink(void)
96227 {
96228 collected[N_ALIGN(name_len) + body_len] = '\0';
96229 clean_path(collected, 0);
96230- sys_symlink(collected + N_ALIGN(name_len), collected);
96231- sys_lchown(collected, uid, gid);
96232- do_utime(collected, mtime);
96233+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
96234+ sys_lchown((char __force_user *)collected, uid, gid);
96235+ do_utime((char __force_user *)collected, mtime);
96236 state = SkipIt;
96237 next_state = Reset;
96238 return 0;
96239diff --git a/init/main.c b/init/main.c
96240index 6f0f1c5f..a542824 100644
96241--- a/init/main.c
96242+++ b/init/main.c
96243@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
96244 static inline void mark_rodata_ro(void) { }
96245 #endif
96246
96247+extern void grsecurity_init(void);
96248+
96249 /*
96250 * Debug helper: via this flag we know that we are in 'early bootup code'
96251 * where only the boot processor is running with IRQ disabled. This means
96252@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
96253
96254 __setup("reset_devices", set_reset_devices);
96255
96256+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
96257+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
96258+static int __init setup_grsec_proc_gid(char *str)
96259+{
96260+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
96261+ return 1;
96262+}
96263+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
96264+#endif
96265+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
96266+int grsec_enable_sysfs_restrict = 1;
96267+static int __init setup_grsec_sysfs_restrict(char *str)
96268+{
96269+ if (!simple_strtol(str, NULL, 0))
96270+ grsec_enable_sysfs_restrict = 0;
96271+ return 1;
96272+}
96273+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
96274+#endif
96275+
96276+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
96277+unsigned long pax_user_shadow_base __read_only;
96278+EXPORT_SYMBOL(pax_user_shadow_base);
96279+extern char pax_enter_kernel_user[];
96280+extern char pax_exit_kernel_user[];
96281+#endif
96282+
96283+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
96284+static int __init setup_pax_nouderef(char *str)
96285+{
96286+#ifdef CONFIG_X86_32
96287+ unsigned int cpu;
96288+ struct desc_struct *gdt;
96289+
96290+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
96291+ gdt = get_cpu_gdt_table(cpu);
96292+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
96293+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
96294+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
96295+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
96296+ }
96297+ loadsegment(ds, __KERNEL_DS);
96298+ loadsegment(es, __KERNEL_DS);
96299+ loadsegment(ss, __KERNEL_DS);
96300+#else
96301+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
96302+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
96303+ clone_pgd_mask = ~(pgdval_t)0UL;
96304+ pax_user_shadow_base = 0UL;
96305+ setup_clear_cpu_cap(X86_FEATURE_PCID);
96306+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
96307+#endif
96308+
96309+ return 0;
96310+}
96311+early_param("pax_nouderef", setup_pax_nouderef);
96312+
96313+#ifdef CONFIG_X86_64
96314+static int __init setup_pax_weakuderef(char *str)
96315+{
96316+ if (clone_pgd_mask != ~(pgdval_t)0UL)
96317+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
96318+ return 1;
96319+}
96320+__setup("pax_weakuderef", setup_pax_weakuderef);
96321+#endif
96322+#endif
96323+
96324+#ifdef CONFIG_PAX_SOFTMODE
96325+int pax_softmode;
96326+
96327+static int __init setup_pax_softmode(char *str)
96328+{
96329+ get_option(&str, &pax_softmode);
96330+ return 1;
96331+}
96332+__setup("pax_softmode=", setup_pax_softmode);
96333+#endif
96334+
96335 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
96336 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
96337 static const char *panic_later, *panic_param;
96338@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
96339 struct blacklist_entry *entry;
96340 char *fn_name;
96341
96342- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
96343+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
96344 if (!fn_name)
96345 return false;
96346
96347@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
96348 {
96349 int count = preempt_count();
96350 int ret;
96351- char msgbuf[64];
96352+ const char *msg1 = "", *msg2 = "";
96353
96354 if (initcall_blacklisted(fn))
96355 return -EPERM;
96356@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
96357 else
96358 ret = fn();
96359
96360- msgbuf[0] = 0;
96361-
96362 if (preempt_count() != count) {
96363- sprintf(msgbuf, "preemption imbalance ");
96364+ msg1 = " preemption imbalance";
96365 preempt_count_set(count);
96366 }
96367 if (irqs_disabled()) {
96368- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
96369+ msg2 = " disabled interrupts";
96370 local_irq_enable();
96371 }
96372- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
96373+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
96374
96375+ add_latent_entropy();
96376 return ret;
96377 }
96378
96379@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
96380 {
96381 argv_init[0] = init_filename;
96382 return do_execve(getname_kernel(init_filename),
96383- (const char __user *const __user *)argv_init,
96384- (const char __user *const __user *)envp_init);
96385+ (const char __user *const __force_user *)argv_init,
96386+ (const char __user *const __force_user *)envp_init);
96387 }
96388
96389 static int try_to_run_init_process(const char *init_filename)
96390@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
96391 return ret;
96392 }
96393
96394+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96395+extern int gr_init_ran;
96396+#endif
96397+
96398 static noinline void __init kernel_init_freeable(void);
96399
96400 static int __ref kernel_init(void *unused)
96401@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
96402 ramdisk_execute_command, ret);
96403 }
96404
96405+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
96406+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
96407+ gr_init_ran = 1;
96408+#endif
96409+
96410 /*
96411 * We try each of these until one succeeds.
96412 *
96413@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
96414 do_basic_setup();
96415
96416 /* Open the /dev/console on the rootfs, this should never fail */
96417- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
96418+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
96419 pr_err("Warning: unable to open an initial console.\n");
96420
96421 (void) sys_dup(0);
96422@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
96423 if (!ramdisk_execute_command)
96424 ramdisk_execute_command = "/init";
96425
96426- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
96427+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
96428 ramdisk_execute_command = NULL;
96429 prepare_namespace();
96430 }
96431
96432+ grsecurity_init();
96433+
96434 /*
96435 * Ok, we have completed the initial bootup, and
96436 * we're essentially up and running. Get rid of the
96437diff --git a/ipc/compat.c b/ipc/compat.c
96438index 9b3c85f..5266b0f 100644
96439--- a/ipc/compat.c
96440+++ b/ipc/compat.c
96441@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
96442 COMPAT_SHMLBA);
96443 if (err < 0)
96444 return err;
96445- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
96446+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
96447 }
96448 case SHMDT:
96449 return sys_shmdt(compat_ptr(ptr));
96450@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
96451 }
96452
96453 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
96454- unsigned, nsops,
96455+ compat_long_t, nsops,
96456 const struct compat_timespec __user *, timeout)
96457 {
96458 struct timespec __user *ts64;
96459diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
96460index 8ad93c2..efd80f8 100644
96461--- a/ipc/ipc_sysctl.c
96462+++ b/ipc/ipc_sysctl.c
96463@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
96464 static int proc_ipc_dointvec(struct ctl_table *table, int write,
96465 void __user *buffer, size_t *lenp, loff_t *ppos)
96466 {
96467- struct ctl_table ipc_table;
96468+ ctl_table_no_const ipc_table;
96469
96470 memcpy(&ipc_table, table, sizeof(ipc_table));
96471 ipc_table.data = get_ipc(table);
96472@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
96473 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
96474 void __user *buffer, size_t *lenp, loff_t *ppos)
96475 {
96476- struct ctl_table ipc_table;
96477+ ctl_table_no_const ipc_table;
96478
96479 memcpy(&ipc_table, table, sizeof(ipc_table));
96480 ipc_table.data = get_ipc(table);
96481@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
96482 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96483 void __user *buffer, size_t *lenp, loff_t *ppos)
96484 {
96485- struct ctl_table ipc_table;
96486+ ctl_table_no_const ipc_table;
96487 memcpy(&ipc_table, table, sizeof(ipc_table));
96488 ipc_table.data = get_ipc(table);
96489
96490@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
96491 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
96492 void __user *buffer, size_t *lenp, loff_t *ppos)
96493 {
96494- struct ctl_table ipc_table;
96495+ ctl_table_no_const ipc_table;
96496 int dummy = 0;
96497
96498 memcpy(&ipc_table, table, sizeof(ipc_table));
96499diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
96500index 68d4e95..1477ded 100644
96501--- a/ipc/mq_sysctl.c
96502+++ b/ipc/mq_sysctl.c
96503@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
96504 static int proc_mq_dointvec(struct ctl_table *table, int write,
96505 void __user *buffer, size_t *lenp, loff_t *ppos)
96506 {
96507- struct ctl_table mq_table;
96508+ ctl_table_no_const mq_table;
96509 memcpy(&mq_table, table, sizeof(mq_table));
96510 mq_table.data = get_mq(table);
96511
96512@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
96513 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
96514 void __user *buffer, size_t *lenp, loff_t *ppos)
96515 {
96516- struct ctl_table mq_table;
96517+ ctl_table_no_const mq_table;
96518 memcpy(&mq_table, table, sizeof(mq_table));
96519 mq_table.data = get_mq(table);
96520
96521diff --git a/ipc/mqueue.c b/ipc/mqueue.c
96522index 7635a1c..7432cb6 100644
96523--- a/ipc/mqueue.c
96524+++ b/ipc/mqueue.c
96525@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
96526 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
96527 info->attr.mq_msgsize);
96528
96529+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
96530 spin_lock(&mq_lock);
96531 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
96532 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
96533diff --git a/ipc/sem.c b/ipc/sem.c
96534index 9284211..bca5b1b 100644
96535--- a/ipc/sem.c
96536+++ b/ipc/sem.c
96537@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
96538 }
96539
96540 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
96541- unsigned, nsops, const struct timespec __user *, timeout)
96542+ long, nsops, const struct timespec __user *, timeout)
96543 {
96544 int error = -EINVAL;
96545 struct sem_array *sma;
96546@@ -2015,7 +2015,7 @@ out_free:
96547 }
96548
96549 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
96550- unsigned, nsops)
96551+ long, nsops)
96552 {
96553 return sys_semtimedop(semid, tsops, nsops, NULL);
96554 }
96555diff --git a/ipc/shm.c b/ipc/shm.c
96556index 19633b4..d454904 100644
96557--- a/ipc/shm.c
96558+++ b/ipc/shm.c
96559@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
96560 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
96561 #endif
96562
96563+#ifdef CONFIG_GRKERNSEC
96564+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96565+ const u64 shm_createtime, const kuid_t cuid,
96566+ const int shmid);
96567+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
96568+ const u64 shm_createtime);
96569+#endif
96570+
96571 void shm_init_ns(struct ipc_namespace *ns)
96572 {
96573 ns->shm_ctlmax = SHMMAX;
96574@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
96575 shp->shm_lprid = 0;
96576 shp->shm_atim = shp->shm_dtim = 0;
96577 shp->shm_ctim = get_seconds();
96578+#ifdef CONFIG_GRKERNSEC
96579+ shp->shm_createtime = ktime_get_ns();
96580+#endif
96581 shp->shm_segsz = size;
96582 shp->shm_nattch = 0;
96583 shp->shm_file = file;
96584@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96585 f_mode = FMODE_READ | FMODE_WRITE;
96586 }
96587 if (shmflg & SHM_EXEC) {
96588+
96589+#ifdef CONFIG_PAX_MPROTECT
96590+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
96591+ goto out;
96592+#endif
96593+
96594 prot |= PROT_EXEC;
96595 acc_mode |= S_IXUGO;
96596 }
96597@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96598 if (err)
96599 goto out_unlock;
96600
96601+#ifdef CONFIG_GRKERNSEC
96602+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
96603+ shp->shm_perm.cuid, shmid) ||
96604+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
96605+ err = -EACCES;
96606+ goto out_unlock;
96607+ }
96608+#endif
96609+
96610 ipc_lock_object(&shp->shm_perm);
96611
96612 /* check if shm_destroy() is tearing down shp */
96613@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
96614 path = shp->shm_file->f_path;
96615 path_get(&path);
96616 shp->shm_nattch++;
96617+#ifdef CONFIG_GRKERNSEC
96618+ shp->shm_lapid = current->pid;
96619+#endif
96620 size = i_size_read(path.dentry->d_inode);
96621 ipc_unlock_object(&shp->shm_perm);
96622 rcu_read_unlock();
96623diff --git a/ipc/util.c b/ipc/util.c
96624index 106bed0..f851429 100644
96625--- a/ipc/util.c
96626+++ b/ipc/util.c
96627@@ -71,6 +71,8 @@ struct ipc_proc_iface {
96628 int (*show)(struct seq_file *, void *);
96629 };
96630
96631+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
96632+
96633 /**
96634 * ipc_init - initialise ipc subsystem
96635 *
96636@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
96637 granted_mode >>= 6;
96638 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
96639 granted_mode >>= 3;
96640+
96641+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
96642+ return -1;
96643+
96644 /* is there some bit set in requested_mode but not in granted_mode? */
96645 if ((requested_mode & ~granted_mode & 0007) &&
96646 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
96647diff --git a/kernel/audit.c b/kernel/audit.c
96648index 72ab759..757deba 100644
96649--- a/kernel/audit.c
96650+++ b/kernel/audit.c
96651@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
96652 3) suppressed due to audit_rate_limit
96653 4) suppressed due to audit_backlog_limit
96654 */
96655-static atomic_t audit_lost = ATOMIC_INIT(0);
96656+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
96657
96658 /* The netlink socket. */
96659 static struct sock *audit_sock;
96660@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
96661 unsigned long now;
96662 int print;
96663
96664- atomic_inc(&audit_lost);
96665+ atomic_inc_unchecked(&audit_lost);
96666
96667 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
96668
96669@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
96670 if (print) {
96671 if (printk_ratelimit())
96672 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
96673- atomic_read(&audit_lost),
96674+ atomic_read_unchecked(&audit_lost),
96675 audit_rate_limit,
96676 audit_backlog_limit);
96677 audit_panic(message);
96678@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
96679 s.pid = audit_pid;
96680 s.rate_limit = audit_rate_limit;
96681 s.backlog_limit = audit_backlog_limit;
96682- s.lost = atomic_read(&audit_lost);
96683+ s.lost = atomic_read_unchecked(&audit_lost);
96684 s.backlog = skb_queue_len(&audit_skb_queue);
96685 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
96686 s.backlog_wait_time = audit_backlog_wait_time;
96687diff --git a/kernel/auditsc.c b/kernel/auditsc.c
96688index dc4ae70..2a2bddc 100644
96689--- a/kernel/auditsc.c
96690+++ b/kernel/auditsc.c
96691@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
96692 }
96693
96694 /* global counter which is incremented every time something logs in */
96695-static atomic_t session_id = ATOMIC_INIT(0);
96696+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
96697
96698 static int audit_set_loginuid_perm(kuid_t loginuid)
96699 {
96700@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
96701
96702 /* are we setting or clearing? */
96703 if (uid_valid(loginuid))
96704- sessionid = (unsigned int)atomic_inc_return(&session_id);
96705+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
96706
96707 task->sessionid = sessionid;
96708 task->loginuid = loginuid;
96709diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
96710index 0c5796e..a9414e2 100644
96711--- a/kernel/bpf/core.c
96712+++ b/kernel/bpf/core.c
96713@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96714 * random section of illegal instructions.
96715 */
96716 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
96717- hdr = module_alloc(size);
96718+ hdr = module_alloc_exec(size);
96719 if (hdr == NULL)
96720 return NULL;
96721
96722 /* Fill space with illegal/arch-dep instructions. */
96723 bpf_fill_ill_insns(hdr, size);
96724
96725+ pax_open_kernel();
96726 hdr->pages = size / PAGE_SIZE;
96727+ pax_close_kernel();
96728+
96729 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
96730 PAGE_SIZE - sizeof(*hdr));
96731 start = (prandom_u32() % hole) & ~(alignment - 1);
96732@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
96733
96734 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
96735 {
96736- module_memfree(hdr);
96737+ module_memfree_exec(hdr);
96738 }
96739 #endif /* CONFIG_BPF_JIT */
96740
96741diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
96742index 536edc2..d28c85d 100644
96743--- a/kernel/bpf/syscall.c
96744+++ b/kernel/bpf/syscall.c
96745@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
96746 int err;
96747
96748 /* the syscall is limited to root temporarily. This restriction will be
96749- * lifted when security audit is clean. Note that eBPF+tracing must have
96750- * this restriction, since it may pass kernel data to user space
96751+ * lifted by upstream when a half-assed security audit is clean. Note
96752+ * that eBPF+tracing must have this restriction, since it may pass
96753+ * kernel data to user space
96754 */
96755 if (!capable(CAP_SYS_ADMIN))
96756 return -EPERM;
96757+#ifdef CONFIG_GRKERNSEC
96758+ return -EPERM;
96759+#endif
96760
96761 if (!access_ok(VERIFY_READ, uattr, 1))
96762 return -EFAULT;
96763diff --git a/kernel/capability.c b/kernel/capability.c
96764index 989f5bf..d317ca0 100644
96765--- a/kernel/capability.c
96766+++ b/kernel/capability.c
96767@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
96768 * before modification is attempted and the application
96769 * fails.
96770 */
96771+ if (tocopy > ARRAY_SIZE(kdata))
96772+ return -EFAULT;
96773+
96774 if (copy_to_user(dataptr, kdata, tocopy
96775 * sizeof(struct __user_cap_data_struct))) {
96776 return -EFAULT;
96777@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
96778 int ret;
96779
96780 rcu_read_lock();
96781- ret = security_capable(__task_cred(t), ns, cap);
96782+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
96783+ gr_task_is_capable(t, __task_cred(t), cap);
96784 rcu_read_unlock();
96785
96786- return (ret == 0);
96787+ return ret;
96788 }
96789
96790 /**
96791@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
96792 int ret;
96793
96794 rcu_read_lock();
96795- ret = security_capable_noaudit(__task_cred(t), ns, cap);
96796+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
96797 rcu_read_unlock();
96798
96799- return (ret == 0);
96800+ return ret;
96801 }
96802
96803 /**
96804@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
96805 BUG();
96806 }
96807
96808- if (security_capable(current_cred(), ns, cap) == 0) {
96809+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
96810 current->flags |= PF_SUPERPRIV;
96811 return true;
96812 }
96813@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
96814 }
96815 EXPORT_SYMBOL(ns_capable);
96816
96817+bool ns_capable_nolog(struct user_namespace *ns, int cap)
96818+{
96819+ if (unlikely(!cap_valid(cap))) {
96820+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
96821+ BUG();
96822+ }
96823+
96824+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
96825+ current->flags |= PF_SUPERPRIV;
96826+ return true;
96827+ }
96828+ return false;
96829+}
96830+EXPORT_SYMBOL(ns_capable_nolog);
96831+
96832 /**
96833 * file_ns_capable - Determine if the file's opener had a capability in effect
96834 * @file: The file we want to check
96835@@ -427,6 +446,12 @@ bool capable(int cap)
96836 }
96837 EXPORT_SYMBOL(capable);
96838
96839+bool capable_nolog(int cap)
96840+{
96841+ return ns_capable_nolog(&init_user_ns, cap);
96842+}
96843+EXPORT_SYMBOL(capable_nolog);
96844+
96845 /**
96846 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
96847 * @inode: The inode in question
96848@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
96849 kgid_has_mapping(ns, inode->i_gid);
96850 }
96851 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
96852+
96853+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
96854+{
96855+ struct user_namespace *ns = current_user_ns();
96856+
96857+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
96858+ kgid_has_mapping(ns, inode->i_gid);
96859+}
96860+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
96861diff --git a/kernel/cgroup.c b/kernel/cgroup.c
96862index 29a7b2c..a64e30a 100644
96863--- a/kernel/cgroup.c
96864+++ b/kernel/cgroup.c
96865@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
96866 if (!pathbuf || !agentbuf)
96867 goto out;
96868
96869+ if (agentbuf[0] == '\0')
96870+ goto out;
96871+
96872 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
96873 if (!path)
96874 goto out;
96875@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
96876 struct task_struct *task;
96877 int count = 0;
96878
96879- seq_printf(seq, "css_set %p\n", cset);
96880+ seq_printf(seq, "css_set %pK\n", cset);
96881
96882 list_for_each_entry(task, &cset->tasks, cg_list) {
96883 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
96884diff --git a/kernel/compat.c b/kernel/compat.c
96885index 24f0061..762ec00 100644
96886--- a/kernel/compat.c
96887+++ b/kernel/compat.c
96888@@ -13,6 +13,7 @@
96889
96890 #include <linux/linkage.h>
96891 #include <linux/compat.h>
96892+#include <linux/module.h>
96893 #include <linux/errno.h>
96894 #include <linux/time.h>
96895 #include <linux/signal.h>
96896@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
96897 mm_segment_t oldfs;
96898 long ret;
96899
96900- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
96901+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
96902 oldfs = get_fs();
96903 set_fs(KERNEL_DS);
96904 ret = hrtimer_nanosleep_restart(restart);
96905@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
96906 oldfs = get_fs();
96907 set_fs(KERNEL_DS);
96908 ret = hrtimer_nanosleep(&tu,
96909- rmtp ? (struct timespec __user *)&rmt : NULL,
96910+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
96911 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
96912 set_fs(oldfs);
96913
96914@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
96915 mm_segment_t old_fs = get_fs();
96916
96917 set_fs(KERNEL_DS);
96918- ret = sys_sigpending((old_sigset_t __user *) &s);
96919+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
96920 set_fs(old_fs);
96921 if (ret == 0)
96922 ret = put_user(s, set);
96923@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
96924 mm_segment_t old_fs = get_fs();
96925
96926 set_fs(KERNEL_DS);
96927- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
96928+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
96929 set_fs(old_fs);
96930
96931 if (!ret) {
96932@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
96933 set_fs (KERNEL_DS);
96934 ret = sys_wait4(pid,
96935 (stat_addr ?
96936- (unsigned int __user *) &status : NULL),
96937- options, (struct rusage __user *) &r);
96938+ (unsigned int __force_user *) &status : NULL),
96939+ options, (struct rusage __force_user *) &r);
96940 set_fs (old_fs);
96941
96942 if (ret > 0) {
96943@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
96944 memset(&info, 0, sizeof(info));
96945
96946 set_fs(KERNEL_DS);
96947- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
96948- uru ? (struct rusage __user *)&ru : NULL);
96949+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
96950+ uru ? (struct rusage __force_user *)&ru : NULL);
96951 set_fs(old_fs);
96952
96953 if ((ret < 0) || (info.si_signo == 0))
96954@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
96955 oldfs = get_fs();
96956 set_fs(KERNEL_DS);
96957 err = sys_timer_settime(timer_id, flags,
96958- (struct itimerspec __user *) &newts,
96959- (struct itimerspec __user *) &oldts);
96960+ (struct itimerspec __force_user *) &newts,
96961+ (struct itimerspec __force_user *) &oldts);
96962 set_fs(oldfs);
96963 if (!err && old && put_compat_itimerspec(old, &oldts))
96964 return -EFAULT;
96965@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
96966 oldfs = get_fs();
96967 set_fs(KERNEL_DS);
96968 err = sys_timer_gettime(timer_id,
96969- (struct itimerspec __user *) &ts);
96970+ (struct itimerspec __force_user *) &ts);
96971 set_fs(oldfs);
96972 if (!err && put_compat_itimerspec(setting, &ts))
96973 return -EFAULT;
96974@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
96975 oldfs = get_fs();
96976 set_fs(KERNEL_DS);
96977 err = sys_clock_settime(which_clock,
96978- (struct timespec __user *) &ts);
96979+ (struct timespec __force_user *) &ts);
96980 set_fs(oldfs);
96981 return err;
96982 }
96983@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
96984 oldfs = get_fs();
96985 set_fs(KERNEL_DS);
96986 err = sys_clock_gettime(which_clock,
96987- (struct timespec __user *) &ts);
96988+ (struct timespec __force_user *) &ts);
96989 set_fs(oldfs);
96990 if (!err && compat_put_timespec(&ts, tp))
96991 return -EFAULT;
96992@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
96993
96994 oldfs = get_fs();
96995 set_fs(KERNEL_DS);
96996- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
96997+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
96998 set_fs(oldfs);
96999
97000 err = compat_put_timex(utp, &txc);
97001@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
97002 oldfs = get_fs();
97003 set_fs(KERNEL_DS);
97004 err = sys_clock_getres(which_clock,
97005- (struct timespec __user *) &ts);
97006+ (struct timespec __force_user *) &ts);
97007 set_fs(oldfs);
97008 if (!err && tp && compat_put_timespec(&ts, tp))
97009 return -EFAULT;
97010@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
97011 struct timespec tu;
97012 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
97013
97014- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
97015+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
97016 oldfs = get_fs();
97017 set_fs(KERNEL_DS);
97018 err = clock_nanosleep_restart(restart);
97019@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
97020 oldfs = get_fs();
97021 set_fs(KERNEL_DS);
97022 err = sys_clock_nanosleep(which_clock, flags,
97023- (struct timespec __user *) &in,
97024- (struct timespec __user *) &out);
97025+ (struct timespec __force_user *) &in,
97026+ (struct timespec __force_user *) &out);
97027 set_fs(oldfs);
97028
97029 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
97030@@ -912,7 +913,8 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
97031 * bitmap. We must however ensure the end of the
97032 * kernel bitmap is zeroed.
97033 */
97034- if (nr_compat_longs-- > 0) {
97035+ if (nr_compat_longs) {
97036+ nr_compat_longs--;
97037 if (__get_user(um, umask))
97038 return -EFAULT;
97039 } else {
97040@@ -954,7 +956,8 @@ long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
97041 * We dont want to write past the end of the userspace
97042 * bitmap.
97043 */
97044- if (nr_compat_longs-- > 0) {
97045+ if (nr_compat_longs) {
97046+ nr_compat_longs--;
97047 if (__put_user(um, umask))
97048 return -EFAULT;
97049 }
97050@@ -1145,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
97051 mm_segment_t old_fs = get_fs();
97052
97053 set_fs(KERNEL_DS);
97054- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
97055+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
97056 set_fs(old_fs);
97057 if (compat_put_timespec(&t, interval))
97058 return -EFAULT;
97059diff --git a/kernel/configs.c b/kernel/configs.c
97060index c18b1f1..b9a0132 100644
97061--- a/kernel/configs.c
97062+++ b/kernel/configs.c
97063@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
97064 struct proc_dir_entry *entry;
97065
97066 /* create the current config file */
97067+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
97068+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
97069+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
97070+ &ikconfig_file_ops);
97071+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
97072+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
97073+ &ikconfig_file_ops);
97074+#endif
97075+#else
97076 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
97077 &ikconfig_file_ops);
97078+#endif
97079+
97080 if (!entry)
97081 return -ENOMEM;
97082
97083diff --git a/kernel/cred.c b/kernel/cred.c
97084index e0573a4..26c0fd3 100644
97085--- a/kernel/cred.c
97086+++ b/kernel/cred.c
97087@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
97088 validate_creds(cred);
97089 alter_cred_subscribers(cred, -1);
97090 put_cred(cred);
97091+
97092+#ifdef CONFIG_GRKERNSEC_SETXID
97093+ cred = (struct cred *) tsk->delayed_cred;
97094+ if (cred != NULL) {
97095+ tsk->delayed_cred = NULL;
97096+ validate_creds(cred);
97097+ alter_cred_subscribers(cred, -1);
97098+ put_cred(cred);
97099+ }
97100+#endif
97101 }
97102
97103 /**
97104@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
97105 * Always returns 0 thus allowing this function to be tail-called at the end
97106 * of, say, sys_setgid().
97107 */
97108-int commit_creds(struct cred *new)
97109+static int __commit_creds(struct cred *new)
97110 {
97111 struct task_struct *task = current;
97112 const struct cred *old = task->real_cred;
97113@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
97114
97115 get_cred(new); /* we will require a ref for the subj creds too */
97116
97117+ gr_set_role_label(task, new->uid, new->gid);
97118+
97119 /* dumpability changes */
97120 if (!uid_eq(old->euid, new->euid) ||
97121 !gid_eq(old->egid, new->egid) ||
97122@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
97123 put_cred(old);
97124 return 0;
97125 }
97126+#ifdef CONFIG_GRKERNSEC_SETXID
97127+extern int set_user(struct cred *new);
97128+
97129+void gr_delayed_cred_worker(void)
97130+{
97131+ const struct cred *new = current->delayed_cred;
97132+ struct cred *ncred;
97133+
97134+ current->delayed_cred = NULL;
97135+
97136+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
97137+ // from doing get_cred on it when queueing this
97138+ put_cred(new);
97139+ return;
97140+ } else if (new == NULL)
97141+ return;
97142+
97143+ ncred = prepare_creds();
97144+ if (!ncred)
97145+ goto die;
97146+ // uids
97147+ ncred->uid = new->uid;
97148+ ncred->euid = new->euid;
97149+ ncred->suid = new->suid;
97150+ ncred->fsuid = new->fsuid;
97151+ // gids
97152+ ncred->gid = new->gid;
97153+ ncred->egid = new->egid;
97154+ ncred->sgid = new->sgid;
97155+ ncred->fsgid = new->fsgid;
97156+ // groups
97157+ set_groups(ncred, new->group_info);
97158+ // caps
97159+ ncred->securebits = new->securebits;
97160+ ncred->cap_inheritable = new->cap_inheritable;
97161+ ncred->cap_permitted = new->cap_permitted;
97162+ ncred->cap_effective = new->cap_effective;
97163+ ncred->cap_bset = new->cap_bset;
97164+
97165+ if (set_user(ncred)) {
97166+ abort_creds(ncred);
97167+ goto die;
97168+ }
97169+
97170+ // from doing get_cred on it when queueing this
97171+ put_cred(new);
97172+
97173+ __commit_creds(ncred);
97174+ return;
97175+die:
97176+ // from doing get_cred on it when queueing this
97177+ put_cred(new);
97178+ do_group_exit(SIGKILL);
97179+}
97180+#endif
97181+
97182+int commit_creds(struct cred *new)
97183+{
97184+#ifdef CONFIG_GRKERNSEC_SETXID
97185+ int ret;
97186+ int schedule_it = 0;
97187+ struct task_struct *t;
97188+ unsigned oldsecurebits = current_cred()->securebits;
97189+
97190+ /* we won't get called with tasklist_lock held for writing
97191+ and interrupts disabled as the cred struct in that case is
97192+ init_cred
97193+ */
97194+ if (grsec_enable_setxid && !current_is_single_threaded() &&
97195+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
97196+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
97197+ schedule_it = 1;
97198+ }
97199+ ret = __commit_creds(new);
97200+ if (schedule_it) {
97201+ rcu_read_lock();
97202+ read_lock(&tasklist_lock);
97203+ for (t = next_thread(current); t != current;
97204+ t = next_thread(t)) {
97205+ /* we'll check if the thread has uid 0 in
97206+ * the delayed worker routine
97207+ */
97208+ if (task_securebits(t) == oldsecurebits &&
97209+ t->delayed_cred == NULL) {
97210+ t->delayed_cred = get_cred(new);
97211+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
97212+ set_tsk_need_resched(t);
97213+ }
97214+ }
97215+ read_unlock(&tasklist_lock);
97216+ rcu_read_unlock();
97217+ }
97218+
97219+ return ret;
97220+#else
97221+ return __commit_creds(new);
97222+#endif
97223+}
97224+
97225 EXPORT_SYMBOL(commit_creds);
97226
97227 /**
97228diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
97229index 0874e2e..5b32cc9 100644
97230--- a/kernel/debug/debug_core.c
97231+++ b/kernel/debug/debug_core.c
97232@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
97233 */
97234 static atomic_t masters_in_kgdb;
97235 static atomic_t slaves_in_kgdb;
97236-static atomic_t kgdb_break_tasklet_var;
97237+static atomic_unchecked_t kgdb_break_tasklet_var;
97238 atomic_t kgdb_setting_breakpoint;
97239
97240 struct task_struct *kgdb_usethread;
97241@@ -137,7 +137,7 @@ int kgdb_single_step;
97242 static pid_t kgdb_sstep_pid;
97243
97244 /* to keep track of the CPU which is doing the single stepping*/
97245-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97246+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
97247
97248 /*
97249 * If you are debugging a problem where roundup (the collection of
97250@@ -552,7 +552,7 @@ return_normal:
97251 * kernel will only try for the value of sstep_tries before
97252 * giving up and continuing on.
97253 */
97254- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
97255+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
97256 (kgdb_info[cpu].task &&
97257 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
97258 atomic_set(&kgdb_active, -1);
97259@@ -654,8 +654,8 @@ cpu_master_loop:
97260 }
97261
97262 kgdb_restore:
97263- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
97264- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
97265+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
97266+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
97267 if (kgdb_info[sstep_cpu].task)
97268 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
97269 else
97270@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
97271 static void kgdb_tasklet_bpt(unsigned long ing)
97272 {
97273 kgdb_breakpoint();
97274- atomic_set(&kgdb_break_tasklet_var, 0);
97275+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
97276 }
97277
97278 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
97279
97280 void kgdb_schedule_breakpoint(void)
97281 {
97282- if (atomic_read(&kgdb_break_tasklet_var) ||
97283+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
97284 atomic_read(&kgdb_active) != -1 ||
97285 atomic_read(&kgdb_setting_breakpoint))
97286 return;
97287- atomic_inc(&kgdb_break_tasklet_var);
97288+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
97289 tasklet_schedule(&kgdb_tasklet_breakpoint);
97290 }
97291 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
97292diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
97293index 41213454..861e178 100644
97294--- a/kernel/debug/kdb/kdb_main.c
97295+++ b/kernel/debug/kdb/kdb_main.c
97296@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
97297 continue;
97298
97299 kdb_printf("%-20s%8u 0x%p ", mod->name,
97300- mod->core_size, (void *)mod);
97301+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
97302 #ifdef CONFIG_MODULE_UNLOAD
97303 kdb_printf("%4d ", module_refcount(mod));
97304 #endif
97305@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
97306 kdb_printf(" (Loading)");
97307 else
97308 kdb_printf(" (Live)");
97309- kdb_printf(" 0x%p", mod->module_core);
97310+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
97311
97312 #ifdef CONFIG_MODULE_UNLOAD
97313 {
97314diff --git a/kernel/events/core.c b/kernel/events/core.c
97315index 2fabc06..79cceec 100644
97316--- a/kernel/events/core.c
97317+++ b/kernel/events/core.c
97318@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
97319 * 0 - disallow raw tracepoint access for unpriv
97320 * 1 - disallow cpu events for unpriv
97321 * 2 - disallow kernel profiling for unpriv
97322+ * 3 - disallow all unpriv perf event use
97323 */
97324-int sysctl_perf_event_paranoid __read_mostly = 1;
97325+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97326+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
97327+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
97328+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
97329+#else
97330+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
97331+#endif
97332
97333 /* Minimum for 512 kiB + 1 user control page */
97334 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
97335@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
97336
97337 tmp *= sysctl_perf_cpu_time_max_percent;
97338 do_div(tmp, 100);
97339- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
97340+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
97341 }
97342
97343 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
97344@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
97345 }
97346 }
97347
97348-static atomic64_t perf_event_id;
97349+static atomic64_unchecked_t perf_event_id;
97350
97351 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
97352 enum event_type_t event_type);
97353@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
97354
97355 static inline u64 perf_event_count(struct perf_event *event)
97356 {
97357- return local64_read(&event->count) + atomic64_read(&event->child_count);
97358+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
97359 }
97360
97361 static u64 perf_event_read(struct perf_event *event)
97362@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
97363 mutex_lock(&event->child_mutex);
97364 total += perf_event_read(event);
97365 *enabled += event->total_time_enabled +
97366- atomic64_read(&event->child_total_time_enabled);
97367+ atomic64_read_unchecked(&event->child_total_time_enabled);
97368 *running += event->total_time_running +
97369- atomic64_read(&event->child_total_time_running);
97370+ atomic64_read_unchecked(&event->child_total_time_running);
97371
97372 list_for_each_entry(child, &event->child_list, child_list) {
97373 total += perf_event_read(child);
97374@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
97375 userpg->offset -= local64_read(&event->hw.prev_count);
97376
97377 userpg->time_enabled = enabled +
97378- atomic64_read(&event->child_total_time_enabled);
97379+ atomic64_read_unchecked(&event->child_total_time_enabled);
97380
97381 userpg->time_running = running +
97382- atomic64_read(&event->child_total_time_running);
97383+ atomic64_read_unchecked(&event->child_total_time_running);
97384
97385 arch_perf_update_userpage(event, userpg, now);
97386
97387@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
97388
97389 /* Data. */
97390 sp = perf_user_stack_pointer(regs);
97391- rem = __output_copy_user(handle, (void *) sp, dump_size);
97392+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
97393 dyn_size = dump_size - rem;
97394
97395 perf_output_skip(handle, rem);
97396@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
97397 values[n++] = perf_event_count(event);
97398 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
97399 values[n++] = enabled +
97400- atomic64_read(&event->child_total_time_enabled);
97401+ atomic64_read_unchecked(&event->child_total_time_enabled);
97402 }
97403 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
97404 values[n++] = running +
97405- atomic64_read(&event->child_total_time_running);
97406+ atomic64_read_unchecked(&event->child_total_time_running);
97407 }
97408 if (read_format & PERF_FORMAT_ID)
97409 values[n++] = primary_event_id(event);
97410@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
97411 event->parent = parent_event;
97412
97413 event->ns = get_pid_ns(task_active_pid_ns(current));
97414- event->id = atomic64_inc_return(&perf_event_id);
97415+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
97416
97417 event->state = PERF_EVENT_STATE_INACTIVE;
97418
97419@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
97420 if (flags & ~PERF_FLAG_ALL)
97421 return -EINVAL;
97422
97423+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
97424+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
97425+ return -EACCES;
97426+#endif
97427+
97428 err = perf_copy_attr(attr_uptr, &attr);
97429 if (err)
97430 return err;
97431@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
97432 /*
97433 * Add back the child's count to the parent's count:
97434 */
97435- atomic64_add(child_val, &parent_event->child_count);
97436- atomic64_add(child_event->total_time_enabled,
97437+ atomic64_add_unchecked(child_val, &parent_event->child_count);
97438+ atomic64_add_unchecked(child_event->total_time_enabled,
97439 &parent_event->child_total_time_enabled);
97440- atomic64_add(child_event->total_time_running,
97441+ atomic64_add_unchecked(child_event->total_time_running,
97442 &parent_event->child_total_time_running);
97443
97444 /*
97445diff --git a/kernel/events/internal.h b/kernel/events/internal.h
97446index 569b2187..19940d9 100644
97447--- a/kernel/events/internal.h
97448+++ b/kernel/events/internal.h
97449@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
97450 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
97451 }
97452
97453-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
97454+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
97455 static inline unsigned long \
97456 func_name(struct perf_output_handle *handle, \
97457- const void *buf, unsigned long len) \
97458+ const void user *buf, unsigned long len) \
97459 { \
97460 unsigned long size, written; \
97461 \
97462@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
97463 return 0;
97464 }
97465
97466-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
97467+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
97468
97469 static inline unsigned long
97470 memcpy_skip(void *dst, const void *src, unsigned long n)
97471@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
97472 return 0;
97473 }
97474
97475-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
97476+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
97477
97478 #ifndef arch_perf_out_copy_user
97479 #define arch_perf_out_copy_user arch_perf_out_copy_user
97480@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
97481 }
97482 #endif
97483
97484-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
97485+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
97486
97487 /* Callchain handling */
97488 extern struct perf_callchain_entry *
97489diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
97490index cb346f2..e4dc317 100644
97491--- a/kernel/events/uprobes.c
97492+++ b/kernel/events/uprobes.c
97493@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
97494 {
97495 struct page *page;
97496 uprobe_opcode_t opcode;
97497- int result;
97498+ long result;
97499
97500 pagefault_disable();
97501 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
97502diff --git a/kernel/exit.c b/kernel/exit.c
97503index feff10b..f623dd5 100644
97504--- a/kernel/exit.c
97505+++ b/kernel/exit.c
97506@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
97507 struct task_struct *leader;
97508 int zap_leader;
97509 repeat:
97510+#ifdef CONFIG_NET
97511+ gr_del_task_from_ip_table(p);
97512+#endif
97513+
97514 /* don't need to get the RCU readlock here - the process is dead and
97515 * can't be modifying its own credentials. But shut RCU-lockdep up */
97516 rcu_read_lock();
97517@@ -656,6 +660,8 @@ void do_exit(long code)
97518 int group_dead;
97519 TASKS_RCU(int tasks_rcu_i);
97520
97521+ set_fs(USER_DS);
97522+
97523 profile_task_exit(tsk);
97524
97525 WARN_ON(blk_needs_flush_plug(tsk));
97526@@ -672,7 +678,6 @@ void do_exit(long code)
97527 * mm_release()->clear_child_tid() from writing to a user-controlled
97528 * kernel address.
97529 */
97530- set_fs(USER_DS);
97531
97532 ptrace_event(PTRACE_EVENT_EXIT, code);
97533
97534@@ -730,6 +735,9 @@ void do_exit(long code)
97535 tsk->exit_code = code;
97536 taskstats_exit(tsk, group_dead);
97537
97538+ gr_acl_handle_psacct(tsk, code);
97539+ gr_acl_handle_exit();
97540+
97541 exit_mm(tsk);
97542
97543 if (group_dead)
97544@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
97545 * Take down every thread in the group. This is called by fatal signals
97546 * as well as by sys_exit_group (below).
97547 */
97548-void
97549+__noreturn void
97550 do_group_exit(int exit_code)
97551 {
97552 struct signal_struct *sig = current->signal;
97553diff --git a/kernel/fork.c b/kernel/fork.c
97554index cf65139..704476e 100644
97555--- a/kernel/fork.c
97556+++ b/kernel/fork.c
97557@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
97558 void thread_info_cache_init(void)
97559 {
97560 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
97561- THREAD_SIZE, 0, NULL);
97562+ THREAD_SIZE, SLAB_USERCOPY, NULL);
97563 BUG_ON(thread_info_cache == NULL);
97564 }
97565 # endif
97566 #endif
97567
97568+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97569+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97570+ int node, void **lowmem_stack)
97571+{
97572+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
97573+ void *ret = NULL;
97574+ unsigned int i;
97575+
97576+ *lowmem_stack = alloc_thread_info_node(tsk, node);
97577+ if (*lowmem_stack == NULL)
97578+ goto out;
97579+
97580+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
97581+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
97582+
97583+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
97584+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
97585+ if (ret == NULL) {
97586+ free_thread_info(*lowmem_stack);
97587+ *lowmem_stack = NULL;
97588+ }
97589+
97590+out:
97591+ return ret;
97592+}
97593+
97594+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97595+{
97596+ unmap_process_stacks(tsk);
97597+}
97598+#else
97599+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
97600+ int node, void **lowmem_stack)
97601+{
97602+ return alloc_thread_info_node(tsk, node);
97603+}
97604+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
97605+{
97606+ free_thread_info(ti);
97607+}
97608+#endif
97609+
97610 /* SLAB cache for signal_struct structures (tsk->signal) */
97611 static struct kmem_cache *signal_cachep;
97612
97613@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
97614 /* SLAB cache for mm_struct structures (tsk->mm) */
97615 static struct kmem_cache *mm_cachep;
97616
97617-static void account_kernel_stack(struct thread_info *ti, int account)
97618+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
97619 {
97620+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97621+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
97622+#else
97623 struct zone *zone = page_zone(virt_to_page(ti));
97624+#endif
97625
97626 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
97627 }
97628
97629 void free_task(struct task_struct *tsk)
97630 {
97631- account_kernel_stack(tsk->stack, -1);
97632+ account_kernel_stack(tsk, tsk->stack, -1);
97633 arch_release_thread_info(tsk->stack);
97634- free_thread_info(tsk->stack);
97635+ gr_free_thread_info(tsk, tsk->stack);
97636 rt_mutex_debug_task_free(tsk);
97637 ftrace_graph_exit_task(tsk);
97638 put_seccomp_filter(tsk);
97639@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97640 {
97641 struct task_struct *tsk;
97642 struct thread_info *ti;
97643+ void *lowmem_stack;
97644 int node = tsk_fork_get_node(orig);
97645 int err;
97646
97647@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97648 if (!tsk)
97649 return NULL;
97650
97651- ti = alloc_thread_info_node(tsk, node);
97652+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
97653 if (!ti)
97654 goto free_tsk;
97655
97656@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97657 goto free_ti;
97658
97659 tsk->stack = ti;
97660+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
97661+ tsk->lowmem_stack = lowmem_stack;
97662+#endif
97663 #ifdef CONFIG_SECCOMP
97664 /*
97665 * We must handle setting up seccomp filters once we're under
97666@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97667 set_task_stack_end_magic(tsk);
97668
97669 #ifdef CONFIG_CC_STACKPROTECTOR
97670- tsk->stack_canary = get_random_int();
97671+ tsk->stack_canary = pax_get_random_long();
97672 #endif
97673
97674 /*
97675@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
97676 tsk->splice_pipe = NULL;
97677 tsk->task_frag.page = NULL;
97678
97679- account_kernel_stack(ti, 1);
97680+ account_kernel_stack(tsk, ti, 1);
97681
97682 return tsk;
97683
97684 free_ti:
97685- free_thread_info(ti);
97686+ gr_free_thread_info(tsk, ti);
97687 free_tsk:
97688 free_task_struct(tsk);
97689 return NULL;
97690 }
97691
97692 #ifdef CONFIG_MMU
97693-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97694+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
97695+{
97696+ struct vm_area_struct *tmp;
97697+ unsigned long charge;
97698+ struct file *file;
97699+ int retval;
97700+
97701+ charge = 0;
97702+ if (mpnt->vm_flags & VM_ACCOUNT) {
97703+ unsigned long len = vma_pages(mpnt);
97704+
97705+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97706+ goto fail_nomem;
97707+ charge = len;
97708+ }
97709+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97710+ if (!tmp)
97711+ goto fail_nomem;
97712+ *tmp = *mpnt;
97713+ tmp->vm_mm = mm;
97714+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
97715+ retval = vma_dup_policy(mpnt, tmp);
97716+ if (retval)
97717+ goto fail_nomem_policy;
97718+ if (anon_vma_fork(tmp, mpnt))
97719+ goto fail_nomem_anon_vma_fork;
97720+ tmp->vm_flags &= ~VM_LOCKED;
97721+ tmp->vm_next = tmp->vm_prev = NULL;
97722+ tmp->vm_mirror = NULL;
97723+ file = tmp->vm_file;
97724+ if (file) {
97725+ struct inode *inode = file_inode(file);
97726+ struct address_space *mapping = file->f_mapping;
97727+
97728+ get_file(file);
97729+ if (tmp->vm_flags & VM_DENYWRITE)
97730+ atomic_dec(&inode->i_writecount);
97731+ i_mmap_lock_write(mapping);
97732+ if (tmp->vm_flags & VM_SHARED)
97733+ atomic_inc(&mapping->i_mmap_writable);
97734+ flush_dcache_mmap_lock(mapping);
97735+ /* insert tmp into the share list, just after mpnt */
97736+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
97737+ flush_dcache_mmap_unlock(mapping);
97738+ i_mmap_unlock_write(mapping);
97739+ }
97740+
97741+ /*
97742+ * Clear hugetlb-related page reserves for children. This only
97743+ * affects MAP_PRIVATE mappings. Faults generated by the child
97744+ * are not guaranteed to succeed, even if read-only
97745+ */
97746+ if (is_vm_hugetlb_page(tmp))
97747+ reset_vma_resv_huge_pages(tmp);
97748+
97749+ return tmp;
97750+
97751+fail_nomem_anon_vma_fork:
97752+ mpol_put(vma_policy(tmp));
97753+fail_nomem_policy:
97754+ kmem_cache_free(vm_area_cachep, tmp);
97755+fail_nomem:
97756+ vm_unacct_memory(charge);
97757+ return NULL;
97758+}
97759+
97760+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97761 {
97762 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
97763 struct rb_node **rb_link, *rb_parent;
97764 int retval;
97765- unsigned long charge;
97766
97767 uprobe_start_dup_mmap();
97768 down_write(&oldmm->mmap_sem);
97769@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97770
97771 prev = NULL;
97772 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
97773- struct file *file;
97774-
97775 if (mpnt->vm_flags & VM_DONTCOPY) {
97776 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
97777 -vma_pages(mpnt));
97778 continue;
97779 }
97780- charge = 0;
97781- if (mpnt->vm_flags & VM_ACCOUNT) {
97782- unsigned long len = vma_pages(mpnt);
97783-
97784- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
97785- goto fail_nomem;
97786- charge = len;
97787- }
97788- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97789- if (!tmp)
97790- goto fail_nomem;
97791- *tmp = *mpnt;
97792- INIT_LIST_HEAD(&tmp->anon_vma_chain);
97793- retval = vma_dup_policy(mpnt, tmp);
97794- if (retval)
97795- goto fail_nomem_policy;
97796- tmp->vm_mm = mm;
97797- if (anon_vma_fork(tmp, mpnt))
97798- goto fail_nomem_anon_vma_fork;
97799- tmp->vm_flags &= ~VM_LOCKED;
97800- tmp->vm_next = tmp->vm_prev = NULL;
97801- file = tmp->vm_file;
97802- if (file) {
97803- struct inode *inode = file_inode(file);
97804- struct address_space *mapping = file->f_mapping;
97805-
97806- get_file(file);
97807- if (tmp->vm_flags & VM_DENYWRITE)
97808- atomic_dec(&inode->i_writecount);
97809- i_mmap_lock_write(mapping);
97810- if (tmp->vm_flags & VM_SHARED)
97811- atomic_inc(&mapping->i_mmap_writable);
97812- flush_dcache_mmap_lock(mapping);
97813- /* insert tmp into the share list, just after mpnt */
97814- vma_interval_tree_insert_after(tmp, mpnt,
97815- &mapping->i_mmap);
97816- flush_dcache_mmap_unlock(mapping);
97817- i_mmap_unlock_write(mapping);
97818+ tmp = dup_vma(mm, oldmm, mpnt);
97819+ if (!tmp) {
97820+ retval = -ENOMEM;
97821+ goto out;
97822 }
97823
97824 /*
97825@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
97826 if (retval)
97827 goto out;
97828 }
97829+
97830+#ifdef CONFIG_PAX_SEGMEXEC
97831+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
97832+ struct vm_area_struct *mpnt_m;
97833+
97834+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
97835+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
97836+
97837+ if (!mpnt->vm_mirror)
97838+ continue;
97839+
97840+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
97841+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
97842+ mpnt->vm_mirror = mpnt_m;
97843+ } else {
97844+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
97845+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
97846+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
97847+ mpnt->vm_mirror->vm_mirror = mpnt;
97848+ }
97849+ }
97850+ BUG_ON(mpnt_m);
97851+ }
97852+#endif
97853+
97854 /* a new mm has just been created */
97855 arch_dup_mmap(oldmm, mm);
97856 retval = 0;
97857@@ -482,14 +586,6 @@ out:
97858 up_write(&oldmm->mmap_sem);
97859 uprobe_end_dup_mmap();
97860 return retval;
97861-fail_nomem_anon_vma_fork:
97862- mpol_put(vma_policy(tmp));
97863-fail_nomem_policy:
97864- kmem_cache_free(vm_area_cachep, tmp);
97865-fail_nomem:
97866- retval = -ENOMEM;
97867- vm_unacct_memory(charge);
97868- goto out;
97869 }
97870
97871 static inline int mm_alloc_pgd(struct mm_struct *mm)
97872@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
97873 return ERR_PTR(err);
97874
97875 mm = get_task_mm(task);
97876- if (mm && mm != current->mm &&
97877- !ptrace_may_access(task, mode)) {
97878+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
97879+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
97880 mmput(mm);
97881 mm = ERR_PTR(-EACCES);
97882 }
97883@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
97884 spin_unlock(&fs->lock);
97885 return -EAGAIN;
97886 }
97887- fs->users++;
97888+ atomic_inc(&fs->users);
97889 spin_unlock(&fs->lock);
97890 return 0;
97891 }
97892 tsk->fs = copy_fs_struct(fs);
97893 if (!tsk->fs)
97894 return -ENOMEM;
97895+ /* Carry through gr_chroot_dentry and is_chrooted instead
97896+ of recomputing it here. Already copied when the task struct
97897+ is duplicated. This allows pivot_root to not be treated as
97898+ a chroot
97899+ */
97900+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
97901+
97902 return 0;
97903 }
97904
97905@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
97906 * parts of the process environment (as per the clone
97907 * flags). The actual kick-off is left to the caller.
97908 */
97909-static struct task_struct *copy_process(unsigned long clone_flags,
97910+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
97911 unsigned long stack_start,
97912 unsigned long stack_size,
97913 int __user *child_tidptr,
97914@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97915 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
97916 #endif
97917 retval = -EAGAIN;
97918+
97919+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
97920+
97921 if (atomic_read(&p->real_cred->user->processes) >=
97922 task_rlimit(p, RLIMIT_NPROC)) {
97923 if (p->real_cred->user != INIT_USER &&
97924@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
97925 goto bad_fork_free_pid;
97926 }
97927
97928+ /* synchronizes with gr_set_acls()
97929+ we need to call this past the point of no return for fork()
97930+ */
97931+ gr_copy_label(p);
97932+
97933 if (likely(p->pid)) {
97934 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
97935
97936@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
97937 bad_fork_free:
97938 free_task(p);
97939 fork_out:
97940+ gr_log_forkfail(retval);
97941+
97942 return ERR_PTR(retval);
97943 }
97944
97945@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
97946
97947 p = copy_process(clone_flags, stack_start, stack_size,
97948 child_tidptr, NULL, trace);
97949+ add_latent_entropy();
97950 /*
97951 * Do this prior waking up the new thread - the thread pointer
97952 * might get invalid after that point, if the thread exits quickly.
97953@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
97954 if (clone_flags & CLONE_PARENT_SETTID)
97955 put_user(nr, parent_tidptr);
97956
97957+ gr_handle_brute_check();
97958+
97959 if (clone_flags & CLONE_VFORK) {
97960 p->vfork_done = &vfork;
97961 init_completion(&vfork);
97962@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
97963 mm_cachep = kmem_cache_create("mm_struct",
97964 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
97965 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
97966- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
97967+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
97968 mmap_init();
97969 nsproxy_cache_init();
97970 }
97971@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
97972 return 0;
97973
97974 /* don't need lock here; in the worst case we'll do useless copy */
97975- if (fs->users == 1)
97976+ if (atomic_read(&fs->users) == 1)
97977 return 0;
97978
97979 *new_fsp = copy_fs_struct(fs);
97980@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
97981 fs = current->fs;
97982 spin_lock(&fs->lock);
97983 current->fs = new_fs;
97984- if (--fs->users)
97985+ gr_set_chroot_entries(current, &current->fs->root);
97986+ if (atomic_dec_return(&fs->users))
97987 new_fs = NULL;
97988 else
97989 new_fs = fs;
97990diff --git a/kernel/futex.c b/kernel/futex.c
97991index 2a5e383..878bac6 100644
97992--- a/kernel/futex.c
97993+++ b/kernel/futex.c
97994@@ -201,7 +201,7 @@ struct futex_pi_state {
97995 atomic_t refcount;
97996
97997 union futex_key key;
97998-};
97999+} __randomize_layout;
98000
98001 /**
98002 * struct futex_q - The hashed futex queue entry, one per waiting task
98003@@ -235,7 +235,7 @@ struct futex_q {
98004 struct rt_mutex_waiter *rt_waiter;
98005 union futex_key *requeue_pi_key;
98006 u32 bitset;
98007-};
98008+} __randomize_layout;
98009
98010 static const struct futex_q futex_q_init = {
98011 /* list gets initialized in queue_me()*/
98012@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
98013 struct page *page, *page_head;
98014 int err, ro = 0;
98015
98016+#ifdef CONFIG_PAX_SEGMEXEC
98017+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
98018+ return -EFAULT;
98019+#endif
98020+
98021 /*
98022 * The futex address must be "naturally" aligned.
98023 */
98024@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
98025
98026 static int get_futex_value_locked(u32 *dest, u32 __user *from)
98027 {
98028- int ret;
98029+ unsigned long ret;
98030
98031 pagefault_disable();
98032 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
98033@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
98034 {
98035 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
98036 u32 curval;
98037+ mm_segment_t oldfs;
98038
98039 /*
98040 * This will fail and we want it. Some arch implementations do
98041@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
98042 * implementation, the non-functional ones will return
98043 * -ENOSYS.
98044 */
98045+ oldfs = get_fs();
98046+ set_fs(USER_DS);
98047 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
98048 futex_cmpxchg_enabled = 1;
98049+ set_fs(oldfs);
98050 #endif
98051 }
98052
98053diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
98054index 55c8c93..9ba7ad6 100644
98055--- a/kernel/futex_compat.c
98056+++ b/kernel/futex_compat.c
98057@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
98058 return 0;
98059 }
98060
98061-static void __user *futex_uaddr(struct robust_list __user *entry,
98062+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
98063 compat_long_t futex_offset)
98064 {
98065 compat_uptr_t base = ptr_to_compat(entry);
98066diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
98067index b358a80..fc25240 100644
98068--- a/kernel/gcov/base.c
98069+++ b/kernel/gcov/base.c
98070@@ -114,11 +114,6 @@ void gcov_enable_events(void)
98071 }
98072
98073 #ifdef CONFIG_MODULES
98074-static inline int within(void *addr, void *start, unsigned long size)
98075-{
98076- return ((addr >= start) && (addr < start + size));
98077-}
98078-
98079 /* Update list and generate events when modules are unloaded. */
98080 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98081 void *data)
98082@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
98083
98084 /* Remove entries located in module from linked list. */
98085 while ((info = gcov_info_next(info))) {
98086- if (within(info, mod->module_core, mod->core_size)) {
98087+ if (within_module_core_rw((unsigned long)info, mod)) {
98088 gcov_info_unlink(prev, info);
98089 if (gcov_events_enabled)
98090 gcov_event(GCOV_REMOVE, info);
98091diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
98092index 886d09e..c7ff4e5 100644
98093--- a/kernel/irq/manage.c
98094+++ b/kernel/irq/manage.c
98095@@ -874,7 +874,7 @@ static int irq_thread(void *data)
98096
98097 action_ret = handler_fn(desc, action);
98098 if (action_ret == IRQ_HANDLED)
98099- atomic_inc(&desc->threads_handled);
98100+ atomic_inc_unchecked(&desc->threads_handled);
98101
98102 wake_threads_waitq(desc);
98103 }
98104diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
98105index e2514b0..de3dfe0 100644
98106--- a/kernel/irq/spurious.c
98107+++ b/kernel/irq/spurious.c
98108@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
98109 * count. We just care about the count being
98110 * different than the one we saw before.
98111 */
98112- handled = atomic_read(&desc->threads_handled);
98113+ handled = atomic_read_unchecked(&desc->threads_handled);
98114 handled |= SPURIOUS_DEFERRED;
98115 if (handled != desc->threads_handled_last) {
98116 action_ret = IRQ_HANDLED;
98117diff --git a/kernel/jump_label.c b/kernel/jump_label.c
98118index 9019f15..9a3c42e 100644
98119--- a/kernel/jump_label.c
98120+++ b/kernel/jump_label.c
98121@@ -14,6 +14,7 @@
98122 #include <linux/err.h>
98123 #include <linux/static_key.h>
98124 #include <linux/jump_label_ratelimit.h>
98125+#include <linux/mm.h>
98126
98127 #ifdef HAVE_JUMP_LABEL
98128
98129@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
98130
98131 size = (((unsigned long)stop - (unsigned long)start)
98132 / sizeof(struct jump_entry));
98133+ pax_open_kernel();
98134 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
98135+ pax_close_kernel();
98136 }
98137
98138 static void jump_label_update(struct static_key *key, int enable);
98139@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
98140 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
98141 struct jump_entry *iter;
98142
98143+ pax_open_kernel();
98144 for (iter = iter_start; iter < iter_stop; iter++) {
98145 if (within_module_init(iter->code, mod))
98146 iter->code = 0;
98147 }
98148+ pax_close_kernel();
98149 }
98150
98151 static int
98152diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
98153index 5c5987f..bc502b0 100644
98154--- a/kernel/kallsyms.c
98155+++ b/kernel/kallsyms.c
98156@@ -11,6 +11,9 @@
98157 * Changed the compression method from stem compression to "table lookup"
98158 * compression (see scripts/kallsyms.c for a more complete description)
98159 */
98160+#ifdef CONFIG_GRKERNSEC_HIDESYM
98161+#define __INCLUDED_BY_HIDESYM 1
98162+#endif
98163 #include <linux/kallsyms.h>
98164 #include <linux/module.h>
98165 #include <linux/init.h>
98166@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
98167
98168 static inline int is_kernel_inittext(unsigned long addr)
98169 {
98170+ if (system_state != SYSTEM_BOOTING)
98171+ return 0;
98172+
98173 if (addr >= (unsigned long)_sinittext
98174 && addr <= (unsigned long)_einittext)
98175 return 1;
98176 return 0;
98177 }
98178
98179+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98180+#ifdef CONFIG_MODULES
98181+static inline int is_module_text(unsigned long addr)
98182+{
98183+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
98184+ return 1;
98185+
98186+ addr = ktla_ktva(addr);
98187+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
98188+}
98189+#else
98190+static inline int is_module_text(unsigned long addr)
98191+{
98192+ return 0;
98193+}
98194+#endif
98195+#endif
98196+
98197 static inline int is_kernel_text(unsigned long addr)
98198 {
98199 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
98200@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
98201
98202 static inline int is_kernel(unsigned long addr)
98203 {
98204+
98205+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98206+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
98207+ return 1;
98208+
98209+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
98210+#else
98211 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
98212+#endif
98213+
98214 return 1;
98215 return in_gate_area_no_mm(addr);
98216 }
98217
98218 static int is_ksym_addr(unsigned long addr)
98219 {
98220+
98221+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
98222+ if (is_module_text(addr))
98223+ return 0;
98224+#endif
98225+
98226 if (all_var)
98227 return is_kernel(addr);
98228
98229@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
98230
98231 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
98232 {
98233- iter->name[0] = '\0';
98234 iter->nameoff = get_symbol_offset(new_pos);
98235 iter->pos = new_pos;
98236 }
98237@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
98238 {
98239 struct kallsym_iter *iter = m->private;
98240
98241+#ifdef CONFIG_GRKERNSEC_HIDESYM
98242+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
98243+ return 0;
98244+#endif
98245+
98246 /* Some debugging symbols have no name. Ignore them. */
98247 if (!iter->name[0])
98248 return 0;
98249@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
98250 */
98251 type = iter->exported ? toupper(iter->type) :
98252 tolower(iter->type);
98253+
98254 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
98255 type, iter->name, iter->module_name);
98256 } else
98257diff --git a/kernel/kcmp.c b/kernel/kcmp.c
98258index 0aa69ea..a7fcafb 100644
98259--- a/kernel/kcmp.c
98260+++ b/kernel/kcmp.c
98261@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
98262 struct task_struct *task1, *task2;
98263 int ret;
98264
98265+#ifdef CONFIG_GRKERNSEC
98266+ return -ENOSYS;
98267+#endif
98268+
98269 rcu_read_lock();
98270
98271 /*
98272diff --git a/kernel/kexec.c b/kernel/kexec.c
98273index 38c25b1..12b3f69 100644
98274--- a/kernel/kexec.c
98275+++ b/kernel/kexec.c
98276@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
98277 compat_ulong_t, flags)
98278 {
98279 struct compat_kexec_segment in;
98280- struct kexec_segment out, __user *ksegments;
98281+ struct kexec_segment out;
98282+ struct kexec_segment __user *ksegments;
98283 unsigned long i, result;
98284
98285 /* Don't allow clients that don't understand the native
98286diff --git a/kernel/kmod.c b/kernel/kmod.c
98287index 2777f40..a689506 100644
98288--- a/kernel/kmod.c
98289+++ b/kernel/kmod.c
98290@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
98291 kfree(info->argv);
98292 }
98293
98294-static int call_modprobe(char *module_name, int wait)
98295+static int call_modprobe(char *module_name, char *module_param, int wait)
98296 {
98297 struct subprocess_info *info;
98298 static char *envp[] = {
98299@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
98300 NULL
98301 };
98302
98303- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
98304+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
98305 if (!argv)
98306 goto out;
98307
98308@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
98309 argv[1] = "-q";
98310 argv[2] = "--";
98311 argv[3] = module_name; /* check free_modprobe_argv() */
98312- argv[4] = NULL;
98313+ argv[4] = module_param;
98314+ argv[5] = NULL;
98315
98316 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
98317 NULL, free_modprobe_argv, NULL);
98318@@ -122,9 +123,8 @@ out:
98319 * If module auto-loading support is disabled then this function
98320 * becomes a no-operation.
98321 */
98322-int __request_module(bool wait, const char *fmt, ...)
98323+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
98324 {
98325- va_list args;
98326 char module_name[MODULE_NAME_LEN];
98327 unsigned int max_modprobes;
98328 int ret;
98329@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
98330 if (!modprobe_path[0])
98331 return 0;
98332
98333- va_start(args, fmt);
98334- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
98335- va_end(args);
98336+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
98337 if (ret >= MODULE_NAME_LEN)
98338 return -ENAMETOOLONG;
98339
98340@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
98341 if (ret)
98342 return ret;
98343
98344+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98345+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98346+ /* hack to workaround consolekit/udisks stupidity */
98347+ read_lock(&tasklist_lock);
98348+ if (!strcmp(current->comm, "mount") &&
98349+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
98350+ read_unlock(&tasklist_lock);
98351+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
98352+ return -EPERM;
98353+ }
98354+ read_unlock(&tasklist_lock);
98355+ }
98356+#endif
98357+
98358 /* If modprobe needs a service that is in a module, we get a recursive
98359 * loop. Limit the number of running kmod threads to max_threads/2 or
98360 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
98361@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
98362
98363 trace_module_request(module_name, wait, _RET_IP_);
98364
98365- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98366+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
98367
98368 atomic_dec(&kmod_concurrent);
98369 return ret;
98370 }
98371+
98372+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
98373+{
98374+ va_list args;
98375+ int ret;
98376+
98377+ va_start(args, fmt);
98378+ ret = ____request_module(wait, module_param, fmt, args);
98379+ va_end(args);
98380+
98381+ return ret;
98382+}
98383+
98384+int __request_module(bool wait, const char *fmt, ...)
98385+{
98386+ va_list args;
98387+ int ret;
98388+
98389+#ifdef CONFIG_GRKERNSEC_MODHARDEN
98390+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
98391+ char module_param[MODULE_NAME_LEN];
98392+
98393+ memset(module_param, 0, sizeof(module_param));
98394+
98395+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
98396+
98397+ va_start(args, fmt);
98398+ ret = ____request_module(wait, module_param, fmt, args);
98399+ va_end(args);
98400+
98401+ return ret;
98402+ }
98403+#endif
98404+
98405+ va_start(args, fmt);
98406+ ret = ____request_module(wait, NULL, fmt, args);
98407+ va_end(args);
98408+
98409+ return ret;
98410+}
98411+
98412 EXPORT_SYMBOL(__request_module);
98413 #endif /* CONFIG_MODULES */
98414
98415 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
98416 {
98417+#ifdef CONFIG_GRKERNSEC
98418+ kfree(info->path);
98419+ info->path = info->origpath;
98420+#endif
98421 if (info->cleanup)
98422 (*info->cleanup)(info);
98423 kfree(info);
98424@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
98425 */
98426 set_user_nice(current, 0);
98427
98428+#ifdef CONFIG_GRKERNSEC
98429+ /* this is race-free as far as userland is concerned as we copied
98430+ out the path to be used prior to this point and are now operating
98431+ on that copy
98432+ */
98433+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
98434+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
98435+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
98436+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
98437+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
98438+ retval = -EPERM;
98439+ goto out;
98440+ }
98441+#endif
98442+
98443 retval = -ENOMEM;
98444 new = prepare_kernel_cred(current);
98445 if (!new)
98446@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
98447 commit_creds(new);
98448
98449 retval = do_execve(getname_kernel(sub_info->path),
98450- (const char __user *const __user *)sub_info->argv,
98451- (const char __user *const __user *)sub_info->envp);
98452+ (const char __user *const __force_user *)sub_info->argv,
98453+ (const char __user *const __force_user *)sub_info->envp);
98454 out:
98455 sub_info->retval = retval;
98456 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
98457@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
98458 *
98459 * Thus the __user pointer cast is valid here.
98460 */
98461- sys_wait4(pid, (int __user *)&ret, 0, NULL);
98462+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
98463
98464 /*
98465 * If ret is 0, either ____call_usermodehelper failed and the
98466@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
98467 goto out;
98468
98469 INIT_WORK(&sub_info->work, __call_usermodehelper);
98470+#ifdef CONFIG_GRKERNSEC
98471+ sub_info->origpath = path;
98472+ sub_info->path = kstrdup(path, gfp_mask);
98473+#else
98474 sub_info->path = path;
98475+#endif
98476 sub_info->argv = argv;
98477 sub_info->envp = envp;
98478
98479@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
98480 static int proc_cap_handler(struct ctl_table *table, int write,
98481 void __user *buffer, size_t *lenp, loff_t *ppos)
98482 {
98483- struct ctl_table t;
98484+ ctl_table_no_const t;
98485 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
98486 kernel_cap_t new_cap;
98487 int err, i;
98488diff --git a/kernel/kprobes.c b/kernel/kprobes.c
98489index c90e417..e6c515d 100644
98490--- a/kernel/kprobes.c
98491+++ b/kernel/kprobes.c
98492@@ -31,6 +31,9 @@
98493 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
98494 * <prasanna@in.ibm.com> added function-return probes.
98495 */
98496+#ifdef CONFIG_GRKERNSEC_HIDESYM
98497+#define __INCLUDED_BY_HIDESYM 1
98498+#endif
98499 #include <linux/kprobes.h>
98500 #include <linux/hash.h>
98501 #include <linux/init.h>
98502@@ -122,12 +125,12 @@ enum kprobe_slot_state {
98503
98504 static void *alloc_insn_page(void)
98505 {
98506- return module_alloc(PAGE_SIZE);
98507+ return module_alloc_exec(PAGE_SIZE);
98508 }
98509
98510 static void free_insn_page(void *page)
98511 {
98512- module_memfree(page);
98513+ module_memfree_exec(page);
98514 }
98515
98516 struct kprobe_insn_cache kprobe_insn_slots = {
98517@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
98518 kprobe_type = "k";
98519
98520 if (sym)
98521- seq_printf(pi, "%p %s %s+0x%x %s ",
98522+ seq_printf(pi, "%pK %s %s+0x%x %s ",
98523 p->addr, kprobe_type, sym, offset,
98524 (modname ? modname : " "));
98525 else
98526- seq_printf(pi, "%p %s %p ",
98527+ seq_printf(pi, "%pK %s %pK ",
98528 p->addr, kprobe_type, p->addr);
98529
98530 if (!pp)
98531diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
98532index 6683cce..daf8999 100644
98533--- a/kernel/ksysfs.c
98534+++ b/kernel/ksysfs.c
98535@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
98536 {
98537 if (count+1 > UEVENT_HELPER_PATH_LEN)
98538 return -ENOENT;
98539+ if (!capable(CAP_SYS_ADMIN))
98540+ return -EPERM;
98541 memcpy(uevent_helper, buf, count);
98542 uevent_helper[count] = '\0';
98543 if (count && uevent_helper[count-1] == '\n')
98544@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
98545 return count;
98546 }
98547
98548-static struct bin_attribute notes_attr = {
98549+static bin_attribute_no_const notes_attr __read_only = {
98550 .attr = {
98551 .name = "notes",
98552 .mode = S_IRUGO,
98553diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
98554index ba77ab5..d6a3e20 100644
98555--- a/kernel/locking/lockdep.c
98556+++ b/kernel/locking/lockdep.c
98557@@ -599,6 +599,10 @@ static int static_obj(void *obj)
98558 end = (unsigned long) &_end,
98559 addr = (unsigned long) obj;
98560
98561+#ifdef CONFIG_PAX_KERNEXEC
98562+ start = ktla_ktva(start);
98563+#endif
98564+
98565 /*
98566 * static variable?
98567 */
98568@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
98569 if (!static_obj(lock->key)) {
98570 debug_locks_off();
98571 printk("INFO: trying to register non-static key.\n");
98572+ printk("lock:%pS key:%pS.\n", lock, lock->key);
98573 printk("the code is fine but needs lockdep annotation.\n");
98574 printk("turning off the locking correctness validator.\n");
98575 dump_stack();
98576@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
98577 if (!class)
98578 return 0;
98579 }
98580- atomic_inc((atomic_t *)&class->ops);
98581+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
98582 if (very_verbose(class)) {
98583 printk("\nacquire class [%p] %s", class->key, class->name);
98584 if (class->name_version > 1)
98585diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
98586index ef43ac4..2720dfa 100644
98587--- a/kernel/locking/lockdep_proc.c
98588+++ b/kernel/locking/lockdep_proc.c
98589@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
98590 return 0;
98591 }
98592
98593- seq_printf(m, "%p", class->key);
98594+ seq_printf(m, "%pK", class->key);
98595 #ifdef CONFIG_DEBUG_LOCKDEP
98596 seq_printf(m, " OPS:%8ld", class->ops);
98597 #endif
98598@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
98599
98600 list_for_each_entry(entry, &class->locks_after, entry) {
98601 if (entry->distance == 1) {
98602- seq_printf(m, " -> [%p] ", entry->class->key);
98603+ seq_printf(m, " -> [%pK] ", entry->class->key);
98604 print_name(m, entry->class);
98605 seq_puts(m, "\n");
98606 }
98607@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
98608 if (!class->key)
98609 continue;
98610
98611- seq_printf(m, "[%p] ", class->key);
98612+ seq_printf(m, "[%pK] ", class->key);
98613 print_name(m, class);
98614 seq_puts(m, "\n");
98615 }
98616@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98617 if (!i)
98618 seq_line(m, '-', 40-namelen, namelen);
98619
98620- snprintf(ip, sizeof(ip), "[<%p>]",
98621+ snprintf(ip, sizeof(ip), "[<%pK>]",
98622 (void *)class->contention_point[i]);
98623 seq_printf(m, "%40s %14lu %29s %pS\n",
98624 name, stats->contention_point[i],
98625@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
98626 if (!i)
98627 seq_line(m, '-', 40-namelen, namelen);
98628
98629- snprintf(ip, sizeof(ip), "[<%p>]",
98630+ snprintf(ip, sizeof(ip), "[<%pK>]",
98631 (void *)class->contending_point[i]);
98632 seq_printf(m, "%40s %14lu %29s %pS\n",
98633 name, stats->contending_point[i],
98634diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
98635index d1fe2ba..180cd65e 100644
98636--- a/kernel/locking/mcs_spinlock.h
98637+++ b/kernel/locking/mcs_spinlock.h
98638@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
98639 */
98640 return;
98641 }
98642- ACCESS_ONCE(prev->next) = node;
98643+ ACCESS_ONCE_RW(prev->next) = node;
98644
98645 /* Wait until the lock holder passes the lock down. */
98646 arch_mcs_spin_lock_contended(&node->locked);
98647diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
98648index 3ef3736..9c951fa 100644
98649--- a/kernel/locking/mutex-debug.c
98650+++ b/kernel/locking/mutex-debug.c
98651@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
98652 }
98653
98654 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98655- struct thread_info *ti)
98656+ struct task_struct *task)
98657 {
98658 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
98659
98660 /* Mark the current thread as blocked on the lock: */
98661- ti->task->blocked_on = waiter;
98662+ task->blocked_on = waiter;
98663 }
98664
98665 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98666- struct thread_info *ti)
98667+ struct task_struct *task)
98668 {
98669 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
98670- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
98671- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
98672- ti->task->blocked_on = NULL;
98673+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
98674+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
98675+ task->blocked_on = NULL;
98676
98677 list_del_init(&waiter->list);
98678 waiter->task = NULL;
98679diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
98680index 0799fd3..d06ae3b 100644
98681--- a/kernel/locking/mutex-debug.h
98682+++ b/kernel/locking/mutex-debug.h
98683@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
98684 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
98685 extern void debug_mutex_add_waiter(struct mutex *lock,
98686 struct mutex_waiter *waiter,
98687- struct thread_info *ti);
98688+ struct task_struct *task);
98689 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
98690- struct thread_info *ti);
98691+ struct task_struct *task);
98692 extern void debug_mutex_unlock(struct mutex *lock);
98693 extern void debug_mutex_init(struct mutex *lock, const char *name,
98694 struct lock_class_key *key);
98695diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
98696index 94674e5..de4966f 100644
98697--- a/kernel/locking/mutex.c
98698+++ b/kernel/locking/mutex.c
98699@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98700 goto skip_wait;
98701
98702 debug_mutex_lock_common(lock, &waiter);
98703- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
98704+ debug_mutex_add_waiter(lock, &waiter, task);
98705
98706 /* add waiting tasks to the end of the waitqueue (FIFO): */
98707 list_add_tail(&waiter.list, &lock->wait_list);
98708@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
98709 }
98710 __set_task_state(task, TASK_RUNNING);
98711
98712- mutex_remove_waiter(lock, &waiter, current_thread_info());
98713+ mutex_remove_waiter(lock, &waiter, task);
98714 /* set it to 0 if there are no waiters left: */
98715 if (likely(list_empty(&lock->wait_list)))
98716 atomic_set(&lock->count, 0);
98717@@ -610,7 +610,7 @@ skip_wait:
98718 return 0;
98719
98720 err:
98721- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
98722+ mutex_remove_waiter(lock, &waiter, task);
98723 spin_unlock_mutex(&lock->wait_lock, flags);
98724 debug_mutex_free_waiter(&waiter);
98725 mutex_release(&lock->dep_map, 1, ip);
98726diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
98727index c112d00..1946ad9 100644
98728--- a/kernel/locking/osq_lock.c
98729+++ b/kernel/locking/osq_lock.c
98730@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
98731
98732 prev = decode_cpu(old);
98733 node->prev = prev;
98734- ACCESS_ONCE(prev->next) = node;
98735+ ACCESS_ONCE_RW(prev->next) = node;
98736
98737 /*
98738 * Normally @prev is untouchable after the above store; because at that
98739@@ -170,8 +170,8 @@ unqueue:
98740 * it will wait in Step-A.
98741 */
98742
98743- ACCESS_ONCE(next->prev) = prev;
98744- ACCESS_ONCE(prev->next) = next;
98745+ ACCESS_ONCE_RW(next->prev) = prev;
98746+ ACCESS_ONCE_RW(prev->next) = next;
98747
98748 return false;
98749 }
98750@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
98751 node = this_cpu_ptr(&osq_node);
98752 next = xchg(&node->next, NULL);
98753 if (next) {
98754- ACCESS_ONCE(next->locked) = 1;
98755+ ACCESS_ONCE_RW(next->locked) = 1;
98756 return;
98757 }
98758
98759 next = osq_wait_next(lock, node, NULL);
98760 if (next)
98761- ACCESS_ONCE(next->locked) = 1;
98762+ ACCESS_ONCE_RW(next->locked) = 1;
98763 }
98764diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
98765index 1d96dd0..994ff19 100644
98766--- a/kernel/locking/rtmutex-tester.c
98767+++ b/kernel/locking/rtmutex-tester.c
98768@@ -22,7 +22,7 @@
98769 #define MAX_RT_TEST_MUTEXES 8
98770
98771 static spinlock_t rttest_lock;
98772-static atomic_t rttest_event;
98773+static atomic_unchecked_t rttest_event;
98774
98775 struct test_thread_data {
98776 int opcode;
98777@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98778
98779 case RTTEST_LOCKCONT:
98780 td->mutexes[td->opdata] = 1;
98781- td->event = atomic_add_return(1, &rttest_event);
98782+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98783 return 0;
98784
98785 case RTTEST_RESET:
98786@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98787 return 0;
98788
98789 case RTTEST_RESETEVENT:
98790- atomic_set(&rttest_event, 0);
98791+ atomic_set_unchecked(&rttest_event, 0);
98792 return 0;
98793
98794 default:
98795@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98796 return ret;
98797
98798 td->mutexes[id] = 1;
98799- td->event = atomic_add_return(1, &rttest_event);
98800+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98801 rt_mutex_lock(&mutexes[id]);
98802- td->event = atomic_add_return(1, &rttest_event);
98803+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98804 td->mutexes[id] = 4;
98805 return 0;
98806
98807@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98808 return ret;
98809
98810 td->mutexes[id] = 1;
98811- td->event = atomic_add_return(1, &rttest_event);
98812+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98813 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
98814- td->event = atomic_add_return(1, &rttest_event);
98815+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98816 td->mutexes[id] = ret ? 0 : 4;
98817 return ret ? -EINTR : 0;
98818
98819@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
98820 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
98821 return ret;
98822
98823- td->event = atomic_add_return(1, &rttest_event);
98824+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98825 rt_mutex_unlock(&mutexes[id]);
98826- td->event = atomic_add_return(1, &rttest_event);
98827+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98828 td->mutexes[id] = 0;
98829 return 0;
98830
98831@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98832 break;
98833
98834 td->mutexes[dat] = 2;
98835- td->event = atomic_add_return(1, &rttest_event);
98836+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98837 break;
98838
98839 default:
98840@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98841 return;
98842
98843 td->mutexes[dat] = 3;
98844- td->event = atomic_add_return(1, &rttest_event);
98845+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98846 break;
98847
98848 case RTTEST_LOCKNOWAIT:
98849@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
98850 return;
98851
98852 td->mutexes[dat] = 1;
98853- td->event = atomic_add_return(1, &rttest_event);
98854+ td->event = atomic_add_return_unchecked(1, &rttest_event);
98855 return;
98856
98857 default:
98858diff --git a/kernel/module.c b/kernel/module.c
98859index 538794c..76d7957 100644
98860--- a/kernel/module.c
98861+++ b/kernel/module.c
98862@@ -59,6 +59,7 @@
98863 #include <linux/jump_label.h>
98864 #include <linux/pfn.h>
98865 #include <linux/bsearch.h>
98866+#include <linux/grsecurity.h>
98867 #include <uapi/linux/module.h>
98868 #include "module-internal.h"
98869
98870@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
98871
98872 /* Bounds of module allocation, for speeding __module_address.
98873 * Protected by module_mutex. */
98874-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
98875+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
98876+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
98877
98878 int register_module_notifier(struct notifier_block *nb)
98879 {
98880@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98881 return true;
98882
98883 list_for_each_entry_rcu(mod, &modules, list) {
98884- struct symsearch arr[] = {
98885+ struct symsearch modarr[] = {
98886 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
98887 NOT_GPL_ONLY, false },
98888 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
98889@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
98890 if (mod->state == MODULE_STATE_UNFORMED)
98891 continue;
98892
98893- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
98894+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
98895 return true;
98896 }
98897 return false;
98898@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
98899 if (!pcpusec->sh_size)
98900 return 0;
98901
98902- if (align > PAGE_SIZE) {
98903+ if (align-1 >= PAGE_SIZE) {
98904 pr_warn("%s: per-cpu alignment %li > %li\n",
98905 mod->name, align, PAGE_SIZE);
98906 align = PAGE_SIZE;
98907@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
98908 static ssize_t show_coresize(struct module_attribute *mattr,
98909 struct module_kobject *mk, char *buffer)
98910 {
98911- return sprintf(buffer, "%u\n", mk->mod->core_size);
98912+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
98913 }
98914
98915 static struct module_attribute modinfo_coresize =
98916@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
98917 static ssize_t show_initsize(struct module_attribute *mattr,
98918 struct module_kobject *mk, char *buffer)
98919 {
98920- return sprintf(buffer, "%u\n", mk->mod->init_size);
98921+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
98922 }
98923
98924 static struct module_attribute modinfo_initsize =
98925@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
98926 goto bad_version;
98927 }
98928
98929+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98930+ /*
98931+ * avoid potentially printing jibberish on attempted load
98932+ * of a module randomized with a different seed
98933+ */
98934+ pr_warn("no symbol version for %s\n", symname);
98935+#else
98936 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
98937+#endif
98938 return 0;
98939
98940 bad_version:
98941+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
98942+ /*
98943+ * avoid potentially printing jibberish on attempted load
98944+ * of a module randomized with a different seed
98945+ */
98946+ pr_warn("attempted module disagrees about version of symbol %s\n",
98947+ symname);
98948+#else
98949 pr_warn("%s: disagrees about version of symbol %s\n",
98950 mod->name, symname);
98951+#endif
98952 return 0;
98953 }
98954
98955@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
98956 */
98957 #ifdef CONFIG_SYSFS
98958
98959-#ifdef CONFIG_KALLSYMS
98960+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
98961 static inline bool sect_empty(const Elf_Shdr *sect)
98962 {
98963 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
98964@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
98965 {
98966 unsigned int notes, loaded, i;
98967 struct module_notes_attrs *notes_attrs;
98968- struct bin_attribute *nattr;
98969+ bin_attribute_no_const *nattr;
98970
98971 /* failed to create section attributes, so can't create notes */
98972 if (!mod->sect_attrs)
98973@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
98974 static int module_add_modinfo_attrs(struct module *mod)
98975 {
98976 struct module_attribute *attr;
98977- struct module_attribute *temp_attr;
98978+ module_attribute_no_const *temp_attr;
98979 int error = 0;
98980 int i;
98981
98982@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
98983
98984 static void unset_module_core_ro_nx(struct module *mod)
98985 {
98986- set_page_attributes(mod->module_core + mod->core_text_size,
98987- mod->module_core + mod->core_size,
98988+ set_page_attributes(mod->module_core_rw,
98989+ mod->module_core_rw + mod->core_size_rw,
98990 set_memory_x);
98991- set_page_attributes(mod->module_core,
98992- mod->module_core + mod->core_ro_size,
98993+ set_page_attributes(mod->module_core_rx,
98994+ mod->module_core_rx + mod->core_size_rx,
98995 set_memory_rw);
98996 }
98997
98998 static void unset_module_init_ro_nx(struct module *mod)
98999 {
99000- set_page_attributes(mod->module_init + mod->init_text_size,
99001- mod->module_init + mod->init_size,
99002+ set_page_attributes(mod->module_init_rw,
99003+ mod->module_init_rw + mod->init_size_rw,
99004 set_memory_x);
99005- set_page_attributes(mod->module_init,
99006- mod->module_init + mod->init_ro_size,
99007+ set_page_attributes(mod->module_init_rx,
99008+ mod->module_init_rx + mod->init_size_rx,
99009 set_memory_rw);
99010 }
99011
99012@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
99013 list_for_each_entry_rcu(mod, &modules, list) {
99014 if (mod->state == MODULE_STATE_UNFORMED)
99015 continue;
99016- if ((mod->module_core) && (mod->core_text_size)) {
99017- set_page_attributes(mod->module_core,
99018- mod->module_core + mod->core_text_size,
99019+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99020+ set_page_attributes(mod->module_core_rx,
99021+ mod->module_core_rx + mod->core_size_rx,
99022 set_memory_rw);
99023 }
99024- if ((mod->module_init) && (mod->init_text_size)) {
99025- set_page_attributes(mod->module_init,
99026- mod->module_init + mod->init_text_size,
99027+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99028+ set_page_attributes(mod->module_init_rx,
99029+ mod->module_init_rx + mod->init_size_rx,
99030 set_memory_rw);
99031 }
99032 }
99033@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
99034 list_for_each_entry_rcu(mod, &modules, list) {
99035 if (mod->state == MODULE_STATE_UNFORMED)
99036 continue;
99037- if ((mod->module_core) && (mod->core_text_size)) {
99038- set_page_attributes(mod->module_core,
99039- mod->module_core + mod->core_text_size,
99040+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
99041+ set_page_attributes(mod->module_core_rx,
99042+ mod->module_core_rx + mod->core_size_rx,
99043 set_memory_ro);
99044 }
99045- if ((mod->module_init) && (mod->init_text_size)) {
99046- set_page_attributes(mod->module_init,
99047- mod->module_init + mod->init_text_size,
99048+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
99049+ set_page_attributes(mod->module_init_rx,
99050+ mod->module_init_rx + mod->init_size_rx,
99051 set_memory_ro);
99052 }
99053 }
99054@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
99055 #else
99056 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
99057 static void unset_module_core_ro_nx(struct module *mod) { }
99058-static void unset_module_init_ro_nx(struct module *mod) { }
99059+static void unset_module_init_ro_nx(struct module *mod)
99060+{
99061+
99062+#ifdef CONFIG_PAX_KERNEXEC
99063+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99064+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
99065+#endif
99066+
99067+}
99068 #endif
99069
99070 void __weak module_memfree(void *module_region)
99071@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
99072 /* This may be NULL, but that's OK */
99073 unset_module_init_ro_nx(mod);
99074 module_arch_freeing_init(mod);
99075- module_memfree(mod->module_init);
99076+ module_memfree(mod->module_init_rw);
99077+ module_memfree_exec(mod->module_init_rx);
99078 kfree(mod->args);
99079 percpu_modfree(mod);
99080
99081 /* Free lock-classes; relies on the preceding sync_rcu(). */
99082- lockdep_free_key_range(mod->module_core, mod->core_size);
99083+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99084+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99085
99086 /* Finally, free the core (containing the module structure) */
99087 unset_module_core_ro_nx(mod);
99088- module_memfree(mod->module_core);
99089+ module_memfree_exec(mod->module_core_rx);
99090+ module_memfree(mod->module_core_rw);
99091
99092 #ifdef CONFIG_MPU
99093 update_protections(current->mm);
99094@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99095 int ret = 0;
99096 const struct kernel_symbol *ksym;
99097
99098+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99099+ int is_fs_load = 0;
99100+ int register_filesystem_found = 0;
99101+ char *p;
99102+
99103+ p = strstr(mod->args, "grsec_modharden_fs");
99104+ if (p) {
99105+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
99106+ /* copy \0 as well */
99107+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
99108+ is_fs_load = 1;
99109+ }
99110+#endif
99111+
99112 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
99113 const char *name = info->strtab + sym[i].st_name;
99114
99115+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99116+ /* it's a real shame this will never get ripped and copied
99117+ upstream! ;(
99118+ */
99119+ if (is_fs_load && !strcmp(name, "register_filesystem"))
99120+ register_filesystem_found = 1;
99121+#endif
99122+
99123 switch (sym[i].st_shndx) {
99124 case SHN_COMMON:
99125 /* Ignore common symbols */
99126@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99127 ksym = resolve_symbol_wait(mod, info, name);
99128 /* Ok if resolved. */
99129 if (ksym && !IS_ERR(ksym)) {
99130+ pax_open_kernel();
99131 sym[i].st_value = ksym->value;
99132+ pax_close_kernel();
99133 break;
99134 }
99135
99136@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
99137 secbase = (unsigned long)mod_percpu(mod);
99138 else
99139 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
99140+ pax_open_kernel();
99141 sym[i].st_value += secbase;
99142+ pax_close_kernel();
99143 break;
99144 }
99145 }
99146
99147+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99148+ if (is_fs_load && !register_filesystem_found) {
99149+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
99150+ ret = -EPERM;
99151+ }
99152+#endif
99153+
99154 return ret;
99155 }
99156
99157@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
99158 || s->sh_entsize != ~0UL
99159 || strstarts(sname, ".init"))
99160 continue;
99161- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
99162+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99163+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
99164+ else
99165+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
99166 pr_debug("\t%s\n", sname);
99167 }
99168- switch (m) {
99169- case 0: /* executable */
99170- mod->core_size = debug_align(mod->core_size);
99171- mod->core_text_size = mod->core_size;
99172- break;
99173- case 1: /* RO: text and ro-data */
99174- mod->core_size = debug_align(mod->core_size);
99175- mod->core_ro_size = mod->core_size;
99176- break;
99177- case 3: /* whole core */
99178- mod->core_size = debug_align(mod->core_size);
99179- break;
99180- }
99181 }
99182
99183 pr_debug("Init section allocation order:\n");
99184@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
99185 || s->sh_entsize != ~0UL
99186 || !strstarts(sname, ".init"))
99187 continue;
99188- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
99189- | INIT_OFFSET_MASK);
99190+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
99191+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
99192+ else
99193+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
99194+ s->sh_entsize |= INIT_OFFSET_MASK;
99195 pr_debug("\t%s\n", sname);
99196 }
99197- switch (m) {
99198- case 0: /* executable */
99199- mod->init_size = debug_align(mod->init_size);
99200- mod->init_text_size = mod->init_size;
99201- break;
99202- case 1: /* RO: text and ro-data */
99203- mod->init_size = debug_align(mod->init_size);
99204- mod->init_ro_size = mod->init_size;
99205- break;
99206- case 3: /* whole init */
99207- mod->init_size = debug_align(mod->init_size);
99208- break;
99209- }
99210 }
99211 }
99212
99213@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99214
99215 /* Put symbol section at end of init part of module. */
99216 symsect->sh_flags |= SHF_ALLOC;
99217- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
99218+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
99219 info->index.sym) | INIT_OFFSET_MASK;
99220 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
99221
99222@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
99223 }
99224
99225 /* Append room for core symbols at end of core part. */
99226- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
99227- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
99228- mod->core_size += strtab_size;
99229- mod->core_size = debug_align(mod->core_size);
99230+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
99231+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
99232+ mod->core_size_rx += strtab_size;
99233+ mod->core_size_rx = debug_align(mod->core_size_rx);
99234
99235 /* Put string table section at end of init part of module. */
99236 strsect->sh_flags |= SHF_ALLOC;
99237- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
99238+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
99239 info->index.str) | INIT_OFFSET_MASK;
99240- mod->init_size = debug_align(mod->init_size);
99241+ mod->init_size_rx = debug_align(mod->init_size_rx);
99242 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
99243 }
99244
99245@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99246 /* Make sure we get permanent strtab: don't use info->strtab. */
99247 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
99248
99249+ pax_open_kernel();
99250+
99251 /* Set types up while we still have access to sections. */
99252 for (i = 0; i < mod->num_symtab; i++)
99253 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
99254
99255- mod->core_symtab = dst = mod->module_core + info->symoffs;
99256- mod->core_strtab = s = mod->module_core + info->stroffs;
99257+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
99258+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
99259 src = mod->symtab;
99260 for (ndst = i = 0; i < mod->num_symtab; i++) {
99261 if (i == 0 ||
99262@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
99263 }
99264 }
99265 mod->core_num_syms = ndst;
99266+
99267+ pax_close_kernel();
99268 }
99269 #else
99270 static inline void layout_symtab(struct module *mod, struct load_info *info)
99271@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
99272 return vmalloc_exec(size);
99273 }
99274
99275-static void *module_alloc_update_bounds(unsigned long size)
99276+static void *module_alloc_update_bounds_rw(unsigned long size)
99277 {
99278 void *ret = module_alloc(size);
99279
99280 if (ret) {
99281 mutex_lock(&module_mutex);
99282 /* Update module bounds. */
99283- if ((unsigned long)ret < module_addr_min)
99284- module_addr_min = (unsigned long)ret;
99285- if ((unsigned long)ret + size > module_addr_max)
99286- module_addr_max = (unsigned long)ret + size;
99287+ if ((unsigned long)ret < module_addr_min_rw)
99288+ module_addr_min_rw = (unsigned long)ret;
99289+ if ((unsigned long)ret + size > module_addr_max_rw)
99290+ module_addr_max_rw = (unsigned long)ret + size;
99291+ mutex_unlock(&module_mutex);
99292+ }
99293+ return ret;
99294+}
99295+
99296+static void *module_alloc_update_bounds_rx(unsigned long size)
99297+{
99298+ void *ret = module_alloc_exec(size);
99299+
99300+ if (ret) {
99301+ mutex_lock(&module_mutex);
99302+ /* Update module bounds. */
99303+ if ((unsigned long)ret < module_addr_min_rx)
99304+ module_addr_min_rx = (unsigned long)ret;
99305+ if ((unsigned long)ret + size > module_addr_max_rx)
99306+ module_addr_max_rx = (unsigned long)ret + size;
99307 mutex_unlock(&module_mutex);
99308 }
99309 return ret;
99310@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99311 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
99312
99313 if (info->index.sym == 0) {
99314+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
99315+ /*
99316+ * avoid potentially printing jibberish on attempted load
99317+ * of a module randomized with a different seed
99318+ */
99319+ pr_warn("module has no symbols (stripped?)\n");
99320+#else
99321 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
99322+#endif
99323 return ERR_PTR(-ENOEXEC);
99324 }
99325
99326@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
99327 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99328 {
99329 const char *modmagic = get_modinfo(info, "vermagic");
99330+ const char *license = get_modinfo(info, "license");
99331 int err;
99332
99333+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
99334+ if (!license || !license_is_gpl_compatible(license))
99335+ return -ENOEXEC;
99336+#endif
99337+
99338 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
99339 modmagic = NULL;
99340
99341@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
99342 }
99343
99344 /* Set up license info based on the info section */
99345- set_license(mod, get_modinfo(info, "license"));
99346+ set_license(mod, license);
99347
99348 return 0;
99349 }
99350@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
99351 void *ptr;
99352
99353 /* Do the allocs. */
99354- ptr = module_alloc_update_bounds(mod->core_size);
99355+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
99356 /*
99357 * The pointer to this block is stored in the module structure
99358 * which is inside the block. Just mark it as not being a
99359@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
99360 if (!ptr)
99361 return -ENOMEM;
99362
99363- memset(ptr, 0, mod->core_size);
99364- mod->module_core = ptr;
99365+ memset(ptr, 0, mod->core_size_rw);
99366+ mod->module_core_rw = ptr;
99367
99368- if (mod->init_size) {
99369- ptr = module_alloc_update_bounds(mod->init_size);
99370+ if (mod->init_size_rw) {
99371+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
99372 /*
99373 * The pointer to this block is stored in the module structure
99374 * which is inside the block. This block doesn't need to be
99375@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
99376 */
99377 kmemleak_ignore(ptr);
99378 if (!ptr) {
99379- module_memfree(mod->module_core);
99380+ module_memfree(mod->module_core_rw);
99381 return -ENOMEM;
99382 }
99383- memset(ptr, 0, mod->init_size);
99384- mod->module_init = ptr;
99385+ memset(ptr, 0, mod->init_size_rw);
99386+ mod->module_init_rw = ptr;
99387 } else
99388- mod->module_init = NULL;
99389+ mod->module_init_rw = NULL;
99390+
99391+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
99392+ kmemleak_not_leak(ptr);
99393+ if (!ptr) {
99394+ if (mod->module_init_rw)
99395+ module_memfree(mod->module_init_rw);
99396+ module_memfree(mod->module_core_rw);
99397+ return -ENOMEM;
99398+ }
99399+
99400+ pax_open_kernel();
99401+ memset(ptr, 0, mod->core_size_rx);
99402+ pax_close_kernel();
99403+ mod->module_core_rx = ptr;
99404+
99405+ if (mod->init_size_rx) {
99406+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
99407+ kmemleak_ignore(ptr);
99408+ if (!ptr && mod->init_size_rx) {
99409+ module_memfree_exec(mod->module_core_rx);
99410+ if (mod->module_init_rw)
99411+ module_memfree(mod->module_init_rw);
99412+ module_memfree(mod->module_core_rw);
99413+ return -ENOMEM;
99414+ }
99415+
99416+ pax_open_kernel();
99417+ memset(ptr, 0, mod->init_size_rx);
99418+ pax_close_kernel();
99419+ mod->module_init_rx = ptr;
99420+ } else
99421+ mod->module_init_rx = NULL;
99422
99423 /* Transfer each section which specifies SHF_ALLOC */
99424 pr_debug("final section addresses:\n");
99425@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
99426 if (!(shdr->sh_flags & SHF_ALLOC))
99427 continue;
99428
99429- if (shdr->sh_entsize & INIT_OFFSET_MASK)
99430- dest = mod->module_init
99431- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99432- else
99433- dest = mod->module_core + shdr->sh_entsize;
99434+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
99435+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99436+ dest = mod->module_init_rw
99437+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99438+ else
99439+ dest = mod->module_init_rx
99440+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
99441+ } else {
99442+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
99443+ dest = mod->module_core_rw + shdr->sh_entsize;
99444+ else
99445+ dest = mod->module_core_rx + shdr->sh_entsize;
99446+ }
99447+
99448+ if (shdr->sh_type != SHT_NOBITS) {
99449+
99450+#ifdef CONFIG_PAX_KERNEXEC
99451+#ifdef CONFIG_X86_64
99452+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
99453+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
99454+#endif
99455+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
99456+ pax_open_kernel();
99457+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99458+ pax_close_kernel();
99459+ } else
99460+#endif
99461
99462- if (shdr->sh_type != SHT_NOBITS)
99463 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
99464+ }
99465 /* Update sh_addr to point to copy in image. */
99466- shdr->sh_addr = (unsigned long)dest;
99467+
99468+#ifdef CONFIG_PAX_KERNEXEC
99469+ if (shdr->sh_flags & SHF_EXECINSTR)
99470+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
99471+ else
99472+#endif
99473+
99474+ shdr->sh_addr = (unsigned long)dest;
99475 pr_debug("\t0x%lx %s\n",
99476 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
99477 }
99478@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
99479 * Do it before processing of module parameters, so the module
99480 * can provide parameter accessor functions of its own.
99481 */
99482- if (mod->module_init)
99483- flush_icache_range((unsigned long)mod->module_init,
99484- (unsigned long)mod->module_init
99485- + mod->init_size);
99486- flush_icache_range((unsigned long)mod->module_core,
99487- (unsigned long)mod->module_core + mod->core_size);
99488+ if (mod->module_init_rx)
99489+ flush_icache_range((unsigned long)mod->module_init_rx,
99490+ (unsigned long)mod->module_init_rx
99491+ + mod->init_size_rx);
99492+ flush_icache_range((unsigned long)mod->module_core_rx,
99493+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
99494
99495 set_fs(old_fs);
99496 }
99497@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
99498 {
99499 percpu_modfree(mod);
99500 module_arch_freeing_init(mod);
99501- module_memfree(mod->module_init);
99502- module_memfree(mod->module_core);
99503+ module_memfree_exec(mod->module_init_rx);
99504+ module_memfree_exec(mod->module_core_rx);
99505+ module_memfree(mod->module_init_rw);
99506+ module_memfree(mod->module_core_rw);
99507 }
99508
99509 int __weak module_finalize(const Elf_Ehdr *hdr,
99510@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
99511 static int post_relocation(struct module *mod, const struct load_info *info)
99512 {
99513 /* Sort exception table now relocations are done. */
99514+ pax_open_kernel();
99515 sort_extable(mod->extable, mod->extable + mod->num_exentries);
99516+ pax_close_kernel();
99517
99518 /* Copy relocated percpu area over. */
99519 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
99520@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
99521 /* For freeing module_init on success, in case kallsyms traversing */
99522 struct mod_initfree {
99523 struct rcu_head rcu;
99524- void *module_init;
99525+ void *module_init_rw;
99526+ void *module_init_rx;
99527 };
99528
99529 static void do_free_init(struct rcu_head *head)
99530 {
99531 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
99532- module_memfree(m->module_init);
99533+ module_memfree(m->module_init_rw);
99534+ module_memfree_exec(m->module_init_rx);
99535 kfree(m);
99536 }
99537
99538@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
99539 ret = -ENOMEM;
99540 goto fail;
99541 }
99542- freeinit->module_init = mod->module_init;
99543+ freeinit->module_init_rw = mod->module_init_rw;
99544+ freeinit->module_init_rx = mod->module_init_rx;
99545
99546 /*
99547 * We want to find out whether @mod uses async during init. Clear
99548@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
99549 #endif
99550 unset_module_init_ro_nx(mod);
99551 module_arch_freeing_init(mod);
99552- mod->module_init = NULL;
99553- mod->init_size = 0;
99554- mod->init_ro_size = 0;
99555- mod->init_text_size = 0;
99556+ mod->module_init_rw = NULL;
99557+ mod->module_init_rx = NULL;
99558+ mod->init_size_rw = 0;
99559+ mod->init_size_rx = 0;
99560 /*
99561 * We want to free module_init, but be aware that kallsyms may be
99562 * walking this with preempt disabled. In all the failure paths,
99563@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
99564 module_bug_finalize(info->hdr, info->sechdrs, mod);
99565
99566 /* Set RO and NX regions for core */
99567- set_section_ro_nx(mod->module_core,
99568- mod->core_text_size,
99569- mod->core_ro_size,
99570- mod->core_size);
99571+ set_section_ro_nx(mod->module_core_rx,
99572+ mod->core_size_rx,
99573+ mod->core_size_rx,
99574+ mod->core_size_rx);
99575
99576 /* Set RO and NX regions for init */
99577- set_section_ro_nx(mod->module_init,
99578- mod->init_text_size,
99579- mod->init_ro_size,
99580- mod->init_size);
99581+ set_section_ro_nx(mod->module_init_rx,
99582+ mod->init_size_rx,
99583+ mod->init_size_rx,
99584+ mod->init_size_rx);
99585
99586 /* Mark state as coming so strong_try_module_get() ignores us,
99587 * but kallsyms etc. can see us. */
99588@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
99589 if (err)
99590 goto free_unload;
99591
99592+ /* Now copy in args */
99593+ mod->args = strndup_user(uargs, ~0UL >> 1);
99594+ if (IS_ERR(mod->args)) {
99595+ err = PTR_ERR(mod->args);
99596+ goto free_unload;
99597+ }
99598+
99599 /* Set up MODINFO_ATTR fields */
99600 setup_modinfo(mod, info);
99601
99602+#ifdef CONFIG_GRKERNSEC_MODHARDEN
99603+ {
99604+ char *p, *p2;
99605+
99606+ if (strstr(mod->args, "grsec_modharden_netdev")) {
99607+ 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);
99608+ err = -EPERM;
99609+ goto free_modinfo;
99610+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
99611+ p += sizeof("grsec_modharden_normal") - 1;
99612+ p2 = strstr(p, "_");
99613+ if (p2) {
99614+ *p2 = '\0';
99615+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
99616+ *p2 = '_';
99617+ }
99618+ err = -EPERM;
99619+ goto free_modinfo;
99620+ }
99621+ }
99622+#endif
99623+
99624 /* Fix up syms, so that st_value is a pointer to location. */
99625 err = simplify_symbols(mod, info);
99626 if (err < 0)
99627@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
99628
99629 flush_module_icache(mod);
99630
99631- /* Now copy in args */
99632- mod->args = strndup_user(uargs, ~0UL >> 1);
99633- if (IS_ERR(mod->args)) {
99634- err = PTR_ERR(mod->args);
99635- goto free_arch_cleanup;
99636- }
99637-
99638 dynamic_debug_setup(info->debug, info->num_debug);
99639
99640 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
99641@@ -3376,11 +3543,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
99642 ddebug_cleanup:
99643 dynamic_debug_remove(info->debug);
99644 synchronize_sched();
99645- kfree(mod->args);
99646- free_arch_cleanup:
99647 module_arch_cleanup(mod);
99648 free_modinfo:
99649 free_modinfo(mod);
99650+ kfree(mod->args);
99651 free_unload:
99652 module_unload_free(mod);
99653 unlink_mod:
99654@@ -3393,7 +3559,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
99655 mutex_unlock(&module_mutex);
99656 free_module:
99657 /* Free lock-classes; relies on the preceding sync_rcu() */
99658- lockdep_free_key_range(mod->module_core, mod->core_size);
99659+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
99660+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
99661
99662 module_deallocate(mod, info);
99663 free_copy:
99664@@ -3470,10 +3637,16 @@ static const char *get_ksymbol(struct module *mod,
99665 unsigned long nextval;
99666
99667 /* At worse, next value is at end of module */
99668- if (within_module_init(addr, mod))
99669- nextval = (unsigned long)mod->module_init+mod->init_text_size;
99670+ if (within_module_init_rx(addr, mod))
99671+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
99672+ else if (within_module_init_rw(addr, mod))
99673+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
99674+ else if (within_module_core_rx(addr, mod))
99675+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
99676+ else if (within_module_core_rw(addr, mod))
99677+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
99678 else
99679- nextval = (unsigned long)mod->module_core+mod->core_text_size;
99680+ return NULL;
99681
99682 /* Scan for closest preceding symbol, and next symbol. (ELF
99683 starts real symbols at 1). */
99684@@ -3721,7 +3894,7 @@ static int m_show(struct seq_file *m, void *p)
99685 return 0;
99686
99687 seq_printf(m, "%s %u",
99688- mod->name, mod->init_size + mod->core_size);
99689+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
99690 print_unload_info(m, mod);
99691
99692 /* Informative for users. */
99693@@ -3730,7 +3903,7 @@ static int m_show(struct seq_file *m, void *p)
99694 mod->state == MODULE_STATE_COMING ? "Loading" :
99695 "Live");
99696 /* Used by oprofile and other similar tools. */
99697- seq_printf(m, " 0x%pK", mod->module_core);
99698+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
99699
99700 /* Taints info */
99701 if (mod->taints)
99702@@ -3766,7 +3939,17 @@ static const struct file_operations proc_modules_operations = {
99703
99704 static int __init proc_modules_init(void)
99705 {
99706+#ifndef CONFIG_GRKERNSEC_HIDESYM
99707+#ifdef CONFIG_GRKERNSEC_PROC_USER
99708+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99709+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99710+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
99711+#else
99712 proc_create("modules", 0, NULL, &proc_modules_operations);
99713+#endif
99714+#else
99715+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
99716+#endif
99717 return 0;
99718 }
99719 module_init(proc_modules_init);
99720@@ -3827,7 +4010,8 @@ struct module *__module_address(unsigned long addr)
99721 {
99722 struct module *mod;
99723
99724- if (addr < module_addr_min || addr > module_addr_max)
99725+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
99726+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
99727 return NULL;
99728
99729 list_for_each_entry_rcu(mod, &modules, list) {
99730@@ -3868,11 +4052,20 @@ bool is_module_text_address(unsigned long addr)
99731 */
99732 struct module *__module_text_address(unsigned long addr)
99733 {
99734- struct module *mod = __module_address(addr);
99735+ struct module *mod;
99736+
99737+#ifdef CONFIG_X86_32
99738+ addr = ktla_ktva(addr);
99739+#endif
99740+
99741+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
99742+ return NULL;
99743+
99744+ mod = __module_address(addr);
99745+
99746 if (mod) {
99747 /* Make sure it's within the text section. */
99748- if (!within(addr, mod->module_init, mod->init_text_size)
99749- && !within(addr, mod->module_core, mod->core_text_size))
99750+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
99751 mod = NULL;
99752 }
99753 return mod;
99754diff --git a/kernel/notifier.c b/kernel/notifier.c
99755index ae9fc7c..5085fbf 100644
99756--- a/kernel/notifier.c
99757+++ b/kernel/notifier.c
99758@@ -5,6 +5,7 @@
99759 #include <linux/rcupdate.h>
99760 #include <linux/vmalloc.h>
99761 #include <linux/reboot.h>
99762+#include <linux/mm.h>
99763
99764 /*
99765 * Notifier list for kernel code which wants to be called
99766@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
99767 while ((*nl) != NULL) {
99768 if (n->priority > (*nl)->priority)
99769 break;
99770- nl = &((*nl)->next);
99771+ nl = (struct notifier_block **)&((*nl)->next);
99772 }
99773- n->next = *nl;
99774+ pax_open_kernel();
99775+ *(const void **)&n->next = *nl;
99776 rcu_assign_pointer(*nl, n);
99777+ pax_close_kernel();
99778 return 0;
99779 }
99780
99781@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
99782 return 0;
99783 if (n->priority > (*nl)->priority)
99784 break;
99785- nl = &((*nl)->next);
99786+ nl = (struct notifier_block **)&((*nl)->next);
99787 }
99788- n->next = *nl;
99789+ pax_open_kernel();
99790+ *(const void **)&n->next = *nl;
99791 rcu_assign_pointer(*nl, n);
99792+ pax_close_kernel();
99793 return 0;
99794 }
99795
99796@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
99797 {
99798 while ((*nl) != NULL) {
99799 if ((*nl) == n) {
99800+ pax_open_kernel();
99801 rcu_assign_pointer(*nl, n->next);
99802+ pax_close_kernel();
99803 return 0;
99804 }
99805- nl = &((*nl)->next);
99806+ nl = (struct notifier_block **)&((*nl)->next);
99807 }
99808 return -ENOENT;
99809 }
99810diff --git a/kernel/padata.c b/kernel/padata.c
99811index b38bea9..91acfbe 100644
99812--- a/kernel/padata.c
99813+++ b/kernel/padata.c
99814@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
99815 * seq_nr mod. number of cpus in use.
99816 */
99817
99818- seq_nr = atomic_inc_return(&pd->seq_nr);
99819+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
99820 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
99821
99822 return padata_index_to_cpu(pd, cpu_index);
99823@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
99824 padata_init_pqueues(pd);
99825 padata_init_squeues(pd);
99826 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
99827- atomic_set(&pd->seq_nr, -1);
99828+ atomic_set_unchecked(&pd->seq_nr, -1);
99829 atomic_set(&pd->reorder_objects, 0);
99830 atomic_set(&pd->refcnt, 0);
99831 pd->pinst = pinst;
99832diff --git a/kernel/panic.c b/kernel/panic.c
99833index 8136ad7..15c857b 100644
99834--- a/kernel/panic.c
99835+++ b/kernel/panic.c
99836@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
99837 /*
99838 * Stop ourself in panic -- architecture code may override this
99839 */
99840-void __weak panic_smp_self_stop(void)
99841+void __weak __noreturn panic_smp_self_stop(void)
99842 {
99843 while (1)
99844 cpu_relax();
99845@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
99846 disable_trace_on_warning();
99847
99848 pr_warn("------------[ cut here ]------------\n");
99849- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
99850+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
99851 raw_smp_processor_id(), current->pid, file, line, caller);
99852
99853 if (args)
99854@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
99855 */
99856 __visible void __stack_chk_fail(void)
99857 {
99858- panic("stack-protector: Kernel stack is corrupted in: %p\n",
99859+ dump_stack();
99860+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
99861 __builtin_return_address(0));
99862 }
99863 EXPORT_SYMBOL(__stack_chk_fail);
99864diff --git a/kernel/pid.c b/kernel/pid.c
99865index cd36a5e..11f185d 100644
99866--- a/kernel/pid.c
99867+++ b/kernel/pid.c
99868@@ -33,6 +33,7 @@
99869 #include <linux/rculist.h>
99870 #include <linux/bootmem.h>
99871 #include <linux/hash.h>
99872+#include <linux/security.h>
99873 #include <linux/pid_namespace.h>
99874 #include <linux/init_task.h>
99875 #include <linux/syscalls.h>
99876@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
99877
99878 int pid_max = PID_MAX_DEFAULT;
99879
99880-#define RESERVED_PIDS 300
99881+#define RESERVED_PIDS 500
99882
99883 int pid_max_min = RESERVED_PIDS + 1;
99884 int pid_max_max = PID_MAX_LIMIT;
99885@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
99886 */
99887 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
99888 {
99889+ struct task_struct *task;
99890+
99891 rcu_lockdep_assert(rcu_read_lock_held(),
99892 "find_task_by_pid_ns() needs rcu_read_lock()"
99893 " protection");
99894- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99895+
99896+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
99897+
99898+ if (gr_pid_is_chrooted(task))
99899+ return NULL;
99900+
99901+ return task;
99902 }
99903
99904 struct task_struct *find_task_by_vpid(pid_t vnr)
99905@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
99906 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
99907 }
99908
99909+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
99910+{
99911+ rcu_lockdep_assert(rcu_read_lock_held(),
99912+ "find_task_by_pid_ns() needs rcu_read_lock()"
99913+ " protection");
99914+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
99915+}
99916+
99917 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
99918 {
99919 struct pid *pid;
99920diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
99921index a65ba13..f600dbb 100644
99922--- a/kernel/pid_namespace.c
99923+++ b/kernel/pid_namespace.c
99924@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
99925 void __user *buffer, size_t *lenp, loff_t *ppos)
99926 {
99927 struct pid_namespace *pid_ns = task_active_pid_ns(current);
99928- struct ctl_table tmp = *table;
99929+ ctl_table_no_const tmp = *table;
99930
99931 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
99932 return -EPERM;
99933diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
99934index 7e01f78..f5da19d 100644
99935--- a/kernel/power/Kconfig
99936+++ b/kernel/power/Kconfig
99937@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
99938 config HIBERNATION
99939 bool "Hibernation (aka 'suspend to disk')"
99940 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
99941+ depends on !GRKERNSEC_KMEM
99942+ depends on !PAX_MEMORY_SANITIZE
99943 select HIBERNATE_CALLBACKS
99944 select LZO_COMPRESS
99945 select LZO_DECOMPRESS
99946diff --git a/kernel/power/process.c b/kernel/power/process.c
99947index 564f786..361a18e 100644
99948--- a/kernel/power/process.c
99949+++ b/kernel/power/process.c
99950@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
99951 unsigned int elapsed_msecs;
99952 bool wakeup = false;
99953 int sleep_usecs = USEC_PER_MSEC;
99954+ bool timedout = false;
99955
99956 do_gettimeofday(&start);
99957
99958@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
99959
99960 while (true) {
99961 todo = 0;
99962+ if (time_after(jiffies, end_time))
99963+ timedout = true;
99964 read_lock(&tasklist_lock);
99965 for_each_process_thread(g, p) {
99966 if (p == current || !freeze_task(p))
99967 continue;
99968
99969- if (!freezer_should_skip(p))
99970+ if (!freezer_should_skip(p)) {
99971 todo++;
99972+ if (timedout) {
99973+ printk(KERN_ERR "Task refusing to freeze:\n");
99974+ sched_show_task(p);
99975+ }
99976+ }
99977 }
99978 read_unlock(&tasklist_lock);
99979
99980@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
99981 todo += wq_busy;
99982 }
99983
99984- if (!todo || time_after(jiffies, end_time))
99985+ if (!todo || timedout)
99986 break;
99987
99988 if (pm_wakeup_pending()) {
99989diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
99990index bb0635b..9aff9f3 100644
99991--- a/kernel/printk/printk.c
99992+++ b/kernel/printk/printk.c
99993@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
99994 if (from_file && type != SYSLOG_ACTION_OPEN)
99995 return 0;
99996
99997+#ifdef CONFIG_GRKERNSEC_DMESG
99998+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
99999+ return -EPERM;
100000+#endif
100001+
100002 if (syslog_action_restricted(type)) {
100003 if (capable(CAP_SYSLOG))
100004 return 0;
100005diff --git a/kernel/profile.c b/kernel/profile.c
100006index a7bcd28..5b368fa 100644
100007--- a/kernel/profile.c
100008+++ b/kernel/profile.c
100009@@ -37,7 +37,7 @@ struct profile_hit {
100010 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
100011 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
100012
100013-static atomic_t *prof_buffer;
100014+static atomic_unchecked_t *prof_buffer;
100015 static unsigned long prof_len, prof_shift;
100016
100017 int prof_on __read_mostly;
100018@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
100019 hits[i].pc = 0;
100020 continue;
100021 }
100022- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100023+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100024 hits[i].hits = hits[i].pc = 0;
100025 }
100026 }
100027@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100028 * Add the current hit(s) and flush the write-queue out
100029 * to the global buffer:
100030 */
100031- atomic_add(nr_hits, &prof_buffer[pc]);
100032+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
100033 for (i = 0; i < NR_PROFILE_HIT; ++i) {
100034- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
100035+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
100036 hits[i].pc = hits[i].hits = 0;
100037 }
100038 out:
100039@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
100040 {
100041 unsigned long pc;
100042 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
100043- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100044+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
100045 }
100046 #endif /* !CONFIG_SMP */
100047
100048@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
100049 return -EFAULT;
100050 buf++; p++; count--; read++;
100051 }
100052- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
100053+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
100054 if (copy_to_user(buf, (void *)pnt, count))
100055 return -EFAULT;
100056 read += count;
100057@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
100058 }
100059 #endif
100060 profile_discard_flip_buffers();
100061- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
100062+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
100063 return count;
100064 }
100065
100066diff --git a/kernel/ptrace.c b/kernel/ptrace.c
100067index 9a34bd8..38d90e5 100644
100068--- a/kernel/ptrace.c
100069+++ b/kernel/ptrace.c
100070@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
100071 if (seize)
100072 flags |= PT_SEIZED;
100073 rcu_read_lock();
100074- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100075+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
100076 flags |= PT_PTRACE_CAP;
100077 rcu_read_unlock();
100078 task->ptrace = flags;
100079@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
100080 break;
100081 return -EIO;
100082 }
100083- if (copy_to_user(dst, buf, retval))
100084+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
100085 return -EFAULT;
100086 copied += retval;
100087 src += retval;
100088@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
100089 bool seized = child->ptrace & PT_SEIZED;
100090 int ret = -EIO;
100091 siginfo_t siginfo, *si;
100092- void __user *datavp = (void __user *) data;
100093+ void __user *datavp = (__force void __user *) data;
100094 unsigned long __user *datalp = datavp;
100095 unsigned long flags;
100096
100097@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
100098 goto out;
100099 }
100100
100101+ if (gr_handle_ptrace(child, request)) {
100102+ ret = -EPERM;
100103+ goto out_put_task_struct;
100104+ }
100105+
100106 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100107 ret = ptrace_attach(child, request, addr, data);
100108 /*
100109 * Some architectures need to do book-keeping after
100110 * a ptrace attach.
100111 */
100112- if (!ret)
100113+ if (!ret) {
100114 arch_ptrace_attach(child);
100115+ gr_audit_ptrace(child);
100116+ }
100117 goto out_put_task_struct;
100118 }
100119
100120@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
100121 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
100122 if (copied != sizeof(tmp))
100123 return -EIO;
100124- return put_user(tmp, (unsigned long __user *)data);
100125+ return put_user(tmp, (__force unsigned long __user *)data);
100126 }
100127
100128 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
100129@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
100130 }
100131
100132 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100133- compat_long_t, addr, compat_long_t, data)
100134+ compat_ulong_t, addr, compat_ulong_t, data)
100135 {
100136 struct task_struct *child;
100137 long ret;
100138@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
100139 goto out;
100140 }
100141
100142+ if (gr_handle_ptrace(child, request)) {
100143+ ret = -EPERM;
100144+ goto out_put_task_struct;
100145+ }
100146+
100147 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
100148 ret = ptrace_attach(child, request, addr, data);
100149 /*
100150 * Some architectures need to do book-keeping after
100151 * a ptrace attach.
100152 */
100153- if (!ret)
100154+ if (!ret) {
100155 arch_ptrace_attach(child);
100156+ gr_audit_ptrace(child);
100157+ }
100158 goto out_put_task_struct;
100159 }
100160
100161diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
100162index 30d42aa..cac5d66 100644
100163--- a/kernel/rcu/rcutorture.c
100164+++ b/kernel/rcu/rcutorture.c
100165@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100166 rcu_torture_count) = { 0 };
100167 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
100168 rcu_torture_batch) = { 0 };
100169-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100170-static atomic_t n_rcu_torture_alloc;
100171-static atomic_t n_rcu_torture_alloc_fail;
100172-static atomic_t n_rcu_torture_free;
100173-static atomic_t n_rcu_torture_mberror;
100174-static atomic_t n_rcu_torture_error;
100175+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
100176+static atomic_unchecked_t n_rcu_torture_alloc;
100177+static atomic_unchecked_t n_rcu_torture_alloc_fail;
100178+static atomic_unchecked_t n_rcu_torture_free;
100179+static atomic_unchecked_t n_rcu_torture_mberror;
100180+static atomic_unchecked_t n_rcu_torture_error;
100181 static long n_rcu_torture_barrier_error;
100182 static long n_rcu_torture_boost_ktrerror;
100183 static long n_rcu_torture_boost_rterror;
100184@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
100185 static long n_rcu_torture_timers;
100186 static long n_barrier_attempts;
100187 static long n_barrier_successes;
100188-static atomic_long_t n_cbfloods;
100189+static atomic_long_unchecked_t n_cbfloods;
100190 static struct list_head rcu_torture_removed;
100191
100192 static int rcu_torture_writer_state;
100193@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
100194
100195 spin_lock_bh(&rcu_torture_lock);
100196 if (list_empty(&rcu_torture_freelist)) {
100197- atomic_inc(&n_rcu_torture_alloc_fail);
100198+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
100199 spin_unlock_bh(&rcu_torture_lock);
100200 return NULL;
100201 }
100202- atomic_inc(&n_rcu_torture_alloc);
100203+ atomic_inc_unchecked(&n_rcu_torture_alloc);
100204 p = rcu_torture_freelist.next;
100205 list_del_init(p);
100206 spin_unlock_bh(&rcu_torture_lock);
100207@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
100208 static void
100209 rcu_torture_free(struct rcu_torture *p)
100210 {
100211- atomic_inc(&n_rcu_torture_free);
100212+ atomic_inc_unchecked(&n_rcu_torture_free);
100213 spin_lock_bh(&rcu_torture_lock);
100214 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
100215 spin_unlock_bh(&rcu_torture_lock);
100216@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
100217 i = rp->rtort_pipe_count;
100218 if (i > RCU_TORTURE_PIPE_LEN)
100219 i = RCU_TORTURE_PIPE_LEN;
100220- atomic_inc(&rcu_torture_wcount[i]);
100221+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100222 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
100223 rp->rtort_mbtest = 0;
100224 return true;
100225@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
100226 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
100227 do {
100228 schedule_timeout_interruptible(cbflood_inter_holdoff);
100229- atomic_long_inc(&n_cbfloods);
100230+ atomic_long_inc_unchecked(&n_cbfloods);
100231 WARN_ON(signal_pending(current));
100232 for (i = 0; i < cbflood_n_burst; i++) {
100233 for (j = 0; j < cbflood_n_per_burst; j++) {
100234@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
100235 i = old_rp->rtort_pipe_count;
100236 if (i > RCU_TORTURE_PIPE_LEN)
100237 i = RCU_TORTURE_PIPE_LEN;
100238- atomic_inc(&rcu_torture_wcount[i]);
100239+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
100240 old_rp->rtort_pipe_count++;
100241 switch (synctype[torture_random(&rand) % nsynctypes]) {
100242 case RTWS_DEF_FREE:
100243@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
100244 return;
100245 }
100246 if (p->rtort_mbtest == 0)
100247- atomic_inc(&n_rcu_torture_mberror);
100248+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100249 spin_lock(&rand_lock);
100250 cur_ops->read_delay(&rand);
100251 n_rcu_torture_timers++;
100252@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
100253 continue;
100254 }
100255 if (p->rtort_mbtest == 0)
100256- atomic_inc(&n_rcu_torture_mberror);
100257+ atomic_inc_unchecked(&n_rcu_torture_mberror);
100258 cur_ops->read_delay(&rand);
100259 preempt_disable();
100260 pipe_count = p->rtort_pipe_count;
100261@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
100262 rcu_torture_current,
100263 rcu_torture_current_version,
100264 list_empty(&rcu_torture_freelist),
100265- atomic_read(&n_rcu_torture_alloc),
100266- atomic_read(&n_rcu_torture_alloc_fail),
100267- atomic_read(&n_rcu_torture_free));
100268+ atomic_read_unchecked(&n_rcu_torture_alloc),
100269+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
100270+ atomic_read_unchecked(&n_rcu_torture_free));
100271 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
100272- atomic_read(&n_rcu_torture_mberror),
100273+ atomic_read_unchecked(&n_rcu_torture_mberror),
100274 n_rcu_torture_boost_ktrerror,
100275 n_rcu_torture_boost_rterror);
100276 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
100277@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
100278 n_barrier_successes,
100279 n_barrier_attempts,
100280 n_rcu_torture_barrier_error);
100281- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
100282+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
100283
100284 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100285- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
100286+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
100287 n_rcu_torture_barrier_error != 0 ||
100288 n_rcu_torture_boost_ktrerror != 0 ||
100289 n_rcu_torture_boost_rterror != 0 ||
100290 n_rcu_torture_boost_failure != 0 ||
100291 i > 1) {
100292 pr_cont("%s", "!!! ");
100293- atomic_inc(&n_rcu_torture_error);
100294+ atomic_inc_unchecked(&n_rcu_torture_error);
100295 WARN_ON_ONCE(1);
100296 }
100297 pr_cont("Reader Pipe: ");
100298@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
100299 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
100300 pr_cont("Free-Block Circulation: ");
100301 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100302- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
100303+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
100304 }
100305 pr_cont("\n");
100306
100307@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
100308
100309 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
100310
100311- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100312+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
100313 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
100314 else if (torture_onoff_failures())
100315 rcu_torture_print_module_parms(cur_ops,
100316@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
100317
100318 rcu_torture_current = NULL;
100319 rcu_torture_current_version = 0;
100320- atomic_set(&n_rcu_torture_alloc, 0);
100321- atomic_set(&n_rcu_torture_alloc_fail, 0);
100322- atomic_set(&n_rcu_torture_free, 0);
100323- atomic_set(&n_rcu_torture_mberror, 0);
100324- atomic_set(&n_rcu_torture_error, 0);
100325+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
100326+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
100327+ atomic_set_unchecked(&n_rcu_torture_free, 0);
100328+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
100329+ atomic_set_unchecked(&n_rcu_torture_error, 0);
100330 n_rcu_torture_barrier_error = 0;
100331 n_rcu_torture_boost_ktrerror = 0;
100332 n_rcu_torture_boost_rterror = 0;
100333 n_rcu_torture_boost_failure = 0;
100334 n_rcu_torture_boosts = 0;
100335 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
100336- atomic_set(&rcu_torture_wcount[i], 0);
100337+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
100338 for_each_possible_cpu(cpu) {
100339 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
100340 per_cpu(rcu_torture_count, cpu)[i] = 0;
100341diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
100342index cc9ceca..ce075a6 100644
100343--- a/kernel/rcu/tiny.c
100344+++ b/kernel/rcu/tiny.c
100345@@ -42,7 +42,7 @@
100346 /* Forward declarations for tiny_plugin.h. */
100347 struct rcu_ctrlblk;
100348 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
100349-static void rcu_process_callbacks(struct softirq_action *unused);
100350+static void rcu_process_callbacks(void);
100351 static void __call_rcu(struct rcu_head *head,
100352 void (*func)(struct rcu_head *rcu),
100353 struct rcu_ctrlblk *rcp);
100354@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
100355 false));
100356 }
100357
100358-static void rcu_process_callbacks(struct softirq_action *unused)
100359+static __latent_entropy void rcu_process_callbacks(void)
100360 {
100361 __rcu_process_callbacks(&rcu_sched_ctrlblk);
100362 __rcu_process_callbacks(&rcu_bh_ctrlblk);
100363diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
100364index f94e209..d2985bd 100644
100365--- a/kernel/rcu/tiny_plugin.h
100366+++ b/kernel/rcu/tiny_plugin.h
100367@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
100368 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
100369 jiffies - rcp->gp_start, rcp->qlen);
100370 dump_stack();
100371- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
100372+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
100373 3 * rcu_jiffies_till_stall_check() + 3;
100374 } else if (ULONG_CMP_GE(j, js)) {
100375- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100376+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100377 }
100378 }
100379
100380@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
100381 {
100382 rcp->ticks_this_gp = 0;
100383 rcp->gp_start = jiffies;
100384- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100385+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
100386 }
100387
100388 static void check_cpu_stalls(void)
100389diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
100390index 48d640c..9401d30 100644
100391--- a/kernel/rcu/tree.c
100392+++ b/kernel/rcu/tree.c
100393@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
100394 */
100395 rdtp = this_cpu_ptr(&rcu_dynticks);
100396 smp_mb__before_atomic(); /* Earlier stuff before QS. */
100397- atomic_add(2, &rdtp->dynticks); /* QS. */
100398+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
100399 smp_mb__after_atomic(); /* Later stuff after QS. */
100400 break;
100401 }
100402@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
100403 rcu_prepare_for_idle();
100404 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100405 smp_mb__before_atomic(); /* See above. */
100406- atomic_inc(&rdtp->dynticks);
100407+ atomic_inc_unchecked(&rdtp->dynticks);
100408 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
100409- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100410+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100411 rcu_dynticks_task_enter();
100412
100413 /*
100414@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
100415
100416 rcu_dynticks_task_exit();
100417 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
100418- atomic_inc(&rdtp->dynticks);
100419+ atomic_inc_unchecked(&rdtp->dynticks);
100420 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
100421 smp_mb__after_atomic(); /* See above. */
100422- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100423+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100424 rcu_cleanup_after_idle();
100425 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
100426 if (!user && !is_idle_task(current)) {
100427@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
100428 * to be in the outermost NMI handler that interrupted an RCU-idle
100429 * period (observation due to Andy Lutomirski).
100430 */
100431- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
100432+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
100433 smp_mb__before_atomic(); /* Force delay from prior write. */
100434- atomic_inc(&rdtp->dynticks);
100435+ atomic_inc_unchecked(&rdtp->dynticks);
100436 /* atomic_inc() before later RCU read-side crit sects */
100437 smp_mb__after_atomic(); /* See above. */
100438- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100439+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100440 incby = 1;
100441 }
100442 rdtp->dynticks_nmi_nesting += incby;
100443@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
100444 * to us!)
100445 */
100446 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
100447- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
100448+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
100449
100450 /*
100451 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
100452@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
100453 rdtp->dynticks_nmi_nesting = 0;
100454 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
100455 smp_mb__before_atomic(); /* See above. */
100456- atomic_inc(&rdtp->dynticks);
100457+ atomic_inc_unchecked(&rdtp->dynticks);
100458 smp_mb__after_atomic(); /* Force delay to next write. */
100459- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
100460+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
100461 }
100462
100463 /**
100464@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
100465 */
100466 bool notrace __rcu_is_watching(void)
100467 {
100468- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100469+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
100470 }
100471
100472 /**
100473@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
100474 static int dyntick_save_progress_counter(struct rcu_data *rdp,
100475 bool *isidle, unsigned long *maxj)
100476 {
100477- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
100478+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100479 rcu_sysidle_check_cpu(rdp, isidle, maxj);
100480 if ((rdp->dynticks_snap & 0x1) == 0) {
100481 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
100482@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
100483 } else {
100484 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
100485 rdp->mynode->gpnum))
100486- ACCESS_ONCE(rdp->gpwrap) = true;
100487+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
100488 return 0;
100489 }
100490 }
100491@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100492 int *rcrmp;
100493 unsigned int snap;
100494
100495- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
100496+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
100497 snap = (unsigned int)rdp->dynticks_snap;
100498
100499 /*
100500@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
100501 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
100502 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
100503 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
100504- ACCESS_ONCE(rdp->cond_resched_completed) =
100505+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
100506 ACCESS_ONCE(rdp->mynode->completed);
100507 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
100508- ACCESS_ONCE(*rcrmp) =
100509+ ACCESS_ONCE_RW(*rcrmp) =
100510 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
100511 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
100512 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
100513@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
100514 rsp->gp_start = j;
100515 smp_wmb(); /* Record start time before stall time. */
100516 j1 = rcu_jiffies_till_stall_check();
100517- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
100518+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
100519 rsp->jiffies_resched = j + j1 / 2;
100520 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
100521 }
100522@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
100523 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100524 return;
100525 }
100526- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100527+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
100528 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100529
100530 /*
100531@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
100532
100533 raw_spin_lock_irqsave(&rnp->lock, flags);
100534 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
100535- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
100536+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
100537 3 * rcu_jiffies_till_stall_check() + 3;
100538 raw_spin_unlock_irqrestore(&rnp->lock, flags);
100539
100540@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
100541 struct rcu_state *rsp;
100542
100543 for_each_rcu_flavor(rsp)
100544- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100545+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
100546 }
100547
100548 /*
100549@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
100550 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
100551 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
100552 zero_cpu_stall_ticks(rdp);
100553- ACCESS_ONCE(rdp->gpwrap) = false;
100554+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
100555 }
100556 return ret;
100557 }
100558@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100559 struct rcu_data *rdp;
100560 struct rcu_node *rnp = rcu_get_root(rsp);
100561
100562- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100563+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100564 rcu_bind_gp_kthread();
100565 raw_spin_lock_irq(&rnp->lock);
100566 smp_mb__after_unlock_lock();
100567@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100568 raw_spin_unlock_irq(&rnp->lock);
100569 return 0;
100570 }
100571- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100572+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
100573
100574 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
100575 /*
100576@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
100577 rdp = this_cpu_ptr(rsp->rda);
100578 rcu_preempt_check_blocked_tasks(rnp);
100579 rnp->qsmask = rnp->qsmaskinit;
100580- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
100581+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
100582 WARN_ON_ONCE(rnp->completed != rsp->completed);
100583- ACCESS_ONCE(rnp->completed) = rsp->completed;
100584+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
100585 if (rnp == rdp->mynode)
100586 (void)__note_gp_changes(rsp, rnp, rdp);
100587 rcu_preempt_boost_start_gp(rnp);
100588@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
100589 rnp->grphi, rnp->qsmask);
100590 raw_spin_unlock_irq(&rnp->lock);
100591 cond_resched_rcu_qs();
100592- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100593+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100594 }
100595
100596 mutex_unlock(&rsp->onoff_mutex);
100597@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100598 unsigned long maxj;
100599 struct rcu_node *rnp = rcu_get_root(rsp);
100600
100601- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100602+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100603 rsp->n_force_qs++;
100604 if (fqs_state == RCU_SAVE_DYNTICK) {
100605 /* Collect dyntick-idle snapshots. */
100606@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
100607 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
100608 raw_spin_lock_irq(&rnp->lock);
100609 smp_mb__after_unlock_lock();
100610- ACCESS_ONCE(rsp->gp_flags) =
100611+ ACCESS_ONCE_RW(rsp->gp_flags) =
100612 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
100613 raw_spin_unlock_irq(&rnp->lock);
100614 }
100615@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100616 struct rcu_data *rdp;
100617 struct rcu_node *rnp = rcu_get_root(rsp);
100618
100619- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100620+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100621 raw_spin_lock_irq(&rnp->lock);
100622 smp_mb__after_unlock_lock();
100623 gp_duration = jiffies - rsp->gp_start;
100624@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100625 rcu_for_each_node_breadth_first(rsp, rnp) {
100626 raw_spin_lock_irq(&rnp->lock);
100627 smp_mb__after_unlock_lock();
100628- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
100629+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
100630 rdp = this_cpu_ptr(rsp->rda);
100631 if (rnp == rdp->mynode)
100632 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
100633@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100634 nocb += rcu_future_gp_cleanup(rsp, rnp);
100635 raw_spin_unlock_irq(&rnp->lock);
100636 cond_resched_rcu_qs();
100637- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100638+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100639 }
100640 rnp = rcu_get_root(rsp);
100641 raw_spin_lock_irq(&rnp->lock);
100642@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
100643 rcu_nocb_gp_set(rnp, nocb);
100644
100645 /* Declare grace period done. */
100646- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
100647+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
100648 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
100649 rsp->fqs_state = RCU_GP_IDLE;
100650 rdp = this_cpu_ptr(rsp->rda);
100651 /* Advance CBs to reduce false positives below. */
100652 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
100653 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
100654- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100655+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100656 trace_rcu_grace_period(rsp->name,
100657 ACCESS_ONCE(rsp->gpnum),
100658 TPS("newreq"));
100659@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
100660 if (rcu_gp_init(rsp))
100661 break;
100662 cond_resched_rcu_qs();
100663- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100664+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100665 WARN_ON(signal_pending(current));
100666 trace_rcu_grace_period(rsp->name,
100667 ACCESS_ONCE(rsp->gpnum),
100668@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
100669 ACCESS_ONCE(rsp->gpnum),
100670 TPS("fqsend"));
100671 cond_resched_rcu_qs();
100672- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100673+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100674 } else {
100675 /* Deal with stray signal. */
100676 cond_resched_rcu_qs();
100677- ACCESS_ONCE(rsp->gp_activity) = jiffies;
100678+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
100679 WARN_ON(signal_pending(current));
100680 trace_rcu_grace_period(rsp->name,
100681 ACCESS_ONCE(rsp->gpnum),
100682@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
100683 */
100684 return false;
100685 }
100686- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100687+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
100688 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
100689 TPS("newreq"));
100690
100691@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
100692 rsp->qlen += rdp->qlen;
100693 rdp->n_cbs_orphaned += rdp->qlen;
100694 rdp->qlen_lazy = 0;
100695- ACCESS_ONCE(rdp->qlen) = 0;
100696+ ACCESS_ONCE_RW(rdp->qlen) = 0;
100697 }
100698
100699 /*
100700@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
100701 }
100702 smp_mb(); /* List handling before counting for rcu_barrier(). */
100703 rdp->qlen_lazy -= count_lazy;
100704- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
100705+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
100706 rdp->n_cbs_invoked += count;
100707
100708 /* Reinstate batch limit if we have worked down the excess. */
100709@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
100710 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100711 return; /* Someone beat us to it. */
100712 }
100713- ACCESS_ONCE(rsp->gp_flags) =
100714+ ACCESS_ONCE_RW(rsp->gp_flags) =
100715 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
100716 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
100717 rcu_gp_kthread_wake(rsp);
100718@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
100719 /*
100720 * Do RCU core processing for the current CPU.
100721 */
100722-static void rcu_process_callbacks(struct softirq_action *unused)
100723+static void rcu_process_callbacks(void)
100724 {
100725 struct rcu_state *rsp;
100726
100727@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100728 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
100729 if (debug_rcu_head_queue(head)) {
100730 /* Probable double call_rcu(), so leak the callback. */
100731- ACCESS_ONCE(head->func) = rcu_leak_callback;
100732+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
100733 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
100734 return;
100735 }
100736@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
100737 local_irq_restore(flags);
100738 return;
100739 }
100740- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
100741+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
100742 if (lazy)
100743 rdp->qlen_lazy++;
100744 else
100745@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
100746 * counter wrap on a 32-bit system. Quite a few more CPUs would of
100747 * course be required on a 64-bit system.
100748 */
100749- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
100750+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
100751 (ulong)atomic_long_read(&rsp->expedited_done) +
100752 ULONG_MAX / 8)) {
100753 synchronize_sched();
100754- atomic_long_inc(&rsp->expedited_wrap);
100755+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
100756 return;
100757 }
100758
100759@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
100760 * Take a ticket. Note that atomic_inc_return() implies a
100761 * full memory barrier.
100762 */
100763- snap = atomic_long_inc_return(&rsp->expedited_start);
100764+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
100765 firstsnap = snap;
100766 if (!try_get_online_cpus()) {
100767 /* CPU hotplug operation in flight, fall back to normal GP. */
100768 wait_rcu_gp(call_rcu_sched);
100769- atomic_long_inc(&rsp->expedited_normal);
100770+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100771 return;
100772 }
100773 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
100774@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
100775 for_each_cpu(cpu, cm) {
100776 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
100777
100778- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
100779+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
100780 cpumask_clear_cpu(cpu, cm);
100781 }
100782 if (cpumask_weight(cm) == 0)
100783@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
100784 synchronize_sched_expedited_cpu_stop,
100785 NULL) == -EAGAIN) {
100786 put_online_cpus();
100787- atomic_long_inc(&rsp->expedited_tryfail);
100788+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
100789
100790 /* Check to see if someone else did our work for us. */
100791 s = atomic_long_read(&rsp->expedited_done);
100792 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100793 /* ensure test happens before caller kfree */
100794 smp_mb__before_atomic(); /* ^^^ */
100795- atomic_long_inc(&rsp->expedited_workdone1);
100796+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
100797 free_cpumask_var(cm);
100798 return;
100799 }
100800@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
100801 udelay(trycount * num_online_cpus());
100802 } else {
100803 wait_rcu_gp(call_rcu_sched);
100804- atomic_long_inc(&rsp->expedited_normal);
100805+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100806 free_cpumask_var(cm);
100807 return;
100808 }
100809@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
100810 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
100811 /* ensure test happens before caller kfree */
100812 smp_mb__before_atomic(); /* ^^^ */
100813- atomic_long_inc(&rsp->expedited_workdone2);
100814+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
100815 free_cpumask_var(cm);
100816 return;
100817 }
100818@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
100819 if (!try_get_online_cpus()) {
100820 /* CPU hotplug operation in flight, use normal GP. */
100821 wait_rcu_gp(call_rcu_sched);
100822- atomic_long_inc(&rsp->expedited_normal);
100823+ atomic_long_inc_unchecked(&rsp->expedited_normal);
100824 free_cpumask_var(cm);
100825 return;
100826 }
100827- snap = atomic_long_read(&rsp->expedited_start);
100828+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
100829 smp_mb(); /* ensure read is before try_stop_cpus(). */
100830 }
100831- atomic_long_inc(&rsp->expedited_stoppedcpus);
100832+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
100833
100834 all_cpus_idle:
100835 free_cpumask_var(cm);
100836@@ -3212,16 +3212,16 @@ all_cpus_idle:
100837 * than we did already did their update.
100838 */
100839 do {
100840- atomic_long_inc(&rsp->expedited_done_tries);
100841+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
100842 s = atomic_long_read(&rsp->expedited_done);
100843 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
100844 /* ensure test happens before caller kfree */
100845 smp_mb__before_atomic(); /* ^^^ */
100846- atomic_long_inc(&rsp->expedited_done_lost);
100847+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
100848 break;
100849 }
100850 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
100851- atomic_long_inc(&rsp->expedited_done_exit);
100852+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
100853
100854 put_online_cpus();
100855 }
100856@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100857 * ACCESS_ONCE() to prevent the compiler from speculating
100858 * the increment to precede the early-exit check.
100859 */
100860- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100861+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100862 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
100863 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
100864 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
100865@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
100866
100867 /* Increment ->n_barrier_done to prevent duplicate work. */
100868 smp_mb(); /* Keep increment after above mechanism. */
100869- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100870+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
100871 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
100872 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
100873 smp_mb(); /* Keep increment before caller's subsequent code. */
100874@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
100875 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
100876 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
100877 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
100878- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
100879+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
100880 rdp->cpu = cpu;
100881 rdp->rsp = rsp;
100882 rcu_boot_init_nocb_percpu_data(rdp);
100883@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
100884 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
100885 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
100886 rcu_sysidle_init_percpu_data(rdp->dynticks);
100887- atomic_set(&rdp->dynticks->dynticks,
100888- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
100889+ atomic_set_unchecked(&rdp->dynticks->dynticks,
100890+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
100891 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
100892
100893 /* Add CPU to rcu_node bitmasks. */
100894diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
100895index 119de39..f07d31a 100644
100896--- a/kernel/rcu/tree.h
100897+++ b/kernel/rcu/tree.h
100898@@ -86,11 +86,11 @@ struct rcu_dynticks {
100899 long long dynticks_nesting; /* Track irq/process nesting level. */
100900 /* Process level is worth LLONG_MAX/2. */
100901 int dynticks_nmi_nesting; /* Track NMI nesting level. */
100902- atomic_t dynticks; /* Even value for idle, else odd. */
100903+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
100904 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
100905 long long dynticks_idle_nesting;
100906 /* irq/process nesting level from idle. */
100907- atomic_t dynticks_idle; /* Even value for idle, else odd. */
100908+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
100909 /* "Idle" excludes userspace execution. */
100910 unsigned long dynticks_idle_jiffies;
100911 /* End of last non-NMI non-idle period. */
100912@@ -457,17 +457,17 @@ struct rcu_state {
100913 /* _rcu_barrier(). */
100914 /* End of fields guarded by barrier_mutex. */
100915
100916- atomic_long_t expedited_start; /* Starting ticket. */
100917- atomic_long_t expedited_done; /* Done ticket. */
100918- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
100919- atomic_long_t expedited_tryfail; /* # acquisition failures. */
100920- atomic_long_t expedited_workdone1; /* # done by others #1. */
100921- atomic_long_t expedited_workdone2; /* # done by others #2. */
100922- atomic_long_t expedited_normal; /* # fallbacks to normal. */
100923- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
100924- atomic_long_t expedited_done_tries; /* # tries to update _done. */
100925- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
100926- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
100927+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
100928+ atomic_long_t expedited_done; /* Done ticket. */
100929+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
100930+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
100931+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
100932+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
100933+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
100934+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
100935+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
100936+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
100937+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
100938
100939 unsigned long jiffies_force_qs; /* Time at which to invoke */
100940 /* force_quiescent_state(). */
100941diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
100942index 0a571e9..fbfd611 100644
100943--- a/kernel/rcu/tree_plugin.h
100944+++ b/kernel/rcu/tree_plugin.h
100945@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
100946 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
100947 {
100948 return !rcu_preempted_readers_exp(rnp) &&
100949- ACCESS_ONCE(rnp->expmask) == 0;
100950+ ACCESS_ONCE_RW(rnp->expmask) == 0;
100951 }
100952
100953 /*
100954@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
100955
100956 /* Clean up and exit. */
100957 smp_mb(); /* ensure expedited GP seen before counter increment. */
100958- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
100959+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
100960 sync_rcu_preempt_exp_count + 1;
100961 unlock_mb_ret:
100962 mutex_unlock(&sync_rcu_preempt_exp_mutex);
100963@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
100964 free_cpumask_var(cm);
100965 }
100966
100967-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
100968+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
100969 .store = &rcu_cpu_kthread_task,
100970 .thread_should_run = rcu_cpu_kthread_should_run,
100971 .thread_fn = rcu_cpu_kthread,
100972@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
100973 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
100974 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
100975 cpu, ticks_value, ticks_title,
100976- atomic_read(&rdtp->dynticks) & 0xfff,
100977+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
100978 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
100979 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
100980 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
100981@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
100982 return;
100983 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
100984 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
100985- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
100986+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
100987 wake_up(&rdp_leader->nocb_wq);
100988 }
100989 }
100990@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
100991 atomic_long_add(rhcount, &rdp->nocb_q_count);
100992 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
100993 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
100994- ACCESS_ONCE(*old_rhpp) = rhp;
100995+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
100996 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
100997 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
100998
100999@@ -2167,7 +2167,7 @@ wait_again:
101000 continue; /* No CBs here, try next follower. */
101001
101002 /* Move callbacks to wait-for-GP list, which is empty. */
101003- ACCESS_ONCE(rdp->nocb_head) = NULL;
101004+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
101005 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
101006 gotcbs = true;
101007 }
101008@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
101009 list = ACCESS_ONCE(rdp->nocb_follower_head);
101010 BUG_ON(!list);
101011 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
101012- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
101013+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
101014 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
101015
101016 /* Each pass through the following loop invokes a callback. */
101017@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
101018 if (!rcu_nocb_need_deferred_wakeup(rdp))
101019 return;
101020 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
101021- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101022+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
101023 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
101024 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
101025 }
101026@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
101027 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
101028 "rcuo%c/%d", rsp->abbr, cpu);
101029 BUG_ON(IS_ERR(t));
101030- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
101031+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
101032 }
101033
101034 /*
101035@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
101036
101037 /* Record start of fully idle period. */
101038 j = jiffies;
101039- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
101040+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
101041 smp_mb__before_atomic();
101042- atomic_inc(&rdtp->dynticks_idle);
101043+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101044 smp_mb__after_atomic();
101045- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
101046+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
101047 }
101048
101049 /*
101050@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
101051
101052 /* Record end of idle period. */
101053 smp_mb__before_atomic();
101054- atomic_inc(&rdtp->dynticks_idle);
101055+ atomic_inc_unchecked(&rdtp->dynticks_idle);
101056 smp_mb__after_atomic();
101057- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
101058+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
101059
101060 /*
101061 * If we are the timekeeping CPU, we are permitted to be non-idle
101062@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
101063 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
101064
101065 /* Pick up current idle and NMI-nesting counter and check. */
101066- cur = atomic_read(&rdtp->dynticks_idle);
101067+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
101068 if (cur & 0x1) {
101069 *isidle = false; /* We are not idle! */
101070 return;
101071@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
101072 case RCU_SYSIDLE_NOT:
101073
101074 /* First time all are idle, so note a short idle period. */
101075- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101076+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
101077 break;
101078
101079 case RCU_SYSIDLE_SHORT:
101080@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
101081 {
101082 smp_mb();
101083 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
101084- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
101085+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
101086 }
101087
101088 /*
101089@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
101090 smp_mb(); /* grace period precedes setting inuse. */
101091
101092 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
101093- ACCESS_ONCE(rshp->inuse) = 0;
101094+ ACCESS_ONCE_RW(rshp->inuse) = 0;
101095 }
101096
101097 /*
101098@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
101099 static void rcu_dynticks_task_enter(void)
101100 {
101101 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101102- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
101103+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
101104 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101105 }
101106
101107@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
101108 static void rcu_dynticks_task_exit(void)
101109 {
101110 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
101111- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
101112+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
101113 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
101114 }
101115diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
101116index fbb6240..f6c5097 100644
101117--- a/kernel/rcu/tree_trace.c
101118+++ b/kernel/rcu/tree_trace.c
101119@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
101120 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
101121 rdp->qs_pending);
101122 seq_printf(m, " dt=%d/%llx/%d df=%lu",
101123- atomic_read(&rdp->dynticks->dynticks),
101124+ atomic_read_unchecked(&rdp->dynticks->dynticks),
101125 rdp->dynticks->dynticks_nesting,
101126 rdp->dynticks->dynticks_nmi_nesting,
101127 rdp->dynticks_fqs);
101128@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
101129 struct rcu_state *rsp = (struct rcu_state *)m->private;
101130
101131 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",
101132- atomic_long_read(&rsp->expedited_start),
101133+ atomic_long_read_unchecked(&rsp->expedited_start),
101134 atomic_long_read(&rsp->expedited_done),
101135- atomic_long_read(&rsp->expedited_wrap),
101136- atomic_long_read(&rsp->expedited_tryfail),
101137- atomic_long_read(&rsp->expedited_workdone1),
101138- atomic_long_read(&rsp->expedited_workdone2),
101139- atomic_long_read(&rsp->expedited_normal),
101140- atomic_long_read(&rsp->expedited_stoppedcpus),
101141- atomic_long_read(&rsp->expedited_done_tries),
101142- atomic_long_read(&rsp->expedited_done_lost),
101143- atomic_long_read(&rsp->expedited_done_exit));
101144+ atomic_long_read_unchecked(&rsp->expedited_wrap),
101145+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
101146+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
101147+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
101148+ atomic_long_read_unchecked(&rsp->expedited_normal),
101149+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
101150+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
101151+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
101152+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
101153 return 0;
101154 }
101155
101156diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
101157index e0d31a3..f4dafe3 100644
101158--- a/kernel/rcu/update.c
101159+++ b/kernel/rcu/update.c
101160@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
101161 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
101162 */
101163 if (till_stall_check < 3) {
101164- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
101165+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
101166 till_stall_check = 3;
101167 } else if (till_stall_check > 300) {
101168- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
101169+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
101170 till_stall_check = 300;
101171 }
101172 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
101173@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
101174 !ACCESS_ONCE(t->on_rq) ||
101175 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
101176 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
101177- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
101178+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
101179 list_del_init(&t->rcu_tasks_holdout_list);
101180 put_task_struct(t);
101181 return;
101182@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
101183 !is_idle_task(t)) {
101184 get_task_struct(t);
101185 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
101186- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
101187+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
101188 list_add(&t->rcu_tasks_holdout_list,
101189 &rcu_tasks_holdouts);
101190 }
101191@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
101192 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
101193 BUG_ON(IS_ERR(t));
101194 smp_mb(); /* Ensure others see full kthread. */
101195- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
101196+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
101197 mutex_unlock(&rcu_tasks_kthread_mutex);
101198 }
101199
101200diff --git a/kernel/resource.c b/kernel/resource.c
101201index 19f2357..ebe7f35 100644
101202--- a/kernel/resource.c
101203+++ b/kernel/resource.c
101204@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
101205
101206 static int __init ioresources_init(void)
101207 {
101208+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101209+#ifdef CONFIG_GRKERNSEC_PROC_USER
101210+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
101211+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
101212+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101213+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
101214+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
101215+#endif
101216+#else
101217 proc_create("ioports", 0, NULL, &proc_ioports_operations);
101218 proc_create("iomem", 0, NULL, &proc_iomem_operations);
101219+#endif
101220 return 0;
101221 }
101222 __initcall(ioresources_init);
101223diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
101224index eae160d..c9aa22e 100644
101225--- a/kernel/sched/auto_group.c
101226+++ b/kernel/sched/auto_group.c
101227@@ -11,7 +11,7 @@
101228
101229 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
101230 static struct autogroup autogroup_default;
101231-static atomic_t autogroup_seq_nr;
101232+static atomic_unchecked_t autogroup_seq_nr;
101233
101234 void __init autogroup_init(struct task_struct *init_task)
101235 {
101236@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
101237
101238 kref_init(&ag->kref);
101239 init_rwsem(&ag->lock);
101240- ag->id = atomic_inc_return(&autogroup_seq_nr);
101241+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
101242 ag->tg = tg;
101243 #ifdef CONFIG_RT_GROUP_SCHED
101244 /*
101245diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
101246index 8d0f35d..c16360d 100644
101247--- a/kernel/sched/completion.c
101248+++ b/kernel/sched/completion.c
101249@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
101250 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101251 * or number of jiffies left till timeout) if completed.
101252 */
101253-long __sched
101254+long __sched __intentional_overflow(-1)
101255 wait_for_completion_interruptible_timeout(struct completion *x,
101256 unsigned long timeout)
101257 {
101258@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
101259 *
101260 * Return: -ERESTARTSYS if interrupted, 0 if completed.
101261 */
101262-int __sched wait_for_completion_killable(struct completion *x)
101263+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
101264 {
101265 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
101266 if (t == -ERESTARTSYS)
101267@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
101268 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
101269 * or number of jiffies left till timeout) if completed.
101270 */
101271-long __sched
101272+long __sched __intentional_overflow(-1)
101273 wait_for_completion_killable_timeout(struct completion *x,
101274 unsigned long timeout)
101275 {
101276diff --git a/kernel/sched/core.c b/kernel/sched/core.c
101277index f4da2cb..e44587b 100644
101278--- a/kernel/sched/core.c
101279+++ b/kernel/sched/core.c
101280@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
101281 int sysctl_numa_balancing(struct ctl_table *table, int write,
101282 void __user *buffer, size_t *lenp, loff_t *ppos)
101283 {
101284- struct ctl_table t;
101285+ ctl_table_no_const t;
101286 int err;
101287 int state = numabalancing_enabled;
101288
101289@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
101290 next->active_mm = oldmm;
101291 atomic_inc(&oldmm->mm_count);
101292 enter_lazy_tlb(oldmm, next);
101293- } else
101294+ } else {
101295 switch_mm(oldmm, mm, next);
101296+ populate_stack();
101297+ }
101298
101299 if (!prev->mm) {
101300 prev->active_mm = NULL;
101301@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
101302 /* convert nice value [19,-20] to rlimit style value [1,40] */
101303 int nice_rlim = nice_to_rlimit(nice);
101304
101305+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
101306+
101307 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
101308 capable(CAP_SYS_NICE));
101309 }
101310@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
101311 nice = task_nice(current) + increment;
101312
101313 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
101314- if (increment < 0 && !can_nice(current, nice))
101315+ if (increment < 0 && (!can_nice(current, nice) ||
101316+ gr_handle_chroot_nice()))
101317 return -EPERM;
101318
101319 retval = security_task_setnice(current, nice);
101320@@ -3462,6 +3467,7 @@ recheck:
101321 if (policy != p->policy && !rlim_rtprio)
101322 return -EPERM;
101323
101324+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
101325 /* can't increase priority */
101326 if (attr->sched_priority > p->rt_priority &&
101327 attr->sched_priority > rlim_rtprio)
101328@@ -4945,6 +4951,7 @@ void idle_task_exit(void)
101329
101330 if (mm != &init_mm) {
101331 switch_mm(mm, &init_mm, current);
101332+ populate_stack();
101333 finish_arch_post_lock_switch();
101334 }
101335 mmdrop(mm);
101336@@ -5040,7 +5047,7 @@ static void migrate_tasks(unsigned int dead_cpu)
101337
101338 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
101339
101340-static struct ctl_table sd_ctl_dir[] = {
101341+static ctl_table_no_const sd_ctl_dir[] __read_only = {
101342 {
101343 .procname = "sched_domain",
101344 .mode = 0555,
101345@@ -5057,17 +5064,17 @@ static struct ctl_table sd_ctl_root[] = {
101346 {}
101347 };
101348
101349-static struct ctl_table *sd_alloc_ctl_entry(int n)
101350+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
101351 {
101352- struct ctl_table *entry =
101353+ ctl_table_no_const *entry =
101354 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
101355
101356 return entry;
101357 }
101358
101359-static void sd_free_ctl_entry(struct ctl_table **tablep)
101360+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
101361 {
101362- struct ctl_table *entry;
101363+ ctl_table_no_const *entry;
101364
101365 /*
101366 * In the intermediate directories, both the child directory and
101367@@ -5075,22 +5082,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
101368 * will always be set. In the lowest directory the names are
101369 * static strings and all have proc handlers.
101370 */
101371- for (entry = *tablep; entry->mode; entry++) {
101372- if (entry->child)
101373- sd_free_ctl_entry(&entry->child);
101374+ for (entry = tablep; entry->mode; entry++) {
101375+ if (entry->child) {
101376+ sd_free_ctl_entry(entry->child);
101377+ pax_open_kernel();
101378+ entry->child = NULL;
101379+ pax_close_kernel();
101380+ }
101381 if (entry->proc_handler == NULL)
101382 kfree(entry->procname);
101383 }
101384
101385- kfree(*tablep);
101386- *tablep = NULL;
101387+ kfree(tablep);
101388 }
101389
101390 static int min_load_idx = 0;
101391 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
101392
101393 static void
101394-set_table_entry(struct ctl_table *entry,
101395+set_table_entry(ctl_table_no_const *entry,
101396 const char *procname, void *data, int maxlen,
101397 umode_t mode, proc_handler *proc_handler,
101398 bool load_idx)
101399@@ -5110,7 +5120,7 @@ set_table_entry(struct ctl_table *entry,
101400 static struct ctl_table *
101401 sd_alloc_ctl_domain_table(struct sched_domain *sd)
101402 {
101403- struct ctl_table *table = sd_alloc_ctl_entry(14);
101404+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
101405
101406 if (table == NULL)
101407 return NULL;
101408@@ -5148,9 +5158,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
101409 return table;
101410 }
101411
101412-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
101413+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
101414 {
101415- struct ctl_table *entry, *table;
101416+ ctl_table_no_const *entry, *table;
101417 struct sched_domain *sd;
101418 int domain_num = 0, i;
101419 char buf[32];
101420@@ -5177,11 +5187,13 @@ static struct ctl_table_header *sd_sysctl_header;
101421 static void register_sched_domain_sysctl(void)
101422 {
101423 int i, cpu_num = num_possible_cpus();
101424- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
101425+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
101426 char buf[32];
101427
101428 WARN_ON(sd_ctl_dir[0].child);
101429+ pax_open_kernel();
101430 sd_ctl_dir[0].child = entry;
101431+ pax_close_kernel();
101432
101433 if (entry == NULL)
101434 return;
101435@@ -5204,8 +5216,12 @@ static void unregister_sched_domain_sysctl(void)
101436 if (sd_sysctl_header)
101437 unregister_sysctl_table(sd_sysctl_header);
101438 sd_sysctl_header = NULL;
101439- if (sd_ctl_dir[0].child)
101440- sd_free_ctl_entry(&sd_ctl_dir[0].child);
101441+ if (sd_ctl_dir[0].child) {
101442+ sd_free_ctl_entry(sd_ctl_dir[0].child);
101443+ pax_open_kernel();
101444+ sd_ctl_dir[0].child = NULL;
101445+ pax_close_kernel();
101446+ }
101447 }
101448 #else
101449 static void register_sched_domain_sysctl(void)
101450diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
101451index 486d00c..62f3f6e 100644
101452--- a/kernel/sched/fair.c
101453+++ b/kernel/sched/fair.c
101454@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
101455
101456 static void reset_ptenuma_scan(struct task_struct *p)
101457 {
101458- ACCESS_ONCE(p->mm->numa_scan_seq)++;
101459+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
101460 p->mm->numa_scan_offset = 0;
101461 }
101462
101463@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
101464 * run_rebalance_domains is triggered when needed from the scheduler tick.
101465 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
101466 */
101467-static void run_rebalance_domains(struct softirq_action *h)
101468+static __latent_entropy void run_rebalance_domains(void)
101469 {
101470 struct rq *this_rq = this_rq();
101471 enum cpu_idle_type idle = this_rq->idle_balance ?
101472diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
101473index dc0f435..ae2e085 100644
101474--- a/kernel/sched/sched.h
101475+++ b/kernel/sched/sched.h
101476@@ -1200,7 +1200,7 @@ struct sched_class {
101477 #ifdef CONFIG_FAIR_GROUP_SCHED
101478 void (*task_move_group) (struct task_struct *p, int on_rq);
101479 #endif
101480-};
101481+} __do_const;
101482
101483 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
101484 {
101485diff --git a/kernel/signal.c b/kernel/signal.c
101486index a390499..ebe9a21 100644
101487--- a/kernel/signal.c
101488+++ b/kernel/signal.c
101489@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
101490
101491 int print_fatal_signals __read_mostly;
101492
101493-static void __user *sig_handler(struct task_struct *t, int sig)
101494+static __sighandler_t sig_handler(struct task_struct *t, int sig)
101495 {
101496 return t->sighand->action[sig - 1].sa.sa_handler;
101497 }
101498
101499-static int sig_handler_ignored(void __user *handler, int sig)
101500+static int sig_handler_ignored(__sighandler_t handler, int sig)
101501 {
101502 /* Is it explicitly or implicitly ignored? */
101503 return handler == SIG_IGN ||
101504@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
101505
101506 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
101507 {
101508- void __user *handler;
101509+ __sighandler_t handler;
101510
101511 handler = sig_handler(t, sig);
101512
101513@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
101514 atomic_inc(&user->sigpending);
101515 rcu_read_unlock();
101516
101517+ if (!override_rlimit)
101518+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
101519+
101520 if (override_rlimit ||
101521 atomic_read(&user->sigpending) <=
101522 task_rlimit(t, RLIMIT_SIGPENDING)) {
101523@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
101524
101525 int unhandled_signal(struct task_struct *tsk, int sig)
101526 {
101527- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
101528+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
101529 if (is_global_init(tsk))
101530 return 1;
101531 if (handler != SIG_IGN && handler != SIG_DFL)
101532@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
101533 }
101534 }
101535
101536+ /* allow glibc communication via tgkill to other threads in our
101537+ thread group */
101538+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
101539+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
101540+ && gr_handle_signal(t, sig))
101541+ return -EPERM;
101542+
101543 return security_task_kill(t, info, sig, 0);
101544 }
101545
101546@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101547 return send_signal(sig, info, p, 1);
101548 }
101549
101550-static int
101551+int
101552 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101553 {
101554 return send_signal(sig, info, t, 0);
101555@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101556 unsigned long int flags;
101557 int ret, blocked, ignored;
101558 struct k_sigaction *action;
101559+ int is_unhandled = 0;
101560
101561 spin_lock_irqsave(&t->sighand->siglock, flags);
101562 action = &t->sighand->action[sig-1];
101563@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
101564 }
101565 if (action->sa.sa_handler == SIG_DFL)
101566 t->signal->flags &= ~SIGNAL_UNKILLABLE;
101567+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
101568+ is_unhandled = 1;
101569 ret = specific_send_sig_info(sig, info, t);
101570 spin_unlock_irqrestore(&t->sighand->siglock, flags);
101571
101572+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
101573+ normal operation */
101574+ if (is_unhandled) {
101575+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
101576+ gr_handle_crash(t, sig);
101577+ }
101578+
101579 return ret;
101580 }
101581
101582@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
101583 ret = check_kill_permission(sig, info, p);
101584 rcu_read_unlock();
101585
101586- if (!ret && sig)
101587+ if (!ret && sig) {
101588 ret = do_send_sig_info(sig, info, p, true);
101589+ if (!ret)
101590+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
101591+ }
101592
101593 return ret;
101594 }
101595@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
101596 int error = -ESRCH;
101597
101598 rcu_read_lock();
101599- p = find_task_by_vpid(pid);
101600+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
101601+ /* allow glibc communication via tgkill to other threads in our
101602+ thread group */
101603+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
101604+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
101605+ p = find_task_by_vpid_unrestricted(pid);
101606+ else
101607+#endif
101608+ p = find_task_by_vpid(pid);
101609 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
101610 error = check_kill_permission(sig, info, p);
101611 /*
101612@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
101613 }
101614 seg = get_fs();
101615 set_fs(KERNEL_DS);
101616- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
101617- (stack_t __force __user *) &uoss,
101618+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
101619+ (stack_t __force_user *) &uoss,
101620 compat_user_stack_pointer());
101621 set_fs(seg);
101622 if (ret >= 0 && uoss_ptr) {
101623diff --git a/kernel/smpboot.c b/kernel/smpboot.c
101624index 40190f2..8861d40 100644
101625--- a/kernel/smpboot.c
101626+++ b/kernel/smpboot.c
101627@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
101628 }
101629 smpboot_unpark_thread(plug_thread, cpu);
101630 }
101631- list_add(&plug_thread->list, &hotplug_threads);
101632+ pax_list_add(&plug_thread->list, &hotplug_threads);
101633 out:
101634 mutex_unlock(&smpboot_threads_lock);
101635 put_online_cpus();
101636@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
101637 {
101638 get_online_cpus();
101639 mutex_lock(&smpboot_threads_lock);
101640- list_del(&plug_thread->list);
101641+ pax_list_del(&plug_thread->list);
101642 smpboot_destroy_threads(plug_thread);
101643 mutex_unlock(&smpboot_threads_lock);
101644 put_online_cpus();
101645diff --git a/kernel/softirq.c b/kernel/softirq.c
101646index 479e443..66d845e1 100644
101647--- a/kernel/softirq.c
101648+++ b/kernel/softirq.c
101649@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
101650 EXPORT_SYMBOL(irq_stat);
101651 #endif
101652
101653-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
101654+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
101655
101656 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
101657
101658@@ -270,7 +270,7 @@ restart:
101659 kstat_incr_softirqs_this_cpu(vec_nr);
101660
101661 trace_softirq_entry(vec_nr);
101662- h->action(h);
101663+ h->action();
101664 trace_softirq_exit(vec_nr);
101665 if (unlikely(prev_count != preempt_count())) {
101666 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
101667@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
101668 or_softirq_pending(1UL << nr);
101669 }
101670
101671-void open_softirq(int nr, void (*action)(struct softirq_action *))
101672+void __init open_softirq(int nr, void (*action)(void))
101673 {
101674 softirq_vec[nr].action = action;
101675 }
101676@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
101677 }
101678 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
101679
101680-static void tasklet_action(struct softirq_action *a)
101681+static void tasklet_action(void)
101682 {
101683 struct tasklet_struct *list;
101684
101685@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
101686 }
101687 }
101688
101689-static void tasklet_hi_action(struct softirq_action *a)
101690+static __latent_entropy void tasklet_hi_action(void)
101691 {
101692 struct tasklet_struct *list;
101693
101694@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
101695 .notifier_call = cpu_callback
101696 };
101697
101698-static struct smp_hotplug_thread softirq_threads = {
101699+static struct smp_hotplug_thread softirq_threads __read_only = {
101700 .store = &ksoftirqd,
101701 .thread_should_run = ksoftirqd_should_run,
101702 .thread_fn = run_ksoftirqd,
101703diff --git a/kernel/sys.c b/kernel/sys.c
101704index a03d9cd..55dbe9c 100644
101705--- a/kernel/sys.c
101706+++ b/kernel/sys.c
101707@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
101708 error = -EACCES;
101709 goto out;
101710 }
101711+
101712+ if (gr_handle_chroot_setpriority(p, niceval)) {
101713+ error = -EACCES;
101714+ goto out;
101715+ }
101716+
101717 no_nice = security_task_setnice(p, niceval);
101718 if (no_nice) {
101719 error = no_nice;
101720@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
101721 goto error;
101722 }
101723
101724+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
101725+ goto error;
101726+
101727+ if (!gid_eq(new->gid, old->gid)) {
101728+ /* make sure we generate a learn log for what will
101729+ end up being a role transition after a full-learning
101730+ policy is generated
101731+ CAP_SETGID is required to perform a transition
101732+ we may not log a CAP_SETGID check above, e.g.
101733+ in the case where new rgid = old egid
101734+ */
101735+ gr_learn_cap(current, new, CAP_SETGID);
101736+ }
101737+
101738 if (rgid != (gid_t) -1 ||
101739 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
101740 new->sgid = new->egid;
101741@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
101742 old = current_cred();
101743
101744 retval = -EPERM;
101745+
101746+ if (gr_check_group_change(kgid, kgid, kgid))
101747+ goto error;
101748+
101749 if (ns_capable(old->user_ns, CAP_SETGID))
101750 new->gid = new->egid = new->sgid = new->fsgid = kgid;
101751 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
101752@@ -417,7 +441,7 @@ error:
101753 /*
101754 * change the user struct in a credentials set to match the new UID
101755 */
101756-static int set_user(struct cred *new)
101757+int set_user(struct cred *new)
101758 {
101759 struct user_struct *new_user;
101760
101761@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
101762 goto error;
101763 }
101764
101765+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
101766+ goto error;
101767+
101768 if (!uid_eq(new->uid, old->uid)) {
101769+ /* make sure we generate a learn log for what will
101770+ end up being a role transition after a full-learning
101771+ policy is generated
101772+ CAP_SETUID is required to perform a transition
101773+ we may not log a CAP_SETUID check above, e.g.
101774+ in the case where new ruid = old euid
101775+ */
101776+ gr_learn_cap(current, new, CAP_SETUID);
101777 retval = set_user(new);
101778 if (retval < 0)
101779 goto error;
101780@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
101781 old = current_cred();
101782
101783 retval = -EPERM;
101784+
101785+ if (gr_check_crash_uid(kuid))
101786+ goto error;
101787+ if (gr_check_user_change(kuid, kuid, kuid))
101788+ goto error;
101789+
101790 if (ns_capable(old->user_ns, CAP_SETUID)) {
101791 new->suid = new->uid = kuid;
101792 if (!uid_eq(kuid, old->uid)) {
101793@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
101794 goto error;
101795 }
101796
101797+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
101798+ goto error;
101799+
101800 if (ruid != (uid_t) -1) {
101801 new->uid = kruid;
101802 if (!uid_eq(kruid, old->uid)) {
101803@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
101804 goto error;
101805 }
101806
101807+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
101808+ goto error;
101809+
101810 if (rgid != (gid_t) -1)
101811 new->gid = krgid;
101812 if (egid != (gid_t) -1)
101813@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
101814 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
101815 ns_capable(old->user_ns, CAP_SETUID)) {
101816 if (!uid_eq(kuid, old->fsuid)) {
101817+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
101818+ goto error;
101819+
101820 new->fsuid = kuid;
101821 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
101822 goto change_okay;
101823 }
101824 }
101825
101826+error:
101827 abort_creds(new);
101828 return old_fsuid;
101829
101830@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
101831 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
101832 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
101833 ns_capable(old->user_ns, CAP_SETGID)) {
101834+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
101835+ goto error;
101836+
101837 if (!gid_eq(kgid, old->fsgid)) {
101838 new->fsgid = kgid;
101839 goto change_okay;
101840 }
101841 }
101842
101843+error:
101844 abort_creds(new);
101845 return old_fsgid;
101846
101847@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
101848 return -EFAULT;
101849
101850 down_read(&uts_sem);
101851- error = __copy_to_user(&name->sysname, &utsname()->sysname,
101852+ error = __copy_to_user(name->sysname, &utsname()->sysname,
101853 __OLD_UTS_LEN);
101854 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
101855- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
101856+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
101857 __OLD_UTS_LEN);
101858 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
101859- error |= __copy_to_user(&name->release, &utsname()->release,
101860+ error |= __copy_to_user(name->release, &utsname()->release,
101861 __OLD_UTS_LEN);
101862 error |= __put_user(0, name->release + __OLD_UTS_LEN);
101863- error |= __copy_to_user(&name->version, &utsname()->version,
101864+ error |= __copy_to_user(name->version, &utsname()->version,
101865 __OLD_UTS_LEN);
101866 error |= __put_user(0, name->version + __OLD_UTS_LEN);
101867- error |= __copy_to_user(&name->machine, &utsname()->machine,
101868+ error |= __copy_to_user(name->machine, &utsname()->machine,
101869 __OLD_UTS_LEN);
101870 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
101871 up_read(&uts_sem);
101872@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
101873 */
101874 new_rlim->rlim_cur = 1;
101875 }
101876+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
101877+ is changed to a lower value. Since tasks can be created by the same
101878+ user in between this limit change and an execve by this task, force
101879+ a recheck only for this task by setting PF_NPROC_EXCEEDED
101880+ */
101881+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
101882+ tsk->flags |= PF_NPROC_EXCEEDED;
101883 }
101884 if (!retval) {
101885 if (old_rlim)
101886diff --git a/kernel/sysctl.c b/kernel/sysctl.c
101887index ce410bb..cd276f0 100644
101888--- a/kernel/sysctl.c
101889+++ b/kernel/sysctl.c
101890@@ -94,7 +94,6 @@
101891
101892
101893 #if defined(CONFIG_SYSCTL)
101894-
101895 /* External variables not in a header file. */
101896 extern int max_threads;
101897 extern int suid_dumpable;
101898@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
101899
101900 /* Constants used for minimum and maximum */
101901 #ifdef CONFIG_LOCKUP_DETECTOR
101902-static int sixty = 60;
101903+static int sixty __read_only = 60;
101904 #endif
101905
101906-static int __maybe_unused neg_one = -1;
101907+static int __maybe_unused neg_one __read_only = -1;
101908
101909-static int zero;
101910-static int __maybe_unused one = 1;
101911-static int __maybe_unused two = 2;
101912-static int __maybe_unused four = 4;
101913-static unsigned long one_ul = 1;
101914-static int one_hundred = 100;
101915+static int zero __read_only = 0;
101916+static int __maybe_unused one __read_only = 1;
101917+static int __maybe_unused two __read_only = 2;
101918+static int __maybe_unused three __read_only = 3;
101919+static int __maybe_unused four __read_only = 4;
101920+static unsigned long one_ul __read_only = 1;
101921+static int one_hundred __read_only = 100;
101922 #ifdef CONFIG_PRINTK
101923-static int ten_thousand = 10000;
101924+static int ten_thousand __read_only = 10000;
101925 #endif
101926
101927 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
101928@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
101929 void __user *buffer, size_t *lenp, loff_t *ppos);
101930 #endif
101931
101932-#ifdef CONFIG_PRINTK
101933 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
101934 void __user *buffer, size_t *lenp, loff_t *ppos);
101935-#endif
101936
101937 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
101938 void __user *buffer, size_t *lenp, loff_t *ppos);
101939@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
101940
101941 #endif
101942
101943+extern struct ctl_table grsecurity_table[];
101944+
101945 static struct ctl_table kern_table[];
101946 static struct ctl_table vm_table[];
101947 static struct ctl_table fs_table[];
101948@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
101949 int sysctl_legacy_va_layout;
101950 #endif
101951
101952+#ifdef CONFIG_PAX_SOFTMODE
101953+static struct ctl_table pax_table[] = {
101954+ {
101955+ .procname = "softmode",
101956+ .data = &pax_softmode,
101957+ .maxlen = sizeof(unsigned int),
101958+ .mode = 0600,
101959+ .proc_handler = &proc_dointvec,
101960+ },
101961+
101962+ { }
101963+};
101964+#endif
101965+
101966 /* The default sysctl tables: */
101967
101968 static struct ctl_table sysctl_base_table[] = {
101969@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
101970 #endif
101971
101972 static struct ctl_table kern_table[] = {
101973+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
101974+ {
101975+ .procname = "grsecurity",
101976+ .mode = 0500,
101977+ .child = grsecurity_table,
101978+ },
101979+#endif
101980+
101981+#ifdef CONFIG_PAX_SOFTMODE
101982+ {
101983+ .procname = "pax",
101984+ .mode = 0500,
101985+ .child = pax_table,
101986+ },
101987+#endif
101988+
101989 {
101990 .procname = "sched_child_runs_first",
101991 .data = &sysctl_sched_child_runs_first,
101992@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
101993 .data = &modprobe_path,
101994 .maxlen = KMOD_PATH_LEN,
101995 .mode = 0644,
101996- .proc_handler = proc_dostring,
101997+ .proc_handler = proc_dostring_modpriv,
101998 },
101999 {
102000 .procname = "modules_disabled",
102001@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
102002 .extra1 = &zero,
102003 .extra2 = &one,
102004 },
102005+#endif
102006 {
102007 .procname = "kptr_restrict",
102008 .data = &kptr_restrict,
102009 .maxlen = sizeof(int),
102010 .mode = 0644,
102011 .proc_handler = proc_dointvec_minmax_sysadmin,
102012+#ifdef CONFIG_GRKERNSEC_HIDESYM
102013+ .extra1 = &two,
102014+#else
102015 .extra1 = &zero,
102016+#endif
102017 .extra2 = &two,
102018 },
102019-#endif
102020 {
102021 .procname = "ngroups_max",
102022 .data = &ngroups_max,
102023@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
102024 */
102025 {
102026 .procname = "perf_event_paranoid",
102027- .data = &sysctl_perf_event_paranoid,
102028- .maxlen = sizeof(sysctl_perf_event_paranoid),
102029+ .data = &sysctl_perf_event_legitimately_concerned,
102030+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
102031 .mode = 0644,
102032- .proc_handler = proc_dointvec,
102033+ /* go ahead, be a hero */
102034+ .proc_handler = proc_dointvec_minmax_sysadmin,
102035+ .extra1 = &neg_one,
102036+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
102037+ .extra2 = &three,
102038+#else
102039+ .extra2 = &two,
102040+#endif
102041 },
102042 {
102043 .procname = "perf_event_mlock_kb",
102044@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
102045 .proc_handler = proc_dointvec_minmax,
102046 .extra1 = &zero,
102047 },
102048+ {
102049+ .procname = "heap_stack_gap",
102050+ .data = &sysctl_heap_stack_gap,
102051+ .maxlen = sizeof(sysctl_heap_stack_gap),
102052+ .mode = 0644,
102053+ .proc_handler = proc_doulongvec_minmax,
102054+ },
102055 #else
102056 {
102057 .procname = "nr_trim_pages",
102058@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
102059 (char __user *)buffer, lenp, ppos);
102060 }
102061
102062+int proc_dostring_modpriv(struct ctl_table *table, int write,
102063+ void __user *buffer, size_t *lenp, loff_t *ppos)
102064+{
102065+ if (write && !capable(CAP_SYS_MODULE))
102066+ return -EPERM;
102067+
102068+ return _proc_do_string(table->data, table->maxlen, write,
102069+ buffer, lenp, ppos);
102070+}
102071+
102072 static size_t proc_skip_spaces(char **buf)
102073 {
102074 size_t ret;
102075@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
102076 len = strlen(tmp);
102077 if (len > *size)
102078 len = *size;
102079+ if (len > sizeof(tmp))
102080+ len = sizeof(tmp);
102081 if (copy_to_user(*buf, tmp, len))
102082 return -EFAULT;
102083 *size -= len;
102084@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
102085 static int proc_taint(struct ctl_table *table, int write,
102086 void __user *buffer, size_t *lenp, loff_t *ppos)
102087 {
102088- struct ctl_table t;
102089+ ctl_table_no_const t;
102090 unsigned long tmptaint = get_taint();
102091 int err;
102092
102093@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
102094 return err;
102095 }
102096
102097-#ifdef CONFIG_PRINTK
102098 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102099 void __user *buffer, size_t *lenp, loff_t *ppos)
102100 {
102101@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
102102
102103 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
102104 }
102105-#endif
102106
102107 struct do_proc_dointvec_minmax_conv_param {
102108 int *min;
102109@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
102110 return -ENOSYS;
102111 }
102112
102113+int proc_dostring_modpriv(struct ctl_table *table, int write,
102114+ void __user *buffer, size_t *lenp, loff_t *ppos)
102115+{
102116+ return -ENOSYS;
102117+}
102118+
102119 int proc_dointvec(struct ctl_table *table, int write,
102120 void __user *buffer, size_t *lenp, loff_t *ppos)
102121 {
102122@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
102123 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
102124 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
102125 EXPORT_SYMBOL(proc_dostring);
102126+EXPORT_SYMBOL(proc_dostring_modpriv);
102127 EXPORT_SYMBOL(proc_doulongvec_minmax);
102128 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
102129diff --git a/kernel/taskstats.c b/kernel/taskstats.c
102130index 21f82c2..c1984e5 100644
102131--- a/kernel/taskstats.c
102132+++ b/kernel/taskstats.c
102133@@ -28,9 +28,12 @@
102134 #include <linux/fs.h>
102135 #include <linux/file.h>
102136 #include <linux/pid_namespace.h>
102137+#include <linux/grsecurity.h>
102138 #include <net/genetlink.h>
102139 #include <linux/atomic.h>
102140
102141+extern int gr_is_taskstats_denied(int pid);
102142+
102143 /*
102144 * Maximum length of a cpumask that can be specified in
102145 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
102146@@ -567,6 +570,9 @@ err:
102147
102148 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
102149 {
102150+ if (gr_is_taskstats_denied(current->pid))
102151+ return -EACCES;
102152+
102153 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
102154 return cmd_attr_register_cpumask(info);
102155 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
102156diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
102157index 1b001ed..55ef9e4 100644
102158--- a/kernel/time/alarmtimer.c
102159+++ b/kernel/time/alarmtimer.c
102160@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
102161 struct platform_device *pdev;
102162 int error = 0;
102163 int i;
102164- struct k_clock alarm_clock = {
102165+ static struct k_clock alarm_clock = {
102166 .clock_getres = alarm_clock_getres,
102167 .clock_get = alarm_clock_get,
102168 .timer_create = alarm_timer_create,
102169diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
102170index 38f586c..14386a7 100644
102171--- a/kernel/time/hrtimer.c
102172+++ b/kernel/time/hrtimer.c
102173@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
102174 local_irq_restore(flags);
102175 }
102176
102177-static void run_hrtimer_softirq(struct softirq_action *h)
102178+static __latent_entropy void run_hrtimer_softirq(void)
102179 {
102180 hrtimer_peek_ahead_timers();
102181 }
102182diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
102183index 0075da7..63cc872 100644
102184--- a/kernel/time/posix-cpu-timers.c
102185+++ b/kernel/time/posix-cpu-timers.c
102186@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
102187
102188 static __init int init_posix_cpu_timers(void)
102189 {
102190- struct k_clock process = {
102191+ static struct k_clock process = {
102192 .clock_getres = process_cpu_clock_getres,
102193 .clock_get = process_cpu_clock_get,
102194 .timer_create = process_cpu_timer_create,
102195 .nsleep = process_cpu_nsleep,
102196 .nsleep_restart = process_cpu_nsleep_restart,
102197 };
102198- struct k_clock thread = {
102199+ static struct k_clock thread = {
102200 .clock_getres = thread_cpu_clock_getres,
102201 .clock_get = thread_cpu_clock_get,
102202 .timer_create = thread_cpu_timer_create,
102203diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
102204index 31ea01f..7fc61ef 100644
102205--- a/kernel/time/posix-timers.c
102206+++ b/kernel/time/posix-timers.c
102207@@ -43,6 +43,7 @@
102208 #include <linux/hash.h>
102209 #include <linux/posix-clock.h>
102210 #include <linux/posix-timers.h>
102211+#include <linux/grsecurity.h>
102212 #include <linux/syscalls.h>
102213 #include <linux/wait.h>
102214 #include <linux/workqueue.h>
102215@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
102216 * which we beg off on and pass to do_sys_settimeofday().
102217 */
102218
102219-static struct k_clock posix_clocks[MAX_CLOCKS];
102220+static struct k_clock *posix_clocks[MAX_CLOCKS];
102221
102222 /*
102223 * These ones are defined below.
102224@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
102225 */
102226 static __init int init_posix_timers(void)
102227 {
102228- struct k_clock clock_realtime = {
102229+ static struct k_clock clock_realtime = {
102230 .clock_getres = hrtimer_get_res,
102231 .clock_get = posix_clock_realtime_get,
102232 .clock_set = posix_clock_realtime_set,
102233@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
102234 .timer_get = common_timer_get,
102235 .timer_del = common_timer_del,
102236 };
102237- struct k_clock clock_monotonic = {
102238+ static struct k_clock clock_monotonic = {
102239 .clock_getres = hrtimer_get_res,
102240 .clock_get = posix_ktime_get_ts,
102241 .nsleep = common_nsleep,
102242@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
102243 .timer_get = common_timer_get,
102244 .timer_del = common_timer_del,
102245 };
102246- struct k_clock clock_monotonic_raw = {
102247+ static struct k_clock clock_monotonic_raw = {
102248 .clock_getres = hrtimer_get_res,
102249 .clock_get = posix_get_monotonic_raw,
102250 };
102251- struct k_clock clock_realtime_coarse = {
102252+ static struct k_clock clock_realtime_coarse = {
102253 .clock_getres = posix_get_coarse_res,
102254 .clock_get = posix_get_realtime_coarse,
102255 };
102256- struct k_clock clock_monotonic_coarse = {
102257+ static struct k_clock clock_monotonic_coarse = {
102258 .clock_getres = posix_get_coarse_res,
102259 .clock_get = posix_get_monotonic_coarse,
102260 };
102261- struct k_clock clock_tai = {
102262+ static struct k_clock clock_tai = {
102263 .clock_getres = hrtimer_get_res,
102264 .clock_get = posix_get_tai,
102265 .nsleep = common_nsleep,
102266@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
102267 .timer_get = common_timer_get,
102268 .timer_del = common_timer_del,
102269 };
102270- struct k_clock clock_boottime = {
102271+ static struct k_clock clock_boottime = {
102272 .clock_getres = hrtimer_get_res,
102273 .clock_get = posix_get_boottime,
102274 .nsleep = common_nsleep,
102275@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
102276 return;
102277 }
102278
102279- posix_clocks[clock_id] = *new_clock;
102280+ posix_clocks[clock_id] = new_clock;
102281 }
102282 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
102283
102284@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
102285 return (id & CLOCKFD_MASK) == CLOCKFD ?
102286 &clock_posix_dynamic : &clock_posix_cpu;
102287
102288- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
102289+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
102290 return NULL;
102291- return &posix_clocks[id];
102292+ return posix_clocks[id];
102293 }
102294
102295 static int common_timer_create(struct k_itimer *new_timer)
102296@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
102297 struct k_clock *kc = clockid_to_kclock(which_clock);
102298 struct k_itimer *new_timer;
102299 int error, new_timer_id;
102300- sigevent_t event;
102301+ sigevent_t event = { };
102302 int it_id_set = IT_ID_NOT_SET;
102303
102304 if (!kc)
102305@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
102306 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
102307 return -EFAULT;
102308
102309+ /* only the CLOCK_REALTIME clock can be set, all other clocks
102310+ have their clock_set fptr set to a nosettime dummy function
102311+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
102312+ call common_clock_set, which calls do_sys_settimeofday, which
102313+ we hook
102314+ */
102315+
102316 return kc->clock_set(which_clock, &new_tp);
102317 }
102318
102319diff --git a/kernel/time/time.c b/kernel/time/time.c
102320index 2c85b77..6530536 100644
102321--- a/kernel/time/time.c
102322+++ b/kernel/time/time.c
102323@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
102324 return error;
102325
102326 if (tz) {
102327+ /* we log in do_settimeofday called below, so don't log twice
102328+ */
102329+ if (!tv)
102330+ gr_log_timechange();
102331+
102332 sys_tz = *tz;
102333 update_vsyscall_tz();
102334 if (firsttime) {
102335diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
102336index 91db941..a371671 100644
102337--- a/kernel/time/timekeeping.c
102338+++ b/kernel/time/timekeeping.c
102339@@ -15,6 +15,7 @@
102340 #include <linux/init.h>
102341 #include <linux/mm.h>
102342 #include <linux/sched.h>
102343+#include <linux/grsecurity.h>
102344 #include <linux/syscore_ops.h>
102345 #include <linux/clocksource.h>
102346 #include <linux/jiffies.h>
102347@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
102348 if (!timespec64_valid_strict(ts))
102349 return -EINVAL;
102350
102351+ gr_log_timechange();
102352+
102353 raw_spin_lock_irqsave(&timekeeper_lock, flags);
102354 write_seqcount_begin(&tk_core.seq);
102355
102356diff --git a/kernel/time/timer.c b/kernel/time/timer.c
102357index 2d3f5c5..7ed7dc5 100644
102358--- a/kernel/time/timer.c
102359+++ b/kernel/time/timer.c
102360@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
102361 /*
102362 * This function runs timers and the timer-tq in bottom half context.
102363 */
102364-static void run_timer_softirq(struct softirq_action *h)
102365+static __latent_entropy void run_timer_softirq(void)
102366 {
102367 struct tvec_base *base = __this_cpu_read(tvec_bases);
102368
102369@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
102370 *
102371 * In all cases the return value is guaranteed to be non-negative.
102372 */
102373-signed long __sched schedule_timeout(signed long timeout)
102374+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
102375 {
102376 struct timer_list timer;
102377 unsigned long expire;
102378diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
102379index 61ed862..3b52c65 100644
102380--- a/kernel/time/timer_list.c
102381+++ b/kernel/time/timer_list.c
102382@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
102383
102384 static void print_name_offset(struct seq_file *m, void *sym)
102385 {
102386+#ifdef CONFIG_GRKERNSEC_HIDESYM
102387+ SEQ_printf(m, "<%p>", NULL);
102388+#else
102389 char symname[KSYM_NAME_LEN];
102390
102391 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
102392 SEQ_printf(m, "<%pK>", sym);
102393 else
102394 SEQ_printf(m, "%s", symname);
102395+#endif
102396 }
102397
102398 static void
102399@@ -119,7 +123,11 @@ next_one:
102400 static void
102401 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
102402 {
102403+#ifdef CONFIG_GRKERNSEC_HIDESYM
102404+ SEQ_printf(m, " .base: %p\n", NULL);
102405+#else
102406 SEQ_printf(m, " .base: %pK\n", base);
102407+#endif
102408 SEQ_printf(m, " .index: %d\n",
102409 base->index);
102410 SEQ_printf(m, " .resolution: %Lu nsecs\n",
102411@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
102412 {
102413 struct proc_dir_entry *pe;
102414
102415+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102416+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
102417+#else
102418 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
102419+#endif
102420 if (!pe)
102421 return -ENOMEM;
102422 return 0;
102423diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
102424index 1fb08f2..ca4bb1e 100644
102425--- a/kernel/time/timer_stats.c
102426+++ b/kernel/time/timer_stats.c
102427@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
102428 static unsigned long nr_entries;
102429 static struct entry entries[MAX_ENTRIES];
102430
102431-static atomic_t overflow_count;
102432+static atomic_unchecked_t overflow_count;
102433
102434 /*
102435 * The entries are in a hash-table, for fast lookup:
102436@@ -140,7 +140,7 @@ static void reset_entries(void)
102437 nr_entries = 0;
102438 memset(entries, 0, sizeof(entries));
102439 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
102440- atomic_set(&overflow_count, 0);
102441+ atomic_set_unchecked(&overflow_count, 0);
102442 }
102443
102444 static struct entry *alloc_entry(void)
102445@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102446 if (likely(entry))
102447 entry->count++;
102448 else
102449- atomic_inc(&overflow_count);
102450+ atomic_inc_unchecked(&overflow_count);
102451
102452 out_unlock:
102453 raw_spin_unlock_irqrestore(lock, flags);
102454@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
102455
102456 static void print_name_offset(struct seq_file *m, unsigned long addr)
102457 {
102458+#ifdef CONFIG_GRKERNSEC_HIDESYM
102459+ seq_printf(m, "<%p>", NULL);
102460+#else
102461 char symname[KSYM_NAME_LEN];
102462
102463 if (lookup_symbol_name(addr, symname) < 0)
102464- seq_printf(m, "<%p>", (void *)addr);
102465+ seq_printf(m, "<%pK>", (void *)addr);
102466 else
102467 seq_printf(m, "%s", symname);
102468+#endif
102469 }
102470
102471 static int tstats_show(struct seq_file *m, void *v)
102472@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
102473
102474 seq_puts(m, "Timer Stats Version: v0.3\n");
102475 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
102476- if (atomic_read(&overflow_count))
102477- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
102478+ if (atomic_read_unchecked(&overflow_count))
102479+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
102480 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
102481
102482 for (i = 0; i < nr_entries; i++) {
102483@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
102484 {
102485 struct proc_dir_entry *pe;
102486
102487+#ifdef CONFIG_GRKERNSEC_PROC_ADD
102488+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
102489+#else
102490 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
102491+#endif
102492 if (!pe)
102493 return -ENOMEM;
102494 return 0;
102495diff --git a/kernel/torture.c b/kernel/torture.c
102496index dd70993..0bf694b 100644
102497--- a/kernel/torture.c
102498+++ b/kernel/torture.c
102499@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
102500 mutex_lock(&fullstop_mutex);
102501 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
102502 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
102503- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
102504+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
102505 } else {
102506 pr_warn("Concurrent rmmod and shutdown illegal!\n");
102507 }
102508@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
102509 if (!torture_must_stop()) {
102510 if (stutter > 1) {
102511 schedule_timeout_interruptible(stutter - 1);
102512- ACCESS_ONCE(stutter_pause_test) = 2;
102513+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
102514 }
102515 schedule_timeout_interruptible(1);
102516- ACCESS_ONCE(stutter_pause_test) = 1;
102517+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
102518 }
102519 if (!torture_must_stop())
102520 schedule_timeout_interruptible(stutter);
102521- ACCESS_ONCE(stutter_pause_test) = 0;
102522+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
102523 torture_shutdown_absorb("torture_stutter");
102524 } while (!torture_must_stop());
102525 torture_kthread_stopping("torture_stutter");
102526@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
102527 schedule_timeout_uninterruptible(10);
102528 return true;
102529 }
102530- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
102531+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
102532 mutex_unlock(&fullstop_mutex);
102533 torture_shutdown_cleanup();
102534 torture_shuffle_cleanup();
102535diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
102536index 483cecf..ac46091 100644
102537--- a/kernel/trace/blktrace.c
102538+++ b/kernel/trace/blktrace.c
102539@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
102540 struct blk_trace *bt = filp->private_data;
102541 char buf[16];
102542
102543- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
102544+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
102545
102546 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
102547 }
102548@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
102549 return 1;
102550
102551 bt = buf->chan->private_data;
102552- atomic_inc(&bt->dropped);
102553+ atomic_inc_unchecked(&bt->dropped);
102554 return 0;
102555 }
102556
102557@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
102558
102559 bt->dir = dir;
102560 bt->dev = dev;
102561- atomic_set(&bt->dropped, 0);
102562+ atomic_set_unchecked(&bt->dropped, 0);
102563 INIT_LIST_HEAD(&bt->running_list);
102564
102565 ret = -EIO;
102566diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
102567index 4f22802..bd268b1 100644
102568--- a/kernel/trace/ftrace.c
102569+++ b/kernel/trace/ftrace.c
102570@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
102571 if (unlikely(ftrace_disabled))
102572 return 0;
102573
102574+ ret = ftrace_arch_code_modify_prepare();
102575+ FTRACE_WARN_ON(ret);
102576+ if (ret)
102577+ return 0;
102578+
102579 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
102580+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
102581 if (ret) {
102582 ftrace_bug(ret, rec);
102583- return 0;
102584 }
102585- return 1;
102586+ return ret ? 0 : 1;
102587 }
102588
102589 /*
102590@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
102591 if (!count)
102592 return 0;
102593
102594+ pax_open_kernel();
102595 sort(start, count, sizeof(*start),
102596 ftrace_cmp_ips, ftrace_swap_ips);
102597+ pax_close_kernel();
102598
102599 start_pg = ftrace_allocate_pages(count);
102600 if (!start_pg)
102601@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
102602
102603 if (t->ret_stack == NULL) {
102604 atomic_set(&t->tracing_graph_pause, 0);
102605- atomic_set(&t->trace_overrun, 0);
102606+ atomic_set_unchecked(&t->trace_overrun, 0);
102607 t->curr_ret_stack = -1;
102608 /* Make sure the tasks see the -1 first: */
102609 smp_wmb();
102610@@ -5876,7 +5883,7 @@ static void
102611 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
102612 {
102613 atomic_set(&t->tracing_graph_pause, 0);
102614- atomic_set(&t->trace_overrun, 0);
102615+ atomic_set_unchecked(&t->trace_overrun, 0);
102616 t->ftrace_timestamp = 0;
102617 /* make curr_ret_stack visible before we add the ret_stack */
102618 smp_wmb();
102619diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
102620index 922048a..bb71a55 100644
102621--- a/kernel/trace/ring_buffer.c
102622+++ b/kernel/trace/ring_buffer.c
102623@@ -348,9 +348,9 @@ struct buffer_data_page {
102624 */
102625 struct buffer_page {
102626 struct list_head list; /* list of buffer pages */
102627- local_t write; /* index for next write */
102628+ local_unchecked_t write; /* index for next write */
102629 unsigned read; /* index for next read */
102630- local_t entries; /* entries on this page */
102631+ local_unchecked_t entries; /* entries on this page */
102632 unsigned long real_end; /* real end of data */
102633 struct buffer_data_page *page; /* Actual data page */
102634 };
102635@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
102636 unsigned long last_overrun;
102637 local_t entries_bytes;
102638 local_t entries;
102639- local_t overrun;
102640- local_t commit_overrun;
102641- local_t dropped_events;
102642+ local_unchecked_t overrun;
102643+ local_unchecked_t commit_overrun;
102644+ local_unchecked_t dropped_events;
102645 local_t committing;
102646- local_t commits;
102647+ local_unchecked_t commits;
102648 unsigned long read;
102649 unsigned long read_bytes;
102650 u64 write_stamp;
102651@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102652 *
102653 * We add a counter to the write field to denote this.
102654 */
102655- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
102656- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
102657+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
102658+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
102659
102660 /*
102661 * Just make sure we have seen our old_write and synchronize
102662@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
102663 * cmpxchg to only update if an interrupt did not already
102664 * do it for us. If the cmpxchg fails, we don't care.
102665 */
102666- (void)local_cmpxchg(&next_page->write, old_write, val);
102667- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
102668+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
102669+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
102670
102671 /*
102672 * No need to worry about races with clearing out the commit.
102673@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
102674
102675 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
102676 {
102677- return local_read(&bpage->entries) & RB_WRITE_MASK;
102678+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
102679 }
102680
102681 static inline unsigned long rb_page_write(struct buffer_page *bpage)
102682 {
102683- return local_read(&bpage->write) & RB_WRITE_MASK;
102684+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
102685 }
102686
102687 static int
102688@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
102689 * bytes consumed in ring buffer from here.
102690 * Increment overrun to account for the lost events.
102691 */
102692- local_add(page_entries, &cpu_buffer->overrun);
102693+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
102694 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102695 }
102696
102697@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
102698 * it is our responsibility to update
102699 * the counters.
102700 */
102701- local_add(entries, &cpu_buffer->overrun);
102702+ local_add_unchecked(entries, &cpu_buffer->overrun);
102703 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
102704
102705 /*
102706@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102707 if (tail == BUF_PAGE_SIZE)
102708 tail_page->real_end = 0;
102709
102710- local_sub(length, &tail_page->write);
102711+ local_sub_unchecked(length, &tail_page->write);
102712 return;
102713 }
102714
102715@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102716 rb_event_set_padding(event);
102717
102718 /* Set the write back to the previous setting */
102719- local_sub(length, &tail_page->write);
102720+ local_sub_unchecked(length, &tail_page->write);
102721 return;
102722 }
102723
102724@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
102725
102726 /* Set write to end of buffer */
102727 length = (tail + length) - BUF_PAGE_SIZE;
102728- local_sub(length, &tail_page->write);
102729+ local_sub_unchecked(length, &tail_page->write);
102730 }
102731
102732 /*
102733@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102734 * about it.
102735 */
102736 if (unlikely(next_page == commit_page)) {
102737- local_inc(&cpu_buffer->commit_overrun);
102738+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102739 goto out_reset;
102740 }
102741
102742@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102743 * this is easy, just stop here.
102744 */
102745 if (!(buffer->flags & RB_FL_OVERWRITE)) {
102746- local_inc(&cpu_buffer->dropped_events);
102747+ local_inc_unchecked(&cpu_buffer->dropped_events);
102748 goto out_reset;
102749 }
102750
102751@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
102752 cpu_buffer->tail_page) &&
102753 (cpu_buffer->commit_page ==
102754 cpu_buffer->reader_page))) {
102755- local_inc(&cpu_buffer->commit_overrun);
102756+ local_inc_unchecked(&cpu_buffer->commit_overrun);
102757 goto out_reset;
102758 }
102759 }
102760@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102761 length += RB_LEN_TIME_EXTEND;
102762
102763 tail_page = cpu_buffer->tail_page;
102764- write = local_add_return(length, &tail_page->write);
102765+ write = local_add_return_unchecked(length, &tail_page->write);
102766
102767 /* set write to only the index of the write */
102768 write &= RB_WRITE_MASK;
102769@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
102770 kmemcheck_annotate_bitfield(event, bitfield);
102771 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
102772
102773- local_inc(&tail_page->entries);
102774+ local_inc_unchecked(&tail_page->entries);
102775
102776 /*
102777 * If this is the first commit on the page, then update
102778@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102779
102780 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
102781 unsigned long write_mask =
102782- local_read(&bpage->write) & ~RB_WRITE_MASK;
102783+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
102784 unsigned long event_length = rb_event_length(event);
102785 /*
102786 * This is on the tail page. It is possible that
102787@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102788 */
102789 old_index += write_mask;
102790 new_index += write_mask;
102791- index = local_cmpxchg(&bpage->write, old_index, new_index);
102792+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
102793 if (index == old_index) {
102794 /* update counters */
102795 local_sub(event_length, &cpu_buffer->entries_bytes);
102796@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
102797 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
102798 {
102799 local_inc(&cpu_buffer->committing);
102800- local_inc(&cpu_buffer->commits);
102801+ local_inc_unchecked(&cpu_buffer->commits);
102802 }
102803
102804 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102805@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102806 return;
102807
102808 again:
102809- commits = local_read(&cpu_buffer->commits);
102810+ commits = local_read_unchecked(&cpu_buffer->commits);
102811 /* synchronize with interrupts */
102812 barrier();
102813 if (local_read(&cpu_buffer->committing) == 1)
102814@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
102815 * updating of the commit page and the clearing of the
102816 * committing counter.
102817 */
102818- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
102819+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
102820 !local_read(&cpu_buffer->committing)) {
102821 local_inc(&cpu_buffer->committing);
102822 goto again;
102823@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
102824 barrier();
102825 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
102826 local_dec(&cpu_buffer->committing);
102827- local_dec(&cpu_buffer->commits);
102828+ local_dec_unchecked(&cpu_buffer->commits);
102829 return NULL;
102830 }
102831 #endif
102832@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102833
102834 /* Do the likely case first */
102835 if (likely(bpage->page == (void *)addr)) {
102836- local_dec(&bpage->entries);
102837+ local_dec_unchecked(&bpage->entries);
102838 return;
102839 }
102840
102841@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
102842 start = bpage;
102843 do {
102844 if (bpage->page == (void *)addr) {
102845- local_dec(&bpage->entries);
102846+ local_dec_unchecked(&bpage->entries);
102847 return;
102848 }
102849 rb_inc_page(cpu_buffer, &bpage);
102850@@ -3197,7 +3197,7 @@ static inline unsigned long
102851 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
102852 {
102853 return local_read(&cpu_buffer->entries) -
102854- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
102855+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
102856 }
102857
102858 /**
102859@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
102860 return 0;
102861
102862 cpu_buffer = buffer->buffers[cpu];
102863- ret = local_read(&cpu_buffer->overrun);
102864+ ret = local_read_unchecked(&cpu_buffer->overrun);
102865
102866 return ret;
102867 }
102868@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
102869 return 0;
102870
102871 cpu_buffer = buffer->buffers[cpu];
102872- ret = local_read(&cpu_buffer->commit_overrun);
102873+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
102874
102875 return ret;
102876 }
102877@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
102878 return 0;
102879
102880 cpu_buffer = buffer->buffers[cpu];
102881- ret = local_read(&cpu_buffer->dropped_events);
102882+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
102883
102884 return ret;
102885 }
102886@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
102887 /* if you care about this being correct, lock the buffer */
102888 for_each_buffer_cpu(buffer, cpu) {
102889 cpu_buffer = buffer->buffers[cpu];
102890- overruns += local_read(&cpu_buffer->overrun);
102891+ overruns += local_read_unchecked(&cpu_buffer->overrun);
102892 }
102893
102894 return overruns;
102895@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102896 /*
102897 * Reset the reader page to size zero.
102898 */
102899- local_set(&cpu_buffer->reader_page->write, 0);
102900- local_set(&cpu_buffer->reader_page->entries, 0);
102901+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102902+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102903 local_set(&cpu_buffer->reader_page->page->commit, 0);
102904 cpu_buffer->reader_page->real_end = 0;
102905
102906@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
102907 * want to compare with the last_overrun.
102908 */
102909 smp_mb();
102910- overwrite = local_read(&(cpu_buffer->overrun));
102911+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
102912
102913 /*
102914 * Here's the tricky part.
102915@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102916
102917 cpu_buffer->head_page
102918 = list_entry(cpu_buffer->pages, struct buffer_page, list);
102919- local_set(&cpu_buffer->head_page->write, 0);
102920- local_set(&cpu_buffer->head_page->entries, 0);
102921+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
102922+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
102923 local_set(&cpu_buffer->head_page->page->commit, 0);
102924
102925 cpu_buffer->head_page->read = 0;
102926@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
102927
102928 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
102929 INIT_LIST_HEAD(&cpu_buffer->new_pages);
102930- local_set(&cpu_buffer->reader_page->write, 0);
102931- local_set(&cpu_buffer->reader_page->entries, 0);
102932+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
102933+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
102934 local_set(&cpu_buffer->reader_page->page->commit, 0);
102935 cpu_buffer->reader_page->read = 0;
102936
102937 local_set(&cpu_buffer->entries_bytes, 0);
102938- local_set(&cpu_buffer->overrun, 0);
102939- local_set(&cpu_buffer->commit_overrun, 0);
102940- local_set(&cpu_buffer->dropped_events, 0);
102941+ local_set_unchecked(&cpu_buffer->overrun, 0);
102942+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
102943+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
102944 local_set(&cpu_buffer->entries, 0);
102945 local_set(&cpu_buffer->committing, 0);
102946- local_set(&cpu_buffer->commits, 0);
102947+ local_set_unchecked(&cpu_buffer->commits, 0);
102948 cpu_buffer->read = 0;
102949 cpu_buffer->read_bytes = 0;
102950
102951@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
102952 rb_init_page(bpage);
102953 bpage = reader->page;
102954 reader->page = *data_page;
102955- local_set(&reader->write, 0);
102956- local_set(&reader->entries, 0);
102957+ local_set_unchecked(&reader->write, 0);
102958+ local_set_unchecked(&reader->entries, 0);
102959 reader->read = 0;
102960 *data_page = bpage;
102961
102962diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
102963index 62c6506..5c25989 100644
102964--- a/kernel/trace/trace.c
102965+++ b/kernel/trace/trace.c
102966@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
102967 return 0;
102968 }
102969
102970-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
102971+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
102972 {
102973 /* do nothing if flag is already set */
102974 if (!!(trace_flags & mask) == !!enabled)
102975diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
102976index dd8205a..1aae87a 100644
102977--- a/kernel/trace/trace.h
102978+++ b/kernel/trace/trace.h
102979@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
102980 void trace_printk_init_buffers(void);
102981 void trace_printk_start_comm(void);
102982 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
102983-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
102984+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
102985
102986 /*
102987 * Normal trace_printk() and friends allocates special buffers
102988diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
102989index 57b67b1..66082a9 100644
102990--- a/kernel/trace/trace_clock.c
102991+++ b/kernel/trace/trace_clock.c
102992@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
102993 return now;
102994 }
102995
102996-static atomic64_t trace_counter;
102997+static atomic64_unchecked_t trace_counter;
102998
102999 /*
103000 * trace_clock_counter(): simply an atomic counter.
103001@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
103002 */
103003 u64 notrace trace_clock_counter(void)
103004 {
103005- return atomic64_add_return(1, &trace_counter);
103006+ return atomic64_inc_return_unchecked(&trace_counter);
103007 }
103008diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
103009index a9c10a3..1864f6b 100644
103010--- a/kernel/trace/trace_events.c
103011+++ b/kernel/trace/trace_events.c
103012@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
103013 return 0;
103014 }
103015
103016-struct ftrace_module_file_ops;
103017 static void __add_event_to_tracers(struct ftrace_event_call *call);
103018
103019 /* Add an additional event_call dynamically */
103020diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
103021index ced69da..7f2e97c 100644
103022--- a/kernel/trace/trace_events_filter.c
103023+++ b/kernel/trace/trace_events_filter.c
103024@@ -1369,19 +1369,26 @@ static int check_preds(struct filter_parse_state *ps)
103025 {
103026 int n_normal_preds = 0, n_logical_preds = 0;
103027 struct postfix_elt *elt;
103028+ int cnt = 0;
103029
103030 list_for_each_entry(elt, &ps->postfix, list) {
103031- if (elt->op == OP_NONE)
103032+ if (elt->op == OP_NONE) {
103033+ cnt++;
103034 continue;
103035+ }
103036
103037 if (elt->op == OP_AND || elt->op == OP_OR) {
103038 n_logical_preds++;
103039+ cnt--;
103040 continue;
103041 }
103042+ if (elt->op != OP_NOT)
103043+ cnt--;
103044 n_normal_preds++;
103045+ WARN_ON_ONCE(cnt < 0);
103046 }
103047
103048- if (!n_normal_preds || n_logical_preds >= n_normal_preds) {
103049+ if (cnt != 1 || !n_normal_preds || n_logical_preds >= n_normal_preds) {
103050 parse_error(ps, FILT_ERR_INVALID_FILTER, 0);
103051 return -EINVAL;
103052 }
103053diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
103054index b6fce36..d9f11a3 100644
103055--- a/kernel/trace/trace_functions_graph.c
103056+++ b/kernel/trace/trace_functions_graph.c
103057@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
103058
103059 /* The return trace stack is full */
103060 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
103061- atomic_inc(&current->trace_overrun);
103062+ atomic_inc_unchecked(&current->trace_overrun);
103063 return -EBUSY;
103064 }
103065
103066@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
103067 *ret = current->ret_stack[index].ret;
103068 trace->func = current->ret_stack[index].func;
103069 trace->calltime = current->ret_stack[index].calltime;
103070- trace->overrun = atomic_read(&current->trace_overrun);
103071+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
103072 trace->depth = index;
103073 }
103074
103075diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
103076index 7a9ba62..2e0e4a1 100644
103077--- a/kernel/trace/trace_mmiotrace.c
103078+++ b/kernel/trace/trace_mmiotrace.c
103079@@ -24,7 +24,7 @@ struct header_iter {
103080 static struct trace_array *mmio_trace_array;
103081 static bool overrun_detected;
103082 static unsigned long prev_overruns;
103083-static atomic_t dropped_count;
103084+static atomic_unchecked_t dropped_count;
103085
103086 static void mmio_reset_data(struct trace_array *tr)
103087 {
103088@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
103089
103090 static unsigned long count_overruns(struct trace_iterator *iter)
103091 {
103092- unsigned long cnt = atomic_xchg(&dropped_count, 0);
103093+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
103094 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
103095
103096 if (over > prev_overruns)
103097@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
103098 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
103099 sizeof(*entry), 0, pc);
103100 if (!event) {
103101- atomic_inc(&dropped_count);
103102+ atomic_inc_unchecked(&dropped_count);
103103 return;
103104 }
103105 entry = ring_buffer_event_data(event);
103106@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
103107 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
103108 sizeof(*entry), 0, pc);
103109 if (!event) {
103110- atomic_inc(&dropped_count);
103111+ atomic_inc_unchecked(&dropped_count);
103112 return;
103113 }
103114 entry = ring_buffer_event_data(event);
103115diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
103116index 692bf71..6d9a9cd 100644
103117--- a/kernel/trace/trace_output.c
103118+++ b/kernel/trace/trace_output.c
103119@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
103120 goto out;
103121 }
103122
103123+ pax_open_kernel();
103124 if (event->funcs->trace == NULL)
103125- event->funcs->trace = trace_nop_print;
103126+ *(void **)&event->funcs->trace = trace_nop_print;
103127 if (event->funcs->raw == NULL)
103128- event->funcs->raw = trace_nop_print;
103129+ *(void **)&event->funcs->raw = trace_nop_print;
103130 if (event->funcs->hex == NULL)
103131- event->funcs->hex = trace_nop_print;
103132+ *(void **)&event->funcs->hex = trace_nop_print;
103133 if (event->funcs->binary == NULL)
103134- event->funcs->binary = trace_nop_print;
103135+ *(void **)&event->funcs->binary = trace_nop_print;
103136+ pax_close_kernel();
103137
103138 key = event->type & (EVENT_HASHSIZE - 1);
103139
103140diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
103141index e694c9f..6775a38 100644
103142--- a/kernel/trace/trace_seq.c
103143+++ b/kernel/trace/trace_seq.c
103144@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
103145 return 0;
103146 }
103147
103148- seq_buf_path(&s->seq, path, "\n");
103149+ seq_buf_path(&s->seq, path, "\n\\");
103150
103151 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
103152 s->seq.len = save_len;
103153diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
103154index c3e4fcf..ef6cc43 100644
103155--- a/kernel/trace/trace_stack.c
103156+++ b/kernel/trace/trace_stack.c
103157@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
103158 return;
103159
103160 /* we do not handle interrupt stacks yet */
103161- if (!object_is_on_stack(stack))
103162+ if (!object_starts_on_stack(stack))
103163 return;
103164
103165 local_irq_save(flags);
103166diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
103167index f97f6e3..d367b48 100644
103168--- a/kernel/trace/trace_syscalls.c
103169+++ b/kernel/trace/trace_syscalls.c
103170@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
103171 int num;
103172
103173 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103174+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103175+ return -EINVAL;
103176
103177 mutex_lock(&syscall_trace_lock);
103178 if (!sys_perf_refcount_enter)
103179@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
103180 int num;
103181
103182 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103183+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103184+ return;
103185
103186 mutex_lock(&syscall_trace_lock);
103187 sys_perf_refcount_enter--;
103188@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
103189 int num;
103190
103191 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103192+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103193+ return -EINVAL;
103194
103195 mutex_lock(&syscall_trace_lock);
103196 if (!sys_perf_refcount_exit)
103197@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
103198 int num;
103199
103200 num = ((struct syscall_metadata *)call->data)->syscall_nr;
103201+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
103202+ return;
103203
103204 mutex_lock(&syscall_trace_lock);
103205 sys_perf_refcount_exit--;
103206diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
103207index 4109f83..fe1f830 100644
103208--- a/kernel/user_namespace.c
103209+++ b/kernel/user_namespace.c
103210@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
103211 !kgid_has_mapping(parent_ns, group))
103212 return -EPERM;
103213
103214+#ifdef CONFIG_GRKERNSEC
103215+ /*
103216+ * This doesn't really inspire confidence:
103217+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
103218+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
103219+ * Increases kernel attack surface in areas developers
103220+ * previously cared little about ("low importance due
103221+ * to requiring "root" capability")
103222+ * To be removed when this code receives *proper* review
103223+ */
103224+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
103225+ !capable(CAP_SETGID))
103226+ return -EPERM;
103227+#endif
103228+
103229 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
103230 if (!ns)
103231 return -ENOMEM;
103232@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
103233 if (atomic_read(&current->mm->mm_users) > 1)
103234 return -EINVAL;
103235
103236- if (current->fs->users != 1)
103237+ if (atomic_read(&current->fs->users) != 1)
103238 return -EINVAL;
103239
103240 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
103241diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
103242index c8eac43..4b5f08f 100644
103243--- a/kernel/utsname_sysctl.c
103244+++ b/kernel/utsname_sysctl.c
103245@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
103246 static int proc_do_uts_string(struct ctl_table *table, int write,
103247 void __user *buffer, size_t *lenp, loff_t *ppos)
103248 {
103249- struct ctl_table uts_table;
103250+ ctl_table_no_const uts_table;
103251 int r;
103252 memcpy(&uts_table, table, sizeof(uts_table));
103253 uts_table.data = get_uts(table, write);
103254diff --git a/kernel/watchdog.c b/kernel/watchdog.c
103255index 3174bf8..3553520 100644
103256--- a/kernel/watchdog.c
103257+++ b/kernel/watchdog.c
103258@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
103259 static void watchdog_nmi_disable(unsigned int cpu) { return; }
103260 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
103261
103262-static struct smp_hotplug_thread watchdog_threads = {
103263+static struct smp_hotplug_thread watchdog_threads __read_only = {
103264 .store = &softlockup_watchdog,
103265 .thread_should_run = watchdog_should_run,
103266 .thread_fn = watchdog,
103267diff --git a/kernel/workqueue.c b/kernel/workqueue.c
103268index 41ff75b..5ad683a 100644
103269--- a/kernel/workqueue.c
103270+++ b/kernel/workqueue.c
103271@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
103272 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
103273 worker_flags |= WORKER_REBOUND;
103274 worker_flags &= ~WORKER_UNBOUND;
103275- ACCESS_ONCE(worker->flags) = worker_flags;
103276+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
103277 }
103278
103279 spin_unlock_irq(&pool->lock);
103280diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
103281index c5cefb3..a4241e3 100644
103282--- a/lib/Kconfig.debug
103283+++ b/lib/Kconfig.debug
103284@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
103285
103286 config DEBUG_WW_MUTEX_SLOWPATH
103287 bool "Wait/wound mutex debugging: Slowpath testing"
103288- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103289+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103290 select DEBUG_LOCK_ALLOC
103291 select DEBUG_SPINLOCK
103292 select DEBUG_MUTEXES
103293@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
103294
103295 config DEBUG_LOCK_ALLOC
103296 bool "Lock debugging: detect incorrect freeing of live locks"
103297- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103298+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103299 select DEBUG_SPINLOCK
103300 select DEBUG_MUTEXES
103301 select LOCKDEP
103302@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
103303
103304 config PROVE_LOCKING
103305 bool "Lock debugging: prove locking correctness"
103306- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103307+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103308 select LOCKDEP
103309 select DEBUG_SPINLOCK
103310 select DEBUG_MUTEXES
103311@@ -1005,7 +1005,7 @@ config LOCKDEP
103312
103313 config LOCK_STAT
103314 bool "Lock usage statistics"
103315- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
103316+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
103317 select LOCKDEP
103318 select DEBUG_SPINLOCK
103319 select DEBUG_MUTEXES
103320@@ -1467,6 +1467,7 @@ config LATENCYTOP
103321 depends on DEBUG_KERNEL
103322 depends on STACKTRACE_SUPPORT
103323 depends on PROC_FS
103324+ depends on !GRKERNSEC_HIDESYM
103325 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
103326 select KALLSYMS
103327 select KALLSYMS_ALL
103328@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103329 config DEBUG_STRICT_USER_COPY_CHECKS
103330 bool "Strict user copy size checks"
103331 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
103332- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
103333+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
103334 help
103335 Enabling this option turns a certain set of sanity checks for user
103336 copy operations into compile time failures.
103337@@ -1614,7 +1615,7 @@ endmenu # runtime tests
103338
103339 config PROVIDE_OHCI1394_DMA_INIT
103340 bool "Remote debugging over FireWire early on boot"
103341- depends on PCI && X86
103342+ depends on PCI && X86 && !GRKERNSEC
103343 help
103344 If you want to debug problems which hang or crash the kernel early
103345 on boot and the crashing machine has a FireWire port, you can use
103346diff --git a/lib/Makefile b/lib/Makefile
103347index 58f74d2..08e011f 100644
103348--- a/lib/Makefile
103349+++ b/lib/Makefile
103350@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
103351 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
103352 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
103353 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
103354-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
103355+obj-y += list_debug.o
103356 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
103357
103358 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
103359diff --git a/lib/average.c b/lib/average.c
103360index 114d1be..ab0350c 100644
103361--- a/lib/average.c
103362+++ b/lib/average.c
103363@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
103364 {
103365 unsigned long internal = ACCESS_ONCE(avg->internal);
103366
103367- ACCESS_ONCE(avg->internal) = internal ?
103368+ ACCESS_ONCE_RW(avg->internal) = internal ?
103369 (((internal << avg->weight) - internal) +
103370 (val << avg->factor)) >> avg->weight :
103371 (val << avg->factor);
103372diff --git a/lib/bitmap.c b/lib/bitmap.c
103373index d456f4c1..29a0308 100644
103374--- a/lib/bitmap.c
103375+++ b/lib/bitmap.c
103376@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
103377 }
103378 EXPORT_SYMBOL(__bitmap_subset);
103379
103380-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103381+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
103382 {
103383 unsigned int k, lim = bits/BITS_PER_LONG;
103384 int w = 0;
103385@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
103386 {
103387 int c, old_c, totaldigits, ndigits, nchunks, nbits;
103388 u32 chunk;
103389- const char __user __force *ubuf = (const char __user __force *)buf;
103390+ const char __user *ubuf = (const char __force_user *)buf;
103391
103392 bitmap_zero(maskp, nmaskbits);
103393
103394@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
103395 {
103396 if (!access_ok(VERIFY_READ, ubuf, ulen))
103397 return -EFAULT;
103398- return __bitmap_parse((const char __force *)ubuf,
103399+ return __bitmap_parse((const char __force_kernel *)ubuf,
103400 ulen, 1, maskp, nmaskbits);
103401
103402 }
103403@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
103404 {
103405 unsigned a, b;
103406 int c, old_c, totaldigits;
103407- const char __user __force *ubuf = (const char __user __force *)buf;
103408+ const char __user *ubuf = (const char __force_user *)buf;
103409 int exp_digit, in_range;
103410
103411 totaldigits = c = 0;
103412@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
103413 {
103414 if (!access_ok(VERIFY_READ, ubuf, ulen))
103415 return -EFAULT;
103416- return __bitmap_parselist((const char __force *)ubuf,
103417+ return __bitmap_parselist((const char __force_kernel *)ubuf,
103418 ulen, 1, maskp, nmaskbits);
103419 }
103420 EXPORT_SYMBOL(bitmap_parselist_user);
103421diff --git a/lib/bug.c b/lib/bug.c
103422index 0c3bd95..5a615a1 100644
103423--- a/lib/bug.c
103424+++ b/lib/bug.c
103425@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
103426 return BUG_TRAP_TYPE_NONE;
103427
103428 bug = find_bug(bugaddr);
103429+ if (!bug)
103430+ return BUG_TRAP_TYPE_NONE;
103431
103432 file = NULL;
103433 line = 0;
103434diff --git a/lib/debugobjects.c b/lib/debugobjects.c
103435index 547f7f9..a6d4ba0 100644
103436--- a/lib/debugobjects.c
103437+++ b/lib/debugobjects.c
103438@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
103439 if (limit > 4)
103440 return;
103441
103442- is_on_stack = object_is_on_stack(addr);
103443+ is_on_stack = object_starts_on_stack(addr);
103444 if (is_on_stack == onstack)
103445 return;
103446
103447diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
103448index 6dd0335..1e9c239 100644
103449--- a/lib/decompress_bunzip2.c
103450+++ b/lib/decompress_bunzip2.c
103451@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
103452
103453 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
103454 uncompressed data. Allocate intermediate buffer for block. */
103455- bd->dbufSize = 100000*(i-BZh0);
103456+ i -= BZh0;
103457+ bd->dbufSize = 100000 * i;
103458
103459 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
103460 if (!bd->dbuf)
103461diff --git a/lib/div64.c b/lib/div64.c
103462index 4382ad7..08aa558 100644
103463--- a/lib/div64.c
103464+++ b/lib/div64.c
103465@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
103466 EXPORT_SYMBOL(__div64_32);
103467
103468 #ifndef div_s64_rem
103469-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103470+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
103471 {
103472 u64 quotient;
103473
103474@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
103475 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
103476 */
103477 #ifndef div64_u64
103478-u64 div64_u64(u64 dividend, u64 divisor)
103479+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
103480 {
103481 u32 high = divisor >> 32;
103482 u64 quot;
103483diff --git a/lib/dma-debug.c b/lib/dma-debug.c
103484index 9722bd2..0d826f4 100644
103485--- a/lib/dma-debug.c
103486+++ b/lib/dma-debug.c
103487@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
103488
103489 void dma_debug_add_bus(struct bus_type *bus)
103490 {
103491- struct notifier_block *nb;
103492+ notifier_block_no_const *nb;
103493
103494 if (dma_debug_disabled())
103495 return;
103496@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
103497
103498 static void check_for_stack(struct device *dev, void *addr)
103499 {
103500- if (object_is_on_stack(addr))
103501+ if (object_starts_on_stack(addr))
103502 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
103503 "stack [addr=%p]\n", addr);
103504 }
103505diff --git a/lib/inflate.c b/lib/inflate.c
103506index 013a761..c28f3fc 100644
103507--- a/lib/inflate.c
103508+++ b/lib/inflate.c
103509@@ -269,7 +269,7 @@ static void free(void *where)
103510 malloc_ptr = free_mem_ptr;
103511 }
103512 #else
103513-#define malloc(a) kmalloc(a, GFP_KERNEL)
103514+#define malloc(a) kmalloc((a), GFP_KERNEL)
103515 #define free(a) kfree(a)
103516 #endif
103517
103518diff --git a/lib/ioremap.c b/lib/ioremap.c
103519index 0c9216c..863bd89 100644
103520--- a/lib/ioremap.c
103521+++ b/lib/ioremap.c
103522@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
103523 unsigned long next;
103524
103525 phys_addr -= addr;
103526- pmd = pmd_alloc(&init_mm, pud, addr);
103527+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
103528 if (!pmd)
103529 return -ENOMEM;
103530 do {
103531@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
103532 unsigned long next;
103533
103534 phys_addr -= addr;
103535- pud = pud_alloc(&init_mm, pgd, addr);
103536+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
103537 if (!pud)
103538 return -ENOMEM;
103539 do {
103540diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
103541index bd2bea9..6b3c95e 100644
103542--- a/lib/is_single_threaded.c
103543+++ b/lib/is_single_threaded.c
103544@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
103545 struct task_struct *p, *t;
103546 bool ret;
103547
103548+ if (!mm)
103549+ return true;
103550+
103551 if (atomic_read(&task->signal->live) != 1)
103552 return false;
103553
103554diff --git a/lib/kobject.c b/lib/kobject.c
103555index 03d4ab3..46f6374 100644
103556--- a/lib/kobject.c
103557+++ b/lib/kobject.c
103558@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
103559
103560
103561 static DEFINE_SPINLOCK(kobj_ns_type_lock);
103562-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
103563+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
103564
103565-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103566+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
103567 {
103568 enum kobj_ns_type type = ops->type;
103569 int error;
103570diff --git a/lib/list_debug.c b/lib/list_debug.c
103571index c24c2f7..f0296f4 100644
103572--- a/lib/list_debug.c
103573+++ b/lib/list_debug.c
103574@@ -11,7 +11,9 @@
103575 #include <linux/bug.h>
103576 #include <linux/kernel.h>
103577 #include <linux/rculist.h>
103578+#include <linux/mm.h>
103579
103580+#ifdef CONFIG_DEBUG_LIST
103581 /*
103582 * Insert a new entry between two known consecutive entries.
103583 *
103584@@ -19,21 +21,40 @@
103585 * the prev/next entries already!
103586 */
103587
103588+static bool __list_add_debug(struct list_head *new,
103589+ struct list_head *prev,
103590+ struct list_head *next)
103591+{
103592+ if (unlikely(next->prev != prev)) {
103593+ printk(KERN_ERR "list_add corruption. next->prev should be "
103594+ "prev (%p), but was %p. (next=%p).\n",
103595+ prev, next->prev, next);
103596+ BUG();
103597+ return false;
103598+ }
103599+ if (unlikely(prev->next != next)) {
103600+ printk(KERN_ERR "list_add corruption. prev->next should be "
103601+ "next (%p), but was %p. (prev=%p).\n",
103602+ next, prev->next, prev);
103603+ BUG();
103604+ return false;
103605+ }
103606+ if (unlikely(new == prev || new == next)) {
103607+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
103608+ new, prev, next);
103609+ BUG();
103610+ return false;
103611+ }
103612+ return true;
103613+}
103614+
103615 void __list_add(struct list_head *new,
103616- struct list_head *prev,
103617- struct list_head *next)
103618+ struct list_head *prev,
103619+ struct list_head *next)
103620 {
103621- WARN(next->prev != prev,
103622- "list_add corruption. next->prev should be "
103623- "prev (%p), but was %p. (next=%p).\n",
103624- prev, next->prev, next);
103625- WARN(prev->next != next,
103626- "list_add corruption. prev->next should be "
103627- "next (%p), but was %p. (prev=%p).\n",
103628- next, prev->next, prev);
103629- WARN(new == prev || new == next,
103630- "list_add double add: new=%p, prev=%p, next=%p.\n",
103631- new, prev, next);
103632+ if (!__list_add_debug(new, prev, next))
103633+ return;
103634+
103635 next->prev = new;
103636 new->next = next;
103637 new->prev = prev;
103638@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
103639 }
103640 EXPORT_SYMBOL(__list_add);
103641
103642-void __list_del_entry(struct list_head *entry)
103643+static bool __list_del_entry_debug(struct list_head *entry)
103644 {
103645 struct list_head *prev, *next;
103646
103647 prev = entry->prev;
103648 next = entry->next;
103649
103650- if (WARN(next == LIST_POISON1,
103651- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103652- entry, LIST_POISON1) ||
103653- WARN(prev == LIST_POISON2,
103654- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103655- entry, LIST_POISON2) ||
103656- WARN(prev->next != entry,
103657- "list_del corruption. prev->next should be %p, "
103658- "but was %p\n", entry, prev->next) ||
103659- WARN(next->prev != entry,
103660- "list_del corruption. next->prev should be %p, "
103661- "but was %p\n", entry, next->prev))
103662+ if (unlikely(next == LIST_POISON1)) {
103663+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
103664+ entry, LIST_POISON1);
103665+ BUG();
103666+ return false;
103667+ }
103668+ if (unlikely(prev == LIST_POISON2)) {
103669+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
103670+ entry, LIST_POISON2);
103671+ BUG();
103672+ return false;
103673+ }
103674+ if (unlikely(entry->prev->next != entry)) {
103675+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
103676+ "but was %p\n", entry, prev->next);
103677+ BUG();
103678+ return false;
103679+ }
103680+ if (unlikely(entry->next->prev != entry)) {
103681+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
103682+ "but was %p\n", entry, next->prev);
103683+ BUG();
103684+ return false;
103685+ }
103686+ return true;
103687+}
103688+
103689+void __list_del_entry(struct list_head *entry)
103690+{
103691+ if (!__list_del_entry_debug(entry))
103692 return;
103693
103694- __list_del(prev, next);
103695+ __list_del(entry->prev, entry->next);
103696 }
103697 EXPORT_SYMBOL(__list_del_entry);
103698
103699@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
103700 void __list_add_rcu(struct list_head *new,
103701 struct list_head *prev, struct list_head *next)
103702 {
103703- WARN(next->prev != prev,
103704- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
103705- prev, next->prev, next);
103706- WARN(prev->next != next,
103707- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
103708- next, prev->next, prev);
103709+ if (!__list_add_debug(new, prev, next))
103710+ return;
103711+
103712 new->next = next;
103713 new->prev = prev;
103714 rcu_assign_pointer(list_next_rcu(prev), new);
103715 next->prev = new;
103716 }
103717 EXPORT_SYMBOL(__list_add_rcu);
103718+#endif
103719+
103720+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
103721+{
103722+#ifdef CONFIG_DEBUG_LIST
103723+ if (!__list_add_debug(new, prev, next))
103724+ return;
103725+#endif
103726+
103727+ pax_open_kernel();
103728+ next->prev = new;
103729+ new->next = next;
103730+ new->prev = prev;
103731+ prev->next = new;
103732+ pax_close_kernel();
103733+}
103734+EXPORT_SYMBOL(__pax_list_add);
103735+
103736+void pax_list_del(struct list_head *entry)
103737+{
103738+#ifdef CONFIG_DEBUG_LIST
103739+ if (!__list_del_entry_debug(entry))
103740+ return;
103741+#endif
103742+
103743+ pax_open_kernel();
103744+ __list_del(entry->prev, entry->next);
103745+ entry->next = LIST_POISON1;
103746+ entry->prev = LIST_POISON2;
103747+ pax_close_kernel();
103748+}
103749+EXPORT_SYMBOL(pax_list_del);
103750+
103751+void pax_list_del_init(struct list_head *entry)
103752+{
103753+ pax_open_kernel();
103754+ __list_del(entry->prev, entry->next);
103755+ INIT_LIST_HEAD(entry);
103756+ pax_close_kernel();
103757+}
103758+EXPORT_SYMBOL(pax_list_del_init);
103759+
103760+void __pax_list_add_rcu(struct list_head *new,
103761+ struct list_head *prev, struct list_head *next)
103762+{
103763+#ifdef CONFIG_DEBUG_LIST
103764+ if (!__list_add_debug(new, prev, next))
103765+ return;
103766+#endif
103767+
103768+ pax_open_kernel();
103769+ new->next = next;
103770+ new->prev = prev;
103771+ rcu_assign_pointer(list_next_rcu(prev), new);
103772+ next->prev = new;
103773+ pax_close_kernel();
103774+}
103775+EXPORT_SYMBOL(__pax_list_add_rcu);
103776+
103777+void pax_list_del_rcu(struct list_head *entry)
103778+{
103779+#ifdef CONFIG_DEBUG_LIST
103780+ if (!__list_del_entry_debug(entry))
103781+ return;
103782+#endif
103783+
103784+ pax_open_kernel();
103785+ __list_del(entry->prev, entry->next);
103786+ entry->next = LIST_POISON1;
103787+ entry->prev = LIST_POISON2;
103788+ pax_close_kernel();
103789+}
103790+EXPORT_SYMBOL(pax_list_del_rcu);
103791diff --git a/lib/lockref.c b/lib/lockref.c
103792index ecb9a66..a044fc5 100644
103793--- a/lib/lockref.c
103794+++ b/lib/lockref.c
103795@@ -48,13 +48,13 @@
103796 void lockref_get(struct lockref *lockref)
103797 {
103798 CMPXCHG_LOOP(
103799- new.count++;
103800+ __lockref_inc(&new);
103801 ,
103802 return;
103803 );
103804
103805 spin_lock(&lockref->lock);
103806- lockref->count++;
103807+ __lockref_inc(lockref);
103808 spin_unlock(&lockref->lock);
103809 }
103810 EXPORT_SYMBOL(lockref_get);
103811@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103812 int retval;
103813
103814 CMPXCHG_LOOP(
103815- new.count++;
103816- if (old.count <= 0)
103817+ __lockref_inc(&new);
103818+ if (__lockref_read(&old) <= 0)
103819 return 0;
103820 ,
103821 return 1;
103822@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
103823
103824 spin_lock(&lockref->lock);
103825 retval = 0;
103826- if (lockref->count > 0) {
103827- lockref->count++;
103828+ if (__lockref_read(lockref) > 0) {
103829+ __lockref_inc(lockref);
103830 retval = 1;
103831 }
103832 spin_unlock(&lockref->lock);
103833@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
103834 int lockref_get_or_lock(struct lockref *lockref)
103835 {
103836 CMPXCHG_LOOP(
103837- new.count++;
103838- if (old.count <= 0)
103839+ __lockref_inc(&new);
103840+ if (__lockref_read(&old) <= 0)
103841 break;
103842 ,
103843 return 1;
103844 );
103845
103846 spin_lock(&lockref->lock);
103847- if (lockref->count <= 0)
103848+ if (__lockref_read(lockref) <= 0)
103849 return 0;
103850- lockref->count++;
103851+ __lockref_inc(lockref);
103852 spin_unlock(&lockref->lock);
103853 return 1;
103854 }
103855@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
103856 int lockref_put_return(struct lockref *lockref)
103857 {
103858 CMPXCHG_LOOP(
103859- new.count--;
103860- if (old.count <= 0)
103861+ __lockref_dec(&new);
103862+ if (__lockref_read(&old) <= 0)
103863 return -1;
103864 ,
103865- return new.count;
103866+ return __lockref_read(&new);
103867 );
103868 return -1;
103869 }
103870@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
103871 int lockref_put_or_lock(struct lockref *lockref)
103872 {
103873 CMPXCHG_LOOP(
103874- new.count--;
103875- if (old.count <= 1)
103876+ __lockref_dec(&new);
103877+ if (__lockref_read(&old) <= 1)
103878 break;
103879 ,
103880 return 1;
103881 );
103882
103883 spin_lock(&lockref->lock);
103884- if (lockref->count <= 1)
103885+ if (__lockref_read(lockref) <= 1)
103886 return 0;
103887- lockref->count--;
103888+ __lockref_dec(lockref);
103889 spin_unlock(&lockref->lock);
103890 return 1;
103891 }
103892@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
103893 void lockref_mark_dead(struct lockref *lockref)
103894 {
103895 assert_spin_locked(&lockref->lock);
103896- lockref->count = -128;
103897+ __lockref_set(lockref, -128);
103898 }
103899 EXPORT_SYMBOL(lockref_mark_dead);
103900
103901@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103902 int retval;
103903
103904 CMPXCHG_LOOP(
103905- new.count++;
103906- if (old.count < 0)
103907+ __lockref_inc(&new);
103908+ if (__lockref_read(&old) < 0)
103909 return 0;
103910 ,
103911 return 1;
103912@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
103913
103914 spin_lock(&lockref->lock);
103915 retval = 0;
103916- if (lockref->count >= 0) {
103917- lockref->count++;
103918+ if (__lockref_read(lockref) >= 0) {
103919+ __lockref_inc(lockref);
103920 retval = 1;
103921 }
103922 spin_unlock(&lockref->lock);
103923diff --git a/lib/mpi/longlong.h b/lib/mpi/longlong.h
103924index aac5114..a89d041 100644
103925--- a/lib/mpi/longlong.h
103926+++ b/lib/mpi/longlong.h
103927@@ -639,7 +639,7 @@ do { \
103928 ************** MIPS *****************
103929 ***************************************/
103930 #if defined(__mips__) && W_TYPE_SIZE == 32
103931-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
103932+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
103933 #define umul_ppmm(w1, w0, u, v) \
103934 do { \
103935 UDItype __ll = (UDItype)(u) * (v); \
103936@@ -671,7 +671,7 @@ do { \
103937 ************** MIPS/64 **************
103938 ***************************************/
103939 #if (defined(__mips) && __mips >= 3) && W_TYPE_SIZE == 64
103940-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
103941+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
103942 #define umul_ppmm(w1, w0, u, v) \
103943 do { \
103944 typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \
103945diff --git a/lib/nlattr.c b/lib/nlattr.c
103946index f5907d2..36072be 100644
103947--- a/lib/nlattr.c
103948+++ b/lib/nlattr.c
103949@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
103950 {
103951 int minlen = min_t(int, count, nla_len(src));
103952
103953+ BUG_ON(minlen < 0);
103954+
103955 memcpy(dest, nla_data(src), minlen);
103956 if (count > minlen)
103957 memset(dest + minlen, 0, count - minlen);
103958diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
103959index 6111bcb..02e816b 100644
103960--- a/lib/percpu-refcount.c
103961+++ b/lib/percpu-refcount.c
103962@@ -31,7 +31,7 @@
103963 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
103964 */
103965
103966-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
103967+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
103968
103969 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
103970
103971diff --git a/lib/radix-tree.c b/lib/radix-tree.c
103972index 3d2aa27..a472f20 100644
103973--- a/lib/radix-tree.c
103974+++ b/lib/radix-tree.c
103975@@ -67,7 +67,7 @@ struct radix_tree_preload {
103976 int nr;
103977 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
103978 };
103979-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
103980+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
103981
103982 static inline void *ptr_to_indirect(void *ptr)
103983 {
103984diff --git a/lib/random32.c b/lib/random32.c
103985index 0bee183..526f12f 100644
103986--- a/lib/random32.c
103987+++ b/lib/random32.c
103988@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
103989 }
103990 #endif
103991
103992-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
103993+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
103994
103995 /**
103996 * prandom_u32_state - seeded pseudo-random number generator.
103997diff --git a/lib/rbtree.c b/lib/rbtree.c
103998index c16c81a..4dcbda1 100644
103999--- a/lib/rbtree.c
104000+++ b/lib/rbtree.c
104001@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
104002 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
104003
104004 static const struct rb_augment_callbacks dummy_callbacks = {
104005- dummy_propagate, dummy_copy, dummy_rotate
104006+ .propagate = dummy_propagate,
104007+ .copy = dummy_copy,
104008+ .rotate = dummy_rotate
104009 };
104010
104011 void rb_insert_color(struct rb_node *node, struct rb_root *root)
104012diff --git a/lib/show_mem.c b/lib/show_mem.c
104013index adc98e18..0ce83c2 100644
104014--- a/lib/show_mem.c
104015+++ b/lib/show_mem.c
104016@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
104017 quicklist_total_size());
104018 #endif
104019 #ifdef CONFIG_MEMORY_FAILURE
104020- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
104021+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
104022 #endif
104023 }
104024diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
104025index e0af6ff..fcc9f15 100644
104026--- a/lib/strncpy_from_user.c
104027+++ b/lib/strncpy_from_user.c
104028@@ -22,7 +22,7 @@
104029 */
104030 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
104031 {
104032- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104033+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104034 long res = 0;
104035
104036 /*
104037diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
104038index 1164961..02dccaa 100644
104039--- a/lib/strnlen_user.c
104040+++ b/lib/strnlen_user.c
104041@@ -26,7 +26,7 @@
104042 */
104043 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
104044 {
104045- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104046+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
104047 long align, res = 0;
104048 unsigned long c;
104049
104050diff --git a/lib/swiotlb.c b/lib/swiotlb.c
104051index 4abda07..b9d3765 100644
104052--- a/lib/swiotlb.c
104053+++ b/lib/swiotlb.c
104054@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
104055
104056 void
104057 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
104058- dma_addr_t dev_addr)
104059+ dma_addr_t dev_addr, struct dma_attrs *attrs)
104060 {
104061 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
104062
104063diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
104064index daf29a39..56f44ac 100644
104065--- a/lib/test-hexdump.c
104066+++ b/lib/test-hexdump.c
104067@@ -18,26 +18,26 @@ static const unsigned char data_b[] = {
104068
104069 static const unsigned char data_a[] = ".2.{....p..$}.4...1.....L...C...";
104070
104071-static const char *test_data_1_le[] __initconst = {
104072+static const char * const test_data_1_le[] __initconst = {
104073 "be", "32", "db", "7b", "0a", "18", "93", "b2",
104074 "70", "ba", "c4", "24", "7d", "83", "34", "9b",
104075 "a6", "9c", "31", "ad", "9c", "0f", "ac", "e9",
104076 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
104077 };
104078
104079-static const char *test_data_2_le[] __initconst = {
104080+static const char * const test_data_2_le[] __initconst = {
104081 "32be", "7bdb", "180a", "b293",
104082 "ba70", "24c4", "837d", "9b34",
104083 "9ca6", "ad31", "0f9c", "e9ac",
104084 "d14c", "9919", "b143", "0caf",
104085 };
104086
104087-static const char *test_data_4_le[] __initconst = {
104088+static const char * const test_data_4_le[] __initconst = {
104089 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
104090 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
104091 };
104092
104093-static const char *test_data_8_le[] __initconst = {
104094+static const char * const test_data_8_le[] __initconst = {
104095 "b293180a7bdb32be", "9b34837d24c4ba70",
104096 "e9ac0f9cad319ca6", "0cafb1439919d14c",
104097 };
104098diff --git a/lib/usercopy.c b/lib/usercopy.c
104099index 4f5b1dd..7cab418 100644
104100--- a/lib/usercopy.c
104101+++ b/lib/usercopy.c
104102@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
104103 WARN(1, "Buffer overflow detected!\n");
104104 }
104105 EXPORT_SYMBOL(copy_from_user_overflow);
104106+
104107+void copy_to_user_overflow(void)
104108+{
104109+ WARN(1, "Buffer overflow detected!\n");
104110+}
104111+EXPORT_SYMBOL(copy_to_user_overflow);
104112diff --git a/lib/vsprintf.c b/lib/vsprintf.c
104113index b235c96..343ffc1 100644
104114--- a/lib/vsprintf.c
104115+++ b/lib/vsprintf.c
104116@@ -16,6 +16,9 @@
104117 * - scnprintf and vscnprintf
104118 */
104119
104120+#ifdef CONFIG_GRKERNSEC_HIDESYM
104121+#define __INCLUDED_BY_HIDESYM 1
104122+#endif
104123 #include <stdarg.h>
104124 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
104125 #include <linux/types.h>
104126@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
104127 #ifdef CONFIG_KALLSYMS
104128 if (*fmt == 'B')
104129 sprint_backtrace(sym, value);
104130- else if (*fmt != 'f' && *fmt != 's')
104131+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
104132 sprint_symbol(sym, value);
104133 else
104134 sprint_symbol_no_offset(sym, value);
104135@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
104136 return number(buf, end, num, spec);
104137 }
104138
104139+#ifdef CONFIG_GRKERNSEC_HIDESYM
104140+int kptr_restrict __read_mostly = 2;
104141+#else
104142 int kptr_restrict __read_mostly;
104143+#endif
104144
104145 /*
104146 * Show a '%p' thing. A kernel extension is that the '%p' is followed
104147@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
104148 *
104149 * - 'F' For symbolic function descriptor pointers with offset
104150 * - 'f' For simple symbolic function names without offset
104151+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
104152 * - 'S' For symbolic direct pointers with offset
104153 * - 's' For symbolic direct pointers without offset
104154+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
104155 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
104156 * - 'B' For backtraced symbolic direct pointers with offset
104157 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
104158@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104159
104160 if (!ptr && *fmt != 'K') {
104161 /*
104162- * Print (null) with the same width as a pointer so it makes
104163+ * Print (nil) with the same width as a pointer so it makes
104164 * tabular output look nice.
104165 */
104166 if (spec.field_width == -1)
104167 spec.field_width = default_width;
104168- return string(buf, end, "(null)", spec);
104169+ return string(buf, end, "(nil)", spec);
104170 }
104171
104172 switch (*fmt) {
104173@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104174 /* Fallthrough */
104175 case 'S':
104176 case 's':
104177+#ifdef CONFIG_GRKERNSEC_HIDESYM
104178+ break;
104179+#else
104180+ return symbol_string(buf, end, ptr, spec, fmt);
104181+#endif
104182+ case 'X':
104183+ ptr = dereference_function_descriptor(ptr);
104184+ case 'A':
104185 case 'B':
104186 return symbol_string(buf, end, ptr, spec, fmt);
104187 case 'R':
104188@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104189 va_end(va);
104190 return buf;
104191 }
104192+ case 'P':
104193+ break;
104194 case 'K':
104195 /*
104196 * %pK cannot be used in IRQ context because its test
104197@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
104198 ((const struct file *)ptr)->f_path.dentry,
104199 spec, fmt);
104200 }
104201+
104202+#ifdef CONFIG_GRKERNSEC_HIDESYM
104203+ /* 'P' = approved pointers to copy to userland,
104204+ as in the /proc/kallsyms case, as we make it display nothing
104205+ for non-root users, and the real contents for root users
104206+ 'X' = approved simple symbols
104207+ Also ignore 'K' pointers, since we force their NULLing for non-root users
104208+ above
104209+ */
104210+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
104211+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
104212+ dump_stack();
104213+ ptr = NULL;
104214+ }
104215+#endif
104216+
104217 spec.flags |= SMALL;
104218 if (spec.field_width == -1) {
104219 spec.field_width = default_width;
104220@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104221 typeof(type) value; \
104222 if (sizeof(type) == 8) { \
104223 args = PTR_ALIGN(args, sizeof(u32)); \
104224- *(u32 *)&value = *(u32 *)args; \
104225- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
104226+ *(u32 *)&value = *(const u32 *)args; \
104227+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
104228 } else { \
104229 args = PTR_ALIGN(args, sizeof(type)); \
104230- value = *(typeof(type) *)args; \
104231+ value = *(const typeof(type) *)args; \
104232 } \
104233 args += sizeof(type); \
104234 value; \
104235@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
104236 case FORMAT_TYPE_STR: {
104237 const char *str_arg = args;
104238 args += strlen(str_arg) + 1;
104239- str = string(str, end, (char *)str_arg, spec);
104240+ str = string(str, end, str_arg, spec);
104241 break;
104242 }
104243
104244diff --git a/localversion-grsec b/localversion-grsec
104245new file mode 100644
104246index 0000000..7cd6065
104247--- /dev/null
104248+++ b/localversion-grsec
104249@@ -0,0 +1 @@
104250+-grsec
104251diff --git a/mm/Kconfig b/mm/Kconfig
104252index a03131b..1b1bafb 100644
104253--- a/mm/Kconfig
104254+++ b/mm/Kconfig
104255@@ -342,10 +342,11 @@ config KSM
104256 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
104257
104258 config DEFAULT_MMAP_MIN_ADDR
104259- int "Low address space to protect from user allocation"
104260+ int "Low address space to protect from user allocation"
104261 depends on MMU
104262- default 4096
104263- help
104264+ default 32768 if ALPHA || ARM || PARISC || SPARC32
104265+ default 65536
104266+ help
104267 This is the portion of low virtual memory which should be protected
104268 from userspace allocation. Keeping a user from writing to low pages
104269 can help reduce the impact of kernel NULL pointer bugs.
104270@@ -376,7 +377,7 @@ config MEMORY_FAILURE
104271
104272 config HWPOISON_INJECT
104273 tristate "HWPoison pages injector"
104274- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
104275+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
104276 select PROC_PAGE_MONITOR
104277
104278 config NOMMU_INITIAL_TRIM_EXCESS
104279diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
104280index 957d3da..1d34e20 100644
104281--- a/mm/Kconfig.debug
104282+++ b/mm/Kconfig.debug
104283@@ -10,6 +10,7 @@ config PAGE_EXTENSION
104284 config DEBUG_PAGEALLOC
104285 bool "Debug page memory allocations"
104286 depends on DEBUG_KERNEL
104287+ depends on !PAX_MEMORY_SANITIZE
104288 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
104289 depends on !KMEMCHECK
104290 select PAGE_EXTENSION
104291diff --git a/mm/backing-dev.c b/mm/backing-dev.c
104292index 000e7b3..aad2605 100644
104293--- a/mm/backing-dev.c
104294+++ b/mm/backing-dev.c
104295@@ -12,7 +12,7 @@
104296 #include <linux/device.h>
104297 #include <trace/events/writeback.h>
104298
104299-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
104300+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
104301
104302 struct backing_dev_info noop_backing_dev_info = {
104303 .name = "noop",
104304@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
104305 return err;
104306
104307 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
104308- atomic_long_inc_return(&bdi_seq));
104309+ atomic_long_inc_return_unchecked(&bdi_seq));
104310 if (err) {
104311 bdi_destroy(bdi);
104312 return err;
104313diff --git a/mm/filemap.c b/mm/filemap.c
104314index ad72420..0a20ef2 100644
104315--- a/mm/filemap.c
104316+++ b/mm/filemap.c
104317@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
104318 struct address_space *mapping = file->f_mapping;
104319
104320 if (!mapping->a_ops->readpage)
104321- return -ENOEXEC;
104322+ return -ENODEV;
104323 file_accessed(file);
104324 vma->vm_ops = &generic_file_vm_ops;
104325 return 0;
104326@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
104327 *pos = i_size_read(inode);
104328
104329 if (limit != RLIM_INFINITY) {
104330+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
104331 if (*pos >= limit) {
104332 send_sig(SIGXFSZ, current, 0);
104333 return -EFBIG;
104334diff --git a/mm/gup.c b/mm/gup.c
104335index a6e24e2..72dd2cf 100644
104336--- a/mm/gup.c
104337+++ b/mm/gup.c
104338@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
104339 unsigned int fault_flags = 0;
104340 int ret;
104341
104342- /* For mlock, just skip the stack guard page. */
104343- if ((*flags & FOLL_MLOCK) &&
104344- (stack_guard_page_start(vma, address) ||
104345- stack_guard_page_end(vma, address + PAGE_SIZE)))
104346- return -ENOENT;
104347 if (*flags & FOLL_WRITE)
104348 fault_flags |= FAULT_FLAG_WRITE;
104349 if (nonblocking)
104350@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104351 if (!(gup_flags & FOLL_FORCE))
104352 gup_flags |= FOLL_NUMA;
104353
104354- do {
104355+ while (nr_pages) {
104356 struct page *page;
104357 unsigned int foll_flags = gup_flags;
104358 unsigned int page_increm;
104359
104360 /* first iteration or cross vma bound */
104361 if (!vma || start >= vma->vm_end) {
104362- vma = find_extend_vma(mm, start);
104363+ vma = find_vma(mm, start);
104364 if (!vma && in_gate_area(mm, start)) {
104365 int ret;
104366 ret = get_gate_page(mm, start & PAGE_MASK,
104367@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
104368 goto next_page;
104369 }
104370
104371- if (!vma || check_vma_flags(vma, gup_flags))
104372+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
104373 return i ? : -EFAULT;
104374 if (is_vm_hugetlb_page(vma)) {
104375 i = follow_hugetlb_page(mm, vma, pages, vmas,
104376@@ -509,7 +504,7 @@ next_page:
104377 i += page_increm;
104378 start += page_increm * PAGE_SIZE;
104379 nr_pages -= page_increm;
104380- } while (nr_pages);
104381+ }
104382 return i;
104383 }
104384 EXPORT_SYMBOL(__get_user_pages);
104385diff --git a/mm/highmem.c b/mm/highmem.c
104386index 123bcd3..0de52ba 100644
104387--- a/mm/highmem.c
104388+++ b/mm/highmem.c
104389@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
104390 * So no dangers, even with speculative execution.
104391 */
104392 page = pte_page(pkmap_page_table[i]);
104393+ pax_open_kernel();
104394 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
104395-
104396+ pax_close_kernel();
104397 set_page_address(page, NULL);
104398 need_flush = 1;
104399 }
104400@@ -259,9 +260,11 @@ start:
104401 }
104402 }
104403 vaddr = PKMAP_ADDR(last_pkmap_nr);
104404+
104405+ pax_open_kernel();
104406 set_pte_at(&init_mm, vaddr,
104407 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
104408-
104409+ pax_close_kernel();
104410 pkmap_count[last_pkmap_nr] = 1;
104411 set_page_address(page, (void *)vaddr);
104412
104413diff --git a/mm/hugetlb.c b/mm/hugetlb.c
104414index caad3c5..4f68807 100644
104415--- a/mm/hugetlb.c
104416+++ b/mm/hugetlb.c
104417@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104418 struct ctl_table *table, int write,
104419 void __user *buffer, size_t *length, loff_t *ppos)
104420 {
104421+ ctl_table_no_const t;
104422 struct hstate *h = &default_hstate;
104423 unsigned long tmp = h->max_huge_pages;
104424 int ret;
104425@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
104426 if (!hugepages_supported())
104427 return -ENOTSUPP;
104428
104429- table->data = &tmp;
104430- table->maxlen = sizeof(unsigned long);
104431- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104432+ t = *table;
104433+ t.data = &tmp;
104434+ t.maxlen = sizeof(unsigned long);
104435+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
104436 if (ret)
104437 goto out;
104438
104439@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104440 struct hstate *h = &default_hstate;
104441 unsigned long tmp;
104442 int ret;
104443+ ctl_table_no_const hugetlb_table;
104444
104445 if (!hugepages_supported())
104446 return -ENOTSUPP;
104447@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
104448 if (write && hstate_is_gigantic(h))
104449 return -EINVAL;
104450
104451- table->data = &tmp;
104452- table->maxlen = sizeof(unsigned long);
104453- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
104454+ hugetlb_table = *table;
104455+ hugetlb_table.data = &tmp;
104456+ hugetlb_table.maxlen = sizeof(unsigned long);
104457+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
104458 if (ret)
104459 goto out;
104460
104461@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
104462 i_mmap_unlock_write(mapping);
104463 }
104464
104465+#ifdef CONFIG_PAX_SEGMEXEC
104466+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
104467+{
104468+ struct mm_struct *mm = vma->vm_mm;
104469+ struct vm_area_struct *vma_m;
104470+ unsigned long address_m;
104471+ pte_t *ptep_m;
104472+
104473+ vma_m = pax_find_mirror_vma(vma);
104474+ if (!vma_m)
104475+ return;
104476+
104477+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104478+ address_m = address + SEGMEXEC_TASK_SIZE;
104479+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
104480+ get_page(page_m);
104481+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
104482+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
104483+}
104484+#endif
104485+
104486 /*
104487 * Hugetlb_cow() should be called with page lock of the original hugepage held.
104488 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
104489@@ -2912,6 +2937,11 @@ retry_avoidcopy:
104490 make_huge_pte(vma, new_page, 1));
104491 page_remove_rmap(old_page);
104492 hugepage_add_new_anon_rmap(new_page, vma, address);
104493+
104494+#ifdef CONFIG_PAX_SEGMEXEC
104495+ pax_mirror_huge_pte(vma, address, new_page);
104496+#endif
104497+
104498 /* Make the old page be freed below */
104499 new_page = old_page;
104500 }
104501@@ -3072,6 +3102,10 @@ retry:
104502 && (vma->vm_flags & VM_SHARED)));
104503 set_huge_pte_at(mm, address, ptep, new_pte);
104504
104505+#ifdef CONFIG_PAX_SEGMEXEC
104506+ pax_mirror_huge_pte(vma, address, page);
104507+#endif
104508+
104509 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
104510 /* Optimization, do the COW without a second fault */
104511 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
104512@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104513 struct address_space *mapping;
104514 int need_wait_lock = 0;
104515
104516+#ifdef CONFIG_PAX_SEGMEXEC
104517+ struct vm_area_struct *vma_m;
104518+#endif
104519+
104520 address &= huge_page_mask(h);
104521
104522 ptep = huge_pte_offset(mm, address);
104523@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
104524 VM_FAULT_SET_HINDEX(hstate_index(h));
104525 }
104526
104527+#ifdef CONFIG_PAX_SEGMEXEC
104528+ vma_m = pax_find_mirror_vma(vma);
104529+ if (vma_m) {
104530+ unsigned long address_m;
104531+
104532+ if (vma->vm_start > vma_m->vm_start) {
104533+ address_m = address;
104534+ address -= SEGMEXEC_TASK_SIZE;
104535+ vma = vma_m;
104536+ h = hstate_vma(vma);
104537+ } else
104538+ address_m = address + SEGMEXEC_TASK_SIZE;
104539+
104540+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
104541+ return VM_FAULT_OOM;
104542+ address_m &= HPAGE_MASK;
104543+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
104544+ }
104545+#endif
104546+
104547 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
104548 if (!ptep)
104549 return VM_FAULT_OOM;
104550diff --git a/mm/internal.h b/mm/internal.h
104551index a96da5b..42ebd54 100644
104552--- a/mm/internal.h
104553+++ b/mm/internal.h
104554@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
104555
104556 extern int __isolate_free_page(struct page *page, unsigned int order);
104557 extern void __free_pages_bootmem(struct page *page, unsigned int order);
104558+extern void free_compound_page(struct page *page);
104559 extern void prep_compound_page(struct page *page, unsigned long order);
104560 #ifdef CONFIG_MEMORY_FAILURE
104561 extern bool is_free_buddy_page(struct page *page);
104562@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
104563
104564 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
104565 unsigned long, unsigned long,
104566- unsigned long, unsigned long);
104567+ unsigned long, unsigned long) __intentional_overflow(-1);
104568
104569 extern void set_pageblock_order(void);
104570 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
104571diff --git a/mm/kmemleak.c b/mm/kmemleak.c
104572index f0fe4f2..898208c 100644
104573--- a/mm/kmemleak.c
104574+++ b/mm/kmemleak.c
104575@@ -366,7 +366,7 @@ static void print_unreferenced(struct seq_file *seq,
104576
104577 for (i = 0; i < object->trace_len; i++) {
104578 void *ptr = (void *)object->trace[i];
104579- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
104580+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
104581 }
104582 }
104583
104584@@ -1912,7 +1912,7 @@ static int __init kmemleak_late_init(void)
104585 return -ENOMEM;
104586 }
104587
104588- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
104589+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
104590 &kmemleak_fops);
104591 if (!dentry)
104592 pr_warning("Failed to create the debugfs kmemleak file\n");
104593diff --git a/mm/maccess.c b/mm/maccess.c
104594index d53adf9..03a24bf 100644
104595--- a/mm/maccess.c
104596+++ b/mm/maccess.c
104597@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
104598 set_fs(KERNEL_DS);
104599 pagefault_disable();
104600 ret = __copy_from_user_inatomic(dst,
104601- (__force const void __user *)src, size);
104602+ (const void __force_user *)src, size);
104603 pagefault_enable();
104604 set_fs(old_fs);
104605
104606@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
104607
104608 set_fs(KERNEL_DS);
104609 pagefault_disable();
104610- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
104611+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
104612 pagefault_enable();
104613 set_fs(old_fs);
104614
104615diff --git a/mm/madvise.c b/mm/madvise.c
104616index d551475..8fdd7f3 100644
104617--- a/mm/madvise.c
104618+++ b/mm/madvise.c
104619@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
104620 pgoff_t pgoff;
104621 unsigned long new_flags = vma->vm_flags;
104622
104623+#ifdef CONFIG_PAX_SEGMEXEC
104624+ struct vm_area_struct *vma_m;
104625+#endif
104626+
104627 switch (behavior) {
104628 case MADV_NORMAL:
104629 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
104630@@ -126,6 +130,13 @@ success:
104631 /*
104632 * vm_flags is protected by the mmap_sem held in write mode.
104633 */
104634+
104635+#ifdef CONFIG_PAX_SEGMEXEC
104636+ vma_m = pax_find_mirror_vma(vma);
104637+ if (vma_m)
104638+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
104639+#endif
104640+
104641 vma->vm_flags = new_flags;
104642
104643 out:
104644@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
104645 struct vm_area_struct **prev,
104646 unsigned long start, unsigned long end)
104647 {
104648+
104649+#ifdef CONFIG_PAX_SEGMEXEC
104650+ struct vm_area_struct *vma_m;
104651+#endif
104652+
104653 *prev = vma;
104654 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104655 return -EINVAL;
104656
104657 zap_page_range(vma, start, end - start, NULL);
104658+
104659+#ifdef CONFIG_PAX_SEGMEXEC
104660+ vma_m = pax_find_mirror_vma(vma);
104661+ if (vma_m) {
104662+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
104663+ return -EINVAL;
104664+
104665+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
104666+ }
104667+#endif
104668+
104669 return 0;
104670 }
104671
104672@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
104673 if (end < start)
104674 return error;
104675
104676+#ifdef CONFIG_PAX_SEGMEXEC
104677+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
104678+ if (end > SEGMEXEC_TASK_SIZE)
104679+ return error;
104680+ } else
104681+#endif
104682+
104683+ if (end > TASK_SIZE)
104684+ return error;
104685+
104686 error = 0;
104687 if (end == start)
104688 return error;
104689diff --git a/mm/memory-failure.c b/mm/memory-failure.c
104690index 72a5224..51ba846 100644
104691--- a/mm/memory-failure.c
104692+++ b/mm/memory-failure.c
104693@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
104694
104695 int sysctl_memory_failure_recovery __read_mostly = 1;
104696
104697-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104698+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
104699
104700 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
104701
104702@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
104703 pfn, t->comm, t->pid);
104704 si.si_signo = SIGBUS;
104705 si.si_errno = 0;
104706- si.si_addr = (void *)addr;
104707+ si.si_addr = (void __user *)addr;
104708 #ifdef __ARCH_SI_TRAPNO
104709 si.si_trapno = trapno;
104710 #endif
104711@@ -779,7 +779,7 @@ static struct page_state {
104712 unsigned long res;
104713 char *msg;
104714 int (*action)(struct page *p, unsigned long pfn);
104715-} error_states[] = {
104716+} __do_const error_states[] = {
104717 { reserved, reserved, "reserved kernel", me_kernel },
104718 /*
104719 * free pages are specially detected outside this table:
104720@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104721 nr_pages = 1 << compound_order(hpage);
104722 else /* normal page or thp */
104723 nr_pages = 1;
104724- atomic_long_add(nr_pages, &num_poisoned_pages);
104725+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
104726
104727 /*
104728 * We need/can do nothing about count=0 pages.
104729@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104730 if (PageHWPoison(hpage)) {
104731 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
104732 || (p != hpage && TestSetPageHWPoison(hpage))) {
104733- atomic_long_sub(nr_pages, &num_poisoned_pages);
104734+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104735 unlock_page(hpage);
104736 return 0;
104737 }
104738@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
104739 */
104740 if (!PageHWPoison(p)) {
104741 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
104742- atomic_long_sub(nr_pages, &num_poisoned_pages);
104743+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104744 put_page(hpage);
104745 res = 0;
104746 goto out;
104747 }
104748 if (hwpoison_filter(p)) {
104749 if (TestClearPageHWPoison(p))
104750- atomic_long_sub(nr_pages, &num_poisoned_pages);
104751+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104752 unlock_page(hpage);
104753 put_page(hpage);
104754 return 0;
104755@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
104756 return 0;
104757 }
104758 if (TestClearPageHWPoison(p))
104759- atomic_long_dec(&num_poisoned_pages);
104760+ atomic_long_dec_unchecked(&num_poisoned_pages);
104761 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
104762 return 0;
104763 }
104764@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
104765 */
104766 if (TestClearPageHWPoison(page)) {
104767 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
104768- atomic_long_sub(nr_pages, &num_poisoned_pages);
104769+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
104770 freeit = 1;
104771 if (PageHuge(page))
104772 clear_page_hwpoison_huge_page(page);
104773@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
104774 if (PageHuge(page)) {
104775 set_page_hwpoison_huge_page(hpage);
104776 dequeue_hwpoisoned_huge_page(hpage);
104777- atomic_long_add(1 << compound_order(hpage),
104778+ atomic_long_add_unchecked(1 << compound_order(hpage),
104779 &num_poisoned_pages);
104780 } else {
104781 SetPageHWPoison(page);
104782- atomic_long_inc(&num_poisoned_pages);
104783+ atomic_long_inc_unchecked(&num_poisoned_pages);
104784 }
104785 }
104786 return ret;
104787@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
104788 put_page(page);
104789 pr_info("soft_offline: %#lx: invalidated\n", pfn);
104790 SetPageHWPoison(page);
104791- atomic_long_inc(&num_poisoned_pages);
104792+ atomic_long_inc_unchecked(&num_poisoned_pages);
104793 return 0;
104794 }
104795
104796@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
104797 if (!is_free_buddy_page(page))
104798 pr_info("soft offline: %#lx: page leaked\n",
104799 pfn);
104800- atomic_long_inc(&num_poisoned_pages);
104801+ atomic_long_inc_unchecked(&num_poisoned_pages);
104802 }
104803 } else {
104804 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
104805@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
104806 if (PageHuge(page)) {
104807 set_page_hwpoison_huge_page(hpage);
104808 if (!dequeue_hwpoisoned_huge_page(hpage))
104809- atomic_long_add(1 << compound_order(hpage),
104810+ atomic_long_add_unchecked(1 << compound_order(hpage),
104811 &num_poisoned_pages);
104812 } else {
104813 if (!TestSetPageHWPoison(page))
104814- atomic_long_inc(&num_poisoned_pages);
104815+ atomic_long_inc_unchecked(&num_poisoned_pages);
104816 }
104817 }
104818 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
104819diff --git a/mm/memory.c b/mm/memory.c
104820index 97839f5..4bc5530 100644
104821--- a/mm/memory.c
104822+++ b/mm/memory.c
104823@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104824 free_pte_range(tlb, pmd, addr);
104825 } while (pmd++, addr = next, addr != end);
104826
104827+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
104828 start &= PUD_MASK;
104829 if (start < floor)
104830 return;
104831@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
104832 pud_clear(pud);
104833 pmd_free_tlb(tlb, pmd, start);
104834 mm_dec_nr_pmds(tlb->mm);
104835+#endif
104836 }
104837
104838 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104839@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104840 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
104841 } while (pud++, addr = next, addr != end);
104842
104843+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
104844 start &= PGDIR_MASK;
104845 if (start < floor)
104846 return;
104847@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
104848 pud = pud_offset(pgd, start);
104849 pgd_clear(pgd);
104850 pud_free_tlb(tlb, pud, start);
104851+#endif
104852+
104853 }
104854
104855 /*
104856@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
104857 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
104858 */
104859 if (vma->vm_ops)
104860- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
104861+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
104862 vma->vm_ops->fault);
104863 if (vma->vm_file)
104864- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
104865+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
104866 vma->vm_file->f_op->mmap);
104867 dump_stack();
104868 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
104869@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
104870 page_add_file_rmap(page);
104871 set_pte_at(mm, addr, pte, mk_pte(page, prot));
104872
104873+#ifdef CONFIG_PAX_SEGMEXEC
104874+ pax_mirror_file_pte(vma, addr, page, ptl);
104875+#endif
104876+
104877 retval = 0;
104878 pte_unmap_unlock(pte, ptl);
104879 return retval;
104880@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
104881 if (!page_count(page))
104882 return -EINVAL;
104883 if (!(vma->vm_flags & VM_MIXEDMAP)) {
104884+
104885+#ifdef CONFIG_PAX_SEGMEXEC
104886+ struct vm_area_struct *vma_m;
104887+#endif
104888+
104889 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
104890 BUG_ON(vma->vm_flags & VM_PFNMAP);
104891 vma->vm_flags |= VM_MIXEDMAP;
104892+
104893+#ifdef CONFIG_PAX_SEGMEXEC
104894+ vma_m = pax_find_mirror_vma(vma);
104895+ if (vma_m)
104896+ vma_m->vm_flags |= VM_MIXEDMAP;
104897+#endif
104898+
104899 }
104900 return insert_page(vma, addr, page, vma->vm_page_prot);
104901 }
104902@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
104903 unsigned long pfn)
104904 {
104905 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
104906+ BUG_ON(vma->vm_mirror);
104907
104908 if (addr < vma->vm_start || addr >= vma->vm_end)
104909 return -EFAULT;
104910@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
104911
104912 BUG_ON(pud_huge(*pud));
104913
104914- pmd = pmd_alloc(mm, pud, addr);
104915+ pmd = (mm == &init_mm) ?
104916+ pmd_alloc_kernel(mm, pud, addr) :
104917+ pmd_alloc(mm, pud, addr);
104918 if (!pmd)
104919 return -ENOMEM;
104920 do {
104921@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
104922 unsigned long next;
104923 int err;
104924
104925- pud = pud_alloc(mm, pgd, addr);
104926+ pud = (mm == &init_mm) ?
104927+ pud_alloc_kernel(mm, pgd, addr) :
104928+ pud_alloc(mm, pgd, addr);
104929 if (!pud)
104930 return -ENOMEM;
104931 do {
104932@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
104933 return ret;
104934 }
104935
104936+#ifdef CONFIG_PAX_SEGMEXEC
104937+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
104938+{
104939+ struct mm_struct *mm = vma->vm_mm;
104940+ spinlock_t *ptl;
104941+ pte_t *pte, entry;
104942+
104943+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
104944+ entry = *pte;
104945+ if (!pte_present(entry)) {
104946+ if (!pte_none(entry)) {
104947+ free_swap_and_cache(pte_to_swp_entry(entry));
104948+ pte_clear_not_present_full(mm, address, pte, 0);
104949+ }
104950+ } else {
104951+ struct page *page;
104952+
104953+ flush_cache_page(vma, address, pte_pfn(entry));
104954+ entry = ptep_clear_flush(vma, address, pte);
104955+ BUG_ON(pte_dirty(entry));
104956+ page = vm_normal_page(vma, address, entry);
104957+ if (page) {
104958+ update_hiwater_rss(mm);
104959+ if (PageAnon(page))
104960+ dec_mm_counter_fast(mm, MM_ANONPAGES);
104961+ else
104962+ dec_mm_counter_fast(mm, MM_FILEPAGES);
104963+ page_remove_rmap(page);
104964+ page_cache_release(page);
104965+ }
104966+ }
104967+ pte_unmap_unlock(pte, ptl);
104968+}
104969+
104970+/* PaX: if vma is mirrored, synchronize the mirror's PTE
104971+ *
104972+ * the ptl of the lower mapped page is held on entry and is not released on exit
104973+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
104974+ */
104975+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
104976+{
104977+ struct mm_struct *mm = vma->vm_mm;
104978+ unsigned long address_m;
104979+ spinlock_t *ptl_m;
104980+ struct vm_area_struct *vma_m;
104981+ pmd_t *pmd_m;
104982+ pte_t *pte_m, entry_m;
104983+
104984+ BUG_ON(!page_m || !PageAnon(page_m));
104985+
104986+ vma_m = pax_find_mirror_vma(vma);
104987+ if (!vma_m)
104988+ return;
104989+
104990+ BUG_ON(!PageLocked(page_m));
104991+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
104992+ address_m = address + SEGMEXEC_TASK_SIZE;
104993+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
104994+ pte_m = pte_offset_map(pmd_m, address_m);
104995+ ptl_m = pte_lockptr(mm, pmd_m);
104996+ if (ptl != ptl_m) {
104997+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
104998+ if (!pte_none(*pte_m))
104999+ goto out;
105000+ }
105001+
105002+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105003+ page_cache_get(page_m);
105004+ page_add_anon_rmap(page_m, vma_m, address_m);
105005+ inc_mm_counter_fast(mm, MM_ANONPAGES);
105006+ set_pte_at(mm, address_m, pte_m, entry_m);
105007+ update_mmu_cache(vma_m, address_m, pte_m);
105008+out:
105009+ if (ptl != ptl_m)
105010+ spin_unlock(ptl_m);
105011+ pte_unmap(pte_m);
105012+ unlock_page(page_m);
105013+}
105014+
105015+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
105016+{
105017+ struct mm_struct *mm = vma->vm_mm;
105018+ unsigned long address_m;
105019+ spinlock_t *ptl_m;
105020+ struct vm_area_struct *vma_m;
105021+ pmd_t *pmd_m;
105022+ pte_t *pte_m, entry_m;
105023+
105024+ BUG_ON(!page_m || PageAnon(page_m));
105025+
105026+ vma_m = pax_find_mirror_vma(vma);
105027+ if (!vma_m)
105028+ return;
105029+
105030+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105031+ address_m = address + SEGMEXEC_TASK_SIZE;
105032+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105033+ pte_m = pte_offset_map(pmd_m, address_m);
105034+ ptl_m = pte_lockptr(mm, pmd_m);
105035+ if (ptl != ptl_m) {
105036+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105037+ if (!pte_none(*pte_m))
105038+ goto out;
105039+ }
105040+
105041+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
105042+ page_cache_get(page_m);
105043+ page_add_file_rmap(page_m);
105044+ inc_mm_counter_fast(mm, MM_FILEPAGES);
105045+ set_pte_at(mm, address_m, pte_m, entry_m);
105046+ update_mmu_cache(vma_m, address_m, pte_m);
105047+out:
105048+ if (ptl != ptl_m)
105049+ spin_unlock(ptl_m);
105050+ pte_unmap(pte_m);
105051+}
105052+
105053+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
105054+{
105055+ struct mm_struct *mm = vma->vm_mm;
105056+ unsigned long address_m;
105057+ spinlock_t *ptl_m;
105058+ struct vm_area_struct *vma_m;
105059+ pmd_t *pmd_m;
105060+ pte_t *pte_m, entry_m;
105061+
105062+ vma_m = pax_find_mirror_vma(vma);
105063+ if (!vma_m)
105064+ return;
105065+
105066+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
105067+ address_m = address + SEGMEXEC_TASK_SIZE;
105068+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
105069+ pte_m = pte_offset_map(pmd_m, address_m);
105070+ ptl_m = pte_lockptr(mm, pmd_m);
105071+ if (ptl != ptl_m) {
105072+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
105073+ if (!pte_none(*pte_m))
105074+ goto out;
105075+ }
105076+
105077+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
105078+ set_pte_at(mm, address_m, pte_m, entry_m);
105079+out:
105080+ if (ptl != ptl_m)
105081+ spin_unlock(ptl_m);
105082+ pte_unmap(pte_m);
105083+}
105084+
105085+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
105086+{
105087+ struct page *page_m;
105088+ pte_t entry;
105089+
105090+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
105091+ goto out;
105092+
105093+ entry = *pte;
105094+ page_m = vm_normal_page(vma, address, entry);
105095+ if (!page_m)
105096+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
105097+ else if (PageAnon(page_m)) {
105098+ if (pax_find_mirror_vma(vma)) {
105099+ pte_unmap_unlock(pte, ptl);
105100+ lock_page(page_m);
105101+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
105102+ if (pte_same(entry, *pte))
105103+ pax_mirror_anon_pte(vma, address, page_m, ptl);
105104+ else
105105+ unlock_page(page_m);
105106+ }
105107+ } else
105108+ pax_mirror_file_pte(vma, address, page_m, ptl);
105109+
105110+out:
105111+ pte_unmap_unlock(pte, ptl);
105112+}
105113+#endif
105114+
105115 /*
105116 * This routine handles present pages, when users try to write
105117 * to a shared page. It is done by copying the page to a new address
105118@@ -2172,6 +2377,12 @@ gotten:
105119 */
105120 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105121 if (likely(pte_same(*page_table, orig_pte))) {
105122+
105123+#ifdef CONFIG_PAX_SEGMEXEC
105124+ if (pax_find_mirror_vma(vma))
105125+ BUG_ON(!trylock_page(new_page));
105126+#endif
105127+
105128 if (old_page) {
105129 if (!PageAnon(old_page)) {
105130 dec_mm_counter_fast(mm, MM_FILEPAGES);
105131@@ -2225,6 +2436,10 @@ gotten:
105132 page_remove_rmap(old_page);
105133 }
105134
105135+#ifdef CONFIG_PAX_SEGMEXEC
105136+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105137+#endif
105138+
105139 /* Free the old page.. */
105140 new_page = old_page;
105141 ret |= VM_FAULT_WRITE;
105142@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105143 swap_free(entry);
105144 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
105145 try_to_free_swap(page);
105146+
105147+#ifdef CONFIG_PAX_SEGMEXEC
105148+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
105149+#endif
105150+
105151 unlock_page(page);
105152 if (page != swapcache) {
105153 /*
105154@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
105155
105156 /* No need to invalidate - it was non-present before */
105157 update_mmu_cache(vma, address, page_table);
105158+
105159+#ifdef CONFIG_PAX_SEGMEXEC
105160+ pax_mirror_anon_pte(vma, address, page, ptl);
105161+#endif
105162+
105163 unlock:
105164 pte_unmap_unlock(page_table, ptl);
105165 out:
105166@@ -2525,40 +2750,6 @@ out_release:
105167 }
105168
105169 /*
105170- * This is like a special single-page "expand_{down|up}wards()",
105171- * except we must first make sure that 'address{-|+}PAGE_SIZE'
105172- * doesn't hit another vma.
105173- */
105174-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
105175-{
105176- address &= PAGE_MASK;
105177- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
105178- struct vm_area_struct *prev = vma->vm_prev;
105179-
105180- /*
105181- * Is there a mapping abutting this one below?
105182- *
105183- * That's only ok if it's the same stack mapping
105184- * that has gotten split..
105185- */
105186- if (prev && prev->vm_end == address)
105187- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
105188-
105189- return expand_downwards(vma, address - PAGE_SIZE);
105190- }
105191- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
105192- struct vm_area_struct *next = vma->vm_next;
105193-
105194- /* As VM_GROWSDOWN but s/below/above/ */
105195- if (next && next->vm_start == address + PAGE_SIZE)
105196- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
105197-
105198- return expand_upwards(vma, address + PAGE_SIZE);
105199- }
105200- return 0;
105201-}
105202-
105203-/*
105204 * We enter with non-exclusive mmap_sem (to exclude vma changes,
105205 * but allow concurrent faults), and pte mapped but not yet locked.
105206 * We return with mmap_sem still held, but pte unmapped and unlocked.
105207@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105208 unsigned int flags)
105209 {
105210 struct mem_cgroup *memcg;
105211- struct page *page;
105212+ struct page *page = NULL;
105213 spinlock_t *ptl;
105214 pte_t entry;
105215
105216- pte_unmap(page_table);
105217-
105218- /* Check if we need to add a guard page to the stack */
105219- if (check_stack_guard_page(vma, address) < 0)
105220- return VM_FAULT_SIGSEGV;
105221-
105222- /* Use the zero-page for reads */
105223 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
105224 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
105225 vma->vm_page_prot));
105226- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
105227+ ptl = pte_lockptr(mm, pmd);
105228+ spin_lock(ptl);
105229 if (!pte_none(*page_table))
105230 goto unlock;
105231 goto setpte;
105232 }
105233
105234 /* Allocate our own private page. */
105235+ pte_unmap(page_table);
105236+
105237 if (unlikely(anon_vma_prepare(vma)))
105238 goto oom;
105239 page = alloc_zeroed_user_highpage_movable(vma, address);
105240@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
105241 if (!pte_none(*page_table))
105242 goto release;
105243
105244+#ifdef CONFIG_PAX_SEGMEXEC
105245+ if (pax_find_mirror_vma(vma))
105246+ BUG_ON(!trylock_page(page));
105247+#endif
105248+
105249 inc_mm_counter_fast(mm, MM_ANONPAGES);
105250 page_add_new_anon_rmap(page, vma, address);
105251 mem_cgroup_commit_charge(page, memcg, false);
105252@@ -2621,6 +2813,12 @@ setpte:
105253
105254 /* No need to invalidate - it was non-present before */
105255 update_mmu_cache(vma, address, page_table);
105256+
105257+#ifdef CONFIG_PAX_SEGMEXEC
105258+ if (page)
105259+ pax_mirror_anon_pte(vma, address, page, ptl);
105260+#endif
105261+
105262 unlock:
105263 pte_unmap_unlock(page_table, ptl);
105264 return 0;
105265@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105266 return ret;
105267 }
105268 do_set_pte(vma, address, fault_page, pte, false, false);
105269+
105270+#ifdef CONFIG_PAX_SEGMEXEC
105271+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105272+#endif
105273+
105274 unlock_page(fault_page);
105275 unlock_out:
105276 pte_unmap_unlock(pte, ptl);
105277@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105278 }
105279 goto uncharge_out;
105280 }
105281+
105282+#ifdef CONFIG_PAX_SEGMEXEC
105283+ if (pax_find_mirror_vma(vma))
105284+ BUG_ON(!trylock_page(new_page));
105285+#endif
105286+
105287 do_set_pte(vma, address, new_page, pte, true, true);
105288+
105289+#ifdef CONFIG_PAX_SEGMEXEC
105290+ pax_mirror_anon_pte(vma, address, new_page, ptl);
105291+#endif
105292+
105293 mem_cgroup_commit_charge(new_page, memcg, false);
105294 lru_cache_add_active_or_unevictable(new_page, vma);
105295 pte_unmap_unlock(pte, ptl);
105296@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105297 return ret;
105298 }
105299 do_set_pte(vma, address, fault_page, pte, true, false);
105300+
105301+#ifdef CONFIG_PAX_SEGMEXEC
105302+ pax_mirror_file_pte(vma, address, fault_page, ptl);
105303+#endif
105304+
105305 pte_unmap_unlock(pte, ptl);
105306
105307 if (set_page_dirty(fault_page))
105308@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
105309 if (flags & FAULT_FLAG_WRITE)
105310 flush_tlb_fix_spurious_fault(vma, address);
105311 }
105312+
105313+#ifdef CONFIG_PAX_SEGMEXEC
105314+ pax_mirror_pte(vma, address, pte, pmd, ptl);
105315+ return 0;
105316+#endif
105317+
105318 unlock:
105319 pte_unmap_unlock(pte, ptl);
105320 return 0;
105321@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
105322 pmd_t *pmd;
105323 pte_t *pte;
105324
105325+#ifdef CONFIG_PAX_SEGMEXEC
105326+ struct vm_area_struct *vma_m;
105327+#endif
105328+
105329 if (unlikely(is_vm_hugetlb_page(vma)))
105330 return hugetlb_fault(mm, vma, address, flags);
105331
105332+#ifdef CONFIG_PAX_SEGMEXEC
105333+ vma_m = pax_find_mirror_vma(vma);
105334+ if (vma_m) {
105335+ unsigned long address_m;
105336+ pgd_t *pgd_m;
105337+ pud_t *pud_m;
105338+ pmd_t *pmd_m;
105339+
105340+ if (vma->vm_start > vma_m->vm_start) {
105341+ address_m = address;
105342+ address -= SEGMEXEC_TASK_SIZE;
105343+ vma = vma_m;
105344+ } else
105345+ address_m = address + SEGMEXEC_TASK_SIZE;
105346+
105347+ pgd_m = pgd_offset(mm, address_m);
105348+ pud_m = pud_alloc(mm, pgd_m, address_m);
105349+ if (!pud_m)
105350+ return VM_FAULT_OOM;
105351+ pmd_m = pmd_alloc(mm, pud_m, address_m);
105352+ if (!pmd_m)
105353+ return VM_FAULT_OOM;
105354+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
105355+ return VM_FAULT_OOM;
105356+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
105357+ }
105358+#endif
105359+
105360 pgd = pgd_offset(mm, address);
105361 pud = pud_alloc(mm, pgd, address);
105362 if (!pud)
105363@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105364 spin_unlock(&mm->page_table_lock);
105365 return 0;
105366 }
105367+
105368+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
105369+{
105370+ pud_t *new = pud_alloc_one(mm, address);
105371+ if (!new)
105372+ return -ENOMEM;
105373+
105374+ smp_wmb(); /* See comment in __pte_alloc */
105375+
105376+ spin_lock(&mm->page_table_lock);
105377+ if (pgd_present(*pgd)) /* Another has populated it */
105378+ pud_free(mm, new);
105379+ else
105380+ pgd_populate_kernel(mm, pgd, new);
105381+ spin_unlock(&mm->page_table_lock);
105382+ return 0;
105383+}
105384 #endif /* __PAGETABLE_PUD_FOLDED */
105385
105386 #ifndef __PAGETABLE_PMD_FOLDED
105387@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
105388 spin_unlock(&mm->page_table_lock);
105389 return 0;
105390 }
105391+
105392+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
105393+{
105394+ pmd_t *new = pmd_alloc_one(mm, address);
105395+ if (!new)
105396+ return -ENOMEM;
105397+
105398+ smp_wmb(); /* See comment in __pte_alloc */
105399+
105400+ spin_lock(&mm->page_table_lock);
105401+#ifndef __ARCH_HAS_4LEVEL_HACK
105402+ if (!pud_present(*pud)) {
105403+ mm_inc_nr_pmds(mm);
105404+ pud_populate_kernel(mm, pud, new);
105405+ } else /* Another has populated it */
105406+ pmd_free(mm, new);
105407+#else
105408+ if (!pgd_present(*pud)) {
105409+ mm_inc_nr_pmds(mm);
105410+ pgd_populate_kernel(mm, pud, new);
105411+ } else /* Another has populated it */
105412+ pmd_free(mm, new);
105413+#endif /* __ARCH_HAS_4LEVEL_HACK */
105414+ spin_unlock(&mm->page_table_lock);
105415+ return 0;
105416+}
105417 #endif /* __PAGETABLE_PMD_FOLDED */
105418
105419 static int __follow_pte(struct mm_struct *mm, unsigned long address,
105420@@ -3482,8 +3782,8 @@ out:
105421 return ret;
105422 }
105423
105424-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105425- void *buf, int len, int write)
105426+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
105427+ void *buf, size_t len, int write)
105428 {
105429 resource_size_t phys_addr;
105430 unsigned long prot = 0;
105431@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
105432 * Access another process' address space as given in mm. If non-NULL, use the
105433 * given task for page fault accounting.
105434 */
105435-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105436- unsigned long addr, void *buf, int len, int write)
105437+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105438+ unsigned long addr, void *buf, size_t len, int write)
105439 {
105440 struct vm_area_struct *vma;
105441 void *old_buf = buf;
105442@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105443 down_read(&mm->mmap_sem);
105444 /* ignore errors, just check how much was successfully transferred */
105445 while (len) {
105446- int bytes, ret, offset;
105447+ ssize_t bytes, ret, offset;
105448 void *maddr;
105449 struct page *page = NULL;
105450
105451@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
105452 *
105453 * The caller must hold a reference on @mm.
105454 */
105455-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105456- void *buf, int len, int write)
105457+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
105458+ void *buf, size_t len, int write)
105459 {
105460 return __access_remote_vm(NULL, mm, addr, buf, len, write);
105461 }
105462@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
105463 * Source/target buffer must be kernel space,
105464 * Do not walk the page table directly, use get_user_pages
105465 */
105466-int access_process_vm(struct task_struct *tsk, unsigned long addr,
105467- void *buf, int len, int write)
105468+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
105469+ void *buf, size_t len, int write)
105470 {
105471 struct mm_struct *mm;
105472- int ret;
105473+ ssize_t ret;
105474
105475 mm = get_task_mm(tsk);
105476 if (!mm)
105477diff --git a/mm/mempolicy.c b/mm/mempolicy.c
105478index 0f7d73b..737047f 100644
105479--- a/mm/mempolicy.c
105480+++ b/mm/mempolicy.c
105481@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105482 unsigned long vmstart;
105483 unsigned long vmend;
105484
105485+#ifdef CONFIG_PAX_SEGMEXEC
105486+ struct vm_area_struct *vma_m;
105487+#endif
105488+
105489 vma = find_vma(mm, start);
105490 if (!vma || vma->vm_start > start)
105491 return -EFAULT;
105492@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
105493 err = vma_replace_policy(vma, new_pol);
105494 if (err)
105495 goto out;
105496+
105497+#ifdef CONFIG_PAX_SEGMEXEC
105498+ vma_m = pax_find_mirror_vma(vma);
105499+ if (vma_m) {
105500+ err = vma_replace_policy(vma_m, new_pol);
105501+ if (err)
105502+ goto out;
105503+ }
105504+#endif
105505+
105506 }
105507
105508 out:
105509@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
105510
105511 if (end < start)
105512 return -EINVAL;
105513+
105514+#ifdef CONFIG_PAX_SEGMEXEC
105515+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
105516+ if (end > SEGMEXEC_TASK_SIZE)
105517+ return -EINVAL;
105518+ } else
105519+#endif
105520+
105521+ if (end > TASK_SIZE)
105522+ return -EINVAL;
105523+
105524 if (end == start)
105525 return 0;
105526
105527@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105528 */
105529 tcred = __task_cred(task);
105530 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105531- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105532- !capable(CAP_SYS_NICE)) {
105533+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105534 rcu_read_unlock();
105535 err = -EPERM;
105536 goto out_put;
105537@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
105538 goto out;
105539 }
105540
105541+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105542+ if (mm != current->mm &&
105543+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
105544+ mmput(mm);
105545+ err = -EPERM;
105546+ goto out;
105547+ }
105548+#endif
105549+
105550 err = do_migrate_pages(mm, old, new,
105551 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
105552
105553diff --git a/mm/migrate.c b/mm/migrate.c
105554index 85e0426..be49beb 100644
105555--- a/mm/migrate.c
105556+++ b/mm/migrate.c
105557@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
105558 */
105559 tcred = __task_cred(task);
105560 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
105561- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
105562- !capable(CAP_SYS_NICE)) {
105563+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
105564 rcu_read_unlock();
105565 err = -EPERM;
105566 goto out;
105567diff --git a/mm/mlock.c b/mm/mlock.c
105568index 8a54cd2..92f1747 100644
105569--- a/mm/mlock.c
105570+++ b/mm/mlock.c
105571@@ -14,6 +14,7 @@
105572 #include <linux/pagevec.h>
105573 #include <linux/mempolicy.h>
105574 #include <linux/syscalls.h>
105575+#include <linux/security.h>
105576 #include <linux/sched.h>
105577 #include <linux/export.h>
105578 #include <linux/rmap.h>
105579@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
105580 {
105581 unsigned long nstart, end, tmp;
105582 struct vm_area_struct * vma, * prev;
105583- int error;
105584+ int error = 0;
105585
105586 VM_BUG_ON(start & ~PAGE_MASK);
105587 VM_BUG_ON(len != PAGE_ALIGN(len));
105588@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
105589 return -EINVAL;
105590 if (end == start)
105591 return 0;
105592+ if (end > TASK_SIZE)
105593+ return -EINVAL;
105594+
105595 vma = find_vma(current->mm, start);
105596 if (!vma || vma->vm_start > start)
105597 return -ENOMEM;
105598@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
105599 for (nstart = start ; ; ) {
105600 vm_flags_t newflags;
105601
105602+#ifdef CONFIG_PAX_SEGMEXEC
105603+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105604+ break;
105605+#endif
105606+
105607 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
105608
105609 newflags = vma->vm_flags & ~VM_LOCKED;
105610@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
105611 locked += current->mm->locked_vm;
105612
105613 /* check against resource limits */
105614+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
105615 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
105616 error = do_mlock(start, len, 1);
105617
105618@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
105619 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
105620 vm_flags_t newflags;
105621
105622+#ifdef CONFIG_PAX_SEGMEXEC
105623+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
105624+ break;
105625+#endif
105626+
105627 newflags = vma->vm_flags & ~VM_LOCKED;
105628 if (flags & MCL_CURRENT)
105629 newflags |= VM_LOCKED;
105630@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
105631 lock_limit >>= PAGE_SHIFT;
105632
105633 ret = -ENOMEM;
105634+
105635+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
105636+
105637 down_write(&current->mm->mmap_sem);
105638-
105639 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
105640 capable(CAP_IPC_LOCK))
105641 ret = do_mlockall(flags);
105642diff --git a/mm/mm_init.c b/mm/mm_init.c
105643index 5f420f7..dd42fb1b 100644
105644--- a/mm/mm_init.c
105645+++ b/mm/mm_init.c
105646@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
105647 return NOTIFY_OK;
105648 }
105649
105650-static struct notifier_block compute_batch_nb __meminitdata = {
105651+static struct notifier_block compute_batch_nb __meminitconst = {
105652 .notifier_call = mm_compute_batch_notifier,
105653 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
105654 };
105655diff --git a/mm/mmap.c b/mm/mmap.c
105656index 9ec50a3..0476e2d 100644
105657--- a/mm/mmap.c
105658+++ b/mm/mmap.c
105659@@ -41,6 +41,7 @@
105660 #include <linux/notifier.h>
105661 #include <linux/memory.h>
105662 #include <linux/printk.h>
105663+#include <linux/random.h>
105664
105665 #include <asm/uaccess.h>
105666 #include <asm/cacheflush.h>
105667@@ -57,6 +58,16 @@
105668 #define arch_rebalance_pgtables(addr, len) (addr)
105669 #endif
105670
105671+static inline void verify_mm_writelocked(struct mm_struct *mm)
105672+{
105673+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
105674+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
105675+ up_read(&mm->mmap_sem);
105676+ BUG();
105677+ }
105678+#endif
105679+}
105680+
105681 static void unmap_region(struct mm_struct *mm,
105682 struct vm_area_struct *vma, struct vm_area_struct *prev,
105683 unsigned long start, unsigned long end);
105684@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
105685 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
105686 *
105687 */
105688-pgprot_t protection_map[16] = {
105689+pgprot_t protection_map[16] __read_only = {
105690 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
105691 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
105692 };
105693
105694-pgprot_t vm_get_page_prot(unsigned long vm_flags)
105695+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
105696 {
105697- return __pgprot(pgprot_val(protection_map[vm_flags &
105698+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
105699 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
105700 pgprot_val(arch_vm_get_page_prot(vm_flags)));
105701+
105702+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105703+ if (!(__supported_pte_mask & _PAGE_NX) &&
105704+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
105705+ (vm_flags & (VM_READ | VM_WRITE)))
105706+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
105707+#endif
105708+
105709+ return prot;
105710 }
105711 EXPORT_SYMBOL(vm_get_page_prot);
105712
105713@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
105714 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
105715 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
105716 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
105717+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
105718 /*
105719 * Make sure vm_committed_as in one cacheline and not cacheline shared with
105720 * other variables. It can be updated by several CPUs frequently.
105721@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
105722 struct vm_area_struct *next = vma->vm_next;
105723
105724 might_sleep();
105725+ BUG_ON(vma->vm_mirror);
105726 if (vma->vm_ops && vma->vm_ops->close)
105727 vma->vm_ops->close(vma);
105728 if (vma->vm_file)
105729@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
105730
105731 SYSCALL_DEFINE1(brk, unsigned long, brk)
105732 {
105733+ unsigned long rlim;
105734 unsigned long retval;
105735 unsigned long newbrk, oldbrk;
105736 struct mm_struct *mm = current->mm;
105737@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
105738 * segment grow beyond its set limit the in case where the limit is
105739 * not page aligned -Ram Gupta
105740 */
105741- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
105742+ rlim = rlimit(RLIMIT_DATA);
105743+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
105744+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
105745+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
105746+ rlim = 4096 * PAGE_SIZE;
105747+#endif
105748+ if (check_data_rlimit(rlim, brk, mm->start_brk,
105749 mm->end_data, mm->start_data))
105750 goto out;
105751
105752@@ -967,6 +996,12 @@ static int
105753 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
105754 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105755 {
105756+
105757+#ifdef CONFIG_PAX_SEGMEXEC
105758+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
105759+ return 0;
105760+#endif
105761+
105762 if (is_mergeable_vma(vma, file, vm_flags) &&
105763 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105764 if (vma->vm_pgoff == vm_pgoff)
105765@@ -986,6 +1021,12 @@ static int
105766 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
105767 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
105768 {
105769+
105770+#ifdef CONFIG_PAX_SEGMEXEC
105771+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
105772+ return 0;
105773+#endif
105774+
105775 if (is_mergeable_vma(vma, file, vm_flags) &&
105776 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
105777 pgoff_t vm_pglen;
105778@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105779 struct vm_area_struct *area, *next;
105780 int err;
105781
105782+#ifdef CONFIG_PAX_SEGMEXEC
105783+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
105784+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
105785+
105786+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
105787+#endif
105788+
105789 /*
105790 * We later require that vma->vm_flags == vm_flags,
105791 * so this tests vma->vm_flags & VM_SPECIAL, too.
105792@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105793 if (next && next->vm_end == end) /* cases 6, 7, 8 */
105794 next = next->vm_next;
105795
105796+#ifdef CONFIG_PAX_SEGMEXEC
105797+ if (prev)
105798+ prev_m = pax_find_mirror_vma(prev);
105799+ if (area)
105800+ area_m = pax_find_mirror_vma(area);
105801+ if (next)
105802+ next_m = pax_find_mirror_vma(next);
105803+#endif
105804+
105805 /*
105806 * Can it merge with the predecessor?
105807 */
105808@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105809 /* cases 1, 6 */
105810 err = vma_adjust(prev, prev->vm_start,
105811 next->vm_end, prev->vm_pgoff, NULL);
105812- } else /* cases 2, 5, 7 */
105813+
105814+#ifdef CONFIG_PAX_SEGMEXEC
105815+ if (!err && prev_m)
105816+ err = vma_adjust(prev_m, prev_m->vm_start,
105817+ next_m->vm_end, prev_m->vm_pgoff, NULL);
105818+#endif
105819+
105820+ } else { /* cases 2, 5, 7 */
105821 err = vma_adjust(prev, prev->vm_start,
105822 end, prev->vm_pgoff, NULL);
105823+
105824+#ifdef CONFIG_PAX_SEGMEXEC
105825+ if (!err && prev_m)
105826+ err = vma_adjust(prev_m, prev_m->vm_start,
105827+ end_m, prev_m->vm_pgoff, NULL);
105828+#endif
105829+
105830+ }
105831 if (err)
105832 return NULL;
105833 khugepaged_enter_vma_merge(prev, vm_flags);
105834@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
105835 mpol_equal(policy, vma_policy(next)) &&
105836 can_vma_merge_before(next, vm_flags,
105837 anon_vma, file, pgoff+pglen)) {
105838- if (prev && addr < prev->vm_end) /* case 4 */
105839+ if (prev && addr < prev->vm_end) { /* case 4 */
105840 err = vma_adjust(prev, prev->vm_start,
105841 addr, prev->vm_pgoff, NULL);
105842- else /* cases 3, 8 */
105843+
105844+#ifdef CONFIG_PAX_SEGMEXEC
105845+ if (!err && prev_m)
105846+ err = vma_adjust(prev_m, prev_m->vm_start,
105847+ addr_m, prev_m->vm_pgoff, NULL);
105848+#endif
105849+
105850+ } else { /* cases 3, 8 */
105851 err = vma_adjust(area, addr, next->vm_end,
105852 next->vm_pgoff - pglen, NULL);
105853+
105854+#ifdef CONFIG_PAX_SEGMEXEC
105855+ if (!err && area_m)
105856+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
105857+ next_m->vm_pgoff - pglen, NULL);
105858+#endif
105859+
105860+ }
105861 if (err)
105862 return NULL;
105863 khugepaged_enter_vma_merge(area, vm_flags);
105864@@ -1199,8 +1286,10 @@ none:
105865 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105866 struct file *file, long pages)
105867 {
105868- const unsigned long stack_flags
105869- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
105870+
105871+#ifdef CONFIG_PAX_RANDMMAP
105872+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105873+#endif
105874
105875 mm->total_vm += pages;
105876
105877@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
105878 mm->shared_vm += pages;
105879 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
105880 mm->exec_vm += pages;
105881- } else if (flags & stack_flags)
105882+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
105883 mm->stack_vm += pages;
105884 }
105885 #endif /* CONFIG_PROC_FS */
105886@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
105887 locked += mm->locked_vm;
105888 lock_limit = rlimit(RLIMIT_MEMLOCK);
105889 lock_limit >>= PAGE_SHIFT;
105890+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
105891 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
105892 return -EAGAIN;
105893 }
105894@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105895 * (the exception is when the underlying filesystem is noexec
105896 * mounted, in which case we dont add PROT_EXEC.)
105897 */
105898- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
105899+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
105900 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
105901 prot |= PROT_EXEC;
105902
105903@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105904 /* Obtain the address to map to. we verify (or select) it and ensure
105905 * that it represents a valid section of the address space.
105906 */
105907- addr = get_unmapped_area(file, addr, len, pgoff, flags);
105908+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
105909 if (addr & ~PAGE_MASK)
105910 return addr;
105911
105912@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105913 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
105914 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
105915
105916+#ifdef CONFIG_PAX_MPROTECT
105917+ if (mm->pax_flags & MF_PAX_MPROTECT) {
105918+
105919+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
105920+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
105921+ mm->binfmt->handle_mmap)
105922+ mm->binfmt->handle_mmap(file);
105923+#endif
105924+
105925+#ifndef CONFIG_PAX_MPROTECT_COMPAT
105926+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
105927+ gr_log_rwxmmap(file);
105928+
105929+#ifdef CONFIG_PAX_EMUPLT
105930+ vm_flags &= ~VM_EXEC;
105931+#else
105932+ return -EPERM;
105933+#endif
105934+
105935+ }
105936+
105937+ if (!(vm_flags & VM_EXEC))
105938+ vm_flags &= ~VM_MAYEXEC;
105939+#else
105940+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
105941+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
105942+#endif
105943+ else
105944+ vm_flags &= ~VM_MAYWRITE;
105945+ }
105946+#endif
105947+
105948+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
105949+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
105950+ vm_flags &= ~VM_PAGEEXEC;
105951+#endif
105952+
105953 if (flags & MAP_LOCKED)
105954 if (!can_do_mlock())
105955 return -EPERM;
105956@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
105957 vm_flags |= VM_NORESERVE;
105958 }
105959
105960+ if (!gr_acl_handle_mmap(file, prot))
105961+ return -EACCES;
105962+
105963 addr = mmap_region(file, addr, len, vm_flags, pgoff);
105964 if (!IS_ERR_VALUE(addr) &&
105965 ((vm_flags & VM_LOCKED) ||
105966@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
105967 vm_flags_t vm_flags = vma->vm_flags;
105968
105969 /* If it was private or non-writable, the write bit is already clear */
105970- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
105971+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
105972 return 0;
105973
105974 /* The backer wishes to know when pages are first written to? */
105975@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105976 struct rb_node **rb_link, *rb_parent;
105977 unsigned long charged = 0;
105978
105979+#ifdef CONFIG_PAX_SEGMEXEC
105980+ struct vm_area_struct *vma_m = NULL;
105981+#endif
105982+
105983+ /*
105984+ * mm->mmap_sem is required to protect against another thread
105985+ * changing the mappings in case we sleep.
105986+ */
105987+ verify_mm_writelocked(mm);
105988+
105989 /* Check against address space limit. */
105990+
105991+#ifdef CONFIG_PAX_RANDMMAP
105992+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
105993+#endif
105994+
105995 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
105996 unsigned long nr_pages;
105997
105998@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
105999
106000 /* Clear old maps */
106001 error = -ENOMEM;
106002-munmap_back:
106003 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106004 if (do_munmap(mm, addr, len))
106005 return -ENOMEM;
106006- goto munmap_back;
106007+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106008 }
106009
106010 /*
106011@@ -1586,6 +1730,16 @@ munmap_back:
106012 goto unacct_error;
106013 }
106014
106015+#ifdef CONFIG_PAX_SEGMEXEC
106016+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
106017+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106018+ if (!vma_m) {
106019+ error = -ENOMEM;
106020+ goto free_vma;
106021+ }
106022+ }
106023+#endif
106024+
106025 vma->vm_mm = mm;
106026 vma->vm_start = addr;
106027 vma->vm_end = addr + len;
106028@@ -1616,6 +1770,13 @@ munmap_back:
106029 if (error)
106030 goto unmap_and_free_vma;
106031
106032+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
106033+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
106034+ vma->vm_flags |= VM_PAGEEXEC;
106035+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106036+ }
106037+#endif
106038+
106039 /* Can addr have changed??
106040 *
106041 * Answer: Yes, several device drivers can do it in their
106042@@ -1634,6 +1795,12 @@ munmap_back:
106043 }
106044
106045 vma_link(mm, vma, prev, rb_link, rb_parent);
106046+
106047+#ifdef CONFIG_PAX_SEGMEXEC
106048+ if (vma_m)
106049+ BUG_ON(pax_mirror_vma(vma_m, vma));
106050+#endif
106051+
106052 /* Once vma denies write, undo our temporary denial count */
106053 if (file) {
106054 if (vm_flags & VM_SHARED)
106055@@ -1646,6 +1813,7 @@ out:
106056 perf_event_mmap(vma);
106057
106058 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
106059+ track_exec_limit(mm, addr, addr + len, vm_flags);
106060 if (vm_flags & VM_LOCKED) {
106061 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
106062 vma == get_gate_vma(current->mm)))
106063@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
106064 if (vm_flags & VM_DENYWRITE)
106065 allow_write_access(file);
106066 free_vma:
106067+
106068+#ifdef CONFIG_PAX_SEGMEXEC
106069+ if (vma_m)
106070+ kmem_cache_free(vm_area_cachep, vma_m);
106071+#endif
106072+
106073 kmem_cache_free(vm_area_cachep, vma);
106074 unacct_error:
106075 if (charged)
106076@@ -1690,7 +1864,63 @@ unacct_error:
106077 return error;
106078 }
106079
106080-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106081+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
106082+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
106083+{
106084+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
106085+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
106086+
106087+ return 0;
106088+}
106089+#endif
106090+
106091+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
106092+{
106093+ if (!vma) {
106094+#ifdef CONFIG_STACK_GROWSUP
106095+ if (addr > sysctl_heap_stack_gap)
106096+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
106097+ else
106098+ vma = find_vma(current->mm, 0);
106099+ if (vma && (vma->vm_flags & VM_GROWSUP))
106100+ return false;
106101+#endif
106102+ return true;
106103+ }
106104+
106105+ if (addr + len > vma->vm_start)
106106+ return false;
106107+
106108+ if (vma->vm_flags & VM_GROWSDOWN)
106109+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
106110+#ifdef CONFIG_STACK_GROWSUP
106111+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
106112+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
106113+#endif
106114+ else if (offset)
106115+ return offset <= vma->vm_start - addr - len;
106116+
106117+ return true;
106118+}
106119+
106120+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
106121+{
106122+ if (vma->vm_start < len)
106123+ return -ENOMEM;
106124+
106125+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
106126+ if (offset <= vma->vm_start - len)
106127+ return vma->vm_start - len - offset;
106128+ else
106129+ return -ENOMEM;
106130+ }
106131+
106132+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
106133+ return vma->vm_start - len - sysctl_heap_stack_gap;
106134+ return -ENOMEM;
106135+}
106136+
106137+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
106138 {
106139 /*
106140 * We implement the search by looking for an rbtree node that
106141@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
106142 }
106143 }
106144
106145- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
106146+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
106147 check_current:
106148 /* Check if current node has a suitable gap */
106149 if (gap_start > high_limit)
106150 return -ENOMEM;
106151+
106152+ if (gap_end - gap_start > info->threadstack_offset)
106153+ gap_start += info->threadstack_offset;
106154+ else
106155+ gap_start = gap_end;
106156+
106157+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106158+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106159+ gap_start += sysctl_heap_stack_gap;
106160+ else
106161+ gap_start = gap_end;
106162+ }
106163+ if (vma->vm_flags & VM_GROWSDOWN) {
106164+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106165+ gap_end -= sysctl_heap_stack_gap;
106166+ else
106167+ gap_end = gap_start;
106168+ }
106169 if (gap_end >= low_limit && gap_end - gap_start >= length)
106170 goto found;
106171
106172@@ -1792,7 +2040,7 @@ found:
106173 return gap_start;
106174 }
106175
106176-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
106177+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
106178 {
106179 struct mm_struct *mm = current->mm;
106180 struct vm_area_struct *vma;
106181@@ -1846,6 +2094,24 @@ check_current:
106182 gap_end = vma->vm_start;
106183 if (gap_end < low_limit)
106184 return -ENOMEM;
106185+
106186+ if (gap_end - gap_start > info->threadstack_offset)
106187+ gap_end -= info->threadstack_offset;
106188+ else
106189+ gap_end = gap_start;
106190+
106191+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
106192+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106193+ gap_start += sysctl_heap_stack_gap;
106194+ else
106195+ gap_start = gap_end;
106196+ }
106197+ if (vma->vm_flags & VM_GROWSDOWN) {
106198+ if (gap_end - gap_start > sysctl_heap_stack_gap)
106199+ gap_end -= sysctl_heap_stack_gap;
106200+ else
106201+ gap_end = gap_start;
106202+ }
106203 if (gap_start <= high_limit && gap_end - gap_start >= length)
106204 goto found;
106205
106206@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106207 struct mm_struct *mm = current->mm;
106208 struct vm_area_struct *vma;
106209 struct vm_unmapped_area_info info;
106210+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106211
106212 if (len > TASK_SIZE - mmap_min_addr)
106213 return -ENOMEM;
106214@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106215 if (flags & MAP_FIXED)
106216 return addr;
106217
106218+#ifdef CONFIG_PAX_RANDMMAP
106219+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106220+#endif
106221+
106222 if (addr) {
106223 addr = PAGE_ALIGN(addr);
106224 vma = find_vma(mm, addr);
106225 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106226- (!vma || addr + len <= vma->vm_start))
106227+ check_heap_stack_gap(vma, addr, len, offset))
106228 return addr;
106229 }
106230
106231@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
106232 info.low_limit = mm->mmap_base;
106233 info.high_limit = TASK_SIZE;
106234 info.align_mask = 0;
106235+ info.threadstack_offset = offset;
106236 return vm_unmapped_area(&info);
106237 }
106238 #endif
106239@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106240 struct mm_struct *mm = current->mm;
106241 unsigned long addr = addr0;
106242 struct vm_unmapped_area_info info;
106243+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
106244
106245 /* requested length too big for entire address space */
106246 if (len > TASK_SIZE - mmap_min_addr)
106247@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106248 if (flags & MAP_FIXED)
106249 return addr;
106250
106251+#ifdef CONFIG_PAX_RANDMMAP
106252+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
106253+#endif
106254+
106255 /* requesting a specific address */
106256 if (addr) {
106257 addr = PAGE_ALIGN(addr);
106258 vma = find_vma(mm, addr);
106259 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
106260- (!vma || addr + len <= vma->vm_start))
106261+ check_heap_stack_gap(vma, addr, len, offset))
106262 return addr;
106263 }
106264
106265@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106266 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
106267 info.high_limit = mm->mmap_base;
106268 info.align_mask = 0;
106269+ info.threadstack_offset = offset;
106270 addr = vm_unmapped_area(&info);
106271
106272 /*
106273@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
106274 VM_BUG_ON(addr != -ENOMEM);
106275 info.flags = 0;
106276 info.low_limit = TASK_UNMAPPED_BASE;
106277+
106278+#ifdef CONFIG_PAX_RANDMMAP
106279+ if (mm->pax_flags & MF_PAX_RANDMMAP)
106280+ info.low_limit += mm->delta_mmap;
106281+#endif
106282+
106283 info.high_limit = TASK_SIZE;
106284 addr = vm_unmapped_area(&info);
106285 }
106286@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
106287 return vma;
106288 }
106289
106290+#ifdef CONFIG_PAX_SEGMEXEC
106291+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
106292+{
106293+ struct vm_area_struct *vma_m;
106294+
106295+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
106296+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
106297+ BUG_ON(vma->vm_mirror);
106298+ return NULL;
106299+ }
106300+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
106301+ vma_m = vma->vm_mirror;
106302+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
106303+ BUG_ON(vma->vm_file != vma_m->vm_file);
106304+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
106305+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
106306+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
106307+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
106308+ return vma_m;
106309+}
106310+#endif
106311+
106312 /*
106313 * Verify that the stack growth is acceptable and
106314 * update accounting. This is shared with both the
106315@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106316
106317 /* Stack limit test */
106318 actual_size = size;
106319- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
106320- actual_size -= PAGE_SIZE;
106321+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
106322 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
106323 return -ENOMEM;
106324
106325@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106326 locked = mm->locked_vm + grow;
106327 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
106328 limit >>= PAGE_SHIFT;
106329+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
106330 if (locked > limit && !capable(CAP_IPC_LOCK))
106331 return -ENOMEM;
106332 }
106333@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
106334 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
106335 * vma is the last one with address > vma->vm_end. Have to extend vma.
106336 */
106337+#ifndef CONFIG_IA64
106338+static
106339+#endif
106340 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106341 {
106342 int error;
106343+ bool locknext;
106344
106345 if (!(vma->vm_flags & VM_GROWSUP))
106346 return -EFAULT;
106347
106348+ /* Also guard against wrapping around to address 0. */
106349+ if (address < PAGE_ALIGN(address+1))
106350+ address = PAGE_ALIGN(address+1);
106351+ else
106352+ return -ENOMEM;
106353+
106354 /*
106355 * We must make sure the anon_vma is allocated
106356 * so that the anon_vma locking is not a noop.
106357 */
106358 if (unlikely(anon_vma_prepare(vma)))
106359 return -ENOMEM;
106360+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
106361+ if (locknext && anon_vma_prepare(vma->vm_next))
106362+ return -ENOMEM;
106363 vma_lock_anon_vma(vma);
106364+ if (locknext)
106365+ vma_lock_anon_vma(vma->vm_next);
106366
106367 /*
106368 * vma->vm_start/vm_end cannot change under us because the caller
106369 * is required to hold the mmap_sem in read mode. We need the
106370- * anon_vma lock to serialize against concurrent expand_stacks.
106371- * Also guard against wrapping around to address 0.
106372+ * anon_vma locks to serialize against concurrent expand_stacks
106373+ * and expand_upwards.
106374 */
106375- if (address < PAGE_ALIGN(address+4))
106376- address = PAGE_ALIGN(address+4);
106377- else {
106378- vma_unlock_anon_vma(vma);
106379- return -ENOMEM;
106380- }
106381 error = 0;
106382
106383 /* Somebody else might have raced and expanded it already */
106384- if (address > vma->vm_end) {
106385+ 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)
106386+ error = -ENOMEM;
106387+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
106388 unsigned long size, grow;
106389
106390 size = address - vma->vm_start;
106391@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
106392 }
106393 }
106394 }
106395+ if (locknext)
106396+ vma_unlock_anon_vma(vma->vm_next);
106397 vma_unlock_anon_vma(vma);
106398 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106399 validate_mm(vma->vm_mm);
106400@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
106401 unsigned long address)
106402 {
106403 int error;
106404+ bool lockprev = false;
106405+ struct vm_area_struct *prev;
106406
106407 /*
106408 * We must make sure the anon_vma is allocated
106409@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
106410 if (error)
106411 return error;
106412
106413+ prev = vma->vm_prev;
106414+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
106415+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
106416+#endif
106417+ if (lockprev && anon_vma_prepare(prev))
106418+ return -ENOMEM;
106419+ if (lockprev)
106420+ vma_lock_anon_vma(prev);
106421+
106422 vma_lock_anon_vma(vma);
106423
106424 /*
106425@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
106426 */
106427
106428 /* Somebody else might have raced and expanded it already */
106429- if (address < vma->vm_start) {
106430+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
106431+ error = -ENOMEM;
106432+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
106433 unsigned long size, grow;
106434
106435+#ifdef CONFIG_PAX_SEGMEXEC
106436+ struct vm_area_struct *vma_m;
106437+
106438+ vma_m = pax_find_mirror_vma(vma);
106439+#endif
106440+
106441 size = vma->vm_end - address;
106442 grow = (vma->vm_start - address) >> PAGE_SHIFT;
106443
106444@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
106445 vma->vm_pgoff -= grow;
106446 anon_vma_interval_tree_post_update_vma(vma);
106447 vma_gap_update(vma);
106448+
106449+#ifdef CONFIG_PAX_SEGMEXEC
106450+ if (vma_m) {
106451+ anon_vma_interval_tree_pre_update_vma(vma_m);
106452+ vma_m->vm_start -= grow << PAGE_SHIFT;
106453+ vma_m->vm_pgoff -= grow;
106454+ anon_vma_interval_tree_post_update_vma(vma_m);
106455+ vma_gap_update(vma_m);
106456+ }
106457+#endif
106458+
106459 spin_unlock(&vma->vm_mm->page_table_lock);
106460
106461+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
106462 perf_event_mmap(vma);
106463 }
106464 }
106465 }
106466 vma_unlock_anon_vma(vma);
106467+ if (lockprev)
106468+ vma_unlock_anon_vma(prev);
106469 khugepaged_enter_vma_merge(vma, vma->vm_flags);
106470 validate_mm(vma->vm_mm);
106471 return error;
106472@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
106473 do {
106474 long nrpages = vma_pages(vma);
106475
106476+#ifdef CONFIG_PAX_SEGMEXEC
106477+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
106478+ vma = remove_vma(vma);
106479+ continue;
106480+ }
106481+#endif
106482+
106483 if (vma->vm_flags & VM_ACCOUNT)
106484 nr_accounted += nrpages;
106485 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
106486@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
106487 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
106488 vma->vm_prev = NULL;
106489 do {
106490+
106491+#ifdef CONFIG_PAX_SEGMEXEC
106492+ if (vma->vm_mirror) {
106493+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
106494+ vma->vm_mirror->vm_mirror = NULL;
106495+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
106496+ vma->vm_mirror = NULL;
106497+ }
106498+#endif
106499+
106500 vma_rb_erase(vma, &mm->mm_rb);
106501 mm->map_count--;
106502 tail_vma = vma;
106503@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106504 struct vm_area_struct *new;
106505 int err = -ENOMEM;
106506
106507+#ifdef CONFIG_PAX_SEGMEXEC
106508+ struct vm_area_struct *vma_m, *new_m = NULL;
106509+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
106510+#endif
106511+
106512 if (is_vm_hugetlb_page(vma) && (addr &
106513 ~(huge_page_mask(hstate_vma(vma)))))
106514 return -EINVAL;
106515
106516+#ifdef CONFIG_PAX_SEGMEXEC
106517+ vma_m = pax_find_mirror_vma(vma);
106518+#endif
106519+
106520 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106521 if (!new)
106522 goto out_err;
106523
106524+#ifdef CONFIG_PAX_SEGMEXEC
106525+ if (vma_m) {
106526+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
106527+ if (!new_m) {
106528+ kmem_cache_free(vm_area_cachep, new);
106529+ goto out_err;
106530+ }
106531+ }
106532+#endif
106533+
106534 /* most fields are the same, copy all, and then fixup */
106535 *new = *vma;
106536
106537@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106538 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
106539 }
106540
106541+#ifdef CONFIG_PAX_SEGMEXEC
106542+ if (vma_m) {
106543+ *new_m = *vma_m;
106544+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
106545+ new_m->vm_mirror = new;
106546+ new->vm_mirror = new_m;
106547+
106548+ if (new_below)
106549+ new_m->vm_end = addr_m;
106550+ else {
106551+ new_m->vm_start = addr_m;
106552+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
106553+ }
106554+ }
106555+#endif
106556+
106557 err = vma_dup_policy(vma, new);
106558 if (err)
106559 goto out_free_vma;
106560@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106561 else
106562 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
106563
106564+#ifdef CONFIG_PAX_SEGMEXEC
106565+ if (!err && vma_m) {
106566+ struct mempolicy *pol = vma_policy(new);
106567+
106568+ if (anon_vma_clone(new_m, vma_m))
106569+ goto out_free_mpol;
106570+
106571+ mpol_get(pol);
106572+ set_vma_policy(new_m, pol);
106573+
106574+ if (new_m->vm_file)
106575+ get_file(new_m->vm_file);
106576+
106577+ if (new_m->vm_ops && new_m->vm_ops->open)
106578+ new_m->vm_ops->open(new_m);
106579+
106580+ if (new_below)
106581+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
106582+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
106583+ else
106584+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
106585+
106586+ if (err) {
106587+ if (new_m->vm_ops && new_m->vm_ops->close)
106588+ new_m->vm_ops->close(new_m);
106589+ if (new_m->vm_file)
106590+ fput(new_m->vm_file);
106591+ mpol_put(pol);
106592+ }
106593+ }
106594+#endif
106595+
106596 /* Success. */
106597 if (!err)
106598 return 0;
106599@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106600 new->vm_ops->close(new);
106601 if (new->vm_file)
106602 fput(new->vm_file);
106603- unlink_anon_vmas(new);
106604 out_free_mpol:
106605 mpol_put(vma_policy(new));
106606 out_free_vma:
106607+
106608+#ifdef CONFIG_PAX_SEGMEXEC
106609+ if (new_m) {
106610+ unlink_anon_vmas(new_m);
106611+ kmem_cache_free(vm_area_cachep, new_m);
106612+ }
106613+#endif
106614+
106615+ unlink_anon_vmas(new);
106616 kmem_cache_free(vm_area_cachep, new);
106617 out_err:
106618 return err;
106619@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106620 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106621 unsigned long addr, int new_below)
106622 {
106623+
106624+#ifdef CONFIG_PAX_SEGMEXEC
106625+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
106626+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
106627+ if (mm->map_count >= sysctl_max_map_count-1)
106628+ return -ENOMEM;
106629+ } else
106630+#endif
106631+
106632 if (mm->map_count >= sysctl_max_map_count)
106633 return -ENOMEM;
106634
106635@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
106636 * work. This now handles partial unmappings.
106637 * Jeremy Fitzhardinge <jeremy@goop.org>
106638 */
106639+#ifdef CONFIG_PAX_SEGMEXEC
106640 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106641 {
106642+ int ret = __do_munmap(mm, start, len);
106643+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
106644+ return ret;
106645+
106646+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
106647+}
106648+
106649+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106650+#else
106651+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106652+#endif
106653+{
106654 unsigned long end;
106655 struct vm_area_struct *vma, *prev, *last;
106656
106657+ /*
106658+ * mm->mmap_sem is required to protect against another thread
106659+ * changing the mappings in case we sleep.
106660+ */
106661+ verify_mm_writelocked(mm);
106662+
106663 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
106664 return -EINVAL;
106665
106666@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
106667 /* Fix up all other VM information */
106668 remove_vma_list(mm, vma);
106669
106670+ track_exec_limit(mm, start, end, 0UL);
106671+
106672 return 0;
106673 }
106674
106675@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
106676 int ret;
106677 struct mm_struct *mm = current->mm;
106678
106679+
106680+#ifdef CONFIG_PAX_SEGMEXEC
106681+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
106682+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
106683+ return -EINVAL;
106684+#endif
106685+
106686 down_write(&mm->mmap_sem);
106687 ret = do_munmap(mm, start, len);
106688 up_write(&mm->mmap_sem);
106689@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
106690 down_write(&mm->mmap_sem);
106691 vma = find_vma(mm, start);
106692
106693+#ifdef CONFIG_PAX_SEGMEXEC
106694+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
106695+ goto out;
106696+#endif
106697+
106698 if (!vma || !(vma->vm_flags & VM_SHARED))
106699 goto out;
106700
106701@@ -2692,16 +3178,6 @@ out:
106702 return ret;
106703 }
106704
106705-static inline void verify_mm_writelocked(struct mm_struct *mm)
106706-{
106707-#ifdef CONFIG_DEBUG_VM
106708- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
106709- WARN_ON(1);
106710- up_read(&mm->mmap_sem);
106711- }
106712-#endif
106713-}
106714-
106715 /*
106716 * this is really a simplified "do_mmap". it only handles
106717 * anonymous maps. eventually we may be able to do some
106718@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106719 struct rb_node **rb_link, *rb_parent;
106720 pgoff_t pgoff = addr >> PAGE_SHIFT;
106721 int error;
106722+ unsigned long charged;
106723
106724 len = PAGE_ALIGN(len);
106725 if (!len)
106726@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106727
106728 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
106729
106730+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
106731+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
106732+ flags &= ~VM_EXEC;
106733+
106734+#ifdef CONFIG_PAX_MPROTECT
106735+ if (mm->pax_flags & MF_PAX_MPROTECT)
106736+ flags &= ~VM_MAYEXEC;
106737+#endif
106738+
106739+ }
106740+#endif
106741+
106742 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
106743 if (error & ~PAGE_MASK)
106744 return error;
106745
106746+ charged = len >> PAGE_SHIFT;
106747+
106748 error = mlock_future_check(mm, mm->def_flags, len);
106749 if (error)
106750 return error;
106751@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106752 /*
106753 * Clear old maps. this also does some error checking for us
106754 */
106755- munmap_back:
106756 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
106757 if (do_munmap(mm, addr, len))
106758 return -ENOMEM;
106759- goto munmap_back;
106760+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
106761 }
106762
106763 /* Check against address space limits *after* clearing old maps... */
106764- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
106765+ if (!may_expand_vm(mm, charged))
106766 return -ENOMEM;
106767
106768 if (mm->map_count > sysctl_max_map_count)
106769 return -ENOMEM;
106770
106771- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
106772+ if (security_vm_enough_memory_mm(mm, charged))
106773 return -ENOMEM;
106774
106775 /* Can we just expand an old private anonymous mapping? */
106776@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106777 */
106778 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106779 if (!vma) {
106780- vm_unacct_memory(len >> PAGE_SHIFT);
106781+ vm_unacct_memory(charged);
106782 return -ENOMEM;
106783 }
106784
106785@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
106786 vma_link(mm, vma, prev, rb_link, rb_parent);
106787 out:
106788 perf_event_mmap(vma);
106789- mm->total_vm += len >> PAGE_SHIFT;
106790+ mm->total_vm += charged;
106791 if (flags & VM_LOCKED)
106792- mm->locked_vm += (len >> PAGE_SHIFT);
106793+ mm->locked_vm += charged;
106794 vma->vm_flags |= VM_SOFTDIRTY;
106795+ track_exec_limit(mm, addr, addr + len, flags);
106796 return addr;
106797 }
106798
106799@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
106800 while (vma) {
106801 if (vma->vm_flags & VM_ACCOUNT)
106802 nr_accounted += vma_pages(vma);
106803+ vma->vm_mirror = NULL;
106804 vma = remove_vma(vma);
106805 }
106806 vm_unacct_memory(nr_accounted);
106807@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106808 struct vm_area_struct *prev;
106809 struct rb_node **rb_link, *rb_parent;
106810
106811+#ifdef CONFIG_PAX_SEGMEXEC
106812+ struct vm_area_struct *vma_m = NULL;
106813+#endif
106814+
106815+ if (security_mmap_addr(vma->vm_start))
106816+ return -EPERM;
106817+
106818 /*
106819 * The vm_pgoff of a purely anonymous vma should be irrelevant
106820 * until its first write fault, when page's anon_vma and index
106821@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
106822 security_vm_enough_memory_mm(mm, vma_pages(vma)))
106823 return -ENOMEM;
106824
106825+#ifdef CONFIG_PAX_SEGMEXEC
106826+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
106827+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
106828+ if (!vma_m)
106829+ return -ENOMEM;
106830+ }
106831+#endif
106832+
106833 vma_link(mm, vma, prev, rb_link, rb_parent);
106834+
106835+#ifdef CONFIG_PAX_SEGMEXEC
106836+ if (vma_m)
106837+ BUG_ON(pax_mirror_vma(vma_m, vma));
106838+#endif
106839+
106840 return 0;
106841 }
106842
106843@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106844 struct rb_node **rb_link, *rb_parent;
106845 bool faulted_in_anon_vma = true;
106846
106847+ BUG_ON(vma->vm_mirror);
106848+
106849 /*
106850 * If anonymous vma has not yet been faulted, update new pgoff
106851 * to match new location, to increase its chance of merging.
106852@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
106853 return NULL;
106854 }
106855
106856+#ifdef CONFIG_PAX_SEGMEXEC
106857+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
106858+{
106859+ struct vm_area_struct *prev_m;
106860+ struct rb_node **rb_link_m, *rb_parent_m;
106861+ struct mempolicy *pol_m;
106862+
106863+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
106864+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
106865+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
106866+ *vma_m = *vma;
106867+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
106868+ if (anon_vma_clone(vma_m, vma))
106869+ return -ENOMEM;
106870+ pol_m = vma_policy(vma_m);
106871+ mpol_get(pol_m);
106872+ set_vma_policy(vma_m, pol_m);
106873+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
106874+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
106875+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
106876+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
106877+ if (vma_m->vm_file)
106878+ get_file(vma_m->vm_file);
106879+ if (vma_m->vm_ops && vma_m->vm_ops->open)
106880+ vma_m->vm_ops->open(vma_m);
106881+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
106882+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
106883+ vma_m->vm_mirror = vma;
106884+ vma->vm_mirror = vma_m;
106885+ return 0;
106886+}
106887+#endif
106888+
106889 /*
106890 * Return true if the calling process may expand its vm space by the passed
106891 * number of pages
106892@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
106893
106894 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
106895
106896+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
106897 if (cur + npages > lim)
106898 return 0;
106899 return 1;
106900@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
106901 vma->vm_start = addr;
106902 vma->vm_end = addr + len;
106903
106904+#ifdef CONFIG_PAX_MPROTECT
106905+ if (mm->pax_flags & MF_PAX_MPROTECT) {
106906+#ifndef CONFIG_PAX_MPROTECT_COMPAT
106907+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
106908+ return ERR_PTR(-EPERM);
106909+ if (!(vm_flags & VM_EXEC))
106910+ vm_flags &= ~VM_MAYEXEC;
106911+#else
106912+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
106913+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
106914+#endif
106915+ else
106916+ vm_flags &= ~VM_MAYWRITE;
106917+ }
106918+#endif
106919+
106920 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
106921 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
106922
106923diff --git a/mm/mprotect.c b/mm/mprotect.c
106924index 8858483..8145fa5 100644
106925--- a/mm/mprotect.c
106926+++ b/mm/mprotect.c
106927@@ -24,10 +24,18 @@
106928 #include <linux/migrate.h>
106929 #include <linux/perf_event.h>
106930 #include <linux/ksm.h>
106931+#include <linux/sched/sysctl.h>
106932+
106933+#ifdef CONFIG_PAX_MPROTECT
106934+#include <linux/elf.h>
106935+#include <linux/binfmts.h>
106936+#endif
106937+
106938 #include <asm/uaccess.h>
106939 #include <asm/pgtable.h>
106940 #include <asm/cacheflush.h>
106941 #include <asm/tlbflush.h>
106942+#include <asm/mmu_context.h>
106943
106944 /*
106945 * For a prot_numa update we only hold mmap_sem for read so there is a
106946@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
106947 return pages;
106948 }
106949
106950+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
106951+/* called while holding the mmap semaphor for writing except stack expansion */
106952+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
106953+{
106954+ unsigned long oldlimit, newlimit = 0UL;
106955+
106956+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
106957+ return;
106958+
106959+ spin_lock(&mm->page_table_lock);
106960+ oldlimit = mm->context.user_cs_limit;
106961+ if ((prot & VM_EXEC) && oldlimit < end)
106962+ /* USER_CS limit moved up */
106963+ newlimit = end;
106964+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
106965+ /* USER_CS limit moved down */
106966+ newlimit = start;
106967+
106968+ if (newlimit) {
106969+ mm->context.user_cs_limit = newlimit;
106970+
106971+#ifdef CONFIG_SMP
106972+ wmb();
106973+ cpus_clear(mm->context.cpu_user_cs_mask);
106974+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
106975+#endif
106976+
106977+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
106978+ }
106979+ spin_unlock(&mm->page_table_lock);
106980+ if (newlimit == end) {
106981+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
106982+
106983+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
106984+ if (is_vm_hugetlb_page(vma))
106985+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
106986+ else
106987+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
106988+ }
106989+}
106990+#endif
106991+
106992 int
106993 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106994 unsigned long start, unsigned long end, unsigned long newflags)
106995@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
106996 int error;
106997 int dirty_accountable = 0;
106998
106999+#ifdef CONFIG_PAX_SEGMEXEC
107000+ struct vm_area_struct *vma_m = NULL;
107001+ unsigned long start_m, end_m;
107002+
107003+ start_m = start + SEGMEXEC_TASK_SIZE;
107004+ end_m = end + SEGMEXEC_TASK_SIZE;
107005+#endif
107006+
107007 if (newflags == oldflags) {
107008 *pprev = vma;
107009 return 0;
107010 }
107011
107012+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
107013+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
107014+
107015+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
107016+ return -ENOMEM;
107017+
107018+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
107019+ return -ENOMEM;
107020+ }
107021+
107022 /*
107023 * If we make a private mapping writable we increase our commit;
107024 * but (without finer accounting) cannot reduce our commit if we
107025@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
107026 }
107027 }
107028
107029+#ifdef CONFIG_PAX_SEGMEXEC
107030+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
107031+ if (start != vma->vm_start) {
107032+ error = split_vma(mm, vma, start, 1);
107033+ if (error)
107034+ goto fail;
107035+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
107036+ *pprev = (*pprev)->vm_next;
107037+ }
107038+
107039+ if (end != vma->vm_end) {
107040+ error = split_vma(mm, vma, end, 0);
107041+ if (error)
107042+ goto fail;
107043+ }
107044+
107045+ if (pax_find_mirror_vma(vma)) {
107046+ error = __do_munmap(mm, start_m, end_m - start_m);
107047+ if (error)
107048+ goto fail;
107049+ } else {
107050+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
107051+ if (!vma_m) {
107052+ error = -ENOMEM;
107053+ goto fail;
107054+ }
107055+ vma->vm_flags = newflags;
107056+ error = pax_mirror_vma(vma_m, vma);
107057+ if (error) {
107058+ vma->vm_flags = oldflags;
107059+ goto fail;
107060+ }
107061+ }
107062+ }
107063+#endif
107064+
107065 /*
107066 * First try to merge with previous and/or next vma.
107067 */
107068@@ -315,7 +419,19 @@ success:
107069 * vm_flags and vm_page_prot are protected by the mmap_sem
107070 * held in write mode.
107071 */
107072+
107073+#ifdef CONFIG_PAX_SEGMEXEC
107074+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
107075+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
107076+#endif
107077+
107078 vma->vm_flags = newflags;
107079+
107080+#ifdef CONFIG_PAX_MPROTECT
107081+ if (mm->binfmt && mm->binfmt->handle_mprotect)
107082+ mm->binfmt->handle_mprotect(vma, newflags);
107083+#endif
107084+
107085 dirty_accountable = vma_wants_writenotify(vma);
107086 vma_set_page_prot(vma);
107087
107088@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107089 end = start + len;
107090 if (end <= start)
107091 return -ENOMEM;
107092+
107093+#ifdef CONFIG_PAX_SEGMEXEC
107094+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
107095+ if (end > SEGMEXEC_TASK_SIZE)
107096+ return -EINVAL;
107097+ } else
107098+#endif
107099+
107100+ if (end > TASK_SIZE)
107101+ return -EINVAL;
107102+
107103 if (!arch_validate_prot(prot))
107104 return -EINVAL;
107105
107106@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107107 /*
107108 * Does the application expect PROT_READ to imply PROT_EXEC:
107109 */
107110- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
107111+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
107112 prot |= PROT_EXEC;
107113
107114 vm_flags = calc_vm_prot_bits(prot);
107115@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107116 if (start > vma->vm_start)
107117 prev = vma;
107118
107119+#ifdef CONFIG_PAX_MPROTECT
107120+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
107121+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
107122+#endif
107123+
107124 for (nstart = start ; ; ) {
107125 unsigned long newflags;
107126
107127@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107128
107129 /* newflags >> 4 shift VM_MAY% in place of VM_% */
107130 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
107131+ if (prot & (PROT_WRITE | PROT_EXEC))
107132+ gr_log_rwxmprotect(vma);
107133+
107134+ error = -EACCES;
107135+ goto out;
107136+ }
107137+
107138+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
107139 error = -EACCES;
107140 goto out;
107141 }
107142@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
107143 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
107144 if (error)
107145 goto out;
107146+
107147+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
107148+
107149 nstart = tmp;
107150
107151 if (nstart < prev->vm_end)
107152diff --git a/mm/mremap.c b/mm/mremap.c
107153index 2dc44b1..caa1819 100644
107154--- a/mm/mremap.c
107155+++ b/mm/mremap.c
107156@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
107157 continue;
107158 pte = ptep_get_and_clear(mm, old_addr, old_pte);
107159 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
107160+
107161+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
107162+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
107163+ pte = pte_exprotect(pte);
107164+#endif
107165+
107166 pte = move_soft_dirty_pte(pte);
107167 set_pte_at(mm, new_addr, new_pte, pte);
107168 }
107169@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
107170 if (is_vm_hugetlb_page(vma))
107171 goto Einval;
107172
107173+#ifdef CONFIG_PAX_SEGMEXEC
107174+ if (pax_find_mirror_vma(vma))
107175+ goto Einval;
107176+#endif
107177+
107178 /* We can't remap across vm area boundaries */
107179 if (old_len > vma->vm_end - addr)
107180 goto Efault;
107181@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
107182 unsigned long ret = -EINVAL;
107183 unsigned long charged = 0;
107184 unsigned long map_flags;
107185+ unsigned long pax_task_size = TASK_SIZE;
107186
107187 if (new_addr & ~PAGE_MASK)
107188 goto out;
107189
107190- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
107191+#ifdef CONFIG_PAX_SEGMEXEC
107192+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107193+ pax_task_size = SEGMEXEC_TASK_SIZE;
107194+#endif
107195+
107196+ pax_task_size -= PAGE_SIZE;
107197+
107198+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
107199 goto out;
107200
107201 /* Check if the location we're moving into overlaps the
107202 * old location at all, and fail if it does.
107203 */
107204- if ((new_addr <= addr) && (new_addr+new_len) > addr)
107205- goto out;
107206-
107207- if ((addr <= new_addr) && (addr+old_len) > new_addr)
107208+ if (addr + old_len > new_addr && new_addr + new_len > addr)
107209 goto out;
107210
107211 ret = do_munmap(mm, new_addr, new_len);
107212@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107213 unsigned long ret = -EINVAL;
107214 unsigned long charged = 0;
107215 bool locked = false;
107216+ unsigned long pax_task_size = TASK_SIZE;
107217
107218 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
107219 return ret;
107220@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107221 if (!new_len)
107222 return ret;
107223
107224+#ifdef CONFIG_PAX_SEGMEXEC
107225+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
107226+ pax_task_size = SEGMEXEC_TASK_SIZE;
107227+#endif
107228+
107229+ pax_task_size -= PAGE_SIZE;
107230+
107231+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
107232+ old_len > pax_task_size || addr > pax_task_size-old_len)
107233+ return ret;
107234+
107235 down_write(&current->mm->mmap_sem);
107236
107237 if (flags & MREMAP_FIXED) {
107238@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107239 new_addr = addr;
107240 }
107241 ret = addr;
107242+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
107243 goto out;
107244 }
107245 }
107246@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
107247 goto out;
107248 }
107249
107250+ map_flags = vma->vm_flags;
107251 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
107252+ if (!(ret & ~PAGE_MASK)) {
107253+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
107254+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
107255+ }
107256 }
107257 out:
107258 if (ret & ~PAGE_MASK)
107259diff --git a/mm/nommu.c b/mm/nommu.c
107260index 3fba2dc9..fdad748 100644
107261--- a/mm/nommu.c
107262+++ b/mm/nommu.c
107263@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
107264 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
107265 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
107266 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
107267-int heap_stack_gap = 0;
107268
107269 atomic_long_t mmap_pages_allocated;
107270
107271@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
107272 EXPORT_SYMBOL(find_vma);
107273
107274 /*
107275- * find a VMA
107276- * - we don't extend stack VMAs under NOMMU conditions
107277- */
107278-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
107279-{
107280- return find_vma(mm, addr);
107281-}
107282-
107283-/*
107284 * expand a stack to a given address
107285 * - not supported under NOMMU conditions
107286 */
107287@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
107288
107289 /* most fields are the same, copy all, and then fixup */
107290 *new = *vma;
107291+ INIT_LIST_HEAD(&new->anon_vma_chain);
107292 *region = *vma->vm_region;
107293 new->vm_region = region;
107294
107295@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
107296 }
107297 EXPORT_SYMBOL(filemap_map_pages);
107298
107299-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107300- unsigned long addr, void *buf, int len, int write)
107301+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107302+ unsigned long addr, void *buf, size_t len, int write)
107303 {
107304 struct vm_area_struct *vma;
107305
107306@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
107307 *
107308 * The caller must hold a reference on @mm.
107309 */
107310-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107311- void *buf, int len, int write)
107312+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
107313+ void *buf, size_t len, int write)
107314 {
107315 return __access_remote_vm(NULL, mm, addr, buf, len, write);
107316 }
107317@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
107318 * Access another process' address space.
107319 * - source/target buffer must be kernel space
107320 */
107321-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
107322+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
107323 {
107324 struct mm_struct *mm;
107325
107326diff --git a/mm/page-writeback.c b/mm/page-writeback.c
107327index ad05f2f..cee723a 100644
107328--- a/mm/page-writeback.c
107329+++ b/mm/page-writeback.c
107330@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
107331 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
107332 * - the bdi dirty thresh drops quickly due to change of JBOD workload
107333 */
107334-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
107335+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
107336 unsigned long thresh,
107337 unsigned long bg_thresh,
107338 unsigned long dirty,
107339diff --git a/mm/page_alloc.c b/mm/page_alloc.c
107340index 40e2942..0eb29a2 100644
107341--- a/mm/page_alloc.c
107342+++ b/mm/page_alloc.c
107343@@ -61,6 +61,7 @@
107344 #include <linux/hugetlb.h>
107345 #include <linux/sched/rt.h>
107346 #include <linux/page_owner.h>
107347+#include <linux/random.h>
107348
107349 #include <asm/sections.h>
107350 #include <asm/tlbflush.h>
107351@@ -357,7 +358,7 @@ out:
107352 * This usage means that zero-order pages may not be compound.
107353 */
107354
107355-static void free_compound_page(struct page *page)
107356+void free_compound_page(struct page *page)
107357 {
107358 __free_pages_ok(page, compound_order(page));
107359 }
107360@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
107361 __mod_zone_freepage_state(zone, (1 << order), migratetype);
107362 }
107363 #else
107364-struct page_ext_operations debug_guardpage_ops = { NULL, };
107365+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
107366 static inline void set_page_guard(struct zone *zone, struct page *page,
107367 unsigned int order, int migratetype) {}
107368 static inline void clear_page_guard(struct zone *zone, struct page *page,
107369@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107370 bool compound = PageCompound(page);
107371 int i, bad = 0;
107372
107373+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107374+ unsigned long index = 1UL << order;
107375+#endif
107376+
107377 VM_BUG_ON_PAGE(PageTail(page), page);
107378 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
107379
107380@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
107381 debug_check_no_obj_freed(page_address(page),
107382 PAGE_SIZE << order);
107383 }
107384+
107385+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107386+ for (; index; --index)
107387+ sanitize_highpage(page + index - 1);
107388+#endif
107389+
107390 arch_free_page(page, order);
107391 kernel_map_pages(page, 1 << order, 0);
107392
107393@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
107394 local_irq_restore(flags);
107395 }
107396
107397+#ifdef CONFIG_PAX_LATENT_ENTROPY
107398+bool __meminitdata extra_latent_entropy;
107399+
107400+static int __init setup_pax_extra_latent_entropy(char *str)
107401+{
107402+ extra_latent_entropy = true;
107403+ return 0;
107404+}
107405+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
107406+
107407+volatile u64 latent_entropy __latent_entropy;
107408+EXPORT_SYMBOL(latent_entropy);
107409+#endif
107410+
107411 void __init __free_pages_bootmem(struct page *page, unsigned int order)
107412 {
107413 unsigned int nr_pages = 1 << order;
107414@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
107415 __ClearPageReserved(p);
107416 set_page_count(p, 0);
107417
107418+#ifdef CONFIG_PAX_LATENT_ENTROPY
107419+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
107420+ u64 hash = 0;
107421+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
107422+ const u64 *data = lowmem_page_address(page);
107423+
107424+ for (index = 0; index < end; index++)
107425+ hash ^= hash + data[index];
107426+ latent_entropy ^= hash;
107427+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
107428+ }
107429+#endif
107430+
107431 page_zone(page)->managed_pages += nr_pages;
107432 set_page_refcounted(page);
107433 __free_pages(page, order);
107434@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
107435 kernel_map_pages(page, 1 << order, 1);
107436 kasan_alloc_pages(page, order);
107437
107438+#ifndef CONFIG_PAX_MEMORY_SANITIZE
107439 if (gfp_flags & __GFP_ZERO)
107440 prep_zero_page(page, order, gfp_flags);
107441+#endif
107442
107443 if (order && (gfp_flags & __GFP_COMP))
107444 prep_compound_page(page, order);
107445@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
107446 }
107447
107448 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
107449- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107450+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
107451 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
107452 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107453
107454@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
107455 do {
107456 mod_zone_page_state(zone, NR_ALLOC_BATCH,
107457 high_wmark_pages(zone) - low_wmark_pages(zone) -
107458- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107459+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107460 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
107461 } while (zone++ != preferred_zone);
107462 }
107463@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
107464
107465 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
107466 high_wmark_pages(zone) - low_wmark_pages(zone) -
107467- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
107468+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
107469
107470 setup_zone_migrate_reserve(zone);
107471 spin_unlock_irqrestore(&zone->lock, flags);
107472diff --git a/mm/percpu.c b/mm/percpu.c
107473index 73c97a5..508ee25 100644
107474--- a/mm/percpu.c
107475+++ b/mm/percpu.c
107476@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
107477 static unsigned int pcpu_high_unit_cpu __read_mostly;
107478
107479 /* the address of the first chunk which starts with the kernel static area */
107480-void *pcpu_base_addr __read_mostly;
107481+void *pcpu_base_addr __read_only;
107482 EXPORT_SYMBOL_GPL(pcpu_base_addr);
107483
107484 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
107485diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
107486index b159769..d07037f 100644
107487--- a/mm/process_vm_access.c
107488+++ b/mm/process_vm_access.c
107489@@ -13,6 +13,7 @@
107490 #include <linux/uio.h>
107491 #include <linux/sched.h>
107492 #include <linux/highmem.h>
107493+#include <linux/security.h>
107494 #include <linux/ptrace.h>
107495 #include <linux/slab.h>
107496 #include <linux/syscalls.h>
107497@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107498 ssize_t iov_len;
107499 size_t total_len = iov_iter_count(iter);
107500
107501+ return -ENOSYS; // PaX: until properly audited
107502+
107503 /*
107504 * Work out how many pages of struct pages we're going to need
107505 * when eventually calling get_user_pages
107506 */
107507 for (i = 0; i < riovcnt; i++) {
107508 iov_len = rvec[i].iov_len;
107509- if (iov_len > 0) {
107510- nr_pages_iov = ((unsigned long)rvec[i].iov_base
107511- + iov_len)
107512- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
107513- / PAGE_SIZE + 1;
107514- nr_pages = max(nr_pages, nr_pages_iov);
107515- }
107516+ if (iov_len <= 0)
107517+ continue;
107518+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
107519+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
107520+ nr_pages = max(nr_pages, nr_pages_iov);
107521 }
107522
107523 if (nr_pages == 0)
107524@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
107525 goto free_proc_pages;
107526 }
107527
107528+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
107529+ rc = -EPERM;
107530+ goto put_task_struct;
107531+ }
107532+
107533 mm = mm_access(task, PTRACE_MODE_ATTACH);
107534 if (!mm || IS_ERR(mm)) {
107535 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
107536diff --git a/mm/rmap.c b/mm/rmap.c
107537index c161a14..8a069bb 100644
107538--- a/mm/rmap.c
107539+++ b/mm/rmap.c
107540@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107541 struct anon_vma *anon_vma = vma->anon_vma;
107542 struct anon_vma_chain *avc;
107543
107544+#ifdef CONFIG_PAX_SEGMEXEC
107545+ struct anon_vma_chain *avc_m = NULL;
107546+#endif
107547+
107548 might_sleep();
107549 if (unlikely(!anon_vma)) {
107550 struct mm_struct *mm = vma->vm_mm;
107551@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107552 if (!avc)
107553 goto out_enomem;
107554
107555+#ifdef CONFIG_PAX_SEGMEXEC
107556+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
107557+ if (!avc_m)
107558+ goto out_enomem_free_avc;
107559+#endif
107560+
107561 anon_vma = find_mergeable_anon_vma(vma);
107562 allocated = NULL;
107563 if (!anon_vma) {
107564@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107565 /* page_table_lock to protect against threads */
107566 spin_lock(&mm->page_table_lock);
107567 if (likely(!vma->anon_vma)) {
107568+
107569+#ifdef CONFIG_PAX_SEGMEXEC
107570+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
107571+
107572+ if (vma_m) {
107573+ BUG_ON(vma_m->anon_vma);
107574+ vma_m->anon_vma = anon_vma;
107575+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
107576+ anon_vma->degree++;
107577+ avc_m = NULL;
107578+ }
107579+#endif
107580+
107581 vma->anon_vma = anon_vma;
107582 anon_vma_chain_link(vma, avc, anon_vma);
107583 /* vma reference or self-parent link for new root */
107584@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
107585
107586 if (unlikely(allocated))
107587 put_anon_vma(allocated);
107588+
107589+#ifdef CONFIG_PAX_SEGMEXEC
107590+ if (unlikely(avc_m))
107591+ anon_vma_chain_free(avc_m);
107592+#endif
107593+
107594 if (unlikely(avc))
107595 anon_vma_chain_free(avc);
107596 }
107597 return 0;
107598
107599 out_enomem_free_avc:
107600+
107601+#ifdef CONFIG_PAX_SEGMEXEC
107602+ if (avc_m)
107603+ anon_vma_chain_free(avc_m);
107604+#endif
107605+
107606 anon_vma_chain_free(avc);
107607 out_enomem:
107608 return -ENOMEM;
107609@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
107610 * good chance of avoiding scanning the whole hierarchy when it searches where
107611 * page is mapped.
107612 */
107613-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107614+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
107615 {
107616 struct anon_vma_chain *avc, *pavc;
107617 struct anon_vma *root = NULL;
107618@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
107619 * the corresponding VMA in the parent process is attached to.
107620 * Returns 0 on success, non-zero on failure.
107621 */
107622-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
107623+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
107624 {
107625 struct anon_vma_chain *avc;
107626 struct anon_vma *anon_vma;
107627@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
107628 void __init anon_vma_init(void)
107629 {
107630 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
107631- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
107632- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
107633+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
107634+ anon_vma_ctor);
107635+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
107636+ SLAB_PANIC|SLAB_NO_SANITIZE);
107637 }
107638
107639 /*
107640diff --git a/mm/shmem.c b/mm/shmem.c
107641index cf2d0ca..ec06b8b 100644
107642--- a/mm/shmem.c
107643+++ b/mm/shmem.c
107644@@ -33,7 +33,7 @@
107645 #include <linux/swap.h>
107646 #include <linux/aio.h>
107647
107648-static struct vfsmount *shm_mnt;
107649+struct vfsmount *shm_mnt;
107650
107651 #ifdef CONFIG_SHMEM
107652 /*
107653@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
107654 #define BOGO_DIRENT_SIZE 20
107655
107656 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
107657-#define SHORT_SYMLINK_LEN 128
107658+#define SHORT_SYMLINK_LEN 64
107659
107660 /*
107661 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
107662@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
107663 static int shmem_xattr_validate(const char *name)
107664 {
107665 struct { const char *prefix; size_t len; } arr[] = {
107666+
107667+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107668+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
107669+#endif
107670+
107671 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
107672 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
107673 };
107674@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
107675 if (err)
107676 return err;
107677
107678+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
107679+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
107680+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
107681+ return -EOPNOTSUPP;
107682+ if (size > 8)
107683+ return -EINVAL;
107684+ }
107685+#endif
107686+
107687 return simple_xattr_set(&info->xattrs, name, value, size, flags);
107688 }
107689
107690@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
107691 int err = -ENOMEM;
107692
107693 /* Round up to L1_CACHE_BYTES to resist false sharing */
107694- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
107695- L1_CACHE_BYTES), GFP_KERNEL);
107696+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
107697 if (!sbinfo)
107698 return -ENOMEM;
107699
107700diff --git a/mm/slab.c b/mm/slab.c
107701index c4b89ea..20990be 100644
107702--- a/mm/slab.c
107703+++ b/mm/slab.c
107704@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107705 if ((x)->max_freeable < i) \
107706 (x)->max_freeable = i; \
107707 } while (0)
107708-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
107709-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
107710-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
107711-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
107712+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
107713+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
107714+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
107715+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
107716+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
107717+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
107718 #else
107719 #define STATS_INC_ACTIVE(x) do { } while (0)
107720 #define STATS_DEC_ACTIVE(x) do { } while (0)
107721@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
107722 #define STATS_INC_ALLOCMISS(x) do { } while (0)
107723 #define STATS_INC_FREEHIT(x) do { } while (0)
107724 #define STATS_INC_FREEMISS(x) do { } while (0)
107725+#define STATS_INC_SANITIZED(x) do { } while (0)
107726+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
107727 #endif
107728
107729 #if DEBUG
107730@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
107731 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
107732 */
107733 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
107734- const struct page *page, void *obj)
107735+ const struct page *page, const void *obj)
107736 {
107737 u32 offset = (obj - page->s_mem);
107738 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
107739@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
107740 * structures first. Without this, further allocations will bug.
107741 */
107742 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
107743- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
107744+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
107745 slab_state = PARTIAL_NODE;
107746
107747 slab_early_init = 0;
107748@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
107749
107750 cachep = find_mergeable(size, align, flags, name, ctor);
107751 if (cachep) {
107752- cachep->refcount++;
107753+ atomic_inc(&cachep->refcount);
107754
107755 /*
107756 * Adjust the object sizes so that we clear
107757@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
107758 struct array_cache *ac = cpu_cache_get(cachep);
107759
107760 check_irq_off();
107761+
107762+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107763+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
107764+ STATS_INC_NOT_SANITIZED(cachep);
107765+ else {
107766+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
107767+
107768+ if (cachep->ctor)
107769+ cachep->ctor(objp);
107770+
107771+ STATS_INC_SANITIZED(cachep);
107772+ }
107773+#endif
107774+
107775 kmemleak_free_recursive(objp, cachep->flags);
107776 objp = cache_free_debugcheck(cachep, objp, caller);
107777
107778@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
107779 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
107780 }
107781
107782-void *__kmalloc_node(size_t size, gfp_t flags, int node)
107783+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
107784 {
107785 return __do_kmalloc_node(size, flags, node, _RET_IP_);
107786 }
107787@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
107788 * @flags: the type of memory to allocate (see kmalloc).
107789 * @caller: function caller for debug tracking of the caller
107790 */
107791-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
107792+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
107793 unsigned long caller)
107794 {
107795 struct kmem_cache *cachep;
107796@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
107797
107798 if (unlikely(ZERO_OR_NULL_PTR(objp)))
107799 return;
107800+ VM_BUG_ON(!virt_addr_valid(objp));
107801 local_irq_save(flags);
107802 kfree_debugcheck(objp);
107803 c = virt_to_cache(objp);
107804@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
107805 }
107806 /* cpu stats */
107807 {
107808- unsigned long allochit = atomic_read(&cachep->allochit);
107809- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
107810- unsigned long freehit = atomic_read(&cachep->freehit);
107811- unsigned long freemiss = atomic_read(&cachep->freemiss);
107812+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
107813+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
107814+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
107815+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
107816
107817 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
107818 allochit, allocmiss, freehit, freemiss);
107819 }
107820+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107821+ {
107822+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
107823+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
107824+
107825+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
107826+ }
107827+#endif
107828 #endif
107829 }
107830
107831@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
107832 static int __init slab_proc_init(void)
107833 {
107834 #ifdef CONFIG_DEBUG_SLAB_LEAK
107835- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
107836+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
107837 #endif
107838 return 0;
107839 }
107840 module_init(slab_proc_init);
107841 #endif
107842
107843+bool is_usercopy_object(const void *ptr)
107844+{
107845+ struct page *page;
107846+ struct kmem_cache *cachep;
107847+
107848+ if (ZERO_OR_NULL_PTR(ptr))
107849+ return false;
107850+
107851+ if (!slab_is_available())
107852+ return false;
107853+
107854+ if (!virt_addr_valid(ptr))
107855+ return false;
107856+
107857+ page = virt_to_head_page(ptr);
107858+
107859+ if (!PageSlab(page))
107860+ return false;
107861+
107862+ cachep = page->slab_cache;
107863+ return cachep->flags & SLAB_USERCOPY;
107864+}
107865+
107866+#ifdef CONFIG_PAX_USERCOPY
107867+const char *check_heap_object(const void *ptr, unsigned long n)
107868+{
107869+ struct page *page;
107870+ struct kmem_cache *cachep;
107871+ unsigned int objnr;
107872+ unsigned long offset;
107873+
107874+ if (ZERO_OR_NULL_PTR(ptr))
107875+ return "<null>";
107876+
107877+ if (!virt_addr_valid(ptr))
107878+ return NULL;
107879+
107880+ page = virt_to_head_page(ptr);
107881+
107882+ if (!PageSlab(page))
107883+ return NULL;
107884+
107885+ cachep = page->slab_cache;
107886+ if (!(cachep->flags & SLAB_USERCOPY))
107887+ return cachep->name;
107888+
107889+ objnr = obj_to_index(cachep, page, ptr);
107890+ BUG_ON(objnr >= cachep->num);
107891+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
107892+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
107893+ return NULL;
107894+
107895+ return cachep->name;
107896+}
107897+#endif
107898+
107899 /**
107900 * ksize - get the actual amount of memory allocated for a given object
107901 * @objp: Pointer to the object
107902diff --git a/mm/slab.h b/mm/slab.h
107903index 4c3ac12..7b2e470 100644
107904--- a/mm/slab.h
107905+++ b/mm/slab.h
107906@@ -22,7 +22,7 @@ struct kmem_cache {
107907 unsigned int align; /* Alignment as calculated */
107908 unsigned long flags; /* Active flags on the slab */
107909 const char *name; /* Slab name for sysfs */
107910- int refcount; /* Use counter */
107911+ atomic_t refcount; /* Use counter */
107912 void (*ctor)(void *); /* Called on object slot creation */
107913 struct list_head list; /* List of all slab caches on the system */
107914 };
107915@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
107916 /* The slab cache that manages slab cache information */
107917 extern struct kmem_cache *kmem_cache;
107918
107919+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107920+#ifdef CONFIG_X86_64
107921+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
107922+#else
107923+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
107924+#endif
107925+enum pax_sanitize_mode {
107926+ PAX_SANITIZE_SLAB_OFF = 0,
107927+ PAX_SANITIZE_SLAB_FAST,
107928+ PAX_SANITIZE_SLAB_FULL,
107929+};
107930+extern enum pax_sanitize_mode pax_sanitize_slab;
107931+#endif
107932+
107933 unsigned long calculate_alignment(unsigned long flags,
107934 unsigned long align, unsigned long size);
107935
107936@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
107937
107938 /* Legal flag mask for kmem_cache_create(), for various configurations */
107939 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
107940- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
107941+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
107942+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
107943
107944 #if defined(CONFIG_DEBUG_SLAB)
107945 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
107946@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
107947 return s;
107948
107949 page = virt_to_head_page(x);
107950+
107951+ BUG_ON(!PageSlab(page));
107952+
107953 cachep = page->slab_cache;
107954 if (slab_equal_or_root(cachep, s))
107955 return cachep;
107956diff --git a/mm/slab_common.c b/mm/slab_common.c
107957index 999bb34..9843aea 100644
107958--- a/mm/slab_common.c
107959+++ b/mm/slab_common.c
107960@@ -25,11 +25,35 @@
107961
107962 #include "slab.h"
107963
107964-enum slab_state slab_state;
107965+enum slab_state slab_state __read_only;
107966 LIST_HEAD(slab_caches);
107967 DEFINE_MUTEX(slab_mutex);
107968 struct kmem_cache *kmem_cache;
107969
107970+#ifdef CONFIG_PAX_MEMORY_SANITIZE
107971+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
107972+static int __init pax_sanitize_slab_setup(char *str)
107973+{
107974+ if (!str)
107975+ return 0;
107976+
107977+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
107978+ pr_info("PaX slab sanitization: %s\n", "disabled");
107979+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
107980+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
107981+ pr_info("PaX slab sanitization: %s\n", "fast");
107982+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
107983+ } else if (!strcmp(str, "full")) {
107984+ pr_info("PaX slab sanitization: %s\n", "full");
107985+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
107986+ } else
107987+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
107988+
107989+ return 0;
107990+}
107991+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
107992+#endif
107993+
107994 /*
107995 * Set of flags that will prevent slab merging
107996 */
107997@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
107998 * Merge control. If this is set then no merging of slab caches will occur.
107999 * (Could be removed. This was introduced to pacify the merge skeptics.)
108000 */
108001-static int slab_nomerge;
108002+static int slab_nomerge = 1;
108003
108004 static int __init setup_slab_nomerge(char *str)
108005 {
108006@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
108007 /*
108008 * We may have set a slab to be unmergeable during bootstrap.
108009 */
108010- if (s->refcount < 0)
108011+ if (atomic_read(&s->refcount) < 0)
108012 return 1;
108013
108014 return 0;
108015@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
108016 if (err)
108017 goto out_free_cache;
108018
108019- s->refcount = 1;
108020+ atomic_set(&s->refcount, 1);
108021 list_add(&s->list, &slab_caches);
108022 out:
108023 if (err)
108024@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
108025 */
108026 flags &= CACHE_CREATE_MASK;
108027
108028+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108029+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
108030+ flags |= SLAB_NO_SANITIZE;
108031+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
108032+ flags &= ~SLAB_NO_SANITIZE;
108033+#endif
108034+
108035 s = __kmem_cache_alias(name, size, align, flags, ctor);
108036 if (s)
108037 goto out_unlock;
108038@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
108039 rcu_barrier();
108040
108041 list_for_each_entry_safe(s, s2, release, list) {
108042-#ifdef SLAB_SUPPORTS_SYSFS
108043+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108044 sysfs_slab_remove(s);
108045 #else
108046 slab_kmem_cache_release(s);
108047@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
108048
108049 mutex_lock(&slab_mutex);
108050
108051- s->refcount--;
108052- if (s->refcount)
108053+ if (!atomic_dec_and_test(&s->refcount))
108054 goto out_unlock;
108055
108056 for_each_memcg_cache_safe(c, c2, s) {
108057@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
108058 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
108059 name, size, err);
108060
108061- s->refcount = -1; /* Exempt from merging for now */
108062+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
108063 }
108064
108065 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108066@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
108067
108068 create_boot_cache(s, name, size, flags);
108069 list_add(&s->list, &slab_caches);
108070- s->refcount = 1;
108071+ atomic_set(&s->refcount, 1);
108072 return s;
108073 }
108074
108075@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
108076 EXPORT_SYMBOL(kmalloc_dma_caches);
108077 #endif
108078
108079+#ifdef CONFIG_PAX_USERCOPY_SLABS
108080+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
108081+EXPORT_SYMBOL(kmalloc_usercopy_caches);
108082+#endif
108083+
108084 /*
108085 * Conversion table for small slabs sizes / 8 to the index in the
108086 * kmalloc array. This is necessary for slabs < 192 since we have non power
108087@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
108088 return kmalloc_dma_caches[index];
108089
108090 #endif
108091+
108092+#ifdef CONFIG_PAX_USERCOPY_SLABS
108093+ if (unlikely((flags & GFP_USERCOPY)))
108094+ return kmalloc_usercopy_caches[index];
108095+
108096+#endif
108097+
108098 return kmalloc_caches[index];
108099 }
108100
108101@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
108102 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
108103 if (!kmalloc_caches[i]) {
108104 kmalloc_caches[i] = create_kmalloc_cache(NULL,
108105- 1 << i, flags);
108106+ 1 << i, SLAB_USERCOPY | flags);
108107 }
108108
108109 /*
108110@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
108111 * earlier power of two caches
108112 */
108113 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
108114- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
108115+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
108116
108117 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
108118- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
108119+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
108120 }
108121
108122 /* Kmalloc array is now usable */
108123@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
108124 }
108125 }
108126 #endif
108127+
108128+#ifdef CONFIG_PAX_USERCOPY_SLABS
108129+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
108130+ struct kmem_cache *s = kmalloc_caches[i];
108131+
108132+ if (s) {
108133+ int size = kmalloc_size(i);
108134+ char *n = kasprintf(GFP_NOWAIT,
108135+ "usercopy-kmalloc-%d", size);
108136+
108137+ BUG_ON(!n);
108138+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
108139+ size, SLAB_USERCOPY | flags);
108140+ }
108141+ }
108142+#endif
108143+
108144 }
108145 #endif /* !CONFIG_SLOB */
108146
108147@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
108148 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
108149 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
108150 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
108151+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108152+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
108153+#endif
108154 #endif
108155 seq_putc(m, '\n');
108156 }
108157@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
108158 module_init(slab_proc_init);
108159 #endif /* CONFIG_SLABINFO */
108160
108161-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
108162+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
108163 gfp_t flags)
108164 {
108165 void *ret;
108166diff --git a/mm/slob.c b/mm/slob.c
108167index 94a7fed..cf3fb1a 100644
108168--- a/mm/slob.c
108169+++ b/mm/slob.c
108170@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
108171 /*
108172 * Return the size of a slob block.
108173 */
108174-static slobidx_t slob_units(slob_t *s)
108175+static slobidx_t slob_units(const slob_t *s)
108176 {
108177 if (s->units > 0)
108178 return s->units;
108179@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
108180 /*
108181 * Return the next free slob block pointer after this one.
108182 */
108183-static slob_t *slob_next(slob_t *s)
108184+static slob_t *slob_next(const slob_t *s)
108185 {
108186 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
108187 slobidx_t next;
108188@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
108189 /*
108190 * Returns true if s is the last free block in its page.
108191 */
108192-static int slob_last(slob_t *s)
108193+static int slob_last(const slob_t *s)
108194 {
108195 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
108196 }
108197
108198-static void *slob_new_pages(gfp_t gfp, int order, int node)
108199+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
108200 {
108201- void *page;
108202+ struct page *page;
108203
108204 #ifdef CONFIG_NUMA
108205 if (node != NUMA_NO_NODE)
108206@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
108207 if (!page)
108208 return NULL;
108209
108210- return page_address(page);
108211+ __SetPageSlab(page);
108212+ return page;
108213 }
108214
108215-static void slob_free_pages(void *b, int order)
108216+static void slob_free_pages(struct page *sp, int order)
108217 {
108218 if (current->reclaim_state)
108219 current->reclaim_state->reclaimed_slab += 1 << order;
108220- free_pages((unsigned long)b, order);
108221+ __ClearPageSlab(sp);
108222+ page_mapcount_reset(sp);
108223+ sp->private = 0;
108224+ __free_pages(sp, order);
108225 }
108226
108227 /*
108228@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108229
108230 /* Not enough space: must allocate a new page */
108231 if (!b) {
108232- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108233- if (!b)
108234+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
108235+ if (!sp)
108236 return NULL;
108237- sp = virt_to_page(b);
108238- __SetPageSlab(sp);
108239+ b = page_address(sp);
108240
108241 spin_lock_irqsave(&slob_lock, flags);
108242 sp->units = SLOB_UNITS(PAGE_SIZE);
108243 sp->freelist = b;
108244+ sp->private = 0;
108245 INIT_LIST_HEAD(&sp->lru);
108246 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
108247 set_slob_page_free(sp, slob_list);
108248@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
108249 /*
108250 * slob_free: entry point into the slob allocator.
108251 */
108252-static void slob_free(void *block, int size)
108253+static void slob_free(struct kmem_cache *c, void *block, int size)
108254 {
108255 struct page *sp;
108256 slob_t *prev, *next, *b = (slob_t *)block;
108257@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
108258 if (slob_page_free(sp))
108259 clear_slob_page_free(sp);
108260 spin_unlock_irqrestore(&slob_lock, flags);
108261- __ClearPageSlab(sp);
108262- page_mapcount_reset(sp);
108263- slob_free_pages(b, 0);
108264+ slob_free_pages(sp, 0);
108265 return;
108266 }
108267
108268+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108269+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
108270+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
108271+#endif
108272+
108273 if (!slob_page_free(sp)) {
108274 /* This slob page is about to become partially free. Easy! */
108275 sp->units = units;
108276@@ -424,11 +431,10 @@ out:
108277 */
108278
108279 static __always_inline void *
108280-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108281+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
108282 {
108283- unsigned int *m;
108284- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108285- void *ret;
108286+ slob_t *m;
108287+ void *ret = NULL;
108288
108289 gfp &= gfp_allowed_mask;
108290
108291@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108292
108293 if (!m)
108294 return NULL;
108295- *m = size;
108296+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
108297+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
108298+ m[0].units = size;
108299+ m[1].units = align;
108300 ret = (void *)m + align;
108301
108302 trace_kmalloc_node(caller, ret,
108303 size, size + align, gfp, node);
108304 } else {
108305 unsigned int order = get_order(size);
108306+ struct page *page;
108307
108308 if (likely(order))
108309 gfp |= __GFP_COMP;
108310- ret = slob_new_pages(gfp, order, node);
108311+ page = slob_new_pages(gfp, order, node);
108312+ if (page) {
108313+ ret = page_address(page);
108314+ page->private = size;
108315+ }
108316
108317 trace_kmalloc_node(caller, ret,
108318 size, PAGE_SIZE << order, gfp, node);
108319 }
108320
108321- kmemleak_alloc(ret, size, 1, gfp);
108322 return ret;
108323 }
108324
108325-void *__kmalloc(size_t size, gfp_t gfp)
108326+static __always_inline void *
108327+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
108328+{
108329+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108330+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
108331+
108332+ if (!ZERO_OR_NULL_PTR(ret))
108333+ kmemleak_alloc(ret, size, 1, gfp);
108334+ return ret;
108335+}
108336+
108337+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
108338 {
108339 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
108340 }
108341@@ -491,34 +515,112 @@ void kfree(const void *block)
108342 return;
108343 kmemleak_free(block);
108344
108345+ VM_BUG_ON(!virt_addr_valid(block));
108346 sp = virt_to_page(block);
108347- if (PageSlab(sp)) {
108348+ VM_BUG_ON(!PageSlab(sp));
108349+ if (!sp->private) {
108350 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108351- unsigned int *m = (unsigned int *)(block - align);
108352- slob_free(m, *m + align);
108353- } else
108354+ slob_t *m = (slob_t *)(block - align);
108355+ slob_free(NULL, m, m[0].units + align);
108356+ } else {
108357+ __ClearPageSlab(sp);
108358+ page_mapcount_reset(sp);
108359+ sp->private = 0;
108360 __free_pages(sp, compound_order(sp));
108361+ }
108362 }
108363 EXPORT_SYMBOL(kfree);
108364
108365+bool is_usercopy_object(const void *ptr)
108366+{
108367+ if (!slab_is_available())
108368+ return false;
108369+
108370+ // PAX: TODO
108371+
108372+ return false;
108373+}
108374+
108375+#ifdef CONFIG_PAX_USERCOPY
108376+const char *check_heap_object(const void *ptr, unsigned long n)
108377+{
108378+ struct page *page;
108379+ const slob_t *free;
108380+ const void *base;
108381+ unsigned long flags;
108382+
108383+ if (ZERO_OR_NULL_PTR(ptr))
108384+ return "<null>";
108385+
108386+ if (!virt_addr_valid(ptr))
108387+ return NULL;
108388+
108389+ page = virt_to_head_page(ptr);
108390+ if (!PageSlab(page))
108391+ return NULL;
108392+
108393+ if (page->private) {
108394+ base = page;
108395+ if (base <= ptr && n <= page->private - (ptr - base))
108396+ return NULL;
108397+ return "<slob>";
108398+ }
108399+
108400+ /* some tricky double walking to find the chunk */
108401+ spin_lock_irqsave(&slob_lock, flags);
108402+ base = (void *)((unsigned long)ptr & PAGE_MASK);
108403+ free = page->freelist;
108404+
108405+ while (!slob_last(free) && (void *)free <= ptr) {
108406+ base = free + slob_units(free);
108407+ free = slob_next(free);
108408+ }
108409+
108410+ while (base < (void *)free) {
108411+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
108412+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
108413+ int offset;
108414+
108415+ if (ptr < base + align)
108416+ break;
108417+
108418+ offset = ptr - base - align;
108419+ if (offset >= m) {
108420+ base += size;
108421+ continue;
108422+ }
108423+
108424+ if (n > m - offset)
108425+ break;
108426+
108427+ spin_unlock_irqrestore(&slob_lock, flags);
108428+ return NULL;
108429+ }
108430+
108431+ spin_unlock_irqrestore(&slob_lock, flags);
108432+ return "<slob>";
108433+}
108434+#endif
108435+
108436 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
108437 size_t ksize(const void *block)
108438 {
108439 struct page *sp;
108440 int align;
108441- unsigned int *m;
108442+ slob_t *m;
108443
108444 BUG_ON(!block);
108445 if (unlikely(block == ZERO_SIZE_PTR))
108446 return 0;
108447
108448 sp = virt_to_page(block);
108449- if (unlikely(!PageSlab(sp)))
108450- return PAGE_SIZE << compound_order(sp);
108451+ VM_BUG_ON(!PageSlab(sp));
108452+ if (sp->private)
108453+ return sp->private;
108454
108455 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
108456- m = (unsigned int *)(block - align);
108457- return SLOB_UNITS(*m) * SLOB_UNIT;
108458+ m = (slob_t *)(block - align);
108459+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
108460 }
108461 EXPORT_SYMBOL(ksize);
108462
108463@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
108464
108465 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
108466 {
108467- void *b;
108468+ void *b = NULL;
108469
108470 flags &= gfp_allowed_mask;
108471
108472 lockdep_trace_alloc(flags);
108473
108474+#ifdef CONFIG_PAX_USERCOPY_SLABS
108475+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
108476+#else
108477 if (c->size < PAGE_SIZE) {
108478 b = slob_alloc(c->size, flags, c->align, node);
108479 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108480 SLOB_UNITS(c->size) * SLOB_UNIT,
108481 flags, node);
108482 } else {
108483- b = slob_new_pages(flags, get_order(c->size), node);
108484+ struct page *sp;
108485+
108486+ sp = slob_new_pages(flags, get_order(c->size), node);
108487+ if (sp) {
108488+ b = page_address(sp);
108489+ sp->private = c->size;
108490+ }
108491 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
108492 PAGE_SIZE << get_order(c->size),
108493 flags, node);
108494 }
108495+#endif
108496
108497 if (b && c->ctor)
108498 c->ctor(b);
108499@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
108500 EXPORT_SYMBOL(kmem_cache_alloc);
108501
108502 #ifdef CONFIG_NUMA
108503-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
108504+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
108505 {
108506 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
108507 }
108508@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
108509 EXPORT_SYMBOL(kmem_cache_alloc_node);
108510 #endif
108511
108512-static void __kmem_cache_free(void *b, int size)
108513+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
108514 {
108515- if (size < PAGE_SIZE)
108516- slob_free(b, size);
108517+ struct page *sp;
108518+
108519+ sp = virt_to_page(b);
108520+ BUG_ON(!PageSlab(sp));
108521+ if (!sp->private)
108522+ slob_free(c, b, size);
108523 else
108524- slob_free_pages(b, get_order(size));
108525+ slob_free_pages(sp, get_order(size));
108526 }
108527
108528 static void kmem_rcu_free(struct rcu_head *head)
108529@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
108530 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
108531 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
108532
108533- __kmem_cache_free(b, slob_rcu->size);
108534+ __kmem_cache_free(NULL, b, slob_rcu->size);
108535 }
108536
108537 void kmem_cache_free(struct kmem_cache *c, void *b)
108538 {
108539+ int size = c->size;
108540+
108541+#ifdef CONFIG_PAX_USERCOPY_SLABS
108542+ if (size + c->align < PAGE_SIZE) {
108543+ size += c->align;
108544+ b -= c->align;
108545+ }
108546+#endif
108547+
108548 kmemleak_free_recursive(b, c->flags);
108549 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
108550 struct slob_rcu *slob_rcu;
108551- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
108552- slob_rcu->size = c->size;
108553+ slob_rcu = b + (size - sizeof(struct slob_rcu));
108554+ slob_rcu->size = size;
108555 call_rcu(&slob_rcu->head, kmem_rcu_free);
108556 } else {
108557- __kmem_cache_free(b, c->size);
108558+ __kmem_cache_free(c, b, size);
108559 }
108560
108561+#ifdef CONFIG_PAX_USERCOPY_SLABS
108562+ trace_kfree(_RET_IP_, b);
108563+#else
108564 trace_kmem_cache_free(_RET_IP_, b);
108565+#endif
108566+
108567 }
108568 EXPORT_SYMBOL(kmem_cache_free);
108569
108570diff --git a/mm/slub.c b/mm/slub.c
108571index 82c4737..55c316a 100644
108572--- a/mm/slub.c
108573+++ b/mm/slub.c
108574@@ -198,7 +198,7 @@ struct track {
108575
108576 enum track_item { TRACK_ALLOC, TRACK_FREE };
108577
108578-#ifdef CONFIG_SYSFS
108579+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108580 static int sysfs_slab_add(struct kmem_cache *);
108581 static int sysfs_slab_alias(struct kmem_cache *, const char *);
108582 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
108583@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
108584 if (!t->addr)
108585 return;
108586
108587- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
108588+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
108589 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
108590 #ifdef CONFIG_STACKTRACE
108591 {
108592@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
108593
108594 slab_free_hook(s, x);
108595
108596+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108597+ if (!(s->flags & SLAB_NO_SANITIZE)) {
108598+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
108599+ if (s->ctor)
108600+ s->ctor(x);
108601+ }
108602+#endif
108603+
108604 redo:
108605 /*
108606 * Determine the currently cpus per cpu slab.
108607@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
108608 s->inuse = size;
108609
108610 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
108611+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108612+ (!(flags & SLAB_NO_SANITIZE)) ||
108613+#endif
108614 s->ctor)) {
108615 /*
108616 * Relocate free pointer after the object if it is not
108617@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
108618
108619 __setup("slub_min_objects=", setup_slub_min_objects);
108620
108621-void *__kmalloc(size_t size, gfp_t flags)
108622+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
108623 {
108624 struct kmem_cache *s;
108625 void *ret;
108626@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
108627 return ptr;
108628 }
108629
108630-void *__kmalloc_node(size_t size, gfp_t flags, int node)
108631+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
108632 {
108633 struct kmem_cache *s;
108634 void *ret;
108635@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
108636 return slab_ksize(page->slab_cache);
108637 }
108638
108639+bool is_usercopy_object(const void *ptr)
108640+{
108641+ struct page *page;
108642+ struct kmem_cache *s;
108643+
108644+ if (ZERO_OR_NULL_PTR(ptr))
108645+ return false;
108646+
108647+ if (!slab_is_available())
108648+ return false;
108649+
108650+ if (!virt_addr_valid(ptr))
108651+ return false;
108652+
108653+ page = virt_to_head_page(ptr);
108654+
108655+ if (!PageSlab(page))
108656+ return false;
108657+
108658+ s = page->slab_cache;
108659+ return s->flags & SLAB_USERCOPY;
108660+}
108661+
108662+#ifdef CONFIG_PAX_USERCOPY
108663+const char *check_heap_object(const void *ptr, unsigned long n)
108664+{
108665+ struct page *page;
108666+ struct kmem_cache *s;
108667+ unsigned long offset;
108668+
108669+ if (ZERO_OR_NULL_PTR(ptr))
108670+ return "<null>";
108671+
108672+ if (!virt_addr_valid(ptr))
108673+ return NULL;
108674+
108675+ page = virt_to_head_page(ptr);
108676+
108677+ if (!PageSlab(page))
108678+ return NULL;
108679+
108680+ s = page->slab_cache;
108681+ if (!(s->flags & SLAB_USERCOPY))
108682+ return s->name;
108683+
108684+ offset = (ptr - page_address(page)) % s->size;
108685+ if (offset <= s->object_size && n <= s->object_size - offset)
108686+ return NULL;
108687+
108688+ return s->name;
108689+}
108690+#endif
108691+
108692 size_t ksize(const void *object)
108693 {
108694 size_t size = __ksize(object);
108695@@ -3410,6 +3474,7 @@ void kfree(const void *x)
108696 if (unlikely(ZERO_OR_NULL_PTR(x)))
108697 return;
108698
108699+ VM_BUG_ON(!virt_addr_valid(x));
108700 page = virt_to_head_page(x);
108701 if (unlikely(!PageSlab(page))) {
108702 BUG_ON(!PageCompound(page));
108703@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108704
108705 s = find_mergeable(size, align, flags, name, ctor);
108706 if (s) {
108707- s->refcount++;
108708+ atomic_inc(&s->refcount);
108709
108710 /*
108711 * Adjust the object sizes so that we clear
108712@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
108713 }
108714
108715 if (sysfs_slab_alias(s, name)) {
108716- s->refcount--;
108717+ atomic_dec(&s->refcount);
108718 s = NULL;
108719 }
108720 }
108721@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
108722 }
108723 #endif
108724
108725-#ifdef CONFIG_SYSFS
108726+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108727 static int count_inuse(struct page *page)
108728 {
108729 return page->inuse;
108730@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
108731 len += sprintf(buf + len, "%7ld ", l->count);
108732
108733 if (l->addr)
108734+#ifdef CONFIG_GRKERNSEC_HIDESYM
108735+ len += sprintf(buf + len, "%pS", NULL);
108736+#else
108737 len += sprintf(buf + len, "%pS", (void *)l->addr);
108738+#endif
108739 else
108740 len += sprintf(buf + len, "<not-available>");
108741
108742@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
108743 validate_slab_cache(kmalloc_caches[9]);
108744 }
108745 #else
108746-#ifdef CONFIG_SYSFS
108747+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108748 static void resiliency_test(void) {};
108749 #endif
108750 #endif
108751
108752-#ifdef CONFIG_SYSFS
108753+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108754 enum slab_stat_type {
108755 SL_ALL, /* All slabs */
108756 SL_PARTIAL, /* Only partially allocated slabs */
108757@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
108758 {
108759 if (!s->ctor)
108760 return 0;
108761+#ifdef CONFIG_GRKERNSEC_HIDESYM
108762+ return sprintf(buf, "%pS\n", NULL);
108763+#else
108764 return sprintf(buf, "%pS\n", s->ctor);
108765+#endif
108766 }
108767 SLAB_ATTR_RO(ctor);
108768
108769 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
108770 {
108771- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
108772+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
108773 }
108774 SLAB_ATTR_RO(aliases);
108775
108776@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
108777 SLAB_ATTR_RO(cache_dma);
108778 #endif
108779
108780+#ifdef CONFIG_PAX_USERCOPY_SLABS
108781+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
108782+{
108783+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
108784+}
108785+SLAB_ATTR_RO(usercopy);
108786+#endif
108787+
108788+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108789+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
108790+{
108791+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
108792+}
108793+SLAB_ATTR_RO(sanitize);
108794+#endif
108795+
108796 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
108797 {
108798 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
108799@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
108800 * as well as cause other issues like converting a mergeable
108801 * cache into an umergeable one.
108802 */
108803- if (s->refcount > 1)
108804+ if (atomic_read(&s->refcount) > 1)
108805 return -EINVAL;
108806
108807 s->flags &= ~SLAB_TRACE;
108808@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
108809 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
108810 size_t length)
108811 {
108812- if (s->refcount > 1)
108813+ if (atomic_read(&s->refcount) > 1)
108814 return -EINVAL;
108815
108816 s->flags &= ~SLAB_FAILSLAB;
108817@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
108818 #ifdef CONFIG_ZONE_DMA
108819 &cache_dma_attr.attr,
108820 #endif
108821+#ifdef CONFIG_PAX_USERCOPY_SLABS
108822+ &usercopy_attr.attr,
108823+#endif
108824+#ifdef CONFIG_PAX_MEMORY_SANITIZE
108825+ &sanitize_attr.attr,
108826+#endif
108827 #ifdef CONFIG_NUMA
108828 &remote_node_defrag_ratio_attr.attr,
108829 #endif
108830@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
108831 return name;
108832 }
108833
108834+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108835 static int sysfs_slab_add(struct kmem_cache *s)
108836 {
108837 int err;
108838@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
108839 kobject_del(&s->kobj);
108840 kobject_put(&s->kobj);
108841 }
108842+#endif
108843
108844 /*
108845 * Need to buffer aliases during bootup until sysfs becomes
108846@@ -5243,6 +5340,7 @@ struct saved_alias {
108847
108848 static struct saved_alias *alias_list;
108849
108850+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
108851 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108852 {
108853 struct saved_alias *al;
108854@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
108855 alias_list = al;
108856 return 0;
108857 }
108858+#endif
108859
108860 static int __init slab_sysfs_init(void)
108861 {
108862diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
108863index 4cba9c2..b4f9fcc 100644
108864--- a/mm/sparse-vmemmap.c
108865+++ b/mm/sparse-vmemmap.c
108866@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
108867 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108868 if (!p)
108869 return NULL;
108870- pud_populate(&init_mm, pud, p);
108871+ pud_populate_kernel(&init_mm, pud, p);
108872 }
108873 return pud;
108874 }
108875@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
108876 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
108877 if (!p)
108878 return NULL;
108879- pgd_populate(&init_mm, pgd, p);
108880+ pgd_populate_kernel(&init_mm, pgd, p);
108881 }
108882 return pgd;
108883 }
108884diff --git a/mm/sparse.c b/mm/sparse.c
108885index d1b48b6..6e8590e 100644
108886--- a/mm/sparse.c
108887+++ b/mm/sparse.c
108888@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
108889
108890 for (i = 0; i < PAGES_PER_SECTION; i++) {
108891 if (PageHWPoison(&memmap[i])) {
108892- atomic_long_sub(1, &num_poisoned_pages);
108893+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
108894 ClearPageHWPoison(&memmap[i]);
108895 }
108896 }
108897diff --git a/mm/swap.c b/mm/swap.c
108898index cd3a5e6..40c0c8f 100644
108899--- a/mm/swap.c
108900+++ b/mm/swap.c
108901@@ -31,6 +31,7 @@
108902 #include <linux/memcontrol.h>
108903 #include <linux/gfp.h>
108904 #include <linux/uio.h>
108905+#include <linux/hugetlb.h>
108906
108907 #include "internal.h"
108908
108909@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
108910
108911 __page_cache_release(page);
108912 dtor = get_compound_page_dtor(page);
108913+ if (!PageHuge(page))
108914+ BUG_ON(dtor != free_compound_page);
108915 (*dtor)(page);
108916 }
108917
108918diff --git a/mm/swapfile.c b/mm/swapfile.c
108919index 63f55cc..31874e6 100644
108920--- a/mm/swapfile.c
108921+++ b/mm/swapfile.c
108922@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
108923
108924 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
108925 /* Activity counter to indicate that a swapon or swapoff has occurred */
108926-static atomic_t proc_poll_event = ATOMIC_INIT(0);
108927+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
108928
108929 static inline unsigned char swap_count(unsigned char ent)
108930 {
108931@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
108932 spin_unlock(&swap_lock);
108933
108934 err = 0;
108935- atomic_inc(&proc_poll_event);
108936+ atomic_inc_unchecked(&proc_poll_event);
108937 wake_up_interruptible(&proc_poll_wait);
108938
108939 out_dput:
108940@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
108941
108942 poll_wait(file, &proc_poll_wait, wait);
108943
108944- if (seq->poll_event != atomic_read(&proc_poll_event)) {
108945- seq->poll_event = atomic_read(&proc_poll_event);
108946+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
108947+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108948 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
108949 }
108950
108951@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
108952 return ret;
108953
108954 seq = file->private_data;
108955- seq->poll_event = atomic_read(&proc_poll_event);
108956+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
108957 return 0;
108958 }
108959
108960@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
108961 (frontswap_map) ? "FS" : "");
108962
108963 mutex_unlock(&swapon_mutex);
108964- atomic_inc(&proc_poll_event);
108965+ atomic_inc_unchecked(&proc_poll_event);
108966 wake_up_interruptible(&proc_poll_wait);
108967
108968 if (S_ISREG(inode->i_mode))
108969diff --git a/mm/util.c b/mm/util.c
108970index 3981ae9..28b585b 100644
108971--- a/mm/util.c
108972+++ b/mm/util.c
108973@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
108974 void arch_pick_mmap_layout(struct mm_struct *mm)
108975 {
108976 mm->mmap_base = TASK_UNMAPPED_BASE;
108977+
108978+#ifdef CONFIG_PAX_RANDMMAP
108979+ if (mm->pax_flags & MF_PAX_RANDMMAP)
108980+ mm->mmap_base += mm->delta_mmap;
108981+#endif
108982+
108983 mm->get_unmapped_area = arch_get_unmapped_area;
108984 }
108985 #endif
108986@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
108987 if (!mm->arg_end)
108988 goto out_mm; /* Shh! No looking before we're done */
108989
108990+ if (gr_acl_handle_procpidmem(task))
108991+ goto out_mm;
108992+
108993 len = mm->arg_end - mm->arg_start;
108994
108995 if (len > buflen)
108996diff --git a/mm/vmalloc.c b/mm/vmalloc.c
108997index 49abccf..7bd1931 100644
108998--- a/mm/vmalloc.c
108999+++ b/mm/vmalloc.c
109000@@ -39,20 +39,65 @@ struct vfree_deferred {
109001 struct work_struct wq;
109002 };
109003 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
109004+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
109005+
109006+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109007+struct stack_deferred_llist {
109008+ struct llist_head list;
109009+ void *stack;
109010+ void *lowmem_stack;
109011+};
109012+
109013+struct stack_deferred {
109014+ struct stack_deferred_llist list;
109015+ struct work_struct wq;
109016+};
109017+
109018+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
109019+#endif
109020
109021 static void __vunmap(const void *, int);
109022
109023-static void free_work(struct work_struct *w)
109024+static void vfree_work(struct work_struct *w)
109025 {
109026 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109027 struct llist_node *llnode = llist_del_all(&p->list);
109028 while (llnode) {
109029- void *p = llnode;
109030+ void *x = llnode;
109031 llnode = llist_next(llnode);
109032- __vunmap(p, 1);
109033+ __vunmap(x, 1);
109034 }
109035 }
109036
109037+static void vunmap_work(struct work_struct *w)
109038+{
109039+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
109040+ struct llist_node *llnode = llist_del_all(&p->list);
109041+ while (llnode) {
109042+ void *x = llnode;
109043+ llnode = llist_next(llnode);
109044+ __vunmap(x, 0);
109045+ }
109046+}
109047+
109048+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109049+static void unmap_work(struct work_struct *w)
109050+{
109051+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
109052+ struct llist_node *llnode = llist_del_all(&p->list.list);
109053+ while (llnode) {
109054+ struct stack_deferred_llist *x =
109055+ llist_entry((struct llist_head *)llnode,
109056+ struct stack_deferred_llist, list);
109057+ void *stack = ACCESS_ONCE(x->stack);
109058+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
109059+ llnode = llist_next(llnode);
109060+ __vunmap(stack, 0);
109061+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
109062+ }
109063+}
109064+#endif
109065+
109066 /*** Page table manipulation functions ***/
109067
109068 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109069@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
109070
109071 pte = pte_offset_kernel(pmd, addr);
109072 do {
109073- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109074- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109075+
109076+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109077+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
109078+ BUG_ON(!pte_exec(*pte));
109079+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
109080+ continue;
109081+ }
109082+#endif
109083+
109084+ {
109085+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
109086+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
109087+ }
109088 } while (pte++, addr += PAGE_SIZE, addr != end);
109089 }
109090
109091@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
109092 pte = pte_alloc_kernel(pmd, addr);
109093 if (!pte)
109094 return -ENOMEM;
109095+
109096+ pax_open_kernel();
109097 do {
109098 struct page *page = pages[*nr];
109099
109100- if (WARN_ON(!pte_none(*pte)))
109101+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109102+ if (pgprot_val(prot) & _PAGE_NX)
109103+#endif
109104+
109105+ if (!pte_none(*pte)) {
109106+ pax_close_kernel();
109107+ WARN_ON(1);
109108 return -EBUSY;
109109- if (WARN_ON(!page))
109110+ }
109111+ if (!page) {
109112+ pax_close_kernel();
109113+ WARN_ON(1);
109114 return -ENOMEM;
109115+ }
109116 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
109117 (*nr)++;
109118 } while (pte++, addr += PAGE_SIZE, addr != end);
109119+ pax_close_kernel();
109120 return 0;
109121 }
109122
109123@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
109124 pmd_t *pmd;
109125 unsigned long next;
109126
109127- pmd = pmd_alloc(&init_mm, pud, addr);
109128+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
109129 if (!pmd)
109130 return -ENOMEM;
109131 do {
109132@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
109133 pud_t *pud;
109134 unsigned long next;
109135
109136- pud = pud_alloc(&init_mm, pgd, addr);
109137+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
109138 if (!pud)
109139 return -ENOMEM;
109140 do {
109141@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
109142 if (addr >= MODULES_VADDR && addr < MODULES_END)
109143 return 1;
109144 #endif
109145+
109146+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
109147+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
109148+ return 1;
109149+#endif
109150+
109151 return is_vmalloc_addr(x);
109152 }
109153
109154@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
109155
109156 if (!pgd_none(*pgd)) {
109157 pud_t *pud = pud_offset(pgd, addr);
109158+#ifdef CONFIG_X86
109159+ if (!pud_large(*pud))
109160+#endif
109161 if (!pud_none(*pud)) {
109162 pmd_t *pmd = pmd_offset(pud, addr);
109163+#ifdef CONFIG_X86
109164+ if (!pmd_large(*pmd))
109165+#endif
109166 if (!pmd_none(*pmd)) {
109167 pte_t *ptep, pte;
109168
109169@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
109170 * Allocate a region of KVA of the specified size and alignment, within the
109171 * vstart and vend.
109172 */
109173-static struct vmap_area *alloc_vmap_area(unsigned long size,
109174+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
109175 unsigned long align,
109176 unsigned long vstart, unsigned long vend,
109177 int node, gfp_t gfp_mask)
109178@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
109179 for_each_possible_cpu(i) {
109180 struct vmap_block_queue *vbq;
109181 struct vfree_deferred *p;
109182+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109183+ struct stack_deferred *p2;
109184+#endif
109185
109186 vbq = &per_cpu(vmap_block_queue, i);
109187 spin_lock_init(&vbq->lock);
109188 INIT_LIST_HEAD(&vbq->free);
109189+
109190 p = &per_cpu(vfree_deferred, i);
109191 init_llist_head(&p->list);
109192- INIT_WORK(&p->wq, free_work);
109193+ INIT_WORK(&p->wq, vfree_work);
109194+
109195+ p = &per_cpu(vunmap_deferred, i);
109196+ init_llist_head(&p->list);
109197+ INIT_WORK(&p->wq, vunmap_work);
109198+
109199+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109200+ p2 = &per_cpu(stack_deferred, i);
109201+ init_llist_head(&p2->list.list);
109202+ INIT_WORK(&p2->wq, unmap_work);
109203+#endif
109204 }
109205
109206 /* Import existing vmlist entries. */
109207@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
109208 struct vm_struct *area;
109209
109210 BUG_ON(in_interrupt());
109211+
109212+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109213+ if (flags & VM_KERNEXEC) {
109214+ if (start != VMALLOC_START || end != VMALLOC_END)
109215+ return NULL;
109216+ start = (unsigned long)MODULES_EXEC_VADDR;
109217+ end = (unsigned long)MODULES_EXEC_END;
109218+ }
109219+#endif
109220+
109221 if (flags & VM_IOREMAP)
109222 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
109223
109224@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
109225 */
109226 void vunmap(const void *addr)
109227 {
109228- BUG_ON(in_interrupt());
109229- might_sleep();
109230- if (addr)
109231+ if (!addr)
109232+ return;
109233+ if (unlikely(in_interrupt())) {
109234+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
109235+ if (llist_add((struct llist_node *)addr, &p->list))
109236+ schedule_work(&p->wq);
109237+ } else {
109238+ might_sleep();
109239 __vunmap(addr, 0);
109240+ }
109241 }
109242 EXPORT_SYMBOL(vunmap);
109243
109244+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
109245+void unmap_process_stacks(struct task_struct *task)
109246+{
109247+ if (unlikely(in_interrupt())) {
109248+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
109249+ struct stack_deferred_llist *list = task->stack;
109250+ list->stack = task->stack;
109251+ list->lowmem_stack = task->lowmem_stack;
109252+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
109253+ schedule_work(&p->wq);
109254+ } else {
109255+ __vunmap(task->stack, 0);
109256+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
109257+ }
109258+}
109259+#endif
109260+
109261 /**
109262 * vmap - map an array of pages into virtually contiguous space
109263 * @pages: array of page pointers
109264@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
109265 if (count > totalram_pages)
109266 return NULL;
109267
109268+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109269+ if (!(pgprot_val(prot) & _PAGE_NX))
109270+ flags |= VM_KERNEXEC;
109271+#endif
109272+
109273 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
109274 __builtin_return_address(0));
109275 if (!area)
109276@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
109277 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
109278 goto fail;
109279
109280+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
109281+ if (!(pgprot_val(prot) & _PAGE_NX)) {
109282+ vm_flags |= VM_KERNEXEC;
109283+ start = VMALLOC_START;
109284+ end = VMALLOC_END;
109285+ }
109286+#endif
109287+
109288 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
109289 vm_flags, start, end, node, gfp_mask, caller);
109290 if (!area)
109291@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
109292 * For tight control over page level allocator and protection flags
109293 * use __vmalloc() instead.
109294 */
109295-
109296 void *vmalloc_exec(unsigned long size)
109297 {
109298- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
109299+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
109300 NUMA_NO_NODE, __builtin_return_address(0));
109301 }
109302
109303@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
109304 {
109305 struct vm_struct *area;
109306
109307+ BUG_ON(vma->vm_mirror);
109308+
109309 size = PAGE_ALIGN(size);
109310
109311 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
109312@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
109313 v->addr, v->addr + v->size, v->size);
109314
109315 if (v->caller)
109316+#ifdef CONFIG_GRKERNSEC_HIDESYM
109317+ seq_printf(m, " %pK", v->caller);
109318+#else
109319 seq_printf(m, " %pS", v->caller);
109320+#endif
109321
109322 if (v->nr_pages)
109323 seq_printf(m, " pages=%d", v->nr_pages);
109324diff --git a/mm/vmstat.c b/mm/vmstat.c
109325index 4f5cd97..9fb715a 100644
109326--- a/mm/vmstat.c
109327+++ b/mm/vmstat.c
109328@@ -27,6 +27,7 @@
109329 #include <linux/mm_inline.h>
109330 #include <linux/page_ext.h>
109331 #include <linux/page_owner.h>
109332+#include <linux/grsecurity.h>
109333
109334 #include "internal.h"
109335
109336@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
109337 *
109338 * vm_stat contains the global counters
109339 */
109340-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109341+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
109342 EXPORT_SYMBOL(vm_stat);
109343
109344 #ifdef CONFIG_SMP
109345@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
109346
109347 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109348 if (diff[i]) {
109349- atomic_long_add(diff[i], &vm_stat[i]);
109350+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
109351 changes++;
109352 }
109353 return changes;
109354@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
109355 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
109356 if (v) {
109357
109358- atomic_long_add(v, &zone->vm_stat[i]);
109359+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109360 global_diff[i] += v;
109361 #ifdef CONFIG_NUMA
109362 /* 3 seconds idle till flush */
109363@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
109364
109365 v = p->vm_stat_diff[i];
109366 p->vm_stat_diff[i] = 0;
109367- atomic_long_add(v, &zone->vm_stat[i]);
109368+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109369 global_diff[i] += v;
109370 }
109371 }
109372@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
109373 if (pset->vm_stat_diff[i]) {
109374 int v = pset->vm_stat_diff[i];
109375 pset->vm_stat_diff[i] = 0;
109376- atomic_long_add(v, &zone->vm_stat[i]);
109377- atomic_long_add(v, &vm_stat[i]);
109378+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
109379+ atomic_long_add_unchecked(v, &vm_stat[i]);
109380 }
109381 }
109382 #endif
109383@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
109384 stat_items_size += sizeof(struct vm_event_state);
109385 #endif
109386
109387- v = kmalloc(stat_items_size, GFP_KERNEL);
109388+ v = kzalloc(stat_items_size, GFP_KERNEL);
109389 m->private = v;
109390 if (!v)
109391 return ERR_PTR(-ENOMEM);
109392+
109393+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109394+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
109395+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
109396+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
109397+ && !in_group_p(grsec_proc_gid)
109398+#endif
109399+ )
109400+ return (unsigned long *)m->private + *pos;
109401+#endif
109402+#endif
109403+
109404 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
109405 v[i] = global_page_state(i);
109406 v += NR_VM_ZONE_STAT_ITEMS;
109407@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
109408 cpu_notifier_register_done();
109409 #endif
109410 #ifdef CONFIG_PROC_FS
109411- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
109412- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
109413- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109414- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
109415+ {
109416+ mode_t gr_mode = S_IRUGO;
109417+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109418+ gr_mode = S_IRUSR;
109419+#endif
109420+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
109421+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
109422+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
109423+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
109424+ }
109425 #endif
109426 return 0;
109427 }
109428diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
109429index 64c6bed..b79a5de 100644
109430--- a/net/8021q/vlan.c
109431+++ b/net/8021q/vlan.c
109432@@ -481,7 +481,7 @@ out:
109433 return NOTIFY_DONE;
109434 }
109435
109436-static struct notifier_block vlan_notifier_block __read_mostly = {
109437+static struct notifier_block vlan_notifier_block = {
109438 .notifier_call = vlan_device_event,
109439 };
109440
109441@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
109442 err = -EPERM;
109443 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
109444 break;
109445- if ((args.u.name_type >= 0) &&
109446- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
109447+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
109448 struct vlan_net *vn;
109449
109450 vn = net_generic(net, vlan_net_id);
109451diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
109452index c92b52f..006c052 100644
109453--- a/net/8021q/vlan_netlink.c
109454+++ b/net/8021q/vlan_netlink.c
109455@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
109456 return dev_net(real_dev);
109457 }
109458
109459-struct rtnl_link_ops vlan_link_ops __read_mostly = {
109460+struct rtnl_link_ops vlan_link_ops = {
109461 .kind = "vlan",
109462 .maxtype = IFLA_VLAN_MAX,
109463 .policy = vlan_policy,
109464diff --git a/net/9p/client.c b/net/9p/client.c
109465index e86a9bea..e91f70e 100644
109466--- a/net/9p/client.c
109467+++ b/net/9p/client.c
109468@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
109469 len - inline_len);
109470 } else {
109471 err = copy_from_user(ename + inline_len,
109472- uidata, len - inline_len);
109473+ (char __force_user *)uidata, len - inline_len);
109474 if (err) {
109475 err = -EFAULT;
109476 goto out_err;
109477@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
109478 kernel_buf = 1;
109479 indata = data;
109480 } else
109481- indata = (__force char *)udata;
109482+ indata = (__force_kernel char *)udata;
109483 /*
109484 * response header len is 11
109485 * PDU Header(7) + IO Size (4)
109486@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
109487 kernel_buf = 1;
109488 odata = data;
109489 } else
109490- odata = (char *)udata;
109491+ odata = (char __force_kernel *)udata;
109492 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
109493 P9_ZC_HDR_SZ, kernel_buf, "dqd",
109494 fid->fid, offset, rsize);
109495diff --git a/net/9p/mod.c b/net/9p/mod.c
109496index 6ab36ae..6f1841b 100644
109497--- a/net/9p/mod.c
109498+++ b/net/9p/mod.c
109499@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
109500 void v9fs_register_trans(struct p9_trans_module *m)
109501 {
109502 spin_lock(&v9fs_trans_lock);
109503- list_add_tail(&m->list, &v9fs_trans_list);
109504+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
109505 spin_unlock(&v9fs_trans_lock);
109506 }
109507 EXPORT_SYMBOL(v9fs_register_trans);
109508@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
109509 void v9fs_unregister_trans(struct p9_trans_module *m)
109510 {
109511 spin_lock(&v9fs_trans_lock);
109512- list_del_init(&m->list);
109513+ pax_list_del_init((struct list_head *)&m->list);
109514 spin_unlock(&v9fs_trans_lock);
109515 }
109516 EXPORT_SYMBOL(v9fs_unregister_trans);
109517diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
109518index 80d08f6..de63fd1 100644
109519--- a/net/9p/trans_fd.c
109520+++ b/net/9p/trans_fd.c
109521@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
109522 oldfs = get_fs();
109523 set_fs(get_ds());
109524 /* The cast to a user pointer is valid due to the set_fs() */
109525- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
109526+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
109527 set_fs(oldfs);
109528
109529 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
109530diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
109531index af46bc4..f9adfcd 100644
109532--- a/net/appletalk/atalk_proc.c
109533+++ b/net/appletalk/atalk_proc.c
109534@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
109535 struct proc_dir_entry *p;
109536 int rc = -ENOMEM;
109537
109538- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
109539+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
109540 if (!atalk_proc_dir)
109541 goto out;
109542
109543diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
109544index 876fbe8..8bbea9f 100644
109545--- a/net/atm/atm_misc.c
109546+++ b/net/atm/atm_misc.c
109547@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
109548 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
109549 return 1;
109550 atm_return(vcc, truesize);
109551- atomic_inc(&vcc->stats->rx_drop);
109552+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109553 return 0;
109554 }
109555 EXPORT_SYMBOL(atm_charge);
109556@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
109557 }
109558 }
109559 atm_return(vcc, guess);
109560- atomic_inc(&vcc->stats->rx_drop);
109561+ atomic_inc_unchecked(&vcc->stats->rx_drop);
109562 return NULL;
109563 }
109564 EXPORT_SYMBOL(atm_alloc_charge);
109565@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
109566
109567 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109568 {
109569-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109570+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109571 __SONET_ITEMS
109572 #undef __HANDLE_ITEM
109573 }
109574@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
109575
109576 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
109577 {
109578-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109579+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
109580 __SONET_ITEMS
109581 #undef __HANDLE_ITEM
109582 }
109583diff --git a/net/atm/lec.c b/net/atm/lec.c
109584index 4b98f89..5a2f6cb 100644
109585--- a/net/atm/lec.c
109586+++ b/net/atm/lec.c
109587@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
109588 }
109589
109590 static struct lane2_ops lane2_ops = {
109591- lane2_resolve, /* resolve, spec 3.1.3 */
109592- lane2_associate_req, /* associate_req, spec 3.1.4 */
109593- NULL /* associate indicator, spec 3.1.5 */
109594+ .resolve = lane2_resolve,
109595+ .associate_req = lane2_associate_req,
109596+ .associate_indicator = NULL
109597 };
109598
109599 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
109600diff --git a/net/atm/lec.h b/net/atm/lec.h
109601index 4149db1..f2ab682 100644
109602--- a/net/atm/lec.h
109603+++ b/net/atm/lec.h
109604@@ -48,7 +48,7 @@ struct lane2_ops {
109605 const u8 *tlvs, u32 sizeoftlvs);
109606 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
109607 const u8 *tlvs, u32 sizeoftlvs);
109608-};
109609+} __no_const;
109610
109611 /*
109612 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
109613diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
109614index d1b2d9a..d549f7f 100644
109615--- a/net/atm/mpoa_caches.c
109616+++ b/net/atm/mpoa_caches.c
109617@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
109618
109619
109620 static struct in_cache_ops ingress_ops = {
109621- in_cache_add_entry, /* add_entry */
109622- in_cache_get, /* get */
109623- in_cache_get_with_mask, /* get_with_mask */
109624- in_cache_get_by_vcc, /* get_by_vcc */
109625- in_cache_put, /* put */
109626- in_cache_remove_entry, /* remove_entry */
109627- cache_hit, /* cache_hit */
109628- clear_count_and_expired, /* clear_count */
109629- check_resolving_entries, /* check_resolving */
109630- refresh_entries, /* refresh */
109631- in_destroy_cache /* destroy_cache */
109632+ .add_entry = in_cache_add_entry,
109633+ .get = in_cache_get,
109634+ .get_with_mask = in_cache_get_with_mask,
109635+ .get_by_vcc = in_cache_get_by_vcc,
109636+ .put = in_cache_put,
109637+ .remove_entry = in_cache_remove_entry,
109638+ .cache_hit = cache_hit,
109639+ .clear_count = clear_count_and_expired,
109640+ .check_resolving = check_resolving_entries,
109641+ .refresh = refresh_entries,
109642+ .destroy_cache = in_destroy_cache
109643 };
109644
109645 static struct eg_cache_ops egress_ops = {
109646- eg_cache_add_entry, /* add_entry */
109647- eg_cache_get_by_cache_id, /* get_by_cache_id */
109648- eg_cache_get_by_tag, /* get_by_tag */
109649- eg_cache_get_by_vcc, /* get_by_vcc */
109650- eg_cache_get_by_src_ip, /* get_by_src_ip */
109651- eg_cache_put, /* put */
109652- eg_cache_remove_entry, /* remove_entry */
109653- update_eg_cache_entry, /* update */
109654- clear_expired, /* clear_expired */
109655- eg_destroy_cache /* destroy_cache */
109656+ .add_entry = eg_cache_add_entry,
109657+ .get_by_cache_id = eg_cache_get_by_cache_id,
109658+ .get_by_tag = eg_cache_get_by_tag,
109659+ .get_by_vcc = eg_cache_get_by_vcc,
109660+ .get_by_src_ip = eg_cache_get_by_src_ip,
109661+ .put = eg_cache_put,
109662+ .remove_entry = eg_cache_remove_entry,
109663+ .update = update_eg_cache_entry,
109664+ .clear_expired = clear_expired,
109665+ .destroy_cache = eg_destroy_cache
109666 };
109667
109668
109669diff --git a/net/atm/proc.c b/net/atm/proc.c
109670index bbb6461..cf04016 100644
109671--- a/net/atm/proc.c
109672+++ b/net/atm/proc.c
109673@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
109674 const struct k_atm_aal_stats *stats)
109675 {
109676 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
109677- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
109678- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
109679- atomic_read(&stats->rx_drop));
109680+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
109681+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
109682+ atomic_read_unchecked(&stats->rx_drop));
109683 }
109684
109685 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
109686diff --git a/net/atm/resources.c b/net/atm/resources.c
109687index 0447d5d..3cf4728 100644
109688--- a/net/atm/resources.c
109689+++ b/net/atm/resources.c
109690@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
109691 static void copy_aal_stats(struct k_atm_aal_stats *from,
109692 struct atm_aal_stats *to)
109693 {
109694-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
109695+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
109696 __AAL_STAT_ITEMS
109697 #undef __HANDLE_ITEM
109698 }
109699@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
109700 static void subtract_aal_stats(struct k_atm_aal_stats *from,
109701 struct atm_aal_stats *to)
109702 {
109703-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
109704+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
109705 __AAL_STAT_ITEMS
109706 #undef __HANDLE_ITEM
109707 }
109708diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
109709index 919a5ce..cc6b444 100644
109710--- a/net/ax25/sysctl_net_ax25.c
109711+++ b/net/ax25/sysctl_net_ax25.c
109712@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
109713 {
109714 char path[sizeof("net/ax25/") + IFNAMSIZ];
109715 int k;
109716- struct ctl_table *table;
109717+ ctl_table_no_const *table;
109718
109719 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
109720 if (!table)
109721diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
109722index 00e00e0..710fcd2 100644
109723--- a/net/batman-adv/bat_iv_ogm.c
109724+++ b/net/batman-adv/bat_iv_ogm.c
109725@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
109726
109727 /* randomize initial seqno to avoid collision */
109728 get_random_bytes(&random_seqno, sizeof(random_seqno));
109729- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109730+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
109731
109732 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
109733 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
109734@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
109735 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
109736
109737 /* change sequence number to network order */
109738- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
109739+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
109740 batadv_ogm_packet->seqno = htonl(seqno);
109741- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
109742+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
109743
109744 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
109745
109746@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
109747 return;
109748
109749 /* could be changed by schedule_own_packet() */
109750- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
109751+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
109752
109753 if (ogm_packet->flags & BATADV_DIRECTLINK)
109754 has_directlink_flag = true;
109755diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
109756index 3d1dcaa..4699f4e 100644
109757--- a/net/batman-adv/fragmentation.c
109758+++ b/net/batman-adv/fragmentation.c
109759@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
109760 frag_header.packet_type = BATADV_UNICAST_FRAG;
109761 frag_header.version = BATADV_COMPAT_VERSION;
109762 frag_header.ttl = BATADV_TTL;
109763- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
109764+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
109765 frag_header.reserved = 0;
109766 frag_header.no = 0;
109767 frag_header.total_size = htons(skb->len);
109768diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
109769index 5ec31d7..e371631 100644
109770--- a/net/batman-adv/soft-interface.c
109771+++ b/net/batman-adv/soft-interface.c
109772@@ -295,7 +295,7 @@ send:
109773 primary_if->net_dev->dev_addr);
109774
109775 /* set broadcast sequence number */
109776- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
109777+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
109778 bcast_packet->seqno = htonl(seqno);
109779
109780 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
109781@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109782 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
109783
109784 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
109785- atomic_set(&bat_priv->bcast_seqno, 1);
109786+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
109787 atomic_set(&bat_priv->tt.vn, 0);
109788 atomic_set(&bat_priv->tt.local_changes, 0);
109789 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
109790@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
109791
109792 /* randomize initial seqno to avoid collision */
109793 get_random_bytes(&random_seqno, sizeof(random_seqno));
109794- atomic_set(&bat_priv->frag_seqno, random_seqno);
109795+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
109796
109797 bat_priv->primary_if = NULL;
109798 bat_priv->num_ifaces = 0;
109799@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
109800 return 0;
109801 }
109802
109803-struct rtnl_link_ops batadv_link_ops __read_mostly = {
109804+struct rtnl_link_ops batadv_link_ops = {
109805 .kind = "batadv",
109806 .priv_size = sizeof(struct batadv_priv),
109807 .setup = batadv_softif_init_early,
109808diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
109809index 9398c3f..0e79657 100644
109810--- a/net/batman-adv/types.h
109811+++ b/net/batman-adv/types.h
109812@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
109813 struct batadv_hard_iface_bat_iv {
109814 unsigned char *ogm_buff;
109815 int ogm_buff_len;
109816- atomic_t ogm_seqno;
109817+ atomic_unchecked_t ogm_seqno;
109818 };
109819
109820 /**
109821@@ -766,7 +766,7 @@ struct batadv_priv {
109822 atomic_t bonding;
109823 atomic_t fragmentation;
109824 atomic_t packet_size_max;
109825- atomic_t frag_seqno;
109826+ atomic_unchecked_t frag_seqno;
109827 #ifdef CONFIG_BATMAN_ADV_BLA
109828 atomic_t bridge_loop_avoidance;
109829 #endif
109830@@ -785,7 +785,7 @@ struct batadv_priv {
109831 #endif
109832 uint32_t isolation_mark;
109833 uint32_t isolation_mark_mask;
109834- atomic_t bcast_seqno;
109835+ atomic_unchecked_t bcast_seqno;
109836 atomic_t bcast_queue_left;
109837 atomic_t batman_queue_left;
109838 char num_ifaces;
109839diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
109840index 1d65c5b..43e55fd 100644
109841--- a/net/bluetooth/hci_sock.c
109842+++ b/net/bluetooth/hci_sock.c
109843@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
109844 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
109845 }
109846
109847- len = min_t(unsigned int, len, sizeof(uf));
109848+ len = min((size_t)len, sizeof(uf));
109849 if (copy_from_user(&uf, optval, len)) {
109850 err = -EFAULT;
109851 break;
109852diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
109853index 6ba33f9..4afc26f 100644
109854--- a/net/bluetooth/l2cap_core.c
109855+++ b/net/bluetooth/l2cap_core.c
109856@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
109857 break;
109858
109859 case L2CAP_CONF_RFC:
109860- if (olen == sizeof(rfc))
109861- memcpy(&rfc, (void *)val, olen);
109862+ if (olen != sizeof(rfc))
109863+ break;
109864+
109865+ memcpy(&rfc, (void *)val, olen);
109866
109867 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
109868 rfc.mode != chan->mode)
109869diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
109870index 60694f0..32623ed 100644
109871--- a/net/bluetooth/l2cap_sock.c
109872+++ b/net/bluetooth/l2cap_sock.c
109873@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109874 struct sock *sk = sock->sk;
109875 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
109876 struct l2cap_options opts;
109877- int len, err = 0;
109878+ int err = 0;
109879+ size_t len = optlen;
109880 u32 opt;
109881
109882 BT_DBG("sk %p", sk);
109883@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
109884 opts.max_tx = chan->max_tx;
109885 opts.txwin_size = chan->tx_win;
109886
109887- len = min_t(unsigned int, sizeof(opts), optlen);
109888+ len = min(sizeof(opts), len);
109889 if (copy_from_user((char *) &opts, optval, len)) {
109890 err = -EFAULT;
109891 break;
109892@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109893 struct bt_security sec;
109894 struct bt_power pwr;
109895 struct l2cap_conn *conn;
109896- int len, err = 0;
109897+ int err = 0;
109898+ size_t len = optlen;
109899 u32 opt;
109900
109901 BT_DBG("sk %p", sk);
109902@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109903
109904 sec.level = BT_SECURITY_LOW;
109905
109906- len = min_t(unsigned int, sizeof(sec), optlen);
109907+ len = min(sizeof(sec), len);
109908 if (copy_from_user((char *) &sec, optval, len)) {
109909 err = -EFAULT;
109910 break;
109911@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
109912
109913 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
109914
109915- len = min_t(unsigned int, sizeof(pwr), optlen);
109916+ len = min(sizeof(pwr), len);
109917 if (copy_from_user((char *) &pwr, optval, len)) {
109918 err = -EFAULT;
109919 break;
109920diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
109921index 3c6d2c8..6afc970 100644
109922--- a/net/bluetooth/rfcomm/sock.c
109923+++ b/net/bluetooth/rfcomm/sock.c
109924@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109925 struct sock *sk = sock->sk;
109926 struct bt_security sec;
109927 int err = 0;
109928- size_t len;
109929+ size_t len = optlen;
109930 u32 opt;
109931
109932 BT_DBG("sk %p", sk);
109933@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
109934
109935 sec.level = BT_SECURITY_LOW;
109936
109937- len = min_t(unsigned int, sizeof(sec), optlen);
109938+ len = min(sizeof(sec), len);
109939 if (copy_from_user((char *) &sec, optval, len)) {
109940 err = -EFAULT;
109941 break;
109942diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
109943index 8e385a0..a5bdd8e 100644
109944--- a/net/bluetooth/rfcomm/tty.c
109945+++ b/net/bluetooth/rfcomm/tty.c
109946@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
109947 BT_DBG("tty %p id %d", tty, tty->index);
109948
109949 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
109950- dev->channel, dev->port.count);
109951+ dev->channel, atomic_read(&dev->port.count));
109952
109953 err = tty_port_open(&dev->port, tty, filp);
109954 if (err)
109955@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
109956 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
109957
109958 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
109959- dev->port.count);
109960+ atomic_read(&dev->port.count));
109961
109962 tty_port_close(&dev->port, tty, filp);
109963 }
109964diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
109965index 4fbcea0..69a6786 100644
109966--- a/net/bridge/br_netlink.c
109967+++ b/net/bridge/br_netlink.c
109968@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
109969 .get_link_af_size = br_get_link_af_size,
109970 };
109971
109972-struct rtnl_link_ops br_link_ops __read_mostly = {
109973+struct rtnl_link_ops br_link_ops = {
109974 .kind = "bridge",
109975 .priv_size = sizeof(struct net_bridge),
109976 .setup = br_dev_setup,
109977diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
109978index 91180a7..1301daa 100644
109979--- a/net/bridge/netfilter/ebtables.c
109980+++ b/net/bridge/netfilter/ebtables.c
109981@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
109982 tmp.valid_hooks = t->table->valid_hooks;
109983 }
109984 mutex_unlock(&ebt_mutex);
109985- if (copy_to_user(user, &tmp, *len) != 0) {
109986+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109987 BUGPRINT("c2u Didn't work\n");
109988 ret = -EFAULT;
109989 break;
109990@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
109991 goto out;
109992 tmp.valid_hooks = t->valid_hooks;
109993
109994- if (copy_to_user(user, &tmp, *len) != 0) {
109995+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
109996 ret = -EFAULT;
109997 break;
109998 }
109999@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
110000 tmp.entries_size = t->table->entries_size;
110001 tmp.valid_hooks = t->table->valid_hooks;
110002
110003- if (copy_to_user(user, &tmp, *len) != 0) {
110004+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
110005 ret = -EFAULT;
110006 break;
110007 }
110008diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
110009index f5afda1..dcf770a 100644
110010--- a/net/caif/cfctrl.c
110011+++ b/net/caif/cfctrl.c
110012@@ -10,6 +10,7 @@
110013 #include <linux/spinlock.h>
110014 #include <linux/slab.h>
110015 #include <linux/pkt_sched.h>
110016+#include <linux/sched.h>
110017 #include <net/caif/caif_layer.h>
110018 #include <net/caif/cfpkt.h>
110019 #include <net/caif/cfctrl.h>
110020@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
110021 memset(&dev_info, 0, sizeof(dev_info));
110022 dev_info.id = 0xff;
110023 cfsrvl_init(&this->serv, 0, &dev_info, false);
110024- atomic_set(&this->req_seq_no, 1);
110025- atomic_set(&this->rsp_seq_no, 1);
110026+ atomic_set_unchecked(&this->req_seq_no, 1);
110027+ atomic_set_unchecked(&this->rsp_seq_no, 1);
110028 this->serv.layer.receive = cfctrl_recv;
110029 sprintf(this->serv.layer.name, "ctrl");
110030 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
110031@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
110032 struct cfctrl_request_info *req)
110033 {
110034 spin_lock_bh(&ctrl->info_list_lock);
110035- atomic_inc(&ctrl->req_seq_no);
110036- req->sequence_no = atomic_read(&ctrl->req_seq_no);
110037+ atomic_inc_unchecked(&ctrl->req_seq_no);
110038+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
110039 list_add_tail(&req->list, &ctrl->list);
110040 spin_unlock_bh(&ctrl->info_list_lock);
110041 }
110042@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
110043 if (p != first)
110044 pr_warn("Requests are not received in order\n");
110045
110046- atomic_set(&ctrl->rsp_seq_no,
110047+ atomic_set_unchecked(&ctrl->rsp_seq_no,
110048 p->sequence_no);
110049 list_del(&p->list);
110050 goto out;
110051diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
110052index 67a4a36..8d28068 100644
110053--- a/net/caif/chnl_net.c
110054+++ b/net/caif/chnl_net.c
110055@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
110056 };
110057
110058
110059-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
110060+static struct rtnl_link_ops ipcaif_link_ops = {
110061 .kind = "caif",
110062 .priv_size = sizeof(struct chnl_net),
110063 .setup = ipcaif_net_setup,
110064diff --git a/net/can/af_can.c b/net/can/af_can.c
110065index 32d710e..93bcf05 100644
110066--- a/net/can/af_can.c
110067+++ b/net/can/af_can.c
110068@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
110069 };
110070
110071 /* notifier block for netdevice event */
110072-static struct notifier_block can_netdev_notifier __read_mostly = {
110073+static struct notifier_block can_netdev_notifier = {
110074 .notifier_call = can_notifier,
110075 };
110076
110077diff --git a/net/can/bcm.c b/net/can/bcm.c
110078index ee9ffd9..dfdf3d4 100644
110079--- a/net/can/bcm.c
110080+++ b/net/can/bcm.c
110081@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
110082 }
110083
110084 /* create /proc/net/can-bcm directory */
110085- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
110086+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
110087 return 0;
110088 }
110089
110090diff --git a/net/can/gw.c b/net/can/gw.c
110091index a6f448e..5902171 100644
110092--- a/net/can/gw.c
110093+++ b/net/can/gw.c
110094@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
110095 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
110096
110097 static HLIST_HEAD(cgw_list);
110098-static struct notifier_block notifier;
110099
110100 static struct kmem_cache *cgw_cache __read_mostly;
110101
110102@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
110103 return err;
110104 }
110105
110106+static struct notifier_block notifier = {
110107+ .notifier_call = cgw_notifier
110108+};
110109+
110110 static __init int cgw_module_init(void)
110111 {
110112 /* sanitize given module parameter */
110113@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
110114 return -ENOMEM;
110115
110116 /* set notifier */
110117- notifier.notifier_call = cgw_notifier;
110118 register_netdevice_notifier(&notifier);
110119
110120 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
110121diff --git a/net/can/proc.c b/net/can/proc.c
110122index 1a19b98..df2b4ec 100644
110123--- a/net/can/proc.c
110124+++ b/net/can/proc.c
110125@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
110126 void can_init_proc(void)
110127 {
110128 /* create /proc/net/can directory */
110129- can_dir = proc_mkdir("can", init_net.proc_net);
110130+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
110131
110132 if (!can_dir) {
110133 printk(KERN_INFO "can: failed to create /proc/net/can . "
110134diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
110135index a9f4ae4..ee19b92 100644
110136--- a/net/ceph/messenger.c
110137+++ b/net/ceph/messenger.c
110138@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
110139 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
110140
110141 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
110142-static atomic_t addr_str_seq = ATOMIC_INIT(0);
110143+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
110144
110145 static struct page *zero_page; /* used in certain error cases */
110146
110147@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
110148 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
110149 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
110150
110151- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110152+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
110153 s = addr_str[i];
110154
110155 switch (ss->ss_family) {
110156diff --git a/net/compat.c b/net/compat.c
110157index f7bd286..76ea56a 100644
110158--- a/net/compat.c
110159+++ b/net/compat.c
110160@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
110161
110162 #define CMSG_COMPAT_FIRSTHDR(msg) \
110163 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
110164- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
110165+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
110166 (struct compat_cmsghdr __user *)NULL)
110167
110168 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
110169 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
110170 (ucmlen) <= (unsigned long) \
110171 ((mhdr)->msg_controllen - \
110172- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
110173+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
110174
110175 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
110176 struct compat_cmsghdr __user *cmsg, int cmsg_len)
110177 {
110178 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
110179- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
110180+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
110181 msg->msg_controllen)
110182 return NULL;
110183 return (struct compat_cmsghdr __user *)ptr;
110184@@ -203,7 +203,7 @@ Efault:
110185
110186 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
110187 {
110188- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110189+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110190 struct compat_cmsghdr cmhdr;
110191 struct compat_timeval ctv;
110192 struct compat_timespec cts[3];
110193@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
110194
110195 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
110196 {
110197- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
110198+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
110199 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
110200 int fdnum = scm->fp->count;
110201 struct file **fp = scm->fp->fp;
110202@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
110203 return -EFAULT;
110204 old_fs = get_fs();
110205 set_fs(KERNEL_DS);
110206- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
110207+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
110208 set_fs(old_fs);
110209
110210 return err;
110211@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
110212 len = sizeof(ktime);
110213 old_fs = get_fs();
110214 set_fs(KERNEL_DS);
110215- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
110216+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
110217 set_fs(old_fs);
110218
110219 if (!err) {
110220@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110221 case MCAST_JOIN_GROUP:
110222 case MCAST_LEAVE_GROUP:
110223 {
110224- struct compat_group_req __user *gr32 = (void *)optval;
110225+ struct compat_group_req __user *gr32 = (void __user *)optval;
110226 struct group_req __user *kgr =
110227 compat_alloc_user_space(sizeof(struct group_req));
110228 u32 interface;
110229@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110230 case MCAST_BLOCK_SOURCE:
110231 case MCAST_UNBLOCK_SOURCE:
110232 {
110233- struct compat_group_source_req __user *gsr32 = (void *)optval;
110234+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
110235 struct group_source_req __user *kgsr = compat_alloc_user_space(
110236 sizeof(struct group_source_req));
110237 u32 interface;
110238@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
110239 }
110240 case MCAST_MSFILTER:
110241 {
110242- struct compat_group_filter __user *gf32 = (void *)optval;
110243+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110244 struct group_filter __user *kgf;
110245 u32 interface, fmode, numsrc;
110246
110247@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
110248 char __user *optval, int __user *optlen,
110249 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
110250 {
110251- struct compat_group_filter __user *gf32 = (void *)optval;
110252+ struct compat_group_filter __user *gf32 = (void __user *)optval;
110253 struct group_filter __user *kgf;
110254 int __user *koptlen;
110255 u32 interface, fmode, numsrc;
110256@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
110257
110258 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
110259 return -EINVAL;
110260- if (copy_from_user(a, args, nas[call]))
110261+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
110262 return -EFAULT;
110263 a0 = a[0];
110264 a1 = a[1];
110265diff --git a/net/core/datagram.c b/net/core/datagram.c
110266index df493d6..1145766 100644
110267--- a/net/core/datagram.c
110268+++ b/net/core/datagram.c
110269@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
110270 }
110271
110272 kfree_skb(skb);
110273- atomic_inc(&sk->sk_drops);
110274+ atomic_inc_unchecked(&sk->sk_drops);
110275 sk_mem_reclaim_partial(sk);
110276
110277 return err;
110278diff --git a/net/core/dev.c b/net/core/dev.c
110279index e977e15..74b19b0 100644
110280--- a/net/core/dev.c
110281+++ b/net/core/dev.c
110282@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
110283 {
110284 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
110285 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
110286- atomic_long_inc(&dev->rx_dropped);
110287+ atomic_long_inc_unchecked(&dev->rx_dropped);
110288 kfree_skb(skb);
110289 return NET_RX_DROP;
110290 }
110291 }
110292
110293 if (unlikely(!is_skb_forwardable(dev, skb))) {
110294- atomic_long_inc(&dev->rx_dropped);
110295+ atomic_long_inc_unchecked(&dev->rx_dropped);
110296 kfree_skb(skb);
110297 return NET_RX_DROP;
110298 }
110299@@ -2987,7 +2987,7 @@ recursion_alert:
110300 drop:
110301 rcu_read_unlock_bh();
110302
110303- atomic_long_inc(&dev->tx_dropped);
110304+ atomic_long_inc_unchecked(&dev->tx_dropped);
110305 kfree_skb_list(skb);
110306 return rc;
110307 out:
110308@@ -3336,7 +3336,7 @@ enqueue:
110309
110310 local_irq_restore(flags);
110311
110312- atomic_long_inc(&skb->dev->rx_dropped);
110313+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110314 kfree_skb(skb);
110315 return NET_RX_DROP;
110316 }
110317@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
110318 }
110319 EXPORT_SYMBOL(netif_rx_ni);
110320
110321-static void net_tx_action(struct softirq_action *h)
110322+static __latent_entropy void net_tx_action(void)
110323 {
110324 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110325
110326@@ -3751,7 +3751,7 @@ ncls:
110327 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
110328 } else {
110329 drop:
110330- atomic_long_inc(&skb->dev->rx_dropped);
110331+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
110332 kfree_skb(skb);
110333 /* Jamal, now you will not able to escape explaining
110334 * me how you were going to use this. :-)
110335@@ -4640,7 +4640,7 @@ out_unlock:
110336 return work;
110337 }
110338
110339-static void net_rx_action(struct softirq_action *h)
110340+static __latent_entropy void net_rx_action(void)
110341 {
110342 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
110343 unsigned long time_limit = jiffies + 2;
110344@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
110345 } else {
110346 netdev_stats_to_stats64(storage, &dev->stats);
110347 }
110348- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
110349- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
110350+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
110351+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
110352 return storage;
110353 }
110354 EXPORT_SYMBOL(dev_get_stats);
110355diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
110356index b94b1d2..da3ed7c 100644
110357--- a/net/core/dev_ioctl.c
110358+++ b/net/core/dev_ioctl.c
110359@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
110360 no_module = !dev;
110361 if (no_module && capable(CAP_NET_ADMIN))
110362 no_module = request_module("netdev-%s", name);
110363- if (no_module && capable(CAP_SYS_MODULE))
110364+ if (no_module && capable(CAP_SYS_MODULE)) {
110365+#ifdef CONFIG_GRKERNSEC_MODHARDEN
110366+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
110367+#else
110368 request_module("%s", name);
110369+#endif
110370+ }
110371 }
110372 EXPORT_SYMBOL(dev_load);
110373
110374diff --git a/net/core/filter.c b/net/core/filter.c
110375index f6bdc2b..76eba8e 100644
110376--- a/net/core/filter.c
110377+++ b/net/core/filter.c
110378@@ -533,7 +533,11 @@ do_pass:
110379
110380 /* Unknown instruction. */
110381 default:
110382- goto err;
110383+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
110384+ fp->code, fp->jt, fp->jf, fp->k);
110385+ kfree(addrs);
110386+ BUG();
110387+ return -EINVAL;
110388 }
110389
110390 insn++;
110391@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
110392 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
110393 int pc, ret = 0;
110394
110395- BUILD_BUG_ON(BPF_MEMWORDS > 16);
110396+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
110397
110398 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
110399 if (!masks)
110400@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
110401 if (!fp)
110402 return -ENOMEM;
110403
110404- memcpy(fp->insns, fprog->filter, fsize);
110405+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
110406
110407 fp->len = fprog->len;
110408 /* Since unattached filters are not copied back to user
110409diff --git a/net/core/flow.c b/net/core/flow.c
110410index 1033725..340f65d 100644
110411--- a/net/core/flow.c
110412+++ b/net/core/flow.c
110413@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
110414 static int flow_entry_valid(struct flow_cache_entry *fle,
110415 struct netns_xfrm *xfrm)
110416 {
110417- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
110418+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
110419 return 0;
110420 if (fle->object && !fle->object->ops->check(fle->object))
110421 return 0;
110422@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
110423 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
110424 fcp->hash_count++;
110425 }
110426- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
110427+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
110428 flo = fle->object;
110429 if (!flo)
110430 goto ret_object;
110431@@ -263,7 +263,7 @@ nocache:
110432 }
110433 flo = resolver(net, key, family, dir, flo, ctx);
110434 if (fle) {
110435- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
110436+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
110437 if (!IS_ERR(flo))
110438 fle->object = flo;
110439 else
110440diff --git a/net/core/neighbour.c b/net/core/neighbour.c
110441index 70fe9e1..c55e69d 100644
110442--- a/net/core/neighbour.c
110443+++ b/net/core/neighbour.c
110444@@ -971,6 +971,8 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
110445 rc = 0;
110446 if (neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE))
110447 goto out_unlock_bh;
110448+ if (neigh->dead)
110449+ goto out_dead;
110450
110451 if (!(neigh->nud_state & (NUD_STALE | NUD_INCOMPLETE))) {
110452 if (NEIGH_VAR(neigh->parms, MCAST_PROBES) +
110453@@ -1027,6 +1029,13 @@ out_unlock_bh:
110454 write_unlock(&neigh->lock);
110455 local_bh_enable();
110456 return rc;
110457+
110458+out_dead:
110459+ if (neigh->nud_state & NUD_STALE)
110460+ goto out_unlock_bh;
110461+ write_unlock_bh(&neigh->lock);
110462+ kfree_skb(skb);
110463+ return 1;
110464 }
110465 EXPORT_SYMBOL(__neigh_event_send);
110466
110467@@ -1090,6 +1099,8 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
110468 if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
110469 (old & (NUD_NOARP | NUD_PERMANENT)))
110470 goto out;
110471+ if (neigh->dead)
110472+ goto out;
110473
110474 if (!(new & NUD_VALID)) {
110475 neigh_del_timer(neigh);
110476@@ -1239,6 +1250,8 @@ EXPORT_SYMBOL(neigh_update);
110477 */
110478 void __neigh_set_probe_once(struct neighbour *neigh)
110479 {
110480+ if (neigh->dead)
110481+ return;
110482 neigh->updated = jiffies;
110483 if (!(neigh->nud_state & NUD_FAILED))
110484 return;
110485@@ -2806,7 +2819,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
110486 void __user *buffer, size_t *lenp, loff_t *ppos)
110487 {
110488 int size, ret;
110489- struct ctl_table tmp = *ctl;
110490+ ctl_table_no_const tmp = *ctl;
110491
110492 tmp.extra1 = &zero;
110493 tmp.extra2 = &unres_qlen_max;
110494@@ -2868,7 +2881,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
110495 void __user *buffer,
110496 size_t *lenp, loff_t *ppos)
110497 {
110498- struct ctl_table tmp = *ctl;
110499+ ctl_table_no_const tmp = *ctl;
110500 int ret;
110501
110502 tmp.extra1 = &zero;
110503diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
110504index 2bf8329..2eb1423 100644
110505--- a/net/core/net-procfs.c
110506+++ b/net/core/net-procfs.c
110507@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
110508 struct rtnl_link_stats64 temp;
110509 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
110510
110511- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110512+ if (gr_proc_is_restricted())
110513+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110514+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110515+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
110516+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
110517+ else
110518+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
110519 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
110520 dev->name, stats->rx_bytes, stats->rx_packets,
110521 stats->rx_errors,
110522@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
110523 return 0;
110524 }
110525
110526-static const struct seq_operations dev_seq_ops = {
110527+const struct seq_operations dev_seq_ops = {
110528 .start = dev_seq_start,
110529 .next = dev_seq_next,
110530 .stop = dev_seq_stop,
110531@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
110532
110533 static int softnet_seq_open(struct inode *inode, struct file *file)
110534 {
110535- return seq_open(file, &softnet_seq_ops);
110536+ return seq_open_restrict(file, &softnet_seq_ops);
110537 }
110538
110539 static const struct file_operations softnet_seq_fops = {
110540@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
110541 else
110542 seq_printf(seq, "%04x", ntohs(pt->type));
110543
110544+#ifdef CONFIG_GRKERNSEC_HIDESYM
110545+ seq_printf(seq, " %-8s %pf\n",
110546+ pt->dev ? pt->dev->name : "", NULL);
110547+#else
110548 seq_printf(seq, " %-8s %pf\n",
110549 pt->dev ? pt->dev->name : "", pt->func);
110550+#endif
110551 }
110552
110553 return 0;
110554diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
110555index f2aa73b..0d1a1ea 100644
110556--- a/net/core/net-sysfs.c
110557+++ b/net/core/net-sysfs.c
110558@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
110559 {
110560 struct net_device *netdev = to_net_dev(dev);
110561 return sprintf(buf, fmt_dec,
110562- atomic_read(&netdev->carrier_changes));
110563+ atomic_read_unchecked(&netdev->carrier_changes));
110564 }
110565 static DEVICE_ATTR_RO(carrier_changes);
110566
110567diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
110568index 70d3450..eb7c528 100644
110569--- a/net/core/net_namespace.c
110570+++ b/net/core/net_namespace.c
110571@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
110572 int error;
110573 LIST_HEAD(net_exit_list);
110574
110575- list_add_tail(&ops->list, list);
110576+ pax_list_add_tail((struct list_head *)&ops->list, list);
110577 if (ops->init || (ops->id && ops->size)) {
110578 for_each_net(net) {
110579 error = ops_init(ops, net);
110580@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
110581
110582 out_undo:
110583 /* If I have an error cleanup all namespaces I initialized */
110584- list_del(&ops->list);
110585+ pax_list_del((struct list_head *)&ops->list);
110586 ops_exit_list(ops, &net_exit_list);
110587 ops_free_list(ops, &net_exit_list);
110588 return error;
110589@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
110590 struct net *net;
110591 LIST_HEAD(net_exit_list);
110592
110593- list_del(&ops->list);
110594+ pax_list_del((struct list_head *)&ops->list);
110595 for_each_net(net)
110596 list_add_tail(&net->exit_list, &net_exit_list);
110597 ops_exit_list(ops, &net_exit_list);
110598@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
110599 mutex_lock(&net_mutex);
110600 error = register_pernet_operations(&pernet_list, ops);
110601 if (!error && (first_device == &pernet_list))
110602- first_device = &ops->list;
110603+ first_device = (struct list_head *)&ops->list;
110604 mutex_unlock(&net_mutex);
110605 return error;
110606 }
110607diff --git a/net/core/netpoll.c b/net/core/netpoll.c
110608index c126a87..10ad89d 100644
110609--- a/net/core/netpoll.c
110610+++ b/net/core/netpoll.c
110611@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110612 struct udphdr *udph;
110613 struct iphdr *iph;
110614 struct ethhdr *eth;
110615- static atomic_t ip_ident;
110616+ static atomic_unchecked_t ip_ident;
110617 struct ipv6hdr *ip6h;
110618
110619 udp_len = len + sizeof(*udph);
110620@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
110621 put_unaligned(0x45, (unsigned char *)iph);
110622 iph->tos = 0;
110623 put_unaligned(htons(ip_len), &(iph->tot_len));
110624- iph->id = htons(atomic_inc_return(&ip_ident));
110625+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
110626 iph->frag_off = 0;
110627 iph->ttl = 64;
110628 iph->protocol = IPPROTO_UDP;
110629diff --git a/net/core/pktgen.c b/net/core/pktgen.c
110630index 508155b..fad080f 100644
110631--- a/net/core/pktgen.c
110632+++ b/net/core/pktgen.c
110633@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
110634 pn->net = net;
110635 INIT_LIST_HEAD(&pn->pktgen_threads);
110636 pn->pktgen_exiting = false;
110637- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
110638+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
110639 if (!pn->proc_dir) {
110640 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
110641 return -ENODEV;
110642diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
110643index a2b90e1..7882f75 100644
110644--- a/net/core/rtnetlink.c
110645+++ b/net/core/rtnetlink.c
110646@@ -61,7 +61,7 @@ struct rtnl_link {
110647 rtnl_doit_func doit;
110648 rtnl_dumpit_func dumpit;
110649 rtnl_calcit_func calcit;
110650-};
110651+} __no_const;
110652
110653 static DEFINE_MUTEX(rtnl_mutex);
110654
110655@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
110656 * to use the ops for creating device. So do not
110657 * fill up dellink as well. That disables rtnl_dellink.
110658 */
110659- if (ops->setup && !ops->dellink)
110660- ops->dellink = unregister_netdevice_queue;
110661+ if (ops->setup && !ops->dellink) {
110662+ pax_open_kernel();
110663+ *(void **)&ops->dellink = unregister_netdevice_queue;
110664+ pax_close_kernel();
110665+ }
110666
110667- list_add_tail(&ops->list, &link_ops);
110668+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
110669 return 0;
110670 }
110671 EXPORT_SYMBOL_GPL(__rtnl_link_register);
110672@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
110673 for_each_net(net) {
110674 __rtnl_kill_links(net, ops);
110675 }
110676- list_del(&ops->list);
110677+ pax_list_del((struct list_head *)&ops->list);
110678 }
110679 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
110680
110681@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
110682 (dev->ifalias &&
110683 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
110684 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
110685- atomic_read(&dev->carrier_changes)))
110686+ atomic_read_unchecked(&dev->carrier_changes)))
110687 goto nla_put_failure;
110688
110689 if (1) {
110690diff --git a/net/core/scm.c b/net/core/scm.c
110691index 3b6899b..cf36238 100644
110692--- a/net/core/scm.c
110693+++ b/net/core/scm.c
110694@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
110695 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110696 {
110697 struct cmsghdr __user *cm
110698- = (__force struct cmsghdr __user *)msg->msg_control;
110699+ = (struct cmsghdr __force_user *)msg->msg_control;
110700 struct cmsghdr cmhdr;
110701 int cmlen = CMSG_LEN(len);
110702 int err;
110703@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
110704 err = -EFAULT;
110705 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
110706 goto out;
110707- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
110708+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
110709 goto out;
110710 cmlen = CMSG_SPACE(len);
110711 if (msg->msg_controllen < cmlen)
110712@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
110713 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110714 {
110715 struct cmsghdr __user *cm
110716- = (__force struct cmsghdr __user*)msg->msg_control;
110717+ = (struct cmsghdr __force_user *)msg->msg_control;
110718
110719 int fdmax = 0;
110720 int fdnum = scm->fp->count;
110721@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
110722 if (fdnum < fdmax)
110723 fdmax = fdnum;
110724
110725- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
110726+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
110727 i++, cmfptr++)
110728 {
110729 struct socket *sock;
110730diff --git a/net/core/skbuff.c b/net/core/skbuff.c
110731index e9f9a15..6eb024e 100644
110732--- a/net/core/skbuff.c
110733+++ b/net/core/skbuff.c
110734@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
110735 __wsum skb_checksum(const struct sk_buff *skb, int offset,
110736 int len, __wsum csum)
110737 {
110738- const struct skb_checksum_ops ops = {
110739+ static const struct skb_checksum_ops ops = {
110740 .update = csum_partial_ext,
110741 .combine = csum_block_add_ext,
110742 };
110743@@ -3379,12 +3379,14 @@ void __init skb_init(void)
110744 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
110745 sizeof(struct sk_buff),
110746 0,
110747- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110748+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110749+ SLAB_NO_SANITIZE,
110750 NULL);
110751 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
110752 sizeof(struct sk_buff_fclones),
110753 0,
110754- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
110755+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
110756+ SLAB_NO_SANITIZE,
110757 NULL);
110758 }
110759
110760diff --git a/net/core/sock.c b/net/core/sock.c
110761index 71e3e5f..ab90920 100644
110762--- a/net/core/sock.c
110763+++ b/net/core/sock.c
110764@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110765 struct sk_buff_head *list = &sk->sk_receive_queue;
110766
110767 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
110768- atomic_inc(&sk->sk_drops);
110769+ atomic_inc_unchecked(&sk->sk_drops);
110770 trace_sock_rcvqueue_full(sk, skb);
110771 return -ENOMEM;
110772 }
110773@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110774 return err;
110775
110776 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
110777- atomic_inc(&sk->sk_drops);
110778+ atomic_inc_unchecked(&sk->sk_drops);
110779 return -ENOBUFS;
110780 }
110781
110782@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
110783 skb_dst_force(skb);
110784
110785 spin_lock_irqsave(&list->lock, flags);
110786- skb->dropcount = atomic_read(&sk->sk_drops);
110787+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
110788 __skb_queue_tail(list, skb);
110789 spin_unlock_irqrestore(&list->lock, flags);
110790
110791@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110792 skb->dev = NULL;
110793
110794 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
110795- atomic_inc(&sk->sk_drops);
110796+ atomic_inc_unchecked(&sk->sk_drops);
110797 goto discard_and_relse;
110798 }
110799 if (nested)
110800@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
110801 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
110802 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
110803 bh_unlock_sock(sk);
110804- atomic_inc(&sk->sk_drops);
110805+ atomic_inc_unchecked(&sk->sk_drops);
110806 goto discard_and_relse;
110807 }
110808
110809@@ -910,6 +910,7 @@ set_rcvbuf:
110810 }
110811 break;
110812
110813+#ifndef GRKERNSEC_BPF_HARDEN
110814 case SO_ATTACH_BPF:
110815 ret = -EINVAL;
110816 if (optlen == sizeof(u32)) {
110817@@ -922,7 +923,7 @@ set_rcvbuf:
110818 ret = sk_attach_bpf(ufd, sk);
110819 }
110820 break;
110821-
110822+#endif
110823 case SO_DETACH_FILTER:
110824 ret = sk_detach_filter(sk);
110825 break;
110826@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110827 struct timeval tm;
110828 } v;
110829
110830- int lv = sizeof(int);
110831- int len;
110832+ unsigned int lv = sizeof(int);
110833+ unsigned int len;
110834
110835 if (get_user(len, optlen))
110836 return -EFAULT;
110837- if (len < 0)
110838+ if (len > INT_MAX)
110839 return -EINVAL;
110840
110841 memset(&v, 0, sizeof(v));
110842@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110843
110844 case SO_PEERNAME:
110845 {
110846- char address[128];
110847+ char address[_K_SS_MAXSIZE];
110848
110849 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
110850 return -ENOTCONN;
110851- if (lv < len)
110852+ if (lv < len || sizeof address < len)
110853 return -EINVAL;
110854 if (copy_to_user(optval, address, len))
110855 return -EFAULT;
110856@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
110857
110858 if (len > lv)
110859 len = lv;
110860- if (copy_to_user(optval, &v, len))
110861+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
110862 return -EFAULT;
110863 lenout:
110864 if (put_user(len, optlen))
110865@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
110866 */
110867 smp_wmb();
110868 atomic_set(&sk->sk_refcnt, 1);
110869- atomic_set(&sk->sk_drops, 0);
110870+ atomic_set_unchecked(&sk->sk_drops, 0);
110871 }
110872 EXPORT_SYMBOL(sock_init_data);
110873
110874@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
110875 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110876 int level, int type)
110877 {
110878+ struct sock_extended_err ee;
110879 struct sock_exterr_skb *serr;
110880 struct sk_buff *skb;
110881 int copied, err;
110882@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
110883 sock_recv_timestamp(msg, sk, skb);
110884
110885 serr = SKB_EXT_ERR(skb);
110886- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
110887+ ee = serr->ee;
110888+ put_cmsg(msg, level, type, sizeof ee, &ee);
110889
110890 msg->msg_flags |= MSG_ERRQUEUE;
110891 err = copied;
110892diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
110893index ad704c7..ca48aff 100644
110894--- a/net/core/sock_diag.c
110895+++ b/net/core/sock_diag.c
110896@@ -9,26 +9,33 @@
110897 #include <linux/inet_diag.h>
110898 #include <linux/sock_diag.h>
110899
110900-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
110901+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
110902 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
110903 static DEFINE_MUTEX(sock_diag_table_mutex);
110904
110905 int sock_diag_check_cookie(void *sk, __u32 *cookie)
110906 {
110907+#ifndef CONFIG_GRKERNSEC_HIDESYM
110908 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
110909 cookie[1] != INET_DIAG_NOCOOKIE) &&
110910 ((u32)(unsigned long)sk != cookie[0] ||
110911 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
110912 return -ESTALE;
110913 else
110914+#endif
110915 return 0;
110916 }
110917 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
110918
110919 void sock_diag_save_cookie(void *sk, __u32 *cookie)
110920 {
110921+#ifdef CONFIG_GRKERNSEC_HIDESYM
110922+ cookie[0] = 0;
110923+ cookie[1] = 0;
110924+#else
110925 cookie[0] = (u32)(unsigned long)sk;
110926 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
110927+#endif
110928 }
110929 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
110930
110931@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
110932 mutex_lock(&sock_diag_table_mutex);
110933 if (sock_diag_handlers[hndl->family])
110934 err = -EBUSY;
110935- else
110936+ else {
110937+ pax_open_kernel();
110938 sock_diag_handlers[hndl->family] = hndl;
110939+ pax_close_kernel();
110940+ }
110941 mutex_unlock(&sock_diag_table_mutex);
110942
110943 return err;
110944@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
110945
110946 mutex_lock(&sock_diag_table_mutex);
110947 BUG_ON(sock_diag_handlers[family] != hnld);
110948+ pax_open_kernel();
110949 sock_diag_handlers[family] = NULL;
110950+ pax_close_kernel();
110951 mutex_unlock(&sock_diag_table_mutex);
110952 }
110953 EXPORT_SYMBOL_GPL(sock_diag_unregister);
110954diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
110955index 8ce351f..2c388f7 100644
110956--- a/net/core/sysctl_net_core.c
110957+++ b/net/core/sysctl_net_core.c
110958@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
110959 {
110960 unsigned int orig_size, size;
110961 int ret, i;
110962- struct ctl_table tmp = {
110963+ ctl_table_no_const tmp = {
110964 .data = &size,
110965 .maxlen = sizeof(size),
110966 .mode = table->mode
110967@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110968 void __user *buffer, size_t *lenp, loff_t *ppos)
110969 {
110970 char id[IFNAMSIZ];
110971- struct ctl_table tbl = {
110972+ ctl_table_no_const tbl = {
110973 .data = id,
110974 .maxlen = IFNAMSIZ,
110975 };
110976@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
110977 static int proc_do_rss_key(struct ctl_table *table, int write,
110978 void __user *buffer, size_t *lenp, loff_t *ppos)
110979 {
110980- struct ctl_table fake_table;
110981+ ctl_table_no_const fake_table;
110982 char buf[NETDEV_RSS_KEY_LEN * 3];
110983
110984 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
110985@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
110986 .mode = 0444,
110987 .proc_handler = proc_do_rss_key,
110988 },
110989-#ifdef CONFIG_BPF_JIT
110990+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
110991 {
110992 .procname = "bpf_jit_enable",
110993 .data = &bpf_jit_enable,
110994@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
110995
110996 static __net_init int sysctl_core_net_init(struct net *net)
110997 {
110998- struct ctl_table *tbl;
110999+ ctl_table_no_const *tbl = NULL;
111000
111001 net->core.sysctl_somaxconn = SOMAXCONN;
111002
111003- tbl = netns_core_table;
111004 if (!net_eq(net, &init_net)) {
111005- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
111006+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
111007 if (tbl == NULL)
111008 goto err_dup;
111009
111010@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
111011 if (net->user_ns != &init_user_ns) {
111012 tbl[0].procname = NULL;
111013 }
111014- }
111015-
111016- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111017+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
111018+ } else
111019+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
111020 if (net->core.sysctl_hdr == NULL)
111021 goto err_reg;
111022
111023 return 0;
111024
111025 err_reg:
111026- if (tbl != netns_core_table)
111027- kfree(tbl);
111028+ kfree(tbl);
111029 err_dup:
111030 return -ENOMEM;
111031 }
111032@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
111033 kfree(tbl);
111034 }
111035
111036-static __net_initdata struct pernet_operations sysctl_core_ops = {
111037+static __net_initconst struct pernet_operations sysctl_core_ops = {
111038 .init = sysctl_core_net_init,
111039 .exit = sysctl_core_net_exit,
111040 };
111041diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
111042index 8102286..a0c2755 100644
111043--- a/net/decnet/af_decnet.c
111044+++ b/net/decnet/af_decnet.c
111045@@ -466,6 +466,7 @@ static struct proto dn_proto = {
111046 .sysctl_rmem = sysctl_decnet_rmem,
111047 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
111048 .obj_size = sizeof(struct dn_sock),
111049+ .slab_flags = SLAB_USERCOPY,
111050 };
111051
111052 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
111053diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
111054index b2c26b0..41f803e 100644
111055--- a/net/decnet/dn_dev.c
111056+++ b/net/decnet/dn_dev.c
111057@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
111058 .extra1 = &min_t3,
111059 .extra2 = &max_t3
111060 },
111061- {0}
111062+ { }
111063 },
111064 };
111065
111066diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
111067index 5325b54..a0d4d69 100644
111068--- a/net/decnet/sysctl_net_decnet.c
111069+++ b/net/decnet/sysctl_net_decnet.c
111070@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
111071
111072 if (len > *lenp) len = *lenp;
111073
111074- if (copy_to_user(buffer, addr, len))
111075+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
111076 return -EFAULT;
111077
111078 *lenp = len;
111079@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
111080
111081 if (len > *lenp) len = *lenp;
111082
111083- if (copy_to_user(buffer, devname, len))
111084+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
111085 return -EFAULT;
111086
111087 *lenp = len;
111088diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
111089index a2c7e4c..3dc9f67 100644
111090--- a/net/hsr/hsr_netlink.c
111091+++ b/net/hsr/hsr_netlink.c
111092@@ -102,7 +102,7 @@ nla_put_failure:
111093 return -EMSGSIZE;
111094 }
111095
111096-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
111097+static struct rtnl_link_ops hsr_link_ops = {
111098 .kind = "hsr",
111099 .maxtype = IFLA_HSR_MAX,
111100 .policy = hsr_policy,
111101diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
111102index 055fbb7..c0dbe60 100644
111103--- a/net/ieee802154/6lowpan/core.c
111104+++ b/net/ieee802154/6lowpan/core.c
111105@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
111106 dev_put(real_dev);
111107 }
111108
111109-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
111110+static struct rtnl_link_ops lowpan_link_ops = {
111111 .kind = "lowpan",
111112 .priv_size = sizeof(struct lowpan_dev_info),
111113 .setup = lowpan_setup,
111114diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
111115index f46e4d1..30231f1 100644
111116--- a/net/ieee802154/6lowpan/reassembly.c
111117+++ b/net/ieee802154/6lowpan/reassembly.c
111118@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
111119
111120 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111121 {
111122- struct ctl_table *table;
111123+ ctl_table_no_const *table = NULL;
111124 struct ctl_table_header *hdr;
111125 struct netns_ieee802154_lowpan *ieee802154_lowpan =
111126 net_ieee802154_lowpan(net);
111127
111128- table = lowpan_frags_ns_ctl_table;
111129 if (!net_eq(net, &init_net)) {
111130- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
111131+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
111132 GFP_KERNEL);
111133 if (table == NULL)
111134 goto err_alloc;
111135@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111136 /* Don't export sysctls to unprivileged users */
111137 if (net->user_ns != &init_user_ns)
111138 table[0].procname = NULL;
111139- }
111140-
111141- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111142+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
111143+ } else
111144+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
111145 if (hdr == NULL)
111146 goto err_reg;
111147
111148@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
111149 return 0;
111150
111151 err_reg:
111152- if (!net_eq(net, &init_net))
111153- kfree(table);
111154+ kfree(table);
111155 err_alloc:
111156 return -ENOMEM;
111157 }
111158diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
111159index d2e49ba..f78e8aa 100644
111160--- a/net/ipv4/af_inet.c
111161+++ b/net/ipv4/af_inet.c
111162@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
111163 return ip_recv_error(sk, msg, len, addr_len);
111164 #if IS_ENABLED(CONFIG_IPV6)
111165 if (sk->sk_family == AF_INET6)
111166- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
111167+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
111168 #endif
111169 return -EINVAL;
111170 }
111171diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
111172index 3a8985c..9d2a870 100644
111173--- a/net/ipv4/devinet.c
111174+++ b/net/ipv4/devinet.c
111175@@ -69,7 +69,8 @@
111176
111177 static struct ipv4_devconf ipv4_devconf = {
111178 .data = {
111179- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111180+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111181+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111182 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111183 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111184 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111185@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
111186
111187 static struct ipv4_devconf ipv4_devconf_dflt = {
111188 .data = {
111189- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
111190+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
111191+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
111192 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
111193 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
111194 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
111195@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
111196 idx = 0;
111197 head = &net->dev_index_head[h];
111198 rcu_read_lock();
111199- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111200+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111201 net->dev_base_seq;
111202 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111203 if (idx < s_idx)
111204@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
111205 idx = 0;
111206 head = &net->dev_index_head[h];
111207 rcu_read_lock();
111208- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
111209+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
111210 net->dev_base_seq;
111211 hlist_for_each_entry_rcu(dev, head, index_hlist) {
111212 if (idx < s_idx)
111213@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
111214 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
111215 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
111216
111217-static struct devinet_sysctl_table {
111218+static const struct devinet_sysctl_table {
111219 struct ctl_table_header *sysctl_header;
111220 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
111221 } devinet_sysctl = {
111222@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
111223 int err;
111224 struct ipv4_devconf *all, *dflt;
111225 #ifdef CONFIG_SYSCTL
111226- struct ctl_table *tbl = ctl_forward_entry;
111227+ ctl_table_no_const *tbl = NULL;
111228 struct ctl_table_header *forw_hdr;
111229 #endif
111230
111231@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
111232 goto err_alloc_dflt;
111233
111234 #ifdef CONFIG_SYSCTL
111235- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
111236+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
111237 if (tbl == NULL)
111238 goto err_alloc_ctl;
111239
111240@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
111241 goto err_reg_dflt;
111242
111243 err = -ENOMEM;
111244- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111245+ if (!net_eq(net, &init_net))
111246+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
111247+ else
111248+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
111249 if (forw_hdr == NULL)
111250 goto err_reg_ctl;
111251 net->ipv4.forw_hdr = forw_hdr;
111252@@ -2289,8 +2294,7 @@ err_reg_ctl:
111253 err_reg_dflt:
111254 __devinet_sysctl_unregister(all);
111255 err_reg_all:
111256- if (tbl != ctl_forward_entry)
111257- kfree(tbl);
111258+ kfree(tbl);
111259 err_alloc_ctl:
111260 #endif
111261 if (dflt != &ipv4_devconf_dflt)
111262diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
111263index 23b9b3e..60cf0c4 100644
111264--- a/net/ipv4/fib_frontend.c
111265+++ b/net/ipv4/fib_frontend.c
111266@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
111267 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111268 fib_sync_up(dev);
111269 #endif
111270- atomic_inc(&net->ipv4.dev_addr_genid);
111271+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111272 rt_cache_flush(dev_net(dev));
111273 break;
111274 case NETDEV_DOWN:
111275 fib_del_ifaddr(ifa, NULL);
111276- atomic_inc(&net->ipv4.dev_addr_genid);
111277+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111278 if (ifa->ifa_dev->ifa_list == NULL) {
111279 /* Last address was deleted from this interface.
111280 * Disable IP.
111281@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
111282 #ifdef CONFIG_IP_ROUTE_MULTIPATH
111283 fib_sync_up(dev);
111284 #endif
111285- atomic_inc(&net->ipv4.dev_addr_genid);
111286+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
111287 rt_cache_flush(net);
111288 break;
111289 case NETDEV_DOWN:
111290diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
111291index 1e2090e..351a724 100644
111292--- a/net/ipv4/fib_semantics.c
111293+++ b/net/ipv4/fib_semantics.c
111294@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
111295 nh->nh_saddr = inet_select_addr(nh->nh_dev,
111296 nh->nh_gw,
111297 nh->nh_parent->fib_scope);
111298- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
111299+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
111300
111301 return nh->nh_saddr;
111302 }
111303diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
111304index ff069f6..335e752 100644
111305--- a/net/ipv4/fou.c
111306+++ b/net/ipv4/fou.c
111307@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
111308
111309 #ifdef CONFIG_NET_FOU_IP_TUNNELS
111310
111311-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
111312+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
111313 .encap_hlen = fou_encap_hlen,
111314 .build_header = fou_build_header,
111315 };
111316
111317-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
111318+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
111319 .encap_hlen = gue_encap_hlen,
111320 .build_header = gue_build_header,
111321 };
111322diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
111323index 9111a4e..3576905 100644
111324--- a/net/ipv4/inet_hashtables.c
111325+++ b/net/ipv4/inet_hashtables.c
111326@@ -18,6 +18,7 @@
111327 #include <linux/sched.h>
111328 #include <linux/slab.h>
111329 #include <linux/wait.h>
111330+#include <linux/security.h>
111331
111332 #include <net/inet_connection_sock.h>
111333 #include <net/inet_hashtables.h>
111334@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
111335 return inet_ehashfn(net, laddr, lport, faddr, fport);
111336 }
111337
111338+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
111339+
111340 /*
111341 * Allocate and initialize a new local port bind bucket.
111342 * The bindhash mutex for snum's hash chain must be held here.
111343@@ -554,6 +557,8 @@ ok:
111344 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
111345 spin_unlock(&head->lock);
111346
111347+ gr_update_task_in_ip_table(inet_sk(sk));
111348+
111349 if (tw) {
111350 inet_twsk_deschedule(tw, death_row);
111351 while (twrefcnt) {
111352diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
111353index 241afd7..31b95d5 100644
111354--- a/net/ipv4/inetpeer.c
111355+++ b/net/ipv4/inetpeer.c
111356@@ -461,7 +461,7 @@ relookup:
111357 if (p) {
111358 p->daddr = *daddr;
111359 atomic_set(&p->refcnt, 1);
111360- atomic_set(&p->rid, 0);
111361+ atomic_set_unchecked(&p->rid, 0);
111362 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
111363 p->rate_tokens = 0;
111364 /* 60*HZ is arbitrary, but chosen enough high so that the first
111365diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
111366index 145a50c..5dd8cc5 100644
111367--- a/net/ipv4/ip_fragment.c
111368+++ b/net/ipv4/ip_fragment.c
111369@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
111370 return 0;
111371
111372 start = qp->rid;
111373- end = atomic_inc_return(&peer->rid);
111374+ end = atomic_inc_return_unchecked(&peer->rid);
111375 qp->rid = end;
111376
111377 rc = qp->q.fragments && (end - start) > max;
111378@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
111379
111380 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111381 {
111382- struct ctl_table *table;
111383+ ctl_table_no_const *table = NULL;
111384 struct ctl_table_header *hdr;
111385
111386- table = ip4_frags_ns_ctl_table;
111387 if (!net_eq(net, &init_net)) {
111388- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111389+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
111390 if (table == NULL)
111391 goto err_alloc;
111392
111393@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111394 /* Don't export sysctls to unprivileged users */
111395 if (net->user_ns != &init_user_ns)
111396 table[0].procname = NULL;
111397- }
111398+ hdr = register_net_sysctl(net, "net/ipv4", table);
111399+ } else
111400+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
111401
111402- hdr = register_net_sysctl(net, "net/ipv4", table);
111403 if (hdr == NULL)
111404 goto err_reg;
111405
111406@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
111407 return 0;
111408
111409 err_reg:
111410- if (!net_eq(net, &init_net))
111411- kfree(table);
111412+ kfree(table);
111413 err_alloc:
111414 return -ENOMEM;
111415 }
111416diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
111417index 6207275f..00323a2 100644
111418--- a/net/ipv4/ip_gre.c
111419+++ b/net/ipv4/ip_gre.c
111420@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
111421 module_param(log_ecn_error, bool, 0644);
111422 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111423
111424-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
111425+static struct rtnl_link_ops ipgre_link_ops;
111426 static int ipgre_tunnel_init(struct net_device *dev);
111427
111428 static int ipgre_net_id __read_mostly;
111429@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
111430 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
111431 };
111432
111433-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111434+static struct rtnl_link_ops ipgre_link_ops = {
111435 .kind = "gre",
111436 .maxtype = IFLA_GRE_MAX,
111437 .policy = ipgre_policy,
111438@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
111439 .get_link_net = ip_tunnel_get_link_net,
111440 };
111441
111442-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
111443+static struct rtnl_link_ops ipgre_tap_ops = {
111444 .kind = "gretap",
111445 .maxtype = IFLA_GRE_MAX,
111446 .policy = ipgre_policy,
111447diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
111448index 3d4da2c..40f9c29 100644
111449--- a/net/ipv4/ip_input.c
111450+++ b/net/ipv4/ip_input.c
111451@@ -147,6 +147,10 @@
111452 #include <linux/mroute.h>
111453 #include <linux/netlink.h>
111454
111455+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111456+extern int grsec_enable_blackhole;
111457+#endif
111458+
111459 /*
111460 * Process Router Attention IP option (RFC 2113)
111461 */
111462@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
111463 if (!raw) {
111464 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
111465 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
111466+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
111467+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
111468+#endif
111469 icmp_send(skb, ICMP_DEST_UNREACH,
111470 ICMP_PROT_UNREACH, 0);
111471 }
111472diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
111473index 5cd9927..8610b9f 100644
111474--- a/net/ipv4/ip_sockglue.c
111475+++ b/net/ipv4/ip_sockglue.c
111476@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111477 len = min_t(unsigned int, len, opt->optlen);
111478 if (put_user(len, optlen))
111479 return -EFAULT;
111480- if (copy_to_user(optval, opt->__data, len))
111481+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
111482+ copy_to_user(optval, opt->__data, len))
111483 return -EFAULT;
111484 return 0;
111485 }
111486@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
111487 if (sk->sk_type != SOCK_STREAM)
111488 return -ENOPROTOOPT;
111489
111490- msg.msg_control = (__force void *) optval;
111491+ msg.msg_control = (__force_kernel void *) optval;
111492 msg.msg_controllen = len;
111493 msg.msg_flags = flags;
111494
111495diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
111496index 94efe14..1453fcc 100644
111497--- a/net/ipv4/ip_vti.c
111498+++ b/net/ipv4/ip_vti.c
111499@@ -45,7 +45,7 @@
111500 #include <net/net_namespace.h>
111501 #include <net/netns/generic.h>
111502
111503-static struct rtnl_link_ops vti_link_ops __read_mostly;
111504+static struct rtnl_link_ops vti_link_ops;
111505
111506 static int vti_net_id __read_mostly;
111507 static int vti_tunnel_init(struct net_device *dev);
111508@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
111509 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
111510 };
111511
111512-static struct rtnl_link_ops vti_link_ops __read_mostly = {
111513+static struct rtnl_link_ops vti_link_ops = {
111514 .kind = "vti",
111515 .maxtype = IFLA_VTI_MAX,
111516 .policy = vti_policy,
111517diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
111518index b26376e..fc3d733 100644
111519--- a/net/ipv4/ipconfig.c
111520+++ b/net/ipv4/ipconfig.c
111521@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
111522
111523 mm_segment_t oldfs = get_fs();
111524 set_fs(get_ds());
111525- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111526+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111527 set_fs(oldfs);
111528 return res;
111529 }
111530@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
111531
111532 mm_segment_t oldfs = get_fs();
111533 set_fs(get_ds());
111534- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
111535+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
111536 set_fs(oldfs);
111537 return res;
111538 }
111539@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
111540
111541 mm_segment_t oldfs = get_fs();
111542 set_fs(get_ds());
111543- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
111544+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
111545 set_fs(oldfs);
111546 return res;
111547 }
111548diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
111549index 915d215..48d1db7 100644
111550--- a/net/ipv4/ipip.c
111551+++ b/net/ipv4/ipip.c
111552@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
111553 static int ipip_net_id __read_mostly;
111554
111555 static int ipip_tunnel_init(struct net_device *dev);
111556-static struct rtnl_link_ops ipip_link_ops __read_mostly;
111557+static struct rtnl_link_ops ipip_link_ops;
111558
111559 static int ipip_err(struct sk_buff *skb, u32 info)
111560 {
111561@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
111562 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
111563 };
111564
111565-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
111566+static struct rtnl_link_ops ipip_link_ops = {
111567 .kind = "ipip",
111568 .maxtype = IFLA_IPTUN_MAX,
111569 .policy = ipip_policy,
111570diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
111571index f95b6f9..2ee2097 100644
111572--- a/net/ipv4/netfilter/arp_tables.c
111573+++ b/net/ipv4/netfilter/arp_tables.c
111574@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
111575 #endif
111576
111577 static int get_info(struct net *net, void __user *user,
111578- const int *len, int compat)
111579+ int len, int compat)
111580 {
111581 char name[XT_TABLE_MAXNAMELEN];
111582 struct xt_table *t;
111583 int ret;
111584
111585- if (*len != sizeof(struct arpt_getinfo)) {
111586- duprintf("length %u != %Zu\n", *len,
111587+ if (len != sizeof(struct arpt_getinfo)) {
111588+ duprintf("length %u != %Zu\n", len,
111589 sizeof(struct arpt_getinfo));
111590 return -EINVAL;
111591 }
111592@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
111593 info.size = private->size;
111594 strcpy(info.name, name);
111595
111596- if (copy_to_user(user, &info, *len) != 0)
111597+ if (copy_to_user(user, &info, len) != 0)
111598 ret = -EFAULT;
111599 else
111600 ret = 0;
111601@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
111602
111603 switch (cmd) {
111604 case ARPT_SO_GET_INFO:
111605- ret = get_info(sock_net(sk), user, len, 1);
111606+ ret = get_info(sock_net(sk), user, *len, 1);
111607 break;
111608 case ARPT_SO_GET_ENTRIES:
111609 ret = compat_get_entries(sock_net(sk), user, len);
111610@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
111611
111612 switch (cmd) {
111613 case ARPT_SO_GET_INFO:
111614- ret = get_info(sock_net(sk), user, len, 0);
111615+ ret = get_info(sock_net(sk), user, *len, 0);
111616 break;
111617
111618 case ARPT_SO_GET_ENTRIES:
111619diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
111620index cf5e82f..75a20f5 100644
111621--- a/net/ipv4/netfilter/ip_tables.c
111622+++ b/net/ipv4/netfilter/ip_tables.c
111623@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
111624 #endif
111625
111626 static int get_info(struct net *net, void __user *user,
111627- const int *len, int compat)
111628+ int len, int compat)
111629 {
111630 char name[XT_TABLE_MAXNAMELEN];
111631 struct xt_table *t;
111632 int ret;
111633
111634- if (*len != sizeof(struct ipt_getinfo)) {
111635- duprintf("length %u != %zu\n", *len,
111636+ if (len != sizeof(struct ipt_getinfo)) {
111637+ duprintf("length %u != %zu\n", len,
111638 sizeof(struct ipt_getinfo));
111639 return -EINVAL;
111640 }
111641@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
111642 info.size = private->size;
111643 strcpy(info.name, name);
111644
111645- if (copy_to_user(user, &info, *len) != 0)
111646+ if (copy_to_user(user, &info, len) != 0)
111647 ret = -EFAULT;
111648 else
111649 ret = 0;
111650@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111651
111652 switch (cmd) {
111653 case IPT_SO_GET_INFO:
111654- ret = get_info(sock_net(sk), user, len, 1);
111655+ ret = get_info(sock_net(sk), user, *len, 1);
111656 break;
111657 case IPT_SO_GET_ENTRIES:
111658 ret = compat_get_entries(sock_net(sk), user, len);
111659@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
111660
111661 switch (cmd) {
111662 case IPT_SO_GET_INFO:
111663- ret = get_info(sock_net(sk), user, len, 0);
111664+ ret = get_info(sock_net(sk), user, *len, 0);
111665 break;
111666
111667 case IPT_SO_GET_ENTRIES:
111668diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111669index e90f83a..3e6acca 100644
111670--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
111671+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
111672@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
111673 spin_lock_init(&cn->lock);
111674
111675 #ifdef CONFIG_PROC_FS
111676- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
111677+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
111678 if (!cn->procdir) {
111679 pr_err("Unable to proc dir entry\n");
111680 return -ENOMEM;
111681diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
111682index 787b0d6..ab6c0ba 100644
111683--- a/net/ipv4/ping.c
111684+++ b/net/ipv4/ping.c
111685@@ -59,7 +59,7 @@ struct ping_table {
111686 };
111687
111688 static struct ping_table ping_table;
111689-struct pingv6_ops pingv6_ops;
111690+struct pingv6_ops *pingv6_ops;
111691 EXPORT_SYMBOL_GPL(pingv6_ops);
111692
111693 static u16 ping_port_rover;
111694@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
111695 return -ENODEV;
111696 }
111697 }
111698- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
111699+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
111700 scoped);
111701 rcu_read_unlock();
111702
111703@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111704 }
111705 #if IS_ENABLED(CONFIG_IPV6)
111706 } else if (skb->protocol == htons(ETH_P_IPV6)) {
111707- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
111708+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
111709 #endif
111710 }
111711
111712@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
111713 info, (u8 *)icmph);
111714 #if IS_ENABLED(CONFIG_IPV6)
111715 } else if (family == AF_INET6) {
111716- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
111717+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
111718 info, (u8 *)icmph);
111719 #endif
111720 }
111721@@ -919,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
111722 }
111723
111724 if (inet6_sk(sk)->rxopt.all)
111725- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
111726+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
111727 if (skb->protocol == htons(ETH_P_IPV6) &&
111728 inet6_sk(sk)->rxopt.all)
111729- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
111730+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
111731 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
111732 ip_cmsg_recv(msg, skb);
111733 #endif
111734@@ -1117,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
111735 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
111736 0, sock_i_ino(sp),
111737 atomic_read(&sp->sk_refcnt), sp,
111738- atomic_read(&sp->sk_drops));
111739+ atomic_read_unchecked(&sp->sk_drops));
111740 }
111741
111742 static int ping_v4_seq_show(struct seq_file *seq, void *v)
111743diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
111744index f027a70..2e64edc 100644
111745--- a/net/ipv4/raw.c
111746+++ b/net/ipv4/raw.c
111747@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
111748 int raw_rcv(struct sock *sk, struct sk_buff *skb)
111749 {
111750 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
111751- atomic_inc(&sk->sk_drops);
111752+ atomic_inc_unchecked(&sk->sk_drops);
111753 kfree_skb(skb);
111754 return NET_RX_DROP;
111755 }
111756@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
111757
111758 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
111759 {
111760+ struct icmp_filter filter;
111761+
111762 if (optlen > sizeof(struct icmp_filter))
111763 optlen = sizeof(struct icmp_filter);
111764- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
111765+ if (copy_from_user(&filter, optval, optlen))
111766 return -EFAULT;
111767+ raw_sk(sk)->filter = filter;
111768 return 0;
111769 }
111770
111771 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
111772 {
111773 int len, ret = -EFAULT;
111774+ struct icmp_filter filter;
111775
111776 if (get_user(len, optlen))
111777 goto out;
111778@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
111779 if (len > sizeof(struct icmp_filter))
111780 len = sizeof(struct icmp_filter);
111781 ret = -EFAULT;
111782- if (put_user(len, optlen) ||
111783- copy_to_user(optval, &raw_sk(sk)->filter, len))
111784+ filter = raw_sk(sk)->filter;
111785+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
111786 goto out;
111787 ret = 0;
111788 out: return ret;
111789@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
111790 0, 0L, 0,
111791 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
111792 0, sock_i_ino(sp),
111793- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
111794+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
111795 }
111796
111797 static int raw_seq_show(struct seq_file *seq, void *v)
111798diff --git a/net/ipv4/route.c b/net/ipv4/route.c
111799index e262a08..d1fc3be 100644
111800--- a/net/ipv4/route.c
111801+++ b/net/ipv4/route.c
111802@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
111803
111804 static int rt_cache_seq_open(struct inode *inode, struct file *file)
111805 {
111806- return seq_open(file, &rt_cache_seq_ops);
111807+ return seq_open_restrict(file, &rt_cache_seq_ops);
111808 }
111809
111810 static const struct file_operations rt_cache_seq_fops = {
111811@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
111812
111813 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
111814 {
111815- return seq_open(file, &rt_cpu_seq_ops);
111816+ return seq_open_restrict(file, &rt_cpu_seq_ops);
111817 }
111818
111819 static const struct file_operations rt_cpu_seq_fops = {
111820@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
111821
111822 static int rt_acct_proc_open(struct inode *inode, struct file *file)
111823 {
111824- return single_open(file, rt_acct_proc_show, NULL);
111825+ return single_open_restrict(file, rt_acct_proc_show, NULL);
111826 }
111827
111828 static const struct file_operations rt_acct_proc_fops = {
111829@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
111830
111831 #define IP_IDENTS_SZ 2048u
111832 struct ip_ident_bucket {
111833- atomic_t id;
111834+ atomic_unchecked_t id;
111835 u32 stamp32;
111836 };
111837
111838-static struct ip_ident_bucket *ip_idents __read_mostly;
111839+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
111840
111841 /* In order to protect privacy, we add a perturbation to identifiers
111842 * if one generator is seldom used. This makes hard for an attacker
111843@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
111844 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
111845 delta = prandom_u32_max(now - old);
111846
111847- return atomic_add_return(segs + delta, &bucket->id) - segs;
111848+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
111849 }
111850 EXPORT_SYMBOL(ip_idents_reserve);
111851
111852@@ -2643,34 +2643,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
111853 .maxlen = sizeof(int),
111854 .mode = 0200,
111855 .proc_handler = ipv4_sysctl_rtcache_flush,
111856+ .extra1 = &init_net,
111857 },
111858 { },
111859 };
111860
111861 static __net_init int sysctl_route_net_init(struct net *net)
111862 {
111863- struct ctl_table *tbl;
111864+ ctl_table_no_const *tbl = NULL;
111865
111866- tbl = ipv4_route_flush_table;
111867 if (!net_eq(net, &init_net)) {
111868- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111869+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
111870 if (tbl == NULL)
111871 goto err_dup;
111872
111873 /* Don't export sysctls to unprivileged users */
111874 if (net->user_ns != &init_user_ns)
111875 tbl[0].procname = NULL;
111876- }
111877- tbl[0].extra1 = net;
111878+ tbl[0].extra1 = net;
111879+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111880+ } else
111881+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
111882
111883- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
111884 if (net->ipv4.route_hdr == NULL)
111885 goto err_reg;
111886 return 0;
111887
111888 err_reg:
111889- if (tbl != ipv4_route_flush_table)
111890- kfree(tbl);
111891+ kfree(tbl);
111892 err_dup:
111893 return -ENOMEM;
111894 }
111895@@ -2693,8 +2693,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
111896
111897 static __net_init int rt_genid_init(struct net *net)
111898 {
111899- atomic_set(&net->ipv4.rt_genid, 0);
111900- atomic_set(&net->fnhe_genid, 0);
111901+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
111902+ atomic_set_unchecked(&net->fnhe_genid, 0);
111903 get_random_bytes(&net->ipv4.dev_addr_genid,
111904 sizeof(net->ipv4.dev_addr_genid));
111905 return 0;
111906@@ -2738,11 +2738,7 @@ int __init ip_rt_init(void)
111907 int rc = 0;
111908 int cpu;
111909
111910- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
111911- if (!ip_idents)
111912- panic("IP: failed to allocate ip_idents\n");
111913-
111914- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
111915+ prandom_bytes(ip_idents, sizeof(ip_idents));
111916
111917 for_each_possible_cpu(cpu) {
111918 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
111919diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
111920index d151539..5f5e247 100644
111921--- a/net/ipv4/sysctl_net_ipv4.c
111922+++ b/net/ipv4/sysctl_net_ipv4.c
111923@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
111924 container_of(table->data, struct net, ipv4.ip_local_ports.range);
111925 int ret;
111926 int range[2];
111927- struct ctl_table tmp = {
111928+ ctl_table_no_const tmp = {
111929 .data = &range,
111930 .maxlen = sizeof(range),
111931 .mode = table->mode,
111932@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
111933 int ret;
111934 gid_t urange[2];
111935 kgid_t low, high;
111936- struct ctl_table tmp = {
111937+ ctl_table_no_const tmp = {
111938 .data = &urange,
111939 .maxlen = sizeof(urange),
111940 .mode = table->mode,
111941@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
111942 void __user *buffer, size_t *lenp, loff_t *ppos)
111943 {
111944 char val[TCP_CA_NAME_MAX];
111945- struct ctl_table tbl = {
111946+ ctl_table_no_const tbl = {
111947 .data = val,
111948 .maxlen = TCP_CA_NAME_MAX,
111949 };
111950@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
111951 void __user *buffer, size_t *lenp,
111952 loff_t *ppos)
111953 {
111954- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
111955+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
111956 int ret;
111957
111958 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111959@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
111960 void __user *buffer, size_t *lenp,
111961 loff_t *ppos)
111962 {
111963- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
111964+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
111965 int ret;
111966
111967 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
111968@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
111969 void __user *buffer, size_t *lenp,
111970 loff_t *ppos)
111971 {
111972- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111973+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
111974 struct tcp_fastopen_context *ctxt;
111975 int ret;
111976 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
111977@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
111978
111979 static __net_init int ipv4_sysctl_init_net(struct net *net)
111980 {
111981- struct ctl_table *table;
111982+ ctl_table_no_const *table = NULL;
111983
111984- table = ipv4_net_table;
111985 if (!net_eq(net, &init_net)) {
111986 int i;
111987
111988- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
111989+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
111990 if (table == NULL)
111991 goto err_alloc;
111992
111993@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
111994 table[i].data += (void *)net - (void *)&init_net;
111995 }
111996
111997- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
111998+ if (!net_eq(net, &init_net))
111999+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
112000+ else
112001+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
112002 if (net->ipv4.ipv4_hdr == NULL)
112003 goto err_reg;
112004
112005diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
112006index 995a225..e1e9183 100644
112007--- a/net/ipv4/tcp.c
112008+++ b/net/ipv4/tcp.c
112009@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
112010
112011 /* Race breaker. If space is freed after
112012 * wspace test but before the flags are set,
112013- * IO signal will be lost.
112014+ * IO signal will be lost. Memory barrier
112015+ * pairs with the input side.
112016 */
112017+ smp_mb__after_atomic();
112018 if (sk_stream_is_writeable(sk))
112019 mask |= POLLOUT | POLLWRNORM;
112020 }
112021diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
112022index f501ac04..0c5a1b2 100644
112023--- a/net/ipv4/tcp_input.c
112024+++ b/net/ipv4/tcp_input.c
112025@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
112026 * without any lock. We want to make sure compiler wont store
112027 * intermediate values in this location.
112028 */
112029- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
112030+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
112031 sk->sk_max_pacing_rate);
112032 }
112033
112034@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
112035 * simplifies code)
112036 */
112037 static void
112038-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112039+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
112040 struct sk_buff *head, struct sk_buff *tail,
112041 u32 start, u32 end)
112042 {
112043@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
112044 {
112045 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
112046 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
112047+ /* pairs with tcp_poll() */
112048+ smp_mb__after_atomic();
112049 if (sk->sk_socket &&
112050 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
112051 tcp_new_space(sk);
112052@@ -5525,6 +5527,7 @@ discard:
112053 tcp_paws_reject(&tp->rx_opt, 0))
112054 goto discard_and_undo;
112055
112056+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
112057 if (th->syn) {
112058 /* We see SYN without ACK. It is attempt of
112059 * simultaneous connect with crossed SYNs.
112060@@ -5575,6 +5578,7 @@ discard:
112061 goto discard;
112062 #endif
112063 }
112064+#endif
112065 /* "fifth, if neither of the SYN or RST bits is set then
112066 * drop the segment and return."
112067 */
112068@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
112069 goto discard;
112070
112071 if (th->syn) {
112072- if (th->fin)
112073+ if (th->fin || th->urg || th->psh)
112074 goto discard;
112075 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
112076 return 1;
112077diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
112078index f1756ee..8908cb0 100644
112079--- a/net/ipv4/tcp_ipv4.c
112080+++ b/net/ipv4/tcp_ipv4.c
112081@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
112082 int sysctl_tcp_low_latency __read_mostly;
112083 EXPORT_SYMBOL(sysctl_tcp_low_latency);
112084
112085+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112086+extern int grsec_enable_blackhole;
112087+#endif
112088+
112089 #ifdef CONFIG_TCP_MD5SIG
112090 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
112091 __be32 daddr, __be32 saddr, const struct tcphdr *th);
112092@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
112093 return 0;
112094
112095 reset:
112096+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112097+ if (!grsec_enable_blackhole)
112098+#endif
112099 tcp_v4_send_reset(rsk, skb);
112100 discard:
112101 kfree_skb(skb);
112102@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
112103 TCP_SKB_CB(skb)->sacked = 0;
112104
112105 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
112106- if (!sk)
112107+ if (!sk) {
112108+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112109+ ret = 1;
112110+#endif
112111 goto no_tcp_socket;
112112-
112113+ }
112114 process:
112115- if (sk->sk_state == TCP_TIME_WAIT)
112116+ if (sk->sk_state == TCP_TIME_WAIT) {
112117+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112118+ ret = 2;
112119+#endif
112120 goto do_time_wait;
112121+ }
112122
112123 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
112124 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
112125@@ -1700,6 +1714,10 @@ csum_error:
112126 bad_packet:
112127 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
112128 } else {
112129+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112130+ if (!grsec_enable_blackhole || (ret == 1 &&
112131+ (skb->dev->flags & IFF_LOOPBACK)))
112132+#endif
112133 tcp_v4_send_reset(NULL, skb);
112134 }
112135
112136diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
112137index 50277af..defe393 100644
112138--- a/net/ipv4/tcp_minisocks.c
112139+++ b/net/ipv4/tcp_minisocks.c
112140@@ -27,6 +27,10 @@
112141 #include <net/inet_common.h>
112142 #include <net/xfrm.h>
112143
112144+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112145+extern int grsec_enable_blackhole;
112146+#endif
112147+
112148 int sysctl_tcp_syncookies __read_mostly = 1;
112149 EXPORT_SYMBOL(sysctl_tcp_syncookies);
112150
112151@@ -788,7 +792,10 @@ embryonic_reset:
112152 * avoid becoming vulnerable to outside attack aiming at
112153 * resetting legit local connections.
112154 */
112155- req->rsk_ops->send_reset(sk, skb);
112156+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112157+ if (!grsec_enable_blackhole)
112158+#endif
112159+ req->rsk_ops->send_reset(sk, skb);
112160 } else if (fastopen) { /* received a valid RST pkt */
112161 reqsk_fastopen_remove(sk, req, true);
112162 tcp_reset(sk);
112163diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
112164index ebf5ff5..4d1ff32 100644
112165--- a/net/ipv4/tcp_probe.c
112166+++ b/net/ipv4/tcp_probe.c
112167@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
112168 if (cnt + width >= len)
112169 break;
112170
112171- if (copy_to_user(buf + cnt, tbuf, width))
112172+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
112173 return -EFAULT;
112174 cnt += width;
112175 }
112176diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
112177index 0732b78..a82bdc6 100644
112178--- a/net/ipv4/tcp_timer.c
112179+++ b/net/ipv4/tcp_timer.c
112180@@ -22,6 +22,10 @@
112181 #include <linux/gfp.h>
112182 #include <net/tcp.h>
112183
112184+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112185+extern int grsec_lastack_retries;
112186+#endif
112187+
112188 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
112189 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
112190 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
112191@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
112192 }
112193 }
112194
112195+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112196+ if ((sk->sk_state == TCP_LAST_ACK) &&
112197+ (grsec_lastack_retries > 0) &&
112198+ (grsec_lastack_retries < retry_until))
112199+ retry_until = grsec_lastack_retries;
112200+#endif
112201+
112202 if (retransmits_timed_out(sk, retry_until,
112203 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
112204 /* Has it gone just too far? */
112205diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
112206index 51f1745..4bc0427 100644
112207--- a/net/ipv4/udp.c
112208+++ b/net/ipv4/udp.c
112209@@ -87,6 +87,7 @@
112210 #include <linux/types.h>
112211 #include <linux/fcntl.h>
112212 #include <linux/module.h>
112213+#include <linux/security.h>
112214 #include <linux/socket.h>
112215 #include <linux/sockios.h>
112216 #include <linux/igmp.h>
112217@@ -115,6 +116,10 @@
112218 #include <net/busy_poll.h>
112219 #include "udp_impl.h"
112220
112221+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112222+extern int grsec_enable_blackhole;
112223+#endif
112224+
112225 struct udp_table udp_table __read_mostly;
112226 EXPORT_SYMBOL(udp_table);
112227
112228@@ -609,6 +614,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
112229 return true;
112230 }
112231
112232+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
112233+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
112234+
112235 /*
112236 * This routine is called by the ICMP module when it gets some
112237 * sort of error condition. If err < 0 then the socket should
112238@@ -946,9 +954,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
112239 dport = usin->sin_port;
112240 if (dport == 0)
112241 return -EINVAL;
112242+
112243+ err = gr_search_udp_sendmsg(sk, usin);
112244+ if (err)
112245+ return err;
112246 } else {
112247 if (sk->sk_state != TCP_ESTABLISHED)
112248 return -EDESTADDRREQ;
112249+
112250+ err = gr_search_udp_sendmsg(sk, NULL);
112251+ if (err)
112252+ return err;
112253+
112254 daddr = inet->inet_daddr;
112255 dport = inet->inet_dport;
112256 /* Open fast path for connected socket.
112257@@ -1196,7 +1213,7 @@ static unsigned int first_packet_length(struct sock *sk)
112258 IS_UDPLITE(sk));
112259 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112260 IS_UDPLITE(sk));
112261- atomic_inc(&sk->sk_drops);
112262+ atomic_inc_unchecked(&sk->sk_drops);
112263 __skb_unlink(skb, rcvq);
112264 __skb_queue_tail(&list_kill, skb);
112265 }
112266@@ -1276,6 +1293,10 @@ try_again:
112267 if (!skb)
112268 goto out;
112269
112270+ err = gr_search_udp_recvmsg(sk, skb);
112271+ if (err)
112272+ goto out_free;
112273+
112274 ulen = skb->len - sizeof(struct udphdr);
112275 copied = len;
112276 if (copied > ulen)
112277@@ -1308,7 +1329,7 @@ try_again:
112278 if (unlikely(err)) {
112279 trace_kfree_skb(skb, udp_recvmsg);
112280 if (!peeked) {
112281- atomic_inc(&sk->sk_drops);
112282+ atomic_inc_unchecked(&sk->sk_drops);
112283 UDP_INC_STATS_USER(sock_net(sk),
112284 UDP_MIB_INERRORS, is_udplite);
112285 }
112286@@ -1604,7 +1625,7 @@ csum_error:
112287 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
112288 drop:
112289 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
112290- atomic_inc(&sk->sk_drops);
112291+ atomic_inc_unchecked(&sk->sk_drops);
112292 kfree_skb(skb);
112293 return -1;
112294 }
112295@@ -1623,7 +1644,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
112296 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
112297
112298 if (!skb1) {
112299- atomic_inc(&sk->sk_drops);
112300+ atomic_inc_unchecked(&sk->sk_drops);
112301 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
112302 IS_UDPLITE(sk));
112303 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
112304@@ -1829,6 +1850,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
112305 goto csum_error;
112306
112307 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
112308+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
112309+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
112310+#endif
112311 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
112312
112313 /*
112314@@ -2426,7 +2450,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
112315 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
112316 0, sock_i_ino(sp),
112317 atomic_read(&sp->sk_refcnt), sp,
112318- atomic_read(&sp->sk_drops));
112319+ atomic_read_unchecked(&sp->sk_drops));
112320 }
112321
112322 int udp4_seq_show(struct seq_file *seq, void *v)
112323diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
112324index 6156f68..d6ab46d 100644
112325--- a/net/ipv4/xfrm4_policy.c
112326+++ b/net/ipv4/xfrm4_policy.c
112327@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
112328 fl4->flowi4_tos = iph->tos;
112329 }
112330
112331-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
112332+static int xfrm4_garbage_collect(struct dst_ops *ops)
112333 {
112334 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
112335
112336- xfrm4_policy_afinfo.garbage_collect(net);
112337+ xfrm_garbage_collect_deferred(net);
112338 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
112339 }
112340
112341@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
112342
112343 static int __net_init xfrm4_net_init(struct net *net)
112344 {
112345- struct ctl_table *table;
112346+ ctl_table_no_const *table = NULL;
112347 struct ctl_table_header *hdr;
112348
112349- table = xfrm4_policy_table;
112350 if (!net_eq(net, &init_net)) {
112351- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112352+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
112353 if (!table)
112354 goto err_alloc;
112355
112356 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
112357- }
112358-
112359- hdr = register_net_sysctl(net, "net/ipv4", table);
112360+ hdr = register_net_sysctl(net, "net/ipv4", table);
112361+ } else
112362+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
112363 if (!hdr)
112364 goto err_reg;
112365
112366@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
112367 return 0;
112368
112369 err_reg:
112370- if (!net_eq(net, &init_net))
112371- kfree(table);
112372+ kfree(table);
112373 err_alloc:
112374 return -ENOMEM;
112375 }
112376diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
112377index b603002..0de5c88 100644
112378--- a/net/ipv6/addrconf.c
112379+++ b/net/ipv6/addrconf.c
112380@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
112381 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112382 .mtu6 = IPV6_MIN_MTU,
112383 .accept_ra = 1,
112384- .accept_redirects = 1,
112385+ .accept_redirects = 0,
112386 .autoconf = 1,
112387 .force_mld_version = 0,
112388 .mldv1_unsolicited_report_interval = 10 * HZ,
112389@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
112390 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
112391 .mtu6 = IPV6_MIN_MTU,
112392 .accept_ra = 1,
112393- .accept_redirects = 1,
112394+ .accept_redirects = 0,
112395 .autoconf = 1,
112396 .force_mld_version = 0,
112397 .mldv1_unsolicited_report_interval = 10 * HZ,
112398@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
112399 idx = 0;
112400 head = &net->dev_index_head[h];
112401 rcu_read_lock();
112402- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
112403+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
112404 net->dev_base_seq;
112405 hlist_for_each_entry_rcu(dev, head, index_hlist) {
112406 if (idx < s_idx)
112407@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
112408 p.iph.ihl = 5;
112409 p.iph.protocol = IPPROTO_IPV6;
112410 p.iph.ttl = 64;
112411- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
112412+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
112413
112414 if (ops->ndo_do_ioctl) {
112415 mm_segment_t oldfs = get_fs();
112416@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
112417 .release = seq_release_net,
112418 };
112419
112420+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
112421+extern void unregister_ipv6_seq_ops_addr(void);
112422+
112423 static int __net_init if6_proc_net_init(struct net *net)
112424 {
112425- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
112426+ register_ipv6_seq_ops_addr(&if6_seq_ops);
112427+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
112428+ unregister_ipv6_seq_ops_addr();
112429 return -ENOMEM;
112430+ }
112431 return 0;
112432 }
112433
112434 static void __net_exit if6_proc_net_exit(struct net *net)
112435 {
112436 remove_proc_entry("if_inet6", net->proc_net);
112437+ unregister_ipv6_seq_ops_addr();
112438 }
112439
112440 static struct pernet_operations if6_proc_net_ops = {
112441@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
112442 s_ip_idx = ip_idx = cb->args[2];
112443
112444 rcu_read_lock();
112445- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112446+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
112447 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
112448 idx = 0;
112449 head = &net->dev_index_head[h];
112450@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112451 rt_genid_bump_ipv6(net);
112452 break;
112453 }
112454- atomic_inc(&net->ipv6.dev_addr_genid);
112455+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
112456 }
112457
112458 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
112459@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
112460 int *valp = ctl->data;
112461 int val = *valp;
112462 loff_t pos = *ppos;
112463- struct ctl_table lctl;
112464+ ctl_table_no_const lctl;
112465 int ret;
112466
112467 /*
112468@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
112469 {
112470 struct inet6_dev *idev = ctl->extra1;
112471 int min_mtu = IPV6_MIN_MTU;
112472- struct ctl_table lctl;
112473+ ctl_table_no_const lctl;
112474
112475 lctl = *ctl;
112476 lctl.extra1 = &min_mtu;
112477@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
112478 int *valp = ctl->data;
112479 int val = *valp;
112480 loff_t pos = *ppos;
112481- struct ctl_table lctl;
112482+ ctl_table_no_const lctl;
112483 int ret;
112484
112485 /*
112486diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
112487index 98cc4cd..0768c4e 100644
112488--- a/net/ipv6/addrconf_core.c
112489+++ b/net/ipv6/addrconf_core.c
112490@@ -133,6 +133,14 @@ static void snmp6_free_dev(struct inet6_dev *idev)
112491 free_percpu(idev->stats.ipv6);
112492 }
112493
112494+static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
112495+{
112496+ struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
112497+
112498+ snmp6_free_dev(idev);
112499+ kfree(idev);
112500+}
112501+
112502 /* Nobody refers to this device, we may destroy it. */
112503
112504 void in6_dev_finish_destroy(struct inet6_dev *idev)
112505@@ -151,7 +159,6 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
112506 pr_warn("Freeing alive inet6 device %p\n", idev);
112507 return;
112508 }
112509- snmp6_free_dev(idev);
112510- kfree_rcu(idev, rcu);
112511+ call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
112512 }
112513 EXPORT_SYMBOL(in6_dev_finish_destroy);
112514diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
112515index e8c4400..a4cd5da 100644
112516--- a/net/ipv6/af_inet6.c
112517+++ b/net/ipv6/af_inet6.c
112518@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
112519 net->ipv6.sysctl.icmpv6_time = 1*HZ;
112520 net->ipv6.sysctl.flowlabel_consistency = 1;
112521 net->ipv6.sysctl.auto_flowlabels = 0;
112522- atomic_set(&net->ipv6.fib6_sernum, 1);
112523+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
112524
112525 err = ipv6_init_mibs(net);
112526 if (err)
112527diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
112528index ace8dac..bd6942d 100644
112529--- a/net/ipv6/datagram.c
112530+++ b/net/ipv6/datagram.c
112531@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
112532 0,
112533 sock_i_ino(sp),
112534 atomic_read(&sp->sk_refcnt), sp,
112535- atomic_read(&sp->sk_drops));
112536+ atomic_read_unchecked(&sp->sk_drops));
112537 }
112538diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
112539index a5e9519..16b7412 100644
112540--- a/net/ipv6/icmp.c
112541+++ b/net/ipv6/icmp.c
112542@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
112543
112544 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
112545 {
112546- struct ctl_table *table;
112547+ ctl_table_no_const *table;
112548
112549 table = kmemdup(ipv6_icmp_table_template,
112550 sizeof(ipv6_icmp_table_template),
112551diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
112552index 263ef41..88c7be8 100644
112553--- a/net/ipv6/ip6_fib.c
112554+++ b/net/ipv6/ip6_fib.c
112555@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
112556 int new, old;
112557
112558 do {
112559- old = atomic_read(&net->ipv6.fib6_sernum);
112560+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
112561 new = old < INT_MAX ? old + 1 : 1;
112562- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
112563+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
112564 old, new) != old);
112565 return new;
112566 }
112567diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
112568index bc28b7d..a08feea 100644
112569--- a/net/ipv6/ip6_gre.c
112570+++ b/net/ipv6/ip6_gre.c
112571@@ -71,8 +71,8 @@ struct ip6gre_net {
112572 struct net_device *fb_tunnel_dev;
112573 };
112574
112575-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
112576-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
112577+static struct rtnl_link_ops ip6gre_link_ops;
112578+static struct rtnl_link_ops ip6gre_tap_ops;
112579 static int ip6gre_tunnel_init(struct net_device *dev);
112580 static void ip6gre_tunnel_setup(struct net_device *dev);
112581 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
112582@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
112583 }
112584
112585
112586-static struct inet6_protocol ip6gre_protocol __read_mostly = {
112587+static struct inet6_protocol ip6gre_protocol = {
112588 .handler = ip6gre_rcv,
112589 .err_handler = ip6gre_err,
112590 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
112591@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
112592 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
112593 };
112594
112595-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112596+static struct rtnl_link_ops ip6gre_link_ops = {
112597 .kind = "ip6gre",
112598 .maxtype = IFLA_GRE_MAX,
112599 .policy = ip6gre_policy,
112600@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
112601 .get_link_net = ip6_tnl_get_link_net,
112602 };
112603
112604-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
112605+static struct rtnl_link_ops ip6gre_tap_ops = {
112606 .kind = "ip6gretap",
112607 .maxtype = IFLA_GRE_MAX,
112608 .policy = ip6gre_policy,
112609diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
112610index ddd94ec..b7cfefb 100644
112611--- a/net/ipv6/ip6_tunnel.c
112612+++ b/net/ipv6/ip6_tunnel.c
112613@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112614
112615 static int ip6_tnl_dev_init(struct net_device *dev);
112616 static void ip6_tnl_dev_setup(struct net_device *dev);
112617-static struct rtnl_link_ops ip6_link_ops __read_mostly;
112618+static struct rtnl_link_ops ip6_link_ops;
112619
112620 static int ip6_tnl_net_id __read_mostly;
112621 struct ip6_tnl_net {
112622@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
112623 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
112624 };
112625
112626-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
112627+static struct rtnl_link_ops ip6_link_ops = {
112628 .kind = "ip6tnl",
112629 .maxtype = IFLA_IPTUN_MAX,
112630 .policy = ip6_tnl_policy,
112631diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
112632index 5fb9e21..92bf04b 100644
112633--- a/net/ipv6/ip6_vti.c
112634+++ b/net/ipv6/ip6_vti.c
112635@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
112636
112637 static int vti6_dev_init(struct net_device *dev);
112638 static void vti6_dev_setup(struct net_device *dev);
112639-static struct rtnl_link_ops vti6_link_ops __read_mostly;
112640+static struct rtnl_link_ops vti6_link_ops;
112641
112642 static int vti6_net_id __read_mostly;
112643 struct vti6_net {
112644@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
112645 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
112646 };
112647
112648-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
112649+static struct rtnl_link_ops vti6_link_ops = {
112650 .kind = "vti6",
112651 .maxtype = IFLA_VTI_MAX,
112652 .policy = vti6_policy,
112653diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
112654index 8d766d9..dcdfea7 100644
112655--- a/net/ipv6/ipv6_sockglue.c
112656+++ b/net/ipv6/ipv6_sockglue.c
112657@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
112658 if (sk->sk_type != SOCK_STREAM)
112659 return -ENOPROTOOPT;
112660
112661- msg.msg_control = optval;
112662+ msg.msg_control = (void __force_kernel *)optval;
112663 msg.msg_controllen = len;
112664 msg.msg_flags = flags;
112665
112666diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
112667index bb00c6f..16c90d7 100644
112668--- a/net/ipv6/netfilter/ip6_tables.c
112669+++ b/net/ipv6/netfilter/ip6_tables.c
112670@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
112671 #endif
112672
112673 static int get_info(struct net *net, void __user *user,
112674- const int *len, int compat)
112675+ int len, int compat)
112676 {
112677 char name[XT_TABLE_MAXNAMELEN];
112678 struct xt_table *t;
112679 int ret;
112680
112681- if (*len != sizeof(struct ip6t_getinfo)) {
112682- duprintf("length %u != %zu\n", *len,
112683+ if (len != sizeof(struct ip6t_getinfo)) {
112684+ duprintf("length %u != %zu\n", len,
112685 sizeof(struct ip6t_getinfo));
112686 return -EINVAL;
112687 }
112688@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
112689 info.size = private->size;
112690 strcpy(info.name, name);
112691
112692- if (copy_to_user(user, &info, *len) != 0)
112693+ if (copy_to_user(user, &info, len) != 0)
112694 ret = -EFAULT;
112695 else
112696 ret = 0;
112697@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112698
112699 switch (cmd) {
112700 case IP6T_SO_GET_INFO:
112701- ret = get_info(sock_net(sk), user, len, 1);
112702+ ret = get_info(sock_net(sk), user, *len, 1);
112703 break;
112704 case IP6T_SO_GET_ENTRIES:
112705 ret = compat_get_entries(sock_net(sk), user, len);
112706@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
112707
112708 switch (cmd) {
112709 case IP6T_SO_GET_INFO:
112710- ret = get_info(sock_net(sk), user, len, 0);
112711+ ret = get_info(sock_net(sk), user, *len, 0);
112712 break;
112713
112714 case IP6T_SO_GET_ENTRIES:
112715diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
112716index 6f187c8..34b367f 100644
112717--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
112718+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
112719@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
112720
112721 static int nf_ct_frag6_sysctl_register(struct net *net)
112722 {
112723- struct ctl_table *table;
112724+ ctl_table_no_const *table = NULL;
112725 struct ctl_table_header *hdr;
112726
112727- table = nf_ct_frag6_sysctl_table;
112728 if (!net_eq(net, &init_net)) {
112729- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
112730+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
112731 GFP_KERNEL);
112732 if (table == NULL)
112733 goto err_alloc;
112734@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112735 table[2].data = &net->nf_frag.frags.high_thresh;
112736 table[2].extra1 = &net->nf_frag.frags.low_thresh;
112737 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
112738- }
112739-
112740- hdr = register_net_sysctl(net, "net/netfilter", table);
112741+ hdr = register_net_sysctl(net, "net/netfilter", table);
112742+ } else
112743+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
112744 if (hdr == NULL)
112745 goto err_reg;
112746
112747@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
112748 return 0;
112749
112750 err_reg:
112751- if (!net_eq(net, &init_net))
112752- kfree(table);
112753+ kfree(table);
112754 err_alloc:
112755 return -ENOMEM;
112756 }
112757diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
112758index a2dfff6..1e52e6d 100644
112759--- a/net/ipv6/ping.c
112760+++ b/net/ipv6/ping.c
112761@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
112762 };
112763 #endif
112764
112765+static struct pingv6_ops real_pingv6_ops = {
112766+ .ipv6_recv_error = ipv6_recv_error,
112767+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
112768+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
112769+ .icmpv6_err_convert = icmpv6_err_convert,
112770+ .ipv6_icmp_error = ipv6_icmp_error,
112771+ .ipv6_chk_addr = ipv6_chk_addr,
112772+};
112773+
112774+static struct pingv6_ops dummy_pingv6_ops = {
112775+ .ipv6_recv_error = dummy_ipv6_recv_error,
112776+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
112777+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
112778+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
112779+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
112780+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
112781+};
112782+
112783 int __init pingv6_init(void)
112784 {
112785 #ifdef CONFIG_PROC_FS
112786@@ -248,13 +266,7 @@ int __init pingv6_init(void)
112787 if (ret)
112788 return ret;
112789 #endif
112790- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
112791- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
112792- pingv6_ops.ip6_datagram_recv_specific_ctl =
112793- ip6_datagram_recv_specific_ctl;
112794- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
112795- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
112796- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
112797+ pingv6_ops = &real_pingv6_ops;
112798 return inet6_register_protosw(&pingv6_protosw);
112799 }
112800
112801@@ -263,14 +275,9 @@ int __init pingv6_init(void)
112802 */
112803 void pingv6_exit(void)
112804 {
112805- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
112806- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
112807- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
112808- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
112809- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
112810- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
112811 #ifdef CONFIG_PROC_FS
112812 unregister_pernet_subsys(&ping_v6_net_ops);
112813 #endif
112814+ pingv6_ops = &dummy_pingv6_ops;
112815 inet6_unregister_protosw(&pingv6_protosw);
112816 }
112817diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
112818index 679253d0..70b653c 100644
112819--- a/net/ipv6/proc.c
112820+++ b/net/ipv6/proc.c
112821@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
112822 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
112823 goto proc_snmp6_fail;
112824
112825- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
112826+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
112827 if (!net->mib.proc_net_devsnmp6)
112828 goto proc_dev_snmp6_fail;
112829 return 0;
112830diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
112831index dae7f1a..783b20d 100644
112832--- a/net/ipv6/raw.c
112833+++ b/net/ipv6/raw.c
112834@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
112835 {
112836 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
112837 skb_checksum_complete(skb)) {
112838- atomic_inc(&sk->sk_drops);
112839+ atomic_inc_unchecked(&sk->sk_drops);
112840 kfree_skb(skb);
112841 return NET_RX_DROP;
112842 }
112843@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112844 struct raw6_sock *rp = raw6_sk(sk);
112845
112846 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
112847- atomic_inc(&sk->sk_drops);
112848+ atomic_inc_unchecked(&sk->sk_drops);
112849 kfree_skb(skb);
112850 return NET_RX_DROP;
112851 }
112852@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
112853
112854 if (inet->hdrincl) {
112855 if (skb_checksum_complete(skb)) {
112856- atomic_inc(&sk->sk_drops);
112857+ atomic_inc_unchecked(&sk->sk_drops);
112858 kfree_skb(skb);
112859 return NET_RX_DROP;
112860 }
112861@@ -609,7 +609,7 @@ out:
112862 return err;
112863 }
112864
112865-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
112866+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
112867 struct flowi6 *fl6, struct dst_entry **dstp,
112868 unsigned int flags)
112869 {
112870@@ -915,12 +915,15 @@ do_confirm:
112871 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
112872 char __user *optval, int optlen)
112873 {
112874+ struct icmp6_filter filter;
112875+
112876 switch (optname) {
112877 case ICMPV6_FILTER:
112878 if (optlen > sizeof(struct icmp6_filter))
112879 optlen = sizeof(struct icmp6_filter);
112880- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
112881+ if (copy_from_user(&filter, optval, optlen))
112882 return -EFAULT;
112883+ raw6_sk(sk)->filter = filter;
112884 return 0;
112885 default:
112886 return -ENOPROTOOPT;
112887@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112888 char __user *optval, int __user *optlen)
112889 {
112890 int len;
112891+ struct icmp6_filter filter;
112892
112893 switch (optname) {
112894 case ICMPV6_FILTER:
112895@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
112896 len = sizeof(struct icmp6_filter);
112897 if (put_user(len, optlen))
112898 return -EFAULT;
112899- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
112900+ filter = raw6_sk(sk)->filter;
112901+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
112902 return -EFAULT;
112903 return 0;
112904 default:
112905diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
112906index d7d70e6..bd5e9fc 100644
112907--- a/net/ipv6/reassembly.c
112908+++ b/net/ipv6/reassembly.c
112909@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
112910
112911 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112912 {
112913- struct ctl_table *table;
112914+ ctl_table_no_const *table = NULL;
112915 struct ctl_table_header *hdr;
112916
112917- table = ip6_frags_ns_ctl_table;
112918 if (!net_eq(net, &init_net)) {
112919- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112920+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
112921 if (table == NULL)
112922 goto err_alloc;
112923
112924@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112925 /* Don't export sysctls to unprivileged users */
112926 if (net->user_ns != &init_user_ns)
112927 table[0].procname = NULL;
112928- }
112929+ hdr = register_net_sysctl(net, "net/ipv6", table);
112930+ } else
112931+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
112932
112933- hdr = register_net_sysctl(net, "net/ipv6", table);
112934 if (hdr == NULL)
112935 goto err_reg;
112936
112937@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
112938 return 0;
112939
112940 err_reg:
112941- if (!net_eq(net, &init_net))
112942- kfree(table);
112943+ kfree(table);
112944 err_alloc:
112945 return -ENOMEM;
112946 }
112947diff --git a/net/ipv6/route.c b/net/ipv6/route.c
112948index 4688bd4..584453d 100644
112949--- a/net/ipv6/route.c
112950+++ b/net/ipv6/route.c
112951@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
112952
112953 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
112954 {
112955- struct ctl_table *table;
112956+ ctl_table_no_const *table;
112957
112958 table = kmemdup(ipv6_route_table_template,
112959 sizeof(ipv6_route_table_template),
112960diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
112961index e4cbd57..02b1aaa 100644
112962--- a/net/ipv6/sit.c
112963+++ b/net/ipv6/sit.c
112964@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
112965 static void ipip6_dev_free(struct net_device *dev);
112966 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
112967 __be32 *v4dst);
112968-static struct rtnl_link_ops sit_link_ops __read_mostly;
112969+static struct rtnl_link_ops sit_link_ops;
112970
112971 static int sit_net_id __read_mostly;
112972 struct sit_net {
112973@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
112974 unregister_netdevice_queue(dev, head);
112975 }
112976
112977-static struct rtnl_link_ops sit_link_ops __read_mostly = {
112978+static struct rtnl_link_ops sit_link_ops = {
112979 .kind = "sit",
112980 .maxtype = IFLA_IPTUN_MAX,
112981 .policy = ipip6_policy,
112982diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
112983index c5c10fa..2577d51 100644
112984--- a/net/ipv6/sysctl_net_ipv6.c
112985+++ b/net/ipv6/sysctl_net_ipv6.c
112986@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
112987
112988 static int __net_init ipv6_sysctl_net_init(struct net *net)
112989 {
112990- struct ctl_table *ipv6_table;
112991+ ctl_table_no_const *ipv6_table;
112992 struct ctl_table *ipv6_route_table;
112993 struct ctl_table *ipv6_icmp_table;
112994 int err;
112995diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
112996index 5ca3bc8..8c53c81 100644
112997--- a/net/ipv6/tcp_ipv6.c
112998+++ b/net/ipv6/tcp_ipv6.c
112999@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
113000 }
113001 }
113002
113003+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113004+extern int grsec_enable_blackhole;
113005+#endif
113006+
113007 static void tcp_v6_hash(struct sock *sk)
113008 {
113009 if (sk->sk_state != TCP_CLOSE) {
113010@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
113011 return 0;
113012
113013 reset:
113014+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113015+ if (!grsec_enable_blackhole)
113016+#endif
113017 tcp_v6_send_reset(sk, skb);
113018 discard:
113019 if (opt_skb)
113020@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
113021
113022 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
113023 inet6_iif(skb));
113024- if (!sk)
113025+ if (!sk) {
113026+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113027+ ret = 1;
113028+#endif
113029 goto no_tcp_socket;
113030+ }
113031
113032 process:
113033- if (sk->sk_state == TCP_TIME_WAIT)
113034+ if (sk->sk_state == TCP_TIME_WAIT) {
113035+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113036+ ret = 2;
113037+#endif
113038 goto do_time_wait;
113039+ }
113040
113041 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
113042 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
113043@@ -1510,6 +1525,10 @@ csum_error:
113044 bad_packet:
113045 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
113046 } else {
113047+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113048+ if (!grsec_enable_blackhole || (ret == 1 &&
113049+ (skb->dev->flags & IFF_LOOPBACK)))
113050+#endif
113051 tcp_v6_send_reset(NULL, skb);
113052 }
113053
113054diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
113055index 1c9512a..786b8d6 100644
113056--- a/net/ipv6/udp.c
113057+++ b/net/ipv6/udp.c
113058@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
113059 udp_ipv6_hash_secret + net_hash_mix(net));
113060 }
113061
113062+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113063+extern int grsec_enable_blackhole;
113064+#endif
113065+
113066 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
113067 {
113068 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
113069@@ -448,7 +452,7 @@ try_again:
113070 if (unlikely(err)) {
113071 trace_kfree_skb(skb, udpv6_recvmsg);
113072 if (!peeked) {
113073- atomic_inc(&sk->sk_drops);
113074+ atomic_inc_unchecked(&sk->sk_drops);
113075 if (is_udp4)
113076 UDP_INC_STATS_USER(sock_net(sk),
113077 UDP_MIB_INERRORS,
113078@@ -712,7 +716,7 @@ csum_error:
113079 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
113080 drop:
113081 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
113082- atomic_inc(&sk->sk_drops);
113083+ atomic_inc_unchecked(&sk->sk_drops);
113084 kfree_skb(skb);
113085 return -1;
113086 }
113087@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
113088 if (likely(skb1 == NULL))
113089 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
113090 if (!skb1) {
113091- atomic_inc(&sk->sk_drops);
113092+ atomic_inc_unchecked(&sk->sk_drops);
113093 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
113094 IS_UDPLITE(sk));
113095 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
113096@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
113097 goto csum_error;
113098
113099 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
113100+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
113101+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
113102+#endif
113103 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
113104
113105 kfree_skb(skb);
113106diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
113107index 8d2d01b4..313511e 100644
113108--- a/net/ipv6/xfrm6_policy.c
113109+++ b/net/ipv6/xfrm6_policy.c
113110@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
113111 }
113112 }
113113
113114-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
113115+static int xfrm6_garbage_collect(struct dst_ops *ops)
113116 {
113117 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
113118
113119- xfrm6_policy_afinfo.garbage_collect(net);
113120+ xfrm_garbage_collect_deferred(net);
113121 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
113122 }
113123
113124@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
113125
113126 static int __net_init xfrm6_net_init(struct net *net)
113127 {
113128- struct ctl_table *table;
113129+ ctl_table_no_const *table = NULL;
113130 struct ctl_table_header *hdr;
113131
113132- table = xfrm6_policy_table;
113133 if (!net_eq(net, &init_net)) {
113134- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113135+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
113136 if (!table)
113137 goto err_alloc;
113138
113139 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
113140- }
113141+ hdr = register_net_sysctl(net, "net/ipv6", table);
113142+ } else
113143+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
113144
113145- hdr = register_net_sysctl(net, "net/ipv6", table);
113146 if (!hdr)
113147 goto err_reg;
113148
113149@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
113150 return 0;
113151
113152 err_reg:
113153- if (!net_eq(net, &init_net))
113154- kfree(table);
113155+ kfree(table);
113156 err_alloc:
113157 return -ENOMEM;
113158 }
113159diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
113160index c1d247e..9e5949d 100644
113161--- a/net/ipx/ipx_proc.c
113162+++ b/net/ipx/ipx_proc.c
113163@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
113164 struct proc_dir_entry *p;
113165 int rc = -ENOMEM;
113166
113167- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
113168+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
113169
113170 if (!ipx_proc_dir)
113171 goto out;
113172diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
113173index 683346d..cb0e12d 100644
113174--- a/net/irda/ircomm/ircomm_tty.c
113175+++ b/net/irda/ircomm/ircomm_tty.c
113176@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113177 add_wait_queue(&port->open_wait, &wait);
113178
113179 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
113180- __FILE__, __LINE__, tty->driver->name, port->count);
113181+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113182
113183 spin_lock_irqsave(&port->lock, flags);
113184- port->count--;
113185+ atomic_dec(&port->count);
113186 port->blocked_open++;
113187 spin_unlock_irqrestore(&port->lock, flags);
113188
113189@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113190 }
113191
113192 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
113193- __FILE__, __LINE__, tty->driver->name, port->count);
113194+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113195
113196 schedule();
113197 }
113198@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
113199
113200 spin_lock_irqsave(&port->lock, flags);
113201 if (!tty_hung_up_p(filp))
113202- port->count++;
113203+ atomic_inc(&port->count);
113204 port->blocked_open--;
113205 spin_unlock_irqrestore(&port->lock, flags);
113206
113207 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
113208- __FILE__, __LINE__, tty->driver->name, port->count);
113209+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
113210
113211 if (!retval)
113212 port->flags |= ASYNC_NORMAL_ACTIVE;
113213@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
113214
113215 /* ++ is not atomic, so this should be protected - Jean II */
113216 spin_lock_irqsave(&self->port.lock, flags);
113217- self->port.count++;
113218+ atomic_inc(&self->port.count);
113219 spin_unlock_irqrestore(&self->port.lock, flags);
113220 tty_port_tty_set(&self->port, tty);
113221
113222 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
113223- self->line, self->port.count);
113224+ self->line, atomic_read(&self->port.count));
113225
113226 /* Not really used by us, but lets do it anyway */
113227 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
113228@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
113229 tty_kref_put(port->tty);
113230 }
113231 port->tty = NULL;
113232- port->count = 0;
113233+ atomic_set(&port->count, 0);
113234 spin_unlock_irqrestore(&port->lock, flags);
113235
113236 wake_up_interruptible(&port->open_wait);
113237@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
113238 seq_putc(m, '\n');
113239
113240 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
113241- seq_printf(m, "Open count: %d\n", self->port.count);
113242+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
113243 seq_printf(m, "Max data size: %d\n", self->max_data_size);
113244 seq_printf(m, "Max header size: %d\n", self->max_header_size);
113245
113246diff --git a/net/irda/irproc.c b/net/irda/irproc.c
113247index b9ac598..f88cc56 100644
113248--- a/net/irda/irproc.c
113249+++ b/net/irda/irproc.c
113250@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
113251 {
113252 int i;
113253
113254- proc_irda = proc_mkdir("irda", init_net.proc_net);
113255+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
113256 if (proc_irda == NULL)
113257 return;
113258
113259diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
113260index 53d9311..cbaf99f 100644
113261--- a/net/iucv/af_iucv.c
113262+++ b/net/iucv/af_iucv.c
113263@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
113264 {
113265 char name[12];
113266
113267- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
113268+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113269 while (__iucv_get_sock_by_name(name)) {
113270 sprintf(name, "%08x",
113271- atomic_inc_return(&iucv_sk_list.autobind_name));
113272+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
113273 }
113274 memcpy(iucv->src_name, name, 8);
113275 }
113276diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
113277index 2a6a1fd..6c112b0 100644
113278--- a/net/iucv/iucv.c
113279+++ b/net/iucv/iucv.c
113280@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
113281 return NOTIFY_OK;
113282 }
113283
113284-static struct notifier_block __refdata iucv_cpu_notifier = {
113285+static struct notifier_block iucv_cpu_notifier = {
113286 .notifier_call = iucv_cpu_notify,
113287 };
113288
113289diff --git a/net/key/af_key.c b/net/key/af_key.c
113290index f8ac939..1e189bf 100644
113291--- a/net/key/af_key.c
113292+++ b/net/key/af_key.c
113293@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
113294 static u32 get_acqseq(void)
113295 {
113296 u32 res;
113297- static atomic_t acqseq;
113298+ static atomic_unchecked_t acqseq;
113299
113300 do {
113301- res = atomic_inc_return(&acqseq);
113302+ res = atomic_inc_return_unchecked(&acqseq);
113303 } while (!res);
113304 return res;
113305 }
113306diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
113307index 781b3a2..73a7434 100644
113308--- a/net/l2tp/l2tp_eth.c
113309+++ b/net/l2tp/l2tp_eth.c
113310@@ -42,12 +42,12 @@ struct l2tp_eth {
113311 struct sock *tunnel_sock;
113312 struct l2tp_session *session;
113313 struct list_head list;
113314- atomic_long_t tx_bytes;
113315- atomic_long_t tx_packets;
113316- atomic_long_t tx_dropped;
113317- atomic_long_t rx_bytes;
113318- atomic_long_t rx_packets;
113319- atomic_long_t rx_errors;
113320+ atomic_long_unchecked_t tx_bytes;
113321+ atomic_long_unchecked_t tx_packets;
113322+ atomic_long_unchecked_t tx_dropped;
113323+ atomic_long_unchecked_t rx_bytes;
113324+ atomic_long_unchecked_t rx_packets;
113325+ atomic_long_unchecked_t rx_errors;
113326 };
113327
113328 /* via l2tp_session_priv() */
113329@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
113330 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
113331
113332 if (likely(ret == NET_XMIT_SUCCESS)) {
113333- atomic_long_add(len, &priv->tx_bytes);
113334- atomic_long_inc(&priv->tx_packets);
113335+ atomic_long_add_unchecked(len, &priv->tx_bytes);
113336+ atomic_long_inc_unchecked(&priv->tx_packets);
113337 } else {
113338- atomic_long_inc(&priv->tx_dropped);
113339+ atomic_long_inc_unchecked(&priv->tx_dropped);
113340 }
113341 return NETDEV_TX_OK;
113342 }
113343@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
113344 {
113345 struct l2tp_eth *priv = netdev_priv(dev);
113346
113347- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
113348- stats->tx_packets = atomic_long_read(&priv->tx_packets);
113349- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
113350- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
113351- stats->rx_packets = atomic_long_read(&priv->rx_packets);
113352- stats->rx_errors = atomic_long_read(&priv->rx_errors);
113353+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
113354+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
113355+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
113356+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
113357+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
113358+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
113359 return stats;
113360 }
113361
113362@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
113363 nf_reset(skb);
113364
113365 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
113366- atomic_long_inc(&priv->rx_packets);
113367- atomic_long_add(data_len, &priv->rx_bytes);
113368+ atomic_long_inc_unchecked(&priv->rx_packets);
113369+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
113370 } else {
113371- atomic_long_inc(&priv->rx_errors);
113372+ atomic_long_inc_unchecked(&priv->rx_errors);
113373 }
113374 return;
113375
113376 error:
113377- atomic_long_inc(&priv->rx_errors);
113378+ atomic_long_inc_unchecked(&priv->rx_errors);
113379 kfree_skb(skb);
113380 }
113381
113382diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
113383index 05dfc8aa..df6cfd7 100644
113384--- a/net/l2tp/l2tp_ip.c
113385+++ b/net/l2tp/l2tp_ip.c
113386@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
113387 .ops = &l2tp_ip_ops,
113388 };
113389
113390-static struct net_protocol l2tp_ip_protocol __read_mostly = {
113391+static const struct net_protocol l2tp_ip_protocol = {
113392 .handler = l2tp_ip_recv,
113393 .netns_ok = 1,
113394 };
113395diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
113396index 8611f1b..bc60a2d 100644
113397--- a/net/l2tp/l2tp_ip6.c
113398+++ b/net/l2tp/l2tp_ip6.c
113399@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
113400 .ops = &l2tp_ip6_ops,
113401 };
113402
113403-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
113404+static const struct inet6_protocol l2tp_ip6_protocol = {
113405 .handler = l2tp_ip6_recv,
113406 };
113407
113408diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
113409index 1a3c7e0..80f8b0c 100644
113410--- a/net/llc/llc_proc.c
113411+++ b/net/llc/llc_proc.c
113412@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
113413 int rc = -ENOMEM;
113414 struct proc_dir_entry *p;
113415
113416- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
113417+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
113418 if (!llc_proc_dir)
113419 goto out;
113420
113421diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
113422index dd4ff36..3462997 100644
113423--- a/net/mac80211/cfg.c
113424+++ b/net/mac80211/cfg.c
113425@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
113426 ret = ieee80211_vif_use_channel(sdata, chandef,
113427 IEEE80211_CHANCTX_EXCLUSIVE);
113428 }
113429- } else if (local->open_count == local->monitors) {
113430+ } else if (local_read(&local->open_count) == local->monitors) {
113431 local->_oper_chandef = *chandef;
113432 ieee80211_hw_config(local, 0);
113433 }
113434@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
113435 else
113436 local->probe_req_reg--;
113437
113438- if (!local->open_count)
113439+ if (!local_read(&local->open_count))
113440 break;
113441
113442 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
113443@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
113444 if (chanctx_conf) {
113445 *chandef = sdata->vif.bss_conf.chandef;
113446 ret = 0;
113447- } else if (local->open_count > 0 &&
113448- local->open_count == local->monitors &&
113449+ } else if (local_read(&local->open_count) > 0 &&
113450+ local_read(&local->open_count) == local->monitors &&
113451 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
113452 if (local->use_chanctx)
113453 *chandef = local->monitor_chandef;
113454diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
113455index 81e8dc5..5b77c58 100644
113456--- a/net/mac80211/ieee80211_i.h
113457+++ b/net/mac80211/ieee80211_i.h
113458@@ -29,6 +29,7 @@
113459 #include <net/ieee80211_radiotap.h>
113460 #include <net/cfg80211.h>
113461 #include <net/mac80211.h>
113462+#include <asm/local.h>
113463 #include "key.h"
113464 #include "sta_info.h"
113465 #include "debug.h"
113466@@ -1129,7 +1130,7 @@ struct ieee80211_local {
113467 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
113468 spinlock_t queue_stop_reason_lock;
113469
113470- int open_count;
113471+ local_t open_count;
113472 int monitors, cooked_mntrs;
113473 /* number of interfaces with corresponding FIF_ flags */
113474 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
113475diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
113476index 81a2751..c06a026 100644
113477--- a/net/mac80211/iface.c
113478+++ b/net/mac80211/iface.c
113479@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113480 break;
113481 }
113482
113483- if (local->open_count == 0) {
113484+ if (local_read(&local->open_count) == 0) {
113485 res = drv_start(local);
113486 if (res)
113487 goto err_del_bss;
113488@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113489 res = drv_add_interface(local, sdata);
113490 if (res)
113491 goto err_stop;
113492- } else if (local->monitors == 0 && local->open_count == 0) {
113493+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
113494 res = ieee80211_add_virtual_monitor(local);
113495 if (res)
113496 goto err_stop;
113497@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113498 atomic_inc(&local->iff_promiscs);
113499
113500 if (coming_up)
113501- local->open_count++;
113502+ local_inc(&local->open_count);
113503
113504 if (hw_reconf_flags)
113505 ieee80211_hw_config(local, hw_reconf_flags);
113506@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
113507 err_del_interface:
113508 drv_remove_interface(local, sdata);
113509 err_stop:
113510- if (!local->open_count)
113511+ if (!local_read(&local->open_count))
113512 drv_stop(local);
113513 err_del_bss:
113514 sdata->bss = NULL;
113515@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113516 }
113517
113518 if (going_down)
113519- local->open_count--;
113520+ local_dec(&local->open_count);
113521
113522 switch (sdata->vif.type) {
113523 case NL80211_IFTYPE_AP_VLAN:
113524@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113525 }
113526 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
113527
113528- if (local->open_count == 0)
113529+ if (local_read(&local->open_count) == 0)
113530 ieee80211_clear_tx_pending(local);
113531
113532 /*
113533@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113534 if (cancel_scan)
113535 flush_delayed_work(&local->scan_work);
113536
113537- if (local->open_count == 0) {
113538+ if (local_read(&local->open_count) == 0) {
113539 ieee80211_stop_device(local);
113540
113541 /* no reconfiguring after stop! */
113542@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
113543 ieee80211_configure_filter(local);
113544 ieee80211_hw_config(local, hw_reconf_flags);
113545
113546- if (local->monitors == local->open_count)
113547+ if (local->monitors == local_read(&local->open_count))
113548 ieee80211_add_virtual_monitor(local);
113549 }
113550
113551diff --git a/net/mac80211/main.c b/net/mac80211/main.c
113552index 5e09d35..e2fdbe2 100644
113553--- a/net/mac80211/main.c
113554+++ b/net/mac80211/main.c
113555@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
113556 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
113557 IEEE80211_CONF_CHANGE_POWER);
113558
113559- if (changed && local->open_count) {
113560+ if (changed && local_read(&local->open_count)) {
113561 ret = drv_config(local, changed);
113562 /*
113563 * Goal:
113564diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
113565index ca405b6..6cc8bee 100644
113566--- a/net/mac80211/pm.c
113567+++ b/net/mac80211/pm.c
113568@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113569 struct ieee80211_sub_if_data *sdata;
113570 struct sta_info *sta;
113571
113572- if (!local->open_count)
113573+ if (!local_read(&local->open_count))
113574 goto suspend;
113575
113576 ieee80211_scan_cancel(local);
113577@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113578 cancel_work_sync(&local->dynamic_ps_enable_work);
113579 del_timer_sync(&local->dynamic_ps_timer);
113580
113581- local->wowlan = wowlan && local->open_count;
113582+ local->wowlan = wowlan && local_read(&local->open_count);
113583 if (local->wowlan) {
113584 int err = drv_suspend(local, wowlan);
113585 if (err < 0) {
113586@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
113587 WARN_ON(!list_empty(&local->chanctx_list));
113588
113589 /* stop hardware - this must stop RX */
113590- if (local->open_count)
113591+ if (local_read(&local->open_count))
113592 ieee80211_stop_device(local);
113593
113594 suspend:
113595diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
113596index d53355b..21f583a 100644
113597--- a/net/mac80211/rate.c
113598+++ b/net/mac80211/rate.c
113599@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
113600
113601 ASSERT_RTNL();
113602
113603- if (local->open_count)
113604+ if (local_read(&local->open_count))
113605 return -EBUSY;
113606
113607 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
113608diff --git a/net/mac80211/util.c b/net/mac80211/util.c
113609index 747bdcf..eb2b981 100644
113610--- a/net/mac80211/util.c
113611+++ b/net/mac80211/util.c
113612@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113613 bool sched_scan_stopped = false;
113614
113615 /* nothing to do if HW shouldn't run */
113616- if (!local->open_count)
113617+ if (!local_read(&local->open_count))
113618 goto wake_up;
113619
113620 #ifdef CONFIG_PM
113621@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113622 local->in_reconfig = false;
113623 barrier();
113624
113625- if (local->monitors == local->open_count && local->monitors > 0)
113626+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
113627 ieee80211_add_virtual_monitor(local);
113628
113629 /*
113630@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113631 * If this is for hw restart things are still running.
113632 * We may want to change that later, however.
113633 */
113634- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
113635+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
113636 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
113637
113638 if (!local->suspended)
113639@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
113640 flush_delayed_work(&local->scan_work);
113641 }
113642
113643- if (local->open_count && !reconfig_due_to_wowlan)
113644+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
113645 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
113646
113647 list_for_each_entry(sdata, &local->interfaces, list) {
113648diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
113649index b02660f..c0f791c 100644
113650--- a/net/netfilter/Kconfig
113651+++ b/net/netfilter/Kconfig
113652@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
113653
113654 To compile it as a module, choose M here. If unsure, say N.
113655
113656+config NETFILTER_XT_MATCH_GRADM
113657+ tristate '"gradm" match support'
113658+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
113659+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
113660+ ---help---
113661+ The gradm match allows to match on grsecurity RBAC being enabled.
113662+ It is useful when iptables rules are applied early on bootup to
113663+ prevent connections to the machine (except from a trusted host)
113664+ while the RBAC system is disabled.
113665+
113666 config NETFILTER_XT_MATCH_HASHLIMIT
113667 tristate '"hashlimit" match support'
113668 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
113669diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
113670index 89f73a9..e4e5bd9 100644
113671--- a/net/netfilter/Makefile
113672+++ b/net/netfilter/Makefile
113673@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
113674 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
113675 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
113676 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
113677+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
113678 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
113679 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
113680 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
113681diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
113682index d259da3..6a32b2c 100644
113683--- a/net/netfilter/ipset/ip_set_core.c
113684+++ b/net/netfilter/ipset/ip_set_core.c
113685@@ -1952,7 +1952,7 @@ done:
113686 return ret;
113687 }
113688
113689-static struct nf_sockopt_ops so_set __read_mostly = {
113690+static struct nf_sockopt_ops so_set = {
113691 .pf = PF_INET,
113692 .get_optmin = SO_IP_SET,
113693 .get_optmax = SO_IP_SET + 1,
113694diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
113695index b0f7b62..0541842 100644
113696--- a/net/netfilter/ipvs/ip_vs_conn.c
113697+++ b/net/netfilter/ipvs/ip_vs_conn.c
113698@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
113699 /* Increase the refcnt counter of the dest */
113700 ip_vs_dest_hold(dest);
113701
113702- conn_flags = atomic_read(&dest->conn_flags);
113703+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
113704 if (cp->protocol != IPPROTO_UDP)
113705 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
113706 flags = cp->flags;
113707@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
113708
113709 cp->control = NULL;
113710 atomic_set(&cp->n_control, 0);
113711- atomic_set(&cp->in_pkts, 0);
113712+ atomic_set_unchecked(&cp->in_pkts, 0);
113713
113714 cp->packet_xmit = NULL;
113715 cp->app = NULL;
113716@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
113717
113718 /* Don't drop the entry if its number of incoming packets is not
113719 located in [0, 8] */
113720- i = atomic_read(&cp->in_pkts);
113721+ i = atomic_read_unchecked(&cp->in_pkts);
113722 if (i > 8 || i < 0) return 0;
113723
113724 if (!todrop_rate[i]) return 0;
113725diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
113726index b87ca32..76c7799 100644
113727--- a/net/netfilter/ipvs/ip_vs_core.c
113728+++ b/net/netfilter/ipvs/ip_vs_core.c
113729@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
113730 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
113731 /* do not touch skb anymore */
113732
113733- atomic_inc(&cp->in_pkts);
113734+ atomic_inc_unchecked(&cp->in_pkts);
113735 ip_vs_conn_put(cp);
113736 return ret;
113737 }
113738@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
113739 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
113740 pkts = sysctl_sync_threshold(ipvs);
113741 else
113742- pkts = atomic_add_return(1, &cp->in_pkts);
113743+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113744
113745 if (ipvs->sync_state & IP_VS_STATE_MASTER)
113746 ip_vs_sync_conn(net, cp, pkts);
113747diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
113748index ed99448..3ba6cad 100644
113749--- a/net/netfilter/ipvs/ip_vs_ctl.c
113750+++ b/net/netfilter/ipvs/ip_vs_ctl.c
113751@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
113752 */
113753 ip_vs_rs_hash(ipvs, dest);
113754 }
113755- atomic_set(&dest->conn_flags, conn_flags);
113756+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
113757
113758 /* bind the service */
113759 old_svc = rcu_dereference_protected(dest->svc, 1);
113760@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
113761 * align with netns init in ip_vs_control_net_init()
113762 */
113763
113764-static struct ctl_table vs_vars[] = {
113765+static ctl_table_no_const vs_vars[] __read_only = {
113766 {
113767 .procname = "amemthresh",
113768 .maxlen = sizeof(int),
113769@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113770 " %-7s %-6d %-10d %-10d\n",
113771 &dest->addr.in6,
113772 ntohs(dest->port),
113773- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113774+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113775 atomic_read(&dest->weight),
113776 atomic_read(&dest->activeconns),
113777 atomic_read(&dest->inactconns));
113778@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
113779 "%-7s %-6d %-10d %-10d\n",
113780 ntohl(dest->addr.ip),
113781 ntohs(dest->port),
113782- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
113783+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
113784 atomic_read(&dest->weight),
113785 atomic_read(&dest->activeconns),
113786 atomic_read(&dest->inactconns));
113787@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
113788
113789 entry.addr = dest->addr.ip;
113790 entry.port = dest->port;
113791- entry.conn_flags = atomic_read(&dest->conn_flags);
113792+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
113793 entry.weight = atomic_read(&dest->weight);
113794 entry.u_threshold = dest->u_threshold;
113795 entry.l_threshold = dest->l_threshold;
113796@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
113797 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
113798 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
113799 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
113800- (atomic_read(&dest->conn_flags) &
113801+ (atomic_read_unchecked(&dest->conn_flags) &
113802 IP_VS_CONN_F_FWD_MASK)) ||
113803 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
113804 atomic_read(&dest->weight)) ||
113805@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
113806 {
113807 int idx;
113808 struct netns_ipvs *ipvs = net_ipvs(net);
113809- struct ctl_table *tbl;
113810+ ctl_table_no_const *tbl;
113811
113812 atomic_set(&ipvs->dropentry, 0);
113813 spin_lock_init(&ipvs->dropentry_lock);
113814diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
113815index 127f140..553d652 100644
113816--- a/net/netfilter/ipvs/ip_vs_lblc.c
113817+++ b/net/netfilter/ipvs/ip_vs_lblc.c
113818@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
113819 * IPVS LBLC sysctl table
113820 */
113821 #ifdef CONFIG_SYSCTL
113822-static struct ctl_table vs_vars_table[] = {
113823+static ctl_table_no_const vs_vars_table[] __read_only = {
113824 {
113825 .procname = "lblc_expiration",
113826 .data = NULL,
113827diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
113828index 2229d2d..b32b785 100644
113829--- a/net/netfilter/ipvs/ip_vs_lblcr.c
113830+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
113831@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
113832 * IPVS LBLCR sysctl table
113833 */
113834
113835-static struct ctl_table vs_vars_table[] = {
113836+static ctl_table_no_const vs_vars_table[] __read_only = {
113837 {
113838 .procname = "lblcr_expiration",
113839 .data = NULL,
113840diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
113841index d93ceeb..4556144 100644
113842--- a/net/netfilter/ipvs/ip_vs_sync.c
113843+++ b/net/netfilter/ipvs/ip_vs_sync.c
113844@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
113845 cp = cp->control;
113846 if (cp) {
113847 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113848- pkts = atomic_add_return(1, &cp->in_pkts);
113849+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113850 else
113851 pkts = sysctl_sync_threshold(ipvs);
113852 ip_vs_sync_conn(net, cp->control, pkts);
113853@@ -771,7 +771,7 @@ control:
113854 if (!cp)
113855 return;
113856 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
113857- pkts = atomic_add_return(1, &cp->in_pkts);
113858+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
113859 else
113860 pkts = sysctl_sync_threshold(ipvs);
113861 goto sloop;
113862@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
113863
113864 if (opt)
113865 memcpy(&cp->in_seq, opt, sizeof(*opt));
113866- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113867+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
113868 cp->state = state;
113869 cp->old_state = cp->state;
113870 /*
113871diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
113872index 3aedbda..6a63567 100644
113873--- a/net/netfilter/ipvs/ip_vs_xmit.c
113874+++ b/net/netfilter/ipvs/ip_vs_xmit.c
113875@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
113876 else
113877 rc = NF_ACCEPT;
113878 /* do not touch skb anymore */
113879- atomic_inc(&cp->in_pkts);
113880+ atomic_inc_unchecked(&cp->in_pkts);
113881 goto out;
113882 }
113883
113884@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
113885 else
113886 rc = NF_ACCEPT;
113887 /* do not touch skb anymore */
113888- atomic_inc(&cp->in_pkts);
113889+ atomic_inc_unchecked(&cp->in_pkts);
113890 goto out;
113891 }
113892
113893diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
113894index a4b5e2a..13b1de3 100644
113895--- a/net/netfilter/nf_conntrack_acct.c
113896+++ b/net/netfilter/nf_conntrack_acct.c
113897@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
113898 #ifdef CONFIG_SYSCTL
113899 static int nf_conntrack_acct_init_sysctl(struct net *net)
113900 {
113901- struct ctl_table *table;
113902+ ctl_table_no_const *table;
113903
113904 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
113905 GFP_KERNEL);
113906diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
113907index 13fad86..18c984c 100644
113908--- a/net/netfilter/nf_conntrack_core.c
113909+++ b/net/netfilter/nf_conntrack_core.c
113910@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
113911 #define DYING_NULLS_VAL ((1<<30)+1)
113912 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
113913
113914+#ifdef CONFIG_GRKERNSEC_HIDESYM
113915+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
113916+#endif
113917+
113918 int nf_conntrack_init_net(struct net *net)
113919 {
113920 int ret = -ENOMEM;
113921@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
113922 if (!net->ct.stat)
113923 goto err_pcpu_lists;
113924
113925+#ifdef CONFIG_GRKERNSEC_HIDESYM
113926+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
113927+#else
113928 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
113929+#endif
113930 if (!net->ct.slabname)
113931 goto err_slabname;
113932
113933diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
113934index 4e78c57..ec8fb74 100644
113935--- a/net/netfilter/nf_conntrack_ecache.c
113936+++ b/net/netfilter/nf_conntrack_ecache.c
113937@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
113938 #ifdef CONFIG_SYSCTL
113939 static int nf_conntrack_event_init_sysctl(struct net *net)
113940 {
113941- struct ctl_table *table;
113942+ ctl_table_no_const *table;
113943
113944 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
113945 GFP_KERNEL);
113946diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
113947index bd9d315..989947e 100644
113948--- a/net/netfilter/nf_conntrack_helper.c
113949+++ b/net/netfilter/nf_conntrack_helper.c
113950@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
113951
113952 static int nf_conntrack_helper_init_sysctl(struct net *net)
113953 {
113954- struct ctl_table *table;
113955+ ctl_table_no_const *table;
113956
113957 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
113958 GFP_KERNEL);
113959diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
113960index b65d586..beec902 100644
113961--- a/net/netfilter/nf_conntrack_proto.c
113962+++ b/net/netfilter/nf_conntrack_proto.c
113963@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
113964
113965 static void
113966 nf_ct_unregister_sysctl(struct ctl_table_header **header,
113967- struct ctl_table **table,
113968+ ctl_table_no_const **table,
113969 unsigned int users)
113970 {
113971 if (users > 0)
113972diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
113973index fc823fa..8311af3 100644
113974--- a/net/netfilter/nf_conntrack_standalone.c
113975+++ b/net/netfilter/nf_conntrack_standalone.c
113976@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
113977
113978 static int nf_conntrack_standalone_init_sysctl(struct net *net)
113979 {
113980- struct ctl_table *table;
113981+ ctl_table_no_const *table;
113982
113983 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
113984 GFP_KERNEL);
113985diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
113986index 7a394df..bd91a8a 100644
113987--- a/net/netfilter/nf_conntrack_timestamp.c
113988+++ b/net/netfilter/nf_conntrack_timestamp.c
113989@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
113990 #ifdef CONFIG_SYSCTL
113991 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
113992 {
113993- struct ctl_table *table;
113994+ ctl_table_no_const *table;
113995
113996 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
113997 GFP_KERNEL);
113998diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
113999index 675d12c..b36e825 100644
114000--- a/net/netfilter/nf_log.c
114001+++ b/net/netfilter/nf_log.c
114002@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
114003
114004 #ifdef CONFIG_SYSCTL
114005 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
114006-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
114007+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
114008
114009 static int nf_log_proc_dostring(struct ctl_table *table, int write,
114010 void __user *buffer, size_t *lenp, loff_t *ppos)
114011@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
114012 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
114013 mutex_unlock(&nf_log_mutex);
114014 } else {
114015+ ctl_table_no_const nf_log_table = *table;
114016+
114017 mutex_lock(&nf_log_mutex);
114018 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
114019 if (!logger)
114020- table->data = "NONE";
114021+ nf_log_table.data = "NONE";
114022 else
114023- table->data = logger->name;
114024- r = proc_dostring(table, write, buffer, lenp, ppos);
114025+ nf_log_table.data = logger->name;
114026+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
114027 mutex_unlock(&nf_log_mutex);
114028 }
114029
114030diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
114031index c68c1e5..8b5d670 100644
114032--- a/net/netfilter/nf_sockopt.c
114033+++ b/net/netfilter/nf_sockopt.c
114034@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
114035 }
114036 }
114037
114038- list_add(&reg->list, &nf_sockopts);
114039+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
114040 out:
114041 mutex_unlock(&nf_sockopt_mutex);
114042 return ret;
114043@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
114044 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
114045 {
114046 mutex_lock(&nf_sockopt_mutex);
114047- list_del(&reg->list);
114048+ pax_list_del((struct list_head *)&reg->list);
114049 mutex_unlock(&nf_sockopt_mutex);
114050 }
114051 EXPORT_SYMBOL(nf_unregister_sockopt);
114052diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
114053index 11d85b3..7fcc420 100644
114054--- a/net/netfilter/nfnetlink_log.c
114055+++ b/net/netfilter/nfnetlink_log.c
114056@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
114057 struct nfnl_log_net {
114058 spinlock_t instances_lock;
114059 struct hlist_head instance_table[INSTANCE_BUCKETS];
114060- atomic_t global_seq;
114061+ atomic_unchecked_t global_seq;
114062 };
114063
114064 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
114065@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
114066 /* global sequence number */
114067 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
114068 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
114069- htonl(atomic_inc_return(&log->global_seq))))
114070+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
114071 goto nla_put_failure;
114072
114073 if (data_len) {
114074diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
114075index 65f3e2b..2e9d6a0 100644
114076--- a/net/netfilter/nft_compat.c
114077+++ b/net/netfilter/nft_compat.c
114078@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
114079 return;
114080 }
114081
114082- switch(ret) {
114083- case true:
114084- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
114085- break;
114086- case false:
114087- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
114088- break;
114089- }
114090+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
114091 }
114092
114093 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
114094diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
114095new file mode 100644
114096index 0000000..c566332
114097--- /dev/null
114098+++ b/net/netfilter/xt_gradm.c
114099@@ -0,0 +1,51 @@
114100+/*
114101+ * gradm match for netfilter
114102